diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
diff --git a/.gitattributes b/.gitattributes
index 2e62a4e59..06b76c6c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
+# Forces all files which git considers text files to use LF line endings
+* text=auto eol=lf
+
 *.cpp diff=cpp
 *.h diff=cpp
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e7db7e8a8..51a7eae63 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,6 +36,9 @@ Contributions are welcome! Here's how you can help:
     - 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 `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)
     - Commit messages should:
@@ -67,20 +70,6 @@ Contributions are welcome! Here's how you can help:
    might need more work in the future.
 5. It uses protocols and formats which include the required compatibility.
 
-### Important note about automated GitHub checks
-
-When you submit a pull request, GitHub automatically runs checks on the Minetest
-Engine combined with your changes. One of these checks is called 'cpp lint /
-clang format', which checks code formatting. Because formatting for readability
-requires human judgement this check often fails and often makes unsuitable
-formatting requests which make code readability worse.
-
-If this check fails, look at the details to check for any clear mistakes and
-correct those. However, you should not apply everything ClangFormat requests.
-Ignore requests that make code readability worse and any other clearly
-unsuitable requests. Discuss in the pull request with a core developer about how
-to progress.
-
 ## Issues
 
 If you experience an issue, we would like to know the details - especially when
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 24cee5aae..32b7f5673 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -15,11 +15,10 @@ body:
       label: Minetest version
       description: |
         Paste the Minetest version below.
-        If you are on a devel version, please add a git commit hash.
-        You can use `minetest --version` to find it.
-        You can also refer to the "About" tab of the menu.
+        If you are on a dev version, please also indicate the git commit hash.
+        Refer to the "About" tab of the menu or run `minetest --version` on the command line.
       placeholder: |
-        Example: 
+        Example:
         Minetest 5.7.0-dev-ca13c51 (Linux)
         Using Irrlicht 1.9.0mt9
         Using LuaJIT 2.1.0-beta3
@@ -33,59 +32,53 @@ body:
       render: "true"
     validations:
       required: true
-  - type: input
-    attributes:
-      label: Active renderer
-      description: For graphical and input-related issues. You can find these in the About tab in the mainmenu.
-      placeholder: "Example: OpenGL 4.6.0"
-    validations:
-      required: false
   - type: input
     attributes:
       label: Irrlicht device
-      description: 
+      description:
       placeholder: "Example: X11"
     validations:
       required: false
   - type: input
     attributes:
       label: Operating system and version
-      description: It is recommended to upgrade your operating system to see if the problem still exists.
+      description: It is recommended to upgrade your operating system to see if the problem persists.
       placeholder: "Example: Ubuntu 22.04"
     validations:
       required: true
   - type: input
     attributes:
       label: CPU model
-      description: Usually found in system settings. 
-      placeholder: "Example: Intel i5-2410M (4) @ 2.900GHz"
+      description: Usually found in OS/system settings.
+      placeholder: "Example: Intel Core i5-2410M"
     validations:
       required: false
   - type: markdown
     attributes:
-      value: The GPU model and OpenGL version can be omitted if the bug is not a graphical issue.
+      value: The GPU model and renderer can be omitted if the bug is not a graphical issue.
   - type: input
     attributes:
       label: GPU model
-      description: Usually found in system settings. 
-      placeholder: "Example: NVIDA GeForce RTX 4090"
+      description: Usually found in OS/system settings.
+      placeholder: "Example: NVIDIA GeForce GTX 1660"
     validations:
       required: false
   - type: input
     attributes:
-      label: OpenGL version
-      placeholder: "Example: 4.6"
+      label: Active renderer
+      description: You can find this in the "About" tab in the main menu.
+      placeholder: "Example: OpenGL 4.6.0"
     validations:
       required: false
   - type: textarea
-    attributes: 
+    attributes:
       label: Summary
       description: Describe your problem here.
     validations:
       required: true
   - type: textarea
-    attributes: 
+    attributes:
       label: Steps to reproduce
-      description: Explain how the problem has happened, providing a minimal test (i.e. a code snippet reduced to the bone) where possible.
+      description: Explain how the problem has happened, providing a minimal test (e.g. a minimized code snippet) where possible.
     validations:
       required: true
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0ef7b9693..8296f5fb5 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -8,6 +8,10 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
       - 'android/**'
       - '.github/workflows/android.yml'
   pull_request:
@@ -16,40 +20,58 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
       - 'android/**'
       - '.github/workflows/android.yml'
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 10
     - name: Install deps
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends gettext openjdk-11-jdk-headless
-    - name: Build with Gradle
+        sudo apt-get install -y --no-install-recommends gettext
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+          distribution: 'temurin'
+          java-version: '17'
+    - name: Build AAB with Gradle
+      # We build an AAB as well for uploading to the the Play Store.
+      run: cd android; ./gradlew bundlerelease
+    - name: Build APKs with Gradle
+      # "assemblerelease" is very fast after "bundlerelease".
       run: cd android; ./gradlew assemblerelease
+    - name: Save AAB artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Minetest-release.aab
+        path: android/app/build/outputs/bundle/release/app-release.aab
     - name: Save armeabi artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         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@v3
+      uses: actions/upload-artifact@v4
       with:
         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@v3
+      uses: actions/upload-artifact@v4
       with:
         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@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Minetest-x86_64.apk
         path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index f2d4f86f5..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,303 +0,0 @@
-name: build
-
-# build on c/cpp changes or workflow changes
-on:
-  push:
-    paths:
-      - 'lib/**.[ch]'
-      - 'lib/**.cpp'
-      - 'src/**.[ch]'
-      - 'src/**.cpp'
-      - '**/CMakeLists.txt'
-      - 'cmake/Modules/**'
-      - 'util/buildbot/**'
-      - 'util/ci/**'
-      - '.github/workflows/**.yml'
-      - 'Dockerfile'
-      - '.dockerignore'
-  pull_request:
-    paths:
-      - 'lib/**.[ch]'
-      - 'lib/**.cpp'
-      - 'src/**.[ch]'
-      - 'src/**.cpp'
-      - '**/CMakeLists.txt'
-      - 'cmake/Modules/**'
-      - 'util/buildbot/**'
-      - 'util/ci/**'
-      - '.github/workflows/**.yml'
-      - 'Dockerfile'
-      - '.dockerignore'
-
-env:
-  MINETEST_POSTGRESQL_CONNECT_STRING: 'host=localhost user=minetest password=minetest dbname=minetest'
-
-jobs:
-  # Older gcc version (should be close to our minimum supported version)
-  gcc_7:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_linux_deps g++-7
-
-      - name: Build
-        run: |
-          ./util/ci/build.sh
-        env:
-          CC: gcc-7
-          CXX: g++-7
-
-      - name: Test
-        run: |
-          ./bin/freeminer --run-unittests
-
-  # Current gcc version
-  gcc_12:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_linux_deps g++-12 libluajit-5.1-dev
-
-      - name: Build
-        run: |
-          ./util/ci/build.sh
-        env:
-          CC: gcc-12
-          CXX: g++-12
-
-      - name: Test
-        run: |
-          ./bin/freeminer --run-unittests
-
-  # Older clang version (should be close to our minimum supported version)
-  clang_7:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_linux_deps clang-7 valgrind
-
-      - name: Build
-        run: |
-          ./util/ci/build.sh
-        env:
-          CC: clang-7
-          CXX: clang++-7
-
-      - name: Unittest
-        run: |
-          ./bin/freeminer --run-unittests
-
-      - name: Valgrind
-        run: |
-          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
-
-  # Current clang version
-  clang_14:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_linux_deps clang-14 gdb
-
-      - name: Build
-        run: |
-          ./util/ci/build.sh
-        env:
-          CC: clang-14
-          CXX: clang++-14
-
-      - name: Test
-        run: |
-          ./bin/freeminer --run-unittests
-
-      - name: Integration test + devtest
-        run: |
-          ./util/test_multiplayer.sh
-
-  # Build with prometheus-cpp (server-only)
-  clang_9_prometheus:
-    name: "clang_9 (PROMETHEUS=1)"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_linux_deps clang-9
-
-      - name: Build prometheus-cpp
-        run: |
-          ./util/ci/build_prometheus_cpp.sh
-
-      - name: Build
-        run: |
-          ./util/ci/build.sh
-        env:
-          CC: clang-9
-          CXX: clang++-9
-          CMAKE_FLAGS: "-DENABLE_PROMETHEUS=1 -DBUILD_CLIENT=0"
-
-      - name: Test
-        run: |
-          ./bin/freeminerserver --run-unittests
-
-  docker:
-    name: "Docker image"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Build docker image
-        run: |
-          docker build . -t minetest:latest
-          docker run --rm minetest:latest /usr/local/bin/freeminerserver --version
-
-  win32:
-    if: ${{ false }}
-    name: "MinGW cross-compiler (32-bit)"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install compiler
-        run: |
-          sudo apt-get update && sudo apt-get install -y gettext
-          wget http://minetest.kitsunemimi.pw/mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
-
-      - name: Build
-        run: |
-           EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild
-        env:
-          NO_PACKAGE: 1
-
-  win64:
-    if: ${{ false }}
-    name: "MinGW cross-compiler (64-bit)"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-      - name: Install compiler
-        run: |
-          sudo apt-get update && sudo apt-get install -y gettext
-          wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-          sudo tar -xaf mingw.tar.xz -C /usr
-
-      - name: Build
-        run: |
-          EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild
-        env:
-          NO_PACKAGE: 1
-
-  msvc:
-    if: ${{ false }}
-    name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
-    runs-on: windows-2019
-    env:
-      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
-      # 2023.10.19
-      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry boost
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-              arch: x86,
-              generator: "-G'Visual Studio 16 2019' -A Win32",
-              vcpkg_triplet: x86-windows
-            }
-          - {
-              arch: x64,
-              generator: "-G'Visual Studio 16 2019' -A x64",
-              vcpkg_triplet: x64-windows
-            }
-        type: [portable]
-#        type: [portable, installer]
-# The installer type is working, but disabled, to save runner jobs.
-# Enable it, when working on the installer.
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-            submodules: recursive
-            fetch-depth: 10
-#      - name: Checkout IrrlichtMt
-#        run: |
-#          $ref = @(Get-Content misc\irrlichtmt_tag.txt)
-#          git clone https://github.com/minetest/irrlicht lib\irrlichtmt --depth 1 -b $ref[0]
-
-      - name: Restore from cache and run vcpkg
-        uses: lukka/run-vcpkg@v7
-        with:
-          vcpkgArguments: ${{env.vcpkg_packages}}
-          vcpkgDirectory: '${{ github.workspace }}\vcpkg'
-          appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
-          vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
-          vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
-
-      - name: Minetest CMake
-        run: |
-          cmake ${{matrix.config.generator}}  `
-          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
-          -DCMAKE_BUILD_TYPE=Release  `
-          -DENABLE_POSTGRESQL=OFF  `
-          -DENABLE_LUAJIT=TRUE  `
-          -DREQUIRE_LUAJIT=TRUE  `
-          -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
-
-      - name: Build Minetest
-        run: cmake --build . --config Release
-
-      - name: CPack
-        run: |
-          If ($env:TYPE -eq "installer")
-          {
-            cpack -G WIX -B "$env:GITHUB_WORKSPACE\Package"
-          }
-          ElseIf($env:TYPE -eq "portable")
-          {
-            cpack -G ZIP -B "$env:GITHUB_WORKSPACE\Package"
-          }
-        env:
-          TYPE: ${{matrix.type}}
-
-      - name: Package Clean
-        run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: msvc-${{ matrix.config.arch }}-${{ matrix.type }}
-          path: .\Package\
diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml
index 374be5445..01c9cc016 100644
--- a/.github/workflows/cpp_lint.yml
+++ b/.github/workflows/cpp_lint.yml
@@ -8,6 +8,8 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/ci/**'
@@ -18,40 +20,28 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/ci/**'
       - '.github/workflows/**.yml'
 
+env:
+  CLANG_TIDY: clang-tidy-15
+
 jobs:
-
-#  clang_format:
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Install clang-format
-#        run: |
-#          sudo apt-get update
-#          sudo apt-get install -y clang-format-9
-#
-#      - name: Run clang-format
-#        run: |
-#          source ./util/ci/clang-format.sh
-#          check_format
-#        env:
-#          CLANG_FORMAT: clang-format-9
-
   clang_tidy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 10
     - name: Install deps
       run: |
         source ./util/ci/common.sh
-        install_linux_deps clang-tidy-9
+        install_linux_deps $CLANG_TIDY
 
     - name: Run clang-tidy
       run: |
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
new file mode 100644
index 000000000..1a2805e22
--- /dev/null
+++ b/.github/workflows/docker_image.yml
@@ -0,0 +1,98 @@
+---
+name: docker_image
+
+# https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
+# https://docs.docker.com/build/ci/github-actions/multi-platform
+# https://github.com/opencontainers/image-spec/blob/main/annotations.md
+
+on:
+  push:
+    branches: [ "master" ]
+    # Publish semver tags as releases.
+    tags: [ "*" ]
+  pull_request:
+    # Build docker image on pull requests. (but do not publish)
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
+      - 'util/ci/**'
+      - 'misc/irrlichtmt_tag.txt'
+      - 'Dockerfile'
+      - '.dockerignore'
+      - '.github/workflows/docker_image.yml'
+  workflow_dispatch:
+    inputs:
+      use_cache:
+        description: "Use build cache"
+        required: true
+        type: boolean
+        default: true
+
+env:
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3.0.0
+
+      # Login against the Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5.5.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          labels: |
+            org.opencontainers.image.title=Minetest
+            org.opencontainers.image.vendor=Minetest
+            org.opencontainers.image.licenses=LGPL-2.1-only
+
+      # Build and push Docker image
+      # https://github.com/docker/build-push-action
+      # No arm support for now. Require cross-compilation support in Dockerfile to not use QEMU.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          platforms: linux/amd64
+          push: ${{ github.event_name != 'pull_request' }}
+          load: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          no-cache: ${{ (github.event_name == 'workflow_dispatch' && !inputs.use_cache) || startsWith(github.ref, 'refs/tags/') }}
+
+      - name: Test Docker Image
+        run: |
+          docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") minetestserver --version
+        shell: bash
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
new file mode 100644
index 000000000..d206fe50f
--- /dev/null
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,169 @@
+name: linux
+
+# build on c/cpp changes or workflow changes
+on:
+  push:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
+      - 'util/ci/**'
+      - 'Dockerfile'
+      - '.dockerignore'
+      - '.github/workflows/linux.yml'
+  pull_request:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
+      - 'util/ci/**'
+      - 'Dockerfile'
+      - '.dockerignore'
+      - '.github/workflows/linux.yml'
+
+env:
+  MINETEST_POSTGRESQL_CONNECT_STRING: 'host=localhost user=minetest password=minetest dbname=minetest'
+
+jobs:
+  # Older gcc version (should be close to our minimum supported version)
+  gcc_7:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install deps
+        run: |
+          source ./util/ci/common.sh
+          install_linux_deps g++-7
+
+      - name: Build
+        run: |
+          ./util/ci/build.sh
+        env:
+          CC: gcc-7
+          CXX: g++-7
+
+      - name: Test
+        run: |
+          ./bin/freeminer --run-unittests
+
+  # Current gcc version
+  gcc_14:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install deps
+        run: |
+          source ./util/ci/common.sh
+          install_linux_deps g++-14 libluajit-5.1-dev
+
+      - name: Build
+        run: |
+          ./util/ci/build.sh
+        env:
+          CC: gcc-14
+          CXX: g++-14
+
+      - name: Test
+        run: |
+          mkdir nowrite
+          chmod a-w nowrite
+          cd nowrite
+          ../bin/freeminer --run-unittests
+
+  # Older clang version (should be close to our minimum supported version)
+  clang_7:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install deps
+        run: |
+          source ./util/ci/common.sh
+          install_linux_deps clang-7 llvm
+
+      - name: Build
+        run: |
+          ./util/ci/build.sh
+        env:
+          CC: clang-7
+          CXX: clang++-7
+          CMAKE_FLAGS: '-DCMAKE_C_FLAGS="-fsanitize=address" -DCMAKE_CXX_FLAGS="-fsanitize=address"'
+
+      - name: Unittest
+        run: |
+          ./bin/freeminer --run-unittests
+
+  # Current clang version
+  clang_18:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install deps
+        run: |
+          source ./util/ci/common.sh
+          install_linux_deps clang-18 lldb
+
+      - name: Build
+        run: |
+          ./util/ci/build.sh
+        env:
+          CC: clang-18
+          CXX: clang++-18
+
+      - name: Test
+        run: |
+          ./bin/freeminer --run-unittests
+
+      - name: Integration test + devtest
+        run: |
+          ./util/test_multiplayer.sh
+
+  # Build with prometheus-cpp (server-only)
+  clang_11_prometheus:
+    name: "clang_11 (PROMETHEUS=1)"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install deps
+        run: |
+          source ./util/ci/common.sh
+          install_linux_deps clang-11
+
+      - name: Build prometheus-cpp
+        run: ./util/ci/build_prometheus_cpp.sh
+
+      - name: Build
+        run: |
+          ./util/ci/build.sh
+        env:
+          CC: clang-11
+          CXX: clang++-11
+          CMAKE_FLAGS: "-DENABLE_PROMETHEUS=1 -DBUILD_CLIENT=0 -DENABLE_CURSES=0"
+
+      - name: Test
+        run: |
+          ./bin/freeminerserver --run-unittests
diff --git a/.github/workflows/lua.yml b/.github/workflows/lua.yml
index 39a0a7d36..c754de701 100644
--- a/.github/workflows/lua.yml
+++ b/.github/workflows/lua.yml
@@ -14,27 +14,27 @@ on:
       - '.github/workflows/**.yml'
 
 jobs:
-  # Note that the integration tests are also run build.yml, but only when C++ code is changed.
+  # Note that the integration tests are also run in build.yml, but only when C++ code is changed.
   integration_tests:
     name: "Compile and run multiplayer tests"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 10
     - name: Install deps
       run: |
         source ./util/ci/common.sh
-        install_linux_deps clang-10 gdb libluajit-5.1-dev
+        install_linux_deps clang gdb libluajit-5.1-dev
 
     - name: Build
       run: |
         ./util/ci/build.sh
       env:
-        CC: clang-10
-        CXX: clang++-10
-        CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0"
+        CC: clang
+        CXX: clang++
+        CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0 -DBUILD_UNITTESTS=0"
 
     - name: Integration test + devtest
       run: |
@@ -42,25 +42,21 @@ jobs:
 
   luacheck:
     name: "Builtin Luacheck and Unit Tests"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 10
-    - uses: leafo/gh-actions-lua@v9
+    - uses: leafo/gh-actions-lua@v10
       with:
         luaVersion: "5.1.5"
-    - uses: leafo/gh-actions-luarocks@v4
+    - uses: leafo/gh-actions-luarocks@v4.3.0
 
     - name: Install LuaJIT
-      run: |
-        cd $HOME
-        git clone https://github.com/LuaJIT/LuaJIT/
-        cd LuaJIT
-        make -j$(nproc)
+      run: ./util/ci/build_luajit.sh
 
     - name: Install luarocks tools
       run: |
diff --git a/.github/workflows/lua_api_deploy.yml b/.github/workflows/lua_api_deploy.yml
index 574e3ba3e..e42335a78 100644
--- a/.github/workflows/lua_api_deploy.yml
+++ b/.github/workflows/lua_api_deploy.yml
@@ -16,13 +16,13 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
-
+    if: github.repository == 'minetest/minetest'
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -36,13 +36,13 @@ jobs:
           ./build.sh
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'public/'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8044961af..bfe12fa54 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,6 +8,9 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - 'irr/**.mm' # Objective-C(++)
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - '.github/workflows/macos.yml'
@@ -17,15 +20,19 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - 'irr/**.mm' # Objective-C(++)
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - '.github/workflows/macos.yml'
 
 jobs:
   build:
-    runs-on: macos-latest
+    # use macOS 13 since it's the last one that still runs on x86
+    runs-on: macos-13
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
             submodules: recursive
             fetch-depth: 10
@@ -36,7 +43,6 @@ jobs:
 
       - name: Build
         run: |
-          # git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt)
           mkdir build
           cd build
           cmake .. \
@@ -57,9 +63,11 @@ jobs:
       - name: CPack
         run: |
           cd build
+          rm -rf macos
+          cmake .. -DINSTALL_DEVTEST=FALSE
           cpack -G ZIP -B macos
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: minetest-macos
           path: ./build/macos/*.zip
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 000000000..54524270a
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,150 @@
+name: windows
+
+# build on c/cpp changes or workflow changes
+on:
+  push:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
+      - 'util/buildbot/**'
+      - 'misc/*.manifest'
+      - '.github/workflows/windows.yml'
+  pull_request:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
+      - '**/CMakeLists.txt'
+      - 'cmake/Modules/**'
+      - 'util/buildbot/**'
+      - 'misc/*.manifest'
+      - '.github/workflows/windows.yml'
+
+jobs:
+  mingw:
+    name: "MinGW cross-compiler (${{ matrix.bits }}-bit)"
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        bits: [32, 64]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+      - name: Install compiler
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends gettext wine wine${{ matrix.bits }}
+          sudo ./util/buildbot/download_toolchain.sh /usr
+
+      - name: Build
+        run: |
+           EXISTING_MINETEST_DIR=$PWD \
+           ./util/buildbot/buildwin${{ matrix.bits }}.sh B
+
+      # Check that the resulting binary can run (DLLs etc.)
+      - name: Runtime test
+        run: |
+          dest=$(mktemp -d)
+          unzip -q -d "$dest" B/build/*.zip
+          cd "$dest"/minetest-*-win*
+          wine bin/minetest.exe --version
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: "mingw${{ matrix.bits }}"
+          path: B/build/*.zip
+          if-no-files-found: error
+
+  msvc:
+    name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
+    runs-on: windows-2019
+    env:
+      VCPKG_VERSION: 01f602195983451bc83e72f4214af2cbc495aa94
+      # 2024.05.24
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry boost
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {
+              arch: x86,
+              generator: "-G'Visual Studio 16 2019' -A Win32",
+              vcpkg_triplet: x86-windows
+            }
+          - {
+              arch: x64,
+              generator: "-G'Visual Studio 16 2019' -A x64",
+              vcpkg_triplet: x64-windows
+            }
+        type: [portable]
+#        type: [portable, installer]
+# The installer type is working, but disabled, to save runner jobs.
+# Enable it, when working on the installer.
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 10
+
+      - name: Restore from cache and run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{env.vcpkg_packages}}
+          vcpkgDirectory: '${{ github.workspace }}\vcpkg'
+          appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
+          vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
+          vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
+
+      - name: Minetest CMake
+        run: |
+          cmake ${{matrix.config.generator}}  `
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
+          -DCMAKE_BUILD_TYPE=Release  `
+          -DENABLE_POSTGRESQL=OFF  `
+          -DENABLE_LUAJIT=TRUE  `
+          -DREQUIRE_LUAJIT=TRUE  `
+          -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
+
+      - name: Build Minetest
+        run: cmake --build . --config Release
+
+      - name: Unittests
+        # need this workaround for stdout to work
+        run: |
+          $proc = start .\bin\Release\minetest.exe --run-unittests -NoNewWindow -Wait -PassThru
+          exit $proc.ExitCode
+        continue-on-error: true # FIXME!!
+
+      - name: CPack
+        run: |
+          If ($env:TYPE -eq "installer")
+          {
+            cpack -G WIX -B "$env:GITHUB_WORKSPACE\Package"
+          }
+          ElseIf($env:TYPE -eq "portable")
+          {
+            cpack -G ZIP -B "$env:GITHUB_WORKSPACE\Package"
+          }
+          rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages
+        env:
+          TYPE: ${{matrix.type}}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: msvc-${{ matrix.config.arch }}-${{ matrix.type }}
+          path: .\Package\
+          if-no-files-found: error
diff --git a/.gitignore b/.gitignore
index b5c71870f..0d2167013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 ## Editors and development environments
 *~
+.cmake
+CMakeUserPresets.json
+Testing/*
 *.swp
 *.bak*
 *.orig
@@ -26,7 +29,8 @@ gtags.files
 # Codelite
 *.project
 # Visual Studio Code & plugins
-.vscode/
+.vscode/*
+!.vscode/extensions.json
 build/.cmake/
 # Fleet
 .fleet
@@ -64,6 +68,7 @@ AppDir
 /clientmods/*
 !/clientmods/preview/
 /client/mod_storage/
+/mod_data
 
 ## Configuration/log files
 minetest.conf
@@ -92,11 +97,8 @@ cmake_install.cmake
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
-src/test_config.h
 src/cmake_config.h
 src/cmake_config_githash.h
-src/unittest/test_world/world.mt
-games/devtest/mods/testnodes/textures/testnodes_generated_*.png
 /locale/
 .directory
 *.cbp
@@ -109,7 +111,10 @@ games/devtest/mods/testnodes/textures/testnodes_generated_*.png
 *.iml
 test_config.h
 cmake-build-debug/
+cmake-build-minsizerel/
 cmake-build-release/
+cmake-build-relwithdebinfo/
+cmake-build-default/
 cmake_config.h
 cmake_config_githash.h
 CMakeDoxy*
@@ -164,7 +169,7 @@ build_tools/android_fm/path.cfg
 
 timestamp
 
-# Optional user provided library folder
+# Old irrlichtmt. Still ignored to make bisecting easier.
 lib/irrlichtmt
 
 # Generated mod storage database
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10568e2e1..d4c5525aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,128 +3,14 @@
 # https://gitlab.com/minetest/minetest
 # Pipelines URL: https://gitlab.com/minetest/minetest/pipelines
 
-stages:
-  - build
-  - package
-  - deploy
-
-variables:
-  CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
-
-.build_template:
-  stage: build
-  before_script:
-   - apt-get update
-   - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential gettext git cmake libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev
-  script:
-    - git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt)
-    - mkdir build && cd build
-    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE ..
-    - make -j $(($(nproc) + 1))
-    - make install
-  artifacts:
-    when: on_success
-    expire_in: 1h
-    paths:
-      - artifact/*
-
-##
-## Ubuntu (prerequisite for AppImage build)
-##
-
-build:ubuntu-20.04:
-  extends: .build_template
-  image: ubuntu:focal
-
-##
-## MinGW for Windows
-##
-
-.generic_win_template:
-  image: ubuntu:focal
-  before_script:
-    - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -y wget xz-utils unzip git cmake gettext
-    - wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
-    - tar -xaf mingw.tar.xz -C /usr
-
-.build_win_template:
-  extends: .generic_win_template
-  stage: build
-  artifacts:
-    expire_in: 90 day
-    paths:
-      - minetest-*-win*/*
-
-build:win32:
-  extends: .build_win_template
-  script:
-    - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh build
-    - unzip -q build/build/*.zip
-  variables:
-    WIN_ARCH: "i686"
-
-build:win64:
-  extends: .build_win_template
-  script:
-    - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh build
-    - unzip -q build/build/*.zip
-  variables:
-    WIN_ARCH: "x86_64"
-
-##
-## Docker
-##
-
-package:docker:
-  stage: package
-  image: docker:stable
-  services:
-    - docker:dind
-  before_script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
-  script:
-    - ./util/ci/docker.sh
-
-##
-## Gitlab Pages (Lua API documentation)
-##
 
 pages:
   stage: deploy
   image: python:3.8
-  before_script:
-    - pip install -U -r doc/mkdocs/requirements.txt
   script:
-    - cd doc/mkdocs && ./build.sh
+    - ./misc/make_redirects.sh
   artifacts:
     paths:
       - public
   only:
     - master
-
-##
-## AppImage
-##
-
-package:appimage-client:
-  stage: package
-  image: appimagecrafters/appimage-builder
-  needs:
-    - build:ubuntu-20.04
-  before_script:
-    - apt-get update
-    - apt-get install -y git
-    # Collect files
-    - mkdir AppDir
-    - cp -a artifact/minetest/usr/ AppDir/usr/
-    - cp -a clientmods AppDir/usr/share/minetest
-    # Remove PrefersNonDefaultGPU property due to validation errors
-    - sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop
-  script:
-    - export VERSION=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
-    - appimage-builder --skip-test --recipe misc/AppImageBuilder.yml
-  artifacts:
-    expire_in: 90 day
-    paths:
-      - ./*.AppImage
diff --git a/.luacheckrc b/.luacheckrc
index 54ece656a..fcc04cab3 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -17,6 +17,7 @@ read_globals = {
 	"VoxelArea",
 	"profiler",
 	"Settings",
+	"PerlinNoise", "PerlinNoiseMap",
 
 	string = {fields = {"split", "trim"}},
 	table  = {fields = {"copy", "getn", "indexof", "insert_all"}},
@@ -70,7 +71,6 @@ files["builtin/mainmenu"] = {
 
 	read_globals = {
 		"PLATFORM",
-		"TOUCHSCREEN_GUI",
 	},
 }
 
@@ -81,9 +81,3 @@ files["builtin/common/tests"] = {
 		"assert",
 	},
 }
-
-files["builtin/fstk"] = {
-	read_globals = {
-		"TOUCHSCREEN_GUI",
-	},
-}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..fd9b2c09b
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47c0f092..a34dc99e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
-
-# Set policies up to 3.9 since we want to enable the IPO option
-if(${CMAKE_VERSION} VERSION_LESS 3.9)
-	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-	cmake_policy(VERSION 3.9)
-endif()
+cmake_minimum_required(VERSION 3.12)
 
 # This can be read from ${PROJECT_NAME} after project() is called
 project(freeminer)
@@ -19,7 +12,7 @@ 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 8)
+set(VERSION_MINOR 9)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
@@ -45,6 +38,27 @@ set(BUILD_UNITTESTS TRUE CACHE BOOL "Build unittests")
 set(BUILD_BENCHMARKS FALSE CACHE BOOL "Build benchmarks")
 set(BUILD_DOCUMENTATION TRUE CACHE BOOL "Build documentation")
 
+if(NOT DEVELOPMENT_BUILD)
+set(DEFAULT_ENABLE_LTO TRUE)
+endif()
+# by default don't enable on Debug builds to get faster builds
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(DEFAULT_ENABLE_LTO FALSE)
+endif()
+#### LTO testing list ####
+# - Linux: seems to work always
+# - win32/msvc: works
+# - win32/gcc: fails to link
+# - win32/clang: works
+# - macOS on x86: seems to be fine
+# - 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)
+	set(DEFAULT_ENABLE_LTO FALSE)
+endif()
+set(ENABLE_LTO ${DEFAULT_ENABLE_LTO} CACHE BOOL "Use Link Time Optimization")
+
 set(DEFAULT_RUN_IN_PLACE FALSE)
 set(DEFAULT_RUN_IN_PLACE TRUE)
 if(WIN32)
@@ -160,29 +174,11 @@ if(ANDROID)
 endif()
 
 
-set(IRRLICHTMT_BUILD_DIR "" CACHE PATH "Path to IrrlichtMt build directory.")
 if(NOT NO_BUILD)
-if(ANDROID)
-	# currently manually provided
-elseif(NOT "${IRRLICHTMT_BUILD_DIR}" STREQUAL "")
-	find_package(IrrlichtMt QUIET
-		PATHS "${IRRLICHTMT_BUILD_DIR}"
-		NO_DEFAULT_PATH
-	)
-
-	if(NOT TARGET IrrlichtMt::IrrlichtMt)
-		# find_package() searches certain subdirectories. ${PATH}/cmake is not
-		# the only one, but it is the one where IrrlichtMt is supposed to export
-		# IrrlichtMtConfig.cmake
-		message(FATAL_ERROR "Could not find IrrlichtMtConfig.cmake in ${IRRLICHTMT_BUILD_DIR}/cmake.")
-	endif()
-elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
-	message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
+if(TRUE)
+	message(STATUS "Using imported IrrlichtMt at subdirectory 'irr'")
 	if(BUILD_CLIENT)
-		# tell IrrlichtMt to create a static library
-		#set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library" FORCE)
-		add_subdirectory(lib/irrlichtmt EXCLUDE_FROM_ALL)
-		#unset(BUILD_SHARED_LIBS CACHE)
+		add_subdirectory(irr EXCLUDE_FROM_ALL)
 
 		if(NOT TARGET IrrlichtMt)
 			message(FATAL_ERROR "IrrlichtMt project is missing a CMake target?!")
@@ -190,47 +186,22 @@ elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
 	else()
 		add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
 		set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt/include")
-	endif()
-else()
-	find_package(IrrlichtMt QUIET)
-	if(NOT TARGET IrrlichtMt::IrrlichtMt)
-		string(CONCAT explanation_msg
-			"The Minetest team has forked Irrlicht to make their own customizations. "
-			"It can be found here: https://github.com/minetest/irrlicht\n"
-			"For example use: git clone --depth=1 https://github.com/minetest/irrlicht lib/irrlichtmt\n")
-		if(BUILD_CLIENT)
-			message(FATAL_ERROR "IrrlichtMt is required to build the client, but it was not found.\n${explanation_msg}")
-		endif()
-
-		include(MinetestFindIrrlichtHeaders)
-		if(NOT IRRLICHT_INCLUDE_DIR)
-			message(FATAL_ERROR "IrrlichtMt headers are required to build the server, but none found.\n${explanation_msg}")
-		endif()
-		message(STATUS "Found IrrlichtMt headers: ${IRRLICHT_INCLUDE_DIR}")
-		add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
-		# Note that we can't use target_include_directories() since that doesn't work for IMPORTED targets before CMake 3.11
-		set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${IRRLICHT_INCLUDE_DIR}")
+			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/irr/include")
 	endif()
 endif()
 
-if(ANDROID)
-	# skipped for now
-elseif(BUILD_CLIENT AND TARGET IrrlichtMt::IrrlichtMt)
-	# retrieve version somehow
-	if(NOT IrrlichtMt_VERSION)
-		get_target_property(IrrlichtMt_VERSION IrrlichtMt VERSION)
-	endif()
-	message(STATUS "Found IrrlichtMt ${IrrlichtMt_VERSION}")
-
-	set(TARGET_VER_S 1.9.0mt13)
-	string(REPLACE "mt" "." TARGET_VER ${TARGET_VER_S})
-	if(IrrlichtMt_VERSION VERSION_LESS ${TARGET_VER})
-		message(FATAL_ERROR "At least IrrlichtMt ${TARGET_VER_S} is required to build")
-	elseif(NOT DEVELOPMENT_BUILD AND IrrlichtMt_VERSION VERSION_GREATER ${TARGET_VER})
-		message(FATAL_ERROR "IrrlichtMt ${TARGET_VER_S} is required to build")
+if (ENABLE_LTO OR CMAKE_INTERPROCEDURAL_OPTIMIZATION)
+	include(CheckIPOSupported)
+	check_ipo_supported(RESULT lto_supported OUTPUT lto_output)
+	if(lto_supported)
+		set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+		message(STATUS "LTO/IPO is enabled")
+	else()
+		set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)
+		message(STATUS "LTO/IPO was requested but is not supported by the compiler: ${lto_output}")
 	endif()
+else()
+	message(STATUS "LTO/IPO is not enabled")
 endif()
 endif()
 
@@ -270,7 +241,7 @@ elseif(UNIX) # Linux, BSD etc
 		set(EXAMPLE_CONF_DIR ".")
 		set(MANDIR "unix/man")
 		set(XDG_APPS_DIR "unix/applications")
-		set(APPDATADIR "unix/metainfo")
+		set(METAINFODIR "unix/metainfo")
 		set(ICONDIR "unix/icons")
 		set(LOCALEDIR "locale")
 	else()
@@ -281,7 +252,7 @@ elseif(UNIX) # Linux, BSD etc
 		set(MANDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}")
 		set(EXAMPLE_CONF_DIR ${DOCDIR})
 		set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications")
-		set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/metainfo")
+		set(METAINFODIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/metainfo")
 		set(ICONDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons")
 		set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}")
 	endif()
@@ -376,7 +347,7 @@ install(FILES "freeminer.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/freeminer.6" "doc/freeminerserver.6" DESTINATION "${MANDIR}/man6")
 	install(FILES "misc/org.freeminer.freeminer.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/org.freeminer.freeminer.appdata.xml" DESTINATION "${APPDATADIR}")
+	install(FILES "misc/org.freeminer.freeminer.metainfo.xml" DESTINATION "${METAINFODIR}")
 	install(FILES "misc/freeminer.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 	install(FILES "misc/freeminer-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
@@ -395,8 +366,9 @@ find_package(Lua REQUIRED)
 if(NOT USE_LUAJIT)
 	add_subdirectory(lib/bitop)
 endif()
+add_subdirectory(lib/sha256)
 
-if(BUILD_BENCHMARKS)
+if(BUILD_UNITTESTS OR BUILD_BENCHMARKS)
 	add_subdirectory(lib/catch2)
 endif()
 
diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 000000000..d1e6a4037
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,41 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 12
+  },
+  "configurePresets": [
+    {
+      "name": "Debug",
+      "displayName": "Debug",
+      "description": "Debug preset with debug symbols and no optimizations",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "Release",
+      "displayName": "Release",
+      "description": "Release preset with optimizations and no debug symbols",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "RelWithDebInfo",
+      "displayName": "RelWithDebInfo",
+      "description": "Release with debug symbols",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      }
+    },
+    {
+      "name": "MinSizeRel",
+      "displayName": "MinSizeRel",
+      "description": "Release with minimal code size",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "MinSizeRel"
+      }
+    }
+  ]
+}
diff --git a/Dockerfile b/Dockerfile
index 3205932e6..d3ec1b422 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
-ARG DOCKER_IMAGE=alpine:3.16
+ARG DOCKER_IMAGE=alpine:3.19
 FROM $DOCKER_IMAGE AS dev
 
-ENV IRRLICHT_VERSION master
-ENV SPATIALINDEX_VERSION 1.9.3
 ENV LUAJIT_VERSION v2.1
 
 RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \
@@ -10,7 +8,7 @@ RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \
 		gmp-dev jsoncpp-dev ninja ca-certificates
 
 WORKDIR /usr/src/
-RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
+RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \
 		cd prometheus-cpp && \
 		cmake -B build \
 			-DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -20,7 +18,7 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
 		cmake --build build && \
 		cmake --install build && \
 	cd /usr/src/ && \
-	git clone --recursive https://github.com/libspatialindex/libspatialindex -b ${SPATIALINDEX_VERSION} && \
+	git clone --recursive https://github.com/libspatialindex/libspatialindex && \
 		cd libspatialindex && \
 		cmake -B build \
 			-DCMAKE_INSTALL_PREFIX=/usr/local && \
@@ -29,10 +27,8 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
 	cd /usr/src/ && \
 	git clone --recursive https://luajit.org/git/luajit.git -b ${LUAJIT_VERSION} && \
 		cd luajit && \
-		make && make install && \
-	cd /usr/src/ && \
-	git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \
-		cp -r irrlicht/include /usr/include/irrlichtmt
+		make amalg && make install && \
+	cd /usr/src/
 
 COPY mods /usr/src/minetest/mods
 
@@ -50,6 +46,7 @@ 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
 
 COPY games/default /usr/src/minetest/games/default
@@ -60,14 +57,13 @@ RUN cmake -B build \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SERVER=TRUE \
 		-DENABLE_PROMETHEUS=TRUE \
-		-DBUILD_UNITTESTS=FALSE \
+		-DBUILD_UNITTESTS=FALSE -DBUILD_BENCHMARKS=FALSE \
 		-DBUILD_CLIENT=FALSE \
 		-DRUN_IN_PLACE=0 \
 		-GNinja && \
 	cmake --build build && \
 	cmake --install build
 
-ARG DOCKER_IMAGE=alpine:3.16
 FROM $DOCKER_IMAGE AS runtime
 
 RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \
diff --git a/README.md b/README.md
index 76489dc4f..54d2c194f 100644
--- a/README.md
+++ b/README.md
@@ -175,11 +175,11 @@ Table of Contents
 
 Further documentation
 ----------------------
-- Website: https://minetest.net/
+- Website: https://www.minetest.net/
 - Wiki: https://wiki.minetest.net/
-- Developer wiki: https://dev.minetest.net/
 - Forum: https://forum.minetest.net/
 - GitHub: https://github.com/minetest/minetest/
+- [Developer documentation](doc/developing/)
 - [doc/](doc/) directory of source distribution
 
 Default controls
@@ -277,30 +277,7 @@ Docker
 ------
 
 - [Developing minetestserver with Docker](doc/developing/docker.md)
-
-We provide Minetest server Docker images using the GitLab mirror registry.
-
-Images are built on each commit and available using the following tag scheme:
-
-* `registry.gitlab.com/minetest/minetest/server:latest` (latest build)
-* `registry.gitlab.com/minetest/minetest/server:<branch/tag>` (current branch or current tag)
-* `registry.gitlab.com/minetest/minetest/server:<commit-id>` (current commit id)
-
-If you want to test it on a Docker server you can easily run:
-
-	sudo docker run registry.gitlab.com/minetest/minetest/server:<docker tag>
-
-If you want to use it in a production environment you should use volumes bound to the Docker host
-to persist data and modify the configuration:
-
-	sudo docker create -v /home/minetest/data/:/var/lib/minetest/ -v /home/minetest/conf/:/etc/minetest/ registry.gitlab.com/minetest/minetest/server:master
-
-Data will be written to `/home/minetest/data` on the host, and configuration will be read from `/home/minetest/conf/minetest.conf`.
-
-**Note:** If you don't understand the previous commands please read the official Docker documentation before use.
-
-You can also host your Minetest server inside a Kubernetes cluster. See our example implementation in [`misc/kubernetes.yml`](misc/kubernetes.yml).
-
+- [Running a server with Docker](doc/docker_server.md)
 
 Version scheme
 --------------
diff --git a/android/SDL_Java_RMB_fix.patch b/android/SDL_Java_RMB_fix.patch
new file mode 100644
index 000000000..cc0eb4772
--- /dev/null
+++ b/android/SDL_Java_RMB_fix.patch
@@ -0,0 +1,18 @@
+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
+             }
+         }
+ 
+-        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
++        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
++                /*
++                 * CUSTOM ADDITION FOR MINETEST
++                 * should be upstreamed
++                 */
++                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
+             // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+             // they are ignored here because sending them as mouse input to SDL is messy
+             if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6bacc3d55..fe6c4ab0d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,17 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
-	compileSdkVersion 33
-	buildToolsVersion '33.0.2'
 	ndkVersion "$ndk_version"
 	defaultConfig {
 		applicationId 'net.minetest.minetest'
 		minSdkVersion 21
-		targetSdkVersion 33
+		compileSdk 34
+		targetSdkVersion 34
 		versionName "${versionMajor}.${versionMinor}.${versionPatch}"
 		versionCode project.versionCode
 	}
 
+	buildFeatures {
+		buildConfig true
+	}
+
 	// load properties
 	Properties props = new Properties()
 	def propfile = file('../local.properties')
@@ -49,6 +52,7 @@ android {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
+	namespace 'net.minetest.minetest'
 }
 
 task prepareAssets() {
@@ -75,7 +79,7 @@ task prepareAssets() {
 			from "${projRoot}/client/shaders" into "${assetsFolder}/client/shaders"
 		}
 		copy {
-			from "../native/deps/armeabi-v7a/Irrlicht/Shaders" into "${assetsFolder}/client/shaders/Irrlicht"
+			from "${projRoot}/irr/media/Shaders" into "${assetsFolder}/client/shaders/Irrlicht"
 		}
 		copy {
 			from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts"
@@ -108,6 +112,10 @@ task prepareAssets() {
 preBuild.dependsOn zipAssets
 prepareAssets.dependsOn ':native:getDeps'
 
+clean {
+	delete new File("src/main/assets", "Minetest.zip")
+}
+
 // Map for the version code that gives each ABI a value.
 import com.android.build.OutputFile
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b629610d8..9197b9131 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="net.minetest.minetest"
-	android:installLocation="auto">
+    android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/android/app/src/main/java/net/minetest/minetest/GameActivity.java b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
index caac0637d..b0e301c53 100644
--- a/android/app/src/main/java/net/minetest/minetest/GameActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
@@ -20,8 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 package net.minetest.minetest;
 
-import android.app.NativeActivity;
+import org.libsdl.app.SDLActivity;
+
 import android.content.Intent;
+import android.content.ActivityNotFoundException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -32,6 +34,8 @@ import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.Toast;
+import android.content.res.Configuration;
 
 import androidx.annotation.Keep;
 import androidx.appcompat.app.AlertDialog;
@@ -45,51 +49,59 @@ import java.util.Objects;
 // This annotation prevents the minifier/Proguard from mangling them.
 @Keep
 @SuppressWarnings("unused")
-public class GameActivity extends NativeActivity {
-	static {
-		System.loadLibrary("c++_shared");
-		System.loadLibrary("minetest");
+public class GameActivity extends SDLActivity {
+	@Override
+	protected String getMainSharedObject() {
+		return getContext().getApplicationInfo().nativeLibraryDir + "/libminetest.so";
 	}
 
-	private int messageReturnCode = -1;
+	@Override
+	protected String getMainFunction() {
+		return "SDL_Main";
+	}
+
+	@Override
+	protected String[] getLibraries() {
+		return new String[] {
+			"minetest"
+		};
+	}
+
+	// Prevent SDL from changing orientation settings since we already set the
+	// correct orientation in our AndroidManifest.xml
+	@Override
+	public void setOrientationBis(int w, int h, boolean resizable, String hint) {}
+
+	enum DialogType { TEXT_INPUT, SELECTION_INPUT }
+	enum DialogState { DIALOG_SHOWN, DIALOG_INPUTTED, DIALOG_CANCELED }
+
+	private DialogType lastDialogType = DialogType.TEXT_INPUT;
+	private DialogState inputDialogState = DialogState.DIALOG_CANCELED;
 	private String messageReturnValue = "";
+	private int selectionReturnValue = 0;
+
+	private native void saveSettings();
 
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+	protected void onStop() {
+		super.onStop();
+		// Avoid losing setting changes in case the app is onDestroy()ed later.
+		// Saving stuff in onStop() is recommended in the Android activity
+		// lifecycle documentation.
+		saveSettings();
 	}
 
-	private void makeFullScreen() {
-		this.getWindow().getDecorView().setSystemUiVisibility(
-				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-				View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-				View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+	public void showTextInputDialog(String hint, String current, int editType) {
+		runOnUiThread(() -> showTextInputDialogUI(hint, current, editType));
 	}
 
-	@Override
-	public void onWindowFocusChanged(boolean hasFocus) {
-		super.onWindowFocusChanged(hasFocus);
-		if (hasFocus)
-			makeFullScreen();
+	public void showSelectionInputDialog(String[] optionList, int selectedIdx) {
+		runOnUiThread(() -> showSelectionInputDialogUI(optionList, selectedIdx));
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-		makeFullScreen();
-	}
-
-	@Override
-	public void onBackPressed() {
-		// Ignore the back press so Minetest can handle it
-	}
-
-	public void showDialog(String acceptButton, String hint, String current, int editType) {
-		runOnUiThread(() -> showDialogUI(hint, current, editType));
-	}
-
-	private void showDialogUI(String hint, String current, int editType) {
+	private void showTextInputDialogUI(String hint, String current, int editType) {
+		lastDialogType = DialogType.TEXT_INPUT;
+		inputDialogState = DialogState.DIALOG_SHOWN;
 		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		LinearLayout container = new LinearLayout(this);
 		container.setOrientation(LinearLayout.VERTICAL);
@@ -114,7 +126,7 @@ public class GameActivity extends NativeActivity {
 			// For multi-line, do not submit the text after pressing Enter key
 			if (keyCode == KeyEvent.KEYCODE_ENTER && editType != 1) {
 				imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
-				messageReturnCode = 0;
+				inputDialogState = DialogState.DIALOG_INPUTTED;
 				messageReturnValue = editText.getText().toString();
 				alertDialog.dismiss();
 				return true;
@@ -128,29 +140,55 @@ public class GameActivity extends NativeActivity {
 			doneButton.setText(R.string.ime_dialog_done);
 			doneButton.setOnClickListener((view -> {
 				imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
-				messageReturnCode = 0;
+				inputDialogState = DialogState.DIALOG_INPUTTED;
 				messageReturnValue = editText.getText().toString();
 				alertDialog.dismiss();
 			}));
 		}
 		alertDialog.setOnCancelListener(dialog -> {
 			getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+			inputDialogState = DialogState.DIALOG_CANCELED;
 			messageReturnValue = current;
-			messageReturnCode = -1;
 		});
 		alertDialog.show();
 		editText.requestFocusTryShow();
 	}
 
-	public int getDialogState() {
-		return messageReturnCode;
+	public void showSelectionInputDialogUI(String[] optionList, int selectedIdx) {
+		lastDialogType = DialogType.SELECTION_INPUT;
+		inputDialogState = DialogState.DIALOG_SHOWN;
+		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setSingleChoiceItems(optionList, selectedIdx, (dialog, selection) -> {
+			inputDialogState = DialogState.DIALOG_INPUTTED;
+			selectionReturnValue = selection;
+			dialog.dismiss();
+		});
+		builder.setOnCancelListener(dialog -> {
+			inputDialogState = DialogState.DIALOG_CANCELED;
+			selectionReturnValue = selectedIdx;
+		});
+		AlertDialog alertDialog = builder.create();
+		alertDialog.show();
 	}
 
-	public String getDialogValue() {
-		messageReturnCode = -1;
+	public int getLastDialogType() {
+		return lastDialogType.ordinal();
+	}
+
+	public int getInputDialogState() {
+		return inputDialogState.ordinal();
+	}
+
+	public String getDialogMessage() {
+		inputDialogState = DialogState.DIALOG_CANCELED;
 		return messageReturnValue;
 	}
 
+	public int getDialogSelection() {
+		inputDialogState = DialogState.DIALOG_CANCELED;
+		return selectionReturnValue;
+	}
+
 	public float getDensity() {
 		return getResources().getDisplayMetrics().density;
 	}
@@ -165,7 +203,11 @@ public class GameActivity extends NativeActivity {
 
 	public void openURI(String uri) {
 		Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
-		startActivity(browserIntent);
+		try {
+			startActivity(browserIntent);
+		} catch (ActivityNotFoundException e) {
+			runOnUiThread(() -> Toast.makeText(this, R.string.no_web_browser, Toast.LENGTH_SHORT).show());
+		}
 	}
 
 	public String getUserDataPath() {
@@ -217,4 +259,8 @@ public class GameActivity extends NativeActivity {
 
 		return langCode;
 	}
+
+	public boolean hasPhysicalKeyboard() {
+		return getContext().getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
+	}
 }
diff --git a/android/app/src/main/java/net/minetest/minetest/MainActivity.java b/android/app/src/main/java/net/minetest/minetest/MainActivity.java
index d942e93e3..7735e8b3d 100644
--- a/android/app/src/main/java/net/minetest/minetest/MainActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/MainActivity.java
@@ -20,23 +20,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 package net.minetest.minetest;
 
+import android.annotation.SuppressLint;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatActivity;
 
 import static net.minetest.minetest.UnzipService.*;
 
 public class MainActivity extends AppCompatActivity {
+	public static final String NOTIFICATION_CHANNEL_ID = "Minetest channel";
+
 	private final static int versionCode = BuildConfig.VERSION_CODE;
 	private static final String SETTINGS = "MinetestSettings";
 	private static final String TAG_VERSION_CODE = "versionCode";
@@ -77,16 +84,27 @@ public class MainActivity extends AppCompatActivity {
 		}
 	};
 
+	@SuppressLint("UnspecifiedRegisterReceiverFlag")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
+
 		IntentFilter filter = new IntentFilter(ACTION_UPDATE);
-		registerReceiver(myReceiver, filter);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			registerReceiver(myReceiver, filter, RECEIVER_NOT_EXPORTED);
+		} else {
+			registerReceiver(myReceiver, filter);
+		}
+
 		mProgressBar = findViewById(R.id.progressBar);
 		mTextView = findViewById(R.id.textView);
 		sharedPreferences = getSharedPreferences(SETTINGS, Context.MODE_PRIVATE);
+
 		checkAppVersion();
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+			createNotificationChannel();
 	}
 
 	private void checkAppVersion() {
@@ -114,6 +132,28 @@ public class MainActivity extends AppCompatActivity {
 		startActivity(intent);
 	}
 
+	@RequiresApi(Build.VERSION_CODES.O)
+	private void createNotificationChannel() {
+		NotificationManager notifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		if (notifyManager == null)
+			return;
+
+		NotificationChannel notifyChannel = new NotificationChannel(
+			NOTIFICATION_CHANNEL_ID,
+			getString(R.string.notification_channel_name),
+			NotificationManager.IMPORTANCE_LOW
+		);
+		notifyChannel.setDescription(getString(R.string.notification_channel_description));
+		// Configure the notification channel without sound set
+		notifyChannel.setSound(null, null);
+		notifyChannel.enableLights(false);
+		notifyChannel.enableVibration(false);
+
+		// It is fine to always create the notification channel because creating a channel
+		// with the same ID is the same as overriding it (only its name and description).
+		notifyManager.createNotificationChannel(notifyChannel);
+	}
+
 	@Override
 	public void onBackPressed() {
 		// Prevent abrupt interruption when copy game files from assets
diff --git a/android/app/src/main/java/net/minetest/minetest/UnzipService.java b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
index 8c293fa89..261eebb8e 100644
--- a/android/app/src/main/java/net/minetest/minetest/UnzipService.java
+++ b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
@@ -22,7 +22,6 @@ package net.minetest.minetest;
 
 import android.app.IntentService;
 import android.app.Notification;
-import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -58,9 +57,11 @@ public class UnzipService extends IntentService {
 	private String failureMessage;
 
 	private static boolean isRunning = false;
+
 	public static synchronized boolean getIsRunning() {
 		return isRunning;
 	}
+
 	private static synchronized void setIsRunning(boolean v) {
 		isRunning = v;
 	}
@@ -99,28 +100,13 @@ public class UnzipService extends IntentService {
 		}
 	}
 
+	@NonNull
 	private Notification.Builder createNotification() {
-		String name = "net.minetest.minetest";
-		String channelId = "Minetest channel";
-		String description = "notifications from Minetest";
 		Notification.Builder builder;
 		if (mNotifyManager == null)
 			mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			int importance = NotificationManager.IMPORTANCE_LOW;
-			NotificationChannel mChannel = null;
-			if (mNotifyManager != null)
-				mChannel = mNotifyManager.getNotificationChannel(channelId);
-			if (mChannel == null) {
-				mChannel = new NotificationChannel(channelId, name, importance);
-				mChannel.setDescription(description);
-				// Configure the notification channel, NO SOUND
-				mChannel.setSound(null, null);
-				mChannel.enableLights(false);
-				mChannel.enableVibration(false);
-				mNotifyManager.createNotificationChannel(mChannel);
-			}
-			builder = new Notification.Builder(this, channelId);
+			builder = new Notification.Builder(this, MainActivity.NOTIFICATION_CHANNEL_ID);
 		} else {
 			builder = new Notification.Builder(this);
 		}
@@ -135,9 +121,9 @@ public class UnzipService extends IntentService {
 		PendingIntent intent = PendingIntent.getActivity(this, 0,
 			notificationIntent, pendingIntentFlag);
 
-		builder.setContentTitle(getString(R.string.notification_title))
+		builder.setContentTitle(getString(R.string.unzip_notification_title))
 				.setSmallIcon(R.mipmap.ic_launcher)
-				.setContentText(getString(R.string.notification_description))
+				.setContentText(getString(R.string.unzip_notification_description))
 				.setContentIntent(intent)
 				.setOngoing(true)
 				.setProgress(0, 0, true);
@@ -198,8 +184,9 @@ public class UnzipService extends IntentService {
 		}
 	}
 
-	private void publishProgress(@Nullable  Notification.Builder notificationBuilder, @StringRes int message, int progress) {
+	private void publishProgress(@Nullable Notification.Builder notificationBuilder, @StringRes int message, int progress) {
 		Intent intentUpdate = new Intent(ACTION_UPDATE);
+		intentUpdate.setPackage(getPackageName());
 		intentUpdate.putExtra(ACTION_PROGRESS, progress);
 		intentUpdate.putExtra(ACTION_PROGRESS_MESSAGE, message);
 		if (!isSuccess)
diff --git a/android/app/src/main/java/org/libsdl/app/HIDDevice.java b/android/app/src/main/java/org/libsdl/app/HIDDevice.java
new file mode 100644
index 000000000..955df5d14
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/HIDDevice.java
@@ -0,0 +1,22 @@
+package org.libsdl.app;
+
+import android.hardware.usb.UsbDevice;
+
+interface HIDDevice
+{
+    public int getId();
+    public int getVendorId();
+    public int getProductId();
+    public String getSerialNumber();
+    public int getVersion();
+    public String getManufacturerName();
+    public String getProductName();
+    public UsbDevice getDevice();
+    public boolean open();
+    public int sendFeatureReport(byte[] report);
+    public int sendOutputReport(byte[] report);
+    public boolean getFeatureReport(byte[] report);
+    public void setFrozen(boolean frozen);
+    public void close();
+    public void shutdown();
+}
diff --git a/android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
new file mode 100644
index 000000000..ee5521fd5
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
@@ -0,0 +1,650 @@
+package org.libsdl.app;
+
+import android.content.Context;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothGattService;
+import android.hardware.usb.UsbDevice;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.os.*;
+
+//import com.android.internal.util.HexDump;
+
+import java.lang.Runnable;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.UUID;
+
+class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+    private HIDDeviceManager mManager;
+    private BluetoothDevice mDevice;
+    private int mDeviceId;
+    private BluetoothGatt mGatt;
+    private boolean mIsRegistered = false;
+    private boolean mIsConnected = false;
+    private boolean mIsChromebook = false;
+    private boolean mIsReconnecting = false;
+    private boolean mFrozen = false;
+    private LinkedList<GattOperation> mOperations;
+    GattOperation mCurrentOperation = null;
+    private Handler mHandler;
+
+    private static final int TRANSPORT_AUTO = 0;
+    private static final int TRANSPORT_BREDR = 1;
+    private static final int TRANSPORT_LE = 2;
+
+    private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;
+
+    static public final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
+    static public final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
+    static public final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
+    static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };
+
+    static class GattOperation {
+        private enum Operation {
+            CHR_READ,
+            CHR_WRITE,
+            ENABLE_NOTIFICATION
+        }
+
+        Operation mOp;
+        UUID mUuid;
+        byte[] mValue;
+        BluetoothGatt mGatt;
+        boolean mResult = true;
+
+        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+        }
+
+        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value) {
+            mGatt = gatt;
+            mOp = operation;
+            mUuid = uuid;
+            mValue = value;
+        }
+
+        public void run() {
+            // This is executed in main thread
+            BluetoothGattCharacteristic chr;
+
+            switch (mOp) {
+                case CHR_READ:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Reading characteristic " + chr.getUuid());
+                    if (!mGatt.readCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to read characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case CHR_WRITE:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing characteristic " + chr.getUuid() + " value=" + HexDump.toHexString(value));
+                    chr.setValue(mValue);
+                    if (!mGatt.writeCharacteristic(chr)) {
+                        Log.e(TAG, "Unable to write characteristic " + mUuid.toString());
+                        mResult = false;
+                        break;
+                    }
+                    mResult = true;
+                    break;
+                case ENABLE_NOTIFICATION:
+                    chr = getCharacteristic(mUuid);
+                    //Log.v(TAG, "Writing descriptor of " + chr.getUuid());
+                    if (chr != null) {
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            int properties = chr.getProperties();
+                            byte[] value;
+                            if ((properties & BluetoothGattCharacteristic.PROPERTY_NOTIFY) == BluetoothGattCharacteristic.PROPERTY_NOTIFY) {
+                                value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE;
+                            } else if ((properties & BluetoothGattCharacteristic.PROPERTY_INDICATE) == BluetoothGattCharacteristic.PROPERTY_INDICATE) {
+                                value = BluetoothGattDescriptor.ENABLE_INDICATION_VALUE;
+                            } else {
+                                Log.e(TAG, "Unable to start notifications on input characteristic");
+                                mResult = false;
+                                return;
+                            }
+
+                            mGatt.setCharacteristicNotification(chr, true);
+                            cccd.setValue(value);
+                            if (!mGatt.writeDescriptor(cccd)) {
+                                Log.e(TAG, "Unable to write descriptor " + mUuid.toString());
+                                mResult = false;
+                                return;
+                            }
+                            mResult = true;
+                        }
+                    }
+            }
+        }
+
+        public boolean finish() {
+            return mResult;
+        }
+
+        private BluetoothGattCharacteristic getCharacteristic(UUID uuid) {
+            BluetoothGattService valveService = mGatt.getService(steamControllerService);
+            if (valveService == null)
+                return null;
+            return valveService.getCharacteristic(uuid);
+        }
+
+        static public GattOperation readCharacteristic(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.CHR_READ, uuid);
+        }
+
+        static public GattOperation writeCharacteristic(BluetoothGatt gatt, UUID uuid, byte[] value) {
+            return new GattOperation(gatt, Operation.CHR_WRITE, uuid, value);
+        }
+
+        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid) {
+            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid);
+        }
+    }
+
+    public HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
+        mManager = manager;
+        mDevice = device;
+        mDeviceId = mManager.getDeviceIDForIdentifier(getIdentifier());
+        mIsRegistered = false;
+        mIsChromebook = mManager.getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+        mOperations = new LinkedList<GattOperation>();
+        mHandler = new Handler(Looper.getMainLooper());
+
+        mGatt = connectGatt();
+        // final HIDDeviceBLESteamController finalThis = this;
+        // mHandler.postDelayed(new Runnable() {
+        //     @Override
+        //     public void run() {
+        //         finalThis.checkConnectionForChromebookIssue();
+        //     }
+        // }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    public String getIdentifier() {
+        return String.format("SteamController.%s", mDevice.getAddress());
+    }
+
+    public BluetoothGatt getGatt() {
+        return mGatt;
+    }
+
+    // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
+    // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
+    private BluetoothGatt connectGatt(boolean managed) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
+            try {
+                return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
+            } catch (Exception e) {
+                return mDevice.connectGatt(mManager.getContext(), managed, this);
+            }
+        } else {
+            return mDevice.connectGatt(mManager.getContext(), managed, this);
+        }
+    }
+
+    private BluetoothGatt connectGatt() {
+        return connectGatt(false);
+    }
+
+    protected int getConnectionState() {
+
+        Context context = mManager.getContext();
+        if (context == null) {
+            // We are lacking any context to get our Bluetooth information.  We'll just assume disconnected.
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        BluetoothManager btManager = (BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (btManager == null) {
+            // This device doesn't support Bluetooth.  We should never be here, because how did
+            // we instantiate a device to start with?
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+
+        return btManager.getConnectionState(mDevice, BluetoothProfile.GATT);
+    }
+
+    public void reconnect() {
+
+        if (getConnectionState() != BluetoothProfile.STATE_CONNECTED) {
+            mGatt.disconnect();
+            mGatt = connectGatt();
+        }
+
+    }
+
+    protected void checkConnectionForChromebookIssue() {
+        if (!mIsChromebook) {
+            // We only do this on Chromebooks, because otherwise it's really annoying to just attempt
+            // over and over.
+            return;
+        }
+
+        int connectionState = getConnectionState();
+
+        switch (connectionState) {
+            case BluetoothProfile.STATE_CONNECTED:
+                if (!mIsConnected) {
+                    // We are in the Bad Chromebook Place.  We can force a disconnect
+                    // to try to recover.
+                    Log.v(TAG, "Chromebook: We are in a very bad state; the controller shows as connected in the underlying Bluetooth layer, but we never received a callback.  Forcing a reconnect.");
+                    mIsReconnecting = true;
+                    mGatt.disconnect();
+                    mGatt = connectGatt(false);
+                    break;
+                }
+                else if (!isRegistered()) {
+                    if (mGatt.getServices().size() > 0) {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never got our registration.  Trying to recover.");
+                        probeService(this);
+                    }
+                    else {
+                        Log.v(TAG, "Chromebook: We are connected to a controller, but never discovered services.  Trying to recover.");
+                        mIsReconnecting = true;
+                        mGatt.disconnect();
+                        mGatt = connectGatt(false);
+                        break;
+                    }
+                }
+                else {
+                    Log.v(TAG, "Chromebook: We are connected, and registered.  Everything's good!");
+                    return;
+                }
+                break;
+
+            case BluetoothProfile.STATE_DISCONNECTED:
+                Log.v(TAG, "Chromebook: We have either been disconnected, or the Chromebook BtGatt.ContextMap bug has bitten us.  Attempting a disconnect/reconnect, but we may not be able to recover.");
+
+                mIsReconnecting = true;
+                mGatt.disconnect();
+                mGatt = connectGatt(false);
+                break;
+
+            case BluetoothProfile.STATE_CONNECTING:
+                Log.v(TAG, "Chromebook: We're still trying to connect.  Waiting a bit longer.");
+                break;
+        }
+
+        final HIDDeviceBLESteamController finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.checkConnectionForChromebookIssue();
+            }
+        }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
+    }
+
+    private boolean isRegistered() {
+        return mIsRegistered;
+    }
+
+    private void setRegistered() {
+        mIsRegistered = true;
+    }
+
+    private boolean probeService(HIDDeviceBLESteamController controller) {
+
+        if (isRegistered()) {
+            return true;
+        }
+
+        if (!mIsConnected) {
+            return false;
+        }
+
+        Log.v(TAG, "probeService controller=" + controller);
+
+        for (BluetoothGattService service : mGatt.getServices()) {
+            if (service.getUuid().equals(steamControllerService)) {
+                Log.v(TAG, "Found Valve steam controller service " + service.getUuid());
+
+                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
+                    if (chr.getUuid().equals(inputCharacteristic)) {
+                        Log.v(TAG, "Found input characteristic");
+                        // Start notifications
+                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+                        if (cccd != null) {
+                            enableNotification(chr.getUuid());
+                        }
+                    }
+                }
+                return true;
+            }
+        }
+
+        if ((mGatt.getServices().size() == 0) && mIsChromebook && !mIsReconnecting) {
+            Log.e(TAG, "Chromebook: Discovered services were empty; this almost certainly means the BtGatt.ContextMap bug has bitten us.");
+            mIsConnected = false;
+            mIsReconnecting = true;
+            mGatt.disconnect();
+            mGatt = connectGatt(false);
+        }
+
+        return false;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private void finishCurrentGattOperation() {
+        GattOperation op = null;
+        synchronized (mOperations) {
+            if (mCurrentOperation != null) {
+                op = mCurrentOperation;
+                mCurrentOperation = null;
+            }
+        }
+        if (op != null) {
+            boolean result = op.finish(); // TODO: Maybe in main thread as well?
+
+            // Our operation failed, let's add it back to the beginning of our queue.
+            if (!result) {
+                mOperations.addFirst(op);
+            }
+        }
+        executeNextGattOperation();
+    }
+
+    private void executeNextGattOperation() {
+        synchronized (mOperations) {
+            if (mCurrentOperation != null)
+                return;
+
+            if (mOperations.isEmpty())
+                return;
+
+            mCurrentOperation = mOperations.removeFirst();
+        }
+
+        // Run in main thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (mOperations) {
+                    if (mCurrentOperation == null) {
+                        Log.e(TAG, "Current operation null in executor?");
+                        return;
+                    }
+
+                    mCurrentOperation.run();
+                    // now wait for the GATT callback and when it comes, finish this operation
+                }
+            }
+        });
+    }
+
+    private void queueGattOperation(GattOperation op) {
+        synchronized (mOperations) {
+            mOperations.add(op);
+        }
+        executeNextGattOperation();
+    }
+
+    private void enableNotification(UUID chrUuid) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid);
+        queueGattOperation(op);
+    }
+
+    public void writeCharacteristic(UUID uuid, byte[] value) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.writeCharacteristic(mGatt, uuid, value);
+        queueGattOperation(op);
+    }
+
+    public void readCharacteristic(UUID uuid) {
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.readCharacteristic(mGatt, uuid);
+        queueGattOperation(op);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////  BluetoothGattCallback overridden methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public void onConnectionStateChange(BluetoothGatt g, int status, int newState) {
+        //Log.v(TAG, "onConnectionStateChange status=" + status + " newState=" + newState);
+        mIsReconnecting = false;
+        if (newState == 2) {
+            mIsConnected = true;
+            // Run directly, without GattOperation
+            if (!isRegistered()) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mGatt.discoverServices();
+                    }
+                });
+            }
+        }
+        else if (newState == 0) {
+            mIsConnected = false;
+        }
+
+        // Disconnection is handled in SteamLink using the ACTION_ACL_DISCONNECTED Intent.
+    }
+
+    public void onServicesDiscovered(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onServicesDiscovered status=" + status);
+        if (status == 0) {
+            if (gatt.getServices().size() == 0) {
+                Log.v(TAG, "onServicesDiscovered returned zero services; something has gone horribly wrong down in Android's Bluetooth stack.");
+                mIsReconnecting = true;
+                mIsConnected = false;
+                gatt.disconnect();
+                mGatt = connectGatt(false);
+            }
+            else {
+                probeService(this);
+            }
+        }
+    }
+
+    public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicRead status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic) && !mFrozen) {
+            mManager.HIDDeviceFeatureReport(getId(), characteristic.getValue());
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        //Log.v(TAG, "onCharacteristicWrite status=" + status + " uuid=" + characteristic.getUuid());
+
+        if (characteristic.getUuid().equals(reportCharacteristic)) {
+            // Only register controller with the native side once it has been fully configured
+            if (!isRegistered()) {
+                Log.v(TAG, "Registering Steam Controller with ID: " + getId());
+                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0);
+                setRegistered();
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+    // Enable this for verbose logging of controller input reports
+        //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));
+
+        if (characteristic.getUuid().equals(inputCharacteristic) && !mFrozen) {
+            mManager.HIDDeviceInputReport(getId(), characteristic.getValue());
+        }
+    }
+
+    public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        //Log.v(TAG, "onDescriptorRead status=" + status);
+    }
+
+    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+        BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
+        //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());
+
+        if (chr.getUuid().equals(inputCharacteristic)) {
+            boolean hasWrittenInputDescriptor = true;
+            BluetoothGattCharacteristic reportChr = chr.getService().getCharacteristic(reportCharacteristic);
+            if (reportChr != null) {
+                Log.v(TAG, "Writing report characteristic to enter valve mode");
+                reportChr.setValue(enterValveMode);
+                gatt.writeCharacteristic(reportChr);
+            }
+        }
+
+        finishCurrentGattOperation();
+    }
+
+    public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
+        //Log.v(TAG, "onReliableWriteCompleted status=" + status);
+    }
+
+    public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
+        //Log.v(TAG, "onReadRemoteRssi status=" + status);
+    }
+
+    public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+        //Log.v(TAG, "onMtuChanged status=" + status);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////// Public API
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        // Valve Corporation
+        final int VALVE_USB_VID = 0x28DE;
+        return VALVE_USB_VID;
+    }
+
+    @Override
+    public int getProductId() {
+        // We don't have an easy way to query from the Bluetooth device, but we know what it is
+        final int D0G_BLE2_PID = 0x1106;
+        return D0G_BLE2_PID;
+    }
+
+    @Override
+    public String getSerialNumber() {
+        // This will be read later via feature report by Steam
+        return "12345";
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        return "Valve Corporation";
+    }
+
+    @Override
+    public String getProductName() {
+        return "Steam Controller";
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return null;
+    }
+
+    @Override
+    public boolean open() {
+        return true;
+    }
+
+    @Override
+    public int sendFeatureReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted sendFeatureReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return -1;
+        }
+
+        // We need to skip the first byte, as that doesn't go over the air
+        byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
+        //Log.v(TAG, "sendFeatureReport " + HexDump.dumpHexString(actual_report));
+        writeCharacteristic(reportCharacteristic, actual_report);
+        return report.length;
+    }
+
+    @Override
+    public int sendOutputReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted sendOutputReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return -1;
+        }
+
+        //Log.v(TAG, "sendFeatureReport " + HexDump.dumpHexString(report));
+        writeCharacteristic(reportCharacteristic, report);
+        return report.length;
+    }
+
+    @Override
+    public boolean getFeatureReport(byte[] report) {
+        if (!isRegistered()) {
+            Log.e(TAG, "Attempted getFeatureReport before Steam Controller is registered!");
+            if (mIsConnected) {
+                probeService(this);
+            }
+            return false;
+        }
+
+        //Log.v(TAG, "getFeatureReport");
+        readCharacteristic(reportCharacteristic);
+        return true;
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+
+        BluetoothGatt g = mGatt;
+        if (g != null) {
+            g.disconnect();
+            g.close();
+            mGatt = null;
+        }
+        mManager = null;
+        mIsRegistered = false;
+        mIsConnected = false;
+        mOperations.clear();
+    }
+
+}
+
diff --git a/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
new file mode 100644
index 000000000..e7281fdf2
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -0,0 +1,691 @@
+package org.libsdl.app;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
+import android.os.Build;
+import android.util.Log;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.hardware.usb.*;
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class HIDDeviceManager {
+    private static final String TAG = "hidapi";
+    private static final String ACTION_USB_PERMISSION = "org.libsdl.app.USB_PERMISSION";
+
+    private static HIDDeviceManager sManager;
+    private static int sManagerRefCount = 0;
+
+    public static HIDDeviceManager acquire(Context context) {
+        if (sManagerRefCount == 0) {
+            sManager = new HIDDeviceManager(context);
+        }
+        ++sManagerRefCount;
+        return sManager;
+    }
+
+    public static void release(HIDDeviceManager manager) {
+        if (manager == sManager) {
+            --sManagerRefCount;
+            if (sManagerRefCount == 0) {
+                sManager.close();
+                sManager = null;
+            }
+        }
+    }
+
+    private Context mContext;
+    private HashMap<Integer, HIDDevice> mDevicesById = new HashMap<Integer, HIDDevice>();
+    private HashMap<BluetoothDevice, HIDDeviceBLESteamController> mBluetoothDevices = new HashMap<BluetoothDevice, HIDDeviceBLESteamController>();
+    private int mNextDeviceId = 0;
+    private SharedPreferences mSharedPreferences = null;
+    private boolean mIsChromebook = false;
+    private UsbManager mUsbManager;
+    private Handler mHandler;
+    private BluetoothManager mBluetoothManager;
+    private List<BluetoothDevice> mLastBluetoothDevices;
+
+    private final BroadcastReceiver mUsbBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceAttached(usbDevice);
+            } else if (action.equals(UsbManager.ACTION_USB_DEVICE_DETACHED)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDeviceDetached(usbDevice);
+            } else if (action.equals(HIDDeviceManager.ACTION_USB_PERMISSION)) {
+                UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                handleUsbDevicePermission(usbDevice, intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false));
+            }
+        }
+    };
+
+    private final BroadcastReceiver mBluetoothBroadcast = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            // Bluetooth device was connected. If it was a Steam Controller, handle it
+            if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device connected: " + device);
+
+                if (isSteamController(device)) {
+                    connectBluetoothDevice(device);
+                }
+            }
+
+            // Bluetooth device was disconnected, remove from controller manager (if any)
+            if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                Log.d(TAG, "Bluetooth device disconnected: " + device);
+
+                disconnectBluetoothDevice(device);
+            }
+        }
+    };
+
+    private HIDDeviceManager(final Context context) {
+        mContext = context;
+
+        HIDDeviceRegisterCallback();
+
+        mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
+        mIsChromebook = mContext.getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+
+//        if (shouldClear) {
+//            SharedPreferences.Editor spedit = mSharedPreferences.edit();
+//            spedit.clear();
+//            spedit.commit();
+//        }
+//        else
+        {
+            mNextDeviceId = mSharedPreferences.getInt("next_device_id", 0);
+        }
+    }
+
+    public Context getContext() {
+        return mContext;
+    }
+
+    public int getDeviceIDForIdentifier(String identifier) {
+        SharedPreferences.Editor spedit = mSharedPreferences.edit();
+
+        int result = mSharedPreferences.getInt(identifier, 0);
+        if (result == 0) {
+            result = mNextDeviceId++;
+            spedit.putInt("next_device_id", mNextDeviceId);
+        }
+
+        spedit.putInt(identifier, result);
+        spedit.commit();
+        return result;
+    }
+
+    private void initializeUSB() {
+        mUsbManager = (UsbManager)mContext.getSystemService(Context.USB_SERVICE);
+        if (mUsbManager == null) {
+            return;
+        }
+
+        /*
+        // Logging
+        for (UsbDevice device : mUsbManager.getDeviceList().values()) {
+            Log.i(TAG,"Path: " + device.getDeviceName());
+            Log.i(TAG,"Manufacturer: " + device.getManufacturerName());
+            Log.i(TAG,"Product: " + device.getProductName());
+            Log.i(TAG,"ID: " + device.getDeviceId());
+            Log.i(TAG,"Class: " + device.getDeviceClass());
+            Log.i(TAG,"Protocol: " + device.getDeviceProtocol());
+            Log.i(TAG,"Vendor ID " + device.getVendorId());
+            Log.i(TAG,"Product ID: " + device.getProductId());
+            Log.i(TAG,"Interface count: " + device.getInterfaceCount());
+            Log.i(TAG,"---------------------------------------");
+
+            // Get interface details
+            for (int index = 0; index < device.getInterfaceCount(); index++) {
+                UsbInterface mUsbInterface = device.getInterface(index);
+                Log.i(TAG,"  *****     *****");
+                Log.i(TAG,"  Interface index: " + index);
+                Log.i(TAG,"  Interface ID: " + mUsbInterface.getId());
+                Log.i(TAG,"  Interface class: " + mUsbInterface.getInterfaceClass());
+                Log.i(TAG,"  Interface subclass: " + mUsbInterface.getInterfaceSubclass());
+                Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
+                Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
+
+                // Get endpoint details
+                for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
+                {
+                    UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
+                    Log.i(TAG,"    ++++   ++++   ++++");
+                    Log.i(TAG,"    Endpoint index: " + epi);
+                    Log.i(TAG,"    Attributes: " + mEndpoint.getAttributes());
+                    Log.i(TAG,"    Direction: " + mEndpoint.getDirection());
+                    Log.i(TAG,"    Number: " + mEndpoint.getEndpointNumber());
+                    Log.i(TAG,"    Interval: " + mEndpoint.getInterval());
+                    Log.i(TAG,"    Packet size: " + mEndpoint.getMaxPacketSize());
+                    Log.i(TAG,"    Type: " + mEndpoint.getType());
+                }
+            }
+        }
+        Log.i(TAG," No more devices connected.");
+        */
+
+        // Register for USB broadcasts and permission completions
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+        filter.addAction(HIDDeviceManager.ACTION_USB_PERMISSION);
+        mContext.registerReceiver(mUsbBroadcast, filter);
+
+        for (UsbDevice usbDevice : mUsbManager.getDeviceList().values()) {
+            handleUsbDeviceAttached(usbDevice);
+        }
+    }
+
+    UsbManager getUSBManager() {
+        return mUsbManager;
+    }
+
+    private void shutdownUSB() {
+        try {
+            mContext.unregisterReceiver(mUsbBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    private boolean isHIDDeviceInterface(UsbDevice usbDevice, UsbInterface usbInterface) {
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_HID) {
+            return true;
+        }
+        if (isXbox360Controller(usbDevice, usbInterface) || isXboxOneController(usbDevice, usbInterface)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isXbox360Controller(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB360_IFACE_SUBCLASS = 93;
+        final int XB360_IFACE_PROTOCOL = 1; // Wired
+        final int XB360W_IFACE_PROTOCOL = 129; // Wireless
+        final int[] SUPPORTED_VENDORS = {
+            0x0079, // GPD Win 2
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x046d, // Logitech
+            0x056e, // Elecom
+            0x06a3, // Saitek
+            0x0738, // Mad Catz
+            0x07ff, // Mad Catz
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x1038, // SteelSeries
+            0x11c9, // Nacon
+            0x12ab, // Unknown
+            0x1430, // RedOctane
+            0x146b, // BigBen
+            0x1532, // Razer Sabertooth
+            0x15e4, // Numark
+            0x162e, // Joytech
+            0x1689, // Razer Onza
+            0x1949, // Lab126, Inc.
+            0x1bad, // Harmonix
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
+        };
+
+        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB360_IFACE_SUBCLASS &&
+            (usbInterface.getInterfaceProtocol() == XB360_IFACE_PROTOCOL ||
+             usbInterface.getInterfaceProtocol() == XB360W_IFACE_PROTOCOL)) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterface) {
+        final int XB1_IFACE_SUBCLASS = 71;
+        final int XB1_IFACE_PROTOCOL = 208;
+        final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
+            0x045e, // Microsoft
+            0x0738, // Mad Catz
+            0x0e6f, // PDP
+            0x0f0d, // Hori
+            0x10f5, // Turtle Beach
+            0x1532, // Razer Wildcat
+            0x20d6, // PowerA
+            0x24c6, // PowerA
+            0x2dc8, // 8BitDo
+            0x2e24, // Hyperkin
+            0x3537, // GameSir
+        };
+
+        if (usbInterface.getId() == 0 &&
+            usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+            usbInterface.getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
+            usbInterface.getInterfaceProtocol() == XB1_IFACE_PROTOCOL) {
+            int vendor_id = usbDevice.getVendorId();
+            for (int supportedVid : SUPPORTED_VENDORS) {
+                if (vendor_id == supportedVid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void handleUsbDeviceAttached(UsbDevice usbDevice) {
+        connectHIDDeviceUSB(usbDevice);
+    }
+
+    private void handleUsbDeviceDetached(UsbDevice usbDevice) {
+        List<Integer> devices = new ArrayList<Integer>();
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                devices.add(device.getId());
+            }
+        }
+        for (int id : devices) {
+            HIDDevice device = mDevicesById.get(id);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    private void handleUsbDevicePermission(UsbDevice usbDevice, boolean permission_granted) {
+        for (HIDDevice device : mDevicesById.values()) {
+            if (usbDevice.equals(device.getDevice())) {
+                boolean opened = false;
+                if (permission_granted) {
+                    opened = device.open();
+                }
+                HIDDeviceOpenResult(device.getId(), opened);
+            }
+        }
+    }
+
+    private void connectHIDDeviceUSB(UsbDevice usbDevice) {
+        synchronized (this) {
+            int interface_mask = 0;
+            for (int interface_index = 0; interface_index < usbDevice.getInterfaceCount(); interface_index++) {
+                UsbInterface usbInterface = usbDevice.getInterface(interface_index);
+                if (isHIDDeviceInterface(usbDevice, usbInterface)) {
+                    // Check to see if we've already added this interface
+                    // This happens with the Xbox Series X controller which has a duplicate interface 0, which is inactive
+                    int interface_id = usbInterface.getId();
+                    if ((interface_mask & (1 << interface_id)) != 0) {
+                        continue;
+                    }
+                    interface_mask |= (1 << interface_id);
+
+                    HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
+                    int id = device.getId();
+                    mDevicesById.put(id, device);
+                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol());
+                }
+            }
+        }
+    }
+
+    private void initializeBluetooth() {
+        Log.d(TAG, "Initializing Bluetooth");
+
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
+            return;
+        }
+
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
+            return;
+        }
+
+        // Find bonded bluetooth controllers and create SteamControllers for them
+        mBluetoothManager = (BluetoothManager)mContext.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (mBluetoothManager == null) {
+            // This device doesn't support Bluetooth.
+            return;
+        }
+
+        BluetoothAdapter btAdapter = mBluetoothManager.getAdapter();
+        if (btAdapter == null) {
+            // This device has Bluetooth support in the codebase, but has no available adapters.
+            return;
+        }
+
+        // Get our bonded devices.
+        for (BluetoothDevice device : btAdapter.getBondedDevices()) {
+
+            Log.d(TAG, "Bluetooth device available: " + device);
+            if (isSteamController(device)) {
+                connectBluetoothDevice(device);
+            }
+
+        }
+
+        // NOTE: These don't work on Chromebooks, to my undying dismay.
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        mContext.registerReceiver(mBluetoothBroadcast, filter);
+
+        if (mIsChromebook) {
+            mHandler = new Handler(Looper.getMainLooper());
+            mLastBluetoothDevices = new ArrayList<BluetoothDevice>();
+
+            // final HIDDeviceManager finalThis = this;
+            // mHandler.postDelayed(new Runnable() {
+            //     @Override
+            //     public void run() {
+            //         finalThis.chromebookConnectionHandler();
+            //     }
+            // }, 5000);
+        }
+    }
+
+    private void shutdownBluetooth() {
+        try {
+            mContext.unregisterReceiver(mBluetoothBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
+    }
+
+    // Chromebooks do not pass along ACTION_ACL_CONNECTED / ACTION_ACL_DISCONNECTED properly.
+    // This function provides a sort of dummy version of that, watching for changes in the
+    // connected devices and attempting to add controllers as things change.
+    public void chromebookConnectionHandler() {
+        if (!mIsChromebook) {
+            return;
+        }
+
+        ArrayList<BluetoothDevice> disconnected = new ArrayList<BluetoothDevice>();
+        ArrayList<BluetoothDevice> connected = new ArrayList<BluetoothDevice>();
+
+        List<BluetoothDevice> currentConnected = mBluetoothManager.getConnectedDevices(BluetoothProfile.GATT);
+
+        for (BluetoothDevice bluetoothDevice : currentConnected) {
+            if (!mLastBluetoothDevices.contains(bluetoothDevice)) {
+                connected.add(bluetoothDevice);
+            }
+        }
+        for (BluetoothDevice bluetoothDevice : mLastBluetoothDevices) {
+            if (!currentConnected.contains(bluetoothDevice)) {
+                disconnected.add(bluetoothDevice);
+            }
+        }
+
+        mLastBluetoothDevices = currentConnected;
+
+        for (BluetoothDevice bluetoothDevice : disconnected) {
+            disconnectBluetoothDevice(bluetoothDevice);
+        }
+        for (BluetoothDevice bluetoothDevice : connected) {
+            connectBluetoothDevice(bluetoothDevice);
+        }
+
+        final HIDDeviceManager finalThis = this;
+        mHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finalThis.chromebookConnectionHandler();
+            }
+        }, 10000);
+    }
+
+    public boolean connectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        Log.v(TAG, "connectBluetoothDevice device=" + bluetoothDevice);
+        synchronized (this) {
+            if (mBluetoothDevices.containsKey(bluetoothDevice)) {
+                Log.v(TAG, "Steam controller with address " + bluetoothDevice + " already exists, attempting reconnect");
+
+                HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+                device.reconnect();
+
+                return false;
+            }
+            HIDDeviceBLESteamController device = new HIDDeviceBLESteamController(this, bluetoothDevice);
+            int id = device.getId();
+            mBluetoothDevices.put(bluetoothDevice, device);
+            mDevicesById.put(id, device);
+
+            // The Steam Controller will mark itself connected once initialization is complete
+        }
+        return true;
+    }
+
+    public void disconnectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+        synchronized (this) {
+            HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
+            if (device == null)
+                return;
+
+            int id = device.getId();
+            mBluetoothDevices.remove(bluetoothDevice);
+            mDevicesById.remove(id);
+            device.shutdown();
+            HIDDeviceDisconnected(id);
+        }
+    }
+
+    public boolean isSteamController(BluetoothDevice bluetoothDevice) {
+        // Sanity check.  If you pass in a null device, by definition it is never a Steam Controller.
+        if (bluetoothDevice == null) {
+            return false;
+        }
+
+        // If the device has no local name, we really don't want to try an equality check against it.
+        if (bluetoothDevice.getName() == null) {
+            return false;
+        }
+
+        return bluetoothDevice.getName().equals("SteamController") && ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) != 0);
+    }
+
+    private void close() {
+        shutdownUSB();
+        shutdownBluetooth();
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.shutdown();
+            }
+            mDevicesById.clear();
+            mBluetoothDevices.clear();
+            HIDDeviceReleaseCallback();
+        }
+    }
+
+    public void setFrozen(boolean frozen) {
+        synchronized (this) {
+            for (HIDDevice device : mDevicesById.values()) {
+                device.setFrozen(frozen);
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private HIDDevice getDevice(int id) {
+        synchronized (this) {
+            HIDDevice result = mDevicesById.get(id);
+            if (result == null) {
+                Log.v(TAG, "No device for id: " + id);
+                Log.v(TAG, "Available devices: " + mDevicesById.keySet());
+            }
+            return result;
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////// JNI interface functions
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public boolean initialize(boolean usb, boolean bluetooth) {
+        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
+
+        if (usb) {
+            initializeUSB();
+        }
+        if (bluetooth) {
+            initializeBluetooth();
+        }
+        return true;
+    }
+
+    public boolean openDevice(int deviceID) {
+        Log.v(TAG, "openDevice deviceID=" + deviceID);
+        HIDDevice device = getDevice(deviceID);
+        if (device == null) {
+            HIDDeviceDisconnected(deviceID);
+            return false;
+        }
+
+        // Look to see if this is a USB device and we have permission to access it
+        UsbDevice usbDevice = device.getDevice();
+        if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) {
+            HIDDeviceOpenPending(deviceID);
+            try {
+                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
+                int flags;
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
+                    flags = FLAG_MUTABLE;
+                } else {
+                    flags = 0;
+                }
+                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);
+            }
+            return false;
+        }
+
+        try {
+            return device.open();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    public int sendOutputReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "sendOutputReport deviceID=" + deviceID + " length=" + report.length);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return -1;
+            }
+
+            return device.sendOutputReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return -1;
+    }
+
+    public int sendFeatureReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "sendFeatureReport deviceID=" + deviceID + " length=" + report.length);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return -1;
+            }
+
+            return device.sendFeatureReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return -1;
+    }
+
+    public boolean getFeatureReport(int deviceID, byte[] report) {
+        try {
+            //Log.v(TAG, "getFeatureReport deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return false;
+            }
+
+            return device.getFeatureReport(report);
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+        return false;
+    }
+
+    public void closeDevice(int deviceID) {
+        try {
+            Log.v(TAG, "closeDevice deviceID=" + deviceID);
+            HIDDevice device;
+            device = getDevice(deviceID);
+            if (device == null) {
+                HIDDeviceDisconnected(deviceID);
+                return;
+            }
+
+            device.close();
+        } catch (Exception e) {
+            Log.e(TAG, "Got exception: " + Log.getStackTraceString(e));
+        }
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////// Native methods
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private native void HIDDeviceRegisterCallback();
+    private native void HIDDeviceReleaseCallback();
+
+    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol);
+    native void HIDDeviceOpenPending(int deviceID);
+    native void HIDDeviceOpenResult(int deviceID, boolean opened);
+    native void HIDDeviceDisconnected(int deviceID);
+
+    native void HIDDeviceInputReport(int deviceID, byte[] report);
+    native void HIDDeviceFeatureReport(int deviceID, byte[] report);
+}
diff --git a/android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java b/android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java
new file mode 100644
index 000000000..bfe0cf954
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java
@@ -0,0 +1,309 @@
+package org.libsdl.app;
+
+import android.hardware.usb.*;
+import android.os.Build;
+import android.util.Log;
+import java.util.Arrays;
+
+class HIDDeviceUSB implements HIDDevice {
+
+    private static final String TAG = "hidapi";
+
+    protected HIDDeviceManager mManager;
+    protected UsbDevice mDevice;
+    protected int mInterfaceIndex;
+    protected int mInterface;
+    protected int mDeviceId;
+    protected UsbDeviceConnection mConnection;
+    protected UsbEndpoint mInputEndpoint;
+    protected UsbEndpoint mOutputEndpoint;
+    protected InputThread mInputThread;
+    protected boolean mRunning;
+    protected boolean mFrozen;
+
+    public HIDDeviceUSB(HIDDeviceManager manager, UsbDevice usbDevice, int interface_index) {
+        mManager = manager;
+        mDevice = usbDevice;
+        mInterfaceIndex = interface_index;
+        mInterface = mDevice.getInterface(mInterfaceIndex).getId();
+        mDeviceId = manager.getDeviceIDForIdentifier(getIdentifier());
+        mRunning = false;
+    }
+
+    public String getIdentifier() {
+        return String.format("%s/%x/%x/%d", mDevice.getDeviceName(), mDevice.getVendorId(), mDevice.getProductId(), mInterfaceIndex);
+    }
+
+    @Override
+    public int getId() {
+        return mDeviceId;
+    }
+
+    @Override
+    public int getVendorId() {
+        return mDevice.getVendorId();
+    }
+
+    @Override
+    public int getProductId() {
+        return mDevice.getProductId();
+    }
+
+    @Override
+    public String getSerialNumber() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            try {
+                result = mDevice.getSerialNumber();
+            }
+            catch (SecurityException exception) {
+                //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+            }
+        }
+        if (result == null) {
+            result = "";
+        }
+        return result;
+    }
+
+    @Override
+    public int getVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getManufacturerName() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            result = mDevice.getManufacturerName();
+        }
+        if (result == null) {
+            result = String.format("%x", getVendorId());
+        }
+        return result;
+    }
+
+    @Override
+    public String getProductName() {
+        String result = null;
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+            result = mDevice.getProductName();
+        }
+        if (result == null) {
+            result = String.format("%x", getProductId());
+        }
+        return result;
+    }
+
+    @Override
+    public UsbDevice getDevice() {
+        return mDevice;
+    }
+
+    public String getDeviceName() {
+        return getManufacturerName() + " " + getProductName() + "(0x" + String.format("%x", getVendorId()) + "/0x" + String.format("%x", getProductId()) + ")";
+    }
+
+    @Override
+    public boolean open() {
+        mConnection = mManager.getUSBManager().openDevice(mDevice);
+        if (mConnection == null) {
+            Log.w(TAG, "Unable to open USB device " + getDeviceName());
+            return false;
+        }
+
+        // Force claim our interface
+        UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+        if (!mConnection.claimInterface(iface, true)) {
+            Log.w(TAG, "Failed to claim interfaces on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Find the endpoints
+        for (int j = 0; j < iface.getEndpointCount(); j++) {
+            UsbEndpoint endpt = iface.getEndpoint(j);
+            switch (endpt.getDirection()) {
+            case UsbConstants.USB_DIR_IN:
+                if (mInputEndpoint == null) {
+                    mInputEndpoint = endpt;
+                }
+                break;
+            case UsbConstants.USB_DIR_OUT:
+                if (mOutputEndpoint == null) {
+                    mOutputEndpoint = endpt;
+                }
+                break;
+            }
+        }
+
+        // Make sure the required endpoints were present
+        if (mInputEndpoint == null || mOutputEndpoint == null) {
+            Log.w(TAG, "Missing required endpoint on USB device " + getDeviceName());
+            close();
+            return false;
+        }
+
+        // Start listening for input
+        mRunning = true;
+        mInputThread = new InputThread();
+        mInputThread.start();
+
+        return true;
+    }
+
+    @Override
+    public int sendFeatureReport(byte[] report) {
+        int res = -1;
+        int offset = 0;
+        int length = report.length;
+        boolean skipped_report_id = false;
+        byte report_number = report[0];
+
+        if (report_number == 0x0) {
+            ++offset;
+            --length;
+            skipped_report_id = true;
+        }
+
+        res = mConnection.controlTransfer(
+            UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_OUT,
+            0x09/*HID set_report*/,
+            (3/*HID feature*/ << 8) | report_number,
+            mInterface,
+            report, offset, length,
+            1000/*timeout millis*/);
+
+        if (res < 0) {
+            Log.w(TAG, "sendFeatureReport() returned " + res + " on device " + getDeviceName());
+            return -1;
+        }
+
+        if (skipped_report_id) {
+            ++length;
+        }
+        return length;
+    }
+
+    @Override
+    public int sendOutputReport(byte[] report) {
+        int r = mConnection.bulkTransfer(mOutputEndpoint, report, report.length, 1000);
+        if (r != report.length) {
+            Log.w(TAG, "sendOutputReport() returned " + r + " on device " + getDeviceName());
+        }
+        return r;
+    }
+
+    @Override
+    public boolean getFeatureReport(byte[] report) {
+        int res = -1;
+        int offset = 0;
+        int length = report.length;
+        boolean skipped_report_id = false;
+        byte report_number = report[0];
+
+        if (report_number == 0x0) {
+            /* Offset the return buffer by 1, so that the report ID
+               will remain in byte 0. */
+            ++offset;
+            --length;
+            skipped_report_id = true;
+        }
+
+        res = mConnection.controlTransfer(
+            UsbConstants.USB_TYPE_CLASS | 0x01 /*RECIPIENT_INTERFACE*/ | UsbConstants.USB_DIR_IN,
+            0x01/*HID get_report*/,
+            (3/*HID feature*/ << 8) | report_number,
+            mInterface,
+            report, offset, length,
+            1000/*timeout millis*/);
+
+        if (res < 0) {
+            Log.w(TAG, "getFeatureReport() returned " + res + " on device " + getDeviceName());
+            return false;
+        }
+
+        if (skipped_report_id) {
+            ++res;
+            ++length;
+        }
+
+        byte[] data;
+        if (res == length) {
+            data = report;
+        } else {
+            data = Arrays.copyOfRange(report, 0, res);
+        }
+        mManager.HIDDeviceFeatureReport(mDeviceId, data);
+
+        return true;
+    }
+
+    @Override
+    public void close() {
+        mRunning = false;
+        if (mInputThread != null) {
+            while (mInputThread.isAlive()) {
+                mInputThread.interrupt();
+                try {
+                    mInputThread.join();
+                } catch (InterruptedException e) {
+                    // Keep trying until we're done
+                }
+            }
+            mInputThread = null;
+        }
+        if (mConnection != null) {
+            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+            mConnection.releaseInterface(iface);
+            mConnection.close();
+            mConnection = null;
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        close();
+        mManager = null;
+    }
+
+    @Override
+    public void setFrozen(boolean frozen) {
+        mFrozen = frozen;
+    }
+
+    protected class InputThread extends Thread {
+        @Override
+        public void run() {
+            int packetSize = mInputEndpoint.getMaxPacketSize();
+            byte[] packet = new byte[packetSize];
+            while (mRunning) {
+                int r;
+                try
+                {
+                    r = mConnection.bulkTransfer(mInputEndpoint, packet, packetSize, 1000);
+                }
+                catch (Exception e)
+                {
+                    Log.v(TAG, "Exception in UsbDeviceConnection bulktransfer: " + e);
+                    break;
+                }
+                if (r < 0) {
+                    // Could be a timeout or an I/O error
+                }
+                if (r > 0) {
+                    byte[] data;
+                    if (r == packetSize) {
+                        data = packet;
+                    } else {
+                        data = Arrays.copyOfRange(packet, 0, r);
+                    }
+
+                    if (!mFrozen) {
+                        mManager.HIDDeviceInputReport(mDeviceId, data);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android/app/src/main/java/org/libsdl/app/SDL.java b/android/app/src/main/java/org/libsdl/app/SDL.java
new file mode 100644
index 000000000..44c21c1c7
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/SDL.java
@@ -0,0 +1,86 @@
+package org.libsdl.app;
+
+import android.content.Context;
+
+import java.lang.Class;
+import java.lang.reflect.Method;
+
+/**
+    SDL library initialization
+*/
+public class SDL {
+
+    // This function should be called first and sets up the native code
+    // so it can call into the Java classes
+    public static void setupJNI() {
+        SDLActivity.nativeSetupJNI();
+        SDLAudioManager.nativeSetupJNI();
+        SDLControllerManager.nativeSetupJNI();
+    }
+
+    // This function should be called each time the activity is started
+    public static void initialize() {
+        setContext(null);
+
+        SDLActivity.initialize();
+        SDLAudioManager.initialize();
+        SDLControllerManager.initialize();
+    }
+
+    // This function stores the current activity (SDL or not)
+    public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
+        mContext = context;
+    }
+
+    public static Context getContext() {
+        return mContext;
+    }
+
+    public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+
+        if (libraryName == null) {
+            throw new NullPointerException("No library name provided.");
+        }
+
+        try {
+            // Let's see if we have ReLinker available in the project.  This is necessary for 
+            // some projects that have huge numbers of local libraries bundled, and thus may 
+            // trip a bug in Android's native library loader which ReLinker works around.  (If
+            // loadLibrary works properly, ReLinker will simply use the normal Android method
+            // internally.)
+            //
+            // To use ReLinker, just add it as a dependency.  For more information, see 
+            // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
+            //
+            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.
+            Method forceMethod = relinkClass.getDeclaredMethod("force");
+            Object relinkInstance = forceMethod.invoke(null);
+            Class<?> relinkInstanceClass = relinkInstance.getClass();
+
+            // Actually load the library!
+            Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
+            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
+        }
+        catch (final Throwable e) {
+            // Fall back
+            try {
+                System.loadLibrary(libraryName);
+            }
+            catch (final UnsatisfiedLinkError ule) {
+                throw ule;
+            }
+            catch (final SecurityException se) {
+                throw se;
+            }
+        }
+    }
+
+    protected static Context mContext;
+}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
new file mode 100644
index 000000000..83e3cf657
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -0,0 +1,2122 @@
+package org.libsdl.app;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.UiModeManager;
+import android.content.ClipboardManager;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Selection;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.PointerIcon;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.Hashtable;
+import java.util.Locale;
+
+
+/**
+    SDL Activity
+*/
+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 = 30;
+    private static final int SDL_MICRO_VERSION = 1;
+/*
+    // Display InputType.SOURCE/CLASS of events and devices
+    //
+    // SDLActivity.debugSource(device.getSources(), "device[" + device.getName() + "]");
+    // SDLActivity.debugSource(event.getSource(), "event");
+    public static void debugSource(int sources, String prefix) {
+        int s = sources;
+        int s_copy = sources;
+        String cls = "";
+        String src = "";
+        int tst = 0;
+        int FLAG_TAINTED = 0x80000000;
+
+        if ((s & InputDevice.SOURCE_CLASS_BUTTON) != 0)     cls += " BUTTON";
+        if ((s & InputDevice.SOURCE_CLASS_JOYSTICK) != 0)   cls += " JOYSTICK";
+        if ((s & InputDevice.SOURCE_CLASS_POINTER) != 0)    cls += " POINTER";
+        if ((s & InputDevice.SOURCE_CLASS_POSITION) != 0)   cls += " POSITION";
+        if ((s & InputDevice.SOURCE_CLASS_TRACKBALL) != 0)  cls += " TRACKBALL";
+
+
+        int s2 = s_copy & ~InputDevice.SOURCE_ANY; // keep class bits
+        s2 &= ~(  InputDevice.SOURCE_CLASS_BUTTON
+                | InputDevice.SOURCE_CLASS_JOYSTICK
+                | InputDevice.SOURCE_CLASS_POINTER
+                | InputDevice.SOURCE_CLASS_POSITION
+                | InputDevice.SOURCE_CLASS_TRACKBALL);
+
+        if (s2 != 0) cls += "Some_Unkown";
+
+        s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
+
+        if (Build.VERSION.SDK_INT >= 23) {
+            tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
+            if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_DPAD;
+        if ((s & tst) == tst) src += " DPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_GAMEPAD;
+        if ((s & tst) == tst) src += " GAMEPAD";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            tst = InputDevice.SOURCE_HDMI;
+            if ((s & tst) == tst) src += " HDMI";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_JOYSTICK;
+        if ((s & tst) == tst) src += " JOYSTICK";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_KEYBOARD;
+        if ((s & tst) == tst) src += " KEYBOARD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_MOUSE;
+        if ((s & tst) == tst) src += " MOUSE";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 26) {
+            tst = InputDevice.SOURCE_MOUSE_RELATIVE;
+            if ((s & tst) == tst) src += " MOUSE_RELATIVE";
+            s2 &= ~tst;
+
+            tst = InputDevice.SOURCE_ROTARY_ENCODER;
+            if ((s & tst) == tst) src += " ROTARY_ENCODER";
+            s2 &= ~tst;
+        }
+        tst = InputDevice.SOURCE_STYLUS;
+        if ((s & tst) == tst) src += " STYLUS";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHPAD;
+        if ((s & tst) == tst) src += " TOUCHPAD";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_TOUCHSCREEN;
+        if ((s & tst) == tst) src += " TOUCHSCREEN";
+        s2 &= ~tst;
+
+        if (Build.VERSION.SDK_INT >= 18) {
+            tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
+            if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
+            s2 &= ~tst;
+        }
+
+        tst = InputDevice.SOURCE_TRACKBALL;
+        if ((s & tst) == tst) src += " TRACKBALL";
+        s2 &= ~tst;
+
+        tst = InputDevice.SOURCE_ANY;
+        if ((s & tst) == tst) src += " ANY";
+        s2 &= ~tst;
+
+        if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
+        s2 &= ~FLAG_TAINTED;
+
+        if (s2 != 0) src += " Some_Unkown";
+
+        Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
+    }
+*/
+
+    public static boolean mIsResumedCalled, mHasFocus;
+    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24  /* Android 7.0 (N) */);
+
+    // Cursor types
+    // private static final int SDL_SYSTEM_CURSOR_NONE = -1;
+    private static final int SDL_SYSTEM_CURSOR_ARROW = 0;
+    private static final int SDL_SYSTEM_CURSOR_IBEAM = 1;
+    private static final int SDL_SYSTEM_CURSOR_WAIT = 2;
+    private static final int SDL_SYSTEM_CURSOR_CROSSHAIR = 3;
+    private static final int SDL_SYSTEM_CURSOR_WAITARROW = 4;
+    private static final int SDL_SYSTEM_CURSOR_SIZENWSE = 5;
+    private static final int SDL_SYSTEM_CURSOR_SIZENESW = 6;
+    private static final int SDL_SYSTEM_CURSOR_SIZEWE = 7;
+    private static final int SDL_SYSTEM_CURSOR_SIZENS = 8;
+    private static final int SDL_SYSTEM_CURSOR_SIZEALL = 9;
+    private static final int SDL_SYSTEM_CURSOR_NO = 10;
+    private static final int SDL_SYSTEM_CURSOR_HAND = 11;
+
+    protected static final int SDL_ORIENTATION_UNKNOWN = 0;
+    protected static final int SDL_ORIENTATION_LANDSCAPE = 1;
+    protected static final int SDL_ORIENTATION_LANDSCAPE_FLIPPED = 2;
+    protected static final int SDL_ORIENTATION_PORTRAIT = 3;
+    protected static final int SDL_ORIENTATION_PORTRAIT_FLIPPED = 4;
+
+    protected static int mCurrentOrientation;
+    protected static Locale mCurrentLocale;
+
+    // Handle the state of the native layer
+    public enum NativeState {
+           INIT, RESUMED, PAUSED
+    }
+
+    public static NativeState mNextNativeState;
+    public static NativeState mCurrentNativeState;
+
+    /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+    public static boolean mBrokenLibraries = true;
+
+    // Main components
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static DummyEdit mTextEdit;
+    protected static boolean mScreenKeyboardShown;
+    protected static ViewGroup mLayout;
+    protected static SDLClipboardHandler mClipboardHandler;
+    protected static Hashtable<Integer, PointerIcon> mCursors;
+    protected static int mLastCursorID;
+    protected static SDLGenericMotionListener_API12 mMotionListener;
+    protected static HIDDeviceManager mHIDDeviceManager;
+
+    // This is what SDL runs in. It invokes SDL_main(), eventually
+    protected static Thread mSDLThread;
+
+    protected static SDLGenericMotionListener_API12 getMotionListener() {
+        if (mMotionListener == null) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mMotionListener = new SDLGenericMotionListener_API26();
+            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                mMotionListener = new SDLGenericMotionListener_API24();
+            } else {
+                mMotionListener = new SDLGenericMotionListener_API12();
+            }
+        }
+
+        return mMotionListener;
+    }
+
+    /**
+     * This method returns the name of the shared object with the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainSharedObject() {
+        String library;
+        String[] libraries = SDLActivity.mSingleton.getLibraries();
+        if (libraries.length > 0) {
+            library = "lib" + libraries[libraries.length - 1] + ".so";
+        } else {
+            library = "libmain.so";
+        }
+        return getContext().getApplicationInfo().nativeLibraryDir + "/" + library;
+    }
+
+    /**
+     * This method returns the name of the application entry point
+     * It can be overridden by derived classes.
+     */
+    protected String getMainFunction() {
+        return "SDL_main";
+    }
+
+    /**
+     * This method is called by SDL before loading the native shared libraries.
+     * It can be overridden to provide names of shared libraries to be loaded.
+     * The default implementation returns the defaults. It never returns null.
+     * An array returned by a new implementation must at least contain "SDL2".
+     * Also keep in mind that the order the libraries are loaded may matter.
+     * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
+     */
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            // "SDL2_image",
+            // "SDL2_mixer",
+            // "SDL2_net",
+            // "SDL2_ttf",
+            "main"
+        };
+    }
+
+    // Load the .so
+    public void loadLibraries() {
+       for (String lib : getLibraries()) {
+          SDL.loadLibrary(lib);
+       }
+    }
+
+    /**
+     * This method is called by SDL before starting the native application thread.
+     * It can be overridden to provide the arguments after the application name.
+     * The default implementation returns an empty array. It never returns null.
+     * @return arguments for the native application.
+     */
+    protected String[] getArguments() {
+        return new String[0];
+    }
+
+    public static void initialize() {
+        // The static nature of the singleton and Android quirkyness force us to initialize everything here
+        // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+        mSingleton = null;
+        mSurface = null;
+        mTextEdit = null;
+        mLayout = null;
+        mClipboardHandler = null;
+        mCursors = new Hashtable<Integer, PointerIcon>();
+        mLastCursorID = 0;
+        mSDLThread = null;
+        mIsResumedCalled = false;
+        mHasFocus = true;
+        mNextNativeState = NativeState.INIT;
+        mCurrentNativeState = NativeState.INIT;
+    }
+    
+    protected SDLSurface createSDLSurface(Context context) {
+        return new SDLSurface(context);
+    }
+
+    // Setup
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        Log.v(TAG, "Device: " + Build.DEVICE);
+        Log.v(TAG, "Model: " + Build.MODEL);
+        Log.v(TAG, "onCreate()");
+        super.onCreate(savedInstanceState);
+
+        try {
+            Thread.currentThread().setName("SDLActivity");
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+
+        // Load shared libraries
+        String errorMsgBrokenLib = "";
+        try {
+            loadLibraries();
+            mBrokenLibraries = false; /* success */
+        } catch(UnsatisfiedLinkError e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        } catch(Exception e) {
+            System.err.println(e.getMessage());
+            mBrokenLibraries = true;
+            errorMsgBrokenLib = e.getMessage();
+        }
+
+        if (!mBrokenLibraries) {
+            String expected_version = String.valueOf(SDL_MAJOR_VERSION) + "." +
+                                      String.valueOf(SDL_MINOR_VERSION) + "." +
+                                      String.valueOf(SDL_MICRO_VERSION);
+            String version = nativeGetVersion();
+            if (!version.equals(expected_version)) {
+                mBrokenLibraries = true;
+                errorMsgBrokenLib = "SDL C/Java version mismatch (expected " + expected_version + ", got " + version + ")";
+            }
+        }
+
+        if (mBrokenLibraries) {
+            mSingleton = this;
+            AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+            dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+                  + System.getProperty("line.separator")
+                  + System.getProperty("line.separator")
+                  + "Error: " + errorMsgBrokenLib);
+            dlgAlert.setTitle("SDL Error");
+            dlgAlert.setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog,int id) {
+                        // if this button is clicked, close current activity
+                        SDLActivity.mSingleton.finish();
+                    }
+                });
+           dlgAlert.setCancelable(false);
+           dlgAlert.create().show();
+
+           return;
+        }
+
+        // Set up JNI
+        SDL.setupJNI();
+
+        // Initialize state
+        SDL.initialize();
+
+        // So we can call stuff from static callbacks
+        mSingleton = this;
+        SDL.setContext(this);
+
+        mClipboardHandler = new SDLClipboardHandler();
+
+        mHIDDeviceManager = HIDDeviceManager.acquire(this);
+
+        // Set up the surface
+        mSurface = createSDLSurface(this);
+
+        mLayout = new RelativeLayout(this);
+        mLayout.addView(mSurface);
+
+        // Get our current screen orientation and pass it down.
+        mCurrentOrientation = SDLActivity.getCurrentOrientation();
+        // Only record current orientation
+        SDLActivity.onNativeOrientationChanged(mCurrentOrientation);
+
+        try {
+            if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+                mCurrentLocale = getContext().getResources().getConfiguration().locale;
+            } else {
+                mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0);
+            }
+        } catch(Exception ignored) {
+        }
+
+        setContentView(mLayout);
+
+        setWindowStyle(false);
+
+        getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
+
+        // Get filename from "Open with" of another application
+        Intent intent = getIntent();
+        if (intent != null && intent.getData() != null) {
+            String filename = intent.getData().getPath();
+            if (filename != null) {
+                Log.v(TAG, "Got filename: " + filename);
+                SDLActivity.onNativeDropFile(filename);
+            }
+        }
+    }
+
+    protected void pauseNativeThread() {
+        mNextNativeState = NativeState.PAUSED;
+        mIsResumedCalled = false;
+
+        if (SDLActivity.mBrokenLibraries) {
+            return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    protected void resumeNativeThread() {
+        mNextNativeState = NativeState.RESUMED;
+        mIsResumedCalled = true;
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.handleNativeState();
+    }
+
+    // Events
+    @Override
+    protected void onPause() {
+        Log.v(TAG, "onPause()");
+        super.onPause();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(true);
+        }
+        if (!mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        Log.v(TAG, "onResume()");
+        super.onResume();
+
+        if (mHIDDeviceManager != null) {
+            mHIDDeviceManager.setFrozen(false);
+        }
+        if (!mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        Log.v(TAG, "onStop()");
+        super.onStop();
+        if (mHasMultiWindow) {
+            pauseNativeThread();
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        Log.v(TAG, "onStart()");
+        super.onStart();
+        if (mHasMultiWindow) {
+            resumeNativeThread();
+        }
+    }
+
+    public static int getCurrentOrientation() {
+        int result = SDL_ORIENTATION_UNKNOWN;
+
+        Activity activity = (Activity)getContext();
+        if (activity == null) {
+            return result;
+        }
+        Display display = activity.getWindowManager().getDefaultDisplay();
+
+        switch (display.getRotation()) {
+            case Surface.ROTATION_0:
+                result = SDL_ORIENTATION_PORTRAIT;
+                break;
+
+            case Surface.ROTATION_90:
+                result = SDL_ORIENTATION_LANDSCAPE;
+                break;
+
+            case Surface.ROTATION_180:
+                result = SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                break;
+
+            case Surface.ROTATION_270:
+                result = SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                break;
+        }
+
+        return result;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        mHasFocus = hasFocus;
+        if (hasFocus) {
+           mNextNativeState = NativeState.RESUMED;
+           SDLActivity.getMotionListener().reclaimRelativeMouseModeIfNeeded();
+
+           SDLActivity.handleNativeState();
+           nativeFocusChanged(true);
+
+        } else {
+           nativeFocusChanged(false);
+           if (!mHasMultiWindow) {
+               mNextNativeState = NativeState.PAUSED;
+               SDLActivity.handleNativeState();
+           }
+        }
+    }
+
+    @Override
+    public void onLowMemory() {
+        Log.v(TAG, "onLowMemory()");
+        super.onLowMemory();
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        SDLActivity.nativeLowMemory();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        Log.v(TAG, "onConfigurationChanged()");
+        super.onConfigurationChanged(newConfig);
+
+        if (SDLActivity.mBrokenLibraries) {
+           return;
+        }
+
+        if (mCurrentLocale == null || !mCurrentLocale.equals(newConfig.locale)) {
+            mCurrentLocale = newConfig.locale;
+            SDLActivity.onNativeLocaleChanged();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.v(TAG, "onDestroy()");
+
+        if (mHIDDeviceManager != null) {
+            HIDDeviceManager.release(mHIDDeviceManager);
+            mHIDDeviceManager = null;
+        }
+
+        SDLAudioManager.release(this);
+
+        if (SDLActivity.mBrokenLibraries) {
+           super.onDestroy();
+           return;
+        }
+
+        if (SDLActivity.mSDLThread != null) {
+
+            // Send Quit event to "SDLThread" thread
+            SDLActivity.nativeSendQuit();
+
+            // Wait for "SDLThread" thread to end
+            try {
+                SDLActivity.mSDLThread.join();
+            } catch(Exception e) {
+                Log.v(TAG, "Problem stopping SDLThread: " + e);
+            }
+        }
+
+        SDLActivity.nativeQuit();
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Check if we want to block the back button in case of mouse right click.
+        //
+        // If we do, the normal hardware back button will no longer work and people have to use home,
+        // but the mouse right click will work.
+        //
+        boolean trapBack = SDLActivity.nativeGetHintBoolean("SDL_ANDROID_TRAP_BACK_BUTTON", false);
+        if (trapBack) {
+            // Exit and let the mouse handler handle this button (if appropriate)
+            return;
+        }
+
+        // Default system back button behavior.
+        if (!isFinishing()) {
+            super.onBackPressed();
+        }
+    }
+
+    // Called by JNI from SDL.
+    public static void manualBackButton() {
+        mSingleton.pressBackButton();
+    }
+
+    // Used to get us onto the activity's main thread
+    public void pressBackButton() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!SDLActivity.this.isFinishing()) {
+                    SDLActivity.this.superOnBackPressed();
+                }
+            }
+        });
+    }
+
+    // Used to access the system back behavior.
+    public void superOnBackPressed() {
+        super.onBackPressed();
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+
+        if (SDLActivity.mBrokenLibraries) {
+           return false;
+        }
+
+        int keyCode = event.getKeyCode();
+        // Ignore certain special keys so they're handled by Android
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+            keyCode == KeyEvent.KEYCODE_CAMERA ||
+            keyCode == KeyEvent.KEYCODE_ZOOM_IN || /* API 11 */
+            keyCode == KeyEvent.KEYCODE_ZOOM_OUT /* API 11 */
+            ) {
+            return false;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    /* Transition to next state */
+    public static void handleNativeState() {
+
+        if (mNextNativeState == mCurrentNativeState) {
+            // Already in same state, discard.
+            return;
+        }
+
+        // Try a transition to init state
+        if (mNextNativeState == NativeState.INIT) {
+
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to paused state
+        if (mNextNativeState == NativeState.PAUSED) {
+            if (mSDLThread != null) {
+                nativePause();
+            }
+            if (mSurface != null) {
+                mSurface.handlePause();
+            }
+            mCurrentNativeState = mNextNativeState;
+            return;
+        }
+
+        // Try a transition to resumed state
+        if (mNextNativeState == NativeState.RESUMED) {
+            if (mSurface.mIsSurfaceReady && mHasFocus && mIsResumedCalled) {
+                if (mSDLThread == null) {
+                    // This is the entry point to the C app.
+                    // Start up the C app thread and enable sensor input for the first time
+                    // FIXME: Why aren't we enabling sensor input at start?
+
+                    mSDLThread = new Thread(new SDLMain(), "SDLThread");
+                    mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+                    mSDLThread.start();
+
+                    // No nativeResume(), don't signal Android_ResumeSem
+                } else {
+                    nativeResume();
+                }
+                mSurface.handleResume();
+
+                mCurrentNativeState = mNextNativeState;
+            }
+        }
+    }
+
+    // Messages from the SDLMain thread
+    static final int COMMAND_CHANGE_TITLE = 1;
+    static final int COMMAND_CHANGE_WINDOW_STYLE = 2;
+    static final int COMMAND_TEXTEDIT_HIDE = 3;
+    static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+
+    protected static final int COMMAND_USER = 0x8000;
+
+    protected static boolean mFullscreenModeActive;
+
+    /**
+     * This method is called by SDL if SDL did not handle a message itself.
+     * This happens if a received message contains an unsupported command.
+     * Method can be overwritten to handle Messages in a different class.
+     * @param command the command of the message.
+     * @param param the parameter of the message. May be null.
+     * @return if the message was handled in overridden method.
+     */
+    protected boolean onUnhandledMessage(int command, Object param) {
+        return false;
+    }
+
+    /**
+     * A Handler class for Messages from native SDL applications.
+     * It uses current Activities as target (e.g. for the title).
+     * static to prevent implicit references to enclosing object.
+     */
+    protected static class SDLCommandHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            Context context = SDL.getContext();
+            if (context == null) {
+                Log.e(TAG, "error handling message, getContext() returned null");
+                return;
+            }
+            switch (msg.arg1) {
+            case COMMAND_CHANGE_TITLE:
+                if (context instanceof Activity) {
+                    ((Activity) context).setTitle((String)msg.obj);
+                } else {
+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
+                }
+                break;
+            case COMMAND_CHANGE_WINDOW_STYLE:
+                if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                    if (context instanceof Activity) {
+                        Window window = ((Activity) context).getWindow();
+                        if (window != null) {
+                            if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+                                window.getDecorView().setSystemUiVisibility(flags);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                SDLActivity.mFullscreenModeActive = true;
+                            } else {
+                                int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
+                                window.getDecorView().setSystemUiVisibility(flags);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                SDLActivity.mFullscreenModeActive = false;
+                            }
+                        }
+                    } else {
+                        Log.e(TAG, "error handling message, getContext() returned no Activity");
+                    }
+                }
+                break;
+            case COMMAND_TEXTEDIT_HIDE:
+                if (mTextEdit != null) {
+                    // Note: On some devices setting view to GONE creates a flicker in landscape.
+                    // Setting the View's sizes to 0 is similar to GONE but without the flicker.
+                    // The sizes will be set to useful values when the keyboard is shown again.
+                    mTextEdit.setLayoutParams(new RelativeLayout.LayoutParams(0, 0));
+
+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+
+                    mScreenKeyboardShown = false;
+
+                    mSurface.requestFocus();
+                }
+                break;
+            case COMMAND_SET_KEEP_SCREEN_ON:
+            {
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        } else {
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    }
+                }
+                break;
+            }
+            default:
+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
+                }
+            }
+        }
+    }
+
+    // Handler for the messages
+    Handler commandHandler = new SDLCommandHandler();
+
+    // Send a message from the SDLMain thread
+    boolean sendCommand(int command, Object data) {
+        Message msg = commandHandler.obtainMessage();
+        msg.arg1 = command;
+        msg.obj = data;
+        boolean result = commandHandler.sendMessage(msg);
+
+        if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+            if (command == COMMAND_CHANGE_WINDOW_STYLE) {
+                // Ensure we don't return until the resize has actually happened,
+                // or 500ms have passed.
+
+                boolean bShouldWait = false;
+
+                if (data instanceof Integer) {
+                    // Let's figure out if we're already laid out fullscreen or not.
+                    Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+                    DisplayMetrics realMetrics = new DisplayMetrics();
+                    display.getRealMetrics(realMetrics);
+
+                    boolean bFullscreenLayout = ((realMetrics.widthPixels == mSurface.getWidth()) &&
+                            (realMetrics.heightPixels == mSurface.getHeight()));
+
+                    if ((Integer) data == 1) {
+                        // If we aren't laid out fullscreen or actively in fullscreen mode already, we're going
+                        // to change size and should wait for surfaceChanged() before we return, so the size
+                        // is right back in native code.  If we're already laid out fullscreen, though, we're
+                        // not going to change size even if we change decor modes, so we shouldn't wait for
+                        // surfaceChanged() -- which may not even happen -- and should return immediately.
+                        bShouldWait = !bFullscreenLayout;
+                    } else {
+                        // If we're laid out fullscreen (even if the status bar and nav bar are present),
+                        // or are actively in fullscreen, we're going to change size and should wait for
+                        // surfaceChanged before we return, so the size is right back in native code.
+                        bShouldWait = bFullscreenLayout;
+                    }
+                }
+
+                if (bShouldWait && (SDLActivity.getContext() != null)) {
+                    // We'll wait for the surfaceChanged() method, which will notify us
+                    // when called.  That way, we know our current size is really the
+                    // size we need, instead of grabbing a size that's still got
+                    // the navigation and/or status bars before they're hidden.
+                    //
+                    // We'll wait for up to half a second, because some devices
+                    // take a surprisingly long time for the surface resize, but
+                    // then we'll just give up and return.
+                    //
+                    synchronized (SDLActivity.getContext()) {
+                        try {
+                            SDLActivity.getContext().wait(500);
+                        } catch (InterruptedException ie) {
+                            ie.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    // C functions we call
+    public static native String nativeGetVersion();
+    public static native int nativeSetupJNI();
+    public static native int nativeRunMain(String library, String function, Object arguments);
+    public static native void nativeLowMemory();
+    public static native void nativeSendQuit();
+    public static native void nativeQuit();
+    public static native void nativePause();
+    public static native void nativeResume();
+    public static native void nativeFocusChanged(boolean hasFocus);
+    public static native void onNativeDropFile(String filename);
+    public static native void nativeSetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, float rate);
+    public static native void onNativeResize();
+    public static native void onNativeKeyDown(int keycode);
+    public static native void onNativeKeyUp(int keycode);
+    public static native boolean onNativeSoftReturnKey();
+    public static native void onNativeKeyboardFocusLost();
+    public static native void onNativeMouse(int button, int action, float x, float y, boolean relative);
+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+                                            int action, float x,
+                                            float y, float p);
+    public static native void onNativeAccel(float x, float y, float z);
+    public static native void onNativeClipboardChanged();
+    public static native void onNativeSurfaceCreated();
+    public static native void onNativeSurfaceChanged();
+    public static native void onNativeSurfaceDestroyed();
+    public static native String nativeGetHint(String name);
+    public static native boolean nativeGetHintBoolean(String name, boolean default_value);
+    public static native void nativeSetenv(String name, String value);
+    public static native void onNativeOrientationChanged(int orientation);
+    public static native void nativeAddTouch(int touchId, String name);
+    public static native void nativePermissionResult(int requestCode, boolean result);
+    public static native void onNativeLocaleChanged();
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setActivityTitle(String title) {
+        // Called from SDLMain() thread and can't directly affect the view
+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void setWindowStyle(boolean fullscreen) {
+        // Called from SDLMain() thread and can't directly affect the view
+        mSingleton.sendCommand(COMMAND_CHANGE_WINDOW_STYLE, fullscreen ? 1 : 0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     * This is a static method for JNI convenience, it calls a non-static method
+     * so that is can be overridden
+     */
+    public static void setOrientation(int w, int h, boolean resizable, String hint)
+    {
+        if (mSingleton != null) {
+            mSingleton.setOrientationBis(w, h, resizable, hint);
+        }
+    }
+
+    /**
+     * This can be overridden
+     */
+    public void setOrientationBis(int w, int h, boolean resizable, String hint)
+    {
+        int orientation_landscape = -1;
+        int orientation_portrait = -1;
+
+        /* If set, hint "explicitly controls which UI orientations are allowed". */
+        if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+        } else if (hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (hint.contains("LandscapeRight")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
+        }
+
+        /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */
+        boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait");
+
+        if (contains_Portrait && hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
+        } else if (contains_Portrait) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        } else if (hint.contains("PortraitUpsideDown")) {
+            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
+        }
+
+        boolean is_landscape_allowed = (orientation_landscape != -1);
+        boolean is_portrait_allowed = (orientation_portrait != -1);
+        int req; /* Requested orientation */
+
+        /* No valid hint, nothing is explicitly allowed */
+        if (!is_portrait_allowed && !is_landscape_allowed) {
+            if (resizable) {
+                /* 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);
+            }
+        } else {
+            /* At least one orientation is allowed */
+            if (resizable) {
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    /* 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);
+                }
+            } else {
+                /* Fixed window and both orientations are allowed. Choose one. */
+                if (is_portrait_allowed && is_landscape_allowed) {
+                    req = (w > h ? orientation_landscape : orientation_portrait);
+                } else {
+                    /* Use the only one allowed "orientation" */
+                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
+                }
+            }
+        }
+
+        Log.v(TAG, "setOrientation() requestedOrientation=" + req + " width=" + w +" height="+ h +" resizable=" + resizable + " hint=" + hint);
+        mSingleton.setRequestedOrientation(req);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void minimizeWindow() {
+
+        if (mSingleton == null) {
+            return;
+        }
+
+        Intent startMain = new Intent(Intent.ACTION_MAIN);
+        startMain.addCategory(Intent.CATEGORY_HOME);
+        startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mSingleton.startActivity(startMain);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean shouldMinimizeOnFocusLoss() {
+/*
+        if (Build.VERSION.SDK_INT >= 24) {
+            if (mSingleton == null) {
+                return true;
+            }
+
+            if (mSingleton.isInMultiWindowMode()) {
+                return false;
+            }
+
+            if (mSingleton.isInPictureInPictureMode()) {
+                return false;
+            }
+        }
+
+        return true;
+*/
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isScreenKeyboardShown()
+    {
+        if (mTextEdit == null) {
+            return false;
+        }
+
+        if (!mScreenKeyboardShown) {
+            return false;
+        }
+
+        InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        return imm.isAcceptingText();
+
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean supportsRelativeMouse()
+    {
+        // DeX mode in Samsung Experience 9.0 and earlier doesn't support relative mice properly under
+        // Android 7 APIs, and simply returns no data under Android 8 APIs.
+        //
+        // This is fixed in Samsung Experience 9.5, which corresponds to Android 8.1.0, and
+        // thus SDK version 27.  If we are in DeX mode and not API 27 or higher, as a result,
+        // we should stick to relative mode.
+        //
+        if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().supportsRelativeMouse();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setRelativeMouseEnabled(boolean enabled)
+    {
+        if (enabled && !supportsRelativeMouse()) {
+            return false;
+        }
+
+        return SDLActivity.getMotionListener().setRelativeMouseEnabled(enabled);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean sendMessage(int command, int param) {
+        if (mSingleton == null) {
+            return false;
+        }
+        return mSingleton.sendCommand(command, param);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Context getContext() {
+        return SDL.getContext();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isAndroidTV() {
+        UiModeManager uiModeManager = (UiModeManager) getContext().getSystemService(UI_MODE_SERVICE);
+        if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("MINIX") && Build.MODEL.equals("NEO-U1")) {
+            return true;
+        }
+        if (Build.MANUFACTURER.equals("Amlogic") && Build.MODEL.equals("X96-W")) {
+            return true;
+        }
+        return Build.MANUFACTURER.equals("Amlogic") && Build.MODEL.startsWith("TV");
+    }
+
+    public static double getDiagonal()
+    {
+        DisplayMetrics metrics = new DisplayMetrics();
+        Activity activity = (Activity)getContext();
+        if (activity == null) {
+            return 0.0;
+        }
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        double dWidthInches = metrics.widthPixels / (double)metrics.xdpi;
+        double dHeightInches = metrics.heightPixels / (double)metrics.ydpi;
+
+        return Math.sqrt((dWidthInches * dWidthInches) + (dHeightInches * dHeightInches));
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isTablet() {
+        // If our diagonal size is seven inches or greater, we consider ourselves a tablet.
+        return (getDiagonal() >= 7.0);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isChromebook() {
+        if (getContext() == null) {
+            return false;
+        }
+        return getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean isDeXMode() {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
+            return false;
+        }
+        try {
+            final Configuration config = getContext().getResources().getConfiguration();
+            final Class<?> configClass = config.getClass();
+            return configClass.getField("SEM_DESKTOP_MODE_ENABLED").getInt(configClass)
+                    == configClass.getField("semDesktopModeEnabled").getInt(config);
+        } catch(Exception ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static DisplayMetrics getDisplayDPI() {
+        return getContext().getResources().getDisplayMetrics();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean getManifestEnvironmentVariables() {
+        try {
+            if (getContext() == null) {
+                return false;
+            }
+
+            ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA);
+            Bundle bundle = applicationInfo.metaData;
+            if (bundle == null) {
+                return false;
+            }
+            String prefix = "SDL_ENV.";
+            final int trimLength = prefix.length();
+            for (String key : bundle.keySet()) {
+                if (key.startsWith(prefix)) {
+                    String name = key.substring(trimLength);
+                    String value = bundle.get(key).toString();
+                    nativeSetenv(name, value);
+                }
+            }
+            /* environment variables set! */
+            return true;
+        } catch (Exception e) {
+           Log.v(TAG, "exception " + e.toString());
+        }
+        return false;
+    }
+
+    // This method is called by SDLControllerManager's API 26 Generic Motion Handler.
+    public static View getContentView() {
+        return mLayout;
+    }
+
+    static class ShowTextInputTask implements Runnable {
+        /*
+         * This is used to regulate the pan&scan method to have some offset from
+         * the bottom edge of the input region and the top edge of an input
+         * method (soft keyboard)
+         */
+        static final int HEIGHT_PADDING = 15;
+
+        public int x, y, w, h;
+
+        public ShowTextInputTask(int x, int y, int w, int h) {
+            this.x = x;
+            this.y = y;
+            this.w = w;
+            this.h = h;
+
+            /* Minimum size of 1 pixel, so it takes focus. */
+            if (this.w <= 0) {
+                this.w = 1;
+            }
+            if (this.h + HEIGHT_PADDING <= 0) {
+                this.h = 1 - HEIGHT_PADDING;
+            }
+        }
+
+        @Override
+        public void run() {
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(w, h + HEIGHT_PADDING);
+            params.leftMargin = x;
+            params.topMargin = y;
+
+            if (mTextEdit == null) {
+                mTextEdit = new DummyEdit(SDL.getContext());
+
+                mLayout.addView(mTextEdit, params);
+            } else {
+                mTextEdit.setLayoutParams(params);
+            }
+
+            mTextEdit.setVisibility(View.VISIBLE);
+            mTextEdit.requestFocus();
+
+            InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(mTextEdit, 0);
+
+            mScreenKeyboardShown = true;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean showTextInput(int x, int y, int w, int h) {
+        // Transfer the task to the main thread as a Runnable
+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+    }
+
+    public static boolean isTextInputEvent(KeyEvent event) {
+
+        // Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT
+        if (event.isCtrlPressed()) {
+            return false;
+        }
+
+        return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
+    }
+
+    public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputConnection ic) {
+        int deviceId = event.getDeviceId();
+        int source = event.getSource();
+
+        if (source == InputDevice.SOURCE_UNKNOWN) {
+            InputDevice device = InputDevice.getDevice(deviceId);
+            if (device != null) {
+                source = device.getSources();
+            }
+        }
+
+//        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+//            Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+//            Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        }
+
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
+        //
+        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
+        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
+        // So, retrieve the device itself and check all of its sources
+        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
+            // Note that we process events with specific key codes here
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
+                /*
+                 * CUSTOM ADDITION FOR MINETEST
+                 * should be upstreamed
+                 */
+                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
+            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+            // they are ignored here because sending them as mouse input to SDL is messy
+            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
+                switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                case KeyEvent.ACTION_UP:
+                    // mark the event as handled or it will be handled by system
+                    // handling KEYCODE_BACK by system will call onBackPressed()
+                    return true;
+                }
+            }
+        }
+
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (isTextInputEvent(event)) {
+                if (ic != null) {
+                    ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                } else {
+                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                }
+            }
+            onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            onNativeKeyUp(keyCode);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static Surface getNativeSurface() {
+        if (SDLActivity.mSurface == null) {
+            return null;
+        }
+        return SDLActivity.mSurface.getNativeSurface();
+    }
+
+    // Input
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void initTouch() {
+        int[] ids = InputDevice.getDeviceIds();
+
+        for (int id : ids) {
+            InputDevice device = InputDevice.getDevice(id);
+            /* Allow SOURCE_TOUCHSCREEN and also Virtual InputDevices because they can send TOUCHSCREEN events */
+            if (device != null && ((device.getSources() & InputDevice.SOURCE_TOUCHSCREEN) == InputDevice.SOURCE_TOUCHSCREEN
+                    || device.isVirtual())) {
+
+                int touchDevId = device.getId();
+                /*
+                 * Prevent id to be -1, since it's used in SDL internal for synthetic events
+                 * Appears when using Android emulator, eg:
+                 *  adb shell input mouse tap 100 100
+                 *  adb shell input touchscreen tap 100 100
+                 */
+                if (touchDevId < 0) {
+                    touchDevId -= 1;
+                }
+                nativeAddTouch(touchDevId, device.getName());
+            }
+        }
+    }
+
+    // Messagebox
+
+    /** Result of current messagebox. Also used for blocking the calling thread. */
+    protected final int[] messageboxSelection = new int[1];
+
+    /**
+     * This method is called by SDL using JNI.
+     * Shows the messagebox from UI thread and block calling thread.
+     * buttonFlags, buttonIds and buttonTexts must have same length.
+     * @param buttonFlags array containing flags for every button.
+     * @param buttonIds array containing id for every button.
+     * @param buttonTexts array containing text for every button.
+     * @param colors null for default or array of length 5 containing colors.
+     * @return button id or -1.
+     */
+    public int messageboxShowMessageBox(
+            final int flags,
+            final String title,
+            final String message,
+            final int[] buttonFlags,
+            final int[] buttonIds,
+            final String[] buttonTexts,
+            final int[] colors) {
+
+        messageboxSelection[0] = -1;
+
+        // sanity checks
+
+        if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+            return -1; // implementation broken
+        }
+
+        // collect arguments for Dialog
+
+        final Bundle args = new Bundle();
+        args.putInt("flags", flags);
+        args.putString("title", title);
+        args.putString("message", message);
+        args.putIntArray("buttonFlags", buttonFlags);
+        args.putIntArray("buttonIds", buttonIds);
+        args.putStringArray("buttonTexts", buttonTexts);
+        args.putIntArray("colors", colors);
+
+        // trigger Dialog creation on UI thread
+
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                messageboxCreateAndShow(args);
+            }
+        });
+
+        // block the calling thread
+
+        synchronized (messageboxSelection) {
+            try {
+                messageboxSelection.wait();
+            } catch (InterruptedException ex) {
+                ex.printStackTrace();
+                return -1;
+            }
+        }
+
+        // return selected value
+
+        return messageboxSelection[0];
+    }
+
+    protected void messageboxCreateAndShow(Bundle args) {
+
+        // TODO set values from "flags" to messagebox dialog
+
+        // get colors
+
+        int[] colors = args.getIntArray("colors");
+        int backgroundColor;
+        int textColor;
+        int buttonBorderColor;
+        int buttonBackgroundColor;
+        int buttonSelectedColor;
+        if (colors != null) {
+            int i = -1;
+            backgroundColor = colors[++i];
+            textColor = colors[++i];
+            buttonBorderColor = colors[++i];
+            buttonBackgroundColor = colors[++i];
+            buttonSelectedColor = colors[++i];
+        } else {
+            backgroundColor = Color.TRANSPARENT;
+            textColor = Color.TRANSPARENT;
+            buttonBorderColor = Color.TRANSPARENT;
+            buttonBackgroundColor = Color.TRANSPARENT;
+            buttonSelectedColor = Color.TRANSPARENT;
+        }
+
+        // create dialog with title and a listener to wake up calling thread
+
+        final AlertDialog dialog = new AlertDialog.Builder(this).create();
+        dialog.setTitle(args.getString("title"));
+        dialog.setCancelable(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface unused) {
+                synchronized (messageboxSelection) {
+                    messageboxSelection.notify();
+                }
+            }
+        });
+
+        // create text
+
+        TextView message = new TextView(this);
+        message.setGravity(Gravity.CENTER);
+        message.setText(args.getString("message"));
+        if (textColor != Color.TRANSPARENT) {
+            message.setTextColor(textColor);
+        }
+
+        // create buttons
+
+        int[] buttonFlags = args.getIntArray("buttonFlags");
+        int[] buttonIds = args.getIntArray("buttonIds");
+        String[] buttonTexts = args.getStringArray("buttonTexts");
+
+        final SparseArray<Button> mapping = new SparseArray<Button>();
+
+        LinearLayout buttons = new LinearLayout(this);
+        buttons.setOrientation(LinearLayout.HORIZONTAL);
+        buttons.setGravity(Gravity.CENTER);
+        for (int i = 0; i < buttonTexts.length; ++i) {
+            Button button = new Button(this);
+            final int id = buttonIds[i];
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    messageboxSelection[0] = id;
+                    dialog.dismiss();
+                }
+            });
+            if (buttonFlags[i] != 0) {
+                // see SDL_messagebox.h
+                if ((buttonFlags[i] & 0x00000001) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ENTER, button);
+                }
+                if ((buttonFlags[i] & 0x00000002) != 0) {
+                    mapping.put(KeyEvent.KEYCODE_ESCAPE, button); /* API 11 */
+                }
+            }
+            button.setText(buttonTexts[i]);
+            if (textColor != Color.TRANSPARENT) {
+                button.setTextColor(textColor);
+            }
+            if (buttonBorderColor != Color.TRANSPARENT) {
+                // TODO set color for border of messagebox button
+            }
+            if (buttonBackgroundColor != Color.TRANSPARENT) {
+                Drawable drawable = button.getBackground();
+                if (drawable == null) {
+                    // setting the color this way removes the style
+                    button.setBackgroundColor(buttonBackgroundColor);
+                } else {
+                    // setting the color this way keeps the style (gradient, padding, etc.)
+                    drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+                }
+            }
+            if (buttonSelectedColor != Color.TRANSPARENT) {
+                // TODO set color for selected messagebox button
+            }
+            buttons.addView(button);
+        }
+
+        // create content
+
+        LinearLayout content = new LinearLayout(this);
+        content.setOrientation(LinearLayout.VERTICAL);
+        content.addView(message);
+        content.addView(buttons);
+        if (backgroundColor != Color.TRANSPARENT) {
+            content.setBackgroundColor(backgroundColor);
+        }
+
+        // add content to dialog and return
+
+        dialog.setView(content);
+        dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+                Button button = mapping.get(keyCode);
+                if (button != null) {
+                    if (event.getAction() == KeyEvent.ACTION_UP) {
+                        button.performClick();
+                    }
+                    return true; // also for ignored actions
+                }
+                return false;
+            }
+        });
+
+        dialog.show();
+    }
+
+    private final Runnable rehideSystemUi = new Runnable() {
+        @Override
+        public void run() {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+
+                SDLActivity.this.getWindow().getDecorView().setSystemUiVisibility(flags);
+            }
+        }
+    };
+
+    public void onSystemUiVisibilityChange(int visibility) {
+        if (SDLActivity.mFullscreenModeActive && ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0 || (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0)) {
+
+            Handler handler = getWindow().getDecorView().getHandler();
+            if (handler != null) {
+                handler.removeCallbacks(rehideSystemUi); // Prevent a hide loop.
+                handler.postDelayed(rehideSystemUi, 2000);
+            }
+
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean clipboardHasText() {
+        return mClipboardHandler.clipboardHasText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static String clipboardGetText() {
+        return mClipboardHandler.clipboardGetText();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void clipboardSetText(String string) {
+        mClipboardHandler.clipboardSetText(string);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int createCustomCursor(int[] colors, int width, int height, int hotSpotX, int hotSpotY) {
+        Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888);
+        ++mLastCursorID;
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY));
+            } catch (Exception e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+        return mLastCursorID;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void destroyCustomCursor(int cursorID) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mCursors.remove(cursorID);
+            } catch (Exception e) {
+            }
+        }
+        return;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setCustomCursor(int cursorID) {
+
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(mCursors.get(cursorID));
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static boolean setSystemCursor(int cursorID) {
+        int cursor_type = 0; //PointerIcon.TYPE_NULL;
+        switch (cursorID) {
+        case SDL_SYSTEM_CURSOR_ARROW:
+            cursor_type = 1000; //PointerIcon.TYPE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_IBEAM:
+            cursor_type = 1008; //PointerIcon.TYPE_TEXT;
+            break;
+        case SDL_SYSTEM_CURSOR_WAIT:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_CROSSHAIR:
+            cursor_type = 1007; //PointerIcon.TYPE_CROSSHAIR;
+            break;
+        case SDL_SYSTEM_CURSOR_WAITARROW:
+            cursor_type = 1004; //PointerIcon.TYPE_WAIT;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENWSE:
+            cursor_type = 1017; //PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENESW:
+            cursor_type = 1016; //PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEWE:
+            cursor_type = 1014; //PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENS:
+            cursor_type = 1015; //PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEALL:
+            cursor_type = 1020; //PointerIcon.TYPE_GRAB;
+            break;
+        case SDL_SYSTEM_CURSOR_NO:
+            cursor_type = 1012; //PointerIcon.TYPE_NO_DROP;
+            break;
+        case SDL_SYSTEM_CURSOR_HAND:
+            cursor_type = 1002; //PointerIcon.TYPE_HAND;
+            break;
+        }
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            try {
+                mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void requestPermission(String permission, int requestCode) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            nativePermissionResult(requestCode, true);
+            return;
+        }
+
+        Activity activity = (Activity)getContext();
+        if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+            activity.requestPermissions(new String[]{permission}, requestCode);
+        } else {
+            nativePermissionResult(requestCode, true);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        boolean result = (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
+        nativePermissionResult(requestCode, result);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int openURL(String url)
+    {
+        try {
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+            if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
+                flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+            } else {
+                flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
+            }
+            i.addFlags(flags);
+
+            mSingleton.startActivity(i);
+        } catch (Exception ex) {
+            return -1;
+        }
+        return 0;
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int showToast(String message, int duration, int gravity, int xOffset, int yOffset)
+    {
+        if(null == mSingleton) {
+            return - 1;
+        }
+
+        try
+        {
+            class OneShotTask implements Runnable {
+                String mMessage;
+                int mDuration;
+                int mGravity;
+                int mXOffset;
+                int mYOffset;
+
+                OneShotTask(String message, int duration, int gravity, int xOffset, int yOffset) {
+                    mMessage  = message;
+                    mDuration = duration;
+                    mGravity  = gravity;
+                    mXOffset  = xOffset;
+                    mYOffset  = yOffset;
+                }
+
+                public void run() {
+                    try
+                    {
+                        Toast toast = Toast.makeText(mSingleton, mMessage, mDuration);
+                        if (mGravity >= 0) {
+                            toast.setGravity(mGravity, mXOffset, mYOffset);
+                        }
+                        toast.show();
+                    } catch(Exception ex) {
+                        Log.e(TAG, ex.getMessage());
+                    }
+                }
+            }
+            mSingleton.runOnUiThread(new OneShotTask(message, duration, gravity, xOffset, yOffset));
+        } catch(Exception ex) {
+            return -1;
+        }
+        return 0;
+    }
+}
+
+/**
+    Simple runnable to start the SDL application
+*/
+class SDLMain implements Runnable {
+    @Override
+    public void run() {
+        // Runs SDL_main()
+        String library = SDLActivity.mSingleton.getMainSharedObject();
+        String function = SDLActivity.mSingleton.getMainFunction();
+        String[] arguments = SDLActivity.mSingleton.getArguments();
+
+        try {
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_DISPLAY);
+        } catch (Exception e) {
+            Log.v("SDL", "modify thread properties failed " + e.toString());
+        }
+
+        Log.v("SDL", "Running main function " + function + " from library " + library);
+
+        SDLActivity.nativeRunMain(library, function, arguments);
+
+        Log.v("SDL", "Finished main function");
+
+        if (SDLActivity.mSingleton != null && !SDLActivity.mSingleton.isFinishing()) {
+            // Let's finish the Activity
+            SDLActivity.mSDLThread = null;
+            SDLActivity.mSingleton.finish();
+        }  // else: Activity is already being destroyed
+
+    }
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+    InputConnection ic;
+
+    public DummyEdit(Context context) {
+        super(context);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        setOnKeyListener(this);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, ic);
+    }
+
+    //
+    @Override
+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+        // FIXME: A more effective solution would be to assume our Layout to be RelativeLayout or LinearLayout
+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                SDLActivity.onNativeKeyboardFocusLost();
+            }
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        ic = new SDLInputConnection(this, true);
+
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT |
+                             InputType.TYPE_TEXT_FLAG_MULTI_LINE;
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+                              EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
+
+        return ic;
+    }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+    protected EditText mEditText;
+    protected String mCommittedText = "";
+
+    public SDLInputConnection(View targetView, boolean fullEditor) {
+        super(targetView, fullEditor);
+        mEditText = new EditText(SDL.getContext());
+    }
+
+    @Override
+    public Editable getEditable() {
+        return mEditText.getEditableText();
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        /*
+         * This used to handle the keycodes from soft keyboard (and IME-translated input from hardkeyboard)
+         * However, as of Ice Cream Sandwich and later, almost all soft keyboard doesn't generate key presses
+         * and so we need to generate them ourselves in commitText.  To avoid duplicates on the handful of keys
+         * that still do, we empty this out.
+         */
+
+        /*
+         * Return DOES still generate a key event, however.  So rather than using it as the 'click a button' key
+         * as we do with physical keyboards, let's just use it to hide the keyboard.
+         */
+
+        if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+            if (SDLActivity.onNativeSoftReturnKey()) {
+                return true;
+            }
+        }
+
+        return super.sendKeyEvent(event);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        if (!super.commitText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        if (!super.setComposingText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (Build.VERSION.SDK_INT <= 29 /* Android 10.0 (Q) */) {
+            // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection
+            // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
+            if (beforeLength > 0 && afterLength == 0) {
+                // backspace(s)
+                while (beforeLength-- > 0) {
+                    nativeGenerateScancodeForUnichar('\b');
+                }
+                return true;
+           }
+        }
+
+        if (!super.deleteSurroundingText(beforeLength, afterLength)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
+
+    protected void updateText() {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        String text = content.toString();
+        int compareLength = Math.min(text.length(), mCommittedText.length());
+        int matchLength, offset;
+
+        /* Backspace over characters that are no longer in the string */
+        for (matchLength = 0; matchLength < compareLength; ) {
+            int codePoint = mCommittedText.codePointAt(matchLength);
+            if (codePoint != text.codePointAt(matchLength)) {
+                break;
+            }
+            matchLength += Character.charCount(codePoint);
+        }
+        /* FIXME: This doesn't handle graphemes, like '🌬️' */
+        for (offset = matchLength; offset < mCommittedText.length(); ) {
+            int codePoint = mCommittedText.codePointAt(offset);
+            nativeGenerateScancodeForUnichar('\b');
+            offset += Character.charCount(codePoint);
+        }
+
+        if (matchLength < text.length()) {
+            String pendingText = text.subSequence(matchLength, text.length()).toString();
+            for (offset = 0; offset < pendingText.length(); ) {
+                int codePoint = pendingText.codePointAt(offset);
+                if (codePoint == '\n') {
+                    if (SDLActivity.onNativeSoftReturnKey()) {
+                        return;
+                    }
+                }
+                /* Higher code points don't generate simulated scancodes */
+                if (codePoint < 128) {
+                    nativeGenerateScancodeForUnichar((char)codePoint);
+                }
+                offset += Character.charCount(codePoint);
+            }
+            SDLInputConnection.nativeCommitText(pendingText, 0);
+        }
+        mCommittedText = text;
+    }
+
+    public static native void nativeCommitText(String text, int newCursorPosition);
+
+    public static native void nativeGenerateScancodeForUnichar(char c);
+}
+
+class SDLClipboardHandler implements
+    ClipboardManager.OnPrimaryClipChangedListener {
+
+    protected ClipboardManager mClipMgr;
+
+    SDLClipboardHandler() {
+       mClipMgr = (ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+       mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    public boolean clipboardHasText() {
+       return mClipMgr.hasPrimaryClip();
+    }
+
+    public String clipboardGetText() {
+        ClipData clip = mClipMgr.getPrimaryClip();
+        if (clip != null) {
+            ClipData.Item item = clip.getItemAt(0);
+            if (item != null) {
+                CharSequence text = item.getText();
+                if (text != null) {
+                    return text.toString();
+                }
+            }
+        }
+        return null;
+    }
+
+    public void clipboardSetText(String string) {
+       mClipMgr.removePrimaryClipChangedListener(this);
+       ClipData clip = ClipData.newPlainText(null, string);
+       mClipMgr.setPrimaryClip(clip);
+       mClipMgr.addPrimaryClipChangedListener(this);
+    }
+
+    @Override
+    public void onPrimaryClipChanged() {
+        SDLActivity.onNativeClipboardChanged();
+    }
+}
+
diff --git a/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
new file mode 100644
index 000000000..7c821a409
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
@@ -0,0 +1,514 @@
+package org.libsdl.app;
+
+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.util.Log;
+
+import java.util.Arrays;
+
+public class SDLAudioManager {
+    protected static final String TAG = "SDLAudio";
+
+    protected static AudioTrack mAudioTrack;
+    protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;
+
+    public static void initialize() {
+        mAudioTrack = null;
+        mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
+    }
+
+    // Audio
+
+    protected static String getAudioFormatString(int audioFormat) {
+        switch (audioFormat) {
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
+        }
+    }
+
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        int channelConfig;
+        int sampleSize;
+        int frameSize;
+
+        Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");
+
+        /* On older devices let's use known good settings */
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            if (desiredChannels > 2) {
+                desiredChannels = 2;
+            }
+        }
+
+        /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
+            if (sampleRate < 8000) {
+                sampleRate = 8000;
+            } else if (sampleRate > 48000) {
+                sampleRate = 48000;
+            }
+        }
+
+        if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
+            if (Build.VERSION.SDK_INT < minSDKVersion) {
+                audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+            }
+        }
+        switch (audioFormat)
+        {
+        case AudioFormat.ENCODING_PCM_8BIT:
+            sampleSize = 1;
+            break;
+        case AudioFormat.ENCODING_PCM_16BIT:
+            sampleSize = 2;
+            break;
+        case AudioFormat.ENCODING_PCM_FLOAT:
+            sampleSize = 4;
+            break;
+        default:
+            Log.v(TAG, "Requested format " + audioFormat + ", getting ENCODING_PCM_16BIT");
+            audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+            sampleSize = 2;
+            break;
+        }
+
+        if (isCapture) {
+            switch (desiredChannels) {
+            case 1:
+                channelConfig = AudioFormat.CHANNEL_IN_MONO;
+                break;
+            case 2:
+                channelConfig = AudioFormat.CHANNEL_IN_STEREO;
+                break;
+            default:
+                Log.v(TAG, "Requested " + desiredChannels + " channels, getting stereo");
+                desiredChannels = 2;
+                channelConfig = AudioFormat.CHANNEL_IN_STEREO;
+                break;
+            }
+        } else {
+            switch (desiredChannels) {
+            case 1:
+                channelConfig = AudioFormat.CHANNEL_OUT_MONO;
+                break;
+            case 2:
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+                break;
+            case 3:
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+                break;
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 5:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+                break;
+            case 6:
+                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
+                break;
+            case 7:
+                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
+                } else {
+                    Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
+                    desiredChannels = 6;
+                    channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
+                }
+                break;
+            default:
+                Log.v(TAG, "Requested " + desiredChannels + " channels, getting stereo");
+                desiredChannels = 2;
+                channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
+                break;
+            }
+
+/*
+            Log.v(TAG, "Speaker configuration (and order of channels):");
+
+            if ((channelConfig & 0x00000004) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_LEFT");
+            }
+            if ((channelConfig & 0x00000008) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_RIGHT");
+            }
+            if ((channelConfig & 0x00000010) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_CENTER");
+            }
+            if ((channelConfig & 0x00000020) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_LOW_FREQUENCY");
+            }
+            if ((channelConfig & 0x00000040) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_LEFT");
+            }
+            if ((channelConfig & 0x00000080) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_RIGHT");
+            }
+            if ((channelConfig & 0x00000100) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_LEFT_OF_CENTER");
+            }
+            if ((channelConfig & 0x00000200) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_FRONT_RIGHT_OF_CENTER");
+            }
+            if ((channelConfig & 0x00000400) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_BACK_CENTER");
+            }
+            if ((channelConfig & 0x00000800) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_SIDE_LEFT");
+            }
+            if ((channelConfig & 0x00001000) != 0) {
+                Log.v(TAG, "   CHANNEL_OUT_SIDE_RIGHT");
+            }
+*/
+        }
+        frameSize = (sampleSize * desiredChannels);
+
+        // Let the user pick a larger buffer if they really want -- but ye
+        // gods they probably shouldn't, the minimums are horrifyingly high
+        // latency already
+        int minBufferSize;
+        if (isCapture) {
+            minBufferSize = AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat);
+        } else {
+            minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat);
+        }
+        desiredFrames = Math.max(desiredFrames, (minBufferSize + frameSize - 1) / frameSize);
+
+        int[] results = new int[4];
+
+        if (isCapture) {
+            if (mAudioRecord == null) {
+                mAudioRecord = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, sampleRate,
+                        channelConfig, audioFormat, desiredFrames * frameSize);
+
+                // see notes about AudioTrack state in audioOpen(), above. Probably also applies here.
+                if (mAudioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+                    Log.e(TAG, "Failed during initialization of AudioRecord");
+                    mAudioRecord.release();
+                    mAudioRecord = null;
+                    return null;
+                }
+
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
+                mAudioRecord.startRecording();
+            }
+
+            results[0] = mAudioRecord.getSampleRate();
+            results[1] = mAudioRecord.getAudioFormat();
+            results[2] = mAudioRecord.getChannelCount();
+
+        } else {
+            if (mAudioTrack == null) {
+                mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+                // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+                // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+                // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+                if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+                    /* Try again, with safer values */
+
+                    Log.e(TAG, "Failed during initialization of Audio Track");
+                    mAudioTrack.release();
+                    mAudioTrack = null;
+                    return null;
+                }
+
+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
+                mAudioTrack.play();
+            }
+
+            results[0] = mAudioTrack.getSampleRate();
+            results[1] = mAudioTrack.getAudioFormat();
+            results[2] = mAudioTrack.getChannelCount();
+        }
+        results[3] = desiredFrames;
+
+        Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", got " + results[3] + " frames of " + results[2] + " channel " + getAudioFormatString(results[1]) + " audio at " + results[0] + " Hz");
+
+        return results;
+    }
+
+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteFloatBuffer(float[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length;) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(float)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteShortBuffer(short[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length;) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(short)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void audioWriteByteBuffer(byte[] buffer) {
+        if (mAudioTrack == null) {
+            Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
+            return;
+        }
+
+        for (int i = 0; i < buffer.length; ) {
+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
+            if (result > 0) {
+                i += result;
+            } else if (result == 0) {
+                try {
+                    Thread.sleep(1);
+                } catch(InterruptedException e) {
+                    // Nom nom
+                }
+            } else {
+                Log.w(TAG, "SDL audio: error return from write(byte)");
+                return;
+            }
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return mAudioRecord.read(buffer, 0, buffer.length);
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return mAudioRecord.read(buffer, 0, buffer.length);
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void audioClose() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+            mAudioTrack.release();
+            mAudioTrack = null;
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void captureClose() {
+        if (mAudioRecord != null) {
+            mAudioRecord.stop();
+            mAudioRecord.release();
+            mAudioRecord = null;
+        }
+    }
+
+    /** This method is called by SDL using JNI. */
+    public static void audioSetThreadPriority(boolean iscapture, int device_id) {
+        try {
+
+            /* Set thread name */
+            if (iscapture) {
+                Thread.currentThread().setName("SDLAudioC" + device_id);
+            } else {
+                Thread.currentThread().setName("SDLAudioP" + device_id);
+            }
+
+            /* Set thread priority */
+            android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_AUDIO);
+
+        } catch (Exception e) {
+            Log.v(TAG, "modify thread properties failed " + e.toString());
+        }
+    }
+
+    public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
+}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
new file mode 100644
index 000000000..d6913f157
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -0,0 +1,854 @@
+package org.libsdl.app;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+public class SDLControllerManager
+{
+
+    public static native int nativeSetupJNI();
+
+    public static native int nativeAddJoystick(int device_id, String name, String desc,
+                                               int vendor_id, int product_id,
+                                               boolean is_accelerometer, int button_mask,
+                                               int naxes, int axis_mask, int nhats, int nballs);
+    public static native int nativeRemoveJoystick(int device_id);
+    public static native int nativeAddHaptic(int device_id, String name);
+    public static native int nativeRemoveHaptic(int device_id);
+    public static native int onNativePadDown(int device_id, int keycode);
+    public static native int onNativePadUp(int device_id, int keycode);
+    public static native void onNativeJoy(int device_id, int axis,
+                                          float value);
+    public static native void onNativeHat(int device_id, int hat_id,
+                                          int x, int y);
+
+    protected static SDLJoystickHandler mJoystickHandler;
+    protected static SDLHapticHandler mHapticHandler;
+
+    private static final String TAG = "SDLControllerManager";
+
+    public static void initialize() {
+        if (mJoystickHandler == null) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
+                mJoystickHandler = new SDLJoystickHandler_API19();
+            } else {
+                mJoystickHandler = new SDLJoystickHandler_API16();
+            }
+        }
+
+        if (mHapticHandler == null) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
+                mHapticHandler = new SDLHapticHandler_API26();
+            } else {
+                mHapticHandler = new SDLHapticHandler();
+            }
+        }
+    }
+
+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
+        return mJoystickHandler.handleMotionEvent(event);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollInputDevices() {
+        mJoystickHandler.pollInputDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void pollHapticDevices() {
+        mHapticHandler.pollHapticDevices();
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void hapticRun(int device_id, float intensity, int length) {
+        mHapticHandler.run(device_id, intensity, length);
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static void hapticStop(int device_id)
+    {
+        mHapticHandler.stop(device_id);
+    }
+
+    // Check if a given device is considered a possible SDL joystick
+    public static boolean isDeviceSDLJoystick(int deviceId) {
+        InputDevice device = InputDevice.getDevice(deviceId);
+        // We cannot use InputDevice.isVirtual before API 16, so let's accept
+        // only nonnegative device ids (VIRTUAL_KEYBOARD equals -1)
+        if ((device == null) || (deviceId < 0)) {
+            return false;
+        }
+        int sources = device.getSources();
+
+        /* This is called for every button press, so let's not spam the logs */
+        /*
+        if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+            Log.v(TAG, "Input device " + device.getName() + " has class joystick.");
+        }
+        if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a dpad.");
+        }
+        if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
+            Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
+        }
+        */
+
+        return ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ||
+                ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
+                ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
+        );
+    }
+
+}
+
+class SDLJoystickHandler {
+
+    /**
+     * Handles given MotionEvent.
+     * @param event the event to be handled.
+     * @return if given event was processed.
+     */
+    public boolean handleMotionEvent(MotionEvent event) {
+        return false;
+    }
+
+    /**
+     * Handles adding and removing of input devices.
+     */
+    public void pollInputDevices() {
+    }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API16 extends SDLJoystickHandler {
+
+    static class SDLJoystick {
+        public int device_id;
+        public String name;
+        public String desc;
+        public ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> hats;
+    }
+    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+        @Override
+        public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+            // Some controllers, like the Moga Pro 2, return AXIS_GAS (22) for right trigger and AXIS_BRAKE (23) for left trigger - swap them so they're sorted in the right order for SDL
+            int arg0Axis = arg0.getAxis();
+            int arg1Axis = arg1.getAxis();
+            if (arg0Axis == MotionEvent.AXIS_GAS) {
+                arg0Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg0Axis == MotionEvent.AXIS_BRAKE) {
+                arg0Axis = MotionEvent.AXIS_GAS;
+            }
+            if (arg1Axis == MotionEvent.AXIS_GAS) {
+                arg1Axis = MotionEvent.AXIS_BRAKE;
+            } else if (arg1Axis == MotionEvent.AXIS_BRAKE) {
+                arg1Axis = MotionEvent.AXIS_GAS;
+            }
+
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
+            return arg0Axis - arg1Axis;
+        }
+    }
+
+    private final ArrayList<SDLJoystick> mJoysticks;
+
+    public SDLJoystickHandler_API16() {
+
+        mJoysticks = new ArrayList<SDLJoystick>();
+    }
+
+    @Override
+    public void pollInputDevices() {
+        int[] deviceIds = InputDevice.getDeviceIds();
+
+        for (int device_id : deviceIds) {
+            if (SDLControllerManager.isDeviceSDLJoystick(device_id)) {
+                SDLJoystick joystick = getJoystick(device_id);
+                if (joystick == null) {
+                    InputDevice joystickDevice = InputDevice.getDevice(device_id);
+                    joystick = new SDLJoystick();
+                    joystick.device_id = device_id;
+                    joystick.name = joystickDevice.getName();
+                    joystick.desc = getJoystickDescriptor(joystickDevice);
+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
+                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
+
+                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+                    Collections.sort(ranges, new RangeComparator());
+                    for (InputDevice.MotionRange range : ranges) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+                                joystick.hats.add(range);
+                            } else {
+                                joystick.axes.add(range);
+                            }
+                        }
+                    }
+
+                    mJoysticks.add(joystick);
+                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
+                            getVendorId(joystickDevice), getProductId(joystickDevice), false,
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLJoystick joystick : mJoysticks) {
+            int device_id = joystick.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
+            }
+            if (i == deviceIds.length) {
+                if (removedDevices == null) {
+                    removedDevices = new ArrayList<Integer>();
+                }
+                removedDevices.add(device_id);
+            }
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveJoystick(device_id);
+                for (int i = 0; i < mJoysticks.size(); i++) {
+                    if (mJoysticks.get(i).device_id == device_id) {
+                        mJoysticks.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    protected SDLJoystick getJoystick(int device_id) {
+        for (SDLJoystick joystick : mJoysticks) {
+            if (joystick.device_id == device_id) {
+                return joystick;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean handleMotionEvent(MotionEvent event) {
+        int actionPointerIndex = event.getActionIndex();
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_MOVE) {
+            SDLJoystick joystick = getJoystick(event.getDeviceId());
+            if (joystick != null) {
+                for (int i = 0; i < joystick.axes.size(); i++) {
+                    InputDevice.MotionRange range = joystick.axes.get(i);
+                    /* Normalize the value to -1...1 */
+                    float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
+                    SDLControllerManager.onNativeJoy(joystick.device_id, i, value);
+                }
+                for (int i = 0; i < joystick.hats.size() / 2; i++) {
+                    int hatX = Math.round(event.getAxisValue(joystick.hats.get(2 * i).getAxis(), actionPointerIndex));
+                    int hatY = Math.round(event.getAxisValue(joystick.hats.get(2 * i + 1).getAxis(), actionPointerIndex));
+                    SDLControllerManager.onNativeHat(joystick.device_id, i, hatX, hatY);
+                }
+            }
+        }
+        return true;
+    }
+
+    public String getJoystickDescriptor(InputDevice joystickDevice) {
+        String desc = joystickDevice.getDescriptor();
+
+        if (desc != null && !desc.isEmpty()) {
+            return desc;
+        }
+
+        return joystickDevice.getName();
+    }
+    public int getProductId(InputDevice joystickDevice) {
+        return 0;
+    }
+    public int getVendorId(InputDevice joystickDevice) {
+        return 0;
+    }
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        return -1;
+    }
+    public int getButtonMask(InputDevice joystickDevice) {
+        return -1;
+    }
+}
+
+class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
+
+    @Override
+    public int getProductId(InputDevice joystickDevice) {
+        return joystickDevice.getProductId();
+    }
+
+    @Override
+    public int getVendorId(InputDevice joystickDevice) {
+        return joystickDevice.getVendorId();
+    }
+
+    @Override
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
+    @Override
+    public int getButtonMask(InputDevice joystickDevice) {
+        int button_mask = 0;
+        int[] keys = new int[] {
+            KeyEvent.KEYCODE_BUTTON_A,
+            KeyEvent.KEYCODE_BUTTON_B,
+            KeyEvent.KEYCODE_BUTTON_X,
+            KeyEvent.KEYCODE_BUTTON_Y,
+            KeyEvent.KEYCODE_BACK,
+            KeyEvent.KEYCODE_MENU,
+            KeyEvent.KEYCODE_BUTTON_MODE,
+            KeyEvent.KEYCODE_BUTTON_START,
+            KeyEvent.KEYCODE_BUTTON_THUMBL,
+            KeyEvent.KEYCODE_BUTTON_THUMBR,
+            KeyEvent.KEYCODE_BUTTON_L1,
+            KeyEvent.KEYCODE_BUTTON_R1,
+            KeyEvent.KEYCODE_DPAD_UP,
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_LEFT,
+            KeyEvent.KEYCODE_DPAD_RIGHT,
+            KeyEvent.KEYCODE_BUTTON_SELECT,
+            KeyEvent.KEYCODE_DPAD_CENTER,
+
+            // These don't map into any SDL controller buttons directly
+            KeyEvent.KEYCODE_BUTTON_L2,
+            KeyEvent.KEYCODE_BUTTON_R2,
+            KeyEvent.KEYCODE_BUTTON_C,
+            KeyEvent.KEYCODE_BUTTON_Z,
+            KeyEvent.KEYCODE_BUTTON_1,
+            KeyEvent.KEYCODE_BUTTON_2,
+            KeyEvent.KEYCODE_BUTTON_3,
+            KeyEvent.KEYCODE_BUTTON_4,
+            KeyEvent.KEYCODE_BUTTON_5,
+            KeyEvent.KEYCODE_BUTTON_6,
+            KeyEvent.KEYCODE_BUTTON_7,
+            KeyEvent.KEYCODE_BUTTON_8,
+            KeyEvent.KEYCODE_BUTTON_9,
+            KeyEvent.KEYCODE_BUTTON_10,
+            KeyEvent.KEYCODE_BUTTON_11,
+            KeyEvent.KEYCODE_BUTTON_12,
+            KeyEvent.KEYCODE_BUTTON_13,
+            KeyEvent.KEYCODE_BUTTON_14,
+            KeyEvent.KEYCODE_BUTTON_15,
+            KeyEvent.KEYCODE_BUTTON_16,
+        };
+        int[] masks = new int[] {
+            (1 << 0),   // A -> A
+            (1 << 1),   // B -> B
+            (1 << 2),   // X -> X
+            (1 << 3),   // Y -> Y
+            (1 << 4),   // BACK -> BACK
+            (1 << 6),   // MENU -> START
+            (1 << 5),   // MODE -> GUIDE
+            (1 << 6),   // START -> START
+            (1 << 7),   // THUMBL -> LEFTSTICK
+            (1 << 8),   // THUMBR -> RIGHTSTICK
+            (1 << 9),   // L1 -> LEFTSHOULDER
+            (1 << 10),  // R1 -> RIGHTSHOULDER
+            (1 << 11),  // DPAD_UP -> DPAD_UP
+            (1 << 12),  // DPAD_DOWN -> DPAD_DOWN
+            (1 << 13),  // DPAD_LEFT -> DPAD_LEFT
+            (1 << 14),  // DPAD_RIGHT -> DPAD_RIGHT
+            (1 << 4),   // SELECT -> BACK
+            (1 << 0),   // DPAD_CENTER -> A
+            (1 << 15),  // L2 -> ??
+            (1 << 16),  // R2 -> ??
+            (1 << 17),  // C -> ??
+            (1 << 18),  // Z -> ??
+            (1 << 20),  // 1 -> ??
+            (1 << 21),  // 2 -> ??
+            (1 << 22),  // 3 -> ??
+            (1 << 23),  // 4 -> ??
+            (1 << 24),  // 5 -> ??
+            (1 << 25),  // 6 -> ??
+            (1 << 26),  // 7 -> ??
+            (1 << 27),  // 8 -> ??
+            (1 << 28),  // 9 -> ??
+            (1 << 29),  // 10 -> ??
+            (1 << 30),  // 11 -> ??
+            (1 << 31),  // 12 -> ??
+            // We're out of room...
+            0xFFFFFFFF,  // 13 -> ??
+            0xFFFFFFFF,  // 14 -> ??
+            0xFFFFFFFF,  // 15 -> ??
+            0xFFFFFFFF,  // 16 -> ??
+        };
+        boolean[] has_keys = joystickDevice.hasKeys(keys);
+        for (int i = 0; i < keys.length; ++i) {
+            if (has_keys[i]) {
+                button_mask |= masks[i];
+            }
+        }
+        return button_mask;
+    }
+}
+
+class SDLHapticHandler_API26 extends SDLHapticHandler {
+    @Override
+    public void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            Log.d("SDL", "Rtest: Vibe with intensity " + intensity + " for " + length);
+            if (intensity == 0.0f) {
+                stop(device_id);
+                return;
+            }
+
+            int vibeValue = Math.round(intensity * 255);
+
+            if (vibeValue > 255) {
+                vibeValue = 255;
+            }
+            if (vibeValue < 1) {
+                stop(device_id);
+                return;
+            }
+            try {
+                haptic.vib.vibrate(VibrationEffect.createOneShot(length, vibeValue));
+            }
+            catch (Exception e) {
+                // Fall back to the generic method, which uses DEFAULT_AMPLITUDE, but works even if
+                // something went horribly wrong with the Android 8.0 APIs.
+                haptic.vib.vibrate(length);
+            }
+        }
+    }
+}
+
+class SDLHapticHandler {
+
+    static class SDLHaptic {
+        public int device_id;
+        public String name;
+        public Vibrator vib;
+    }
+
+    private final ArrayList<SDLHaptic> mHaptics;
+
+    public SDLHapticHandler() {
+        mHaptics = new ArrayList<SDLHaptic>();
+    }
+
+    public void run(int device_id, float intensity, int length) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.vibrate(length);
+        }
+    }
+
+    public void stop(int device_id) {
+        SDLHaptic haptic = getHaptic(device_id);
+        if (haptic != null) {
+            haptic.vib.cancel();
+        }
+    }
+
+    public void pollHapticDevices() {
+
+        final int deviceId_VIBRATOR_SERVICE = 999999;
+        boolean hasVibratorService = false;
+
+        int[] deviceIds = InputDevice.getDeviceIds();
+        // It helps processing the device ids in reverse order
+        // For example, in the case of the XBox 360 wireless dongle,
+        // so the first controller seen by SDL matches what the receiver
+        // considers to be the first controller
+
+        for (int i = deviceIds.length - 1; i > -1; i--) {
+            SDLHaptic haptic = getHaptic(deviceIds[i]);
+            if (haptic == null) {
+                InputDevice device = InputDevice.getDevice(deviceIds[i]);
+                Vibrator vib = device.getVibrator();
+                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);
+                }
+            }
+        }
+
+        /* Check VIBRATOR_SERVICE */
+        Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE);
+        if (vib != null) {
+            hasVibratorService = vib.hasVibrator();
+
+            if (hasVibratorService) {
+                SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
+                if (haptic == null) {
+                    haptic = new SDLHaptic();
+                    haptic.device_id = deviceId_VIBRATOR_SERVICE;
+                    haptic.name = "VIBRATOR_SERVICE";
+                    haptic.vib = vib;
+                    mHaptics.add(haptic);
+                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
+                }
+            }
+        }
+
+        /* Check removed devices */
+        ArrayList<Integer> removedDevices = null;
+        for (SDLHaptic haptic : mHaptics) {
+            int device_id = haptic.device_id;
+            int i;
+            for (i = 0; i < deviceIds.length; i++) {
+                if (device_id == deviceIds[i]) break;
+            }
+
+            if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
+                if (i == deviceIds.length) {
+                    if (removedDevices == null) {
+                        removedDevices = new ArrayList<Integer>();
+                    }
+                    removedDevices.add(device_id);
+                }
+            }  // else: don't remove the vibrator if it is still present
+        }
+
+        if (removedDevices != null) {
+            for (int device_id : removedDevices) {
+                SDLControllerManager.nativeRemoveHaptic(device_id);
+                for (int i = 0; i < mHaptics.size(); i++) {
+                    if (mHaptics.get(i).device_id == device_id) {
+                        mHaptics.remove(i);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    protected SDLHaptic getHaptic(int device_id) {
+        for (SDLHaptic haptic : mHaptics) {
+            if (haptic.device_id == device_id) {
+                return haptic;
+            }
+        }
+        return null;
+    }
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+    // Generic Motion (mouse hover, joystick...) events go here
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+                return SDLControllerManager.handleJoystickMotionEvent(event);
+
+            case InputDevice.SOURCE_MOUSE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+
+    public boolean supportsRelativeMouse() {
+        return false;
+    }
+
+    public boolean inRelativeMode() {
+        return false;
+    }
+
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        return false;
+    }
+
+    public void reclaimRelativeMouseModeIfNeeded()
+    {
+
+    }
+
+    public float getEventX(MotionEvent event) {
+        return event.getX(0);
+    }
+
+    public float getEventY(MotionEvent event) {
+        return event.getY(0);
+    }
+
+}
+
+class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API12 {
+    // Generic Motion (mouse hover, joystick...) events go here
+
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+
+        // Handle relative mouse mode
+        if (mRelativeModeEnabled) {
+            if (event.getSource() == InputDevice.SOURCE_MOUSE) {
+                int action = event.getActionMasked();
+                if (action == MotionEvent.ACTION_HOVER_MOVE) {
+                    float x = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+                    float y = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+                    SDLActivity.onNativeMouse(0, action, x, y, true);
+                    return true;
+                }
+            }
+        }
+
+        // Event was not managed, call SDLGenericMotionListener_API12 method
+        return super.onGenericMotion(v, event);
+    }
+
+    @Override
+    public boolean supportsRelativeMouse() {
+        return true;
+    }
+
+    @Override
+    public boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        mRelativeModeEnabled = enabled;
+        return true;
+    }
+
+    @Override
+    public float getEventX(MotionEvent event) {
+        if (mRelativeModeEnabled) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+        } else {
+            return event.getX(0);
+        }
+    }
+
+    @Override
+    public float getEventY(MotionEvent event) {
+        if (mRelativeModeEnabled) {
+            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+        } else {
+            return event.getY(0);
+        }
+    }
+}
+
+class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
+    // Generic Motion (mouse hover, joystick...) events go here
+    private boolean mRelativeModeEnabled;
+
+    @Override
+    public boolean onGenericMotion(View v, MotionEvent event) {
+        float x, y;
+        int action;
+
+        switch ( event.getSource() ) {
+            case InputDevice.SOURCE_JOYSTICK:
+                return SDLControllerManager.handleJoystickMotionEvent(event);
+
+            case InputDevice.SOURCE_MOUSE:
+            // DeX desktop mouse cursor is a separate non-standard input type.
+            case InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            case InputDevice.SOURCE_MOUSE_RELATIVE:
+                action = event.getActionMasked();
+                switch (action) {
+                    case MotionEvent.ACTION_SCROLL:
+                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                        SDLActivity.onNativeMouse(0, action, x, y, false);
+                        return true;
+
+                    case MotionEvent.ACTION_HOVER_MOVE:
+                        x = event.getX(0);
+                        y = event.getY(0);
+                        SDLActivity.onNativeMouse(0, action, x, y, true);
+                        return true;
+
+                    default:
+                        break;
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // Event was not managed
+        return false;
+    }
+
+    @Override
+    public boolean supportsRelativeMouse() {
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
+    }
+
+    @Override
+    public boolean inRelativeMode() {
+        return mRelativeModeEnabled;
+    }
+
+    @Override
+    public boolean setRelativeMouseEnabled(boolean enabled) {
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
+            if (enabled) {
+                SDLActivity.getContentView().requestPointerCapture();
+            } else {
+                SDLActivity.getContentView().releasePointerCapture();
+            }
+            mRelativeModeEnabled = enabled;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void reclaimRelativeMouseModeIfNeeded()
+    {
+        if (mRelativeModeEnabled && !SDLActivity.isDeXMode()) {
+            SDLActivity.getContentView().requestPointerCapture();
+        }
+    }
+
+    @Override
+    public float getEventX(MotionEvent event) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getX(0);
+    }
+
+    @Override
+    public float getEventY(MotionEvent event) {
+        // Relative mouse in capture mode will only have relative for X/Y
+        return event.getY(0);
+    }
+}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLSurface.java b/android/app/src/main/java/org/libsdl/app/SDLSurface.java
new file mode 100644
index 000000000..0857e4b6f
--- /dev/null
+++ b/android/app/src/main/java/org/libsdl/app/SDLSurface.java
@@ -0,0 +1,405 @@
+package org.libsdl.app;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    public boolean mIsSurfaceReady;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    public void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        try
+        {
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                mDisplay.getRealMetrics( realMetrics );
+                nDeviceWidth = realMetrics.widthPixels;
+                nDeviceHeight = realMetrics.heightPixels;
+            }
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip in MultiWindow.
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
+                    Log.v("SDL", "Don't skip in Multi-Window");
+                    skip = false;
+                }
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+
+        /*
+         * Prevent id to be -1, since it's used in SDL internal for synthetic events
+         * Appears when using Android emulator, eg:
+         *  adb shell input mouse tap 100 100
+         *  adb shell input touchscreen tap 100 100
+         */
+        if (touchDevId < 0) {
+            touchDevId -= 1;
+        }
+
+        // 12290 = Samsung DeX mode desktop mouse
+        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
+        // 0x2   = SOURCE_CLASS_POINTER
+        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
+            int mouseButton = 1;
+            try {
+                Object object = event.getClass().getMethod("getButtonState").invoke(event);
+                if (object != null) {
+                    mouseButton = (Integer) object;
+                }
+            } catch(Exception ignored) {
+            }
+
+            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+            // if we are.  We'll leverage our existing mouse motion listener
+            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
+            x = motionListener.getEventX(event);
+            y = motionListener.getEventY(event);
+
+            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                    /* fallthrough */
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newOrientation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                    break;
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
+                    break;
+            }
+
+            if (newOrientation != SDLActivity.mCurrentOrientation) {
+                SDLActivity.mCurrentOrientation = newOrientation;
+                SDLActivity.onNativeOrientationChanged(newOrientation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Captured pointer events for API 26.
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+
+        float x, y;
+        switch (action) {
+            case MotionEvent.ACTION_SCROLL:
+                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                SDLActivity.onNativeMouse(0, action, x, y, false);
+                return true;
+
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_MOVE:
+                x = event.getX(0);
+                y = event.getY(0);
+                SDLActivity.onNativeMouse(0, action, x, y, true);
+                return true;
+
+            case MotionEvent.ACTION_BUTTON_PRESS:
+            case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                // Change our action value to what SDL's code expects.
+                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                    action = MotionEvent.ACTION_DOWN;
+                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                    action = MotionEvent.ACTION_UP;
+                }
+
+                x = event.getX(0);
+                y = event.getY(0);
+                int button = event.getButtonState();
+
+                SDLActivity.onNativeMouse(button, action, x, y, true);
+                return true;
+        }
+
+        return false;
+    }
+}
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index d8bb7ac68..5885a7b7a 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -2,7 +2,10 @@
 <resources>
 	<string name="label">Minetest</string>
 	<string name="loading">Loading&#8230;</string>
-	<string name="notification_title">Loading Minetest</string>
-	<string name="notification_description">Less than 1 minute&#8230;</string>
+	<string name="notification_channel_name">General notification</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>
 </resources>
diff --git a/android/build.gradle b/android/build.gradle
index cfe4bdfc2..06030cd5c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,10 +1,10 @@
 // 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", 8)      // Version Minor
+project.ext.set("versionMinor", 9)      // Version Minor
 project.ext.set("versionPatch", 0)      // Version Patch
 // ^ keep in sync with cmake
-project.ext.set("versionCode", 46)      // Android Version Code
+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
@@ -16,7 +16,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.4.1'
+		classpath 'com.android.tools.build:gradle:8.5.1'
 		classpath 'de.undercouch:gradle-download-task:4.1.1'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/android/gradle.properties b/android/gradle.properties
index 8d5c2efb6..238ccd7a7 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,7 +1,7 @@
 <#if isLowMemory>
-org.gradle.jvmargs=-Xmx4G -XX:MaxPermSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 <#else>
-org.gradle.jvmargs=-Xmx16G -XX:MaxPermSize=8G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx16G -XX:+HeapDumpOnOutOfMemoryError
 </#if>
 org.gradle.daemon=true
 org.gradle.parallel=true
@@ -9,3 +9,5 @@ org.gradle.parallel.threads=8
 org.gradle.configureondemand=true
 android.enableJetifier=false
 android.useAndroidX=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..d64cd4917 100644
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 0e9a61051..b82aa23a4 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/android/gradlew b/android/gradlew
index 25e0c1148..1aa94a426 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,111 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    command -v java >/dev/null || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
deleted file mode 100644
index 9618d8d96..000000000
--- a/android/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/android/native/build.gradle b/android/native/build.gradle
index 47b78ea9c..806dda2f0 100644
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -2,17 +2,16 @@ apply plugin: 'com.android.library'
 apply plugin: 'de.undercouch.download'
 
 android {
-	compileSdkVersion 33
-	buildToolsVersion '33.0.2'
 	ndkVersion "$ndk_version"
 	defaultConfig {
 		minSdkVersion 21
-		targetSdkVersion 33
+		compileSdk 34
+		targetSdkVersion 34
 		externalNativeBuild {
-            cmake {
+			cmake {
 				arguments "-DANDROID_STL=c++_shared",
 					"-DENABLE_CURL=1", "-DENABLE_SOUND=1",
-					"-DENABLE_TOUCH=1", "-DENABLE_GETTEXT=1",
+					"-DENABLE_GETTEXT=1",
 					"-DBUILD_UNITTESTS=0", "-DENABLE_UPDATE_CHECKER=0"
 			}
 		}
@@ -36,26 +35,33 @@ android {
 	buildTypes {
 		release {
 			ndk {
-				debugSymbolLevel 'SYMBOL_TABLE'
+				debugSymbolLevel 'FULL'
 			}
 		}
 	}
+	namespace 'net.minetest'
 }
 
 // get precompiled deps
-task downloadDeps(type: Download) {
-	def depsDir = new File(buildDir.parent, 'deps')
-	def depsZip = new File(buildDir, 'deps.zip')
+def depsDir = new File(buildDir.parent, 'deps')
+if (new File(depsDir, 'armeabi-v7a').exists()) {
+	task getDeps {
+		doLast { logger.lifecycle('Using existing deps from {}', depsDir) }
+	}
+} else {
+	task downloadDeps(type: Download) {
+		def depsZip = new File(buildDir, 'deps.zip')
 
-	src 'https://github.com/minetest/minetest_android_deps/releases/download/5.8.0/deps.zip'
-	dest depsZip
-	overwrite false
+		src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps-lite.zip'
+		dest depsZip
+		overwrite false
 
-	task getDeps(dependsOn: downloadDeps, type: Copy) {
-		depsDir.mkdir()
-		from zipTree(depsZip)
-		into depsDir
-		doFirst { logger.lifecycle('Extracting to {}', depsDir) }
+		task getDeps(dependsOn: downloadDeps, type: Copy) {
+			depsDir.mkdir()
+			from zipTree(depsZip)
+			into depsDir
+			doFirst { logger.lifecycle('Extracting to {}', depsDir) }
+		}
 	}
 }
 
diff --git a/android/native/src/main/AndroidManifest.xml b/android/native/src/main/AndroidManifest.xml
index 19451c7fd..cc947c567 100644
--- a/android/native/src/main/AndroidManifest.xml
+++ b/android/native/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="net.minetest" />
+<manifest />
diff --git a/builtin/client/init.lua b/builtin/client/init.lua
index 68fb169f0..301a8050c 100644
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@@ -7,6 +7,7 @@ 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")
diff --git a/builtin/common/after.lua b/builtin/common/after.lua
index bce262537..321e5ac9d 100644
--- a/builtin/common/after.lua
+++ b/builtin/common/after.lua
@@ -1,4 +1,116 @@
-local jobs = {}
+-- This is an implementation of a job sheduling mechanism. It guarantees that
+-- coexisting jobs will execute primarily in order of least expiry, and
+-- secondarily in order of first registration.
+
+-- These functions implement an intrusive singly linked list of one or more
+-- elements where the first element has a pointer to the last. The next pointer
+-- is stored with key list_next. The pointer to the last is with key list_end.
+
+local function list_init(first)
+	first.list_end = first
+end
+
+local function list_append(first, append)
+	first.list_end.list_next = append
+	first.list_end = append
+end
+
+local function list_append_list(first, first_append)
+	first.list_end.list_next = first_append
+	first.list_end = first_append.list_end
+end
+
+-- The jobs are stored in a map from expiration times to linked lists of jobs
+-- as above. The expiration times are also stored in an array representing a
+-- binary min heap, which is a particular arrangement of binary tree. A parent
+-- at index i has children at indices i*2 and i*2+1. Out-of-bounds indices
+-- represent nonexistent children. A parent is never greater than its children.
+-- This structure means that, if there is at least one job, the next expiration
+-- time is the first item in the array.
+
+-- Push element on a binary min-heap,
+-- "bubbling up" the element by swapping with larger parents.
+local function heap_push(heap, element)
+	local index = #heap + 1
+	while index > 1 do
+		local parent_index = math.floor(index / 2)
+		local parent = heap[parent_index]
+		if element < parent then
+			heap[index] = parent
+			index = parent_index
+		else
+			break
+		end
+	end
+	heap[index] = element
+end
+
+-- Pop smallest element from the heap,
+-- "sinking down" the last leaf on the last layer of the heap
+-- by swapping with the smaller child.
+local function heap_pop(heap)
+	local removed_element = heap[1]
+	local length = #heap
+	local element = heap[length]
+	heap[length] = nil
+	length = length - 1
+	if length > 0 then
+		local index = 1
+		while true do
+			local old_index = index
+			local smaller_element = element
+			local left_index = index * 2
+			local right_index = index * 2 + 1
+			if left_index <= length then
+				local left_element = heap[left_index]
+				if left_element < smaller_element then
+					index = left_index
+					smaller_element = left_element
+				end
+			end
+			if right_index <= length then
+				if heap[right_index] < smaller_element then
+					index = right_index
+				end
+			end
+			if old_index ~= index then
+				heap[old_index] = heap[index]
+			else
+				break
+			end
+		end
+		heap[index] = element
+	end
+	return removed_element
+end
+
+local job_map = {}
+local expiries = {}
+
+-- Adds an individual job with the given expiry.
+-- The worst-case complexity is O(log n), where n is the number of distinct
+-- expiration times.
+local function add_job(expiry, job)
+	local list = job_map[expiry]
+	if list then
+		list_append(list, job)
+	else
+		list_init(job)
+		job_map[expiry] = job
+		heap_push(expiries, expiry)
+	end
+end
+
+-- Removes the next expiring jobs and returns the linked list of them.
+-- The worst-case complexity is O(log n), where n is the number of distinct
+-- expiration times.
+local function remove_first_jobs()
+	local removed_expiry = heap_pop(expiries)
+	local removed = job_map[removed_expiry]
+	job_map[removed_expiry] = nil
+	return removed
+end
+
 local time = 0.0
 local time_next = math.huge
 
@@ -9,42 +121,54 @@ core.register_globalstep(function(dtime)
 		return
 	end
 
-	time_next = math.huge
+	-- Remove the expired jobs.
+	local expired = remove_first_jobs()
 
-	-- Iterate backwards so that we miss any new timers added by
-	-- a timer callback.
-	for i = #jobs, 1, -1 do
-		local job = jobs[i]
-		if time >= job.expire then
-			core.set_last_run_mod(job.mod_origin)
-			job.func(unpack(job.arg))
-			local jobs_l = #jobs
-			jobs[i] = jobs[jobs_l]
-			jobs[jobs_l] = nil
-		elseif job.expire < time_next then
-			time_next = job.expire
+	-- Remove other expired jobs and append them to the list.
+	while true do
+		time_next = expiries[1] or math.huge
+		if time_next > time then
+			break
 		end
+		list_append_list(expired, remove_first_jobs())
+	end
+
+	-- Run the callbacks afterward to prevent infinite loops with core.after(0, ...).
+	local last_expired = expired.list_end
+	while true do
+		core.set_last_run_mod(expired.mod_origin)
+		expired.func(unpack(expired.args, 1, expired.args.n))
+		if expired == last_expired then
+			break
+		end
+		expired = expired.list_next
 	end
 end)
 
-function core.after(after, func, ...)
-	assert(tonumber(after) and type(func) == "function",
-		"Invalid minetest.after invocation")
-	local expire = time + after
-	local new_job = {
-		func = func,
-		expire = expire,
-		arg = {...},
-		mod_origin = core.get_last_run_mod(),
-	}
+local job_metatable = {__index = {}}
 
-	jobs[#jobs + 1] = new_job
-	time_next = math.min(time_next, expire)
-
-	return {
-		cancel = function()
-			new_job.func = function() end
-			new_job.args = {}
-		end
+local function dummy_func() end
+function job_metatable.__index:cancel()
+	self.func = dummy_func
+	self.args = {n = 0}
+end
+
+function core.after(after, func, ...)
+	assert(tonumber(after) and not core.is_nan(after) and type(func) == "function",
+		"Invalid minetest.after invocation")
+
+	local new_job = {
+		mod_origin = core.get_last_run_mod(),
+		func = func,
+		args = {
+			n = select("#", ...),
+			...
+		},
 	}
+
+	local expiry = time + after
+	add_job(expiry, new_job)
+	time_next = math.min(time_next, expiry)
+
+	return setmetatable(new_job, job_metatable)
 end
diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index 1abfb50f2..e7d685865 100644
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -90,7 +90,7 @@ local function do_help_cmd(name, param)
 	if #args > 1 then
 		return false, S("Too many arguments, try using just /help <command>")
 	end
-	local use_gui = INIT ~= "client" and core.get_player_by_name(name)
+	local use_gui = INIT == "client" or core.get_player_by_name(name)
 	use_gui = use_gui and not opts:find("t")
 
 	if #args == 0 and not use_gui then
@@ -164,8 +164,8 @@ end
 
 if INIT == "client" then
 	core.register_chatcommand("help", {
-		params = core.gettext("[all | <cmd>]"),
-		description = core.gettext("Get help for commands"),
+		params = core.gettext("[all | <cmd>] [-t]"),
+		description = core.gettext("Get help for commands (-t: output in chat)"),
 		func = function(param)
 			return do_help_cmd(nil, param)
 		end,
diff --git a/builtin/common/information_formspecs.lua b/builtin/common/information_formspecs.lua
index 3405263bf..3fa397d25 100644
--- a/builtin/common/information_formspecs.lua
+++ b/builtin/common/information_formspecs.lua
@@ -61,15 +61,20 @@ local function build_chatcommands_formspec(name, sel, copy)
 	for i, data in ipairs(mod_cmds) do
 		rows[#rows + 1] = COLOR_BLUE .. ",0," .. F(data[1]) .. ","
 		for j, cmds in ipairs(data[2]) do
-			local has_priv = check_player_privs(name, cmds[2].privs)
+			local has_priv = INIT == "client" or check_player_privs(name, cmds[2].privs)
 			rows[#rows + 1] = ("%s,1,%s,%s"):format(
 				has_priv and COLOR_GREEN or COLOR_GRAY,
 				cmds[1], F(cmds[2].params))
 			if sel == #rows then
 				description = cmds[2].description
 				if copy then
-					core.chat_send_player(name, S("Command: @1 @2",
-						core.colorize("#0FF", "/" .. cmds[1]), cmds[2].params))
+					local msg = S("Command: @1 @2",
+						core.colorize("#0FF", "/" .. cmds[1]), cmds[2].params)
+					if INIT == "client" then
+						core.display_chat_message(msg)
+					else
+						core.chat_send_player(name, msg)
+					end
 				end
 			end
 		end
@@ -111,26 +116,46 @@ end
 
 
 -- DETAILED CHAT COMMAND INFORMATION
+if INIT == "client" then
+	core.register_on_formspec_input(function(formname, fields)
+		if formname ~= "__builtin:help_cmds" or fields.quit then
+			return
+		end
 
-core.register_on_player_receive_fields(function(player, formname, fields)
-	if formname ~= "__builtin:help_cmds" or fields.quit then
-		return
-	end
+		local event = core.explode_table_event(fields.list)
+		if event.type ~= "INV" then
+			core.show_formspec("__builtin:help_cmds",
+				build_chatcommands_formspec(nil, event.row, event.type == "DCL"))
+		end
+	end)
+else
+	core.register_on_player_receive_fields(function(player, formname, fields)
+		if formname ~= "__builtin:help_cmds" or fields.quit then
+			return
+		end
 
-	local event = core.explode_table_event(fields.list)
-	if event.type ~= "INV" then
-		local name = player:get_player_name()
-		core.show_formspec(name, "__builtin:help_cmds",
-			build_chatcommands_formspec(name, event.row, event.type == "DCL"))
-	end
-end)
+		local event = core.explode_table_event(fields.list)
+		if event.type ~= "INV" then
+			local name = player:get_player_name()
+			core.show_formspec(name, "__builtin:help_cmds",
+				build_chatcommands_formspec(name, event.row, event.type == "DCL"))
+		end
+	end)
+end
 
 function core.show_general_help_formspec(name)
-	core.show_formspec(name, "__builtin:help_cmds",
-		build_chatcommands_formspec(name))
+	if INIT == "client" then
+		core.show_formspec("__builtin:help_cmds",
+			build_chatcommands_formspec(name))
+	else
+		core.show_formspec(name, "__builtin:help_cmds",
+			build_chatcommands_formspec(name))
+	end
 end
 
-function core.show_privs_help_formspec(name)
-	core.show_formspec(name, "__builtin:help_privs",
-		build_privs_formspec(name))
+if INIT ~= "client" then
+	function core.show_privs_help_formspec(name)
+		core.show_formspec(name, "__builtin:help_privs",
+			build_privs_formspec(name))
+	end
 end
diff --git a/builtin/common/item_s.lua b/builtin/common/item_s.lua
index f848ef6d8..72a722ed1 100644
--- a/builtin/common/item_s.lua
+++ b/builtin/common/item_s.lua
@@ -144,6 +144,8 @@ local wallmounted_to_dir = {
 	vector.new(-1,  0,  0),
 	vector.new( 0,  0,  1),
 	vector.new( 0,  0, -1),
+	vector.new( 0,  1,  0),
+	vector.new( 0, -1,  0),
 }
 function core.wallmounted_to_dir(wallmounted)
 	return wallmounted_to_dir[wallmounted % 8]
diff --git a/builtin/common/metatable.lua b/builtin/common/metatable.lua
new file mode 100644
index 000000000..40003d293
--- /dev/null
+++ b/builtin/common/metatable.lua
@@ -0,0 +1,19 @@
+-- Registered metatables, used by the C++ packer
+local known_metatables = {}
+function core.register_portable_metatable(name, mt)
+	assert(type(name) == "string", ("attempt to use %s value as metatable name"):format(type(name)))
+	assert(type(mt) == "table", ("attempt to register a %s value as metatable"):format(type(mt)))
+	assert(known_metatables[name] == nil or known_metatables[name] == mt,
+			("attempt to override metatable %s"):format(name))
+	known_metatables[name] = mt
+	known_metatables[mt] = name
+end
+core.known_metatables = known_metatables
+
+function core.register_async_metatable(...)
+	core.log("deprecated", "minetest.register_async_metatable is deprecated. " ..
+			"Use minetest.register_portable_metatable instead.")
+	return core.register_portable_metatable(...)
+end
+
+core.register_portable_metatable("__builtin:vector", vector.metatable)
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index 90ac2ae4e..5e550348d 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -240,12 +240,15 @@ function math.factorial(x)
 	return v
 end
 
-
 function math.round(x)
-	if x >= 0 then
-		return math.floor(x + 0.5)
+	if x < 0 then
+		local int = math.ceil(x)
+		local frac = x - int
+		return int - ((frac <= -0.5) and 1 or 0)
 	end
-	return math.ceil(x - 0.5)
+	local int = math.floor(x)
+	local frac = x - int
+	return int + ((frac >= 0.5) and 1 or 0)
 end
 
 local formspec_escapes = {
@@ -490,6 +493,9 @@ end
 
 
 function table.insert_all(t, other)
+	if table.move then -- LuaJIT
+		return table.move(other, 1, #other, #t + 1, t)
+	end
 	for i=1, #other do
 		t[#t + 1] = other[i]
 	end
diff --git a/builtin/common/tests/after_spec.lua b/builtin/common/tests/after_spec.lua
new file mode 100644
index 000000000..cca1871a5
--- /dev/null
+++ b/builtin/common/tests/after_spec.lua
@@ -0,0 +1,113 @@
+_G.core = {}
+_G.vector = {metatable = {}}
+
+dofile("builtin/common/vector.lua")
+dofile("builtin/common/misc_helpers.lua")
+
+function core.get_last_run_mod() return "*test*" end
+function core.set_last_run_mod() end
+
+local do_step
+function core.register_globalstep(func)
+	do_step = func
+end
+
+dofile("builtin/common/after.lua")
+
+describe("after", function()
+	it("executes callbacks when expected", function()
+		local result = ""
+		core.after(0, function()
+			result = result .. "a"
+		end)
+		core.after(1, function()
+			result = result .. "b"
+		end)
+		core.after(1, function()
+			result = result .. "c"
+		end)
+		core.after(2, function()
+			result = result .. "d"
+		end)
+		local cancel = core.after(2, function()
+			result = result .. "e"
+		end)
+		do_step(0)
+		assert.same("a", result)
+
+		do_step(1)
+		assert.same("abc", result)
+
+		core.after(2, function()
+			result = result .. "f"
+		end)
+		core.after(1, function()
+			result = result .. "g"
+		end)
+		core.after(-1, function()
+			result = result .. "h"
+		end)
+		cancel:cancel()
+		do_step(1)
+		assert.same("abchdg", result)
+
+		do_step(1)
+		assert.same("abchdgf", result)
+	end)
+
+	it("defers jobs with delay 0", function()
+		local result = ""
+		core.after(0, function()
+			core.after(0, function()
+				result = result .. "b"
+			end)
+			result = result .. "a"
+		end)
+		do_step(1)
+		assert.same("a", result)
+		do_step(1)
+		assert.same("ab", result)
+	end)
+
+	it("passes arguments", function()
+		core.after(0, function(...)
+			assert.same(0, select("#", ...))
+		end)
+		core.after(0, function(...)
+			assert.same(4, select("#", ...))
+			assert.same(1, (select(1, ...)))
+			assert.same(nil, (select(2, ...)))
+			assert.same("a", (select(3, ...)))
+			assert.same(nil, (select(4, ...)))
+		end, 1, nil, "a", nil)
+		do_step(0)
+	end)
+
+	it("rejects invalid arguments", function()
+		assert.has.errors(function() core.after() end)
+		assert.has.errors(function() core.after(nil, nil) end)
+		assert.has.errors(function() core.after(0) end)
+		assert.has.errors(function() core.after(0, nil) end)
+		assert.has.errors(function() core.after(nil, function() end) end)
+		assert.has.errors(function() core.after(0 / 0, function() end) end)
+	end)
+
+	-- Make sure that the underlying heap is working correctly
+	it("can be abused as a heapsort", function()
+		local t = {}
+		for i = 1, 1000 do
+			t[i] = math.random(100)
+		end
+		local sorted = table.copy(t)
+		table.sort(sorted)
+		local i = 0
+		for _, v in ipairs(t) do
+			core.after(v, function()
+				i = i + 1
+				assert.equal(v, sorted[i])
+			end)
+		end
+		do_step(math.max(unpack(t)))
+		assert.equal(#t, i)
+	end)
+end)
diff --git a/builtin/common/tests/misc_helpers_spec.lua b/builtin/common/tests/misc_helpers_spec.lua
index 73a66737f..65549c2e3 100644
--- a/builtin/common/tests/misc_helpers_spec.lua
+++ b/builtin/common/tests/misc_helpers_spec.lua
@@ -176,3 +176,17 @@ describe("formspec_escape", function()
 		assert.equal("\\[Hello\\\\\\[", core.formspec_escape("[Hello\\["))
 	end)
 end)
+
+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)
diff --git a/builtin/emerge/env.lua b/builtin/emerge/env.lua
new file mode 100644
index 000000000..2b32a0339
--- /dev/null
+++ b/builtin/emerge/env.lua
@@ -0,0 +1,56 @@
+-- Reimplementations of some environment function on vmanips, since this is
+-- what the emerge environment operates on
+
+-- core.vmanip = <VoxelManip> -- set by C++
+
+function core.set_node(pos, node)
+	return core.vmanip:set_node_at(pos, node)
+end
+
+function core.bulk_set_node(pos_list, node)
+	local vm = core.vmanip
+	local set_node_at = vm.set_node_at
+	for _, pos in ipairs(pos_list) do
+		if not set_node_at(vm, pos, node) then
+			return false
+		end
+	end
+	return true
+end
+
+core.add_node = core.set_node
+
+-- we don't deal with metadata currently
+core.swap_node = core.set_node
+
+function core.remove_node(pos)
+	return core.vmanip:set_node_at(pos, {name="air"})
+end
+
+function core.get_node(pos)
+	return core.vmanip:get_node_at(pos)
+end
+
+function core.get_perlin(seed, octaves, persist, spread)
+	local params
+	if type(seed) == "table" then
+		params = table.copy(seed)
+	else
+		assert(type(seed) == "number")
+		params = {
+			seed = seed,
+			octaves = octaves,
+			persist = persist,
+			spread = {x=spread, y=spread, z=spread},
+		}
+	end
+	params.seed = core.get_seed(params.seed) -- add mapgen seed
+	return PerlinNoise(params)
+end
+
+
+function core.get_perlin_map(params, size)
+	local params2 = table.copy(params)
+	params2.seed = core.get_seed(params.seed) -- add mapgen seed
+	return PerlinNoiseMap(params2, size)
+end
diff --git a/builtin/emerge/init.lua b/builtin/emerge/init.lua
new file mode 100644
index 000000000..cb7d9266a
--- /dev/null
+++ b/builtin/emerge/init.lua
@@ -0,0 +1,21 @@
+local gamepath = core.get_builtin_path() .. "game" .. DIR_DELIM
+local commonpath = core.get_builtin_path() .. "common" .. DIR_DELIM
+local epath = core.get_builtin_path() .. "emerge" .. DIR_DELIM
+
+local builtin_shared = {}
+
+-- Import parts shared with "game" environment
+dofile(gamepath .. "constants.lua")
+assert(loadfile(commonpath .. "item_s.lua"))(builtin_shared)
+dofile(gamepath .. "misc_s.lua")
+dofile(gamepath .. "features.lua")
+dofile(gamepath .. "voxelarea.lua")
+
+-- Now for our own stuff
+assert(loadfile(commonpath .. "register.lua"))(builtin_shared)
+assert(loadfile(epath .. "register.lua"))(builtin_shared)
+dofile(epath .. "env.lua")
+
+builtin_shared.cache_content_ids()
+
+core.log("info", "Initialized emerge Lua environment")
diff --git a/builtin/emerge/register.lua b/builtin/emerge/register.lua
new file mode 100644
index 000000000..308fe4d7e
--- /dev/null
+++ b/builtin/emerge/register.lua
@@ -0,0 +1,54 @@
+local builtin_shared = ...
+
+-- Copy all the registration tables over
+do
+	local all = assert(core.transferred_globals)
+	core.transferred_globals = nil
+
+	all.registered_nodes = {}
+	all.registered_craftitems = {}
+	all.registered_tools = {}
+	for k, v in pairs(all.registered_items) do
+		-- Disable further modification
+		setmetatable(v, {__newindex = {}})
+		-- Reassemble the other tables
+		if v.type == "node" then
+			getmetatable(v).__index = all.nodedef_default
+			all.registered_nodes[k] = v
+		elseif v.type == "craft" then
+			getmetatable(v).__index = all.craftitemdef_default
+			all.registered_craftitems[k] = v
+		elseif v.type == "tool" then
+			getmetatable(v).__index = all.tooldef_default
+			all.registered_tools[k] = v
+		else
+			getmetatable(v).__index = all.noneitemdef_default
+		end
+	end
+
+	for k, v in pairs(all) do
+		core[k] = v
+	end
+end
+
+-- For tables that are indexed by item name:
+-- If table[X] does not exist, default to table[core.registered_aliases[X]]
+local alias_metatable = {
+	__index = function(t, name)
+		return rawget(t, core.registered_aliases[name])
+	end
+}
+setmetatable(core.registered_items, alias_metatable)
+setmetatable(core.registered_nodes, alias_metatable)
+setmetatable(core.registered_craftitems, alias_metatable)
+setmetatable(core.registered_tools, alias_metatable)
+
+--
+-- Callbacks
+--
+
+local make_registration = builtin_shared.make_registration
+
+core.registered_on_mods_loaded, core.register_on_mods_loaded = make_registration()
+core.registered_on_generateds, core.register_on_generated = make_registration()
+core.registered_on_shutdown, core.register_on_shutdown = make_registration()
diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua
index effd0eba7..59b7a586f 100644
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@@ -18,7 +18,9 @@
 
 
 local BASE_SPACING = 0.1
-local SCROLL_BTN_WIDTH = TOUCHSCREEN_GUI and 0.8 or 0.5
+local function get_scroll_btn_width()
+	return core.settings:get_bool("enable_touch") and 0.8 or 0.5
+end
 
 local function buttonbar_formspec(self)
 	if self.hidden then
@@ -39,7 +41,7 @@ local function buttonbar_formspec(self)
 
 	-- The number of buttons per page is always calculated as if the scroll
     -- buttons were visible.
-	local avail_space = self.size.x - 2*BASE_SPACING - 2*SCROLL_BTN_WIDTH
+	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))
 
 	self.num_pages = math.ceil(#self.buttons / btns_per_page)
@@ -55,7 +57,7 @@ local function buttonbar_formspec(self)
 
 	local btn_start_x = self.pos.x + btn_spacing
 	if show_scroll_btns then
-		btn_start_x = btn_start_x + BASE_SPACING + SCROLL_BTN_WIDTH
+		btn_start_x = btn_start_x + BASE_SPACING + get_scroll_btn_width()
 	end
 
 	for i = first_btn, first_btn + btns_per_page - 1 do
@@ -80,7 +82,7 @@ local function buttonbar_formspec(self)
 			y = self.pos.y + BASE_SPACING,
 		}
 		local btn_next_pos = {
-			x = self.pos.x + self.size.x - BASE_SPACING - SCROLL_BTN_WIDTH,
+			x = self.pos.x + self.size.x - BASE_SPACING - get_scroll_btn_width(),
 			y = self.pos.y + BASE_SPACING,
 		}
 
@@ -88,11 +90,11 @@ local function buttonbar_formspec(self)
 				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, SCROLL_BTN_WIDTH, btn_size,
+				btn_prev_pos.x, btn_prev_pos.y, get_scroll_btn_width(), btn_size,
 				self.btn_prev_name))
 
 		table.insert(formspec, string.format("button[%f,%f;%f,%f;%s;>]",
-				btn_next_pos.x, btn_next_pos.y, SCROLL_BTN_WIDTH, btn_size,
+				btn_next_pos.x, btn_next_pos.y, get_scroll_btn_width(), btn_size,
 				self.btn_next_name))
 	end
 
@@ -100,14 +102,24 @@ local function buttonbar_formspec(self)
 end
 
 local function buttonbar_buttonhandler(self, fields)
-	if fields[self.btn_prev_name] and self.cur_page > 1 then
-		self.cur_page = self.cur_page - 1
-		return true
+	if fields[self.btn_prev_name] then
+		if self.cur_page > 1 then
+			self.cur_page = self.cur_page - 1
+			return true
+		elseif self.cur_page == 1 then
+			self.cur_page = self.num_pages
+			return true
+		end
 	end
 
-	if fields[self.btn_next_name] and self.cur_page < self.num_pages then
-		self.cur_page = self.cur_page + 1
-		return true
+	if fields[self.btn_next_name] then
+		if self.cur_page < self.num_pages then
+			self.cur_page = self.cur_page + 1
+			return true
+		elseif self.cur_page == self.num_pages then
+			self.cur_page = 1
+			return true
+		end
 	end
 
 	for _, btn in ipairs(self.buttons) do
diff --git a/builtin/fstk/dialog.lua b/builtin/fstk/dialog.lua
index c50d23855..991ec20ab 100644
--- a/builtin/fstk/dialog.lua
+++ b/builtin/fstk/dialog.lua
@@ -78,15 +78,12 @@ function dialog_create(name,get_formspec,buttonhandler,eventhandler)
 	return self
 end
 
+-- "message" must already be formspec-escaped, e.g. via fgettext or
+-- core.formspec_escape.
 function messagebox(name, message)
 	return dialog_create(name,
 			function()
-				return ([[
-					formspec_version[3]
-					size[8,3]
-					textarea[0.375,0.375;7.25,1.2;;;%s]
-					button[3,1.825;2,0.8;ok;%s]
-				]]):format(message, fgettext("OK"))
+				return ui.get_message_formspec("", message, "ok")
 			end,
 			function(this, fields)
 				if fields.ok then
diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua
index a63cb2cd0..a3a8fed77 100644
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -50,6 +50,20 @@ function ui.find_by_name(name)
 	return ui.childlist[name]
 end
 
+--------------------------------------------------------------------------------
+-- "title" and "message" must already be formspec-escaped, e.g. via fgettext or
+-- core.formspec_escape.
+function ui.get_message_formspec(title, message, btn_id)
+	return table.concat({
+		"size[14,8]",
+		"real_coordinates[true]",
+		"set_focus[", btn_id, ";true]",
+		"box[0.5,1.2;13,5;#000]",
+		("textarea[0.5,1.2;13,5;;%s;%s]"):format(title, message),
+		"button[5,6.6;4,1;", btn_id, ";" .. fgettext("OK") .. "]",
+	})
+end
+
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 -- Internal functions not to be called from user
@@ -76,6 +90,9 @@ function ui.update()
 		}
 		ui.overridden = true
 	elseif gamedata ~= nil and gamedata.errormessage ~= nil then
+		-- Note to API users:
+		-- "gamedata.errormessage" must not be formspec-escaped yet.
+		-- For translations, fgettext_ne should be used.
 		local error_message = core.formspec_escape(gamedata.errormessage)
 
 		local error_title
@@ -84,15 +101,7 @@ function ui.update()
 		else
 			error_title = fgettext("An error occurred:")
 		end
-		formspec = {
-			"size[14,8]",
-			"real_coordinates[true]",
-			"set_focus[btn_error_confirm;true]",
-			"box[0.5,1.2;13,5;#000]",
-			("textarea[0.5,1.2;13,5;;%s;%s]"):format(
-				error_title, error_message),
-			"button[5,6.6;4,1;btn_error_confirm;" .. fgettext("OK") .. "]"
-		}
+		formspec = {ui.get_message_formspec(error_title, error_message, "btn_error_confirm")}
 		ui.overridden = true
 	else
 		local active_toplevel_ui_elements = 0
diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua
index 5aa95948b..7c54d2adb 100644
--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@@ -91,20 +91,29 @@ core.builtin_auth_handler = {
 					core.settings:get("default_password")))
 		end
 
+		local prev_privs = auth_entry.privileges
 		auth_entry.privileges = privileges
 
 		core_auth.save(auth_entry)
 
-		-- Run grant callbacks
-		for priv, _ in pairs(privileges) do
-			if not auth_entry.privileges[priv] then
+		for priv, value in pairs(privileges) do
+			-- Warnings for improper API usage
+			if value == false then
+				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 `minetest.set_player_privs`")
+			end
+			-- Run grant callbacks
+			if prev_privs[priv] == nil then
 				core.run_priv_callbacks(name, priv, nil, "grant")
 			end
 		end
 
 		-- Run revoke callbacks
-		for priv, _ in pairs(auth_entry.privileges) do
-			if not privileges[priv] then
+		for priv, _ in pairs(prev_privs) do
+			if privileges[priv] == nil then
 				core.run_priv_callbacks(name, priv, nil, "revoke")
 			end
 		end
@@ -183,6 +192,20 @@ core.set_player_privs    = auth_pass("set_privileges")
 core.remove_player_auth  = auth_pass("delete_auth")
 core.auth_reload         = auth_pass("reload")
 
+function core.change_player_privs(name, changes)
+	local privs = core.get_player_privs(name)
+	for priv, change in pairs(changes) do
+		if change == true then
+			privs[priv] = true
+		elseif change == false then
+			privs[priv] = nil
+		else
+			error("non-bool value given to `minetest.change_player_privs`")
+		end
+	end
+	core.set_player_privs(name, privs)
+end
+
 local record_login = auth_pass("record_login")
 core.register_on_joinplayer(function(player)
 	record_login(player:get_player_name())
diff --git a/builtin/game/detached_inventory.lua b/builtin/game/detached_inventory.lua
index 2e27168a1..8eed00391 100644
--- a/builtin/game/detached_inventory.lua
+++ b/builtin/game/detached_inventory.lua
@@ -2,6 +2,9 @@
 
 core.detached_inventories = {}
 
+local create_detached_inventory_raw = core.create_detached_inventory_raw
+core.create_detached_inventory_raw = nil
+
 function core.create_detached_inventory(name, callbacks, player_name)
 	local stuff = {}
 	stuff.name = name
@@ -15,10 +18,13 @@ function core.create_detached_inventory(name, callbacks, player_name)
 	end
 	stuff.mod_origin = core.get_current_modname() or "??"
 	core.detached_inventories[name] = stuff
-	return core.create_detached_inventory_raw(name, player_name)
+	return create_detached_inventory_raw(name, player_name)
 end
 
+local remove_detached_inventory_raw = core.remove_detached_inventory_raw
+core.remove_detached_inventory_raw = nil
+
 function core.remove_detached_inventory(name)
 	core.detached_inventories[name] = nil
-	return core.remove_detached_inventory_raw(name)
+	return remove_detached_inventory_raw(name)
 end
diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 8fa5e481f..5a46bad56 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -103,6 +103,9 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 		-- Cache whether we're supposed to float on water
 		self.floats = core.get_item_group(node.name, "float") ~= 0
 
+		-- Save liquidtype for falling water
+        self.liquidtype = def.liquidtype
+
 		-- Set entity visuals
 		if def.drawtype == "torchlike" or def.drawtype == "signlike" then
 			local textures
@@ -174,7 +177,12 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 
 		-- Rotate entity
 		if def.drawtype == "torchlike" then
-			self.object:set_yaw(math.pi*0.25)
+			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"
@@ -214,6 +222,10 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 						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
@@ -226,6 +238,10 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 						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
@@ -234,10 +250,20 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 						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 and rot <= 1 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
@@ -303,9 +329,17 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 		end
 
 		-- Decide if we're replacing the node or placing on top
+		-- This condition is very similar to the check in core.check_single_for_falling(p)
 		local np = vector.copy(bcp)
-		if bcd and bcd.buildable_to and
-				(not self.floats or bcd.liquidtype == "none") then
+		if bcd and bcd.buildable_to
+				and -- Take "float" group into consideration:
+				(
+					-- Fall through non-liquids
+					not self.floats or bcd.liquidtype == "none" or
+					-- Only let sources fall through flowing liquids
+					(self.floats and self.liquidtype ~= "none" and bcd.liquidtype ~= "source")
+				) then
+
 			core.remove_node(bcp, remove_fast)
 		else
 			np.y = np.y + 1
@@ -316,7 +350,7 @@ core.register_entity(":__builtin:falling_node_NOOOOOOOOOOOO", {
 		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 == "none") then
+		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
@@ -584,11 +618,19 @@ function core.check_single_for_falling(p)
 				local success, _ = convert_to_falling_node(p, n)
 				return success
 			end
+			local d_falling = core.registered_nodes[n.name]
+			local do_float = core.get_item_group(n.name, "float") > 0
 			-- Otherwise only if the bottom node is considered "fall through"
 			if not same and
-					(not d_bottom.walkable or d_bottom.buildable_to) and
-					(core.get_item_group(n.name, "float") == 0 or
-					d_bottom.liquidtype == "none") then
+					(not d_bottom.walkable or d_bottom.buildable_to)
+					and -- Take "float" group into consideration:
+					(
+						-- Fall through non-liquids
+						not do_float or d_bottom.liquidtype == "none" or
+						-- Only let sources fall through flowing liquids
+						(do_float and d_falling.liquidtype == "source" and d_bottom.liquidtype ~= "source")
+					) then
+
 				local success, _ = convert_to_falling_node(p, n)
 				return success
 			end
diff --git a/builtin/game/features.lua b/builtin/game/features.lua
index c76566ed3..22bf1859d 100644
--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@@ -29,6 +29,19 @@ core.features = {
 	compress_zstd = true,
 	sound_params_start_time = true,
 	physics_overrides_v2 = true,
+	hud_def_type_field = true,
+	random_state_restore = true,
+	after_order_expiry_registration = true,
+	wallmounted_rotate = true,
+	item_specific_pointabilities = true,
+	blocking_pointability_type = true,
+	dynamic_add_media_startup = true,
+	dynamic_add_media_filepath = true,
+	lsystem_decoration_type = true,
+	item_meta_range = true,
+	node_interaction_actor = true,
+	moveresult_new_pos = true,
+	override_item_remove_fields = true,
 }
 
 function core.has_feature(arg)
diff --git a/builtin/game/hud.lua b/builtin/game/hud.lua
new file mode 100644
index 000000000..1bc4b48d7
--- /dev/null
+++ b/builtin/game/hud.lua
@@ -0,0 +1,261 @@
+--[[
+Register function to easily register new builtin hud elements
+`def` is a table and contains the following fields:
+  elem_def  the HUD element definition which can be changed with hud_replace_builtin
+  events    (optional) additional event names on which the element will be updated
+            ("hud_changed" will always be used.)
+  show_elem(player, flags, id)
+            (optional) a function to decide if the element should be shown to a player
+            It is called before the element gets updated.
+  update_def(player, elem_def)
+            (optional) a function to change the elem_def before it will be used.
+            (elem_def can be changed, since the table which got set by using
+            hud_replace_builtin isn't exposed to the API.)
+  update_elem(player, id)
+            (optional) a function to change the element after it has been updated
+            (Is not called when the element is first set or recreated.)
+]]--
+
+local registered_elements = {}
+local update_events = {}
+local function register_builtin_hud_element(name, def)
+	registered_elements[name] = def
+	for _, event in ipairs(def.events or {}) do
+		update_events[event] = update_events[event] or {}
+		table.insert(update_events[event], name)
+	end
+end
+
+-- Stores HUD ids for all players
+local hud_ids = {}
+
+-- Updates one element
+-- In case the element is already added, it only calls the update_elem function from
+-- registered_elements. (To recreate the element remove it first.)
+local function update_element(player, player_hud_ids, elem_name, flags)
+	local def = registered_elements[elem_name]
+	local id = player_hud_ids[elem_name]
+
+	if def.show_elem and not def.show_elem(player, flags, id) then
+		if id then
+			player:hud_remove(id)
+			player_hud_ids[elem_name] = nil
+		end
+		return
+	end
+
+	if not id then
+		if def.update_def then
+			def.update_def(player, def.elem_def)
+		end
+
+		id = player:hud_add(def.elem_def)
+		player_hud_ids[elem_name] = id
+		return
+	end
+
+	if def.update_elem then
+		def.update_elem(player, id)
+	end
+end
+
+-- Updates all elements
+-- If to_update is specified it will only update those elements.
+local function update_hud(player, to_update)
+	local flags = player:hud_get_flags()
+	local playername = player:get_player_name()
+	hud_ids[playername] = hud_ids[playername] or {}
+	local player_hud_ids = hud_ids[playername]
+
+	if to_update then
+		for _, elem_name in ipairs(to_update) do
+			update_element(player, player_hud_ids, elem_name, flags)
+		end
+	else
+		for elem_name, _ in pairs(registered_elements) do
+			update_element(player, player_hud_ids, elem_name, flags)
+		end
+	end
+end
+
+local function player_event_handler(player, eventname)
+	assert(player:is_player())
+
+	if eventname == "hud_changed" then
+		update_hud(player)
+		return
+	end
+
+	-- Custom events
+	local to_update = update_events[eventname]
+	if to_update then
+		update_hud(player, to_update)
+	end
+end
+
+-- Returns true if successful, otherwise false,
+-- but currently the return value is not documented in the Lua API.
+function core.hud_replace_builtin(elem_name, elem_def)
+	assert(type(elem_def) == "table")
+
+	local registered = registered_elements[elem_name]
+	if not registered then
+		return false
+	end
+
+	registered.elem_def = table.copy(elem_def)
+
+	for playername, player_hud_ids in pairs(hud_ids) do
+		local player = core.get_player_by_name(playername)
+		local id = player_hud_ids[elem_name]
+		if player and id then
+			player:hud_remove(id)
+			player_hud_ids[elem_name] = nil
+			update_element(player, player_hud_ids, elem_name, player:hud_get_flags())
+		end
+	end
+	return true
+end
+
+local function cleanup_builtin_hud(player)
+	hud_ids[player:get_player_name()] = nil
+end
+
+
+-- Append "update_hud" as late as possible
+-- This ensures that the HUD is hidden when the flags are updated in this callback
+core.register_on_mods_loaded(function()
+	core.register_on_joinplayer(function(player)
+		update_hud(player)
+	end)
+end)
+core.register_on_leaveplayer(cleanup_builtin_hud)
+core.register_playerevent(player_event_handler)
+
+
+---- Builtin HUD Elements
+
+--- Healthbar
+
+-- Cache setting
+local enable_damage = core.settings:get_bool("enable_damage")
+
+local function scale_to_hud_max(player, field)
+	-- Scale "hp" or "breath" to the hud maximum dimensions
+	local current = player["get_" .. field](player)
+	local nominal
+	if field == "hp" then -- HUD is called health but field is hp
+		nominal = registered_elements.health.elem_def.item
+	else
+		nominal = registered_elements[field].elem_def.item
+	end
+	local max_display = math.max(player:get_properties()[field .. "_max"], current)
+	return math.ceil(current / max_display * nominal)
+end
+
+register_builtin_hud_element("health", {
+	elem_def = {
+		type = "statbar",
+		position = {x = 0.5, y = 1},
+		text = "heart.png",
+		text2 = "heart_gone.png",
+		number = core.PLAYER_MAX_HP_DEFAULT,
+		item = core.PLAYER_MAX_HP_DEFAULT,
+		direction = 0,
+		size = {x = 24, y = 24},
+		offset = {x = (-10 * 24) - 25, y = -(48 + 24 + 16)},
+	},
+	events = {"properties_changed", "health_changed"},
+	show_elem = function(player, flags)
+		return flags.healthbar and enable_damage and
+				player:get_armor_groups().immortal ~= 1
+	end,
+	update_def = function(player, elem_def)
+		elem_def.item = elem_def.item or elem_def.number or core.PLAYER_MAX_HP_DEFAULT
+		elem_def.number = scale_to_hud_max(player, "hp")
+	end,
+	update_elem = function(player, id)
+		player:hud_change(id, "number", scale_to_hud_max(player, "hp"))
+	end,
+})
+
+--- Breathbar
+
+-- Stores core.after calls for every player
+local breathbar_removal_jobs = {}
+
+register_builtin_hud_element("breath", {
+	elem_def = {
+		type = "statbar",
+		position = {x = 0.5, y = 1},
+		text = "bubble.png",
+		text2 = "bubble_gone.png",
+		number = core.PLAYER_MAX_BREATH_DEFAULT * 2,
+		item = core.PLAYER_MAX_BREATH_DEFAULT * 2,
+		direction = 0,
+		size = {x = 24, y = 24},
+		offset = {x = 25, y= -(48 + 24 + 16)},
+	},
+	events = {"properties_changed", "breath_changed"},
+	show_elem = function(player, flags, id)
+		local show_breathbar = flags.breathbar and enable_damage and
+				player:get_armor_groups().immortal ~= 1
+		if id then
+			-- The element will not prematurely be removed by update_element
+			-- (but may still be instantly removed if the flag changed)
+			return show_breathbar
+		end
+		-- Don't add the element if the breath is full
+		local breath_relevant = player:get_breath() < player:get_properties().breath_max
+		return show_breathbar and breath_relevant
+	end,
+	update_def = function(player, elem_def)
+		elem_def.item = elem_def.item or elem_def.number or core.PLAYER_MAX_BREATH_DEFAULT
+		elem_def.number = scale_to_hud_max(player, "breath")
+	end,
+	update_elem = function(player, id)
+		player:hud_change(id, "number", scale_to_hud_max(player, "breath"))
+
+		local player_name = player:get_player_name()
+		local breath_relevant = player:get_breath() < player:get_properties().breath_max
+
+		if not breath_relevant then
+			if not breathbar_removal_jobs[player_name] then
+				-- The breathbar stays for some time and then gets removed.
+				breathbar_removal_jobs[player_name] = core.after(1, function()
+					local player = core.get_player_by_name(player_name)
+					local player_hud_ids = hud_ids[player_name]
+					if player and player_hud_ids and player_hud_ids.breath then
+						player:hud_remove(player_hud_ids.breath)
+						player_hud_ids.breath = nil
+					end
+					breathbar_removal_jobs[player_name] = nil
+				end)
+			end
+		else
+			-- Cancel removal
+			local job = breathbar_removal_jobs[player_name]
+			if job then
+				job:cancel()
+				breathbar_removal_jobs[player_name] = nil
+			end
+		end
+	end,
+})
+
+--- Minimap
+
+register_builtin_hud_element("minimap", {
+	elem_def = {
+		type = "minimap",
+		position = {x = 1, y = 0},
+		alignment = {x = -1, y = 1},
+		offset = {x = -10, y = 10},
+		size = {x = 256, y = 256},
+	},
+	show_elem = function(player, flags)
+		-- Don't add a minimap for clients which already have it hardcoded in C++.
+		return flags.minimap and
+				core.get_player_information(player:get_player_name()).protocol_version >= 44
+	end,
+})
diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index 0a69b3e3d..cc2bfc7e0 100644
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -18,6 +18,7 @@ if core.settings:get_bool("profiler.load") then
 end
 
 dofile(commonpath .. "after.lua")
+dofile(commonpath .. "metatable.lua")
 dofile(commonpath .. "mod_storage.lua")
 dofile(gamepath .. "item_entity.lua")
 dofile(gamepath .. "deprecated.lua")
@@ -35,7 +36,7 @@ assert(loadfile(gamepath .. "falling.lua"))(builtin_shared)
 dofile(gamepath .. "features.lua")
 dofile(gamepath .. "voxelarea.lua")
 dofile(gamepath .. "forceloading.lua")
-dofile(gamepath .. "statbars.lua")
+dofile(gamepath .. "hud.lua")
 dofile(gamepath .. "knockback.lua")
 dofile(gamepath .. "async.lua")
 
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 8e2a0377c..9e1258fc0 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -202,7 +202,40 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
 	elseif (def.paramtype2 == "wallmounted" or
 			def.paramtype2 == "colorwallmounted") and not param2 then
 		local dir = vector.subtract(under, above)
+		-- If you change this code, also change src/client/game.cpp
 		newnode.param2 = core.dir_to_wallmounted(dir)
+		if def.wallmounted_rotate_vertical and
+				(newnode.param2 == 0 or newnode.param2 == 1) then
+			local placer_pos = placer and placer:get_pos()
+			if placer_pos then
+				local pdir = {
+					x = above.x - placer_pos.x,
+					y = dir.y,
+					z = above.z - placer_pos.z
+				}
+				local rotate = false
+				if def.drawtype == "torchlike" then
+					if not ((pdir.x < 0 and pdir.z > 0) or
+							(pdir.x > 0 and pdir.z < 0)) then
+						rotate = true
+					end
+					if pdir.y > 0 then
+						rotate = not rotate
+					end
+				elseif def.drawtype == "signlike" then
+					if math.abs(pdir.x) < math.abs(pdir.z) then
+						rotate = true
+					end
+				else
+					if math.abs(pdir.x) > math.abs(pdir.z) then
+						rotate = true
+					end
+				end
+				if rotate then
+					newnode.param2 = newnode.param2 + 6
+				end
+			end
+		end
 	-- Calculate the direction for furnaces and chests and stuff
 	elseif (def.paramtype2 == "facedir" or
 			def.paramtype2 == "colorfacedir" or
@@ -714,3 +747,22 @@ core.noneitemdef_default = {  -- This is used for the hand and unknown items
 	on_drop = nil,
 	on_use = nil,
 }
+
+--
+-- get_node implementation
+--
+
+local get_node_raw = core.get_node_raw
+core.get_node_raw = nil
+
+function core.get_node(pos)
+	local content, param1, param2 = get_node_raw(pos.x, pos.y, pos.z)
+	return {name = core.get_name_from_content_id(content), param1 = param1, param2 = param2}
+end
+
+function core.get_node_or_nil(pos)
+	local content, param1, param2, pos_ok = get_node_raw(pos.x, pos.y, pos.z)
+	return pos_ok and
+			{name = core.get_name_from_content_id(content), param1 = param1, param2 = param2}
+			or nil
+end
diff --git a/builtin/game/knockback.lua b/builtin/game/knockback.lua
index 979d13a14..b119cdeb9 100644
--- a/builtin/game/knockback.lua
+++ b/builtin/game/knockback.lua
@@ -22,14 +22,16 @@ local function vector_absmax(v)
 	return max(max(abs(v.x), abs(v.y)), abs(v.z))
 end
 
-core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, unused_dir, damage)
+core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
 	if player:get_hp() == 0 then
 		return -- RIP
 	end
 
-	-- Server::handleCommand_Interact() adds eye offset to one but not the other
-	-- so the direction is slightly off, calculate it ourselves
-	local dir = vector.subtract(player:get_pos(), hitter:get_pos())
+	if hitter then
+		-- Server::handleCommand_Interact() adds eye offset to one but not the other
+		-- so the direction is slightly off, calculate it ourselves
+		dir = vector.subtract(player:get_pos(), hitter:get_pos())
+	end
 	local d = vector.length(dir)
 	if d ~= 0.0 then
 		dir = vector.divide(dir, d)
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 0f0bebff6..78061b5a5 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -249,8 +249,8 @@ end
 core.dynamic_media_callbacks = {}
 
 
--- Transfer of certain globals into async environment
--- see builtin/async/game.lua for the other side
+-- Transfer of certain globals into seconday Lua environments
+-- see builtin/async/game.lua or builtin/emerge/register.lua for the unpacking
 
 local function copy_filtering(t, seen)
 	if type(t) == "userdata" or type(t) == "function" then
@@ -273,6 +273,9 @@ function core.get_globals_to_transfer()
 	local all = {
 		registered_items = copy_filtering(core.registered_items),
 		registered_aliases = core.registered_aliases,
+		registered_biomes = core.registered_biomes,
+		registered_ores = core.registered_ores,
+		registered_decorations = core.registered_decorations,
 
 		nodedef_default = copy_filtering(core.nodedef_default),
 		craftitemdef_default = copy_filtering(core.craftitemdef_default),
@@ -281,3 +284,29 @@ function core.get_globals_to_transfer()
 	}
 	return all
 end
+
+do
+	local function valid_object_iterator(objects)
+		local i = 0
+		local function next_valid_object()
+			i = i + 1
+			local obj = objects[i]
+			if obj == nil then
+				return
+			end
+			if obj:is_valid() then
+				return obj
+			end
+			return next_valid_object()
+		end
+		return next_valid_object
+	end
+
+	function core.objects_inside_radius(center, radius)
+		return valid_object_iterator(core.get_objects_inside_radius(center, radius))
+	end
+
+	function core.objects_in_area(min_pos, max_pos)
+		return valid_object_iterator(core.get_objects_in_area(min_pos, max_pos))
+	end
+end
diff --git a/builtin/game/misc_s.lua b/builtin/game/misc_s.lua
index 93d2bafa8..ab15b230e 100644
--- a/builtin/game/misc_s.lua
+++ b/builtin/game/misc_s.lua
@@ -64,6 +64,13 @@ function core.encode_png(width, height, data, compression)
 		error("Incorrect type for 'height', expected number, got " .. type(height))
 	end
 
+	if width < 1 then
+		error("Incorrect value for 'width', must be at least 1")
+	end
+	if height < 1 then
+		error("Incorrect value for 'height', must be at least 1")
+	end
+
 	local expected_byte_count = width * height * 4
 
 	if type(data) ~= "table" and type(data) ~= "string" then
@@ -90,3 +97,26 @@ function core.encode_png(width, height, data, compression)
 
 	return o_encode_png(width, height, data, compression or 6)
 end
+
+-- Helper that pushes a collisionMoveResult structure
+if core.set_push_moveresult1 then
+	-- must match CollisionAxis in collision.h
+	local AXES = {"x", "y", "z"}
+	-- <=> script/common/c_content.cpp push_collision_move_result()
+	core.set_push_moveresult1(function(b0, b1, b2, axis, npx, npy, npz, v0x, v0y, v0z, v1x, v1y, v1z, v2x, v2y, v2z)
+		return {
+			touching_ground = b0,
+			collides = b1,
+			standing_on_object = b2,
+			collisions = {{
+				type = "node",
+				axis = AXES[axis + 1],
+				node_pos = vector.new(npx, npy, npz),
+				new_pos = vector.new(v0x, v0y, v0z),
+				old_velocity = vector.new(v1x, v1y, v1z),
+				new_velocity = vector.new(v2x, v2y, v2z),
+			}},
+		}
+	end)
+	core.set_push_moveresult1 = nil
+end
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 25aad12d5..c903f1d94 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -404,7 +404,7 @@ core.register_item(":", {
 })
 
 
-function core.override_item(name, redefinition)
+function core.override_item(name, redefinition, del_fields)
 	if redefinition.name ~= nil then
 		error("Attempt to redefine name of "..name.." to "..dump(redefinition.name), 2)
 	end
@@ -418,6 +418,9 @@ function core.override_item(name, redefinition)
 	for k, v in pairs(redefinition) do
 		rawset(item, k, v)
 	end
+	for _, field in ipairs(del_fields or {}) do
+		rawset(item, field, nil)
+	end
 	register_item_raw(item)
 end
 
diff --git a/builtin/game/statbars.lua b/builtin/game/statbars.lua
deleted file mode 100644
index 78d1d2728..000000000
--- a/builtin/game/statbars.lua
+++ /dev/null
@@ -1,187 +0,0 @@
--- cache setting
-local enable_damage = core.settings:get_bool("enable_damage")
-
-local bar_definitions = {
-	hp = {
-		hud_elem_type = "statbar",
-		position = {x = 0.5, y = 1},
-		text = "heart.png",
-		text2 = "heart_gone.png",
-		number = core.PLAYER_MAX_HP_DEFAULT,
-		item = core.PLAYER_MAX_HP_DEFAULT,
-		direction = 0,
-		size = {x = 24, y = 24},
-		offset = {x = (-10 * 24) - 25, y = -(48 + 24 + 16)},
-	},
-	breath = {
-		hud_elem_type = "statbar",
-		position = {x = 0.5, y = 1},
-		text = "bubble.png",
-		text2 = "bubble_gone.png",
-		number = core.PLAYER_MAX_BREATH_DEFAULT * 2,
-		item = core.PLAYER_MAX_BREATH_DEFAULT * 2,
-		direction = 0,
-		size = {x = 24, y = 24},
-		offset = {x = 25, y= -(48 + 24 + 16)},
-	},
-}
-
-local hud_ids = {}
-
-local function scaleToHudMax(player, field)
-	-- Scale "hp" or "breath" to the hud maximum dimensions
-	local current = player["get_" .. field](player)
-	local nominal = bar_definitions[field].item
-	local max_display = math.max(player:get_properties()[field .. "_max"], current)
-	return math.ceil(current / max_display * nominal)
-end
-
-local function update_builtin_statbars(player)
-	local name = player:get_player_name()
-
-	if name == "" then
-		return
-	end
-
-	local flags = player:hud_get_flags()
-	if not hud_ids[name] then
-		hud_ids[name] = {}
-		-- flags are not transmitted to client on connect, we need to make sure
-		-- our current flags are transmitted by sending them actively
-		player:hud_set_flags(flags)
-	end
-	local hud = hud_ids[name]
-
-	local immortal = player:get_armor_groups().immortal == 1
-
-	if flags.healthbar and enable_damage and not immortal then
-		local number = scaleToHudMax(player, "hp")
-		if hud.id_healthbar == nil then
-			local hud_def = table.copy(bar_definitions.hp)
-			hud_def.number = number
-			hud.id_healthbar = player:hud_add(hud_def)
-		else
-			player:hud_change(hud.id_healthbar, "number", number)
-		end
-	elseif hud.id_healthbar then
-		player:hud_remove(hud.id_healthbar)
-		hud.id_healthbar = nil
-	end
-
-	local show_breathbar = flags.breathbar and enable_damage and not immortal
-
-	local breath     = player:get_breath()
-	local breath_max = player:get_properties().breath_max
-	if show_breathbar and breath <= breath_max then
-		local number = scaleToHudMax(player, "breath")
-		if not hud.id_breathbar and breath < breath_max then
-			local hud_def = table.copy(bar_definitions.breath)
-			hud_def.number = number
-			hud.id_breathbar = player:hud_add(hud_def)
-		elseif hud.id_breathbar then
-			player:hud_change(hud.id_breathbar, "number", number)
-		end
-	end
-
-	if hud.id_breathbar and (not show_breathbar or breath == breath_max) then
-		core.after(1, function(player_name, breath_bar)
-			local player = core.get_player_by_name(player_name)
-			if player then
-				player:hud_remove(breath_bar)
-			end
-		end, name, hud.id_breathbar)
-		hud.id_breathbar = nil
-	end
-end
-
-local function cleanup_builtin_statbars(player)
-	local name = player:get_player_name()
-
-	if name == "" then
-		return
-	end
-
-	hud_ids[name] = nil
-end
-
-local function player_event_handler(player,eventname)
-	assert(player:is_player())
-
-	local name = player:get_player_name()
-
-	if name == "" or not hud_ids[name] then
-		return
-	end
-
-	if eventname == "health_changed" then
-		update_builtin_statbars(player)
-
-		if hud_ids[name].id_healthbar then
-			return true
-		end
-	end
-
-	if eventname == "breath_changed" then
-		update_builtin_statbars(player)
-
-		if hud_ids[name].id_breathbar then
-			return true
-		end
-	end
-
-	if eventname == "hud_changed" or eventname == "properties_changed" then
-		update_builtin_statbars(player)
-		return true
-	end
-
-	return false
-end
-
-function core.hud_replace_builtin(hud_name, definition)
-	if type(definition) ~= "table" or
-			definition.hud_elem_type ~= "statbar" then
-		return false
-	end
-
-	definition = table.copy(definition)
-
-	if hud_name == "health" then
-		definition.item = definition.item or definition.number or core.PLAYER_MAX_HP_DEFAULT
-		bar_definitions.hp = definition
-
-		for name, ids in pairs(hud_ids) do
-			local player = core.get_player_by_name(name)
-			if player and ids.id_healthbar then
-				player:hud_remove(ids.id_healthbar)
-				ids.id_healthbar = nil
-				update_builtin_statbars(player)
-			end
-		end
-		return true
-	end
-
-	if hud_name == "breath" then
-		definition.item = definition.item or definition.number or core.PLAYER_MAX_BREATH_DEFAULT
-		bar_definitions.breath = definition
-
-		for name, ids in pairs(hud_ids) do
-			local player = core.get_player_by_name(name)
-			if player and ids.id_breathbar then
-				player:hud_remove(ids.id_breathbar)
-				ids.id_breathbar = nil
-				update_builtin_statbars(player)
-			end
-		end
-		return true
-	end
-
-	return false
-end
-
--- Append "update_builtin_statbars" as late as possible
--- This ensures that the HUD is hidden when the flags are updated in this callback
-core.register_on_mods_loaded(function()
-	core.register_on_joinplayer(update_builtin_statbars)
-end)
-core.register_on_leaveplayer(cleanup_builtin_statbars)
-core.register_playerevent(player_event_handler)
diff --git a/builtin/game/tests/test_moveaction.lua b/builtin/game/tests/test_moveaction.lua
new file mode 100644
index 000000000..476579348
--- /dev/null
+++ b/builtin/game/tests/test_moveaction.lua
@@ -0,0 +1,84 @@
+-- Table to keep track of callback executions
+-- [i + 0] = count of expected patterns of index (i + 1)
+-- [i + 1] = pattern to check
+local PATTERN_NORMAL = { 4, "allow_%w", 2, "on_take", 1, "on_put", 1 }
+local PATTERN_SWAP   = { 8, "allow_%w", 4, "on_take", 2, "on_put", 2 }
+local exec_listing = {} -- List of logged callbacks (e.g. "on_take", "allow_put")
+
+-- Checks whether the logged callbacks equal the expected pattern
+core.__helper_check_callbacks = function(expect_swap)
+	local exec_pattern = expect_swap and PATTERN_SWAP or PATTERN_NORMAL
+	local ok = #exec_listing == exec_pattern[1]
+	if ok then
+		local list_index = 1
+		for i = 2, #exec_pattern, 2 do
+			for n = 1, exec_pattern[i + 1] do
+				-- Match the list for "n" occurrences of the wanted callback name pattern
+				ok = exec_listing[list_index]:find(exec_pattern[i])
+				list_index = list_index + 1
+				if not ok then break end
+			end
+			if not ok then break end
+		end
+	end
+
+	if not ok then
+		print("Execution order mismatch!")
+		print("Expected patterns: ", dump(exec_pattern))
+		print("Got list: ", dump(exec_listing))
+	end
+	exec_listing = {}
+	return ok
+end
+
+-- Uncomment the other line for easier callback debugging
+local log = function(...) end
+--local log = print
+
+minetest.register_allow_player_inventory_action(function(_, action, inv, info)
+	log("\tallow " .. action, info.count or info.stack:to_string())
+
+	if action == "move" then
+		-- testMoveFillStack
+		return info.count
+	end
+
+	if action == "take" or action == "put" then
+		assert(not info.stack:is_empty(), "Stack empty in: " .. action)
+
+		-- testMoveUnallowed
+		-- testSwapFromUnallowed
+		-- testSwapToUnallowed
+		if info.stack:get_name() == "default:takeput_deny" then
+			return 0
+		end
+
+		-- testMovePartial
+		if info.stack:get_name() == "default:takeput_max_5" then
+			return 5
+		end
+
+		-- testCallbacks
+		if info.stack:get_name():find("default:takeput_cb_%d") then
+			-- Log callback as executed
+			table.insert(exec_listing, "allow_" .. action)
+			return -- Unlimited
+		end
+	end
+
+	return -- Unlimited
+end)
+
+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
+		assert(not info.stack:is_empty(), action)
+
+		if info.stack:get_name():find("default:takeput_cb_%d") then
+			-- Log callback as executed
+			table.insert(exec_listing, "on_" .. action)
+			return
+		end
+	end
+end)
diff --git a/builtin/init.lua b/builtin/init.lua
index 2632faa5a..ef6dcc9fa 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -26,15 +26,21 @@ do
 		core.print = nil -- don't pollute our namespace
 	end
 end
-math.randomseed(os.time())
+
+do
+	-- Note that PUC Lua just calls srand() which is already initialized by C++,
+	-- but we don't want to rely on this implementation detail.
+	local seed = 1048576 * (os.time() % 1048576)
+	seed = seed + core.get_us_time() % 1048576
+	math.randomseed(seed)
+end
+
 minetest = core
 freeminer = core
 multicraft = core
 
 -- Load other files
 local scriptdir = core.get_builtin_path()
-local gamepath = scriptdir .. "game" .. DIR_DELIM
-local clientpath = scriptdir .. "client" .. DIR_DELIM
 local commonpath = scriptdir .. "common" .. DIR_DELIM
 local asyncpath = scriptdir .. "async" .. DIR_DELIM
 
@@ -48,7 +54,7 @@ dofile(scriptdir.."key_value_storage.lua")
 --PLATFORM = "Android" -- for test
 
 if INIT == "game" then
-	dofile(gamepath .. "init.lua")
+	dofile(scriptdir .. "game" .. DIR_DELIM .. "init.lua")
 	assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
 	local mm_script = core.settings:get("main_menu_script")
@@ -76,9 +82,12 @@ elseif INIT == "mainmenu" then
 elseif INIT == "async"  then
 	dofile(asyncpath .. "mainmenu.lua")
 elseif INIT == "async_game" then
+	dofile(commonpath .. "metatable.lua")
 	dofile(asyncpath .. "game.lua")
 elseif INIT == "client" then
-	dofile(clientpath .. "init.lua")
+	dofile(scriptdir .. "client" .. DIR_DELIM .. "init.lua")
+elseif INIT == "emerge" then
+	dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua")
 else
 	error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end
diff --git a/builtin/locale/__builtin.eo.tr b/builtin/locale/__builtin.eo.tr
new file mode 100644
index 000000000..c3fec6c37
--- /dev/null
+++ b/builtin/locale/__builtin.eo.tr
@@ -0,0 +1,246 @@
+# textdomain: __builtin
+Invalid parameters (see /help @1).=Nevalidaj parametroj (kontrolu /help @1)
+Too many arguments, try using just /help <command>=Tro da parametroj, eble provu /help <ordono>
+Available commands: @1=Nunaj ordonoj: @1
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=Uzu «/help <ordono>» por specifa informo, aŭ «/help all» por listigi ĉion.
+Available commands:=Nunaj ordonoj:
+Command not available: @1=Ordono neuzebla: @1
+[all | privs | <cmd>] [-t]=[all | privs | <ordono>]
+Get help for commands or list privileges (-t: output in chat)=Listigi helpon pri ordonoj («all» aŭ <ordono>) aŭ rajtoj («privs») (kun -t: presu en babilejo)
+Available privileges:=Nunaj rajtoj:
+Command=Ordono
+Parameters=Parametroj
+For more information, click on any entry in the list.=Por pliaj informoj, klaku ajnan listeron.
+Double-click to copy the entry to the chat history.=Dufoje-klaku por kopii listeron al la babilejo.
+Command: @1 @2=Ordono: @1 @2
+Available commands: (see also: /help <cmd>)=Nunaj ordonoj: (vidu ankaŭ: /help <ordono>)
+Close=Fermi
+Privilege=Rajto
+Description=Priskribo
+Empty command.=Malplena ordono.
+Invalid command: @1=Nevalida ordono: @1
+Invalid command usage.=Nevalida ordonouzo.
+ (@1 s)= (@1 s)
+Command execution took @1 s=Ruliĝo de ordono postulis @1 s
+You don't have permission to run this command (missing privileges: @1).=Vi ne rajtas uzi tiun ĉi ordonon (mankataj rajtoj: @1)
+Unable to get position of player @1.=Ne povis akiri pozicion de ludanto @1.
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=Nevalida loko-formo. Atendis: (x1,y1,z1) (x2,y2,z2)
+<action>=<ago>
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=Roli agon en la babilejo (ekz., «/me mendas picon» montras «<ludanto> mendas picon»)
+Show the name of the server owner=Montri nomon de la serviladministranto
+The administrator of this server is @1.=La adminstranto de tiu ĉi servilo estas @1.
+There's no administrator named in the config file.=Estas neniu agordita administranto en la agordodosiero.
+@1 does not have any privileges.=@1 havas neniun rajton.
+Privileges of @1: @2=Rajtoj de @1: @2
+[<name>]=[<nomo>]
+Show privileges of yourself or another player=Montri rajtojn de vi aŭ alia ludanto
+Player @1 does not exist.=Ludanto @1 ne ekzistas.
+<privilege>=<rajto>
+Return list of all online players with privilege=Listi ĉeretan ludanton kun specifa rajto
+Invalid parameters (see /help haspriv).=Nevalidaj parametroj (vidu /help haspriv).
+Unknown privilege!=Nekonata rajto!
+No online player has the "@1" privilege.=Neniu ĉeretulo havas la rajton «@1».
+Players online with the "@1" privilege: @2=Ĉeretuloj kun la rajto «@1»: @2
+Your privileges are insufficient.=Viaj rajtoj ne sufiĉas.
+Your privileges are insufficient. '@1' only allows you to grant: @2=Viaj rajtoj ne sufiĉas. «@1» sole lasas vin doni: @2
+Unknown privilege: @1=Nekonata rajto: @1
+@1 granted you privileges: @2=@1 donis al vi rajtojn: @2
+<name> (<privilege> [, <privilege2> [<...>]] | all)=<nomo> (<rajto> [, <rajto2> [<...>]] | all)
+Give privileges to player=Doni rajtojn al ludanto, aŭ aparte, aŭ ĉiun kune («all»)
+Invalid parameters (see /help grant).=Nevalidaj parametroj (vidu /help grant).
+<privilege> [, <privilege2> [<...>]] | all=<rajto> [, <rajto2> [<...>]] | all
+Grant privileges to yourself=Doni rajtojn al vi mem, aŭ aparte, aŭ ĉiun kune («all»)
+Invalid parameters (see /help grantme).=Nevalidaj parametroj (vidu /help grantme)
+Your privileges are insufficient. '@1' only allows you to revoke: @2=Viaj rajtoj ne sufiĉas. «@1» sole lasas vin repreni: @2
+Note: Cannot revoke in singleplayer: @1=Rimarko: Neeblas repreni rajton sole: @1
+Note: Cannot revoke from admin: @1=Rimarko: Neeblas repreni rajnton de administranto: @1
+No privileges were revoked.=Neniu rajto reprenita.
+@1 revoked privileges from you: @2=@1 reprenis rajtojn de vi: @2
+Remove privileges from player=Repreni rajtojn de ludanto, aŭ aparte, aŭ ĉiun kune («all»)
+Invalid parameters (see /help revoke).=Nevalidaj parametroj (vidu /help revoke)
+Revoke privileges from yourself=Repreni rajtojn de vi mem, aŭ aparte, aŭ ĉiun kune («all»)
+Invalid parameters (see /help revokeme).=Nevalidaj parametroj (vidu /help revokeme).
+<name> <password>=<nomo> <pasvorto>
+Set player's password (sent unencrypted, thus insecure)=Agordi pasvorton de ludanto (sendute senĉifre, kaj tiel malsekure)
+Name field required.=Nomo bezonata.
+Your password was cleared by @1.=Via pasvorto forviŝiĝis de @1.
+Password of player "@1" cleared.=Pasvorto de ludanto «@1» forviŝita.
+Your password was set by @1.=Via pasvorto agordiĝis de @1.
+Password of player "@1" set.=Pasvorto de ludanto «@1» agordita.
+<name>=<nomo>
+Set empty password for a player=Forviŝi pasvorton de ludanto
+Reload authentication data=Reenlegi aŭtentigajn datumojn
+Done.=Finite.
+Failed.=Malsukcese..
+Remove a player's data=Forviŝi datumojn de ludanto
+Player "@1" removed.=Ludanto «@1» forigita.
+No such player "@1" to remove.=Neniu ekzistanta ludanto «@1» forigebla.
+Player "@1" is connected, cannot remove.=Ludanto «@1» ĉeretas, do ne forigeblas.
+Unhandled remove_player return code @1.=Netraktata remove_player redonkodo @1.
+Cannot teleport out of map bounds!=Neeblas teleporti ekstermonden!
+Cannot get player with name @1.=Neeblas trovi ludanton nomitan «@1».
+Cannot teleport, @1 is attached to an object!=Ne povas teleporti @1, ĝi estas ligita al objekto!
+Teleporting @1 to @2.=Teleportante @1 al @2.
+One does not teleport to oneself.=Oni kutimas ne teleportu al si mem.
+Cannot get teleportee with name @1.=Ne trovis alteleportaton nomitan @1.
+Cannot get target player with name @1.=Ne trovis celatan ludanton nomitan @1.
+Teleporting @1 to @2 at @3.=Teleportante @1 al @2 ĉe @3.
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=<X>,<Y>,<Z> | <al_nomo> | <nomo> <X>,<Y>,<Z> | <nomo> <al_nomo>
+Teleport to position or player=Teleportiĝi al pozicio aŭ ludanto
+You don't have permission to teleport other players (missing privilege: @1).=Vi ne rajtas teleporti aliajn ludantojn (mankas rajto: @1).
+([-n] <name> <value>) | <name>=([-n] <nomo> <valoro>) | <nomo>
+Set or read server configuration setting=Agordi aŭ vidi servilan agordon
+Failed. Cannot modify secure settings. Edit the settings file manually.=Malsukcese. Neeblas redakti sekurajn agordojn. Redaktu la agordodosieron permane.
+Failed. Use '/set -n <name> <value>' to create a new setting.=Malsukcese. Uzu «/set -n <nomo> <valoro>» por krei novan agordon.
+@1 @= @2=@1 @= @2
+<not set>=<ne agordita>
+Invalid parameters (see /help set).=Nevalidaj parametroj (vidu /help set).
+Finished emerging @1 blocks in @2ms.=Finenlegis @1 monderojn dum @2ms.
+emergeblocks update: @1/@2 blocks emerged (@3%)=emergeblocks ĝisdatigo: @1/@2 monderoj enlegitaj (@3%)
+(here [<radius>]) | (<pos1> <pos2>)=(here [<radius>]) | (<pos1> <pos2>)
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Enlegi (aŭ, laŭnecese, krei) mondopecojn inter la pozicioj poz1 kaj pos2 (<poz1> kaj <poz2> devas esti inter krampoj)
+Started emerge of area ranging from @1 to @2.=Ekenlegis mondpecojn inter @1 kaj @2.
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Forigi mondpecojn inter la pozicioj poz1 kaj poz2 (<poz1> kaj <poz2> devas esti inter krampoj)
+Successfully cleared area ranging from @1 to @2.=Sukcese forigis mondpecojn inter @1 kaj @2.
+Failed to clear one or more blocks in area.=Malsukcesis forigi unu aŭ pli da mondpecoj.
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=Reŝarĝas lumojn inter la pozicioj poz1 kaj poz2 (<poz1> kaj <poz2> devas esti inter krampoj)
+Successfully reset light in the area ranging from @1 to @2.=Sukcesis reŝarĝi lumojn inter @1 kaj @2.
+Failed to load one or more blocks in area.=Malsukcesis enlegante unu aŭ pli da monderoj.
+List mods installed on the server=Listigi modifaĵojn instalitajn de la servilo.
+No mods installed.=Neniu modifaĵ instalita.
+Cannot give an empty item.=Neeblas doni neniun portaĵon.
+Cannot give an unknown item.=Neeblas doni nekonatan portaĵon.
+Giving 'ignore' is not allowed.=Doni «ignore» estas ne permesita.
+@1 is not a known player.=@1 ne estas konata ludanto.
+@1 partially added to inventory.=@1 parte enmetiĝis al portaĵujon.
+@1 could not be added to inventory.=@1 ne enmetiĝis al portaĵujon.
+@1 added to inventory.=@1 enmetiĝis al portaĵujon.
+@1 partially added to inventory of @2.=@1 parte enmetiĝis al portaĵujon de @2.
+@1 could not be added to inventory of @2.=@1 ne enmetiĝis al portaĵujon de @2.
+@1 added to inventory of @2.=@1 enmetiĝis al portaĵujon de @2.
+<name> <ItemString> [<count> [<wear>]]=<nomo> <PortaĵNomo> [<kvanto> <portu>]]
+Give item to player=Doni portaĵon al ludanto
+Name and ItemString required.=Nomo kaj PortaĵNomo postualtaj.
+<ItemString> [<count> [<wear>]]=<PortaĵNomo> [<kvanto> [<portu>]]
+Give item to yourself=Doni portaĵon al vi mem.
+ItemString required.=PortaĵNomo postulata.
+<EntityName> [<X>,<Y>,<Z>]=<EstaĵoNomo> [<X>, <Y>, <Z>]
+Spawn entity at given (or your) position=Estigi estaĵon ĉe la donita (aŭ la via) pozicio
+EntityName required.=EstaĵNomo postulata.
+Unable to spawn entity, player is nil.=Ne povis estigi estaĵon, ĉar ludanto estas nil.
+Cannot spawn an unknown entity.=Neeblas estigi nekonatan estaĵon.
+Invalid parameters (@1).=Nevalidaj parametroj (@1).
+@1 spawned.=@1 naskiĝis.
+@1 failed to spawn.=@1 ne naskiĝis.
+Destroy item in hand=Detrui portaĵon enmanan
+Unable to pulverize, no player.=Ne povis detrui, neniu ludanto.
+Unable to pulverize, no item in hand.=Ne povis detrui, ĉar nenio estas tenata.
+An item was pulverized.=Portaĵo detruiĝis.
+[<range>] [<seconds>] [<limit>]=[<intertempo>] [<sekundoj>] [<limo>]
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=Kontroli kiu lastafoje tuŝis monderon aŭ monderon proksiman al ĝi dum
+Rollback functions are disabled.=Malfaraj funkcioj estas malŝaltitaj.
+That limit is too high!=Tiu limo troaltas!
+Checking @1 ...=Kontrolas @1…
+Nobody has touched the specified location in @1 seconds.=Neniu tuŝis tiun lokon dum @1 sekundoj.
+@1 @2 @3 -> @4 @5 seconds ago.=@1 @2 @3 -> @4 @5 sekundoj antaŭe.
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=Frapi monderon (intertempo@=@1, sekundoj@=@2, limo@=@3).
+(<name> [<seconds>]) | (:<actor> [<seconds>])=(<nomo> [<sekundoj>]) | (:<aganto> [<sekundoj>])
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=Malfari agojn de ludanto. Implicita valoro de <sekundoj> estas 60. Metu <sekundoj> kiel «inf» por neniu tempolimo
+Invalid parameters. See /help rollback and /help rollback_check.=Nevalidaj parametroj. Vidu /help rollback kaj /help rollback_check.
+Reverting actions of player '@1' since @2 seconds.=Malfaras agojn de ludanto «@1» ekde @2 sekundoj antaŭ nun.
+Reverting actions of @1 since @2 seconds.=Malfaras agojn de @1 ekde @2 sekundoj antaŭ nun.
+(log is too long to show)=(protokolo trolongas por montri)
+Reverting actions succeeded.=Sukcesis malfari agojn.
+Reverting actions FAILED.=MALsukcesis malfari agojn.
+Show server status=Montri staton de servilon.
+This command was disabled by a mod or game.=Tiun ordonon malŝaltis modifaĵo aŭ ludo.
+[<0..23>:<0..59> | <0..24000>]=[<0..23>:<0..59> | <0..24000>]
+Show or set time of day=Montri aŭ ŝanĝi la horon
+Current time is @1:@2.=Nun estas @1:@2.
+You don't have permission to run this command (missing privilege: @1).=Vi ne rajtas rulu tiun orodnon (mankata rajto: @1).
+Invalid time (must be between 0 and 24000).=Nevalida tempo (estu inter 0 kaj 24000)
+Time of day changed.=Horo ŝanĝita.
+Invalid hour (must be between 0 and 23 inclusive).=Nevalida horo (estu inter 0 kaj 23, inkluzive).
+Invalid minute (must be between 0 and 59 inclusive).=Nevalida minuto (estu inter 0 kaj 59, inkluzive).
+Show day count since world creation=Montri pasitajn tagojn ekde mondokreo
+Current day is @1.=Nuna tago estas @1.
+[<delay_in_seconds> | -1] [-r] [<message>]=[<prokrasto_sekunde> | -1] [-r] [<mesaĝo>]
+Shutdown server (-1 cancels a delayed shutdown, -r allows players to reconnect)=Malŝalti servilon (-1 nuligas planitan malŝalton, -r lasas ludantojn rekonektiĝi)
+Server shutting down (operator request).=Servilo malŝaltiĝas (laŭ prizorganta peto)
+Ban the IP of a player or show the ban list=Forbari la IP-adreson de ludanto, aŭ listigi forbaritojn
+The ban list is empty.=La forbaritolisto malplenas.
+Ban list: @1=Forbaritoj: @1
+You cannot ban players in singleplayer!=Vi ne povas forbari ludantojn en unuludanta reĝimo!
+Player is not online.=Ludanto ne ĉeretas.
+Failed to ban player.=Malsukcesis forbari ludanton.
+Banned @1.=Forbaris @1.
+<name> | <IP_address>=<nomo> | <IP_adreso>
+Remove IP ban belonging to a player/IP=Nuligi IP-forbaron de ludanto/IP
+Failed to unban player/IP.=Malsukcesis nuligi forbaron de ludanto/IP-adreso
+Unbanned @1.=Malforbaris @1.
+<name> [<reason>]=<nomo> [<kialo>]
+Kick a player=Elĵeti ludanton
+Failed to kick player @1.=Malsukcesis elĵeti ludanton @1.
+Kicked @1.=Elĵetis @1.
+[full | quick]=[full | quick]
+Clear all objects in world=Forigu ĉiujn lasitajn portaĵojn en la mondo
+Invalid usage, see /help clearobjects.=Nevalida uzo, vidu /help clearobjects.
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=Forigante ĉiun lasitan portaĵon. Tio ĉi eble postulos longan tempon. Vi eble malkonektiĝos pro tempo-elĉerpo. (de @1)
+Cleared all objects.=Forigis ĉiun lasitan portaĵon.
+<name> <message>=<nomo> <mesaĝo>
+Send a direct message to a player=Sendu rekte privatan mesaĝon al ludanto
+Invalid usage, see /help msg.=Nevalida uzo, vidu /help msg.
+The player @1 is not online.=La ludanto @1 ne ĉeretas.
+DM from @1: @2=Privata mesaĝo de @1: @2
+Message sent.=Mesaĝo sendita.
+Get the last login time of a player or yourself=Vidi la lastan salutotempon de ludanto, aŭ vi mem
+@1's last login time was @2.=Lasta salutotempo de @1 estas @2.
+@1's last login time is unknown.=Lasta salutotempo de @1 estas nesciata.
+Clear the inventory of yourself or another player=Malplenigi la portaĵujon de vi aŭ alia ludanto.
+You don't have permission to clear another player's inventory (missing privilege: @1).=Vi ne rajtas malplenigi portaĵujon de alia ludanto (mankata rajto: @1).
+@1 cleared your inventory.=@1 malplenigis vian portaĵujon.
+Cleared @1's inventory.=Malplenigis portaĵujon de @1.
+Player must be online to clear inventory!=Por malplenigi onian portaĵujon, tiu devas ĉereti!
+Players can't be killed, damage has been disabled.=Nemortigeblas ludantoj, ĉar vundado estas malŝaltita.
+Player @1 is not online.=Ludanto @1 ne ĉeretas.
+You are already dead.=Vi jam estas mortinta.
+@1 is already dead.=@1 estas mortinta.
+@1 has been killed.=@1 estas murdita.
+Kill player or yourself=Mortigi ludanton aŭ vin mem
+@1 joined the game.=@1 aliĝis la ludon.
+@1 left the game.=@1 foriris de la ludo.
+@1 left the game (timed out).=@1 foriris de la ludo (tempo-elĉerpo)
+(no description)=(neniu priskribo)
+Can interact with things and modify the world=Povas interfaci kaj redakti la mondon
+Can speak in chat=Povas paroli babileje
+Can modify basic privileges (@1)=Povas redakti bazajn rajtojn (@1)
+Can modify privileges=Povas redakti rajtojn
+Can teleport self=Povas teleporti sin
+Can teleport other players=Povas teleporti aliajn ludantojn
+Can set the time of day using /time=Povas ŝanĝi la tempon per /time
+Can do server maintenance stuff=Povas fari servilestrajn aferojn
+Can bypass node protection in the world=Povas malatenti monderajn protektojn de la mondo
+Can ban and unban players=Povas forbari kaj malforbari ludantojn
+Can kick players=Povas elĵeti ludantojn
+Can use /give and /giveme=Povas uzi /give kaj /giveme
+Can use /setpassword and /clearpassword=Povas uzi /setpassword kaj /clearpassword
+Can use fly mode=Povas ŝalti flugan reĝimon
+Can use fast mode=Povas ŝalti rapidegan reĝimon
+Can fly through solid nodes using noclip mode=Povas traflugi monderojn per trapasa reĝimo
+Can use the rollback functionality=Povas uzi malfarajn funkciojn
+Can enable wireframe=Povas ŝalti ĉirkaŭkadron
+Unknown Item=Nekonata portaĵo
+Air=Aero
+Ignore=Malatenti
+You can't place 'ignore' nodes!=Vi ne povas meti «malatentajn» monderojn!
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=print [<filtrilo>] | dump [<filtrilo>] | save [<formo> [<filtrilo>]] | reset
+Handle the profiler and profiling data=Trakti la analizilon kaj analizajn datumojn
+Statistics written to action log.=Analizoj skribitaj al agoprotokolo.
+Statistics were reset.=Analizoj forviŝitaj.
+Usage: @1=Uzado: @1
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=Formo povas estas txt, csv, lua, json, aŭ json_pretty (struktuoj eble iam ŝanĝiĝos).
+Values below show absolute/relative times spend per server step by the instrumented function.=Valoroj subaj montras la malrelativan/relativan tempon pasigitan de la servilo je ĉiu paŝo de la funkcio.
+A total of @1 sample(s) were taken.=Sume @1 ekzemplero(j) konserviĝis.
+The output is limited to '@1'.=La eligo estas limigita al «@1».
+Saving of profile failed: @1=Konservado de profilo malsukcesis: @1
+Profile saved to @1=Profilo konservita al @1
diff --git a/builtin/locale/__builtin.fr.tr b/builtin/locale/__builtin.fr.tr
new file mode 100644
index 000000000..6c3a244dc
--- /dev/null
+++ b/builtin/locale/__builtin.fr.tr
@@ -0,0 +1,246 @@
+# textdomain: __builtin
+Invalid parameters (see /help @1).=Paramètres invalides (voir /help @1).
+Too many arguments, try using just /help <command>=Trop de paramètres, essayez /help <command>
+Available commands: @1=Commandes disponibles : @1
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=Essayez '/help <cmd>' pour obtenir plus d'informations, ou '/help all' pour tout lister.
+Available commands:=Commandes disponibles :
+Command not available: @1=Commande non disponible : @1
+[all | privs | <cmd>] [-t]=[all | privs | <cmd>] [-t]
+Get help for commands or list privileges (-t: output in chat)=Obtenir de l'aide pour les commandes ou pour lister les privilèges (-t : affichage dans le tchat)
+Available privileges:=Privilèges disponibles :
+Command=Commande
+Parameters=Paramètres
+For more information, click on any entry in the list.=Pour plus d'informations, cliquez sur une entrée dans la liste.
+Double-click to copy the entry to the chat history.=Double-cliquez pour copier une entrée dans l'historique du tchat.
+Command: @1 @2=Commande : @1 @2
+Available commands: (see also: /help <cmd>)=Commandes disponibles : (voir aussi : /help <cmd>)
+Close=Fermer
+Privilege=Privilège
+Description=Description
+Empty command.=Commande vide.
+Invalid command: @1=Commande invalide : @1
+Invalid command usage.=Usage invalide de la commande.
+ (@1 s)= (@1 s)
+Command execution took @1 s=L'exécution de la commande a pris @1 s.
+You don't have permission to run this command (missing privileges: @1).=Vous n'avez pas la permission d'exécuter cette commande (privilèges manquants : @1)
+Unable to get position of player @1.=Impossible d'obtenir la position du joueur @1.
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=Format incorrect de la zone. Demandé : (x1, y1, z1) (x2, y2, z2)
+<action>=<action>
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=Affiche une action de tchat (ex : '/me commande une pizza' affichage '<joueur> commande une pizza')
+Show the name of the server owner=Affiche le nom du propriétaire du serveur
+The administrator of this server is @1.=L'administrateur de ce serveur est @1.
+There's no administrator named in the config file.=Il n'y a pas d'administrateur indiqué dans le fichier de configuration.
+@1 does not have any privileges.=@1 ne possède aucun privilège.
+Privileges of @1: @2=Privilège(s) de @1 : @2
+[<name>]=[<nom>]
+Show privileges of yourself or another player=Affiche vos privilèges ou ceux d'un autre joueur.
+Player @1 does not exist.=Le joueur @1 n'existe pas.
+<privilege>=<privilège>
+Return list of all online players with privilege=Renvoie la liste de tous les joueurs en ligne avec un privilège.
+Invalid parameters (see /help haspriv).=Paramètres invalides (voir /help haspriv)
+Unknown privilege!=Privilège inconnu !
+No online player has the "@1" privilege.=Aucun joueur en ligne avant le privilège « @1 »
+Players online with the "@1" privilege: @2=Joueurs en ligne avec le privilège « @1 » : @2
+Your privileges are insufficient.=Vos privilèges sont insuffisants.
+Your privileges are insufficient. '@1' only allows you to grant: @2=Vos privilèges sont insuffisants. '@1' vous autorise seulement d'accorder : @2
+Unknown privilege: @1=Privilège inconnu : @1
+@1 granted you privileges: @2=@1 vous a accordé les privilèges : @2
+<name> (<privilege> [, <privilege2> [<...>]] | all)=<nom> (<privilège> [, <privilège2> [<...>]] | all)
+Give privileges to player=Accorder le privilège au joueur
+Invalid parameters (see /help grant).=Paramètres invalides (voir /help grant)
+<privilege> [, <privilege2> [<...>]] | all=<privilège> [, <privilège2> [<...>]] | all
+Grant privileges to yourself=Accorder des privilèges à vous-même
+Invalid parameters (see /help grantme).=Paramètres invalides (voir /help grantme)
+Your privileges are insufficient. '@1' only allows you to revoke: @2=Vos privilèges sont insuffisants. '@1' vous autorise seulement à révoquer : @2
+Note: Cannot revoke in singleplayer: @1=Note : Impossible de révoquer en solo : @1
+Note: Cannot revoke from admin: @1=Note : Impossible de révoquer à l'administrateur : @1
+No privileges were revoked.=Aucun privilège n'a été révoqué.
+@1 revoked privileges from you: @2=@1 vous a révoqué le privilège : @2
+Remove privileges from player=Révoquer les privilèges au joueur
+Invalid parameters (see /help revoke).=Paramètres invalides (voir /help revoke).
+Revoke privileges from yourself=Révoquer des privilèges à vous-même
+Invalid parameters (see /help revokeme).=Paramètres invalides (voir /help revokeme).
+<name> <password>=<nom> <mot de passe>
+Set player's password (sent unencrypted, thus insecure)=Voir le mot de passe d'un joueur (envoyé non crypté, soit non sécurisé)
+Name field required.=Le champ « nom » est requis.
+Your password was cleared by @1.=Votre mot de passe a été effacé par @1.
+Password of player "@1" cleared.=Mot de passe du joueur « @1 » effacé.
+Your password was set by @1.=Votre mot de passe a été défini par @1.
+Password of player "@1" set.=Mot de passe « @1 » défini.
+<name>=<nom>
+Set empty password for a player=Définir un mot de passe pour un joueur
+Reload authentication data=Recharger les données d'authentification
+Done.=Fait.
+Failed.=Échoué.
+Remove a player's data=Supprimer les données d'un joueur
+Player "@1" removed.=Joueur « @1 » supprimé.
+No such player "@1" to remove.=Aucun joueur « @1 » à supprimer.
+Player "@1" is connected, cannot remove.=Le joueur « @1 » est connecté, impossible de supprimer.
+Unhandled remove_player return code @1.=La commande remove_player non gérée a retourné le code @1.
+Cannot teleport out of map bounds!=Impossible de téléporter en dehors des limites de la carte !
+Cannot get player with name @1.=Impossible d'obtenir le joueur @1.
+Cannot teleport, @1 is attached to an object!=Impossible de téléporter, @1 est lié à un objet !
+Teleporting @1 to @2.=Téléportation de @1 vers @2.
+One does not teleport to oneself.=Impossible de se téléporter vers soi-même.
+Cannot get teleportee with name @1.=Impossible d'obtenir le téléporté @1.
+Cannot get target player with name @1.=Impossible d'obtenir le joueur cible @1.
+Teleporting @1 to @2 at @3.=Téléportation de @1 vers @2 à @3.
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=<X>, <Y>, <Z> | <vers_nom> | <nom> <X>, <Y>, <Z> | <nom> <vers_nom>
+Teleport to position or player=Se téléporter vers une position ou un joueur.
+You don't have permission to teleport other players (missing privilege: @1).=Vous n'avez pas la permission de téléporter des joueurs (privilège manquant : @1).
+([-n] <name> <value>) | <name>=([-n] <nom> <valeur>) | <nom>
+Set or read server configuration setting=Définir ou lire un paramètre de configuration du serveur.
+Failed. Cannot modify secure settings. Edit the settings file manually.=Échoué. Impossible de modifier les paramètres sécurisés. Éditez le fichier manuellement.
+Failed. Use '/set -n <name> <value>' to create a new setting.=Échoué. Utilisez '/set -n <nom> <valeur>' pour créer un nouveau paramètre.
+@1 @= @2=@1 @= @2
+<not set>=<non défini>
+Invalid parameters (see /help set).=Paramètres invalides (voir /help set).
+Finished emerging @1 blocks in @2ms.=Fini de générer @1 blocks en @2 ms.
+emergeblocks update: @1/@2 blocks emerged (@3%)=Mise à jour de emergeblocks : @1/@2 de blocs générés (@3%)
+(here [<radius>]) | (<pos1> <pos2>)=(here [<rayon>]) | (<pos1> <pos1>)
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Charger (ou, si inexistant, générer), des blocs contenus dans la zone de pos1 à pos2 (<pos1> et <pos2> doivent être entre parenthèses)
+Started emerge of area ranging from @1 to @2.=Début de la génération de la zone de @1 à @2.
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Supprimer les blocs contenus dans la zone de pos1 à pos2 (<pos1> et <pos2> doivent être entre parenthèses)
+Successfully cleared area ranging from @1 to @2.=La zone de @1 à @2 a été nettoyée avec succès.
+Failed to clear one or more blocks in area.=Le nettoyage d'un ou plusieurs blocs dans la zone a echoué.
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=Réinitialiser l'éclairage dans la zone de pos1 à pos2 (<pos1> et <pos2> doivent être entre parenthèses)
+Successfully reset light in the area ranging from @1 to @2.=L'éclairage dans la zone de @1 à @2 a été réinitialisé avec succès.
+Failed to load one or more blocks in area.=Le chargement d'un ou plusieurs blocs dans la zone a échoué.
+List mods installed on the server=Liste les modules installés sur le serveur.
+No mods installed.=Aucun module installé.
+Cannot give an empty item.=Impossible de donner un objet vide.
+Cannot give an unknown item.=Impossible de donner un objet inconnu.
+Giving 'ignore' is not allowed.=Donner 'ignore' n'est pas autorisé.
+@1 is not a known player.=Le joueur @1 est inconnu.
+@1 partially added to inventory.=@1 été partiellement rajouté à l'inventaire.
+@1 could not be added to inventory.=@1 n'a pas pu être rajouté à l'inventaire.
+@1 added to inventory.=@1 a été rajouté à l'inventaire.
+@1 partially added to inventory of @2.=@1 a été partiellement rajouté à l'inventaire de @2.
+@1 could not be added to inventory of @2.=@1 n'a pas pu être rajouté à l'inventaire de @2.
+@1 added to inventory of @2.=@1 a été rajouté à l'inventaire de @2.
+<name> <ItemString> [<count> [<wear>]]=<nom> <CodeObjet> [<nombre> [<usure>]]
+Give item to player=Donner un objet à un joueur
+Name and ItemString required.=Le nom et le code de l'objet sont requis
+<ItemString> [<count> [<wear>]]=<CodeObjet> [<nombre> [<usure>]]
+Give item to yourself=Donner un objet à vous-même
+ItemString required.=Code objet requis.
+<EntityName> [<X>,<Y>,<Z>]=<NomEntité> [<X>, <Y>, <Z>]
+Spawn entity at given (or your) position=Faire apparaître une entité à une position donnée (ou la vôtre)
+EntityName required.=Nom de l'entité requis.
+Unable to spawn entity, player is nil.=Impossible de faire apparaître l'entité, le joueur est inexistant.
+Cannot spawn an unknown entity.=Impossible de faire apparaître une entité inconnue.
+Invalid parameters (@1).=Paramètres invalides (@1).
+@1 spawned.=@1 a apparu.
+@1 failed to spawn.=@1 a échoué à apparaître.
+Destroy item in hand=Détruire l'objet dans la main
+Unable to pulverize, no player.=Impossible de détruire, pas de joueur.
+Unable to pulverize, no item in hand.=Impossible de détruire, pas d'objet dans la main.
+An item was pulverized.=Un objet a été détruit.
+[<range>] [<seconds>] [<limit>]=[<rayon>] [<secondes>] [<limite>]
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=Vérifier qui a le dernier touché un nœud ou un autre aux environs dans le temps spécifié par <secondes>. Par défaut : rayon @= 0, secondes @= 86400 @= 24h, limite @= 5. Définissez <secondes> à inf pour aucune limite de temps.
+Rollback functions are disabled.=Les fonctions retour sont désactivées.
+That limit is too high!=Cette limite est trop grande !
+Checking @1 ...=Vérification de @1 ...
+Nobody has touched the specified location in @1 seconds.=Personne n'as touché la position spécificée dans les dernières @1 secondes.
+@1 @2 @3 -> @4 @5 seconds ago.=@1 @2 @3 -> @4 il y a @5 secondes.
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=Taper un nœud (rayon @= @1, secondes @= @2, limite @= @3).
+(<name> [<seconds>]) | (:<actor> [<seconds>])=(<nom> [<secondes>]) | (:<acteur> [<secondes>])
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=Annuler les actions d'un joueur. La valeur par défaut de <secondes> est 60. Définissez <secondes> à inf pour aucune limite de temps.
+Invalid parameters. See /help rollback and /help rollback_check.=Paramètres invalides. Voir /help rollback et /help rollback_check.
+Reverting actions of player '@1' since @2 seconds.=Annuler les actions du joueur '@1' depuis @2 secondes.
+Reverting actions of @1 since @2 seconds.=Annuler les actions de @1 depuis @2 secondes.
+(log is too long to show)=(le journal est trop long à afficher)
+Reverting actions succeeded.=Les actions ont été annulées avec succès.
+Reverting actions FAILED.=L'annulation des actions a échoué.
+Show server status=Afficher le statut du serveur.
+This command was disabled by a mod or game.=Cette commande a été désactivée par un module ou un jeu.
+[<0..23>:<0..59> | <0..24000>]=[<0..23>:<0..59> | <0.24000>]
+Show or set time of day=Afficher ou définir l'heure du jour.
+Current time is @1:@2.=L'heure actuelle est @1:@2.
+You don't have permission to run this command (missing privilege: @1).=Vous n'avez pas la permission d'exécuter cette commande (privilège manquant : @1)
+Invalid time (must be between 0 and 24000).=Heure invalide (doit être comprise entre 0 et 24000).
+Time of day changed.=L'heure du jour a changé.
+Invalid hour (must be between 0 and 23 inclusive).=Heure invalide (doit être comprise entre 0 et 23 inclus).
+Invalid minute (must be between 0 and 59 inclusive).=Minute invalide (doit être comprise entre 0 et 59 inclus).
+Show day count since world creation=Afficher le nombre de jours écoulés depuis la création du monde.
+Current day is @1.=Le jour actuel est @1.
+[<delay_in_seconds> | -1] [-r] [<message>]=[<délai_en_secondes> | -1] [-r] [<message>]
+Shutdown server (-1 cancels a delayed shutdown, -r allows players to reconnect)=Éteindre le serveur (-1 annule une extinction programmée, -r autorise les joueurs à se reconnecter)
+Server shutting down (operator request).=Extinction du serveur (requête de l'opérateur).
+Ban the IP of a player or show the ban list=Bannir l'IP d'un joueur ou affiche la liste des bans.
+The ban list is empty.=La liste des bans est vide.
+Ban list: @1=Liste de bans : @1
+You cannot ban players in singleplayer!=Vous ne pouvez pas bannir des joueurs en solo !
+Player is not online.=Le joueur n'est pas en ligne.
+Failed to ban player.=Le bannissement du joueur a échoué.
+Banned @1.=@1 a été banni.
+<name> | <IP_address>=<nom> | <adresse_IP>
+Remove IP ban belonging to a player/IP=Rétablir un IP appartenant à un joueur ou une adresse IP.
+Failed to unban player/IP.=Le rétablissement du joueur ou de l'adresse IP a échoué.
+Unbanned @1.=@1 a été rétabli.
+<name> [<reason>]=<nom> [<motif>]
+Kick a player=Expulser un joueur
+Failed to kick player @1.=L'expulsion du joueur @1 a échoué.
+Kicked @1.=@1 a été expulsé.
+[full | quick]=[full | quick]
+Clear all objects in world=Nettoyer tous les objets dans le monde
+Invalid usage, see /help clearobjects.=Usage invalide, voir /help clearobjects.
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=Nettoyage de tous les objects. Cela peut prendre du temps. Une inactivité peut surveni (par @1).
+Cleared all objects.=Tous les objets ont été nettoyés.
+<name> <message>=<nom> <message>
+Send a direct message to a player=Envoyer un message privé à un joueur.
+Invalid usage, see /help msg.=Usage invalide, voir /help msg.
+The player @1 is not online.=Le joueur @1 n'est pas en ligne.
+DM from @1: @2=Message privé de @1 : @2
+Message sent.=Message privé envoyé.
+Get the last login time of a player or yourself=Obtenir l'horodatage de la dernière connexion d'un joueur ou de vous-même.
+@1's last login time was @2.=@1 s'est connecté pour la dernière fois au @2.
+@1's last login time is unknown.=L'horodatage de la dernière connexion de @1 est inconnu.
+Clear the inventory of yourself or another player=Vider votre inventaire ou celui d'un autre joueur.
+You don't have permission to clear another player's inventory (missing privilege: @1).=Vous n'avez pas la permission de vider l'inventaire d'un autre joueur (privilège manquant : @1).
+@1 cleared your inventory.=@1 a vidé votre inventaire.
+Cleared @1's inventory.=L'inventaire de @1 a été vidé.
+Player must be online to clear inventory!=Le joueur doit être en ligne pour pouvoir vider son inventaire.
+Players can't be killed, damage has been disabled.=Les joueurs ne peuvent pas être tués, les dommages ont été désactivés.
+Player @1 is not online.=Le joueur @1 n'est pas en ligne.
+You are already dead.=Vous êtes déjà mort.
+@1 is already dead.=@1 est déjà mort.
+@1 has been killed.=@1 a été tué.
+Kill player or yourself=Tuer un joueur ou vous-même.
+@1 joined the game.=@1 a rejoint la partie.
+@1 left the game.=@1 a quitté la partie.
+@1 left the game (timed out).=@1 a quitté la partie (inactivité).
+(no description)=(sans description)
+Can interact with things and modify the world=Peut interagir avec des éléments ou modifier le monde.
+Can speak in chat=Peut écrire dans le tchat.
+Can modify basic privileges (@1)=Peut modifier les privilèges basiques (@1)
+Can modify privileges=Peut modifier les privilèges
+Can teleport self=Peut se téléporter
+Can teleport other players=Peut téléporter d'autres joueurs
+Can set the time of day using /time=Peut définir l'heure du jour avec /time
+Can do server maintenance stuff=Peut effectuer des tâches de maintenance du serveur
+Can bypass node protection in the world=Peut outrepasser la protection des nœuds dans le monde.
+Can ban and unban players=Peut bannir et rétablir des joueurs.
+Can kick players=Peut expulser des joueurs.
+Can use /give and /giveme=Peut utiliser /give et /giveme
+Can use /setpassword and /clearpassword=Peut utiliser /setpassword et /clearpassword
+Can use fly mode=Peut utiliser le mode vol
+Can use fast mode=Peut utiliser le mode rapide
+Can fly through solid nodes using noclip mode=Peut voler à travers des nœuds solides en utilisant le mode de collisions désactivées.
+Can use the rollback functionality=Peut utiliser la fonctionnalité de retour
+Can enable wireframe=Peut activer la vue fil de fer
+Unknown Item=Objet inconnu
+Air=Air
+Ignore=Ignorer
+You can't place 'ignore' nodes!=Vous ne pouvez pas placé de nœuds 'ignorés' !
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=print [<filtre>] | dump [<filtre>] | save [<format> [<filtre>]] | reset
+Handle the profiler and profiling data=Traiter le profileur et les données de profilage
+Statistics written to action log.=Les statistiques sont écrites dans les journaux d'actions.
+Statistics were reset.=Les statistiques ont été réinitialisées.
+Usage: @1=Usage : @1
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=Le format peut être txt, csv, lua, json ou json_pretty (les structures sont sujettes au changement).
+Values below show absolute/relative times spend per server step by the instrumented function.=Les valeurs inférieures affichent les temps absolu et relatif dépensés par étape du serveur par la fonction utilisée.
+A total of @1 sample(s) were taken.=@1 échantillons ont été collectés.
+The output is limited to '@1'.=La sortie est limitée à '@1'.
+Saving of profile failed: @1=La sauvegarde du profil a échoué : @1
+Profile saved to @1=Le profil a été sauvegardé dans @1
diff --git a/builtin/locale/__builtin.pt_BR.tr b/builtin/locale/__builtin.pt_BR.tr
new file mode 100644
index 000000000..e12e9fae8
--- /dev/null
+++ b/builtin/locale/__builtin.pt_BR.tr
@@ -0,0 +1,246 @@
+# textdomain: __builtin
+Invalid parameters (see /help @1).=Parâmetros inválidos (veja /help @1).
+Too many arguments, try using just /help <command>=Muitos argumentos, tente usar apenas /help <comando>
+Available commands: @1=Comandos disponíveis: @1
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=Use '/help <cmd>' para obter mais informações, ou '/help all' para listar tudo.
+Available commands:=Comandos disponíveis:
+Command not available: @1=Comando não disponível: @1
+[all | privs | <cmd>] [-t]=[all | privs | <cmd>] [-t]
+Get help for commands or list privileges (-t: output in chat)=Obtenha ajuda para comandos ou liste privilégios (-t: saída no chat)
+Available privileges:=Privilégios disponíveis:
+Command=Comando
+Parameters=Parâmetros
+For more information, click on any entry in the list.=Para mais informações, clique em qualquer entrada na lista.
+Double-click to copy the entry to the chat history.=Clique duas vezes para copiar a entrada para o histórico do chat.
+Command: @1 @2=Comando: @1 @2
+Available commands: (see also: /help <cmd>)=Comandos disponíveis: (veja também: /help <cmd>)
+Close=Fechar
+Privilege=Privilégio
+Description=Descrição
+Empty command.=Comando vazio.
+Invalid command: @1=Comando inválido: @1
+Invalid command usage.=Uso de comando inválido.
+ (@1 s)= (@1 s)
+Command execution took @1 s=A execução do comando levou @1 s
+You don't have permission to run this command (missing privileges: @1).=Você não tem permissão para executar este comando (privilégios faltando: @1).
+Unable to get position of player @1.=Incapaz de obter a posição do jogador @1.
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=Formato de área incorreto. Esperado: (x1,y1,z1) (x2,y2,z2)
+<action>=<ação>
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=Mostra a ação do chat (por exemplo, '/me orders a pizza' exibe '<nome do jogador> pede uma pizza')
+Show the name of the server owner=Mostra o nome do dono do servidor
+The administrator of this server is @1.=O administrador deste servidor é @1.
+There's no administrator named in the config file.=Não há administrador nomeado no arquivo de configuração.
+@1 does not have any privileges.=@1 não tem nenhum privilégio.
+Privileges of @1: @2=Privilégios de @1: @2
+[<name>]=[<nome>]
+Show privileges of yourself or another player=Mostrar privilégios seus ou de outro jogador
+Player @1 does not exist.=O jogador @1 não existe.
+<privilege>=<privilégio>
+Return list of all online players with privilege=Retornar lista de todos os jogadores online com privilégio
+Invalid parameters (see /help haspriv).=Parâmetros inválidos (veja /help haspriv).
+Unknown privilege!=Privilégio desconhecido!
+No online player has the "@1" privilege.=Nenhum jogador online tem o privilégio "@1".
+Players online with the "@1" privilege: @2=Jogadores online com o privilégio "@1": @2
+Your privileges are insufficient.=Seus privilégios são insuficientes.
+Your privileges are insufficient. '@1' only allows you to grant: @2=Seus privilégios são insuficientes. '@1' só permite que você conceda: @2
+Unknown privilege: @1=Privilégio desconhecido: @1
+@1 granted you privileges: @2=@1 concedeu-lhe privilégios: @2
+<name> (<privilege> [, <privilege2> [<...>]] | all)=<nome> (<privilégio> [, <privilégio2> [<...>]] | all)
+Give privileges to player=Conceder privilégios ao jogador
+Invalid parameters (see /help grant).=Parâmetros inválidos (veja /help grant).
+<privilege> [, <privilege2> [<...>]] | all=<privilégio> [, <privilégio2> [<...>]] | all
+Grant privileges to yourself=Concede privilégios a você mesmo
+Invalid parameters (see /help grantme).=Parâmetros inválidos (veja /help grantme).
+Your privileges are insufficient. '@1' only allows you to revoke: @2=Seus privilégios são insuficientes. '@1' só permite que você revogue: @2
+Note: Cannot revoke in singleplayer: @1=Nota: Não é possível revogar em singleplayer: @1
+Note: Cannot revoke from admin: @1=Nota: Não é possível revogar do administrador: @1
+No privileges were revoked.=Nenhum privilégio foi revogado.
+@1 revoked privileges from you: @2=@1 revogou seus privilégios: @2
+Remove privileges from player=Remover privilégios do jogador
+Invalid parameters (see /help revoke).=Parâmetros inválidos (veja /help revoke).
+Revoke privileges from yourself=Revogar privilégios de si mesmo
+Invalid parameters (see /help revokeme).=Parâmetros inválidos (veja /help revokeme).
+<name> <password>=<nome> <senha>
+Set player's password (sent unencrypted, thus insecure)=Definir a senha do jogador (enviada sem criptografia, portanto insegura)
+Name field required.=Campo de nome obrigatório.
+Your password was cleared by @1.=Sua senha foi limpa por @1.
+Password of player "@1" cleared.=Senha do jogador "@1" limpa.
+Your password was set by @1.=Sua senha foi definida por @1.
+Password of player "@1" set.=Senha do jogador "@1" definida.
+<name>=<nome>
+Set empty password for a player=Definir senha vazia para um jogador
+Reload authentication data=Recarregar dados de autenticação
+Done.=Pronto.
+Failed.=Erro.
+Remove a player's data=Remover dados de um jogador
+Player "@1" removed.=Jogador "@1" removido.
+No such player "@1" to remove.=Não existe tal jogador "@1" para remover.
+Player "@1" is connected, cannot remove.=Jogador "@1" está conectado, não pode ser removido.
+Unhandled remove_player return code @1.=Código de retorno remove_player não tratado @1.
+Cannot teleport out of map bounds!=Não é possível teleportar para fora dos limites do mapa!
+Cannot get player with name @1.=Não é possível obter jogador com o nome @1.
+Cannot teleport, @1 is attached to an object!=Não é possível teleportar, @1 está anexado a um objeto!
+Teleporting @1 to @2.=Teleportando @1 para @2.
+One does not teleport to oneself.=Não tem como se teletransportar para você mesmo.
+Cannot get teleportee with name @1.=Não é possível teletransportar com o nome @1.
+Cannot get target player with name @1.=Não é possível obter jogador alvo com o nome @1.
+Teleporting @1 to @2 at @3.=Teleportando @1 para @2 em @3.
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=<X>,<Y>,<Z> | <para_nome> | <nome> <X>,<Y>,<Z> | <nome> <para_nome>
+Teleport to position or player=Teleportar para posição ou um jogador
+You don't have permission to teleport other players (missing privilege: @1).=Você não tem permissão para teleportar outros jogadores (privilégio faltando: @1).
+([-n] <name> <value>) | <name>=([-n] <nome> <valor>) | <nome>
+Set or read server configuration setting=Definir ou ler configuração do servidor
+Failed. Cannot modify secure settings. Edit the settings file manually.=Falha. Não é possível modificar configurações seguras. Edite o arquivo de configurações manualmente.
+Failed. Use '/set -n <name> <value>' to create a new setting.=Falhou. Use '/set -n <nome> <valor>' para criar uma nova configuração.
+@1 @= @2=@1 @= @2
+<not set>=<não definido>
+Invalid parameters (see /help set).=Parâmetros inválidos (veja /help set).
+Finished emerging @1 blocks in @2ms.=Finalizada a emergência de @1 blocos em @2ms.
+emergeblocks update: @1/@2 blocks emerged (@3%)=atualização de emergeblocks: @1/@2 blocos emergidos (@3%)
+(here [<radius>]) | (<pos1> <pos2>)=(aqui [<raio>]) | (<pos1> <pos2>)
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Carregar (ou, se inexistente, gerar) blocos de mapa contidos na área pos1 a pos2 (<pos1> e <pos2> devem estar entre parênteses)
+Started emerge of area ranging from @1 to @2.=Iniciada o surgimento de áreas que vão de @1 a @2.
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Excluir blocos de mapa contidos na área pos1 a pos2 (<pos1> e <pos2> devem estar entre parênteses)
+Successfully cleared area ranging from @1 to @2.=Área limpa com sucesso variando de @1 a @2.
+Failed to clear one or more blocks in area.=Falha ao limpar um ou mais blocos na área.
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=Redefine a iluminação na área entre pos1 e pos2 (<pos1> e <pos2> devem estar entre parênteses)
+Successfully reset light in the area ranging from @1 to @2.=Iluminação redefinida com sucesso na área variando de @1 a @2.
+Failed to load one or more blocks in area.=Falha ao carregar um ou mais blocos na área.
+List mods installed on the server=Listar mods instalados no servidor
+No mods installed.=Sem mods instalados.
+Cannot give an empty item.=Não é possível dar um item vazio.
+Cannot give an unknown item.=Não é possível dar um item desconhecido.
+Giving 'ignore' is not allowed.=Não é permitido dar 'ignore'.
+@1 is not a known player.=@1 não é um jogador conhecido.
+@1 partially added to inventory.=@1 parcialmente adicionado ao inventário.
+@1 could not be added to inventory.=@1 não pôde ser adicionado ao inventário.
+@1 added to inventory.=@1 adicionado ao inventário.
+@1 partially added to inventory of @2.=@1 parcialmente adicionado ao inventário de @2.
+@1 could not be added to inventory of @2.=@1 não pôde ser adicionado ao inventário de @2.
+@1 added to inventory of @2.=@1 adicionado ao inventário de @2.
+<name> <ItemString> [<count> [<wear>]]=<nome> <ItemString> [<quantidade> [<desgaste>]]
+Give item to player=Dar item ao jogador
+Name and ItemString required.=Nome e ItemString são obrigatórios.
+<ItemString> [<count> [<wear>]]=<ItemString> [<quantidade> [<desgaste>]]
+Give item to yourself=Dar item a si mesmo
+ItemString required.=ItemString é obrigatório.
+<EntityName> [<X>,<Y>,<Z>]=<NomeDaEntidade> [<X>,<Y>,<Z>]
+Spawn entity at given (or your) position=Gerar entidade na posição fornecida (ou na sua)
+EntityName required.=NomeDaEntidade é obrigatório.
+Unable to spawn entity, player is nil.=Não é possível gerar a entidade, jogador é nulo.
+Cannot spawn an unknown entity.=Não é possível gerar uma entidade desconhecida.
+Invalid parameters (@1).=Parâmetros inválidos (@1).
+@1 spawned.=@1 gerado.
+@1 failed to spawn.=Falha ao gerar @1.
+Destroy item in hand=Destruir item na mão
+Unable to pulverize, no player.=Incapaz de pulverizar, sem jogador.
+Unable to pulverize, no item in hand.=Incapaz de pulverizar, sem item na mão.
+An item was pulverized.=Um item foi pulverizado.
+[<range>] [<seconds>] [<limit>]=[<alcance>] [<segundos>] [<limite>]
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=Verificar quem tocou pela última vez um nó ou um nó próximo dentro do tempo especificado por <segundos>. Padrão: alcance @= 0, segundos @= 86400 @= 24h, limite @= 5. Defina <segundos> como inf para sem limite de tempo
+Rollback functions are disabled.=Funções de rollback estão desativadas.
+That limit is too high!=Esse limite é muito alto!
+Checking @1 ...=Verificando @1 ...
+Nobody has touched the specified location in @1 seconds.=Ninguém tocou a localização especificada em @1 segundos.
+@1 @2 @3 -> @4 @5 seconds ago.=@1 @2 @3 -> @4 @5 segundos atrás.
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=Golpeie um nó (alcance@=@1, segundos@=@2, limite@=@3).
+(<name> [<seconds>]) | (:<actor> [<seconds>])=(<nome> [<segundos>]) | (:<ator> [<segundos>])
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=Reverter ações de um jogador. O padrão para <segundos> é 60. Defina <segundos> como inf para sem limite de tempo
+Invalid parameters. See /help rollback and /help rollback_check.=Parâmetros inválidos. Veja /help rollback e /help rollback_check.
+Reverting actions of player '@1' since @2 seconds.=Revertendo ações do jogador '@1' desde @2 segundos.
+Reverting actions of @1 since @2 seconds.=Revertendo ações de @1 desde @2 segundos.
+(log is too long to show)=O log é muito longo para mostrar
+Reverting actions succeeded.=Ações revertidas com sucesso.
+Reverting actions FAILED.=Reversão de ações FALHOU.
+Show server status=Mostrar status do servidor
+This command was disabled by a mod or game.=Este comando foi desativado por um mod ou jogo.
+[<0..23>:<0..59> | <0..24000>]=[<0..23>:<0..59> | <0..24000>]
+Show or set time of day=Mostrar ou definir hora do dia
+Current time is @1:@2.=A hora atual é @1:@2.
+You don't have permission to run this command (missing privilege: @1).=Você não tem permissão para executar este comando (privilégio faltando: @1).
+Invalid time (must be between 0 and 24000).=Hora inválida (deve estar entre 0 e 24000).
+Time of day changed.=Hora do dia alterada.
+Invalid hour (must be between 0 and 23 inclusive).=Hora inválida (deve estar entre 0 e 23 inclusivo).
+Invalid minute (must be between 0 and 59 inclusive).=Minuto inválido (deve estar entre 0 e 59 inclusivo).
+Show day count since world creation=Mostrar contagem de dias desde a criação do mundo
+Current day is @1.=O dia atual é @1.
+[<delay_in_seconds> | -1] [-r] [<message>]=[<atraso_em_segundos> | -1] [-r] [<mensagem>]
+Shutdown server (-1 cancels a delayed shutdown, -r allows players to reconnect)=Desligar servidor (-1 cancela o desligamento adiado, -r permite que os jogadores se reconectem)
+Server shutting down (operator request).=Servidor desligando (solicitação do operador).
+Ban the IP of a player or show the ban list=Banir o IP de um jogador ou mostrar a lista de banimentos
+The ban list is empty.=A lista de banimentos está vazia.
+Ban list: @1=Lista de banimentos: @1
+You cannot ban players in singleplayer!=Você não pode banir jogadores em singleplayer!
+Player is not online.=Jogador não está online.
+Failed to ban player.=Falha ao banir jogador.
+Banned @1.=Banido @1.
+<name> | <IP_address>=<nome> | <endereço_IP>
+Remove IP ban belonging to a player/IP=Remover banimento de IP pertencente a um jogador/IP
+Failed to unban player/IP.=Falha ao desbanir jogador/IP.
+Unbanned @1.=Desbanido @1.
+<name> [<reason>]=<nome> [<motivo>]
+Kick a player=Expulsar um jogador
+Failed to kick player @1.=Falha ao expulsar jogador @1.
+Kicked @1.=Expulso @1.
+[full | quick]=[full | quick]
+Clear all objects in world=Limpar todos os objetos no mundo
+Invalid usage, see /help clearobjects.=Uso inválido, veja /help clearobjects.
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=Limpeza de todos os objetos. Isso pode levar muito tempo. Você pode experimentar um tempo limite. (por @1)
+Cleared all objects.=Todos os objetos foram limpos.
+<name> <message>=<nome> <mensagem>
+Send a direct message to a player=Enviar uma mensagem direta a um jogador
+Invalid usage, see /help msg.=Uso inválido, veja /help msg.
+The player @1 is not online.=O jogador @1 não está online.
+DM from @1: @2=DM de @1: @2
+Message sent.=Mensagem enviada.
+Get the last login time of a player or yourself=Pegue o último horário de login de um jogador ou de você mesmo
+@1's last login time was @2.=O último login de @1 foi às @2.
+@1's last login time is unknown.=O último login de @1 é desconhecido.
+Clear the inventory of yourself or another player=Limpar o inventário de você mesmo ou de outro jogador
+You don't have permission to clear another player's inventory (missing privilege: @1).=Você não tem permissão para limpar o inventário de outro jogador (privilégio faltando: @1).
+@1 cleared your inventory.=@1 limpou seu inventário.
+Cleared @1's inventory.=Inventário de @1 limpo.
+Player must be online to clear inventory!=O jogador deve estar online para limpar o inventário!
+Players can't be killed, damage has been disabled.=Jogadores não podem ser mortos, o dano foi desativado.
+Player @1 is not online.=Jogador @1 não está online.
+You are already dead.=Você já está morto.
+@1 is already dead.=@1 já está morto.
+@1 has been killed.=@1 foi morto.
+Kill player or yourself=Matar jogador ou a si mesmo
+@1 joined the game.=@1 entrou no jogo.
+@1 left the game.=@1 saiu do jogo.
+@1 left the game (timed out).=@1 saiu do jogo (tempo esgotado)
+(no description)=(sem descrição)
+Can interact with things and modify the world=Pode interagir com as coisas e modificar o mundo
+Can speak in chat=Pode falar no chat
+Can modify basic privileges (@1)=Pode modificar privilégios básicos (@1)
+Can modify privileges=Pode modificar privilégios
+Can teleport self=Pode se teletransportar
+Can teleport other players=Pode teletransportar outros jogadores
+Can set the time of day using /time=Pode definir a hora do dia usando /time
+Can do server maintenance stuff=Pode realizar tarefas de manutenção do servidor
+Can bypass node protection in the world=Pode ignorar a proteção de nós no mundo
+Can ban and unban players=Pode banir e desbanir jogadores
+Can kick players=Pode chutar jogadores
+Can use /give and /giveme=Pode usar /give e /giveme
+Can use /setpassword and /clearpassword=Pode usar /setpassword e /clearpassword
+Can use fly mode=Pode usar o modo voar
+Can use fast mode=Pode usar o modo rápido
+Can fly through solid nodes using noclip mode=Pode voar através de nós sólidos usando o modo noclip
+Can use the rollback functionality=Pode usar a funcionalidade de reversão
+Can enable wireframe=Pode ativar wireframe
+Unknown Item=Item desconhecido
+Air=Ar
+Ignore=Ignorar
+You can't place 'ignore' nodes!=Você não pode colocar nós 'ignorar'!
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=print [<filtro>] | dump [<filtro>] | save [<formato> [<filtro>]] | reset
+Handle the profiler and profiling data=Lidar com o criador de perfil e os dados de criação de perfil
+Statistics written to action log.=Estatísticas salvas no log de ações.
+Statistics were reset.=As estatísticas foram redefinidas.
+Usage: @1=Uso: @1
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=O formato pode ser txt, csv, lua, json, json_pretty (as estruturas podem estar sujeitas a alterações).
+Values below show absolute/relative times spend per server step by the instrumented function.=Os valores abaixo mostram os tempos absolutos/relativos gastos por etapa do servidor pela função instrumentada.
+A total of @1 sample(s) were taken.=Um total de @1 amostra(s) foi coletada.
+The output is limited to '@1'.=A saída é limitada a '@1'.
+Saving of profile failed: @1=Falha ao salvar o perfil: @1
+Profile saved to @1=Perfil salvo em @1
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 3c44acbca..67cf744b4 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -37,6 +37,25 @@ function updater_init()
 	]]
 end
 
+-- located in user cache path, for remembering this like e.g. last update check
+cache_settings = Settings(core.get_cache_path() .. DIR_DELIM .. "common.conf")
+
+--- Checks if the given key contains a timestamp less than a certain age.
+--- Pair this with a call to `cache_settings:set(key, tostring(os.time()))`
+--- after successfully refreshing the cache.
+--- @param key Name of entry in cache_settings
+--- @param max_age Age to check against, in seconds
+--- @return true if the max age is not reached
+function check_cache_age(key, max_age)
+	local time_now = os.time()
+	local time_checked = tonumber(cache_settings:get(key)) or 0
+	return time_now - time_checked < max_age
+end
+
+function core.on_before_close()
+	-- called before the menu is closed, either exit or to join a game
+	cache_settings:write()
+end
 
 -- Local cached values
 local min_supp_proto, max_supp_proto
@@ -47,6 +66,16 @@ function common_update_cached_supp_proto()
 end
 common_update_cached_supp_proto()
 
+-- Other global functions
+
+function core.sound_stop(handle, ...)
+	return handle:stop(...)
+end
+
+function os.tmpname()
+	error('do not use') -- instead: core.get_temp_path()
+end
+
 -- Menu helper functions
 
 local function render_client_count(n)
@@ -162,11 +191,6 @@ function render_serverlist_row(spec)
 
 	return table.concat(details, ",")
 end
----------------------------------------------------------------------------------
-os.tmpname = function()
-	error('do not use') -- instead use core.get_temp_path()
-end
---------------------------------------------------------------------------------
 
 function menu_render_worldlist()
 	local retval = {}
diff --git a/builtin/mainmenu/content/contentdb.lua b/builtin/mainmenu/content/contentdb.lua
new file mode 100644
index 000000000..e0479cb4c
--- /dev/null
+++ b/builtin/mainmenu/content/contentdb.lua
@@ -0,0 +1,583 @@
+--Minetest
+--Copyright (C) 2018-24 rubenwardy
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+if not core.get_http_api then
+	return
+end
+
+
+contentdb = {
+	loading = false,
+	load_ok = false,
+	load_error = false,
+
+	-- Unordered preserves the original order of the ContentDB API,
+	-- before the package list is ordered based on installed state.
+	packages = {},
+	packages_full = {},
+	packages_full_unordered = {},
+	package_by_id = {},
+	aliases = {},
+
+	number_downloading = 0,
+	download_queue = {},
+
+	REASON_NEW = "new",
+	REASON_UPDATE = "update",
+	REASON_DEPENDENCY = "dependency",
+}
+
+
+local function get_download_url(package, reason)
+	local base_url = core.settings:get("contentdb_url")
+	local ret = base_url .. ("/packages/%s/releases/%d/download/"):format(
+			package.url_part, package.release)
+	if reason then
+		ret = ret .. "?reason=" .. reason
+	end
+	return ret
+end
+
+
+local function download_and_extract(param)
+	local package = param.package
+
+	local filename = core.get_temp_path(true)
+	if filename == "" or not core.download_file(param.url, filename) then
+		core.log("error", "Downloading " .. dump(param.url) .. " failed")
+		return {
+			msg = fgettext_ne("Failed to download \"$1\"", package.title)
+		}
+	end
+
+	local tempfolder = core.get_temp_path()
+	if tempfolder ~= "" and not core.extract_zip(filename, tempfolder) then
+		tempfolder = ""
+	end
+	os.remove(filename)
+	if tempfolder == "" then
+		return {
+			msg = fgettext_ne("Failed to extract \"$1\" " ..
+					"(insufficient disk space, unsupported file type or broken archive)",
+					package.title),
+		}
+	end
+
+	return {
+		path = tempfolder
+	}
+end
+
+
+local function start_install(package, reason)
+	local params = {
+		package = package,
+		url = get_download_url(package, reason),
+	}
+
+	contentdb.number_downloading = contentdb.number_downloading + 1
+
+	local function callback(result)
+		if result.msg then
+			gamedata.errormessage = result.msg
+		else
+			local path, msg = pkgmgr.install_dir(package.type, result.path, package.name, package.path)
+			core.delete_dir(result.path)
+			if not path then
+				gamedata.errormessage = fgettext_ne("Error installing \"$1\": $2", package.title, msg)
+			else
+				core.log("action", "Installed package to " .. path)
+
+				local conf_path
+				local name_is_title = false
+				if package.type == "mod" then
+					local actual_type = pkgmgr.get_folder_type(path)
+					if actual_type.type == "modpack" then
+						conf_path = path .. DIR_DELIM .. "modpack.conf"
+					else
+						conf_path = path .. DIR_DELIM .. "mod.conf"
+					end
+				elseif package.type == "game" then
+					conf_path = path .. DIR_DELIM .. "game.conf"
+					name_is_title = true
+				elseif package.type == "txp" then
+					conf_path = path .. DIR_DELIM .. "texture_pack.conf"
+				end
+
+				if conf_path then
+					local conf = Settings(conf_path)
+					if not conf:get("title") then
+						conf:set("title", package.title)
+					end
+					if not name_is_title then
+						conf:set("name", package.name)
+					end
+					if not conf:get("description") then
+						conf:set("description", package.short_description)
+					end
+					conf:set("author",     package.author)
+					conf:set("release",    package.release)
+					conf:write()
+				end
+
+				pkgmgr.reload_by_type(package.type)
+			end
+		end
+
+		package.downloading = false
+
+		contentdb.number_downloading = contentdb.number_downloading - 1
+
+		local next = contentdb.download_queue[1]
+		if next then
+			table.remove(contentdb.download_queue, 1)
+
+			start_install(next.package, next.reason)
+		end
+		ui.update()
+	end
+
+	package.queued = false
+	package.downloading = true
+
+	if not core.handle_async(download_and_extract, params, callback) then
+		core.log("error", "ERROR: async event failed")
+		gamedata.errormessage = fgettext_ne("Failed to download $1", package.name)
+		return
+	end
+end
+
+
+function contentdb.queue_download(package, reason)
+	if package.queued or package.downloading then
+		return
+	end
+
+	local max_concurrent_downloads = tonumber(core.settings:get("contentdb_max_concurrent_downloads"))
+	if contentdb.number_downloading < math.max(max_concurrent_downloads, 1) then
+		start_install(package, reason)
+	else
+		table.insert(contentdb.download_queue, { package = package, reason = reason })
+		package.queued = true
+	end
+end
+
+
+function contentdb.get_package_by_id(id)
+	return contentdb.package_by_id[id]
+end
+
+
+-- Create a coroutine from `fn` and provide results to `callback` when complete (dead).
+-- Returns a resumer function.
+local function make_callback_coroutine(fn, callback)
+	local co = coroutine.create(fn)
+
+	local function resumer(...)
+		local ok, result = coroutine.resume(co, ...)
+
+		if not ok then
+			error(result)
+		elseif coroutine.status(co) == "dead" then
+			callback(result)
+		end
+	end
+
+	return resumer
+end
+
+
+local function get_raw_dependencies_async(package)
+	local url_fmt = "/api/packages/%s/dependencies/?only_hard=1&protocol_version=%s&engine_version=%s"
+	local version = core.get_version()
+	local base_url = core.settings:get("contentdb_url")
+	local url = base_url .. url_fmt:format(package.url_part, core.get_max_supp_proto(), core.urlencode(version.string))
+
+	local http = core.get_http_api()
+	local response = http.fetch_sync({ url = url })
+	if not response.succeeded then
+		return nil
+	end
+	return core.parse_json(response.data) or {}
+end
+
+
+local function get_raw_dependencies_co(package, resumer)
+	if package.type ~= "mod" then
+		return {}
+	end
+	if package.raw_deps then
+		return package.raw_deps
+	end
+
+	core.handle_async(get_raw_dependencies_async, package, resumer)
+	local data = coroutine.yield()
+	if not data then
+		return nil
+	end
+
+	for id, raw_deps in pairs(data) do
+		local package2 = contentdb.package_by_id[id:lower()]
+		if package2 and not package2.raw_deps then
+			package2.raw_deps = raw_deps
+
+			for _, dep in pairs(raw_deps) do
+				local packages = {}
+				for i=1, #dep.packages do
+					packages[#packages + 1] = contentdb.package_by_id[dep.packages[i]:lower()]
+				end
+				dep.packages = packages
+			end
+		end
+	end
+
+	return package.raw_deps
+end
+
+
+local function has_hard_deps_co(package, resumer)
+	local raw_deps = get_raw_dependencies_co(package, resumer)
+	if not raw_deps then
+		return nil
+	end
+
+	for i=1, #raw_deps do
+		if not raw_deps[i].is_optional then
+			return true
+		end
+	end
+
+	return false
+end
+
+
+function contentdb.has_hard_deps(package, callback)
+	local resumer = make_callback_coroutine(has_hard_deps_co, callback)
+	resumer(package, resumer)
+end
+
+
+-- Recursively resolve dependencies, given the installed mods
+local function resolve_dependencies_2_co(raw_deps, installed_mods, out, resumer)
+	local function resolve_dep(dep)
+		-- Check whether it's already installed
+		if installed_mods[dep.name] then
+			return {
+				is_optional = dep.is_optional,
+				name = dep.name,
+				installed = true,
+			}
+		end
+
+		-- Find exact name matches
+		local fallback
+		for _, package in pairs(dep.packages) do
+			if package.type ~= "game" then
+				if package.name == dep.name then
+					return {
+						is_optional = dep.is_optional,
+						name = dep.name,
+						installed = false,
+						package = package,
+					}
+				elseif not fallback then
+					fallback = package
+				end
+			end
+		end
+
+		-- Otherwise, find the first mod that fulfills it
+		if fallback then
+			return {
+				is_optional = dep.is_optional,
+				name = dep.name,
+				installed = false,
+				package = fallback,
+			}
+		end
+
+		return {
+			is_optional = dep.is_optional,
+			name = dep.name,
+			installed = false,
+		}
+	end
+
+	for _, dep in pairs(raw_deps) do
+		if not dep.is_optional and not out[dep.name] then
+			local result  = resolve_dep(dep)
+			out[dep.name] = result
+			if result and result.package and not result.installed then
+				local raw_deps2 = get_raw_dependencies_co(result.package, resumer)
+				if raw_deps2 then
+					resolve_dependencies_2_co(raw_deps2, installed_mods, out, resumer)
+				end
+			end
+		end
+	end
+
+	return true
+end
+
+
+local function resolve_dependencies_co(package, game, resumer)
+	assert(game)
+
+	local raw_deps = get_raw_dependencies_co(package, resumer)
+	local installed_mods = {}
+
+	local mods = {}
+	pkgmgr.get_game_mods(game, mods)
+	for _, mod in pairs(mods) do
+		installed_mods[mod.name] = true
+	end
+
+	for _, mod in pairs(pkgmgr.global_mods:get_list()) do
+		installed_mods[mod.name] = true
+	end
+
+	local out = {}
+	if not resolve_dependencies_2_co(raw_deps, installed_mods, out, resumer) then
+		return nil
+	end
+
+	local retval = {}
+	for _, dep in pairs(out) do
+		retval[#retval + 1] = dep
+	end
+
+	table.sort(retval, function(a, b)
+		return a.name < b.name
+	end)
+
+	return retval
+end
+
+
+-- Resolve dependencies for a package, calls the recursive version.
+function contentdb.resolve_dependencies(package, game, callback)
+	local resumer = make_callback_coroutine(resolve_dependencies_co, callback)
+	resumer(package, game, resumer)
+end
+
+
+local function fetch_pkgs(params)
+	local version = core.get_version()
+	local base_url = core.settings:get("contentdb_url")
+	local url = base_url ..
+			"/api/packages/?type=mod&type=game&type=txp&protocol_version=" ..
+			core.get_max_supp_proto() .. "&engine_version=" .. core.urlencode(version.string)
+
+	for _, item in pairs(core.settings:get("contentdb_flag_blacklist"):split(",")) do
+		item = item:trim()
+		if item ~= "" then
+			url = url .. "&hide=" .. core.urlencode(item)
+		end
+	end
+
+	local languages
+	local current_language = core.get_language()
+	if current_language ~= "" then
+		languages = { current_language, "en;q=0.8" }
+	else
+		languages = { "en" }
+	end
+
+	local http = core.get_http_api()
+	local response = http.fetch_sync({
+		url = url,
+		extra_headers = {
+			"Accept-Language: " .. table.concat(languages, ", ")
+		},
+	})
+	if not response.succeeded then
+		return
+	end
+
+	local packages = core.parse_json(response.data)
+	if not packages or #packages == 0 then
+		return
+	end
+	local aliases = {}
+
+	for _, package in pairs(packages) do
+		local name_len = #package.name
+		-- This must match what contentdb.update_paths() does!
+		package.id = package.author:lower() .. "/"
+		if package.type == "game" and name_len > 5 and package.name:sub(name_len - 4) == "_game" then
+			package.id = package.id .. package.name:sub(1, name_len - 5)
+		else
+			package.id = package.id .. package.name
+		end
+
+		package.url_part = core.urlencode(package.author) .. "/" .. core.urlencode(package.name)
+
+		if package.aliases then
+			for _, alias in ipairs(package.aliases) do
+				-- We currently don't support name changing
+				local suffix = "/" .. package.name
+				if alias:sub(-#suffix) == suffix then
+					aliases[alias:lower()] = package.id
+				end
+			end
+		end
+	end
+
+	return { packages = packages, aliases = aliases }
+end
+
+
+function contentdb.fetch_pkgs(callback)
+	contentdb.loading = true
+	core.handle_async(fetch_pkgs, nil, function(result)
+		if result then
+			contentdb.load_ok = true
+			contentdb.load_error = false
+			contentdb.packages = result.packages
+			contentdb.packages_full = result.packages
+			contentdb.packages_full_unordered = result.packages
+			contentdb.aliases = result.aliases
+
+			for _, package in ipairs(result.packages) do
+				contentdb.package_by_id[package.id] = package
+			end
+		else
+			contentdb.load_error = true
+		end
+
+		contentdb.loading = false
+		callback(result)
+	end)
+end
+
+
+function contentdb.update_paths()
+	pkgmgr.load_all()
+
+	local mod_hash = {}
+	for _, mod in pairs(pkgmgr.global_mods:get_list()) do
+		local cdb_id = pkgmgr.get_contentdb_id(mod)
+		if cdb_id then
+			mod_hash[contentdb.aliases[cdb_id] or cdb_id] = mod
+		end
+	end
+
+	local game_hash = {}
+	for _, game in pairs(pkgmgr.games) do
+		local cdb_id = pkgmgr.get_contentdb_id(game)
+		if cdb_id then
+			game_hash[contentdb.aliases[cdb_id] or cdb_id] = game
+		end
+	end
+
+	local txp_hash = {}
+	for _, txp in pairs(pkgmgr.texture_packs) do
+		local cdb_id = pkgmgr.get_contentdb_id(txp)
+		if cdb_id then
+			txp_hash[contentdb.aliases[cdb_id] or cdb_id] = txp
+		end
+	end
+
+	for _, package in pairs(contentdb.packages_full) do
+		local content
+		if package.type == "mod" then
+			content = mod_hash[package.id]
+		elseif package.type == "game" then
+			content = game_hash[package.id]
+		elseif package.type == "txp" then
+			content = txp_hash[package.id]
+		end
+
+		if content then
+			package.path = content.path
+			package.installed_release = content.release or 0
+		else
+			package.path = nil
+			package.installed_release = nil
+		end
+	end
+end
+
+
+function contentdb.sort_packages()
+	local ret = {}
+
+	-- Add installed content
+	for _, pkg in ipairs(contentdb.packages_full_unordered) do
+		if pkg.path then
+			ret[#ret + 1] = pkg
+		end
+	end
+
+	-- Sort installed content first by "is there an update available?", then by title
+	table.sort(ret, function(a, b)
+		local a_updatable = a.installed_release < a.release
+		local b_updatable = b.installed_release < b.release
+		if a_updatable and not b_updatable then
+			return true
+		elseif b_updatable and not a_updatable then
+			return false
+		end
+
+		return a.title < b.title
+	end)
+
+	-- Add uninstalled content
+	for _, pkg in ipairs(contentdb.packages_full_unordered) do
+		if not pkg.path then
+			ret[#ret + 1] = pkg
+		end
+	end
+
+	contentdb.packages_full = ret
+end
+
+
+function contentdb.filter_packages(query, by_type)
+	if query == "" and by_type == nil then
+		contentdb.packages = contentdb.packages_full
+		return
+	end
+
+	local keywords = {}
+	for word in query:lower():gmatch("%S+") do
+		table.insert(keywords, word)
+	end
+
+	local function matches_keywords(package)
+		for k = 1, #keywords do
+			local keyword = keywords[k]
+
+			if string.find(package.name:lower(), keyword, 1, true) or
+					string.find(package.title:lower(), keyword, 1, true) or
+					string.find(package.author:lower(), keyword, 1, true) or
+					string.find(package.short_description:lower(), keyword, 1, true) then
+				return true
+			end
+		end
+
+		return false
+	end
+
+	contentdb.packages = {}
+	for _, package in pairs(contentdb.packages_full) do
+		if (query == "" or matches_keywords(package)) and
+				(by_type == nil or package.type == by_type) then
+			contentdb.packages[#contentdb.packages + 1] = package
+		end
+	end
+end
diff --git a/builtin/mainmenu/content/dlg_contentdb.lua b/builtin/mainmenu/content/dlg_contentdb.lua
new file mode 100644
index 000000000..84ef96800
--- /dev/null
+++ b/builtin/mainmenu/content/dlg_contentdb.lua
@@ -0,0 +1,511 @@
+--Minetest
+--Copyright (C) 2018-20 rubenwardy
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+if not core.get_http_api then
+	function create_contentdb_dlg()
+		return messagebox("contentdb",
+				fgettext("ContentDB is not available when Minetest was compiled without cURL"))
+	end
+	return
+end
+
+-- Filter
+local search_string = ""
+local cur_page = 1
+local num_per_page = 5
+local filter_type = 1
+local filter_types_titles = {
+	fgettext("All packages"),
+	fgettext("Games"),
+	fgettext("Mods"),
+	fgettext("Texture packs"),
+}
+
+-- Automatic package installation
+local auto_install_spec = nil
+
+local filter_types_type = {
+	nil,
+	"game",
+	"mod",
+	"txp",
+}
+
+
+local function install_or_update_package(this, package)
+	local install_parent
+	if package.type == "mod" then
+		install_parent = core.get_modpath()
+	elseif package.type == "game" then
+		install_parent = core.get_gamepath()
+	elseif package.type == "txp" then
+		install_parent = core.get_texturepath()
+	else
+		error("Unknown package type: " .. package.type)
+	end
+
+	if package.queued or package.downloading then
+		return
+	end
+
+	local function on_confirm()
+		local dlg = create_install_dialog(package)
+		dlg:set_parent(this)
+		this:hide()
+		dlg:show()
+
+		dlg:load_deps()
+	end
+
+	if package.type == "mod" and #pkgmgr.games == 0 then
+		local dlg = messagebox("install_game",
+			fgettext("You need to install a game before you can install a mod"))
+		dlg:set_parent(this)
+		this:hide()
+		dlg:show()
+	elseif not package.path and core.is_dir(install_parent .. DIR_DELIM .. package.name) then
+		local dlg = create_confirm_overwrite(package, on_confirm)
+		dlg:set_parent(this)
+		this:hide()
+		dlg:show()
+	else
+		on_confirm()
+	end
+end
+
+
+-- Resolves the package specification stored in auto_install_spec into an actual package.
+-- May only be called after the package list has been loaded successfully.
+local function resolve_auto_install_spec()
+	assert(contentdb.load_ok)
+
+	if not auto_install_spec then
+		return nil
+	end
+
+	local spec = contentdb.aliases[auto_install_spec] or auto_install_spec
+	local resolved = nil
+
+	for _, pkg in ipairs(contentdb.packages_full_unordered) do
+		if pkg.id == spec then
+			resolved = pkg
+			break
+		end
+	end
+
+	if not resolved then
+		gamedata.errormessage = fgettext_ne("The package $1 was not found.", auto_install_spec)
+		ui.update()
+
+		auto_install_spec = nil
+	end
+
+	return resolved
+end
+
+
+-- Installs the package specified by auto_install_spec.
+-- Only does something if:
+-- a. The package list has been loaded successfully.
+-- b. The ContentDB dialog is currently visible.
+local function do_auto_install()
+	if not contentdb.load_ok then
+		return
+	end
+
+	local pkg = resolve_auto_install_spec()
+	if not pkg then
+		return
+	end
+
+	local contentdb_dlg = ui.find_by_name("contentdb")
+	if not contentdb_dlg or contentdb_dlg.hidden then
+		return
+	end
+
+	install_or_update_package(contentdb_dlg, pkg)
+	auto_install_spec = nil
+end
+
+
+local function sort_and_filter_pkgs()
+	contentdb.update_paths()
+	contentdb.sort_packages()
+	contentdb.filter_packages(search_string, filter_types_type[filter_type])
+
+	local auto_install_pkg = resolve_auto_install_spec()
+	if auto_install_pkg then
+		local idx = table.indexof(contentdb.packages, auto_install_pkg)
+		if idx ~= -1 then
+			table.remove(contentdb.packages, idx)
+			table.insert(contentdb.packages, 1, auto_install_pkg)
+		end
+	end
+end
+
+
+local function load()
+	if contentdb.load_ok then
+		sort_and_filter_pkgs()
+		return
+	end
+	if contentdb.loading then
+		return
+	end
+	contentdb.fetch_pkgs(function(result)
+		if result then
+			sort_and_filter_pkgs()
+			do_auto_install()
+		end
+		ui.update()
+	end)
+end
+
+
+local function get_info_formspec(text)
+	local H = 9.5
+	return table.concat({
+		"formspec_version[6]",
+		"size[15.75,9.5]",
+		core.settings:get_bool("enable_touch") and "padding[0.01,0.01]" or "position[0.5,0.55]",
+
+		"label[4,4.35;", text, "]",
+		"container[0,", H - 0.8 - 0.375, "]",
+		"button[0.375,0;5,0.8;back;", fgettext("Back to Main Menu"), "]",
+		"container_end[]",
+	})
+end
+
+
+local function get_formspec(dlgdata)
+	if contentdb.loading then
+		return get_info_formspec(fgettext("Loading..."))
+	end
+	if contentdb.load_error then
+		return get_info_formspec(fgettext("No packages could be retrieved"))
+	end
+	assert(contentdb.load_ok)
+
+	contentdb.update_paths()
+
+	dlgdata.pagemax = math.max(math.ceil(#contentdb.packages / num_per_page), 1)
+	if cur_page > dlgdata.pagemax then
+		cur_page = 1
+	end
+
+	local W = 15.75
+	local H = 9.5
+	local formspec = {
+		"formspec_version[6]",
+		"size[15.75,9.5]",
+		core.settings:get_bool("enable_touch") and "padding[0.01,0.01]" or "position[0.5,0.55]",
+
+		"style[status,downloading,queued;border=false]",
+
+		"container[0.375,0.375]",
+		"field[0,0;7.225,0.8;search_string;;", core.formspec_escape(search_string), "]",
+		"field_enter_after_edit[search_string;true]",
+		"image_button[7.3,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "search.png"), ";search;]",
+		"image_button[8.125,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "clear.png"), ";clear;]",
+		"dropdown[9.175,0;2.7875,0.8;type;", table.concat(filter_types_titles, ","), ";", filter_type, "]",
+		"container_end[]",
+
+		-- Page nav buttons
+		"container[0,", H - 0.8 - 0.375, "]",
+		"button[0.375,0;5,0.8;back;", fgettext("Back to Main Menu"), "]",
+
+		"container[", W - 0.375 - 0.8*4 - 2,  ",0]",
+		"image_button[0,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "start_icon.png;pstart;]",
+		"image_button[0.8,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "prev_icon.png;pback;]",
+		"style[pagenum;border=false]",
+		"button[1.6,0;2,0.8;pagenum;", tonumber(cur_page), " / ", tonumber(dlgdata.pagemax), "]",
+		"image_button[3.6,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "next_icon.png;pnext;]",
+		"image_button[4.4,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "end_icon.png;pend;]",
+		"container_end[]",
+
+		"container_end[]",
+	}
+
+	if contentdb.number_downloading > 0 then
+		formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;downloading;"
+		if #contentdb.download_queue > 0 then
+			formspec[#formspec + 1] = fgettext("$1 downloading,\n$2 queued",
+					contentdb.number_downloading, #contentdb.download_queue)
+		else
+			formspec[#formspec + 1] = fgettext("$1 downloading...", contentdb.number_downloading)
+		end
+		formspec[#formspec + 1] = "]"
+	else
+		local num_avail_updates = 0
+		for i=1, #contentdb.packages_full do
+			local package = contentdb.packages_full[i]
+			if package.path and package.installed_release < package.release and
+					not (package.downloading or package.queued) then
+				num_avail_updates = num_avail_updates + 1
+			end
+		end
+
+		if num_avail_updates == 0 then
+			formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;status;"
+			formspec[#formspec + 1] = fgettext("No updates")
+			formspec[#formspec + 1] = "]"
+		else
+			formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;update_all;"
+			formspec[#formspec + 1] = fgettext("Update All [$1]", num_avail_updates)
+			formspec[#formspec + 1] = "]"
+		end
+	end
+
+	if #contentdb.packages == 0 then
+		formspec[#formspec + 1] = "label[4,4.75;"
+		formspec[#formspec + 1] = fgettext("No results")
+		formspec[#formspec + 1] = "]"
+	end
+
+	-- download/queued tooltips always have the same message
+	local tooltip_colors = ";#dff6f5;#302c2e]"
+	formspec[#formspec + 1] = "tooltip[downloading;" .. fgettext("Downloading...") .. tooltip_colors
+	formspec[#formspec + 1] = "tooltip[queued;" .. fgettext("Queued") .. tooltip_colors
+
+	local start_idx = (cur_page - 1) * num_per_page + 1
+	for i=start_idx, math.min(#contentdb.packages, start_idx+num_per_page-1) do
+		local package = contentdb.packages[i]
+		local container_y = (i - start_idx) * 1.375 + (2*0.375 + 0.8)
+		formspec[#formspec + 1] = "container[0.375,"
+		formspec[#formspec + 1] = container_y
+		formspec[#formspec + 1] = "]"
+
+		-- image
+		formspec[#formspec + 1] = "image[0,0;1.5,1;"
+		formspec[#formspec + 1] = core.formspec_escape(get_screenshot(package))
+		formspec[#formspec + 1] = "]"
+
+		-- title
+		formspec[#formspec + 1] = "label[1.875,0.1;"
+		formspec[#formspec + 1] = core.formspec_escape(
+				core.colorize(mt_color_green, package.title) ..
+				core.colorize("#BFBFBF", " by " .. package.author))
+		formspec[#formspec + 1] = "]"
+
+		-- buttons
+		local description_width = W - 2.625 - 2 * 0.7 - 2 * 0.15
+
+		local second_base = "image_button[-1.55,0;0.7,0.7;" .. core.formspec_escape(defaulttexturedir)
+		local third_base = "image_button[-2.4,0;0.7,0.7;" .. core.formspec_escape(defaulttexturedir)
+		formspec[#formspec + 1] = "container["
+		formspec[#formspec + 1] = W - 0.375*2
+		formspec[#formspec + 1] = ",0.1]"
+
+		if package.downloading then
+			formspec[#formspec + 1] = "animated_image[-1.7,-0.15;1,1;downloading;"
+			formspec[#formspec + 1] = core.formspec_escape(defaulttexturedir)
+			formspec[#formspec + 1] = "cdb_downloading.png;3;400;]"
+		elseif package.queued then
+			formspec[#formspec + 1] = second_base
+			formspec[#formspec + 1] = "cdb_queued.png;queued;]"
+		elseif not package.path then
+			local elem_name = "install_" .. i .. ";"
+			formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#71aa34]"
+			formspec[#formspec + 1] = second_base .. "cdb_add.png;" .. elem_name .. "]"
+			formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Install") .. tooltip_colors
+		else
+			if package.installed_release < package.release then
+				-- The install_ action also handles updating
+				local elem_name = "install_" .. i .. ";"
+				formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#28ccdf]"
+				formspec[#formspec + 1] = third_base .. "cdb_update.png;" .. elem_name .. "]"
+				formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Update") .. tooltip_colors
+
+				description_width = description_width - 0.7 - 0.15
+			end
+
+			local elem_name = "uninstall_" .. i .. ";"
+			formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#a93b3b]"
+			formspec[#formspec + 1] = second_base .. "cdb_clear.png;" .. elem_name .. "]"
+			formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Uninstall") .. tooltip_colors
+		end
+
+		local web_elem_name = "view_" .. i .. ";"
+		formspec[#formspec + 1] = "image_button[-0.7,0;0.7,0.7;" ..
+			core.formspec_escape(defaulttexturedir) .. "cdb_viewonline.png;" .. web_elem_name .. "]"
+		formspec[#formspec + 1] = "tooltip[" .. web_elem_name ..
+			fgettext("View more information in a web browser") .. tooltip_colors
+		formspec[#formspec + 1] = "container_end[]"
+
+		-- description
+		formspec[#formspec + 1] = "textarea[1.855,0.3;"
+		formspec[#formspec + 1] = tostring(description_width)
+		formspec[#formspec + 1] = ",0.8;;;"
+		formspec[#formspec + 1] = core.formspec_escape(package.short_description)
+		formspec[#formspec + 1] = "]"
+
+		formspec[#formspec + 1] = "container_end[]"
+	end
+
+	return table.concat(formspec)
+end
+
+
+local function handle_submit(this, fields)
+	if fields.search or fields.key_enter_field == "search_string" then
+		search_string = fields.search_string:trim()
+		cur_page = 1
+		contentdb.filter_packages(search_string, filter_types_type[filter_type])
+		return true
+	end
+
+	if fields.clear then
+		search_string = ""
+		cur_page = 1
+		contentdb.filter_packages("", filter_types_type[filter_type])
+		return true
+	end
+
+	if fields.back then
+		this:delete()
+		return true
+	end
+
+	if fields.pstart then
+		cur_page = 1
+		return true
+	end
+
+	if fields.pend then
+		cur_page = this.data.pagemax
+		return true
+	end
+
+	if fields.pnext then
+		cur_page = cur_page + 1
+		if cur_page > this.data.pagemax then
+			cur_page = 1
+		end
+		return true
+	end
+
+	if fields.pback then
+		if cur_page == 1 then
+			cur_page = this.data.pagemax
+		else
+			cur_page = cur_page - 1
+		end
+		return true
+	end
+
+	if fields.type then
+		local new_type = table.indexof(filter_types_titles, fields.type)
+		if new_type ~= filter_type then
+			filter_type = new_type
+			cur_page = 1
+			contentdb.filter_packages(search_string, filter_types_type[filter_type])
+			return true
+		end
+	end
+
+	if fields.update_all then
+		for i=1, #contentdb.packages_full do
+			local package = contentdb.packages_full[i]
+			if package.path and package.installed_release < package.release and
+					not (package.downloading or package.queued) then
+				contentdb.queue_download(package, contentdb.REASON_UPDATE)
+			end
+		end
+		return true
+	end
+
+	local start_idx = (cur_page - 1) * num_per_page + 1
+	assert(start_idx ~= nil)
+	for i=start_idx, math.min(#contentdb.packages, start_idx+num_per_page-1) do
+		local package = contentdb.packages[i]
+		assert(package)
+
+		if fields["install_" .. i] then
+			install_or_update_package(this, package)
+			return true
+		end
+
+		if fields["uninstall_" .. i] then
+			local dlg = create_delete_content_dlg(package)
+			dlg:set_parent(this)
+			this:hide()
+			dlg:show()
+			return true
+		end
+
+		if fields["view_" .. i] then
+			local url = ("%s/packages/%s?protocol_version=%d"):format(
+					core.settings:get("contentdb_url"), package.url_part,
+					core.get_max_supp_proto())
+			core.open_url(url)
+			return true
+		end
+	end
+
+	return false
+end
+
+
+local function handle_events(event)
+	if event == "DialogShow" then
+		-- On touchscreen, don't show the "MINETEST" header behind the dialog.
+		mm_game_theme.set_engine(core.settings:get_bool("enable_touch"))
+
+		-- If ContentDB is already loaded, auto-install packages here.
+		do_auto_install()
+
+		return true
+	end
+
+	return false
+end
+
+
+--- Creates a ContentDB dialog.
+---
+--- @param type string | nil
+--- Sets initial package filter. "game", "mod", "txp" or nil (no filter).
+--- @param install_spec table | nil
+--- ContentDB ID of package as returned by pkgmgr.get_contentdb_id().
+--- Sets package to install or update automatically.
+function create_contentdb_dlg(type, install_spec)
+	search_string = ""
+	cur_page = 1
+	if type then
+		-- table.indexof does not work on tables that contain `nil`
+		for i, v in pairs(filter_types_type) do
+			if v == type then
+				filter_type = i
+				break
+			end
+		end
+	else
+		filter_type = 1
+	end
+
+	-- Keep the old auto_install_spec if the caller doesn't specify one.
+	if install_spec then
+		auto_install_spec = install_spec
+	end
+
+	load()
+
+	return dialog_create("contentdb",
+			get_formspec,
+			handle_submit,
+			handle_events)
+end
diff --git a/builtin/mainmenu/content/dlg_contentstore.lua b/builtin/mainmenu/content/dlg_contentstore.lua
deleted file mode 100644
index e567fcef7..000000000
--- a/builtin/mainmenu/content/dlg_contentstore.lua
+++ /dev/null
@@ -1,1223 +0,0 @@
---Minetest
---Copyright (C) 2018-20 rubenwardy
---
---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
---the Free Software Foundation; either version 2.1 of the License, or
---(at your option) any later version.
---
---This program is distributed in the hope that it will be useful,
---but WITHOUT ANY WARRANTY; without even the implied warranty of
---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---GNU Lesser General Public License for more details.
---
---You should have received a copy of the GNU Lesser General Public License along
---with this program; if not, write to the Free Software Foundation, Inc.,
---51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-if not core.get_http_api then
-	function create_store_dlg()
-		return messagebox("store",
-				fgettext("ContentDB is not available when Minetest was compiled without cURL"))
-	end
-	return
-end
-
-local store = {
-	loading = false,
-	load_ok = false,
-	load_error = false,
-
-	-- Unordered preserves the original order of the ContentDB API,
-	-- before the package list is ordered based on installed state.
-	packages = {},
-	packages_full = {},
-	packages_full_unordered = {},
-	aliases = {},
-}
-
-local http = core.get_http_api()
-
--- Screenshot
-local screenshot_dir = core.get_cache_path() .. DIR_DELIM .. "cdb"
-assert(core.create_dir(screenshot_dir))
-local screenshot_downloading = {}
-local screenshot_downloaded = {}
-
--- Filter
-local search_string = ""
-local cur_page = 1
-local num_per_page = 5
-local filter_type = 1
-local filter_types_titles = {
-	fgettext("All packages"),
-	fgettext("Games"),
-	fgettext("Mods"),
-	fgettext("Texture packs"),
-}
-
--- Automatic package installation
-local auto_install_spec = nil
-
-local number_downloading = 0
-local download_queue = {}
-
-local filter_types_type = {
-	nil,
-	"game",
-	"mod",
-	"txp",
-}
-
-local REASON_NEW = "new"
-local REASON_UPDATE = "update"
-local REASON_DEPENDENCY = "dependency"
-
-
-local function get_download_url(package, reason)
-	local base_url = core.settings:get("contentdb_url")
-	local ret = base_url .. ("/packages/%s/releases/%d/download/"):format(
-		package.url_part, package.release)
-	if reason then
-		ret = ret .. "?reason=" .. reason
-	end
-	return ret
-end
-
-
-local function download_and_extract(param)
-	local package = param.package
-
-	local filename = core.get_temp_path(true)
-	if filename == "" or not core.download_file(param.url, filename) then
-		core.log("error", "Downloading " .. dump(param.url) .. " failed")
-		return {
-			msg = fgettext_ne("Failed to download \"$1\"", package.title)
-		}
-	end
-
-	local tempfolder = core.get_temp_path()
-	if tempfolder ~= "" then
-		tempfolder = tempfolder .. DIR_DELIM .. "MT_" .. math.random(1, 1024000)
-		if not core.extract_zip(filename, tempfolder) then
-			tempfolder = nil
-		end
-	else
-		tempfolder = nil
-	end
-	os.remove(filename)
-	if not tempfolder then
-		return {
-			msg = fgettext_ne("Failed to extract \"$1\" (unsupported file type or broken archive)", package.title),
-		}
-	end
-
-	return {
-		path = tempfolder
-	}
-end
-
-local function start_install(package, reason)
-	local params = {
-		package = package,
-		url = get_download_url(package, reason),
-	}
-
-	number_downloading = number_downloading + 1
-
-	local function callback(result)
-		if result.msg then
-			gamedata.errormessage = result.msg
-		else
-			local path, msg = pkgmgr.install_dir(package.type, result.path, package.name, package.path)
-			core.delete_dir(result.path)
-			if not path then
-				gamedata.errormessage = fgettext_ne("Error installing \"$1\": $2", package.title, msg)
-			else
-				core.log("action", "Installed package to " .. path)
-
-				local conf_path
-				local name_is_title = false
-				if package.type == "mod" then
-					local actual_type = pkgmgr.get_folder_type(path)
-					if actual_type.type == "modpack" then
-						conf_path = path .. DIR_DELIM .. "modpack.conf"
-					else
-						conf_path = path .. DIR_DELIM .. "mod.conf"
-					end
-				elseif package.type == "game" then
-					conf_path = path .. DIR_DELIM .. "game.conf"
-					name_is_title = true
-				elseif package.type == "txp" then
-					conf_path = path .. DIR_DELIM .. "texture_pack.conf"
-				end
-
-				if conf_path then
-					local conf = Settings(conf_path)
-					conf:set("title", package.title)
-					if not name_is_title then
-						conf:set("name", package.name)
-					end
-					if not conf:get("description") then
-						conf:set("description", package.short_description)
-					end
-					conf:set("author",     package.author)
-					conf:set("release",    package.release)
-					conf:write()
-				end
-			end
-		end
-
-		package.downloading = false
-
-		number_downloading = number_downloading - 1
-
-		local next = download_queue[1]
-		if next then
-			table.remove(download_queue, 1)
-
-			start_install(next.package, next.reason)
-		end
-
-		ui.update()
-	end
-
-	package.queued = false
-	package.downloading = true
-
-	if not core.handle_async(download_and_extract, params, callback) then
-		core.log("error", "ERROR: async event failed")
-		gamedata.errormessage = fgettext_ne("Failed to download $1", package.name)
-		return
-	end
-end
-
-local function queue_download(package, reason)
-	if package.queued or package.downloading then
-		return
-	end
-
-	local max_concurrent_downloads = tonumber(core.settings:get("contentdb_max_concurrent_downloads"))
-	if number_downloading < math.max(max_concurrent_downloads, 1) then
-		start_install(package, reason)
-	else
-		table.insert(download_queue, { package = package, reason = reason })
-		package.queued = true
-	end
-end
-
-local function get_raw_dependencies(package)
-	if package.type ~= "mod" then
-		return {}
-	end
-	if package.raw_deps then
-		return package.raw_deps
-	end
-
-	local url_fmt = "/api/packages/%s/dependencies/?only_hard=1&protocol_version=%s&engine_version=%s"
-	local version = core.get_version()
-	local base_url = core.settings:get("contentdb_url")
-	local url = base_url .. url_fmt:format(package.url_part, core.get_max_supp_proto(), core.urlencode(version.string))
-
-	local response = http.fetch_sync({ url = url })
-	if not response.succeeded then
-		return
-	end
-
-	local data = core.parse_json(response.data) or {}
-
-	local content_lookup = {}
-	for _, pkg in pairs(store.packages_full) do
-		content_lookup[pkg.id] = pkg
-	end
-
-	for id, raw_deps in pairs(data) do
-		local package2 = content_lookup[id:lower()]
-		if package2 and not package2.raw_deps then
-			package2.raw_deps = raw_deps
-
-			for _, dep in pairs(raw_deps) do
-				local packages = {}
-				for i=1, #dep.packages do
-					packages[#packages + 1] = content_lookup[dep.packages[i]:lower()]
-				end
-				dep.packages = packages
-			end
-		end
-	end
-
-	return package.raw_deps
-end
-
-local function has_hard_deps(raw_deps)
-	for i=1, #raw_deps do
-		if not raw_deps[i].is_optional then
-			return true
-		end
-	end
-
-	return false
-end
-
--- Recursively resolve dependencies, given the installed mods
-local function resolve_dependencies_2(raw_deps, installed_mods, out)
-	local function resolve_dep(dep)
-		-- Check whether it's already installed
-		if installed_mods[dep.name] then
-			return {
-				is_optional = dep.is_optional,
-				name = dep.name,
-				installed = true,
-			}
-		end
-
-		-- Find exact name matches
-		local fallback
-		for _, package in pairs(dep.packages) do
-			if package.type ~= "game" then
-				if package.name == dep.name then
-					return {
-						is_optional = dep.is_optional,
-						name = dep.name,
-						installed = false,
-						package = package,
-					}
-				elseif not fallback then
-					fallback = package
-				end
-			end
-		end
-
-		-- Otherwise, find the first mod that fulfills it
-		if fallback then
-			return {
-				is_optional = dep.is_optional,
-				name = dep.name,
-				installed = false,
-				package = fallback,
-			}
-		end
-
-		return {
-			is_optional = dep.is_optional,
-			name = dep.name,
-			installed = false,
-		}
-	end
-
-	for _, dep in pairs(raw_deps) do
-		if not dep.is_optional and not out[dep.name] then
-			local result  = resolve_dep(dep)
-			out[dep.name] = result
-			if result and result.package and not result.installed then
-				local raw_deps2 = get_raw_dependencies(result.package)
-				if raw_deps2 then
-					resolve_dependencies_2(raw_deps2, installed_mods, out)
-				end
-			end
-		end
-	end
-
-	return true
-end
-
--- Resolve dependencies for a package, calls the recursive version.
-local function resolve_dependencies(raw_deps, game)
-	assert(game)
-
-	local installed_mods = {}
-
-	local mods = {}
-	pkgmgr.get_game_mods(game, mods)
-	for _, mod in pairs(mods) do
-		installed_mods[mod.name] = true
-	end
-
-	for _, mod in pairs(pkgmgr.global_mods:get_list()) do
-		installed_mods[mod.name] = true
-	end
-
-	local out = {}
-	if not resolve_dependencies_2(raw_deps, installed_mods, out) then
-		return nil
-	end
-
-	local retval = {}
-	for _, dep in pairs(out) do
-		retval[#retval + 1] = dep
-	end
-
-	table.sort(retval, function(a, b)
-		return a.name < b.name
-	end)
-
-	return retval
-end
-
-local install_dialog = {}
-function install_dialog.get_formspec()
-	local selected_game, selected_game_idx = pkgmgr.find_by_gameid(core.settings:get("menu_last_game"))
-	if not selected_game_idx then
-		selected_game_idx = 1
-		selected_game = pkgmgr.games[1]
-	end
-
-	local game_list = {}
-	for i, game in ipairs(pkgmgr.games) do
-		game_list[i] = core.formspec_escape(game.title)
-	end
-
-	local package = install_dialog.package
-	local raw_deps = install_dialog.raw_deps
-	local will_install_deps = install_dialog.will_install_deps
-
-	local deps_to_install = 0
-	local deps_not_found = 0
-
-	install_dialog.dependencies = resolve_dependencies(raw_deps, selected_game)
-	local formatted_deps = {}
-	for _, dep in pairs(install_dialog.dependencies) do
-		formatted_deps[#formatted_deps + 1] = "#fff"
-		formatted_deps[#formatted_deps + 1] = core.formspec_escape(dep.name)
-		if dep.installed then
-			formatted_deps[#formatted_deps + 1] = "#ccf"
-			formatted_deps[#formatted_deps + 1] = fgettext("Already installed")
-		elseif dep.package then
-			formatted_deps[#formatted_deps + 1] = "#cfc"
-			formatted_deps[#formatted_deps + 1] = fgettext("$1 by $2", dep.package.title, dep.package.author)
-			deps_to_install = deps_to_install + 1
-		else
-			formatted_deps[#formatted_deps + 1] = "#f00"
-			formatted_deps[#formatted_deps + 1] = fgettext("Not found")
-			deps_not_found = deps_not_found + 1
-		end
-	end
-
-	local message_bg = "#3333"
-	local message
-	if will_install_deps then
-		message = fgettext("$1 and $2 dependencies will be installed.", package.title, deps_to_install)
-	else
-		message = fgettext("$1 will be installed, and $2 dependencies will be skipped.", package.title, deps_to_install)
-	end
-	if deps_not_found > 0 then
-		message = fgettext("$1 required dependencies could not be found.", deps_not_found) ..
-				" " .. fgettext("Please check that the base game is correct.", deps_not_found) ..
-				"\n" .. message
-		message_bg = mt_color_orange
-	end
-
-	local formspec = {
-		"formspec_version[3]",
-		"size[7,7.85]",
-		"style[title;border=false]",
-		"box[0,0;7,0.5;#3333]",
-		"button[0,0;7,0.5;title;", fgettext("Install $1", package.title) , "]",
-
-		"container[0.375,0.70]",
-
-		"label[0,0.25;", fgettext("Base Game:"), "]",
-		"dropdown[2,0;4.25,0.5;selected_game;", table.concat(game_list, ","), ";", selected_game_idx, "]",
-
-		"label[0,0.8;", fgettext("Dependencies:"), "]",
-
-		"tablecolumns[color;text;color;text]",
-		"table[0,1.1;6.25,3;packages;", table.concat(formatted_deps, ","), "]",
-
-		"container_end[]",
-
-		"checkbox[0.375,5.1;will_install_deps;",
-			fgettext("Install missing dependencies"), ";",
-			will_install_deps and "true" or "false", "]",
-
-		"box[0,5.4;7,1.2;", message_bg, "]",
-		"textarea[0.375,5.5;6.25,1;;;", message, "]",
-
-		"container[1.375,6.85]",
-		"button[0,0;2,0.8;install_all;", fgettext("Install"), "]",
-		"button[2.25,0;2,0.8;cancel;", fgettext("Cancel"), "]",
-		"container_end[]",
-	}
-
-	return table.concat(formspec)
-end
-
-function install_dialog.handle_submit(this, fields)
-	if fields.cancel then
-		this:delete()
-		return true
-	end
-
-	if fields.will_install_deps ~= nil then
-		install_dialog.will_install_deps = core.is_yes(fields.will_install_deps)
-		return true
-	end
-
-	if fields.install_all then
-		queue_download(install_dialog.package, REASON_NEW)
-
-		if install_dialog.will_install_deps then
-			for _, dep in pairs(install_dialog.dependencies) do
-				if not dep.is_optional and not dep.installed and dep.package then
-					queue_download(dep.package, REASON_DEPENDENCY)
-				end
-			end
-		end
-
-		this:delete()
-		return true
-	end
-
-	if fields.selected_game then
-		for _, game in pairs(pkgmgr.games) do
-			if game.title == fields.selected_game then
-				core.settings:set("menu_last_game", game.id)
-				break
-			end
-		end
-		return true
-	end
-
-	return false
-end
-
-function install_dialog.create(package, raw_deps)
-	install_dialog.dependencies = nil
-	install_dialog.package = package
-	install_dialog.raw_deps = raw_deps
-	install_dialog.will_install_deps = true
-	return dialog_create("install_dialog",
-			install_dialog.get_formspec,
-			install_dialog.handle_submit,
-			nil)
-end
-
-
-local confirm_overwrite = {}
-function confirm_overwrite.get_formspec()
-	local package = confirm_overwrite.package
-
-	return confirmation_formspec(
-		fgettext("\"$1\" already exists. Would you like to overwrite it?", package.name),
-		'install', fgettext("Overwrite"),
-		'cancel', fgettext("Cancel"))
-end
-
-function confirm_overwrite.handle_submit(this, fields)
-	if fields.cancel then
-		this:delete()
-		return true
-	end
-
-	if fields.install then
-		this:delete()
-		confirm_overwrite.callback()
-		return true
-	end
-
-	return false
-end
-
-function confirm_overwrite.create(package, callback)
-	assert(type(package) == "table")
-	assert(type(callback) == "function")
-
-	confirm_overwrite.package = package
-	confirm_overwrite.callback = callback
-	return dialog_create("confirm_overwrite",
-		confirm_overwrite.get_formspec,
-		confirm_overwrite.handle_submit,
-		nil)
-end
-
-local function install_or_update_package(this, package)
-	local install_parent
-	if package.type == "mod" then
-		install_parent = core.get_modpath()
-	elseif package.type == "game" then
-		install_parent = core.get_gamepath()
-	elseif package.type == "txp" then
-		install_parent = core.get_texturepath()
-	else
-		error("Unknown package type: " .. package.type)
-	end
-
-	if package.queued or package.downloading then
-		return
-	end
-
-	local function on_confirm()
-		local deps = get_raw_dependencies(package)
-		if deps and has_hard_deps(deps) then
-			local dlg = install_dialog.create(package, deps)
-			dlg:set_parent(this)
-			this:hide()
-			dlg:show()
-		else
-			queue_download(package, package.path and REASON_UPDATE or REASON_NEW)
-		end
-	end
-
-	if package.type == "mod" and #pkgmgr.games == 0 then
-		local dlg = messagebox("install_game",
-			fgettext("You need to install a game before you can install a mod"))
-		dlg:set_parent(this)
-		this:hide()
-		dlg:show()
-	elseif not package.path and core.is_dir(install_parent .. DIR_DELIM .. package.name) then
-		local dlg = confirm_overwrite.create(package, on_confirm)
-		dlg:set_parent(this)
-		this:hide()
-		dlg:show()
-	else
-		on_confirm()
-	end
-end
-
-
-local function get_file_extension(path)
-	local parts = path:split(".")
-	return parts[#parts]
-end
-
-local function get_screenshot(package)
-	if not package.thumbnail then
-		return defaulttexturedir .. "no_screenshot.png"
-	elseif screenshot_downloading[package.thumbnail] then
-		return defaulttexturedir .. "loading_screenshot.png"
-	end
-
-	-- Get tmp screenshot path
-	local ext = get_file_extension(package.thumbnail)
-	local filepath = screenshot_dir .. DIR_DELIM ..
-		("%s-%s-%s.%s"):format(package.type, package.author, package.name, ext)
-
-	-- Return if already downloaded
-	local file = io.open(filepath, "r")
-	if file then
-		file:close()
-		return filepath
-	end
-
-	-- Show error if we've failed to download before
-	if screenshot_downloaded[package.thumbnail] then
-		return defaulttexturedir .. "error_screenshot.png"
-	end
-
-	-- Download
-
-	local function download_screenshot(params)
-		return core.download_file(params.url, params.dest)
-	end
-	local function callback(success)
-		screenshot_downloading[package.thumbnail] = nil
-		screenshot_downloaded[package.thumbnail] = true
-		if not success then
-			core.log("warning", "Screenshot download failed for some reason")
-		end
-		ui.update()
-	end
-	if core.handle_async(download_screenshot,
-			{ dest = filepath, url = package.thumbnail }, callback) then
-		screenshot_downloading[package.thumbnail] = true
-	else
-		core.log("error", "ERROR: async event failed")
-		return defaulttexturedir .. "error_screenshot.png"
-	end
-
-	return defaulttexturedir .. "loading_screenshot.png"
-end
-
-local function fetch_pkgs()
-	local version = core.get_version()
-	local base_url = core.settings:get("contentdb_url")
-	local url = base_url ..
-		"/api/packages/?type=mod&type=game&type=txp&protocol_version=" ..
-		core.get_max_supp_proto() .. "&engine_version=" .. core.urlencode(version.string)
-
-	for _, item in pairs(core.settings:get("contentdb_flag_blacklist"):split(",")) do
-		item = item:trim()
-		if item ~= "" then
-			url = url .. "&hide=" .. core.urlencode(item)
-		end
-	end
-
-	local http = core.get_http_api()
-	local response = http.fetch_sync({ url = url })
-	if not response.succeeded then
-		return
-	end
-
-	local packages = core.parse_json(response.data)
-	if not packages or #packages == 0 then
-		return
-	end
-	local aliases = {}
-
-	for _, package in pairs(packages) do
-		local name_len = #package.name
-		-- This must match what store.update_paths() does!
-		package.id = package.author:lower() .. "/"
-		if package.type == "game" and name_len > 5 and package.name:sub(name_len - 4) == "_game" then
-			package.id = package.id .. package.name:sub(1, name_len - 5)
-		else
-			package.id = package.id .. package.name
-		end
-
-		package.url_part = core.urlencode(package.author) .. "/" .. core.urlencode(package.name)
-
-		if package.aliases then
-			for _, alias in ipairs(package.aliases) do
-				-- We currently don't support name changing
-				local suffix = "/" .. package.name
-				if alias:sub(-#suffix) == suffix then
-					aliases[alias:lower()] = package.id
-				end
-			end
-		end
-	end
-
-	return { packages = packages, aliases = aliases }
-end
-
-local function sort_and_filter_pkgs()
-	store.update_paths()
-	store.sort_packages()
-	store.filter_packages(search_string)
-end
-
--- Resolves the package specification stored in auto_install_spec into an actual package.
--- May only be called after the package list has been loaded successfully.
-local function resolve_auto_install_spec()
-	assert(store.load_ok)
-
-	if not auto_install_spec then
-		return nil
-	end
-
-	local spec = store.aliases[auto_install_spec] or auto_install_spec
-	local resolved = nil
-
-	for _, pkg in ipairs(store.packages_full_unordered) do
-		if pkg.id == spec then
-			resolved = pkg
-			break
-		end
-	end
-
-	if not resolved then
-		gamedata.errormessage = fgettext("The package $1 was not found.", auto_install_spec)
-		ui.update()
-
-		auto_install_spec = nil
-	end
-
-	return resolved
-end
-
--- Installs the package specified by auto_install_spec.
--- Only does something if:
--- a. The package list has been loaded successfully.
--- b. The store dialog is currently visible.
-local function do_auto_install()
-	if not store.load_ok then
-		return
-	end
-
-	local pkg = resolve_auto_install_spec()
-	if not pkg then
-		return
-	end
-
-	local store_dlg = ui.find_by_name("store")
-	if not store_dlg or store_dlg.hidden then
-		return
-	end
-
-	install_or_update_package(store_dlg, pkg)
-	auto_install_spec = nil
-end
-
-function store.load()
-	if store.load_ok then
-		sort_and_filter_pkgs()
-		return
-	end
-	if store.loading then
-		return
-	end
-	store.loading = true
-	core.handle_async(
-		fetch_pkgs,
-		nil,
-		function(result)
-			if result then
-				store.load_ok = true
-				store.load_error = false
-				store.packages = result.packages
-				store.packages_full = result.packages
-				store.packages_full_unordered = result.packages
-				store.aliases = result.aliases
-
-				sort_and_filter_pkgs()
-				do_auto_install()
-			else
-				store.load_error = true
-			end
-
-			store.loading = false
-			ui.update()
-		end
-	)
-end
-
-function store.update_paths()
-	local mod_hash = {}
-	pkgmgr.refresh_globals()
-	for _, mod in pairs(pkgmgr.global_mods:get_list()) do
-		local cdb_id = pkgmgr.get_contentdb_id(mod)
-		if cdb_id then
-			mod_hash[store.aliases[cdb_id] or cdb_id] = mod
-		end
-	end
-
-	local game_hash = {}
-	pkgmgr.update_gamelist()
-	for _, game in pairs(pkgmgr.games) do
-		local cdb_id = pkgmgr.get_contentdb_id(game)
-		if cdb_id then
-			game_hash[store.aliases[cdb_id] or cdb_id] = game
-		end
-	end
-
-	local txp_hash = {}
-	for _, txp in pairs(pkgmgr.get_texture_packs()) do
-		local cdb_id = pkgmgr.get_contentdb_id(txp)
-		if cdb_id then
-			txp_hash[store.aliases[cdb_id] or cdb_id] = txp
-		end
-	end
-
-	for _, package in pairs(store.packages_full) do
-		local content
-		if package.type == "mod" then
-			content = mod_hash[package.id]
-		elseif package.type == "game" then
-			content = game_hash[package.id]
-		elseif package.type == "txp" then
-			content = txp_hash[package.id]
-		end
-
-		if content then
-			package.path = content.path
-			package.installed_release = content.release or 0
-		else
-			package.path = nil
-			package.installed_release = nil
-		end
-	end
-end
-
-function store.sort_packages()
-	local ret = {}
-
-	local auto_install_pkg = resolve_auto_install_spec() -- can be nil
-
-	-- Add installed content
-	for _, pkg in ipairs(store.packages_full_unordered) do
-		if pkg.path and pkg ~= auto_install_pkg then
-			ret[#ret + 1] = pkg
-		end
-	end
-
-	-- Sort installed content first by "is there an update available?", then by title
-	table.sort(ret, function(a, b)
-		local a_updatable = a.installed_release < a.release
-		local b_updatable = b.installed_release < b.release
-		if a_updatable and not b_updatable then
-			return true
-		elseif b_updatable and not a_updatable then
-			return false
-		end
-
-		return a.title < b.title
-	end)
-
-	-- Add uninstalled content
-	for _, pkg in ipairs(store.packages_full_unordered) do
-		if not pkg.path and pkg ~= auto_install_pkg then
-			ret[#ret + 1] = pkg
-		end
-	end
-
-	-- Put the package that will be auto-installed at the very top
-	if auto_install_pkg then
-		table.insert(ret, 1, auto_install_pkg)
-	end
-
-	store.packages_full = ret
-end
-
-function store.filter_packages(query)
-	if query == "" and filter_type == 1 then
-		store.packages = store.packages_full
-		return
-	end
-
-	local keywords = {}
-	for word in query:lower():gmatch("%S+") do
-		table.insert(keywords, word)
-	end
-
-	local function matches_keywords(package)
-		for k = 1, #keywords do
-			local keyword = keywords[k]
-
-			if string.find(package.name:lower(), keyword, 1, true) or
-					string.find(package.title:lower(), keyword, 1, true) or
-					string.find(package.author:lower(), keyword, 1, true) or
-					string.find(package.short_description:lower(), keyword, 1, true) then
-				return true
-			end
-		end
-
-		return false
-	end
-
-	store.packages = {}
-	for _, package in pairs(store.packages_full) do
-		if (query == "" or matches_keywords(package)) and
-				(filter_type == 1 or package.type == filter_types_type[filter_type]) then
-			store.packages[#store.packages + 1] = package
-		end
-	end
-end
-
-local function get_info_formspec(text)
-	local H = 9.5
-	return table.concat({
-		"formspec_version[6]",
-		"size[15.75,9.5]",
-		TOUCHSCREEN_GUI and "padding[0.01,0.01]" or "position[0.5,0.55]",
-
-		"label[4,4.35;", text, "]",
-		"container[0,", H - 0.8 - 0.375, "]",
-		"button[0.375,0;5,0.8;back;", fgettext("Back to Main Menu"), "]",
-		"container_end[]",
-	})
-end
-
-function store.get_formspec(dlgdata)
-	if store.loading then
-		return get_info_formspec(fgettext("Loading..."))
-	end
-	if store.load_error then
-		return get_info_formspec(fgettext("No packages could be retrieved"))
-	end
-	assert(store.load_ok)
-
-	store.update_paths()
-
-	dlgdata.pagemax = math.max(math.ceil(#store.packages / num_per_page), 1)
-	if cur_page > dlgdata.pagemax then
-		cur_page = 1
-	end
-
-	local W = 15.75
-	local H = 9.5
-	local formspec = {
-		"formspec_version[6]",
-		"size[15.75,9.5]",
-		TOUCHSCREEN_GUI and "padding[0.01,0.01]" or "position[0.5,0.55]",
-
-		"style[status,downloading,queued;border=false]",
-
-		"container[0.375,0.375]",
-		"field[0,0;7.225,0.8;search_string;;", core.formspec_escape(search_string), "]",
-		"field_enter_after_edit[search_string;true]",
-		"image_button[7.3,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "search.png"), ";search;]",
-		"image_button[8.125,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "clear.png"), ";clear;]",
-		"dropdown[9.175,0;2.7875,0.8;type;", table.concat(filter_types_titles, ","), ";", filter_type, "]",
-		"container_end[]",
-
-		-- Page nav buttons
-		"container[0,", H - 0.8 - 0.375, "]",
-		"button[0.375,0;5,0.8;back;", fgettext("Back to Main Menu"), "]",
-
-		"container[", W - 0.375 - 0.8*4 - 2,  ",0]",
-		"image_button[0,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "start_icon.png;pstart;]",
-		"image_button[0.8,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "prev_icon.png;pback;]",
-		"style[pagenum;border=false]",
-		"button[1.6,0;2,0.8;pagenum;", tonumber(cur_page), " / ", tonumber(dlgdata.pagemax), "]",
-		"image_button[3.6,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "next_icon.png;pnext;]",
-		"image_button[4.4,0;0.8,0.8;", core.formspec_escape(defaulttexturedir), "end_icon.png;pend;]",
-		"container_end[]",
-
-		"container_end[]",
-	}
-
-	if number_downloading > 0 then
-		formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;downloading;"
-		if #download_queue > 0 then
-			formspec[#formspec + 1] = fgettext("$1 downloading,\n$2 queued", number_downloading, #download_queue)
-		else
-			formspec[#formspec + 1] = fgettext("$1 downloading...", number_downloading)
-		end
-		formspec[#formspec + 1] = "]"
-	else
-		local num_avail_updates = 0
-		for i=1, #store.packages_full do
-			local package = store.packages_full[i]
-			if package.path and package.installed_release < package.release and
-					not (package.downloading or package.queued) then
-				num_avail_updates = num_avail_updates + 1
-			end
-		end
-
-		if num_avail_updates == 0 then
-			formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;status;"
-			formspec[#formspec + 1] = fgettext("No updates")
-			formspec[#formspec + 1] = "]"
-		else
-			formspec[#formspec + 1] = "button[12.5875,0.375;2.7875,0.8;update_all;"
-			formspec[#formspec + 1] = fgettext("Update All [$1]", num_avail_updates)
-			formspec[#formspec + 1] = "]"
-		end
-	end
-
-	if #store.packages == 0 then
-		formspec[#formspec + 1] = "label[4,4.75;"
-		formspec[#formspec + 1] = fgettext("No results")
-		formspec[#formspec + 1] = "]"
-	end
-
-	-- download/queued tooltips always have the same message
-	local tooltip_colors = ";#dff6f5;#302c2e]"
-	formspec[#formspec + 1] = "tooltip[downloading;" .. fgettext("Downloading...") .. tooltip_colors
-	formspec[#formspec + 1] = "tooltip[queued;" .. fgettext("Queued") .. tooltip_colors
-
-	local start_idx = (cur_page - 1) * num_per_page + 1
-	for i=start_idx, math.min(#store.packages, start_idx+num_per_page-1) do
-		local package = store.packages[i]
-		local container_y = (i - start_idx) * 1.375 + (2*0.375 + 0.8)
-		formspec[#formspec + 1] = "container[0.375,"
-		formspec[#formspec + 1] = container_y
-		formspec[#formspec + 1] = "]"
-
-		-- image
-		formspec[#formspec + 1] = "image[0,0;1.5,1;"
-		formspec[#formspec + 1] = core.formspec_escape(get_screenshot(package))
-		formspec[#formspec + 1] = "]"
-
-		-- title
-		formspec[#formspec + 1] = "label[1.875,0.1;"
-		formspec[#formspec + 1] = core.formspec_escape(
-				core.colorize(mt_color_green, package.title) ..
-				core.colorize("#BFBFBF", " by " .. package.author))
-		formspec[#formspec + 1] = "]"
-
-		-- buttons
-		local description_width = W - 2.625 - 2 * 0.7 - 2 * 0.15
-
-		local second_base = "image_button[-1.55,0;0.7,0.7;" .. core.formspec_escape(defaulttexturedir)
-		local third_base = "image_button[-2.4,0;0.7,0.7;" .. core.formspec_escape(defaulttexturedir)
-		formspec[#formspec + 1] = "container["
-		formspec[#formspec + 1] = W - 0.375*2
-		formspec[#formspec + 1] = ",0.1]"
-
-		if package.downloading then
-			formspec[#formspec + 1] = "animated_image[-1.7,-0.15;1,1;downloading;"
-			formspec[#formspec + 1] = core.formspec_escape(defaulttexturedir)
-			formspec[#formspec + 1] = "cdb_downloading.png;3;400;]"
-		elseif package.queued then
-			formspec[#formspec + 1] = second_base
-			formspec[#formspec + 1] = "cdb_queued.png;queued;]"
-		elseif not package.path then
-			local elem_name = "install_" .. i .. ";"
-			formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#71aa34]"
-			formspec[#formspec + 1] = second_base .. "cdb_add.png;" .. elem_name .. "]"
-			formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Install") .. tooltip_colors
-		else
-			if package.installed_release < package.release then
-				-- The install_ action also handles updating
-				local elem_name = "install_" .. i .. ";"
-				formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#28ccdf]"
-				formspec[#formspec + 1] = third_base .. "cdb_update.png;" .. elem_name .. "]"
-				formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Update") .. tooltip_colors
-
-				description_width = description_width - 0.7 - 0.15
-			end
-
-			local elem_name = "uninstall_" .. i .. ";"
-			formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#a93b3b]"
-			formspec[#formspec + 1] = second_base .. "cdb_clear.png;" .. elem_name .. "]"
-			formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Uninstall") .. tooltip_colors
-		end
-
-		local web_elem_name = "view_" .. i .. ";"
-		formspec[#formspec + 1] = "image_button[-0.7,0;0.7,0.7;" ..
-			core.formspec_escape(defaulttexturedir) .. "cdb_viewonline.png;" .. web_elem_name .. "]"
-		formspec[#formspec + 1] = "tooltip[" .. web_elem_name ..
-			fgettext("View more information in a web browser") .. tooltip_colors
-		formspec[#formspec + 1] = "container_end[]"
-
-		-- description
-		formspec[#formspec + 1] = "textarea[1.855,0.3;"
-		formspec[#formspec + 1] = tostring(description_width)
-		formspec[#formspec + 1] = ",0.8;;;"
-		formspec[#formspec + 1] = core.formspec_escape(package.short_description)
-		formspec[#formspec + 1] = "]"
-
-		formspec[#formspec + 1] = "container_end[]"
-	end
-
-	return table.concat(formspec)
-end
-
-function store.handle_submit(this, fields)
-	if fields.search or fields.key_enter_field == "search_string" then
-		search_string = fields.search_string:trim()
-		cur_page = 1
-		store.filter_packages(search_string)
-		return true
-	end
-
-	if fields.clear then
-		search_string = ""
-		cur_page = 1
-		store.filter_packages("")
-		return true
-	end
-
-	if fields.back then
-		this:delete()
-		return true
-	end
-
-	if fields.pstart then
-		cur_page = 1
-		return true
-	end
-
-	if fields.pend then
-		cur_page = this.data.pagemax
-		return true
-	end
-
-	if fields.pnext then
-		cur_page = cur_page + 1
-		if cur_page > this.data.pagemax then
-			cur_page = 1
-		end
-		return true
-	end
-
-	if fields.pback then
-		if cur_page == 1 then
-			cur_page = this.data.pagemax
-		else
-			cur_page = cur_page - 1
-		end
-		return true
-	end
-
-	if fields.type then
-		local new_type = table.indexof(filter_types_titles, fields.type)
-		if new_type ~= filter_type then
-			filter_type = new_type
-			cur_page = 1
-			store.filter_packages(search_string)
-			return true
-		end
-	end
-
-	if fields.update_all then
-		for i=1, #store.packages_full do
-			local package = store.packages_full[i]
-			if package.path and package.installed_release < package.release and
-					not (package.downloading or package.queued) then
-				queue_download(package, REASON_UPDATE)
-			end
-		end
-		return true
-	end
-
-	local start_idx = (cur_page - 1) * num_per_page + 1
-	assert(start_idx ~= nil)
-	for i=start_idx, math.min(#store.packages, start_idx+num_per_page-1) do
-		local package = store.packages[i]
-		assert(package)
-
-		if fields["install_" .. i] then
-			install_or_update_package(this, package)
-			return true
-		end
-
-		if fields["uninstall_" .. i] then
-			local dlg = create_delete_content_dlg(package)
-			dlg:set_parent(this)
-			this:hide()
-			dlg:show()
-			return true
-		end
-
-		if fields["view_" .. i] then
-			local url = ("%s/packages/%s?protocol_version=%d"):format(
-					core.settings:get("contentdb_url"), package.url_part,
-					core.get_max_supp_proto())
-			core.open_url(url)
-			return true
-		end
-	end
-
-	return false
-end
-
-function store.handle_events(event)
-	if event == "DialogShow" then
-		-- On mobile, don't show the "MINETEST" header behind the dialog.
-		mm_game_theme.set_engine(TOUCHSCREEN_GUI)
-
-		-- If the store is already loaded, auto-install packages here.
-		do_auto_install()
-
-		return true
-	end
-
-	return false
-end
-
---- Creates a ContentDB dialog.
----
---- @param type string | nil
---- Sets initial package filter. "game", "mod", "txp" or nil (no filter).
---- @param install_spec table | nil
---- ContentDB ID of package as returned by pkgmgr.get_contentdb_id().
---- Sets package to install or update automatically.
-function create_store_dlg(type, install_spec)
-	search_string = ""
-	cur_page = 1
-	if type then
-		-- table.indexof does not work on tables that contain `nil`
-		for i, v in pairs(filter_types_type) do
-			if v == type then
-				filter_type = i
-				break
-			end
-		end
-	else
-		filter_type = 1
-	end
-
-	-- Keep the old auto_install_spec if the caller doesn't specify one.
-	if install_spec then
-		auto_install_spec = install_spec
-	end
-
-	store.load()
-
-	return dialog_create("store",
-			store.get_formspec,
-			store.handle_submit,
-			store.handle_events)
-end
diff --git a/builtin/mainmenu/content/dlg_install.lua b/builtin/mainmenu/content/dlg_install.lua
new file mode 100644
index 000000000..0549e23be
--- /dev/null
+++ b/builtin/mainmenu/content/dlg_install.lua
@@ -0,0 +1,246 @@
+--Minetest
+--Copyright (C) 2018-24 rubenwardy
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+local function is_still_visible(dlg)
+	local this = ui.find_by_name("install_dialog")
+	return this == dlg and not dlg.hidden
+end
+
+
+local function get_loading_formspec()
+	local ENABLE_TOUCH = core.settings:get_bool("enable_touch")
+	local w = ENABLE_TOUCH and 14 or 7
+
+	local formspec = {
+		"formspec_version[3]",
+		"size[", w, ",9.05]",
+		ENABLE_TOUCH and "padding[0.01,0.01]" or "position[0.5,0.55]",
+		"label[3,4.525;", fgettext("Loading..."), "]",
+	}
+	return table.concat(formspec)
+end
+
+
+local function get_formspec(data)
+	if not data.has_hard_deps_ready then
+		return get_loading_formspec()
+	end
+
+	local selected_game, selected_game_idx = pkgmgr.find_by_gameid(core.settings:get("menu_last_game"))
+	if not selected_game_idx then
+		selected_game_idx = 1
+		selected_game = pkgmgr.games[1]
+	end
+
+	local game_list = {}
+	for i, game in ipairs(pkgmgr.games) do
+		game_list[i] = core.formspec_escape(game.title)
+	end
+
+	if not data.deps_ready[selected_game_idx] and
+			not data.deps_loading[selected_game_idx] then
+		data.deps_loading[selected_game_idx] = true
+
+		contentdb.resolve_dependencies(data.package, selected_game, function(deps)
+			if not is_still_visible(data.dlg) then
+				return
+			end
+			data.deps_ready[selected_game_idx] = deps
+			ui.update()
+		end)
+	end
+
+	-- The value of `data.deps_ready[selected_game_idx]` may have changed
+	-- since the last if statement since `contentdb.resolve_dependencies`
+	-- calls the callback immediately if the dependencies are already cached.
+	if not data.deps_ready[selected_game_idx] then
+		return get_loading_formspec()
+	end
+
+	local package = data.package
+	local will_install_deps = data.will_install_deps
+
+	local deps_to_install = 0
+	local deps_not_found = 0
+
+	data.deps_chosen = data.deps_ready[selected_game_idx]
+	local formatted_deps = {}
+	for _, dep in pairs(data.deps_chosen) do
+		formatted_deps[#formatted_deps + 1] = "#fff"
+		formatted_deps[#formatted_deps + 1] = core.formspec_escape(dep.name)
+		if dep.installed then
+			formatted_deps[#formatted_deps + 1] = "#ccf"
+			formatted_deps[#formatted_deps + 1] = fgettext("Already installed")
+		elseif dep.package then
+			formatted_deps[#formatted_deps + 1] = "#cfc"
+			formatted_deps[#formatted_deps + 1] = fgettext("$1 by $2", dep.package.title, dep.package.author)
+			deps_to_install = deps_to_install + 1
+		else
+			formatted_deps[#formatted_deps + 1] = "#f00"
+			formatted_deps[#formatted_deps + 1] = fgettext("Not found")
+			deps_not_found = deps_not_found + 1
+		end
+	end
+
+	local message_bg = "#3333"
+	local message
+	if will_install_deps then
+		message = fgettext("$1 and $2 dependencies will be installed.", package.title, deps_to_install)
+	else
+		message = fgettext("$1 will be installed, and $2 dependencies will be skipped.", package.title, deps_to_install)
+	end
+	if deps_not_found > 0 then
+		message = fgettext("$1 required dependencies could not be found.", deps_not_found) ..
+				" " .. fgettext("Please check that the base game is correct.", deps_not_found) ..
+				"\n" .. message
+		message_bg = mt_color_orange
+	end
+
+	local ENABLE_TOUCH = core.settings:get_bool("enable_touch")
+
+	local w = ENABLE_TOUCH and 14 or 7
+	local padded_w = w - 2*0.375
+	local dropdown_w = ENABLE_TOUCH and 10.2 or 4.25
+	local button_w = (padded_w - 0.25) / 3
+	local button_pad = button_w / 2
+
+	local formspec = {
+		"formspec_version[3]",
+		"size[", w, ",9.05]",
+		ENABLE_TOUCH and "padding[0.01,0.01]" or "position[0.5,0.55]",
+		"style[title;border=false]",
+		"box[0,0;", w, ",0.8;#3333]",
+		"button[0,0;", w, ",0.8;title;", fgettext("Install $1", package.title) , "]",
+
+		"container[0.375,1]",
+
+		"label[0,0.4;", fgettext("Base Game:"), "]",
+		"dropdown[", padded_w - dropdown_w, ",0;", dropdown_w, ",0.8;selected_game;",
+				table.concat(game_list, ","), ";", selected_game_idx, "]",
+
+		"label[0,1.1;", fgettext("Dependencies:"), "]",
+
+		"tablecolumns[color;text;color;text]",
+		"table[0,1.4;", padded_w, ",3;packages;", table.concat(formatted_deps, ","), "]",
+
+		"container_end[]",
+
+		"checkbox[0.375,5.7;will_install_deps;",
+		fgettext("Install missing dependencies"), ";",
+		will_install_deps and "true" or "false", "]",
+
+		"box[0,6;", w, ",1.8;", message_bg, "]",
+		"textarea[0.375,6.1;", padded_w, ",1.6;;;", message, "]",
+
+		"container[", 0.375 + button_pad, ",8.05]",
+		"button[0,0;", button_w, ",0.8;install_all;", fgettext("Install"), "]",
+		"button[", 0.25 + button_w, ",0;", button_w, ",0.8;cancel;", fgettext("Cancel"), "]",
+		"container_end[]",
+	}
+
+	return table.concat(formspec)
+end
+
+
+local function handle_submit(this, fields)
+	local data = this.data
+	if fields.cancel then
+		this:delete()
+		return true
+	end
+
+	if fields.will_install_deps ~= nil then
+		data.will_install_deps = core.is_yes(fields.will_install_deps)
+		return true
+	end
+
+	if fields.install_all then
+		contentdb.queue_download(data.package, contentdb.REASON_NEW)
+
+		if data.will_install_deps then
+			for _, dep in pairs(data.deps_chosen) do
+				if not dep.is_optional and not dep.installed and dep.package then
+					contentdb.queue_download(dep.package, contentdb.REASON_DEPENDENCY)
+				end
+			end
+		end
+
+		this:delete()
+		return true
+	end
+
+	if fields.selected_game then
+		for _, game in pairs(pkgmgr.games) do
+			if game.title == fields.selected_game then
+				core.settings:set("menu_last_game", game.id)
+				break
+			end
+		end
+		return true
+	end
+
+	return false
+end
+
+
+local function load_deps(dlg)
+	local package = dlg.data.package
+
+	contentdb.has_hard_deps(package, function(result)
+		if not is_still_visible(dlg) then
+			return
+		end
+
+		if result == nil then
+			local parent = dlg.parent
+			dlg:delete()
+			local dlg2 = messagebox("error_checking_deps",
+					fgettext("Error getting dependencies for package $1", package.url_part))
+			dlg2:set_parent(parent)
+			parent:hide()
+			dlg2:show()
+		elseif result == false then
+			contentdb.queue_download(package, package.path and contentdb.REASON_UPDATE or contentdb.REASON_NEW)
+			dlg:delete()
+		else
+			assert(result == true)
+			dlg.data.has_hard_deps_ready = true
+		end
+		ui.update()
+	end)
+end
+
+
+function create_install_dialog(package)
+	local dlg = dialog_create("install_dialog", get_formspec, handle_submit, nil)
+	dlg.data.deps_chosen = nil
+	dlg.data.package = package
+	dlg.data.will_install_deps = true
+
+	dlg.data.has_hard_deps_ready = false
+	dlg.data.deps_ready = {}
+	dlg.data.deps_loading = {}
+
+	dlg.load_deps = load_deps
+
+	-- `get_formspec` needs to access `dlg` to check whether it's still open.
+	-- It doesn't suffice to check that any "install_dialog" instance is open
+	-- via `ui.find_by_name`, it's necessary to check for this exact instance.
+	dlg.data.dlg = dlg
+
+	return dlg
+end
diff --git a/builtin/mainmenu/content/dlg_overwrite.lua b/builtin/mainmenu/content/dlg_overwrite.lua
new file mode 100644
index 000000000..7967cb48c
--- /dev/null
+++ b/builtin/mainmenu/content/dlg_overwrite.lua
@@ -0,0 +1,53 @@
+--Minetest
+--Copyright (C) 2018-24 rubenwardy
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+function get_formspec(data)
+	local package = data.package
+
+	return confirmation_formspec(
+			fgettext("\"$1\" already exists. Would you like to overwrite it?", package.name),
+			'install', fgettext("Overwrite"),
+			'cancel', fgettext("Cancel"))
+end
+
+
+local function handle_submit(this, fields)
+	local data = this.data
+	if fields.cancel then
+		this:delete()
+		return true
+	end
+
+	if fields.install then
+		this:delete()
+		data.callback()
+		return true
+	end
+
+	return false
+end
+
+
+function create_confirm_overwrite(package, callback)
+	assert(type(package) == "table")
+	assert(type(callback) == "function")
+
+	local dlg = dialog_create("data", get_formspec, handle_submit, nil)
+	dlg.data.package = package
+	dlg.data.callback = callback
+	return dlg
+end
diff --git a/builtin/mainmenu/content/init.lua b/builtin/mainmenu/content/init.lua
index 9b562fedc..e66828089 100644
--- a/builtin/mainmenu/content/init.lua
+++ b/builtin/mainmenu/content/init.lua
@@ -18,5 +18,9 @@
 local path = core.get_mainmenu_path() .. DIR_DELIM .. "content"
 
 dofile(path .. DIR_DELIM .. "pkgmgr.lua")
+dofile(path .. DIR_DELIM .. "contentdb.lua")
 dofile(path .. DIR_DELIM .. "update_detector.lua")
-dofile(path .. DIR_DELIM .. "dlg_contentstore.lua")
+dofile(path .. DIR_DELIM .. "screenshots.lua")
+dofile(path .. DIR_DELIM .. "dlg_install.lua")
+dofile(path .. DIR_DELIM .. "dlg_overwrite.lua")
+dofile(path .. DIR_DELIM .. "dlg_contentdb.lua")
diff --git a/builtin/mainmenu/content/pkgmgr.lua b/builtin/mainmenu/content/pkgmgr.lua
index 57eb7f890..c95c05c6e 100644
--- a/builtin/mainmenu/content/pkgmgr.lua
+++ b/builtin/mainmenu/content/pkgmgr.lua
@@ -110,7 +110,7 @@ pkgmgr = {}
 -- @param modpack      Currently processing modpack or nil/"" if none (recursion)
 function pkgmgr.get_mods(path, virtual_path, listing, modpack)
 	local mods = core.get_dir_list(path, true)
-
+	local added = {}
 	for _, name in ipairs(mods) do
 		if name:sub(1, 1) ~= "." then
 			local mod_path = path .. DIR_DELIM .. name
@@ -120,6 +120,7 @@ function pkgmgr.get_mods(path, virtual_path, listing, modpack)
 				parent_dir = path,
 			}
 			listing[#listing + 1] = toadd
+			added[#added + 1] = toadd
 
 			-- Get config file
 			local mod_conf
@@ -169,6 +170,8 @@ function pkgmgr.get_mods(path, virtual_path, listing, modpack)
 		end
 	end
 
+	pkgmgr.update_translations(added)
+
 	if not modpack then
 		-- Sort all when the recursion is done
 		table.sort(listing, function(a, b)
@@ -178,26 +181,31 @@ function pkgmgr.get_mods(path, virtual_path, listing, modpack)
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.get_texture_packs()
+function pkgmgr.reload_texture_packs()
 	local txtpath = core.get_texturepath()
 	local txtpath_system = core.get_texturepath_share()
 	local retval = {}
 
 	load_texture_packs(txtpath, retval)
+
 	-- on portable versions these two paths coincide. It avoids loading the path twice
 	if txtpath ~= txtpath_system then
 		load_texture_packs(txtpath_system, retval)
 	end
 
+	pkgmgr.update_translations(retval)
+
 	table.sort(retval, function(a, b)
 		return a.title:lower() < b.title:lower()
 	end)
 
-	return retval
+	pkgmgr.texture_packs = retval
 end
 
 --------------------------------------------------------------------------------
 function pkgmgr.get_all()
+	pkgmgr.load_all()
+
 	local result = {}
 
 	for _, mod in pairs(pkgmgr.global_mods:get_list()) do
@@ -206,7 +214,7 @@ function pkgmgr.get_all()
 	for _, game in pairs(pkgmgr.games) do
 		result[#result + 1] = game
 	end
-	for _, txp in pairs(pkgmgr.get_texture_packs()) do
+	for _, txp in pairs(pkgmgr.texture_packs) do
 		result[#result + 1] = txp
 	end
 
@@ -284,7 +292,7 @@ end
 function pkgmgr.render_packagelist(render_list, use_technical_names, with_icon)
 	if not render_list then
 		if not pkgmgr.global_mods then
-			pkgmgr.refresh_globals()
+			pkgmgr.reload_global_mods()
 		end
 		render_list = pkgmgr.global_mods
 	end
@@ -584,6 +592,7 @@ function pkgmgr.get_worldconfig(worldpath)
 end
 
 --------------------------------------------------------------------------------
+-- Caller is responsible for reloading content types (see reload_by_type)
 function pkgmgr.install_dir(expected_type, path, basename, targetpath)
 	assert(type(expected_type) == "string")
 	assert(type(path) == "string")
@@ -650,12 +659,6 @@ function pkgmgr.install_dir(expected_type, path, basename, targetpath)
 			fgettext_ne("Failed to install $1 to $2", basename, targetpath)
 	end
 
-	if basefolder.type == "game" then
-		pkgmgr.update_gamelist()
-	else
-		pkgmgr.refresh_globals()
-	end
-
 	return targetpath, nil
 end
 
@@ -777,7 +780,7 @@ function pkgmgr.comparemod(elem1,elem2)
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.refresh_globals()
+function pkgmgr.reload_global_mods()
 	local function is_equal(element,uid) --uid match
 		if element.name == uid then
 			return true
@@ -809,11 +812,60 @@ function pkgmgr.get_game_mods(gamespec, retval)
 end
 
 --------------------------------------------------------------------------------
-function pkgmgr.update_gamelist()
+function pkgmgr.reload_games()
 	pkgmgr.games = core.get_games()
 	table.sort(pkgmgr.games, function(a, b)
 		return a.title:lower() < b.title:lower()
 	end)
+	pkgmgr.update_translations(pkgmgr.games)
+end
+
+--------------------------------------------------------------------------------
+function pkgmgr.reload_by_type(type)
+	if type == "game" then
+		pkgmgr.reload_games()
+	elseif type == "txp" then
+		pkgmgr.reload_texture_packs()
+	elseif type == "mod" or type == "modpack" then
+		pkgmgr.reload_global_mods()
+	else
+		error("Unknown package type: " .. type)
+	end
+end
+
+--------------------------------------------------------------------------------
+function pkgmgr.load_all()
+	if not pkgmgr.global_mods then
+		pkgmgr.reload_global_mods()
+	end
+	if not pkgmgr.games then
+		pkgmgr.reload_games()
+	end
+	if not pkgmgr.texture_packs then
+		pkgmgr.reload_texture_packs()
+	end
+end
+
+--------------------------------------------------------------------------------
+function pkgmgr.update_translations(list)
+	for _, item in ipairs(list) do
+		local info = core.get_content_info(item.path)
+		assert(info.path)
+		assert(info.textdomain)
+
+		assert(not item.is_translated)
+		item.is_translated = true
+
+		if info.title and info.title ~= "" then
+			item.title = core.get_content_translation(info.path, info.textdomain,
+				core.translate(info.textdomain, info.title))
+		end
+
+		if info.description and info.description ~= "" then
+			item.description = core.get_content_translation(info.path, info.textdomain,
+				core.translate(info.textdomain, info.description))
+		end
+	end
 end
 
 --------------------------------------------------------------------------------
@@ -843,4 +895,4 @@ end
 --------------------------------------------------------------------------------
 -- read initial data
 --------------------------------------------------------------------------------
-pkgmgr.update_gamelist()
+pkgmgr.reload_games()
diff --git a/builtin/mainmenu/content/screenshots.lua b/builtin/mainmenu/content/screenshots.lua
new file mode 100644
index 000000000..98c6658b9
--- /dev/null
+++ b/builtin/mainmenu/content/screenshots.lua
@@ -0,0 +1,78 @@
+--Minetest
+--Copyright (C) 2023-24 rubenwardy
+--
+--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
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+-- Screenshot
+local screenshot_dir = core.get_cache_path() .. DIR_DELIM .. "cdb"
+assert(core.create_dir(screenshot_dir))
+local screenshot_downloading = {}
+local screenshot_downloaded = {}
+
+
+local function get_file_extension(path)
+	local parts = path:split(".")
+	return parts[#parts]
+end
+
+
+function get_screenshot(package)
+	if not package.thumbnail then
+		return defaulttexturedir .. "no_screenshot.png"
+	elseif screenshot_downloading[package.thumbnail] then
+		return defaulttexturedir .. "loading_screenshot.png"
+	end
+
+	-- Get tmp screenshot path
+	local ext = get_file_extension(package.thumbnail)
+	local filepath = screenshot_dir .. DIR_DELIM ..
+			("%s-%s-%s.%s"):format(package.type, package.author, package.name, ext)
+
+	-- Return if already downloaded
+	local file = io.open(filepath, "r")
+	if file then
+		file:close()
+		return filepath
+	end
+
+	-- Show error if we've failed to download before
+	if screenshot_downloaded[package.thumbnail] then
+		return defaulttexturedir .. "error_screenshot.png"
+	end
+
+	-- Download
+
+	local function download_screenshot(params)
+		return core.download_file(params.url, params.dest)
+	end
+	local function callback(success)
+		screenshot_downloading[package.thumbnail] = nil
+		screenshot_downloaded[package.thumbnail] = true
+		if not success then
+			core.log("warning", "Screenshot download failed for some reason")
+		end
+		ui.update()
+	end
+	if core.handle_async(download_screenshot,
+			{ dest = filepath, url = package.thumbnail }, callback) then
+		screenshot_downloading[package.thumbnail] = true
+	else
+		core.log("error", "ERROR: async event failed")
+		return defaulttexturedir .. "error_screenshot.png"
+	end
+
+	return defaulttexturedir .. "loading_screenshot.png"
+end
diff --git a/builtin/mainmenu/content/tests/pkgmgr_spec.lua b/builtin/mainmenu/content/tests/pkgmgr_spec.lua
index 37c1bb784..ccadde38c 100644
--- a/builtin/mainmenu/content/tests/pkgmgr_spec.lua
+++ b/builtin/mainmenu/content/tests/pkgmgr_spec.lua
@@ -46,6 +46,9 @@ local function reset()
 	function core.get_texturepath()
 		return txp_dir
 	end
+	function core.get_texturepath_share()
+		return txp_dir
+	end
 	function core.get_modpath()
 		return mods_dir
 	end
@@ -59,13 +62,6 @@ local function reset()
 	setfenv(loadfile("builtin/common/misc_helpers.lua"), env)()
 	setfenv(loadfile("builtin/mainmenu/content/pkgmgr.lua"), env)()
 
-	function env.pkgmgr.update_gamelist()
-		table.insert(calls, { "update_gamelist" })
-	end
-	function env.pkgmgr.refresh_globals()
-		table.insert(calls, { "refresh_globals" })
-	end
-
 	function env.assert_calls(list)
 		assert.are.same(list, calls)
 	end
@@ -113,7 +109,6 @@ describe("install_dir", function()
 		env.assert_calls({
 			{ "delete_dir", mods_dir .. "/mymod" },
 			{ "copy_dir", "/tmp/123", mods_dir .. "/mymod", false },
-			{ "refresh_globals" },
 		})
 	end)
 
@@ -129,7 +124,6 @@ describe("install_dir", function()
 		env.assert_calls({
 			{ "delete_dir", mods_dir .. "/mymod" },
 			{ "copy_dir", "/tmp/123", mods_dir .. "/mymod", false },
-			{ "refresh_globals" },
 		})
 	end)
 
@@ -145,7 +139,6 @@ describe("install_dir", function()
 		env.assert_calls({
 			{ "delete_dir", games_dir .. "/mygame" },
 			{ "copy_dir", "/tmp/123", games_dir .. "/mygame", false },
-			{ "update_gamelist" },
 		})
 	end)
 
@@ -161,7 +154,6 @@ describe("install_dir", function()
 		env.assert_calls({
 			{ "delete_dir", mods_dir .. "/123" },
 			{ "copy_dir", "/tmp/123", mods_dir .. "/123", false },
-			{ "refresh_globals" },
 		})
 	end)
 
@@ -188,7 +180,6 @@ describe("install_dir", function()
 		env.assert_calls({
 			{ "delete_dir", "/tmp/alt-target" },
 			{ "copy_dir", "/tmp/123", "/tmp/alt-target", false },
-			{ "refresh_globals" },
 		})
 	end)
 
@@ -238,6 +229,5 @@ describe("install_dir", function()
 		path, message = env.pkgmgr.install_dir("txp", "/tmp/123", "name", nil)
 		assert.is._not._nil(path)
 		assert.is._nil(message)
-
 	end)
 end)
diff --git a/builtin/mainmenu/content/update_detector.lua b/builtin/mainmenu/content/update_detector.lua
index d184272e4..1f8672bba 100644
--- a/builtin/mainmenu/content/update_detector.lua
+++ b/builtin/mainmenu/content/update_detector.lua
@@ -26,8 +26,25 @@ if not core.get_http_api then
 end
 
 
+assert(core.create_dir(core.get_cache_path() .. DIR_DELIM .. "cdb"))
+local cache_file_path = core.get_cache_path() .. DIR_DELIM .. "cdb" .. DIR_DELIM .. "updates.json"
 local has_fetched = false
 local latest_releases
+do
+	if check_cache_age("cdb_updates_last_checked", 24 * 3600) then
+		local f = io.open(cache_file_path, "r")
+		local data = ""
+		if f then
+			data = f:read("*a")
+			f:close()
+		end
+		data = data ~= "" and core.parse_json(data) or nil
+		if type(data) == "table" then
+			latest_releases = data
+			has_fetched = true
+		end
+	end
+end
 
 
 local function fetch_latest_releases()
@@ -55,9 +72,6 @@ end
 
 
 local function has_packages_from_cdb()
-	pkgmgr.refresh_globals()
-	pkgmgr.update_gamelist()
-
 	for _, content in pairs(pkgmgr.get_all()) do
 		if pkgmgr.get_contentdb_id(content) then
 			return true
@@ -89,8 +103,10 @@ local function fetch()
 			has_fetched = false
 			return
 		end
-
 		latest_releases = lowercase_keys(releases)
+		core.safe_file_write(cache_file_path, core.write_json(latest_releases))
+		cache_settings:set("cdb_updates_last_checked", tostring(os.time()))
+
 		if update_detector.get_count() > 0 then
 			local maintab = ui.find_by_name("maintab")
 			if not maintab.hidden then
@@ -108,9 +124,6 @@ function update_detector.get_all()
 		return {}
 	end
 
-	pkgmgr.refresh_globals()
-	pkgmgr.update_gamelist()
-
 	local ret = {}
 	local all_content = pkgmgr.get_all()
 	for _, content in ipairs(all_content) do
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index b6d12e5fb..53d6af142 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -341,7 +341,7 @@ local function handle_buttons(this, fields)
 	if fields.btn_config_world_cdb then
 		this.data.list = nil
 
-		local dlg = create_store_dlg("mod")
+		local dlg = create_contentdb_dlg("mod")
 		dlg:set_parent(this)
 		this:hide()
 		dlg:show()
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 4e28487ab..3772207ad 100644
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -86,6 +86,8 @@ local flag_checkboxes = {
 		{ "trees", fgettext("Trees and jungle grass") },
 		{ "flat", fgettext("Flat terrain") },
 		{ "mudflow", fgettext("Mud flow"), fgettext("Terrain surface erosion") },
+		{ "temples", fgettext("Desert temples"),
+		fgettext("Different dungeon variant generated in desert biomes (only if dungeons enabled)") },
 		-- Biome settings are in mgv6_biomes below
 	},
 }
@@ -297,7 +299,7 @@ local function create_world_formspec(dialogdata)
 	end
 
 	local retval =
-		"size[12.25,7,true]" ..
+		"size[12.25,7.4,true]" ..
 
 		-- Left side
 		"container[0,0]"..
@@ -339,8 +341,10 @@ local function create_world_formspec(dialogdata)
 		"container_end[]"..
 
 		-- Menu buttons
-		"button[3.25,6.5;3,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
-		"button[6.25,6.5;3,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]"
+		"container[0,6.9]"..
+		"button[3.25,0;3,0.5;world_create_confirm;" .. fgettext("Create") .. "]" ..
+		"button[6.25,0;3,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" ..
+		"container_end[]"
 
 	return retval
 
@@ -349,7 +353,7 @@ end
 local function create_world_buttonhandler(this, fields)
 
 	if fields["world_create_open_cdb"] then
-		local dlg = create_store_dlg("game")
+		local dlg = create_contentdb_dlg("game")
 		dlg:set_parent(this.parent)
 		this:delete()
 		this.parent:hide()
diff --git a/builtin/mainmenu/dlg_delete_content.lua b/builtin/mainmenu/dlg_delete_content.lua
index 1a6178acc..98e15bf01 100644
--- a/builtin/mainmenu/dlg_delete_content.lua
+++ b/builtin/mainmenu/dlg_delete_content.lua
@@ -37,11 +37,7 @@ local function delete_content_buttonhandler(this, fields)
 				gamedata.errormessage = fgettext_ne("pkgmgr: failed to delete \"$1\"", this.data.content.path)
 			end
 
-			if this.data.content.type == "game" then
-				pkgmgr.update_gamelist()
-			else
-				pkgmgr.refresh_globals()
-			end
+			pkgmgr.reload_by_type(this.data.content.type)
 		else
 			gamedata.errormessage = fgettext_ne("pkgmgr: invalid path \"$1\"", this.data.content.path)
 		end
diff --git a/builtin/mainmenu/dlg_reinstall_mtg.lua b/builtin/mainmenu/dlg_reinstall_mtg.lua
index 77652e968..685847024 100644
--- a/builtin/mainmenu/dlg_reinstall_mtg.lua
+++ b/builtin/mainmenu/dlg_reinstall_mtg.lua
@@ -15,15 +15,30 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+---- IMPORTANT ----
+-- This whole file can be removed after a while.
+-- It was only directly useful for upgrades from 5.7.0 to 5.8.0, but
+-- maybe some odd fellow directly upgrades from 5.6.1 to 5.9.0 in the future...
+-- see <https://github.com/minetest/minetest/pull/13850> in case it's not obvious
+---- ----
+
+local SETTING_NAME = "no_mtg_notification"
+
 function check_reinstall_mtg()
-	if core.settings:get_bool("no_mtg_notification") then
+	-- used to be in minetest.conf
+	if core.settings:get_bool(SETTING_NAME) then
+		cache_settings:set_bool(SETTING_NAME, true)
+		core.settings:remove(SETTING_NAME)
+	end
+
+	if cache_settings:get_bool(SETTING_NAME) then
 		return
 	end
 
 	local games = core.get_games()
 	for _, game in ipairs(games) do
 		if game.id == "minetest" then
-			core.settings:set_bool("no_mtg_notification", true)
+			cache_settings:set_bool(SETTING_NAME, true)
 			return
 		end
 	end
@@ -37,7 +52,7 @@ function check_reinstall_mtg()
 		end
 	end
 	if not mtg_world_found then
-		core.settings:set_bool("no_mtg_notification", true)
+		cache_settings:set_bool(SETTING_NAME, true)
 		return
 	end
 
@@ -78,7 +93,7 @@ local function buttonhandler(this, fields)
 
 		local maintab = ui.find_by_name("maintab")
 
-		local dlg = create_store_dlg(nil, "minetest/minetest")
+		local dlg = create_contentdb_dlg(nil, "minetest/minetest")
 		dlg:set_parent(maintab)
 		maintab:hide()
 		dlg:show()
@@ -87,7 +102,7 @@ local function buttonhandler(this, fields)
 	end
 
 	if fields.dismiss then
-		core.settings:set_bool("no_mtg_notification", true)
+		cache_settings:set_bool("no_mtg_notification", true)
 		this:delete()
 		return true
 	end
@@ -111,5 +126,3 @@ function create_reinstall_mtg_dlg()
 			buttonhandler, eventhandler)
 	return dlg
 end
-
-
diff --git a/builtin/mainmenu/dlg_rename_modpack.lua b/builtin/mainmenu/dlg_rename_modpack.lua
index ca76a8cbe..884140eb3 100644
--- a/builtin/mainmenu/dlg_rename_modpack.lua
+++ b/builtin/mainmenu/dlg_rename_modpack.lua
@@ -45,7 +45,7 @@ local function rename_modpack_buttonhandler(this, fields)
 		local oldpath = this.data.mod.path
 		local targetpath = this.data.mod.parent_dir .. DIR_DELIM .. fields["te_modpack_name"]
 		os.rename(oldpath, targetpath)
-		pkgmgr.refresh_globals()
+		pkgmgr.reload_global_mods()
 		pkgmgr.selected_mod = pkgmgr.global_mods:get_current_index(
 			pkgmgr.global_mods:raw_index_by_uid(fields["te_modpack_name"]))
 
diff --git a/builtin/mainmenu/dlg_version_info.lua b/builtin/mainmenu/dlg_version_info.lua
index 98085ee4a..483cd30bd 100644
--- a/builtin/mainmenu/dlg_version_info.lua
+++ b/builtin/mainmenu/dlg_version_info.lua
@@ -51,12 +51,13 @@ end
 local function version_info_buttonhandler(this, fields)
 	if fields.version_check_remind then
 		-- Erase last known, user will be reminded again at next check
-		core.settings:set("update_last_known", "")
+		cache_settings:set("update_last_known", "")
 		this:delete()
 		return true
 	end
 	if fields.version_check_never then
-		core.settings:set("update_last_checked", "disabled")
+		-- clear checked URL
+		core.settings:set("update_information_url", "")
 		this:delete()
 		return true
 	end
@@ -116,7 +117,7 @@ local function on_version_info_received(json)
 		return
 	end
 
-	local known_update = tonumber(core.settings:get("update_last_known")) or 0
+	local known_update = tonumber(cache_settings:get("update_last_known")) or 0
 
 	-- Format: MMNNPPP (Major, Minor, Patch)
 	local new_number = type(json.latest) == "table" and json.latest.version_code
@@ -135,7 +136,7 @@ local function on_version_info_received(json)
 		return
 	end
 
-	core.settings:set("update_last_known", tostring(new_number))
+	cache_settings:set("update_last_known", tostring(new_number))
 
 	-- Show version info dialog (once)
 	maintab:hide()
@@ -149,20 +150,20 @@ end
 
 function check_new_version()
 	local url = core.settings:get("update_information_url")
-	if core.settings:get("update_last_checked") == "disabled" or
-			url == "" then
+	if url == "" then
 		-- Never show any updates
 		return
 	end
 
-	local time_now = os.time()
-	local time_checked = tonumber(core.settings:get("update_last_checked")) or 0
-	if time_now - time_checked < 2 * 24 * 3600 then
-		-- Check interval of 2 entire days
+	-- every 2 days
+	if check_cache_age("update_last_checked", 2 * 24 * 3600) then
 		return
 	end
+	cache_settings:set("update_last_checked", tostring(os.time()))
 
-	core.settings:set("update_last_checked", tostring(time_now))
+	-- Clean old leftovers (this can be removed after 5.9.0 or so)
+	core.settings:remove("update_last_checked")
+	core.settings:remove("update_last_known")
 
 	core.handle_async(function(params)
 		local http = core.get_http_api()
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 9039e76e4..b7fc28d5f 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -28,8 +28,6 @@ local basepath = core.get_builtin_path()
 defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" ..
 					DIR_DELIM .. "pack" .. DIR_DELIM
 
-dofile(menupath .. DIR_DELIM .. "misc.lua")
-
 dofile(basepath .. "common" .. DIR_DELIM .. "filterlist.lua")
 dofile(basepath .. "fstk" .. DIR_DELIM .. "buttonbar.lua")
 dofile(basepath .. "fstk" .. DIR_DELIM .. "dialog.lua")
diff --git a/builtin/mainmenu/misc.lua b/builtin/mainmenu/misc.lua
deleted file mode 100644
index 0677e96a3..000000000
--- a/builtin/mainmenu/misc.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-
--- old non-method sound function
-
-function core.sound_stop(handle, ...)
-	return handle:stop(...)
-end
diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua
index c6cecea35..92a3c4107 100644
--- a/builtin/mainmenu/serverlistmgr.lua
+++ b/builtin/mainmenu/serverlistmgr.lua
@@ -17,7 +17,7 @@
 
 serverlistmgr = {
 	-- continent code we detected for ourselves
-	my_continent = core.get_once("continent"),
+	my_continent = nil,
 
 	-- list of locally favorites servers
 	favorites = nil,
@@ -26,6 +26,15 @@ serverlistmgr = {
 	servers = nil,
 }
 
+do
+	if check_cache_age("geoip_last_checked", 3600) then
+		local tmp = cache_settings:get("geoip") or ""
+		if tmp:match("^[A-Z][A-Z]$") then
+			serverlistmgr.my_continent = tmp
+		end
+	end
+end
+
 --------------------------------------------------------------------------------
 -- Efficient data structure for normalizing arbitrary scores attached to objects
 -- e.g. {{"a", 3.14}, {"b", 3.14}, {"c", 20}, {"d", 0}}
@@ -71,7 +80,8 @@ local WEIGHT_SORT = 2
 -- how much the estimated latency contributes to the final ranking
 local WEIGHT_LATENCY = 1
 
-local function order_server_list(list)
+--- @param list of servers, will be modified.
+local function order_server_list_internal(list)
 	-- calculate the scores
 	local s1 = Normalizer:new()
 	local s2 = Normalizer:new()
@@ -90,28 +100,58 @@ local function order_server_list(list)
 	s1 = s1:calc()
 	s2 = s2:calc()
 
-	-- make a shallow copy and pre-calculate ordering
-	local res, order = {}, {}
-	for i = 1, #list do
-		local fav = list[i]
-		res[i] = fav
-
-		local n = s1[fav] * WEIGHT_SORT + s2[fav] * WEIGHT_LATENCY
-		order[fav] = n
+	-- pre-calculate ordering
+	local order = {}
+	for _, fav in ipairs(list) do
+		order[fav] = s1[fav] * WEIGHT_SORT + s2[fav] * WEIGHT_LATENCY
 	end
 
 	-- now sort the list
-	table.sort(res, function(fav1, fav2)
+	table.sort(list, function(fav1, fav2)
 		return order[fav1] > order[fav2]
 	end)
+end
 
-	return res
+local function order_server_list(list)
+	-- split the list into two parts and sort them separately, to keep empty
+	-- servers at the bottom.
+	local nonempty, empty = {}, {}
+
+	for _, fav in ipairs(list) do
+		if (fav.clients or 0) > 0 then
+			table.insert(nonempty, fav)
+		else
+			table.insert(empty, fav)
+		end
+	end
+
+	order_server_list_internal(nonempty)
+	order_server_list_internal(empty)
+
+	table.insert_all(nonempty, empty)
+	return nonempty
 end
 
 local public_downloading = false
 local geoip_downloading = false
 
 --------------------------------------------------------------------------------
+local function fetch_geoip()
+	local http = core.get_http_api()
+	local url = core.settings:get("serverlist_url") .. "/geoip"
+
+	local response = http.fetch_sync({ url = url })
+	if not response.succeeded then
+		return
+	end
+
+	local retval = core.parse_json(response.data)
+	if type(retval) ~= "table" then
+		return
+	end
+	return type(retval.continent) == "string" and retval.continent
+end
+
 function serverlistmgr.sync()
 	core.ask_lan_servers()
 
@@ -131,37 +171,23 @@ function serverlistmgr.sync()
 		return
 	end
 
-	-- only fetched once per MT instance
 	if not serverlistmgr.my_continent and not geoip_downloading then
 		geoip_downloading = true
-		core.handle_async(
-			function(param)
-				local http = core.get_http_api()
-				local url = core.settings:get("serverlist_url") .. "/geoip"
-
-				local response = http.fetch_sync({ url = url })
-				if not response.succeeded then
-					return
-				end
-
-				local retval = core.parse_json(response.data)
-				return retval and type(retval.continent) == "string" and retval.continent
-			end,
-			nil,
-			function(result)
-				geoip_downloading = false
-				if not result then
-					return
-				end
-				serverlistmgr.my_continent = result
-				core.set_once("continent", result)
-				-- reorder list if we already have it
-				if serverlistmgr.servers then
-					serverlistmgr.servers = order_server_list(serverlistmgr.servers)
-					core.event_handler("Refresh")
-				end
+		core.handle_async(fetch_geoip, nil, function(result)
+			geoip_downloading = false
+			if not result then
+				return
 			end
-		)
+			serverlistmgr.my_continent = result
+			cache_settings:set("geoip", result)
+			cache_settings:set("geoip_last_checked", tostring(os.time()))
+
+			-- re-sort list if applicable
+			if serverlistmgr.servers then
+				serverlistmgr.servers = order_server_list(serverlistmgr.servers)
+				core.event_handler("Refresh")
+			end
+		end)
 	end
 
 	if public_downloading then
@@ -169,6 +195,7 @@ function serverlistmgr.sync()
 	end
 	public_downloading = true
 
+	-- note: this isn't cached because it's way too dynamic
 	core.handle_async(
 		function(param)
 			local http = core.get_http_api()
diff --git a/builtin/mainmenu/settings/components.lua b/builtin/mainmenu/settings/components.lua
index 51cc0c95b..bfe64285c 100644
--- a/builtin/mainmenu/settings/components.lua
+++ b/builtin/mainmenu/settings/components.lua
@@ -306,17 +306,36 @@ function make.flags(setting)
 				"label[0,0.1;" .. get_label(setting) .. "]",
 			}
 
-			local value = core.settings:get(setting.name) or setting.default
 			self.resettable = core.settings:has(setting.name)
 
 			checkboxes = {}
-			for _, name in ipairs(value:split(",")) do
-				name = name:trim()
-				if name:sub(1, 2) == "no" then
-					checkboxes[name:sub(3)] = false
-				elseif name ~= "" then
-					checkboxes[name] = true
+			for _, name in ipairs(setting.possible) do
+				checkboxes[name] = false
+			end
+			local function apply_flags(flag_string, what)
+				local prefixed_flags = {}
+				for _, name in ipairs(flag_string:split(",")) do
+					prefixed_flags[name:trim()] = true
 				end
+				for _, name in ipairs(setting.possible) do
+					local enabled = prefixed_flags[name]
+					local disabled = prefixed_flags["no" .. name]
+					if enabled and disabled then
+						core.log("warning", "Flag " .. name .. " in " .. what .. " " ..
+								setting.name .. " both enabled and disabled, ignoring")
+					elseif enabled then
+						checkboxes[name] = true
+					elseif disabled then
+						checkboxes[name] = false
+					end
+				end
+			end
+			-- First apply the default, which is necessary since flags
+			-- which are not overridden may be missing from the value.
+			apply_flags(setting.default, "default for setting")
+			local value = core.settings:get(setting.name)
+			if value then
+				apply_flags(value, "setting")
 			end
 
 			local columns = math.max(math.floor(avail_w / 2.5), 1)
@@ -325,18 +344,16 @@ function make.flags(setting)
 			local y = 0.55
 
 			for _, possible in ipairs(setting.possible) do
-				if possible:sub(1, 2) ~= "no" then
-					if x >= avail_w then
-						x = 0
-						y = y + 0.5
-					end
-
-					local is_checked = checkboxes[possible]
-					fs[#fs + 1] = ("checkbox[%f,%f;%s;%s;%s]"):format(
-						x, y, setting.name .. "_" .. possible,
-						core.formspec_escape(possible), tostring(is_checked))
-					x = x + column_width
+				if x >= avail_w then
+					x = 0
+					y = y + 0.5
 				end
+
+				local is_checked = checkboxes[possible]
+				fs[#fs + 1] = ("checkbox[%f,%f;%s;%s;%s]"):format(
+					x, y, setting.name .. "_" .. possible,
+					core.formspec_escape(possible), tostring(is_checked))
+				x = x + column_width
 			end
 
 			return table.concat(fs, ""), y + 0.25
@@ -355,12 +372,10 @@ function make.flags(setting)
 			if changed then
 				local values = {}
 				for _, name in ipairs(setting.possible) do
-					if name:sub(1, 2) ~= "no" then
-						if checkboxes[name] then
-							table.insert(values, name)
-						else
-							table.insert(values, "no" .. name)
-						end
+					if checkboxes[name] then
+						table.insert(values, name)
+					else
+						table.insert(values, "no" .. name)
 					end
 				end
 
diff --git a/builtin/mainmenu/settings/dlg_settings.lua b/builtin/mainmenu/settings/dlg_settings.lua
index 01ff2dcb0..73a72769b 100644
--- a/builtin/mainmenu/settings/dlg_settings.lua
+++ b/builtin/mainmenu/settings/dlg_settings.lua
@@ -22,16 +22,27 @@ local component_funcs =  dofile(core.get_mainmenu_path() .. DIR_DELIM ..
 local shadows_component =  dofile(core.get_mainmenu_path() .. DIR_DELIM ..
 		"settings" .. DIR_DELIM .. "shadows_component.lua")
 
-
-local full_settings = settingtypes.parse_config_file(false, true)
+local loaded = false
+local full_settings
 local info_icon_path = core.formspec_escape(defaulttexturedir .. "settings_info.png")
 local reset_icon_path = core.formspec_escape(defaulttexturedir .. "settings_reset.png")
-
 local all_pages = {}
 local page_by_id = {}
 local filtered_pages = all_pages
 local filtered_page_by_id = page_by_id
 
+
+local function get_setting_info(name)
+	for _, entry in ipairs(full_settings) do
+		if entry.type ~= "category" and entry.name == name then
+			return entry
+		end
+	end
+
+	return nil
+end
+
+
 local function add_page(page)
 	assert(type(page.id) == "string")
 	assert(type(page.title) == "string")
@@ -46,49 +57,6 @@ local function add_page(page)
 end
 
 
-local change_keys = {
-	query_text = "Change Keys",
-	requires = {
-		keyboard_mouse = true,
-	},
-	get_formspec = function(self, avail_w)
-		local btn_w = math.min(avail_w, 3)
-		return ("button[0,0;%f,0.8;btn_change_keys;%s]"):format(btn_w, fgettext("Change Keys")), 0.8
-	end,
-	on_submit = function(self, fields)
-		if fields.btn_change_keys then
-			core.show_keys_menu()
-		end
-	end,
-}
-
-
-add_page({
-	id = "accessibility",
-	title = fgettext_ne("Accessibility"),
-	content = {
-		"language",
-		{ heading = fgettext_ne("General") },
-		"font_size",
-		"chat_font_size",
-		"gui_scaling",
-		"hud_scaling",
-		"show_nametag_backgrounds",
-		{ heading = fgettext_ne("Chat") },
-		"console_height",
-		"console_alpha",
-		"console_color",
-		{ heading = fgettext_ne("Controls") },
-		"autojump",
-		"safe_dig_and_place",
-		{ heading = fgettext_ne("Movement") },
-		"arm_inertia",
-		"view_bobbing_amount",
-		"fall_bobbing_amount",
-	},
-})
-
-
 local function load_settingtypes()
 	local page = nil
 	local section = nil
@@ -129,94 +97,134 @@ local function load_settingtypes()
 		end
 	end
 end
-load_settingtypes()
-
-table.insert(page_by_id.controls_keyboard_and_mouse.content, 1, change_keys)
-do
-	local content = page_by_id.graphics_and_audio_shaders.content
-	local idx = table.indexof(content, "enable_dynamic_shadows")
-	table.insert(content, idx, shadows_component)
-end
 
 
-local function get_setting_info(name)
-	for _, entry in ipairs(full_settings) do
-		if entry.type ~= "category" and entry.name == name then
-			return entry
-		end
+local function load()
+	if loaded then
+		return
+	end
+	loaded = true
+
+	full_settings = settingtypes.parse_config_file(false, true)
+
+	local change_keys = {
+		query_text = "Controls",
+		requires = {
+			keyboard_mouse = true,
+		},
+		get_formspec = function(self, avail_w)
+			local btn_w = math.min(avail_w, 3)
+			return ("button[0,0;%f,0.8;btn_change_keys;%s]"):format(btn_w, fgettext("Controls")), 0.8
+		end,
+		on_submit = function(self, fields)
+			if fields.btn_change_keys then
+				core.show_keys_menu()
+			end
+		end,
+	}
+
+	add_page({
+		id = "accessibility",
+		title = fgettext_ne("Accessibility"),
+		content = {
+			"language",
+			{ heading = fgettext_ne("General") },
+			"font_size",
+			"chat_font_size",
+			"gui_scaling",
+			"hud_scaling",
+			"show_nametag_backgrounds",
+			{ heading = fgettext_ne("Chat") },
+			"console_height",
+			"console_alpha",
+			"console_color",
+			{ heading = fgettext_ne("Controls") },
+			"autojump",
+			"safe_dig_and_place",
+			{ heading = fgettext_ne("Movement") },
+			"arm_inertia",
+			"view_bobbing_amount",
+			"fall_bobbing_amount",
+		},
+	})
+
+	load_settingtypes()
+
+	table.insert(page_by_id.controls_keyboard_and_mouse.content, 1, change_keys)
+	do
+		local content = page_by_id.graphics_and_audio_shaders.content
+		local idx = table.indexof(content, "enable_dynamic_shadows")
+		table.insert(content, idx, shadows_component)
 	end
 
-	return nil
+	-- These must not be translated, as they need to show in the local
+	-- language no matter the user's current language.
+	-- This list must be kept in sync with src/unsupported_language_list.txt.
+	get_setting_info("language").option_labels = {
+		[""] = fgettext_ne("(Use system language)"),
+		--ar = " [ar]", blacklisted
+		be = "Беларуская [be]",
+		bg = "Български [bg]",
+		ca = "Català [ca]",
+		cs = "Česky [cs]",
+		cy = "Cymraeg [cy]",
+		da = "Dansk [da]",
+		de = "Deutsch [de]",
+		--dv = " [dv]", blacklisted
+		el = "Ελληνικά [el]",
+		en = "English [en]",
+		eo = "Esperanto [eo]",
+		es = "Español [es]",
+		et = "Eesti [et]",
+		eu = "Euskara [eu]",
+		fi = "Suomi [fi]",
+		fil = "Wikang Filipino [fil]",
+		fr = "Français [fr]",
+		gd = "Gàidhlig [gd]",
+		gl = "Galego [gl]",
+		--he = " [he]", blacklisted
+		--hi = " [hi]", blacklisted
+		hu = "Magyar [hu]",
+		id = "Bahasa Indonesia [id]",
+		it = "Italiano [it]",
+		ja = "日本語 [ja]",
+		jbo = "Lojban [jbo]",
+		kk = "Қазақша [kk]",
+		--kn = " [kn]", blacklisted
+		ko = "한국어 [ko]",
+		ky = "Kırgızca / Кыргызча [ky]",
+		lt = "Lietuvių [lt]",
+		lv = "Latviešu [lv]",
+		mn = "Монгол [mn]",
+		mr = "मराठी [mr]",
+		ms = "Bahasa Melayu [ms]",
+		--ms_Arab = " [ms_Arab]", blacklisted
+		nb = "Norsk Bokmål [nb]",
+		nl = "Nederlands [nl]",
+		nn = "Norsk Nynorsk [nn]",
+		oc = "Occitan [oc]",
+		pl = "Polski [pl]",
+		pt = "Português [pt]",
+		pt_BR = "Português do Brasil [pt_BR]",
+		ro = "Română [ro]",
+		ru = "Русский [ru]",
+		sk = "Slovenčina [sk]",
+		sl = "Slovenščina [sl]",
+		sr_Cyrl = "Српски [sr_Cyrl]",
+		sr_Latn = "Srpski (Latinica) [sr_Latn]",
+		sv = "Svenska [sv]",
+		sw = "Kiswahili [sw]",
+		--th = " [th]", blacklisted
+		tr = "Türkçe [tr]",
+		tt = "Tatarça [tt]",
+		uk = "Українська [uk]",
+		vi = "Tiếng Việt [vi]",
+		zh_CN = "中文 (简体) [zh_CN]",
+		zh_TW = "正體中文 (繁體) [zh_TW]",
+	}
 end
 
 
--- These must not be translated, as they need to show in the local
--- language no matter the user's current language.
--- This list must be kept in sync with src/unsupported_language_list.txt.
-get_setting_info("language").option_labels = {
-	[""] = fgettext_ne("(Use system language)"),
-	--ar = " [ar]", blacklisted
-	be = "Беларуская [be]",
-	bg = "Български [bg]",
-	ca = "Català [ca]",
-	cs = "Česky [cs]",
-	cy = "Cymraeg [cy]",
-	da = "Dansk [da]",
-	de = "Deutsch [de]",
-	--dv = " [dv]", blacklisted
-	el = "Ελληνικά [el]",
-	en = "English [en]",
-	eo = "Esperanto [eo]",
-	es = "Español [es]",
-	et = "Eesti [et]",
-	eu = "Euskara [eu]",
-	fi = "Suomi [fi]",
-	fil = "Wikang Filipino [fil]",
-	fr = "Français [fr]",
-	gd = "Gàidhlig [gd]",
-	gl = "Galego [gl]",
-	--he = " [he]", blacklisted
-	--hi = " [hi]", blacklisted
-	hu = "Magyar [hu]",
-	id = "Bahasa Indonesia [id]",
-	it = "Italiano [it]",
-	ja = "日本語 [ja]",
-	jbo = "Lojban [jbo]",
-	kk = "Қазақша [kk]",
-	--kn = " [kn]", blacklisted
-	ko = "한국어 [ko]",
-	ky = "Kırgızca / Кыргызча [ky]",
-	lt = "Lietuvių [lt]",
-	lv = "Latviešu [lv]",
-	mn = "Монгол [mn]",
-	mr = "मराठी [mr]",
-	ms = "Bahasa Melayu [ms]",
-	--ms_Arab = " [ms_Arab]", blacklisted
-	nb = "Norsk Bokmål [nb]",
-	nl = "Nederlands [nl]",
-	nn = "Norsk Nynorsk [nn]",
-	oc = "Occitan [oc]",
-	pl = "Polski [pl]",
-	pt = "Português [pt]",
-	pt_BR = "Português do Brasil [pt_BR]",
-	ro = "Română [ro]",
-	ru = "Русский [ru]",
-	sk = "Slovenčina [sk]",
-	sl = "Slovenščina [sl]",
-	sr_Cyrl = "Српски [sr_Cyrl]",
-	sr_Latn = "Srpski (Latinica) [sr_Latn]",
-	sv = "Svenska [sv]",
-	sw = "Kiswahili [sw]",
-	--th = " [th]", blacklisted
-	tr = "Türkçe [tr]",
-	tt = "Tatarça [tt]",
-	uk = "Українська [uk]",
-	vi = "Tiếng Việt [vi]",
-	zh_CN = "中文 (简体) [zh_CN]",
-	zh_TW = "正體中文 (繁體) [zh_TW]",
-}
-
-
 -- See if setting matches keywords
 local function get_setting_match_weight(entry, query_keywords)
 	local setting_score = 0
@@ -312,12 +320,12 @@ local function check_requirements(name, requires)
 	end
 
 	local video_driver = core.get_active_driver()
-	local shaders_support = video_driver == "opengl" or video_driver == "ogles2"
+	local shaders_support = video_driver == "opengl" or video_driver == "opengl3" or video_driver == "ogles2"
 	local special = {
 		android = PLATFORM == "Android",
 		desktop = PLATFORM ~= "Android",
-		touchscreen_gui = TOUCHSCREEN_GUI,
-		keyboard_mouse = not TOUCHSCREEN_GUI,
+		touchscreen_gui = core.settings:get_bool("enable_touch"),
+		keyboard_mouse = not core.settings:get_bool("enable_touch"),
 		shaders_support = shaders_support,
 		shaders = core.settings:get_bool("enable_shaders") and shaders_support,
 		opengl = video_driver == "opengl",
@@ -449,13 +457,14 @@ local function get_formspec(dialogdata)
 
 	local extra_h = 1 -- not included in tabsize.height
 	local tabsize = {
-		width = TOUCHSCREEN_GUI and 16.5 or 15.5,
-		height = TOUCHSCREEN_GUI and (10 - extra_h) or 12,
+		width = core.settings:get_bool("enable_touch") and 16.5 or 15.5,
+		height = core.settings:get_bool("enable_touch") and (10 - extra_h) or 12,
 	}
 
-	local scrollbar_w = TOUCHSCREEN_GUI and 0.6 or 0.4
+	local scrollbar_w = core.settings:get_bool("enable_touch") and 0.6 or 0.4
 
-	local left_pane_width = TOUCHSCREEN_GUI and 4.5 or 4.25
+	local left_pane_width = core.settings:get_bool("enable_touch") and 4.5 or 4.25
+	local left_pane_padding = 0.25
 	local search_width = left_pane_width + scrollbar_w - (0.75 * 2)
 
 	local back_w = 3
@@ -468,7 +477,7 @@ local function get_formspec(dialogdata)
 	local fs = {
 		"formspec_version[6]",
 		"size[", tostring(tabsize.width), ",", tostring(tabsize.height + extra_h), "]",
-		TOUCHSCREEN_GUI and "padding[0.01,0.01]" or "",
+		core.settings:get_bool("enable_touch") and "padding[0.01,0.01]" or "",
 		"bgcolor[#0000]",
 
 		-- HACK: this is needed to allow resubmitting the same formspec
@@ -516,9 +525,9 @@ local function get_formspec(dialogdata)
 			y = y + 0.82
 		end
 		fs[#fs + 1] = ("box[0,%f;%f,0.8;%s]"):format(
-			y, left_pane_width, other_page.id == page_id and "#467832FF" or "#3339")
+			y, left_pane_width-left_pane_padding, other_page.id == page_id and "#467832FF" or "#3339")
 		fs[#fs + 1] = ("button[0,%f;%f,0.8;page_%s;%s]")
-			:format(y, left_pane_width, other_page.id, fgettext(other_page.title))
+			:format(y, left_pane_width-left_pane_padding, other_page.id, fgettext(other_page.title))
 		y = y + 0.82
 	end
 
@@ -608,6 +617,16 @@ local function get_formspec(dialogdata)
 end
 
 
+-- On Android, closing the app via the "Recents screen" won't result in a clean
+-- exit, discarding any setting changes made by the user.
+-- To avoid that, we write the settings file in more cases on Android.
+function write_settings_early()
+	if PLATFORM == "Android" then
+		core.settings:write()
+	end
+end
+
+
 local function buttonhandler(this, fields)
 	local dialogdata = this.data
 	dialogdata.leftscroll = core.explode_scrollbar_event(fields.leftscroll).value or dialogdata.leftscroll
@@ -622,17 +641,31 @@ local function buttonhandler(this, fields)
 	if fields.show_technical_names ~= nil then
 		local value = core.is_yes(fields.show_technical_names)
 		core.settings:set_bool("show_technical_names", value)
+		write_settings_early()
+
 		return true
 	end
 
 	if fields.show_advanced ~= nil then
 		local value = core.is_yes(fields.show_advanced)
 		core.settings:set_bool("show_advanced", value)
+		write_settings_early()
+	end
 
+	-- enable_touch is a checkbox in a setting component. We handle this
+	-- setting differently so we can hide/show pages using the next if-statement
+	if fields.enable_touch ~= nil then
+		local value = core.is_yes(fields.enable_touch)
+		core.settings:set_bool("enable_touch", value)
+		write_settings_early()
+	end
+
+	if fields.show_advanced ~= nil or fields.enable_touch ~= nil then
 		local suggested_page_id = update_filtered_pages(dialogdata.query)
 
+		dialogdata.components = nil
+
 		if not filtered_page_by_id[dialogdata.page_id] then
-			dialogdata.components = nil
 			dialogdata.leftscroll = 0
 			dialogdata.rightscroll = 0
 
@@ -672,12 +705,15 @@ local function buttonhandler(this, fields)
 
 	for i, comp in ipairs(dialogdata.components) do
 		if comp.on_submit and comp:on_submit(fields, this) then
+			write_settings_early()
+
 			-- Clear components so they regenerate
 			dialogdata.components = nil
 			return true
 		end
 		if comp.setting and fields["reset_" .. i] then
 			core.settings:remove(comp.setting.name)
+			write_settings_early()
 
 			-- Clear components so they regenerate
 			dialogdata.components = nil
@@ -695,12 +731,18 @@ local function eventhandler(event)
 		mm_game_theme.set_engine(true)
 		return true
 	end
+	if event == "FullscreenChange" then
+		-- Refresh the formspec to keep the fullscreen checkbox up to date.
+		ui.update()
+		return true
+	end
 
 	return false
 end
 
 
 function create_settings_dlg()
+	load()
 	local dlg = dialog_create("dlg_settings", get_formspec, buttonhandler, eventhandler)
 
 	dlg.data.page_id = update_filtered_pages("")
diff --git a/builtin/mainmenu/settings/settingtypes.lua b/builtin/mainmenu/settings/settingtypes.lua
index 1174c9b76..eacd96d09 100644
--- a/builtin/mainmenu/settings/settingtypes.lua
+++ b/builtin/mainmenu/settings/settingtypes.lua
@@ -439,9 +439,9 @@ function settingtypes.parse_config_file(read_all, parse_mods)
 		end
 
 		-- Parse mods
+		pkgmgr.load_all()
 		local mods_category_initialized = false
-		local mods = {}
-		pkgmgr.get_mods(core.get_modpath(), "mods", mods)
+		local mods = pkgmgr.global_mods:get_list()
 		table.sort(mods, function(a, b) return a.name < b.name end)
 
 		for _, mod in ipairs(mods) do
diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua
index 17a76e459..8fa45d36d 100644
--- a/builtin/mainmenu/tab_about.lua
+++ b/builtin/mainmenu/tab_about.lua
@@ -30,6 +30,7 @@ local core_developers = {
 	"Desour/DS",
 	"srifqi",
 	"Gregor Parzefall (grorp)",
+	"Lars Müller (luatic)",
 }
 
 -- currently only https://github.com/orgs/minetest/teams/triagers/members
@@ -43,19 +44,24 @@ local core_team = {
 -- For updating active/previous contributors, see the script in ./util/gather_git_credits.py
 
 local active_contributors = {
-	"Wuzzy [Features, translations, documentation]",
-	"numzero [Optimizations, work on OpenGL driver]",
-	"ROllerozxa [Bugfixes, Mainmenu]",
-	"Lars Müller [Bugfixes]",
-	"AFCMS [Documentation]",
-	"savilli [Bugfixes]",
-	"fluxionary [Bugfixes]",
-	"Bradley Pierce (Thresher) [Documentation]",
-	"Stvk imension [Android]",
-	"JosiahWI [Code cleanups]",
-	"OgelGames [UI, Bugfixes]",
-	"ndren [Bugfixes]",
-	"Abdou-31 [Documentation]",
+	"cx384",
+	"numzero",
+	"AFCMS",
+	"sfence",
+	"Wuzzy",
+	"ROllerozxa",
+	"JosiahWI",
+	"OgelGames",
+	"David Heidelberg",
+	"1F616EMO",
+	"HybridDog",
+	"Bradley Pierce (Thresher)",
+	"savilli",
+	"Stvk imension",
+	"y5nw",
+	"chmodsayshello",
+	"jordan4ibanez",
+	"superfloh247",
 }
 
 local previous_core_developers = {
@@ -158,7 +164,7 @@ return {
 			"style[label_button;border=false]" ..
 			"button[0.1,3.4;5.3,0.5;label_button;" ..
 			core.formspec_escape(version.project .. " " .. version.string) .. "]" ..
-			"button[1.5,4.1;2.5,0.8;homepage;freeminer.org]" ..
+			"button_url[1.5,4.1;2.5,0.8;homepage;freeminer.org;https://freeminer.org/]" ..
 			"hypertext[5.5,0.25;9.75,6.6;credits;" .. minetest.formspec_escape(hypertext) .. "]"
 
 		-- Render information
diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua
index abe127a69..b38f12884 100644
--- a/builtin/mainmenu/tab_content.lua
+++ b/builtin/mainmenu/tab_content.lua
@@ -29,16 +29,11 @@ end
 local packages_raw, packages
 
 local function update_packages()
-	if not pkgmgr.global_mods then
-		pkgmgr.refresh_globals()
-	end
-	if not pkgmgr.games then
-		pkgmgr.update_gamelist()
-	end
+	pkgmgr.load_all()
 
 	packages_raw = {}
 	table.insert_all(packages_raw, pkgmgr.games)
-	table.insert_all(packages_raw, pkgmgr.get_texture_packs())
+	table.insert_all(packages_raw, pkgmgr.texture_packs)
 	table.insert_all(packages_raw, pkgmgr.global_mods:get_list())
 
 	local function get_data()
@@ -114,12 +109,13 @@ local function get_formspec(tabview, name, tabdata)
 			modscreenshot = defaulttexturedir .. "no_screenshot.png"
 		end
 
-		local info = core.get_content_info(selected_pkg.path)
 		local desc = fgettext("No package description available")
-		if info.description and info.description:trim() ~= "" then
-			desc = core.formspec_escape(info.description)
+		if selected_pkg.description and selected_pkg.description:trim() ~= "" then
+			desc = core.formspec_escape(selected_pkg.description)
 		end
 
+		local info = core.get_content_info(selected_pkg.path)
+
 		local title_and_name
 		if selected_pkg.type == "game" then
 			title_and_name = selected_pkg.name
@@ -206,6 +202,7 @@ local function handle_doubleclick(pkg)
 			core.settings:set("texture_path", pkg.path)
 		end
 		packages = nil
+		pkgmgr.reload_texture_packs()
 
 		mm_game_theme.init()
 		mm_game_theme.set_engine()
@@ -224,7 +221,7 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
 	end
 
 	if fields.btn_contentdb then
-		local dlg = create_store_dlg()
+		local dlg = create_contentdb_dlg()
 		dlg:set_parent(tabview)
 		tabview:hide()
 		dlg:show()
@@ -254,7 +251,7 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
 
 	if fields.btn_mod_mgr_update then
 		local pkg = packages:get_list()[tabdata.selected_pkg]
-		local dlg = create_store_dlg(nil, pkgmgr.get_contentdb_id(pkg))
+		local dlg = create_contentdb_dlg(nil, pkgmgr.get_contentdb_id(pkg))
 		dlg:set_parent(tabview)
 		tabview:hide()
 		dlg:show()
@@ -270,6 +267,7 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
 
 		core.settings:set("texture_path", txp_path)
 		packages = nil
+		pkgmgr.reload_texture_packs()
 
 		mm_game_theme.init()
 		mm_game_theme.set_engine()
@@ -282,7 +280,7 @@ end
 return {
 	name = "content",
 	caption = function()
-		local update_count = update_detector.get_count()
+		local update_count = core.settings:get_bool("contentdb_enable_updates_indicator") and update_detector.get_count() or 0
 		if update_count == 0 then
 			return fgettext("Content")
 		else
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index c35a3f6fb..1ed08d825 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -94,7 +94,7 @@ function singleplayer_refresh_gamebar()
 
 	local btnbar = buttonbar_create(
 			"game_button_bar",
-			TOUCHSCREEN_GUI and {x = 0, y = 7.25} or {x = 0, y = 7.475},
+			core.settings:get_bool("enable_touch") and {x = 0, y = 7.25} or {x = 0, y = 7.475},
 			{x = 15.5, y = 1.25},
 			"#000000",
 			game_buttonbar_button_handler)
@@ -156,10 +156,18 @@ local function get_formspec(tabview, name, tabdata)
 
 	-- Point the player to ContentDB when no games are found
 	if #pkgmgr.games == 0 then
+		local W = tabview.width
+		local H = tabview.height
+
+		local hypertext = "<global valign=middle halign=center size=18>" ..
+				fgettext_ne("Minetest is a game-creation platform that allows you to play many different games.") .. "\n" ..
+				fgettext_ne("Minetest doesn't come with a game by default.") .. " " ..
+				fgettext_ne("You need to install a game before you can create a world.")
+
+		local button_y = H * 2/3 - 0.6
 		return table.concat({
-			"style[label_button;border=false]",
-			"button[2.75,1.5;10,1;label_button;", fgettext("You have no games installed."), "]",
-			"button[5.25,3.5;5,1.2;game_open_cdb;", fgettext("Install a game"), "]"})
+			"hypertext[0.375,0;", W - 2*0.375, ",", button_y, ";ht;", core.formspec_escape(hypertext), "]",
+			"button[5.25,", button_y, ";5,1.2;game_open_cdb;", fgettext("Install a game"), "]"})
 	end
 
 	local retval = ""
@@ -264,7 +272,7 @@ local function main_button_handler(this, fields, name, tabdata)
 
 	if fields.game_open_cdb then
 		local maintab = ui.find_by_name("maintab")
-		local dlg = create_store_dlg("game")
+		local dlg = create_contentdb_dlg("game")
 		dlg:set_parent(maintab)
 		maintab:hide()
 		dlg:show()
diff --git a/builtin/mainmenu/tests/serverlistmgr_spec.lua b/builtin/mainmenu/tests/serverlistmgr_spec.lua
index 25e208d10..21ce8a226 100644
--- a/builtin/mainmenu/tests/serverlistmgr_spec.lua
+++ b/builtin/mainmenu/tests/serverlistmgr_spec.lua
@@ -1,5 +1,6 @@
-_G.core = {get_once = function(_) end}
+_G.core = {}
 _G.unpack = table.unpack
+_G.check_cache_age = function() return false end
 _G.serverlistmgr = {}
 
 dofile("builtin/common/vector.lua")
diff --git a/builtin/profiler/instrumentation.lua b/builtin/profiler/instrumentation.lua
index 80f1c66af..0ffd9e6a9 100644
--- a/builtin/profiler/instrumentation.lua
+++ b/builtin/profiler/instrumentation.lua
@@ -46,11 +46,18 @@ local register_functions = {
 	register_on_mapblocks_changed = 0,
 }
 
+local function regex_escape(s)
+	return s:gsub("(%W)", "%%%1")
+end
+
 ---
 -- Create an unique instrument name.
 -- Generate a missing label with a running index number.
 --
 local counts = {}
+local worldmods_path = regex_escape(core.get_worldpath())
+local user_path = regex_escape(core.get_user_path())
+local builtin_path = regex_escape(core.get_builtin_path())
 local function generate_name(def)
 	local class, label, func_name = def.class, def.label, def.func_name
 	if label then
@@ -65,7 +72,16 @@ local function generate_name(def)
 	local index_id = def.mod .. (class or func_name)
 	local index = counts[index_id] or 1
 	counts[index_id] = index + 1
-	return format("%s[%d] %s", class or func_name, index, class and func_name or ""):trim()
+	local info = debug.getinfo(def.func)
+	local modpath = regex_escape(core.get_modpath(def.mod) or "")
+	local source = info.source
+	if modpath ~= "" then
+		source = source:gsub(modpath, def.mod)
+	end
+	source = source:gsub(worldmods_path, "")
+	source = source:gsub(builtin_path, "builtin" .. DIR_DELIM)
+	source = source:gsub(user_path, "")
+	return format("%s[%d] %s#%s", class or func_name, index, source, info.linedefined)
 end
 
 ---
diff --git a/builtin/profiler/reporter.lua b/builtin/profiler/reporter.lua
index 5928a3718..2e24a1fe0 100644
--- a/builtin/profiler/reporter.lua
+++ b/builtin/profiler/reporter.lua
@@ -77,7 +77,7 @@ local Formatter = {
 	end
 }
 
-local widths = { 55, 9, 9, 9, 5, 5, 5 }
+local widths = { 80, 9, 9, 9, 5, 5, 5 }
 local txt_row_format = sprintf(" %%-%ds | %%%ds | %%%ds | %%%ds | %%%ds | %%%ds | %%%ds", unpack(widths))
 
 local HR = {}
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 945fc2176..db476b41d 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -355,7 +355,7 @@ mg_math () string {"generator":"sphere"}
 #    Smooths rotation of camera, also called look or mouse smoothing. 0 to disable.
 camera_smoothing (Camera smoothing) float 0.0 0.0 0.99
 
-#    Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Change Keys.
+#    Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Controls.
 #
 #    Requires: keyboard_mouse
 cinematic_camera_smoothing (Camera smoothing in cinematic mode) float 0.7 0.0 0.99
@@ -379,7 +379,11 @@ always_fly_fast (Always fly fast) bool true
 #    the place button.
 #
 #    Requires: keyboard_mouse
-repeat_place_time (Place repetition interval) float 0.25 0.16 2
+repeat_place_time (Place repetition interval) float 0.25 0.16 2.0
+
+#    The minimum time in seconds it takes between digging nodes when holding
+#    the dig button.
+repeat_dig_time (Minimum dig repetition interval) float 0.0 0.0 2.0
 
 #    Automatically jump up single-node obstacles.
 autojump (Automatic jumping) bool false
@@ -413,16 +417,26 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false
 
 [*Touchscreen]
 
-#    The length in pixels it takes for touchscreen interaction to start.
+#    Enables touchscreen mode, allowing you to play the game with a touchscreen.
 #
-#    Requires: touchscreen_gui
-touchscreen_threshold (Touchscreen threshold) int 20 0 100
+#    Requires: !android
+enable_touch (Enable touchscreen) bool true
 
 #    Touchscreen sensitivity multiplier.
 #
 #    Requires: touchscreen_gui
 touchscreen_sensitivity (Touchscreen sensitivity) float 0.2 0.001 10.0
 
+#    The length in pixels after which a touch interaction is considered movement.
+#
+#    Requires: touchscreen_gui
+touchscreen_threshold (Movement threshold) int 20 0 100
+
+#    The delay in milliseconds after which a touch interaction is considered a long tap.
+#
+#    Requires: touchscreen_gui
+touch_long_tap_delay (Threshold for long taps) int 400 100 1000
+
 #    Use crosshair to select object instead of whole screen.
 #    If enabled, a crosshair will be shown and will be used for selecting object.
 #
@@ -441,6 +455,19 @@ fixed_virtual_joystick (Fixed virtual joystick) bool false
 #    Requires: touchscreen_gui
 virtual_joystick_triggers_aux1 (Virtual joystick triggers Aux1 button) bool false
 
+#    The gesture for punching players/entities.
+#    This can be overridden by games and mods.
+#
+#    * short_tap
+#      Easy to use and well-known from other games that shall not be named.
+#
+#    * long_tap
+#      Known from the classic Minetest mobile controls.
+#      Combat is more or less impossible.
+#
+#    Requires: touchscreen_gui
+touch_punch_gesture (Punch gesture) enum short_tap short_tap,long_tap
+
 
 [Graphics and Audio]
 
@@ -505,8 +532,8 @@ undersampling (Undersampling) int 1 1 8
 
 [**Graphics Effects]
 
-#    Makes all liquids opaque
-opaque_water (Opaque liquids) bool false
+#    Allows liquids to be translucent.
+translucent_liquids (Translucent liquids) bool true
 
 #    Leaves style:
 #    -   Fancy:  all faces visible
@@ -666,7 +693,8 @@ anisotropic_filter (Anisotropic filtering) bool false
 #
 #    * None - No antialiasing (default)
 #
-#    * FSAA - Hardware-provided full-screen antialiasing (incompatible with shaders)
+#    * FSAA - Hardware-provided full-screen antialiasing
+#             (incompatible with Post Processing and Undersampling)
 #             A.K.A multi-sample antialiasing (MSAA)
 #             Smoothens out block edges but does not affect the insides of textures.
 #             A restart is required to change this option.
@@ -705,7 +733,6 @@ enable_raytraced_culling (Enable Raytraced Culling) bool true
 
 #    Shaders allow advanced visual effects and may increase performance on some video
 #    cards.
-#    This only works with the OpenGL video backend.
 #
 #    Requires: shaders_support
 enable_shaders (Shaders) bool true
@@ -822,12 +849,17 @@ shadow_sky_body_orbit_tilt (Sky Body Orbit Tilt) float 0.0 -60.0 60.0
 
 [**Post Processing]
 
+#    Enables the post processing pipeline.
+#
+#    Requires: shaders
+enable_post_processing (Enable Post Processing) bool true
+
 #    Enables Hable's 'Uncharted 2' filmic tone mapping.
 #    Simulates the tone curve of photographic film and how this approximates the
 #    appearance of high dynamic range images. Mid-range contrast is slightly
 #    enhanced, highlights and shadows are gradually compressed.
 #
-#    Requires: shaders
+#    Requires: shaders, enable_post_processing
 tone_mapping (Filmic tone mapping) bool false
 
 #    Enable automatic exposure correction
@@ -835,22 +867,33 @@ tone_mapping (Filmic tone mapping) bool false
 #    automatically adjust to the brightness of the scene,
 #    simulating the behavior of human eye.
 #
-#    Requires: shaders
+#    Requires: shaders, enable_post_processing
 enable_auto_exposure (Enable Automatic Exposure) bool false
 
 #    Set the exposure compensation in EV units.
 #    Value of 0.0 (default) means no exposure compensation.
 #    Range: from -1 to 1.0
 #
-#    Requires: shaders, enable_auto_exposure
+#    Requires: shaders, enable_post_processing, enable_auto_exposure
 exposure_compensation (Exposure compensation) float 0.0 -1.0 1.0
 
+#    Apply dithering to reduce color banding artifacts.
+#    Dithering significantly increases the size of losslessly-compressed
+#    screenshots and it works incorrectly if the display or operating system
+#    performs additional dithering or if the color channels are not quantized
+#    to 8 bits.
+#    With OpenGL ES, dithering only works if the shader supports high
+#    floating-point precision and it may have a higher performance impact.
+#
+#    Requires: shaders, enable_post_processing
+debanding (Enable Debanding) bool true
+
 [**Bloom]
 
 #    Set to true to enable bloom effect.
 #    Bright colors will bleed over the neighboring objects.
 #
-#    Requires: shaders
+#    Requires: shaders, enable_post_processing
 enable_bloom (Enable Bloom) bool false
 
 #    Set to true to render debugging breakdown of the bloom effect.
@@ -858,29 +901,33 @@ enable_bloom (Enable Bloom) bool false
 #    top-left - processed base image, top-right - final image
 #    bottom-left - raw base image, bottom-right - bloom texture.
 #
-#    Requires: shaders, enable_bloom
+#    Requires: shaders, enable_post_processing, enable_bloom
 enable_bloom_debug (Enable Bloom Debug) bool false
 
 #    Defines how much bloom is applied to the rendered image
 #    Smaller values make bloom more subtle
 #    Range: from 0.01 to 1.0, default: 0.05
 #
-#    Requires: shaders, enable_bloom
+#    Requires: shaders, enable_post_processing, enable_bloom
 bloom_intensity (Bloom Intensity) float 0.05 0.01 1.0
 
 #    Defines the magnitude of bloom overexposure.
 #    Range: from 0.1 to 10.0, default: 1.0
 #
-#    Requires: shaders, enable_bloom
+#    Requires: shaders, enable_post_processing, enable_bloom
 bloom_strength_factor (Bloom Strength Factor) float 1.0 0.1 10.0
 
 #    Logical value that controls how far the bloom effect spreads
 #    from the bright objects.
 #    Range: from 0.1 to 8, default: 1
 #
-#    Requires: shaders, enable_bloom
+#    Requires: shaders, enable_post_processing, enable_bloom
 bloom_radius (Bloom Radius) float 1 0.1 8
 
+#    Set to true to enable volumetric lighting effect (a.k.a. "Godrays").
+#
+#    Requires: shaders, enable_post_processing, enable_bloom
+enable_volumetric_lighting (Volumetric lighting) bool false
 
 [*Audio]
 
@@ -888,6 +935,9 @@ bloom_radius (Bloom Radius) float 1 0.1 8
 #    Requires the sound system to be enabled.
 sound_volume (Volume) float 0.8 0.0 1.0
 
+#    Volume multiplier when the window is unfocused.
+sound_volume_unfocused (Volume when unfocused) float 0.3 0.0 1.0
+
 #    Whether to mute sounds. You can unmute sounds at any time, unless the
 #    sound system is disabled (enable_sound=false).
 #    In-game, you can toggle the mute state with the mute key or by using the
@@ -896,7 +946,7 @@ mute_sound (Mute sound) bool false
 
 [*User Interfaces]
 
-#    Set the language. Leave empty to use the system language.
+#    Set the language. By default, the system language is used.
 #    A restart is required after changing this.
 language (Language) enum   ,be,bg,ca,cs,da,de,el,en,eo,es,et,eu,fi,fr,gd,gl,hu,id,it,ja,jbo,kk,ko,lt,lv,ms,nb,nl,nn,pl,pt,pt_BR,ro,ru,sk,sl,sr_Cyrl,sr_Latn,sv,sw,tr,uk,vi,zh_CN,zh_TW
 
@@ -981,6 +1031,10 @@ chat_font_size (Chat font size) int 0 0 72
 #    The URL for the content repository
 contentdb_url (ContentDB URL) string https://content.minetest.net
 
+#    If enabled and you have ContentDB packages installed, Minetest may contact ContentDB to
+#    check for package updates when opening the mainmenu.
+contentdb_enable_updates_indicator (Enable updates available indicator on content tab) bool true
+
 #    Comma-separated list of flags to hide in the content repository.
 #    "nonfree" can be used to hide packages which do not qualify as 'free software',
 #    as defined by the Free Software Foundation.
@@ -1008,7 +1062,8 @@ serverlist_url (Serverlist URL) string servers.minetest.net
 #    If disabled, new accounts will be registered automatically when logging in.
 enable_split_login_register (Enable split login/register) bool true
 
-#    URL to JSON file which provides information about the newest Minetest release
+#    URL to JSON file which provides information about the newest Minetest release.
+#    If this is empty the engine will never check for updates.
 update_information_url (Update information URL) string https://www.minetest.net/release_info.json
 
 [*Server]
@@ -1061,6 +1116,14 @@ bind_address (Bind address) string
 #    to new servers, but they may not support all new features that you are expecting.
 strict_protocol_version_checking (Strict protocol checking) bool false
 
+#    Define the oldest clients allowed to connect.
+#    Older clients are compatible in the sense that they will not crash when connecting
+#    to new servers, but they may not support all new features that you are expecting.
+#    This allows for more fine-grained control than strict_protocol_version_checking.
+#    Minetest still enforces its own internal minimum, and enabling
+#    strict_protocol_version_checking will effectively override this.
+protocol_version_min (Protocol version minimum) int 1 1 65535
+
 #    Specifies URL from which client fetches media instead of using UDP.
 #    $filename should be accessible from $remote_media$filename via cURL
 #    (obviously, remote_media should end with a slash).
@@ -1327,7 +1390,8 @@ mgmath_spflags (Mapgen math specific flags) flags mountains,ridges,nofloatlands,
 #    The 'snowbiomes' flag enables the new 5 biome system.
 #    When the 'snowbiomes' flag is enabled jungles are automatically enabled and
 #    the 'jungles' flag is ignored.
-mgv6_spflags (Mapgen V6 specific flags) flags jungles,biomeblend,mudflow,snowbiomes,noflat,trees jungles,biomeblend,mudflow,snowbiomes,flat,trees,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees
+#    The 'temples' flag disables generation of desert temples. Normal dungeons will appear instead.
+mgv6_spflags (Mapgen V6 specific flags) flags jungles,biomeblend,mudflow,snowbiomes,noflat,trees,temples jungles,biomeblend,mudflow,snowbiomes,flat,trees,temples,nojungles,nobiomeblend,nomudflow,nosnowbiomes,noflat,notrees,notemples
 
 #    Deserts occur when np_biome exceeds this value.
 #    When the 'snowbiomes' flag is enabled, this is ignored.
@@ -1986,6 +2050,9 @@ deprecated_lua_api_handling (Deprecated Lua API handling) enum log none,log,erro
 #    Enable random user input (only used for testing).
 random_input (Random input) bool false
 
+#    Enable random mod loading (mainly used for testing).
+random_mod_load_order (Random mod load order) bool false
+
 #    Enable mod channels support.
 enable_mod_channels (Mod channels) bool false
 
@@ -2056,17 +2123,13 @@ shader_path (Shader path) path
 #    The rendering back-end.
 #    Note: A restart is required after changing this!
 #    OpenGL is the default for desktop, and OGLES2 for Android.
-#    Shaders are supported by OpenGL and OGLES2 (experimental).
-video_driver (Video driver) enum  ,opengl,ogles1,ogles2
+#    Shaders are supported by everything but OGLES1.
+video_driver (Video driver) enum  ,opengl,opengl3,ogles1,ogles2
 
 #    Distance in nodes at which transparency depth sorting is enabled
 #    Use this to limit the performance impact of transparency depth sorting
 transparency_sorting_distance (Transparency Sorting Distance) int 16 0 128
 
-#    Enable vertex buffer objects.
-#    This should greatly improve graphics performance.
-enable_vbo (VBO) bool true
-
 #    Radius of cloud area stated in number of 64 node cloud squares.
 #    Values larger than 26 will start to produce sharp cutoffs at cloud area corners.
 cloud_radius (Cloud radius) int 12 1 62
@@ -2085,11 +2148,6 @@ mesh_generation_interval (Mapblock mesh generation delay) int 0 0 50
 #    Value of 0 (default) will let Minetest autodetect the number of available threads.
 mesh_generation_threads (Mapblock mesh generation threads) int 0 0 8
 
-#    Size of the MapBlock cache of the mesh generator. Increasing this will
-#    increase the cache hit %, reducing the data being copied from the main
-#    thread, thus reducing jitter.
-meshgen_block_cache_size (Mapblock mesh generator's MapBlock cache size in MB) int 20 0 1000
-
 #    True = 256
 #    False = 128
 #    Usable to make minimap smoother on slower machines.
@@ -2128,6 +2186,14 @@ texture_min_size (Base texture size) int 64 1 32768
 #    Systems with a low-end GPU (or no GPU) would benefit from smaller values.
 client_mesh_chunk (Client Mesh Chunksize) int 1 1 16
 
+#    Enables debug and error-checking in the OpenGL driver.
+opengl_debug (OpenGL debug) bool false
+
+[**Sound]
+#    Comma-separated list of AL and ALC extensions that should not be used.
+#    Useful for testing. See al_extensions.[h,cpp] for details.
+sound_extensions_blacklist (Sound Extensions Blacklist) string
+
 [**Font]
 
 font_bold (Font bold by default) bool false
@@ -2266,9 +2332,10 @@ ask_reconnect_on_crash (Ask to reconnect after crash) bool false
 
 [**Server/Env Performance]
 
-#    Length of a server tick and the interval at which objects are generally updated over
-#    network, stated in seconds.
-dedicated_server_step (Dedicated server step) float 0.09 0.0
+#    Length of a server tick (the interval at which everything is generally updated),
+#    stated in seconds.
+#    Does not apply to sessions hosted from the client menu.
+dedicated_server_step (Dedicated server step) float 0.09 0.0 1.0
 
 #    Whether players are shown to clients without any range limit.
 #    Deprecated, use the setting player_transfer_distance instead.
@@ -2338,12 +2405,11 @@ liquid_update (Liquid update tick) float 1.0 0.001
 #    At this distance the server will aggressively optimize which blocks are sent to
 #    clients.
 #    Small values potentially improve performance a lot, at the expense of visible
-#    rendering glitches (some blocks will not be rendered under water and in caves,
-#    as well as sometimes on land).
+#    rendering glitches (some blocks might not be rendered correctly in caves).
 #    Setting this to a value greater than max_block_send_distance disables this
 #    optimization.
-#    Stated in mapblocks (16 nodes).
-block_send_optimize_distance (Block send optimize distance) int 4 2 32767
+#    Stated in MapBlocks (16 nodes).
+block_send_optimize_distance (Block send optimize distance) int 4 2 2047
 
 #    If enabled, the server will perform map block occlusion culling based on
 #    on the eye position of the player. This can reduce the number of blocks
@@ -2351,6 +2417,13 @@ block_send_optimize_distance (Block send optimize distance) int 4 2 32767
 #    invisible blocks, so that the utility of noclip mode is reduced.
 server_side_occlusion_culling (Server-side occlusion culling) bool true
 
+#    At this distance the server will perform a simpler and cheaper occlusion check.
+#    Smaller values potentially improve performance, at the expense of temporarily visible
+#    rendering glitches (missing blocks).
+#    This is especially useful for very large viewing range (upwards of 500).
+#    Stated in MapBlocks (16 nodes).
+block_cull_optimize_distance (Block cull optimize distance) int 25 2 2047
+
 [**Mapgen]
 
 #    Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).
@@ -2404,9 +2477,6 @@ curl_file_download_timeout (cURL file download timeout) int 300000 5000 21474836
 
 [**Miscellaneous]
 
-#    Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens.
-screen_dpi (DPI) int 72 1
-
 #    Adjust the detected display density, used for scaling UI elements.
 display_density_factor (Display Density Scaling Factor) float 1 0.5 5.0
 
@@ -2531,20 +2601,6 @@ show_advanced (Show advanced settings) bool false
 #    Changing this setting requires a restart.
 enable_sound (Sound) bool true
 
-#    Unix timestamp (integer) of when the client last checked for an update
-#    Set this value to "disabled" to never check for updates.
-update_last_checked (Last update check) string
-
-#    Version number which was last seen during an update check.
-#
-#    Representation: MMMIIIPPP, where M=Major, I=Minor, P=Patch
-#    Ex: 5.5.0 is 005005000
-update_last_known (Last known version update) int 0
-
-#    If this is set to true, the user will never (again) be shown the
-#    "reinstall Minetest Game" notification.
-no_mtg_notification (Don't show "reinstall Minetest Game" notification) bool false
-
 #    Key for moving the player forward.
 keymap_forward (Forward key) key KEY_KEY_W
 
@@ -2630,6 +2686,9 @@ keymap_minimap (Minimap key) key KEY_KEY_V
 #    Key for taking screenshots.
 keymap_screenshot (Screenshot) key KEY_F12
 
+#    Key for toggling fullscreen mode.
+keymap_fullscreen (Fullscreen key) key KEY_F11
+
 #    Key for dropping the currently selected item.
 keymap_drop (Drop item key) key KEY_KEY_Q
 
@@ -2742,9 +2801,9 @@ keymap_toggle_chat (Chat toggle key) key KEY_F2
 keymap_console (Large chat console key) key KEY_F10
 
 #    Key for toggling the display of fog.
-keymap_toggle_force_fog_off (Fog toggle key) key KEY_F3
+keymap_toggle_fog (Fog toggle key) key KEY_F3
 
-#    Key for toggling the camera update. Only used for development
+#    Key for toggling the camera update. Only usable with 'debug' privilege.
 keymap_toggle_update_camera (Camera update toggle key) key
 
 #    Key for toggling the display of debug info.
@@ -2753,6 +2812,9 @@ keymap_toggle_debug (Debug info toggle key) key KEY_F5
 #    Key for toggling the display of the profiler. Used for development.
 keymap_toggle_profiler (Profiler toggle key) key KEY_F6
 
+#    Key for toggling the display of mapblock boundaries.
+keymap_toggle_block_bounds (Block bounds toggle key) key
+
 #    Key for switching between first- and third-person camera.
 keymap_camera_mode (Toggle camera mode key) key KEY_KEY_C
 
diff --git a/client/shaders/Irrlicht b/client/shaders/Irrlicht
new file mode 120000
index 000000000..9349d3073
--- /dev/null
+++ b/client/shaders/Irrlicht
@@ -0,0 +1 @@
+../../irr/media/Shaders
\ No newline at end of file
diff --git a/client/shaders/blur_h/opengl_fragment.glsl b/client/shaders/blur_h/opengl_fragment.glsl
index 72d71dc07..131cb9305 100644
--- a/client/shaders/blur_h/opengl_fragment.glsl
+++ b/client/shaders/blur_h/opengl_fragment.glsl
@@ -14,7 +14,7 @@ centroid varying vec2 varTexCoord;
 // smoothstep - squared
 float smstsq(float f)
 {
-	f = f * f * (3 - 2 * f);
+	f = f * f * (3. - 2. * f);
 	return f;
 }
 
diff --git a/client/shaders/blur_v/opengl_fragment.glsl b/client/shaders/blur_v/opengl_fragment.glsl
index 05575a967..e1e5e5780 100644
--- a/client/shaders/blur_v/opengl_fragment.glsl
+++ b/client/shaders/blur_v/opengl_fragment.glsl
@@ -14,7 +14,7 @@ centroid varying vec2 varTexCoord;
 // smoothstep - squared
 float smstsq(float f)
 {
-	f = f * f * (3 - 2 * f);
+	f = f * f * (3. - 2. * f);
 	return f;
 }
 
diff --git a/client/shaders/cloud_shader/opengl_fragment.glsl b/client/shaders/cloud_shader/opengl_fragment.glsl
new file mode 100644
index 000000000..d47173ce0
--- /dev/null
+++ b/client/shaders/cloud_shader/opengl_fragment.glsl
@@ -0,0 +1,17 @@
+uniform lowp vec4 fogColor;
+uniform float fogDistance;
+uniform float fogShadingParameter;
+varying highp vec3 eyeVec;
+
+varying lowp vec4 varColor;
+
+void main(void)
+{
+	vec4 col = varColor;
+
+	float clarity = clamp(fogShadingParameter
+		- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
+	col.rgb = mix(fogColor.rgb, col.rgb, clarity);
+
+	gl_FragColor = col;
+}
diff --git a/client/shaders/cloud_shader/opengl_vertex.glsl b/client/shaders/cloud_shader/opengl_vertex.glsl
new file mode 100644
index 000000000..3f2e7d9b3
--- /dev/null
+++ b/client/shaders/cloud_shader/opengl_vertex.glsl
@@ -0,0 +1,21 @@
+uniform lowp vec4 emissiveColor;
+
+varying lowp vec4 varColor;
+
+varying highp vec3 eyeVec;
+
+void main(void)
+{
+	gl_Position = mWorldViewProj * inVertexPosition;
+
+#ifdef GL_ES
+	vec4 color = inVertexColor.bgra;
+#else
+	vec4 color = inVertexColor;
+#endif
+
+	color *= emissiveColor;
+	varColor = color;
+
+	eyeVec = -(mWorldView * inVertexPosition).xyz;
+}
diff --git a/client/shaders/minimap_shader/opengl_fragment.glsl b/client/shaders/minimap_shader/opengl_fragment.glsl
index cef359e8a..3f6b041da 100644
--- a/client/shaders/minimap_shader/opengl_fragment.glsl
+++ b/client/shaders/minimap_shader/opengl_fragment.glsl
@@ -12,13 +12,13 @@ void main (void)
 	//texture sampling rate
 	const float step = 1.0 / 256.0;
 	float tl = texture2D(normalTexture, vec2(uv.x - step, uv.y + step)).r;
-	float t  = texture2D(normalTexture, vec2(uv.x - step, uv.y - step)).r;
+	float t  = texture2D(normalTexture, vec2(uv.x,        uv.y + step)).r;
 	float tr = texture2D(normalTexture, vec2(uv.x + step, uv.y + step)).r;
-	float r  = texture2D(normalTexture, vec2(uv.x + step, uv.y)).r;
+	float r  = texture2D(normalTexture, vec2(uv.x + step, uv.y       )).r;
 	float br = texture2D(normalTexture, vec2(uv.x + step, uv.y - step)).r;
-	float b  = texture2D(normalTexture, vec2(uv.x, uv.y - step)).r;
+	float b  = texture2D(normalTexture, vec2(uv.x,        uv.y - step)).r;
 	float bl = texture2D(normalTexture, vec2(uv.x - step, uv.y - step)).r;
-	float l  = texture2D(normalTexture, vec2(uv.x - step, uv.y)).r;
+	float l  = texture2D(normalTexture, vec2(uv.x - step, uv.y       )).r;
 	float dX = (tr + 2.0 * r + br) - (tl + 2.0 * l + bl);
 	float dY = (bl + 2.0 * b + br) - (tl + 2.0 * t + tr);
 	vec4 bump = vec4 (normalize(vec3 (dX, dY, 0.1)),1.0);
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 805932681..1fda8f979 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -1,7 +1,7 @@
 uniform sampler2D baseTexture;
 
 uniform vec3 dayLight;
-uniform vec4 skyBgColor;
+uniform lowp vec4 fogColor;
 uniform float fogDistance;
 uniform float fogShadingParameter;
 uniform vec3 eyePosition;
@@ -10,7 +10,7 @@ uniform vec3 sunPosition;
 uniform float wieldLight;
 
 // The cameraOffset is the current center of the visible world.
-uniform vec3 cameraOffset;
+uniform highp vec3 cameraOffset;
 uniform float animationTimer;
 #ifdef ENABLE_DYNAMIC_SHADOWS
 	// shadow texture
@@ -47,11 +47,8 @@ varying mediump vec2 varTexCoord;
 #else
 centroid varying vec2 varTexCoord;
 #endif
-varying vec3 eyeVec;
+varying highp vec3 eyeVec;
 varying float nightRatio;
-varying vec3 tsEyeVec;
-varying vec3 lightVec;
-varying vec3 tsLightVec;
 
 #ifdef ENABLE_DYNAMIC_SHADOWS
 
@@ -164,7 +161,7 @@ float getPenumbraRadius(sampler2D shadowsampler, vec2 smTexCoord, float realDist
 	float depth_to_blur = f_shadowfar / SOFTSHADOWRADIUS / xyPerspectiveBias0;
 	if (depth > 0.0 && f_normal_length > 0.0)
 		// 5 is empirical factor that controls how fast shadow loses sharpness
-		sharpness_factor = clamp(5 * depth * depth_to_blur, 0.0, 1.0);
+		sharpness_factor = clamp(5.0 * depth * depth_to_blur, 0.0, 1.0);
 	depth = 0.0;
 
 	float world_to_texture = xyPerspectiveBias1 / perspective_factor / perspective_factor
@@ -452,7 +449,7 @@ void main(void)
 	// Note: clarity = (1 - fogginess)
 	float clarity = clamp(fogShadingParameter
 		- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
-	col = mix(skyBgColor, col, clarity);
+	col = mix(fogColor, col, clarity);
 	col = vec4(col.rgb, base.a);
 
 	gl_FragData[0] = col;
diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl
index de461c9d1..f209cfb30 100644
--- a/client/shaders/nodes_shader/opengl_vertex.glsl
+++ b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -5,7 +5,7 @@ uniform vec3 eyePosition;
 uniform vec3 sunPosition;
 
 // The cameraOffset is the current center of the visible world.
-uniform vec3 cameraOffset;
+uniform highp vec3 cameraOffset;
 uniform float animationTimer;
 
 varying vec3 vNormal;
@@ -45,7 +45,7 @@ centroid varying vec2 varTexCoord;
 
 varying float area_enable_parallax;
 
-varying vec3 eyeVec;
+varying highp vec3 eyeVec;
 varying float nightRatio;
 // Color of the light emitted by the light sources.
 const vec3 artificialLight = vec3(1.04, 1.04, 1.04);
@@ -243,7 +243,7 @@ void main(void)
 		if (f_normal_length > 0.0) {
 			nNormal = normalize(vNormal);
 			cosLight = max(1e-5, dot(nNormal, -v_LightDirection));
-			float sinLight = pow(1 - pow(cosLight, 2.0), 0.5);
+			float sinLight = pow(1.0 - pow(cosLight, 2.0), 0.5);
 			normalOffsetScale = 2.0 * pFactor * pFactor * sinLight * min(f_shadowfar, 500.0) /
 					xyPerspectiveBias1 / f_textureresolution;
 			z_bias = 1.0 * sinLight / cosLight;
@@ -251,7 +251,7 @@ void main(void)
 		else {
 			nNormal = vec3(0.0);
 			cosLight = clamp(dot(v_LightDirection, normalize(vec3(v_LightDirection.x, 0.0, v_LightDirection.z))), 1e-2, 1.0);
-			float sinLight = pow(1 - pow(cosLight, 2.0), 0.5);
+			float sinLight = pow(1.0 - pow(cosLight, 2.0), 0.5);
 			normalOffsetScale = 0.0;
 			z_bias = 3.6e3 * sinLight / cosLight;
 		}
diff --git a/client/shaders/object_shader/opengl_fragment.glsl b/client/shaders/object_shader/opengl_fragment.glsl
index c0afe3087..6694b69ab 100644
--- a/client/shaders/object_shader/opengl_fragment.glsl
+++ b/client/shaders/object_shader/opengl_fragment.glsl
@@ -1,7 +1,7 @@
 uniform sampler2D baseTexture;
 
 uniform vec3 dayLight;
-uniform vec4 skyBgColor;
+uniform lowp vec4 fogColor;
 uniform float fogDistance;
 uniform float fogShadingParameter;
 uniform vec3 eyePosition;
@@ -9,7 +9,7 @@ uniform vec3 sunPosition;
 uniform float wieldLight;
 
 // The cameraOffset is the current center of the visible world.
-uniform vec3 cameraOffset;
+uniform highp vec3 cameraOffset;
 uniform float animationTimer;
 #ifdef ENABLE_DYNAMIC_SHADOWS
 	// shadow texture
@@ -46,7 +46,7 @@ varying mediump vec2 varTexCoord;
 #else
 centroid varying vec2 varTexCoord;
 #endif
-varying vec3 eyeVec;
+varying highp vec3 eyeVec;
 varying float nightRatio;
 
 varying float vIDiff;
@@ -455,7 +455,7 @@ void main(void)
 	// Note: clarity = (1 - fogginess)
 	float clarity = clamp(fogShadingParameter
 		- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
-	col = mix(skyBgColor, col, clarity);
+	col = mix(fogColor, col, clarity);
 	col = vec4(col.rgb, base.a);
 
 	gl_FragData[0] = col;
diff --git a/client/shaders/object_shader/opengl_vertex.glsl b/client/shaders/object_shader/opengl_vertex.glsl
index 291f50ff5..d5a434da5 100644
--- a/client/shaders/object_shader/opengl_vertex.glsl
+++ b/client/shaders/object_shader/opengl_vertex.glsl
@@ -1,10 +1,7 @@
 uniform mat4 mWorld;
 uniform vec3 dayLight;
-uniform vec3 eyePosition;
 uniform float animationTimer;
-uniform vec4 emissiveColor;
-uniform vec3 cameraOffset;
-
+uniform lowp vec4 emissiveColor;
 
 varying vec3 vNormal;
 varying vec3 vPosition;
@@ -33,7 +30,7 @@ centroid varying vec2 varTexCoord;
 	varying float perspective_factor;
 #endif
 
-varying vec3 eyeVec;
+varying highp vec3 eyeVec;
 varying float nightRatio;
 // Color of the light emitted by the light sources.
 const vec3 artificialLight = vec3(1.04, 1.04, 1.04);
@@ -147,7 +144,7 @@ void main(void)
 		if (f_normal_length > 0.0) {
 			nNormal = normalize(vNormal);
 			cosLight = max(1e-5, dot(nNormal, -v_LightDirection));
-			float sinLight = pow(1 - pow(cosLight, 2.0), 0.5);
+			float sinLight = pow(1.0 - pow(cosLight, 2.0), 0.5);
 			normalOffsetScale = 0.1 * pFactor * pFactor * sinLight * min(f_shadowfar, 500.0) /
 					xyPerspectiveBias1 / f_textureresolution;
 			z_bias = 1e3 * sinLight / cosLight * (0.5 + f_textureresolution / 1024.0);
@@ -155,7 +152,7 @@ void main(void)
 		else {
 			nNormal = vec3(0.0);
 			cosLight = clamp(dot(v_LightDirection, normalize(vec3(v_LightDirection.x, 0.0, v_LightDirection.z))), 1e-2, 1.0);
-			float sinLight = pow(1 - pow(cosLight, 2.0), 0.5);
+			float sinLight = pow(1.0 - pow(cosLight, 2.0), 0.5);
 			normalOffsetScale = 0.0;
 			z_bias = 3.6e3 * sinLight / cosLight;
 		}
diff --git a/client/shaders/second_stage/opengl_fragment.glsl b/client/shaders/second_stage/opengl_fragment.glsl
index 928e408e2..0a73aa393 100644
--- a/client/shaders/second_stage/opengl_fragment.glsl
+++ b/client/shaders/second_stage/opengl_fragment.glsl
@@ -1,6 +1,13 @@
 #define rendered texture0
 #define bloom texture1
 
+#ifdef GL_ES
+// Dithering requires sufficient floating-point precision
+#ifndef GL_FRAGMENT_PRECISION_HIGH
+#undef ENABLE_DITHERING
+#endif
+#endif
+
 struct ExposureParams {
 	float compensationFactor;
 };
@@ -54,21 +61,25 @@ vec4 applyBloom(vec4 color, vec2 uv)
 	equation used:  ((x * (A * x + C * B) + D * E) / (x * (A * x + B) + D * F)) - E / F
 */
 
-vec3 uncharted2Tonemap(vec3 x)
+// see https://github.com/minetest/minetest/pull/14688
+highp vec3 uncharted2Tonemap(highp vec3 x)
 {
 	return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03333;
 }
 
 vec4 applyToneMapping(vec4 color)
 {
-	const float exposureBias = 2.0;
+	color = vec4(pow(color.rgb, vec3(2.2)), color.a);
+	const float gamma = 1.6;
+	const float exposureBias = 5.5;
 	color.rgb = uncharted2Tonemap(exposureBias * color.rgb);
 	// Precalculated white_scale from
 	//vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W));
 	vec3 whiteScale = vec3(1.036015346);
 	color.rgb *= whiteScale;
-	return color;
+	return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a);
 }
+#endif
 
 vec3 applySaturation(vec3 color, float factor)
 {
@@ -77,6 +88,19 @@ vec3 applySaturation(vec3 color, float factor)
 	float brightness = dot(color, vec3(0.2125, 0.7154, 0.0721));
 	return mix(vec3(brightness), color, factor);
 }
+
+#ifdef ENABLE_DITHERING
+// From http://alex.vlachos.com/graphics/Alex_Vlachos_Advanced_VR_Rendering_GDC2015.pdf
+// and https://www.shadertoy.com/view/MslGR8 (5th one starting from the bottom)
+// NOTE: `frag_coord` is in pixels (i.e. not normalized UV).
+vec3 screen_space_dither(highp vec2 frag_coord) {
+	// Iestyn's RGB dither (7 asm instructions) from Portal 2 X360, slightly modified for VR.
+	highp vec3 dither = vec3(dot(vec2(171.0, 231.0), frag_coord));
+	dither.rgb = fract(dither.rgb / vec3(103.0, 71.0, 97.0));
+
+	// Subtract 0.5 to avoid slightly brightening the whole viewport.
+	return (dither.rgb - 0.5) / 255.0;
+}
 #endif
 
 void main(void)
@@ -105,25 +129,31 @@ void main(void)
 #endif
 	}
 
-
 #ifdef ENABLE_BLOOM
 	color = applyBloom(color, uv);
 #endif
 
+
+	color.rgb = clamp(color.rgb, vec3(0.), vec3(1.));
+
+	// return to sRGB colorspace (approximate)
+	color.rgb = pow(color.rgb, vec3(1.0 / 2.2));
+
 #ifdef ENABLE_BLOOM_DEBUG
 	if (uv.x > 0.5 || uv.y > 0.5)
 #endif
 	{
 #if ENABLE_TONE_MAPPING
 		color = applyToneMapping(color);
-		color.rgb = applySaturation(color.rgb, saturation);
 #endif
+
+		color.rgb = applySaturation(color.rgb, saturation);
 	}
 
-	color.rgb = clamp(color.rgb, vec3(0.), vec3(1.));
-
-	// return to sRGB colorspace (approximate)
-	color.rgb = pow(color.rgb, vec3(1.0 / 2.2));
+#ifdef ENABLE_DITHERING
+	// Apply dithering just before quantisation
+	color.rgb += screen_space_dither(gl_FragCoord.xy);
+#endif
 
 	gl_FragColor = vec4(color.rgb, 1.0); // force full alpha to avoid holes in the image.
 }
diff --git a/client/shaders/stars_shader/opengl_fragment.glsl b/client/shaders/stars_shader/opengl_fragment.glsl
index a9ed741bf..224032fa3 100644
--- a/client/shaders/stars_shader/opengl_fragment.glsl
+++ b/client/shaders/stars_shader/opengl_fragment.glsl
@@ -1,6 +1,6 @@
-uniform vec4 starColor;
+uniform lowp vec4 emissiveColor;
 
 void main(void)
 {
-	gl_FragColor = starColor;
+	gl_FragColor = emissiveColor;
 }
diff --git a/client/shaders/volumetric_light/opengl_fragment.glsl b/client/shaders/volumetric_light/opengl_fragment.glsl
new file mode 100644
index 000000000..9ed5fa9ba
--- /dev/null
+++ b/client/shaders/volumetric_light/opengl_fragment.glsl
@@ -0,0 +1,115 @@
+#define rendered texture0
+#define depthmap texture1
+
+uniform sampler2D rendered;
+uniform sampler2D depthmap;
+
+uniform vec3 sunPositionScreen;
+uniform float sunBrightness;
+uniform vec3 moonPositionScreen;
+uniform float moonBrightness;
+
+uniform lowp float volumetricLightStrength;
+
+uniform vec3 dayLight;
+#ifdef ENABLE_DYNAMIC_SHADOWS
+uniform vec3 v_LightDirection;
+#else
+const vec3 v_LightDirection = vec3(0.0, -1.0, 0.0);
+#endif
+
+#ifdef GL_ES
+varying mediump vec2 varTexCoord;
+#else
+centroid varying vec2 varTexCoord;
+#endif
+
+const float far = 1000.;
+float mapDepth(float depth)
+{
+	return min(1., 1. / (1.00001 - depth) / far);
+}
+
+float noise(vec3 uvd) {
+	return fract(dot(sin(uvd * vec3(13041.19699, 27723.29171, 61029.77801)), vec3(73137.11101, 37312.92319, 10108.89991)));
+}
+
+float sampleVolumetricLight(vec2 uv, vec3 lightVec, float rawDepth)
+{
+	lightVec = 0.5 * lightVec / lightVec.z + 0.5;
+	const float samples = 30.;
+	float result = texture2D(depthmap, uv).r < 1. ? 0.0 : 1.0;
+	float bias = noise(vec3(uv, rawDepth));
+	vec2 samplepos;
+	for (float i = 1.; i < samples; i++) {
+		samplepos = mix(uv, lightVec.xy, (i + bias) / samples);
+		if (min(samplepos.x, samplepos.y) > 0. && max(samplepos.x, samplepos.y) < 1.)
+			result += texture2D(depthmap, samplepos).r < 1. ? 0.0 : 1.0;
+	}
+	return result / samples;
+}
+
+vec3 getDirectLightScatteringAtGround(vec3 v_LightDirection)
+{
+	// Based on talk at 2002 Game Developers Conference by Naty Hoffman and Arcot J. Preetham
+	const float beta_r0 = 1e-5; // Rayleigh scattering beta
+
+	// These factors are calculated based on expected value of scattering factor of 1e-5
+	// for Nitrogen at 532nm (green), 2e25 molecules/m3 in atmosphere
+	const vec3 beta_r0_l = vec3(3.3362176e-01, 8.75378289198826e-01, 1.95342379700656) * beta_r0; // wavelength-dependent scattering
+
+	const float atmosphere_height = 15000.; // height of the atmosphere in meters
+	// sun/moon light at the ground level, after going through the atmosphere
+	return exp(-beta_r0_l * atmosphere_height / (1e-5 - dot(v_LightDirection, vec3(0., 1., 0.))));
+}
+
+vec3 applyVolumetricLight(vec3 color, vec2 uv, float rawDepth)
+{
+	vec3 lookDirection = normalize(vec3(uv.x * 2. - 1., uv.y * 2. - 1., rawDepth));
+
+	const float boost = 4.0;
+	float brightness = 0.;
+	vec3 sourcePosition = vec3(-1., -1., -1);
+
+	if (sunPositionScreen.z > 0. && sunBrightness > 0.) {
+		brightness = sunBrightness;
+		sourcePosition = sunPositionScreen;
+	}
+	else if (moonPositionScreen.z > 0. && moonBrightness > 0.) {
+		brightness = moonBrightness * 0.05;
+		sourcePosition = moonPositionScreen;
+	}
+
+	float cameraDirectionFactor = pow(clamp(dot(sourcePosition, vec3(0., 0., 1.)), 0.0, 0.7), 2.5);
+	float viewAngleFactor = pow(max(0., dot(sourcePosition, lookDirection)), 8.);
+
+	float lightFactor = brightness * sampleVolumetricLight(uv, sourcePosition, rawDepth) *
+			(0.05 * cameraDirectionFactor + 0.95 * viewAngleFactor);
+
+	color = mix(color, boost * getDirectLightScatteringAtGround(v_LightDirection) * dayLight, lightFactor);
+
+	// a factor of 5 tested well
+	color *= volumetricLightStrength * 5.0;
+
+	// if (sunPositionScreen.z < 0.)
+	// 	color.rg += 1. - clamp(abs((2. * uv.xy - 1.) - sunPositionScreen.xy / sunPositionScreen.z) * 1000., 0., 1.);
+	// if (moonPositionScreen.z < 0.)
+	// 	color.rg += 1. - clamp(abs((2. * uv.xy - 1.) - moonPositionScreen.xy / moonPositionScreen.z) * 1000., 0., 1.);
+	return color;
+}
+
+void main(void)
+{
+	vec2 uv = varTexCoord.st;
+	vec3 color = texture2D(rendered, uv).rgb;
+	// translate to linear colorspace (approximate)
+	color = pow(color, vec3(2.2));
+
+	if (volumetricLightStrength > 0.0) {
+		float rawDepth = texture2D(depthmap, uv).r;
+
+		color = applyVolumetricLight(color, uv, rawDepth);
+	}
+
+	gl_FragColor = vec4(color, 1.0); // force full alpha to avoid holes in the image.
+}
diff --git a/client/shaders/volumetric_light/opengl_vertex.glsl b/client/shaders/volumetric_light/opengl_vertex.glsl
new file mode 100644
index 000000000..d264ae071
--- /dev/null
+++ b/client/shaders/volumetric_light/opengl_vertex.glsl
@@ -0,0 +1,12 @@
+#ifdef GL_ES
+varying mediump vec2 varTexCoord;
+#else
+centroid varying vec2 varTexCoord;
+#endif
+
+
+void main(void)
+{
+	varTexCoord.st = inTexCoord0.st;
+	gl_Position = inVertexPosition;
+}
diff --git a/clientmods/preview/init.lua b/clientmods/preview/init.lua
index 46d59ec9a..f8d3a006b 100644
--- a/clientmods/preview/init.lua
+++ b/clientmods/preview/init.lua
@@ -33,7 +33,7 @@ end)
 core.after(1, function()
 	print("armor: " .. dump(core.localplayer:get_armor_groups()))
 	id = core.localplayer:hud_add({
-			hud_elem_type = "text",
+			type = "text",
 			name = "example",
 			number = 0xff0000,
 			position = {x=0, y=1},
diff --git a/cmake/Modules/MinetestAndroidLibs.cmake b/cmake/Modules/MinetestAndroidLibs.cmake
index a133976cb..0f8e4fa29 100644
--- a/cmake/Modules/MinetestAndroidLibs.cmake
+++ b/cmake/Modules/MinetestAndroidLibs.cmake
@@ -1,31 +1,29 @@
 set(DEPS "${CMAKE_SOURCE_DIR}/android/native/deps/${ANDROID_ABI}")
 
-add_library(IrrlichtMt::IrrlichtMt STATIC IMPORTED)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	INTERFACE_INCLUDE_DIRECTORIES ${DEPS}/Irrlicht/include)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	IMPORTED_LOCATION ${DEPS}/Irrlicht/libIrrlichtMt.a)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	INTERFACE_LINK_LIBRARIES "EGL;GLESv1_CM;GLESv2;${DEPS}/Irrlicht/libpng.a;${DEPS}/Irrlicht/libjpeg.a")
-
 set(CURL_INCLUDE_DIR ${DEPS}/Curl/include)
 set(CURL_LIBRARY ${DEPS}/Curl/libcurl.a;${DEPS}/Curl/libmbedcrypto.a;${DEPS}/Curl/libmbedtls.a;${DEPS}/Curl/libmbedx509.a)
-set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/Freetype/include/freetype2)
 set(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR_ft2build}/freetype)
+set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/Freetype/include/freetype2)
 set(FREETYPE_LIBRARY ${DEPS}/Freetype/libfreetype.a)
 set(GETTEXT_INCLUDE_DIR ${DEPS}/Gettext/include;${DEPS}/Iconv/include)
 set(GETTEXT_LIBRARY ${DEPS}/Gettext/libintl.a)
 set(ICONV_LIBRARY ${DEPS}/Iconv/libiconv.a;${DEPS}/Iconv/libcharset.a)
+set(JPEG_INCLUDE_DIR ${DEPS}/JPEG/include)
+set(JPEG_LIBRARY ${DEPS}/JPEG/libjpeg.a)
 set(LUA_INCLUDE_DIR ${DEPS}/LuaJIT/include)
 set(LUA_LIBRARY ${DEPS}/LuaJIT/libluajit.a)
 set(OGG_INCLUDE_DIR ${DEPS}/Vorbis/include)
 set(OGG_LIBRARY ${DEPS}/Vorbis/libogg.a)
 set(OPENAL_INCLUDE_DIR ${DEPS}/OpenAL-Soft/include)
 set(OPENAL_LIBRARY ${DEPS}/OpenAL-Soft/libopenal.a;OpenSLES)
+set(PNG_LIBRARY ${DEPS}/PNG/libpng.a)
+set(PNG_PNG_INCLUDE_DIR ${DEPS}/PNG/include)
 set(SQLITE3_INCLUDE_DIR ${DEPS}/SQLite/include)
 set(SQLITE3_LIBRARY ${DEPS}/SQLite/libsqlite3.a)
 set(VORBIS_INCLUDE_DIR ${DEPS}/Vorbis/include)
-set(VORBISFILE_LIBRARY ${DEPS}/Vorbis/libvorbisfile.a)
 set(VORBIS_LIBRARY ${DEPS}/Vorbis/libvorbis.a)
+set(VORBISFILE_LIBRARY ${DEPS}/Vorbis/libvorbisfile.a)
 set(ZSTD_INCLUDE_DIR ${DEPS}/Zstd/include)
 set(ZSTD_LIBRARY ${DEPS}/Zstd/libzstd.a)
+set(SDL2_INCLUDE_DIRS ${DEPS}/SDL2/include/SDL2)
+set(SDL2_LIBRARIES ${DEPS}/SDL2/libSDL2.a)
diff --git a/cmake/Modules/MinetestFindIrrlichtHeaders.cmake b/cmake/Modules/MinetestFindIrrlichtHeaders.cmake
deleted file mode 100644
index e434b582f..000000000
--- a/cmake/Modules/MinetestFindIrrlichtHeaders.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Locate IrrlichtMt headers on system.
-
-find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
-	DOC "Path to the directory with IrrlichtMt includes"
-	PATHS
-	/usr/local/include/irrlichtmt
-	/usr/include/irrlichtmt
-	/system/develop/headers/irrlichtmt #Haiku
-	PATH_SUFFIXES "include/irrlichtmt"
-)
-
-# Handholding for users
-if(IRRLICHT_INCLUDE_DIR AND (NOT IS_DIRECTORY "${IRRLICHT_INCLUDE_DIR}" OR
-	NOT EXISTS "${IRRLICHT_INCLUDE_DIR}/irrlicht.h"))
-	message(WARNING "IRRLICHT_INCLUDE_DIR was set to ${IRRLICHT_INCLUDE_DIR} "
-		"but irrlicht.h does not exist inside. The path will not be used.")
-	unset(IRRLICHT_INCLUDE_DIR CACHE)
-endif()
diff --git a/doc/android.md b/doc/android.md
index 843d842d3..44e66d7c1 100644
--- a/doc/android.md
+++ b/doc/android.md
@@ -9,8 +9,8 @@ due to limited capabilities of common devices. What can be done is described bel
 While you're playing the game normally (that is, no menu or inventory is
 shown), the following controls are available:
 * Look around: touch screen and slide finger
-* Tap: Place a node
-* Long tap: Dig node or use the held item
+* Tap: Place a node, punch an object or use the selected item (default)
+* Long tap: Dig a node or use the selected item (default)
 * Press back: Pause menu
 * Touch buttons: Press button
 * Buttons:
diff --git a/doc/client_lua_api.md b/doc/client_lua_api.md
index 2411d8fc1..cbf243616 100644
--- a/doc/client_lua_api.md
+++ b/doc/client_lua_api.md
@@ -1,4 +1,4 @@
-Minetest Lua Client Modding API Reference 5.8.0
+Minetest Lua Client Modding API Reference 5.9.0
 ================================================
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>
@@ -8,7 +8,7 @@ Introduction
 
 ** WARNING: The client API is currently unstable, and may break/change without warning. **
 
-Content and functionality can be added to Minetest 0.4.15-dev+ by using Lua
+Content and functionality can be added to Minetest by using Lua
 scripting in run-time loaded mods.
 
 A mod is a self-contained bunch of scripts, textures and other related
@@ -62,7 +62,7 @@ Generic:
 
 In a run-in-place version (e.g. the distributed windows version):
 
-* `minetest-0.4.x/clientmods/` (User-installed mods)
+* `minetest/clientmods/` (User-installed mods)
 
 On an installed version on Linux:
 
@@ -185,15 +185,9 @@ Examples of sound parameter tables:
     pos = {x = 1, y = 2, z = 3},
     gain = 1.0, -- default
 }
--- Play connected to an object, looped
-{
-    object = <an ObjectRef>,
-    gain = 1.0, -- default
-    loop = true,
-}
 ```
 
-Looped sounds must either be connected to an object or played locationless.
+Looped sounds must be played locationless.
 
 ### SimpleSoundSpec
 * e.g. `""`
@@ -220,387 +214,20 @@ For helper functions see "Vector helpers".
 
 Flag Specifier Format
 ---------------------
-Flags using the standardized flag specifier format can be specified in either of
-two ways, by string or table.
 
-The string format is a comma-delimited set of flag names; whitespace and
-unrecognized flag fields are ignored. Specifying a flag in the string sets the
-flag, and specifying a flag prefixed by the string `"no"` explicitly
-clears the flag from whatever the default may be.
-
-In addition to the standard string flag format, the schematic flags field can
-also be a table of flag names to boolean values representing whether or not the
-flag is set. Additionally, if a field with the flag name prefixed with `"no"`
-is present, mapped to a boolean of any value, the specified flag is unset.
-
-E.g. A flag field of value
-
-```lua
-{place_center_x = true, place_center_y=false, place_center_z=true}
-```
-
-is equivalent to
-
-```lua
-{place_center_x = true, noplace_center_y=true, place_center_z=true}
-```
-
-which is equivalent to
-
-```lua
-"place_center_x, noplace_center_y, place_center_z"
-```
-
-or even
-
-```lua
-"place_center_x, place_center_z"
-```
-
-since, by default, no schematic attributes are set.
+Refer to `lua_api.md`.
 
 Formspec
 --------
+
 Formspec defines a menu. It is a string, with a somewhat strange format.
 
-Spaces and newlines can be inserted between the blocks, as is used in the
-examples.
-
-### Examples
-
-#### Chest
-
-    size[8,9]
-    list[context;main;0,0;8,4;]
-    list[current_player;main;0,5;8,4;]
-
-#### Furnace
-
-    size[8,9]
-    list[context;fuel;2,3;1,1;]
-    list[context;src;2,1;1,1;]
-    list[context;dst;5,1;2,2;]
-    list[current_player;main;0,5;8,4;]
-
-#### Minecraft-like player inventory
-
-    size[8,7.5]
-    image[1,0.6;1,2;player.png]
-    list[current_player;main;0,3.5;8,4;]
-    list[current_player;craft;3,0;3,3;]
-    list[current_player;craftpreview;7,1;1,1;]
-
-### Elements
-
-#### `size[<W>,<H>,<fixed_size>]`
-* Define the size of the menu in inventory slots
-* `fixed_size`: `true`/`false` (optional)
-* deprecated: `invsize[<W>,<H>;]`
-
-#### `container[<X>,<Y>]`
-* Start of a container block, moves all physical elements in the container by (X, Y)
-* Must have matching container_end
-* Containers can be nested, in which case the offsets are added
-  (child containers are relative to parent containers)
-
-#### `container_end[]`
-* End of a container, following elements are no longer relative to this container
-
-#### `list[<inventory location>;<list name>;<X>,<Y>;<W>,<H>;]`
-* Show an inventory list
-
-#### `list[<inventory location>;<list name>;<X>,<Y>;<W>,<H>;<starting item index>]`
-* Show an inventory list
-
-#### `listring[<inventory location>;<list name>]`
-* Allows to create a ring of inventory lists
-* Shift-clicking on items in one element of the ring
-  will send them to the next inventory list inside the ring
-* The first occurrence of an element inside the ring will
-  determine the inventory where items will be sent to
-
-#### `listring[]`
-* Shorthand for doing `listring[<inventory location>;<list name>]`
-  for the last two inventory lists added by list[...]
-
-#### `listcolors[<slot_bg_normal>;<slot_bg_hover>]`
-* Sets background color of slots as `ColorString`
-* Sets background color of slots on mouse hovering
-
-#### `listcolors[<slot_bg_normal>;<slot_bg_hover>;<slot_border>]`
-* Sets background color of slots as `ColorString`
-* Sets background color of slots on mouse hovering
-* Sets color of slots border
-
-#### `listcolors[<slot_bg_normal>;<slot_bg_hover>;<slot_border>;<tooltip_bgcolor>;<tooltip_fontcolor>]`
-* Sets background color of slots as `ColorString`
-* Sets background color of slots on mouse hovering
-* Sets color of slots border
-* Sets default background color of tooltips
-* Sets default font color of tooltips
-
-#### `tooltip[<gui_element_name>;<tooltip_text>;<bgcolor>,<fontcolor>]`
-* Adds tooltip for an element
-* `<bgcolor>` tooltip background color as `ColorString` (optional)
-* `<fontcolor>` tooltip font color as `ColorString` (optional)
-
-#### `image[<X>,<Y>;<W>,<H>;<texture name>]`
-* Show an image
-* Position and size units are inventory slots
-
-#### `item_image[<X>,<Y>;<W>,<H>;<item name>]`
-* Show an inventory image of registered item/node
-* Position and size units are inventory slots
-
-#### `bgcolor[<color>;<fullscreen>]`
-* Sets background color of formspec as `ColorString`
-* If `true`, the background color is drawn fullscreen (does not affect the size of the formspec)
-
-#### `background[<X>,<Y>;<W>,<H>;<texture name>]`
-* Use a background. Inventory rectangles are not drawn then.
-* Position and size units are inventory slots
-* Example for formspec 8x4 in 16x resolution: image shall be sized
-  8 times 16px  times  4 times 16px.
-
-#### `background[<X>,<Y>;<W>,<H>;<texture name>;<auto_clip>]`
-* Use a background. Inventory rectangles are not drawn then.
-* Position and size units are inventory slots
-* Example for formspec 8x4 in 16x resolution:
-  image shall be sized 8 times 16px  times  4 times 16px
-* If `true` the background is clipped to formspec size
-  (`x` and `y` are used as offset values, `w` and `h` are ignored)
-
-#### `pwdfield[<X>,<Y>;<W>,<H>;<name>;<label>]`
-* Textual password style field; will be sent to server when a button is clicked
-* When enter is pressed in field, fields.key_enter_field will be sent with the name
-  of this field.
-* `x` and `y` position the field relative to the top left of the menu
-* `w` and `h` are the size of the field
-* Fields are a set height, but will be vertically centered on `h`
-* Position and size units are inventory slots
-* `name` is the name of the field as returned in fields to `on_receive_fields`
-* `label`, if not blank, will be text printed on the top left above the field
-* See field_close_on_enter to stop enter closing the formspec
-
-#### `field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
-* Textual field; will be sent to server when a button is clicked
-* When enter is pressed in field, fields.key_enter_field will be sent with the name
-  of this field.
-* `x` and `y` position the field relative to the top left of the menu
-* `w` and `h` are the size of the field
-* Fields are a set height, but will be vertically centered on `h`
-* Position and size units are inventory slots
-* `name` is the name of the field as returned in fields to `on_receive_fields`
-* `label`, if not blank, will be text printed on the top left above the field
-* `default` is the default value of the field
-    * `default` may contain variable references such as `${text}'` which
-      will fill the value from the metadata value `text`
-    * **Note**: no extra text or more than a single variable is supported ATM.
-* See field_close_on_enter to stop enter closing the formspec
-
-#### `field[<name>;<label>;<default>]`
-* As above, but without position/size units
-* When enter is pressed in field, fields.key_enter_field will be sent with the name
-  of this field.
-* Special field for creating simple forms, such as sign text input
-* Must be used without a `size[]` element
-* A "Proceed" button will be added automatically
-* See field_close_on_enter to stop enter closing the formspec
-
-#### `field_close_on_enter[<name>;<close_on_enter>]`
-* <name> is the name of the field
-* if <close_on_enter> is false, pressing enter in the field will submit the form but not close it
-* defaults to true when not specified (ie: no tag for a field)
-
-#### `textarea[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]`
-* Same as fields above, but with multi-line input
-
-#### `label[<X>,<Y>;<label>]`
-* `x` and `y` work as per field
-* `label` is the text on the label
-* Position and size units are inventory slots
-
-#### `vertlabel[<X>,<Y>;<label>]`
-* Textual label drawn vertically
-* `x` and `y` work as per field
-* `label` is the text on the label
-* Position and size units are inventory slots
-
-#### `button[<X>,<Y>;<W>,<H>;<name>;<label>]`
-* Clickable button. When clicked, fields will be sent.
-* `x`, `y` and `name` work as per field
-* `w` and `h` are the size of the button
-* Fixed button height. It will be vertically centered on `h`
-* `label` is the text on the button
-* Position and size units are inventory slots
-
-#### `image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]`
-* `x`, `y`, `w`, `h`, and `name` work as per button
-* `texture name` is the filename of an image
-* Position and size units are inventory slots
-
-#### `image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>;<noclip>;<drawborder>;<pressed texture name>]`
-* `x`, `y`, `w`, `h`, and `name` work as per button
-* `texture name` is the filename of an image
-* Position and size units are inventory slots
-* `noclip=true` means the image button doesn't need to be within specified formsize
-* `drawborder`: draw button border or not
-* `pressed texture name` is the filename of an image on pressed state
-
-#### `item_image_button[<X>,<Y>;<W>,<H>;<item name>;<name>;<label>]`
-* `x`, `y`, `w`, `h`, `name` and `label` work as per button
-* `item name` is the registered name of an item/node,
-   tooltip will be made out of its description
-   to override it use tooltip element
-* Position and size units are inventory slots
-
-#### `button_exit[<X>,<Y>;<W>,<H>;<name>;<label>]`
-* When clicked, fields will be sent and the form will quit.
-
-#### `image_button_exit[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]`
-* When clicked, fields will be sent and the form will quit.
-
-#### `textlist[<X>,<Y>;<W>,<H>;<name>;<listelem 1>,<listelem 2>,...,<listelem n>]`
-* Scrollable item list showing arbitrary text elements
-* `x` and `y` position the itemlist relative to the top left of the menu
-* `w` and `h` are the size of the itemlist
-* `name` fieldname sent to server on doubleclick value is current selected element
-* `listelements` can be prepended by #color in hexadecimal format RRGGBB (only),
-     * if you want a listelement to start with "#" write "##".
-
-#### `textlist[<X>,<Y>;<W>,<H>;<name>;<listelem 1>,<listelem 2>,...,<listelem n>;<selected idx>;<transparent>]`
-* Scrollable itemlist showing arbitrary text elements
-* `x` and `y` position the item list relative to the top left of the menu
-* `w` and `h` are the size of the item list
-* `name` fieldname sent to server on doubleclick value is current selected element
-* `listelements` can be prepended by #RRGGBB (only) in hexadecimal format
-     * if you want a listelement to start with "#" write "##"
-* Index to be selected within textlist
-* `true`/`false`: draw transparent background
-* See also `minetest.explode_textlist_event` (main menu: `engine.explode_textlist_event`)
-
-#### `tabheader[<X>,<Y>;<name>;<caption 1>,<caption 2>,...,<caption n>;<current_tab>;<transparent>;<draw_border>]`
-* Show a tab**header** at specific position (ignores formsize)
-* `x` and `y` position the itemlist relative to the top left of the menu
-* `name` fieldname data is transferred to Lua
-* `caption 1`...: name shown on top of tab
-* `current_tab`: index of selected tab 1...
-* `transparent` (optional): show transparent
-* `draw_border` (optional): draw border
-
-#### `box[<X>,<Y>;<W>,<H>;<color>]`
-* Simple colored semitransparent box
-* `x` and `y` position the box relative to the top left of the menu
-* `w` and `h` are the size of box
-* `color` is color specified as a `ColorString`
-
-#### `dropdown[<X>,<Y>;<W>;<name>;<item 1>,<item 2>, ...,<item n>;<selected idx>]`
-* Show a dropdown field
-* **Important note**: There are two different operation modes:
-     1. handle directly on change (only changed dropdown is submitted)
-     2. read the value on pressing a button (all dropdown values are available)
-* `x` and `y` position of dropdown
-* Width of dropdown
-* Fieldname data is transferred to Lua
-* Items to be shown in dropdown
-* Index of currently selected dropdown item
-
-#### `checkbox[<X>,<Y>;<name>;<label>;<selected>]`
-* Show a checkbox
-* `x` and `y`: position of checkbox
-* `name` fieldname data is transferred to Lua
-* `label` to be shown left of checkbox
-* `selected` (optional): `true`/`false`
-
-#### `scrollbar[<X>,<Y>;<W>,<H>;<orientation>;<name>;<value>]`
-* Show a scrollbar
-* There are two ways to use it:
-     1. handle the changed event (only changed scrollbar is available)
-     2. read the value on pressing a button (all scrollbars are available)
-* `x` and `y`: position of trackbar
-* `w` and `h`: width and height
-* `orientation`:  `vertical`/`horizontal`
-* Fieldname data is transferred to Lua
-* Value this trackbar is set to (`0`-`1000`)
-* See also `minetest.explode_scrollbar_event` (main menu: `engine.explode_scrollbar_event`)
-
-#### `table[<X>,<Y>;<W>,<H>;<name>;<cell 1>,<cell 2>,...,<cell n>;<selected idx>]`
-* Show scrollable table using options defined by the previous `tableoptions[]`
-* Displays cells as defined by the previous `tablecolumns[]`
-* `x` and `y`: position the itemlist relative to the top left of the menu
-* `w` and `h` are the size of the itemlist
-* `name`: fieldname sent to server on row select or doubleclick
-* `cell 1`...`cell n`: cell contents given in row-major order
-* `selected idx`: index of row to be selected within table (first row = `1`)
-* See also `minetest.explode_table_event` (main menu: `engine.explode_table_event`)
-
-#### `tableoptions[<opt 1>;<opt 2>;...]`
-* Sets options for `table[]`
-* `color=#RRGGBB`
-     * default text color (`ColorString`), defaults to `#FFFFFF`
-* `background=#RRGGBB`
-     * table background color (`ColorString`), defaults to `#000000`
-* `border=<true/false>`
-     * should the table be drawn with a border? (default: `true`)
-* `highlight=#RRGGBB`
-     * highlight background color (`ColorString`), defaults to `#466432`
-* `highlight_text=#RRGGBB`
-     * highlight text color (`ColorString`), defaults to `#FFFFFF`
-* `opendepth=<value>`
-     * all subtrees up to `depth < value` are open (default value = `0`)
-     * only useful when there is a column of type "tree"
-
-#### `tablecolumns[<type 1>,<opt 1a>,<opt 1b>,...;<type 2>,<opt 2a>,<opt 2b>;...]`
-* Sets columns for `table[]`
-* Types: `text`, `image`, `color`, `indent`, `tree`
-    * `text`:   show cell contents as text
-    * `image`:  cell contents are an image index, use column options to define images
-    * `color`:   cell contents are a ColorString and define color of following cell
-    * `indent`: cell contents are a number and define indentation of following cell
-    * `tree`:   same as indent, but user can open and close subtrees (treeview-like)
-* Column options:
-    * `align=<value>`
-        * for `text` and `image`: content alignment within cells.
-          Available values: `left` (default), `center`, `right`, `inline`
-    * `width=<value>`
-        * for `text` and `image`: minimum width in em (default: `0`)
-        * for `indent` and `tree`: indent width in em (default: `1.5`)
-    * `padding=<value>`: padding left of the column, in em (default `0.5`).
-      Exception: defaults to 0 for indent columns
-    * `tooltip=<value>`: tooltip text (default: empty)
-    * `image` column options:
-        * `0=<value>` sets image for image index 0
-        * `1=<value>` sets image for image index 1
-        * `2=<value>` sets image for image index 2
-        * and so on; defined indices need not be contiguous empty or
-          non-numeric cells are treated as `0`.
-    * `color` column options:
-        * `span=<value>`: number of following columns to affect (default: infinite)
-
-**Note**: do _not_ use an element name starting with `key_`; those names are reserved to
-pass key press events to formspec!
+For details, refer to `lua_api.md`.
 
 Spatial Vectors
 ---------------
-* `vector.new(a[, b, c])`: returns a vector:
-    * A copy of `a` if `a` is a vector.
-    * `{x = a, y = b, z = c}`, if all `a, b, c` are defined
-* `vector.direction(p1, p2)`: returns a vector
-* `vector.distance(p1, p2)`: returns a number
-* `vector.length(v)`: returns a number
-* `vector.normalize(v)`: returns a vector
-* `vector.floor(v)`: returns a vector, each dimension rounded down
-* `vector.round(v)`: returns a vector, each dimension rounded to nearest int
-* `vector.apply(v, func)`: returns a vector
-* `vector.combine(v, w, func)`: returns a vector
-* `vector.equals(v1, v2)`: returns a boolean
 
-For the following functions `x` can be either a vector or a number:
-
-* `vector.add(v, x)`: returns a vector
-* `vector.subtract(v, x)`: returns a vector
-* `vector.multiply(v, x)`: returns a scaled vector or Schur product
-* `vector.divide(v, x)`: returns a scaled vector or Schur quotient
+Refer to `lua_api.md`.
 
 Helper functions
 ----------------
@@ -687,7 +314,8 @@ Minetest namespace reference
 Call these functions only at load time!
 
 * `minetest.register_globalstep(function(dtime))`
-    * Called every client environment step, usually interval of 0.1s
+    * Called every client environment step
+	* `dtime` is the time since last execution in seconds.
 * `minetest.register_on_mods_loaded(function())`
     * Called just after mods have finished loading.
 * `minetest.register_on_shutdown(function())`
@@ -770,6 +398,10 @@ Call these functions only at load time!
 * `minetest.after(time, func, ...)`
     * Call the function `func` after `time` seconds, may be fractional
     * Optional: Variable number of arguments that are passed to `func`
+    * Jobs set for earlier times are executed earlier. If multiple jobs expire
+      at exactly the same time, then they expire in the order in which they were
+      registered. This basically just applies to jobs registered on the same
+      step with the exact same delay.
 * `minetest.get_us_time()`
     * Returns time with microsecond precision. May not return wall time.
 * `minetest.get_timeofday()`
@@ -1071,8 +703,18 @@ Methods:
         ```lua
         {
             speed = float,
+            speed_climb = float,
+            speed_crouch = float,
+            speed_fast = float,
+            speed_walk = float,
+            acceleration_default = float,
+            acceleration_air = float,
+            acceleration_fast = float,
             jump = float,
             gravity = float,
+            liquid_fluidity = float,
+            liquid_fluidity_smooth = float,
+            liquid_sink = float,
             sneak = boolean,
             sneak_glitch = boolean,
             new_move = boolean,
@@ -1088,7 +730,8 @@ Methods:
 * `get_breath()`
     * returns the player's breath
 * `get_movement_acceleration()`
-    * returns acceleration of the player in different environments:
+    * returns acceleration of the player in different environments
+      (note: does not take physics overrides into account):
 
         ```lua
         {
@@ -1099,7 +742,8 @@ Methods:
         ```
 
 * `get_movement_speed()`
-    * returns player's speed in different environments:
+    * returns player's speed in different environments
+      (note: does not take physics overrides into account):
 
         ```lua
         {
@@ -1112,7 +756,8 @@ Methods:
         ```
 
 * `get_movement()`
-    * returns player's movement in different environments:
+    * returns player's movement in different environments
+      (note: does not take physics overrides into account):
 
         ```lua
         {
@@ -1152,6 +797,10 @@ Methods:
     * See [`HUD definition`](#hud-definition-hud_add-hud_get)
 * `hud_get(id)`
     * returns the [`definition`](#hud-definition-hud_add-hud_get) of the HUD with that ID number or `nil`, if non-existent.
+* `hud_get_all()`:
+    * Returns a table in the form `{ [id] = HUD definition, [id] = ... }`.
+    * A mod should keep track of its introduced IDs and only use this to access foreign elements.
+    * It is discouraged to change foreign HUD elements.
 * `hud_remove(id)`
     * remove the HUD element of the specified id, returns `true` on success
 * `hud_change(id, stat, value)`
@@ -1249,7 +898,7 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
         "node1",
         "node2"
     },
-    post_effect_color = Color,      -- Color overlayed on the screen when the player is in the node
+    post_effect_color = Color,      -- Color overlaid on the screen when the player is in the node
     leveled = number,               -- Max level for node
     sunlight_propogates = bool,     -- Whether light passes through the block
     light_source = number,          -- Light emitted by the block
@@ -1319,6 +968,7 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
 ```
 
 ### Server info
+
 ```lua
 {
 	address = "minetest.example.org", -- The domain name/IP address of a remote server or "" for a local server.
@@ -1330,30 +980,7 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
 
 ### HUD Definition (`hud_add`, `hud_get`)
 
-```lua
-{
-    hud_elem_type = "image", -- see HUD element types, default "text"
---  ^ type of HUD element, can be either of "image", "text", "statbar", or "inventory"
-    position = {x=0.5, y=0.5},
---  ^ Left corner position of element, default `{x=0,y=0}`.
-    name = "<name>",    -- default ""
-    scale = {x=2, y=2}, -- default {x=0,y=0}
-    text = "<text>",    -- default ""
-    number = 2,         -- default 0
-    item = 3,           -- default 0
---  ^ Selected item in inventory.  0 for no item selected.
-    direction = 0,      -- default 0
---  ^ Direction: 0: left-right, 1: right-left, 2: top-bottom, 3: bottom-top
-    alignment = {x=0, y=0},   -- default {x=0, y=0}
---  ^ See "HUD Element Types"
-    offset = {x=0, y=0},      -- default {x=0, y=0}
---  ^ See "HUD Element Types"
-    size = { x=100, y=100 },  -- default {x=0, y=0}
---  ^ Size of element in pixels
-    style = 0,
---  ^ For "text" elements sets font style: bitfield with 1 = bold, 2 = italic, 4 = monospace
-}
-```
+Refer to `lua_api.md`.
 
 Escape sequences
 ----------------
@@ -1381,177 +1008,17 @@ The following functions provide escape sequences:
 
 `ColorString`
 -------------
-`#RGB` defines a color in hexadecimal format.
 
-`#RGBA` defines a color in hexadecimal format and alpha channel.
-
-`#RRGGBB` defines a color in hexadecimal format.
-
-`#RRGGBBAA` defines a color in hexadecimal format and alpha channel.
-
-Named colors are also supported and are equivalent to
-[CSS Color Module Level 4](http://dev.w3.org/csswg/css-color/#named-colors).
-To specify the value of the alpha channel, append `#A` or `#AA` to the end of
-the color name (e.g. `colorname#08`).
+Refer to `lua_api.md`.
 
 `Color`
 -------------
 `{a = alpha, r = red, g = green, b = blue}` defines an ARGB8 color.
 
-HUD element types
------------------
-The position field is used for all element types.
-
-To account for differing resolutions, the position coordinates are the percentage
-of the screen, ranging in value from `0` to `1`.
-
-The name field is not yet used, but should contain a description of what the
-HUD element represents. The direction field is the direction in which something
-is drawn.
-
-`0` draws from left to right, `1` draws from right to left, `2` draws from
-top to bottom, and `3` draws from bottom to top.
-
-The `alignment` field specifies how the item will be aligned. It ranges from `-1` to `1`,
-with `0` being the center, `-1` is moved to the left/up, and `1` is to the right/down.
-Fractional values can be used.
-
-The `offset` field specifies a pixel offset from the position. Contrary to position,
-the offset is not scaled to screen size. This allows for some precisely-positioned
-items in the HUD.
-
-**Note**: `offset` _will_ adapt to screen DPI as well as user defined scaling factor!
-
-Below are the specific uses for fields in each type; fields not listed for that type are ignored.
-
-**Note**: Future revisions to the HUD API may be incompatible; the HUD API is still
-in the experimental stages.
-
-### `image`
-Displays an image on the HUD.
-
-* `scale`: The scale of the image, with 1 being the original texture size.
-  Only the X coordinate scale is used (positive values).
-  Negative values represent that percentage of the screen it
-  should take; e.g. `x=-100` means 100% (width).
-* `text`: The name of the texture that is displayed.
-* `alignment`: The alignment of the image.
-* `offset`: offset in pixels from position.
-
-### `text`
-Displays text on the HUD.
-
-* `scale`: Defines the bounding rectangle of the text.
-  A value such as `{x=100, y=100}` should work.
-* `text`: The text to be displayed in the HUD element.
-* `number`: An integer containing the RGB value of the color used to draw the text.
-  Specify `0xFFFFFF` for white text, `0xFF0000` for red, and so on.
-* `alignment`: The alignment of the text.
-* `offset`: offset in pixels from position.
-
-### `statbar`
-Displays a horizontal bar made up of half-images.
-
-* `text`: The name of the texture that is used.
-* `number`: The number of half-textures that are displayed.
-  If odd, will end with a vertically center-split texture.
-* `direction`
-* `offset`: offset in pixels from position.
-* `size`: If used, will force full-image size to this value (override texture pack image size)
-
-### `inventory`
-* `text`: The name of the inventory list to be displayed.
-* `number`: Number of items in the inventory to be displayed.
-* `item`: Position of item that is selected.
-* `direction`
-* `offset`: offset in pixels from position.
-
-### `waypoint`
-
-Displays distance to selected world position.
-
-* `name`: The name of the waypoint.
-* `text`: Distance suffix. Can be blank.
-* `precision`: Waypoint precision, integer >= 0. Defaults to 10.
-  If set to 0, distance is not shown. Shown value is `floor(distance*precision)/precision`.
-  When the precision is an integer multiple of 10, there will be `log_10(precision)` digits after the decimal point.
-  `precision = 1000`, for example, will show 3 decimal places (eg: `0.999`).
-  `precision = 2` will show multiples of `0.5`; precision = 5 will show multiples of `0.2` and so on:
-  `precision = n` will show multiples of `1/n`
-* `number:` An integer containing the RGB value of the color used to draw the
-  text.
-* `world_pos`: World position of the waypoint.
-* `offset`: offset in pixels from position.
-* `alignment`: The alignment of the waypoint.
-
-### `image_waypoint`
-
-Same as `image`, but does not accept a `position`; the position is instead determined by `world_pos`, the world position of the waypoint.
-
-* `scale`: The scale of the image, with 1 being the original texture size.
-  Only the X coordinate scale is used (positive values).
-  Negative values represent that percentage of the screen it
-  should take; e.g. `x=-100` means 100% (width).
-* `text`: The name of the texture that is displayed.
-* `alignment`: The alignment of the image.
-* `world_pos`: World position of the waypoint.
-* `offset`: offset in pixels from position.
-
 ### Particle definition (`add_particle`)
 
-```lua
-{
-    pos = {x=0, y=0, z=0},
-    velocity = {x=0, y=0, z=0},
-    acceleration = {x=0, y=0, z=0},
-    --  ^ Spawn particle at pos with velocity and acceleration
-    expirationtime = 1,
-    --  ^ Disappears after expirationtime seconds
-    size = 1,
-    collisiondetection = false,
-    --  ^ collisiondetection: if true collides with physical objects
-    collision_removal = false,
-    --  ^ collision_removal: if true then particle is removed when it collides,
-    --  ^ requires collisiondetection = true to have any effect
-    vertical = false,
-    --  ^ vertical: if true faces player using y axis only
-    texture = "image.png",
-    --  ^ Uses texture (string)
-    animation = {Tile Animation definition},
-    --  ^ optional, specifies how to animate the particle texture
-    glow = 0
-    --  ^ optional, specify particle self-luminescence in darkness
-}
-```
+As documented in `lua_api.md`, except for obvious reasons, the `playername` field is not supported.
 
 ### `ParticleSpawner` definition (`add_particlespawner`)
 
-```lua
-{
-    amount = 1,
-    time = 1,
-    --  ^ If time is 0 has infinite lifespan and spawns the amount on a per-second base
-    minpos = {x=0, y=0, z=0},
-    maxpos = {x=0, y=0, z=0},
-    minvel = {x=0, y=0, z=0},
-    maxvel = {x=0, y=0, z=0},
-    minacc = {x=0, y=0, z=0},
-    maxacc = {x=0, y=0, z=0},
-    minexptime = 1,
-    maxexptime = 1,
-    minsize = 1,
-    maxsize = 1,
-    --  ^ The particle's properties are random values in between the bounds:
-    --  ^ minpos/maxpos, minvel/maxvel (velocity), minacc/maxacc (acceleration),
-    --  ^ minsize/maxsize, minexptime/maxexptime (expirationtime)
-    collisiondetection = false,
-    --  ^ collisiondetection: if true uses collision detection
-    collision_removal = false,
-    --  ^ collision_removal: if true then particle is removed when it collides,
-    --  ^ requires collisiondetection = true to have any effect
-    vertical = false,
-    --  ^ vertical: if true faces player using y axis only
-    texture = "image.png",
-    --  ^ Uses texture (string)
-}
-```
+As documented in `lua_api.md`, except for obvious reasons, the `playername` field is not supported.
diff --git a/doc/compiling/README.md b/doc/compiling/README.md
index f4812e77d..a1ab1ebbd 100644
--- a/doc/compiling/README.md
+++ b/doc/compiling/README.md
@@ -20,6 +20,8 @@ General options and their default values:
         SemiDebug              - Partially optimized debug build
         RelWithDebInfo         - Release build with debug information
         MinSizeRel             - Release build with -Os passed to compiler to make executable as small as possible
+    PRECOMPILE_HEADERS=FALSE   - Precompile some headers (experimental; requires CMake 3.16 or later)
+    PRECOMPILED_HEADERS_PATH=  - Path to a file listing all headers to precompile (default points to src/precompiled_headers.txt)
     ENABLE_CURL=ON             - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
     ENABLE_CURSES=ON           - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
     ENABLE_GETTEXT=ON          - Build with Gettext; Allows using translations
@@ -28,6 +30,7 @@ General options and their default values:
     ENABLE_REDIS=ON            - Build with libhiredis; Enables use of Redis map backend
     ENABLE_SPATIAL=ON          - Build with LibSpatial; Speeds up AreaStores
     ENABLE_SOUND=ON            - Build with OpenAL, libogg & libvorbis; in-game sounds
+    ENABLE_LTO=<varies>        - Build with IPO/LTO optimizations (smaller and more efficient than regular build)
     ENABLE_LUAJIT=ON           - Build with LuaJIT (much faster than non-JIT Lua)
     ENABLE_PROMETHEUS=OFF      - Build with Prometheus metrics exporter (listens on tcp/30000 by default)
     ENABLE_SYSTEM_GMP=ON       - Use GMP from system (much faster than bundled mini-gmp)
@@ -37,7 +40,6 @@ General options and their default values:
     INSTALL_DEVTEST=FALSE      - Whether the Development Test game should be installed alongside Minetest
     USE_GPROF=FALSE            - Enable profiling using GProf
     VERSION_EXTRA=             - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)
-    ENABLE_TOUCH=FALSE         - Enable Touchscreen support (requires support by IrrlichtMt)
 
 Library specific options:
 
@@ -54,8 +56,6 @@ Library specific options:
     GETTEXT_LIBRARY                 - Optional/platform-dependent with gettext; path to libintl.so/libintl.dll.a
     GETTEXT_MSGFMT                  - Only when building with gettext; path to msgfmt/msgfmt.exe
     ICONV_LIBRARY                   - Optional/platform-dependent; path to libiconv.so/libiconv.dylib
-    IRRLICHT_DLL                    - Only on Windows; path to IrrlichtMt.dll
-    IRRLICHT_INCLUDE_DIR            - Directory that contains IrrCompileConfig.h (usable for server build only)
     LEVELDB_INCLUDE_DIR             - Only when building with LevelDB; directory that contains db.h
     LEVELDB_LIBRARY                 - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a
     LEVELDB_DLL                     - Only when building with LevelDB on Windows; path to libleveldb.dll
diff --git a/doc/compiling/linux.md b/doc/compiling/linux.md
index 2d057ea2f..3b31250e8 100644
--- a/doc/compiling/linux.md
+++ b/doc/compiling/linux.md
@@ -6,9 +6,12 @@
 | ---------- | ------- | ---------- |
 | GCC        | 7.5+    | or Clang 7.0.1+ |
 | CMake      | 3.5+    |            |
-| IrrlichtMt | -       | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
+| libjpeg    | -       |            |
+| libpng     | -       |            |
+| SDL        | 2.x     |            |
 | Freetype   | 2.0+    |            |
 | SQLite3    | 3+      |            |
+| Zlib       | -       |            |
 | Zstd       | 1.0+    |            |
 | LuaJIT     | 2.0+    | Bundled Lua 5.1 is used if not present |
 | GMP        | 5.0.0+  | Bundled mini-GMP is used if not present |
@@ -26,11 +29,11 @@ For Fedora users:
 
 For openSUSE users:
 
-	sudo zypper install gcc cmake libjpeg8-devel libpng16-devel openal-soft-devel libcurl-devel sqlite3-devel luajit-devel libzstd-devel Mesa-libGL-devel libXi-devel libvorbis-devel freetype2-devel
+	sudo zypper install gcc gcc-c++ cmake libjpeg8-devel libpng16-devel openal-soft-devel libcurl-devel sqlite3-devel luajit-devel libzstd-devel Mesa-libGL-devel libXi-devel libvorbis-devel freetype2-devel
 
 For Arch users:
 
-    sudo pacman -S base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
+    sudo pacman -S --needed base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
 
 For Alpine users:
 
@@ -38,7 +41,7 @@ For Alpine users:
 
 For Void users:
 
-    sudo xbps-install cmake libpng-devel jpeg-devel libXi-devel mesa sqlite-devel libogg-devel libvorbis-devel libopenal-devel libcurl-devel freetype-devel zlib-devel gmp-devel jsoncpp-devel LuaJIT-devel libzstd-devel gettext
+    sudo xbps-install cmake libpng-devel jpeg-devel libXi-devel mesa sqlite-devel libogg-devel libvorbis-devel libopenal-devel libcurl-devel freetype-devel zlib-devel gmp-devel jsoncpp-devel LuaJIT-devel zstd libzstd-devel gettext
 
 ## Download
 
@@ -69,24 +72,12 @@ Download source (this is the URL to the latest of source repository, which might
     git clone --depth 1 https://github.com/minetest/minetest.git
     cd minetest
 
-Download IrrlichtMt to `lib/irrlichtmt`, it will be used to satisfy the IrrlichtMt dependency that way:
-
-    git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt
-
 Download source, without using Git:
 
     wget https://github.com/minetest/minetest/archive/master.tar.gz
     tar xf master.tar.gz
     cd minetest-master
 
-Download IrrlichtMt, without using Git:
-
-    cd lib/
-    wget https://github.com/minetest/irrlicht/archive/master.tar.gz
-    tar xf master.tar.gz
-    mv irrlicht-master irrlichtmt
-    cd ..
-
 ## Build
 
 Build a version that runs directly from the source directory:
@@ -105,12 +96,3 @@ Run it:
 - You can disable the client build by specifying `-DBUILD_CLIENT=FALSE`.
 - You can select between Release and Debug build by `-DCMAKE_BUILD_TYPE=<Debug or Release>`.
   - Debug build is slower, but gives much more useful output in a debugger.
-- If you build a bare server you don't need to compile IrrlichtMt, just the headers suffice.
-  - In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlichtmt/include`.
-
-- Minetest will use the IrrlichtMt package that is found first, given by the following order:
-  1. Specified `IRRLICHTMT_BUILD_DIR` CMake variable
-  2. `${PROJECT_SOURCE_DIR}/lib/irrlichtmt` (if existent)
-  3. Installation of IrrlichtMt in the system-specific library paths
-  4. For server builds with disabled `BUILD_CLIENT` variable, the headers from `IRRLICHT_INCLUDE_DIR` will be used.
-  - NOTE: Changing the IrrlichtMt build directory (includes system installs) requires regenerating the CMake cache (`rm CMakeCache.txt`)
diff --git a/doc/compiling/macos.md b/doc/compiling/macos.md
index 5061223ab..6b9b4b6b8 100644
--- a/doc/compiling/macos.md
+++ b/doc/compiling/macos.md
@@ -8,7 +8,7 @@
 Install dependencies with homebrew:
 
 ```
-brew install cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd gettext
+brew install cmake freetype gettext gmp hiredis jpeg-turbo jsoncpp leveldb libogg libpng libvorbis luajit zstd gettext
 ```
 
 ## Download
@@ -20,12 +20,6 @@ git clone --depth 1 https://github.com/minetest/minetest.git
 cd minetest
 ```
 
-Download Minetest's fork of Irrlicht:
-
-```
-git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt
-```
-
 ## Build
 
 ```bash
@@ -33,13 +27,15 @@ mkdir build
 cd build
 
 cmake .. \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
     -DCMAKE_FIND_FRAMEWORK=LAST \
     -DCMAKE_INSTALL_PREFIX=../build/macos/ \
     -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE
 
 make -j$(sysctl -n hw.logicalcpu)
 make install
+
+# M1 Macs w/ MacOS >= BigSur
+codesign --force --deep -s - macos/minetest.app
 ```
 
 ## Run
diff --git a/doc/compiling/windows.md b/doc/compiling/windows.md
index a6fb8b580..7c20cd81c 100644
--- a/doc/compiling/windows.md
+++ b/doc/compiling/windows.md
@@ -13,11 +13,11 @@
 It is highly recommended to use vcpkg as package manager.
 
 After you successfully built vcpkg you can easily install the required libraries:
+
 ```powershell
-vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry gettext --triplet x64-windows
+vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext opengl-registry --triplet x64-windows
 ```
 
-- **Don't forget about IrrlichtMt.** The easiest way is to clone it to `lib/irrlichtmt` as described in the Linux section.
 - `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
 - `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
 - `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter.
diff --git a/doc/developing/README.md b/doc/developing/README.md
new file mode 100644
index 000000000..7c438436c
--- /dev/null
+++ b/doc/developing/README.md
@@ -0,0 +1,26 @@
+# Developer documentation
+
+## Wiki
+
+Some important development docs are found in the wiki: https://dev.minetest.net/
+
+Notable pages:
+
+- [Releasing Minetest](https://dev.minetest.net/Releasing_Minetest)
+- [Engine translations](https://dev.minetest.net/Translation#Maintaining_engine_translations)
+- [Changelog](https://dev.minetest.net/Changelog)
+- [Organisation](https://dev.minetest.net/Organisation)
+- [Code style guidelines](https://dev.minetest.net/Code_style_guidelines)
+
+## In this folder
+
+- [Developing minetestserver with Docker](docker.md)
+- [Android tips & tricks](android.md)
+- [OS/library compatibility policy](os-compatibility.md)
+- [Miscellaneous](misc.md)
+
+## IRC
+
+Oftentimes knowledge hasn't been written down (yet) and your best bet is to ask someone experienced and/or the core developers.
+
+Feel free to join the [#minetest-dev IRC](https://wiki.minetest.net/IRC) and ask questions related to **engine development**.
diff --git a/doc/developing/android.md b/doc/developing/android.md
new file mode 100644
index 000000000..e278c48d8
--- /dev/null
+++ b/doc/developing/android.md
@@ -0,0 +1,63 @@
+# Android tips & tricks
+
+## Sign the Android APK from CI
+
+The [Github Actions Workflow](https://github.com/minetest/minetest/actions?query=workflow%3Aandroid+event%3Apush)
+automatically produces an APK for each architecture.
+Before installing them onto a device they however need to be signed.
+
+This requires an installation of the Android SDK and `adb`.
+```bash
+.../android-sdk/build-tools/30.0.3/apksigner sign --ks ~/.android/debug.keystore \
+	app-arm64-v8a-release-unsigned.apk
+# Enter 'android' (without quotes) when asked for a password
+```
+
+Note that the `debug.keystore` will not exist if you have never compiled an
+Android app on your system (probably).
+
+After that installing it will work:
+```bash
+adb install -r -d ./app-arm64-v8a-release-unsigned.apk
+```
+
+## How to get debug output from Minetest on Android
+
+In case debug.txt isn't enough (e.g. when debugging a crash), you can get debug
+output using logcat:
+
+`adb logcat -s 'Minetest:*' '*:F'`
+
+Note that you can do this even *after* the app has crashed,
+since Android keeps an internal buffer.
+
+A segmentation fault for example looks like this:
+
+```
+01-10 17:20:22.215 19308 20560 F libc    : Fatal signal 6 (SIGABRT), code -1 (SI_QUEUE) in tid 20560 (MinetestNativeT), pid 19308 (netest.minetest)
+01-10 17:20:22.287 20576 20576 F DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+01-10 17:20:22.287 20576 20576 F DEBUG   : Build fingerprint: '...'
+01-10 17:20:22.287 20576 20576 F DEBUG   : Revision: '4'
+01-10 17:20:22.287 20576 20576 F DEBUG   : ABI: 'arm64'
+01-10 17:20:22.288 20576 20576 F DEBUG   : Timestamp: 2024-01-10 17:20:22+0100
+01-10 17:20:22.288 20576 20576 F DEBUG   : pid: 19308, tid: 20560, name: MinetestNativeT  >>> net.minetest.minetest <<<
+01-10 17:20:22.288 20576 20576 F DEBUG   : uid: 10385
+01-10 17:20:22.288 20576 20576 F DEBUG   : signal 6 (SIGABRT), code -1 (SI_QUEUE), fault addr --------
+[ ... more information follows ... ]
+```
+
+If you want get rid of previous output you can do that with `adb logcat -c`.
+
+## I edited builtin, shaders, ... but nothing changed. Help!
+
+You're probably hitting two problems:
+* the build system only generates assets once
+* the app only re-extracts assets when the version changes
+
+Force regenerating the assets: `./gradlew app:clean`
+
+Erase the app's memory of which version was installed: `adb shell run-as net.minetest.minetest rm shared_prefs/MinetestSettings.xml`
+
+If this doesn't work you can also uninstall it using `adb shell pm uninstall net.minetest.minetest`. You will obviously lose your data.
+
+Then build and install as normal and your changes should be applied.
diff --git a/doc/developing/misc.md b/doc/developing/misc.md
new file mode 100644
index 000000000..1d3d8c941
--- /dev/null
+++ b/doc/developing/misc.md
@@ -0,0 +1,38 @@
+# Miscellaneous
+
+## Profiling Minetest on Linux
+
+We will be using a tool called "perf", which you can get by installing `perf` or `linux-perf` or `linux-tools-common`.
+
+To get usable results you need to build Minetest with debug symbols
+(`-DCMAKE_BUILD_TYPE=RelWithDebInfo` or `-DCMAKE_BUILD_TYPE=Debug`).
+
+Run the client (or server) like this and do whatever you wanted to test:
+```bash
+perf record -z --call-graph dwarf -- ./bin/minetest
+```
+
+This will leave a file called "perf.data".
+
+You can open this file with perf built-in tools but much more interesting
+is the visualization using a GUI tool: **[Hotspot](https://github.com/KDAB/hotspot)**.
+It will give you flamegraphs, per-thread, per-function views and much more.
+
+### Remote Profiling
+
+Attach perf to your running server, press *^C* to stop:
+```bash
+perf record -z --call-graph dwarf -F 400 -p "$(pidof minetestserver)"
+```
+
+Collect a copy of the required libraries/executables:
+```bash
+perf buildid-list | grep -Eo '/[^ ]+(minetestserver|\.so)[^ ]*$' | \
+	tar -cvahf debug.tgz --files-from=- --ignore-failed-read
+```
+
+Give both files to the developer and also provide:
+* Linux distribution and version
+* commit the source was built from and/or modified source code (if applicable)
+
+Hotspot will resolve symbols correctly when pointing the sysroot option at the collected libs.
diff --git a/doc/developing/os-compatibility.md b/doc/developing/os-compatibility.md
new file mode 100644
index 000000000..dfc78bad7
--- /dev/null
+++ b/doc/developing/os-compatibility.md
@@ -0,0 +1,109 @@
+OS/library compatibility policy
+===============================
+
+This document describes how we decide which minimum versions of operating systems, C++ standards,
+libraries, build tools (CMake) or compilers Minetest requires.
+
+Most important is that we do not increase our minimum requirements without a reason or use case.
+A reason can be as simple as "cleaning up legacy support code", but it needs to exist.
+
+As most development happens on Linux the first measure is to check the version of the component in question on:
+* the oldest still-supported **Ubuntu** (End of Standard Support)
+* the oldest still-supported **Debian** (*not* LTS)
+* optional: the second newest **RHEL (derivative)**
+
+Generally this leads to versions about 5 years old and works as a reasonable result for BSDs and other platforms too.
+
+Needless to say that any new requirements need to work on our other platforms too, as listed below.
+
+### Windows
+
+We currently support Windows 8 or later.
+
+Despite requiring explicit support code in numerous places there doesn't seem to be a strong case
+for dropping older Windows versions. We will likely only do it once SDL2 does so.
+
+Note that we're constrained by the versions [vcpkg](https://vcpkg.io/en/packages) offers, for the MSVC build.
+
+### macOS
+
+We currently support macOS 10.14 (Mojave) or later.
+
+Since we do not have any macOS developer we can only do some shallow testing in CI.
+So this is subject to change basically whenever Github throws
+[a new version](https://github.com/actions/runner-images?tab=readme-ov-file#available-images) at us, or for other reasons.
+
+### Android
+
+We currently support Android 5.0 (API 21) or later.
+
+There's usually no reason to raise this unless the NDK drops older versions.
+
+*Note*: You can check the Google Play Console to see what our user base is running.
+
+## Other parts
+
+**Compilers**: gcc, clang and MSVC (exceptions exist)
+
+**OpenGL** is an entirely different beast, there is no formal consensus on changing the requirements
+and neither do we have an exact set of requirements.
+
+We still support OpenGL 1.4 without shaders (fixed-pipeline), which could be considered very unreasonable in 2024.
+OpenGL ES 2.0 is supported for the sake of mobile platforms.
+
+It has been [proposed](https://irc.minetest.net/minetest-dev/2022-08-18) moving to OpenGL 2.x or 3.0 with shaders required.
+
+General **system requirements** are not bounded either.
+Being able to play Minetest on a recent low-end phone is a reasonable target.
+
+## On totality
+
+These rules are not absolute and there can be exceptions.
+
+But consider how much trouble it would be to chase down a new version of a component on an old distro:
+* C++ standard library: probably impossible without breaking your system(?)
+* compiler: very annoying
+* CMake: somewhat annoying
+* some ordinary library: reasonably easy
+
+The rules can be seen more relaxed for optional dependencies, but remember to be reasonable.
+Sound is optional at build-time but nobody would call an engine build without sound complete.
+
+In general also consider:
+* Is the proposition important enough to warrant a new dependency?
+* Can we make it easier for users to build the library together with Minetest?
+* Maybe even vendor the library?
+* Or could the engine include a transparent fallback implementation?
+
+The SpatialIndex support is a good example for the latter. It is only used to speed up some (relatively unimportant)
+API feature, but there's no loss of functionality if you don't have it.
+
+## A concrete example
+
+(as of April 2024)
+
+```
+Situation: someone wants C++20 to use std::span
+
+MSVC supports it after some version, should be fine as long as it builds in CI
+gcc with libstdc++ 10 or later
+clang with libc++ 7 or later (note: no mainstream Linux distros use this)
+
+Debian 11 has libstdc++ 10
+Ubuntu 20.04 LTS has libstdc++ 9
+(optional) Rocky Linux 8 has libstdc++ 8
+Windows, Android and macOS are probably okay
+
+Verdict: not possible. maybe next year.
+
+Possible alternative: use a library that provides a polyfill for std::span
+```
+
+## Links
+
+* Ubuntu support table: https://wiki.ubuntu.com/Releases
+* Debian support table: https://wiki.debian.org/LTS
+* Release table of a RHEL derivative: https://en.wikipedia.org/wiki/AlmaLinux#Releases
+* Android API levels: https://apilevels.com/
+* C++ standard support information: https://en.cppreference.com/w/cpp/compiler_support
+* Distribution-independent package search: https://repology.org/ or https://pkgs.org/
diff --git a/doc/docker_server.md b/doc/docker_server.md
new file mode 100644
index 000000000..01a068536
--- /dev/null
+++ b/doc/docker_server.md
@@ -0,0 +1,46 @@
+# Docker Server
+
+We provide Minetest server Docker images using the GitHub container registry.
+
+Images are built on each commit and available using the following tag scheme:
+
+* `ghcr.io/minetest/minetest:master` (latest build)
+* `ghcr.io/minetest/minetest:<tag>` (specific Git tag)
+* `ghcr.io/minetest/minetest:latest` (latest Git tag, which is the stable release)
+
+See [here](https://github.com/minetest/minetest/pkgs/container/minetest) for all available tags.
+
+For a quick test you can easily run:
+
+```shell
+docker run ghcr.io/minetest/minetest:master
+```
+
+To use it in a production environment, you should use volumes bound to the Docker host to persist data and modify the configuration:
+
+```shell
+docker create -v /home/minetest/data/:/var/lib/minetest/ -v /home/minetest/conf/:/etc/minetest/ ghcr.io/minetest/minetest:master
+```
+
+You may also want to use [Docker Compose](https://docs.docker.com/compose):
+
+```yaml
+---
+version: "2"
+services:
+  minetest_server:
+    image: ghcr.io/minetest/minetest:master
+    restart: always
+    networks:
+      - default
+    volumes:
+      - /home/minetest/data/:/var/lib/minetest/
+      - /home/minetest/conf/:/etc/minetest/
+    ports:
+      - "30000:30000/udp"
+      - "127.0.0.1:30000:30000/tcp"
+```
+
+Data will be written to `/home/minetest/data` on the host, and configuration will be read from `/home/minetest/conf/minetest.conf`.
+
+**Note:** If you don't understand the previous commands please read the [official Docker documentation](https://docs.docker.com) before use.
diff --git a/doc/freeminer.6 b/doc/freeminer.6
index 06062721e..dcd38501f 100644
--- a/doc/freeminer.6
+++ b/doc/freeminer.6
@@ -119,7 +119,7 @@ Display an interactive terminal over ncurses during execution.
 
 .SH ENVIRONMENT
 .TP
-.B MINETEST_SUBGAME_PATH
+.B MINETEST_GAME_PATH
 Colon delimited list of directories to search for games.
 .TP
 .B MINETEST_MOD_PATH
diff --git a/doc/ides/images/jetbrains_cmake_profiles.png b/doc/ides/images/jetbrains_cmake_profiles.png
new file mode 100644
index 000000000..f0e969a6b
Binary files /dev/null and b/doc/ides/images/jetbrains_cmake_profiles.png differ
diff --git a/doc/ides/images/jetbrains_ide.png b/doc/ides/images/jetbrains_ide.png
new file mode 100644
index 000000000..8b9b11c0f
Binary files /dev/null and b/doc/ides/images/jetbrains_ide.png differ
diff --git a/doc/ides/images/jetbrains_notification_profiles.png b/doc/ides/images/jetbrains_notification_profiles.png
new file mode 100644
index 000000000..8aeb13073
Binary files /dev/null and b/doc/ides/images/jetbrains_notification_profiles.png differ
diff --git a/doc/ides/images/jetbrains_open_project_wizard_profiles.png b/doc/ides/images/jetbrains_open_project_wizard_profiles.png
new file mode 100644
index 000000000..dafc2c0c4
Binary files /dev/null and b/doc/ides/images/jetbrains_open_project_wizard_profiles.png differ
diff --git a/doc/ides/images/jetbrains_open_project_wizard_windows_cmake.png b/doc/ides/images/jetbrains_open_project_wizard_windows_cmake.png
new file mode 100644
index 000000000..2366908ec
Binary files /dev/null and b/doc/ides/images/jetbrains_open_project_wizard_windows_cmake.png differ
diff --git a/doc/ides/images/jetbrains_open_project_wizard_windows_compiler.png b/doc/ides/images/jetbrains_open_project_wizard_windows_compiler.png
new file mode 100644
index 000000000..928e0788f
Binary files /dev/null and b/doc/ides/images/jetbrains_open_project_wizard_windows_compiler.png differ
diff --git a/doc/ides/images/jetbrains_vcpkg.png b/doc/ides/images/jetbrains_vcpkg.png
new file mode 100644
index 000000000..31ab265ce
Binary files /dev/null and b/doc/ides/images/jetbrains_vcpkg.png differ
diff --git a/doc/ides/images/vscode_cmake_preset_selection.png b/doc/ides/images/vscode_cmake_preset_selection.png
new file mode 100644
index 000000000..f73ede5be
Binary files /dev/null and b/doc/ides/images/vscode_cmake_preset_selection.png differ
diff --git a/doc/ides/images/vscode_toolbar.png b/doc/ides/images/vscode_toolbar.png
new file mode 100644
index 000000000..13bfcbbde
Binary files /dev/null and b/doc/ides/images/vscode_toolbar.png differ
diff --git a/doc/ides/jetbrains.md b/doc/ides/jetbrains.md
new file mode 100644
index 000000000..09a95b92f
--- /dev/null
+++ b/doc/ides/jetbrains.md
@@ -0,0 +1,81 @@
+# [Jetbrains IntellIJ CLion](https://www.jetbrains.com/clion)
+
+## Linux
+
+When opening the folder for the first time, select `Open as CMake project` if the IDE ask you between Make and CMake.
+
+The IDE will open the folder and display the open project wizard:
+
+![Open Project Wizard](images/jetbrains_open_project_wizard_profiles.png)
+
+CLion try to determine a base configuration, but Minetest define it's own presets for easier setup. So you need to
+delete the `Debug` profile with the `-` sign and close the dialog.
+
+You should notice a notification telling you 4 presets have been loaded in the bottom right corner.
+
+![Notification Popup](images/jetbrains_notification_profiles.png)
+
+Clicking on the `View` link or going to `Settings > Build, Execution, Deployment > CMake` you should get a window
+similar to the Open Project Wizard, but with the readonly presets listed.
+
+![CMake Profiles](images/jetbrains_cmake_profiles.png)
+
+By default, none of the presets are enabled. You can select them and enable the ones you want. Keep in mind that
+triggering the CMake project reload (VCS updates, config changes, etc) will reload all the enabled profiles, so unless
+you need the other ones you can enable just `Debug` and `Release`.
+
+If none of the availlable profiles fit your needs, you can create a `CMakeUserPresets.json` file, edit it by hand and
+CLion will load the presets in this window. But the easiest solution is to create an editable copy of one of the availlable
+presets with the `Copy` button icon.
+
+After these steps you should get an IDE like this.
+
+On the main toolbar at the top right, you have a dropdown for selecting the CMake profile to use for the build. You have another dropdown next to it to select the build target; by default the `minetest` executable will be selected, but you may also have to use `IrrlichtMt` for building just the library .
+
+![Jetbrains IDE](images/jetbrains_ide.png)
+
+You can rightclick the topbar to change the project icon and color, for fancier looking IDE.
+
+## Windows
+
+Under Windows, the recommended compiler is the [Visual Studio](https://visualstudio.microsoft.com) compiler.
+
+From the Visual Studio installer, you need to install the `Desktop development with C++` Workload. CMake is already
+bundled in CLion.
+
+By default, CLion have a MinGW compiler bundled, so if you want to use Visual Studio, you need to configure it as the default compiler.
+
+CLion may ask you in the open project wisard for your compilers, with MinGW and Visual Studio if you have installed it predefined. You can use the arrows to make `Visual Studio` the default.
+
+If not you can go to `Settings > Build, Execution, Deployment > Toolchains` to change it.
+
+![Jetbrains Open Project Wizard](images/jetbrains_open_project_wizard_windows_compiler.png)
+
+
+
+
+Then, the process is roughly similar to Linux, you just need to pick `Visual Studio` as toolchain.
+
+![Jetbrains Open Project Wizard](images/jetbrains_open_project_wizard_windows_cmake.png)
+
+
+
+
+[Vcpkg](https://vcpkg.io) is the recommended way of installing Minetest dependencies.
+
+You need to let CLion know about a `vcpkg` installation to let the bundled CMake use the dependencies seamlessly and get
+IDE integration. (Require CLion 2023 or later)
+
+Go to `View > Tool Windows > Vcpkg` and click the add button. I will open a popup allowing you to add a Vcpkg
+installation. By default it will download a new one that you can use to install your dependencies, but if you already
+have one installed or you do not plan on using CLion only then install Vcpkg by hand and select your installation
+directory. Don't forget to check `Add vcpkg installation to existing CMake profiles`. If you haven't already installed
+Minetest dependencies in your vcpkg installation, you can do it right from CLion's Vcpkg tool window.
+
+![Jetbrains Vcpkg](images/jetbrains_vcpkg.png)
+
+Reloading the CMake project (should happen automatically, or display a notification for outdated CMake project) will now
+load the dependencies.
+
+[More infos on Vcpkg integration in CLion](https://blog.jetbrains.com/clion/2023/01/support-for-vcpkg-in-clion)
+
diff --git a/doc/ides/visual_studio.md b/doc/ides/visual_studio.md
new file mode 100644
index 000000000..a08a58ea2
--- /dev/null
+++ b/doc/ides/visual_studio.md
@@ -0,0 +1,7 @@
+# [Visual Studio](https://visualstudio.microsoft.com)
+
+From the Visual Studio installer, you need to install the `Desktop development with C++` Workload. You need to make sure the `C++ CMake tools for Windows` component is included in the installation details panel.
+
+You need to install [Vcpkg](https://vcpkg.io) and install Minetest dependencies as stated in the compilation documentation.
+
+For the packages to be discoverable and used by Visual Studio, you need to run `vcpkg integrate install`.
diff --git a/doc/ides/vscode.md b/doc/ides/vscode.md
new file mode 100644
index 000000000..6814a7a88
--- /dev/null
+++ b/doc/ides/vscode.md
@@ -0,0 +1,51 @@
+# [Visual Studio Code](https://code.visualstudio.com)
+
+VSCode suppport for C/C++ and CMake is provided by
+the [Microsoft C/C++ extension pack](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools-extension-pack).
+You can install it from the VSCode extensions tab.
+
+If you use a unofficial VSCode distribution like [VSCodium](https://vscodium.com), you will need to install the
+extension pack manually by downloading the VSIX files and going to `Extensions > ... > Install from VSIX`.
+
+CMake support for VSCode uses CMake presets provided by the project by default.
+
+When you open the Minetest folder with VSCode, you should get a quick pick asking you for the default preset.
+
+![VSCode CMake Preset Selection](images/vscode_cmake_preset_selection.png)
+
+You can use the bottom bar to change the CMake profile, change the build target, build, run and debug (running/debugging doesn't build first).
+
+![VSCode Toolbar](images/vscode_toolbar.png)
+
+Like most of the VSCode experience, it may be faster to use commands directly (most of the VSCode UI just trigger commands).
+
+| Command Name                     | Usecase                          |
+|----------------------------------|----------------------------------|
+| `CMake: Select Configure Preset` | Change the current CMake profile |
+| `CMake: Set Build Target`        | Change the current build target  |
+| `CMake: Build`                   | Build current target             |
+| `CMake: Clean`                   | Clean build files                |
+| `CMake: Run Without Debugging`   | Run selected run target          |
+| `CMake: Debug`                   | Debug selected run target        |
+
+## Windows
+
+Under Windows, the recommended compiler is the [Visual Studio](https://visualstudio.microsoft.com) compiler.
+
+From the Visual Studio installer, you need to install the `Desktop development with C++` Workload.
+
+[Vcpkg](https://vcpkg.io) is the recommended way of installing Minetest dependencies.
+
+Follow the official documentation to install it and install Minetest dependencies as explained in [Windows compilation process](../compiling/windows.md).
+
+You need to let CMake know about the `vcpkg` installation in VSCode.
+
+Modify your `.vscode/settings.json`:
+
+```json
+{
+    "cmake.configureSettings": {
+        "CMAKE_TOOLCHAIN_FILE": "C:/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake"
+    }
+}
+```
diff --git a/doc/lua_api.md b/doc/lua_api.md
index 54b366b55..271022bd8 100644
--- a/doc/lua_api.md
+++ b/doc/lua_api.md
@@ -4,6 +4,7 @@ Minetest Lua Modding API Reference
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>
 * (Unofficial) Minetest Modding Book by rubenwardy: <https://rubenwardy.com/minetest_modding_book/>
+* Modding tools: <https://github.com/minetest/modtools>
 
 Introduction
 ------------
@@ -61,7 +62,10 @@ The game directory can contain the following files:
 * `game.conf`, with the following keys:
     * `title`: Required, a human-readable title to address the game, e.g. `title = Minetest Game`.
     * `name`: (Deprecated) same as title.
-    * `description`: Short description to be shown in the content tab
+    * `description`: Short description to be shown in the content tab.
+      See [Translating content meta](#translating-content-meta).
+    * `first_mod`: Use this to specify the mod that must be loaded before any other mod.
+    * `last_mod`: Use this to specify the mod that must be loaded after all other mods
     * `allowed_mapgens = <comma-separated mapgens>`
       e.g. `allowed_mapgens = v5,v6,flat`
       Mapgens not in this list are removed from the list of mapgens for the
@@ -87,10 +91,11 @@ The game directory can contain the following files:
           `enable_damage`, `creative_mode`, `enable_server`.
     * `map_persistent`: Specifies whether newly created worlds should use
       a persistent map backend. Defaults to `true` (= "sqlite3")
-    * `author`: The author of the game. It only appears when downloaded from
-                ContentDB.
+    * `author`: The author's ContentDB username.
     * `release`: Ignore this: Should only ever be set by ContentDB, as it is
                  an internal ID used to track versions.
+    * `textdomain`: Textdomain used to translate description. Defaults to game id.
+      See [Translating content meta](#translating-content-meta).
 * `minetest.conf`:
   Used to set default settings when running this game.
 * `settingtypes.txt`:
@@ -156,13 +161,14 @@ The file is a key-value store of modpack details.
 
 * `name`: The modpack name. Allows Minetest to determine the modpack name even
           if the folder is wrongly named.
+* `title`: A human-readable title to address the modpack. See [Translating content meta](#translating-content-meta).
 * `description`: Description of mod to be shown in the Mods tab of the main
-                 menu.
-* `author`: The author of the modpack. It only appears when downloaded from
-            ContentDB.
+                 menu. See [Translating content meta](#translating-content-meta).
+* `author`: The author's ContentDB username.
 * `release`: Ignore this: Should only ever be set by ContentDB, as it is an
              internal ID used to track versions.
-* `title`: A human-readable title to address the modpack.
+* `textdomain`: Textdomain used to translate title and description. Defaults to modpack name.
+  See [Translating content meta](#translating-content-meta).
 
 Note: to support 0.4.x, please also create an empty modpack.txt file.
 
@@ -201,17 +207,18 @@ A `Settings` file that provides meta information about the mod.
 
 * `name`: The mod name. Allows Minetest to determine the mod name even if the
           folder is wrongly named.
+* `title`: A human-readable title to address the mod. See [Translating content meta](#translating-content-meta).
 * `description`: Description of mod to be shown in the Mods tab of the main
-                 menu.
+                 menu. See [Translating content meta](#translating-content-meta).
 * `depends`: A comma separated list of dependencies. These are mods that must be
              loaded before this mod.
 * `optional_depends`: A comma separated list of optional dependencies.
                       Like a dependency, but no error if the mod doesn't exist.
-* `author`: The author of the mod. It only appears when downloaded from
-            ContentDB.
+* `author`: The author's ContentDB username.
 * `release`: Ignore this: Should only ever be set by ContentDB, as it is an
              internal ID used to track versions.
-* `title`: A human-readable title to address the mod.
+* `textdomain`: Textdomain used to translate title and description. Defaults to modname.
+  See [Translating content meta](#translating-content-meta).
 
 ### `screenshot.png`
 
@@ -246,15 +253,15 @@ The format is documented in `builtin/settingtypes.txt`.
 It is parsed by the main menu settings dialogue to list mod-specific
 settings in the "Mods" category.
 
+`minetest.settings` can be used to read custom or engine settings.
+See [`Settings`].
+
 ### `init.lua`
 
 The main Lua script. Running this script should register everything it
-wants to register. Subsequent execution depends on minetest calling the
+wants to register. Subsequent execution depends on Minetest calling the
 registered callbacks.
 
-`minetest.settings` can be used to read custom or existing settings at load
-time, if necessary. (See [`Settings`])
-
 ### `textures`, `sounds`, `media`, `models`, `locale`
 
 Media files (textures, sounds, whatever) that will be transferred to the
@@ -450,6 +457,10 @@ i.e. without gamma-correction.
 
 Textures can be overlaid by putting a `^` between them.
 
+Warning: If the lower and upper pixels are both semi-transparent, this operation
+does *not* do alpha blending, and it is *not* associative. Otherwise it does
+alpha blending in srgb color space.
+
 Example:
 
     default_dirt.png^default_grass_side.png
@@ -506,8 +517,8 @@ Example:
 
 * `<w>`: width
 * `<h>`: height
-* `<x>`: x position
-* `<y>`: y position
+* `<x>`: x position, negative numbers allowed
+* `<y>`: y position, negative numbers allowed
 * `<file>`: texture to combine
 
 Creates a texture of size `<w>` times `<h>` and blits the listed files to their
@@ -613,13 +624,13 @@ Creates an inventorycube with `grass.png`, `dirt.png^grass_side.png` and
 * `<y>`: y position
 * `<color>`: a `ColorString`.
 
-Creates a texture of the given size and color, optionally with an <x>,<y>
+Creates a texture of the given size and color, optionally with an `<x>,<y>`
 position. An alpha value may be specified in the `Colorstring`.
 
-The optional <x>,<y> position is only used if the [fill is being overlaid
+The optional `<x>,<y>` position is only used if the `[fill` is being overlaid
 onto another texture with '^'.
 
-When [fill is overlaid onto another texture it will not upscale or change
+When `[fill` is overlaid onto another texture it will not upscale or change
 the resolution of the texture, the base texture will determine the output
 resolution.
 
@@ -655,8 +666,9 @@ The mask is applied using binary AND.
 
 #### `[sheet:<w>x<h>:<x>,<y>`
 
-Retrieves a tile at position x,y from the base image
-which it assumes to be a tilesheet with dimensions w,h.
+Retrieves a tile at position x, y (in tiles, 0-indexed)
+from the base image, which it assumes to be a tilesheet
+with dimensions w, h (in tiles).
 
 #### `[colorize:<color>:<ratio>`
 
@@ -1270,11 +1282,15 @@ The function of `param2` is determined by `paramtype2` in node definition.
     * The rotation of the node is stored in `param2`
     * Node is 'mounted'/facing towards one of 6 directions
     * You can make this value by using `minetest.dir_to_wallmounted()`
-    * Values range 0 - 5
+    * Values range 0 - 7
     * The value denotes at which direction the node is "mounted":
       0 = y+,   1 = y-,   2 = x+,   3 = x-,   4 = z+,   5 = z-
+      6 = y+, but rotated by  90°
+      7 = y-, but rotated by -90°
     * By default, on placement the param2 is automatically set to the
-      appropriate rotation, depending on which side was pointed at
+      appropriate rotation (0 to 5), depending on which side was
+      pointed at. With the node field `wallmounted_rotate_vertical = true`,
+      the param2 values 6 and 7 might additionally be set
 * `paramtype2 = "facedir"`
     * Supported drawtypes: "normal", "nodebox", "mesh"
     * The rotation of the node is stored in `param2`.
@@ -1387,8 +1403,7 @@ Look for examples in `games/devtest` or `games/minetest_game`.
 * `liquid`
     * The cubic source node for a liquid.
     * Faces bordering to the same node are never rendered.
-    * Connects to node specified in `liquid_alternative_flowing`.
-    * You *must* set `liquid_alternative_source` to the node's own name.
+    * Connects to node specified in `liquid_alternative_flowing` if specified.
     * Use `backface_culling = false` for the tiles you want to make
       visible when inside the node.
 * `flowingliquid`
@@ -1473,7 +1488,7 @@ Look for examples in `games/devtest` or `games/minetest_game`.
     * For supported model formats see Irrlicht engine documentation.
 * `plantlike_rooted`
     * Enables underwater `plantlike` without air bubbles around the nodes.
-    * Consists of a base cube at the co-ordinates of the node plus a
+    * Consists of a base cube at the coordinates of the node plus a
       `plantlike` extension above
     * If `paramtype2="leveled", the `plantlike` extension has a height
       of `param2 / 16` nodes, otherwise it's the height of 1 node
@@ -1678,10 +1693,12 @@ type are ignored.
 
 Displays an image on the HUD.
 
-* `scale`: The scale of the image, with 1 being the original texture size.
-  Only the X coordinate scale is used (positive values).
-  Negative values represent that percentage of the screen it
-  should take; e.g. `x=-100` means 100% (width).
+* `scale`: The scale of the image, with `{x = 1, y = 1}` being the original texture size.
+  The `x` and `y` fields apply to the respective axes.
+  Positive values scale the source image.
+  Negative values represent percentages relative to screen dimensions.
+  Example: `{x = -20, y = 3}` means the image will be drawn 20% of screen width wide,
+  and 3 times as high as the source image is.
 * `text`: The name of the texture that is displayed.
 * `alignment`: The alignment of the image.
 * `offset`: offset in pixels from position.
@@ -1693,6 +1710,8 @@ Displays text on the HUD.
 * `scale`: Defines the bounding rectangle of the text.
   A value such as `{x=100, y=100}` should work.
 * `text`: The text to be displayed in the HUD element.
+  Supports `minetest.translate` (always)
+  and `minetest.colorize` (since protocol version 44)
 * `number`: An integer containing the RGB value of the color used to draw the
   text. Specify `0xFFFFFF` for white text, `0xFF0000` for red, and so on.
 * `alignment`: The alignment of the text.
@@ -1748,10 +1767,12 @@ Displays distance to selected world position.
 
 Same as `image`, but does not accept a `position`; the position is instead determined by `world_pos`, the world position of the waypoint.
 
-* `scale`: The scale of the image, with 1 being the original texture size.
-  Only the X coordinate scale is used (positive values).
-  Negative values represent that percentage of the screen it
-  should take; e.g. `x=-100` means 100% (width).
+* `scale`: The scale of the image, with `{x = 1, y = 1}` being the original texture size.
+  The `x` and `y` fields apply to the respective axes.
+  Positive values scale the source image.
+  Negative values represent percentages relative to screen dimensions.
+  Example: `{x = -20, y = 3}` means the image will be drawn 20% of screen width wide,
+  and 3 times as high as the source image is.
 * `text`: The name of the texture that is displayed.
 * `alignment`: The alignment of the image.
 * `world_pos`: World position of the waypoint.
@@ -2159,6 +2180,8 @@ to games.
   Negative damage values are discarded as no damage.
 * `falling_node`: if there is no walkable block under the node it will fall
 * `float`: the node will not fall through liquids (`liquidtype ~= "none"`)
+     * A liquid source with `groups = {falling_node = 1, float = 1}`
+       will fall through flowing liquids.
 * `level`: Can be used to give an additional sense of progression in the game.
      * A larger level will cause e.g. a weapon of a lower level make much less
        damage, and get worn out much faster, or not be able to get drops
@@ -2318,9 +2341,12 @@ for this group, and unable to dig the rating `1`, which is the toughest.
 Unless there is a matching group that enables digging otherwise.
 
 If the result digging time is 0, a delay of 0.15 seconds is added between
-digging nodes; If the player releases LMB after digging, this delay is set to 0,
+digging nodes. If the player releases LMB after digging, this delay is set to 0,
 i.e. players can more quickly click the nodes away instead of holding LMB.
 
+This extra delay is not applied in case of a digging time between 0 and 0.15,
+so a digging time of 0.01 is actually faster than a digging time of 0.
+
 ### Damage groups
 
 List of damage for groups of entities. See [Entity damage mechanism].
@@ -2530,6 +2556,8 @@ Some of the values in the key-value store are handled specially:
   0 = default, 1 = left / up, 2 = middle, 3 = right / down
   The default currently is the same as right/down.
   Example: 6 = 2 + 1*4 = middle,up
+* `range`: Overrides the pointing range
+  Example: `meta:set_float("range", 4.2)`
 
 Example:
 
@@ -2985,6 +3013,16 @@ Elements
   centered on `H`. With the new coordinate system, `H` will modify the height.
 * `label` is the text on the button
 
+### `button_url[<X>,<Y>;<W>,<H>;<name>;<label>;<url>]`
+
+* Clickable button. When clicked, fields will be sent and the user will be given the
+  option to open the URL in a browser.
+* With the old coordinate system, buttons are a set height, but will be vertically
+  centered on `H`. With the new coordinate system, `H` will modify the height.
+* To make this into an `image_button`, you can use formspec styling.
+* `label` is the text on the button.
+* `url` must be a valid web URL, starting with `http://` or `https://`.
+
 ### `image_button[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]`
 
 * `texture name` is the filename of an image
@@ -3011,6 +3049,11 @@ Elements
 * When clicked, fields will be sent and the form will quit.
 * Same as `button` in all other respects.
 
+### `button_url_exit[<X>,<Y>;<W>,<H>;<name>;<label>;<url>]`
+
+* When clicked, fields will be sent and the form will quit.
+* Same as `button_url` in all other respects.
+
 ### `image_button_exit[<X>,<Y>;<W>,<H>;<texture name>;<name>;<label>]`
 
 * When clicked, fields will be sent and the form will quit.
@@ -3019,7 +3062,7 @@ Elements
 ### `textlist[<X>,<Y>;<W>,<H>;<name>;<listelem 1>,<listelem 2>,...,<listelem n>]`
 
 * Scrollable item list showing arbitrary text elements
-* `name` fieldname sent to server on doubleclick value is current selected
+* `name` fieldname sent to server on double-click value is current selected
   element.
 * `listelements` can be prepended by #color in hexadecimal format RRGGBB
   (only).
@@ -3028,7 +3071,7 @@ Elements
 ### `textlist[<X>,<Y>;<W>,<H>;<name>;<listelem 1>,<listelem 2>,...,<listelem n>;<selected idx>;<transparent>]`
 
 * Scrollable itemlist showing arbitrary text elements
-* `name` fieldname sent to server on doubleclick value is current selected
+* `name` fieldname sent to server on double-click value is current selected
   element.
 * `listelements` can be prepended by #RRGGBB (only) in hexadecimal format
     * if you want a listelement to start with "#" write "##"
@@ -3165,7 +3208,7 @@ Elements
 
 * Show scrollable table using options defined by the previous `tableoptions[]`
 * Displays cells as defined by the previous `tablecolumns[]`
-* `name`: fieldname sent to server on row select or doubleclick
+* `name`: fieldname sent to server on row select or double-click
 * `cell 1`...`cell n`: cell contents given in row-major order
 * `selected idx`: index of row to be selected within table (first row = `1`)
 * See also `minetest.explode_table_event`
@@ -3194,7 +3237,7 @@ Elements
 * Types: `text`, `image`, `color`, `indent`, `tree`
     * `text`:   show cell contents as text
     * `image`:  cell contents are an image index, use column options to define
-                images.
+                images. images are scaled down to fit the row height if necessary.
     * `color`:  cell contents are a ColorString and define color of following
                 cell.
     * `indent`: cell contents are a number and define indentation of following
@@ -3215,7 +3258,7 @@ Elements
         * `0=<value>` sets image for image index 0
         * `1=<value>` sets image for image index 1
         * `2=<value>` sets image for image index 2
-        * and so on; defined indices need not be contiguous empty or
+        * and so on; defined indices need not be contiguous. empty or
           non-numeric cells are treated as `0`.
     * `color` column options:
         * `span=<value>`: number of following columns to affect
@@ -3486,10 +3529,12 @@ Markup language used in `hypertext[]` elements uses tags that look like HTML tag
 The markup language is currently unstable and subject to change. Use with caution.
 Some tags can enclose text, they open with `<tagname>` and close with `</tagname>`.
 Tags can have attributes, in that case, attributes are in the opening tag in
-form of a key/value separated with equal signs. Attribute values should not be quoted.
+form of a key/value separated with equal signs.
+Attribute values should be quoted using either " or '.
 
-If you want to insert a literal greater-than sign or a backslash into the text,
-you must escape it by preceding it with a backslash.
+If you want to insert a literal greater-than, less-than, or a backslash into the text,
+you must escape it by preceding it with a backslash. In a quoted attribute value, you
+can insert a literal quote mark by preceding it with a backslash.
 
 These are the technically basic tags but see below for usual tags. Base tags are:
 
@@ -3506,11 +3551,13 @@ Changes the style of the text.
 Sets global style.
 
 Global only styles:
+
 * `background`: Text background, a `colorspec` or `none`.
 * `margin`: Page margins in pixel.
 * `valign`: Text vertical alignment (`top`, `middle`, `bottom`).
 
 Inheriting styles (affects child elements):
+
 * `color`: Default text color. Given color is a `colorspec`.
 * `hovercolor`: Color of <action> tags when mouse is over.
 * `size`: Default text size.
@@ -3524,6 +3571,7 @@ tags appear.
 `<tag name=... color=... hovercolor=... font=... size=...>`
 
 Defines or redefines tag style. This can be used to define new tags.
+
 * `name`: Name of the tag to define or change.
 * `color`: Text color. Given color is a `colorspec`.
 * `hovercolor`: Text color when element hovered (only for `action` tags). Given color is a `colorspec`.
@@ -3556,6 +3604,7 @@ Other tags can be added using `<tag ...>` tag.
 Make that text a clickable text triggering an action.
 
 * `name`: Name of the action (mandatory).
+* `url`: URL to open when the action is triggered (optional).
 
 When clicked, the formspec is send to the server. The value of the text field
 sent to `on_player_receive_fields` will be "action:" concatenated to the action
@@ -3610,6 +3659,19 @@ Player Inventory lists
     * Is not created automatically, use `InvRef:set_size`
     * Is only used to enhance the empty hand's tool capabilities
 
+ItemStack transaction order
+---------------------------
+
+This list describes the situation for non-empty ItemStacks in both slots
+that cannot be stacked at all, hence triggering an ItemStack swap operation.
+Put/take callbacks on empty ItemStack are not executed.
+
+1. The "allow take" and "allow put" callbacks are each run once for the source
+   and destination inventory.
+2. The allowed ItemStacks are exchanged.
+3. The "on take" callbacks are run for the source and destination inventories
+4. The "on put" callbacks are run for the source and destination inventories
+
 Colors
 ======
 
@@ -3832,6 +3894,7 @@ Operators
 ---------
 
 Operators can be used if all of the involved vectors have metatables:
+
 * `v1 == v2`:
     * Returns whether `v1` and `v2` are identical.
 * `-v`:
@@ -3937,8 +4000,9 @@ Helper functions
     * X1, Y1, ... Z2 are coordinates
     * `relative_to`: Optional. If set to a position, each coordinate
       can use the tilde notation for relative positions
-    * Tilde notation: "~": Relative coordinate
-                      "~<number>": Relative coordinate plus <number>
+    * Tilde notation
+      * `"~"`: Relative coordinate
+      * `"~<number>"`: Relative coordinate plus `<number>`
     * Example: `minetest.string_to_area("(1,2,3) (~5,~-5,~)", {x=10,y=10,z=10})`
       returns `{x=1,y=2,z=3}, {x=15,y=5,z=10}`
 * `minetest.formspec_escape(string)`: returns a string
@@ -4009,9 +4073,9 @@ Translations
 Texts can be translated client-side with the help of `minetest.translate` and
 translation files.
 
-Consider using the script `util/mod_translation_updater.py` in the Minetest
-repository to generate and update translation files automatically from the Lua
-sources. See `util/README_mod_translation_updater.md` for an explanation.
+Consider using the script `mod_translation_updater.py` in the Minetest
+[modtools](https://github.com/minetest/modtools) repository to generate and
+update translation files automatically from the Lua sources.
 
 Translating a string
 --------------------
@@ -4041,25 +4105,31 @@ Two functions are provided to translate strings: `minetest.translate` and
   avoid clashes with other mods.
   This function must be given a number of arguments equal to the number of
   arguments the translated string expects.
-  Arguments are literal strings -- they will not be translated, so if you want
-  them to be, they need to come as outputs of `minetest.translate` as well.
+  Arguments are literal strings -- they will not be translated.
 
-  For instance, suppose we want to translate "@1 Wool" with "@1" being replaced
-  by the translation of "Red". We can do the following:
+For instance, suppose we want to greet players when they join. We can do the
+following:
 
-  ```lua
-  local S = minetest.get_translator()
-  S("@1 Wool", S("Red"))
-  ```
+```lua
+local S = minetest.get_translator("hello")
+minetest.register_on_joinplayer(function(player)
+    local name = player:get_player_name()
+    minetest.chat_send_player(name, S("Hello @1, how are you today?", name))
+end)
+```
 
-  This will be displayed as "Red Wool" on old clients and on clients that do
-  not have localization enabled. However, if we have for instance a translation
-  file named `wool.fr.tr` containing the following:
+When someone called "CoolGuy" joins the game with an old client or a client
+that does not have localization enabled, they will see `Hello CoolGuy, how are
+you today?`
 
-      @1 Wool=Laine @1
-      Red=Rouge
+However, if we have for instance a translation file named `hello.de.tr`
+containing the following:
 
-  this will be displayed as "Laine Rouge" on clients with a French locale.
+    # textdomain: hello
+    Hello @1, how are you today?=Hallo @1, wie geht es dir heute?
+
+and CoolGuy has set a German locale, they will see `Hallo CoolGuy, wie geht es
+dir heute?`
 
 Operations on translated strings
 --------------------------------
@@ -4125,11 +4195,51 @@ the table returned by `minetest.get_player_information(name)`.
 IMPORTANT: This functionality should only be used for sorting, filtering or similar purposes.
 You do not need to use this to get translated strings to show up on the client.
 
+Translating content meta
+------------------------
+
+You can translate content meta, such as `title` and `description`, by placing
+translations in a `locale/DOMAIN.LANG.tr` file. The textdomain defaults to the
+content name, but can be customised using `textdomain` in the content's .conf.
+
+### Mods and Texture Packs
+
+Say you have a mod called `mymod` with a short description in mod.conf:
+
+```
+description = This is the short description
+```
+
+Minetest will look for translations in the `mymod` textdomain as there's no
+textdomain specified in mod.conf. For example, `mymod/locale/mymod.fr.tr`:
+
+```
+# textdomain:mymod
+This is the short description=Voici la description succincte
+```
+
+### Games and Modpacks
+
+For games and modpacks, Minetest will look for the textdomain in all mods.
+
+Say you have a game called `mygame` with the following game.conf:
+
+```
+description = This is the game's short description
+textdomain = mygame
+```
+
+Minetest will then look for the textdomain `mygame` in all mods, for example,
+`mygame/mods/anymod/locale/mygame.fr.tr`. Note that it is still recommended that your
+textdomain match the mod name, but this isn't required.
+
+
+
 Perlin noise
 ============
 
 Perlin noise creates a continuously-varying value depending on the input values.
-Usually in Minetest the input values are either 2D or 3D co-ordinates in nodes.
+Usually in Minetest the input values are either 2D or 3D coordinates in nodes.
 The result is used during map generation to create the terrain shape, vary heat
 and humidity to distribute biomes, vary the density of decorations or vary the
 structure of ores.
@@ -4230,6 +4340,8 @@ the previous octave.
 This may need to be tuned when altering `lacunarity`; when doing so consider
 that a common medium value is 1 / lacunarity.
 
+Instead of `persistence`, the key `persist` may be used to the same effect.
+
 ### `lacunarity`
 
 Each additional octave has a 'wavelength' that is the 'wavelength' of the
@@ -4390,7 +4502,7 @@ computationally expensive than any other ore.
 Creates a single undulating ore stratum that is continuous across mapchunk
 borders and horizontally spans the world.
 
-The 2D perlin noise described by `noise_params` defines the Y co-ordinate of
+The 2D perlin noise described by `noise_params` defines the Y coordinate of
 the stratum midpoint. The 2D perlin noise described by `np_stratum_thickness`
 defines the stratum's vertical thickness (in units of nodes). Due to being
 continuous across mapchunk borders the stratum's vertical thickness is
@@ -4463,6 +4575,12 @@ Can specify a probability of a node randomly appearing when placed.
 This decoration type is intended to be used for multi-node sized discrete
 structures, such as trees, cave spikes, rocks, and so on.
 
+`lsystem`
+-----------
+
+Generates a L-system tree at the position where the decoration is placed.
+Uses the same L-system as `minetest.spawn_tree`, but is faster than using it manually.
+The `treedef` field in the decoration definition is used for the tree definition.
 
 
 
@@ -4669,6 +4787,7 @@ differences:
   into it; it's not necessary to call `VoxelManip:read_from_map()`.
   Note that the region of map it has loaded is NOT THE SAME as the `minp`, `maxp`
   parameters of `on_generated()`. Refer to `minetest.get_mapgen_object` docs.
+  Once you're done you still need to call `VoxelManip:write_to_map()`
 
 * The `on_generated()` callbacks of some mods may place individual nodes in the
   generated area using non-VoxelManip map modification methods. Because the
@@ -4865,10 +4984,10 @@ Mapgen objects
 ==============
 
 A mapgen object is a construct used in map generation. Mapgen objects can be
-used by an `on_generate` callback to speed up operations by avoiding
+used by an `on_generated` callback to speed up operations by avoiding
 unnecessary recalculations, these can be retrieved using the
 `minetest.get_mapgen_object()` function. If the requested Mapgen object is
-unavailable, or `get_mapgen_object()` was called outside of an `on_generate()`
+unavailable, or `get_mapgen_object()` was called outside of an `on_generated`
 callback, `nil` is returned.
 
 The following Mapgen objects are currently available:
@@ -4900,12 +5019,14 @@ generated chunk by the current mapgen.
 
 ### `gennotify`
 
-Returns a table mapping requested generation notification types to arrays of
-positions at which the corresponding generated structures are located within
-the current chunk. To enable the capture of positions of interest to be recorded
-call `minetest.set_gen_notify()` first.
+Returns a table. You need to announce your interest in a specific
+field by calling `minetest.set_gen_notify()` *before* map generation happens.
 
-Possible fields of the returned table are:
+* key = string: generation notification type
+* value = list of positions (usually)
+   * Exceptions are denoted in the listing below.
+
+Available generation notification types:
 
 * `dungeon`: bottom center position of dungeon rooms
 * `temple`: as above but for desert temples (mgv6 only)
@@ -4913,7 +5034,12 @@ Possible fields of the returned table are:
 * `cave_end`
 * `large_cave_begin`
 * `large_cave_end`
-* `decoration#id` (see below)
+* `custom`: data originating from [Mapgen environment] (Lua API)
+   * This is a table.
+   * key = user-defined ID (string)
+   * value = arbitrary Lua value
+* `decoration#id`: decorations
+  * (see below)
 
 Decorations have a key in the format of `"decoration#id"`, where `id` is the
 numeric unique decoration ID as returned by `minetest.get_decoration_id()`.
@@ -4998,6 +5124,9 @@ Collision info passed to `on_step` (`moveresult` argument):
             axis = string, -- "x", "y" or "z"
             node_pos = vector, -- if type is "node"
             object = ObjectRef, -- if type is "object"
+            -- The position of the entity when the collision occurred.
+            -- Available since feature "moveresult_new_pos".
+            new_pos = vector,
             old_velocity = vector,
             new_velocity = vector,
         },
@@ -5207,6 +5336,12 @@ Utilities
 
 * `minetest.get_worldpath()`: returns e.g. `"/home/user/.minetest/world"`
     * Useful for storing custom data
+* `minetest.get_mod_data_path()`: returns e.g. `"/home/user/.minetest/mod_data/mymod"`
+    * Useful for storing custom data *independently of worlds*.
+    * Must be called during mod load time.
+    * Can read or write to this directory at any time.
+    * It's possible that multiple Minetest instances are running at the same
+      time, which may lead to corruption if you are not careful.
 * `minetest.is_singleplayer()`
 * `minetest.features`: Table containing API feature flags
 
@@ -5278,6 +5413,37 @@ Utilities
       -- liquid_fluidity, liquid_fluidity_smooth, liquid_sink,
       -- acceleration_default, acceleration_air (5.8.0)
       physics_overrides_v2 = true,
+      -- In HUD definitions the field `type` is used and `hud_elem_type` is deprecated (5.9.0)
+      hud_def_type_field = true,
+      -- PseudoRandom and PcgRandom state is restorable
+      -- PseudoRandom has get_state method
+      -- PcgRandom has get_state and set_state methods (5.9.0)
+      random_state_restore = true,
+      -- minetest.after guarantees that coexisting jobs are executed primarily
+      -- in order of expiry and secondarily in order of registration (5.9.0)
+      after_order_expiry_registration = true,
+      -- wallmounted nodes mounted at floor or ceiling may additionally
+      -- be rotated by 90° with special param2 values (5.9.0)
+      wallmounted_rotate = true,
+      -- Availability of the `pointabilities` property in the item definition (5.9.0)
+      item_specific_pointabilities = true,
+      -- Nodes `pointable` property can be `"blocking"` (5.9.0)
+      blocking_pointability_type = true,
+      -- dynamic_add_media can be called at startup when leaving callback as `nil` (5.9.0)
+      dynamic_add_media_startup = true,
+      -- dynamic_add_media supports `filename` and `filedata` parameters (5.9.0)
+      dynamic_add_media_filepath = true,
+       -- L-system decoration type (5.9.0)
+      lsystem_decoration_type = true,
+      -- Overridable pointing range using the itemstack meta key `"range"` (5.9.0)
+      item_meta_range = true,
+      -- Allow passing an optional "actor" ObjectRef to the following functions:
+      -- minetest.place_node, minetest.dig_node, minetest.punch_node (5.9.0)
+      node_interaction_actor = true,
+      -- "new_pos" field in entity moveresult (5.9.0)
+      moveresult_new_pos = true,
+      -- Allow removing definition fields in `minetest.override_item` (5.9.0)
+      override_item_remove_fields = true,
   }
   ```
 
@@ -5350,6 +5516,12 @@ Utilities
       -- HUD Scaling multiplier
       -- Equal to the setting `hud_scaling` multiplied by `dpi / 96`
       real_hud_scaling = 1,
+
+      -- Whether the touchscreen controls are enabled.
+      -- Usually (but not always) `true` on Android.
+      -- Requires at least Minetest 5.9.0 on the client. For older clients, it
+      -- is always set to `false`.
+      touch_controls = false,
   }
   ```
 
@@ -5396,6 +5568,9 @@ Utilities
 * `minetest.sha1(data, [raw])`: returns the sha1 hash of data
     * `data`: string of data to hash
     * `raw`: return raw bytes instead of hex digits, default: false
+* `minetest.sha256(data, [raw])`: returns the sha256 hash of data
+    * `data`: string of data to hash
+    * `raw`: return raw bytes instead of hex digits, default: false
 * `minetest.colorspec_to_colorstring(colorspec)`: Converts a ColorSpec to a
   ColorString. If the ColorSpec is invalid, returns `nil`.
     * `colorspec`: The ColorSpec to convert
@@ -5412,11 +5587,10 @@ Utilities
     * `compression`: Optional zlib compression level, number in range 0 to 9.
   The data is one-dimensional, starting in the upper left corner of the image
   and laid out in scanlines going from left to right, then top to bottom.
-  Please note that it's not safe to use string.char to generate raw data,
-  use `colorspec_to_bytes` to generate raw RGBA values in a predictable way.
-  The resulting PNG image is always 32-bit. Palettes are not supported at the moment.
+  You can use `colorspec_to_bytes` to generate raw RGBA values.
+  Palettes are not supported at the moment.
   You may use this to procedurally generate textures during server init.
-* `minetest.urlencode(str)`: Encodes non-unreserved URI characters by a
+* `minetest.urlencode(str)`: Encodes reserved URI characters by a
   percent sign followed by two hex digits. See
   [RFC 3986, section 2.3](https://datatracker.ietf.org/doc/html/rfc3986#section-2.3).
 
@@ -5439,11 +5613,17 @@ Call these functions only at load time!
 * `minetest.register_node(name, node definition)`
 * `minetest.register_craftitem(name, item definition)`
 * `minetest.register_tool(name, item definition)`
-* `minetest.override_item(name, redefinition)`
+* `minetest.override_item(name, redefinition, del_fields)`
+    * `redefinition` is a table of fields `[name] = new_value`,
+      overwriting fields of or adding fields to the existing definition.
+    * `del_fields` is a list of field names to be set
+      to `nil` ("deleted from") the original definition.
     * Overrides fields of an item registered with register_node/tool/craftitem.
     * Note: Item must already be defined, (opt)depend on the mod defining it.
     * Example: `minetest.override_item("default:mese",
-      {light_source=minetest.LIGHT_MAX})`
+      {light_source=minetest.LIGHT_MAX}, {"sounds"})`:
+      Overwrites the `light_source` field,
+      removes the sounds from the definition of the mese block.
 * `minetest.unregister_item(name)`
     * Unregisters the item from the engine, and deletes the entry with key
       `name` from `minetest.registered_items` and from the associated item table
@@ -5530,12 +5710,15 @@ Global callback registration functions
 Call these functions only at load time!
 
 * `minetest.register_globalstep(function(dtime))`
-    * Called every server step, usually interval of 0.1s
+    * Called every server step, usually interval of 0.1s.
+	* `dtime` is the time since last execution in seconds.
 * `minetest.register_on_mods_loaded(function())`
     * Called after mods have finished loading and before the media is cached or the
       aliases handled.
 * `minetest.register_on_shutdown(function())`
     * Called before server shutdown
+    * Players that were kicked by the shutdown procedure are still fully accessible
+     in `minetest.get_connected_players()`.
     * **Warning**: If the server terminates abnormally (i.e. crashes), the
       registered callbacks **will likely not be run**. Data should be saved at
       semi-frequent intervals as well as on server shutdown.
@@ -5552,15 +5735,17 @@ Call these functions only at load time!
 * `minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing))`
     * Called when a node is punched
 * `minetest.register_on_generated(function(minp, maxp, blockseed))`
-    * Called after generating a piece of world. Modifying nodes inside the area
-      is a bit faster than usual.
+    * Called after generating a piece of world between `minp` and `maxp`.
+    * **Avoid using this** whenever possible. As with other callbacks this blocks
+      the main thread and introduces noticeable latency.
+      Consider [Mapgen environment] for an alternative.
 * `minetest.register_on_newplayer(function(ObjectRef))`
     * Called when a new player enters the world for the first time
 * `minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage))`
     * Called when a player is punched
     * Note: This callback is invoked even if the punched player is dead.
     * `player`: ObjectRef - Player that was punched
-    * `hitter`: ObjectRef - Player that hit
+    * `hitter`: ObjectRef - Player that hit. Can be nil.
     * `time_from_last_punch`: Meant for disallowing spamming of clicks
       (can be nil).
     * `tool_capabilities`: Capability table of used item (can be nil)
@@ -5610,6 +5795,7 @@ Call these functions only at load time!
     * `last_login`: The timestamp of the previous login, or nil if player is new
 * `minetest.register_on_leaveplayer(function(ObjectRef, timed_out))`
     * Called when a player leaves the game
+    * Does not get executed for connected players on shutdown.
     * `timed_out`: True for timeout, false for other reasons.
 * `minetest.register_on_authplayer(function(name, ip, is_success))`
     * Called when a client attempts to log into an account.
@@ -5639,8 +5825,8 @@ Call these functions only at load time!
     * Return `true` to mark the command as handled, which means that the default
       handlers will be prevented.
 * `minetest.register_on_player_receive_fields(function(player, formname, fields))`
-    * Called when the server received input from `player` in a formspec with
-      the given `formname`. Specifically, this is called on any of the
+    * Called when the server received input from `player`.
+      Specifically, this is called on any of the
       following events:
           * a button was pressed,
           * Enter was pressed while the focus was on a text field
@@ -5651,6 +5837,9 @@ Call these functions only at load time!
           * an entry was double-clicked in a textlist or table,
           * a scrollbar was moved, or
           * the form was actively closed by the player.
+    * `formname` is the name passed to `minetest.show_formspec`.
+      Special case: The empty string refers to the player inventory
+      (the formspec set by the `set_inventory_formspec` player method).
     * Fields are sent for formspec elements which define a field. `fields`
       is a table containing each formspecs element value (as string), with
       the `name` parameter as index for each. The value depends on the
@@ -5761,7 +5950,7 @@ Setting-related
 ---------------
 
 * `minetest.settings`: Settings object containing all of the settings from the
-  main config file (`minetest.conf`).
+  main config file (`minetest.conf`). See [`Settings`].
 * `minetest.setting_get_pos(name)`: Loads a setting from the main settings and
   parses it as a position (in the format `(1,2,3)`). Returns a position or nil.
 
@@ -5812,8 +6001,20 @@ Authentication
     * `name`: string; if omitted, all auth data should be considered modified
 * `minetest.set_player_password(name, password_hash)`: Set password hash of
   player `name`.
-* `minetest.set_player_privs(name, {priv1=true,...})`: Set privileges of player
-  `name`.
+* `minetest.set_player_privs(name, privs)`: Set privileges of player `name`.
+    * `privs` is a **set** of privileges:
+      A table where the keys are names of privileges and the values are `true`.
+    * Example: `minetest.set_player_privs("singleplayer", {interact = true, fly = true})`.
+      This **sets** the player privileges to `interact` and `fly`;
+      `singleplayer` will only have these two privileges afterwards.
+* `minetest.change_player_privs(name, changes)`: Helper to grant or revoke privileges.
+    * `changes`: Table of changes to make.
+      A field `[privname] = true` grants a privilege,
+      whereas `[privname] = false` revokes a privilege.
+    * Example: `minetest.change_player_privs("singleplayer", {interact = true, fly = false})`
+      will grant singleplayer the `interact` privilege
+      and revoke singleplayer's `fly` privilege.
+      All other privileges will remain unchanged.
 * `minetest.auth_reload()`
     * See `reload()` in authentication handler definition
 
@@ -5824,8 +6025,9 @@ handler.
 Chat
 ----
 
-* `minetest.chat_send_all(text)`
-* `minetest.chat_send_player(name, text)`
+* `minetest.chat_send_all(text)`: send chat message to all players
+* `minetest.chat_send_player(name, text)`: send chat message to specific player
+    * `name`: Name of the player
 * `minetest.format_chat_message(name, message)`
     * Used by the server to format a chat message, based on the setting `chat_message_format`.
       Refer to the documentation of the setting for a list of valid placeholders.
@@ -5837,13 +6039,14 @@ Environment access
 ------------------
 
 * `minetest.set_node(pos, node)`
-* `minetest.add_node(pos, node)`: alias to `minetest.set_node`
-    * Set node at position `pos`
+    * Set node at position `pos`.
+    * Any existing metadata is deleted.
     * `node`: table `{name=string, param1=number, param2=number}`
-    * If param1 or param2 is omitted, it's set to `0`.
+      If param1 or param2 is omitted, it's set to `0`.
     * e.g. `minetest.set_node({x=0, y=10, z=0}, {name="default:wood"})`
+* `minetest.add_node(pos, node)`: alias to `minetest.set_node`
 * `minetest.bulk_set_node({pos1, pos2, pos3, ...}, node)`
-    * Set node on all positions set in the first argument.
+    * Set the same node at all positions in the first argument.
     * e.g. `minetest.bulk_set_node({{x=0, y=1, z=1}, {x=1, y=2, z=2}}, {name="default:stone"})`
     * For node specification or position syntax see `minetest.set_node` call
     * Faster than set_node due to single call, but still considerably slower
@@ -5853,15 +6056,17 @@ Environment access
       For setting a cube, this is 1.3x faster than set_node whereas LVM is 20
       times faster.
 * `minetest.swap_node(pos, node)`
-    * Set node at position, but don't remove metadata
-* `minetest.remove_node(pos)`
-    * By default it does the same as `minetest.set_node(pos, {name="air"})`
+    * Swap node at position with another.
+    * This keeps the metadata intact and will not run con-/destructor callbacks.
+* `minetest.remove_node(pos)`: Remove a node
+    * Equivalent to `minetest.set_node(pos, {name="air"})`, but a bit faster.
 * `minetest.get_node(pos)`
-    * Returns the node at the given position as table in the format
-      `{name="node_name", param1=0, param2=0}`,
-      returns `{name="ignore", param1=0, param2=0}` for unloaded areas.
+    * Returns the node at the given position as table in the same format as `set_node`.
+    * This function never returns `nil` and instead returns
+      `{name="ignore", param1=0, param2=0}` for unloaded areas.
 * `minetest.get_node_or_nil(pos)`
     * Same as `get_node` but returns `nil` for unloaded areas.
+    * Note that even loaded areas can contain "ignore" nodes.
 * `minetest.get_node_light(pos[, timeofday])`
     * Gets the light value at the given position. Note that the light value
       "inside" the node at the given position is returned, so you usually want
@@ -5885,13 +6090,16 @@ Environment access
     * Returns a number between `0` and `15`
     * Currently it's the same as `math.floor(param1 / 16)`, except that it
       ensures compatibility.
-* `minetest.place_node(pos, node)`
+* `minetest.place_node(pos, node[, placer])`
     * Place node with the same effects that a player would cause
-* `minetest.dig_node(pos)`
+    * `placer`: The ObjectRef that places the node (optional)
+* `minetest.dig_node(pos[, digger])`
     * Dig node with the same effects that a player would cause
+    * `digger`: The ObjectRef that digs the node (optional)
     * Returns `true` if successful, `false` on failure (e.g. protected location)
-* `minetest.punch_node(pos)`
+* `minetest.punch_node(pos[, puncher])`
     * Punch node with the same effects that a player would cause
+    * `puncher`: The ObjectRef that punches the node (optional)
 * `minetest.spawn_falling_node(pos)`
     * Change node into falling node
     * Returns `true` and the ObjectRef of the spawned entity if successful, `false` on failure
@@ -5907,23 +6115,39 @@ Environment access
 * `minetest.add_entity(pos, name, [staticdata])`: Spawn Lua-defined entity at
   position.
     * Returns `ObjectRef`, or `nil` if failed
+    * Entities with `static_save = true` can be added also
+      to unloaded and non-generated blocks.
 * `minetest.add_item(pos, item)`: Spawn item
     * Returns `ObjectRef`, or `nil` if failed
+    * Items can be added also to unloaded and non-generated blocks.
 * `minetest.get_player_by_name(name)`: Get an `ObjectRef` to a player
-* `minetest.get_objects_inside_radius(pos, radius)`: returns a list of
-  ObjectRefs.
+    * Returns nothing in case of error (player offline, doesn't exist, ...).
+* `minetest.get_objects_inside_radius(center, radius)`
+    * returns a list of ObjectRefs
     * `radius`: using a Euclidean metric
-* `minetest.get_objects_in_area(pos1, pos2)`: returns a list of
-  ObjectRefs.
-     * `pos1` and `pos2` are the min and max positions of the area to search.
-* `minetest.set_timeofday(val)`
+    * **Warning**: Any kind of interaction with the environment or other APIs
+      can cause later objects in the list to become invalid while you're iterating it.
+      (e.g. punching an entity removes its children)
+      It is recommended to use `minetest.objects_inside_radius` instead, which
+      transparently takes care of this possibility.
+* `minetest.objects_inside_radius(center, radius)`
+    * returns an iterator of valid objects
+    * example: `for obj in minetest.objects_inside_radius(center, radius) do obj:punch(...) end`
+* `minetest.get_objects_in_area(min_pos, max_pos)`
+    * returns a list of ObjectRefs
+    * `min_pos` and `max_pos` are the min and max positions of the area to search
+    * **Warning**: The same warning as for `minetest.get_objects_inside_radius` applies.
+      Use `minetest.objects_in_area` instead to iterate only valid objects.
+* `minetest.objects_in_area(min_pos, max_pos)`
+	* returns an iterator of valid objects
+* `minetest.set_timeofday(val)`: set time of day
     * `val` is between `0` and `1`; `0` for midnight, `0.5` for midday
-* `minetest.get_timeofday()`
+* `minetest.get_timeofday()`: get time of day
 * `minetest.get_gametime()`: returns the time, in seconds, since the world was
   created. The time is not available (`nil`) before the first server step.
 * `minetest.get_day_count()`: returns number days elapsed since world was
   created.
-    * accounts for time changes.
+    * Time changes are accounted for.
 * `minetest.find_node_near(pos, radius, nodenames, [search_center])`: returns
   pos or `nil`.
     * `radius`: using a maximum metric
@@ -5954,20 +6178,18 @@ Environment access
 * `minetest.get_voxel_manip([pos1, pos2])`
     * Return voxel manipulator object.
     * Loads the manipulator from the map if positions are passed.
-* `minetest.set_gen_notify(flags, {deco_ids})`
+* `minetest.set_gen_notify(flags, [deco_ids], [custom_ids])`
     * Set the types of on-generate notifications that should be collected.
-    * `flags` is a flag field with the available flags:
-        * dungeon
-        * temple
-        * cave_begin
-        * cave_end
-        * large_cave_begin
-        * large_cave_end
-        * decoration
-    * The second parameter is a list of IDs of decorations which notification
+    * `flags`: flag field, see [`gennotify`] for available generation notification types.
+    * The following parameters are optional:
+    * `deco_ids` is a list of IDs of decorations which notification
       is requested for.
+    * `custom_ids` is a list of user-defined IDs (strings) which are
+      requested. By convention these should be the mod name with an optional
+      colon and specifier added, e.g. `"default"` or `"default:dungeon_loot"`
 * `minetest.get_gen_notify()`
-    * Returns a flagstring and a table with the `deco_id`s.
+    * Returns a flagstring, a table with the `deco_id`s and a table with
+      user-defined IDs.
 * `minetest.get_decoration_id(decoration_name)`
     * Returns the decoration ID number for the provided decoration name string,
       or `nil` on failure.
@@ -6097,13 +6319,16 @@ Environment access
     * Returns the position of the blocking node when `false`
     * `pos1`: First position
     * `pos2`: Second position
-* `minetest.raycast(pos1, pos2, objects, liquids)`: returns `Raycast`
+* `minetest.raycast(pos1, pos2, objects, liquids, pointabilities)`: returns `Raycast`
     * Creates a `Raycast` object.
     * `pos1`: start of the ray
     * `pos2`: end of the ray
     * `objects`: if false, only nodes will be returned. Default is `true`.
     * `liquids`: if false, liquid nodes (`liquidtype ~= "none"`) won't be
                  returned. Default is `false`.
+    * `pointabilities`: Allows overriding the `pointable` property of
+      nodes and objects. Uses the same format as the `pointabilities` property
+      of item definitions. Default is `nil`.
 * `minetest.find_path(pos1,pos2,searchdistance,max_jump,max_drop,algorithm)`
     * returns table containing path that can be walked on
     * returns a table of 3D points representing a path from `pos1` to `pos2` or
@@ -6139,6 +6364,17 @@ Environment access
     * increase level of leveled node by level, default `level` equals `1`
     * if `totallevel > maxlevel`, returns rest (`total-max`)
     * `level` must be between -127 and 127
+* `minetest.get_node_boxes(box_type, pos, [node])`
+    * `box_type` must be `"node_box"`, `"collision_box"` or `"selection_box"`.
+    * `pos` must be a node position.
+    * `node` can be a table in the form `{name=string, param1=number, param2=number}`.
+      If `node` is `nil`, the actual node at `pos` is used instead.
+    * Resolves any facedir-rotated boxes, connected boxes and the like into
+      actual boxes.
+    * Returns a list of boxes in the form
+      `{{x1, y1, z1, x2, y2, z2}, {x1, y1, z1, x2, y2, z2}, ...}`. Coordinates
+      are relative to `pos`.
+    * See also: [Node boxes](#node-boxes)
 * `minetest.fix_light(pos1, pos2)`: returns `true`/`false`
     * resets the light in a cuboid-shaped part of
       the map and removes lighting bugs.
@@ -6165,11 +6401,11 @@ Environment access
     * spread these updates to neighbors and can cause a cascade
       of nodes to fall.
 * `minetest.get_spawn_level(x, z)`
-    * Returns a player spawn y co-ordinate for the provided (x, z)
-      co-ordinates, or `nil` for an unsuitable spawn point.
+    * Returns a player spawn y coordinate for the provided (x, z)
+      coordinates, or `nil` for an unsuitable spawn point.
     * For most mapgens a 'suitable spawn point' is one with y between
       `water_level` and `water_level + 16`, and in mgv7 well away from rivers,
-      so `nil` will be returned for many (x, z) co-ordinates.
+      so `nil` will be returned for many (x, z) coordinates.
     * The spawn level returned is for a player spawn in unmodified terrain.
     * The spawn level is intentionally above terrain level to cope with
       full-node biome 'dust' nodes.
@@ -6214,7 +6450,8 @@ Formspec
 * `minetest.show_formspec(playername, formname, formspec)`
     * `playername`: name of player to show formspec
     * `formname`: name passed to `on_player_receive_fields` callbacks.
-      It should follow the `"modname:<whatever>"` naming convention
+      It should follow the `"modname:<whatever>"` naming convention.
+      `formname` must not be empty.
     * `formspec`: formspec to display
 * `minetest.close_formspec(playername, formname)`
     * `playername`: name of player to close formspec
@@ -6443,6 +6680,8 @@ Timing
 * `minetest.after(time, func, ...)`: returns job table to use as below.
     * Call the function `func` after `time` seconds, may be fractional
     * Optional: Variable number of arguments that are passed to `func`
+    * Jobs set for earlier times are executed earlier. If multiple jobs expire
+      at exactly the same time, then they are executed in registration order.
 
 * `job:cancel()`
     * Cancels the job function from being called
@@ -6476,10 +6715,23 @@ This allows you easy interoperability for delegating work to jobs.
     * Register a path to a Lua file to be imported when an async environment
       is initialized. You can use this to preload code which you can then call
       later using `minetest.handle_async()`.
+* `minetest.register_portable_metatable(name, mt)`:
+    * Register a metatable that should be preserved when data is transferred
+    between the main thread and the async environment.
+    * `name` is a string that identifies the metatable. It is recommended to
+      follow the `modname:name` convention for this identifier.
+    * `mt` is the metatable to register.
+    * Note that it is allowed to register the same metatable under multiple
+      names, but it is not allowed to register multiple metatables under the
+      same name.
+    * You must register the metatable in both the main environment
+      and the async environment for this mechanism to work.
+
 
 ### List of APIs available in an async environment
 
 Classes:
+
 * `AreaStore`
 * `ItemStack`
 * `PerlinNoise`
@@ -6493,23 +6745,108 @@ Classes:
 * `Settings`
 
 Class instances that can be transferred between environments:
+
 * `ItemStack`
 * `PerlinNoise`
 * `PerlinNoiseMap`
 * `VoxelManip`
 
 Functions:
+
 * Standalone helpers such as logging, filesystem, encoding,
   hashing or compression APIs
-* `minetest.request_insecure_environment` (same restrictions apply)
+* `minetest.register_portable_metatable` (see above)
 
 Variables:
+
 * `minetest.settings`
 * `minetest.registered_items`, `registered_nodes`, `registered_tools`,
   `registered_craftitems` and `registered_aliases`
     * with all functions and userdata values replaced by `true`, calling any
       callbacks here is obviously not possible
 
+Mapgen environment
+------------------
+
+The engine runs the map generator on separate threads, each of these also has
+a Lua environment. Its primary purpose is to allow mods to operate on newly
+generated parts of the map to e.g. generate custom structures.
+Internally it is referred to as "emerge environment".
+
+Refer to [Async environment] for the usual disclaimer on what environment isolation entails.
+
+The map generator threads, which also contain the above mentioned Lua environment,
+are initialized after all mods have been loaded by the server. After that the
+registered scripts (not all mods!) - see below - are run during initialization of
+the mapgen environment. After that only callbacks happen. The mapgen env
+does not have a global step or timer.
+
+* `minetest.register_mapgen_script(path)`:
+    * Register a path to a Lua file to be imported when a mapgen environment
+      is initialized. Run in order of registration.
+
+### List of APIs exclusive to the mapgen env
+
+* `minetest.register_on_generated(function(vmanip, minp, maxp, blockseed))`
+    * Called after the engine mapgen finishes a chunk but before it is written to
+      the map.
+    * Chunk data resides in `vmanip`. Other parts of the map are not accessible.
+      The area of the chunk if comprised of `minp` and `maxp`, note that is smaller
+      than the emerged area of the VoxelManip.
+      Note: calling `read_from_map()` or `write_to_map()` on the VoxelManipulator object
+      is not necessary and is disallowed.
+    * `blockseed`: 64-bit seed number used for this chunk
+* `minetest.save_gen_notify(id, data)`
+    * Saves data for retrieval using the gennotify mechanism (see [Mapgen objects]).
+    * Data is bound to the chunk that is currently being processed, so this function
+      only makes sense inside the `on_generated` callback.
+    * `id`: user-defined ID (a string)
+      By convention these should be the mod name with an optional
+      colon and specifier added, e.g. `"default"` or `"default:dungeon_loot"`
+    * `data`: any Lua object (will be serialized, no userdata allowed)
+    * returns `true` if the data was remembered. That is if `minetest.set_gen_notify`
+      was called with the same user-defined ID before.
+
+### List of APIs available in the mapgen env
+
+Classes:
+
+* `AreaStore`
+* `ItemStack`
+* `PerlinNoise`
+* `PerlinNoiseMap`
+* `PseudoRandom`
+* `PcgRandom`
+* `SecureRandom`
+* `VoxelArea`
+* `VoxelManip`
+    * only given by callbacks; cannot access rest of map
+* `Settings`
+
+Functions:
+
+* Standalone helpers such as logging, filesystem, encoding,
+  hashing or compression APIs
+* `minetest.get_biome_id`, `get_biome_name`, `get_heat`, `get_humidity`,
+  `get_biome_data`, `get_mapgen_object`, `get_mapgen_params`, `get_mapgen_edges`,
+  `get_mapgen_setting`, `get_noiseparams`, `get_decoration_id` and more
+* `minetest.get_node`, `set_node`, `find_node_near`, `find_nodes_in_area`,
+  `spawn_tree` and similar
+    * these only operate on the current chunk (if inside a callback)
+
+Variables:
+
+* `minetest.settings`
+* `minetest.registered_items`, `registered_nodes`, `registered_tools`,
+  `registered_craftitems` and `registered_aliases`
+    * with all functions and userdata values replaced by `true`, calling any
+      callbacks here is obviously not possible
+* `minetest.registered_biomes`, `registered_ores`, `registered_decorations`
+
+Note that node metadata does not exist in the mapgen env, we suggest deferring
+setting any metadata you need to the `on_generated` callback in the regular env.
+You can use the gennotify mechanism to transfer this information.
+
 Server
 ------
 
@@ -6540,11 +6877,15 @@ Server
     * Returns boolean indicating success (false if player nonexistent)
 * `minetest.dynamic_add_media(options, callback)`
     * `options`: table containing the following parameters
-        * `filepath`: path to a media file on the filesystem
+        * `filename`: name the media file will be usable as
+                      (optional if `filepath` present)
+        * `filepath`: path to the file on the filesystem [*]
+        * `filedata`: the data of the file to be sent [*]
         * `to_player`: name of the player the media should be sent to instead of
                        all players (optional)
         * `ephemeral`: boolean that marks the media as ephemeral,
                        it will not be cached on the client (optional, default false)
+        * Exactly one of the parameters marked [*] must be specified.
     * `callback`: function with arguments `name`, which is a player name
     * Pushes the specified media file to client(s). (details below)
       The file must be a supported image, sound or model format.
@@ -6562,6 +6903,9 @@ Server
         name twice is not possible/guaranteed to work. An exception to this is the
         use of `to_player` to send the same, already existent file to multiple
         chosen players.
+      * You can also call this at startup time. In that case `callback` MUST
+        be `nil` and you cannot use `ephemeral` or `to_player`, as these logically
+        do not make sense.
     * Clients will attempt to fetch files added this way via remote media,
       this can make transfer of bigger files painless (if set up). Nevertheless
       it is advised not to use dynamic media for big media files.
@@ -6743,7 +7087,7 @@ Misc.
   (regardless of online status)
 * `minetest.hud_replace_builtin(name, hud_definition)`
     * Replaces definition of a builtin hud element
-    * `name`: `"breath"` or `"health"`
+    * `name`: `"breath"`, `"health"` or `"minimap"`
     * `hud_definition`: definition to replace builtin definition
 * `minetest.parse_relative_number(arg, relative_to)`: returns number or nil
     * Helper function for chat commands.
@@ -7011,10 +7355,6 @@ Global tables
     * Map of registered decoration definitions, indexed by the `name` field.
     * If `name` is nil, the key is the object handle returned by
       `minetest.register_decoration`.
-* `minetest.registered_schematics`
-    * Map of registered schematic definitions, indexed by the `name` field.
-    * If `name` is nil, the key is the object handle returned by
-      `minetest.register_schematic`.
 * `minetest.registered_chatcommands`
     * Map of registered chat command definitions, indexed by name
 * `minetest.registered_privileges`
@@ -7026,8 +7366,41 @@ Global tables
 All callbacks registered with [Global callback registration functions] are added
 to corresponding `minetest.registered_*` tables.
 
+For historical reasons, the use of an -s suffix in these names is inconsistent.
 
-
+* `minetest.registered_on_chat_messages`
+* `minetest.registered_on_chatcommands`
+* `minetest.registered_globalsteps`
+* `minetest.registered_on_punchnodes`
+* `minetest.registered_on_placenodes`
+* `minetest.registered_on_dignodes`
+* `minetest.registered_on_generateds`
+* `minetest.registered_on_newplayers`
+* `minetest.registered_on_dieplayers`
+* `minetest.registered_on_respawnplayers`
+* `minetest.registered_on_prejoinplayers`
+* `minetest.registered_on_joinplayers`
+* `minetest.registered_on_leaveplayers`
+* `minetest.registered_on_player_receive_fields`
+* `minetest.registered_on_cheats`
+* `minetest.registered_on_crafts`
+* `minetest.registered_craft_predicts`
+* `minetest.registered_on_item_eats`
+* `minetest.registered_on_item_pickups`
+* `minetest.registered_on_punchplayers`
+* `minetest.registered_on_authplayers`
+* `minetest.registered_on_player_inventory_actions`
+* `minetest.registered_allow_player_inventory_actions`
+* `minetest.registered_on_rightclickplayers`
+* `minetest.registered_on_mods_loaded`
+* `minetest.registered_on_shutdown`
+* `minetest.registered_on_protection_violation`
+* `minetest.registered_on_priv_grant`
+* `minetest.registered_on_priv_revoke`
+* `minetest.registered_can_bypass_userlimit`
+* `minetest.registered_on_modchannel_message`
+* `minetest.registered_on_liquid_transformed`
+* `minetest.registered_on_mapblocks_changed`
 
 Class reference
 ===============
@@ -7123,6 +7496,7 @@ An `InvRef` is a reference to an inventory.
     * returns `false` on error (e.g. invalid `listname` or `size`)
 * `get_width(listname)`: get width of a list
 * `set_width(listname, width)`: set width of list; currently used for crafting
+    * returns `false` on error (e.g. invalid `listname` or `width`)
 * `get_stack(listname, i)`: get a copy of stack index `i` in list
 * `set_stack(listname, i, stack)`: copy `stack` to index `i` in list
 * `get_list(listname)`: returns full list (list of `ItemStack`s)
@@ -7193,9 +7567,12 @@ an itemstring, a table or `nil`.
 * `set_wear(wear)`: returns boolean indicating whether item was cleared
     * `wear`: number, unsigned 16 bit integer
 * `get_meta()`: returns ItemStackMetaRef. See section for more details
-* `get_metadata()`: (DEPRECATED) Returns metadata (a string attached to an item
-  stack).
-* `set_metadata(metadata)`: (DEPRECATED) Returns true.
+* `get_metadata()`: **Deprecated.** Returns metadata (a string attached to an item stack).
+    * If you need to access this to maintain backwards compatibility,
+      use `stack:get_meta():get_string("")` instead.
+* `set_metadata(metadata)`: **Deprecated.** Returns true.
+    * If you need to set this to maintain backwards compatibility,
+      use `stack:get_meta():set_string("", metadata)` instead.
 * `get_description()`: returns the description shown in inventory list tooltips.
     * The engine uses this when showing item descriptions in tooltips.
     * Fields for finding the description, in order:
@@ -7230,6 +7607,8 @@ an itemstring, a table or `nil`.
       the item breaks after `max_uses` times
     * Valid `max_uses` range is [0,65536]
     * Does nothing if item is not a tool or if `max_uses` is 0
+* `get_wear_bar_params()`: returns the wear bar parameters of the item,
+  or nil if none are defined for this item type or in the stack's meta
 * `add_item(item)`: returns leftover `ItemStack`
     * Put some item or stack onto this stack
 * `item_fits(item)`: returns `true` if item or stack can be fully added to
@@ -7271,6 +7650,10 @@ Can be obtained via `item:get_meta()`.
     * Overrides the item's tool capabilities
     * A nil value will clear the override data and restore the original
       behavior.
+* `set_wear_bar_params([wear_bar_params])`
+    * Overrides the item's wear bar parameters (see "Wear Bar Color" section)
+    * A nil value will clear the override data and restore the original
+      behavior.
 
 `MetaDataRef`
 -------------
@@ -7333,7 +7716,7 @@ metadata_table = {
     -- metadata fields (key/value store)
     fields = {
         infotext = "Container",
-        anoter_key = "Another Value",
+        another_key = "Another Value",
     },
 
     -- inventory data (for nodes)
@@ -7428,13 +7811,18 @@ When you receive an `ObjectRef` as a callback argument or from another API
 function, it is possible to store the reference somewhere and keep it around.
 It will keep functioning until the object is unloaded or removed.
 
-However, doing this is **NOT** recommended as there is (intentionally) no method
-to test if a previously acquired `ObjectRef` is still valid.
-Instead, `ObjectRefs` should be "let go" of as soon as control is returned from
-Lua back to the engine.
+However, doing this is **NOT** recommended - `ObjectRefs` should be "let go"
+of as soon as control is returned from Lua back to the engine.
+
 Doing so is much less error-prone and you will never need to wonder if the
 object you are working with still exists.
 
+If this is not feasible, you can test whether an `ObjectRef` is still valid
+via `object:is_valid()`.
+
+Getters may be called for invalid objects and will return nothing then.
+All other methods should not be called on invalid objects.
+
 ### Attachments
 
 It is possible to attach objects to other objects (`set_attach` method).
@@ -7453,20 +7841,27 @@ child will follow movement and rotation of that bone.
 
 ### Methods
 
+* `is_valid()`: returns whether the object is valid.
+   * See "Advice on handling `ObjectRefs`" above.
 * `get_pos()`: returns position as vector `{x=num, y=num, z=num}`
 * `set_pos(pos)`:
     * Sets the position of the object.
     * No-op if object is attached.
     * `pos` is a vector `{x=num, y=num, z=num}`
+* `add_pos(pos)`:
+    * Changes position by adding to the current position.
+    * No-op if object is attached.
+    * `pos` is a vector `{x=num, y=num, z=num}`.
+    * In comparison to using `set_pos`, `add_pos` will avoid synchronization problems.
 * `get_velocity()`: returns the velocity, a vector.
 * `add_velocity(vel)`
     * Changes velocity by adding to the current velocity.
     * `vel` is a vector, e.g. `{x=0.0, y=2.3, z=1.0}`
-    * In comparison to using get_velocity, adding the velocity and then using
-      set_velocity, add_velocity is supposed to avoid synchronization problems.
-      Additionally, players also do not support set_velocity.
+    * In comparison to using `get_velocity`, adding the velocity and then using
+      `set_velocity`, `add_velocity` is supposed to avoid synchronization problems.
+      Additionally, players also do not support `set_velocity`.
     * If object is a player:
-        * Does not apply during free_move.
+        * Does not apply during `free_move`.
         * Note that since the player speed is normalized at each move step,
           increasing e.g. Y velocity beyond what would usually be achieved
           (see: physics overrides) will cause existing X/Z velocity to be reduced.
@@ -7480,11 +7875,11 @@ child will follow movement and rotation of that bone.
     * no-op if object is attached
 * `punch(puncher, time_from_last_punch, tool_capabilities, dir)`
     * punches the object, triggering all consequences a normal punch would have
-    * `puncher`: another `ObjectRef` which punched the object
+    * `puncher`: another `ObjectRef` which punched the object or `nil`
     * `dir`: direction vector of punch
     * Other arguments: See `on_punch` for entities
-    * All arguments except `puncher` can be `nil`, in which case a default
-      value will be used
+    * Arguments `time_from_last_punch`, `tool_capabilities`, and `dir`
+      will be replaced with a default value when the caller sets them to `nil`.
 * `right_click(clicker)`:
     * simulates using the 'place/use' key on the object
     * triggers all consequences as if a real player had done this
@@ -7550,17 +7945,32 @@ child will follow movement and rotation of that bone.
     object.
 * `set_detach()`: Detaches object. No-op if object was not attached.
 * `set_bone_position([bone, position, rotation])`
-    * `bone`: string. Default is `""`, the root bone
-    * `position`: `{x=num, y=num, z=num}`, relative, `default {x=0, y=0, z=0}`
-    * `rotation`: `{x=num, y=num, z=num}`, default `{x=0, y=0, z=0}`
-* `get_bone_position(bone)`:
-    * returns bone parameters previously set by `set_bone_position`
-    * returns `position, rotation` of the specified bone (as vectors)
-    * note: position is relative to the object
-* `set_properties(object property table)`:
-    * set a number of object properties in the given table
-    * only properties listed in the table will be changed
-    * see the 'Object properties' section for details
+	* Shorthand for `set_bone_override(bone, {position = position, rotation = rotation:apply(math.rad)})` using absolute values.
+	* **Note:** Rotation is in degrees, not radians.
+	* **Deprecated:** Use `set_bone_override` instead.
+* `get_bone_position(bone)`: returns the previously set position and rotation of the bone
+	* Shorthand for `get_bone_override(bone).position.vec, get_bone_override(bone).rotation.vec:apply(math.deg)`.
+	* **Note:** Returned rotation is in degrees, not radians.
+	* **Deprecated:** Use `get_bone_override` instead.
+* `set_bone_override(bone, override)`
+    * `bone`: string
+    * `override`: `{ position = property, rotation = property, scale = property }` or `nil`
+        * `property`: `{ vec = vector, interpolation = 0, absolute = false}` or `nil`;
+            * `vec` is in the same coordinate system as the model, and in degrees for rotation
+        * `property = nil` is equivalent to no override on that property
+        * `absolute`: If set to `false`, the override will be relative to the animated property:
+            * Transposition in the case of `position`;
+            * Composition in the case of `rotation`;
+            * Multiplication in the case of `scale`
+        * `interpolation`: Old and new values are interpolated over this timeframe (in seconds)
+    * `override = nil` (including omission) is shorthand for `override = {}` which clears the override
+    * **Note:** Unlike `set_bone_position`, the rotation is in radians, not degrees.
+    * Compatibility note: Clients prior to 5.9.0 only support absolute position and rotation.
+      All values are treated as absolute and are set immediately (no interpolation).
+* `get_bone_override(bone)`: returns `override` in the above format
+	* **Note:** Unlike `get_bone_position`, the returned rotation is in radians, not degrees.
+* `get_bone_overrides()`: returns all bone overrides as table `{[bonename] = override, ...}`
+* `set_properties(object property table)`
 * `get_properties()`: returns a table of all object properties
 * `is_player()`: returns true for players, false otherwise
 * `get_nametag_attributes()`
@@ -7606,7 +8016,7 @@ child will follow movement and rotation of that bone.
     * `rot` is a vector (radians). X is pitch (elevation), Y is yaw (heading)
       and Z is roll (bank).
     * Does not reset rotation incurred through `automatic_rotate`.
-      Remove & readd your objects to force a certain rotation.
+      Remove & re-add your objects to force a certain rotation.
 * `get_rotation()`: returns the rotation, a vector (radians)
 * `set_yaw(yaw)`: sets the yaw in radians (heading).
 * `get_yaw()`: returns number in radians
@@ -7631,8 +8041,12 @@ child will follow movement and rotation of that bone.
         * Fourth column: subject looking to the right
         * Fifth column:  subject viewed from above
         * Sixth column:  subject viewed from below
-* `get_entity_name()` (**Deprecated**: Will be removed in a future version, use the field `self.name` instead)
-* `get_luaentity()`: returns the object's associated luaentity table
+* `get_luaentity()`:
+	* Returns the object's associated luaentity table, if there is one
+	* Otherwise returns `nil` (e.g. for players)
+* `get_entity_name()`:
+    * **Deprecated**: Will be removed in a future version,
+      use `:get_luaentity().name` instead.
 
 #### Player only (no-op for other objects)
 
@@ -7725,13 +8139,18 @@ child will follow movement and rotation of that bone.
 * `set_physics_override(override_table)`
     * Overrides the physics attributes of the player
     * `override_table` is a table with the following fields:
-        * `speed`: multiplier to default movement speed and acceleration values (default: `1`)
-        * `jump`: multiplier to default jump value (default: `1`)
-        * `gravity`: multiplier to default gravity value (default: `1`)
+        * `speed`: multiplier to *all* movement speed (`speed_*`) and
+                   acceleration (`acceleration_*`) values (default: `1`)
+        * `speed_walk`: multiplier to default walk speed value (default: `1`)
+            * Note: The actual walk speed is the product of `speed` and `speed_walk`
         * `speed_climb`: multiplier to default climb speed value (default: `1`)
             * Note: The actual climb speed is the product of `speed` and `speed_climb`
         * `speed_crouch`: multiplier to default sneak speed value (default: `1`)
             * Note: The actual sneak speed is the product of `speed` and `speed_crouch`
+        * `speed_fast`: multiplier to default speed value in Fast Mode (default: `1`)
+            * Note: The actual fast speed is the product of `speed` and `speed_fast`
+        * `jump`: multiplier to default jump value (default: `1`)
+        * `gravity`: multiplier to default gravity value (default: `1`)
         * `liquid_fluidity`: multiplier to liquid movement resistance value
           (for nodes with `liquid_move_physics`); the higher this value, the lower the
           resistance to movement. At `math.huge`, the resistance is zero and you can
@@ -7749,6 +8168,8 @@ child will follow movement and rotation of that bone.
         * `acceleration_air`: multiplier to acceleration
           when jumping or falling (default: `1`)
             * Note: The actual acceleration is the product of `speed` and `acceleration_air`
+        * `acceleration_fast`: multiplier to acceleration in Fast Mode (default: `1`)
+            * Note: The actual acceleration is the product of `speed` and `acceleration_fast`
         * `sneak`: whether player can sneak (default: `true`)
         * `sneak_glitch`: whether player can use the new move code replications
           of the old sneak side-effects: sneak ladders and 2 node sneak jump
@@ -7770,8 +8191,12 @@ child will follow movement and rotation of that bone.
 * `hud_change(id, stat, value)`: change a value of a previously added HUD
   element.
     * `stat` supports the same keys as in the hud definition table except for
-      `"hud_elem_type"`.
+      `"type"` (or the deprecated `"hud_elem_type"`).
 * `hud_get(id)`: gets the HUD element definition structure of the specified ID
+* `hud_get_all()`:
+    * Returns a table in the form `{ [id] = HUD definition, [id] = ... }`.
+    * A mod should keep track of its introduced IDs and only use this to access foreign elements.
+    * It is discouraged to change foreign HUD elements.
 * `hud_set_flags(flags)`: sets specified HUD flags of player.
     * `flags`: A table with the following fields set to boolean values
         * `hotbar`
@@ -7825,8 +8250,7 @@ child will follow movement and rotation of that bone.
       whether `set_sky` accepts this format. Check the legacy format otherwise.
     * Passing no arguments resets the sky to its default values.
     * `sky_parameters` is a table with the following optional fields:
-        * `base_color`: ColorSpec, changes fog in "skybox" and "plain".
-          (default: `#ffffff`)
+        * `base_color`: ColorSpec, meaning depends on `type` (default: `#ffffff`)
         * `body_orbit_tilt`: Float, rotation angle of sun/moon orbit in degrees.
            By default, orbit is controlled by a client-side setting, and this field is not set.
            After a value is assigned, it can only be changed to another float value.
@@ -7837,7 +8261,11 @@ child will follow movement and rotation of that bone.
             * `"plain"`: Uses 0 textures, `base_color` used as both fog and sky.
             (default: `"regular"`)
         * `textures`: A table containing up to six textures in the following
-            order: Y+ (top), Y- (bottom), X- (west), X+ (east), Z+ (north), Z- (south).
+            order: Y+ (top), Y- (bottom), X+ (east), X- (west), Z- (south), Z+ (north).
+            The top and bottom textures are oriented in-line with the east (X+) face (the top edge of the
+            bottom texture and the bottom edge of the top texture touch the east face).
+            Some top and bottom textures expect to be aligned with the north face and will need to be rotated
+            by -90 and 90 degrees, respectively, to fit the eastward orientation.
         * `clouds`: Boolean for whether clouds appear. (default: `true`)
         * `sky_color`: A table used in `"regular"` type only, containing the
           following values (alpha is ignored):
@@ -7872,17 +8300,19 @@ child will follow movement and rotation of that bone.
                 `"default"` uses the classic Minetest sun and moon tinting.
                 Will use tonemaps, if set to `"default"`. (default: `"default"`)
         * `fog`: A table with following optional fields:
-            * `fog_distance`: integer, set an upper bound the client's viewing_range (inluding range_all).
-               By default, fog_distance is controlled by the client's viewing_range, and this field is not set.
-               Any value >= 0 sets the desired upper bound for the client's viewing_range and disables range_all.
-               Any value < 0, resets the behavior to being client-controlled.
+            * `fog_distance`: integer, set an upper bound for the client's viewing_range.
+               Any value >= 0 sets the desired upper bound for viewing_range,
+               disables range_all and prevents disabling fog (F3 key by default).
+               Any value < 0 resets the behavior to being client-controlled.
                (default: -1)
             * `fog_start`: float, override the client's fog_start.
                Fraction of the visible distance at which fog starts to be rendered.
-               By default, fog_start is controlled by the client's `fog_start` setting, and this field is not set.
                Any value between [0.0, 0.99] set the fog_start as a fraction of the viewing_range.
                Any value < 0, resets the behavior to being client-controlled.
                (default: -1)
+            * `fog_color`: ColorSpec, override the color of the fog.
+               Unlike `base_color` above this will apply regardless of the skybox type.
+               (default: `"#00000000"`, which means no override)
 * `set_sky(base_color, type, {texture names}, clouds)`
     * Deprecated. Use `set_sky(sky_parameters)`
     * `base_color`: ColorSpec, defaults to white
@@ -8001,9 +8431,8 @@ child will follow movement and rotation of that bone.
     * Passing no arguments resets lighting to its default values.
     * `light_definition` is a table with the following optional fields:
       * `saturation` sets the saturation (vividness; default: `1.0`).
-          values > 1 increase the saturation
-          values in [0,1) decrease the saturation
-            * This value has no effect on clients who have the "Tone Mapping" shader disabled.
+        * values > 1 increase the saturation
+        * values in [0,1] decrease the saturation
       * `shadows` is a table that controls ambient shadows
         * `intensity` sets the intensity of the shadows from 0 (no shadows, default) to 1 (blackness)
             * This value has no effect on clients who have the "Dynamic Shadows" shader disabled.
@@ -8015,11 +8444,14 @@ child will follow movement and rotation of that bone.
         * `speed_dark_bright` set the speed of adapting to bright light (default: `1000.0`)
         * `speed_bright_dark` set the speed of adapting to dark scene (default: `1000.0`)
         * `center_weight_power` set the power factor for center-weighted luminance measurement (default: `1.0`)
+      * `volumetric_light`: is a table that controls volumetric light (a.k.a. "godrays")
+        * `strength`: sets the strength of the volumetric light effect from 0 (off, default) to 1 (strongest)
+           * This value has no effect on clients who have the "Volumetric Lighting" or "Bloom" shaders disabled.
 
 * `get_lighting()`: returns the current state of lighting for the player.
     * Result is a table with the same fields as `light_definition` in `set_lighting`.
 * `respawn()`: Respawns the player using the same mechanism as the death screen,
-  including calling on_respawnplayer callbacks.
+  including calling `on_respawnplayer` callbacks.
 
 `PcgRandom`
 -----------
@@ -8028,7 +8460,9 @@ A 32-bit pseudorandom number generator.
 Uses PCG32, an algorithm of the permuted congruential generator family,
 offering very strong randomness.
 
-It can be created via `PcgRandom(seed)` or `PcgRandom(seed, sequence)`.
+* constructor `PcgRandom(seed, [seq])`
+  * `seed`: 64-bit unsigned seed
+  * `seq`: 64-bit unsigned sequence, optional
 
 ### Methods
 
@@ -8040,6 +8474,8 @@ It can be created via `PcgRandom(seed)` or `PcgRandom(seed, sequence)`.
     * `mean = (max - min) / 2`, and
     * `variance = (((max - min + 1) ^ 2) - 1) / (12 * num_trials)`
     * Increasing `num_trials` improves accuracy of the approximation
+* `get_state()`: return generator state encoded in string
+* `set_state(state_string)`: restore generator state from encoded string
 
 `PerlinNoise`
 -------------
@@ -8123,14 +8559,22 @@ Can be obtained using `player:get_meta()`.
 A 16-bit pseudorandom number generator.
 Uses a well-known LCG algorithm introduced by K&R.
 
-It can be created via `PseudoRandom(seed)`.
+**Note**:
+`PseudoRandom` is slower and has worse random distribution than `PcgRandom`.
+Use `PseudoRandom` only if you need output to match the well-known LCG algorithm introduced by K&R.
+Otherwise, use `PcgRandom`.
+
+* constructor `PseudoRandom(seed)`
+  * `seed`: 32-bit signed number
 
 ### Methods
 
 * `next()`: return next integer random number [`0`...`32767`]
 * `next(min, max)`: return next integer random number [`min`...`max`]
-    * `((max - min) == 32767) or ((max-min) <= 6553))` must be true
-      due to the simple implementation making bad distribution otherwise.
+    * Either `max - min == 32767` or `max - min <= 6553` must be true
+      due to the simple implementation making a bad distribution otherwise.
+* `get_state()`: return state of pseudorandom generator as number
+    * use returned number as seed in PseudoRandom constructor to restore
 
 `Raycast`
 ---------
@@ -8196,37 +8640,47 @@ secure random device cannot be found on the system.
 
 An interface to read config files in the format of `minetest.conf`.
 
-It can be created via `Settings(filename)`.
+`minetest.settings` is a `Settings` instance that can be used to access the
+main config file (`minetest.conf`). Instances for other config files can be
+created via `Settings(filename)`.
+
+Engine settings on the `minetest.settings` object have internal defaults that
+will be returned if a setting is unset.
+The engine does *not* (yet) read `settingtypes.txt` for this purpose. This
+means that no defaults will be returned for mod settings.
 
 ### Methods
 
 * `get(key)`: returns a value
+    * Returns `nil` if `key` is not found.
 * `get_bool(key, [default])`: returns a boolean
     * `default` is the value returned if `key` is not found.
     * Returns `nil` if `key` is not found and `default` not specified.
 * `get_np_group(key)`: returns a NoiseParams table
+    * Returns `nil` if `key` is not found.
 * `get_flags(key)`:
     * Returns `{flag = true/false, ...}` according to the set flags.
     * Is currently limited to mapgen flags `mg_flags` and mapgen-specific
       flags like `mgv5_spflags`.
+    * Returns `nil` if `key` is not found.
 * `set(key, value)`
     * Setting names can't contain whitespace or any of `="{}#`.
     * Setting values can't contain the sequence `\n"""`.
     * Setting names starting with "secure." can't be set on the main settings
       object (`minetest.settings`).
 * `set_bool(key, value)`
-    * See documentation for set() above.
+    * See documentation for `set()` above.
 * `set_np_group(key, value)`
     * `value` is a NoiseParams table.
-    * Also, see documentation for set() above.
+    * Also, see documentation for `set()` above.
 * `remove(key)`: returns a boolean (`true` for success)
 * `get_names()`: returns `{key1,...}`
 * `has(key)`:
     * Returns a boolean indicating whether `key` exists.
-    * Note that for the main settings object (`minetest.settings`), `get(key)`
-      might return a value even if `has(key)` returns `false`. That's because
-      `get` can fall back to the so-called parent of the `Settings` object, i.e.
-      the default values.
+    * In contrast to the various getter functions, `has()` doesn't consider
+      any default values.
+    * This means that on the main settings object (`minetest.settings`),
+      `get(key)` might return a value even if `has(key)` returns `false`.
 * `write()`: returns a boolean (`true` for success)
     * Writes changes to file.
 * `to_table()`: returns `{[key1]=value1,...}`
@@ -8304,10 +8758,15 @@ Player properties need to be saved manually.
     -- If `rotate = false`, the selection box will not rotate with the object itself, remaining fixed to the axes.
     -- If `rotate = true`, it will match the object's rotation and any attachment rotations.
     -- Raycasts use the selection box and object's rotation, but do *not* obey attachment rotations.
+    -- For server-side raycasts to work correctly,
+    -- the selection box should extend at most 5 units in each direction.
 
 
     pointable = true,
-    -- Whether the object can be pointed at
+    -- Can be `true` if it is pointable, `false` if it can be pointed through,
+    -- or `"blocking"` if it is pointable but not selectable.
+    -- Clients older than 5.9.0 interpret `pointable = "blocking"` as `pointable = true`.
+    -- Can be overridden by the `pointabilities` of the held item.
 
     visual = "cube" / "sprite" / "upright_sprite" / "mesh" / "wielditem" / "item",
     -- "cube" is a node-sized cube.
@@ -8316,7 +8775,8 @@ Player properties need to be saved manually.
     -- "mesh" uses the defined mesh model.
     -- "wielditem" is used for dropped items.
     --   (see builtin/game/item_entity.lua).
-    --   For this use 'wield_item = itemname' (Deprecated: 'textures = {itemname}').
+    --   For this use 'wield_item = itemname'.
+    --   Setting 'textures = {itemname}' has the same effect, but is deprecated.
     --   If the item has a 'wield_image' the object will be an extrusion of
     --   that, otherwise:
     --   If 'itemname' is a cubic node or nodebox the object will appear
@@ -8343,8 +8803,8 @@ Player properties need to be saved manually.
     -- "cube" uses 6 textures just like a node, but all 6 must be defined.
     -- "sprite" uses 1 texture.
     -- "upright_sprite" uses 2 textures: {front, back}.
-    -- "wielditem" expects 'textures = {itemname}' (see 'visual' above).
     -- "mesh" requires one texture for each mesh buffer/material (in order)
+    -- Deprecated usage of "wielditem" expects 'textures = {itemname}' (see 'visual' above).
 
     colors = {},
     -- Number of required colors depends on visual
@@ -8666,11 +9126,33 @@ Used by `minetest.register_node`, `minetest.register_craftitem`, and
 
     range = 4.0,
     -- Range of node and object pointing that is possible with this item held
+    -- Can be overridden with itemstack meta.
 
     liquids_pointable = false,
     -- If true, item can point to all liquid nodes (`liquidtype ~= "none"`),
     -- even those for which `pointable = false`
 
+    pointabilities = {
+        nodes = {
+            ["default:stone"] = "blocking",
+            ["group:leaves"] = false,
+        },
+        objects = {
+            ["modname:entityname"] = true,
+            ["group:ghosty"] = true, -- (an armor group)
+        },
+    },
+    -- Contains lists to override the `pointable` property of nodes and objects.
+    -- The index can be a node/entity name or a group with the prefix `"group:"`.
+    -- (For objects `armor_groups` are used and for players the entity name is irrelevant.)
+    -- If multiple fields fit, the following priority order is applied:
+    -- 1. value of matching node/entity name
+    -- 2. `true` for any group
+    -- 3. `false` for any group
+    -- 4. `"blocking"` for any group
+    -- 5. `liquids_pointable` if it is a liquid node
+    -- 6. `pointable` property of the node or object
+
     light_source = 0,
     -- When used for nodes: Defines amount of light emitted by node.
     -- Otherwise: Defines texture glow when viewed as a dropped item
@@ -8698,6 +9180,19 @@ Used by `minetest.register_node`, `minetest.register_craftitem`, and
         -- fallback behavior.
     },
 
+    -- Set wear bar color of the tool by setting color stops and blend mode
+    -- See "Wear Bar Color" section for further explanation including an example
+    wear_color = {
+        -- interpolation mode: 'constant' or 'linear'
+        -- (nil defaults to 'constant')
+        blend = "linear",
+        color_stops = {
+            [0.0] = "#ff0000",
+            [0.5] = "#ffff00",
+            [1.0] = "#00ff00",
+        }
+    },
+
     node_placement_prediction = nil,
     -- If nil and item is node, prediction is made automatically.
     -- If nil and item is not a node, no prediction is made.
@@ -8712,6 +9207,21 @@ Used by `minetest.register_node`, `minetest.register_craftitem`, and
     -- Otherwise should be name of node which the client immediately places
     -- upon digging. Server will always update with actual result shortly.
 
+    touch_interaction = <TouchInteractionMode> OR {
+        pointed_nothing = <TouchInteractionMode>,
+        pointed_node    = <TouchInteractionMode>,
+        pointed_object  = <TouchInteractionMode>,
+    },
+      -- Only affects touchscreen clients.
+      -- Defines the meaning of short and long taps with the item in hand.
+      -- If specified as a table, the field to be used is selected according to
+      -- the current `pointed_thing`.
+      -- There are three possible TouchInteractionMode values:
+      -- * "user"                 (meaning depends on client-side settings)
+      -- * "long_dig_short_place" (long tap  = dig, short tap = place)
+      -- * "short_dig_long_place" (short tap = dig, long tap  = place)
+      -- The default value is "user".
+
     sound = {
         -- Definition of item sounds to be played at various events.
         -- All fields in this table are optional.
@@ -8837,8 +9347,8 @@ Used by `minetest.register_node`.
     --           depending on the alpha channel being below/above 50% in value
     -- * "blend": The alpha channel specifies how transparent a given pixel
     --            of the rendered node is
-    -- The default is "opaque" for drawtypes normal, liquid and flowingliquid;
-    -- "clip" otherwise.
+    -- The default is "opaque" for drawtypes normal, liquid and flowingliquid,
+    -- mesh and nodebox or "clip" otherwise.
     -- If set to a boolean value (deprecated): true either sets it to blend
     -- or clip, false sets it to clip or opaque mode depending on the drawtype.
 
@@ -8863,6 +9373,13 @@ Used by `minetest.register_node`.
     place_param2 = 0,
     -- Value for param2 that is set when player places node
 
+    wallmounted_rotate_vertical = false,
+    -- If true, place_param2 is nil, and this is a wallmounted node,
+    -- this node might use the special 90° rotation when placed
+    -- on the floor or ceiling, depending on the direction.
+    -- See the explanation about wallmounted for details.
+    -- Otherwise, the rotation is always the same on vertical placement.
+
     is_ground_content = true,
     -- If false, the cave generator and dungeon generator will not carve
     -- through this node.
@@ -8875,7 +9392,12 @@ Used by `minetest.register_node`.
 
     walkable = true,  -- If true, objects collide with node
 
-    pointable = true,  -- If true, can be pointed at
+    pointable = true,
+    -- Can be `true` if it is pointable, `false` if it can be pointed through,
+    -- or `"blocking"` if it is pointable but not selectable.
+    -- Clients older than 5.9.0 interpret `pointable = "blocking"` as `pointable = true`.
+    -- Can be overridden by the `pointabilities` of the held item.
+    -- A client may be able to point non-pointable nodes, since it isn't checked server-side.
 
     diggable = true,  -- If false, can never be dug
 
@@ -8911,10 +9433,8 @@ Used by `minetest.register_node`.
     -- flowing version (`liquid_alternative_flowing`) and
     -- source version (`liquid_alternative_source`) of a liquid.
     --
-    -- Specifically, these fields are required if any of these is true:
-    -- * `liquidtype ~= "none" or
-    -- * `drawtype == "liquid" or
-    -- * `drawtype == "flowingliquid"
+    -- Specifically, these fields are required if `liquidtype ~= "none"` or
+    -- `drawtype == "flowingliquid"`.
     --
     -- Liquids consist of up to two nodes: source and flowing.
     --
@@ -9200,6 +9720,7 @@ Used by `minetest.register_node`.
 
     on_receive_fields = function(pos, formname, fields, sender),
     -- fields = {name1 = value1, name2 = value2, ...}
+    -- formname should be the empty string; you **must not** use formname.
     -- Called when an UI form (e.g. sign text input) returns data.
     -- See minetest.register_on_player_receive_fields for more info.
     -- default: nil
@@ -9239,6 +9760,46 @@ Used by `minetest.register_node`.
 }
 ```
 
+Wear Bar Color
+--------------
+
+'Wear Bar' is a property of items that defines the coloring
+of the bar that appears under damaged tools.
+If it is absent, the default behavior of green-yellow-red is
+used.
+
+### Wear bar colors definition
+
+#### Syntax
+
+```lua
+{
+    -- 'constant' or 'linear'
+    -- (nil defaults to 'constant')
+    blend = "linear",
+    color_stops = {
+        [0.0] = "#ff0000",
+        [0.5] = "slateblue",
+        [1.0] = {r=0, g=255, b=0, a=150},
+    }
+}
+```
+
+#### Blend mode `blend`
+
+* `linear`: blends smoothly between each defined color point.
+* `constant`: each color starts at its defined point, and continues up to the next point
+
+#### Color stops `color_stops`
+
+Specified as `ColorSpec` color values assigned to `float` durability keys.
+
+"Durability" is defined as `1 - (wear / 65535)`.
+
+#### Shortcut usage
+
+Wear bar color can also be specified as a single `ColorSpec` instead of a table.
+
 Crafting recipes
 ----------------
 
@@ -9741,7 +10302,7 @@ See [Decoration types]. Used by `minetest.register_decoration`.
 ```lua
 {
     deco_type = "simple",
-    -- Type. "simple" or "schematic" supported
+    -- Type. "simple", "schematic" or "lsystem" supported
 
     place_on = "default:dirt_with_grass",
     -- Node (or list of nodes) that the decoration can be placed on
@@ -9784,7 +10345,7 @@ See [Decoration types]. Used by `minetest.register_decoration`.
     y_min = -31000,
     y_max = 31000,
     -- Lower and upper limits for decoration (inclusive).
-    -- These parameters refer to the Y co-ordinate of the 'place_on' node.
+    -- These parameters refer to the Y coordinate of the 'place_on' node.
 
     spawn_by = "default:water",
     -- Node (or list of nodes) that the decoration only spawns next to.
@@ -9894,6 +10455,12 @@ See [Decoration types]. Used by `minetest.register_decoration`.
     -- Effect is inverted for "all_ceilings" decorations.
     -- Ignored by 'y_min', 'y_max' and 'spawn_by' checks, which always refer
     -- to the 'place_on' node.
+
+    ----- L-system-type parameters
+
+    treedef = {},
+    -- Same as for `minetest.spawn_tree`.
+    -- See section [L-system trees] for more details.
 }
 ```
 
@@ -10027,9 +10594,14 @@ Used by `ObjectRef:hud_add`. Returned by `ObjectRef:hud_get`.
 
 ```lua
 {
-    hud_elem_type = "image",
+    type = "image",
     -- Type of element, can be "image", "text", "statbar", "inventory",
     -- "waypoint", "image_waypoint", "compass" or "minimap"
+    -- If undefined "text" will be used.
+
+    hud_elem_type = "image",
+    -- Deprecated, same as `type`.
+    -- In case both are specified `type` will be used.
 
     position = {x=0.5, y=0.5},
     -- Top left corner position of element
@@ -10103,7 +10675,10 @@ Used by `minetest.add_particle`.
     texture = "image.png",
     -- The texture of the particle
     -- v5.6.0 and later: also supports the table format described in the
-    -- following section
+    -- following section, but due to a bug this did not take effect
+    -- (beyond the texture name).
+    -- v5.9.0 and later: fixes the bug.
+    -- Note: "texture.animation" is ignored here. Use "animation" below instead.
 
     playername = "singleplayer",
     -- Optional, if specified spawns particle only on the player's client
@@ -10128,6 +10703,11 @@ Used by `minetest.add_particle`.
 
     drag = {x=0, y=0, z=0},
     -- v5.6.0 and later: Optional drag value, consult the following section
+    -- Note: Only a vector is supported here. Alternative forms like a single
+    -- number are not supported.
+
+    jitter = {min = ..., max = ..., bias = 0},
+    -- v5.6.0 and later: Optional jitter range, consult the following section
 
     bounce = {min = ..., max = ..., bias = 0},
     -- v5.6.0 and later: Optional bounce range, consult the following section
@@ -10153,7 +10733,10 @@ will be ignored.
 
 ```lua
 {
-    -- Common fields (same name and meaning in both new and legacy syntax)
+    -------------------
+    -- Common fields --
+    -------------------
+    -- (same name and meaning in both new and legacy syntax)
 
     amount = 1,
     -- Number of particles spawned over the time period `time`.
@@ -10185,6 +10768,8 @@ will be ignored.
 
     texture = "image.png",
     -- The texture of the particle
+    -- v5.6.0 and later: also supports the table format described in the
+    -- following section.
 
     playername = "singleplayer",
     -- Optional, if specified spawns particles only on the player's client
@@ -10210,7 +10795,9 @@ will be ignored.
     -- particle texture is picked.
     -- Otherwise, the default behavior is used. (currently: any random tile)
 
-    -- Legacy definition fields
+    -------------------
+    -- Legacy fields --
+    -------------------
 
     minpos = {x=0, y=0, z=0},
     maxpos = {x=0, y=0, z=0},
@@ -10338,32 +10925,46 @@ All of the properties that can be defined in this way are listed in the next
 section, along with the datatypes they accept.
 
 #### List of particlespawner properties
-All of the properties in this list can be animated with `*_tween` tables
-unless otherwise specified. For example, `jitter` can be tweened by setting
-a `jitter_tween` table instead of (or in addition to) a `jitter` table/value.
+
+All properties in this list of type "vec3 range", "float range" or "vec3" can
+be animated with `*_tween` tables. For example, `jitter` can be tweened by
+setting a `jitter_tween` table instead of (or in addition to) a `jitter`
+table/value.
+
 In this section, a float range is a table defined as so: { min = A, max = B }
 A and B are your supplemented values. For a vec3 range this means they are vectors.
 Types used are defined in the previous section.
 
 * vec3 range `pos`: the position at which particles can appear
+
 * vec3 range `vel`: the initial velocity of the particle
+
 * vec3 range `acc`: the direction and speed with which the particle
   accelerates
+
+* vec3 range `size`: scales the visual size of the particle texture.
+  if `node` is set, this can be set to 0 to spawn randomly-sized particles
+  (just like actual node dig particles).
+
 * vec3 range `jitter`: offsets the velocity of each particle by a random
   amount within the specified range each frame. used to create Brownian motion.
+
 * vec3 range `drag`: the amount by which absolute particle velocity along
   each axis is decreased per second.  a value of 1.0 means that the particle
   will be slowed to a stop over the space of a second; a value of -1.0 means
   that the particle speed will be doubled every second. to avoid interfering
   with gravity provided by `acc`, a drag vector like `vector.new(1,0,1)` can
   be used instead of a uniform value.
+
 * float range `bounce`: how bouncy the particles are when `collisiondetection`
   is turned on. values less than or equal to `0` turn off particle bounce;
   `1` makes the particles bounce without losing any velocity, and `2` makes
   them double their velocity with every bounce.  `bounce` is not bounded but
   values much larger than `1.0` probably aren't very useful.
+
 * float range `exptime`: the number of seconds after which the particle
   disappears.
+
 * table `attract`: sets the birth orientation of particles relative to various
   shapes defined in world coordinate space. this is an alternative means of
   setting the velocity which allows particles to emerge from or enter into
@@ -10371,8 +10972,10 @@ Types used are defined in the previous section.
   velocity values within a range. the velocity calculated by this method will
   be **added** to that specified by `vel` if `vel` is also set, so in most
   cases **`vel` should be set to 0**. `attract` has the fields:
+
   * string `kind`: selects the kind of shape towards which the particles will
     be oriented. it must have one of the following values:
+
     * `"none"`: no attractor is set and the `attractor` table is ignored
     * `"point"`: the particles are attracted to a specific point in space.
       use this also if you want a sphere-like effect, in combination with
@@ -10383,25 +10986,32 @@ Types used are defined in the previous section.
     * `"plane"`: the particles are attracted to an (infinite) plane on whose
       surface `origin` designates a point in world coordinate space. use this
       for e.g. particles entering or emerging from a portal.
+
   * float range `strength`: the speed with which particles will move towards
     `attractor`. If negative, the particles will instead move away from that
     point.
+
   * vec3 `origin`: the origin point of the shape towards which particles will
     initially be oriented. functions as an offset if `origin_attached` is also
     set.
+
   * vec3 `direction`: sets the direction in which the attractor shape faces. for
     lines, this sets the angle of the line; e.g. a vector of (0,1,0) will
     create a vertical line that passes through `origin`. for planes, `direction`
     is the surface normal of an infinite plane on whose surface `origin` is
     a point. functions as an offset if `direction_attached` is also set.
-  * entity `origin_attached`: allows the origin to be specified as an offset
-    from the position of an entity rather than a coordinate in world space.
-  * entity `direction_attached`: allows the direction to be specified as an offset
+
+  * ObjectRef `origin_attached`: allows the origin to be specified as an offset
     from the position of an entity rather than a coordinate in world space.
+
+  * ObjectRef `direction_attached`: allows the direction to be specified as an
+    offset from the position of an entity rather than a coordinate in world space.
+
   * bool `die_on_contact`: if true, the particles' lifetimes are adjusted so
     that they will die as they cross the attractor threshold. this behavior
     is the default but is undesirable for some kinds of animations; set it to
     false to allow particles to live out their natural lives.
+
 * vec3 range `radius`: if set, particles will be arranged in a sphere around
   `pos`. A constant can be used to create a spherical shell of particles, a
   vector to create an ovoid shell, and a range to create a volume; e.g.
@@ -10413,9 +11023,10 @@ Types used are defined in the previous section.
 
 ### Textures
 
-In versions before v5.6.0, particlespawner textures could only be specified as a single
-texture string. After v5.6.0, textures can now be specified as a table as well. This
-table contains options that allow simple animations to be applied to the texture.
+In versions before v5.6.0, particle/particlespawner textures could only be
+specified as a single texture string. After v5.6.0, textures can now be
+specified as a table as well. This table contains options that allow simple
+animations to be applied to the texture.
 
 ```lua
 texture = {
@@ -10470,18 +11081,18 @@ texture = {
 }
 ```
 
-Instead of setting a single texture definition, it is also possible to set a
-`texpool` property. A `texpool` consists of a list of possible particle textures.
-Every time a particle is spawned, the engine will pick a texture at random from
-the `texpool` and assign it as that particle's texture. You can also specify a
-`texture` in addition to a `texpool`; the `texture` value will be ignored on newer
-clients but will be sent to older (pre-v5.6.0) clients that do not implement
-texpools.
+For particlespawners, it is also possible to set the `texpool` property instead
+of a single texture definition. A `texpool` consists of a list of possible
+particle textures. Every time a particle is spawned, the engine will pick a
+texture at random from the `texpool` and assign it as that particle's texture.
+You can also specify a `texture` in addition to a `texpool`; the `texture`
+value will be ignored on newer clients but will be sent to older (pre-v5.6.0)
+clients that do not implement texpools.
 
 ```lua
 texpool = {
     "mymod_particle_texture.png";
-    { name = "mymod_spark.png", fade = "out" },
+    { name = "mymod_spark.png", alpha_tween = {1, 0} },
     {
       name = "mymod_dust.png",
       alpha = 0.3,
@@ -10613,8 +11224,8 @@ Used by `minetest.register_authentication_handler`.
 
     set_privileges = function(name, privileges),
     -- Set privileges of player `name`.
-    -- `privileges` is in table form, auth data should be created if not
-    -- present.
+    -- `privileges` is in table form: keys are privilege names, values are `true`;
+    -- auth data should be created if not present.
 
     reload = function(),
     -- Reload authentication data from the storage location.
diff --git a/doc/menu_lua_api.md b/doc/menu_lua_api.md
index 1eec75228..19540a607 100644
--- a/doc/menu_lua_api.md
+++ b/doc/menu_lua_api.md
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 5.8.0
+Minetest Lua Mainmenu API Reference 5.9.0
 =========================================
 
 Introduction
@@ -14,7 +14,8 @@ Callbacks
 * `core.button_handler(fields)`: called when a button is pressed.
   * `fields` = `{name1 = value1, name2 = value2, ...}`
 * `core.event_handler(event)`
-  * `event`: `"MenuQuit"`, `"KeyEnter"`, `"ExitButton"` or `"EditBoxEnter"`
+  * `event`: `"MenuQuit"`, `"KeyEnter"`, `"ExitButton"`, `"EditBoxEnter"` or
+    `"FullscreenChange"`
 
 
 Gamedata
@@ -38,7 +39,9 @@ Functions
 ---------
 
 * `core.start()`
+  * start game session
 * `core.close()`
+  * exit engine
 * `core.get_min_supp_proto()`
   * returns the minimum supported network protocol version
 * `core.get_max_supp_proto()`
@@ -91,8 +94,8 @@ Filesystem
     registered in the core (possible in async calls)
 * `core.get_cache_path()` -> path of cache
 * `core.get_temp_path([param])` (possible in async calls)
-  * `param`=true: returns path to a temporary file
-    otherwise: returns path to the temporary folder
+  * `param`=true: returns path to a newly created temporary file
+  * otherwise: returns path to a newly created temporary folder
 
 
 HTTP Requests
@@ -249,6 +252,10 @@ GUI
       -- HUD Scaling multiplier
       -- Equal to the setting `hud_scaling` multiplied by `dpi / 96`
       real_hud_scaling = 1,
+
+      -- Whether the touchscreen controls are enabled.
+      -- Usually (but not always) `true` on Android.
+      touch_controls = false,
   }
   ```
 
@@ -313,6 +320,7 @@ Package - content which is downloadable from the content db, may or may not be i
           description      = "description",
           author           = "author",
           path             = "path/to/content",
+          textdomain = "textdomain", -- textdomain to translate title / description with
           depends          = {"mod", "names"}, -- mods only
           optional_depends = {"mod", "names"}, -- mods only
       }
@@ -330,6 +338,13 @@ Package - content which is downloadable from the content db, may or may not be i
           error_message = "",  -- message or nil
       }
       ```
+* `core.get_content_translation(path, domain, string)`
+  * Translates `string` using `domain` in content directory at `path`.
+  * Textdomains will be found by looking through all locale folders.
+  * String should contain translation markup from `core.translate(textdomain, ...)`.
+  * Ex: `core.get_content_translation("mods/mymod", "mymod", core.translate("mymod", "Hello World"))`
+    will translate "Hello World" into the current user's language
+    using `mods/mymod/locale/mymod.fr.tr`.
 
 Logging
 -------
diff --git a/doc/mkdocs/build.sh b/doc/mkdocs/build.sh
index 7f837866f..8d8ecb7ca 100755
--- a/doc/mkdocs/build.sh
+++ b/doc/mkdocs/build.sh
@@ -17,6 +17,7 @@ markdown_extensions:
     - pymdownx.superfences
     - pymdownx.highlight:
         css_class: codehilite
+    - gfm_admonition
 plugins:
     - search:
         separator: '[\s\-\.\(]+'
diff --git a/doc/mkdocs/requirements.txt b/doc/mkdocs/requirements.txt
index e67f3d07f..61e9c03c3 100644
--- a/doc/mkdocs/requirements.txt
+++ b/doc/mkdocs/requirements.txt
@@ -1,3 +1,4 @@
 mkdocs~=1.4.3
 pygments~=2.15.1
-pymdown-extensions~=10.3
\ No newline at end of file
+pymdown-extensions~=10.3
+markdown-gfm-admonition~=0.1.0
\ No newline at end of file
diff --git a/doc/texture_packs.md b/doc/texture_packs.md
index c1bd1dd86..b6f9306d9 100644
--- a/doc/texture_packs.md
+++ b/doc/texture_packs.md
@@ -25,8 +25,14 @@ texture pack. The name must not be “base”.
 ### `texture_pack.conf`
 A key-value config file with the following keys:
 
-* `title` - human readable title
+* `name`: The texture pack name. Allows Minetest to determine the texture pack name even if
+  the folder is wrongly named.
+* `title` - human-readable title
 * `description` - short description, shown in the content tab
+* `author`: The author's ContentDB username.
+* `textdomain`: Textdomain used to translate title and description.
+  Defaults to the texture pack name.
+  See [Translating content meta](lua_api.md#translating-content-meta).
 
 ### `description.txt`
 **Deprecated**, you should use texture_pack.conf instead.
@@ -133,11 +139,6 @@ are placeholders intended to be overwritten by the game.
 
 ### Android textures
 
-* `down_arrow.png`
-* `left_arrow.png`
-* `right_arrow.png`
-* `up_arrow.png`
-
 * `drop_btn.png`
 * `fast_btn.png`
 * `fly_btn.png`
@@ -210,7 +211,8 @@ Here are targets you can choose from:
 Nodes support all targets, but other items only support 'inventory'
 and 'wield'.
 
-¹ : `N` is an integer [0,255]. Sets align_style = "world" and scale = N on the tile, refer to lua_api.md for details.
+¹ : `N` is an integer [0,255]. Sets align_style = "world" and scale = N on the tile,
+     refer to lua_api.md for details.
 
 ### Using the special targets
 
diff --git a/freeminer.conf.example b/freeminer.conf.example
index 479f39591..d61371a73 100644
--- a/freeminer.conf.example
+++ b/freeminer.conf.example
@@ -22,7 +22,7 @@
 #    type: float min: 0 max: 0.99
 # camera_smoothing = 0.0
 
-#    Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Change Keys.
+#    Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Controls.
 #    type: float min: 0 max: 0.99
 # cinematic_camera_smoothing = 0.7
 
@@ -50,6 +50,11 @@
 #    type: float min: 0.16 max: 2
 # repeat_place_time = 0.25
 
+#    The minimum time in seconds it takes between digging nodes when holding
+#    the dig button.
+#    type: float min: 0 max: 2
+# repeat_dig_time = 0.0
+
 #    Automatically jump up single-node obstacles.
 #    type: bool
 # autojump = false
@@ -80,14 +85,22 @@
 
 ## Touchscreen
 
-#    The length in pixels it takes for touchscreen interaction to start.
-#    type: int min: 0 max: 100
-# touchscreen_threshold = 20
+#    Enables touchscreen mode, allowing you to play the game with a touchscreen.
+#    type: bool
+# enable_touch = true
 
 #    Touchscreen sensitivity multiplier.
 #    type: float min: 0.001 max: 10
 # touchscreen_sensitivity = 0.2
 
+#    The length in pixels after which a touch interaction is considered movement.
+#    type: int min: 0 max: 100
+# touchscreen_threshold = 20
+
+#    The delay in milliseconds after which a touch interaction is considered a long tap.
+#    type: int min: 100 max: 1000
+# touch_long_tap_delay = 400
+
 #    Use crosshair to select object instead of whole screen.
 #    If enabled, a crosshair will be shown and will be used for selecting object.
 #    type: bool
@@ -103,6 +116,18 @@
 #    type: bool
 # virtual_joystick_triggers_aux1 = false
 
+#    The gesture for punching players/entities.
+#    This can be overridden by games and mods.
+#
+#    * short_tap
+#    Easy to use and well-known from other games that shall not be named.
+#
+#    * long_tap
+#    Known from the classic Minetest mobile controls.
+#    Combat is more or less impossible.
+#    type: enum values: short_tap, long_tap
+# touch_punch_gesture = short_tap
+
 #
 # Graphics and Audio
 #
@@ -167,9 +192,9 @@
 
 ### Graphics Effects
 
-#    Makes all liquids opaque
+#    Allows liquids to be translucent.
 #    type: bool
-# opaque_water = false
+# translucent_liquids = true
 
 #    Leaves style:
 #    -   Fancy:  all faces visible
@@ -348,7 +373,8 @@
 #
 #    * None - No antialiasing (default)
 #
-#    * FSAA - Hardware-provided full-screen antialiasing (incompatible with shaders)
+#    * FSAA - Hardware-provided full-screen antialiasing
+#    (incompatible with Post Processing and Undersampling)
 #    A.K.A multi-sample antialiasing (MSAA)
 #    Smoothens out block edges but does not affect the insides of textures.
 #    A restart is required to change this option.
@@ -389,7 +415,6 @@
 
 #    Shaders allow advanced visual effects and may increase performance on some video
 #    cards.
-#    This only works with the OpenGL video backend.
 #    type: bool
 # enable_shaders = true
 
@@ -488,6 +513,10 @@
 
 ### Post Processing
 
+#    Enables the post processing pipeline.
+#    type: bool
+# enable_post_processing = true
+
 #    Enables Hable's 'Uncharted 2' filmic tone mapping.
 #    Simulates the tone curve of photographic film and how this approximates the
 #    appearance of high dynamic range images. Mid-range contrast is slightly
@@ -508,6 +537,16 @@
 #    type: float min: -1 max: 1
 # exposure_compensation = 0.0
 
+#    Apply dithering to reduce color banding artifacts.
+#    Dithering significantly increases the size of losslessly-compressed
+#    screenshots and it works incorrectly if the display or operating system
+#    performs additional dithering or if the color channels are not quantized
+#    to 8 bits.
+#    With OpenGL ES, dithering only works if the shader supports high
+#    floating-point precision and it may have a higher performance impact.
+#    type: bool
+# debanding = true
+
 ### Bloom
 
 #    Set to true to enable bloom effect.
@@ -539,6 +578,10 @@
 #    type: float min: 0.1 max: 8
 # bloom_radius = 1
 
+#    Set to true to enable volumetric lighting effect (a.k.a. "Godrays").
+#    type: bool
+# enable_volumetric_lighting = false
+
 ## Audio
 
 #    Volume of all sounds.
@@ -546,6 +589,10 @@
 #    type: float min: 0 max: 1
 # sound_volume = 0.8
 
+#    Volume multiplier when the window is unfocused.
+#    type: float min: 0 max: 1
+# sound_volume_unfocused = 0.3
+
 #    Whether to mute sounds. You can unmute sounds at any time, unless the
 #    sound system is disabled (enable_sound=false).
 #    In-game, you can toggle the mute state with the mute key or by using the
@@ -555,7 +602,7 @@
 
 ## User Interfaces
 
-#    Set the language. Leave empty to use the system language.
+#    Set the language. By default, the system language is used.
 #    A restart is required after changing this.
 #    type: enum values: , be, bg, ca, cs, da, de, el, en, eo, es, et, eu, fi, fr, gd, gl, hu, id, it, ja, jbo, kk, ko, lt, lv, ms, nb, nl, nn, pl, pt, pt_BR, ro, ru, sk, sl, sr_Cyrl, sr_Latn, sv, sw, tr, uk, vi, zh_CN, zh_TW
 # language =
@@ -660,6 +707,11 @@
 #    type: string
 # contentdb_url = https://content.minetest.net
 
+#    If enabled and you have ContentDB packages installed, Minetest may contact ContentDB to
+#    check for package updates when opening the mainmenu.
+#    type: bool
+# contentdb_enable_updates_indicator = true
+
 #    Comma-separated list of flags to hide in the content repository.
 #    "nonfree" can be used to hide packages which do not qualify as 'free software',
 #    as defined by the Free Software Foundation.
@@ -693,7 +745,8 @@
 #    type: bool
 # enable_split_login_register = true
 
-#    URL to JSON file which provides information about the newest Minetest release
+#    URL to JSON file which provides information about the newest Minetest release.
+#    If this is empty the engine will never check for updates.
 #    type: string
 # update_information_url = https://www.minetest.net/release_info.json
 
@@ -760,6 +813,15 @@
 #    type: bool
 # strict_protocol_version_checking = false
 
+#    Define the oldest clients allowed to connect.
+#    Older clients are compatible in the sense that they will not crash when connecting
+#    to new servers, but they may not support all new features that you are expecting.
+#    This allows for more fine-grained control than strict_protocol_version_checking.
+#    Minetest still enforces its own internal minimum, and enabling
+#    strict_protocol_version_checking will effectively override this.
+#    type: int min: 1 max: 65535
+# protocol_version_min = 1
+
 #    Specifies URL from which client fetches media instead of using UDP.
 #    $filename should be accessible from $remote_media$filename via cURL
 #    (obviously, remote_media should end with a slash).
@@ -1177,8 +1239,9 @@
 #    The 'snowbiomes' flag enables the new 5 biome system.
 #    When the 'snowbiomes' flag is enabled jungles are automatically enabled and
 #    the 'jungles' flag is ignored.
-#    type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees
-# mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes,noflat,trees
+#    The 'temples' flag disables generation of desert temples. Normal dungeons will appear instead.
+#    type: flags possible values: jungles, biomeblend, mudflow, snowbiomes, flat, trees, temples, nojungles, nobiomeblend, nomudflow, nosnowbiomes, noflat, notrees, notemples
+# mgv6_spflags = jungles,biomeblend,mudflow,snowbiomes,noflat,trees,temples
 
 #    Deserts occur when np_biome exceeds this value.
 #    When the 'snowbiomes' flag is enabled, this is ignored.
@@ -2582,6 +2645,10 @@
 #    type: bool
 # random_input = false
 
+#    Enable random mod loading (mainly used for testing).
+#    type: bool
+# random_mod_load_order = false
+
 #    Enable mod channels support.
 #    type: bool
 # enable_mod_channels = false
@@ -2664,8 +2731,8 @@
 #    The rendering back-end.
 #    Note: A restart is required after changing this!
 #    OpenGL is the default for desktop, and OGLES2 for Android.
-#    Shaders are supported by OpenGL and OGLES2 (experimental).
-#    type: enum values: , opengl, ogles1, ogles2
+#    Shaders are supported by everything but OGLES1.
+#    type: enum values: , opengl, opengl3, ogles1, ogles2
 # video_driver =
 
 #    Distance in nodes at which transparency depth sorting is enabled
@@ -2673,11 +2740,6 @@
 #    type: int min: 0 max: 128
 # transparency_sorting_distance = 16
 
-#    Enable vertex buffer objects.
-#    This should greatly improve graphics performance.
-#    type: bool
-# enable_vbo = true
-
 #    Radius of cloud area stated in number of 64 node cloud squares.
 #    Values larger than 26 will start to produce sharp cutoffs at cloud area corners.
 #    type: int min: 1 max: 62
@@ -2701,12 +2763,6 @@
 #    type: int min: 0 max: 8
 # mesh_generation_threads = 0
 
-#    Size of the MapBlock cache of the mesh generator. Increasing this will
-#    increase the cache hit %, reducing the data being copied from the main
-#    thread, thus reducing jitter.
-#    type: int min: 0 max: 1000
-# meshgen_block_cache_size = 20
-
 #    True = 256
 #    False = 128
 #    Usable to make minimap smoother on slower machines.
@@ -2750,6 +2806,17 @@
 #    type: int min: 1 max: 16
 # client_mesh_chunk = 1
 
+#    Enables debug and error-checking in the OpenGL driver.
+#    type: bool
+# opengl_debug = false
+
+### Sound
+
+#    Comma-separated list of AL and ALC extensions that should not be used.
+#    Useful for testing. See al_extensions.[h,cpp] for details.
+#    type: string
+# sound_extensions_blacklist =
+
 ### Font
 
 #    type: bool
@@ -2928,9 +2995,10 @@
 
 ### Server/Env Performance
 
-#    Length of a server tick and the interval at which objects are generally updated over
-#    network, stated in seconds.
-#    type: float min: 0
+#    Length of a server tick (the interval at which everything is generally updated),
+#    stated in seconds.
+#    Does not apply to sessions hosted from the client menu.
+#    type: float min: 0 max: 1
 # dedicated_server_step = 0.09
 
 #    Whether players are shown to clients without any range limit.
@@ -3018,12 +3086,11 @@
 #    At this distance the server will aggressively optimize which blocks are sent to
 #    clients.
 #    Small values potentially improve performance a lot, at the expense of visible
-#    rendering glitches (some blocks will not be rendered under water and in caves,
-#    as well as sometimes on land).
+#    rendering glitches (some blocks might not be rendered correctly in caves).
 #    Setting this to a value greater than max_block_send_distance disables this
 #    optimization.
-#    Stated in mapblocks (16 nodes).
-#    type: int min: 2 max: 32767
+#    Stated in MapBlocks (16 nodes).
+#    type: int min: 2 max: 2047
 # block_send_optimize_distance = 4
 
 #    If enabled, the server will perform map block occlusion culling based on
@@ -3033,6 +3100,14 @@
 #    type: bool
 # server_side_occlusion_culling = true
 
+#    At this distance the server will perform a simpler and cheaper occlusion check.
+#    Smaller values potentially improve performance, at the expense of temporarily visible
+#    rendering glitches (missing blocks).
+#    This is especially useful for very large viewing range (upwards of 500).
+#    Stated in MapBlocks (16 nodes).
+#    type: int min: 2 max: 2047
+# block_cull_optimize_distance = 25
+
 ### Mapgen
 
 #    Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).
@@ -3095,10 +3170,6 @@
 
 ### Miscellaneous
 
-#    Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens.
-#    type: int min: 1
-# screen_dpi = 72
-
 #    Adjust the detected display density, used for scaling UI elements.
 #    type: float min: 0.5 max: 5
 # display_density_factor = 1
@@ -3252,23 +3323,6 @@
 #    type: bool
 # enable_sound = true
 
-#    Unix timestamp (integer) of when the client last checked for an update
-#    Set this value to "disabled" to never check for updates.
-#    type: string
-# update_last_checked =
-
-#    Version number which was last seen during an update check.
-#
-#    Representation: MMMIIIPPP, where M=Major, I=Minor, P=Patch
-#    Ex: 5.5.0 is 005005000
-#    type: int
-# update_last_known = 0
-
-#    If this is set to true, the user will never (again) be shown the
-#    "reinstall Minetest Game" notification.
-#    type: bool
-# no_mtg_notification = false
-
 #    Key for moving the player forward.
 #    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
 #    type: key
@@ -3408,6 +3462,11 @@
 #    type: key
 # keymap_screenshot = KEY_F12
 
+#    Key for toggling fullscreen mode.
+#    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
+#    type: key
+# keymap_fullscreen = KEY_F11
+
 #    Key for dropping the currently selected item.
 #    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
 #    type: key
@@ -3596,9 +3655,9 @@
 #    Key for toggling the display of fog.
 #    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
 #    type: key
-# keymap_toggle_force_fog_off = KEY_F3
+# keymap_toggle_fog = KEY_F3
 
-#    Key for toggling the camera update. Only used for development
+#    Key for toggling the camera update. Only usable with 'debug' privilege.
 #    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
 #    type: key
 # keymap_toggle_update_camera =
@@ -3613,6 +3672,11 @@
 #    type: key
 # keymap_toggle_profiler = KEY_F6
 
+#    Key for toggling the display of mapblock boundaries.
+#    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
+#    type: key
+# keymap_toggle_block_bounds =
+
 #    Key for switching between first- and third-person camera.
 #    See https://github.com/minetest/irrlicht/blob/master/include/Keycodes.h
 #    type: key
diff --git a/games/devtest/.luacheckrc b/games/devtest/.luacheckrc
index 1c7d3994f..261cacf56 100644
--- a/games/devtest/.luacheckrc
+++ b/games/devtest/.luacheckrc
@@ -27,6 +27,7 @@ read_globals = {
 	"Settings",
 	"check",
 	"PseudoRandom",
+	"PcgRandom",
 
 	string = {fields = {"split", "trim"}},
 	table  = {fields = {"copy", "getn", "indexof", "insert_all"}},
diff --git a/games/devtest/game.conf b/games/devtest/game.conf
index 0f5656c99..8184881a2 100644
--- a/games/devtest/game.conf
+++ b/games/devtest/game.conf
@@ -1,2 +1,4 @@
 title = Development Test
 description = Testing environment to help with testing the engine features of Minetest. It can also be helpful in mod development.
+first_mod = first_mod
+last_mod = last_mod
diff --git a/games/devtest/mods/basetools/init.lua b/games/devtest/mods/basetools/init.lua
index c0bd1d00b..17e53c1fe 100644
--- a/games/devtest/mods/basetools/init.lua
+++ b/games/devtest/mods/basetools/init.lua
@@ -71,7 +71,7 @@ end
 -- Mese Pickaxe: special tool that digs "everything" instantly
 minetest.register_tool("basetools:pick_mese", {
 	description = "Mese Pickaxe".."\n"..
-			"Digs diggable nodes instantly",
+			"Digs diggable nodes instantly.",
 	inventory_image = "basetools_mesepick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
@@ -88,6 +88,28 @@ minetest.register_tool("basetools:pick_mese", {
 })
 
 
+-- A variant of the mese pickaxe that is not affected by the 0.15s digging delay
+minetest.register_tool("basetools:pick_mese_no_delay", {
+	description = "Mese Pickaxe (no delay)".."\n"..
+			"Digs diggable nodes instantly.".."\n"..
+			"There is no delay between digging each node,\n"..
+			'but the "repeat_dig_time" setting is still respected.',
+	inventory_image = "basetools_mesepick_no_delay.png",
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=3,
+		groupcaps={
+			cracky={times={[1]=0.001, [2]=0.001, [3]=0.001}, maxlevel=255},
+			crumbly={times={[1]=0.001, [2]=0.001, [3]=0.001}, maxlevel=255},
+			snappy={times={[1]=0.001, [2]=0.001, [3]=0.001}, maxlevel=255},
+			choppy={times={[1]=0.001, [2]=0.001, [3]=0.001}, maxlevel=255},
+			dig_immediate={times={[1]=0.001, [2]=0.001, [3]=0.001}, maxlevel=255},
+		},
+		damage_groups = {fleshy=100},
+	},
+})
+
+
 --
 -- Pickaxes: Dig cracky
 --
@@ -420,36 +442,141 @@ minetest.register_tool("basetools:dagger_steel", {
 	}
 })
 
--- Test tool uses and punch_attack_uses
-local uses = { 1, 2, 3, 5, 10, 50, 100, 1000, 10000, 65535 }
-for i=1, #uses do
-	local u = uses[i]
-	local ustring
-	if i == 1 then
-		ustring = u.."-Use"
-	else
-		ustring = u.."-Uses"
-	end
-	local color = string.format("#FF00%02X", math.floor(((i-1)/#uses) * 255))
-	minetest.register_tool("basetools:pick_uses_"..string.format("%05d", u), {
+-- Test tool uses, punch_attack_uses, and wear bar coloring
+local tool_params = {
+	{uses = 1},
+	{uses = 2},
+	{uses = 3},
+	{
+		uses = 5,
+		wear_color = "#5865f2",
+		wear_description = "Solid color: #5865f2",
+	},
+	{
+		uses = 10,
+		wear_color = "slateblue",
+		wear_description = "Solid color: slateblue",
+	},
+	{
+		uses = 50,
+		wear_color = {
+			color_stops = {
+				[0] = "red",
+				[0.5] = "yellow",
+				[1.0] = "blue"
+			},
+			blend = "linear"
+		},
+		wear_description = "Ranges from blue to yellow to red",
+	},
+	{
+		uses = 100,
+		wear_color = {
+			color_stops = {
+				[0] = "#ffff00",
+				[0.2] = "#ff00ff",
+				[0.3] = "#ffff00",
+				[0.45] = "#c0ffee",
+				[0.6] = {r=255, g=255, b=0, a=100}, -- continues until the end
+			},
+			blend = "constant"
+		},
+		wear_description = "Misc. colors, constant interpolation",
+	},
+	{uses = 1e3},
+	{uses = 1e4},
+	{uses = 65535},
+}
+
+for i, params in ipairs(tool_params) do
+	local uses = params.uses
+	local ustring = uses.."-Use"..(uses == 1 and "" or "s")
+	local color = string.format("#FF00%02X", math.floor(((i-1)/#tool_params) * 255))
+	minetest.register_tool("basetools:pick_uses_"..string.format("%05d", uses), {
 		description = ustring.." Pickaxe".."\n"..
-			"Digs cracky=3",
+			"Digs cracky=3"..
+			(params.wear_description and "\n".."Wear bar: " .. params.wear_description or ""),
 		inventory_image = "basetools_usespick.png^[colorize:"..color..":127",
 		tool_capabilities = {
 			max_drop_level=0,
 			groupcaps={
-				cracky={times={[3]=0.1, [2]=0.2, [1]=0.3}, uses=u, maxlevel=0}
+				cracky={times={[3]=0.1, [2]=0.2, [1]=0.3}, uses=uses, maxlevel=0}
 			},
 		},
+		wear_color = params.wear_color
 	})
 
-	minetest.register_tool("basetools:sword_uses_"..string.format("%05d", u), {
+	minetest.register_tool("basetools:sword_uses_"..string.format("%05d", uses), {
 		description = ustring.." Sword".."\n"..
 			"Damage: fleshy=1",
 		inventory_image = "basetools_usessword.png^[colorize:"..color..":127",
 		tool_capabilities = {
 			damage_groups = {fleshy=1},
-			punch_attack_uses = u,
+			punch_attack_uses = uses,
 		},
 	})
 end
+
+minetest.register_chatcommand("wear_color", {
+	params = "[idx]",
+	description = "Set wear bar color override",
+	func = function(player_name, param)
+		local player = minetest.get_player_by_name(player_name)
+		if not player then return end
+
+		local wear_color = nil
+		local wear_desc = "Reset override"
+
+		if param ~= "" then
+			local params = tool_params[tonumber(param)]
+			if not params then
+				return false, "idx out of bounds"
+			end
+			wear_color = params.wear_color
+			wear_desc = "Set override: "..(params.wear_description or "Default behavior")
+		end
+		local tool = player:get_wielded_item()
+		if tool:get_count() == 0 then
+			return false, "Tool not found"
+		end
+		tool:get_meta():set_wear_bar_params(wear_color)
+		player:set_wielded_item(tool)
+		return true, wear_desc
+	end
+})
+
+-- Punch handler to set random color & wear
+local wear_on_use = function(itemstack, user, pointed_thing)
+	local meta = itemstack:get_meta()
+	local color = math.random(0, 0xFFFFFF)
+	local colorstr = string.format("#%06x", color)
+	meta:set_wear_bar_params(colorstr)
+	minetest.log("action", "[basetool] Wear bar color of "..itemstack:get_name().." changed to "..colorstr)
+	itemstack:set_wear(math.random(0, 65535))
+	return itemstack
+end
+
+-- Place handler to clear item metadata color
+local wear_on_place = function(itemstack, user, pointed_thing)
+	local meta = itemstack:get_meta()
+	meta:set_wear_bar_params(nil)
+	return itemstack
+end
+
+minetest.register_tool("basetools:random_wear_bar", {
+	description = "Wear Bar Color Test\n" ..
+			"Punch: Set random color & wear\n" ..
+			"Place: Clear color",
+	-- Base texture: A grayscale square (can be colorized)
+	inventory_image = "basetools_usespick.png^[colorize:#FFFFFF:127",
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			cracky={times={[3]=0.1, [2]=0.2, [1]=0.3}, uses=1000, maxlevel=0}
+		},
+	},
+
+	on_use = wear_on_use,
+	on_place = wear_on_place,
+	on_secondary_use = wear_on_place,
+})
diff --git a/games/devtest/mods/basetools/textures/basetools_mesepick_no_delay.png b/games/devtest/mods/basetools/textures/basetools_mesepick_no_delay.png
new file mode 100644
index 000000000..5a7db7e0a
Binary files /dev/null and b/games/devtest/mods/basetools/textures/basetools_mesepick_no_delay.png differ
diff --git a/games/devtest/mods/benchmarks/init.lua b/games/devtest/mods/benchmarks/init.lua
index 19ba044a4..1f5001c69 100644
--- a/games/devtest/mods/benchmarks/init.lua
+++ b/games/devtest/mods/benchmarks/init.lua
@@ -71,6 +71,22 @@ minetest.register_chatcommand("bench_content2name", {
 	end,
 })
 
+local function get_positions_cube(ppos)
+	local pos_list = {}
+
+	local i = 1
+	for x=2,100 do
+		for y=2,100 do
+			for z=2,100 do
+				pos_list[i] = ppos:offset(x, y, z)
+				i = i + 1
+			end
+		end
+	end
+
+	return pos_list
+end
+
 minetest.register_chatcommand("bench_bulk_set_node", {
 	params = "",
 	description = "Benchmark: Bulk-set 99×99×99 stone nodes",
@@ -79,25 +95,15 @@ minetest.register_chatcommand("bench_bulk_set_node", {
 		if not player then
 			return false, "No player."
 		end
-		local pos_list = {}
-		local ppos = player:get_pos()
-		local i = 1
-		for x=2,100 do
-			for y=2,100 do
-				for z=2,100 do
-					pos_list[i] = {x=ppos.x + x,y = ppos.y + y,z = ppos.z + z}
-					i = i + 1
-				end
-			end
-		end
+		local pos_list = get_positions_cube(player:get_pos())
 
-		minetest.chat_send_player(name, "Benchmarking minetest.bulk_set_node. Warming up ...");
+		minetest.chat_send_player(name, "Benchmarking minetest.bulk_set_node. Warming up ...")
 
 		-- warm up with stone to prevent having different callbacks
 		-- due to different node topology
 		minetest.bulk_set_node(pos_list, {name = "mapgen_stone"})
 
-		minetest.chat_send_player(name, "Warming up finished, now benchmarking ...");
+		minetest.chat_send_player(name, "Warming up finished, now benchmarking ...")
 
 		local start_time = minetest.get_us_time()
 		for i=1,#pos_list do
@@ -114,4 +120,37 @@ minetest.register_chatcommand("bench_bulk_set_node", {
 	end,
 })
 
+minetest.register_chatcommand("bench_bulk_get_node", {
+	params = "",
+	description = "Benchmark: Bulk-get 99×99×99 nodes",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+		local pos_list = get_positions_cube(player:get_pos())
+		local function bench()
+			local start_time = minetest.get_us_time()
+			for i=1,#pos_list do
+				local n = minetest.get_node(pos_list[i])
+				-- Make sure the name lookup is never optimized away.
+				-- Table allocation might still be omitted. But only accessing
+				-- the name of a node is a common pattern anyways.
+				if n.name == "benchmarks:nonexistent_node" then
+					error("should never happen")
+				end
+			end
+			return minetest.get_us_time() - start_time
+		end
 
+		minetest.chat_send_player(name, "Benchmarking minetest.get_node. Warming up ...")
+		bench()
+
+		minetest.chat_send_player(name, "Warming up finished, now benchmarking ...")
+		local result_us = bench()
+
+		local msg = string.format("Benchmark results: minetest.get_node loop 1: %.2f ms",
+				result_us / 1000)
+		return true, msg
+	end,
+})
diff --git a/games/devtest/mods/callbacks/entities.lua b/games/devtest/mods/callbacks/entities.lua
index e8379cb6f..528c985da 100644
--- a/games/devtest/mods/callbacks/entities.lua
+++ b/games/devtest/mods/callbacks/entities.lua
@@ -76,3 +76,26 @@ minetest.register_entity("callbacks:callback_step", {
 		message("on_step callback entity: on_step! pos="..spos(self).."; dtime="..dtime)
 	end,
 })
+
+-- Callback punch with nil puncher
+minetest.register_entity("callbacks:callback_puncher", {
+	initial_properties = {
+		visual = "upright_sprite",
+		textures = { "callbacks_callback_entity.png" },
+		infotext = "Callback entity for nil puncher test.",
+	},
+
+	on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+		if puncher then
+			puncher:punch(nil, time_from_last_punch, tool_capabilities, dir)
+			self.object:punch(nil, time_from_last_punch, tool_capabilities, dir)
+		else
+			message(
+				"Callback entity: on_punch with nil puncher "..
+				"pos="..spos(self).."; "..
+				"time_from_last_punch="..time_from_last_punch.."; "..
+				"tool_capabilities="..dump(tool_capabilities).."; "..
+				"dir="..dump(dir).."; damage="..damage)
+		end
+	end,
+})
diff --git a/games/devtest/mods/callbacks/init.lua b/games/devtest/mods/callbacks/init.lua
index 8f719a3f8..77cee1db2 100644
--- a/games/devtest/mods/callbacks/init.lua
+++ b/games/devtest/mods/callbacks/init.lua
@@ -1,3 +1,4 @@
 dofile(minetest.get_modpath("callbacks").."/items.lua")
 dofile(minetest.get_modpath("callbacks").."/nodes.lua")
 dofile(minetest.get_modpath("callbacks").."/entities.lua")
+dofile(minetest.get_modpath("callbacks").."/players.lua")
diff --git a/games/devtest/mods/callbacks/players.lua b/games/devtest/mods/callbacks/players.lua
new file mode 100644
index 000000000..15bb076dc
--- /dev/null
+++ b/games/devtest/mods/callbacks/players.lua
@@ -0,0 +1,11 @@
+
+local message = function(msg)
+	minetest.log("action", "[callbacks] "..msg)
+	minetest.chat_send_all(msg)
+end
+
+core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
+	if not hitter then
+		message("Player "..player:get_player_name().." punched without hitter.")
+	end
+end)
diff --git a/games/devtest/mods/chest/chest.lua b/games/devtest/mods/chest/chest.lua
index e347459ed..1f165fed4 100644
--- a/games/devtest/mods/chest/chest.lua
+++ b/games/devtest/mods/chest/chest.lua
@@ -29,12 +29,16 @@ minetest.register_node("chest:chest", {
 		return inv:is_empty("main")
 	end,
 	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow put' event for " .. stack:to_string())
-		return stack:get_count()
+		print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow put' (10) event for " .. stack:to_string())
+		return 10
 	end,
 	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow take' event for " .. stack:to_string())
-		return stack:get_count()
+		print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow take' (20) event for " .. stack:to_string())
+		return 20
+	end,
+	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		print_to_everything("Chest: ".. player:get_player_name() .. " triggered 'allow move' (30) event")
+		return 30
 	end,
 	on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		print_to_everything("Chest: ".. player:get_player_name() .. " put " .. stack:to_string())
@@ -42,4 +46,7 @@ minetest.register_node("chest:chest", {
 	on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		print_to_everything("Chest: ".. player:get_player_name() .. " took " .. stack:to_string())
 	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		print_to_everything("Chest: ".. player:get_player_name() .. " moved " .. count)
+	end,
 })
diff --git a/games/devtest/mods/first_mod/init.lua b/games/devtest/mods/first_mod/init.lua
new file mode 100644
index 000000000..3909a39cc
--- /dev/null
+++ b/games/devtest/mods/first_mod/init.lua
@@ -0,0 +1 @@
+-- Nothing to do here, loading order is tested in C++ unittests.
diff --git a/games/devtest/mods/first_mod/mod.conf b/games/devtest/mods/first_mod/mod.conf
new file mode 100644
index 000000000..d35fa8d28
--- /dev/null
+++ b/games/devtest/mods/first_mod/mod.conf
@@ -0,0 +1,2 @@
+name = first_mod
+description = Mod which should be loaded before every other mod.
diff --git a/games/devtest/mods/last_mod/init.lua b/games/devtest/mods/last_mod/init.lua
new file mode 100644
index 000000000..3909a39cc
--- /dev/null
+++ b/games/devtest/mods/last_mod/init.lua
@@ -0,0 +1 @@
+-- Nothing to do here, loading order is tested in C++ unittests.
diff --git a/games/devtest/mods/last_mod/mod.conf b/games/devtest/mods/last_mod/mod.conf
new file mode 100644
index 000000000..734bf4c0c
--- /dev/null
+++ b/games/devtest/mods/last_mod/mod.conf
@@ -0,0 +1,5 @@
+name = last_mod
+description = Mod which should be loaded as last mod.
+# Test dependencies
+optional_depends = unittests
+depends = first_mod
diff --git a/games/devtest/mods/testentities/init.lua b/games/devtest/mods/testentities/init.lua
index 6e0f8acb8..9ab54f5ab 100644
--- a/games/devtest/mods/testentities/init.lua
+++ b/games/devtest/mods/testentities/init.lua
@@ -1,3 +1,4 @@
 dofile(minetest.get_modpath("testentities").."/visuals.lua")
 dofile(minetest.get_modpath("testentities").."/selectionbox.lua")
 dofile(minetest.get_modpath("testentities").."/armor.lua")
+dofile(minetest.get_modpath("testentities").."/pointable.lua")
diff --git a/games/devtest/mods/testentities/pointable.lua b/games/devtest/mods/testentities/pointable.lua
new file mode 100644
index 000000000..be7ce4ba8
--- /dev/null
+++ b/games/devtest/mods/testentities/pointable.lua
@@ -0,0 +1,23 @@
+-- Pointability test Entities
+
+-- Register wrapper for compactness
+local function register_pointable_testentity(name, pointable)
+	local texture = "testnodes_"..name..".png"
+	minetest.register_entity("testentities:"..name, {
+		initial_properties = {
+			visual = "cube",
+			visual_size = {x = 0.6, y = 0.6, z = 0.6},
+			textures = {
+				texture, texture, texture, texture, texture, texture
+			},
+			pointable = pointable,
+		},
+		on_activate = function(self)
+			self.object:set_armor_groups({[name.."_test"] = 1})
+		end
+	})
+end
+
+register_pointable_testentity("pointable", true)
+register_pointable_testentity("not_pointable", false)
+register_pointable_testentity("blocking_pointable", "blocking")
diff --git a/games/devtest/mods/testentities/selectionbox.lua b/games/devtest/mods/testentities/selectionbox.lua
index 36a8daa41..a455fd459 100644
--- a/games/devtest/mods/testentities/selectionbox.lua
+++ b/games/devtest/mods/testentities/selectionbox.lua
@@ -66,7 +66,7 @@ minetest.register_globalstep(function()
 			local ent = pointed_thing.ref:get_luaentity()
 			if ent and ent.name == "testentities:selectionbox" then
 				hud_ids[pname] = hud_id or player:hud_add({
-					hud_elem_type = "text",  -- See HUD element types
+					type = "text",  -- See HUD element types
 					position = {x=0.5, y=0.5},
 			        text = "X",
 					number = 0xFF0000,
diff --git a/games/devtest/mods/testformspec/formspec.lua b/games/devtest/mods/testformspec/formspec.lua
index 48c8763de..99ee691f1 100644
--- a/games/devtest/mods/testformspec/formspec.lua
+++ b/games/devtest/mods/testformspec/formspec.lua
@@ -1,12 +1,15 @@
 local color = minetest.colorize
 
+-- \208\176 is a cyrillic small a
+local unsafe_url = minetest.formspec_escape("https://u:p@wikipedi\208\176.org:1233/heIIoll?a=b#c")
+
 local clip_fs = [[
 	style_type[label,button,image_button,item_image_button,
 			tabheader,scrollbar,table,animated_image
 			,field,textarea,checkbox,dropdown;noclip=%c]
 
 	label[0,0;A clipping test]
-	button[0,1;3,0.8;clip_button;A clipping test]
+	button_url[0,1;3,0.8;clip_button;A clipping test;]] .. unsafe_url .. [[]
 	image_button[0,2;3,0.8;testformspec_button_image.png;clip_image_button;A clipping test]
 	item_image_button[0,3;3,0.8;testformspec:item;clip_item_image_button;A clipping test]
 	tabheader[0,4.7;3,0.63;clip_tabheader;Clip,Test,Text,Tabs;1;false;false]
@@ -61,14 +64,49 @@ local inv_style_fs = [[
 	list[current_player;main;.5,7;8,4]
 ]]
 
-local hypertext_basic = [[
+-- Some textures from textures/base/pack and Devtest, with many different sizes
+-- and aspect ratios.
+local image_column = "image,0=logo.png,1=rare_controls.png,2=checkbox_16.png," ..
+		"3=checkbox_32.png,4=checkbox_64.png,5=default_lava.png," ..
+		"6=progress_bar.png,7=progress_bar_bg.png"
+local words = {
+	"esciunt", "repudiandae", "repellat", "voluptatem", "autem", "vitae", "et",
+	"minima", "quasi", "facere", "nihil", "ea", "nemo", "rem", "non", "eos",
+	"laudantium", "eveniet", "veritatis",
+}
+
+local reseed = math.random(2^31-1)
+math.randomseed(1337)
+
+local table_content = {}
+for i = 1, 100 do
+	table.insert(table_content, words[math.random(#words)])
+	table.insert(table_content, words[math.random(#words)])
+	table.insert(table_content, words[math.random(#words)])
+	table.insert(table_content, math.random(0, 7))
+	table.insert(table_content, math.random(0, 7))
+	table.insert(table_content, math.random(0, 7))
+	table.insert(table_content, words[math.random(#words)])
+end
+
+math.randomseed(reseed)
+
+local table_fs = table.concat({
+	"tablecolumns[text,align=left;text,align=right;text,align=center;",
+			image_column, ",align=left;",
+			image_column, ",align=right;",
+			image_column, ",align=center;text,align=right]",
+	"table[0,0;17,12;the_table;", table.concat(table_content, ","), ";1]"
+})
+
+local hypertext_basic = [[A hypertext element
 <bigger>Normal test</bigger>
 This is a normal text.
 
 <bigger><mono>style</mono> test</bigger>
-<style color=#FFFF00>Yellow text.</style> <style color=#FF0000>Red text.</style>
-<style size=24>Size 24.</style> <style size=16>Size 16</style>. <style size=12>Size 12.</style>
-<style font=normal>Normal font.</style> <style font=mono>Mono font.</style>
+<style color="#FFFF00">Yellow text.</style> <style color='#FF0000'>Red text.</style>
+<style size="24">Size 24.</style> <style size=16>Size 16</style>. <style size=12>Size 12.</style>
+<style font="normal">Normal font.</style> <style font=mono>Mono font.</style>
 
 <bigger>Tag test</bigger>
 <normal>normal</normal>
@@ -85,19 +123,20 @@ This is a normal text.
 
 <bigger>Custom tag test</bigger>
 <tag name=t_green color=green>
-<tag name=t_hover hovercolor=yellow>
-<tag name=t_size size=24>
-<tag name=t_mono font=mono>
-<tag name=t_multi color=green font=mono size=24>
+<tag name="t_hover" hovercolor=yellow>
+<tag name="t_size" size=24>
+<tag name="t_mono" font=mono>
+<tag name="t_multi" color=green font=mono size=24>
 <t_green>color=green</t_green>
-Action: <action name=color><t_green>color=green</t_green></action>
-Action: <action name=hovercolor><t_hover>hovercolor=yellow</t_hover></action>
+Action: <action name="color"><t_green>color=green</t_green></action>
+Action: <action name="hovercolor"><t_hover>hovercolor=yellow</t_hover></action>
+Action URL: <action name="open" url="https://example.com/?a=b#c">open URL</action>
 <t_size>size=24</t_size>
 <t_mono>font=mono</t_mono>
 <t_multi>color=green font=mono size=24</t_multi>
 
 <bigger><mono>action</mono> test</bigger>
-<action name=action_test>action</action>
+<action name="action_test">action</action>
 
 <bigger><mono>img</mono> test</bigger>
 Normal:
@@ -145,7 +184,7 @@ local hypertext_fs = "hypertext[0,0;11,9;hypertext;"..minetest.formspec_escape(h
 local style_fs = [[
 	style[one_btn1;bgcolor=red;textcolor=yellow;bgcolor_hovered=orange;
 		bgcolor_pressed=purple]
-	button[0,0;2.5,0.8;one_btn1;Button]
+	button_url_exit[0,0;2.5,0.8;one_btn1;Button;]] .. unsafe_url .. [[]
 
 	style[one_btn2;border=false;textcolor=cyan] ]]..
 	"button[0,1.05;2.5,0.8;one_btn2;Text " .. color("#FF0", "Yellow") .. [[]
@@ -346,6 +385,10 @@ local pages = {
 		"label[11,0.5;Noclip]" ..
 		"container[11.5,1]" .. clip_fs:gsub("%%c", "true") .. "container_end[]",
 
+	-- Table
+		"size[18,13]real_coordinates[true]" ..
+		"container[0.5,0.5]" .. table_fs.. "container_end[]",
+
 	-- Hypertext
 		"size[12,13]real_coordinates[true]" ..
 		"container[0.5,0.5]" .. hypertext_fs .. "container_end[]",
@@ -473,7 +516,7 @@ local function show_test_formspec(pname)
 		page = page()
 	end
 
-	local fs = page .. "tabheader[0,0;11,0.65;maintabs;Real Coord,Styles,Noclip,Hypertext,Tabs,Invs,Window,Anim,Model,ScrollC,Sound,Background,Unsized;" .. page_id .. ";false;false]"
+	local fs = page .. "tabheader[0,0;11,0.65;maintabs;Real Coord,Styles,Noclip,Table,Hypertext,Tabs,Invs,Window,Anim,Model,ScrollC,Sound,Background,Unsized;" .. page_id .. ";false;false]"
 
 	minetest.show_formspec(pname, "testformspec:formspec", fs)
 end
diff --git a/games/devtest/mods/testfullscreenfs/init.lua b/games/devtest/mods/testfullscreenfs/init.lua
index b9d20610b..e1af3ae33 100644
--- a/games/devtest/mods/testfullscreenfs/init.lua
+++ b/games/devtest/mods/testfullscreenfs/init.lua
@@ -7,6 +7,8 @@ local function show_fullscreen_fs(name)
 	print(dump(window))
 
 	local size = { x = window.max_formspec_size.x * 1.1, y = window.max_formspec_size.y * 1.1 }
+	local touch_text = window.touch_controls and "Touch controls enabled" or
+			"Touch controls disabled"
 	local fs = {
 		"formspec_version[4]",
 		("size[%f,%f]"):format(size.x, size.y),
@@ -16,7 +18,8 @@ local function show_fullscreen_fs(name)
 		("button[%f,%f;1,1;%s;%s]"):format(size.x - 1, size.y - 1, "br", "BR"),
 		("button[%f,%f;1,1;%s;%s]"):format(0, size.y - 1, "bl", "BL"),
 
-		("label[%f,%f;%s]"):format(size.x / 2, size.y / 2, "Fullscreen")
+		("label[%f,%f;%s]"):format(size.x / 2, size.y / 2, "Fullscreen"),
+		("label[%f,%f;%s]"):format(size.x / 2, size.y / 2 + 1, touch_text),
 	}
 
 	minetest.show_formspec(name, "testfullscreenfs:fs", table.concat(fs))
diff --git a/games/devtest/mods/testhud/init.lua b/games/devtest/mods/testhud/init.lua
index 6b55b924b..9afed8fc7 100644
--- a/games/devtest/mods/testhud/init.lua
+++ b/games/devtest/mods/testhud/init.lua
@@ -8,11 +8,13 @@ local font_states = {
 	{4, "Monospace font"},
 	{5, "Bold and monospace font"},
 	{7, "ZOMG all the font styles"},
+	{7, "Colors test! " .. minetest.colorize("green", "Green") ..
+		minetest.colorize("red", "\nRed") .. " END"},
 }
 
 
 local font_default_def = {
-	hud_elem_type = "text",
+	type = "text",
 	position = {x = 0.5, y = 0.5},
 	scale = {x = 2, y = 2},
 	alignment = { x = 0, y = 0 },
@@ -102,14 +104,14 @@ minetest.register_chatcommand("hudwaypoints", {
 			return false
 		end
 		local regular = player:hud_add {
-			hud_elem_type = "waypoint",
+			type = "waypoint",
 			name = "regular waypoint",
 			text = "m",
 			number = 0xFFFFFF,
 			world_pos = vector.add(player:get_pos(), {x = 0, y = 1.5, z = 0})
 		}
 		local reduced_precision = player:hud_add {
-			hud_elem_type = "waypoint",
+			type = "waypoint",
 			name = "imprecise waypoint",
 			text = "m (0.1 steps, precision = 10)",
 			precision = 10,
@@ -117,7 +119,7 @@ minetest.register_chatcommand("hudwaypoints", {
 			world_pos = vector.add(player:get_pos(), {x = 0, y = 1, z = 0})
 		}
 		local hidden_distance = player:hud_add {
-			hud_elem_type = "waypoint",
+			type = "waypoint",
 			name = "waypoint with hidden distance",
 			text = "this text is hidden as well (precision = 0)",
 			precision = 0,
@@ -149,10 +151,11 @@ minetest.register_chatcommand("hudwaypoints", {
 			minetest.after(0.5, change, player)
 		end
 		local image_waypoint = player:hud_add {
-			hud_elem_type = "image_waypoint",
+			type = "image_waypoint",
 			text = "testhud_waypoint.png",
 			world_pos = player:get_pos(),
-			scale = {x = 3, y = 3},
+			-- 20% of screen width, 3x image height
+			scale = {x = -20, y = 3},
 			offset = {x = 0, y = -32}
 		}
 		if not player_waypoints[name] then
@@ -209,3 +212,23 @@ minetest.register_on_leaveplayer(function(player)
 	player_font_huds[player:get_player_name()] = nil
 	player_waypoints[player:get_player_name()] = nil
 end)
+
+minetest.register_chatcommand("hudprint", {
+	description = "Writes all used Lua HUD elements into chat.",
+	func = function(name, params)
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "No player."
+		end
+
+		local s = "HUD elements:"
+		for k, elem in pairs(player:hud_get_all()) do
+			local ename = dump(elem.name)
+			local etype = dump(elem.type)
+			local epos = "{x="..elem.position.x..", y="..elem.position.y.."}"
+			s = s.."\n["..k.."]  type = "..etype.." | name = "..ename.." | pos = ".. epos
+		end
+
+		return true, s
+	end
+})
diff --git a/games/devtest/mods/testitems/init.lua b/games/devtest/mods/testitems/init.lua
index ec080a7c5..bde9cc6d9 100644
--- a/games/devtest/mods/testitems/init.lua
+++ b/games/devtest/mods/testitems/init.lua
@@ -90,3 +90,18 @@ minetest.register_craftitem("testitems:image_meta", {
 		return itemstack
 	end,
 })
+
+minetest.register_craftitem("testitems:telescope_stick", {
+	description = S("Telescope Stick (Increases range on use.)"),
+	inventory_image = "testitems_telescope_stick.png",
+	on_use = function(itemstack, player)
+		local meta = itemstack:get_meta()
+		local range = meta:get_float("range") + 1.2
+		if range > 10 then
+			range = 0
+		end
+		meta:set_float("range", range)
+		minetest.chat_send_player(player:get_player_name(), "Telescope Stick range set to "..range)
+		return itemstack
+	end,
+})
diff --git a/games/devtest/mods/testitems/textures/testitems_telescope_stick.png b/games/devtest/mods/testitems/textures/testitems_telescope_stick.png
new file mode 100644
index 000000000..88d004c4c
Binary files /dev/null and b/games/devtest/mods/testitems/textures/testitems_telescope_stick.png differ
diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index f354b4394..087d09eff 100644
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -163,7 +163,7 @@ minetest.register_node("testnodes:torchlike", {
 
 minetest.register_node("testnodes:torchlike_wallmounted", {
 	description = S("Wallmounted \"torchlike\" Drawtype Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	drawtype = "torchlike",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
@@ -179,6 +179,24 @@ minetest.register_node("testnodes:torchlike_wallmounted", {
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:torchlike_wallmounted_rot", {
+	description = S("Wallmounted Rotatable Torchlike Drawtype Test Node"),
+	drawtype = "torchlike",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	tiles = {
+		"testnodes_torchlike_floor.png^[colorize:#FFFF00:40",
+		"testnodes_torchlike_ceiling.png^[colorize:#FFFF00:40",
+		"testnodes_torchlike_wall.png^[colorize:#FFFF00:40",
+	},
+
+
+	walkable = false,
+	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
+})
+
 minetest.register_node("testnodes:signlike", {
 	description = S("Floor \"signlike\" Drawtype Test Node").."\n"..
 		S("Always on floor"),
@@ -186,16 +204,14 @@ minetest.register_node("testnodes:signlike", {
 	paramtype = "light",
 	tiles = { "testnodes_signlike.png^[colorize:#FF0000:64" },
 
-
 	walkable = false,
-	groups = { dig_immediate = 3 },
 	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
 })
 
-
 minetest.register_node("testnodes:signlike_wallmounted", {
 	description = S("Wallmounted \"signlike\" Drawtype Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	drawtype = "signlike",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
@@ -207,6 +223,22 @@ minetest.register_node("testnodes:signlike_wallmounted", {
 	sunlight_propagates = true,
 })
 
+minetest.register_node("testnodes:signlike_rot", {
+	description = S("Wallmounted Rotatable Signlike Drawtype Test Node"),
+	drawtype = "signlike",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	tiles = { "testnodes_signlike.png^[colorize:#FFFF00:40" },
+
+
+	walkable = false,
+	groups = { dig_immediate = 3 },
+	sunlight_propagates = true,
+})
+
+
+
 minetest.register_node("testnodes:plantlike", {
 	description = S("\"plantlike\" Drawtype Test Node"),
 	drawtype = "plantlike",
@@ -235,7 +267,7 @@ minetest.register_node("testnodes:plantlike_waving", {
 
 minetest.register_node("testnodes:plantlike_wallmounted", {
 	description = S("Wallmounted \"plantlike\" Drawtype Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	drawtype = "plantlike",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
@@ -366,7 +398,7 @@ minetest.register_node("testnodes:plantlike_rooted", {
 
 minetest.register_node("testnodes:plantlike_rooted_wallmounted", {
 	description = S("Wallmounted \"rooted_plantlike\" Drawtype Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	drawtype = "plantlike_rooted",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
diff --git a/games/devtest/mods/testnodes/liquids.lua b/games/devtest/mods/testnodes/liquids.lua
index 13b8dd9d7..334b16dff 100644
--- a/games/devtest/mods/testnodes/liquids.lua
+++ b/games/devtest/mods/testnodes/liquids.lua
@@ -9,7 +9,7 @@ for d=0, 8 do
 	end
 	minetest.register_node("testnodes:rliquid_"..d, {
 		description = "Test Liquid Source, Range "..d..
-			tt_normal,
+			tt_normal .. "\n" .. "(falling & floating node)",
 		drawtype = "liquid",
 		tiles = {"testnodes_liquidsource_r"..d..".png"},
 		special_tiles = {
@@ -25,6 +25,8 @@ for d=0, 8 do
 		liquid_alternative_flowing = "testnodes:rliquid_flowing_"..d,
 		liquid_alternative_source = "testnodes:rliquid_"..d,
 		liquid_range = d,
+		-- Also use these nodes to test falling, floating liquid source nodes
+		groups = {float = 1, falling_node = 1},
 	})
 
 	minetest.register_node("testnodes:rliquid_flowing_"..d, {
diff --git a/games/devtest/mods/testnodes/meshes.lua b/games/devtest/mods/testnodes/meshes.lua
index e55c3eafd..88a59ad22 100644
--- a/games/devtest/mods/testnodes/meshes.lua
+++ b/games/devtest/mods/testnodes/meshes.lua
@@ -92,7 +92,7 @@ minetest.register_node("testnodes:mesh_color4dir", {
 -- Wallmounted mesh: pyramid
 minetest.register_node("testnodes:mesh_wallmounted", {
 	description = S("Wallmounted Mesh Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	drawtype = "mesh",
 	mesh = "testnodes_pyramid.obj",
 	tiles = {"testnodes_mesh_stripes9.png"},
@@ -105,7 +105,7 @@ minetest.register_node("testnodes:mesh_wallmounted", {
 
 minetest.register_node("testnodes:mesh_colorwallmounted", {
 	description = S("Color Wallmounted Mesh Test Node").."\n"..
-		S("param2 = color + wallmounted rotation (0..5, 8..13, ...)"),
+		S("param2 = color + wallmounted rotation (0..7, 8..15, ...)"),
 	drawtype = "mesh",
 	mesh = "testnodes_pyramid.obj",
 	tiles = {"testnodes_mesh_stripes10.png"},
diff --git a/games/devtest/mods/testnodes/nodeboxes.lua b/games/devtest/mods/testnodes/nodeboxes.lua
index bc36035c0..99623bdda 100644
--- a/games/devtest/mods/testnodes/nodeboxes.lua
+++ b/games/devtest/mods/testnodes/nodeboxes.lua
@@ -180,3 +180,63 @@ minetest.register_node("testnodes:facedir_to_connect_to", {
 	paramtype2 = "facedir",
 	connect_sides = {"left", "top"},
 })
+
+-- 3D sign and button:
+-- These are example nodes for more realistic example uses
+-- of wallmounted_rotate_vertical
+minetest.register_node("testnodes:sign3d", {
+	description = S("Nodebox Sign, Nodebox Type \"fixed\""),
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	sunlight_propagates = true,
+	walkable = false,
+	tiles = {
+		"testnodes_sign3d.png",
+	},
+	groups = { dig_immediate = 3 },
+	node_box = {
+		type = "fixed",
+		fixed = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
+	},
+})
+
+minetest.register_node("testnodes:sign3d_wallmounted", {
+	description = S("Nodebox Sign, Nodebox Type \"wallmounted\""),
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	sunlight_propagates = true,
+	walkable = false,
+	tiles = {
+		"testnodes_sign3d.png^[colorize:#ff0000:127",
+	},
+	groups = { dig_immediate = 3 },
+	node_box = {
+		type = "wallmounted",
+		wall_top    = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125},
+		wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
+		wall_side   = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375},
+	},
+})
+
+minetest.register_node("testnodes:button", {
+	description = S("Button Nodebox Test Node"),
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	sunlight_propagates = true,
+	walkable = false,
+	tiles = {
+		"testnodes_nodebox.png",
+	},
+	groups = { dig_immediate = 3 },
+	node_box = {
+		type = "fixed",
+		fixed = { -4/16, -8/16, -2/16, 4/16, -6/16, 2/16 },
+	},
+})
+
diff --git a/games/devtest/mods/testnodes/param2.lua b/games/devtest/mods/testnodes/param2.lua
index ffa390967..6063ce2a3 100644
--- a/games/devtest/mods/testnodes/param2.lua
+++ b/games/devtest/mods/testnodes/param2.lua
@@ -78,9 +78,35 @@ minetest.register_node("testnodes:4dir_nodebox", {
 	groups = {dig_immediate=3},
 })
 
+minetest.register_node("testnodes:4dir_nodebox_stair", {
+	description = S("4dir Nodebox Stair Test Node").."\n"..
+		S("param2 = 4dir rotation (0..3)"),
+	tiles = {
+		"testnodes_1f.png",
+		"testnodes_2f.png",
+		"testnodes_3f.png",
+		"testnodes_4f.png",
+		"testnodes_5f.png",
+		"testnodes_6f.png",
+	},
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "4dir",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+			{-0.5, 0, 0, 0.5, 0.5, 0.5},
+		},
+	},
+
+	groups = { dig_immediate = 3 },
+})
+
+
 minetest.register_node("testnodes:wallmounted", {
 	description = S("Wallmounted Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	paramtype2 = "wallmounted",
 	tiles = {
 		"testnodes_1w.png",
@@ -94,9 +120,25 @@ minetest.register_node("testnodes:wallmounted", {
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:wallmounted_rot", {
+	description = S("Wallmounted Rotatable Test Node"),
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	tiles = {
+		"testnodes_1w.png^[colorize:#FFFF00:40",
+		"testnodes_2w.png^[colorize:#FFFF00:40",
+		"testnodes_3w.png^[colorize:#FFFF00:40",
+		"testnodes_4w.png^[colorize:#FFFF00:40",
+		"testnodes_5w.png^[colorize:#FFFF00:40",
+		"testnodes_6w.png^[colorize:#FFFF00:40",
+	},
+
+	groups = { dig_immediate = 3 },
+})
+
 minetest.register_node("testnodes:wallmounted_nodebox", {
 	description = S("Wallmounted Nodebox Test Node").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("param2 = wallmounted rotation (0..7)"),
 	paramtype2 = "wallmounted",
 	paramtype = "light",
 	tiles = {
@@ -118,6 +160,30 @@ minetest.register_node("testnodes:wallmounted_nodebox", {
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:wallmounted_nodebox_rot", {
+	description = S("Wallmounted Rotatable Nodebox Test Node"),
+	paramtype2 = "wallmounted",
+	wallmounted_rotate_vertical = true,
+	paramtype = "light",
+	tiles = {
+		"testnodes_1w.png^[colorize:#FFFF00:40",
+		"testnodes_2w.png^[colorize:#FFFF00:40",
+		"testnodes_3w.png^[colorize:#FFFF00:40",
+		"testnodes_4w.png^[colorize:#FFFF00:40",
+		"testnodes_5w.png^[colorize:#FFFF00:40",
+		"testnodes_6w.png^[colorize:#FFFF00:40",
+	},
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		wall_top = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 },
+		wall_bottom = { -0.5, -0.5, -0.5, 0.5, 0, 0.5 },
+		wall_side = { -0.5, -0.5, -0.5, 0, 0.5, 0.5 },
+	},
+
+	groups = { dig_immediate = 3 },
+})
+
 minetest.register_node("testnodes:color", {
 	description = S("Color Test Node").."\n"..
 		S("param2 = color (0..255)"),
@@ -212,7 +278,7 @@ minetest.register_node("testnodes:color4dir_nodebox", {
 
 minetest.register_node("testnodes:colorwallmounted", {
 	description = S("Color Wallmounted Test Node").."\n"..
-		S("param2 = color + wallmounted rotation (0..5, 8..13, ...)"),
+		S("param2 = color + wallmounted rotation (0..7, 8..15, ...)"),
 	paramtype2 = "colorwallmounted",
 	paramtype = "light",
 	palette = "testnodes_palette_wallmounted.png",
@@ -230,7 +296,7 @@ minetest.register_node("testnodes:colorwallmounted", {
 
 minetest.register_node("testnodes:colorwallmounted_nodebox", {
 	description = S("Color Wallmounted Nodebox Test Node").."\n"..
-		S("param2 = color + wallmounted rotation (0..5, 8..13, ...)"),
+		S("param2 = color + wallmounted rotation (0..7, 8..15, ...)"),
 	paramtype2 = "colorwallmounted",
 	paramtype = "light",
 	palette = "testnodes_palette_wallmounted.png",
diff --git a/games/devtest/mods/testnodes/properties.lua b/games/devtest/mods/testnodes/properties.lua
index 938511b83..a688d3814 100644
--- a/games/devtest/mods/testnodes/properties.lua
+++ b/games/devtest/mods/testnodes/properties.lua
@@ -61,8 +61,8 @@ minetest.register_node("testnodes:attached", {
 -- when the node it attaches to is gone.
 minetest.register_node("testnodes:attached_wallmounted", {
 	description = S("Wallmounted Attached Node").."\n"..
-		S("Attaches to wall; drops as item if neighbor node is gone").."\n"..
-		S("param2 = wallmounted rotation (0..5)"),
+		S("Attaches to solid node it was placed on; drops as item if neighbor node is gone").."\n"..
+		S("param2 = wallmounted rotation (0..7)"),
 	paramtype2 = "wallmounted",
 	tiles = {
 		"testnodes_attachedw_top.png",
@@ -72,9 +72,29 @@ minetest.register_node("testnodes:attached_wallmounted", {
 	groups = { attached_node = 1, dig_immediate = 3 },
 })
 
+-- This node attaches to the side of a node and drops as item
+-- when the node it attaches to is gone.
+-- Also adds vertical 90° rotation variants.
+minetest.register_node("testnodes:attached_wallmounted_rot", {
+	description = S("Rotatable Wallmounted Attached Node").."\n"..
+		S("Attaches to solid node it was placed on; drops as item if neighbor node is gone").."\n"..
+		S("param2 = wallmounted rotation (0..7)").."\n"..
+		S("May be rotated by 90° if placed at floor or ceiling"),
+	paramtype2 = "wallmounted",
+	tiles = {
+		"testnodes_attachedwr_top.png",
+		"testnodes_attachedwr_bottom.png",
+		"testnodes_attachedwr_side.png",
+	},
+	wallmounted_rotate_vertical = true,
+	groups = { attached_node = 1, dig_immediate = 3 },
+})
+
 -- Wallmounted node that always attaches to the floor
 minetest.register_node("testnodes:attached_wallmounted_floor", {
-	description = S("Floor-Attached Wallmounted Node"),
+	description = S("Floor-Attached Wallmounted Node").."\n"..
+		S("Drops as item if no solid node below (regardless of rotation)").."\n"..
+		S("param2 = wallmounted rotation (visual only) (0..7)"),
 	paramtype2 = "wallmounted",
 	tiles = {
 		"testnodes_attached_top.png",
@@ -85,10 +105,28 @@ minetest.register_node("testnodes:attached_wallmounted_floor", {
 	color = "#FF8080",
 })
 
+-- Wallmounted node that always attaches to the floor.
+-- Also adds 90° rotation variants.
+minetest.register_node("testnodes:attached_wallmounted_floor_rot", {
+	description = S("Rotatable Floor-Attached Wallmounted Node").."\n"..
+		S("Drops as item if no solid node below (regardless of rotation)").."\n"..
+		S("param2 = wallmounted rotation (visual only) (0..7)").."\n"..
+		S("May be rotated by 90° if placed at floor or ceiling"),
+	paramtype2 = "wallmounted",
+	tiles = {
+		"testnodes_attachedfr_top.png",
+		"testnodes_attachedfr_bottom.png",
+		"testnodes_attachedfr_side.png",
+	},
+	wallmounted_rotate_vertical = true,
+	groups = { attached_node = 3, dig_immediate = 3 },
+})
+
 -- This node attaches to the ceiling and drops as item
 -- when the ceiling is gone.
 minetest.register_node("testnodes:attached_top", {
-	description = S("Ceiling-Attached Node"),
+	description = S("Ceiling-Attached Node").."\n"..
+		S("Drops as item if no solid node above"),
 	tiles = {
 		"testnodes_attached_bottom.png",
 		"testnodes_attached_top.png",
@@ -99,7 +137,9 @@ minetest.register_node("testnodes:attached_top", {
 
 -- Same as wallmounted attached, but for facedir
 minetest.register_node("testnodes:attached_facedir", {
-	description = S("Facedir Attached Node"),
+	description = S("Facedir Attached Node").."\n"..
+		S("Attaches to a neighboring solid node; drops as item if that node is gone").."\n"..
+		S("param2 = facedir rotation (0..23)"),
 	paramtype2 = "facedir",
 	tiles = {
 		"testnodes_attachedf_side.png^[transformR180",
@@ -114,7 +154,9 @@ minetest.register_node("testnodes:attached_facedir", {
 
 -- Same as facedir attached, but for 4dir
 minetest.register_node("testnodes:attached_4dir", {
-	description = S("4dir Attached Node"),
+	description = S("4dir Attached Node").."\n"..
+		S("Attaches to the side of a solid node; drops as item if that node is gone").."\n"..
+		S("param2 = 4dir rotation (0..3)"),
 	paramtype2 = "4dir",
 	tiles = {
 		"testnodes_attached4_side.png^[transformR180",
@@ -621,3 +663,23 @@ minetest.register_node("testnodes:post_effect_color_shaded_true", {
 	is_ground_content = false,
 	groups = {dig_immediate=3},
 })
+
+-- Pointability
+
+-- Register wrapper for compactness
+local function register_pointable_test_node(name, description, pointable)
+	local texture = "testnodes_"..name..".png"
+	minetest.register_node("testnodes:"..name, {
+		description = S(description),
+		tiles = {texture},
+		drawtype = "glasslike_framed",
+		paramtype = "light",
+		walkable = false,
+		pointable = pointable,
+		groups = {dig_immediate=3, [name.."_test"]=1},
+	})
+end
+
+register_pointable_test_node("pointable", "Pointable Node", true)
+register_pointable_test_node("not_pointable", "Not Pointable Node", false)
+register_pointable_test_node("blocking_pointable", "Blocking Pointable Node", "blocking")
diff --git a/games/devtest/mods/testnodes/textures.lua b/games/devtest/mods/testnodes/textures.lua
index 8e9fec515..86bc3e343 100644
--- a/games/devtest/mods/testnodes/textures.lua
+++ b/games/devtest/mods/testnodes/textures.lua
@@ -33,6 +33,25 @@ minetest.register_node("testnodes:anim", {
 	groups = { dig_immediate = 2 },
 })
 
+minetest.register_node("testnodes:fill_positioning", {
+	description = S("Fill Modifier Test Node") .. "\n" ..
+		S("The node should have the same look as " ..
+		"testnodes:fill_positioning_reference."),
+	drawtype = "glasslike",
+	paramtype = "light",
+	tiles = {"[fill:16x16:#ffffff^[fill:6x6:1,1:#00ffdc" ..
+		"^[fill:6x6:1,9:#00ffdc^[fill:6x6:9,1:#00ffdc^[fill:6x6:9,9:#00ffdc"},
+	groups = {dig_immediate = 3},
+})
+
+minetest.register_node("testnodes:fill_positioning_reference", {
+	description = S("Fill Modifier Test Node Reference"),
+	drawtype = "glasslike",
+	paramtype = "light",
+	tiles = {"testnodes_fill_positioning_reference.png"},
+	groups = {dig_immediate = 3},
+})
+
 -- Node texture transparency test
 
 local alphas = { 64, 128, 191 }
@@ -69,6 +88,19 @@ for a=1,#alphas do
 	})
 end
 
+minetest.register_node("testnodes:alpha_compositing", {
+	description = S("Alpha Compositing Test Node") .. "\n" ..
+		S("A regular grid should be visible where each cell contains two " ..
+		"texels with the same colour.") .. "\n" ..
+		S("Alpha compositing is gamma-incorrect for backwards compatibility."),
+	drawtype = "glasslike",
+	paramtype = "light",
+	tiles = {"testnodes_alpha_compositing_bottom.png^"  ..
+		"testnodes_alpha_compositing_top.png"},
+	use_texture_alpha = "blend",
+	groups = {dig_immediate = 3},
+})
+
 -- Generate PNG textures
 
 local function mandelbrot(w, h, iterations)
@@ -105,6 +137,19 @@ local function gen_checkers(w, h, tile)
 	return r
 end
 
+-- The engine should perform color reduction of the generated PNG in certain
+-- cases, so we have this helper to check the result
+local function encode_and_check(w, h, ctype, data)
+	local ret = core.encode_png(w, h, data)
+	assert(ret:sub(1, 8) == "\137PNG\r\n\026\n", "missing png signature")
+	assert(ret:sub(9, 16) == "\000\000\000\rIHDR", "didn't find ihdr chunk")
+	local ctype_actual = ret:byte(26) -- Color Type (1 byte)
+	ctype = ({rgba=6, rgb=2, gray=0})[ctype]
+	assert(ctype_actual == ctype, "png should have color type " .. ctype ..
+		" but actually has " .. ctype_actual)
+	return ret
+end
+
 local fractal = mandelbrot(512, 512, 128)
 local frac_emb = mandelbrot(64, 64, 64)
 local checker = gen_checkers(512, 512, 32)
@@ -129,18 +174,27 @@ for i=1, #fractal do
 		b = floor(abs(1 - fractal[i]) * 255),
 		a = 255,
 	}
-	data_ck[i] = checker[i] > 0 and "#F80" or "#000"
+	data_ck[i] = checker[i] > 0 and "#888" or "#000"
 end
 
-local textures_path = minetest.get_modpath( minetest.get_current_modname() ) .. "/textures/"
-minetest.safe_file_write(
-	textures_path .. "testnodes_generated_mb.png",
-	minetest.encode_png(512,512,data_mb)
-)
-minetest.safe_file_write(
-	textures_path .. "testnodes_generated_ck.png",
-	minetest.encode_png(512,512,data_ck)
+fractal = nil
+frac_emb = nil
+checker = nil
+
+local textures_path = core.get_worldpath() .. "/"
+core.safe_file_write(
+	textures_path .. "testnodes1.png",
+	encode_and_check(512, 512, "rgb", data_mb)
 )
+local png_ck = encode_and_check(512, 512, "gray", data_ck)
+core.dynamic_add_media({
+	filename = "testnodes_generated_mb.png",
+	filepath = textures_path .. "testnodes1.png"
+})
+core.dynamic_add_media({
+	filename = "testnodes_generated_ck.png",
+	filedata = png_ck,
+})
 
 minetest.register_node("testnodes:generated_png_mb", {
 	description = S("Generated Mandelbrot PNG Test Node"),
@@ -155,7 +209,8 @@ minetest.register_node("testnodes:generated_png_ck", {
 	groups = { dig_immediate = 2 },
 })
 
-local png_emb = "[png:" .. minetest.encode_base64(minetest.encode_png(64,64,data_emb))
+local png_emb = "[png:" .. minetest.encode_base64(
+	encode_and_check(64, 64, "rgba", data_emb))
 
 minetest.register_node("testnodes:generated_png_emb", {
 	description = S("Generated In-Band Mandelbrot PNG Test Node"),
@@ -182,6 +237,12 @@ minetest.register_node("testnodes:generated_png_dst_emb", {
 	groups = { dig_immediate = 2 },
 })
 
+png_ck = nil
+png_emb = nil
+data_emb = nil
+data_mb = nil
+data_ck = nil
+
 --[[
 
 The following nodes can be used to demonstrate the TGA format support.
diff --git a/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_bottom.png b/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_bottom.png
new file mode 100644
index 000000000..83447e423
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_bottom.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_top.png b/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_top.png
new file mode 100644
index 000000000..64b5664d8
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_alpha_compositing_top.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedfr_bottom.png b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_bottom.png
new file mode 100644
index 000000000..21ece33dc
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_bottom.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedfr_side.png b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_side.png
new file mode 100644
index 000000000..1e6a69640
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_side.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedfr_top.png b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_top.png
new file mode 100644
index 000000000..feef55277
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedfr_top.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedwr_bottom.png b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_bottom.png
new file mode 100644
index 000000000..1a2e1e90e
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_bottom.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedwr_side.png b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_side.png
new file mode 100644
index 000000000..382e2dafa
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_side.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_attachedwr_top.png b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_top.png
new file mode 100644
index 000000000..39ea67b8b
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_attachedwr_top.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_blocking_pointable.png b/games/devtest/mods/testnodes/textures/testnodes_blocking_pointable.png
new file mode 100644
index 000000000..fa021041a
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_blocking_pointable.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_fill_positioning_reference.png b/games/devtest/mods/testnodes/textures/testnodes_fill_positioning_reference.png
new file mode 100644
index 000000000..2ecd96955
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_fill_positioning_reference.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_not_pointable.png b/games/devtest/mods/testnodes/textures/testnodes_not_pointable.png
new file mode 100644
index 000000000..8509a68b7
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_not_pointable.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_pointable.png b/games/devtest/mods/testnodes/textures/testnodes_pointable.png
new file mode 100644
index 000000000..70c8f36f5
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_pointable.png differ
diff --git a/games/devtest/mods/testnodes/textures/testnodes_sign3d.png b/games/devtest/mods/testnodes/textures/testnodes_sign3d.png
new file mode 100644
index 000000000..e4ad9479f
Binary files /dev/null and b/games/devtest/mods/testnodes/textures/testnodes_sign3d.png differ
diff --git a/games/devtest/mods/testtools/init.lua b/games/devtest/mods/testtools/init.lua
index 7aa55bdb3..2378cf982 100644
--- a/games/devtest/mods/testtools/init.lua
+++ b/games/devtest/mods/testtools/init.lua
@@ -6,6 +6,21 @@ testtools = {}
 dofile(minetest.get_modpath("testtools") .. "/light.lua")
 dofile(minetest.get_modpath("testtools") .. "/privatizer.lua")
 dofile(minetest.get_modpath("testtools") .. "/particles.lua")
+dofile(minetest.get_modpath("testtools") .. "/node_box_visualizer.lua")
+
+local pointabilities_nodes = {
+	nodes = {
+		["group:blocking_pointable_test"] = true,
+		["group:not_pointable_test"] = true,
+	},
+}
+
+local pointabilities_objects = {
+	objects = {
+		["group:blocking_pointable_test"] = true,
+		["group:not_pointable_test"] = true,
+	},
+}
 
 minetest.register_tool("testtools:param2tool", {
 	description = S("Param2 Tool") .."\n"..
@@ -16,6 +31,7 @@ minetest.register_tool("testtools:param2tool", {
 		S("Sneak+Place: -8"),
 	inventory_image = "testtools_param2tool.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_nodes,
 	on_use = function(itemstack, user, pointed_thing)
 		local pos = minetest.get_pointed_thing_position(pointed_thing)
 		if pointed_thing.type ~= "node" or (not pos) then
@@ -58,6 +74,7 @@ minetest.register_tool("testtools:node_setter", {
 		S("Place in air: Manually select a node"),
 	inventory_image = "testtools_node_setter.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_nodes,
 	on_use = function(itemstack, user, pointed_thing)
 		local pos = minetest.get_pointed_thing_position(pointed_thing)
 		if pointed_thing.type == "nothing" then
@@ -118,6 +135,10 @@ minetest.register_tool("testtools:remover", {
 		S("Punch: Remove pointed node or object"),
 	inventory_image = "testtools_remover.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = {
+		nodes = pointabilities_nodes.nodes,
+		objects = pointabilities_objects.objects,
+	},
 	on_use = function(itemstack, user, pointed_thing)
 		local pos = minetest.get_pointed_thing_position(pointed_thing)
 		if pointed_thing.type == "node" and pos ~= nil then
@@ -139,6 +160,7 @@ minetest.register_tool("testtools:falling_node_tool", {
 		S("Place: Move pointed node 2 units upwards, then make it fall"),
 	inventory_image = "testtools_falling_node_tool.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_nodes,
 	on_place = function(itemstack, user, pointed_thing)
 		-- Teleport node 1-2 units upwards (if possible) and make it fall
 		local pos = minetest.get_pointed_thing_position(pointed_thing)
@@ -192,6 +214,7 @@ minetest.register_tool("testtools:rotator", {
 		S("Aux1+Punch: Roll"),
 	inventory_image = "testtools_entity_rotator.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "object" then
 			return
@@ -250,6 +273,7 @@ minetest.register_tool("testtools:object_mover", {
 		S("Sneak+Place: Decrease distance"),
 	inventory_image = "testtools_object_mover.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_place = mover_config,
 	on_secondary_use = mover_config,
 	on_use = function(itemstack, user, pointed_thing)
@@ -296,6 +320,7 @@ minetest.register_tool("testtools:entity_scaler", {
 		S("Sneak+Punch: Decrease scale"),
 	inventory_image = "testtools_entity_scaler.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_use = function(itemstack, user, pointed_thing)
 		if pointed_thing.type ~= "object" then
 			return
@@ -355,6 +380,7 @@ minetest.register_tool("testtools:branding_iron", {
 		S("Devices that accept the returned name also accept \"player:<playername>\" for players."),
 	inventory_image = "testtools_branding_iron.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_use = function(_itemstack, user, pointed_thing)
 		local obj
 		local msg
@@ -499,6 +525,7 @@ minetest.register_tool("testtools:object_editor", {
 		S("Punch air: Edit yourself"),
 	inventory_image = "testtools_object_editor.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_use = function(itemstack, user, pointed_thing)
 		if user and user:is_player() then
 			local name = user:get_player_name()
@@ -586,6 +613,7 @@ minetest.register_tool("testtools:object_attacher", {
 		S("Aux1+Sneak+Place: Decrease attachment rotation"),
 	inventory_image = "testtools_object_attacher.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_place = attacher_config,
 	on_secondary_use = attacher_config,
 	on_use = function(itemstack, user, pointed_thing)
@@ -679,6 +707,7 @@ minetest.register_tool("testtools:children_getter", {
 		S("Punch air to show your own 'children'"),
 	inventory_image = "testtools_children_getter.png",
 	groups = { testtool = 1, disable_repair = 1 },
+	pointabilities = pointabilities_objects,
 	on_use = function(itemstack, user, pointed_thing)
 		if user and user:is_player() then
 			local name = user:get_player_name()
@@ -998,3 +1027,41 @@ minetest.register_on_leaveplayer(function(player)
 	meta_latest_keylist[name] = nil
 	node_meta_posses[name] = nil
 end)
+
+-- Pointing Staffs
+
+minetest.register_tool("testtools:blocked_pointing_staff", {
+	description = S("Blocked Pointing Staff").."\n"..
+			S("Can point the Blocking Pointable Node/Object and "..
+			"the Pointable Node/Object is point blocking."),
+	inventory_image = "testtools_blocked_pointing_staff.png",
+	pointabilities = {
+		nodes = {
+			["testnodes:blocking_pointable"] = true,
+			["group:pointable_test"] = "blocking"
+		},
+		objects = {
+			["testentities:blocking_pointable"] = true,
+			["group:pointable_test"] = "blocking"
+		}
+	}
+})
+
+minetest.register_tool("testtools:ultimate_pointing_staff", {
+	description = S("Ultimate Pointing Staff").."\n"..
+			S("Can point all pointable test nodes, objects and liquids."),
+	inventory_image = "testtools_ultimate_pointing_staff.png",
+	liquids_pointable = true,
+	pointabilities = {
+		nodes = {
+			["group:blocking_pointable_test"] = true,
+			["group:pointable_test"] = true,
+			["testnodes:not_pointable"] = true
+		},
+		objects = {
+			["group:blocking_pointable_test"] = true,
+			["group:pointable_test"] = true,
+			["testentities:not_pointable"] = true
+		}
+	}
+})
diff --git a/games/devtest/mods/testtools/node_box_visualizer.lua b/games/devtest/mods/testtools/node_box_visualizer.lua
new file mode 100644
index 000000000..60ec8a518
--- /dev/null
+++ b/games/devtest/mods/testtools/node_box_visualizer.lua
@@ -0,0 +1,79 @@
+local S = minetest.get_translator("testtools")
+
+minetest.register_entity("testtools:visual_box", {
+	initial_properties = {
+		visual = "cube",
+		textures = {
+			"blank.png", "blank.png", "blank.png",
+			"blank.png", "blank.png", "blank.png",
+		},
+		use_texture_alpha = true,
+		physical = false,
+		pointable = false,
+		static_save = false,
+	},
+
+	on_activate = function(self)
+		self.timestamp = minetest.get_us_time() + 5000000
+	end,
+
+	on_step = function(self)
+		if minetest.get_us_time() >= self.timestamp then
+			self.object:remove()
+		end
+	end,
+})
+
+local BOX_TYPES = {"node_box", "collision_box", "selection_box"}
+local DEFAULT_BOX_TYPE = "selection_box"
+
+local function visualizer_on_use(itemstack, user, pointed_thing)
+	if pointed_thing.type ~= "node" then
+		return
+	end
+
+	local meta = itemstack:get_meta()
+	local box_type = meta:get("box_type") or DEFAULT_BOX_TYPE
+
+	local result = minetest.get_node_boxes(box_type, pointed_thing.under)
+	local t = "testtools_visual_" .. box_type .. ".png"
+
+	for _, box in ipairs(result) do
+		local box_min = pointed_thing.under + vector.new(box[1], box[2], box[3])
+		local box_max = pointed_thing.under + vector.new(box[4], box[5], box[6])
+		local box_center = (box_min + box_max) / 2
+		local obj = minetest.add_entity(box_center, "testtools:visual_box")
+		if not obj then
+			break
+		end
+		obj:set_properties({
+			textures = {t, t, t, t, t, t},
+			-- Add a small offset to avoid Z-fighting.
+			visual_size = vector.add(box_max - box_min, 0.01),
+		})
+	end
+end
+
+local function visualizer_on_place(itemstack, placer, pointed_thing)
+	local meta = itemstack:get_meta()
+	local prev_value = meta:get("box_type") or DEFAULT_BOX_TYPE
+	local prev_index = table.indexof(BOX_TYPES, prev_value)
+	assert(prev_index ~= -1)
+
+	local new_value = BOX_TYPES[(prev_index % #BOX_TYPES) + 1]
+	meta:set_string("box_type", new_value)
+	minetest.chat_send_player(placer:get_player_name(), S("[Node Box Visualizer] box_type = @1", new_value))
+
+	return itemstack
+end
+
+minetest.register_tool("testtools:node_box_visualizer", {
+	description = S("Node Box Visualizer") .. "\n" ..
+		S("Punch: Show node/collision/selection boxes of the pointed node") .. "\n" ..
+		S("Place: Change selected box type (default: selection box)"),
+	inventory_image = "testtools_node_box_visualizer.png",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_use = visualizer_on_use,
+	on_place = visualizer_on_place,
+	on_secondary_use = visualizer_on_place,
+})
diff --git a/games/devtest/mods/testtools/textures/testtools_blocked_pointing_staff.png b/games/devtest/mods/testtools/textures/testtools_blocked_pointing_staff.png
new file mode 100644
index 000000000..aa1cdb97a
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_blocked_pointing_staff.png differ
diff --git a/games/devtest/mods/testtools/textures/testtools_node_box_visualizer.png b/games/devtest/mods/testtools/textures/testtools_node_box_visualizer.png
new file mode 100644
index 000000000..1b16aa794
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_node_box_visualizer.png differ
diff --git a/games/devtest/mods/testtools/textures/testtools_ultimate_pointing_staff.png b/games/devtest/mods/testtools/textures/testtools_ultimate_pointing_staff.png
new file mode 100644
index 000000000..e4d80fb4d
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_ultimate_pointing_staff.png differ
diff --git a/games/devtest/mods/testtools/textures/testtools_visual_collision_box.png b/games/devtest/mods/testtools/textures/testtools_visual_collision_box.png
new file mode 100644
index 000000000..c8ab97cdf
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_visual_collision_box.png differ
diff --git a/games/devtest/mods/testtools/textures/testtools_visual_node_box.png b/games/devtest/mods/testtools/textures/testtools_visual_node_box.png
new file mode 100644
index 000000000..dbbb8d9f6
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_visual_node_box.png differ
diff --git a/games/devtest/mods/testtools/textures/testtools_visual_selection_box.png b/games/devtest/mods/testtools/textures/testtools_visual_selection_box.png
new file mode 100644
index 000000000..1f4bbf3c8
Binary files /dev/null and b/games/devtest/mods/testtools/textures/testtools_visual_selection_box.png differ
diff --git a/games/devtest/mods/unittests/async_env.lua b/games/devtest/mods/unittests/async_env.lua
index b7edf941e..b00deb3b6 100644
--- a/games/devtest/mods/unittests/async_env.lua
+++ b/games/devtest/mods/unittests/async_env.lua
@@ -53,7 +53,7 @@ local test_object = {
 	end,
 	sunlight_propagates = true,
 	is_ground_content = false,
-	light_source = 0,
+	pos = vector.new(-1, -2, -3),
 }
 
 local function test_object_passing()
@@ -166,3 +166,44 @@ local function test_userdata_passing2(cb, _, pos)
 	end, vm, pos)
 end
 unittests.register("test_userdata_passing2", test_userdata_passing2, {map=true, async=true})
+
+local function test_portable_metatable_override()
+	assert(pcall(core.register_portable_metatable, "__builtin:vector", vector.metatable),
+			"Metatable name aliasing throws an error when it should be allowed")
+
+	assert(not pcall(core.register_portable_metatable, "__builtin:vector", {}),
+			"Illegal metatable overriding allowed")
+end
+unittests.register("test_portable_metatable_override", test_portable_metatable_override)
+
+local function test_portable_metatable_registration(cb)
+	local custom_metatable = {}
+	core.register_portable_metatable("unittests:custom_metatable", custom_metatable)
+
+	core.handle_async(function(x)
+		-- unittests.custom_metatable is registered in inside_async_env.lua
+		return getmetatable(x) == unittests.custom_metatable, x
+	end, function(metatable_preserved_async, table_after_roundtrip)
+		if not metatable_preserved_async then
+			return cb("Custom metatable not preserved (main -> async)")
+		end
+		if getmetatable(table_after_roundtrip) ~= custom_metatable then
+			return cb("Custom metable not preserved (after roundtrip)")
+		end
+		cb()
+	end, setmetatable({}, custom_metatable))
+end
+unittests.register("test_portable_metatable_registration", test_portable_metatable_registration, {async=true})
+
+local function test_vector_preserve(cb)
+	local vec = vector.new(1, 2, 3)
+	core.handle_async(function(x)
+		return x[1]
+	end, function(ret)
+		if ret ~= vec then -- fails if metatable was not preserved
+			return cb("Vector value mismatch")
+		end
+		cb()
+	end, {vec})
+end
+unittests.register("test_async_vector", test_vector_preserve, {async=true})
diff --git a/games/devtest/mods/unittests/entity.lua b/games/devtest/mods/unittests/entity.lua
index 565dd6adf..38d026663 100644
--- a/games/devtest/mods/unittests/entity.lua
+++ b/games/devtest/mods/unittests/entity.lua
@@ -71,13 +71,13 @@ local function test_entity_lifecycle(_, pos)
 
 	-- with binary in staticdata
 	local obj = core.add_entity(pos, "unittests:callbacks", "abc\000def")
+	assert(obj and obj:is_valid())
 	check_log({"on_activate(7)"})
 
 	obj:set_hp(0)
 	check_log({"on_death(nil)", "on_deactivate(true)"})
 
-	-- objectref must be invalid now
-	assert(obj:get_velocity() == nil)
+	assert(not obj:is_valid())
 end
 unittests.register("test_entity_lifecycle", test_entity_lifecycle, {map=true})
 
@@ -130,3 +130,57 @@ local function test_entity_attach(player, pos)
 	obj:remove()
 end
 unittests.register("test_entity_attach", test_entity_attach, {player=true, map=true})
+
+core.register_entity("unittests:dummy", {
+	initial_properties = {
+		hp_max = 1,
+		visual = "upright_sprite",
+		textures = { "no_texture.png" },
+		static_save = false,
+	},
+})
+
+local function test_entity_raycast(_, pos)
+	local obj1 = core.add_entity(pos, "unittests:dummy")
+	local obj2 = core.add_entity(pos:offset(1, 0, 0), "unittests:dummy")
+	local raycast = core.raycast(pos:offset(-1, 0, 0), pos:offset(2, 0, 0), true, false)
+	for pt in raycast do
+		if pt.type == "object" then
+			assert(pt.ref == obj1)
+			obj1:remove()
+			obj2:remove()
+			obj1 = nil -- object should be hit exactly one
+		end
+	end
+	assert(obj1 == nil)
+end
+unittests.register("test_entity_raycast", test_entity_raycast, {map=true})
+
+local function test_object_iterator(pos, make_iterator)
+	local obj1 = core.add_entity(pos, "unittests:dummy")
+	local obj2 = core.add_entity(pos, "unittests:dummy")
+	assert(obj1 and obj2)
+	local found = false
+	-- As soon as we find one of the objects, we remove both, invalidating the other.
+	for obj in make_iterator() do
+		assert(obj:is_valid())
+		if obj == obj1 or obj == obj2 then
+			obj1:remove()
+			obj2:remove()
+			found = true
+		end
+	end
+	assert(found)
+end
+
+unittests.register("test_objects_inside_radius", function(_, pos)
+	test_object_iterator(pos, function()
+		return core.objects_inside_radius(pos, 1)
+	end)
+end, {map=true})
+
+unittests.register("test_objects_in_area", function(_, pos)
+	test_object_iterator(pos, function()
+		return core.objects_in_area(pos:offset(-1, -1, -1), pos:offset(1, 1, 1))
+	end)
+end, {map=true})
diff --git a/games/devtest/mods/unittests/get_version.lua b/games/devtest/mods/unittests/get_version.lua
index 99ddcfde6..7ef78257d 100644
--- a/games/devtest/mods/unittests/get_version.lua
+++ b/games/devtest/mods/unittests/get_version.lua
@@ -7,6 +7,10 @@ unittests.register("test_get_version", function()
     assert(type(version.proto_min) == "number")
     assert(type(version.proto_max) == "number")
     assert(version.proto_max >= version.proto_min)
-    assert(type(version.hash) == "string")
     assert(type(version.is_dev) == "boolean")
+    if version.is_dev then
+        assert(type(version.hash) == "string")
+    else
+        assert(version.hash == nil)
+    end
 end)
diff --git a/games/devtest/mods/unittests/init.lua b/games/devtest/mods/unittests/init.lua
index edba2c3d2..eae003a2a 100644
--- a/games/devtest/mods/unittests/init.lua
+++ b/games/devtest/mods/unittests/init.lua
@@ -108,9 +108,9 @@ local function wait_for_player(callback)
 	end)
 end
 
-local function wait_for_map(player, callback)
+local function wait_for_map(pos, callback)
 	local function check()
-		if core.get_node_or_nil(player:get_pos()) ~= nil then
+		if core.get_node(pos).name ~= "ignore" then
 			callback()
 		else
 			core.after(0, check)
@@ -119,8 +119,8 @@ local function wait_for_map(player, callback)
 	check()
 end
 
+-- This runs in a coroutine so it uses await()
 function unittests.run_all()
-	-- This runs in a coroutine so it uses await().
 	local counters = { time = 0, total = 0, passed = 0 }
 
 	-- Run standalone tests first
@@ -143,10 +143,11 @@ function unittests.run_all()
 	end
 
 	-- Wait for the world to generate/load, run tests that require map access
+	local pos = player:get_pos():round():offset(0, 5, 0)
+	core.forceload_block(pos, true, -1)
 	await(function(cb)
-		wait_for_map(player, cb)
+		wait_for_map(pos, cb)
 	end)
-	local pos = vector.round(player:get_pos())
 	for idx = 1, #unittests.list do
 		local def = unittests.list[idx]
 		if not def.done then
@@ -159,7 +160,7 @@ function unittests.run_all()
 	-- Print stats
 	assert(#unittests.list == counters.total)
 	print(string.rep("+", 80))
-	print(string.format("Unit Test Results: %s",
+	print(string.format("Devtest Unit Test Results: %s",
 	counters.total == counters.passed and "PASSED" or "FAILED"))
 	print(string.format("    %d / %d failed tests.",
 	counters.total - counters.passed, counters.total))
@@ -182,22 +183,49 @@ dofile(modpath .. "/get_version.lua")
 dofile(modpath .. "/itemstack_equals.lua")
 dofile(modpath .. "/content_ids.lua")
 dofile(modpath .. "/metadata.lua")
+dofile(modpath .. "/raycast.lua")
+dofile(modpath .. "/inventory.lua")
+dofile(modpath .. "/load_time.lua")
+dofile(modpath .. "/on_shutdown.lua")
 
 --------------
 
+local function send_results(name, ok)
+	core.chat_send_player(name,
+		minetest.colorize(ok and "green" or "red",
+			(ok and "All devtest unit tests passed." or
+				"There were devtest unit test failures.") ..
+				" Check the console for detailed output."))
+end
+
 if core.settings:get_bool("devtest_unittests_autostart", false) then
+	local test_results = nil
 	core.after(0, function()
+		-- CI adds a mod which sets `unittests.on_finished`
+		-- to write status information to the filesystem
+		local old_on_finished = unittests.on_finished
+		unittests.on_finished = function(ok)
+			for _, player in ipairs(minetest.get_connected_players()) do
+				send_results(player:get_player_name(), ok)
+			end
+			test_results = ok
+			old_on_finished(ok)
+		end
 		coroutine.wrap(unittests.run_all)()
 	end)
+	minetest.register_on_joinplayer(function(player)
+		if test_results == nil then
+			return -- tests haven't completed yet
+		end
+		send_results(player:get_player_name(), test_results)
+	end)
 else
 	core.register_chatcommand("unittests", {
 		privs = {basic_privs=true},
 		description = "Runs devtest unittests (may modify player or map state)",
 		func = function(name, param)
 			unittests.on_finished = function(ok)
-				core.chat_send_player(name,
-					(ok and "All tests passed." or "There were test failures.") ..
-					" Check the console for detailed output.")
+				send_results(name, ok)
 			end
 			coroutine.wrap(unittests.run_all)()
 			return true, ""
diff --git a/games/devtest/mods/unittests/inside_async_env.lua b/games/devtest/mods/unittests/inside_async_env.lua
index 7228d383d..fb610604d 100644
--- a/games/devtest/mods/unittests/inside_async_env.lua
+++ b/games/devtest/mods/unittests/inside_async_env.lua
@@ -2,6 +2,9 @@ unittests = {}
 
 core.log("info", "Hello World")
 
+unittests.custom_metatable = {}
+core.register_portable_metatable("unittests:custom_metatable", unittests.custom_metatable)
+
 local function do_tests()
 	assert(core == minetest)
 	-- stuff that should not be here
diff --git a/games/devtest/mods/unittests/inside_mapgen_env.lua b/games/devtest/mods/unittests/inside_mapgen_env.lua
new file mode 100644
index 000000000..a8df004de
--- /dev/null
+++ b/games/devtest/mods/unittests/inside_mapgen_env.lua
@@ -0,0 +1,32 @@
+core.log("info", "Hello World")
+
+local function do_tests()
+	assert(core == minetest)
+	-- stuff that should not be here
+	assert(not core.get_player_by_name)
+	assert(not core.object_refs)
+	-- stuff that should be here
+	assert(core.register_on_generated)
+	assert(core.get_node)
+	assert(core.spawn_tree)
+	assert(ItemStack)
+	local meta = ItemStack():get_meta()
+	assert(type(meta) == "userdata")
+	assert(type(meta.set_tool_capabilities) == "function")
+	assert(core.registered_items[""])
+	assert(core.save_gen_notify)
+	-- alias handling
+	assert(core.registered_items["unittests:steel_ingot_alias"].name ==
+		"unittests:steel_ingot")
+	-- fallback to item defaults
+	assert(core.registered_items["unittests:description_test"].on_place == true)
+end
+
+-- there's no (usable) communcation path between mapgen and the regular env
+-- so we just run the test unconditionally
+do_tests()
+
+core.register_on_generated(function(vm, pos1, pos2, blockseed)
+	local n = tonumber(core.get_mapgen_setting("chunksize")) * 16 - 1
+	assert(pos2:subtract(pos1) == vector.new(n, n, n))
+end)
diff --git a/games/devtest/mods/unittests/inventory.lua b/games/devtest/mods/unittests/inventory.lua
new file mode 100644
index 000000000..8e1e16b3b
--- /dev/null
+++ b/games/devtest/mods/unittests/inventory.lua
@@ -0,0 +1,73 @@
+
+local item_with_meta = ItemStack({name = "air", meta = {test = "abc"}})
+
+local test_list = {
+	ItemStack("air"),
+	ItemStack(""),
+	ItemStack(item_with_meta),
+}
+
+local function compare_lists(a, b)
+	if not a or not b or #a ~= #b then
+		return false
+	end
+	for i=1, #a do
+		if not ItemStack(a[i]):equals(ItemStack(b[i])) then
+			return false
+		end
+	end
+	return true
+end
+
+local function test_inventory()
+	local inv = minetest.create_detached_inventory("test")
+
+	inv:set_lists({test = {""}})
+	assert(inv:get_list("test"))
+
+	assert(inv:get_size("test") == 1)
+	assert(inv:set_size("test", 3))
+	assert(not inv:set_size("test", -1))
+
+	assert(inv:get_width("test") == 0)
+	assert(inv:set_width("test", 3))
+	assert(not inv:set_width("test", -1))
+
+	inv:set_stack("test", 1, "air")
+	inv:set_stack("test", 3, item_with_meta)
+	assert(not inv:is_empty("test"))
+	assert(compare_lists(inv:get_list("test"), test_list))
+
+	assert(inv:add_item("test", "air") == ItemStack())
+	assert(inv:add_item("test", item_with_meta) == ItemStack())
+	assert(inv:get_stack("test", 1) == ItemStack("air 2"))
+
+	assert(inv:room_for_item("test", "air 99"))
+	inv:set_stack("test", 2, "air 99")
+	assert(not inv:room_for_item("test", "air 99"))
+	inv:set_stack("test", 2, "")
+
+	assert(inv:contains_item("test", "air"))
+	assert(not inv:contains_item("test", "air 99"))
+	assert(inv:contains_item("test", item_with_meta, true))
+
+	-- Items should be removed in reverse and combine with first stack removed
+	assert(inv:remove_item("test", "air") == item_with_meta)
+	item_with_meta:set_count(2)
+	assert(inv:remove_item("test", "air 2") == item_with_meta)
+	assert(inv:remove_item("test", "air") == ItemStack("air"))
+	assert(inv:is_empty("test"))
+
+	-- Failure of set_list(s) should not change inventory
+	local before = inv:get_list("test")
+	pcall(inv.set_lists, inv, {test = true})
+	pcall(inv.set_list, inv, "test", true)
+	local after = inv:get_list("test")
+	assert(compare_lists(before, after))
+
+	local location = inv:get_location()
+	assert(minetest.remove_detached_inventory("test"))
+	assert(not minetest.get_inventory(location))
+end
+
+unittests.register("test_inventory", test_inventory)
diff --git a/games/devtest/mods/unittests/load_time.lua b/games/devtest/mods/unittests/load_time.lua
new file mode 100644
index 000000000..d437fba06
--- /dev/null
+++ b/games/devtest/mods/unittests/load_time.lua
@@ -0,0 +1,13 @@
+-- Test item (un)registration and overriding
+do
+	local itemname = "unittests:test_override_item"
+	minetest.register_craftitem(":" .. itemname, {description = "foo"})
+	assert(assert(minetest.registered_items[itemname]).description == "foo")
+	minetest.override_item(itemname, {description = "bar"})
+	assert(assert(minetest.registered_items[itemname]).description == "bar")
+	minetest.override_item(itemname, {}, {"description"})
+	-- description has the empty string as a default
+	assert(assert(minetest.registered_items[itemname]).description == "")
+	minetest.unregister_item("unittests:test_override_item")
+	assert(minetest.registered_items["unittests:test_override_item"] == nil)
+end
diff --git a/games/devtest/mods/unittests/metadata.lua b/games/devtest/mods/unittests/metadata.lua
index 6b0dcf04a..defd81dd3 100644
--- a/games/devtest/mods/unittests/metadata.lua
+++ b/games/devtest/mods/unittests/metadata.lua
@@ -77,6 +77,29 @@ local function test_metadata(meta)
 	assert(not meta:equals(compare_meta))
 end
 
+local function test_metadata_compat(meta)
+	-- key/value removal using set_string (undocumented, deprecated way)
+	meta:set_string("key", "value")
+	assert(meta:get_string("key") == "value")
+	meta:set_string("key", nil) -- ignore warning
+	assert(meta:to_table().fields["key"] == nil)
+
+	-- undocumented but supported consequence of Lua's
+	-- automatic string <--> number cast
+	meta:set_string("key", 2)
+	assert(meta:get_string("key") == "2")
+
+	-- from_table with non-string keys (supported)
+	local values = meta:to_table()
+	values.fields["new"] = 420
+	meta:from_table(values)
+	assert(meta:get_int("new") == 420)
+	values.fields["new"] = nil
+	meta:from_table(values)
+	assert(meta:get("new") == nil)
+end
+
+
 local storage_a = core.get_mod_storage()
 local storage_b = core.get_mod_storage()
 local function test_mod_storage()
@@ -86,7 +109,9 @@ end
 unittests.register("test_mod_storage", test_mod_storage)
 
 local function test_item_metadata()
-	test_metadata(ItemStack("unittest:coal_lump"):get_meta())
+	local meta = ItemStack("unittest:coal_lump"):get_meta()
+	test_metadata(meta)
+	test_metadata_compat(meta)
 end
 unittests.register("test_item_metadata", test_item_metadata)
 
diff --git a/games/devtest/mods/unittests/misc.lua b/games/devtest/mods/unittests/misc.lua
index 10af80585..6ff5c7e84 100644
--- a/games/devtest/mods/unittests/misc.lua
+++ b/games/devtest/mods/unittests/misc.lua
@@ -1,10 +1,40 @@
-local function test_random()
-	-- Try out PseudoRandom
-	local pseudo = PseudoRandom(13)
-	assert(pseudo:next() == 22290)
-	assert(pseudo:next() == 13854)
+core.register_mapgen_script(core.get_modpath(core.get_current_modname()) ..
+	DIR_DELIM .. "inside_mapgen_env.lua")
+
+local function test_pseudo_random()
+	-- We have comprehensive unit tests in C++, this is just to make sure the API code isn't messing up
+	local gen1 = PseudoRandom(13)
+	assert(gen1:next() == 22290)
+	assert(gen1:next() == 13854)
+
+	local gen2 = PseudoRandom(gen1:get_state())
+	for n = 0, 16 do
+		assert(gen1:next() == gen2:next())
+	end
+
+	local pr3 = PseudoRandom(-101)
+	assert(pr3:next(0, 100) == 35)
+	-- unusual case that is normally disallowed:
+	assert(pr3:next(10000, 42767) == 12485)
 end
-unittests.register("test_random", test_random)
+unittests.register("test_pseudo_random", test_pseudo_random)
+
+local function test_pcg_random()
+	-- We have comprehensive unit tests in C++, this is just to make sure the API code isn't messing up
+	local gen1 = PcgRandom(55)
+
+	for n = 0, 16 do
+		gen1:next()
+	end
+
+	local gen2 = PcgRandom(26)
+	gen2:set_state(gen1:get_state())
+
+	for n = 16, 32 do
+		assert(gen1:next() == gen2:next())
+	end
+end
+unittests.register("test_pcg_random", test_pcg_random)
 
 local function test_dynamic_media(cb, player)
 	if core.get_player_information(player:get_player_name()).protocol_version < 40 then
@@ -69,17 +99,31 @@ local function test_clear_meta(_, pos)
 end
 unittests.register("test_clear_meta", test_clear_meta, {map=true})
 
-local on_punch_called
-minetest.register_on_punchnode(function()
+local on_punch_called, on_place_called
+core.register_on_placenode(function()
+	on_place_called = true
+end)
+core.register_on_punchnode(function()
 	on_punch_called = true
 end)
-unittests.register("test_punch_node", function(_, pos)
-	minetest.place_node(pos, {name="basenodes:dirt"})
+local function test_node_callbacks(_, pos)
+	on_place_called = false
 	on_punch_called = false
-	minetest.punch_node(pos)
-	minetest.remove_node(pos)
-	-- currently failing: assert(on_punch_called)
-end, {map=true})
+
+	core.place_node(pos, {name="basenodes:dirt"})
+	assert(on_place_called, "on_place not called")
+	core.punch_node(pos)
+	assert(on_punch_called, "on_punch not called")
+	core.remove_node(pos)
+end
+unittests.register("test_node_callbacks", test_node_callbacks, {map=true})
+
+local function test_hashing()
+	local input = "hello\000world"
+	assert(core.sha1(input) == "f85b420f1e43ebf88649dfcab302b898d889606c")
+	assert(core.sha256(input) == "b206899bc103669c8e7b36de29d73f95b46795b508aa87d612b2ce84bfb29df2")
+end
+unittests.register("test_hashing", test_hashing)
 
 local function test_compress()
 	-- This text should be compressible, to make sure the results are... normal
@@ -103,6 +147,12 @@ local function test_compress()
 end
 unittests.register("test_compress", test_compress)
 
+local function test_urlencode()
+	-- checks that API code handles null bytes
+	assert(core.urlencode("foo\000bar!") == "foo%00bar%21")
+end
+unittests.register("test_urlencode", test_urlencode)
+
 local function test_game_info()
 	local info = minetest.get_game_info()
 	local game_conf = Settings(info.path .. "/game.conf")
@@ -177,3 +227,30 @@ local function test_on_mapblocks_changed(cb, player, pos)
 	end
 end
 unittests.register("test_on_mapblocks_changed", test_on_mapblocks_changed, {map=true, async=true})
+
+local function test_gennotify_api()
+	local DECO_ID = 123
+	local UD_ID = "unittests:dummy"
+
+	-- the engine doesn't check if the id is actually valid, maybe it should
+	core.set_gen_notify({decoration=true}, {DECO_ID})
+
+	core.set_gen_notify({custom=true}, nil, {UD_ID})
+
+	local flags, deco, custom = core.get_gen_notify()
+	local function ff(flag)
+		return (" " .. flags .. " "):match("[ ,]" .. flag .. "[ ,]") ~= nil
+	end
+	assert(ff("decoration"), "'decoration' flag missing")
+	assert(ff("custom"), "'custom' flag missing")
+	assert(table.indexof(deco, DECO_ID) > 0)
+	assert(table.indexof(custom, UD_ID) > 0)
+
+	core.set_gen_notify({decoration=false, custom=false})
+
+	flags, deco, custom = core.get_gen_notify()
+	assert(not ff("decoration") and not ff("custom"))
+	assert(#deco == 0, "deco ids not empty")
+	assert(#custom == 0, "custom ids not empty")
+end
+unittests.register("test_gennotify_api", test_gennotify_api)
diff --git a/games/devtest/mods/unittests/mod.conf b/games/devtest/mods/unittests/mod.conf
index fa94e01a6..ccff73701 100644
--- a/games/devtest/mods/unittests/mod.conf
+++ b/games/devtest/mods/unittests/mod.conf
@@ -1,3 +1,4 @@
 name = unittests
 description = Adds automated unit tests for the engine
-depends = basenodes
+# Also test that it is possible to depend on first_mod
+depends = first_mod, basenodes
diff --git a/games/devtest/mods/unittests/on_shutdown.lua b/games/devtest/mods/unittests/on_shutdown.lua
new file mode 100644
index 000000000..6d5d88638
--- /dev/null
+++ b/games/devtest/mods/unittests/on_shutdown.lua
@@ -0,0 +1,22 @@
+-- Test whether players still exist on shutdown
+local players = {}
+
+core.register_on_joinplayer(function(player)
+	players[player:get_player_name()] = true
+end)
+
+core.register_on_leaveplayer(function(player)
+	local name = player:get_player_name();
+	assert(players[name], "Unrecorded player join.")
+	players[name] = nil
+end)
+
+core.register_on_shutdown(function()
+	for _, player in pairs(core.get_connected_players()) do
+		local name = player:get_player_name()
+		assert(players[name], "Unrecorded player join or left too early.")
+		players[name] = nil
+	end
+
+	assert(not next(players), "Invalid connected players on shutdown.")
+end)
diff --git a/games/devtest/mods/unittests/player.lua b/games/devtest/mods/unittests/player.lua
index fa0557960..70b3b6cae 100644
--- a/games/devtest/mods/unittests/player.lua
+++ b/games/devtest/mods/unittests/player.lua
@@ -68,3 +68,19 @@ local function run_player_meta_tests(player)
 	assert(meta:equals(meta2))
 end
 unittests.register("test_player_meta", run_player_meta_tests, {player=true})
+
+--
+-- Player add pos
+--
+local function run_player_add_pos_tests(player)
+	local pos = player:get_pos()
+	player:add_pos(vector.new(0, 1000, 0))
+	local newpos = player:get_pos()
+	player:add_pos(vector.new(0, -1000, 0))
+	local backpos = player:get_pos()
+	local newdist = vector.distance(pos, newpos)
+	assert(math.abs(newdist - 1000) <= 1)
+	assert(vector.distance(pos, backpos) <= 1)
+end
+unittests.register("test_player_add_pos", run_player_add_pos_tests, {player=true})
+
diff --git a/games/devtest/mods/unittests/raycast.lua b/games/devtest/mods/unittests/raycast.lua
new file mode 100644
index 000000000..08d6a1120
--- /dev/null
+++ b/games/devtest/mods/unittests/raycast.lua
@@ -0,0 +1,36 @@
+local function raycast_with_pointabilities(start_pos, end_pos, pointabilities)
+	local ray = core.raycast(start_pos, end_pos, nil, nil, pointabilities)
+	for hit in ray do
+        if hit.type == "node" then
+            return hit.under
+        end
+	end
+    return nil
+end
+
+local function test_raycast_pointabilities(player, pos1)
+    local pos2 = pos1:offset(0, 0, 1)
+    local pos3 = pos1:offset(0, 0, 2)
+
+    local oldnode1 = core.get_node(pos1)
+    local oldnode2 = core.get_node(pos2)
+    local oldnode3 = core.get_node(pos3)
+    core.swap_node(pos1, {name = "air"})
+    core.swap_node(pos2, {name = "testnodes:not_pointable"})
+    core.swap_node(pos3, {name = "testnodes:pointable"})
+
+    local p = nil
+    assert(raycast_with_pointabilities(pos1, pos3, p) == pos3)
+
+    p = core.registered_items["testtools:blocked_pointing_staff"].pointabilities
+    assert(raycast_with_pointabilities(pos1, pos3, p) == nil)
+
+    p = core.registered_items["testtools:ultimate_pointing_staff"].pointabilities
+    assert(raycast_with_pointabilities(pos1, pos3, p) == pos2)
+
+    core.swap_node(pos1, oldnode1)
+    core.swap_node(pos2, oldnode2)
+    core.swap_node(pos3, oldnode3)
+end
+
+unittests.register("test_raycast_pointabilities", test_raycast_pointabilities, {map=true})
diff --git a/games/devtest/mods/util_commands/init.lua b/games/devtest/mods/util_commands/init.lua
index 48cd47f10..6285d4754 100644
--- a/games/devtest/mods/util_commands/init.lua
+++ b/games/devtest/mods/util_commands/init.lua
@@ -210,6 +210,29 @@ minetest.register_chatcommand("dump_item", {
 	end,
 })
 
+minetest.register_chatcommand("dump_itemdef", {
+	params = "",
+	description = "Prints a dump of the wielded item's definition in table form",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		local str = dump(player:get_wielded_item():get_definition())
+		print(str)
+		return true, str
+	end,
+})
+
+minetest.register_chatcommand("dump_wear_bar", {
+	params = "",
+	description = "Prints a dump of the wielded item's wear bar parameters in table form",
+	func = function(name, param)
+		local player = minetest.get_player_by_name(name)
+		local item = player:get_wielded_item()
+		local str = dump(item:get_wear_bar_params())
+		print(str)
+		return true, str
+	end,
+})
+
 core.register_chatcommand("set_saturation", {
     params = "<saturation>",
     description = "Set the saturation for current player.",
diff --git a/irr/.editorconfig b/irr/.editorconfig
new file mode 100755
index 000000000..080ba5b54
--- /dev/null
+++ b/irr/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+
+[*.{cpp,h,txt,cmake,fsh,vsh}]
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/irr/.github/workflows/build.yml b/irr/.github/workflows/build.yml
new file mode 100644
index 000000000..f31521bd2
--- /dev/null
+++ b/irr/.github/workflows/build.yml
@@ -0,0 +1,310 @@
+name: build
+
+# build on c/cpp changes or workflow changes
+on:
+  - push
+  - pull_request
+
+jobs:
+
+  linux-gl:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libxi-dev libgl1-mesa-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+
+      - name: Build
+        run: |
+          cmake . -DUSE_SDL2=OFF
+          make VERBOSE=1 -j2
+
+      - name: Test
+        run: |
+          ctest --output-on-failure
+
+      - name: Package
+        run: |
+          make DESTDIR=$PWD/_install install
+          tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local .
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: irrlicht-linux
+          path: ./irrlicht-linux.tar.gz
+
+  linux-gles:
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libxi-dev libgles2-mesa-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
+
+  linux-sdl:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DCMAKE_BUILD_TYPE=Debug
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+  linux-sdl-gl3:
+    # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest opengl3
+
+  linux-sdl-gles2:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install g++ cmake libsdl2-dev libpng-dev libjpeg-dev zlib1g-dev xvfb -qyy
+
+      - name: Build
+        run: |
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          make -j2
+
+      - name: Test (headless)
+        run: |
+          cd bin/Linux
+          ./AutomatedTest null
+
+      - name: Test (Xvfb)
+        run: |
+          cd bin/Linux
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
+
+  mingw:
+    name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}"
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {variant: win32, arch: i686}
+          - {variant: win64, arch: x86_64}
+          - {variant: win32, arch: i686, extras: "-sdl"}
+          - {variant: win64, arch: x86_64, extras: "-sdl"}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install compiler
+        run: |
+          sudo apt-get update && sudo apt-get install cmake -qyy
+          ./scripts/ci-get-mingw.sh
+
+      - name: Build
+        run: |
+          ./scripts/ci-build-mingw.sh package
+        env:
+          CC: ${{matrix.config.arch}}-w64-mingw32-clang
+          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
+          extras: ${{matrix.config.extras}}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
+          path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
+
+  macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update --auto-update
+          brew install cmake libpng jpeg
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1
+          make -j3
+
+      - name: Test (headless)
+        run: |
+          ./bin/OSX/AutomatedTest null
+
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew update --auto-update
+          brew install cmake libpng jpeg sdl2
+        env:
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
+  msvc:
+    name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
+    runs-on: windows-2019
+    env:
+      VCPKG_VERSION: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
+      # 2023.10.19
+      vcpkg_packages: zlib libpng libjpeg-turbo
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          -
+            arch: x86
+            generator: "-G'Visual Studio 16 2019' -A Win32"
+            vcpkg_triplet: x86-windows
+          -
+            arch: x64
+            generator: "-G'Visual Studio 16 2019' -A x64"
+            vcpkg_triplet: x64-windows
+        sdl:
+          -
+            use: FALSE
+            label: '(no SDL)'
+            vcpkg_packages: opengl-registry
+          -
+            use: TRUE
+            label: '(with SDL)'
+            vcpkg_packages: sdl2
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Restore from cache and run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{env.vcpkg_packages}} ${{matrix.sdl.vcpkg_packages}}
+          vcpkgDirectory: '${{ github.workspace }}\vcpkg'
+          appendedCacheKey: ${{ matrix.config.vcpkg_triplet }}
+          vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
+          vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
+
+      - name: CMake
+        run: |
+            cmake ${{matrix.config.generator}}  `
+            -DUSE_SDL2=${{matrix.sdl.use}}  `
+            -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
+            -DCMAKE_BUILD_TYPE=Release .
+
+      - name: Build
+        run: cmake --build . --config Release
+
+      - name: Create artifact folder
+        run: |
+          mkdir artifact/
+          mkdir artifact/lib/
+
+      - name: Move dlls into artifact folder
+        run: move bin\Win32-VisualStudio\Release\* artifact\lib\
+
+      - name: Move includes into artifact folder
+        run: move include artifact/
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
+          path: artifact/
+
+  android:
+    name: Android ${{ matrix.arch }}
+    runs-on: ubuntu-20.04
+    env:
+       ndk_version: "r25c"
+       ANDROID_NDK: ${{ github.workspace }}/android-ndk
+    strategy:
+      matrix:
+        arch: [armeabi-v7a, arm64-v8a, x86, x86_64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install deps
+        run: |
+          sudo rm /var/lib/man-db/auto-update
+          sudo apt-get update
+          sudo apt-get install -qyy wget unzip zip gcc-multilib make cmake
+
+      - name: Cache NDK
+        id: cache-ndk
+        uses: actions/cache@v4
+        with:
+          key: android-ndk-${{ env.ndk_version }}-linux
+          path: ${{ env.ANDROID_NDK }}
+
+      - name: Install NDK
+        run: |
+          wget --progress=bar:force "http://dl.google.com/android/repository/android-ndk-${ndk_version}-linux.zip"
+          unzip -q "android-ndk-${ndk_version}-linux.zip"
+          rm "android-ndk-${ndk_version}-linux.zip"
+          mv "android-ndk-${ndk_version}" "${ANDROID_NDK}"
+        if: ${{ steps.cache-ndk.outputs.cache-hit != 'true' }}
+
+      - name: Build
+        run: ./scripts/ci-build-android.sh ${{ matrix.arch }}
+
+      #- name: Upload Artifact
+      #  uses: actions/upload-artifact@v4
+      #  with:
+      #    name: irrlicht-android-${{ matrix.arch }}
+      #    path: ${{ runner.temp }}/pkg/${{ matrix.arch }}
diff --git a/irr/.gitignore b/irr/.gitignore
new file mode 100644
index 000000000..8bced59d8
--- /dev/null
+++ b/irr/.gitignore
@@ -0,0 +1,25 @@
+CMakeFiles
+CMakeCache.txt
+cmake_install.cmake
+install_manifest.txt
+IrrlichtMtConfig.cmake
+IrrlichtMtConfigVersion.cmake
+IrrlichtMtTargets.cmake
+CTestTestfile.cmake
+Makefile
+libs/*
+*.so*
+*.a
+*.exe
+*.dll
+bin/Linux
+scripts/gl2ext.h
+scripts/glcorearb.h
+scripts/glext.h
+*.vcxproj*
+*.dir/
+*.sln
+*visualstudio/
+
+# vscode cmake plugin
+build/*
diff --git a/irr/CMakeLists.txt b/irr/CMakeLists.txt
new file mode 100644
index 000000000..ccc00f271
--- /dev/null
+++ b/irr/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(Irrlicht LANGUAGES CXX)
+
+message(STATUS "*** Building IrrlichtMt ***")
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
+endif()
+
+# FIXME: tests need to be moved to MT if we want to keep them
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+#enable_testing()
+add_subdirectory(src)
+#add_subdirectory(test)
+
+#option(BUILD_EXAMPLES "Build example applications" FALSE)
+#if(BUILD_EXAMPLES)
+#	add_subdirectory(examples)
+#endif()
diff --git a/irr/LICENSE b/irr/LICENSE
new file mode 100644
index 000000000..8ad1f24ca
--- /dev/null
+++ b/irr/LICENSE
@@ -0,0 +1,26 @@
+Copyright (C) 2002-2012 Nikolaus Gebhardt
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Please note that the Irrlicht Engine is based in part on the work of the
+  Independent JPEG Group, the zlib, libPng and aesGladman. This means that if you use
+  the Irrlicht Engine in your product, you must acknowledge somewhere in your
+  documentation that you've used the IJPG code. It would also be nice to mention
+  that you use the Irrlicht Engine, the zlib, libPng and aesGladman. See the
+  corresponding license files for further informations. It is also possible to disable
+  usage of those additional libraries by defines in the IrrCompileConfig.h header and
+  recompiling the engine.
diff --git a/irr/README.md b/irr/README.md
new file mode 100644
index 000000000..f07bb6d63
--- /dev/null
+++ b/irr/README.md
@@ -0,0 +1,64 @@
+IrrlichtMt version 1.9
+======================
+
+IrrlichtMt is the 3D engine of [Minetest](https://github.com/minetest).
+It is based on the [Irrlicht Engine](https://irrlicht.sourceforge.io/) but is now developed independently.
+It is intentionally not compatible to upstream and is planned to be eventually absorbed into Minetest.
+
+Build
+-----
+
+The build system is CMake.
+
+The following libraries are required to be installed:
+* zlib, libPNG, libJPEG
+* OpenGL
+  * or on mobile: OpenGL ES (can be optionally enabled on desktop too)
+* on Unix: X11
+* SDL2 (see below)
+
+Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
+* `ENABLE_OPENGL` - Enable OpenGL driver
+* `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
+* `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
+* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
+* `USE_SDL2` (default: ON for Android, OFF for other platforms) - Use SDL2 instead of older native device code
+
+However, IrrlichtMt cannot be built or installed separately.
+	
+Platforms
+---------
+
+We aim to support these platforms:
+* Windows via MinGW
+* Linux (GL or GLES)
+* macOS
+* Android
+
+This doesn't mean other platforms don't work or won't be supported, if you find something that doesn't work contributions are welcome.
+
+License
+-------
+
+The license of the Irrlicht Engine is based on the zlib/libpng license and applies to this fork, too.
+
+	The Irrlicht Engine License
+	===========================
+
+	Copyright (C) 2002-2012 Nikolaus Gebhardt
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	 claim that you wrote the original software. If you use this software
+	 in a product, an acknowledgement in the product documentation would be
+	 appreciated but is not required.
+	2. Altered source versions must be clearly marked as such, and must not be
+	 misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
diff --git a/irr/cmake/FindOpenGLES2.cmake b/irr/cmake/FindOpenGLES2.cmake
new file mode 100644
index 000000000..9be6ce8e6
--- /dev/null
+++ b/irr/cmake/FindOpenGLES2.cmake
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------------
+# The contents of this file are placed in the public domain. Feel
+# free to make use of it in any way you like.
+#-------------------------------------------------------------------
+
+# Try to find OpenGL ES 2 and EGL
+
+if(WIN32)
+	find_path(OPENGLES2_INCLUDE_DIR GLES2/gl2.h)
+	find_library(OPENGLES2_LIBRARY libGLESv2)
+elseif(APPLE)
+	find_library(OPENGLES2_LIBRARY OpenGLES REQUIRED) # framework
+else()
+	# Unix
+	find_path(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
+		PATHS /usr/X11R6/include /usr/include
+	)
+	find_library(OPENGLES2_LIBRARY
+		NAMES GLESv2
+		PATHS /usr/X11R6/lib /usr/lib
+	)
+
+	include(FindPackageHandleStandardArgs)
+	find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
+
+	find_path(EGL_INCLUDE_DIR EGL/egl.h
+		PATHS /usr/X11R6/include /usr/include
+	)
+	find_library(EGL_LIBRARY
+		NAMES EGL
+		PATHS /usr/X11R6/lib /usr/lib
+	)
+
+	include(FindPackageHandleStandardArgs)
+	find_package_handle_standard_args(EGL REQUIRED_VARS EGL_LIBRARY EGL_INCLUDE_DIR NAME_MISMATCHED)
+endif()
+
+set(OPENGLES2_LIBRARIES ${OPENGLES2_LIBRARY} ${EGL_LIBRARY})
diff --git a/irr/examples/AutomatedTest/main.cpp b/irr/examples/AutomatedTest/main.cpp
new file mode 100644
index 000000000..c9e5bab68
--- /dev/null
+++ b/irr/examples/AutomatedTest/main.cpp
@@ -0,0 +1,154 @@
+#include <iostream>
+#include <irrlicht.h>
+#include "exampleHelper.h"
+
+using namespace irr;
+
+static IrrlichtDevice *device = nullptr;
+static int test_fail = 0;
+
+void test_irr_array();
+void test_irr_string();
+
+static video::E_DRIVER_TYPE chooseDriver(core::stringc arg_)
+{
+	if (arg_ == "null")
+		return video::EDT_NULL;
+	if (arg_ == "ogles1")
+		return video::EDT_OGLES1;
+	if (arg_ == "ogles2")
+		return video::EDT_OGLES2;
+	if (arg_ == "opengl")
+		return video::EDT_OPENGL;
+	if (arg_ == "opengl3")
+		return video::EDT_OPENGL3;
+	std::cerr << "Unknown driver type: " << arg_.c_str() << ". Trying OpenGL." << std::endl;
+	return video::EDT_OPENGL;
+}
+
+static inline void check(bool ok, const char *msg)
+{
+	if (!ok) {
+		test_fail++;
+		device->getLogger()->log((core::stringc("FAILED TEST: ") + msg).c_str(), ELL_ERROR);
+	}
+}
+
+void run_unit_tests()
+{
+	std::cout << "Running unit tests:" << std::endl;
+	try {
+		test_irr_array();
+		test_irr_string();
+	} catch (const std::exception &e) {
+		std::cerr << e.what() << std::endl;
+		test_fail++;
+	}
+	std::cout << std::endl;
+}
+
+int main(int argc, char *argv[])
+{
+	run_unit_tests();
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = chooseDriver(argc > 1 ? argv[1] : "");
+	p.WindowSize = core::dimension2du(640, 480);
+	p.Vsync = true;
+	p.LoggingLevel = ELL_DEBUG;
+
+	device = createDeviceEx(p);
+	if (!device)
+		return 1;
+
+	{
+		u32 total = 0;
+		device->getOSOperator()->getSystemMemory(&total, nullptr);
+		core::stringc message = core::stringc("Total RAM in MiB: ") + core::stringc(total >> 10);
+		device->getLogger()->log(message.c_str(), ELL_INFORMATION);
+		check(total > 130 * 1024, "RAM amount");
+	}
+
+	device->setWindowCaption(L"Hello World!");
+	device->setResizable(true);
+
+	video::IVideoDriver *driver = device->getVideoDriver();
+	scene::ISceneManager *smgr = device->getSceneManager();
+	gui::IGUIEnvironment *guienv = device->getGUIEnvironment();
+
+	guienv->addStaticText(L"sample text", core::rect<s32>(10, 10, 110, 22), false);
+
+	gui::IGUIButton *button = guienv->addButton(
+			core::rect<s32>(10, 30, 110, 30 + 32), 0, -1, L"sample button",
+			L"sample tooltip");
+
+	gui::IGUIEditBox *editbox = guienv->addEditBox(L"",
+			core::rect<s32>(10, 70, 60, 70 + 16));
+
+	const io::path mediaPath = getExampleMediaPath();
+
+	auto mesh_file = device->getFileSystem()->createAndOpenFile(mediaPath + "coolguy_opt.x");
+	check(mesh_file, "mesh file loading");
+	scene::IAnimatedMesh *mesh = smgr->getMesh(mesh_file);
+	check(mesh, "mesh loading");
+	if (mesh_file)
+		mesh_file->drop();
+	if (mesh) {
+		video::ITexture *tex = driver->getTexture(mediaPath + "cooltexture.png");
+		check(tex, "texture loading");
+		scene::IAnimatedMeshSceneNode *node = smgr->addAnimatedMeshSceneNode(mesh);
+		if (node) {
+			node->forEachMaterial([tex](video::SMaterial &mat) {
+				mat.Lighting = false;
+				mat.setTexture(0, tex);
+			});
+			node->setFrameLoop(0, 29);
+			node->setAnimationSpeed(30);
+		}
+	}
+
+	smgr->addCameraSceneNode(0, core::vector3df(0, 4, 5), core::vector3df(0, 2, 0));
+
+	s32 n = 0;
+	SEvent event;
+	device->getTimer()->start();
+
+	while (device->run()) {
+		if (device->getTimer()->getTime() >= 1000) {
+			device->getTimer()->setTime(0);
+			++n;
+			if (n == 1) { // Tooltip display
+				bzero(&event, sizeof(SEvent));
+				event.EventType = irr::EET_MOUSE_INPUT_EVENT;
+				event.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+				event.MouseInput.X = button->getAbsolutePosition().getCenter().X;
+				event.MouseInput.Y = button->getAbsolutePosition().getCenter().Y;
+				device->postEventFromUser(event);
+			} else if (n == 2) // Text input focus
+				guienv->setFocus(editbox);
+			else if (n == 3) { // Keypress for Text input
+				bzero(&event, sizeof(SEvent));
+				event.EventType = irr::EET_KEY_INPUT_EVENT;
+				event.KeyInput.Char = L'a';
+				event.KeyInput.Key = KEY_KEY_A;
+				event.KeyInput.PressedDown = true;
+				device->postEventFromUser(event);
+				event.KeyInput.PressedDown = false;
+				device->postEventFromUser(event);
+			} else
+				device->closeDevice();
+		}
+
+		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH,
+				video::SColor(255, 100, 100, 150));
+		smgr->drawAll();
+		guienv->drawAll();
+		driver->endScene();
+	}
+
+	check(core::stringw(L"a") == editbox->getText(), "EditBox text");
+
+	device->getLogger()->log("Done.", ELL_INFORMATION);
+	device->drop();
+	return test_fail > 0 ? 1 : 0;
+}
diff --git a/irr/examples/AutomatedTest/test_array.cpp b/irr/examples/AutomatedTest/test_array.cpp
new file mode 100644
index 000000000..42959e913
--- /dev/null
+++ b/irr/examples/AutomatedTest/test_array.cpp
@@ -0,0 +1,138 @@
+#include <irrArray.h>
+#include "test_helper.h"
+
+using namespace irr;
+using core::array;
+
+static void test_basics()
+{
+	array<int> v;
+	v.push_back(1);  // 1
+	v.push_front(2); // 2, 1
+	v.insert(4, 0);  // 4, 2, 1
+	v.insert(3, 1);  // 4, 3, 2, 1
+	v.insert(0, 4);  // 4, 3, 2, 1, 0
+	UASSERTEQ(v.size(), 5);
+	UASSERTEQ(v[0], 4);
+	UASSERTEQ(v[1], 3);
+	UASSERTEQ(v[2], 2);
+	UASSERTEQ(v[3], 1);
+	UASSERTEQ(v[4], 0);
+	array<int> w = v;
+	UASSERTEQ(w.size(), 5);
+	UASSERT(w == v);
+	w.clear();
+	UASSERTEQ(w.size(), 0);
+	UASSERTEQ(w.allocated_size(), 0);
+	UASSERT(w.empty());
+	w = v;
+	UASSERTEQ(w.size(), 5);
+	w.set_used(3);
+	UASSERTEQ(w.size(), 3);
+	UASSERTEQ(w[0], 4);
+	UASSERTEQ(w[1], 3);
+	UASSERTEQ(w[2], 2);
+	UASSERTEQ(w.getLast(), 2);
+	w.set_used(20);
+	UASSERTEQ(w.size(), 20);
+	w = v;
+	w.sort();
+	UASSERTEQ(w.size(), 5);
+	UASSERTEQ(w[0], 0);
+	UASSERTEQ(w[1], 1);
+	UASSERTEQ(w[2], 2);
+	UASSERTEQ(w[3], 3);
+	UASSERTEQ(w[4], 4);
+	w.erase(0);
+	UASSERTEQ(w.size(), 4);
+	UASSERTEQ(w[0], 1);
+	UASSERTEQ(w[1], 2);
+	UASSERTEQ(w[2], 3);
+	UASSERTEQ(w[3], 4);
+	w.erase(1, 2);
+	UASSERTEQ(w.size(), 2);
+	UASSERTEQ(w[0], 1);
+	UASSERTEQ(w[1], 4);
+	w.swap(v);
+	UASSERTEQ(w.size(), 5);
+	UASSERTEQ(v.size(), 2);
+}
+
+static void test_linear_searches()
+{
+	// Populate the array with 0, 1, 2, ..., 100, 100, 99, 98, 97, ..., 0
+	array<int> arr;
+	for (int i = 0; i <= 100; i++)
+		arr.push_back(i);
+	for (int i = 100; i >= 0; i--)
+		arr.push_back(i);
+	s32 end = arr.size() - 1;
+	for (int i = 0; i <= 100; i++) {
+		s32 index = arr.linear_reverse_search(i);
+		UASSERTEQ(index, end - i);
+	}
+	for (int i = 0; i <= 100; i++) {
+		s32 index = arr.linear_search(i);
+		UASSERTEQ(index, i);
+	}
+}
+
+static void test_binary_searches()
+{
+	const auto &values = {3, 5, 1, 2, 5, 10, 19, 9, 7, 1, 2, 5, 8, 15};
+	array<int> arr;
+	for (int value : values) {
+		arr.push_back(value);
+	}
+	// Test the const form first, it uses a linear search without sorting
+	const array<int> &carr = arr;
+	UASSERTEQ(carr.binary_search(20), -1);
+	UASSERTEQ(carr.binary_search(0), -1);
+	UASSERTEQ(carr.binary_search(1), 2);
+
+	// Sorted: 1, 1, 2, 2, 3, 5, 5, 5, 7, 8, 9, 10, 15, 19
+	UASSERTEQ(arr.binary_search(20), -1);
+	UASSERTEQ(arr.binary_search(0), -1);
+
+	for (int value : values) {
+		s32 i = arr.binary_search(value);
+		UASSERTNE(i, -1);
+		UASSERTEQ(arr[i], value);
+	}
+
+	s32 first, last;
+	first = arr.binary_search_multi(1, last);
+	UASSERTEQ(first, 0);
+	UASSERTEQ(last, 1);
+
+	first = arr.binary_search_multi(2, last);
+	UASSERTEQ(first, 2);
+	UASSERTEQ(last, 3);
+
+	first = arr.binary_search_multi(3, last);
+	UASSERTEQ(first, 4);
+	UASSERTEQ(last, 4);
+
+	first = arr.binary_search_multi(4, last);
+	UASSERTEQ(first, -1);
+
+	first = arr.binary_search_multi(5, last);
+	UASSERTEQ(first, 5);
+	UASSERTEQ(last, 7);
+
+	first = arr.binary_search_multi(7, last);
+	UASSERTEQ(first, 8);
+	UASSERTEQ(last, 8);
+
+	first = arr.binary_search_multi(19, last);
+	UASSERTEQ(first, 13);
+	UASSERTEQ(last, 13);
+}
+
+void test_irr_array()
+{
+	test_basics();
+	test_linear_searches();
+	test_binary_searches();
+	std::cout << "    test_irr_array PASSED" << std::endl;
+}
diff --git a/irr/examples/AutomatedTest/test_helper.h b/irr/examples/AutomatedTest/test_helper.h
new file mode 100644
index 000000000..5229eff29
--- /dev/null
+++ b/irr/examples/AutomatedTest/test_helper.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <exception>
+#include <iostream>
+
+class TestFailedException : public std::exception
+{
+};
+
+// Asserts the comparison specified by CMP is true, or fails the current unit test
+#define UASSERTCMP(CMP, actual, expected)                                         \
+	do {                                                                          \
+		const auto &a = (actual);                                                 \
+		const auto &e = (expected);                                               \
+		if (!CMP(a, e)) {                                                         \
+			std::cout                                                             \
+					<< "Test assertion failed: " << #actual << " " << #CMP << " " \
+					<< #expected << std::endl                                     \
+					<< "    at " << __FILE__ << ":" << __LINE__ << std::endl      \
+					<< "    actual:   " << a << std::endl                         \
+					<< "    expected: "                                           \
+					<< e << std::endl;                                            \
+			throw TestFailedException();                                          \
+		}                                                                         \
+	} while (0)
+
+#define CMPEQ(a, e) (a == e)
+#define CMPTRUE(a, e) (a)
+#define CMPNE(a, e) (a != e)
+
+#define UASSERTEQ(actual, expected) UASSERTCMP(CMPEQ, actual, expected)
+#define UASSERTNE(actual, nexpected) UASSERTCMP(CMPNE, actual, nexpected)
+#define UASSERT(actual) UASSERTCMP(CMPTRUE, actual, true)
diff --git a/irr/examples/AutomatedTest/test_string.cpp b/irr/examples/AutomatedTest/test_string.cpp
new file mode 100644
index 000000000..4d1291f18
--- /dev/null
+++ b/irr/examples/AutomatedTest/test_string.cpp
@@ -0,0 +1,205 @@
+#include <irrString.h>
+#include <cstring>
+#include <clocale>
+#include <vector>
+#include "test_helper.h"
+
+using namespace irr;
+using namespace irr::core;
+
+#define CMPSTR(a, b) (!strcmp(a, b))
+#define UASSERTSTR(actual, expected) UASSERTCMP(CMPSTR, actual.c_str(), expected)
+
+static void test_basics()
+{
+	// ctor
+	stringc s;
+	UASSERTEQ(s.c_str()[0], '\0');
+	s = stringc(0.1234567);
+	UASSERTSTR(s, "0.123457");
+	s = stringc(0x1p+53);
+	UASSERTSTR(s, "9007199254740992.000000");
+	s = stringc(static_cast<int>(-102400));
+	UASSERTSTR(s, "-102400");
+	s = stringc(static_cast<unsigned int>(102400));
+	UASSERTSTR(s, "102400");
+	s = stringc(static_cast<long>(-1024000));
+	UASSERTSTR(s, "-1024000");
+	s = stringc(static_cast<unsigned long>(1024000));
+	UASSERTSTR(s, "1024000");
+	s = stringc("YESno", 3);
+	UASSERTSTR(s, "YES");
+	s = stringc(L"test", 4);
+	UASSERTSTR(s, "test");
+	s = stringc("Hello World!");
+	UASSERTSTR(s, "Hello World!");
+	// operator=
+	s = stringw(L"abcdef");
+	UASSERTSTR(s, "abcdef");
+	s = L"abcdef";
+	UASSERTSTR(s, "abcdef");
+	s = static_cast<const char *>(nullptr);
+	UASSERTSTR(s, "");
+	// operator+
+	s = s + stringc("foo");
+	UASSERTSTR(s, "foo");
+	s = s + L"bar";
+	UASSERTSTR(s, "foobar");
+	// the rest
+	s = "f";
+	UASSERTEQ(s[0], 'f');
+	const auto &sref = s;
+	UASSERTEQ(sref[0], 'f');
+	UASSERT(sref == "f");
+	UASSERT(sref == stringc("f"));
+	s = "a";
+	UASSERT(sref < stringc("aa"));
+	UASSERT(sref < stringc("b"));
+	UASSERT(stringc("Z") < sref);
+	UASSERT(!(sref < stringc("a")));
+	UASSERT(sref.lower_ignore_case("AA"));
+	UASSERT(sref.lower_ignore_case("B"));
+	UASSERT(!sref.lower_ignore_case("A"));
+	s = "dog";
+	UASSERT(sref != "cat");
+	UASSERT(sref != stringc("cat"));
+}
+
+static void test_methods()
+{
+	stringc s;
+	const auto &sref = s;
+	s = "irrlicht";
+	UASSERTEQ(sref.size(), 8);
+	UASSERT(!sref.empty());
+	s.clear();
+	UASSERTEQ(sref.size(), 0);
+	UASSERT(sref.empty());
+	UASSERT(sref[0] == 0);
+	s = "\tAz#`";
+	s.make_lower();
+	UASSERTSTR(s, "\taz#`");
+	s.make_upper();
+	UASSERTSTR(s, "\tAZ#`");
+	UASSERT(sref.equals_ignore_case("\taz#`"));
+	UASSERT(sref.equals_substring_ignore_case("Z#`", 2));
+	s = "irrlicht";
+	UASSERT(sref.equalsn(stringc("irr"), 3));
+	UASSERT(sref.equalsn("irr", 3));
+	s = "fo";
+	s.append('o');
+	UASSERTSTR(s, "foo");
+	s.append("bar", 1);
+	UASSERTSTR(s, "foob");
+	s.append("ar", 999999);
+	UASSERTSTR(s, "foobar");
+	s = "nyan";
+	s.append(stringc("cat"));
+	UASSERTSTR(s, "nyancat");
+	s.append(stringc("sam"), 1);
+	UASSERTSTR(s, "nyancats");
+	s = "fbar";
+	s.insert(1, "ooXX", 2);
+	UASSERTSTR(s, "foobar");
+	UASSERTEQ(sref.findFirst('o'), 1);
+	UASSERTEQ(sref.findFirst('X'), -1);
+	UASSERTEQ(sref.findFirstChar("abff", 2), 3);
+	UASSERTEQ(sref.findFirstCharNotInList("fobb", 2), 3);
+	UASSERTEQ(sref.findLast('o'), 2);
+	UASSERTEQ(sref.findLast('X'), -1);
+	UASSERTEQ(sref.findLastChar("abrr", 2), 4);
+	UASSERTEQ(sref.findLastCharNotInList("rabb", 2), 3);
+	UASSERTEQ(sref.findNext('o', 2), 2);
+	UASSERTEQ(sref.findLast('o', 1), 1);
+	s = "ob-oob";
+	UASSERTEQ(sref.find("ob", 1), 4);
+	UASSERTEQ(sref.find("ob"), 0);
+	UASSERTEQ(sref.find("?"), -1);
+	s = "HOMEOWNER";
+	stringc s2 = sref.subString(2, 4);
+	UASSERTSTR(s2, "MEOW");
+	s2 = sref.subString(2, 4, true);
+	UASSERTSTR(s2, "meow");
+	s = "land";
+	s.replace('l', 's');
+	UASSERTSTR(s, "sand");
+	s = ">dog<";
+	s.replace("dog", "cat");
+	UASSERTSTR(s, ">cat<");
+	s.replace("cat", "horse");
+	UASSERTSTR(s, ">horse<");
+	s.replace("horse", "gnu");
+	UASSERTSTR(s, ">gnu<");
+	s = " h e l p ";
+	s.remove(' ');
+	UASSERTSTR(s, "help");
+	s.remove("el");
+	UASSERTSTR(s, "hp");
+	s = "irrlicht";
+	s.removeChars("it");
+	UASSERTSTR(s, "rrlch");
+	s = "\r\nfoo bar ";
+	s.trim();
+	UASSERTSTR(s, "foo bar");
+	s = "foxo";
+	s.erase(2);
+	UASSERTSTR(s, "foo");
+	s = "a";
+	s.append('\0');
+	s.append('b');
+	UASSERTEQ(s.size(), 3);
+	s.validate();
+	UASSERTEQ(s.size(), 1);
+	UASSERTEQ(s.lastChar(), 'a');
+	std::vector<stringc> res;
+	s = "a,,b,c";
+	s.split(res, ",aa", 1, true, false);
+	UASSERTEQ(res.size(), 3);
+	UASSERTSTR(res[0], "a");
+	UASSERTSTR(res[2], "c");
+	res.clear();
+	s.split(res, ",", 1, false, true);
+	UASSERTEQ(res.size(), 7);
+	UASSERTSTR(res[0], "a");
+	UASSERTSTR(res[2], "");
+	for (int i = 0; i < 3; i++)
+		UASSERTSTR(res[2 * i + 1], ",");
+}
+
+static void test_conv()
+{
+	// locale-independent
+
+	stringw out;
+	utf8ToWString(out, "†††");
+	UASSERTEQ(out.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out[i]), 0x2020);
+
+	stringc out2;
+	wStringToUTF8(out2, L"†††");
+	UASSERTEQ(out2.size(), 9);
+	for (int i = 0; i < 3; i++) {
+		UASSERTEQ(static_cast<u8>(out2[3 * i]), 0xe2);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 1]), 0x80);
+		UASSERTEQ(static_cast<u8>(out2[3 * i + 2]), 0xa0);
+	}
+
+	// locale-dependent
+	if (!setlocale(LC_CTYPE, "C.UTF-8"))
+		setlocale(LC_CTYPE, "UTF-8"); // macOS
+
+	stringw out3;
+	multibyteToWString(out3, "†††");
+	UASSERTEQ(out3.size(), 3);
+	for (int i = 0; i < 3; i++)
+		UASSERTEQ(static_cast<u16>(out3[i]), 0x2020);
+}
+
+void test_irr_string()
+{
+	test_basics();
+	test_methods();
+	test_conv();
+	std::cout << "    test_irr_string PASSED" << std::endl;
+}
diff --git a/irr/examples/CMakeLists.txt b/irr/examples/CMakeLists.txt
new file mode 100644
index 000000000..03553048e
--- /dev/null
+++ b/irr/examples/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(IRREXAMPLES
+	# removed
+)
+if(UNIX)
+	list(APPEND IRREXAMPLES AutomatedTest)
+endif()
+
+foreach(exname IN ITEMS ${IRREXAMPLES})
+	file(GLOB sources "${CMAKE_CURRENT_SOURCE_DIR}/${exname}/*.cpp")
+	add_executable(${exname} ${sources})
+
+	target_include_directories(${exname} PRIVATE
+		${CMAKE_SOURCE_DIR}/include
+		${CMAKE_CURRENT_SOURCE_DIR}/${exname}
+	)
+	target_link_libraries(${exname} IrrlichtMt)
+endforeach()
diff --git a/irr/include/CMeshBuffer.h b/irr/include/CMeshBuffer.h
new file mode 100644
index 000000000..8f8158ff1
--- /dev/null
+++ b/irr/include/CMeshBuffer.h
@@ -0,0 +1,274 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrArray.h"
+#include "IMeshBuffer.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Template implementation of the IMeshBuffer interface
+template <class T>
+class CMeshBuffer : public IMeshBuffer
+{
+public:
+	//! Default constructor for empty meshbuffer
+	CMeshBuffer() :
+			ChangedID_Vertex(1), ChangedID_Index(1), MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER), HWBuffer(NULL), PrimitiveType(EPT_TRIANGLES)
+	{
+#ifdef _DEBUG
+		setDebugName("CMeshBuffer");
+#endif
+	}
+
+	//! Get material of this meshbuffer
+	/** \return Material of this buffer */
+	const video::SMaterial &getMaterial() const override
+	{
+		return Material;
+	}
+
+	//! Get material of this meshbuffer
+	/** \return Material of this buffer */
+	video::SMaterial &getMaterial() override
+	{
+		return Material;
+	}
+
+	//! Get pointer to vertices
+	/** \return Pointer to vertices. */
+	const void *getVertices() const override
+	{
+		return Vertices.const_pointer();
+	}
+
+	//! Get pointer to vertices
+	/** \return Pointer to vertices. */
+	void *getVertices() override
+	{
+		return Vertices.pointer();
+	}
+
+	//! Get number of vertices
+	/** \return Number of vertices. */
+	u32 getVertexCount() const override
+	{
+		return Vertices.size();
+	}
+
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	video::E_INDEX_TYPE getIndexType() const override
+	{
+		return video::EIT_16BIT;
+	}
+
+	//! Get pointer to indices
+	/** \return Pointer to indices. */
+	const u16 *getIndices() const override
+	{
+		return Indices.const_pointer();
+	}
+
+	//! Get pointer to indices
+	/** \return Pointer to indices. */
+	u16 *getIndices() override
+	{
+		return Indices.pointer();
+	}
+
+	//! Get number of indices
+	/** \return Number of indices. */
+	u32 getIndexCount() const override
+	{
+		return Indices.size();
+	}
+
+	//! Get the axis aligned bounding box
+	/** \return Axis aligned bounding box of this buffer. */
+	const core::aabbox3d<f32> &getBoundingBox() const override
+	{
+		return BoundingBox;
+	}
+
+	//! Set the axis aligned bounding box
+	/** \param box New axis aligned bounding box for this buffer. */
+	//! set user axis aligned bounding box
+	void setBoundingBox(const core::aabbox3df &box) override
+	{
+		BoundingBox = box;
+	}
+
+	//! Recalculate the bounding box.
+	/** should be called if the mesh changed. */
+	void recalculateBoundingBox() override
+	{
+		if (!Vertices.empty()) {
+			BoundingBox.reset(Vertices[0].Pos);
+			const irr::u32 vsize = Vertices.size();
+			for (u32 i = 1; i < vsize; ++i)
+				BoundingBox.addInternalPoint(Vertices[i].Pos);
+		} else
+			BoundingBox.reset(0, 0, 0);
+	}
+
+	//! Get type of vertex data stored in this buffer.
+	/** \return Type of vertex data. */
+	video::E_VERTEX_TYPE getVertexType() const override
+	{
+		return T::getType();
+	}
+
+	//! returns position of vertex i
+	const core::vector3df &getPosition(u32 i) const override
+	{
+		return Vertices[i].Pos;
+	}
+
+	//! returns position of vertex i
+	core::vector3df &getPosition(u32 i) override
+	{
+		return Vertices[i].Pos;
+	}
+
+	//! returns normal of vertex i
+	const core::vector3df &getNormal(u32 i) const override
+	{
+		return Vertices[i].Normal;
+	}
+
+	//! returns normal of vertex i
+	core::vector3df &getNormal(u32 i) override
+	{
+		return Vertices[i].Normal;
+	}
+
+	//! returns texture coord of vertex i
+	const core::vector2df &getTCoords(u32 i) const override
+	{
+		return Vertices[i].TCoords;
+	}
+
+	//! returns texture coord of vertex i
+	core::vector2df &getTCoords(u32 i) override
+	{
+		return Vertices[i].TCoords;
+	}
+
+	//! Append the vertices and indices to the current buffer
+	/** Only works for compatible types, i.e. either the same type
+	or the main buffer is of standard type. Otherwise, behavior is
+	undefined.
+	*/
+	void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) override
+	{
+		if (vertices == getVertices())
+			return;
+
+		const u32 vertexCount = getVertexCount();
+		u32 i;
+
+		Vertices.reallocate(vertexCount + numVertices);
+		for (i = 0; i < numVertices; ++i) {
+			Vertices.push_back(static_cast<const T *>(vertices)[i]);
+			BoundingBox.addInternalPoint(static_cast<const T *>(vertices)[i].Pos);
+		}
+
+		Indices.reallocate(getIndexCount() + numIndices);
+		for (i = 0; i < numIndices; ++i) {
+			Indices.push_back(indices[i] + vertexCount);
+		}
+	}
+
+	//! get the current hardware mapping hint
+	E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
+	{
+		return MappingHint_Vertex;
+	}
+
+	//! get the current hardware mapping hint
+	E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override
+	{
+		return MappingHint_Index;
+	}
+
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_VERTEX)
+			MappingHint_Vertex = NewMappingHint;
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_INDEX)
+			MappingHint_Index = NewMappingHint;
+	}
+
+	//! Describe what kind of primitive geometry is used by the meshbuffer
+	void setPrimitiveType(E_PRIMITIVE_TYPE type) override
+	{
+		PrimitiveType = type;
+	}
+
+	//! Get the kind of primitive geometry which is used by the meshbuffer
+	E_PRIMITIVE_TYPE getPrimitiveType() const override
+	{
+		return PrimitiveType;
+	}
+
+	//! flags the mesh as changed, reloads hardware buffers
+	void setDirty(E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_VERTEX)
+			++ChangedID_Vertex;
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_INDEX)
+			++ChangedID_Index;
+	}
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	u32 getChangedID_Vertex() const override { return ChangedID_Vertex; }
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	u32 getChangedID_Index() const override { return ChangedID_Index; }
+
+	void setHWBuffer(void *ptr) const override
+	{
+		HWBuffer = ptr;
+	}
+
+	void *getHWBuffer() const override
+	{
+		return HWBuffer;
+	}
+
+	u32 ChangedID_Vertex;
+	u32 ChangedID_Index;
+
+	//! hardware mapping hint
+	E_HARDWARE_MAPPING MappingHint_Vertex;
+	E_HARDWARE_MAPPING MappingHint_Index;
+	mutable void *HWBuffer;
+
+	//! Material for this meshbuffer.
+	video::SMaterial Material;
+	//! Vertices of this buffer
+	core::array<T> Vertices;
+	//! Indices into the vertices of this buffer.
+	core::array<u16> Indices;
+	//! Bounding box of this meshbuffer.
+	core::aabbox3d<f32> BoundingBox;
+	//! Primitive type used for rendering (triangles, lines, ...)
+	E_PRIMITIVE_TYPE PrimitiveType;
+};
+
+//! Standard meshbuffer
+typedef CMeshBuffer<video::S3DVertex> SMeshBuffer;
+//! Meshbuffer with two texture coords per vertex, e.g. for lightmaps
+typedef CMeshBuffer<video::S3DVertex2TCoords> SMeshBufferLightMap;
+//! Meshbuffer with vertices having tangents stored, e.g. for normal mapping
+typedef CMeshBuffer<video::S3DVertexTangents> SMeshBufferTangents;
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EAttributes.h b/irr/include/EAttributes.h
new file mode 100644
index 000000000..54954ca41
--- /dev/null
+++ b/irr/include/EAttributes.h
@@ -0,0 +1,32 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace io
+{
+
+//! Types of attributes available for IAttributes
+enum E_ATTRIBUTE_TYPE
+{
+	// integer attribute
+	EAT_INT = 0,
+
+	// float attribute
+	EAT_FLOAT,
+
+	// boolean attribute
+	EAT_BOOL,
+
+	// known attribute type count
+	EAT_COUNT,
+
+	// unknown attribute
+	EAT_UNKNOWN
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/ECullingTypes.h b/irr/include/ECullingTypes.h
new file mode 100644
index 000000000..95979bef4
--- /dev/null
+++ b/irr/include/ECullingTypes.h
@@ -0,0 +1,35 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! An enumeration for all types of automatic culling for built-in scene nodes
+enum E_CULLING_TYPE
+{
+	EAC_OFF = 0,
+	EAC_BOX = 1,
+	EAC_FRUSTUM_BOX = 2,
+	EAC_FRUSTUM_SPHERE = 4,
+	EAC_OCC_QUERY = 8
+};
+
+//! Names for culling type
+const c8 *const AutomaticCullingNames[] = {
+		"false",
+		"box",            // camera box against node box
+		"frustum_box",    // camera frustum against node box
+		"frustum_sphere", // camera frustum against node sphere
+		"occ_query",      // occlusion query
+		0,
+	};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EDebugSceneTypes.h b/irr/include/EDebugSceneTypes.h
new file mode 100644
index 000000000..29ca8ad0e
--- /dev/null
+++ b/irr/include/EDebugSceneTypes.h
@@ -0,0 +1,41 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace scene
+{
+
+//! An enumeration for all types of debug data for built-in scene nodes (flags)
+enum E_DEBUG_SCENE_TYPE
+{
+	//! No Debug Data ( Default )
+	EDS_OFF = 0,
+
+	//! Show Bounding Boxes of SceneNode
+	EDS_BBOX = 1,
+
+	//! Show Vertex Normals
+	EDS_NORMALS = 2,
+
+	//! Shows Skeleton/Tags
+	EDS_SKELETON = 4,
+
+	//! Overlays Mesh Wireframe
+	EDS_MESH_WIRE_OVERLAY = 8,
+
+	//! Show Bounding Boxes of all MeshBuffers
+	EDS_BBOX_BUFFERS = 32,
+
+	//! EDS_BBOX | EDS_BBOX_BUFFERS
+	EDS_BBOX_ALL = EDS_BBOX | EDS_BBOX_BUFFERS,
+
+	//! Show all debug infos
+	EDS_FULL = 0xffffffff
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EDeviceTypes.h b/irr/include/EDeviceTypes.h
new file mode 100644
index 000000000..1eff4f615
--- /dev/null
+++ b/irr/include/EDeviceTypes.h
@@ -0,0 +1,46 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+
+//! An enum for the different device types supported by the Irrlicht Engine.
+enum E_DEVICE_TYPE
+{
+
+	//! A device native to Microsoft Windows
+	/** This device uses the Win32 API and works in all versions of Windows. */
+	EIDT_WIN32,
+
+	//! A device native to Unix style operating systems.
+	/** This device uses the X11 windowing system and works in Linux, Solaris, FreeBSD, OSX and
+	other operating systems which support X11. */
+	EIDT_X11,
+
+	//! A device native to Mac OSX
+	/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
+	EIDT_OSX,
+
+	//! A device which uses Simple DirectMedia Layer
+	/** The SDL device works under all platforms supported by SDL but first must be compiled
+	in by setting the USE_SDL2 CMake option to ON */
+	EIDT_SDL,
+
+	//! This selection allows Irrlicht to choose the best device from the ones available.
+	/** If this selection is chosen then Irrlicht will try to use the IrrlichtDevice native
+	to your operating system. If this is unavailable then the X11, SDL and then console device
+	will be tried. This ensures that Irrlicht will run even if your platform is unsupported,
+	although it may not be able to render anything. */
+	EIDT_BEST,
+
+	//! A device for Android platforms
+	/** Best used with embedded devices and mobile systems.
+	Does not need X11 or other graphical subsystems.
+	May support hw-acceleration via OpenGL-ES */
+	EIDT_ANDROID,
+};
+
+} // end namespace irr
diff --git a/irr/include/EDriverFeatures.h b/irr/include/EDriverFeatures.h
new file mode 100644
index 000000000..bde2c7698
--- /dev/null
+++ b/irr/include/EDriverFeatures.h
@@ -0,0 +1,137 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+//! enumeration for querying features of the video driver.
+enum E_VIDEO_DRIVER_FEATURE
+{
+	//! Is driver able to render to a surface?
+	EVDF_RENDER_TO_TARGET = 0,
+
+	//! Is hardware transform and lighting supported?
+	EVDF_HARDWARE_TL,
+
+	//! Are multiple textures per material possible?
+	EVDF_MULTITEXTURE,
+
+	//! Is driver able to render with a bilinear filter applied?
+	EVDF_BILINEAR_FILTER,
+
+	//! Can the driver handle mip maps?
+	EVDF_MIP_MAP,
+
+	//! Can the driver update mip maps automatically?
+	EVDF_MIP_MAP_AUTO_UPDATE,
+
+	//! Are stencilbuffers switched on and does the device support stencil buffers?
+	EVDF_STENCIL_BUFFER,
+
+	//! Is Vertex Shader 1.1 supported?
+	EVDF_VERTEX_SHADER_1_1,
+
+	//! Is Vertex Shader 2.0 supported?
+	EVDF_VERTEX_SHADER_2_0,
+
+	//! Is Vertex Shader 3.0 supported?
+	EVDF_VERTEX_SHADER_3_0,
+
+	//! Is Pixel Shader 1.1 supported?
+	EVDF_PIXEL_SHADER_1_1,
+
+	//! Is Pixel Shader 1.2 supported?
+	EVDF_PIXEL_SHADER_1_2,
+
+	//! Is Pixel Shader 1.3 supported?
+	EVDF_PIXEL_SHADER_1_3,
+
+	//! Is Pixel Shader 1.4 supported?
+	EVDF_PIXEL_SHADER_1_4,
+
+	//! Is Pixel Shader 2.0 supported?
+	EVDF_PIXEL_SHADER_2_0,
+
+	//! Is Pixel Shader 3.0 supported?
+	EVDF_PIXEL_SHADER_3_0,
+
+	//! Are ARB vertex programs v1.0 supported?
+	EVDF_ARB_VERTEX_PROGRAM_1,
+
+	//! Are ARB fragment programs v1.0 supported?
+	EVDF_ARB_FRAGMENT_PROGRAM_1,
+
+	//! Is GLSL supported?
+	EVDF_ARB_GLSL,
+
+	//! Is HLSL supported?
+	EVDF_HLSL,
+
+	//! Are non-square textures supported?
+	EVDF_TEXTURE_NSQUARE,
+
+	//! Are non-power-of-two textures supported?
+	EVDF_TEXTURE_NPOT,
+
+	//! Are framebuffer objects supported?
+	EVDF_FRAMEBUFFER_OBJECT,
+
+	//! Are vertex buffer objects supported?
+	EVDF_VERTEX_BUFFER_OBJECT,
+
+	//! Supports Alpha To Coverage
+	EVDF_ALPHA_TO_COVERAGE,
+
+	//! Supports Color masks (disabling color planes in output)
+	EVDF_COLOR_MASK,
+
+	//! Supports multiple render targets at once
+	EVDF_MULTIPLE_RENDER_TARGETS,
+
+	//! Supports separate blend settings for multiple render targets
+	EVDF_MRT_BLEND,
+
+	//! Supports separate color masks for multiple render targets
+	EVDF_MRT_COLOR_MASK,
+
+	//! Supports separate blend functions for multiple render targets
+	EVDF_MRT_BLEND_FUNC,
+
+	//! Supports geometry shaders
+	EVDF_GEOMETRY_SHADER,
+
+	//! Supports occlusion queries
+	EVDF_OCCLUSION_QUERY,
+
+	//! Supports polygon offset/depth bias for avoiding z-fighting
+	EVDF_POLYGON_OFFSET,
+
+	//! Support for different blend functions. Without, only ADD is available
+	EVDF_BLEND_OPERATIONS,
+
+	//! Support for separate blending for RGB and Alpha.
+	EVDF_BLEND_SEPARATE,
+
+	//! Support for texture coord transformation via texture matrix
+	EVDF_TEXTURE_MATRIX,
+
+	//! Support for cube map textures.
+	EVDF_TEXTURE_CUBEMAP,
+
+	//! Support for filtering across different faces of the cubemap
+	EVDF_TEXTURE_CUBEMAP_SEAMLESS,
+
+	//! Support for clamping vertices beyond far-plane to depth instead of capping them.
+	EVDF_DEPTH_CLAMP,
+
+	//! Only used for counting the elements of this enum
+	EVDF_COUNT
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/EDriverTypes.h b/irr/include/EDriverTypes.h
new file mode 100644
index 000000000..33f987889
--- /dev/null
+++ b/irr/include/EDriverTypes.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! An enum for all types of drivers the Irrlicht Engine supports.
+enum E_DRIVER_TYPE
+{
+	//! Null driver, useful for applications to run the engine without visualization.
+	/** The null device is able to load textures, but does not
+	render and display any graphics. */
+	EDT_NULL,
+
+	//! OpenGL device, available on most platforms.
+	/** Performs hardware accelerated rendering of 3D and 2D
+	primitives. */
+	EDT_OPENGL,
+
+	//! OpenGL-ES 1.x driver, for embedded and mobile systems
+	EDT_OGLES1,
+
+	//! OpenGL-ES 2.x driver, for embedded and mobile systems
+	/** Supports shaders etc. */
+	EDT_OGLES2,
+
+	//! WebGL1 friendly subset of OpenGL-ES 2.x driver for Emscripten
+	EDT_WEBGL1,
+
+	EDT_OPENGL3,
+
+	//! No driver, just for counting the elements
+	EDT_COUNT
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/EFocusFlags.h b/irr/include/EFocusFlags.h
new file mode 100644
index 000000000..2c229472d
--- /dev/null
+++ b/irr/include/EFocusFlags.h
@@ -0,0 +1,34 @@
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace gui
+{
+
+//! Bitflags for defining the the focus behavior of the gui
+// (all names start with SET as we might add REMOVE flags later to control that behavior as well)
+enum EFOCUS_FLAG
+{
+	//! When set the focus changes when the left mouse-button got clicked while over an element
+	EFF_SET_ON_LMOUSE_DOWN = 0x1,
+
+	//! When set the focus changes when the right mouse-button got clicked while over an element
+	//! Note that elements usually don't care about right-click and that won't change with this flag
+	//! This is mostly to allow taking away focus from elements with right-mouse additionally.
+	EFF_SET_ON_RMOUSE_DOWN = 0x2,
+
+	//! When set the focus changes when the mouse-cursor is over an element
+	EFF_SET_ON_MOUSE_OVER = 0x4,
+
+	//! When set the focus can be changed with TAB-key combinations.
+	EFF_SET_ON_TAB = 0x8,
+
+	//! When set it's possible to set the focus to disabled elements.
+	EFF_CAN_FOCUS_DISABLED = 0x16
+};
+
+} // namespace gui
+} // namespace irr
diff --git a/irr/include/EGUIAlignment.h b/irr/include/EGUIAlignment.h
new file mode 100644
index 000000000..80be1c189
--- /dev/null
+++ b/irr/include/EGUIAlignment.h
@@ -0,0 +1,35 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+enum EGUI_ALIGNMENT
+{
+	//! Aligned to parent's top or left side (default)
+	EGUIA_UPPERLEFT = 0,
+	//! Aligned to parent's bottom or right side
+	EGUIA_LOWERRIGHT,
+	//! Aligned to the center of parent
+	EGUIA_CENTER,
+	//! Stretched to fit parent
+	EGUIA_SCALE
+};
+
+//! Names for alignments
+const c8 *const GUIAlignmentNames[] = {
+		"upperLeft",
+		"lowerRight",
+		"center",
+		"scale",
+		0,
+	};
+
+} // namespace gui
+} // namespace irr
diff --git a/irr/include/EGUIElementTypes.h b/irr/include/EGUIElementTypes.h
new file mode 100644
index 000000000..557969e44
--- /dev/null
+++ b/irr/include/EGUIElementTypes.h
@@ -0,0 +1,133 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! List of all basic Irrlicht GUI elements.
+/** An IGUIElement returns this when calling IGUIElement::getType(); */
+enum EGUI_ELEMENT_TYPE
+{
+	//! A button (IGUIButton)
+	EGUIET_BUTTON = 0,
+
+	//! A check box (IGUICheckBox)
+	EGUIET_CHECK_BOX,
+
+	//! A combo box (IGUIComboBox)
+	EGUIET_COMBO_BOX,
+
+	//! A context menu (IGUIContextMenu)
+	EGUIET_CONTEXT_MENU,
+
+	//! A menu (IGUIMenu)
+	EGUIET_MENU,
+
+	//! An edit box (IGUIEditBox)
+	EGUIET_EDIT_BOX,
+
+	//! A file open dialog (IGUIFileOpenDialog)
+	EGUIET_FILE_OPEN_DIALOG,
+
+	//! A color select open dialog (IGUIColorSelectDialog)
+	EGUIET_COLOR_SELECT_DIALOG,
+
+	//! A in/out fader (IGUIInOutFader)
+	EGUIET_IN_OUT_FADER,
+
+	//! An image (IGUIImage)
+	EGUIET_IMAGE,
+
+	//! A list box (IGUIListBox)
+	EGUIET_LIST_BOX,
+
+	//! A mesh viewer (IGUIMeshViewer)
+	EGUIET_MESH_VIEWER,
+
+	//! A message box (IGUIWindow)
+	EGUIET_MESSAGE_BOX,
+
+	//! A modal screen
+	EGUIET_MODAL_SCREEN,
+
+	//! A scroll bar (IGUIScrollBar)
+	EGUIET_SCROLL_BAR,
+
+	//! A spin box (IGUISpinBox)
+	EGUIET_SPIN_BOX,
+
+	//! A static text (IGUIStaticText)
+	EGUIET_STATIC_TEXT,
+
+	//! A tab (IGUITab)
+	EGUIET_TAB,
+
+	//! A tab control
+	EGUIET_TAB_CONTROL,
+
+	//! A Table
+	EGUIET_TABLE,
+
+	//! A tool bar (IGUIToolBar)
+	EGUIET_TOOL_BAR,
+
+	//! A Tree View
+	EGUIET_TREE_VIEW,
+
+	//! A window
+	EGUIET_WINDOW,
+
+	//! Unknown type.
+	EGUIET_ELEMENT,
+
+	//! The root of the GUI
+	EGUIET_ROOT,
+
+	//! Not an element, amount of elements in there
+	EGUIET_COUNT,
+
+	//! This enum is never used, it only forces the compiler to compile this enumeration to 32 bit.
+	EGUIET_FORCE_32_BIT = 0x7fffffff
+
+};
+
+//! Names for built-in element types
+const c8 *const GUIElementTypeNames[] = {
+		"button",
+		"checkBox",
+		"comboBox",
+		"contextMenu",
+		"menu",
+		"editBox",
+		"fileOpenDialog",
+		"colorSelectDialog",
+		"inOutFader",
+		"image",
+		"listBox",
+		"meshViewer",
+		"messageBox",
+		"modalScreen",
+		"scrollBar",
+		"spinBox",
+		"staticText",
+		"tab",
+		"tabControl",
+		"table",
+		"toolBar",
+		"treeview",
+		"window",
+		"element",
+		"root",
+		"profiler",
+		0,
+	};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/EHardwareBufferFlags.h b/irr/include/EHardwareBufferFlags.h
new file mode 100644
index 000000000..ae1b602e3
--- /dev/null
+++ b/irr/include/EHardwareBufferFlags.h
@@ -0,0 +1,40 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace scene
+{
+
+enum E_HARDWARE_MAPPING
+{
+	//! Don't store on the hardware
+	EHM_NEVER = 0,
+
+	//! Rarely changed, usually stored completely on the hardware
+	EHM_STATIC,
+
+	//! Sometimes changed, driver optimized placement
+	EHM_DYNAMIC,
+
+	//! Always changed, cache optimizing on the GPU
+	EHM_STREAM
+};
+
+enum E_BUFFER_TYPE
+{
+	//! Does not change anything
+	EBT_NONE = 0,
+	//! Change the vertex mapping
+	EBT_VERTEX,
+	//! Change the index mapping
+	EBT_INDEX,
+	//! Change both vertex and index mapping to the same value
+	EBT_VERTEX_AND_INDEX
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EMaterialProps.h b/irr/include/EMaterialProps.h
new file mode 100644
index 000000000..6f37c95b8
--- /dev/null
+++ b/irr/include/EMaterialProps.h
@@ -0,0 +1,82 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+//! Material properties
+enum E_MATERIAL_PROP
+{
+	//! Corresponds to SMaterial::Wireframe.
+	EMP_WIREFRAME = 0x1,
+
+	//! Corresponds to SMaterial::PointCloud.
+	EMP_POINTCLOUD = 0x2,
+
+	//! Corresponds to SMaterial::GouraudShading.
+	EMP_GOURAUD_SHADING = 0x4,
+
+	//! Corresponds to SMaterial::Lighting.
+	EMP_LIGHTING = 0x8,
+
+	//! Corresponds to SMaterial::ZBuffer.
+	EMP_ZBUFFER = 0x10,
+
+	//! Corresponds to SMaterial::ZWriteEnable.
+	EMP_ZWRITE_ENABLE = 0x20,
+
+	//! Corresponds to SMaterial::BackfaceCulling.
+	EMP_BACK_FACE_CULLING = 0x40,
+
+	//! Corresponds to SMaterial::FrontfaceCulling.
+	EMP_FRONT_FACE_CULLING = 0x80,
+
+	//! Corresponds to SMaterialLayer::MinFilter.
+	EMP_MIN_FILTER = 0x100,
+
+	//! Corresponds to SMaterialLayer::MagFilter.
+	EMP_MAG_FILTER = 0x200,
+
+	//! Corresponds to SMaterialLayer::AnisotropicFilter.
+	EMP_ANISOTROPIC_FILTER = 0x400,
+
+	//! Corresponds to SMaterial::FogEnable.
+	EMP_FOG_ENABLE = 0x800,
+
+	//! Corresponds to SMaterial::NormalizeNormals.
+	EMP_NORMALIZE_NORMALS = 0x1000,
+
+	//! Corresponds to SMaterialLayer::TextureWrapU, TextureWrapV and
+	//! TextureWrapW.
+	EMP_TEXTURE_WRAP = 0x2000,
+
+	//! Corresponds to SMaterial::AntiAliasing.
+	EMP_ANTI_ALIASING = 0x4000,
+
+	//! Corresponds to SMaterial::ColorMask.
+	EMP_COLOR_MASK = 0x8000,
+
+	//! Corresponds to SMaterial::ColorMaterial.
+	EMP_COLOR_MATERIAL = 0x10000,
+
+	//! Corresponds to SMaterial::UseMipMaps.
+	EMP_USE_MIP_MAPS = 0x20000,
+
+	//! Corresponds to SMaterial::BlendOperation.
+	EMP_BLEND_OPERATION = 0x40000,
+
+	//! Corresponds to SMaterial::PolygonOffsetFactor, PolygonOffsetDirection,
+	//! PolygonOffsetDepthBias and PolygonOffsetSlopeScale.
+	EMP_POLYGON_OFFSET = 0x80000,
+
+	//! Corresponds to SMaterial::BlendFactor.
+	EMP_BLEND_FACTOR = 0x100000,
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/EMaterialTypes.h b/irr/include/EMaterialTypes.h
new file mode 100644
index 000000000..cac8233fe
--- /dev/null
+++ b/irr/include/EMaterialTypes.h
@@ -0,0 +1,74 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Abstracted and easy to use fixed function/programmable pipeline material modes.
+enum E_MATERIAL_TYPE
+{
+	//! Standard solid material.
+	/** Only first texture is used, which is supposed to be the
+	diffuse material. */
+	EMT_SOLID = 0,
+
+	//! Makes the material transparent based on the texture alpha channel.
+	/** The final color is blended together from the destination
+	color and the texture color, using the alpha channel value as
+	blend factor. Only first texture is used. If you are using
+	this material with small textures, it is a good idea to load
+	the texture in 32 bit mode
+	(video::IVideoDriver::setTextureCreationFlag()). Also, an alpha
+	ref is used, which can be manipulated using
+	SMaterial::MaterialTypeParam. This value controls how sharp the
+	edges become when going from a transparent to a solid spot on
+	the texture. */
+	EMT_TRANSPARENT_ALPHA_CHANNEL,
+
+	//! Makes the material transparent based on the texture alpha channel.
+	/** If the alpha channel value is greater than 127, a
+	pixel is written to the target, otherwise not. This
+	material does not use alpha blending and is a lot faster
+	than EMT_TRANSPARENT_ALPHA_CHANNEL. It is ideal for drawing
+	stuff like leaves of plants, because the borders are not
+	blurry but sharp. Only first texture is used. If you are
+	using this material with small textures and 3d object, it
+	is a good idea to load the texture in 32 bit mode
+	(video::IVideoDriver::setTextureCreationFlag()). */
+	EMT_TRANSPARENT_ALPHA_CHANNEL_REF,
+
+	//! Makes the material transparent based on the vertex alpha value.
+	EMT_TRANSPARENT_VERTEX_ALPHA,
+
+	//! BlendFunc = source * sourceFactor + dest * destFactor ( E_BLEND_FUNC )
+	/** Using only first texture. Generic blending method.
+	The blend function is set to SMaterial::MaterialTypeParam with
+	pack_textureBlendFunc (for 2D) or pack_textureBlendFuncSeparate (for 3D). */
+	EMT_ONETEXTURE_BLEND,
+
+	//! This value is not used. It only forces this enumeration to compile to 32 bit.
+	EMT_FORCE_32BIT = 0x7fffffff
+};
+
+//! Array holding the built in material type names
+const char *const sBuiltInMaterialTypeNames[] = {
+		"solid",
+		"trans_alphach",
+		"trans_alphach_ref",
+		"trans_vertex_alpha",
+		"onetexture_blend",
+		0,
+	};
+
+constexpr u32 numBuiltInMaterials =
+		sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/EPrimitiveTypes.h b/irr/include/EPrimitiveTypes.h
new file mode 100644
index 000000000..d4e5f73f4
--- /dev/null
+++ b/irr/include/EPrimitiveTypes.h
@@ -0,0 +1,43 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace scene
+{
+
+//! Enumeration for all primitive types there are.
+enum E_PRIMITIVE_TYPE
+{
+	//! All vertices are non-connected points.
+	EPT_POINTS = 0,
+
+	//! All vertices form a single connected line.
+	EPT_LINE_STRIP,
+
+	//! Just as LINE_STRIP, but the last and the first vertex is also connected.
+	EPT_LINE_LOOP,
+
+	//! Every two vertices are connected creating n/2 lines.
+	EPT_LINES,
+
+	//! After the first two vertices each vertex defines a new triangle.
+	//! Always the two last and the new one form a new triangle.
+	EPT_TRIANGLE_STRIP,
+
+	//! After the first two vertices each vertex defines a new triangle.
+	//! All around the common first vertex.
+	EPT_TRIANGLE_FAN,
+
+	//! Explicitly set all vertices for each triangle.
+	EPT_TRIANGLES,
+
+	//! The single vertices are expanded to quad billboards on the GPU.
+	EPT_POINT_SPRITES
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EReadFileType.h b/irr/include/EReadFileType.h
new file mode 100644
index 000000000..2241b70bf
--- /dev/null
+++ b/irr/include/EReadFileType.h
@@ -0,0 +1,30 @@
+// Copyright (C) Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! An enumeration for different class types implementing IReadFile
+enum EREAD_FILE_TYPE
+{
+	//! CReadFile
+	ERFT_READ_FILE = MAKE_IRR_ID('r', 'e', 'a', 'd'),
+
+	//! CMemoryReadFile
+	ERFT_MEMORY_READ_FILE = MAKE_IRR_ID('r', 'm', 'e', 'm'),
+
+	//! CLimitReadFile
+	ERFT_LIMIT_READ_FILE = MAKE_IRR_ID('r', 'l', 'i', 'm'),
+
+	//! Unknown type
+	EFIT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n')
+};
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/ESceneNodeTypes.h b/irr/include/ESceneNodeTypes.h
new file mode 100644
index 000000000..b8251d965
--- /dev/null
+++ b/irr/include/ESceneNodeTypes.h
@@ -0,0 +1,49 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! An enumeration for all types of built-in scene nodes
+/** A scene node type is represented by a four character code
+such as 'cube' or 'mesh' instead of simple numbers, to avoid
+name clashes with external scene nodes.*/
+enum ESCENE_NODE_TYPE
+{
+	//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
+	ESNT_SCENE_MANAGER = MAKE_IRR_ID('s', 'm', 'n', 'g'),
+
+	//! Mesh Scene Node
+	ESNT_MESH = MAKE_IRR_ID('m', 'e', 's', 'h'),
+
+	//! Empty Scene Node
+	ESNT_EMPTY = MAKE_IRR_ID('e', 'm', 't', 'y'),
+
+	//! Dummy Transformation Scene Node
+	ESNT_DUMMY_TRANSFORMATION = MAKE_IRR_ID('d', 'm', 'm', 'y'),
+
+	//! Camera Scene Node
+	ESNT_CAMERA = MAKE_IRR_ID('c', 'a', 'm', '_'),
+
+	//! Billboard Scene Node
+	ESNT_BILLBOARD = MAKE_IRR_ID('b', 'i', 'l', 'l'),
+
+	//! Animated Mesh Scene Node
+	ESNT_ANIMATED_MESH = MAKE_IRR_ID('a', 'm', 's', 'h'),
+
+	//! Unknown scene node
+	ESNT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n'),
+
+	//! Will match with any scene node when checking types
+	ESNT_ANY = MAKE_IRR_ID('a', 'n', 'y', '_')
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/EShaderTypes.h b/irr/include/EShaderTypes.h
new file mode 100644
index 000000000..8d0b3a5e1
--- /dev/null
+++ b/irr/include/EShaderTypes.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
+enum E_VERTEX_SHADER_TYPE
+{
+	EVST_VS_1_1 = 0,
+	EVST_VS_2_0,
+	EVST_VS_2_a,
+	EVST_VS_3_0,
+	EVST_VS_4_0,
+	EVST_VS_4_1,
+	EVST_VS_5_0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EVST_COUNT
+};
+
+//! Names for all vertex shader types, each entry corresponds to a E_VERTEX_SHADER_TYPE entry.
+const c8 *const VERTEX_SHADER_TYPE_NAMES[] = {
+		"vs_1_1",
+		"vs_2_0",
+		"vs_2_a",
+		"vs_3_0",
+		"vs_4_0",
+		"vs_4_1",
+		"vs_5_0",
+		0};
+
+//! Compile target enumeration for the addHighLevelShaderMaterial() method.
+enum E_PIXEL_SHADER_TYPE
+{
+	EPST_PS_1_1 = 0,
+	EPST_PS_1_2,
+	EPST_PS_1_3,
+	EPST_PS_1_4,
+	EPST_PS_2_0,
+	EPST_PS_2_a,
+	EPST_PS_2_b,
+	EPST_PS_3_0,
+	EPST_PS_4_0,
+	EPST_PS_4_1,
+	EPST_PS_5_0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EPST_COUNT
+};
+
+//! Names for all pixel shader types, each entry corresponds to a E_PIXEL_SHADER_TYPE entry.
+const c8 *const PIXEL_SHADER_TYPE_NAMES[] = {
+		"ps_1_1",
+		"ps_1_2",
+		"ps_1_3",
+		"ps_1_4",
+		"ps_2_0",
+		"ps_2_a",
+		"ps_2_b",
+		"ps_3_0",
+		"ps_4_0",
+		"ps_4_1",
+		"ps_5_0",
+		0};
+
+//! Enum for supported geometry shader types
+enum E_GEOMETRY_SHADER_TYPE
+{
+	EGST_GS_4_0 = 0,
+
+	//! This is not a type, but a value indicating how much types there are.
+	EGST_COUNT
+};
+
+//! String names for supported geometry shader types
+const c8 *const GEOMETRY_SHADER_TYPE_NAMES[] = {
+		"gs_4_0",
+		0};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/EVertexAttributes.h b/irr/include/EVertexAttributes.h
new file mode 100644
index 000000000..75d039fec
--- /dev/null
+++ b/irr/include/EVertexAttributes.h
@@ -0,0 +1,34 @@
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+//! Enumeration for all vertex attributes there are.
+enum E_VERTEX_ATTRIBUTES
+{
+	EVA_POSITION = 0,
+	EVA_NORMAL,
+	EVA_COLOR,
+	EVA_TCOORD0,
+	EVA_TCOORD1,
+	EVA_TANGENT,
+	EVA_BINORMAL,
+	EVA_COUNT
+};
+
+//! Array holding the built in vertex attribute names
+const char *const sBuiltInVertexAttributeNames[] = {
+		"inVertexPosition",
+		"inVertexNormal",
+		"inVertexColor",
+		"inTexCoord0",
+		"inTexCoord1",
+		"inVertexTangent",
+		"inVertexBinormal",
+		0,
+	};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IAnimatedMesh.h b/irr/include/IAnimatedMesh.h
new file mode 100644
index 000000000..80b3bc3ca
--- /dev/null
+++ b/irr/include/IAnimatedMesh.h
@@ -0,0 +1,69 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "aabbox3d.h"
+#include "IMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Interface for an animated mesh.
+/** There are already simple implementations of this interface available so
+you don't have to implement this interface on your own if you need to:
+You might want to use irr::scene::SAnimatedMesh, irr::scene::SMesh,
+irr::scene::SMeshBuffer etc. */
+class IAnimatedMesh : public IMesh
+{
+public:
+	//! Gets the frame count of the animated mesh.
+	/** Note that the play-time is usually getFrameCount()-1 as it stops as soon as the last frame-key is reached.
+	\return The amount of frames. If the amount is 1,
+	it is a static, non animated mesh. 	*/
+	virtual u32 getFrameCount() const = 0;
+
+	//! Gets the animation speed of the animated mesh.
+	/** \return The number of frames per second to play the
+	animation with by default. If the amount is 0,
+	it is a static, non animated mesh. */
+	virtual f32 getAnimationSpeed() const = 0;
+
+	//! Sets the animation speed of the animated mesh.
+	/** \param fps Number of frames per second to play the
+	animation with by default. If the amount is 0,
+	it is not animated. The actual speed is set in the
+	scene node the mesh is instantiated in.*/
+	virtual void setAnimationSpeed(f32 fps) = 0;
+
+	//! Returns the IMesh interface for a frame.
+	/** \param frame: Frame number as zero based index. The maximum
+	frame number is getFrameCount() - 1;
+	\param detailLevel: Level of detail. 0 is the lowest, 255 the
+	highest level of detail. Most meshes will ignore the detail level.
+	\param startFrameLoop: Because some animated meshes (.MD2) are
+	blended between 2 static frames, and maybe animated in a loop,
+	the startFrameLoop and the endFrameLoop have to be defined, to
+	prevent the animation to be blended between frames which are
+	outside of this loop.
+	If startFrameLoop and endFrameLoop are both -1, they are ignored.
+	\param endFrameLoop: see startFrameLoop.
+	\return Returns the animated mesh based on a detail level. */
+	virtual IMesh *getMesh(s32 frame, s32 detailLevel = 255, s32 startFrameLoop = -1, s32 endFrameLoop = -1) = 0;
+
+	//! Returns the type of the animated mesh.
+	/** In most cases it is not necessary to use this method.
+	This is useful for making a safe downcast. For example,
+	if getMeshType() returns EAMT_MD2 it's safe to cast the
+	IAnimatedMesh to IAnimatedMeshMD2.
+	\returns Type of the mesh. */
+	E_ANIMATED_MESH_TYPE getMeshType() const override
+	{
+		return EAMT_UNKNOWN;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IAnimatedMeshSceneNode.h b/irr/include/IAnimatedMeshSceneNode.h
new file mode 100644
index 000000000..65fdaaadf
--- /dev/null
+++ b/irr/include/IAnimatedMeshSceneNode.h
@@ -0,0 +1,169 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+#include "IBoneSceneNode.h"
+#include "IAnimatedMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+enum E_JOINT_UPDATE_ON_RENDER
+{
+	//! do nothing
+	EJUOR_NONE = 0,
+
+	//! get joints positions from the mesh (for attached nodes, etc)
+	EJUOR_READ,
+
+	//! control joint positions in the mesh (eg. ragdolls, or set the animation from animateJoints() )
+	EJUOR_CONTROL
+};
+
+class IAnimatedMeshSceneNode;
+
+//! Callback interface for catching events of ended animations.
+/** Implement this interface and use
+IAnimatedMeshSceneNode::setAnimationEndCallback to be able to
+be notified if an animation playback has ended.
+**/
+class IAnimationEndCallBack : public virtual IReferenceCounted
+{
+public:
+	//! Will be called when the animation playback has ended.
+	/** See IAnimatedMeshSceneNode::setAnimationEndCallback for
+	more information.
+	\param node: Node of which the animation has ended. */
+	virtual void OnAnimationEnd(IAnimatedMeshSceneNode *node) = 0;
+};
+
+//! Scene node capable of displaying an animated mesh.
+class IAnimatedMeshSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IAnimatedMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
+
+	//! Destructor
+	virtual ~IAnimatedMeshSceneNode() {}
+
+	//! Sets the current frame number.
+	/** From now on the animation is played from this frame.
+	\param frame: Number of the frame to let the animation be started from.
+	The frame number must be a valid frame number of the IMesh used by this
+	scene node. Set IAnimatedMesh::getMesh() for details. */
+	virtual void setCurrentFrame(f32 frame) = 0;
+
+	//! Sets the frame numbers between the animation is looped.
+	/** The default is 0 to getFrameCount()-1 of the mesh.
+	Number of played frames is end-start.
+	It interpolates toward the last frame but stops when it is reached.
+	It does not interpolate back to start even when looping.
+	Looping animations should ensure last and first frame-key are identical.
+	\param begin: Start frame number of the loop.
+	\param end: End frame number of the loop.
+	\return True if successful, false if not. */
+	virtual bool setFrameLoop(s32 begin, s32 end) = 0;
+
+	//! Sets the speed with which the animation is played.
+	/** \param framesPerSecond: Frames per second played. */
+	virtual void setAnimationSpeed(f32 framesPerSecond) = 0;
+
+	//! Gets the speed with which the animation is played.
+	/** \return Frames per second played. */
+	virtual f32 getAnimationSpeed() const = 0;
+
+	//! Get a pointer to a joint in the mesh (if the mesh is a bone based mesh).
+	/** With this method it is possible to attach scene nodes to
+	joints for example possible to attach a weapon to the left hand
+	of an animated model. This example shows how:
+	\code
+	ISceneNode* hand =
+		yourAnimatedMeshSceneNode->getJointNode("LeftHand");
+	hand->addChild(weaponSceneNode);
+	\endcode
+	Please note that the joint returned by this method may not exist
+	before this call and the joints in the node were created by it.
+	\param jointName: Name of the joint.
+	\return Pointer to the scene node which represents the joint
+	with the specified name. Returns 0 if the contained mesh is not
+	an skinned mesh or the name of the joint could not be found. */
+	virtual IBoneSceneNode *getJointNode(const c8 *jointName) = 0;
+
+	//! same as getJointNode(const c8* jointName), but based on id
+	virtual IBoneSceneNode *getJointNode(u32 jointID) = 0;
+
+	//! Gets joint count.
+	/** \return Amount of joints in the mesh. */
+	virtual u32 getJointCount() const = 0;
+
+	//! Returns the currently displayed frame number.
+	virtual f32 getFrameNr() const = 0;
+	//! Returns the current start frame number.
+	virtual s32 getStartFrame() const = 0;
+	//! Returns the current end frame number.
+	virtual s32 getEndFrame() const = 0;
+
+	//! Sets looping mode which is on by default.
+	/** If set to false, animations will not be played looped. */
+	virtual void setLoopMode(bool playAnimationLooped) = 0;
+
+	//! returns the current loop mode
+	/** When true the animations are played looped */
+	virtual bool getLoopMode() const = 0;
+
+	//! Sets a callback interface which will be called if an animation playback has ended.
+	/** Set this to 0 to disable the callback again.
+	Please note that this will only be called when in non looped
+	mode, see IAnimatedMeshSceneNode::setLoopMode(). */
+	virtual void setAnimationEndCallback(IAnimationEndCallBack *callback = 0) = 0;
+
+	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+	/** In this way it is possible to change the materials a mesh
+	causing all mesh scene nodes referencing this mesh to change
+	too. */
+	virtual void setReadOnlyMaterials(bool readonly) = 0;
+
+	//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+	virtual bool isReadOnlyMaterials() const = 0;
+
+	//! Sets a new mesh
+	virtual void setMesh(IAnimatedMesh *mesh) = 0;
+
+	//! Returns the current mesh
+	virtual IAnimatedMesh *getMesh(void) = 0;
+
+	//! Set how the joints should be updated on render
+	virtual void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) = 0;
+
+	//! Sets the transition time in seconds
+	/** Note: This needs to enable joints, and setJointmode set to
+	EJUOR_CONTROL. You must call animateJoints(), or the mesh will
+	not animate. */
+	virtual void setTransitionTime(f32 Time) = 0;
+
+	//! animates the joints in the mesh based on the current frame.
+	/** Also takes in to account transitions. */
+	virtual void animateJoints(bool CalculateAbsolutePositions = true) = 0;
+
+	//! render mesh ignoring its transformation.
+	/** Culling is unaffected. */
+	virtual void setRenderFromIdentity(bool On) = 0;
+
+	//! Creates a clone of this scene node and its children.
+	/** \param newParent An optional new parent.
+	\param newManager An optional new scene manager.
+	\return The newly created clone of this node. */
+	virtual ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IAttributes.h b/irr/include/IAttributes.h
new file mode 100644
index 000000000..906d334a2
--- /dev/null
+++ b/irr/include/IAttributes.h
@@ -0,0 +1,125 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "EAttributes.h"
+
+// not needed here but I can't be bothered to clean the transitive includes up.
+#include "quaternion.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+} // end namespace video
+namespace io
+{
+
+//! Provides a generic interface for attributes and their values and the possibility to serialize them
+class IAttributes : public virtual IReferenceCounted
+{
+public:
+	//! Returns amount of attributes in this collection of attributes.
+	virtual u32 getAttributeCount() const = 0;
+
+	//! Returns attribute name by index.
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual const c8 *getAttributeName(s32 index) const = 0;
+
+	//! Returns the type of an attribute
+	//! \param attributeName: Name for the attribute
+	virtual E_ATTRIBUTE_TYPE getAttributeType(const c8 *attributeName) const = 0;
+
+	//! Returns attribute type by index.
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual E_ATTRIBUTE_TYPE getAttributeType(s32 index) const = 0;
+
+	//! Returns if an attribute with a name exists
+	virtual bool existsAttribute(const c8 *attributeName) const = 0;
+
+	//! Returns attribute index from name, -1 if not found
+	virtual s32 findAttribute(const c8 *attributeName) const = 0;
+
+	//! Removes all attributes
+	virtual void clear() = 0;
+
+	/*
+
+		Integer Attribute
+
+	*/
+
+	//! Adds an attribute as integer
+	virtual void addInt(const c8 *attributeName, s32 value) = 0;
+
+	//! Sets an attribute as integer value
+	virtual void setAttribute(const c8 *attributeName, s32 value) = 0;
+
+	//! Gets an attribute as integer value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	virtual s32 getAttributeAsInt(const c8 *attributeName, irr::s32 defaultNotFound = 0) const = 0;
+
+	//! Gets an attribute as integer value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual s32 getAttributeAsInt(s32 index) const = 0;
+
+	//! Sets an attribute as integer value
+	virtual void setAttribute(s32 index, s32 value) = 0;
+
+	/*
+
+		Float Attribute
+
+	*/
+
+	//! Adds an attribute as float
+	virtual void addFloat(const c8 *attributeName, f32 value) = 0;
+
+	//! Sets a attribute as float value
+	virtual void setAttribute(const c8 *attributeName, f32 value) = 0;
+
+	//! Gets an attribute as float value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	virtual f32 getAttributeAsFloat(const c8 *attributeName, irr::f32 defaultNotFound = 0.f) const = 0;
+
+	//! Gets an attribute as float value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual f32 getAttributeAsFloat(s32 index) const = 0;
+
+	//! Sets an attribute as float value
+	virtual void setAttribute(s32 index, f32 value) = 0;
+
+	/*
+		Bool Attribute
+	*/
+
+	//! Adds an attribute as bool
+	virtual void addBool(const c8 *attributeName, bool value) = 0;
+
+	//! Sets an attribute as boolean value
+	virtual void setAttribute(const c8 *attributeName, bool value) = 0;
+
+	//! Gets an attribute as boolean value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	virtual bool getAttributeAsBool(const c8 *attributeName, bool defaultNotFound = false) const = 0;
+
+	//! Gets an attribute as boolean value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	virtual bool getAttributeAsBool(s32 index) const = 0;
+
+	//! Sets an attribute as boolean value
+	virtual void setAttribute(s32 index, bool value) = 0;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IBillboardSceneNode.h b/irr/include/IBillboardSceneNode.h
new file mode 100644
index 000000000..3e7026ac3
--- /dev/null
+++ b/irr/include/IBillboardSceneNode.h
@@ -0,0 +1,90 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+class ICameraSceneNode;
+class IMeshBuffer;
+
+//! A billboard scene node.
+/** A billboard is like a 3d sprite: A 2d element,
+which always looks to the camera. It is usually used for explosions, fire,
+lensflares, particles and things like that.
+*/
+class IBillboardSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0)) :
+			ISceneNode(parent, mgr, id, position) {}
+
+	//! Sets the size of the billboard, making it rectangular.
+	virtual void setSize(const core::dimension2d<f32> &size) = 0;
+
+	//! Sets the size of the billboard with independent widths of the bottom and top edges.
+	/** \param[in] height The height of the billboard.
+	\param[in] bottomEdgeWidth The width of the bottom edge of the billboard.
+	\param[in] topEdgeWidth The width of the top edge of the billboard.
+	*/
+	virtual void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) = 0;
+
+	//! Returns the size of the billboard.
+	/** This will return the width of the bottom edge of the billboard.
+	Use getWidths() to retrieve the bottom and top edges independently.
+	\return Size of the billboard.
+	*/
+	virtual const core::dimension2d<f32> &getSize() const = 0;
+
+	//! Gets the size of the the billboard and handles independent top and bottom edge widths correctly.
+	/** \param[out] height The height of the billboard.
+	\param[out] bottomEdgeWidth The width of the bottom edge of the billboard.
+	\param[out] topEdgeWidth The width of the top edge of the billboard.
+	*/
+	virtual void getSize(f32 &height, f32 &bottomEdgeWidth, f32 &topEdgeWidth) const = 0;
+
+	//! Set the color of all vertices of the billboard
+	/** \param[in] overallColor Color to set */
+	virtual void setColor(const video::SColor &overallColor) = 0;
+
+	//! Set the color of the top and bottom vertices of the billboard
+	/** \param[in] topColor Color to set the top vertices
+	\param[in] bottomColor Color to set the bottom vertices */
+	virtual void setColor(const video::SColor &topColor,
+			const video::SColor &bottomColor) = 0;
+
+	//! Gets the color of the top and bottom vertices of the billboard
+	/** \param[out] topColor Stores the color of the top vertices
+	\param[out] bottomColor Stores the color of the bottom vertices */
+	virtual void getColor(video::SColor &topColor,
+			video::SColor &bottomColor) const = 0;
+
+	//! Get the real boundingbox used by the billboard, which can depend on the active camera.
+	/** The boundingbox returned will use absolute coordinates.
+		The billboard orients itself toward the camera and some only update in render().
+		So we don't know the real boundingboxes before that. Which would be too late for culling.
+		That is why the usual getBoundingBox will return a "safe" boundingbox which is guaranteed
+		to contain the billboard. While this function can return the real one. */
+	virtual const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera) = 0;
+
+	//! Get the amount of mesh buffers.
+	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
+	virtual u32 getMeshBufferCount() const = 0;
+
+	//! Get pointer to a mesh buffer.
+	/** NOTE: Positions and normals of this meshbuffers are re-calculated before rendering.
+	So this is mainly useful to access/modify the uv-coordinates.
+	\param nr: Zero based index of the mesh buffer.
+	\return Pointer to the mesh buffer or 0 if there is no such	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IBoneSceneNode.h b/irr/include/IBoneSceneNode.h
new file mode 100644
index 000000000..668289271
--- /dev/null
+++ b/irr/include/IBoneSceneNode.h
@@ -0,0 +1,96 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Enumeration for different bone animation modes
+enum E_BONE_ANIMATION_MODE
+{
+	//! The bone is usually animated, unless it's parent is not animated
+	EBAM_AUTOMATIC = 0,
+
+	//! The bone is animated by the skin, if it's parent is not animated then animation will resume from this bone onward
+	EBAM_ANIMATED,
+
+	//! The bone is not animated by the skin
+	EBAM_UNANIMATED,
+
+	//! Not an animation mode, just here to count the available modes
+	EBAM_COUNT
+
+};
+
+enum E_BONE_SKINNING_SPACE
+{
+	//! local skinning, standard
+	EBSS_LOCAL = 0,
+
+	//! global skinning
+	EBSS_GLOBAL,
+
+	EBSS_COUNT
+};
+
+//! Names for bone animation modes
+const c8 *const BoneAnimationModeNames[] = {
+		"automatic",
+		"animated",
+		"unanimated",
+		0,
+	};
+
+//! Interface for bones used for skeletal animation.
+/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
+class IBoneSceneNode : public ISceneNode
+{
+public:
+	IBoneSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id = -1) :
+			ISceneNode(parent, mgr, id), positionHint(-1), scaleHint(-1), rotationHint(-1) {}
+
+	//! Get the index of the bone
+	virtual u32 getBoneIndex() const = 0;
+
+	//! Sets the animation mode of the bone.
+	/** \return True if successful. (Unused) */
+	virtual bool setAnimationMode(E_BONE_ANIMATION_MODE mode) = 0;
+
+	//! Gets the current animation mode of the bone
+	virtual E_BONE_ANIMATION_MODE getAnimationMode() const = 0;
+
+	//! Get the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override = 0;
+
+	//! Returns the relative transformation of the scene node.
+	// virtual core::matrix4 getRelativeTransformation() const = 0;
+
+	//! The animation method.
+	void OnAnimate(u32 timeMs) override = 0;
+
+	//! The render method.
+	/** Does nothing as bones are not visible. */
+	void render() override {}
+
+	//! How the relative transformation of the bone is used
+	virtual void setSkinningSpace(E_BONE_SKINNING_SPACE space) = 0;
+
+	//! How the relative transformation of the bone is used
+	virtual E_BONE_SKINNING_SPACE getSkinningSpace() const = 0;
+
+	//! Updates the absolute position based on the relative and the parents position
+	virtual void updateAbsolutePositionOfAllChildren() = 0;
+
+	s32 positionHint;
+	s32 scaleHint;
+	s32 rotationHint;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/ICameraSceneNode.h b/irr/include/ICameraSceneNode.h
new file mode 100644
index 000000000..a7c72428d
--- /dev/null
+++ b/irr/include/ICameraSceneNode.h
@@ -0,0 +1,184 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+#include "IEventReceiver.h"
+
+namespace irr
+{
+namespace scene
+{
+struct SViewFrustum;
+
+//! Scene Node which is a (controllable) camera.
+/** The whole scene will be rendered from the cameras point of view.
+Because the ICameraSceneNode is a SceneNode, it can be attached to any
+other scene node, and will follow its parents movement, rotation and so
+on.
+*/
+class ICameraSceneNode : public ISceneNode, public IEventReceiver
+{
+public:
+	//! Constructor
+	ICameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale),
+			IsOrthogonal(false) {}
+
+	//! Sets the projection matrix of the camera.
+	/** The core::matrix4 class has some methods to build a
+	projection matrix. e.g:
+	core::matrix4::buildProjectionMatrixPerspectiveFovLH.
+	Note that the matrix will only stay as set by this method until
+	one of the following Methods are called: setNearValue,
+	setFarValue, setAspectRatio, setFOV.
+	NOTE: The frustum is not updated before render() is called
+	unless you explicitly call updateMatrices()
+	\param projection The new projection matrix of the camera.
+	\param isOrthogonal Set this to true if the matrix is an
+	orthogonal one (e.g. from matrix4::buildProjectionMatrixOrtho).
+	*/
+	virtual void setProjectionMatrix(const core::matrix4 &projection, bool isOrthogonal = false) = 0;
+
+	//! Gets the current projection matrix of the camera.
+	/** \return The current projection matrix of the camera. */
+	virtual const core::matrix4 &getProjectionMatrix() const = 0;
+
+	//! Gets the current view matrix of the camera.
+	/** \return The current view matrix of the camera. */
+	virtual const core::matrix4 &getViewMatrix() const = 0;
+
+	//! Sets a custom view matrix affector.
+	/** The matrix passed here, will be multiplied with the view
+	matrix when it gets updated. This allows for custom camera
+	setups like, for example, a reflection camera.
+	\param affector The affector matrix. */
+	virtual void setViewMatrixAffector(const core::matrix4 &affector) = 0;
+
+	//! Get the custom view matrix affector.
+	/** \return The affector matrix. */
+	virtual const core::matrix4 &getViewMatrixAffector() const = 0;
+
+	//! It is possible to send mouse and key events to the camera.
+	/** Most cameras may ignore this input, but camera scene nodes
+	which are created for example with
+	ISceneManager::addCameraSceneNodeMaya or
+	ISceneManager::addCameraSceneNodeFPS, may want to get
+	this input for changing their position, look at target or
+	whatever. */
+	bool OnEvent(const SEvent &event) override = 0;
+
+	//! Sets the look at target of the camera
+	/** If the camera's target and rotation are bound ( @see
+	bindTargetAndRotation() ) then calling this will also change
+	the camera's scene node rotation to match the target.
+	Note that setTarget uses the current absolute position
+	internally, so if you changed setPosition since last rendering you must
+	call updateAbsolutePosition before using this function.
+	\param pos Look at target of the camera, in world co-ordinates. */
+	virtual void setTarget(const core::vector3df &pos) = 0;
+
+	//! Sets the rotation of the node.
+	/** This only modifies the relative rotation of the node.
+	If the camera's target and rotation are bound ( @see
+	bindTargetAndRotation() ) then calling this will also change
+	the camera's target to match the rotation.
+	\param rotation New rotation of the node in degrees. */
+	void setRotation(const core::vector3df &rotation) override = 0;
+
+	//! Gets the current look at target of the camera
+	/** \return The current look at target of the camera, in world co-ordinates */
+	virtual const core::vector3df &getTarget() const = 0;
+
+	//! Sets the up vector of the camera.
+	/** \param pos: New upvector of the camera. */
+	virtual void setUpVector(const core::vector3df &pos) = 0;
+
+	//! Gets the up vector of the camera.
+	/** \return The up vector of the camera, in world space. */
+	virtual const core::vector3df &getUpVector() const = 0;
+
+	//! Gets the value of the near plane of the camera.
+	/** \return The value of the near plane of the camera. */
+	virtual f32 getNearValue() const = 0;
+
+	//! Gets the value of the far plane of the camera.
+	/** \return The value of the far plane of the camera. */
+	virtual f32 getFarValue() const = 0;
+
+	//! Gets the aspect ratio of the camera.
+	/** \return The aspect ratio of the camera. */
+	virtual f32 getAspectRatio() const = 0;
+
+	//! Gets the field of view of the camera.
+	/** \return The field of view of the camera in radians. */
+	virtual f32 getFOV() const = 0;
+
+	//! Sets the value of the near clipping plane. (default: 1.0f)
+	/** \param zn: New z near value. */
+	virtual void setNearValue(f32 zn) = 0;
+
+	//! Sets the value of the far clipping plane (default: 2000.0f)
+	/** \param zf: New z far value. */
+	virtual void setFarValue(f32 zf) = 0;
+
+	//! Sets the aspect ratio (default: 4.0f / 3.0f)
+	/** \param aspect: New aspect ratio. */
+	virtual void setAspectRatio(f32 aspect) = 0;
+
+	//! Sets the field of view (Default: PI / 2.5f)
+	/** \param fovy: New field of view in radians. */
+	virtual void setFOV(f32 fovy) = 0;
+
+	//! Get the view frustum.
+	/** \return The current view frustum. */
+	virtual const SViewFrustum *getViewFrustum() const = 0;
+
+	//! Disables or enables the camera to get key or mouse inputs.
+	/** If this is set to true, the camera will respond to key
+	inputs otherwise not. */
+	virtual void setInputReceiverEnabled(bool enabled) = 0;
+
+	//! Checks if the input receiver of the camera is currently enabled.
+	virtual bool isInputReceiverEnabled() const = 0;
+
+	//! Checks if a camera is orthogonal.
+	virtual bool isOrthogonal() const
+	{
+		return IsOrthogonal;
+	}
+
+	//! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them.
+	/** When bound, calling setRotation() will update the camera's
+	target position to be along its +Z axis, and likewise calling
+	setTarget() will update its rotation so that its +Z axis will
+	point at the target point. FPS camera use this binding by
+	default; other cameras do not.
+	\param bound True to bind the camera's scene node rotation
+	and targeting, false to unbind them.
+	@see getTargetAndRotationBinding() */
+	virtual void bindTargetAndRotation(bool bound) = 0;
+
+	//! Updates the matrices without uploading them to the driver
+	virtual void updateMatrices() = 0;
+
+	//! Queries if the camera scene node's rotation and its target position are bound together.
+	/** @see bindTargetAndRotation() */
+	virtual bool getTargetAndRotationBinding(void) const = 0;
+
+protected:
+	void cloneMembers(const ICameraSceneNode *toCopyFrom)
+	{
+		IsOrthogonal = toCopyFrom->IsOrthogonal;
+	}
+
+	bool IsOrthogonal;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IContextManager.h b/irr/include/IContextManager.h
new file mode 100644
index 000000000..85177dc43
--- /dev/null
+++ b/irr/include/IContextManager.h
@@ -0,0 +1,59 @@
+// Copyright (C) 2013-2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SExposedVideoData.h"
+#include "SIrrCreationParameters.h"
+#include <string>
+
+namespace irr
+{
+namespace video
+{
+// For system specific window contexts (used for OpenGL)
+class IContextManager : public virtual IReferenceCounted
+{
+public:
+	//! Initialize manager with device creation parameters and device window (passed as exposed video data)
+	virtual bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) = 0;
+
+	//! Terminate manager, any cleanup that is left over. Manager needs a new initialize to be usable again
+	virtual void terminate() = 0;
+
+	//! Create surface based on current window set
+	virtual bool generateSurface() = 0;
+
+	//! Destroy current surface
+	virtual void destroySurface() = 0;
+
+	//! Create context based on current surface
+	virtual bool generateContext() = 0;
+
+	//! Destroy current context
+	virtual void destroyContext() = 0;
+
+	//! Get current context
+	virtual const SExposedVideoData &getContext() const = 0;
+
+	//! Change render context, disable old and activate new defined by videoData
+	//\param restorePrimaryOnZero When true: restore original driver context when videoData is set to 0 values.
+	//                            When false: resets the context when videoData is set to 0 values.
+	/** This is mostly used internally by IVideoDriver::beginScene().
+		But if you want to switch threads which access your OpenGL driver you will have to
+		call this function as follows:
+		Old thread gives up context with: activateContext(irr::video::SExposedVideoData());
+		New thread takes over context with: activateContext(videoDriver->getExposedVideoData());
+		Note that only 1 thread at a time may access an OpenGL context.	*/
+	virtual bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) = 0;
+
+	//! Get the address of any OpenGL procedure (including core procedures).
+	virtual void *getProcAddress(const std::string &procName) = 0;
+
+	//! Swap buffers.
+	virtual bool swapBuffers() = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/ICursorControl.h b/irr/include/ICursorControl.h
new file mode 100644
index 000000000..65b8efb7e
--- /dev/null
+++ b/irr/include/ICursorControl.h
@@ -0,0 +1,195 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "position2d.h"
+#include "rect.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class IGUISpriteBank;
+
+//! Default icons for cursors
+enum ECURSOR_ICON
+{
+	// Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far.
+	ECI_NORMAL,   // arrow
+	ECI_CROSS,    // Crosshair
+	ECI_HAND,     // Hand
+	ECI_HELP,     // Arrow and question mark
+	ECI_IBEAM,    // typical text-selection cursor
+	ECI_NO,       // should not click icon
+	ECI_WAIT,     // hourglass
+	ECI_SIZEALL,  // arrow in all directions
+	ECI_SIZENESW, // resizes in direction north-east or south-west
+	ECI_SIZENWSE, // resizes in direction north-west or south-east
+	ECI_SIZENS,   // resizes in direction north or south
+	ECI_SIZEWE,   // resizes in direction west or east
+	ECI_UP,       // up-arrow
+
+	// Implementer note: Should we add system specific cursors, which use guaranteed the system icons,
+	// then I would recommend using a naming scheme like ECI_W32_CROSS, ECI_X11_CROSSHAIR and adding those
+	// additionally.
+
+	ECI_COUNT // maximal of defined cursors. Note that higher values can be created at runtime
+};
+
+//! Names for ECURSOR_ICON
+const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
+		"normal",
+		"cross",
+		"hand",
+		"help",
+		"ibeam",
+		"no",
+		"wait",
+		"sizeall",
+		"sizenesw",
+		"sizenwse",
+		"sizens",
+		"sizewe",
+		"sizeup",
+		0,
+	};
+
+//! structure used to set sprites as cursors.
+struct SCursorSprite
+{
+	SCursorSprite() :
+			SpriteBank(0), SpriteId(-1)
+	{
+	}
+
+	SCursorSprite(gui::IGUISpriteBank *spriteBank, s32 spriteId, const core::position2d<s32> &hotspot = (core::position2d<s32>(0, 0))) :
+			SpriteBank(spriteBank), SpriteId(spriteId), HotSpot(hotspot)
+	{
+	}
+
+	IGUISpriteBank *SpriteBank;
+	s32 SpriteId;
+	core::position2d<s32> HotSpot;
+};
+
+//! platform specific behavior flags for the cursor
+enum ECURSOR_PLATFORM_BEHAVIOR
+{
+	//! default - no platform specific behavior
+	ECPB_NONE = 0,
+
+	//! On X11 try caching cursor updates as XQueryPointer calls can be expensive.
+	/** Update cursor positions only when the irrlicht timer has been updated or the timer is stopped.
+		This means you usually get one cursor update per device->run() which will be fine in most cases.
+		See this forum-thread for a more detailed explanation:
+		http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=45525
+	*/
+	ECPB_X11_CACHE_UPDATES = 1
+};
+
+//! Interface to manipulate the mouse cursor.
+class ICursorControl : public virtual IReferenceCounted
+{
+public:
+	//! Changes the visible state of the mouse cursor.
+	/** \param visible: The new visible state. If true, the cursor will be visible,
+	if false, it will be invisible. */
+	virtual void setVisible(bool visible) = 0;
+
+	//! Returns if the cursor is currently visible.
+	/** \return True if the cursor flag is set to visible, false if not. */
+	virtual bool isVisible() const = 0;
+
+	//! Sets the new position of the cursor.
+	/** The position must be
+	between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	render window.
+	\param pos New position of the cursor. */
+	virtual void setPosition(const core::position2d<f32> &pos) = 0;
+
+	//! Sets the new position of the cursor.
+	/** The position must be
+	between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	render window.
+	\param x New x-coord of the cursor.
+	\param y New x-coord of the cursor. */
+	virtual void setPosition(f32 x, f32 y) = 0;
+
+	//! Sets the new position of the cursor.
+	/** \param pos: New position of the cursor. The coordinates are pixel units. */
+	virtual void setPosition(const core::position2d<s32> &pos) = 0;
+
+	//! Sets the new position of the cursor.
+	/** \param x New x-coord of the cursor. The coordinates are pixel units.
+	\param y New y-coord of the cursor. The coordinates are pixel units. */
+	virtual void setPosition(s32 x, s32 y) = 0;
+
+	//! Returns the current position of the mouse cursor.
+	/** \param updateCursor When true ask system/OS for current cursor position.
+		When false return the last known (buffered) position ( this is useful to
+		check what has become of a setPosition call with float numbers).
+	\return Returns the current position of the cursor. The returned position
+	is the position of the mouse cursor in pixel units. */
+	virtual const core::position2d<s32> &getPosition(bool updateCursor = true) = 0;
+
+	//! Returns the current position of the mouse cursor.
+	/** \param updateCursor When true ask system/OS for current cursor position.
+		When false return the last known (buffered) position (this is
+		useful to check what has become of a setPosition call with float numbers
+		and is often different from the values you passed in setPosition).
+	\return Returns the current position of the cursor. The returned position
+	is a value between (0.0f, 0.0f) and (1.0f, 1.0f), where (0.0f, 0.0f) is
+	the top left corner and (1.0f, 1.0f) is the bottom right corner of the
+	render window. */
+	virtual core::position2d<f32> getRelativePosition(bool updateCursor = true) = 0;
+
+	//! Sets an absolute reference rect for setting and retrieving the cursor position.
+	/** If this rect is set, the cursor position is not being calculated relative to
+	the rendering window but to this rect. You can set the rect pointer to 0 to disable
+	this feature again. This feature is useful when rendering into parts of foreign windows
+	for example in an editor.
+	\param rect: A pointer to an reference rectangle or 0 to disable the reference rectangle.*/
+	virtual void setReferenceRect(core::rect<s32> *rect = 0) = 0;
+
+	//! Internally fixes the mouse position, and reports relative mouse movement compared to the old position
+	/** Specific to SDL */
+	virtual void setRelativeMode(bool relative){};
+
+	//! Sets the active cursor icon
+	/** Setting cursor icons is so far only supported on Win32 and Linux */
+	virtual void setActiveIcon(ECURSOR_ICON iconId) {}
+
+	//! Gets the currently active icon
+	virtual ECURSOR_ICON getActiveIcon() const { return gui::ECI_NORMAL; }
+
+	//! Add a custom sprite as cursor icon.
+	/** \return Identification for the icon */
+	virtual ECURSOR_ICON addIcon(const gui::SCursorSprite &icon) { return gui::ECI_NORMAL; }
+
+	//! replace a cursor icon.
+	/** Changing cursor icons is so far only supported on Win32 and Linux
+		Note that this only changes the icons within your application, system cursors outside your
+		application will not be affected.
+	*/
+	virtual void changeIcon(ECURSOR_ICON iconId, const gui::SCursorSprite &sprite) {}
+
+	//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+	virtual core::dimension2di getSupportedIconSize() const { return core::dimension2di(0, 0); }
+
+	//! Set platform specific behavior flags.
+	virtual void setPlatformBehavior(ECURSOR_PLATFORM_BEHAVIOR behavior) {}
+
+	//! Return platform specific behavior.
+	/** \return Behavior set by setPlatformBehavior or ECPB_NONE for platforms not implementing specific behaviors.
+	 */
+	virtual ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return ECPB_NONE; }
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IDummyTransformationSceneNode.h b/irr/include/IDummyTransformationSceneNode.h
new file mode 100644
index 000000000..88bc37c78
--- /dev/null
+++ b/irr/include/IDummyTransformationSceneNode.h
@@ -0,0 +1,36 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Dummy scene node for adding additional transformations to the scene graph.
+/** This scene node does not render itself, and does not respond to set/getPosition,
+set/getRotation and set/getScale. Its just a simple scene node that takes a
+matrix as relative transformation, making it possible to insert any transformation
+anywhere into the scene graph.
+This scene node is for example used by the IAnimatedMeshSceneNode for emulating
+joint scene nodes when playing skeletal animations.
+*/
+class IDummyTransformationSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	IDummyTransformationSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id) :
+			ISceneNode(parent, mgr, id) {}
+
+	//! Returns a reference to the current relative transformation matrix.
+	/** This is the matrix, this scene node uses instead of scale, translation
+	and rotation. */
+	virtual core::matrix4 &getRelativeTransformationMatrix() = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IEventReceiver.h b/irr/include/IEventReceiver.h
new file mode 100644
index 000000000..a484bfb84
--- /dev/null
+++ b/irr/include/IEventReceiver.h
@@ -0,0 +1,600 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ILogger.h"
+#include "Keycodes.h"
+#include "irrString.h"
+
+namespace irr
+{
+//! Enumeration for all event types there are.
+enum EEVENT_TYPE
+{
+	//! An event of the graphical user interface.
+	/** GUI events are created by the GUI environment or the GUI elements in response
+	to mouse or keyboard events. When a GUI element receives an event it will either
+	process it and return true, or pass the event to its parent. If an event is not absorbed
+	before it reaches the root element then it will then be passed to the user receiver. */
+	EET_GUI_EVENT = 0,
+
+	//! A mouse input event.
+	/** Mouse events are created by the device and passed to IrrlichtDevice::postEventFromUser
+	in response to mouse input received from the operating system.
+	Mouse events are first passed to the user receiver, then to the GUI environment and its elements,
+	then finally the input receiving scene manager where it is passed to the active camera.
+	*/
+	EET_MOUSE_INPUT_EVENT,
+
+	//! A key input event.
+	/** Like mouse events, keyboard events are created by the device and passed to
+	IrrlichtDevice::postEventFromUser. They take the same path as mouse events. */
+	EET_KEY_INPUT_EVENT,
+
+	//! A string input event.
+	/** This event is created when multiple characters are sent at a time (e.g. using an IME). */
+	EET_STRING_INPUT_EVENT,
+
+	//! A touch input event.
+	EET_TOUCH_INPUT_EVENT,
+
+	//! A accelerometer event.
+	EET_ACCELEROMETER_EVENT,
+
+	//! A gyroscope event.
+	EET_GYROSCOPE_EVENT,
+
+	//! A device motion event.
+	EET_DEVICE_MOTION_EVENT,
+
+	//! A joystick (joypad, gamepad) input event.
+	/** Joystick events are created by polling all connected joysticks once per
+	device run() and then passing the events to IrrlichtDevice::postEventFromUser.
+	They take the same path as mouse events.
+	Windows, SDL: Implemented.
+	Linux: Implemented, with POV hat issues.
+	MacOS / Other: Not yet implemented.
+	*/
+	EET_JOYSTICK_INPUT_EVENT,
+
+	//! A log event
+	/** Log events are only passed to the user receiver if there is one. If they are absorbed by the
+	user receiver then no text will be sent to the console. */
+	EET_LOG_TEXT_EVENT,
+
+	//! A user event with user data.
+	/** This is not used by Irrlicht and can be used to send user
+	specific data though the system. The Irrlicht 'window handle'
+	can be obtained from IrrlichtDevice::getExposedVideoData()
+	The usage and behavior depends on the operating system:
+	Windows: send a WM_USER message to the Irrlicht Window; the
+		wParam and lParam will be used to populate the
+		UserData1 and UserData2 members of the SUserEvent.
+	Linux: send a ClientMessage via XSendEvent to the Irrlicht
+		Window; the data.l[0] and data.l[1] members will be
+		cast to s32 and used as UserData1 and UserData2.
+	MacOS: Not yet implemented
+	*/
+	EET_USER_EVENT,
+
+	//! Application state events like a resume, pause etc.
+	EET_APPLICATION_EVENT,
+
+	//! This enum is never used, it only forces the compiler to
+	//! compile these enumeration values to 32 bit.
+	EGUIET_FORCE_32_BIT = 0x7fffffff
+
+};
+
+//! Enumeration for all mouse input events
+enum EMOUSE_INPUT_EVENT
+{
+	//! Left mouse button was pressed down.
+	EMIE_LMOUSE_PRESSED_DOWN = 0,
+
+	//! Right mouse button was pressed down.
+	EMIE_RMOUSE_PRESSED_DOWN,
+
+	//! Middle mouse button was pressed down.
+	EMIE_MMOUSE_PRESSED_DOWN,
+
+	//! Left mouse button was left up.
+	EMIE_LMOUSE_LEFT_UP,
+
+	//! Right mouse button was left up.
+	EMIE_RMOUSE_LEFT_UP,
+
+	//! Middle mouse button was left up.
+	EMIE_MMOUSE_LEFT_UP,
+
+	//! The mouse cursor changed its position.
+	EMIE_MOUSE_MOVED,
+
+	//! The mouse wheel was moved. Use Wheel value in event data to find out
+	//! in what direction and how fast.
+	EMIE_MOUSE_WHEEL,
+
+	//! Left mouse button double click.
+	//! This event is generated after the second EMIE_LMOUSE_PRESSED_DOWN event.
+	EMIE_LMOUSE_DOUBLE_CLICK,
+
+	//! Right mouse button double click.
+	//! This event is generated after the second EMIE_RMOUSE_PRESSED_DOWN event.
+	EMIE_RMOUSE_DOUBLE_CLICK,
+
+	//! Middle mouse button double click.
+	//! This event is generated after the second EMIE_MMOUSE_PRESSED_DOWN event.
+	EMIE_MMOUSE_DOUBLE_CLICK,
+
+	//! Left mouse button triple click.
+	//! This event is generated after the third EMIE_LMOUSE_PRESSED_DOWN event.
+	EMIE_LMOUSE_TRIPLE_CLICK,
+
+	//! Right mouse button triple click.
+	//! This event is generated after the third EMIE_RMOUSE_PRESSED_DOWN event.
+	EMIE_RMOUSE_TRIPLE_CLICK,
+
+	//! Middle mouse button triple click.
+	//! This event is generated after the third EMIE_MMOUSE_PRESSED_DOWN event.
+	EMIE_MMOUSE_TRIPLE_CLICK,
+
+	//! Mouse enters canvas used for rendering.
+	//! Only generated on emscripten
+	EMIE_MOUSE_ENTER_CANVAS,
+
+	//! Mouse leaves canvas used for rendering.
+	//! Only generated on emscripten
+	EMIE_MOUSE_LEAVE_CANVAS,
+
+	//! No real event. Just for convenience to get number of events
+	EMIE_COUNT
+};
+
+//! Masks for mouse button states
+enum E_MOUSE_BUTTON_STATE_MASK
+{
+	EMBSM_LEFT = 0x01,
+	EMBSM_RIGHT = 0x02,
+	EMBSM_MIDDLE = 0x04,
+
+	//! currently only on windows
+	EMBSM_EXTRA1 = 0x08,
+
+	//! currently only on windows
+	EMBSM_EXTRA2 = 0x10,
+
+	EMBSM_FORCE_32_BIT = 0x7fffffff
+};
+
+//! Enumeration for all touch input events
+enum ETOUCH_INPUT_EVENT
+{
+	//! Touch was pressed down.
+	ETIE_PRESSED_DOWN = 0,
+
+	//! Touch was left up.
+	ETIE_LEFT_UP,
+
+	//! The touch changed its position.
+	ETIE_MOVED,
+
+	//! No real event. Just for convenience to get number of events
+	ETIE_COUNT
+};
+
+//! Enumeration for a commonly used application state events (it's useful mainly for mobile devices)
+enum EAPPLICATION_EVENT_TYPE
+{
+	//! The application will be resumed.
+	EAET_WILL_RESUME = 0,
+
+	//! The application has been resumed.
+	EAET_DID_RESUME,
+
+	//! The application will be paused.
+	EAET_WILL_PAUSE,
+
+	//! The application has been paused.
+	EAET_DID_PAUSE,
+
+	//! The application will be terminated.
+	EAET_WILL_TERMINATE,
+
+	//! The application received a memory warning.
+	EAET_MEMORY_WARNING,
+
+	//! The display density changed (only works on SDL).
+	EAET_DPI_CHANGED,
+
+	//! No real event, but to get number of event types.
+	EAET_COUNT
+};
+
+namespace gui
+{
+
+class IGUIElement;
+
+//! Enumeration for all events which are sendable by the gui system
+enum EGUI_EVENT_TYPE
+{
+	//! A gui element has lost its focus.
+	/** GUIEvent.Caller is losing the focus to GUIEvent.Element.
+	If the event is absorbed then the focus will not be changed. */
+	EGET_ELEMENT_FOCUS_LOST = 0,
+
+	//! A gui element has got the focus.
+	/** If the event is absorbed then the focus will not be changed. */
+	EGET_ELEMENT_FOCUSED,
+
+	//! The mouse cursor hovered over a gui element.
+	/** If an element has sub-elements you also get this message for the subelements */
+	EGET_ELEMENT_HOVERED,
+
+	//! The mouse cursor left the hovered element.
+	/** If an element has sub-elements you also get this message for the subelements */
+	EGET_ELEMENT_LEFT,
+
+	//! An element would like to close.
+	/** Windows and context menus use this event when they would like to close,
+	this can be canceled by absorbing the event. */
+	EGET_ELEMENT_CLOSED,
+
+	//! A button was clicked.
+	EGET_BUTTON_CLICKED,
+
+	//! A scrollbar has changed its position.
+	EGET_SCROLL_BAR_CHANGED,
+
+	//! A checkbox has changed its check state.
+	EGET_CHECKBOX_CHANGED,
+
+	//! A listbox would like to open.
+	/** You can prevent the listbox from opening by absorbing the event. */
+	EGET_LISTBOX_OPENED,
+
+	//! A new item in a listbox was selected.
+	/** NOTE: You also get this event currently when the same item was clicked again after more than 500 ms. */
+	EGET_LISTBOX_CHANGED,
+
+	//! An item in the listbox was selected, which was already selected.
+	/** NOTE: You get the event currently only if the item was clicked again within 500 ms or selected by "enter" or "space". */
+	EGET_LISTBOX_SELECTED_AGAIN,
+
+	//! A file has been selected in the file dialog
+	EGET_FILE_SELECTED,
+
+	//! A directory has been selected in the file dialog
+	EGET_DIRECTORY_SELECTED,
+
+	//! A file open dialog has been closed without choosing a file
+	EGET_FILE_CHOOSE_DIALOG_CANCELLED,
+
+	//! In an editbox 'ENTER' was pressed
+	EGET_EDITBOX_ENTER,
+
+	//! The text in an editbox was changed. This does not include automatic changes in text-breaking.
+	EGET_EDITBOX_CHANGED,
+
+	//! The marked area in an editbox was changed.
+	EGET_EDITBOX_MARKING_CHANGED,
+
+	//! The tab was changed in an tab control
+	EGET_TAB_CHANGED,
+
+	//! The selection in a combo box has been changed
+	EGET_COMBO_BOX_CHANGED,
+
+	//! A table has changed
+	EGET_TABLE_CHANGED,
+	EGET_TABLE_HEADER_CHANGED,
+	EGET_TABLE_SELECTED_AGAIN,
+
+	//! No real event. Just for convenience to get number of events
+	EGET_COUNT
+};
+} // end namespace gui
+
+//! SEvents hold information about an event. See irr::IEventReceiver for details on event handling.
+struct SEvent
+{
+	//! Any kind of GUI event.
+	struct SGUIEvent
+	{
+		//! IGUIElement who called the event
+		gui::IGUIElement *Caller;
+
+		//! If the event has something to do with another element, it will be held here.
+		gui::IGUIElement *Element;
+
+		//! Type of GUI Event
+		gui::EGUI_EVENT_TYPE EventType;
+	};
+
+	//! Any kind of mouse event.
+	struct SMouseInput
+	{
+		//! X position of mouse cursor
+		s32 X;
+
+		//! Y position of mouse cursor
+		s32 Y;
+
+		//! mouse wheel delta, often 1.0 or -1.0, but can have other values < 0.f or > 0.f;
+		/** Only valid if event was EMIE_MOUSE_WHEEL */
+		f32 Wheel;
+
+		//! True if shift was also pressed
+		bool Shift : 1;
+
+		//! True if ctrl was also pressed
+		bool Control : 1;
+
+		//! A bitmap of button states. You can use isButtonPressed() to determine
+		//! if a button is pressed or not.
+		u32 ButtonStates;
+
+		//! Is the left button pressed down?
+		bool isLeftPressed() const { return 0 != (ButtonStates & EMBSM_LEFT); }
+
+		//! Is the right button pressed down?
+		bool isRightPressed() const { return 0 != (ButtonStates & EMBSM_RIGHT); }
+
+		//! Is the middle button pressed down?
+		bool isMiddlePressed() const { return 0 != (ButtonStates & EMBSM_MIDDLE); }
+
+		//! Type of mouse event
+		EMOUSE_INPUT_EVENT Event;
+	};
+
+	//! Any kind of keyboard event.
+	struct SKeyInput
+	{
+		//! Character corresponding to the key (0, if not a character, value undefined in key releases)
+		wchar_t Char;
+
+		//! Key which has been pressed or released
+		EKEY_CODE Key;
+
+		//! System dependent code. Only set for systems which are described below, otherwise undefined.
+		//! Android: int32_t with physical key as returned by AKeyEvent_getKeyCode
+		u32 SystemKeyCode;
+
+		//! If not true, then the key was left up
+		bool PressedDown : 1;
+
+		//! True if shift was also pressed
+		bool Shift : 1;
+
+		//! True if ctrl was also pressed
+		bool Control : 1;
+	};
+
+	//! String input event.
+	struct SStringInput
+	{
+		//! The string that is entered
+		core::stringw *Str;
+	};
+
+	//! Any kind of touch event.
+	struct STouchInput
+	{
+		// Touch ID.
+		size_t ID;
+
+		// X position of simple touch.
+		s32 X;
+
+		// Y position of simple touch.
+		s32 Y;
+
+		// number of current touches
+		s32 touchedCount;
+
+		//! Type of touch event.
+		ETOUCH_INPUT_EVENT Event;
+	};
+
+	//! Any kind of accelerometer event.
+	struct SAccelerometerEvent
+	{
+		// X acceleration.
+		f64 X;
+
+		// Y acceleration.
+		f64 Y;
+
+		// Z acceleration.
+		f64 Z;
+	};
+
+	//! Any kind of gyroscope event.
+	struct SGyroscopeEvent
+	{
+		// X rotation.
+		f64 X;
+
+		// Y rotation.
+		f64 Y;
+
+		// Z rotation.
+		f64 Z;
+	};
+
+	//! Any kind of device motion event.
+	struct SDeviceMotionEvent
+	{
+		// X angle - roll.
+		f64 X;
+
+		// Y angle - pitch.
+		f64 Y;
+
+		// Z angle - yaw.
+		f64 Z;
+	};
+
+	//! A joystick event.
+	/** Unlike other events, joystick events represent the result of polling
+	 * each connected joystick once per run() of the device. Joystick events will
+	 * not be generated by default.  If joystick support is available for the
+	 * active device, and @ref irr::IrrlichtDevice::activateJoysticks() has been
+	 * called, an event of this type will be generated once per joystick per
+	 * @ref IrrlichtDevice::run() regardless of whether the state of the joystick
+	 * has actually changed. */
+	struct SJoystickEvent
+	{
+		enum
+		{
+			NUMBER_OF_BUTTONS = 32,
+
+			AXIS_X = 0, // e.g. analog stick 1 left to right
+			AXIS_Y,     // e.g. analog stick 1 top to bottom
+			AXIS_Z,     // e.g. throttle, or analog 2 stick 2 left to right
+			AXIS_R,     // e.g. rudder, or analog 2 stick 2 top to bottom
+			AXIS_U,
+			AXIS_V,
+			NUMBER_OF_AXES = 18 // (please tell Irrlicht maintainers if you absolutely need more axes)
+		};
+
+		/** A bitmap of button states.  You can use IsButtonPressed() to
+		 ( check the state of each button from 0 to (NUMBER_OF_BUTTONS - 1) */
+		u32 ButtonStates;
+
+		/** For AXIS_X, AXIS_Y, AXIS_Z, AXIS_R, AXIS_U and AXIS_V
+		 * Values are in the range -32768 to 32767, with 0 representing
+		 * the center position.  You will receive the raw value from the
+		 * joystick, and so will usually want to implement a dead zone around
+		 * the center of the range. Axes not supported by this joystick will
+		 * always have a value of 0. On Linux, POV hats are represented as axes,
+		 * usually the last two active axis.
+		 */
+		s16 Axis[NUMBER_OF_AXES];
+
+		/** The POV represents the angle of the POV hat in degrees * 100,
+		 * from 0 to 35,900.  A value of 65535 indicates that the POV hat
+		 * is centered (or not present).
+		 * This value is only supported on Windows.  On Linux, the POV hat
+		 * will be sent as 2 axes instead. */
+		u16 POV;
+
+		//! The ID of the joystick which generated this event.
+		/** This is an internal Irrlicht index; it does not map directly
+		 * to any particular hardware joystick. */
+		u8 Joystick;
+
+		//! A helper function to check if a button is pressed.
+		bool IsButtonPressed(u32 button) const
+		{
+			if (button >= (u32)NUMBER_OF_BUTTONS)
+				return false;
+
+			return (ButtonStates & (1 << button)) ? true : false;
+		}
+	};
+
+	//! Any kind of log event.
+	struct SLogEvent
+	{
+		//! Pointer to text which has been logged
+		const c8 *Text;
+
+		//! Log level in which the text has been logged
+		ELOG_LEVEL Level;
+	};
+
+	//! Any kind of user event.
+	struct SUserEvent
+	{
+		//! Some user specified data as int
+		size_t UserData1;
+
+		//! Another user specified data as int
+		size_t UserData2;
+	};
+
+	// Application state event
+	struct SApplicationEvent
+	{
+		EAPPLICATION_EVENT_TYPE EventType;
+	};
+
+	EEVENT_TYPE EventType;
+	union
+	{
+		struct SGUIEvent GUIEvent;
+		struct SMouseInput MouseInput;
+		struct SKeyInput KeyInput;
+		struct SStringInput StringInput;
+		struct STouchInput TouchInput;
+		struct SAccelerometerEvent AccelerometerEvent;
+		struct SGyroscopeEvent GyroscopeEvent;
+		struct SDeviceMotionEvent DeviceMotionEvent;
+		struct SJoystickEvent JoystickEvent;
+		struct SLogEvent LogEvent;
+		struct SUserEvent UserEvent;
+		struct SApplicationEvent ApplicationEvent;
+	};
+};
+
+//! Interface of an object which can receive events.
+/** Many of the engine's classes inherit IEventReceiver so they are able to
+process events. Events usually start at a postEventFromUser function and are
+passed down through a chain of event receivers until OnEvent returns true. See
+irr::EEVENT_TYPE for a description of where each type of event starts, and the
+path it takes through the system. */
+class IEventReceiver
+{
+public:
+	//! Destructor
+	virtual ~IEventReceiver() {}
+
+	//! Called if an event happened.
+	/** Please take care that you should only return 'true' when you want to _prevent_ Irrlicht
+	* from processing the event any further. So 'true' does mean that an event is completely done.
+	* Therefore your return value for all unprocessed events should be 'false'.
+	\return True if the event was processed.
+	*/
+	virtual bool OnEvent(const SEvent &event) = 0;
+};
+
+//! Information on a joystick, returned from @ref irr::IrrlichtDevice::activateJoysticks()
+struct SJoystickInfo
+{
+	//! The ID of the joystick
+	/** This is an internal Irrlicht index; it does not map directly
+	 * to any particular hardware joystick. It corresponds to the
+	 * irr::SJoystickEvent Joystick ID. */
+	u8 Joystick;
+
+	//! The name that the joystick uses to identify itself.
+	core::stringc Name;
+
+	//! The number of buttons that the joystick has.
+	u32 Buttons;
+
+	//! The number of axes that the joystick has, i.e. X, Y, Z, R, U, V.
+	/** Note: with a Linux device, the POV hat (if any) will use two axes. These
+	 *  will be included in this count. */
+	u32 Axes;
+
+	//! An indication of whether the joystick has a POV hat.
+	/** A Windows device will identify the presence or absence of the POV hat.
+	 *  A Linux device cannot, and will always return POV_HAT_UNKNOWN. */
+	enum
+	{
+		//! A hat is definitely present.
+		POV_HAT_PRESENT,
+
+		//! A hat is definitely not present.
+		POV_HAT_ABSENT,
+
+		//! The presence or absence of a hat cannot be determined.
+		POV_HAT_UNKNOWN
+	} PovHat;
+}; // struct SJoystickInfo
+
+} // end namespace irr
diff --git a/irr/include/IFileArchive.h b/irr/include/IFileArchive.h
new file mode 100644
index 000000000..fb77b48c4
--- /dev/null
+++ b/irr/include/IFileArchive.h
@@ -0,0 +1,127 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt/ Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReadFile.h"
+#include "IFileList.h"
+
+namespace irr
+{
+
+namespace io
+{
+
+//! FileSystemType: which filesystem should be used for e.g. browsing
+enum EFileSystemType
+{
+	FILESYSTEM_NATIVE = 0, // Native OS FileSystem
+	FILESYSTEM_VIRTUAL     // Virtual FileSystem
+};
+
+//! Contains the different types of archives
+enum E_FILE_ARCHIVE_TYPE
+{
+	//! A PKZIP archive
+	EFAT_ZIP = MAKE_IRR_ID('Z', 'I', 'P', 0),
+
+	//! A gzip archive
+	EFAT_GZIP = MAKE_IRR_ID('g', 'z', 'i', 'p'),
+
+	//! An Android asset file archive
+	EFAT_ANDROID_ASSET = MAKE_IRR_ID('A', 'S', 'S', 'E'),
+
+	//! The type of this archive is unknown
+	EFAT_UNKNOWN = MAKE_IRR_ID('u', 'n', 'k', 'n')
+};
+
+//! The FileArchive manages archives and provides access to files inside them.
+class IFileArchive : public virtual IReferenceCounted
+{
+public:
+	//! Opens a file based on its name
+	/** Creates and returns a new IReadFile for a file in the archive.
+	\param filename The file to open
+	\return Returns A pointer to the created file on success,
+	or 0 on failure. */
+	virtual IReadFile *createAndOpenFile(const path &filename) = 0;
+
+	//! Opens a file based on its position in the file list.
+	/** Creates and returns
+	\param index The zero based index of the file.
+	\return Returns a pointer to the created file on success, or 0 on failure. */
+	virtual IReadFile *createAndOpenFile(u32 index) = 0;
+
+	//! Returns the complete file tree
+	/** \return Returns the complete directory tree for the archive,
+	including all files and folders */
+	virtual const IFileList *getFileList() const = 0;
+
+	//! get the archive type
+	virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_UNKNOWN; }
+
+	//! return the name (id) of the file Archive
+	virtual const io::path &getArchiveName() const = 0;
+
+	//! Add a directory in the archive and all it's files to the FileList
+	/** Only needed for file-archives which have no information about their own
+	directory structure. In that case the user must add directories manually.
+	Currently this is necessary for archives of type EFAT_ANDROID_ASSET.
+	The root-path itself is already set by the engine.
+	If directories are not added manually opening files might still work,
+	but checks if file exists will fail.
+	*/
+	virtual void addDirectoryToFileList(const io::path &filename) {}
+
+	//! An optionally used password string
+	/** This variable is publicly accessible from the interface in order to
+	avoid single access patterns to this place, and hence allow some more
+	obscurity.
+	*/
+	core::stringc Password;
+};
+
+//! Class which is able to create an archive from a file.
+/** If you want the Irrlicht Engine be able to load archives of
+currently unsupported file formats (e.g .wad), then implement
+this and add your new Archive loader with
+IFileSystem::addArchiveLoader() to the engine. */
+class IArchiveLoader : public virtual IReferenceCounted
+{
+public:
+	//! Check if the file might be loaded by this class
+	/** Check based on the file extension (e.g. ".zip")
+	\param filename Name of file to check.
+	\return True if file seems to be loadable. */
+	virtual bool isALoadableFileFormat(const path &filename) const = 0;
+
+	//! Check if the file might be loaded by this class
+	/** This check may look into the file.
+	\param file File handle to check.
+	\return True if file seems to be loadable. */
+	virtual bool isALoadableFileFormat(io::IReadFile *file) const = 0;
+
+	//! Check to see if the loader can create archives of this type.
+	/** Check based on the archive type.
+	\param fileType The archive type to check.
+	\return True if the archive loader supports this type, false if not */
+	virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const = 0;
+
+	//! Creates an archive from the filename
+	/** \param filename File to use.
+	\param ignoreCase Searching is performed without regarding the case
+	\param ignorePaths Files are searched for without checking for the directories
+	\return Pointer to newly created archive, or 0 upon error. */
+	virtual IFileArchive *createArchive(const path &filename, bool ignoreCase, bool ignorePaths) const = 0;
+
+	//! Creates an archive from the file
+	/** \param file File handle to use.
+	\param ignoreCase Searching is performed without regarding the case
+	\param ignorePaths Files are searched for without checking for the directories
+	\return Pointer to newly created archive, or 0 upon error. */
+	virtual IFileArchive *createArchive(io::IReadFile *file, bool ignoreCase, bool ignorePaths) const = 0;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IFileList.h b/irr/include/IFileList.h
new file mode 100644
index 000000000..f33b1628f
--- /dev/null
+++ b/irr/include/IFileList.h
@@ -0,0 +1,89 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Provides a list of files and folders.
+/** File lists usually contain a list of all files in a given folder,
+but can also contain a complete directory structure. */
+class IFileList : public virtual IReferenceCounted
+{
+public:
+	//! Get the number of files in the filelist.
+	/** \return Amount of files and directories in the file list. */
+	virtual u32 getFileCount() const = 0;
+
+	//! Gets the name of a file in the list, based on an index.
+	/** The path is not included in this name. Use getFullFileName for this.
+	\param index is the zero based index of the file which name should
+	be returned. The index must be less than the amount getFileCount() returns.
+	\return File name of the file. Returns 0, if an error occurred. */
+	virtual const io::path &getFileName(u32 index) const = 0;
+
+	//! Gets the full name of a file in the list including the path, based on an index.
+	/** \param index is the zero based index of the file which name should
+	be returned. The index must be less than the amount getFileCount() returns.
+	\return File name of the file. Returns 0 if an error occurred. */
+	virtual const io::path &getFullFileName(u32 index) const = 0;
+
+	//! Returns the size of a file in the file list, based on an index.
+	/** \param index is the zero based index of the file which should be returned.
+	The index must be less than the amount getFileCount() returns.
+	\return The size of the file in bytes. */
+	virtual u32 getFileSize(u32 index) const = 0;
+
+	//! Returns the file offset of a file in the file list, based on an index.
+	/** \param index is the zero based index of the file which should be returned.
+	The index must be less than the amount getFileCount() returns.
+	\return The offset of the file in bytes. */
+	virtual u32 getFileOffset(u32 index) const = 0;
+
+	//! Returns the ID of a file in the file list, based on an index.
+	/** This optional ID can be used to link the file list entry to information held
+	elsewhere. For example this could be an index in an IFileArchive, linking the entry
+	to its data offset, uncompressed size and CRC.
+	\param index is the zero based index of the file which should be returned.
+	The index must be less than the amount getFileCount() returns.
+	\return The ID of the file. */
+	virtual u32 getID(u32 index) const = 0;
+
+	//! Check if the file is a directory
+	/** \param index The zero based index which will be checked. The index
+	must be less than the amount getFileCount() returns.
+	\return True if the file is a directory, else false. */
+	virtual bool isDirectory(u32 index) const = 0;
+
+	//! Searches for a file or folder in the list
+	/** Searches for a file by name
+	\param filename The name of the file to search for.
+	\param isFolder True if you are searching for a directory path, false if you are searching for a file
+	\return Returns the index of the file in the file list, or -1 if
+	no matching name name was found. */
+	virtual s32 findFile(const io::path &filename, bool isFolder = false) const = 0;
+
+	//! Returns the base path of the file list
+	virtual const io::path &getPath() const = 0;
+
+	//! Add as a file or folder to the list
+	/** \param fullPath The file name including path, from the root of the file list.
+	\param isDirectory True if this is a directory rather than a file.
+	\param offset The file offset inside an archive
+	\param size The size of the file in bytes.
+	\param id The ID of the file in the archive which owns it */
+	virtual u32 addItem(const io::path &fullPath, u32 offset, u32 size, bool isDirectory, u32 id = 0) = 0;
+
+	//! Sorts the file list. You should call this after adding any items to the file list
+	virtual void sort() = 0;
+};
+
+} // end namespace irr
+} // end namespace io
diff --git a/irr/include/IFileSystem.h b/irr/include/IFileSystem.h
new file mode 100644
index 000000000..1fe9fe6f2
--- /dev/null
+++ b/irr/include/IFileSystem.h
@@ -0,0 +1,265 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "IFileArchive.h"
+
+namespace irr
+{
+namespace video
+{
+class IVideoDriver;
+} // end namespace video
+namespace io
+{
+
+class IReadFile;
+class IWriteFile;
+class IFileList;
+class IAttributes;
+
+//! The FileSystem manages files and archives and provides access to them.
+/** It manages where files are, so that modules which use the the IO do not
+need to know where every file is located. A file could be in a .zip-Archive or
+as file on disk, using the IFileSystem makes no difference to this. */
+class IFileSystem : public virtual IReferenceCounted
+{
+public:
+	//! Opens a file for read access.
+	/** \param filename: Name of file to open.
+	\return Pointer to the created file interface.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information. */
+	virtual IReadFile *createAndOpenFile(const path &filename) = 0;
+
+	//! Creates an IReadFile interface for accessing memory like a file.
+	/** This allows you to use a pointer to memory where an IReadFile is requested.
+	\param memory: A pointer to the start of the file in memory
+	\param len: The length of the memory in bytes
+	\param fileName: The name given to this file
+	\param deleteMemoryWhenDropped: True if the memory should be deleted
+	along with the IReadFile when it is dropped.
+	\return Pointer to the created file interface.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information.
+	*/
+	virtual IReadFile *createMemoryReadFile(const void *memory, s32 len, const path &fileName, bool deleteMemoryWhenDropped = false) = 0;
+
+	//! Creates an IReadFile interface for accessing files inside files.
+	/** This is useful e.g. for archives.
+	\param fileName: The name given to this file
+	\param alreadyOpenedFile: Pointer to the enclosing file
+	\param pos: Start of the file inside alreadyOpenedFile
+	\param areaSize: The length of the file
+	\return A pointer to the created file interface.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information.
+	*/
+	virtual IReadFile *createLimitReadFile(const path &fileName,
+			IReadFile *alreadyOpenedFile, long pos, long areaSize) = 0;
+
+	//! Creates an IWriteFile interface for accessing memory like a file.
+	/** This allows you to use a pointer to memory where an IWriteFile is requested.
+		You are responsible for allocating enough memory.
+	\param memory: A pointer to the start of the file in memory (allocated by you)
+	\param len: The length of the memory in bytes
+	\param fileName: The name given to this file
+	\param deleteMemoryWhenDropped: True if the memory should be deleted
+	along with the IWriteFile when it is dropped.
+	\return Pointer to the created file interface.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information.
+	*/
+	virtual IWriteFile *createMemoryWriteFile(void *memory, s32 len, const path &fileName, bool deleteMemoryWhenDropped = false) = 0;
+
+	//! Opens a file for write access.
+	/** \param filename: Name of file to open.
+	\param append: If the file already exist, all write operations are
+	appended to the file.
+	\return Pointer to the created file interface. 0 is returned, if the
+	file could not created or opened for writing.
+	The returned pointer should be dropped when no longer needed.
+	See IReferenceCounted::drop() for more information. */
+	virtual IWriteFile *createAndWriteFile(const path &filename, bool append = false) = 0;
+
+	//! Adds an archive to the file system.
+	/** After calling this, the Irrlicht Engine will also search and open
+	files directly from this archive. This is useful for hiding data from
+	the end user, speeding up file access and making it possible to access
+	for example Quake3 .pk3 files, which are just renamed .zip files. By
+	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
+	archives. You can provide your own archive types by implementing
+	IArchiveLoader and passing an instance to addArchiveLoader.
+	Irrlicht supports AES-encrypted zip files, and the advanced compression
+	techniques lzma and bzip2.
+	\param filename: Filename of the archive to add to the file system.
+	\param ignoreCase: If set to true, files in the archive can be accessed without
+	writing all letters in the right case.
+	\param ignorePaths: If set to true, files in the added archive can be accessed
+	without its complete path.
+	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
+	the type of archive will depend on the extension of the file name. If
+	you use a different extension then you can use this parameter to force
+	a specific type of archive.
+	\param password An optional password, which is used in case of encrypted archives.
+	\param retArchive A pointer that will be set to the archive that is added.
+	\return True if the archive was added successfully, false if not. */
+	virtual bool addFileArchive(const path &filename, bool ignoreCase = true,
+			bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			IFileArchive **retArchive = 0) = 0;
+
+	//! Adds an archive to the file system.
+	/** After calling this, the Irrlicht Engine will also search and open
+	files directly from this archive. This is useful for hiding data from
+	the end user, speeding up file access and making it possible to access
+	for example Quake3 .pk3 files, which are just renamed .zip files. By
+	default Irrlicht supports ZIP, PAK, TAR, PNK, and directories as
+	archives. You can provide your own archive types by implementing
+	IArchiveLoader and passing an instance to addArchiveLoader.
+	Irrlicht supports AES-encrypted zip files, and the advanced compression
+	techniques lzma and bzip2.
+	If you want to add a directory as an archive, prefix its name with a
+	slash in order to let Irrlicht recognize it as a folder mount (mypath/).
+	Using this technique one can build up a search order, because archives
+	are read first, and can be used more easily with relative filenames.
+	\param file: Archive to add to the file system.
+	\param ignoreCase: If set to true, files in the archive can be accessed without
+	writing all letters in the right case.
+	\param ignorePaths: If set to true, files in the added archive can be accessed
+	without its complete path.
+	\param archiveType: If no specific E_FILE_ARCHIVE_TYPE is selected then
+	the type of archive will depend on the extension of the file name. If
+	you use a different extension then you can use this parameter to force
+	a specific type of archive.
+	\param password An optional password, which is used in case of encrypted archives.
+	\param retArchive A pointer that will be set to the archive that is added.
+	\return True if the archive was added successfully, false if not. */
+	virtual bool addFileArchive(IReadFile *file, bool ignoreCase = true,
+			bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			IFileArchive **retArchive = 0) = 0;
+
+	//! Adds an archive to the file system.
+	/** \param archive: The archive to add to the file system.
+	\return True if the archive was added successfully, false if not. */
+	virtual bool addFileArchive(IFileArchive *archive) = 0;
+
+	//! Get the number of archives currently attached to the file system
+	virtual u32 getFileArchiveCount() const = 0;
+
+	//! Removes an archive from the file system.
+	/** This will close the archive and free any file handles, but will not
+	close resources which have already been loaded and are now cached, for
+	example textures and meshes.
+	\param index: The index of the archive to remove
+	\return True on success, false on failure */
+	virtual bool removeFileArchive(u32 index) = 0;
+
+	//! Removes an archive from the file system.
+	/** This will close the archive and free any file handles, but will not
+	close resources which have already been loaded and are now cached, for
+	example textures and meshes. Note that a relative filename might be
+	interpreted differently on each call, depending on the current working
+	directory. In case you want to remove an archive that was added using
+	a relative path name, you have to change to the same working directory
+	again. This means, that the filename given on creation is not an
+	identifier for the archive, but just a usual filename that is used for
+	locating the archive to work with.
+	\param filename The archive pointed to by the name will be removed
+	\return True on success, false on failure */
+	virtual bool removeFileArchive(const path &filename) = 0;
+
+	//! Removes an archive from the file system.
+	/** This will close the archive and free any file handles, but will not
+	close resources which have already been loaded and are now cached, for
+	example textures and meshes.
+	\param archive The archive to remove.
+	\return True on success, false on failure */
+	virtual bool removeFileArchive(const IFileArchive *archive) = 0;
+
+	//! Changes the search order of attached archives.
+	/**
+	\param sourceIndex: The index of the archive to change
+	\param relative: The relative change in position, archives with a lower index are searched first */
+	virtual bool moveFileArchive(u32 sourceIndex, s32 relative) = 0;
+
+	//! Get the archive at a given index.
+	virtual IFileArchive *getFileArchive(u32 index) = 0;
+
+	//! Adds an external archive loader to the engine.
+	/** Use this function to add support for new archive types to the
+	engine, for example proprietary or encrypted file storage. */
+	virtual void addArchiveLoader(IArchiveLoader *loader) = 0;
+
+	//! Gets the number of archive loaders currently added
+	virtual u32 getArchiveLoaderCount() const = 0;
+
+	//! Retrieve the given archive loader
+	/** \param index The index of the loader to retrieve. This parameter is an 0-based
+	array index.
+	\return A pointer to the specified loader, 0 if the index is incorrect. */
+	virtual IArchiveLoader *getArchiveLoader(u32 index) const = 0;
+
+	//! Get the current working directory.
+	/** \return Current working directory as a string. */
+	virtual const path &getWorkingDirectory() = 0;
+
+	//! Changes the current working directory.
+	/** \param newDirectory: A string specifying the new working directory.
+	The string is operating system dependent. Under Windows it has
+	the form "<drive>:\<directory>\<sudirectory>\<..>". An example would be: "C:\Windows\"
+	\return True if successful, otherwise false. */
+	virtual bool changeWorkingDirectoryTo(const path &newDirectory) = 0;
+
+	//! Converts a relative path to an absolute (unique) path, resolving symbolic links if required
+	/** \param filename Possibly relative file or directory name to query.
+	\result Absolute filename which points to the same file. */
+	virtual path getAbsolutePath(const path &filename) const = 0;
+
+	//! Get the directory a file is located in.
+	/** \param filename: The file to get the directory from.
+	\return String containing the directory of the file. */
+	virtual path getFileDir(const path &filename) const = 0;
+
+	//! Get the base part of a filename, i.e. the name without the directory part.
+	/** If no directory is prefixed, the full name is returned.
+	\param filename: The file to get the basename from
+	\param keepExtension True if filename with extension is returned otherwise everything
+	after the final '.' is removed as well. */
+	virtual path getFileBasename(const path &filename, bool keepExtension = true) const = 0;
+
+	//! flatten a path and file name for example: "/you/me/../." becomes "/you"
+	virtual path &flattenFilename(path &directory, const path &root = "/") const = 0;
+
+	//! Get the relative filename, relative to the given directory
+	virtual path getRelativeFilename(const path &filename, const path &directory) const = 0;
+
+	//! Creates a list of files and directories in the current working directory and returns it.
+	/** \return a Pointer to the created IFileList is returned. After the list has been used
+	it has to be deleted using its IFileList::drop() method.
+	See IReferenceCounted::drop() for more information. */
+	virtual IFileList *createFileList() = 0;
+
+	//! Creates an empty filelist
+	/** \return a Pointer to the created IFileList is returned. After the list has been used
+	it has to be deleted using its IFileList::drop() method.
+	See IReferenceCounted::drop() for more information. */
+	virtual IFileList *createEmptyFileList(const io::path &path, bool ignoreCase, bool ignorePaths) = 0;
+
+	//! Set the active type of file system.
+	virtual EFileSystemType setFileListSystem(EFileSystemType listType) = 0;
+
+	//! Determines if a file exists and could be opened.
+	/** \param filename is the string identifying the file which should be tested for existence.
+	\return True if file exists, and false if it does not exist or an error occurred. */
+	virtual bool existFile(const path &filename) const = 0;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IGPUProgrammingServices.h b/irr/include/IGPUProgrammingServices.h
new file mode 100644
index 000000000..de24a912d
--- /dev/null
+++ b/irr/include/IGPUProgrammingServices.h
@@ -0,0 +1,369 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "EShaderTypes.h"
+#include "EMaterialTypes.h"
+#include "EPrimitiveTypes.h"
+#include "path.h"
+
+namespace irr
+{
+
+namespace io
+{
+class IReadFile;
+} // end namespace io
+
+namespace video
+{
+
+class IVideoDriver;
+class IShaderConstantSetCallBack;
+
+//! Interface making it possible to create and use programs running on the GPU.
+class IGPUProgrammingServices
+{
+public:
+	//! Destructor
+	virtual ~IGPUProgrammingServices() {}
+
+	//! Adds a new high-level shading material renderer to the VideoDriver.
+	/** Currently only HLSL/D3D9 and GLSL/OpenGL are supported.
+	\param vertexShaderProgram String containing the source of the vertex
+	shader program. This can be 0 if no vertex program shall be used.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram (p.e. "main")
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgram String containing the source of the pixel
+	shader program. This can be 0 if no pixel shader shall be used.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgram String containing the source of the
+	geometry shader program. This can be 0 if no geometry shader shall be
+	used.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\param callback Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex,
+	pixel, and geometry shader program constants. Set this to 0 if you
+	don't need this.
+	\param baseMaterial Base material which renderstates will be used to
+	shade the material.
+	\param userData a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an error
+	occurred, e.g. if a shader program could not be compiled or a compile
+	target is not reachable. The error strings are then printed to the
+	error log and can be caught with a custom event receiver. */
+	virtual s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			const c8 *pixelShaderProgram,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			const c8 *geometryShaderProgram,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgram,
+				pixelShaderEntryPointName, psCompileTarget,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, without geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1.
+	*/
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *pixelShaderProgram = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, "main",
+				EVST_VS_1_1, pixelShaderProgram,
+				"main", EPST_PS_1_1,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, with geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1 and geometry shader 4.0.
+	*/
+	s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *geometryShaderProgram = 0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterial(
+				vertexShaderProgram, "main",
+				EVST_VS_1_1, pixelShaderProgram,
+				"main", EPST_PS_1_1,
+				geometryShaderProgram, "main", EGST_GS_4_0,
+				inType, outType, verticesOut,
+				callback, baseMaterial, userData);
+	}
+
+	//! Like addHighLevelShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgramFileName Text file containing the source
+	of the vertex shader program. Set to empty string if no vertex shader
+	shall be created.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram  (p.e. "main")
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgramFileName Text file containing the source of
+	the pixel shader program. Set to empty string if no pixel shader shall
+	be created.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgramFileName Name of the source of
+	the geometry shader program. Set to empty string if no geometry shader
+	shall be created.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\param callback Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex,
+	pixel, and geometry shader program constants. Set this to 0 if you
+	don't need this.
+	\param baseMaterial Base material which renderstates will be used to
+	shade the material.
+	\param userData a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an error
+	occurred, e.g. if a shader program could not be compiled or a compile
+	target is not reachable. The error strings are then printed to the
+	error log and can be caught with a custom event receiver. */
+	virtual s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			const io::path &pixelShaderProgramFileName,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			const io::path &geometryShaderProgramFileName,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const io::path &pixelShaderProgramFileName = "",
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgramFileName,
+				pixelShaderEntryPointName, psCompileTarget,
+				"", "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, without geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1.
+	*/
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const io::path &pixelShaderProgramFileName = "",
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, "main",
+				EVST_VS_1_1, pixelShaderProgramFileName,
+				"main", EPST_PS_1_1,
+				"", "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! convenience function for use with many defaults, with geometry shader
+	/** All shader names are set to "main" and compile targets are shader
+	type 1.1 and geometry shader 4.0.
+	*/
+	s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFileName,
+			const io::path &pixelShaderProgramFileName = "",
+			const io::path &geometryShaderProgramFileName = "",
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgramFileName, "main",
+				EVST_VS_1_1, pixelShaderProgramFileName,
+				"main", EPST_PS_1_1,
+				geometryShaderProgramFileName, "main", EGST_GS_4_0,
+				inType, outType, verticesOut,
+				callback, baseMaterial, userData);
+	}
+
+	//! Like addHighLevelShaderMaterial(), but loads from files.
+	/** \param vertexShaderProgram Text file handle containing the source
+	of the vertex shader program. Set to 0 if no vertex shader shall be
+	created.
+	\param vertexShaderEntryPointName Name of the entry function of the
+	vertexShaderProgram
+	\param vsCompileTarget Vertex shader version the high level shader
+	shall be compiled to.
+	\param pixelShaderProgram Text file handle containing the source of
+	the pixel shader program. Set to 0 if no pixel shader shall be created.
+	\param pixelShaderEntryPointName Entry name of the function of the
+	pixelShaderProgram (p.e. "main")
+	\param psCompileTarget Pixel shader version the high level shader
+	shall be compiled to.
+	\param geometryShaderProgram Text file handle containing the source of
+	the geometry shader program. Set to 0 if no geometry shader shall be
+	created.
+	\param geometryShaderEntryPointName Entry name of the function of the
+	geometryShaderProgram (p.e. "main")
+	\param gsCompileTarget Geometry shader version the high level shader
+	shall be compiled to.
+	\param inType Type of vertices passed to geometry shader
+	\param outType Type of vertices created by geometry shader
+	\param verticesOut Maximal number of vertices created by geometry
+	shader. If 0, maximal number supported is assumed.
+	\param callback Pointer to an implementation of
+	IShaderConstantSetCallBack in which you can set the needed vertex and
+	pixel shader program constants. Set this to 0 if you don't need this.
+	\param baseMaterial Base material which renderstates will be used to
+	shade the material.
+	\param userData a user data int. This int can be set to any value and
+	will be set as parameter in the callback method when calling
+	OnSetConstants(). In this way it is easily possible to use the same
+	callback method for multiple materials and distinguish between them
+	during the call.
+	\return Number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if an
+	error occurred, e.g. if a shader program could not be compiled or a
+	compile target is not reachable. The error strings are then printed to
+	the error log and can be caught with a custom event receiver. */
+	virtual s32 addHighLevelShaderMaterialFromFiles(
+			io::IReadFile *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			io::IReadFile *pixelShaderProgram,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			io::IReadFile *geometryShaderProgram,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) = 0;
+
+	//! convenience function for use without geometry shaders
+	s32 addHighLevelShaderMaterialFromFiles(
+			io::IReadFile *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			io::IReadFile *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0)
+	{
+		return addHighLevelShaderMaterialFromFiles(
+				vertexShaderProgram, vertexShaderEntryPointName,
+				vsCompileTarget, pixelShaderProgram,
+				pixelShaderEntryPointName, psCompileTarget,
+				0, "main", EGST_GS_4_0,
+				scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0,
+				callback, baseMaterial, userData);
+	}
+
+	//! Delete a shader material and associated data.
+	/**
+	After you have deleted a material it is invalid to still use and doing
+	so might result in a crash. The ID may be reused in the future when new
+	materials are added.
+	\param material Number of the material type. Must not be a built-in
+	material. */
+	virtual void deleteShaderMaterial(s32 material) = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IGUIButton.h b/irr/include/IGUIButton.h
new file mode 100644
index 000000000..8870f8b1c
--- /dev/null
+++ b/irr/include/IGUIButton.h
@@ -0,0 +1,256 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+
+namespace video
+{
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+class IGUIFont;
+class IGUISpriteBank;
+
+//! Current state of buttons used for drawing sprites.
+//! Note that up to 3 states can be active at the same time:
+//! EGBS_BUTTON_UP or EGBS_BUTTON_DOWN
+//! EGBS_BUTTON_MOUSE_OVER or EGBS_BUTTON_MOUSE_OFF
+//! EGBS_BUTTON_FOCUSED or EGBS_BUTTON_NOT_FOCUSED
+enum EGUI_BUTTON_STATE
+{
+	//! The button is not pressed.
+	EGBS_BUTTON_UP = 0,
+	//! The button is currently pressed down.
+	EGBS_BUTTON_DOWN,
+	//! The mouse cursor is over the button
+	EGBS_BUTTON_MOUSE_OVER,
+	//! The mouse cursor is not over the button
+	EGBS_BUTTON_MOUSE_OFF,
+	//! The button has the focus
+	EGBS_BUTTON_FOCUSED,
+	//! The button doesn't have the focus
+	EGBS_BUTTON_NOT_FOCUSED,
+	//! The button is disabled All other states are ignored in that case.
+	EGBS_BUTTON_DISABLED,
+	//! not used, counts the number of enumerated items
+	EGBS_COUNT
+};
+
+//! Names for gui button state icons
+const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
+		"buttonUp",
+		"buttonDown",
+		"buttonMouseOver",
+		"buttonMouseOff",
+		"buttonFocused",
+		"buttonNotFocused",
+		"buttonDisabled",
+		0, // count
+	};
+
+//! State of buttons used for drawing texture images.
+//! Note that only a single state is active at a time
+//! Also when no image is defined for a state it will use images from another state
+//! and if that state is not set from the replacement for that,etc.
+//! So in many cases setting EGBIS_IMAGE_UP and EGBIS_IMAGE_DOWN is sufficient.
+enum EGUI_BUTTON_IMAGE_STATE
+{
+	//! When no other states have images they will all use this one.
+	EGBIS_IMAGE_UP,
+	//! When not set EGBIS_IMAGE_UP is used.
+	EGBIS_IMAGE_UP_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP_MOUSEOVER is used.
+	EGBIS_IMAGE_UP_FOCUSED,
+	//! When not set EGBIS_IMAGE_UP_FOCUSED is used.
+	EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP is used.
+	EGBIS_IMAGE_DOWN,
+	//! When not set EGBIS_IMAGE_DOWN is used.
+	EGBIS_IMAGE_DOWN_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_DOWN_MOUSEOVER is used.
+	EGBIS_IMAGE_DOWN_FOCUSED,
+	//! When not set EGBIS_IMAGE_DOWN_FOCUSED is used.
+	EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER,
+	//! When not set EGBIS_IMAGE_UP or EGBIS_IMAGE_DOWN are used (depending on button state).
+	EGBIS_IMAGE_DISABLED,
+	//! not used, counts the number of enumerated items
+	EGBIS_COUNT
+};
+
+//! Names for gui button image states
+const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
+		"Image", // not "ImageUp" as it otherwise breaks serialization of old files
+		"ImageUpOver",
+		"ImageUpFocused",
+		"ImageUpFocusedOver",
+		"PressedImage", // not "ImageDown" as it otherwise breaks serialization of old files
+		"ImageDownOver",
+		"ImageDownFocused",
+		"ImageDownFocusedOver",
+		"ImageDisabled",
+		0, // count
+	};
+
+//! GUI Button interface.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_BUTTON_CLICKED
+*/
+class IGUIButton : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIButton(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_BUTTON, environment, parent, id, rectangle) {}
+
+	//! Sets another skin independent font.
+	/** If this is set to zero, the button uses the font of the skin.
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	virtual IGUIFont *getOverrideFont(void) const = 0;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
+
+	//! Sets another color for the button text.
+	/** When set, this color is used instead of EGDC_BUTTON_TEXT/EGDC_GRAY_TEXT.
+	You don't need to call enableOverrideColor(true), that's done by this function.
+	If you want the the color of the skin back, call enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
+
+	//! Gets the override color
+	/** \return: The override color */
+	virtual video::SColor getOverrideColor(void) const = 0;
+
+	//! Gets the currently used text color
+	/** Either a skin-color for the current state or the override color */
+	virtual video::SColor getActiveColor() const = 0;
+
+	//! Sets if the button text should use the override color or the color in the gui skin.
+	/** \param enable: If set to true, the override color, which can be set
+	with IGUIStaticText::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT or EGDC_GRAY_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	virtual bool isOverrideColorEnabled(void) const = 0;
+
+	//! Sets an image which should be displayed on the button when it is in the given state.
+	/** Only one image-state can be active at a time. Images are drawn below sprites.
+	If a state is without image it will try to use images from other states as described
+	in ::EGUI_BUTTON_IMAGE_STATE.
+	Images are a little less flexible than sprites, but easier to use.
+	\param state: One of ::EGUI_BUTTON_IMAGE_STATE
+	\param image: Image to be displayed or NULL to remove the image
+	\param sourceRect: Source rectangle on the image texture. When width or height are 0 then the full texture-size is used (default). */
+	virtual void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture *image = 0, const core::rect<s32> &sourceRect = core::rect<s32>(0, 0, 0, 0)) = 0;
+
+	//! Sets an image which should be displayed on the button when it is in normal state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image); and might be deprecated in future revisions.
+	\param image: Image to be displayed */
+	virtual void setImage(video::ITexture *image = 0) = 0;
+
+	//! Sets a background image for the button when it is in normal state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_UP, image, sourceRect); and might be deprecated in future revisions.
+	\param image: Texture containing the image to be displayed
+	\param sourceRect: Position in the texture, where the image is located.
+	When width or height are 0 then the full texture-size is used */
+	virtual void setImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
+
+	//! Sets a background image for the button when it is in pressed state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image); and might be deprecated in future revisions.
+	If no images is specified for the pressed state via
+	setPressedImage(), this image is also drawn in pressed state.
+	\param image: Image to be displayed */
+	virtual void setPressedImage(video::ITexture *image = 0) = 0;
+
+	//! Sets an image which should be displayed on the button when it is in pressed state.
+	/** This is identical to calling setImage(EGBIS_IMAGE_DOWN, image, sourceRect); and might be deprecated in future revisions.
+	\param image: Texture containing the image to be displayed
+	\param sourceRect: Position in the texture, where the image is located */
+	virtual void setPressedImage(video::ITexture *image, const core::rect<s32> &sourceRect) = 0;
+
+	//! Sets the sprite bank used by the button
+	/** NOTE: The spritebank itself is _not_ serialized so far. The sprites are serialized.
+	Which means after loading the gui you still have to set the spritebank manually. */
+	virtual void setSpriteBank(IGUISpriteBank *bank = 0) = 0;
+
+	//! Sets the animated sprite for a specific button state
+	/** Several sprites can be drawn at the same time.
+	Sprites can be animated.
+	Sprites are drawn above the images.
+	\param index: Number of the sprite within the sprite bank, use -1 for no sprite
+	\param state: State of the button to set the sprite for
+	\param index: The sprite number from the current sprite bank
+	\param color: The color of the sprite
+	\param loop: True if the animation should loop, false if not
+	\param scale: True if the sprite should scale to button size, false if not	*/
+	virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
+			video::SColor color = video::SColor(255, 255, 255, 255), bool loop = false) = 0;
+
+	//! Get the sprite-index for the given state or -1 when no sprite is set
+	virtual s32 getSpriteIndex(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Get the sprite color for the given state. Color is only used when a sprite is set.
+	virtual video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Returns if the sprite in the given state does loop
+	virtual bool getSpriteLoop(EGUI_BUTTON_STATE state) const = 0;
+
+	//! Sets if the button should behave like a push button.
+	/** Which means it can be in two states: Normal or Pressed. With a click on the button,
+	the user can change the state of the button. */
+	virtual void setIsPushButton(bool isPushButton = true) = 0;
+
+	//! Sets the pressed state of the button if this is a pushbutton
+	virtual void setPressed(bool pressed = true) = 0;
+
+	//! Returns if the button is currently pressed
+	virtual bool isPressed() const = 0;
+
+	//! Sets if the alpha channel should be used for drawing background images on the button (default is false)
+	virtual void setUseAlphaChannel(bool useAlphaChannel = true) = 0;
+
+	//! Returns if the alpha channel should be used for drawing background images on the button
+	virtual bool isAlphaChannelUsed() const = 0;
+
+	//! Returns whether the button is a push button
+	virtual bool isPushButton() const = 0;
+
+	//! Sets if the button should use the skin to draw its border and button face (default is true)
+	virtual void setDrawBorder(bool border = true) = 0;
+
+	//! Returns if the border and button face are being drawn using the skin
+	virtual bool isDrawingBorder() const = 0;
+
+	//! Sets if the button should scale the button images to fit
+	virtual void setScaleImage(bool scaleImage = true) = 0;
+
+	//! Checks whether the button scales the used images
+	virtual bool isScalingImage() const = 0;
+
+	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
+	/** Generated together with event, so info is available in the event-receiver.	*/
+	virtual bool getClickShiftState() const = 0;
+
+	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
+	/** Generated together with event, so info is available in the event-receiver.	*/
+	virtual bool getClickControlState() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUICheckBox.h b/irr/include/IGUICheckBox.h
new file mode 100644
index 000000000..0e71510b8
--- /dev/null
+++ b/irr/include/IGUICheckBox.h
@@ -0,0 +1,47 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! GUI Check box interface.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_CHECKBOX_CHANGED
+*/
+class IGUICheckBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUICheckBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_CHECK_BOX, environment, parent, id, rectangle) {}
+
+	//! Set if box is checked.
+	virtual void setChecked(bool checked) = 0;
+
+	//! Returns true if box is checked.
+	virtual bool isChecked() const = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Checks if background drawing is enabled
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+
+	//! Sets whether to draw the border
+	virtual void setDrawBorder(bool draw) = 0;
+
+	//! Checks if border drawing is enabled
+	/** \return true if border drawing is enabled, false otherwise */
+	virtual bool isDrawBorderEnabled() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIComboBox.h b/irr/include/IGUIComboBox.h
new file mode 100644
index 000000000..deeaad2b5
--- /dev/null
+++ b/irr/include/IGUIComboBox.h
@@ -0,0 +1,72 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Combobox widget
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_COMBO_BOX_CHANGED
+*/
+class IGUIComboBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIComboBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_COMBO_BOX, environment, parent, id, rectangle) {}
+
+	//! Returns amount of items in box
+	virtual u32 getItemCount() const = 0;
+
+	//! Returns string of an item. the idx may be a value from 0 to itemCount-1
+	virtual const wchar_t *getItem(u32 idx) const = 0;
+
+	//! Returns item data of an item. the idx may be a value from 0 to itemCount-1
+	virtual u32 getItemData(u32 idx) const = 0;
+
+	//! Returns index based on item data
+	virtual s32 getIndexForItemData(u32 data) const = 0;
+
+	//! Adds an item and returns the index of it
+	virtual u32 addItem(const wchar_t *text, u32 data = 0) = 0;
+
+	//! Removes an item from the combo box.
+	/** Warning. This will change the index of all following items */
+	virtual void removeItem(u32 idx) = 0;
+
+	//! Deletes all items in the combo box
+	virtual void clear() = 0;
+
+	//! Returns id of selected item. returns -1 if no item is selected.
+	virtual s32 getSelected() const = 0;
+
+	//! Sets the selected item. Set this to -1 if no item should be selected
+	virtual void setSelected(s32 idx) = 0;
+
+	//! Sets the selected item and emits a change event.
+	/** Set this to -1 if no item should be selected */
+	virtual void setAndSendSelected(s32 idx) = 0;
+
+	//! Sets text justification of the text area
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	\param vertical: EGUIA_UPPERLEFT to align with top edge,
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
+
+	//! Set the maximal number of rows for the selection listbox
+	virtual void setMaxSelectionRows(u32 max) = 0;
+
+	//! Get the maximal number of rows for the selection listbox
+	virtual u32 getMaxSelectionRows() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIEditBox.h b/irr/include/IGUIEditBox.h
new file mode 100644
index 000000000..c63a905db
--- /dev/null
+++ b/irr/include/IGUIEditBox.h
@@ -0,0 +1,151 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUIFont;
+
+//! Single line edit box for editing simple text.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_EDITBOX_ENTER
+\li EGET_EDITBOX_CHANGED
+\li EGET_EDITBOX_MARKING_CHANGED
+*/
+class IGUIEditBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIEditBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_EDIT_BOX, environment, parent, id, rectangle) {}
+
+	//! Sets another skin independent font.
+	/** If this is set to zero, the button uses the font of the skin.
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	virtual IGUIFont *getOverrideFont() const = 0;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
+
+	//! Sets another color for the text.
+	/** If set, the edit box does not use the EGDC_BUTTON_TEXT color defined
+	in the skin, but the set color instead. You don't need to call
+	IGUIEditBox::enableOverrrideColor(true) after this, this is done
+	by this function.
+	If you set a color, and you want the text displayed with the color
+	of the skin again, call IGUIEditBox::enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
+
+	//! Gets the override color
+	virtual video::SColor getOverrideColor() const = 0;
+
+	//! Sets if the text should use the override color or the color in the gui skin.
+	/** \param enable: If set to true, the override color, which can be set
+	with IGUIEditBox::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	virtual bool isOverrideColorEnabled(void) const = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Checks if background drawing is enabled
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+
+	//! Turns the border on or off
+	/** \param border: true if you want the border to be drawn, false if not */
+	virtual void setDrawBorder(bool border) = 0;
+
+	//! Checks if border drawing is enabled
+	/** \return true if border drawing is enabled, false otherwise */
+	virtual bool isDrawBorderEnabled() const = 0;
+
+	//! Sets text justification mode
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	\param vertical: EGUIA_UPPERLEFT to align with top edge,
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
+
+	//! Enables or disables word wrap.
+	/** \param enable: If set to true, words going over one line are
+	broken to the next line. */
+	virtual void setWordWrap(bool enable) = 0;
+
+	//! Checks if word wrap is enabled
+	/** \return true if word wrap is enabled, false otherwise */
+	virtual bool isWordWrapEnabled() const = 0;
+
+	//! Enables or disables newlines.
+	/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
+	instead a newline character will be inserted. */
+	virtual void setMultiLine(bool enable) = 0;
+
+	//! Checks if multi line editing is enabled
+	/** \return true if multi-line is enabled, false otherwise */
+	virtual bool isMultiLineEnabled() const = 0;
+
+	//! Enables or disables automatic scrolling with cursor position
+	/** \param enable: If set to true, the text will move around with the cursor position */
+	virtual void setAutoScroll(bool enable) = 0;
+
+	//! Checks to see if automatic scrolling is enabled
+	/** \return true if automatic scrolling is enabled, false if not */
+	virtual bool isAutoScrollEnabled() const = 0;
+
+	//! Sets whether the edit box is a password box. Setting this to true will
+	/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
+	\param passwordBox: true to enable password, false to disable
+	\param passwordChar: the character that is displayed instead of letters */
+	virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') = 0;
+
+	//! Returns true if the edit box is currently a password box.
+	virtual bool isPasswordBox() const = 0;
+
+	//! Gets the size area of the text in the edit box
+	/** \return The size in pixels of the text */
+	virtual core::dimension2du getTextDimension() = 0;
+
+	//! Sets the maximum amount of characters which may be entered in the box.
+	/** \param max: Maximum amount of characters. If 0, the character amount is
+	infinity. */
+	virtual void setMax(u32 max) = 0;
+
+	//! Returns maximum amount of characters, previously set by setMax();
+	virtual u32 getMax() const = 0;
+
+	//! Set the character used for the cursor.
+	/** By default it's "_" */
+	virtual void setCursorChar(const wchar_t cursorChar) = 0;
+
+	//! Get the character used for the cursor.
+	virtual wchar_t getCursorChar() const = 0;
+
+	//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
+	//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
+	virtual void setCursorBlinkTime(irr::u32 timeMs) = 0;
+
+	//! Get the cursor blinktime
+	virtual irr::u32 getCursorBlinkTime() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIElement.h b/irr/include/IGUIElement.h
new file mode 100644
index 000000000..866ca282d
--- /dev/null
+++ b/irr/include/IGUIElement.h
@@ -0,0 +1,941 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "rect.h"
+#include "irrString.h"
+#include "IEventReceiver.h"
+#include "EGUIElementTypes.h"
+#include "EGUIAlignment.h"
+#include "IAttributes.h"
+#include "IGUIEnvironment.h"
+#include <cassert>
+#include <algorithm>
+#include <list>
+#include <vector>
+
+namespace irr
+{
+namespace gui
+{
+//! Base class of all GUI elements.
+class IGUIElement : virtual public IReferenceCounted, public IEventReceiver
+{
+public:
+	//! Constructor
+	IGUIElement(EGUI_ELEMENT_TYPE type, IGUIEnvironment *environment, IGUIElement *parent,
+			s32 id, const core::rect<s32> &rectangle) :
+			Parent(0),
+			RelativeRect(rectangle), AbsoluteRect(rectangle),
+			AbsoluteClippingRect(rectangle), DesiredRect(rectangle),
+			MaxSize(0, 0), MinSize(1, 1), IsVisible(true), IsEnabled(true),
+			IsSubElement(false), NoClip(false), ID(id), IsTabStop(false), TabOrder(-1), IsTabGroup(false),
+			AlignLeft(EGUIA_UPPERLEFT), AlignRight(EGUIA_UPPERLEFT), AlignTop(EGUIA_UPPERLEFT), AlignBottom(EGUIA_UPPERLEFT),
+			Environment(environment), Type(type)
+	{
+#ifdef _DEBUG
+		setDebugName("IGUIElement");
+#endif
+
+		// if we were given a parent to attach to
+		if (parent) {
+			parent->addChildToEnd(this);
+			recalculateAbsolutePosition(true);
+		}
+	}
+
+	//! Destructor
+	virtual ~IGUIElement()
+	{
+		for (auto child : Children) {
+			child->Parent = nullptr;
+			child->drop();
+		}
+	}
+
+	//! Returns parent of this element.
+	IGUIElement *getParent() const
+	{
+		return Parent;
+	}
+
+	//! Returns the relative rectangle of this element.
+	core::rect<s32> getRelativePosition() const
+	{
+		return RelativeRect;
+	}
+
+	//! Sets the relative rectangle of this element.
+	/** \param r The absolute position to set */
+	void setRelativePosition(const core::rect<s32> &r)
+	{
+		if (Parent) {
+			const core::rect<s32> &r2 = Parent->getAbsolutePosition();
+
+			core::dimension2df d((f32)(r2.getSize().Width), (f32)(r2.getSize().Height));
+
+			if (AlignLeft == EGUIA_SCALE)
+				ScaleRect.UpperLeftCorner.X = (f32)r.UpperLeftCorner.X / d.Width;
+			if (AlignRight == EGUIA_SCALE)
+				ScaleRect.LowerRightCorner.X = (f32)r.LowerRightCorner.X / d.Width;
+			if (AlignTop == EGUIA_SCALE)
+				ScaleRect.UpperLeftCorner.Y = (f32)r.UpperLeftCorner.Y / d.Height;
+			if (AlignBottom == EGUIA_SCALE)
+				ScaleRect.LowerRightCorner.Y = (f32)r.LowerRightCorner.Y / d.Height;
+		}
+
+		DesiredRect = r;
+		updateAbsolutePosition();
+	}
+
+	//! Sets the relative rectangle of this element, maintaining its current width and height
+	/** \param position The new relative position to set. Width and height will not be changed. */
+	void setRelativePosition(const core::position2di &position)
+	{
+		const core::dimension2di mySize = RelativeRect.getSize();
+		const core::rect<s32> rectangle(position.X, position.Y,
+				position.X + mySize.Width, position.Y + mySize.Height);
+		setRelativePosition(rectangle);
+	}
+
+	//! Sets the relative rectangle of this element as a proportion of its parent's area.
+	/** \note This method used to be 'void setRelativePosition(const core::rect<f32>& r)'
+	\param r  The rectangle to set, interpreted as a proportion of the parent's area.
+	Meaningful values are in the range [0...1], unless you intend this element to spill
+	outside its parent. */
+	void setRelativePositionProportional(const core::rect<f32> &r)
+	{
+		if (!Parent)
+			return;
+
+		const core::dimension2di &d = Parent->getAbsolutePosition().getSize();
+
+		DesiredRect = core::rect<s32>(
+				core::floor32((f32)d.Width * r.UpperLeftCorner.X),
+				core::floor32((f32)d.Height * r.UpperLeftCorner.Y),
+				core::floor32((f32)d.Width * r.LowerRightCorner.X),
+				core::floor32((f32)d.Height * r.LowerRightCorner.Y));
+
+		ScaleRect = r;
+
+		updateAbsolutePosition();
+	}
+
+	//! Gets the absolute rectangle of this element
+	core::rect<s32> getAbsolutePosition() const
+	{
+		return AbsoluteRect;
+	}
+
+	//! Returns the visible area of the element.
+	core::rect<s32> getAbsoluteClippingRect() const
+	{
+		return AbsoluteClippingRect;
+	}
+
+	//! Sets whether the element will ignore its parent's clipping rectangle
+	/** \param noClip If true, the element will not be clipped by its parent's clipping rectangle. */
+	void setNotClipped(bool noClip)
+	{
+		NoClip = noClip;
+		updateAbsolutePosition();
+	}
+
+	//! Gets whether the element will ignore its parent's clipping rectangle
+	/** \return true if the element is not clipped by its parent's clipping rectangle. */
+	bool isNotClipped() const
+	{
+		return NoClip;
+	}
+
+	//! Sets the maximum size allowed for this element
+	/** If set to 0,0, there is no maximum size */
+	void setMaxSize(core::dimension2du size)
+	{
+		MaxSize = size;
+		updateAbsolutePosition();
+	}
+
+	//! Sets the minimum size allowed for this element
+	void setMinSize(core::dimension2du size)
+	{
+		MinSize = size;
+		if (MinSize.Width < 1)
+			MinSize.Width = 1;
+		if (MinSize.Height < 1)
+			MinSize.Height = 1;
+		updateAbsolutePosition();
+	}
+
+	//! The alignment defines how the borders of this element will be positioned when the parent element is resized.
+	void setAlignment(EGUI_ALIGNMENT left, EGUI_ALIGNMENT right, EGUI_ALIGNMENT top, EGUI_ALIGNMENT bottom)
+	{
+		AlignLeft = left;
+		AlignRight = right;
+		AlignTop = top;
+		AlignBottom = bottom;
+
+		if (Parent) {
+			core::rect<s32> r(Parent->getAbsolutePosition());
+
+			core::dimension2df d((f32)r.getSize().Width, (f32)r.getSize().Height);
+
+			if (AlignLeft == EGUIA_SCALE)
+				ScaleRect.UpperLeftCorner.X = (f32)DesiredRect.UpperLeftCorner.X / d.Width;
+			if (AlignRight == EGUIA_SCALE)
+				ScaleRect.LowerRightCorner.X = (f32)DesiredRect.LowerRightCorner.X / d.Width;
+			if (AlignTop == EGUIA_SCALE)
+				ScaleRect.UpperLeftCorner.Y = (f32)DesiredRect.UpperLeftCorner.Y / d.Height;
+			if (AlignBottom == EGUIA_SCALE)
+				ScaleRect.LowerRightCorner.Y = (f32)DesiredRect.LowerRightCorner.Y / d.Height;
+		}
+	}
+
+	//! How left element border is aligned when parent is resized
+	EGUI_ALIGNMENT getAlignLeft() const
+	{
+		return AlignLeft;
+	}
+
+	//! How right element border is aligned when parent is resized
+	EGUI_ALIGNMENT getAlignRight() const
+	{
+		return AlignRight;
+	}
+
+	//! How top element border is aligned when parent is resized
+	EGUI_ALIGNMENT getAlignTop() const
+	{
+		return AlignTop;
+	}
+
+	//! How bottom element border is aligned when parent is resized
+	EGUI_ALIGNMENT getAlignBottom() const
+	{
+		return AlignBottom;
+	}
+
+	//! Updates the absolute position.
+	virtual void updateAbsolutePosition()
+	{
+		recalculateAbsolutePosition(false);
+
+		// update all children
+		for (auto child : Children) {
+			child->updateAbsolutePosition();
+		}
+	}
+
+	//! Returns the topmost GUI element at the specific position.
+	/**
+	This will check this GUI element and all of its descendants, so it
+	may return this GUI element.  To check all GUI elements, call this
+	function on device->getGUIEnvironment()->getRootGUIElement(). Note
+	that the root element is the size of the screen, so doing so (with
+	an on-screen point) will always return the root element if no other
+	element is above it at that point.
+	\param point: The point at which to find a GUI element.
+	\return The topmost GUI element at that point, or 0 if there are
+	no candidate elements at this point.
+	*/
+	virtual IGUIElement *getElementFromPoint(const core::position2d<s32> &point)
+	{
+		IGUIElement *target = 0;
+
+		if (isVisible()) {
+			// we have to search from back to front, because later children
+			// might be drawn over the top of earlier ones.
+			auto it = Children.rbegin();
+			auto ie = Children.rend();
+			while (it != ie) {
+				target = (*it)->getElementFromPoint(point);
+				if (target)
+					return target;
+
+				++it;
+			}
+		}
+
+		if (isVisible() && isPointInside(point))
+			target = this;
+
+		return target;
+	}
+
+	//! Returns true if a point is within this element.
+	/** Elements with a shape other than a rectangle should override this method */
+	virtual bool isPointInside(const core::position2d<s32> &point) const
+	{
+		return AbsoluteClippingRect.isPointInside(point);
+	}
+
+	//! Adds a GUI element as new child of this element.
+	virtual void addChild(IGUIElement *child)
+	{
+		if (child && child != this) {
+			addChildToEnd(child);
+			child->updateAbsolutePosition();
+		}
+	}
+
+	//! Removes a child.
+	virtual void removeChild(IGUIElement *child)
+	{
+		assert(child->Parent == this);
+		Children.erase(child->ParentPos);
+		child->Parent = nullptr;
+		child->drop();
+	}
+
+	//! Removes all children.
+	virtual void removeAllChildren()
+	{
+		while (!Children.empty()) {
+			auto child = Children.back();
+			child->remove();
+		}
+	}
+
+	//! Removes this element from its parent.
+	virtual void remove()
+	{
+		if (Parent)
+			Parent->removeChild(this);
+	}
+
+	//! Draws the element and its children.
+	virtual void draw()
+	{
+		if (isVisible()) {
+			for (auto child : Children)
+				child->draw();
+		}
+	}
+
+	//! animate the element and its children.
+	virtual void OnPostRender(u32 timeMs)
+	{
+		if (isVisible()) {
+			for (auto child : Children)
+				child->OnPostRender(timeMs);
+		}
+	}
+
+	//! Moves this element.
+	virtual void move(core::position2d<s32> absoluteMovement)
+	{
+		setRelativePosition(DesiredRect + absoluteMovement);
+	}
+
+	//! Returns true if element is visible.
+	virtual bool isVisible() const
+	{
+		return IsVisible;
+	}
+
+	//! Check whether the element is truly visible, taking into accounts its parents' visibility
+	/** \return true if the element and all its parents are visible,
+	false if this or any parent element is invisible. */
+	virtual bool isTrulyVisible() const
+	{
+		if (!IsVisible)
+			return false;
+
+		if (!Parent)
+			return true;
+
+		return Parent->isTrulyVisible();
+	}
+
+	//! Sets the visible state of this element.
+	virtual void setVisible(bool visible)
+	{
+		IsVisible = visible;
+	}
+
+	//! Returns true if this element was created as part of its parent control
+	virtual bool isSubElement() const
+	{
+		return IsSubElement;
+	}
+
+	//! Sets whether this control was created as part of its parent.
+	/** For example, it is true when a scrollbar is part of a listbox.
+	SubElements are not saved to disk when calling guiEnvironment->saveGUI() */
+	virtual void setSubElement(bool subElement)
+	{
+		IsSubElement = subElement;
+	}
+
+	//! If set to true, the focus will visit this element when using the tab key to cycle through elements.
+	/** If this element is a tab group (see isTabGroup/setTabGroup) then
+	ctrl+tab will be used instead. */
+	void setTabStop(bool enable)
+	{
+		IsTabStop = enable;
+	}
+
+	//! Returns true if this element can be focused by navigating with the tab key
+	bool isTabStop() const
+	{
+		return IsTabStop;
+	}
+
+	//! Sets the priority of focus when using the tab key to navigate between a group of elements.
+	/** See setTabGroup, isTabGroup and getTabGroup for information on tab groups.
+	Elements with a lower number are focused first */
+	void setTabOrder(s32 index)
+	{
+		// negative = autonumber
+		if (index < 0) {
+			TabOrder = 0;
+			IGUIElement *el = getTabGroup();
+			while (IsTabGroup && el && el->Parent)
+				el = el->Parent;
+
+			IGUIElement *first = 0, *closest = 0;
+			if (el) {
+				// find the highest element number
+				el->getNextElement(-1, true, IsTabGroup, first, closest, true, true);
+				if (first) {
+					TabOrder = first->getTabOrder() + 1;
+				}
+			}
+
+		} else
+			TabOrder = index;
+	}
+
+	//! Returns the number in the tab order sequence
+	s32 getTabOrder() const
+	{
+		return TabOrder;
+	}
+
+	//! Sets whether this element is a container for a group of elements which can be navigated using the tab key.
+	/** For example, windows are tab groups.
+	Groups can be navigated using ctrl+tab, providing isTabStop is true. */
+	void setTabGroup(bool isGroup)
+	{
+		IsTabGroup = isGroup;
+	}
+
+	//! Returns true if this element is a tab group.
+	bool isTabGroup() const
+	{
+		return IsTabGroup;
+	}
+
+	//! Returns the container element which holds all elements in this element's tab group.
+	IGUIElement *getTabGroup()
+	{
+		IGUIElement *ret = this;
+
+		while (ret && !ret->isTabGroup())
+			ret = ret->getParent();
+
+		return ret;
+	}
+
+	//! Returns true if element is enabled
+	/** Currently elements do _not_ care about parent-states.
+		So if you want to affect children you have to enable/disable them all.
+		The only exception to this are sub-elements which also check their parent.
+	*/
+	virtual bool isEnabled() const
+	{
+		if (isSubElement() && IsEnabled && getParent())
+			return getParent()->isEnabled();
+
+		return IsEnabled;
+	}
+
+	//! Sets the enabled state of this element.
+	virtual void setEnabled(bool enabled)
+	{
+		IsEnabled = enabled;
+	}
+
+	//! Sets the new caption of this element.
+	virtual void setText(const wchar_t *text)
+	{
+		Text = text;
+	}
+
+	//! Returns caption of this element.
+	virtual const wchar_t *getText() const
+	{
+		return Text.c_str();
+	}
+
+	//! Sets the new caption of this element.
+	virtual void setToolTipText(const wchar_t *text)
+	{
+		ToolTipText = text;
+	}
+
+	//! Returns caption of this element.
+	virtual const core::stringw &getToolTipText() const
+	{
+		return ToolTipText;
+	}
+
+	//! Returns id. Can be used to identify the element.
+	virtual s32 getID() const
+	{
+		return ID;
+	}
+
+	//! Sets the id of this element
+	virtual void setID(s32 id)
+	{
+		ID = id;
+	}
+
+	//! Called if an event happened.
+	bool OnEvent(const SEvent &event) override
+	{
+		return Parent ? Parent->OnEvent(event) : false;
+	}
+
+	//! Brings a child to front
+	/** \return True if successful, false if not. */
+	virtual bool bringToFront(IGUIElement *child)
+	{
+		if (child->Parent != this)
+			return false;
+		if (std::next(child->ParentPos) == Children.end()) // already there
+			return true;
+		Children.erase(child->ParentPos);
+		child->ParentPos = Children.insert(Children.end(), child);
+		return true;
+	}
+
+	//! Moves a child to the back, so it's siblings are drawn on top of it
+	/** \return True if successful, false if not. */
+	virtual bool sendToBack(IGUIElement *child)
+	{
+		if (child->Parent != this)
+			return false;
+		if (child->ParentPos == Children.begin()) // already there
+			return true;
+		Children.erase(child->ParentPos);
+		child->ParentPos = Children.insert(Children.begin(), child);
+		return true;
+	}
+
+	//! Returns list with children of this element
+	virtual const std::list<IGUIElement *> &getChildren() const
+	{
+		return Children;
+	}
+
+	//! Finds the first element with the given id.
+	/** \param id: Id to search for.
+	\param searchchildren: Set this to true, if also children of this
+	element may contain the element with the searched id and they
+	should be searched too.
+	\return Returns the first element with the given id. If no element
+	with this id was found, 0 is returned. */
+	virtual IGUIElement *getElementFromId(s32 id, bool searchchildren = false) const
+	{
+		IGUIElement *e = 0;
+
+		for (auto child : Children) {
+			if (child->getID() == id)
+				return child;
+
+			if (searchchildren)
+				e = child->getElementFromId(id, true);
+
+			if (e)
+				return e;
+		}
+
+		return e;
+	}
+
+	//! returns true if the given element is a child of this one.
+	//! \param child: The child element to check
+	bool isMyChild(IGUIElement *child) const
+	{
+		if (!child)
+			return false;
+		do {
+			if (child->Parent)
+				child = child->Parent;
+
+		} while (child->Parent && child != this);
+
+		return child == this;
+	}
+
+	//! searches elements to find the closest next element to tab to
+	/** \param startOrder: The TabOrder of the current element, -1 if none
+	\param reverse: true if searching for a lower number
+	\param group: true if searching for a higher one
+	\param first: element with the highest/lowest known tab order depending on search direction
+	\param closest: the closest match, depending on tab order and direction
+	\param includeInvisible: includes invisible elements in the search (default=false)
+	\param includeDisabled: includes disabled elements in the search (default=false)
+	\return true if successfully found an element, false to continue searching/fail */
+	bool getNextElement(s32 startOrder, bool reverse, bool group,
+			IGUIElement *&first, IGUIElement *&closest, bool includeInvisible = false,
+			bool includeDisabled = false) const
+	{
+		// we'll stop searching if we find this number
+		s32 wanted = startOrder + (reverse ? -1 : 1);
+		if (wanted == -2)
+			wanted = 1073741824; // maximum s32
+
+		auto it = Children.begin();
+
+		s32 closestOrder, currentOrder;
+
+		while (it != Children.end()) {
+			// ignore invisible elements and their children
+			if (((*it)->isVisible() || includeInvisible) &&
+					(group == true || (*it)->isTabGroup() == false)) {
+				// ignore disabled, but children are checked (disabled is currently per element ignoring parent states)
+				if ((*it)->isEnabled() || includeDisabled) {
+					// only check tab stops and those with the same group status
+					if ((*it)->isTabStop() && ((*it)->isTabGroup() == group)) {
+						currentOrder = (*it)->getTabOrder();
+
+						// is this what we're looking for?
+						if (currentOrder == wanted) {
+							closest = *it;
+							return true;
+						}
+
+						// is it closer than the current closest?
+						if (closest) {
+							closestOrder = closest->getTabOrder();
+							if ((reverse && currentOrder > closestOrder && currentOrder < startOrder) || (!reverse && currentOrder < closestOrder && currentOrder > startOrder)) {
+								closest = *it;
+							}
+						} else if ((reverse && currentOrder < startOrder) || (!reverse && currentOrder > startOrder)) {
+							closest = *it;
+						}
+
+						// is it before the current first?
+						if (first) {
+							closestOrder = first->getTabOrder();
+
+							if ((reverse && closestOrder < currentOrder) || (!reverse && closestOrder > currentOrder)) {
+								first = *it;
+							}
+						} else {
+							first = *it;
+						}
+					}
+				}
+				// search within children
+				if ((*it)->getNextElement(startOrder, reverse, group, first, closest, includeInvisible, includeDisabled)) {
+					return true;
+				}
+			}
+			++it;
+		}
+		return false;
+	}
+
+	//! Returns the type of the gui element.
+	/** This is needed for the .NET wrapper but will be used
+	later for serializing and deserializing.
+	If you wrote your own GUIElements, you need to set the type for your element as first parameter
+	in the constructor of IGUIElement. For own (=unknown) elements, simply use EGUIET_ELEMENT as type */
+	EGUI_ELEMENT_TYPE getType() const
+	{
+		return Type;
+	}
+
+	//! Returns true if the gui element supports the given type.
+	/** This is mostly used to check if you can cast a gui element to the class that goes with the type.
+	Most gui elements will only support their own type, but if you derive your own classes from interfaces
+	you can overload this function and add a check for the type of the base-class additionally.
+	This allows for checks comparable to the dynamic_cast of c++ with enabled rtti.
+	Note that you can't do that by calling BaseClass::hasType(type), but you have to do an explicit
+	comparison check, because otherwise the base class usually just checks for the member variable
+	Type which contains the type of your derived class.
+	*/
+	virtual bool hasType(EGUI_ELEMENT_TYPE type) const
+	{
+		return type == Type;
+	}
+
+	//! Returns the type name of the gui element.
+	/** This is needed serializing elements. */
+	virtual const c8 *getTypeName() const
+	{
+		return GUIElementTypeNames[Type];
+	}
+
+	//! Returns the name of the element.
+	/** \return Name as character string. */
+	virtual const c8 *getName() const
+	{
+		return Name.c_str();
+	}
+
+	//! Sets the name of the element.
+	/** \param name New name of the gui element. */
+	virtual void setName(const c8 *name)
+	{
+		Name = name;
+	}
+
+	//! Sets the name of the element.
+	/** \param name New name of the gui element. */
+	virtual void setName(const core::stringc &name)
+	{
+		Name = name;
+	}
+
+	//! Returns whether the element takes input from the IME
+	virtual bool acceptsIME()
+	{
+		return false;
+	}
+
+protected:
+	// not virtual because needed in constructor
+	void addChildToEnd(IGUIElement *child)
+	{
+		if (child) {
+			child->grab();   // prevent destruction when removed
+			child->remove(); // remove from old parent
+			child->LastParentRect = getAbsolutePosition();
+			child->Parent = this;
+			child->ParentPos = Children.insert(Children.end(), child);
+		}
+	}
+
+#ifndef NDEBUG
+	template <typename Iterator>
+	static size_t _fastSetChecksum(Iterator begin, Iterator end)
+	{
+		std::hash<typename Iterator::value_type> hasher;
+		size_t checksum = 0;
+		for (Iterator it = begin; it != end; ++it) {
+			size_t h = hasher(*it);
+			checksum ^= 966073049 + (h * 3432918353) + ((h >> 16) * 461845907);
+		}
+		return checksum;
+	}
+#endif
+
+	// Reorder children [from, to) to the order given by `neworder`
+	void reorderChildren(
+			std::list<IGUIElement *>::iterator from,
+			std::list<IGUIElement *>::iterator to,
+			const std::vector<IGUIElement *> &neworder)
+	{
+		assert(_fastSetChecksum(from, to) == _fastSetChecksum(neworder.begin(), neworder.end()));
+		for (auto e : neworder) {
+			*from = e;
+			e->ParentPos = from;
+			++from;
+		}
+		assert(from == to);
+	}
+
+	// not virtual because needed in constructor
+	void recalculateAbsolutePosition(bool recursive)
+	{
+		core::rect<s32> parentAbsolute(0, 0, 0, 0);
+		core::rect<s32> parentAbsoluteClip;
+		f32 fw = 0.f, fh = 0.f;
+
+		if (Parent) {
+			parentAbsolute = Parent->AbsoluteRect;
+
+			if (NoClip) {
+				IGUIElement *p = this;
+				while (p->Parent)
+					p = p->Parent;
+				parentAbsoluteClip = p->AbsoluteClippingRect;
+			} else
+				parentAbsoluteClip = Parent->AbsoluteClippingRect;
+		}
+
+		const s32 diffx = parentAbsolute.getWidth() - LastParentRect.getWidth();
+		const s32 diffy = parentAbsolute.getHeight() - LastParentRect.getHeight();
+
+		if (AlignLeft == EGUIA_SCALE || AlignRight == EGUIA_SCALE)
+			fw = (f32)parentAbsolute.getWidth();
+
+		if (AlignTop == EGUIA_SCALE || AlignBottom == EGUIA_SCALE)
+			fh = (f32)parentAbsolute.getHeight();
+
+		switch (AlignLeft) {
+		case EGUIA_UPPERLEFT:
+			break;
+		case EGUIA_LOWERRIGHT:
+			DesiredRect.UpperLeftCorner.X += diffx;
+			break;
+		case EGUIA_CENTER:
+			DesiredRect.UpperLeftCorner.X += diffx / 2;
+			break;
+		case EGUIA_SCALE:
+			DesiredRect.UpperLeftCorner.X = core::round32(ScaleRect.UpperLeftCorner.X * fw);
+			break;
+		}
+
+		switch (AlignRight) {
+		case EGUIA_UPPERLEFT:
+			break;
+		case EGUIA_LOWERRIGHT:
+			DesiredRect.LowerRightCorner.X += diffx;
+			break;
+		case EGUIA_CENTER:
+			DesiredRect.LowerRightCorner.X += diffx / 2;
+			break;
+		case EGUIA_SCALE:
+			DesiredRect.LowerRightCorner.X = core::round32(ScaleRect.LowerRightCorner.X * fw);
+			break;
+		}
+
+		switch (AlignTop) {
+		case EGUIA_UPPERLEFT:
+			break;
+		case EGUIA_LOWERRIGHT:
+			DesiredRect.UpperLeftCorner.Y += diffy;
+			break;
+		case EGUIA_CENTER:
+			DesiredRect.UpperLeftCorner.Y += diffy / 2;
+			break;
+		case EGUIA_SCALE:
+			DesiredRect.UpperLeftCorner.Y = core::round32(ScaleRect.UpperLeftCorner.Y * fh);
+			break;
+		}
+
+		switch (AlignBottom) {
+		case EGUIA_UPPERLEFT:
+			break;
+		case EGUIA_LOWERRIGHT:
+			DesiredRect.LowerRightCorner.Y += diffy;
+			break;
+		case EGUIA_CENTER:
+			DesiredRect.LowerRightCorner.Y += diffy / 2;
+			break;
+		case EGUIA_SCALE:
+			DesiredRect.LowerRightCorner.Y = core::round32(ScaleRect.LowerRightCorner.Y * fh);
+			break;
+		}
+
+		RelativeRect = DesiredRect;
+
+		const s32 w = RelativeRect.getWidth();
+		const s32 h = RelativeRect.getHeight();
+
+		// make sure the desired rectangle is allowed
+		if (w < (s32)MinSize.Width)
+			RelativeRect.LowerRightCorner.X = RelativeRect.UpperLeftCorner.X + MinSize.Width;
+		if (h < (s32)MinSize.Height)
+			RelativeRect.LowerRightCorner.Y = RelativeRect.UpperLeftCorner.Y + MinSize.Height;
+		if (MaxSize.Width && w > (s32)MaxSize.Width)
+			RelativeRect.LowerRightCorner.X = RelativeRect.UpperLeftCorner.X + MaxSize.Width;
+		if (MaxSize.Height && h > (s32)MaxSize.Height)
+			RelativeRect.LowerRightCorner.Y = RelativeRect.UpperLeftCorner.Y + MaxSize.Height;
+
+		RelativeRect.repair();
+
+		AbsoluteRect = RelativeRect + parentAbsolute.UpperLeftCorner;
+
+		if (!Parent)
+			parentAbsoluteClip = AbsoluteRect;
+
+		AbsoluteClippingRect = AbsoluteRect;
+		AbsoluteClippingRect.clipAgainst(parentAbsoluteClip);
+
+		LastParentRect = parentAbsolute;
+
+		if (recursive) {
+			// update all children
+			for (auto child : Children) {
+				child->recalculateAbsolutePosition(recursive);
+			}
+		}
+	}
+
+protected:
+	//! List of all children of this element
+	std::list<IGUIElement *> Children;
+
+	//! Pointer to the parent
+	IGUIElement *Parent;
+
+	//! Our position in the parent list. Only valid when Parent != nullptr
+	std::list<IGUIElement *>::iterator ParentPos;
+
+	//! relative rect of element
+	core::rect<s32> RelativeRect;
+
+	//! absolute rect of element
+	core::rect<s32> AbsoluteRect;
+
+	//! absolute clipping rect of element
+	core::rect<s32> AbsoluteClippingRect;
+
+	//! the rectangle the element would prefer to be,
+	//! if it was not constrained by parent or max/min size
+	core::rect<s32> DesiredRect;
+
+	//! for calculating the difference when resizing parent
+	core::rect<s32> LastParentRect;
+
+	//! relative scale of the element inside its parent
+	core::rect<f32> ScaleRect;
+
+	//! maximum and minimum size of the element
+	core::dimension2du MaxSize, MinSize;
+
+	//! is visible?
+	bool IsVisible;
+
+	//! is enabled?
+	bool IsEnabled;
+
+	//! is a part of a larger whole and should not be serialized?
+	bool IsSubElement;
+
+	//! does this element ignore its parent's clipping rectangle?
+	bool NoClip;
+
+	//! caption
+	core::stringw Text;
+
+	//! tooltip
+	core::stringw ToolTipText;
+
+	//! users can set this for identifying the element by string
+	core::stringc Name;
+
+	//! users can set this for identifying the element by integer
+	s32 ID;
+
+	//! tab stop like in windows
+	bool IsTabStop;
+
+	//! tab order
+	s32 TabOrder;
+
+	//! tab groups are containers like windows, use ctrl+tab to navigate
+	bool IsTabGroup;
+
+	//! tells the element how to act when its parent is resized
+	EGUI_ALIGNMENT AlignLeft, AlignRight, AlignTop, AlignBottom;
+
+	//! GUI Environment
+	IGUIEnvironment *Environment;
+
+	//! type of element
+	EGUI_ELEMENT_TYPE Type;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIEnvironment.h b/irr/include/IGUIEnvironment.h
new file mode 100644
index 000000000..b9905252d
--- /dev/null
+++ b/irr/include/IGUIEnvironment.h
@@ -0,0 +1,414 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "IGUISkin.h"
+#include "rect.h"
+#include "EFocusFlags.h"
+#include "IEventReceiver.h"
+#include "path.h"
+
+namespace irr
+{
+class IOSOperator;
+class IEventReceiver;
+
+namespace io
+{
+class IReadFile;
+class IWriteFile;
+class IFileSystem;
+} // end namespace io
+namespace video
+{
+class IVideoDriver;
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+
+class IGUIElement;
+class IGUIFont;
+class IGUISpriteBank;
+class IGUIScrollBar;
+class IGUIImage;
+class IGUICheckBox;
+class IGUIListBox;
+class IGUIImageList;
+class IGUIFileOpenDialog;
+class IGUIStaticText;
+class IGUIEditBox;
+class IGUITabControl;
+class IGUITab;
+class IGUIComboBox;
+class IGUIButton;
+class IGUIWindow;
+
+//! GUI Environment. Used as factory and manager of all other GUI elements.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE (which are passed on to focused sub-elements):
+\li EGET_ELEMENT_FOCUS_LOST
+\li EGET_ELEMENT_FOCUSED
+\li EGET_ELEMENT_LEFT
+\li EGET_ELEMENT_HOVERED
+*/
+class IGUIEnvironment : public virtual IReferenceCounted
+{
+public:
+	//! Draws all gui elements by traversing the GUI environment starting at the root node.
+	/** \param  When true ensure the GuiEnvironment (aka the RootGUIElement) has the same size as the current driver screensize.
+				Can be set to false to control that size yourself, p.E when not the full size should be used for UI. */
+	virtual void drawAll(bool useScreenSize = true) = 0;
+
+	//! Sets the focus to an element.
+	/** Causes a EGET_ELEMENT_FOCUS_LOST event followed by a
+	EGET_ELEMENT_FOCUSED event. If someone absorbed either of the events,
+	then the focus will not be changed.
+	\param element Pointer to the element which shall get the focus.
+	\return True on success, false on failure */
+	virtual bool setFocus(IGUIElement *element) = 0;
+
+	//! Returns the element which holds the focus.
+	/** \return Pointer to the element with focus. */
+	virtual IGUIElement *getFocus() const = 0;
+
+	//! Returns the element which was last under the mouse cursor
+	/** NOTE: This information is updated _after_ the user-eventreceiver
+	received it's mouse-events. To find the hovered element while catching
+	mouse events you have to use instead:
+	IGUIEnvironment::getRootGUIElement()->getElementFromPoint(mousePos);
+	\return Pointer to the element under the mouse. */
+	virtual IGUIElement *getHovered() const = 0;
+
+	//! Removes the focus from an element.
+	/** Causes a EGET_ELEMENT_FOCUS_LOST event. If the event is absorbed
+	then the focus will not be changed.
+	\param element Pointer to the element which shall lose the focus.
+	\return True on success, false on failure */
+	virtual bool removeFocus(IGUIElement *element) = 0;
+
+	//! Returns whether the element has focus
+	/** \param element Pointer to the element which is tested.
+	\param checkSubElements When true and focus is on a sub-element of element then it will still count as focused and return true
+	\return True if the element has focus, else false. */
+	virtual bool hasFocus(const IGUIElement *element, bool checkSubElements = false) const = 0;
+
+	//! Returns the current video driver.
+	/** \return Pointer to the video driver. */
+	virtual video::IVideoDriver *getVideoDriver() const = 0;
+
+	//! Returns the file system.
+	/** \return Pointer to the file system. */
+	virtual io::IFileSystem *getFileSystem() const = 0;
+
+	//! returns a pointer to the OS operator
+	/** \return Pointer to the OS operator. */
+	virtual IOSOperator *getOSOperator() const = 0;
+
+	//! Removes all elements from the environment.
+	virtual void clear() = 0;
+
+	//! Posts an input event to the environment.
+	/** Usually you do not have to
+	use this method, it is used by the engine internally.
+	\param event The event to post.
+	\return True if succeeded, else false. */
+	virtual bool postEventFromUser(const SEvent &event) = 0;
+
+	//! This sets a new event receiver for gui events.
+	/** Usually you do not have to
+	use this method, it is used by the engine internally.
+	\param evr Pointer to the new receiver. */
+	virtual void setUserEventReceiver(IEventReceiver *evr) = 0;
+
+	//! Returns pointer to the current gui skin.
+	/** \return Pointer to the GUI skin. */
+	virtual IGUISkin *getSkin() const = 0;
+
+	//! Sets a new GUI Skin
+	/** You can use this to change the appearance of the whole GUI
+	Environment. You can set one of the built-in skins or implement your
+	own class derived from IGUISkin and enable it using this method.
+	To set for example the built-in Windows classic skin, use the following
+	code:
+	\code
+	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
+	environment->setSkin(newskin);
+	newskin->drop();
+	\endcode
+	\param skin New skin to use.
+	*/
+	virtual void setSkin(IGUISkin *skin) = 0;
+
+	//! Creates a new GUI Skin based on a template.
+	/** Use setSkin() to set the created skin.
+	\param type The type of the new skin.
+	\return Pointer to the created skin.
+	If you no longer need it, you should call IGUISkin::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IGUISkin *createSkin(EGUI_SKIN_TYPE type) = 0;
+
+	//! Creates the image list from the given texture.
+	/** \param texture Texture to split into images
+	\param imageSize Dimension of each image
+	\param useAlphaChannel Flag whether alpha channel of the texture should be honored.
+	\return Pointer to the font. Returns 0 if the font could not be loaded.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIImageList *createImageList(video::ITexture *texture,
+			core::dimension2d<s32> imageSize,
+			bool useAlphaChannel) = 0;
+
+	//! Returns pointer to the font with the specified filename.
+	/** Loads the font if it was not loaded before.
+	\param filename Filename of the Font.
+	\return Pointer to the font. Returns 0 if the font could not be loaded.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIFont *getFont(const io::path &filename) = 0;
+
+	//! Adds an externally loaded font to the font list.
+	/** This method allows to attach an already loaded font to the list of
+	existing fonts. The font is grabbed if non-null and adding was successful.
+	\param name Name the font should be stored as.
+	\param font Pointer to font to add.
+	\return Pointer to the font stored. This can differ from given parameter if the name previously existed. */
+	virtual IGUIFont *addFont(const io::path &name, IGUIFont *font) = 0;
+
+	//! remove loaded font
+	virtual void removeFont(IGUIFont *font) = 0;
+
+	//! Returns the default built-in font.
+	/** \return Pointer to the default built-in font.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIFont *getBuiltInFont() const = 0;
+
+	//! Returns pointer to the sprite bank which was added with addEmptySpriteBank
+	/** TODO: This should load files in the future, but not implemented so far.
+	\param filename Name of a spritebank added with addEmptySpriteBank
+	\return Pointer to the sprite bank. Returns 0 if it could not be loaded.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IGUISpriteBank *getSpriteBank(const io::path &filename) = 0;
+
+	//! Adds an empty sprite bank to the manager
+	/** \param name Name of the new sprite bank.
+	\return Pointer to the sprite bank.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IGUISpriteBank *addEmptySpriteBank(const io::path &name) = 0;
+
+	//! Returns the root gui element.
+	/** This is the first gui element, the (direct or indirect) parent of all
+	other gui elements. It is a valid IGUIElement, with dimensions the same
+	size as the screen.
+	\return Pointer to the root element of the GUI. The returned pointer
+	should not be dropped. See IReferenceCounted::drop() for more
+	information. */
+	virtual IGUIElement *getRootGUIElement() = 0;
+
+	//! Adds a button element.
+	/** \param rectangle Rectangle specifying the borders of the button.
+	\param parent Parent gui element of the button.
+	\param id Id with which the gui element can be identified.
+	\param text Text displayed on the button.
+	\param tooltiptext Text displayed in the tooltip.
+	\return Pointer to the created button. Returns 0 if an error occurred.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIButton *addButton(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0) = 0;
+
+	//! Adds a scrollbar.
+	/** \param horizontal Specifies if the scroll bar is drawn horizontal
+	or vertical.
+	\param rectangle Rectangle specifying the borders of the scrollbar.
+	\param parent Parent gui element of the scroll bar.
+	\param id Id to identify the gui element.
+	\return Pointer to the created scrollbar. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIScrollBar *addScrollBar(bool horizontal, const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Adds an image element.
+	/** \param image Image to be displayed.
+	\param pos Position of the image. The width and height of the image is
+	taken from the image.
+	\param useAlphaChannel Sets if the image should use the alpha channel
+	of the texture to draw itself.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image (not displayed).
+	\return Pointer to the created image element. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIImage *addImage(video::ITexture *image, core::position2d<s32> pos,
+			bool useAlphaChannel = true, IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) = 0;
+
+	//! Adds an image element.
+	/** Use IGUIImage::setImage later to set the image to be displayed.
+	\param rectangle Rectangle specifying the borders of the image.
+	\param parent Parent gui element of the image.
+	\param id Id to identify the gui element.
+	\param text Title text of the image (not displayed).
+	\param useAlphaChannel Sets if the image should use the alpha channel
+	of the texture to draw itself.
+	\return Pointer to the created image element. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIImage *addImage(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, bool useAlphaChannel = true) = 0;
+
+	//! Adds a checkbox element.
+	/** \param checked Define the initial state of the check box.
+	\param rectangle Rectangle specifying the borders of the check box.
+	\param parent Parent gui element of the check box.
+	\param id Id to identify the gui element.
+	\param text Title text of the check box.
+	\return Pointer to the created check box. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUICheckBox *addCheckBox(bool checked, const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) = 0;
+
+	//! Adds a list box element.
+	/** \param rectangle Rectangle specifying the borders of the list box.
+	\param parent Parent gui element of the list box.
+	\param id Id to identify the gui element.
+	\param drawBackground Flag whether the background should be drawn.
+	\return Pointer to the created list box. Returns 0 if an error occurred.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIListBox *addListBox(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, bool drawBackground = false) = 0;
+
+	//! Adds a file open dialog.
+	/** \param title Text to be displayed as the title of the dialog.
+	\param modal Defines if the dialog is modal. This means, that all other
+	gui elements which were created before the message box cannot be used
+	until this messagebox is removed.
+	\param parent Parent gui element of the dialog.
+	\param id Id to identify the gui element.
+	\param restoreCWD If set to true, the current working directory will be
+	restored after the dialog is closed in some way. Otherwise the working
+	directory will be the one that the file dialog was last showing.
+	\param startDir Optional path for which the file dialog will be opened.
+	\return Pointer to the created file open dialog. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIFileOpenDialog *addFileOpenDialog(const wchar_t *title = 0,
+			bool modal = true, IGUIElement *parent = 0, s32 id = -1,
+			bool restoreCWD = false, io::path::char_type *startDir = 0) = 0;
+
+	//! Adds a static text.
+	/** \param text Text to be displayed. Can be altered after creation by SetText().
+	\param rectangle Rectangle specifying the borders of the static text
+	\param border Set to true if the static text should have a 3d border.
+	\param wordWrap Enable if the text should wrap into multiple lines.
+	\param parent Parent item of the element, e.g. a window.
+	\param id The ID of the element.
+	\param fillBackground Enable if the background shall be filled.
+	Defaults to false.
+	\return Pointer to the created static text. Returns 0 if an error
+	occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIStaticText *addStaticText(const wchar_t *text, const core::rect<s32> &rectangle,
+			bool border = false, bool wordWrap = true, IGUIElement *parent = 0, s32 id = -1,
+			bool fillBackground = false) = 0;
+
+	//! Adds an edit box.
+	/** Supports Unicode input from every keyboard around the world,
+	scrolling, copying and pasting (exchanging data with the clipboard
+	directly), maximum character amount, marking, and all shortcuts like
+	ctrl+X, ctrl+V, ctrl+C, shift+Left, shift+Right, Home, End, and so on.
+	\param text Text to be displayed. Can be altered after creation
+	by setText().
+	\param rectangle Rectangle specifying the borders of the edit box.
+	\param border Set to true if the edit box should have a 3d border.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the edit box directly in the environment.
+	\param id The ID of the element.
+	\return Pointer to the created edit box. Returns 0 if an error occurred.
+	This pointer should not be dropped. See IReferenceCounted::drop() for
+	more information. */
+	virtual IGUIEditBox *addEditBox(const wchar_t *text, const core::rect<s32> &rectangle,
+			bool border = true, IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Adds a tab control to the environment.
+	/** \param rectangle Rectangle specifying the borders of the tab control.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab control directly in the environment.
+	\param fillbackground Specifies if the background of the tab control
+	should be drawn.
+	\param border Specifies if a flat 3d border should be drawn. This is
+	usually not necessary unless you place the control directly into
+	the environment without a window as parent.
+	\param id An identifier for the tab control.
+	\return Pointer to the created tab control element. Returns 0 if an
+	error occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUITabControl *addTabControl(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, bool fillbackground = false,
+			bool border = true, s32 id = -1) = 0;
+
+	//! Adds tab to the environment.
+	/** You can use this element to group other elements. This is not used
+	for creating tabs on tab controls, please use IGUITabControl::addTab()
+	for this instead.
+	\param rectangle Rectangle specifying the borders of the tab.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the tab directly in the environment.
+	\param id An identifier for the tab.
+	\return Pointer to the created tab. Returns 0 if an
+	error occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUITab *addTab(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Adds a combo box to the environment.
+	/** \param rectangle Rectangle specifying the borders of the combo box.
+	\param parent Parent item of the element, e.g. a window.
+	Set it to 0 to place the combo box directly in the environment.
+	\param id An identifier for the combo box.
+	\return Pointer to the created combo box. Returns 0 if an
+	error occurred. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IGUIComboBox *addComboBox(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) = 0;
+
+	//! Find the next element which would be selected when pressing the tab-key
+	/** If you set the focus for the result you can manually force focus-changes like they
+	would happen otherwise by the tab-keys.
+	\param reverse When true it will search backward (toward lower TabOrder numbers, like shift+tab)
+	\param group When true it will search for the next tab-group (like ctrl+tab)
+	*/
+	virtual IGUIElement *getNextElement(bool reverse = false, bool group = false) = 0;
+
+	//! Set the way the gui will handle automatic focus changes
+	/** The default is (EFF_SET_ON_LMOUSE_DOWN | EFF_SET_ON_TAB).
+	with the left mouse button.
+	This does not affect the setFocus function itself - users can still call that whenever they want on any element.
+	\param flags A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
+	virtual void setFocusBehavior(u32 flags) = 0;
+
+	//! Get the way the gui does handle focus changes
+	/** \returns A bitmask which is a combination of ::EFOCUS_FLAG flags.*/
+	virtual u32 getFocusBehavior() const = 0;
+
+	//! Adds a IGUIElement to deletion queue.
+	/** Queued elements will be removed at the end of each drawAll call.
+	Or latest in the destructor of the GUIEnvironment.
+	This can be used to allow an element removing itself safely in a function
+	iterating over gui elements, like an overloaded	IGUIElement::draw or
+	IGUIElement::OnPostRender function.
+	Note that in general just calling IGUIElement::remove() is enough.
+	Unless you create your own GUI elements removing themselves you won't need it.
+	\param element: Element to remove */
+	virtual void addToDeletionQueue(IGUIElement *element) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIFileOpenDialog.h b/irr/include/IGUIFileOpenDialog.h
new file mode 100644
index 000000000..04a51ccb4
--- /dev/null
+++ b/irr/include/IGUIFileOpenDialog.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "path.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Standard file chooser dialog.
+/** \warning When the user selects a folder this does change the current working directory
+
+\par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_DIRECTORY_SELECTED
+\li EGET_FILE_SELECTED
+\li EGET_FILE_CHOOSE_DIALOG_CANCELLED
+*/
+class IGUIFileOpenDialog : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIFileOpenDialog(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_FILE_OPEN_DIALOG, environment, parent, id, rectangle) {}
+
+	//! Returns the filename of the selected file converted to wide characters. Returns NULL if no file was selected.
+	virtual const wchar_t *getFileName() const = 0;
+
+	//! Returns the filename of the selected file. Is empty if no file was selected.
+	virtual const io::path &getFileNameP() const = 0;
+
+	//! Returns the directory of the selected file. Empty if no directory was selected.
+	virtual const io::path &getDirectoryName() const = 0;
+
+	//! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected.
+	virtual const wchar_t *getDirectoryNameW() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIFont.h b/irr/include/IGUIFont.h
new file mode 100644
index 000000000..c18354c79
--- /dev/null
+++ b/irr/include/IGUIFont.h
@@ -0,0 +1,99 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "SColor.h"
+#include "rect.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! An enum for the different types of GUI font.
+enum EGUI_FONT_TYPE
+{
+	//! Bitmap fonts loaded from an XML file or a texture.
+	EGFT_BITMAP = 0,
+
+	//! Scalable vector fonts loaded from an XML file.
+	/** These fonts reside in system memory and use no video memory
+	until they are displayed. These are slower than bitmap fonts
+	but can be easily scaled and rotated. */
+	EGFT_VECTOR,
+
+	//! A font which uses a the native API provided by the operating system.
+	/** Currently not used. */
+	EGFT_OS,
+
+	//! An external font type provided by the user.
+	EGFT_CUSTOM
+};
+
+//! Font interface.
+class IGUIFont : public virtual IReferenceCounted
+{
+public:
+	//! Draws some text and clips it to the specified rectangle if wanted.
+	/** \param text: Text to draw
+	\param position: Rectangle specifying position where to draw the text.
+	\param color: Color of the text
+	\param hcenter: Specifies if the text should be centered horizontally into the rectangle.
+	\param vcenter: Specifies if the text should be centered vertically into the rectangle.
+	\param clip: Optional pointer to a rectangle against which the text will be clipped.
+	If the pointer is null, no clipping will be done. */
+	virtual void draw(const core::stringw &text, const core::rect<s32> &position,
+			video::SColor color, bool hcenter = false, bool vcenter = false,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! Calculates the width and height of a given string of text.
+	/** \return Returns width and height of the area covered by the text if
+	it would be drawn. */
+	virtual core::dimension2d<u32> getDimension(const wchar_t *text) const = 0;
+
+	//! Calculates the index of the character in the text which is on a specific position.
+	/** \param text: Text string.
+	\param pixel_x: X pixel position of which the index of the character will be returned.
+	\return Returns zero based index of the character in the text, and -1 if no no character
+	is on this position. (=the text is too short). */
+	virtual s32 getCharacterFromPos(const wchar_t *text, s32 pixel_x) const = 0;
+
+	//! Returns the type of this font
+	virtual EGUI_FONT_TYPE getType() const { return EGFT_CUSTOM; }
+
+	//! Sets global kerning width for the font.
+	virtual void setKerningWidth(s32 kerning) = 0;
+
+	//! Sets global kerning height for the font.
+	virtual void setKerningHeight(s32 kerning) = 0;
+
+	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
+	/** the global kerning distance is returned.
+	\param thisLetter: If this parameter is provided, the left side kerning
+	for this letter is added to the global kerning value. For example, a
+	space might only be one pixel wide, but it may be displayed as several
+	pixels.
+	\param previousLetter: If provided, kerning is calculated for both
+	letters and added to the global kerning value. For example, in a font
+	which supports kerning pairs a string such as 'Wo' may have the 'o'
+	tucked neatly under the 'W'.
+	*/
+	virtual s32 getKerningWidth(const wchar_t *thisLetter = 0, const wchar_t *previousLetter = 0) const = 0;
+
+	//! Returns the distance between letters
+	virtual s32 getKerningHeight() const = 0;
+
+	//! Define which characters should not be drawn by the font.
+	/** For example " " would not draw any space which is usually blank in
+	most fonts.
+	\param s String of symbols which are not send down to the videodriver
+	*/
+	virtual void setInvisibleCharacters(const wchar_t *s) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIFontBitmap.h b/irr/include/IGUIFontBitmap.h
new file mode 100644
index 000000000..b86dbe2bf
--- /dev/null
+++ b/irr/include/IGUIFontBitmap.h
@@ -0,0 +1,41 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIFont.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUISpriteBank;
+
+//! Font interface.
+class IGUIFontBitmap : public IGUIFont
+{
+public:
+	//! Returns the type of this font
+	EGUI_FONT_TYPE getType() const override { return EGFT_BITMAP; }
+
+	//! returns the parsed Symbol Information
+	virtual IGUISpriteBank *getSpriteBank() const = 0;
+
+	//! returns the sprite number from a given character
+	virtual u32 getSpriteNoFromChar(const wchar_t *c) const = 0;
+
+	//! Gets kerning values (distance between letters) for the font. If no parameters are provided,
+	/** the global kerning distance is returned.
+	\param thisLetter: If this parameter is provided, the left side kerning for this letter is added
+	to the global kerning value. For example, a space might only be one pixel wide, but it may
+	be displayed as several pixels.
+	\param previousLetter: If provided, kerning is calculated for both letters and added to the global
+	kerning value. For example, EGFT_BITMAP will add the right kerning value of previousLetter to the
+	left side kerning value of thisLetter, then add the global value.
+	*/
+	s32 getKerningWidth(const wchar_t *thisLetter = 0, const wchar_t *previousLetter = 0) const override = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIImage.h b/irr/include/IGUIImage.h
new file mode 100644
index 000000000..33453a3cd
--- /dev/null
+++ b/irr/include/IGUIImage.h
@@ -0,0 +1,82 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+}
+namespace gui
+{
+//! GUI element displaying an image.
+class IGUIImage : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_IMAGE, environment, parent, id, rectangle) {}
+
+	//! Sets an image texture
+	virtual void setImage(video::ITexture *image) = 0;
+
+	//! Gets the image texture
+	virtual video::ITexture *getImage() const = 0;
+
+	//! Sets the color of the image
+	/** \param color Color with which the image is drawn. If the color
+	equals Color(255,255,255,255) it is ignored. */
+	virtual void setColor(video::SColor color) = 0;
+
+	//! Sets if the image should scale to fit the element
+	virtual void setScaleImage(bool scale) = 0;
+
+	//! Sets if the image should use its alpha channel to draw itself
+	virtual void setUseAlphaChannel(bool use) = 0;
+
+	//! Gets the color of the image
+	virtual video::SColor getColor() const = 0;
+
+	//! Returns true if the image is scaled to fit, false if not
+	virtual bool isImageScaled() const = 0;
+
+	//! Returns true if the image is using the alpha channel, false if not
+	virtual bool isAlphaChannelUsed() const = 0;
+
+	//! Sets the source rectangle of the image. By default the full image is used.
+	/** \param sourceRect coordinates inside the image or an area with size 0 for using the full image (default). */
+	virtual void setSourceRect(const core::rect<s32> &sourceRect) = 0;
+
+	//! Returns the customized source rectangle of the image to be used.
+	/** By default an empty rectangle of width and height 0 is returned which means the full image is used. */
+	virtual core::rect<s32> getSourceRect() const = 0;
+
+	//! Restrict drawing-area.
+	/** This allows for example to use the image as a progress bar.
+		Base for area is the image, which means:
+		-  The original clipping area when the texture is scaled or there is no texture.
+		-  The source-rect for an unscaled texture (but still restricted afterward by the clipping area)
+		Unlike normal clipping this does not affect the gui-children.
+		\param drawBoundUVs: Coordinates between 0 and 1 where 0 are for left+top and 1 for right+bottom
+	*/
+	virtual void setDrawBounds(const core::rect<f32> &drawBoundUVs = core::rect<f32>(0.f, 0.f, 1.f, 1.f)) = 0;
+
+	//! Get drawing-area restrictions.
+	virtual core::rect<f32> getDrawBounds() const = 0;
+
+	//! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set
+	/** By default it's enabled */
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Checks if a background is drawn when no texture is set
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIImageList.h b/irr/include/IGUIImageList.h
new file mode 100644
index 000000000..6b23c5469
--- /dev/null
+++ b/irr/include/IGUIImageList.h
@@ -0,0 +1,40 @@
+// This file is part of the "Irrlicht Engine".
+// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "rect.h"
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Font interface.
+class IGUIImageList : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	virtual ~IGUIImageList(){};
+
+	//! Draws an image and clips it to the specified rectangle if wanted
+	//! \param index: Index of the image
+	//! \param destPos: Position of the image to draw
+	//! \param clip: Optional pointer to a rectangle against which the text will be clipped.
+	//! If the pointer is null, no clipping will be done.
+	virtual void draw(s32 index, const core::position2d<s32> &destPos,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! Returns the count of Images in the list.
+	//! \return Returns the count of Images in the list.
+	virtual s32 getImageCount() const = 0;
+
+	//! Returns the size of the images in the list.
+	//! \return Returns the size of the images in the list.
+	virtual core::dimension2d<s32> getImageSize() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIListBox.h b/irr/include/IGUIListBox.h
new file mode 100644
index 000000000..6271eb560
--- /dev/null
+++ b/irr/include/IGUIListBox.h
@@ -0,0 +1,136 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUISpriteBank;
+class IGUIScrollBar;
+
+//! Enumeration for listbox colors
+enum EGUI_LISTBOX_COLOR
+{
+	//! Color of text
+	EGUI_LBC_TEXT = 0,
+	//! Color of selected text
+	EGUI_LBC_TEXT_HIGHLIGHT,
+	//! Color of icon
+	EGUI_LBC_ICON,
+	//! Color of selected icon
+	EGUI_LBC_ICON_HIGHLIGHT,
+	//! Not used, just counts the number of available colors
+	EGUI_LBC_COUNT
+};
+
+//! Default list box GUI element.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_LISTBOX_CHANGED
+\li EGET_LISTBOX_SELECTED_AGAIN
+*/
+class IGUIListBox : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIListBox(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle) {}
+
+	//! returns amount of list items
+	virtual u32 getItemCount() const = 0;
+
+	//! returns string of a list item. the may id be a value from 0 to itemCount-1
+	virtual const wchar_t *getListItem(u32 id) const = 0;
+
+	//! adds an list item, returns id of item
+	virtual u32 addItem(const wchar_t *text) = 0;
+
+	//! adds an list item with an icon
+	/** \param text Text of list entry
+	\param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+	\return The id of the new created item */
+	virtual u32 addItem(const wchar_t *text, s32 icon) = 0;
+
+	//! Removes an item from the list
+	virtual void removeItem(u32 index) = 0;
+
+	//! get the the id of the item at the given absolute coordinates
+	/** \return The id of the list item or -1 when no item is at those coordinates*/
+	virtual s32 getItemAt(s32 xpos, s32 ypos) const = 0;
+
+	//! Returns the icon of an item
+	virtual s32 getIcon(u32 index) const = 0;
+
+	//! Sets the sprite bank which should be used to draw list icons.
+	/** This font is set to the sprite bank of the built-in-font by
+	default. A sprite can be displayed in front of every list item.
+	An icon is an index within the icon sprite bank. Several
+	default icons are available in the skin through getIcon. */
+	virtual void setSpriteBank(IGUISpriteBank *bank) = 0;
+
+	//! clears the list, deletes all items in the listbox
+	virtual void clear() = 0;
+
+	//! returns id of selected item. returns -1 if no item is selected.
+	virtual s32 getSelected() const = 0;
+
+	//! sets the selected item. Set this to -1 if no item should be selected
+	virtual void setSelected(s32 index) = 0;
+
+	//! sets the selected item. Set this to 0 if no item should be selected
+	virtual void setSelected(const wchar_t *item) = 0;
+
+	//! set whether the listbox should scroll to newly selected items
+	virtual void setAutoScrollEnabled(bool scroll) = 0;
+
+	//! returns true if automatic scrolling is enabled, false if not.
+	virtual bool isAutoScrollEnabled() const = 0;
+
+	//! set all item colors at given index to color
+	virtual void setItemOverrideColor(u32 index, video::SColor color) = 0;
+
+	//! set all item colors of specified type at given index to color
+	virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) = 0;
+
+	//! clear all item colors at index
+	virtual void clearItemOverrideColor(u32 index) = 0;
+
+	//! clear item color at index for given colortype
+	virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) = 0;
+
+	//! has the item at index its color overwritten?
+	virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! return the overwrite color at given item index.
+	virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! return the default color which is used for the given colorType
+	virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const = 0;
+
+	//! set the item at the given index
+	virtual void setItem(u32 index, const wchar_t *text, s32 icon) = 0;
+
+	//! Insert the item at the given index
+	/** \return The index on success or -1 on failure. */
+	virtual s32 insertItem(u32 index, const wchar_t *text, s32 icon) = 0;
+
+	//! Swap the items at the given indices
+	virtual void swapItems(u32 index1, u32 index2) = 0;
+
+	//! set global itemHeight
+	virtual void setItemHeight(s32 height) = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Access the vertical scrollbar
+	virtual IGUIScrollBar *getVerticalScrollBar() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIScrollBar.h b/irr/include/IGUIScrollBar.h
new file mode 100644
index 000000000..c7eb4b1b8
--- /dev/null
+++ b/irr/include/IGUIScrollBar.h
@@ -0,0 +1,59 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! Default scroll bar GUI element.
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_SCROLL_BAR_CHANGED
+*/
+class IGUIScrollBar : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_SCROLL_BAR, environment, parent, id, rectangle) {}
+
+	//! sets the maximum value of the scrollbar.
+	virtual void setMax(s32 max) = 0;
+	//! gets the maximum value of the scrollbar.
+	virtual s32 getMax() const = 0;
+
+	//! sets the minimum value of the scrollbar.
+	virtual void setMin(s32 min) = 0;
+	//! gets the minimum value of the scrollbar.
+	virtual s32 getMin() const = 0;
+
+	//! gets the small step value
+	virtual s32 getSmallStep() const = 0;
+
+	//! Sets the small step
+	/** That is the amount that the value changes by when clicking
+	on the buttons or using the cursor keys. */
+	virtual void setSmallStep(s32 step) = 0;
+
+	//! gets the large step value
+	virtual s32 getLargeStep() const = 0;
+
+	//! Sets the large step
+	/** That is the amount that the value changes by when clicking
+	in the tray, or using the page up and page down keys. */
+	virtual void setLargeStep(s32 step) = 0;
+
+	//! gets the current position of the scrollbar
+	virtual s32 getPos() const = 0;
+
+	//! sets the current position of the scrollbar
+	virtual void setPos(s32 pos) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUISkin.h b/irr/include/IGUISkin.h
new file mode 100644
index 000000000..36b510606
--- /dev/null
+++ b/irr/include/IGUISkin.h
@@ -0,0 +1,571 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "EGUIAlignment.h"
+#include "SColor.h"
+#include "rect.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUIFont;
+class IGUISpriteBank;
+class IGUIElement;
+
+//! Enumeration of available default skins.
+/** To set one of the skins, use the following code, for example to set
+the Windows classic skin:
+\code
+gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
+environment->setSkin(newskin);
+newskin->drop();
+\endcode
+*/
+enum EGUI_SKIN_TYPE
+{
+	//! Default windows look and feel
+	EGST_WINDOWS_CLASSIC = 0,
+
+	//! Like EGST_WINDOWS_CLASSIC, but with metallic shaded windows and buttons
+	EGST_WINDOWS_METALLIC,
+
+	//! Burning's skin
+	EGST_BURNING_SKIN,
+
+	//! An unknown skin, not serializable at present
+	EGST_UNKNOWN,
+
+	//! this value is not used, it only specifies the number of skin types
+	EGST_COUNT
+};
+
+//! Names for gui element types
+const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = {
+		"windowsClassic",
+		"windowsMetallic",
+		"burning",
+		"unknown",
+		0,
+	};
+
+//! Enumeration for skin colors
+enum EGUI_DEFAULT_COLOR
+{
+	//! Dark shadow for three-dimensional display elements.
+	EGDC_3D_DARK_SHADOW = 0,
+	//! Shadow color for three-dimensional display elements (for edges facing away from the light source).
+	EGDC_3D_SHADOW,
+	//! Face color for three-dimensional display elements and for dialog box backgrounds.
+	EGDC_3D_FACE,
+	//! Highlight color for three-dimensional display elements (for edges facing the light source.)
+	EGDC_3D_HIGH_LIGHT,
+	//! Light color for three-dimensional display elements (for edges facing the light source.)
+	EGDC_3D_LIGHT,
+	//! Active window border.
+	EGDC_ACTIVE_BORDER,
+	//! Active window title bar text.
+	EGDC_ACTIVE_CAPTION,
+	//! Background color of multiple document interface (MDI) applications.
+	EGDC_APP_WORKSPACE,
+	//! Text on a button
+	EGDC_BUTTON_TEXT,
+	//! Grayed (disabled) text.
+	EGDC_GRAY_TEXT,
+	//! Item(s) selected in a control.
+	EGDC_HIGH_LIGHT,
+	//! Text of item(s) selected in a control.
+	EGDC_HIGH_LIGHT_TEXT,
+	//! Inactive window border.
+	EGDC_INACTIVE_BORDER,
+	//! Inactive window caption.
+	EGDC_INACTIVE_CAPTION,
+	//! Tool tip text color
+	EGDC_TOOLTIP,
+	//! Tool tip background color
+	EGDC_TOOLTIP_BACKGROUND,
+	//! Scrollbar gray area
+	EGDC_SCROLLBAR,
+	//! Window background
+	EGDC_WINDOW,
+	//! Window symbols like on close buttons, scroll bars and check boxes
+	EGDC_WINDOW_SYMBOL,
+	//! Icons in a list or tree
+	EGDC_ICON,
+	//! Selected icons in a list or tree
+	EGDC_ICON_HIGH_LIGHT,
+	//! Grayed (disabled) window symbols like on close buttons, scroll bars and check boxes
+	EGDC_GRAY_WINDOW_SYMBOL,
+	//! Window background for editable field (editbox, checkbox-field)
+	EGDC_EDITABLE,
+	//! Grayed (disabled) window background for editable field (editbox, checkbox-field)
+	EGDC_GRAY_EDITABLE,
+	//! Show focus of window background for editable field (editbox or when checkbox-field is pressed)
+	EGDC_FOCUSED_EDITABLE,
+
+	//! this value is not used, it only specifies the amount of default colors
+	//! available.
+	EGDC_COUNT
+};
+
+//! Names for default skin colors
+const c8 *const GUISkinColorNames[EGDC_COUNT + 1] = {
+		"3DDarkShadow",
+		"3DShadow",
+		"3DFace",
+		"3DHighlight",
+		"3DLight",
+		"ActiveBorder",
+		"ActiveCaption",
+		"AppWorkspace",
+		"ButtonText",
+		"GrayText",
+		"Highlight",
+		"HighlightText",
+		"InactiveBorder",
+		"InactiveCaption",
+		"ToolTip",
+		"ToolTipBackground",
+		"ScrollBar",
+		"Window",
+		"WindowSymbol",
+		"Icon",
+		"IconHighlight",
+		"GrayWindowSymbol",
+		"Editable",
+		"GrayEditable",
+		"FocusedEditable",
+		0,
+	};
+
+//! Enumeration for default sizes.
+enum EGUI_DEFAULT_SIZE
+{
+	//! default with / height of scrollbar. Also width of drop-down button in comboboxes.
+	EGDS_SCROLLBAR_SIZE = 0,
+	//! height of menu
+	EGDS_MENU_HEIGHT,
+	//! width and height of a window titlebar button (like minimize/maximize/close buttons). The titlebar height is also calculated from that.
+	EGDS_WINDOW_BUTTON_WIDTH,
+	//! width of a checkbox check
+	EGDS_CHECK_BOX_WIDTH,
+	//! \deprecated This may be removed by Irrlicht 1.9
+	EGDS_MESSAGE_BOX_WIDTH,
+	//! \deprecated This may be removed by Irrlicht 1.9
+	EGDS_MESSAGE_BOX_HEIGHT,
+	//! width of a default button
+	EGDS_BUTTON_WIDTH,
+	//! height of a default button (OK and cancel buttons)
+	EGDS_BUTTON_HEIGHT,
+	//! distance for text from background
+	EGDS_TEXT_DISTANCE_X,
+	//! distance for text from background
+	EGDS_TEXT_DISTANCE_Y,
+	//! distance for text in the title bar, from the left of the window rect
+	EGDS_TITLEBARTEXT_DISTANCE_X,
+	//! distance for text in the title bar, from the top of the window rect
+	EGDS_TITLEBARTEXT_DISTANCE_Y,
+	//! free space in a messagebox between borders and contents on all sides
+	EGDS_MESSAGE_BOX_GAP_SPACE,
+	//! minimal space to reserve for messagebox text-width
+	EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH,
+	//! maximal space to reserve for messagebox text-width
+	EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH,
+	//! minimal space to reserve for messagebox text-height
+	EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT,
+	//! maximal space to reserve for messagebox text-height
+	EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT,
+	//! pixels to move an unscaled button image to the right when a button is pressed and the unpressed image looks identical
+	EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X,
+	//! pixels to move an unscaled button image down when a button is pressed  and the unpressed image looks identical
+	EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y,
+	//! pixels to move the button text to the right when a button is pressed
+	EGDS_BUTTON_PRESSED_TEXT_OFFSET_X,
+	//! pixels to move the button text down when a button is pressed
+	EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y,
+	//! pixels to move an unscaled button sprite to the right when a button is pressed
+	EGDS_BUTTON_PRESSED_SPRITE_OFFSET_X,
+	//! pixels to move an unscaled button sprite down when a button is pressed
+	EGDS_BUTTON_PRESSED_SPRITE_OFFSET_Y,
+
+	//! this value is not used, it only specifies the amount of default sizes
+	//! available.
+	EGDS_COUNT
+};
+
+//! Names for default skin sizes
+const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] = {
+		"ScrollBarSize",
+		"MenuHeight",
+		"WindowButtonWidth",
+		"CheckBoxWidth",
+		"MessageBoxWidth",
+		"MessageBoxHeight",
+		"ButtonWidth",
+		"ButtonHeight",
+		"TextDistanceX",
+		"TextDistanceY",
+		"TitleBarTextX",
+		"TitleBarTextY",
+		"MessageBoxGapSpace",
+		"MessageBoxMinTextWidth",
+		"MessageBoxMaxTextWidth",
+		"MessageBoxMinTextHeight",
+		"MessageBoxMaxTextHeight",
+		"ButtonPressedImageOffsetX",
+		"ButtonPressedImageOffsetY",
+		"ButtonPressedTextOffsetX",
+		"ButtonPressedTextOffsetY",
+		"ButtonPressedSpriteOffsetX",
+		"ButtonPressedSpriteOffsetY",
+		0,
+	};
+
+enum EGUI_DEFAULT_TEXT
+{
+	//! Text for the OK button on a message box
+	EGDT_MSG_BOX_OK = 0,
+	//! Text for the Cancel button on a message box
+	EGDT_MSG_BOX_CANCEL,
+	//! Text for the Yes button on a message box
+	EGDT_MSG_BOX_YES,
+	//! Text for the No button on a message box
+	EGDT_MSG_BOX_NO,
+	//! Tooltip text for window close button
+	EGDT_WINDOW_CLOSE,
+	//! Tooltip text for window maximize button
+	EGDT_WINDOW_MAXIMIZE,
+	//! Tooltip text for window minimize button
+	EGDT_WINDOW_MINIMIZE,
+	//! Tooltip text for window restore button
+	EGDT_WINDOW_RESTORE,
+
+	//! this value is not used, it only specifies the number of default texts
+	EGDT_COUNT
+};
+
+//! Names for default skin sizes
+const c8 *const GUISkinTextNames[EGDT_COUNT + 1] = {
+		"MessageBoxOkay",
+		"MessageBoxCancel",
+		"MessageBoxYes",
+		"MessageBoxNo",
+		"WindowButtonClose",
+		"WindowButtonMaximize",
+		"WindowButtonMinimize",
+		"WindowButtonRestore",
+		0,
+	};
+
+//! Customizable symbols for GUI
+enum EGUI_DEFAULT_ICON
+{
+	//! maximize window button
+	EGDI_WINDOW_MAXIMIZE = 0,
+	//! restore window button
+	EGDI_WINDOW_RESTORE,
+	//! close window button
+	EGDI_WINDOW_CLOSE,
+	//! minimize window button
+	EGDI_WINDOW_MINIMIZE,
+	//! resize icon for bottom right corner of a window
+	EGDI_WINDOW_RESIZE,
+	//! scroll bar up button
+	EGDI_CURSOR_UP,
+	//! scroll bar down button
+	EGDI_CURSOR_DOWN,
+	//! scroll bar left button
+	EGDI_CURSOR_LEFT,
+	//! scroll bar right button
+	EGDI_CURSOR_RIGHT,
+	//! icon for menu children
+	EGDI_MENU_MORE,
+	//! tick for checkbox
+	EGDI_CHECK_BOX_CHECKED,
+	//! down arrow for dropdown menus
+	EGDI_DROP_DOWN,
+	//! smaller up arrow
+	EGDI_SMALL_CURSOR_UP,
+	//! smaller down arrow
+	EGDI_SMALL_CURSOR_DOWN,
+	//! selection dot in a radio button
+	EGDI_RADIO_BUTTON_CHECKED,
+	//! << icon indicating there is more content to the left
+	EGDI_MORE_LEFT,
+	//! >> icon indicating that there is more content to the right
+	EGDI_MORE_RIGHT,
+	//! icon indicating that there is more content above
+	EGDI_MORE_UP,
+	//! icon indicating that there is more content below
+	EGDI_MORE_DOWN,
+	//! plus icon for trees
+	EGDI_EXPAND,
+
+	//! minus icon for trees
+	EGDI_COLLAPSE,
+	//! file icon for file selection
+	EGDI_FILE,
+	//! folder icon for file selection
+	EGDI_DIRECTORY,
+
+	//! value not used, it only specifies the number of icons
+	EGDI_COUNT
+};
+
+const c8 *const GUISkinIconNames[EGDI_COUNT + 1] = {
+		"windowMaximize",
+		"windowRestore",
+		"windowClose",
+		"windowMinimize",
+		"windowResize",
+		"cursorUp",
+		"cursorDown",
+		"cursorLeft",
+		"cursorRight",
+		"menuMore",
+		"checkBoxChecked",
+		"dropDown",
+		"smallCursorUp",
+		"smallCursorDown",
+		"radioButtonChecked",
+		"moreLeft",
+		"moreRight",
+		"moreUp",
+		"moreDown",
+		"expand",
+		"collapse",
+		"file",
+		"directory",
+		0,
+	};
+
+// Customizable fonts
+enum EGUI_DEFAULT_FONT
+{
+	//! For static text, edit boxes, lists and most other places
+	EGDF_DEFAULT = 0,
+	//! Font for buttons
+	EGDF_BUTTON,
+	//! Font for window title bars
+	EGDF_WINDOW,
+	//! Font for menu items
+	EGDF_MENU,
+	//! Font for tooltips
+	EGDF_TOOLTIP,
+	//! this value is not used, it only specifies the amount of default fonts
+	//! available.
+	EGDF_COUNT
+};
+
+const c8 *const GUISkinFontNames[EGDF_COUNT + 1] = {
+		"defaultFont",
+		"buttonFont",
+		"windowFont",
+		"menuFont",
+		"tooltipFont",
+		0,
+	};
+
+//! A skin modifies the look of the GUI elements.
+class IGUISkin : virtual public IReferenceCounted
+{
+public:
+	//! returns display density scaling factor
+	virtual float getScale() const = 0;
+
+	//! sets display density scaling factor
+	virtual void setScale(float scale) = 0;
+
+	//! returns default color
+	virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const = 0;
+
+	//! sets a default color
+	virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) = 0;
+
+	//! returns size for the given size type
+	virtual s32 getSize(EGUI_DEFAULT_SIZE size) const = 0;
+
+	//! Returns a default text.
+	/** For example for Message box button captions:
+	"OK", "Cancel", "Yes", "No" and so on. */
+	virtual const wchar_t *getDefaultText(EGUI_DEFAULT_TEXT text) const = 0;
+
+	//! Sets a default text.
+	/** For example for Message box button captions:
+	"OK", "Cancel", "Yes", "No" and so on. */
+	virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t *newText) = 0;
+
+	//! sets a default size
+	virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size) = 0;
+
+	//! returns the default font
+	virtual IGUIFont *getFont(EGUI_DEFAULT_FONT which = EGDF_DEFAULT) const = 0;
+
+	//! sets a default font
+	virtual void setFont(IGUIFont *font, EGUI_DEFAULT_FONT which = EGDF_DEFAULT) = 0;
+
+	//! returns the sprite bank
+	virtual IGUISpriteBank *getSpriteBank() const = 0;
+
+	//! sets the sprite bank
+	virtual void setSpriteBank(IGUISpriteBank *bank) = 0;
+
+	//! Returns a default icon
+	/** Returns the sprite index within the sprite bank */
+	virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const = 0;
+
+	//! Sets a default icon
+	/** Sets the sprite index used for drawing icons like arrows,
+	close buttons and ticks in checkboxes
+	\param icon: Enum specifying which icon to change
+	\param index: The sprite index used to draw this icon */
+	virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index) = 0;
+
+	//! draws a standard 3d button pane
+	/** Used for drawing for example buttons in normal state.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DButtonPaneStandard(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a pressed 3d button pane
+	/** Used for drawing for example buttons in pressed state.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DButtonPanePressed(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a sunken 3d pane
+	/** Used for drawing the background of edit, combo or check boxes.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param bgcolor: Background color.
+	\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+	deep into the ground.
+	\param fillBackGround: Specifies if the background should be filled with the background
+	color or not be drawn at all.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DSunkenPane(IGUIElement *element,
+			video::SColor bgcolor, bool flat, bool fillBackGround,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a window background
+	/** Used for drawing the background of dialogs and windows.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param titleBarColor: Title color.
+	\param drawTitleBar: True to enable title drawing.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param checkClientArea: When set to non-null the function will not draw anything,
+	but will instead return the clientArea which can be used for drawing by the calling window.
+	That is the area without borders and without titlebar.
+	\return Returns rect where it would be good to draw title bar text. This will
+	work even when checkClientArea is set to a non-null value.*/
+	virtual core::rect<s32> draw3DWindowBackground(IGUIElement *element,
+			bool drawTitleBar, video::SColor titleBarColor,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0,
+			core::rect<s32> *checkClientArea = 0) = 0;
+
+	//! draws a standard 3d menu pane
+	/** Used for drawing for menus and context menus.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DMenuPane(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a standard 3d tool bar
+	/** Used for drawing for toolbars and menus.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area. */
+	virtual void draw3DToolBar(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a tab button
+	/** Used for drawing for tab buttons on top of tabs.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param active: Specifies if the tab is currently active.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param alignment Alignment of GUI element. */
+	virtual void draw3DTabButton(IGUIElement *element, bool active,
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) = 0;
+
+	//! draws a tab control body
+	/** \param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by IGUISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param border: Specifies if the border should be drawn.
+	\param background: Specifies if the background should be drawn.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param tabHeight Height of tab.
+	\param alignment Alignment of GUI element. */
+	virtual void draw3DTabBody(IGUIElement *element, bool border, bool background,
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0, s32 tabHeight = -1, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) = 0;
+
+	//! draws an icon, usually from the skin's sprite bank
+	/** \param element: Pointer to the element which wishes to draw this icon.
+	This parameter is usually not used by IGUISkin, but can be used for example
+	by more complex implementations to find out how to draw the part exactly.
+	\param icon: Specifies the icon to be drawn.
+	\param position: The position to draw the icon
+	\param starttime: The time at the start of the animation
+	\param currenttime: The present time, used to calculate the frame number
+	\param loop: Whether the animation should loop or not
+	\param clip: Clip area. */
+	virtual void drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon,
+			const core::position2di position, u32 starttime = 0, u32 currenttime = 0,
+			bool loop = false, const core::rect<s32> *clip = 0) = 0;
+
+	//! draws a 2d rectangle.
+	/** \param element: Pointer to the element which wishes to draw this icon.
+	This parameter is usually not used by IGUISkin, but can be used for example
+	by more complex implementations to find out how to draw the part exactly.
+	\param color: Color of the rectangle to draw. The alpha component specifies how
+	transparent the rectangle will be.
+	\param pos: Position of the rectangle.
+	\param clip: Pointer to rectangle against which the rectangle will be clipped.
+	If the pointer is null, no clipping will be performed. */
+	virtual void draw2DRectangle(IGUIElement *element, const video::SColor &color,
+			const core::rect<s32> &pos, const core::rect<s32> *clip = 0) = 0;
+
+	//! get the type of this skin
+	virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUISpriteBank.h b/irr/include/IGUISpriteBank.h
new file mode 100644
index 000000000..70d8fd1b9
--- /dev/null
+++ b/irr/include/IGUISpriteBank.h
@@ -0,0 +1,138 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "SColor.h"
+#include "rect.h"
+
+namespace irr
+{
+
+namespace video
+{
+class ITexture;
+} // end namespace video
+
+namespace gui
+{
+
+//! A single sprite frame.
+// Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
+struct SGUISpriteFrame
+{
+	SGUISpriteFrame() :
+			textureNumber(0), rectNumber(0)
+	{
+	}
+
+	SGUISpriteFrame(u32 textureIndex, u32 positionIndex) :
+			textureNumber(textureIndex), rectNumber(positionIndex)
+	{
+	}
+
+	//! Texture index in IGUISpriteBank
+	u32 textureNumber;
+
+	//! Index in IGUISpriteBank::getPositions()
+	u32 rectNumber;
+};
+
+//! A sprite composed of several frames.
+// Note for implementer: Can't fix variable names to uppercase as this is a public interface used since a while
+struct SGUISprite
+{
+	SGUISprite() :
+			frameTime(0) {}
+	SGUISprite(const SGUISpriteFrame &firstFrame) :
+			frameTime(0)
+	{
+		Frames.push_back(firstFrame);
+	}
+
+	core::array<SGUISpriteFrame> Frames;
+	u32 frameTime;
+};
+
+//! Sprite bank interface.
+/** See http://http://irrlicht.sourceforge.net/forum//viewtopic.php?f=9&t=25742
+ * for more information how to use the spritebank.
+ */
+class IGUISpriteBank : public virtual IReferenceCounted
+{
+public:
+	//! Returns the list of rectangles held by the sprite bank
+	virtual core::array<core::rect<s32>> &getPositions() = 0;
+
+	//! Returns the array of animated sprites within the sprite bank
+	virtual core::array<SGUISprite> &getSprites() = 0;
+
+	//! Returns the number of textures held by the sprite bank
+	virtual u32 getTextureCount() const = 0;
+
+	//! Gets the texture with the specified index
+	virtual video::ITexture *getTexture(u32 index) const = 0;
+
+	//! Adds a texture to the sprite bank
+	virtual void addTexture(video::ITexture *texture) = 0;
+
+	//! Changes one of the textures in the sprite bank
+	virtual void setTexture(u32 index, video::ITexture *texture) = 0;
+
+	//! Add the texture and use it for a single non-animated sprite.
+	/** The texture and the corresponding rectangle and sprite will all be added to the end of each array.
+	 \returns The index of the sprite or -1 on failure */
+	virtual s32 addTextureAsSprite(video::ITexture *texture) = 0;
+
+	//! Clears sprites, rectangles and textures
+	virtual void clear() = 0;
+
+	//! Draws a sprite in 2d with position and color
+	/**
+	\param index Index of SGUISprite to draw
+	\param pos Target position - depending on center value either the left-top or the sprite center is used as pivot
+	\param clip Clipping rectangle, can be 0 when clipping is not wanted.
+	\param color Color with which the image is drawn.
+		Note that the alpha component is used. If alpha is other than
+		255, the image will be transparent.
+	\param starttime Tick when the first frame was drawn (only difference currenttime-starttime matters).
+	\param currenttime To calculate the frame of animated sprites
+	\param loop When true animations are looped
+	\param center When true pivot is set to the sprite-center. So it affects pos.
+	*/
+	virtual void draw2DSprite(u32 index, const core::position2di &pos,
+			const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = true, bool center = false) = 0;
+
+	//! Draws a sprite in 2d with destination rectangle and colors
+	/**
+		\param index Index of SGUISprite to draw
+		\param destRect The sprite will be scaled to fit this target rectangle
+		\param clip Clipping rectangle, can be 0 when clipping is not wanted.
+		\param colors Array of 4 colors denoting the color values of
+		the corners of the destRect
+		\param timeTicks Current frame for animated sprites
+		(same as currenttime-starttime in other draw2DSprite function)
+		\param loop When true animations are looped
+	*/
+	virtual void draw2DSprite(u32 index, const core::rect<s32> &destRect,
+			const core::rect<s32> *clip = 0,
+			const video::SColor *const colors = 0,
+			u32 timeTicks = 0,
+			bool loop = true) = 0;
+
+	//! Draws a sprite batch in 2d using an array of positions and a color
+	virtual void draw2DSpriteBatch(const core::array<u32> &indices, const core::array<core::position2di> &pos,
+			const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = true, bool center = false) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIStaticText.h b/irr/include/IGUIStaticText.h
new file mode 100644
index 000000000..02af9b573
--- /dev/null
+++ b/irr/include/IGUIStaticText.h
@@ -0,0 +1,133 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUIFont;
+
+//! Multi or single line text label.
+class IGUIStaticText : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIStaticText(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_STATIC_TEXT, environment, parent, id, rectangle) {}
+
+	//! Sets another skin independent font.
+	/** If this is set to zero, the button uses the font of the skin.
+	\param font: New font to set. */
+	virtual void setOverrideFont(IGUIFont *font = 0) = 0;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	virtual IGUIFont *getOverrideFont(void) const = 0;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	virtual IGUIFont *getActiveFont() const = 0;
+
+	//! Sets another color for the text.
+	/** If set, the static text does not use the EGDC_BUTTON_TEXT color defined
+	in the skin, but the set color instead. You don't need to call
+	IGUIStaticText::enableOverrrideColor(true) after this, this is done
+	by this function.
+	If you set a color, and you want the text displayed with the color
+	of the skin again, call IGUIStaticText::enableOverrideColor(false);
+	\param color: New color of the text. */
+	virtual void setOverrideColor(video::SColor color) = 0;
+
+	//! Gets the override color
+	/** \return: The override color */
+	virtual video::SColor getOverrideColor(void) const = 0;
+
+	//! Gets the currently used text color
+	/** Either a skin-color for the current state or the override color */
+	virtual video::SColor getActiveColor() const = 0;
+
+	//! Sets if the static text should use the override color or the color in the gui skin.
+	/** \param enable: If set to true, the override color, which can be set
+	with IGUIStaticText::setOverrideColor is used, otherwise the
+	EGDC_BUTTON_TEXT color of the skin. */
+	virtual void enableOverrideColor(bool enable) = 0;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	virtual bool isOverrideColorEnabled(void) const = 0;
+
+	//! Sets another color for the background.
+	virtual void setBackgroundColor(video::SColor color) = 0;
+
+	//! Sets whether to draw the background
+	virtual void setDrawBackground(bool draw) = 0;
+
+	//! Checks if background drawing is enabled
+	/** \return true if background drawing is enabled, false otherwise */
+	virtual bool isDrawBackgroundEnabled() const = 0;
+
+	//! Gets the background color
+	/** \return: The background color */
+	virtual video::SColor getBackgroundColor() const = 0;
+
+	//! Sets whether to draw the border
+	virtual void setDrawBorder(bool draw) = 0;
+
+	//! Checks if border drawing is enabled
+	/** \return true if border drawing is enabled, false otherwise */
+	virtual bool isDrawBorderEnabled() const = 0;
+
+	//! Sets text justification mode
+	/** \param horizontal: EGUIA_UPPERLEFT for left justified (default),
+	EGUIA_LOWERRIGHT for right justified, or EGUIA_CENTER for centered text.
+	\param vertical: EGUIA_UPPERLEFT to align with top edge (default),
+	EGUIA_LOWERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */
+	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0;
+
+	//! Enables or disables word wrap for using the static text as multiline text control.
+	/** \param enable: If set to true, words going over one line are
+	broken on to the next line. */
+	virtual void setWordWrap(bool enable) = 0;
+
+	//! Checks if word wrap is enabled
+	/** \return true if word wrap is enabled, false otherwise */
+	virtual bool isWordWrapEnabled(void) const = 0;
+
+	//! Returns the height of the text in pixels when it is drawn.
+	/** This is useful for adjusting the layout of gui elements based on the height
+	of the multiline text in this element.
+	\return Height of text in pixels. */
+	virtual s32 getTextHeight() const = 0;
+
+	//! Returns the width of the current text, in the current font
+	/** If the text is broken, this returns the width of the widest line
+	\return The width of the text, or the widest broken line. */
+	virtual s32 getTextWidth(void) const = 0;
+
+	//! Set whether the text in this label should be clipped if it goes outside bounds
+	virtual void setTextRestrainedInside(bool restrainedInside) = 0;
+
+	//! Checks if the text in this label should be clipped if it goes outside bounds
+	virtual bool isTextRestrainedInside() const = 0;
+
+	//! Set whether the string should be interpreted as right-to-left (RTL) text
+	/** \note This component does not implement the Unicode bidi standard, the
+	text of the component should be already RTL if you call this. The
+	main difference when RTL is enabled is that the linebreaks for multiline
+	elements are performed starting from the end.
+	*/
+	virtual void setRightToLeft(bool rtl) = 0;
+
+	//! Checks whether the text in this element should be interpreted as right-to-left
+	virtual bool isRightToLeft() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUITabControl.h b/irr/include/IGUITabControl.h
new file mode 100644
index 000000000..f1d2183ae
--- /dev/null
+++ b/irr/include/IGUITabControl.h
@@ -0,0 +1,149 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+#include "SColor.h"
+#include "IGUISkin.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUITab;
+
+//! A standard tab control
+/** \par This element can create the following events of type EGUI_EVENT_TYPE:
+\li EGET_TAB_CHANGED
+*/
+class IGUITabControl : public IGUIElement
+{
+public:
+	//! constructor
+	IGUITabControl(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB_CONTROL, environment, parent, id, rectangle) {}
+
+	//! Adds a tab
+	virtual IGUITab *addTab(const wchar_t *caption, s32 id = -1) = 0;
+
+	//! Adds an existing tab
+	/** Note that it will also add the tab as a child of this TabControl.
+	\return Index of added tab or -1 for failure*/
+	virtual s32 addTab(IGUITab *tab) = 0;
+
+	//! Insert the tab at the given index
+	/** \return The tab on success or NULL on failure. */
+	virtual IGUITab *insertTab(s32 idx, const wchar_t *caption, s32 id = -1) = 0;
+
+	//! Insert an existing tab
+	/** Note that it will also add the tab as a child of this TabControl.
+	\param idx Index at which tab will be inserted. Later tabs will be moved.
+			   Previous active tab will stay active unless this is the first
+			   element to be inserted in which case it becomes active.
+	\param tab New tab to insert.
+	\param serializationMode Internally used for serialization. You should not need this.
+		   When true it reserves space for the index, doesn't move but replaces tabs
+		   and it doesn't change the active tab.
+	\return Index of added tab (should be same as the one passed) or -1 for failure*/
+	virtual s32 insertTab(s32 idx, IGUITab *tab, bool serializationMode = false) = 0;
+
+	//! Removes a tab from the tabcontrol
+	virtual void removeTab(s32 idx) = 0;
+
+	//! Clears the tabcontrol removing all tabs
+	virtual void clear() = 0;
+
+	//! Returns amount of tabs in the tabcontrol
+	virtual s32 getTabCount() const = 0;
+
+	//! Returns a tab based on zero based index
+	/** \param idx: zero based index of tab. Is a value between 0 and getTabcount()-1;
+	\return Returns pointer to the Tab. Returns 0 if no tab
+	is corresponding to this tab. */
+	virtual IGUITab *getTab(s32 idx) const = 0;
+
+	//! For given element find if it's a tab and return it's zero-based index (or -1 for not found)
+	/** \param tab Tab for which we are looking (usually you will look for an IGUITab* type as only
+				  those can be tabs, but we allow looking for any kind of IGUIElement* as there are some
+				  use-cases for that even if it just returns 0. For example this way you can check for
+				  all children of this gui-element if they are tabs or some non-tab children.*/
+	virtual s32 getTabIndex(const IGUIElement *tab) const = 0;
+
+	//! Brings a tab to front.
+	/** \param idx: number of the tab.
+	\return Returns true if successful. */
+	virtual bool setActiveTab(s32 idx) = 0;
+
+	//! Brings a tab to front.
+	/** \param tab: pointer to the tab.
+	\return Returns true if successful. */
+	virtual bool setActiveTab(IGUITab *tab) = 0;
+
+	//! Returns which tab is currently active
+	virtual s32 getActiveTab() const = 0;
+
+	//! get the the id of the tab at the given absolute coordinates
+	/** \return The id of the tab or -1 when no tab is at those coordinates*/
+	virtual s32 getTabAt(s32 xpos, s32 ypos) const = 0;
+
+	//! Set the height of the tabs
+	virtual void setTabHeight(s32 height) = 0;
+
+	//! Get the height of the tabs
+	/** return Returns the height of the tabs */
+	virtual s32 getTabHeight() const = 0;
+
+	//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
+	virtual void setTabMaxWidth(s32 width) = 0;
+
+	//! get the maximal width of a tab
+	virtual s32 getTabMaxWidth() const = 0;
+
+	//! Set the alignment of the tabs
+	/** Use EGUIA_UPPERLEFT or EGUIA_LOWERRIGHT */
+	virtual void setTabVerticalAlignment(gui::EGUI_ALIGNMENT alignment) = 0;
+
+	//! Get the alignment of the tabs
+	/** return Returns the alignment of the tabs */
+	virtual gui::EGUI_ALIGNMENT getTabVerticalAlignment() const = 0;
+
+	//! Set the extra width added to tabs on each side of the text
+	virtual void setTabExtraWidth(s32 extraWidth) = 0;
+
+	//! Get the extra width added to tabs on each side of the text
+	/** return Returns the extra width of the tabs */
+	virtual s32 getTabExtraWidth() const = 0;
+};
+
+//! A tab-page, onto which other gui elements could be added.
+/** IGUITab refers mostly to the page itself, but also carries some data about the tab in the tabbar of an IGUITabControl. */
+class IGUITab : public IGUIElement
+{
+public:
+	//! constructor
+	IGUITab(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TAB, environment, parent, id, rectangle) {}
+
+	//! sets if the tab should draw its background
+	virtual void setDrawBackground(bool draw = true) = 0;
+
+	//! sets the color of the background, if it should be drawn.
+	virtual void setBackgroundColor(video::SColor c) = 0;
+
+	//! returns true if the tab is drawing its background, false if not
+	virtual bool isDrawingBackground() const = 0;
+
+	//! returns the color of the background
+	virtual video::SColor getBackgroundColor() const = 0;
+
+	//! sets the color of it's text in  the tab-bar
+	virtual void setTextColor(video::SColor c) = 0;
+
+	//! gets the color of the text
+	virtual video::SColor getTextColor() const = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IGUIToolbar.h b/irr/include/IGUIToolbar.h
new file mode 100644
index 000000000..2011f09a1
--- /dev/null
+++ b/irr/include/IGUIToolbar.h
@@ -0,0 +1,34 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIElement.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+} // end namespace video
+namespace gui
+{
+class IGUIButton;
+
+//! Stays at the top of its parent like the menu bar and contains tool buttons
+class IGUIToolBar : public IGUIElement
+{
+public:
+	//! constructor
+	IGUIToolBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+			IGUIElement(EGUIET_TOOL_BAR, environment, parent, id, rectangle) {}
+
+	//! Adds a button to the tool bar
+	virtual IGUIButton *addButton(s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0,
+			video::ITexture *img = 0, video::ITexture *pressedimg = 0,
+			bool isPushButton = false, bool useAlphaChannel = false) = 0;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/include/IImage.h b/irr/include/IImage.h
new file mode 100644
index 000000000..f3c29b71d
--- /dev/null
+++ b/irr/include/IImage.h
@@ -0,0 +1,424 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "position2d.h"
+#include "rect.h"
+#include "SColor.h"
+#include <cstring>
+
+namespace irr
+{
+namespace video
+{
+
+//! Interface for software image data.
+/** Image loaders create these images from files. IVideoDrivers convert
+these images into their (hardware) textures.
+NOTE: Floating point formats are not well supported yet. Basically only getData() works for them.
+*/
+class IImage : public virtual IReferenceCounted
+{
+public:
+	//! constructor
+	IImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size, bool deleteMemory) :
+			Format(format), Size(size), Data(0), MipMapsData(0), BytesPerPixel(0), Pitch(0), DeleteMemory(deleteMemory), DeleteMipMapsMemory(false)
+	{
+		BytesPerPixel = getBitsPerPixelFromFormat(Format) / 8;
+		Pitch = BytesPerPixel * Size.Width;
+	}
+
+	//! destructor
+	virtual ~IImage()
+	{
+		if (DeleteMemory)
+			delete[] Data;
+
+		if (DeleteMipMapsMemory)
+			delete[] MipMapsData;
+	}
+
+	//! Returns the color format
+	ECOLOR_FORMAT getColorFormat() const
+	{
+		return Format;
+	}
+
+	//! Returns width and height of image data.
+	const core::dimension2d<u32> &getDimension() const
+	{
+		return Size;
+	}
+
+	//! Returns bits per pixel.
+	u32 getBitsPerPixel() const
+	{
+
+		return getBitsPerPixelFromFormat(Format);
+	}
+
+	//! Returns bytes per pixel
+	u32 getBytesPerPixel() const
+	{
+		return BytesPerPixel;
+	}
+
+	//! Returns image data size in bytes
+	u32 getImageDataSizeInBytes() const
+	{
+		return getDataSizeFromFormat(Format, Size.Width, Size.Height);
+	}
+
+	//! Returns image data size in pixels
+	u32 getImageDataSizeInPixels() const
+	{
+		return Size.Width * Size.Height;
+	}
+
+	//! Returns pitch of image
+	u32 getPitch() const
+	{
+		return Pitch;
+	}
+
+	//! Returns mask for red value of a pixel
+	u32 getRedMask() const
+	{
+		switch (Format) {
+		case ECF_A1R5G5B5:
+			return 0x1F << 10;
+		case ECF_R5G6B5:
+			return 0x1F << 11;
+		case ECF_R8G8B8:
+			return 0x00FF0000;
+		case ECF_A8R8G8B8:
+			return 0x00FF0000;
+		default:
+			return 0x0;
+		}
+	}
+
+	//! Returns mask for green value of a pixel
+	u32 getGreenMask() const
+	{
+		switch (Format) {
+		case ECF_A1R5G5B5:
+			return 0x1F << 5;
+		case ECF_R5G6B5:
+			return 0x3F << 5;
+		case ECF_R8G8B8:
+			return 0x0000FF00;
+		case ECF_A8R8G8B8:
+			return 0x0000FF00;
+		default:
+			return 0x0;
+		}
+	}
+
+	//! Returns mask for blue value of a pixel
+	u32 getBlueMask() const
+	{
+		switch (Format) {
+		case ECF_A1R5G5B5:
+			return 0x1F;
+		case ECF_R5G6B5:
+			return 0x1F;
+		case ECF_R8G8B8:
+			return 0x000000FF;
+		case ECF_A8R8G8B8:
+			return 0x000000FF;
+		default:
+			return 0x0;
+		}
+	}
+
+	//! Returns mask for alpha value of a pixel
+	u32 getAlphaMask() const
+	{
+		switch (Format) {
+		case ECF_A1R5G5B5:
+			return 0x1 << 15;
+		case ECF_R5G6B5:
+			return 0x0;
+		case ECF_R8G8B8:
+			return 0x0;
+		case ECF_A8R8G8B8:
+			return 0xFF000000;
+		default:
+			return 0x0;
+		}
+	}
+
+	//! Use this to get a pointer to the image data.
+	/**
+	\return Pointer to the image data. What type of data is pointed to
+	depends on the color format of the image. For example if the color
+	format is ECF_A8R8G8B8, it is of u32. */
+	void *getData() const
+	{
+		return Data;
+	}
+
+	//! Get the mipmap size for this image for a certain mipmap level
+	/** level 0 will be full image size. Every further level is half the size.
+		Doesn't care if the image actually has mipmaps, just which size would be needed. */
+	core::dimension2du getMipMapsSize(u32 mipmapLevel) const
+	{
+		return getMipMapsSize(Size, mipmapLevel);
+	}
+
+	//! Calculate mipmap size for a certain level
+	/** level 0 will be full image size. Every further level is half the size.	*/
+	static core::dimension2du getMipMapsSize(const core::dimension2du &sizeLevel0, u32 mipmapLevel)
+	{
+		core::dimension2du result(sizeLevel0);
+		u32 i = 0;
+		while (i != mipmapLevel) {
+			if (result.Width > 1)
+				result.Width >>= 1;
+			if (result.Height > 1)
+				result.Height >>= 1;
+			++i;
+
+			if (result.Width == 1 && result.Height == 1 && i < mipmapLevel)
+				return core::dimension2du(0, 0);
+		}
+		return result;
+	}
+
+	//! Get mipmaps data.
+	/** Note that different mip levels are just behind each other in memory block.
+		So if you just get level 1 you also have the data for all other levels.
+		There is no level 0 - use getData to get the original image data.
+	*/
+	void *getMipMapsData(irr::u32 mipLevel = 1) const
+	{
+		if (MipMapsData && mipLevel > 0) {
+			size_t dataSize = 0;
+			core::dimension2du mipSize(Size);
+			u32 i = 1; // We want the start of data for this level, not end.
+
+			while (i != mipLevel) {
+				if (mipSize.Width > 1)
+					mipSize.Width >>= 1;
+
+				if (mipSize.Height > 1)
+					mipSize.Height >>= 1;
+
+				dataSize += getDataSizeFromFormat(Format, mipSize.Width, mipSize.Height);
+
+				++i;
+				if (mipSize.Width == 1 && mipSize.Height == 1 && i < mipLevel)
+					return 0;
+			}
+
+			return MipMapsData + dataSize;
+		}
+
+		return 0;
+	}
+
+	//! Set mipmaps data.
+	/** This method allows you to put custom mipmaps data for
+	image.
+	\param data A byte array with pixel color information
+	\param ownForeignMemory If true, the image will use the data
+	pointer directly and own it afterward. If false, the memory
+	will by copied internally.
+	\param deleteMemory Whether the memory is deallocated upon
+	destruction. */
+	void setMipMapsData(void *data, bool ownForeignMemory)
+	{
+		if (data != MipMapsData) {
+			if (DeleteMipMapsMemory) {
+				delete[] MipMapsData;
+
+				DeleteMipMapsMemory = false;
+			}
+
+			if (data) {
+				if (ownForeignMemory) {
+					MipMapsData = static_cast<u8 *>(data);
+
+					DeleteMipMapsMemory = false;
+				} else {
+					u32 dataSize = 0;
+					u32 width = Size.Width;
+					u32 height = Size.Height;
+
+					do {
+						if (width > 1)
+							width >>= 1;
+
+						if (height > 1)
+							height >>= 1;
+
+						dataSize += getDataSizeFromFormat(Format, width, height);
+					} while (width != 1 || height != 1);
+
+					MipMapsData = new u8[dataSize];
+					memcpy(MipMapsData, data, dataSize);
+
+					DeleteMipMapsMemory = true;
+				}
+			} else {
+				MipMapsData = 0;
+			}
+		}
+	}
+
+	//! Returns a pixel
+	virtual SColor getPixel(u32 x, u32 y) const = 0;
+
+	//! Sets a pixel
+	virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false) = 0;
+
+	//! Copies this surface into another, if it has the exact same size and format.
+	/**	NOTE: mipmaps are ignored
+	\return True if it was copied, false otherwise.
+	*/
+	virtual bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) const = 0;
+
+	//! Copies the image into the target, scaling the image to fit
+	/**	NOTE: mipmaps are ignored */
+	virtual void copyToScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) = 0;
+
+	//! Copies the image into the target, scaling the image to fit
+	/**	NOTE: mipmaps are ignored */
+	virtual void copyToScaling(IImage *target) = 0;
+
+	//! copies this surface into another
+	/**	NOTE: mipmaps are ignored */
+	virtual void copyTo(IImage *target, const core::position2d<s32> &pos = core::position2d<s32>(0, 0)) = 0;
+
+	//! copies this surface into another
+	/**	NOTE: mipmaps are ignored */
+	virtual void copyTo(IImage *target, const core::position2d<s32> &pos, const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0) = 0;
+
+	//! copies this surface into another, using the alpha mask and cliprect and a color to add with
+	/**	NOTE: mipmaps are ignored
+	\param combineAlpha - When true then combine alpha channels. When false replace target image alpha with source image alpha.
+	*/
+	virtual void copyToWithAlpha(IImage *target, const core::position2d<s32> &pos,
+			const core::rect<s32> &sourceRect, const SColor &color,
+			const core::rect<s32> *clipRect = 0,
+			bool combineAlpha = false) = 0;
+
+	//! copies this surface into another, scaling it to fit, applying a box filter
+	/**	NOTE: mipmaps are ignored */
+	virtual void copyToScalingBoxFilter(IImage *target, s32 bias = 0, bool blend = false) = 0;
+
+	//! fills the surface with given color
+	virtual void fill(const SColor &color) = 0;
+
+	//! get the amount of Bits per Pixel of the given color format
+	static u32 getBitsPerPixelFromFormat(const ECOLOR_FORMAT format)
+	{
+		switch (format) {
+		case ECF_A1R5G5B5:
+			return 16;
+		case ECF_R5G6B5:
+			return 16;
+		case ECF_R8G8B8:
+			return 24;
+		case ECF_A8R8G8B8:
+			return 32;
+		case ECF_D16:
+			return 16;
+		case ECF_D32:
+			return 32;
+		case ECF_D24S8:
+			return 32;
+		case ECF_R8:
+			return 8;
+		case ECF_R8G8:
+			return 16;
+		case ECF_R16:
+			return 16;
+		case ECF_R16G16:
+			return 32;
+		case ECF_R16F:
+			return 16;
+		case ECF_G16R16F:
+			return 32;
+		case ECF_A16B16G16R16F:
+			return 64;
+		case ECF_R32F:
+			return 32;
+		case ECF_G32R32F:
+			return 64;
+		case ECF_A32B32G32R32F:
+			return 128;
+		default:
+			return 0;
+		}
+	}
+
+	//! calculate image data size in bytes for selected format, width and height.
+	static u32 getDataSizeFromFormat(ECOLOR_FORMAT format, u32 width, u32 height)
+	{
+		// non-compressed formats
+		u32 imageSize = getBitsPerPixelFromFormat(format) / 8 * width;
+		imageSize *= height;
+
+		return imageSize;
+	}
+
+	//! check if this is compressed color format
+	static bool isCompressedFormat(const ECOLOR_FORMAT format)
+	{
+		return false;
+	}
+
+	//! check if the color format is only viable for depth/stencil textures
+	static bool isDepthFormat(const ECOLOR_FORMAT format)
+	{
+		switch (format) {
+		case ECF_D16:
+		case ECF_D32:
+		case ECF_D24S8:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	//! Check if the color format uses floating point values for pixels
+	static bool isFloatingPointFormat(const ECOLOR_FORMAT format)
+	{
+		if (isCompressedFormat(format))
+			return false;
+
+		switch (format) {
+		case ECF_R16F:
+		case ECF_G16R16F:
+		case ECF_A16B16G16R16F:
+		case ECF_R32F:
+		case ECF_G32R32F:
+		case ECF_A32B32G32R32F:
+			return true;
+		default:
+			break;
+		}
+		return false;
+	}
+
+protected:
+	ECOLOR_FORMAT Format;
+	core::dimension2d<u32> Size;
+
+	u8 *Data;
+	u8 *MipMapsData;
+
+	u32 BytesPerPixel;
+	u32 Pitch;
+
+	bool DeleteMemory;
+	bool DeleteMipMapsMemory;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IImageLoader.h b/irr/include/IImageLoader.h
new file mode 100644
index 000000000..a521be15f
--- /dev/null
+++ b/irr/include/IImageLoader.h
@@ -0,0 +1,49 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "IImage.h"
+#include "ITexture.h"
+#include "path.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace io
+{
+class IReadFile;
+} // end namespace io
+namespace video
+{
+
+//! Class which is able to create a image from a file.
+/** If you want the Irrlicht Engine be able to load textures of
+currently unsupported file formats (e.g .gif), then implement
+this and add your new Surface loader with
+IVideoDriver::addExternalImageLoader() to the engine. */
+class IImageLoader : public virtual IReferenceCounted
+{
+public:
+	//! Check if the file might be loaded by this class
+	/** Check is based on the file extension (e.g. ".tga")
+	\param filename Name of file to check.
+	\return True if file seems to be loadable. */
+	virtual bool isALoadableFileExtension(const io::path &filename) const = 0;
+
+	//! Check if the file might be loaded by this class
+	/** Check might look into the file.
+	\param file File handle to check.
+	\return True if file seems to be loadable. */
+	virtual bool isALoadableFileFormat(io::IReadFile *file) const = 0;
+
+	//! Creates a surface from the file
+	/** \param file File handle to check.
+	\return Pointer to newly created image, or 0 upon error. */
+	virtual IImage *loadImage(io::IReadFile *file) const = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IImageWriter.h b/irr/include/IImageWriter.h
new file mode 100644
index 000000000..b8defc75f
--- /dev/null
+++ b/irr/include/IImageWriter.h
@@ -0,0 +1,40 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrString.h"
+#include "coreutil.h"
+
+namespace irr
+{
+namespace io
+{
+class IWriteFile;
+} // end namespace io
+
+namespace video
+{
+class IImage;
+
+//! Interface for writing software image data.
+class IImageWriter : public IReferenceCounted
+{
+public:
+	//! Check if this writer can write a file with the given extension
+	/** \param filename Name of the file to check.
+	\return True if file extension specifies a writable type. */
+	virtual bool isAWriteableFileExtension(const io::path &filename) const = 0;
+
+	//! Write image to file
+	/** \param file File handle to write to.
+	\param image Image to write into file.
+	\param param Writer specific parameter, influencing e.g. quality.
+	\return True if image was successfully written. */
+	virtual bool writeImage(io::IWriteFile *file, IImage *image, u32 param = 0) const = 0;
+};
+
+} // namespace video
+} // namespace irr
diff --git a/irr/include/IIndexBuffer.h b/irr/include/IIndexBuffer.h
new file mode 100644
index 000000000..3d5b8e76a
--- /dev/null
+++ b/irr/include/IIndexBuffer.h
@@ -0,0 +1,59 @@
+// Copyright (C) 2008-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "EHardwareBufferFlags.h"
+#include "SVertexIndex.h"
+
+namespace irr
+{
+
+namespace video
+{
+
+}
+
+namespace scene
+{
+
+class IIndexBuffer : public virtual IReferenceCounted
+{
+public:
+	virtual void *getData() = 0;
+
+	virtual video::E_INDEX_TYPE getType() const = 0;
+	virtual void setType(video::E_INDEX_TYPE IndexType) = 0;
+
+	virtual u32 stride() const = 0;
+
+	virtual u32 size() const = 0;
+	virtual void push_back(const u32 &element) = 0;
+	virtual u32 operator[](u32 index) const = 0;
+	virtual u32 getLast() = 0;
+	virtual void setValue(u32 index, u32 value) = 0;
+	virtual void set_used(u32 usedNow) = 0;
+	virtual void reallocate(u32 new_size) = 0;
+	virtual u32 allocated_size() const = 0;
+
+	virtual void *pointer() = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint() const = 0;
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint) = 0;
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	virtual void setDirty() = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID() const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/ILogger.h b/irr/include/ILogger.h
new file mode 100644
index 000000000..2642f3398
--- /dev/null
+++ b/irr/include/ILogger.h
@@ -0,0 +1,75 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+
+namespace irr
+{
+
+//! Possible log levels.
+//! When used has filter ELL_DEBUG means => log everything and ELL_NONE means => log (nearly) nothing.
+//! When used to print logging information ELL_DEBUG will have lowest priority while ELL_NONE
+//! messages are never filtered and always printed.
+enum ELOG_LEVEL
+{
+	//! Used for printing information helpful in debugging
+	ELL_DEBUG,
+
+	//! Useful information to print. For example hardware info or something started/stopped.
+	ELL_INFORMATION,
+
+	//! Warnings that something isn't as expected and can cause oddities
+	ELL_WARNING,
+
+	//! Something did go wrong.
+	ELL_ERROR,
+
+	//! Logs with ELL_NONE will never be filtered.
+	//! And used as filter it will remove all logging except ELL_NONE messages.
+	ELL_NONE
+};
+
+//! Interface for logging messages, warnings and errors
+class ILogger : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	virtual ~ILogger() {}
+
+	//! Returns the current set log level.
+	virtual ELOG_LEVEL getLogLevel() const = 0;
+
+	//! Sets a new log level.
+	/** With this value, texts which are sent to the logger are filtered
+	out. For example setting this value to ELL_WARNING, only warnings and
+	errors are printed out. Setting it to ELL_INFORMATION, which is the
+	default setting, warnings, errors and informational texts are printed
+	out.
+	\param ll: new log level filter value. */
+	virtual void setLogLevel(ELOG_LEVEL ll) = 0;
+
+	//! Prints out a text into the log
+	/** \param text: Text to print out.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
+	virtual void log(const c8 *text, ELOG_LEVEL ll = ELL_INFORMATION) = 0;
+
+	//! Prints out a text into the log
+	/** \param text: Text to print out.
+	\param hint: Additional info. This string is added after a " :" to the
+	string.
+	\param ll: Log level of the text. If the text is an error, set
+	it to ELL_ERROR, if it is warning set it to ELL_WARNING, and if it
+	is just an informational text, set it to ELL_INFORMATION. Texts are
+	filtered with these levels. If you want to be a text displayed,
+	independent on what level filter is set, use ELL_NONE. */
+	virtual void log(const c8 *text, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION) = 0;
+};
+
+} // end namespace
diff --git a/irr/include/IMaterialRenderer.h b/irr/include/IMaterialRenderer.h
new file mode 100644
index 000000000..ba9c4b74f
--- /dev/null
+++ b/irr/include/IMaterialRenderer.h
@@ -0,0 +1,101 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace video
+{
+
+class IVideoDriver;
+class IMaterialRendererServices;
+class IShaderConstantSetCallBack;
+
+//! Interface for material rendering.
+/** Can be used to extend the engine with new materials. Refer to
+IVideoDriver::addMaterialRenderer() for more information on how to extend the
+engine with new materials. */
+class IMaterialRenderer : public virtual IReferenceCounted
+{
+public:
+	//! Called by the IVideoDriver implementation the let the renderer set its needed render states.
+	/** This is called during the IVideoDriver::setMaterial() call.
+	When overriding this, you can set some renderstates or for example a
+	vertex or pixel shader if you like.
+	\param material: The new material parameters to be set. The renderer
+	may change the material flags in this material. For example if this
+	material does not accept the zbuffer = true, it can set it to false.
+	This is useful, because in the next lastMaterial will be just the
+	material in this call.
+	\param lastMaterial: The material parameters which have been set before
+	this material.
+	\param resetAllRenderstates: True if all renderstates should really be
+	reset. This is usually true if the last rendering mode was not a usual
+	3d rendering mode, but for example a 2d rendering mode.
+	You should reset really all renderstates if this is true, no matter if
+	the lastMaterial had some similar settings. This is used because in
+	most cases, some common renderstates are not changed if they are
+	already there, for example bilinear filtering, wireframe,
+	gouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fogenable.
+	\param services: Interface providing some methods for changing
+	advanced, internal states of a IVideoDriver. */
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) {}
+
+	//! Called every time before a new bunch of geometry is being drawn using this material with for example drawIndexedTriangleList() call.
+	/** OnSetMaterial should normally only be called if the renderer decides
+	that the renderstates should be changed, it won't be called if for
+	example two drawIndexedTriangleList() will be called with the same
+	material set. This method will be called every time. This is useful for
+	example for materials with shaders, which don't only set new
+	renderstates but also shader constants.
+	\param service: Pointer to interface providing methods for setting
+	constants and other things.
+	\param vtxtype: Vertex type with which the next rendering will be done.
+	This can be used by the material renderer to set some specific
+	optimized shaders or if this is an incompatible vertex type for this
+	renderer, to refuse rendering for example.
+	\return Returns true if everything is OK, and false if nothing should
+	be rendered. The material renderer can choose to return false for
+	example if he doesn't support the specified vertex type. This is
+	actually done in D3D9 when using a normal mapped material with
+	a vertex type other than EVT_TANGENTS. */
+	virtual bool OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype) { return true; }
+
+	//! Called by the IVideoDriver to unset this material.
+	/** Called during the IVideoDriver::setMaterial() call before the new
+	material will get the OnSetMaterial() call. */
+	virtual void OnUnsetMaterial() {}
+
+	//! Returns if the material is transparent.
+	/** The scene management needs to know this
+	for being able to sort the materials by opaque and transparent. */
+	virtual bool isTransparent() const { return false; }
+
+	//! Returns the render capability of the material.
+	/** Because some more complex materials
+	are implemented in multiple ways and need special hardware capabilities, it is possible
+	to query how the current material renderer is performing on the current hardware with this
+	function.
+	\return Returns 0 if everything is running fine. Any other value is material renderer
+	specific and means for example that the renderer switched back to a fall back material because
+	it cannot use the latest shaders. More specific examples:
+	Fixed function pipeline materials should return 0 in most cases, parallax mapped
+	material will only return 0 when at least pixel shader 1.4 is available on that machine. */
+	virtual s32 getRenderCapability() const { return 0; }
+
+	//! Access the callback provided by the users when creating shader materials
+	/** \returns Returns either the users provided callback or 0 when no such
+	callback exists. Non-shader materials will always return 0.	*/
+	virtual IShaderConstantSetCallBack *getShaderConstantSetCallBack() const { return 0; }
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IMaterialRendererServices.h b/irr/include/IMaterialRendererServices.h
new file mode 100644
index 000000000..81a195d8c
--- /dev/null
+++ b/irr/include/IMaterialRendererServices.h
@@ -0,0 +1,80 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SMaterial.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace video
+{
+
+class IVideoDriver;
+
+//! Interface providing some methods for changing advanced, internal states of a IVideoDriver.
+class IMaterialRendererServices
+{
+public:
+	//! Destructor
+	virtual ~IMaterialRendererServices() {}
+
+	//! Can be called by an IMaterialRenderer to make its work easier.
+	/** Sets all basic renderstates if needed.
+	Basic render states are diffuse, ambient, specular, and emissive color,
+	specular power, bilinear and trilinear filtering, wireframe mode,
+	grouraudshading, lighting, zbuffer, zwriteenable, backfaceculling and
+	fog enabling.
+	\param material The new material to be used.
+	\param lastMaterial The material used until now.
+	\param resetAllRenderstates Set to true if all renderstates should be
+	set, regardless of their current state. */
+	virtual void setBasicRenderStates(const SMaterial &material,
+			const SMaterial &lastMaterial,
+			bool resetAllRenderstates) = 0;
+
+	//! Return an index constant for the vertex shader based on a uniform variable name.
+	virtual s32 getVertexShaderConstantID(const c8 *name) = 0;
+
+	//! Sets a value for a vertex shader uniform variable.
+	/** \param index Index of the variable (as received from getVertexShaderConstantID)
+	\param floats Pointer to array of floats
+	\param count Amount of floats in array.
+	\return True if successful.
+	*/
+	virtual bool setVertexShaderConstant(s32 index, const f32 *floats, int count) = 0;
+
+	//! Int interface for the above.
+	virtual bool setVertexShaderConstant(s32 index, const s32 *ints, int count) = 0;
+
+	//! Uint interface for the above.
+	virtual bool setVertexShaderConstant(s32 index, const u32 *ints, int count) = 0;
+
+	//! Return an index constant for the pixel shader for the given uniform variable name
+	virtual s32 getPixelShaderConstantID(const c8 *name) = 0;
+
+	//! Sets a value for the given pixel shader uniform variable
+	/** This can be used if you used a high level shader language like GLSL
+	or HLSL to create a shader. See setVertexShaderConstant() for an
+	example on how to use this.
+	\param index Index of the variable (as received from getPixelShaderConstantID)
+	\param floats Pointer to array of floats
+	\param count Amount of floats in array.
+	\return True if successful. */
+	virtual bool setPixelShaderConstant(s32 index, const f32 *floats, int count) = 0;
+
+	//! Int interface for the above.
+	virtual bool setPixelShaderConstant(s32 index, const s32 *ints, int count) = 0;
+
+	//! Uint interface for the above.
+	virtual bool setPixelShaderConstant(s32 index, const u32 *ints, int count) = 0;
+
+	//! Get pointer to the IVideoDriver interface
+	/** \return Pointer to the IVideoDriver interface */
+	virtual IVideoDriver *getVideoDriver() = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IMemoryReadFile.h b/irr/include/IMemoryReadFile.h
new file mode 100644
index 000000000..982b09af3
--- /dev/null
+++ b/irr/include/IMemoryReadFile.h
@@ -0,0 +1,27 @@
+// Copyright Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReadFile.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Interface providing read access to a memory read file.
+class IMemoryReadFile : public IReadFile
+{
+public:
+	//! Get direct access to internal buffer of memory block used as file.
+	/** It's usually better to use the IReadFile functions to access
+	the file content. But as that buffer exist over the full life-time
+	of a CMemoryReadFile, it's sometimes nice to avoid the additional
+	data-copy which read() needs.
+	*/
+	virtual const void *getBuffer() const = 0;
+};
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IMesh.h b/irr/include/IMesh.h
new file mode 100644
index 000000000..6d06eb762
--- /dev/null
+++ b/irr/include/IMesh.h
@@ -0,0 +1,123 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "EHardwareBufferFlags.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Possible types of meshes.
+// Note: Was previously only used in IAnimatedMesh so it still has the "animated" in the name.
+// 		 But can now be used for all mesh-types as we need those casts as well.
+enum E_ANIMATED_MESH_TYPE
+{
+	//! Unknown animated mesh type.
+	EAMT_UNKNOWN = 0,
+
+	//! Quake 2 MD2 model file
+	EAMT_MD2,
+
+	//! Quake 3 MD3 model file
+	EAMT_MD3,
+
+	//! Maya .obj static model
+	EAMT_OBJ,
+
+	//! Quake 3 .bsp static Map
+	EAMT_BSP,
+
+	//! 3D Studio .3ds file
+	EAMT_3DS,
+
+	//! My3D Mesh, the file format by Zhuck Dimitry
+	EAMT_MY3D,
+
+	//! Pulsar LMTools .lmts file. This Irrlicht loader was written by Jonas Petersen
+	EAMT_LMTS,
+
+	//! Cartography Shop .csm file. This loader was created by Saurav Mohapatra.
+	EAMT_CSM,
+
+	//! .oct file for Paul Nette's FSRad or from Murphy McCauley's Blender .oct exporter.
+	/** The oct file format contains 3D geometry and lightmaps and
+	can be loaded directly by Irrlicht */
+	EAMT_OCT,
+
+	//! Halflife MDL model file
+	EAMT_MDL_HALFLIFE,
+
+	//! generic skinned mesh
+	EAMT_SKINNED,
+
+	//! generic non-animated mesh
+	EAMT_STATIC
+};
+
+class IMeshBuffer;
+
+//! Class which holds the geometry of an object.
+/** An IMesh is nothing more than a collection of some mesh buffers
+(IMeshBuffer). SMesh is a simple implementation of an IMesh.
+A mesh is usually added to an IMeshSceneNode in order to be rendered.
+*/
+class IMesh : public virtual IReferenceCounted
+{
+public:
+	//! Get the amount of mesh buffers.
+	/** \return Amount of mesh buffers (IMeshBuffer) in this mesh. */
+	virtual u32 getMeshBufferCount() const = 0;
+
+	//! Get pointer to a mesh buffer.
+	/** \param nr: Zero based index of the mesh buffer. The maximum value is
+	getMeshBufferCount() - 1;
+	\return Pointer to the mesh buffer or 0 if there is no such
+	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0;
+
+	//! Get pointer to a mesh buffer which fits a material
+	/** \param material: material to search for
+	\return Pointer to the mesh buffer or 0 if there is no such
+	mesh buffer. */
+	virtual IMeshBuffer *getMeshBuffer(const video::SMaterial &material) const = 0;
+
+	//! Get an axis aligned bounding box of the mesh.
+	/** \return Bounding box of this mesh. */
+	virtual const core::aabbox3d<f32> &getBoundingBox() const = 0;
+
+	//! Set user-defined axis aligned bounding box
+	/** \param box New bounding box to use for the mesh. */
+	virtual void setBoundingBox(const core::aabbox3df &box) = 0;
+
+	//! Set the hardware mapping hint
+	/** This methods allows to define optimization hints for the
+	hardware. This enables, e.g., the use of hardware buffers on
+	platforms that support this feature. This can lead to noticeable
+	performance gains. */
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Flag the meshbuffer as changed, reloads hardware buffers
+	/** This method has to be called every time the vertices or
+	indices have changed. Otherwise, changes won't be updated
+	on the GPU in the next render cycle. */
+	virtual void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Returns the type of the meshes.
+	/** This is useful for making a safe downcast. For example,
+	if getMeshType() returns EAMT_MD2 it's safe to cast the
+	IMesh to IAnimatedMeshMD2.
+	Note: It's no longer just about animated meshes, that name has just historical reasons.
+	\returns Type of the mesh  */
+	virtual E_ANIMATED_MESH_TYPE getMeshType() const
+	{
+		return EAMT_STATIC;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IMeshBuffer.h b/irr/include/IMeshBuffer.h
new file mode 100644
index 000000000..c69a12d1d
--- /dev/null
+++ b/irr/include/IMeshBuffer.h
@@ -0,0 +1,208 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "SMaterial.h"
+#include "aabbox3d.h"
+#include "S3DVertex.h"
+#include "SVertexIndex.h"
+#include "EHardwareBufferFlags.h"
+#include "EPrimitiveTypes.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Struct for holding a mesh with a single material.
+/** A part of an IMesh which has the same material on each face of that
+group. Logical groups of an IMesh need not be put into separate mesh
+buffers, but can be. Separately animated parts of the mesh must be put
+into separate mesh buffers.
+Some mesh buffer implementations have limitations on the number of
+vertices the buffer can hold. In that case, logical grouping can help.
+Moreover, the number of vertices should be optimized for the GPU upload,
+which often depends on the type of gfx card. Typical figures are
+1000-10000 vertices per buffer.
+SMeshBuffer is a simple implementation of a MeshBuffer, which supports
+up to 65535 vertices.
+
+Since meshbuffers are used for drawing, and hence will be exposed
+to the driver, chances are high that they are grab()'ed from somewhere.
+It's therefore required to dynamically allocate meshbuffers which are
+passed to a video driver and only drop the buffer once it's not used in
+the current code block anymore.
+*/
+class IMeshBuffer : public virtual IReferenceCounted
+{
+public:
+	//! Get the material of this meshbuffer
+	/** \return Material of this buffer. */
+	virtual video::SMaterial &getMaterial() = 0;
+
+	//! Get the material of this meshbuffer
+	/** \return Material of this buffer. */
+	virtual const video::SMaterial &getMaterial() const = 0;
+
+	//! Get type of vertex data which is stored in this meshbuffer.
+	/** \return Vertex type of this buffer. */
+	virtual video::E_VERTEX_TYPE getVertexType() const = 0;
+
+	//! Get access to vertex data. The data is an array of vertices.
+	/** Which vertex type is used can be determined by getVertexType().
+	\return Pointer to array of vertices. */
+	virtual const void *getVertices() const = 0;
+
+	//! Get access to vertex data. The data is an array of vertices.
+	/** Which vertex type is used can be determined by getVertexType().
+	\return Pointer to array of vertices. */
+	virtual void *getVertices() = 0;
+
+	//! Get amount of vertices in meshbuffer.
+	/** \return Number of vertices in this buffer. */
+	virtual u32 getVertexCount() const = 0;
+
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	virtual video::E_INDEX_TYPE getIndexType() const = 0;
+
+	//! Get access to indices.
+	/** \return Pointer to indices array. */
+	virtual const u16 *getIndices() const = 0;
+
+	//! Get access to indices.
+	/** \return Pointer to indices array. */
+	virtual u16 *getIndices() = 0;
+
+	//! Get amount of indices in this meshbuffer.
+	/** \return Number of indices in this buffer. */
+	virtual u32 getIndexCount() const = 0;
+
+	//! Get the axis aligned bounding box of this meshbuffer.
+	/** \return Axis aligned bounding box of this buffer. */
+	virtual const core::aabbox3df &getBoundingBox() const = 0;
+
+	//! Set axis aligned bounding box
+	/** \param box User defined axis aligned bounding box to use
+	for this buffer. */
+	virtual void setBoundingBox(const core::aabbox3df &box) = 0;
+
+	//! Recalculates the bounding box. Should be called if the mesh changed.
+	virtual void recalculateBoundingBox() = 0;
+
+	//! returns position of vertex i
+	virtual const core::vector3df &getPosition(u32 i) const = 0;
+
+	//! returns position of vertex i
+	virtual core::vector3df &getPosition(u32 i) = 0;
+
+	//! returns normal of vertex i
+	virtual const core::vector3df &getNormal(u32 i) const = 0;
+
+	//! returns normal of vertex i
+	virtual core::vector3df &getNormal(u32 i) = 0;
+
+	//! returns texture coord of vertex i
+	virtual const core::vector2df &getTCoords(u32 i) const = 0;
+
+	//! returns texture coord of vertex i
+	virtual core::vector2df &getTCoords(u32 i) = 0;
+
+	//! Append the vertices and indices to the current buffer
+	/** Only works for compatible vertex types.
+	\param vertices Pointer to a vertex array.
+	\param numVertices Number of vertices in the array.
+	\param indices Pointer to index array.
+	\param numIndices Number of indices in array. */
+	virtual void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const = 0;
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	virtual void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID_Vertex() const = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID_Index() const = 0;
+
+	//! Used by the VideoDriver to remember the buffer link.
+	virtual void setHWBuffer(void *ptr) const = 0;
+	virtual void *getHWBuffer() const = 0;
+
+	//! Describe what kind of primitive geometry is used by the meshbuffer
+	/** Note: Default is EPT_TRIANGLES. Using other types is fine for rendering.
+	But meshbuffer manipulation functions might expect type EPT_TRIANGLES
+	to work correctly. Also mesh writers will generally fail (badly!) with other
+	types than EPT_TRIANGLES. */
+	virtual void setPrimitiveType(E_PRIMITIVE_TYPE type) = 0;
+
+	//! Get the kind of primitive geometry which is used by the meshbuffer
+	virtual E_PRIMITIVE_TYPE getPrimitiveType() const = 0;
+
+	//! Calculate how many geometric primitives are used by this meshbuffer
+	virtual u32 getPrimitiveCount() const
+	{
+		const u32 indexCount = getIndexCount();
+		switch (getPrimitiveType()) {
+		case scene::EPT_POINTS:
+			return indexCount;
+		case scene::EPT_LINE_STRIP:
+			return indexCount - 1;
+		case scene::EPT_LINE_LOOP:
+			return indexCount;
+		case scene::EPT_LINES:
+			return indexCount / 2;
+		case scene::EPT_TRIANGLE_STRIP:
+			return (indexCount - 2);
+		case scene::EPT_TRIANGLE_FAN:
+			return (indexCount - 2);
+		case scene::EPT_TRIANGLES:
+			return indexCount / 3;
+		case scene::EPT_POINT_SPRITES:
+			return indexCount;
+		}
+		return 0;
+	}
+
+	//! Calculate size of vertices and indices in memory
+	virtual size_t getSize() const
+	{
+		size_t ret = 0;
+		switch (getVertexType()) {
+			case video::EVT_STANDARD:
+				ret += sizeof(video::S3DVertex) * getVertexCount();
+				break;
+			case video::EVT_2TCOORDS:
+				ret += sizeof(video::S3DVertex2TCoords) * getVertexCount();
+				break;
+			case video::EVT_TANGENTS:
+				ret += sizeof(video::S3DVertexTangents) * getVertexCount();
+				break;
+		}
+		switch (getIndexType()) {
+			case video::EIT_16BIT:
+				ret += sizeof(u16) * getIndexCount();
+				break;
+			case video::EIT_32BIT:
+				ret += sizeof(u32) * getIndexCount();
+				break;
+		}
+		return ret;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IMeshCache.h b/irr/include/IMeshCache.h
new file mode 100644
index 000000000..66052bfac
--- /dev/null
+++ b/irr/include/IMeshCache.h
@@ -0,0 +1,131 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+
+namespace scene
+{
+class IMesh;
+class IAnimatedMesh;
+class IAnimatedMeshSceneNode;
+class IMeshLoader;
+
+//! The mesh cache stores already loaded meshes and provides an interface to them.
+/** You can access it using ISceneManager::getMeshCache(). All existing
+scene managers will return a pointer to the same mesh cache, because it
+is shared between them. With this interface, it is possible to manually
+add new loaded meshes (if ISceneManager::getMesh() is not sufficient),
+to remove them and to iterate through already loaded meshes. */
+class IMeshCache : public virtual IReferenceCounted
+{
+public:
+	//! Destructor
+	virtual ~IMeshCache() {}
+
+	//! Adds a mesh to the internal list of loaded meshes.
+	/** Usually, ISceneManager::getMesh() is called to load a mesh
+	from a file. That method searches the list of loaded meshes if
+	a mesh has already been loaded and returns a pointer to if it
+	is in that list and already in memory. Otherwise it loads the
+	mesh. With IMeshCache::addMesh(), it is possible to pretend
+	that a mesh already has been loaded. This method can be used
+	for example by mesh loaders who need to load more than one mesh
+	with one call. They can add additional meshes with this method
+	to the scene manager. The COLLADA loader for example uses this
+	method.
+	\param name Name of the mesh. When calling
+	ISceneManager::getMesh() with this name it will return the mesh
+	set by this method.
+	\param mesh Pointer to a mesh which will now be referenced by
+	this name. */
+	virtual void addMesh(const io::path &name, IAnimatedMesh *mesh) = 0;
+
+	//! Removes the mesh from the cache.
+	/** After loading a mesh with getMesh(), the mesh can be
+	removed from the cache using this method, freeing a lot of
+	memory.
+	\param mesh Pointer to the mesh which shall be removed. */
+	virtual void removeMesh(const IMesh *const mesh) = 0;
+
+	//! Returns amount of loaded meshes in the cache.
+	/** You can load new meshes into the cache using getMesh() and
+	addMesh(). If you ever need to access the internal mesh cache,
+	you can do this using removeMesh(), getMeshNumber(),
+	getMeshByIndex() and getMeshName().
+	\return Number of meshes in cache. */
+	virtual u32 getMeshCount() const = 0;
+
+	//! Returns current index number of the mesh or -1 when not found.
+	/** \param mesh Pointer to the mesh to search for.
+	\return Index of the mesh in the cache, or -1 if not found. */
+	virtual s32 getMeshIndex(const IMesh *const mesh) const = 0;
+
+	//! Returns a mesh based on its index number.
+	/** \param index: Index of the mesh, number between 0 and
+	getMeshCount()-1.
+	Note that this number is only valid until a new mesh is loaded
+	or removed.
+	\return Pointer to the mesh or 0 if there is none with this
+	number. */
+	virtual IAnimatedMesh *getMeshByIndex(u32 index) = 0;
+
+	//! Returns a mesh based on its name.
+	/** \param name Name of the mesh. Usually a filename.
+	\return Pointer to the mesh or 0 if there is none with this number. */
+	virtual IAnimatedMesh *getMeshByName(const io::path &name) = 0;
+
+	//! Get the name of a loaded mesh, based on its index.
+	/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
+	\return The name if mesh was found and has a name, else the path is empty. */
+	virtual const io::SNamedPath &getMeshName(u32 index) const = 0;
+
+	//! Get the name of the loaded mesh if there is any.
+	/** \param mesh Pointer to mesh to query.
+	\return The name if mesh was found and has a name, else the path is empty. */
+	virtual const io::SNamedPath &getMeshName(const IMesh *const mesh) const = 0;
+
+	//! Renames a loaded mesh.
+	/** Note that renaming meshes might change the ordering of the
+	meshes, and so the index of the meshes as returned by
+	getMeshIndex() or taken by some methods will change.
+	\param index The index of the mesh in the cache.
+	\param name New name for the mesh.
+	\return True if mesh was renamed. */
+	virtual bool renameMesh(u32 index, const io::path &name) = 0;
+
+	//! Renames the loaded mesh
+	/** Note that renaming meshes might change the ordering of the
+	meshes, and so the index of the meshes as returned by
+	getMeshIndex() or taken by some methods will change.
+	\param mesh Mesh to be renamed.
+	\param name New name for the mesh.
+	\return True if mesh was renamed. */
+	virtual bool renameMesh(const IMesh *const mesh, const io::path &name) = 0;
+
+	//! Check if a mesh was already loaded.
+	/** \param name Name of the mesh. Usually a filename.
+	\return True if the mesh has been loaded, else false. */
+	virtual bool isMeshLoaded(const io::path &name) = 0;
+
+	//! Clears the whole mesh cache, removing all meshes.
+	/** All meshes will be reloaded completely when using ISceneManager::getMesh()
+	after calling this method.
+	Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
+	and you did not grab them, then they may become invalid. */
+	virtual void clear() = 0;
+
+	//! Clears all meshes that are held in the mesh cache but not used anywhere else.
+	/** Warning: If you have pointers to meshes that were loaded with ISceneManager::getMesh()
+	and you did not grab them, then they may become invalid. */
+	virtual void clearUnusedMeshes() = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IMeshLoader.h b/irr/include/IMeshLoader.h
new file mode 100644
index 000000000..d1f2675e9
--- /dev/null
+++ b/irr/include/IMeshLoader.h
@@ -0,0 +1,50 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+namespace io
+{
+class IReadFile;
+} // end namespace io
+namespace scene
+{
+class IAnimatedMesh;
+
+//! Class which is able to load an animated mesh from a file.
+/** If you want Irrlicht be able to load meshes of
+currently unsupported file formats (e.g. .cob), then implement
+this and add your new Meshloader with
+ISceneManager::addExternalMeshLoader() to the engine. */
+class IMeshLoader : public virtual IReferenceCounted
+{
+public:
+	//! Constructor
+	IMeshLoader() {}
+
+	//! Destructor
+	virtual ~IMeshLoader() {}
+
+	//! Returns true if the file might be loaded by this class.
+	/** This decision should be based on the file extension (e.g. ".cob")
+	only.
+	\param filename Name of the file to test.
+	\return True if the file might be loaded by this class. */
+	virtual bool isALoadableFileExtension(const io::path &filename) const = 0;
+
+	//! Creates/loads an animated mesh from the file.
+	/** \param file File handler to load the file from.
+	\return Pointer to the created mesh. Returns 0 if loading failed.
+	If you no longer need the mesh, you should call IAnimatedMesh::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IAnimatedMesh *createMesh(io::IReadFile *file) = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IMeshManipulator.h b/irr/include/IMeshManipulator.h
new file mode 100644
index 000000000..de3d84416
--- /dev/null
+++ b/irr/include/IMeshManipulator.h
@@ -0,0 +1,170 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "vector3d.h"
+#include "aabbox3d.h"
+#include "matrix4.h"
+#include "IAnimatedMesh.h"
+#include "IMeshBuffer.h"
+#include "SVertexManipulator.h"
+
+namespace irr
+{
+namespace scene
+{
+
+struct SMesh;
+
+//! An interface for easy manipulation of meshes.
+/** Scale, set alpha value, flip surfaces, and so on. This exists for
+fixing problems with wrong imported or exported meshes quickly after
+loading. It is not intended for doing mesh modifications and/or
+animations during runtime.
+*/
+class IMeshManipulator : public virtual IReferenceCounted
+{
+public:
+	//! Recalculates all normals of the mesh.
+	/** \param mesh: Mesh on which the operation is performed.
+	\param smooth: If the normals shall be smoothed.
+	\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	virtual void recalculateNormals(IMesh *mesh, bool smooth = false,
+			bool angleWeighted = false) const = 0;
+
+	//! Recalculates all normals of the mesh buffer.
+	/** \param buffer: Mesh buffer on which the operation is performed.
+	\param smooth: If the normals shall be smoothed.
+	\param angleWeighted: If the normals shall be smoothed in relation to their angles. More expensive, but also higher precision. */
+	virtual void recalculateNormals(IMeshBuffer *buffer,
+			bool smooth = false, bool angleWeighted = false) const = 0;
+
+	//! Scales the actual mesh, not a scene node.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Scale factor for each axis. */
+	void scale(IMesh *mesh, const core::vector3df &factor) const
+	{
+		apply(SVertexPositionScaleManipulator(factor), mesh, true);
+	}
+
+	//! Scales the actual meshbuffer, not a scene node.
+	/** \param buffer Meshbuffer on which the operation is performed.
+	\param factor Scale factor for each axis. */
+	void scale(IMeshBuffer *buffer, const core::vector3df &factor) const
+	{
+		apply(SVertexPositionScaleManipulator(factor), buffer, true);
+	}
+
+	//! Clones a static IMesh into a modifiable SMesh.
+	/** All meshbuffers in the returned SMesh
+	are of type SMeshBuffer or SMeshBufferLightMap.
+	\param mesh Mesh to copy.
+	\return Cloned mesh. If you no longer need the
+	cloned mesh, you should call SMesh::drop(). See
+	IReferenceCounted::drop() for more information. */
+	virtual SMesh *createMeshCopy(IMesh *mesh) const = 0;
+
+	//! Get amount of polygons in mesh.
+	/** \param mesh Input mesh
+	\return Number of polygons in mesh. */
+	virtual s32 getPolyCount(IMesh *mesh) const = 0;
+
+	//! Get amount of polygons in mesh.
+	/** \param mesh Input mesh
+	\return Number of polygons in mesh. */
+	virtual s32 getPolyCount(IAnimatedMesh *mesh) const = 0;
+
+	//! Create a new AnimatedMesh and adds the mesh to it
+	/** \param mesh Input mesh
+	\param type The type of the animated mesh to create.
+	\return Newly created animated mesh with mesh as its only
+	content. When you don't need the animated mesh anymore, you
+	should call IAnimatedMesh::drop(). See
+	IReferenceCounted::drop() for more information. */
+	virtual IAnimatedMesh *createAnimatedMesh(IMesh *mesh,
+			scene::E_ANIMATED_MESH_TYPE type = scene::EAMT_UNKNOWN) const = 0;
+
+	//! Apply a manipulator on the Meshbuffer
+	/** \param func A functor defining the mesh manipulation.
+	\param buffer The Meshbuffer to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate = false) const
+	{
+		return apply_(func, buffer, boundingBoxUpdate, func);
+	}
+
+	//! Apply a manipulator on the Mesh
+	/** \param func A functor defining the mesh manipulation.
+	\param mesh The Mesh to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply(const Functor &func, IMesh *mesh, bool boundingBoxUpdate = false) const
+	{
+		if (!mesh)
+			return true;
+		bool result = true;
+		core::aabbox3df bufferbox;
+		for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
+			result &= apply(func, mesh->getMeshBuffer(i), boundingBoxUpdate);
+			if (boundingBoxUpdate) {
+				if (0 == i)
+					bufferbox.reset(mesh->getMeshBuffer(i)->getBoundingBox());
+				else
+					bufferbox.addInternalBox(mesh->getMeshBuffer(i)->getBoundingBox());
+			}
+		}
+		if (boundingBoxUpdate)
+			mesh->setBoundingBox(bufferbox);
+		return result;
+	}
+
+protected:
+	//! Apply a manipulator based on the type of the functor
+	/** \param func A functor defining the mesh manipulation.
+	\param buffer The Meshbuffer to apply the manipulator to.
+	\param boundingBoxUpdate Specifies if the bounding box should be updated during manipulation.
+	\param typeTest Unused parameter, which handles the proper call selection based on the type of the Functor which is passed in two times.
+	\return True if the functor was successfully applied, else false. */
+	template <typename Functor>
+	bool apply_(const Functor &func, IMeshBuffer *buffer, bool boundingBoxUpdate, const IVertexManipulator &typeTest) const
+	{
+		if (!buffer)
+			return true;
+
+		core::aabbox3df bufferbox;
+		for (u32 i = 0; i < buffer->getVertexCount(); ++i) {
+			switch (buffer->getVertexType()) {
+			case video::EVT_STANDARD: {
+				video::S3DVertex *verts = (video::S3DVertex *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			case video::EVT_2TCOORDS: {
+				video::S3DVertex2TCoords *verts = (video::S3DVertex2TCoords *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			case video::EVT_TANGENTS: {
+				video::S3DVertexTangents *verts = (video::S3DVertexTangents *)buffer->getVertices();
+				func(verts[i]);
+			} break;
+			}
+			if (boundingBoxUpdate) {
+				if (0 == i)
+					bufferbox.reset(buffer->getPosition(0));
+				else
+					bufferbox.addInternalPoint(buffer->getPosition(i));
+			}
+		}
+		if (boundingBoxUpdate)
+			buffer->setBoundingBox(bufferbox);
+		return true;
+	}
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IMeshSceneNode.h b/irr/include/IMeshSceneNode.h
new file mode 100644
index 000000000..89b26dce1
--- /dev/null
+++ b/irr/include/IMeshSceneNode.h
@@ -0,0 +1,50 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class IMesh;
+
+//! A scene node displaying a static mesh
+class IMeshSceneNode : public ISceneNode
+{
+public:
+	//! Constructor
+	/** Use setMesh() to set the mesh to display.
+	 */
+	IMeshSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1, 1, 1)) :
+			ISceneNode(parent, mgr, id, position, rotation, scale) {}
+
+	//! Sets a new mesh to display
+	/** \param mesh Mesh to display. */
+	virtual void setMesh(IMesh *mesh) = 0;
+
+	//! Get the currently defined mesh for display.
+	/** \return Pointer to mesh which is displayed by this node. */
+	virtual IMesh *getMesh(void) = 0;
+
+	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+	/** In this way it is possible to change the materials of a mesh
+	causing all mesh scene nodes referencing this mesh to change, too.
+	\param readonly Flag if the materials shall be read-only. */
+	virtual void setReadOnlyMaterials(bool readonly) = 0;
+
+	//! Check if the scene node should not copy the materials of the mesh but use them in a read only style
+	/** This flag can be set by setReadOnlyMaterials().
+	\return Whether the materials are read-only. */
+	virtual bool isReadOnlyMaterials() const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IOSOperator.h b/irr/include/IOSOperator.h
new file mode 100644
index 000000000..6164af5c9
--- /dev/null
+++ b/irr/include/IOSOperator.h
@@ -0,0 +1,45 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrString.h"
+
+namespace irr
+{
+
+//! The OSOperator provides OS-specific methods and information.
+class IOSOperator : public virtual IReferenceCounted
+{
+public:
+	//! Get the current OS version as string.
+	virtual const core::stringc &getOperatingSystemVersion() const = 0;
+
+	//! Copies text to the clipboard
+	//! \param text: text in utf-8
+	virtual void copyToClipboard(const c8 *text) const = 0;
+
+	//! Copies text to the primary selection
+	//! This is a no-op on some platforms.
+	//! \param text: text in utf-8
+	virtual void copyToPrimarySelection(const c8 *text) const = 0;
+
+	//! Get text from the clipboard
+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
+	virtual const c8 *getTextFromClipboard() const = 0;
+
+	//! Get text from the primary selection
+	//! This is a no-op on some platforms.
+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
+	virtual const c8 *getTextFromPrimarySelection() const = 0;
+
+	//! Get the total and available system RAM
+	/** \param totalBytes: will contain the total system memory in Kilobytes (1024 B)
+	\param availableBytes: will contain the available memory in Kilobytes (1024 B)
+	\return True if successful, false if not */
+	virtual bool getSystemMemory(u32 *totalBytes, u32 *availableBytes) const = 0;
+};
+
+} // end namespace
diff --git a/irr/include/IReadFile.h b/irr/include/IReadFile.h
new file mode 100644
index 000000000..d3d973069
--- /dev/null
+++ b/irr/include/IReadFile.h
@@ -0,0 +1,57 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "coreutil.h"
+#include "EReadFileType.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Interface providing read access to a file.
+class IReadFile : public virtual IReferenceCounted
+{
+public:
+	//! Reads an amount of bytes from the file.
+	/** \param buffer Pointer to buffer where read bytes are written to.
+	\param sizeToRead Amount of bytes to read from the file.
+	\return How many bytes were read. */
+	virtual size_t read(void *buffer, size_t sizeToRead) = 0;
+
+	//! Changes position in file
+	/** \param finalPos Destination position in the file.
+	\param relativeMovement If set to true, the position in the file is
+	changed relative to current position. Otherwise the position is changed
+	from beginning of file.
+	\return True if successful, otherwise false. */
+	virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
+
+	//! Get size of file.
+	/** \return Size of the file in bytes. */
+	virtual long getSize() const = 0;
+
+	//! Get the current position in the file.
+	/** \return Current position in the file in bytes on success or -1L on failure. */
+	virtual long getPos() const = 0;
+
+	//! Get name of file.
+	/** \return File name as zero terminated character string. */
+	virtual const io::path &getFileName() const = 0;
+
+	//! Get the type of the class implementing this interface
+	virtual EREAD_FILE_TYPE getType() const
+	{
+		return EFIT_UNKNOWN;
+	}
+};
+
+//! Internal function, please do not use.
+IReadFile *createLimitReadFile(const io::path &fileName, IReadFile *alreadyOpenedFile, long pos, long areaSize);
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IReferenceCounted.h b/irr/include/IReferenceCounted.h
new file mode 100644
index 000000000..6f85bb904
--- /dev/null
+++ b/irr/include/IReferenceCounted.h
@@ -0,0 +1,162 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+
+//! Base class of most objects of the Irrlicht Engine.
+/** This class provides reference counting through the methods grab() and drop().
+It also is able to store a debug string for every instance of an object.
+Most objects of the Irrlicht
+Engine are derived from IReferenceCounted, and so they are reference counted.
+
+When you create an object in the Irrlicht engine, calling a method
+which starts with 'create', an object is created, and you get a pointer
+to the new object. If you no longer need the object, you have
+to call drop(). This will destroy the object, if grab() was not called
+in another part of you program, because this part still needs the object.
+Note, that you only need to call drop() to the object, if you created it,
+and the method had a 'create' in it.
+
+A simple example:
+
+If you want to create a texture, you may want to call an imaginable method
+IDriver::createTexture. You call
+ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+If you no longer need the texture, call texture->drop().
+
+If you want to load a texture, you may want to call imaginable method
+IDriver::loadTexture. You do this like
+ITexture* texture = driver->loadTexture("example.jpg");
+You will not have to drop the pointer to the loaded texture, because
+the name of the method does not start with 'create'. The texture
+is stored somewhere by the driver.
+*/
+class IReferenceCounted
+{
+public:
+	//! Constructor.
+	IReferenceCounted() :
+			DebugName(0), ReferenceCounter(1)
+	{
+	}
+
+	//! Destructor.
+	virtual ~IReferenceCounted()
+	{
+	}
+
+	//! Grabs the object. Increments the reference counter by one.
+	/** Someone who calls grab() to an object, should later also
+	call drop() to it. If an object never gets as much drop() as
+	grab() calls, it will never be destroyed. The
+	IReferenceCounted class provides a basic reference counting
+	mechanism with its methods grab() and drop(). Most objects of
+	the Irrlicht Engine are derived from IReferenceCounted, and so
+	they are reference counted.
+
+	When you create an object in the Irrlicht engine, calling a
+	method which starts with 'create', an object is created, and
+	you get a pointer to the new object. If you no longer need the
+	object, you have to call drop(). This will destroy the object,
+	if grab() was not called in another part of you program,
+	because this part still needs the object. Note, that you only
+	need to call drop() to the object, if you created it, and the
+	method had a 'create' in it.
+
+	A simple example:
+
+	If you want to create a texture, you may want to call an
+	imaginable method IDriver::createTexture. You call
+	ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+	If you no longer need the texture, call texture->drop().
+	If you want to load a texture, you may want to call imaginable
+	method IDriver::loadTexture. You do this like
+	ITexture* texture = driver->loadTexture("example.jpg");
+	You will not have to drop the pointer to the loaded texture,
+	because the name of the method does not start with 'create'.
+	The texture is stored somewhere by the driver. */
+	void grab() const { ++ReferenceCounter; }
+
+	//! Drops the object. Decrements the reference counter by one.
+	/** The IReferenceCounted class provides a basic reference
+	counting mechanism with its methods grab() and drop(). Most
+	objects of the Irrlicht Engine are derived from
+	IReferenceCounted, and so they are reference counted.
+
+	When you create an object in the Irrlicht engine, calling a
+	method which starts with 'create', an object is created, and
+	you get a pointer to the new object. If you no longer need the
+	object, you have to call drop(). This will destroy the object,
+	if grab() was not called in another part of you program,
+	because this part still needs the object. Note, that you only
+	need to call drop() to the object, if you created it, and the
+	method had a 'create' in it.
+
+	A simple example:
+
+	If you want to create a texture, you may want to call an
+	imaginable method IDriver::createTexture. You call
+	ITexture* texture = driver->createTexture(dimension2d<u32>(128, 128));
+	If you no longer need the texture, call texture->drop().
+	If you want to load a texture, you may want to call imaginable
+	method IDriver::loadTexture. You do this like
+	ITexture* texture = driver->loadTexture("example.jpg");
+	You will not have to drop the pointer to the loaded texture,
+	because the name of the method does not start with 'create'.
+	The texture is stored somewhere by the driver.
+	\return True, if the object was deleted. */
+	bool drop() const
+	{
+		// someone is doing bad reference counting.
+		_IRR_DEBUG_BREAK_IF(ReferenceCounter <= 0)
+
+		--ReferenceCounter;
+		if (!ReferenceCounter) {
+			delete this;
+			return true;
+		}
+
+		return false;
+	}
+
+	//! Get the reference count.
+	/** \return Current value of the reference counter. */
+	s32 getReferenceCount() const
+	{
+		return ReferenceCounter;
+	}
+
+	//! Returns the debug name of the object.
+	/** The Debugname may only be set and changed by the object
+	itself. This method should only be used in Debug mode.
+	\return Returns a string, previously set by setDebugName(); */
+	const c8 *getDebugName() const
+	{
+		return DebugName;
+	}
+
+protected:
+	//! Sets the debug name of the object.
+	/** The Debugname may only be set and changed by the object
+	itself. This method should only be used in Debug mode.
+	\param newName: New debug name to set. */
+	void setDebugName(const c8 *newName)
+	{
+		DebugName = newName;
+	}
+
+private:
+	//! The debug name.
+	const c8 *DebugName;
+
+	//! The reference counter. Mutable to do reference counting on const objects.
+	mutable s32 ReferenceCounter;
+};
+
+} // end namespace irr
diff --git a/irr/include/IRenderTarget.h b/irr/include/IRenderTarget.h
new file mode 100644
index 000000000..1e70c1e06
--- /dev/null
+++ b/irr/include/IRenderTarget.h
@@ -0,0 +1,119 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "EDriverTypes.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+
+//! Enumeration of cube texture surfaces
+enum E_CUBE_SURFACE
+{
+	ECS_POSX = 0,
+	ECS_NEGX,
+	ECS_POSY,
+	ECS_NEGY,
+	ECS_POSZ,
+	ECS_NEGZ
+};
+
+//! Interface of a Render Target.
+class IRenderTarget : public virtual IReferenceCounted
+{
+public:
+	//! constructor
+	IRenderTarget() :
+			DepthStencil(0), DriverType(EDT_NULL)
+	{
+	}
+
+	//! Returns an array of previously set textures.
+	const core::array<ITexture *> &getTexture() const
+	{
+		return Textures;
+	}
+
+	//! Returns a of previously set depth / depth-stencil texture.
+	ITexture *getDepthStencil() const
+	{
+		return DepthStencil;
+	}
+
+	//! Returns an array of active surface for cube textures
+	const core::array<E_CUBE_SURFACE> &getCubeSurfaces() const
+	{
+		return CubeSurfaces;
+	}
+
+	//! Set multiple textures.
+	/** Set multiple textures for the render target.
+	\param texture Array of texture objects. These textures are used for a color outputs.
+	\param depthStencil Depth or packed depth-stencil texture. This texture is used as depth
+	or depth-stencil buffer. You can pass getDepthStencil() if you don't want to change it.
+	\param cubeSurfaces When rendering to cube textures, set the surface to be used for each texture. Can be empty otherwise.
+	*/
+	void setTexture(const core::array<ITexture *> &texture, ITexture *depthStencil, const core::array<E_CUBE_SURFACE> &cubeSurfaces = core::array<E_CUBE_SURFACE>())
+	{
+		setTextures(texture.const_pointer(), texture.size(), depthStencil, cubeSurfaces.const_pointer(), cubeSurfaces.size());
+	}
+
+	//! Sets one texture + depthStencil
+	//! You can pass getDepthStencil() for depthStencil if you don't want to change that one
+	void setTexture(ITexture *texture, ITexture *depthStencil)
+	{
+		if (texture) {
+			setTextures(&texture, 1, depthStencil);
+		} else {
+			setTextures(0, 0, depthStencil);
+		}
+	}
+
+	//! Set one cube surface texture.
+	void setTexture(ITexture *texture, ITexture *depthStencil, E_CUBE_SURFACE cubeSurface)
+	{
+		if (texture) {
+			setTextures(&texture, 1, depthStencil, &cubeSurface, 1);
+		} else {
+			setTextures(0, 0, depthStencil, &cubeSurface, 1);
+		}
+	}
+
+	//! Get driver type of render target.
+	E_DRIVER_TYPE getDriverType() const
+	{
+		return DriverType;
+	}
+
+protected:
+	//! Set multiple textures.
+	// NOTE: working with pointers instead of arrays to avoid unnecessary memory allocations for the single textures case
+	virtual void setTextures(ITexture *const *textures, u32 numTextures, ITexture *depthStencil, const E_CUBE_SURFACE *cubeSurfaces = 0, u32 numCubeSurfaces = 0) = 0;
+
+	//! Textures assigned to render target.
+	core::array<ITexture *> Textures;
+
+	//! Depth or packed depth-stencil texture assigned to render target.
+	ITexture *DepthStencil;
+
+	//! Active surface of cube textures
+	core::array<E_CUBE_SURFACE> CubeSurfaces;
+
+	//! Driver type of render target.
+	E_DRIVER_TYPE DriverType;
+
+private:
+	// no copying (IReferenceCounted still allows that for reasons which take some time to work around)
+	IRenderTarget(const IRenderTarget &);
+	IRenderTarget &operator=(const IRenderTarget &);
+};
+
+}
+}
diff --git a/irr/include/ISceneCollisionManager.h b/irr/include/ISceneCollisionManager.h
new file mode 100644
index 000000000..3307dc6bb
--- /dev/null
+++ b/irr/include/ISceneCollisionManager.h
@@ -0,0 +1,33 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "position2d.h"
+#include "line3d.h"
+
+namespace irr
+{
+
+namespace scene
+{
+class ICameraSceneNode;
+
+class ISceneCollisionManager : public virtual IReferenceCounted
+{
+public:
+	//! Returns a 3d ray which would go through the 2d screen coordinates.
+	/** \param pos: Screen coordinates in pixels.
+	\param camera: Camera from which the ray starts. If null, the
+	active camera is used.
+	\return Ray starting from the position of the camera and ending
+	at a length of the far value of the camera at a position which
+	would be behind the 2d screen coordinates. */
+	virtual core::line3d<f32> getRayFromScreenCoordinates(
+			const core::position2d<s32> &pos, const ICameraSceneNode *camera = 0) = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/ISceneManager.h b/irr/include/ISceneManager.h
new file mode 100644
index 000000000..c247c4b99
--- /dev/null
+++ b/irr/include/ISceneManager.h
@@ -0,0 +1,632 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "irrString.h"
+#include "path.h"
+#include "vector3d.h"
+#include "dimension2d.h"
+#include "SColor.h"
+#include "ESceneNodeTypes.h"
+#include "SceneParameters.h"
+#include "ISkinnedMesh.h"
+
+namespace irr
+{
+struct SKeyMap;
+struct SEvent;
+
+namespace io
+{
+class IReadFile;
+class IAttributes;
+class IWriteFile;
+class IFileSystem;
+} // end namespace io
+
+namespace gui
+{
+class IGUIFont;
+class IGUIEnvironment;
+} // end namespace gui
+
+namespace video
+{
+class IVideoDriver;
+class SMaterial;
+class IImage;
+class ITexture;
+} // end namespace video
+
+namespace scene
+{
+//! Enumeration for render passes.
+/** A parameter passed to the registerNodeForRendering() method of the ISceneManager,
+specifying when the node wants to be drawn in relation to the other nodes.
+Note: Despite the numbering this is not used as bit-field.
+*/
+enum E_SCENE_NODE_RENDER_PASS
+{
+	//! No pass currently active
+	ESNRP_NONE = 0,
+
+	//! Camera pass. The active view is set up here. The very first pass.
+	ESNRP_CAMERA = 1,
+
+	//! In this pass, lights are transformed into camera space and added to the driver
+	ESNRP_LIGHT = 2,
+
+	//! This is used for sky boxes.
+	ESNRP_SKY_BOX = 4,
+
+	//! All normal objects can use this for registering themselves.
+	/** This value will never be returned by
+	ISceneManager::getSceneNodeRenderPass(). The scene manager
+	will determine by itself if an object is transparent or solid
+	and register the object as ESNRT_TRANSPARENT or ESNRP_SOLID
+	automatically if you call registerNodeForRendering with this
+	value (which is default). Note that it will register the node
+	only as ONE type. If your scene node has both solid and
+	transparent material types register it twice (one time as
+	ESNRP_SOLID, the other time as ESNRT_TRANSPARENT) and in the
+	render() method call getSceneNodeRenderPass() to find out the
+	current render pass and render only the corresponding parts of
+	the node. */
+	ESNRP_AUTOMATIC = 24,
+
+	//! Solid scene nodes or special scene nodes without materials.
+	ESNRP_SOLID = 8,
+
+	//! Transparent scene nodes, drawn after solid nodes. They are sorted from back to front and drawn in that order.
+	ESNRP_TRANSPARENT = 16,
+
+	//! Transparent effect scene nodes, drawn after Transparent nodes. They are sorted from back to front and drawn in that order.
+	ESNRP_TRANSPARENT_EFFECT = 32,
+
+	//! Drawn after the solid nodes, before the transparent nodes, the time for drawing shadow volumes
+	ESNRP_SHADOW = 64,
+
+	//! Drawn after transparent effect nodes. For custom gui's. Unsorted (in order nodes registered themselves).
+	ESNRP_GUI = 128
+
+};
+
+class IAnimatedMesh;
+class IAnimatedMeshSceneNode;
+class IBillboardSceneNode;
+class ICameraSceneNode;
+class IDummyTransformationSceneNode;
+class IMesh;
+class IMeshBuffer;
+class IMeshCache;
+class ISceneCollisionManager;
+class IMeshLoader;
+class IMeshManipulator;
+class IMeshSceneNode;
+class ISceneNode;
+class ISceneNodeFactory;
+
+//! The Scene Manager manages scene nodes, mesh resources, cameras and all the other stuff.
+/** All Scene nodes can be created only here.
+A scene node is a node in the hierarchical scene graph. Every scene node
+may have children, which are other scene nodes. Children move relative
+the their parents position. If the parent of a node is not visible, its
+children won't be visible, too. In this way, it is for example easily
+possible to attach a light to a moving car or to place a walking
+character on a moving platform on a moving ship.
+The SceneManager is also able to load 3d mesh files of different
+formats. Take a look at getMesh() to find out what formats are
+supported. If these formats are not enough, use
+addExternalMeshLoader() to add new formats to the engine.
+*/
+class ISceneManager : public virtual IReferenceCounted
+{
+public:
+	//! Get pointer to an animatable mesh. Loads the file if not loaded already.
+	/**
+	 * If you want to remove a loaded mesh from the cache again, use removeMesh().
+	 *  Currently there are the following mesh formats supported:
+	 *  <TABLE border="1" cellpadding="2" cellspacing="0">
+	 *  <TR>
+	 *    <TD>Format</TD>
+	 *    <TD>Description</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>3D Studio (.3ds)</TD>
+	 *    <TD>Loader for 3D-Studio files which lots of 3D packages
+	 *      are able to export. Only static meshes are currently
+	 *      supported by this importer.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>3D World Studio (.smf)</TD>
+	 *    <TD>Loader for Leadwerks SMF mesh files, a simple mesh format
+	 *    containing static geometry for games. The proprietary .STF texture format
+	 *    is not supported yet. This loader was originally written by Joseph Ellis. </TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Bliz Basic B3D (.b3d)</TD>
+	 *    <TD>Loader for blitz basic files, developed by Mark
+	 *      Sibly. This is the ideal animated mesh format for game
+	 *      characters as it is both rigidly defined and widely
+	 *      supported by modeling and animation software.
+	 *      As this format supports skeletal animations, an
+	 *      ISkinnedMesh will be returned by this importer.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Cartography shop 4 (.csm)</TD>
+	 *    <TD>Cartography Shop is a modeling program for creating
+	 *      architecture and calculating lighting. Irrlicht can
+	 *      directly import .csm files thanks to the IrrCSM library
+	 *      created by Saurav Mohapatra which is now integrated
+	 *      directly in Irrlicht.
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Delgine DeleD (.dmf)</TD>
+	 *    <TD>DeleD (delgine.com) is a 3D editor and level-editor
+	 *        combined into one and is specifically designed for 3D
+	 *        game-development. With this loader, it is possible to
+	 *        directly load all geometry is as well as textures and
+	 *        lightmaps from .dmf files. To set texture and
+	 *        material paths, see scene::DMF_USE_MATERIALS_DIRS.
+	 *        It is also possible to flip the alpha texture by setting
+	 *        scene::DMF_FLIP_ALPHA_TEXTURES to true and to set the
+	 *        material transparent reference value by setting
+	 *        scene::DMF_ALPHA_CHANNEL_REF to a float between 0 and
+	 *        1. The loader is based on Salvatore Russo's .dmf
+	 *        loader, I just changed some parts of it. Thanks to
+	 *        Salvatore for his work and for allowing me to use his
+	 *        code in Irrlicht and put it under Irrlicht's license.
+	 *        For newer and more enhanced versions of the loader,
+	 *        take a look at delgine.com.
+	 *    </TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>DirectX (.x)</TD>
+	 *    <TD>Platform independent importer (so not D3D-only) for
+	 *      .x files. Most 3D packages can export these natively
+	 *      and there are several tools for them available, e.g.
+	 *      the Maya exporter included in the DX SDK.
+	 *      .x files can include skeletal animations and Irrlicht
+	 *      is able to play and display them, users can manipulate
+	 *      the joints via the ISkinnedMesh interface. Currently,
+	 *      Irrlicht only supports uncompressed .x files.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Half-Life model (.mdl)</TD>
+	 *    <TD>This loader opens Half-life 1 models, it was contributed
+	 *        by Fabio Concas and adapted by Thomas Alten.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>LightWave (.lwo)</TD>
+	 *    <TD>Native to NewTek's LightWave 3D, the LWO format is well
+	 *      known and supported by many exporters. This loader will
+	 *      import LWO2 models including lightmaps, bumpmaps and
+	 *      reflection textures.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Maya (.obj)</TD>
+	 *    <TD>Most 3D software can create .obj files which contain
+	 *      static geometry without material data. The material
+	 *      files .mtl are also supported. This importer for
+	 *      Irrlicht can load them directly. </TD>
+	 *  </TR>
+	 *  <TR>
+	 *    <TD>Milkshape (.ms3d)</TD>
+	 *    <TD>.MS3D files contain models and sometimes skeletal
+	 *      animations from the Milkshape 3D modeling and animation
+	 *      software. Like the other skeletal mesh loaders, joints
+	 *      are exposed via the ISkinnedMesh animated mesh type.</TD>
+	 *  </TR>
+	 *  <TR>
+	 *  <TD>My3D (.my3d)</TD>
+	 *      <TD>.my3D is a flexible 3D file format. The My3DTools
+	 *        contains plug-ins to export .my3D files from several
+	 *        3D packages. With this built-in importer, Irrlicht
+	 *        can read and display those files directly. This
+	 *        loader was written by Zhuck Dimitry who also created
+	 *        the whole My3DTools package.
+	 *        </TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>OCT (.oct)</TD>
+	 *      <TD>The oct file format contains 3D geometry and
+	 *        lightmaps and can be loaded directly by Irrlicht. OCT
+	 *        files<br> can be created by FSRad, Paul Nette's
+	 *        radiosity processor or exported from Blender using
+	 *        OCTTools which can be found in the exporters/OCTTools
+	 *        directory of the SDK. Thanks to Murphy McCauley for
+	 *        creating all this.</TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>OGRE Meshes (.mesh)</TD>
+	 *      <TD>Ogre .mesh files contain 3D data for the OGRE 3D
+	 *        engine. Irrlicht can read and display them directly
+	 *        with this importer. To define materials for the mesh,
+	 *        copy a .material file named like the corresponding
+	 *        .mesh file where the .mesh file is. (For example
+	 *        ogrehead.material for ogrehead.mesh). Thanks to
+	 *        Christian Stehno who wrote and contributed this
+	 *        loader.</TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Pulsar LMTools (.lmts)</TD>
+	 *      <TD>LMTools is a set of tools (Windows &amp; Linux) for
+	 *        creating lightmaps. Irrlicht can directly read .lmts
+	 *        files thanks to<br> the importer created by Jonas
+	 *        Petersen.
+	 *        Notes for<br> this version of the loader:<br>
+	 *        - It does not recognize/support user data in the
+	 *          *.lmts files.<br>
+	 *        - The TGAs generated by LMTools don't work in
+	 *          Irrlicht for some reason (the textures are upside
+	 *          down). Opening and resaving them in a graphics app
+	 *          will solve the problem.</TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Quake 3 levels (.bsp)</TD>
+	 *      <TD>Quake 3 is a popular game by IDSoftware, and .pk3
+	 *        files contain .bsp files and textures/lightmaps
+	 *        describing huge prelighted levels. Irrlicht can read
+	 *        .pk3 and .bsp files directly and thus render Quake 3
+	 *        levels directly. Written by Nikolaus Gebhardt
+	 *        enhanced by Dean P. Macri with the curved surfaces
+	 *        feature. </TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Quake 2 models (.md2)</TD>
+	 *      <TD>Quake 2 models are characters with morph target
+	 *        animation. Irrlicht can read, display and animate
+	 *        them directly with this importer. </TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Quake 3 models (.md3)</TD>
+	 *      <TD>Quake 3 models are characters with morph target
+	 *        animation, they contain mount points for weapons and body
+	 *        parts and are typically made of several sections which are
+	 *        manually joined together.</TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Stanford Triangle (.ply)</TD>
+	 *      <TD>Invented by Stanford University and known as the native
+	 *        format of the infamous "Stanford Bunny" model, this is a
+	 *        popular static mesh format used by 3D scanning hardware
+	 *        and software. This loader supports extremely large models
+	 *        in both ASCII and binary format, but only has rudimentary
+	 *        material support in the form of vertex colors and texture
+	 *        coordinates.</TD>
+	 *    </TR>
+	 *    <TR>
+	 *      <TD>Stereolithography (.stl)</TD>
+	 *      <TD>The STL format is used for rapid prototyping and
+	 *        computer-aided manufacturing, thus has no support for
+	 *        materials.</TD>
+	 *    </TR>
+	 *  </TABLE>
+	 *
+	 *  To load and display a mesh quickly, just do this:
+	 *  \code
+	 *  SceneManager->addAnimatedMeshSceneNode(
+	 *		SceneManager->getMesh("yourmesh.3ds"));
+	 * \endcode
+	 * If you would like to implement and add your own file format loader to Irrlicht,
+	 * see addExternalMeshLoader().
+	 * \param file File handle of the mesh to load.
+	 * \return Null if failed, otherwise pointer to the mesh.
+	 * This pointer should not be dropped. See IReferenceCounted::drop() for more information.
+	 **/
+	virtual IAnimatedMesh *getMesh(io::IReadFile *file) = 0;
+
+	//! Get interface to the mesh cache which is shared between all existing scene managers.
+	/** With this interface, it is possible to manually add new loaded
+	meshes (if ISceneManager::getMesh() is not sufficient), to remove them and to iterate
+	through already loaded meshes. */
+	virtual IMeshCache *getMeshCache() = 0;
+
+	//! Get the video driver.
+	/** \return Pointer to the video Driver.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual video::IVideoDriver *getVideoDriver() = 0;
+
+	//! Adds a scene node for rendering an animated mesh model.
+	/** \param mesh: Pointer to the loaded animated mesh to be displayed.
+	\param parent: Parent of the scene node. Can be NULL if no parent.
+	\param id: Id of the node. This id can be used to identify the scene node.
+	\param position: Position of the space relative to its parent where the
+	scene node will be placed.
+	\param rotation: Initial rotation of the scene node.
+	\param scale: Initial scale of the scene node.
+	\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
+	\return Pointer to the created scene node.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IAnimatedMeshSceneNode *addAnimatedMeshSceneNode(IAnimatedMesh *mesh,
+			ISceneNode *parent = 0, s32 id = -1,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f),
+			bool alsoAddIfMeshPointerZero = false) = 0;
+
+	//! Adds a scene node for rendering a static mesh.
+	/** \param mesh: Pointer to the loaded static mesh to be displayed.
+	\param parent: Parent of the scene node. Can be NULL if no parent.
+	\param id: Id of the node. This id can be used to identify the scene node.
+	\param position: Position of the space relative to its parent where the
+	scene node will be placed.
+	\param rotation: Initial rotation of the scene node.
+	\param scale: Initial scale of the scene node.
+	\param alsoAddIfMeshPointerZero: Add the scene node even if a 0 pointer is passed.
+	\return Pointer to the created scene node.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IMeshSceneNode *addMeshSceneNode(IMesh *mesh, ISceneNode *parent = 0, s32 id = -1,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f),
+			bool alsoAddIfMeshPointerZero = false) = 0;
+
+	//! Adds a camera scene node to the scene graph and sets it as active camera.
+	/** This camera does not react on user input.
+	If you want to move or animate it, use ISceneNode::setPosition(),
+	ICameraSceneNode::setTarget() etc methods.
+	By default, a camera's look at position (set with setTarget()) and its scene node
+	rotation (set with setRotation()) are independent. If you want to be able to
+	control the direction that the camera looks by using setRotation() then call
+	ICameraSceneNode::bindTargetAndRotation(true) on it.
+	\param position: Position of the space relative to its parent where the camera will be placed.
+	\param lookat: Position where the camera will look at. Also known as target.
+	\param parent: Parent scene node of the camera. Can be null. If the parent moves,
+	the camera will move too.
+	\param id: id of the camera. This id can be used to identify the camera.
+	\param makeActive Flag whether this camera should become the active one.
+	Make sure you always have one active camera.
+	\return Pointer to interface to camera if successful, otherwise 0.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ICameraSceneNode *addCameraSceneNode(ISceneNode *parent = 0,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &lookat = core::vector3df(0, 0, 100),
+			s32 id = -1, bool makeActive = true) = 0;
+
+	//! Adds a billboard scene node to the scene graph.
+	/** A billboard is like a 3d sprite: A 2d element,
+	which always looks to the camera. It is usually used for things
+	like explosions, fire, lensflares and things like that.
+	\param parent Parent scene node of the billboard. Can be null.
+	If the parent moves, the billboard will move too.
+	\param size Size of the billboard. This size is 2 dimensional
+	because a billboard only has width and height.
+	\param position Position of the space relative to its parent
+	where the billboard will be placed.
+	\param id An id of the node. This id can be used to identify
+	the node.
+	\param colorTop The color of the vertices at the top of the
+	billboard (default: white).
+	\param colorBottom The color of the vertices at the bottom of
+	the billboard (default: white).
+	\return Pointer to the billboard if successful, otherwise NULL.
+	This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual IBillboardSceneNode *addBillboardSceneNode(ISceneNode *parent = 0,
+			const core::dimension2d<f32> &size = core::dimension2d<f32>(10.0f, 10.0f),
+			const core::vector3df &position = core::vector3df(0, 0, 0), s32 id = -1,
+			video::SColor colorTop = 0xFFFFFFFF, video::SColor colorBottom = 0xFFFFFFFF) = 0;
+
+	//! Adds an empty scene node to the scene graph.
+	/** Can be used for doing advanced transformations
+	or structuring the scene graph.
+	\return Pointer to the created scene node.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneNode *addEmptySceneNode(ISceneNode *parent = 0, s32 id = -1) = 0;
+
+	//! Adds a dummy transformation scene node to the scene graph.
+	/** This scene node does not render itself, and does not respond to set/getPosition,
+	set/getRotation and set/getScale. Its just a simple scene node that takes a
+	matrix as relative transformation, making it possible to insert any transformation
+	anywhere into the scene graph.
+	\return Pointer to the created scene node.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IDummyTransformationSceneNode *addDummyTransformationSceneNode(
+			ISceneNode *parent = 0, s32 id = -1) = 0;
+
+	//! Gets the root scene node.
+	/** This is the scene node which is parent
+	of all scene nodes. The root scene node is a special scene node which
+	only exists to manage all scene nodes. It will not be rendered and cannot
+	be removed from the scene.
+	\return Pointer to the root scene node.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneNode *getRootSceneNode() = 0;
+
+	//! Get the first scene node with the specified id.
+	/** \param id: The id to search for
+	\param start: Scene node to start from. All children of this scene
+	node are searched. If null is specified, the root scene node is
+	taken.
+	\return Pointer to the first scene node with this id,
+	and null if no scene node could be found.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneNode *getSceneNodeFromId(s32 id, ISceneNode *start = 0) = 0;
+
+	//! Get the first scene node with the specified name.
+	/** \param name: The name to search for
+	\param start: Scene node to start from. All children of this scene
+	node are searched. If null is specified, the root scene node is
+	taken.
+	\return Pointer to the first scene node with this id,
+	and null if no scene node could be found.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneNode *getSceneNodeFromName(const c8 *name, ISceneNode *start = 0) = 0;
+
+	//! Get the first scene node with the specified type.
+	/** \param type: The type to search for
+	\param start: Scene node to start from. All children of this scene
+	node are searched. If null is specified, the root scene node is
+	taken.
+	\return Pointer to the first scene node with this type,
+	and null if no scene node could be found.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneNode *getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode *start = 0) = 0;
+
+	//! Get scene nodes by type.
+	/** \param type: Type of scene node to find (ESNT_ANY will return all child nodes).
+	\param outNodes: results will be added to this array (outNodes is not cleared).
+	\param start: Scene node to start from. This node and all children of this scene
+	node are checked (recursively, so also children of children, etc). If null is specified,
+	the root scene node is taken as start-node. */
+	virtual void getSceneNodesFromType(ESCENE_NODE_TYPE type,
+			core::array<scene::ISceneNode *> &outNodes,
+			ISceneNode *start = 0) = 0;
+
+	//! Get the current active camera.
+	/** \return The active camera is returned. Note that this can
+	be NULL, if there was no camera created yet.
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ICameraSceneNode *getActiveCamera() const = 0;
+
+	//! Sets the currently active camera.
+	/** The previous active camera will be deactivated.
+	\param camera: The new camera which should be active. */
+	virtual void setActiveCamera(ICameraSceneNode *camera) = 0;
+
+	//! Registers a node for rendering it at a specific time.
+	/** This method should only be used by SceneNodes when they get a
+	ISceneNode::OnRegisterSceneNode() call.
+	\param node: Node to register for drawing. Usually scene nodes would set 'this'
+	as parameter here because they want to be drawn.
+	\param pass: Specifies when the node wants to be drawn in relation to the other nodes.
+	For example, if the node is a shadow, it usually wants to be drawn after all other nodes
+	and will use ESNRP_SHADOW for this. See scene::E_SCENE_NODE_RENDER_PASS for details.
+	Note: This is _not_ a bitfield. If you want to register a note for several render passes, then
+	call this function once for each pass.
+	\return scene will be rendered ( passed culling ) */
+	virtual u32 registerNodeForRendering(ISceneNode *node,
+			E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) = 0;
+
+	//! Clear all nodes which are currently registered for rendering
+	/** Usually you don't have to care about this as drawAll will clear nodes
+	after rendering them. But sometimes you might have to manually reset this.
+	For example when you deleted nodes between registering and rendering. */
+	virtual void clearAllRegisteredNodesForRendering() = 0;
+
+	//! Draws all the scene nodes.
+	/** This can only be invoked between
+	IVideoDriver::beginScene() and IVideoDriver::endScene(). Please note that
+	the scene is not only drawn when calling this, but also animated
+	by existing scene node animators, culling of scene nodes is done, etc. */
+	virtual void drawAll() = 0;
+
+	//! Adds an external mesh loader for extending the engine with new file formats.
+	/** If you want the engine to be extended with
+	file formats it currently is not able to load (e.g. .cob), just implement
+	the IMeshLoader interface in your loading class and add it with this method.
+	Using this method it is also possible to override built-in mesh loaders with
+	newer or updated versions without the need to recompile the engine.
+	\param externalLoader: Implementation of a new mesh loader. */
+	virtual void addExternalMeshLoader(IMeshLoader *externalLoader) = 0;
+
+	//! Returns the number of mesh loaders supported by Irrlicht at this time
+	virtual u32 getMeshLoaderCount() const = 0;
+
+	//! Retrieve the given mesh loader
+	/** \param index The index of the loader to retrieve. This parameter is an 0-based
+	array index.
+	\return A pointer to the specified loader, 0 if the index is incorrect. */
+	virtual IMeshLoader *getMeshLoader(u32 index) const = 0;
+
+	//! Get pointer to the scene collision manager.
+	/** \return Pointer to the collision manager
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ISceneCollisionManager *getSceneCollisionManager() = 0;
+
+	//! Get pointer to the mesh manipulator.
+	/** \return Pointer to the mesh manipulator
+	This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual IMeshManipulator *getMeshManipulator() = 0;
+
+	//! Adds a scene node to the deletion queue.
+	/** The scene node is immediately
+	deleted when it's secure. Which means when the scene node does not
+	execute animators and things like that. This method is for example
+	used for deleting scene nodes by their scene node animators. In
+	most other cases, a ISceneNode::remove() call is enough, using this
+	deletion queue is not necessary.
+	See ISceneManager::createDeleteAnimator() for details.
+	\param node: Node to delete. */
+	virtual void addToDeletionQueue(ISceneNode *node) = 0;
+
+	//! Posts an input event to the environment.
+	/** Usually you do not have to
+	use this method, it is used by the internal engine. */
+	virtual bool postEventFromUser(const SEvent &event) = 0;
+
+	//! Clears the whole scene.
+	/** All scene nodes are removed. */
+	virtual void clear() = 0;
+
+	//! Get interface to the parameters set in this scene.
+	/** String parameters can be used by plugins and mesh loaders.
+	See	COLLADA_CREATE_SCENE_INSTANCES and DMF_USE_MATERIALS_DIRS */
+	virtual io::IAttributes *getParameters() = 0;
+
+	//! Get current render pass.
+	/** All scene nodes are being rendered in a specific order.
+	First lights, cameras, sky boxes, solid geometry, and then transparent
+	stuff. During the rendering process, scene nodes may want to know what the scene
+	manager is rendering currently, because for example they registered for rendering
+	twice, once for transparent geometry and once for solid. When knowing what rendering
+	pass currently is active they can render the correct part of their geometry. */
+	virtual E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const = 0;
+
+	//! Creates a new scene manager.
+	/** This can be used to easily draw and/or store two
+	independent scenes at the same time. The mesh cache will be
+	shared between all existing scene managers, which means if you
+	load a mesh in the original scene manager using for example
+	getMesh(), the mesh will be available in all other scene
+	managers too, without loading.
+	The original/main scene manager will still be there and
+	accessible via IrrlichtDevice::getSceneManager(). If you need
+	input event in this new scene manager, for example for FPS
+	cameras, you'll need to forward input to this manually: Just
+	implement an IEventReceiver and call
+	yourNewSceneManager->postEventFromUser(), and return true so
+	that the original scene manager doesn't get the event.
+	Otherwise, all input will go to the main scene manager
+	automatically.
+	If you no longer need the new scene manager, you should call
+	ISceneManager::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual ISceneManager *createNewSceneManager(bool cloneContent = false) = 0;
+
+	//! Get a skinned mesh, which is not available as header-only code
+	/** Note: You need to drop() the pointer after use again, see IReferenceCounted::drop()
+	for details. */
+	virtual ISkinnedMesh *createSkinnedMesh() = 0;
+
+	//! Sets ambient color of the scene
+	virtual void setAmbientLight(const video::SColorf &ambientColor) = 0;
+
+	//! Get ambient color of the scene
+	virtual const video::SColorf &getAmbientLight() const = 0;
+
+	//! Get current render pass.
+	virtual E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const = 0;
+
+	//! Set current render pass.
+	virtual void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) = 0;
+
+	//! Check if node is culled in current view frustum
+	/** Please note that depending on the used culling method this
+	check can be rather coarse, or slow. A positive result is
+	correct, though, i.e. if this method returns true the node is
+	positively not visible. The node might still be invisible even
+	if this method returns false.
+	\param node The scene node which is checked for culling.
+	\return True if node is not visible in the current scene, else
+	false. */
+	virtual bool isCulled(const ISceneNode *node) const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/ISceneNode.h b/irr/include/ISceneNode.h
new file mode 100644
index 000000000..7a03a2256
--- /dev/null
+++ b/irr/include/ISceneNode.h
@@ -0,0 +1,597 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "ESceneNodeTypes.h"
+#include "ECullingTypes.h"
+#include "EDebugSceneTypes.h"
+#include "SMaterial.h"
+#include "irrString.h"
+#include "aabbox3d.h"
+#include "matrix4.h"
+#include "IAttributes.h"
+
+#include <list>
+#include <optional>
+
+namespace irr
+{
+namespace scene
+{
+class ISceneNode;
+class ISceneManager;
+
+//! Typedef for list of scene nodes
+typedef std::list<ISceneNode *> ISceneNodeList;
+
+//! Scene node interface.
+/** A scene node is a node in the hierarchical scene graph. Every scene
+node may have children, which are also scene nodes. Children move
+relative to their parent's position. If the parent of a node is not
+visible, its children won't be visible either. In this way, it is for
+example easily possible to attach a light to a moving car, or to place
+a walking character on a moving platform on a moving ship.
+*/
+class ISceneNode : virtual public IReferenceCounted
+{
+public:
+	//! Constructor
+	ISceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id = -1,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f)) :
+			RelativeTranslation(position),
+			RelativeRotation(rotation), RelativeScale(scale),
+			Parent(0), SceneManager(mgr), ID(id),
+			AutomaticCullingState(EAC_BOX), DebugDataVisible(EDS_OFF),
+			IsVisible(true), IsDebugObject(false)
+	{
+		if (parent)
+			parent->addChild(this);
+
+		updateAbsolutePosition();
+	}
+
+	//! Destructor
+	virtual ~ISceneNode()
+	{
+		// delete all children
+		removeAll();
+	}
+
+	//! This method is called just before the rendering process of the whole scene.
+	/** Nodes may register themselves in the render pipeline during this call,
+	precalculate the geometry which should be rendered, and prevent their
+	children from being able to register themselves if they are clipped by simply
+	not calling their OnRegisterSceneNode method.
+	If you are implementing your own scene node, you should overwrite this method
+	with an implementation code looking like this:
+	\code
+	if (IsVisible)
+		SceneManager->registerNodeForRendering(this);
+
+	ISceneNode::OnRegisterSceneNode();
+	\endcode
+	*/
+	virtual void OnRegisterSceneNode()
+	{
+		if (IsVisible) {
+			ISceneNodeList::iterator it = Children.begin();
+			for (; it != Children.end(); ++it)
+				(*it)->OnRegisterSceneNode();
+		}
+	}
+
+	//! OnAnimate() is called just before rendering the whole scene.
+	/** Nodes may calculate or store animations here, and may do other useful things,
+	depending on what they are. Also, OnAnimate() should be called for all
+	child scene nodes here. This method will be called once per frame, independent
+	of whether the scene node is visible or not.
+	\param timeMs Current time in milliseconds. */
+	virtual void OnAnimate(u32 timeMs)
+	{
+		if (IsVisible) {
+			// update absolute position
+			updateAbsolutePosition();
+
+			// perform the post render process on all children
+
+			ISceneNodeList::iterator it = Children.begin();
+			for (; it != Children.end(); ++it)
+				(*it)->OnAnimate(timeMs);
+		}
+	}
+
+	//! Renders the node.
+	virtual void render() = 0;
+
+	//! Returns the name of the node.
+	/** \return Name as character string. */
+	virtual const std::optional<std::string> &getName() const
+	{
+		return Name;
+	}
+
+	//! Sets the name of the node.
+	/** \param name New name of the scene node. */
+	virtual void setName(const std::optional<std::string> &name)
+	{
+		Name = name;
+	}
+
+	//! Get the axis aligned, not transformed bounding box of this node.
+	/** This means that if this node is an animated 3d character,
+	moving in a room, the bounding box will always be around the
+	origin. To get the box in real world coordinates, just
+	transform it with the matrix you receive with
+	getAbsoluteTransformation() or simply use
+	getTransformedBoundingBox(), which does the same.
+	\return The non-transformed bounding box. */
+	virtual const core::aabbox3d<f32> &getBoundingBox() const = 0;
+
+	//! Get the axis aligned, transformed and animated absolute bounding box of this node.
+	/** Note: The result is still an axis-aligned bounding box, so it's size
+	changes with rotation.
+	\return The transformed bounding box. */
+	virtual const core::aabbox3d<f32> getTransformedBoundingBox() const
+	{
+		core::aabbox3d<f32> box = getBoundingBox();
+		AbsoluteTransformation.transformBoxEx(box);
+		return box;
+	}
+
+	//! Get a the 8 corners of the original bounding box transformed and
+	//! animated by the absolute transformation.
+	/** Note: The result is _not_ identical to getTransformedBoundingBox().getEdges(),
+	but getting an aabbox3d of these edges would then be identical.
+	\param edges Receives an array with the transformed edges */
+	virtual void getTransformedBoundingBoxEdges(core::array<core::vector3d<f32>> &edges) const
+	{
+		edges.set_used(8);
+		getBoundingBox().getEdges(edges.pointer());
+		for (u32 i = 0; i < 8; ++i)
+			AbsoluteTransformation.transformVect(edges[i]);
+	}
+
+	//! Get the absolute transformation of the node. Is recalculated every OnAnimate()-call.
+	/** NOTE: For speed reasons the absolute transformation is not
+	automatically recalculated on each change of the relative
+	transformation or by a transformation change of an parent. Instead the
+	update usually happens once per frame in OnAnimate. You can enforce
+	an update with updateAbsolutePosition().
+	\return The absolute transformation matrix. */
+	virtual const core::matrix4 &getAbsoluteTransformation() const
+	{
+		return AbsoluteTransformation;
+	}
+
+	//! Returns the relative transformation of the scene node.
+	/** The relative transformation is stored internally as 3
+	vectors: translation, rotation and scale. To get the relative
+	transformation matrix, it is calculated from these values.
+	\return The relative transformation matrix. */
+	virtual core::matrix4 getRelativeTransformation() const
+	{
+		core::matrix4 mat;
+		mat.setRotationDegrees(RelativeRotation);
+		mat.setTranslation(RelativeTranslation);
+
+		if (RelativeScale != core::vector3df(1.f, 1.f, 1.f)) {
+			core::matrix4 smat;
+			smat.setScale(RelativeScale);
+			mat *= smat;
+		}
+
+		return mat;
+	}
+
+	//! Returns whether the node should be visible (if all of its parents are visible).
+	/** This is only an option set by the user, but has nothing to
+	do with geometry culling
+	\return The requested visibility of the node, true means
+	visible (if all parents are also visible). */
+	virtual bool isVisible() const
+	{
+		return IsVisible;
+	}
+
+	//! Check whether the node is truly visible, taking into accounts its parents' visibility
+	/** \return true if the node and all its parents are visible,
+	false if this or any parent node is invisible. */
+	virtual bool isTrulyVisible() const
+	{
+		if (!IsVisible)
+			return false;
+
+		if (!Parent)
+			return true;
+
+		return Parent->isTrulyVisible();
+	}
+
+	//! Sets if the node should be visible or not.
+	/** All children of this node won't be visible either, when set
+	to false. Invisible nodes are not valid candidates for selection by
+	collision manager bounding box methods.
+	\param isVisible If the node shall be visible. */
+	virtual void setVisible(bool isVisible)
+	{
+		IsVisible = isVisible;
+	}
+
+	//! Get the id of the scene node.
+	/** This id can be used to identify the node.
+	\return The id. */
+	virtual s32 getID() const
+	{
+		return ID;
+	}
+
+	//! Sets the id of the scene node.
+	/** This id can be used to identify the node.
+	\param id The new id. */
+	virtual void setID(s32 id)
+	{
+		ID = id;
+	}
+
+	//! Adds a child to this scene node.
+	/** If the scene node already has a parent it is first removed
+	from the other parent.
+	\param child A pointer to the new child. */
+	virtual void addChild(ISceneNode *child)
+	{
+		if (child && (child != this)) {
+			// Change scene manager?
+			if (SceneManager != child->SceneManager)
+				child->setSceneManager(SceneManager);
+
+			child->grab();
+			child->remove(); // remove from old parent
+			// Note: This iterator is not invalidated until we erase it.
+			child->ThisIterator = Children.insert(Children.end(), child);
+			child->Parent = this;
+		}
+	}
+
+	//! Removes a child from this scene node.
+	/**
+	\param child A pointer to the child which shall be removed.
+	\return True if the child was removed, and false if not,
+	e.g. because it belongs to a different parent or no parent. */
+	virtual bool removeChild(ISceneNode *child)
+	{
+		if (child->Parent != this)
+			return false;
+
+		// The iterator must be set since the parent is not null.
+		_IRR_DEBUG_BREAK_IF(!child->ThisIterator.has_value());
+		auto it = *child->ThisIterator;
+		child->ThisIterator = std::nullopt;
+		child->Parent = nullptr;
+		child->drop();
+		Children.erase(it);
+		return true;
+	}
+
+	//! Removes all children of this scene node
+	/** The scene nodes found in the children list are also dropped
+	and might be deleted if no other grab exists on them.
+	*/
+	virtual void removeAll()
+	{
+		for (auto &child : Children) {
+			child->Parent = nullptr;
+			child->ThisIterator = std::nullopt;
+			child->drop();
+		}
+		Children.clear();
+	}
+
+	//! Removes this scene node from the scene
+	/** If no other grab exists for this node, it will be deleted.
+	 */
+	virtual void remove()
+	{
+		if (Parent)
+			Parent->removeChild(this);
+	}
+
+	//! Returns the material based on the zero based index i.
+	/** To get the amount of materials used by this scene node, use
+	getMaterialCount(). This function is needed for inserting the
+	node into the scene hierarchy at an optimal position for
+	minimizing renderstate changes, but can also be used to
+	directly modify the material of a scene node.
+	\param num Zero based index. The maximal value is getMaterialCount() - 1.
+	\return The material at that index. */
+	virtual video::SMaterial &getMaterial(u32 num)
+	{
+		return video::IdentityMaterial;
+	}
+
+	//! Get amount of materials used by this scene node.
+	/** \return Current amount of materials of this scene node. */
+	virtual u32 getMaterialCount() const
+	{
+		return 0;
+	}
+
+	//! Execute a function on all materials of this scene node.
+	/** Useful for setting material properties, e.g. if you want the whole
+	mesh to be affected by light. */
+	template <typename F>
+	void forEachMaterial(F &&fn)
+	{
+		for (u32 i = 0; i < getMaterialCount(); i++) {
+			fn(getMaterial(i));
+		}
+	}
+
+	//! Gets the scale of the scene node relative to its parent.
+	/** This is the scale of this node relative to its parent.
+	If you want the absolute scale, use
+	getAbsoluteTransformation().getScale()
+	\return The scale of the scene node. */
+	virtual const core::vector3df &getScale() const
+	{
+		return RelativeScale;
+	}
+
+	//! Sets the relative scale of the scene node.
+	/** \param scale New scale of the node, relative to its parent. */
+	virtual void setScale(const core::vector3df &scale)
+	{
+		RelativeScale = scale;
+	}
+
+	//! Gets the rotation of the node relative to its parent.
+	/** Note that this is the relative rotation of the node.
+	If you want the absolute rotation, use
+	getAbsoluteTransformation().getRotation()
+	\return Current relative rotation of the scene node. */
+	virtual const core::vector3df &getRotation() const
+	{
+		return RelativeRotation;
+	}
+
+	//! Sets the rotation of the node relative to its parent.
+	/** This only modifies the relative rotation of the node.
+	\param rotation New rotation of the node in degrees. */
+	virtual void setRotation(const core::vector3df &rotation)
+	{
+		RelativeRotation = rotation;
+	}
+
+	//! Gets the position of the node relative to its parent.
+	/** Note that the position is relative to the parent. If you want
+	the position in world coordinates, use getAbsolutePosition() instead.
+	\return The current position of the node relative to the parent. */
+	virtual const core::vector3df &getPosition() const
+	{
+		return RelativeTranslation;
+	}
+
+	//! Sets the position of the node relative to its parent.
+	/** Note that the position is relative to the parent.
+	\param newpos New relative position of the scene node. */
+	virtual void setPosition(const core::vector3df &newpos)
+	{
+		RelativeTranslation = newpos;
+	}
+
+	//! Gets the absolute position of the node in world coordinates.
+	/** If you want the position of the node relative to its parent,
+	use getPosition() instead.
+	NOTE: For speed reasons the absolute position is not
+	automatically recalculated on each change of the relative
+	position or by a position change of an parent. Instead the
+	update usually happens once per frame in OnAnimate. You can enforce
+	an update with updateAbsolutePosition().
+	\return The current absolute position of the scene node (updated on last call of updateAbsolutePosition). */
+	virtual core::vector3df getAbsolutePosition() const
+	{
+		return AbsoluteTransformation.getTranslation();
+	}
+
+	//! Set a culling style or disable culling completely.
+	/** Box cullling (EAC_BOX) is set by default. Note that not
+	all SceneNodes support culling and that some nodes always cull
+	their geometry because it is their only reason for existence,
+	for example the OctreeSceneNode.
+	\param state The culling state to be used. Check E_CULLING_TYPE for possible values.*/
+	void setAutomaticCulling(u32 state)
+	{
+		AutomaticCullingState = state;
+	}
+
+	//! Gets the automatic culling state.
+	/** \return The automatic culling state. */
+	u32 getAutomaticCulling() const
+	{
+		return AutomaticCullingState;
+	}
+
+	//! Sets if debug data like bounding boxes should be drawn.
+	/** A bitwise OR of the types from @ref irr::scene::E_DEBUG_SCENE_TYPE.
+	Please note that not all scene nodes support all debug data types.
+	\param state The debug data visibility state to be used. */
+	virtual void setDebugDataVisible(u32 state)
+	{
+		DebugDataVisible = state;
+	}
+
+	//! Returns if debug data like bounding boxes are drawn.
+	/** \return A bitwise OR of the debug data values from
+	@ref irr::scene::E_DEBUG_SCENE_TYPE that are currently visible. */
+	u32 isDebugDataVisible() const
+	{
+		return DebugDataVisible;
+	}
+
+	//! Sets if this scene node is a debug object.
+	/** Debug objects have some special properties, for example they can be easily
+	excluded from collision detection or from serialization, etc. */
+	void setIsDebugObject(bool debugObject)
+	{
+		IsDebugObject = debugObject;
+	}
+
+	//! Returns if this scene node is a debug object.
+	/** Debug objects have some special properties, for example they can be easily
+	excluded from collision detection or from serialization, etc.
+	\return If this node is a debug object, true is returned. */
+	bool isDebugObject() const
+	{
+		return IsDebugObject;
+	}
+
+	//! Returns a const reference to the list of all children.
+	/** \return The list of all children of this node. */
+	const std::list<ISceneNode *> &getChildren() const
+	{
+		return Children;
+	}
+
+	//! Changes the parent of the scene node.
+	/** \param newParent The new parent to be used. */
+	virtual void setParent(ISceneNode *newParent)
+	{
+		grab();
+		remove();
+
+		if (newParent)
+			newParent->addChild(this);
+
+		drop();
+	}
+
+	//! Updates the absolute position based on the relative and the parents position
+	/** Note: This does not recursively update the parents absolute positions, so if you have a deeper
+		hierarchy you might want to update the parents first.*/
+	virtual void updateAbsolutePosition()
+	{
+		if (Parent) {
+			AbsoluteTransformation =
+					Parent->getAbsoluteTransformation() * getRelativeTransformation();
+		} else
+			AbsoluteTransformation = getRelativeTransformation();
+	}
+
+	//! Returns the parent of this scene node
+	/** \return A pointer to the parent. */
+	scene::ISceneNode *getParent() const
+	{
+		return Parent;
+	}
+
+	//! Returns type of the scene node
+	/** \return The type of this node. */
+	virtual ESCENE_NODE_TYPE getType() const
+	{
+		return ESNT_UNKNOWN;
+	}
+
+	//! Creates a clone of this scene node and its children.
+	/** \param newParent An optional new parent.
+	\param newManager An optional new scene manager.
+	\return The newly created clone of this node. */
+	virtual ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0)
+	{
+		return 0; // to be implemented by derived classes
+	}
+
+	//! Retrieve the scene manager for this node.
+	/** \return The node's scene manager. */
+	virtual ISceneManager *getSceneManager(void) const { return SceneManager; }
+
+protected:
+	//! A clone function for the ISceneNode members.
+	/** This method can be used by clone() implementations of
+	derived classes
+	\param toCopyFrom The node from which the values are copied
+	\param newManager The new scene manager. */
+	void cloneMembers(ISceneNode *toCopyFrom, ISceneManager *newManager)
+	{
+		Name = toCopyFrom->Name;
+		AbsoluteTransformation = toCopyFrom->AbsoluteTransformation;
+		RelativeTranslation = toCopyFrom->RelativeTranslation;
+		RelativeRotation = toCopyFrom->RelativeRotation;
+		RelativeScale = toCopyFrom->RelativeScale;
+		ID = toCopyFrom->ID;
+		AutomaticCullingState = toCopyFrom->AutomaticCullingState;
+		DebugDataVisible = toCopyFrom->DebugDataVisible;
+		IsVisible = toCopyFrom->IsVisible;
+		IsDebugObject = toCopyFrom->IsDebugObject;
+
+		if (newManager)
+			SceneManager = newManager;
+		else
+			SceneManager = toCopyFrom->SceneManager;
+
+		// clone children
+
+		ISceneNodeList::iterator it = toCopyFrom->Children.begin();
+		for (; it != toCopyFrom->Children.end(); ++it)
+			(*it)->clone(this, newManager);
+	}
+
+	//! Sets the new scene manager for this node and all children.
+	//! Called by addChild when moving nodes between scene managers
+	void setSceneManager(ISceneManager *newManager)
+	{
+		SceneManager = newManager;
+
+		ISceneNodeList::iterator it = Children.begin();
+		for (; it != Children.end(); ++it)
+			(*it)->setSceneManager(newManager);
+	}
+
+	//! Name of the scene node.
+	std::optional<std::string> Name;
+
+	//! Absolute transformation of the node.
+	core::matrix4 AbsoluteTransformation;
+
+	//! Relative translation of the scene node.
+	core::vector3df RelativeTranslation;
+
+	//! Relative rotation of the scene node.
+	core::vector3df RelativeRotation;
+
+	//! Relative scale of the scene node.
+	core::vector3df RelativeScale;
+
+	//! List of all children of this node
+	std::list<ISceneNode *> Children;
+
+	//! Iterator pointing to this node in the parent's child list.
+	std::optional<ISceneNodeList::iterator> ThisIterator;
+
+	//! Pointer to the parent
+	ISceneNode *Parent;
+
+	//! Pointer to the scene manager
+	ISceneManager *SceneManager;
+
+	//! ID of the node.
+	s32 ID;
+
+	//! Automatic culling state
+	u32 AutomaticCullingState;
+
+	//! Flag if debug data should be drawn, such as Bounding Boxes.
+	u32 DebugDataVisible;
+
+	//! Is the node visible?
+	bool IsVisible;
+
+	//! Is debug object?
+	bool IsDebugObject;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IShaderConstantSetCallBack.h b/irr/include/IShaderConstantSetCallBack.h
new file mode 100644
index 000000000..2e37a34ae
--- /dev/null
+++ b/irr/include/IShaderConstantSetCallBack.h
@@ -0,0 +1,79 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+
+namespace irr
+{
+namespace video
+{
+class IMaterialRendererServices;
+class SMaterial;
+
+//! Interface making it possible to set constants for gpu programs every frame.
+/** Implement this interface in an own class and pass a pointer to it to one of
+the methods in IGPUProgrammingServices when creating a shader. The
+OnSetConstants method will be called every frame now. */
+class IShaderConstantSetCallBack : public virtual IReferenceCounted
+{
+public:
+	//! Called to let the callBack know the used material (optional method)
+	/**
+	 \code
+	class MyCallBack : public IShaderConstantSetCallBack
+	{
+		const video::SMaterial *UsedMaterial;
+
+		OnSetMaterial(const video::SMaterial& material)
+		{
+			UsedMaterial=&material;
+		}
+
+		OnSetConstants(IMaterialRendererServices* services, s32 userData)
+		{
+			services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&UsedMaterial->color), 4);
+		}
+	}
+	\endcode
+	*/
+	virtual void OnSetMaterial(const SMaterial &material) {}
+
+	//! Called by the engine when the vertex and/or pixel shader constants for an material renderer should be set.
+	/**
+	Implement the IShaderConstantSetCallBack in an own class and implement your own
+	OnSetConstants method using the given IMaterialRendererServices interface.
+	Pass a pointer to this class to one of the methods in IGPUProgrammingServices
+	when creating a shader. The OnSetConstants method will now be called every time
+	before geometry is being drawn using your shader material. A sample implementation
+	would look like this:
+	\code
+	virtual void OnSetConstants(video::IMaterialRendererServices* services, s32 userData)
+	{
+		video::IVideoDriver* driver = services->getVideoDriver();
+
+		// set clip matrix at register 4
+		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
+		worldViewProj *= driver->getTransform(video::ETS_VIEW);
+		worldViewProj *= driver->getTransform(video::ETS_WORLD);
+		services->setVertexShaderConstant(&worldViewProj.M[0], 4, 4);
+		// for high level shading languages, this would be another solution:
+		//services->setVertexShaderConstant("mWorldViewProj", worldViewProj.M, 16);
+
+		// set some light color at register 9
+		video::SColorf col(0.0f,1.0f,1.0f,0.0f);
+		services->setVertexShaderConstant(reinterpret_cast<const f32*>(&col), 9, 1);
+		// for high level shading languages, this would be another solution:
+		//services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&col), 4);
+	}
+	\endcode
+	\param services: Pointer to an interface providing methods to set the constants for the shader.
+	\param userData: Userdata int which can be specified when creating the shader.
+	*/
+	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData) = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/ISkinnedMesh.h b/irr/include/ISkinnedMesh.h
new file mode 100644
index 000000000..9cc7469cb
--- /dev/null
+++ b/irr/include/ISkinnedMesh.h
@@ -0,0 +1,220 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrArray.h"
+#include "IBoneSceneNode.h"
+#include "IAnimatedMesh.h"
+#include "SSkinMeshBuffer.h"
+
+#include <optional>
+
+namespace irr
+{
+namespace scene
+{
+
+enum E_INTERPOLATION_MODE
+{
+	// constant does use the current key-values without interpolation
+	EIM_CONSTANT = 0,
+
+	// linear interpolation
+	EIM_LINEAR,
+
+	//! count of all available interpolation modes
+	EIM_COUNT
+};
+
+//! Interface for using some special functions of Skinned meshes
+class ISkinnedMesh : public IAnimatedMesh
+{
+public:
+	//! Gets joint count.
+	/** \return Amount of joints in the skeletal animated mesh. */
+	virtual u32 getJointCount() const = 0;
+
+	//! Gets the name of a joint.
+	/** \param number: Zero based index of joint. The last joint
+	has the number getJointCount()-1;
+	\return Name of joint and null if an error happened. */
+	virtual const std::optional<std::string> &getJointName(u32 number) const = 0;
+
+	//! Gets a joint number from its name
+	/** \param name: Name of the joint.
+	\return Number of the joint or std::nullopt if not found. */
+	virtual std::optional<u32> getJointNumber(const std::string &name) const = 0;
+
+	//! Use animation from another mesh
+	/** The animation is linked (not copied) based on joint names
+	so make sure they are unique.
+	\return True if all joints in this mesh were
+	matched up (empty names will not be matched, and it's case
+	sensitive). Unmatched joints will not be animated. */
+	virtual bool useAnimationFrom(const ISkinnedMesh *mesh) = 0;
+
+	//! Update Normals when Animating
+	/** \param on If false don't animate, which is faster.
+	Else update normals, which allows for proper lighting of
+	animated meshes. */
+	virtual void updateNormalsWhenAnimating(bool on) = 0;
+
+	//! Sets Interpolation Mode
+	virtual void setInterpolationMode(E_INTERPOLATION_MODE mode) = 0;
+
+	//! Animates this mesh's joints based on frame input
+	virtual void animateMesh(f32 frame, f32 blend) = 0;
+
+	//! Preforms a software skin on this mesh based of joint positions
+	virtual void skinMesh() = 0;
+
+	//! converts the vertex type of all meshbuffers to tangents.
+	/** E.g. used for bump mapping. */
+	virtual void convertMeshToTangents() = 0;
+
+	//! Allows to enable hardware skinning.
+	/* This feature is not implemented in Irrlicht yet */
+	virtual bool setHardwareSkinning(bool on) = 0;
+
+	//! Refreshes vertex data cached in joints such as positions and normals
+	virtual void refreshJointCache() = 0;
+
+	//! Moves the mesh into static position.
+	virtual void resetAnimation() = 0;
+
+	//! A vertex weight
+	struct SWeight
+	{
+		//! Index of the mesh buffer
+		u16 buffer_id; // I doubt 32bits is needed
+
+		//! Index of the vertex
+		u32 vertex_id; // Store global ID here
+
+		//! Weight Strength/Percentage (0-1)
+		f32 strength;
+
+	private:
+		//! Internal members used by CSkinnedMesh
+		friend class CSkinnedMesh;
+		char *Moved;
+		core::vector3df StaticPos;
+		core::vector3df StaticNormal;
+	};
+
+	//! Animation keyframe which describes a new position
+	struct SPositionKey
+	{
+		f32 frame;
+		core::vector3df position;
+	};
+
+	//! Animation keyframe which describes a new scale
+	struct SScaleKey
+	{
+		f32 frame;
+		core::vector3df scale;
+	};
+
+	//! Animation keyframe which describes a new rotation
+	struct SRotationKey
+	{
+		f32 frame;
+		core::quaternion rotation;
+	};
+
+	//! Joints
+	struct SJoint
+	{
+		SJoint() :
+				UseAnimationFrom(0), GlobalSkinningSpace(false),
+				positionHint(-1), scaleHint(-1), rotationHint(-1)
+		{
+		}
+
+		//! The name of this joint
+		std::optional<std::string> Name;
+
+		//! Local matrix of this joint
+		core::matrix4 LocalMatrix;
+
+		//! List of child joints
+		core::array<SJoint *> Children;
+
+		//! List of attached meshes
+		core::array<u32> AttachedMeshes;
+
+		//! Animation keys causing translation change
+		core::array<SPositionKey> PositionKeys;
+
+		//! Animation keys causing scale change
+		core::array<SScaleKey> ScaleKeys;
+
+		//! Animation keys causing rotation change
+		core::array<SRotationKey> RotationKeys;
+
+		//! Skin weights
+		core::array<SWeight> Weights;
+
+		//! Unnecessary for loaders, will be overwritten on finalize
+		core::matrix4 GlobalMatrix;
+		core::matrix4 GlobalAnimatedMatrix;
+		core::matrix4 LocalAnimatedMatrix;
+		core::vector3df Animatedposition;
+		core::vector3df Animatedscale;
+		core::quaternion Animatedrotation;
+
+		core::matrix4 GlobalInversedMatrix; // the x format pre-calculates this
+
+	private:
+		//! Internal members used by CSkinnedMesh
+		friend class CSkinnedMesh;
+
+		SJoint *UseAnimationFrom;
+		bool GlobalSkinningSpace;
+
+		s32 positionHint;
+		s32 scaleHint;
+		s32 rotationHint;
+	};
+
+	// Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
+
+	// these functions will use the needed arrays, set values, etc to help the loaders
+
+	//! exposed for loaders: to add mesh buffers
+	virtual core::array<SSkinMeshBuffer *> &getMeshBuffers() = 0;
+
+	//! exposed for loaders: joints list
+	virtual core::array<SJoint *> &getAllJoints() = 0;
+
+	//! exposed for loaders: joints list
+	virtual const core::array<SJoint *> &getAllJoints() const = 0;
+
+	//! loaders should call this after populating the mesh
+	virtual void finalize() = 0;
+
+	//! Adds a new meshbuffer to the mesh, access it as last one
+	virtual SSkinMeshBuffer *addMeshBuffer() = 0;
+
+	//! Adds a new joint to the mesh, access it as last one
+	virtual SJoint *addJoint(SJoint *parent = 0) = 0;
+
+	//! Adds a new weight to the mesh, access it as last one
+	virtual SWeight *addWeight(SJoint *joint) = 0;
+
+	//! Adds a new position key to the mesh, access it as last one
+	virtual SPositionKey *addPositionKey(SJoint *joint) = 0;
+	//! Adds a new scale key to the mesh, access it as last one
+	virtual SScaleKey *addScaleKey(SJoint *joint) = 0;
+	//! Adds a new rotation key to the mesh, access it as last one
+	virtual SRotationKey *addRotationKey(SJoint *joint) = 0;
+
+	//! Check if the mesh is non-animated
+	virtual bool isStatic() = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/ITexture.h b/irr/include/ITexture.h
new file mode 100644
index 000000000..adca90e7b
--- /dev/null
+++ b/irr/include/ITexture.h
@@ -0,0 +1,337 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "IImage.h"
+#include "dimension2d.h"
+#include "EDriverTypes.h"
+#include "path.h"
+#include "matrix4.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Enumeration flags used to tell the video driver with setTextureCreationFlag in which format textures should be created.
+enum E_TEXTURE_CREATION_FLAG
+{
+	/** Forces the driver to create 16 bit textures always, independent of
+	which format the file on disk has. When choosing this you may lose
+	some color detail, but gain much speed and memory. 16 bit textures can
+	be transferred twice as fast as 32 bit textures and only use half of
+	the space in memory.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_32_BIT, ETCF_OPTIMIZED_FOR_QUALITY, or
+	ETCF_OPTIMIZED_FOR_SPEED at the same time.
+	Not all texture formats are affected (usually those up to ECF_A8R8G8B8). */
+	ETCF_ALWAYS_16_BIT = 0x00000001,
+
+	/** Forces the driver to create 32 bit textures always, independent of
+	which format the file on disk has. Please note that some drivers (like
+	the software device) will ignore this, because they are only able to
+	create and use 16 bit textures.
+	Default is true.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_OPTIMIZED_FOR_QUALITY, or
+	ETCF_OPTIMIZED_FOR_SPEED at the same time.
+	Not all texture formats are affected (usually those up to ECF_A8R8G8B8). */
+	ETCF_ALWAYS_32_BIT = 0x00000002,
+
+	/** Lets the driver decide in which format the textures are created and
+	tries to make the textures look as good as possible. Usually it simply
+	chooses the format in which the texture was stored on disk.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, or ETCF_OPTIMIZED_FOR_SPEED at
+	the same time.
+	Not all texture formats are affected (usually those up to ECF_A8R8G8B8). */
+	ETCF_OPTIMIZED_FOR_QUALITY = 0x00000004,
+
+	/** Lets the driver decide in which format the textures are created and
+	tries to create them maximizing render speed.
+	When using this flag, it does not make sense to use the flags
+	ETCF_ALWAYS_16_BIT, ETCF_ALWAYS_32_BIT, or ETCF_OPTIMIZED_FOR_QUALITY,
+	at the same time.
+	Not all texture formats are affected (usually those up to ECF_A8R8G8B8). */
+	ETCF_OPTIMIZED_FOR_SPEED = 0x00000008,
+
+	/** Creates textures with mipmap levels.
+	If disabled textures can not have mipmaps.
+	Default is true. */
+	ETCF_CREATE_MIP_MAPS = 0x00000010,
+
+	/** Discard any alpha layer and use non-alpha color format.
+	Warning: This may lead to getting 24-bit texture formats which
+			 are often badly supported by drivers. So it's generally
+			 not recommended to enable this flag.	*/
+	ETCF_NO_ALPHA_CHANNEL = 0x00000020,
+
+	//! Allow the Driver to use Non-Power-2-Textures
+	/** BurningVideo can handle Non-Power-2 Textures in 2D (GUI), but not in 3D. */
+	ETCF_ALLOW_NON_POWER_2 = 0x00000040,
+
+	//! Allow the driver to keep a copy of the texture in memory
+	/** Enabling this makes calls to ITexture::lock a lot faster, but costs main memory.
+	Currently only used in combination with OpenGL drivers.
+	NOTE: Disabling this does not yet work correctly with alpha-textures.
+	So the default is on for now (but might change with Irrlicht 1.9 if we get the alpha-troubles fixed).
+	*/
+	ETCF_ALLOW_MEMORY_COPY = 0x00000080,
+
+	//! Enable automatic updating mip maps when the base texture changes.
+	/** Default is true.
+	This flag is only used when ETCF_CREATE_MIP_MAPS is also enabled and if the driver supports it.
+	Please note:
+	- On D3D (and maybe older OGL?) you can no longer manually set mipmap data when enabled
+	 (for example mips from image loading will be ignored).
+	- On D3D (and maybe older OGL?) texture locking for mipmap levels usually won't work anymore.
+	- On new OGL this flag is ignored.
+	- When disabled you do _not_ get hardware mipmaps on D3D, so mipmap generation can be slower.
+	- When disabled you can still update your mipmaps when the texture changed by manually calling regenerateMipMapLevels.
+	- You can still call regenerateMipMapLevels when this flag is enabled (it will be a hint on d3d to update mips immediately)
+	  */
+	ETCF_AUTO_GENERATE_MIP_MAPS = 0x00000100,
+
+	/** This flag is never used, it only forces the compiler to compile
+	these enumeration values to 32 bit. */
+	ETCF_FORCE_32_BIT_DO_NOT_USE = 0x7fffffff
+};
+
+//! Enum for the mode for texture locking. Read-Only, write-only or read/write.
+enum E_TEXTURE_LOCK_MODE
+{
+	//! The default mode. Texture can be read and written to.
+	ETLM_READ_WRITE = 0,
+
+	//! Read only. The texture is downloaded, but not uploaded again.
+	/** Often used to read back shader generated textures. */
+	ETLM_READ_ONLY,
+
+	//! Write only. The texture is not downloaded and might be uninitialized.
+	/** The updated texture is uploaded to the GPU.
+	Used for initializing the shader from the CPU. */
+	ETLM_WRITE_ONLY
+};
+
+//! Additional bitflags for ITexture::lock() call
+enum E_TEXTURE_LOCK_FLAGS
+{
+	ETLF_NONE = 0,
+
+	//! Flip left-bottom origin rendertarget textures upside-down
+	/** Irrlicht usually has all textures with left-top as origin.
+	And for drivers with a left-bottom origin coordinate system (OpenGL)
+	Irrlicht modifies the texture-matrix in the fixed function pipeline to make
+	the textures show up correctly (shader coders have to handle upside down
+	textures themselves).
+	But rendertarget textures (RTT's) are written by drivers the way the
+	coordinate system of that driver works. So on OpenGL images tend to look
+	upside down (aka Y coordinate going up) on lock() when this flag isn't set.
+	When the flag is set it will flip such textures on lock() to make them look
+	like non-rtt textures (origin left-top). Note that this also means the texture
+	will be uploaded flipped on unlock. So mostly you want to have this flag set
+	when you want to look at the texture or save it, but unset if you want to
+	upload it again to the card.
+	If you disable this flag you get the memory just as it is on the graphic card.
+	For backward compatibility reasons this flag is enabled by default. */
+	ETLF_FLIP_Y_UP_RTT = 1
+};
+
+//! Where did the last IVideoDriver::getTexture call find this texture
+enum E_TEXTURE_SOURCE
+{
+	//! IVideoDriver::getTexture was never called (texture created otherwise)
+	ETS_UNKNOWN,
+
+	//! Texture has been found in cache
+	ETS_FROM_CACHE,
+
+	//! Texture had to be loaded
+	ETS_FROM_FILE
+};
+
+//! Enumeration describing the type of ITexture.
+enum E_TEXTURE_TYPE
+{
+	//! 2D texture.
+	ETT_2D,
+
+	//! Cubemap texture.
+	ETT_CUBEMAP
+};
+
+//! Interface of a Video Driver dependent Texture.
+/** An ITexture is created by an IVideoDriver by using IVideoDriver::addTexture
+or IVideoDriver::getTexture. After that, the texture may only be used by this
+VideoDriver. As you can imagine, textures of the DirectX and the OpenGL device
+will, e.g., not be compatible. An exception is the Software device and the
+NULL device, their textures are compatible. If you try to use a texture
+created by one device with an other device, the device will refuse to do that
+and write a warning or an error message to the output buffer.
+*/
+class ITexture : public virtual IReferenceCounted
+{
+public:
+	//! constructor
+	ITexture(const io::path &name, E_TEXTURE_TYPE type) :
+			NamedPath(name), DriverType(EDT_NULL), OriginalColorFormat(ECF_UNKNOWN),
+			ColorFormat(ECF_UNKNOWN), Pitch(0), HasMipMaps(false), IsRenderTarget(false), Source(ETS_UNKNOWN), Type(type)
+	{
+	}
+
+	//! Lock function.
+	/** Locks the Texture and returns a pointer to access the
+	pixels. After lock() has been called and all operations on the pixels
+	are done, you must call unlock().
+	Locks are not accumulating, hence one unlock will do for an arbitrary
+	number of previous locks. You should avoid locking different levels without
+	unlocking in between, though, because only the last level locked will be
+	unlocked.
+	The size of the i-th mipmap level is defined as max(getSize().Width>>i,1)
+	and max(getSize().Height>>i,1)
+	\param mode Specifies what kind of changes to the locked texture are
+	allowed. Unspecified behavior will arise if texture is written in read
+	only mode or read from in write only mode.
+	Support for this feature depends on the driver, so don't rely on the
+	texture being write-protected when locking with read-only, etc.
+	\param mipmapLevel NOTE: Currently broken, sorry, we try if we can repair it for 1.9 release.
+	Number of the mipmapLevel to lock. 0 is main texture.
+	Non-existing levels will silently fail and return 0.
+	\param layer It determines which cubemap face or texture array layer should be locked.
+	\param lockFlags See E_TEXTURE_LOCK_FLAGS documentation.
+	\return Returns a pointer to the pixel data. The format of the pixel can
+	be determined by using getColorFormat(). 0 is returned, if
+	the texture cannot be locked. */
+	virtual void *lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel = 0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) = 0;
+
+	//! Unlock function. Must be called after a lock() to the texture.
+	/** One should avoid to call unlock more than once before another lock.
+	The last locked mip level will be unlocked.
+	You may want to call regenerateMipMapLevels() after this when you changed any data.	*/
+	virtual void unlock() = 0;
+
+	//! Regenerates the mip map levels of the texture.
+	/** Required after modifying the texture, usually after calling unlock().
+	\param data Optional parameter to pass in image data which will be
+	used instead of the previously stored or automatically generated mipmap
+	data. The data has to be a continuous pixel data for all mipmaps until
+	1x1 pixel. Each mipmap has to be half the width and height of the previous
+	level. At least one pixel will be always kept.
+	\param layer It informs a texture about which cubemap or texture array layer
+	needs mipmap regeneration. */
+	virtual void regenerateMipMapLevels(void *data = 0, u32 layer = 0) = 0;
+
+	//! Get original size of the texture.
+	/** The texture is usually scaled, if it was created with an unoptimal
+	size. For example if the size was not a power of two. This method
+	returns the size of the texture it had before it was scaled. Can be
+	useful when drawing 2d images on the screen, which should have the
+	exact size of the original texture. Use ITexture::getSize() if you want
+	to know the real size it has now stored in the system.
+	\return The original size of the texture. */
+	const core::dimension2d<u32> &getOriginalSize() const { return OriginalSize; };
+
+	//! Get dimension (=size) of the texture.
+	/** \return The size of the texture. */
+	const core::dimension2d<u32> &getSize() const { return Size; };
+
+	//! Get driver type of texture.
+	/** This is the driver, which created the texture. This method is used
+	internally by the video devices, to check, if they may use a texture
+	because textures may be incompatible between different devices.
+	\return Driver type of texture. */
+	E_DRIVER_TYPE getDriverType() const { return DriverType; };
+
+	//! Get the color format of texture.
+	/** \return The color format of texture. */
+	ECOLOR_FORMAT getColorFormat() const { return ColorFormat; };
+
+	//! Get the original color format
+	/** When create textures from image data we will often use different color formats.
+	For example depending on driver TextureCreationFlag's.
+	This can give you the original format which the image used to create the texture had	*/
+	ECOLOR_FORMAT getOriginalColorFormat() const { return OriginalColorFormat; };
+
+	//! Get pitch of the main texture (in bytes).
+	/** The pitch is the amount of bytes used for a row of pixels in a
+	texture.
+	\return Pitch of texture in bytes. */
+	u32 getPitch() const { return Pitch; };
+
+	//! Check whether the texture has MipMaps
+	/** \return True if texture has MipMaps, else false. */
+	bool hasMipMaps() const { return HasMipMaps; }
+
+	//! Check whether the texture is a render target
+	/** Render targets can be set as such in the video driver, in order to
+	render a scene into the texture. Once unbound as render target, they can
+	be used just as usual textures again.
+	\return True if this is a render target, otherwise false. */
+	bool isRenderTarget() const { return IsRenderTarget; }
+
+	//! Get name of texture (in most cases this is the filename)
+	const io::SNamedPath &getName() const { return NamedPath; }
+
+	//! Check where the last IVideoDriver::getTexture found this texture
+	E_TEXTURE_SOURCE getSource() const { return Source; }
+
+	//! Used internally by the engine to update Source status on IVideoDriver::getTexture calls.
+	void updateSource(E_TEXTURE_SOURCE source) { Source = source; }
+
+	//! Returns if the texture has an alpha channel
+	bool hasAlpha() const
+	{
+		bool status = false;
+
+		switch (ColorFormat) {
+		case ECF_A8R8G8B8:
+		case ECF_A1R5G5B5:
+		case ECF_A16B16G16R16F:
+		case ECF_A32B32G32R32F:
+			status = true;
+			break;
+		default:
+			break;
+		}
+
+		return status;
+	}
+
+	//! Returns the type of texture
+	E_TEXTURE_TYPE getType() const { return Type; }
+
+protected:
+	//! Helper function, helps to get the desired texture creation format from the flags.
+	/** \return Either ETCF_ALWAYS_32_BIT, ETCF_ALWAYS_16_BIT,
+	ETCF_OPTIMIZED_FOR_QUALITY, or ETCF_OPTIMIZED_FOR_SPEED. */
+	inline E_TEXTURE_CREATION_FLAG getTextureFormatFromFlags(u32 flags)
+	{
+		if (flags & ETCF_OPTIMIZED_FOR_SPEED)
+			return ETCF_OPTIMIZED_FOR_SPEED;
+		if (flags & ETCF_ALWAYS_16_BIT)
+			return ETCF_ALWAYS_16_BIT;
+		if (flags & ETCF_ALWAYS_32_BIT)
+			return ETCF_ALWAYS_32_BIT;
+		if (flags & ETCF_OPTIMIZED_FOR_QUALITY)
+			return ETCF_OPTIMIZED_FOR_QUALITY;
+		return ETCF_OPTIMIZED_FOR_SPEED;
+	}
+
+	io::SNamedPath NamedPath;
+	core::dimension2d<u32> OriginalSize;
+	core::dimension2d<u32> Size;
+	E_DRIVER_TYPE DriverType;
+	ECOLOR_FORMAT OriginalColorFormat;
+	ECOLOR_FORMAT ColorFormat;
+	u32 Pitch;
+	bool HasMipMaps;
+	bool IsRenderTarget;
+	E_TEXTURE_SOURCE Source;
+	E_TEXTURE_TYPE Type;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/ITimer.h b/irr/include/ITimer.h
new file mode 100644
index 000000000..22c79f603
--- /dev/null
+++ b/irr/include/ITimer.h
@@ -0,0 +1,65 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+
+namespace irr
+{
+
+//! Interface for getting and manipulating the virtual time
+class ITimer : public virtual IReferenceCounted
+{
+public:
+	//! Returns current real time in milliseconds of the system.
+	/** This value does not start with 0 when the application starts.
+	For example in one implementation the value returned could be the
+	amount of milliseconds which have elapsed since the system was started.
+	*/
+	virtual u32 getRealTime() const = 0;
+
+	//! Returns current virtual time in milliseconds.
+	/** This value starts with 0 and can be manipulated using setTime(),
+	stopTimer(), startTimer(), etc. This value depends on the set speed of
+	the timer if the timer is stopped, etc. If you need the system time,
+	use getRealTime() */
+	virtual u32 getTime() const = 0;
+
+	//! sets current virtual time
+	virtual void setTime(u32 time) = 0;
+
+	//! Stops the virtual timer.
+	/** The timer is reference counted, which means everything which calls
+	stop() will also have to call start(), otherwise the timer may not
+	start/stop correctly again. */
+	virtual void stop() = 0;
+
+	//! Starts the virtual timer.
+	/** The timer is reference counted, which means everything which calls
+	stop() will also have to call start(), otherwise the timer may not
+	start/stop correctly again. */
+	virtual void start() = 0;
+
+	//! Sets the speed of the timer
+	/** The speed is the factor with which the time is running faster or
+	slower then the real system time. */
+	virtual void setSpeed(f32 speed = 1.0f) = 0;
+
+	//! Returns current speed of the timer
+	/** The speed is the factor with which the time is running faster or
+	slower then the real system time. */
+	virtual f32 getSpeed() const = 0;
+
+	//! Returns if the virtual timer is currently stopped
+	virtual bool isStopped() const = 0;
+
+	//! Advances the virtual time
+	/** Makes the virtual timer update the time value based on the real
+	time. This is called automatically when calling IrrlichtDevice::run(),
+	but you can call it manually if you don't use this method. */
+	virtual void tick() = 0;
+};
+
+} // end namespace irr
diff --git a/irr/include/IVertexBuffer.h b/irr/include/IVertexBuffer.h
new file mode 100644
index 000000000..a4ec5efd9
--- /dev/null
+++ b/irr/include/IVertexBuffer.h
@@ -0,0 +1,48 @@
+// Copyright (C) 2008-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "EHardwareBufferFlags.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class IVertexBuffer : public virtual IReferenceCounted
+{
+public:
+	virtual void *getData() = 0;
+	virtual video::E_VERTEX_TYPE getType() const = 0;
+	virtual void setType(video::E_VERTEX_TYPE vertexType) = 0;
+	virtual u32 stride() const = 0;
+	virtual u32 size() const = 0;
+	virtual void push_back(const video::S3DVertex &element) = 0;
+	virtual video::S3DVertex &operator[](const u32 index) const = 0;
+	virtual video::S3DVertex &getLast() = 0;
+	virtual void set_used(u32 usedNow) = 0;
+	virtual void reallocate(u32 new_size) = 0;
+	virtual u32 allocated_size() const = 0;
+	virtual video::S3DVertex *pointer() = 0;
+
+	//! get the current hardware mapping hint
+	virtual E_HARDWARE_MAPPING getHardwareMappingHint() const = 0;
+
+	//! set the hardware mapping hint, for driver
+	virtual void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint) = 0;
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	virtual void setDirty() = 0;
+
+	//! Get the currently used ID for identification of changes.
+	/** This shouldn't be used for anything outside the VideoDriver. */
+	virtual u32 getChangedID() const = 0;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/IVideoDriver.h b/irr/include/IVideoDriver.h
new file mode 100644
index 000000000..2d651c6bf
--- /dev/null
+++ b/irr/include/IVideoDriver.h
@@ -0,0 +1,1207 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "rect.h"
+#include "SColor.h"
+#include "ITexture.h"
+#include "irrArray.h"
+#include "matrix4.h"
+#include "plane3d.h"
+#include "dimension2d.h"
+#include "position2d.h"
+#include "IMeshBuffer.h"
+#include "EDriverTypes.h"
+#include "EDriverFeatures.h"
+#include "SExposedVideoData.h"
+#include "SOverrideMaterial.h"
+
+namespace irr
+{
+namespace io
+{
+class IAttributes;
+class IReadFile;
+class IWriteFile;
+} // end namespace io
+namespace scene
+{
+class IMeshBuffer;
+class IMesh;
+class IMeshManipulator;
+class ISceneNode;
+} // end namespace scene
+
+namespace video
+{
+struct S3DVertex;
+struct S3DVertex2TCoords;
+struct S3DVertexTangents;
+class IImageLoader;
+class IImageWriter;
+class IMaterialRenderer;
+class IGPUProgrammingServices;
+class IRenderTarget;
+
+//! enumeration for geometry transformation states
+enum E_TRANSFORMATION_STATE
+{
+	//! View transformation
+	ETS_VIEW = 0,
+	//! World transformation
+	ETS_WORLD,
+	//! Projection transformation
+	ETS_PROJECTION,
+	//! Texture 0 transformation
+	//! Use E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + texture_number) to access other texture transformations
+	ETS_TEXTURE_0,
+	//! Only used internally
+	ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES
+};
+
+//! Special render targets, which usually map to dedicated hardware
+/** These render targets (besides 0 and 1) need not be supported by gfx cards */
+enum E_RENDER_TARGET
+{
+	//! Render target is the main color frame buffer
+	ERT_FRAME_BUFFER = 0,
+	//! Render target is a render texture
+	ERT_RENDER_TEXTURE,
+	//! Multi-Render target textures
+	ERT_MULTI_RENDER_TEXTURES,
+	//! Render target is the main color frame buffer
+	ERT_STEREO_LEFT_BUFFER,
+	//! Render target is the right color buffer (left is the main buffer)
+	ERT_STEREO_RIGHT_BUFFER,
+	//! Render to both stereo buffers at once
+	ERT_STEREO_BOTH_BUFFERS,
+	//! Auxiliary buffer 0
+	ERT_AUX_BUFFER0,
+	//! Auxiliary buffer 1
+	ERT_AUX_BUFFER1,
+	//! Auxiliary buffer 2
+	ERT_AUX_BUFFER2,
+	//! Auxiliary buffer 3
+	ERT_AUX_BUFFER3,
+	//! Auxiliary buffer 4
+	ERT_AUX_BUFFER4
+};
+
+//! Enum for the flags of clear buffer
+enum E_CLEAR_BUFFER_FLAG
+{
+	ECBF_NONE = 0,
+	ECBF_COLOR = 1,
+	ECBF_DEPTH = 2,
+	ECBF_STENCIL = 4,
+	ECBF_ALL = ECBF_COLOR | ECBF_DEPTH | ECBF_STENCIL
+};
+
+//! Enum for the types of fog distributions to choose from
+enum E_FOG_TYPE
+{
+	EFT_FOG_EXP = 0,
+	EFT_FOG_LINEAR,
+	EFT_FOG_EXP2
+};
+
+const c8 *const FogTypeNames[] = {
+		"FogExp",
+		"FogLinear",
+		"FogExp2",
+		0,
+	};
+
+//! Interface to driver which is able to perform 2d and 3d graphics functions.
+/** This interface is one of the most important interfaces of
+the Irrlicht Engine: All rendering and texture manipulation is done with
+this interface. You are able to use the Irrlicht Engine by only
+invoking methods of this interface if you like to, although the
+irr::scene::ISceneManager interface provides a lot of powerful classes
+and methods to make the programmer's life easier.
+*/
+class IVideoDriver : public virtual IReferenceCounted
+{
+public:
+	//! Applications must call this method before performing any rendering.
+	/** This method can clear the back- and the z-buffer.
+	\param clearFlag A combination of the E_CLEAR_BUFFER_FLAG bit-flags.
+	\param clearColor The clear color for the color buffer.
+	\param clearDepth The clear value for the depth buffer.
+	\param clearStencil The clear value for the stencil buffer.
+	\param videoData Handle of another window, if you want the
+	bitmap to be displayed on another window. If this is an empty
+	element, everything will be displayed in the default window.
+	Note: This feature is not fully implemented for all devices.
+	\param sourceRect Pointer to a rectangle defining the source
+	rectangle of the area to be presented. Set to null to present
+	everything. Note: not implemented in all devices.
+	\return False if failed. */
+	virtual bool beginScene(u16 clearFlag = (u16)(ECBF_COLOR | ECBF_DEPTH), SColor clearColor = SColor(255, 0, 0, 0), f32 clearDepth = 1.f, u8 clearStencil = 0,
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0) = 0;
+
+	//! Alternative beginScene implementation. Can't clear stencil buffer, but otherwise identical to other beginScene
+	bool beginScene(bool backBuffer, bool zBuffer, SColor color = SColor(255, 0, 0, 0),
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0)
+	{
+		u16 flag = 0;
+
+		if (backBuffer)
+			flag |= ECBF_COLOR;
+
+		if (zBuffer)
+			flag |= ECBF_DEPTH;
+
+		return beginScene(flag, color, 1.f, 0, videoData, sourceRect);
+	}
+
+	//! Presents the rendered image to the screen.
+	/** Applications must call this method after performing any
+	rendering.
+	\return False if failed and true if succeeded. */
+	virtual bool endScene() = 0;
+
+	//! Queries the features of the driver.
+	/** Returns true if a feature is available
+	\param feature Feature to query.
+	\return True if the feature is available, false if not. */
+	virtual bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const = 0;
+
+	//! Disable a feature of the driver.
+	/** Can also be used to enable the features again. It is not
+	possible to enable unsupported features this way, though.
+	\param feature Feature to disable.
+	\param flag When true the feature is disabled, otherwise it is enabled. */
+	virtual void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag = true) = 0;
+
+	//! Get attributes of the actual video driver
+	/** The following names can be queried for the given types:
+	MaxTextures (int) The maximum number of simultaneous textures supported by the driver. This can be less than the supported number of textures of the driver. Use _IRR_MATERIAL_MAX_TEXTURES_ to adapt the number.
+	MaxSupportedTextures (int) The maximum number of simultaneous textures supported by the fixed function pipeline of the (hw) driver. The actual supported number of textures supported by the engine can be lower.
+	MaxLights (int) Number of hardware lights supported in the fixed function pipeline of the driver, typically 6-8. Use light manager or deferred shading for more.
+	MaxAnisotropy (int) Number of anisotropy levels supported for filtering. At least 1, max is typically at 16 or 32.
+	MaxUserClipPlanes (int) Number of additional clip planes, which can be set by the user via dedicated driver methods.
+	MaxAuxBuffers (int) Special render buffers, which are currently not really usable inside Irrlicht. Only supported by OpenGL
+	MaxMultipleRenderTargets (int) Number of render targets which can be bound simultaneously. Rendering to MRTs is done via shaders.
+	MaxIndices (int) Number of indices which can be used in one render call (i.e. one mesh buffer).
+	MaxTextureSize (int) Dimension that a texture may have, both in width and height.
+	MaxGeometryVerticesOut (int) Number of vertices the geometry shader can output in one pass. Only OpenGL so far.
+	MaxTextureLODBias (float) Maximum value for LOD bias. Is usually at around 16, but can be lower on some systems.
+	Version (int) Version of the driver. Should be Major*100+Minor
+	ShaderLanguageVersion (int) Version of the high level shader language. Should be Major*100+Minor.
+	AntiAlias (int) Number of Samples the driver uses for each pixel. 0 and 1 means anti aliasing is off, typical values are 2,4,8,16,32
+	*/
+	virtual const io::IAttributes &getDriverAttributes() const = 0;
+
+	//! Check if the driver was recently reset.
+	/** For d3d devices you will need to recreate the RTTs if the
+	driver was reset. Should be queried right after beginScene().
+	*/
+	virtual bool checkDriverReset() = 0;
+
+	//! Sets transformation matrices.
+	/** \param state Transformation type to be set, e.g. view,
+	world, or projection.
+	\param mat Matrix describing the transformation. */
+	virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat) = 0;
+
+	//! Returns the transformation set by setTransform
+	/** \param state Transformation type to query
+	\return Matrix describing the transformation. */
+	virtual const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const = 0;
+
+	//! Retrieve the number of image loaders
+	/** \return Number of image loaders */
+	virtual u32 getImageLoaderCount() const = 0;
+
+	//! Retrieve the given image loader
+	/** \param n The index of the loader to retrieve. This parameter is an 0-based
+	array index.
+	\return A pointer to the specified loader, 0 if the index is incorrect. */
+	virtual IImageLoader *getImageLoader(u32 n) = 0;
+
+	//! Retrieve the number of image writers
+	/** \return Number of image writers */
+	virtual u32 getImageWriterCount() const = 0;
+
+	//! Retrieve the given image writer
+	/** \param n The index of the writer to retrieve. This parameter is an 0-based
+	array index.
+	\return A pointer to the specified writer, 0 if the index is incorrect. */
+	virtual IImageWriter *getImageWriter(u32 n) = 0;
+
+	//! Sets a material.
+	/** All 3d drawing functions will draw geometry using this material thereafter.
+	\param material: Material to be used from now on. */
+	virtual void setMaterial(const SMaterial &material) = 0;
+
+	//! Get access to a named texture.
+	/** Loads the texture from disk if it is not
+	already loaded and generates mipmap levels if desired.
+	Texture loading can be influenced using the
+	setTextureCreationFlag() method. The texture can be in several
+	imageformats, such as BMP, JPG, TGA, PCX, PNG, and PSD.
+	\param filename Filename of the texture to be loaded.
+	\return Pointer to the texture, or 0 if the texture
+	could not be loaded. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual ITexture *getTexture(const io::path &filename) = 0;
+
+	//! Get access to a named texture.
+	/** Loads the texture from disk if it is not
+	already loaded and generates mipmap levels if desired.
+	Texture loading can be influenced using the
+	setTextureCreationFlag() method. The texture can be in several
+	imageformats, such as BMP, JPG, TGA, PCX, PNG, and PSD.
+	\param file Pointer to an already opened file.
+	\return Pointer to the texture, or 0 if the texture
+	could not be loaded. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual ITexture *getTexture(io::IReadFile *file) = 0;
+
+	//! Returns amount of textures currently loaded
+	/** \return Amount of textures currently loaded */
+	virtual u32 getTextureCount() const = 0;
+
+	//! Creates an empty texture of specified size.
+	/** \param size: Size of the texture.
+	\param name A name for the texture. Later calls to
+	getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param format Desired color format of the texture. Please note
+	that the driver may choose to create the texture in another
+	color format.
+	\return Pointer to the newly created texture. This pointer
+	should not be dropped. See IReferenceCounted::drop() for more
+	information. */
+	virtual ITexture *addTexture(const core::dimension2d<u32> &size,
+			const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0;
+
+	//! Creates a texture from an IImage.
+	/** \param name A name for the texture. Later calls of
+	getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param image Image the texture is created from.
+	\return Pointer to the newly created texture. This pointer
+	should not be dropped. See IReferenceCounted::drop() for more
+	information. */
+	virtual ITexture *addTexture(const io::path &name, IImage *image) = 0;
+
+	//! Creates a cubemap texture from loaded IImages.
+	/** \param name A name for the texture. Later calls of getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param imagePosX Image (positive X) the texture is created from.
+	\param imageNegX Image (negative X) the texture is created from.
+	\param imagePosY Image (positive Y) the texture is created from.
+	\param imageNegY Image (negative Y) the texture is created from.
+	\param imagePosZ Image (positive Z) the texture is created from.
+	\param imageNegZ Image (negative Z) the texture is created from.
+	\return Pointer to the newly created texture. This pointer should not be dropped. See IReferenceCounted::drop() for more information. */
+	virtual ITexture *addTextureCubemap(const io::path &name, IImage *imagePosX, IImage *imageNegX, IImage *imagePosY,
+			IImage *imageNegY, IImage *imagePosZ, IImage *imageNegZ) = 0;
+
+	//! Creates an empty cubemap texture of specified size.
+	/** \param sideLen diameter of one side of the cube
+	\param name A name for the texture. Later calls of
+	getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param format Desired color format of the texture. Please note
+	that the driver may choose to create the texture in another
+	color format.
+	\return Pointer to the newly created texture. 	*/
+	virtual ITexture *addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0;
+
+	//! Adds a new render target texture to the texture cache.
+	/** \param size Size of the texture, in pixels. Width and
+	height should be a power of two (e.g. 64, 128, 256, 512, ...)
+	and it should not be bigger than the backbuffer, because it
+	shares the zbuffer with the screen buffer.
+	\param name A name for the texture. Later calls of getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param format The color format of the render target. Floating point formats are supported.
+	\return Pointer to the created texture or 0 if the texture
+	could not be created. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information.
+	You may want to remove it from driver texture cache with removeTexture if you no longer need it.
+	*/
+	virtual ITexture *addRenderTargetTexture(const core::dimension2d<u32> &size,
+			const io::path &name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) = 0;
+
+	//! Adds a new render target texture with 6 sides for a cubemap map to the texture cache.
+	/** \param sideLen Length of one cubemap side.
+	\param name A name for the texture. Later calls of getTexture() with this name will return this texture.
+	The name can _not_ be empty.
+	\param format The color format of the render target. Floating point formats are supported.
+	\return Pointer to the created texture or 0 if the texture
+	could not be created. This pointer should not be dropped. See
+	IReferenceCounted::drop() for more information. */
+	virtual ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+			const io::path &name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) = 0;
+
+	//! Removes a texture from the texture cache and deletes it.
+	/** This method can free a lot of memory!
+	Please note that after calling this, the pointer to the
+	ITexture may no longer be valid, if it was not grabbed before
+	by other parts of the engine for storing it longer. So it is a
+	good idea to set all materials which are using this texture to
+	0 or another texture first.
+	\param texture Texture to delete from the engine cache. */
+	virtual void removeTexture(ITexture *texture) = 0;
+
+	//! Removes all textures from the texture cache and deletes them.
+	/** This method can free a lot of memory!
+	Please note that after calling this, the pointer to the
+	ITexture may no longer be valid, if it was not grabbed before
+	by other parts of the engine for storing it longer. So it is a
+	good idea to set all materials which are using this texture to
+	0 or another texture first. */
+	virtual void removeAllTextures() = 0;
+
+	//! Remove hardware buffer
+	virtual void removeHardwareBuffer(const scene::IMeshBuffer *mb) = 0;
+
+	//! Remove all hardware buffers
+	virtual void removeAllHardwareBuffers() = 0;
+
+	//! Create occlusion query.
+	/** Use node for identification and mesh for occlusion test. */
+	virtual void addOcclusionQuery(scene::ISceneNode *node,
+			const scene::IMesh *mesh = 0) = 0;
+
+	//! Remove occlusion query.
+	virtual void removeOcclusionQuery(scene::ISceneNode *node) = 0;
+
+	//! Remove all occlusion queries.
+	virtual void removeAllOcclusionQueries() = 0;
+
+	//! Run occlusion query. Draws mesh stored in query.
+	/** If the mesh shall not be rendered visible, use
+	overrideMaterial to disable the color and depth buffer. */
+	virtual void runOcclusionQuery(scene::ISceneNode *node, bool visible = false) = 0;
+
+	//! Run all occlusion queries. Draws all meshes stored in queries.
+	/** If the meshes shall not be rendered visible, use
+	overrideMaterial to disable the color and depth buffer. */
+	virtual void runAllOcclusionQueries(bool visible = false) = 0;
+
+	//! Update occlusion query. Retrieves results from GPU.
+	/** If the query shall not block, set the flag to false.
+	Update might not occur in this case, though */
+	virtual void updateOcclusionQuery(scene::ISceneNode *node, bool block = true) = 0;
+
+	//! Update all occlusion queries. Retrieves results from GPU.
+	/** If the query shall not block, set the flag to false.
+	Update might not occur in this case, though */
+	virtual void updateAllOcclusionQueries(bool block = true) = 0;
+
+	//! Return query result.
+	/** Return value is the number of visible pixels/fragments.
+	The value is a safe approximation, i.e. can be larger than the
+	actual value of pixels. */
+	virtual u32 getOcclusionQueryResult(scene::ISceneNode *node) const = 0;
+
+	//! Create render target.
+	virtual IRenderTarget *addRenderTarget() = 0;
+
+	//! Remove render target.
+	virtual void removeRenderTarget(IRenderTarget *renderTarget) = 0;
+
+	//! Remove all render targets.
+	virtual void removeAllRenderTargets() = 0;
+
+	//! Sets a boolean alpha channel on the texture based on a color key.
+	/** This makes the texture fully transparent at the texels where
+	this color key can be found when using for example draw2DImage
+	with useAlphachannel==true.  The alpha of other texels is not modified.
+	\param texture Texture whose alpha channel is modified.
+	\param color Color key color. Every texel with this color will
+	become fully transparent as described above. Please note that the
+	colors of a texture may be converted when loading it, so the
+	color values may not be exactly the same in the engine and for
+	example in picture edit programs. To avoid this problem, you
+	could use the makeColorKeyTexture method, which takes the
+	position of a pixel instead a color value. */
+	virtual void makeColorKeyTexture(video::ITexture *texture,
+			video::SColor color) const = 0;
+
+	//! Sets a boolean alpha channel on the texture based on the color at a position.
+	/** This makes the texture fully transparent at the texels where
+	the color key can be found when using for example draw2DImage
+	with useAlphachannel==true.  The alpha of other texels is not modified.
+	\param texture Texture whose alpha channel is modified.
+	\param colorKeyPixelPos Position of a pixel with the color key
+	color. Every texel with this color will become fully transparent as
+	described above. */
+	virtual void makeColorKeyTexture(video::ITexture *texture,
+			core::position2d<s32> colorKeyPixelPos) const = 0;
+
+	//! Set a render target.
+	/** This will only work if the driver supports the
+	EVDF_RENDER_TO_TARGET feature, which can be queried with
+	queryFeature(). Please note that you cannot render 3D or 2D
+	geometry with a render target as texture on it when you are rendering
+	the scene into this render target at the same time. It is usually only
+	possible to render into a texture between the
+	IVideoDriver::beginScene() and endScene() method calls. If you need the
+	best performance use this method instead of setRenderTarget.
+	\param target Render target object. If set to nullptr, it makes the
+	window the current render target.
+	\param clearFlag A combination of the E_CLEAR_BUFFER_FLAG bit-flags.
+	\param clearColor The clear color for the color buffer.
+	\param clearDepth The clear value for the depth buffer.
+	\param clearStencil The clear value for the stencil buffer.
+	\return True if successful and false if not. */
+	virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) = 0;
+
+	//! Sets a new render target.
+	/** This will only work if the driver supports the
+	EVDF_RENDER_TO_TARGET feature, which can be queried with
+	queryFeature(). Usually, rendering to textures is done in this
+	way:
+	\code
+	// create render target
+	ITexture* target = driver->addRenderTargetTexture(core::dimension2d<u32>(128,128), "rtt1");
+
+	// ...
+
+	driver->setRenderTarget(target); // set render target
+	// .. draw stuff here
+	driver->setRenderTarget(0); // set previous render target
+	\endcode
+	Please note that you cannot render 3D or 2D geometry with a
+	render target as texture on it when you are rendering the scene
+	into this render target at the same time. It is usually only
+	possible to render into a texture between the
+	IVideoDriver::beginScene() and endScene() method calls.
+	\param texture New render target. Must be a texture created with
+	IVideoDriver::addRenderTargetTexture(). If set to nullptr, it makes
+	the window the current render target.
+	\param clearFlag A combination of the E_CLEAR_BUFFER_FLAG bit-flags.
+	\param clearColor The clear color for the color buffer.
+	\param clearDepth The clear value for the depth buffer.
+	\param clearStencil The clear value for the stencil buffer.
+	\return True if successful and false if not. */
+	virtual bool setRenderTarget(ITexture *texture, u16 clearFlag = ECBF_COLOR | ECBF_DEPTH, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) = 0;
+
+	//! Sets a new render target.
+	//! Prefer to use the setRenderTarget function taking flags as parameter as this one can't clear the stencil buffer.
+	//! It's still offered for backward compatibility.
+	bool setRenderTarget(ITexture *texture, bool clearBackBuffer, bool clearZBuffer, SColor color = SColor(255, 0, 0, 0))
+	{
+		u16 flag = 0;
+
+		if (clearBackBuffer)
+			flag |= ECBF_COLOR;
+
+		if (clearZBuffer)
+			flag |= ECBF_DEPTH;
+
+		return setRenderTarget(texture, flag, color);
+	}
+
+	//! Sets a new viewport.
+	/** Every rendering operation is done into this new area.
+	\param area: Rectangle defining the new area of rendering
+	operations. */
+	virtual void setViewPort(const core::rect<s32> &area) = 0;
+
+	//! Gets the area of the current viewport.
+	/** \return Rectangle of the current viewport. */
+	virtual const core::rect<s32> &getViewPort() const = 0;
+
+	//! Draws a vertex primitive list
+	/** Note that, depending on the index type, some vertices might be not
+	accessible through the index list. The limit is at 65535 vertices for 16bit
+	indices. Please note that currently not all primitives are available for
+	all drivers, and some might be emulated via triangle renders.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices. These define the vertices used
+	for each primitive. Depending on the pType, indices are interpreted as single
+	objects (for point like primitives), pairs (for lines), triplets (for
+	triangles), or quads.
+	\param primCount Amount of Primitives
+	\param vType Vertex type, e.g. video::EVT_STANDARD for S3DVertex.
+	\param pType Primitive type, e.g. scene::EPT_TRIANGLE_FAN for a triangle fan.
+	\param iType Index type, e.g. video::EIT_16BIT for 16bit indices. */
+	virtual void drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primCount,
+			E_VERTEX_TYPE vType = EVT_STANDARD,
+			scene::E_PRIMITIVE_TYPE pType = scene::EPT_TRIANGLES,
+			E_INDEX_TYPE iType = EIT_16BIT) = 0;
+
+	//! Draws a vertex primitive list in 2d
+	/** Compared to the general (3d) version of this method, this
+	one sets up a 2d render mode, and uses only x and y of vectors.
+	Note that, depending on the index type, some vertices might be
+	not accessible through the index list. The limit is at 65535
+	vertices for 16bit indices. Please note that currently not all
+	primitives are available for all drivers, and some might be
+	emulated via triangle renders. This function is not available
+	for the sw drivers.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices. These define the
+	vertices used for each primitive. Depending on the pType,
+	indices are interpreted as single objects (for point like
+	primitives), pairs (for lines), triplets (for triangles), or
+	quads.
+	\param primCount Amount of Primitives
+	\param vType Vertex type, e.g. video::EVT_STANDARD for S3DVertex.
+	\param pType Primitive type, e.g. scene::EPT_TRIANGLE_FAN for a triangle fan.
+	\param iType Index type, e.g. video::EIT_16BIT for 16bit indices. */
+	virtual void draw2DVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primCount,
+			E_VERTEX_TYPE vType = EVT_STANDARD,
+			scene::E_PRIMITIVE_TYPE pType = scene::EPT_TRIANGLES,
+			E_INDEX_TYPE iType = EIT_16BIT) = 0;
+
+	//! Draws an indexed triangle list.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
+	void drawIndexedTriangleList(const S3DVertex *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLES, EIT_16BIT);
+	}
+
+	//! Draws an indexed triangle list.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
+	void drawIndexedTriangleList(const S3DVertex2TCoords *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLES, EIT_16BIT);
+	}
+
+	//! Draws an indexed triangle list.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices / 3. */
+	void drawIndexedTriangleList(const S3DVertexTangents *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLES, EIT_16BIT);
+	}
+
+	//! Draws an indexed triangle fan.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices - 2. */
+	void drawIndexedTriangleFan(const S3DVertex *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
+	}
+
+	//! Draws an indexed triangle fan.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices - 2. */
+	void drawIndexedTriangleFan(const S3DVertex2TCoords *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_2TCOORDS, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
+	}
+
+	//! Draws an indexed triangle fan.
+	/** Note that there may be at maximum 65536 vertices, because
+	the index list is an array of 16 bit values each with a maximum
+	value of 65536. If there are more than 65536 vertices in the
+	list, results of this operation are not defined.
+	\param vertices Pointer to array of vertices.
+	\param vertexCount Amount of vertices in the array.
+	\param indexList Pointer to array of indices.
+	\param triangleCount Amount of Triangles. Usually amount of indices - 2. */
+	void drawIndexedTriangleFan(const S3DVertexTangents *vertices,
+			u32 vertexCount, const u16 *indexList, u32 triangleCount)
+	{
+		drawVertexPrimitiveList(vertices, vertexCount, indexList, triangleCount, EVT_TANGENTS, scene::EPT_TRIANGLE_FAN, EIT_16BIT);
+	}
+
+	//! Draws a 3d line.
+	/** For some implementations, this method simply calls
+	drawVertexPrimitiveList for some triangles.
+	Note that the line is drawn using the current transformation
+	matrix and material. So if you need to draw the 3D line
+	independently of the current transformation, use
+	\code
+	driver->setMaterial(someMaterial);
+	driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+	\endcode
+	for some properly set up material before drawing the line.
+	Some drivers support line thickness set in the material.
+	\param start Start of the 3d line.
+	\param end End of the 3d line.
+	\param color Color of the line. */
+	virtual void draw3DLine(const core::vector3df &start,
+			const core::vector3df &end, SColor color = SColor(255, 255, 255, 255)) = 0;
+
+	//! Draws a 3d axis aligned box.
+	/** This method simply calls draw3DLine for the edges of the
+	box. Note that the box is drawn using the current transformation
+	matrix and material. So if you need to draw it independently of
+	the current transformation, use
+	\code
+	driver->setMaterial(someMaterial);
+	driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+	\endcode
+	for some properly set up material before drawing the box.
+	\param box The axis aligned box to draw
+	\param color Color to use while drawing the box. */
+	virtual void draw3DBox(const core::aabbox3d<f32> &box,
+			SColor color = SColor(255, 255, 255, 255)) = 0;
+
+	//! Draws a 2d image without any special effects
+	/** \param texture Pointer to texture to use.
+	\param destPos Upper left 2d destination position where the
+	image will be drawn.
+	\param useAlphaChannelOfTexture: If true, the alpha channel of
+	the texture is used to draw the image.*/
+	virtual void draw2DImage(const video::ITexture *texture,
+			const core::position2d<s32> &destPos, bool useAlphaChannelOfTexture = false) = 0;
+
+	//! Draws a 2d image using a color
+	/** (if color is other than
+	Color(255,255,255,255)) and the alpha channel of the texture.
+	\param texture Texture to be drawn.
+	\param destPos Upper left 2d destination position where the
+	image will be drawn.
+	\param sourceRect Source rectangle in the texture (based on it's OriginalSize)
+	\param clipRect Pointer to rectangle on the screen where the
+	image is clipped to.
+	If this pointer is NULL the image is not clipped.
+	\param color Color with which the image is drawn. If the color
+	equals Color(255,255,255,255) it is ignored. Note that the
+	alpha component is used: If alpha is other than 255, the image
+	will be transparent.
+	\param useAlphaChannelOfTexture: If true, the alpha channel of
+	the texture is used to draw the image.*/
+	virtual void draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255), bool useAlphaChannelOfTexture = false) = 0;
+
+	//! Draws a set of 2d images, using a color and the alpha channel of the texture.
+	/** All drawings are clipped against clipRect (if != 0).
+	The subtextures are defined by the array of sourceRects and are
+	positioned using the array of positions.
+	\param texture Texture to be drawn.
+	\param positions Array of upper left 2d destinations where the
+	images will be drawn.
+	\param sourceRects Source rectangles of the texture (based on it's OriginalSize)
+	\param clipRect Pointer to rectangle on the screen where the
+	images are clipped to.
+	If this pointer is 0 then the image is not clipped.
+	\param color Color with which the image is drawn.
+	Note that the alpha component is used. If alpha is other than
+	255, the image will be transparent.
+	\param useAlphaChannelOfTexture: If true, the alpha channel of
+	the texture is used to draw the image. */
+	virtual void draw2DImageBatch(const video::ITexture *texture,
+			const core::array<core::position2d<s32>> &positions,
+			const core::array<core::rect<s32>> &sourceRects,
+			const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255),
+			bool useAlphaChannelOfTexture = false) = 0;
+
+	//! Draws a part of the texture into the rectangle. Note that colors must be an array of 4 colors if used.
+	/** Suggested and first implemented by zola.
+	\param texture The texture to draw from
+	\param destRect The rectangle to draw into
+	\param sourceRect The rectangle denoting a part of the texture (based on it's OriginalSize)
+	\param clipRect Clips the destination rectangle (may be 0)
+	\param colors Array of 4 colors denoting the color values of
+	the corners of the destRect
+	\param useAlphaChannelOfTexture True if alpha channel will be
+	blended. */
+	virtual void draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			const video::SColor *const colors = 0, bool useAlphaChannelOfTexture = false) = 0;
+
+	//! Draws a 2d rectangle.
+	/** \param color Color of the rectangle to draw. The alpha
+	component will not be ignored and specifies how transparent the
+	rectangle will be.
+	\param pos Position of the rectangle.
+	\param clip Pointer to rectangle against which the rectangle
+	will be clipped. If the pointer is null, no clipping will be
+	performed. */
+	virtual void draw2DRectangle(SColor color, const core::rect<s32> &pos,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! Draws a 2d rectangle with a gradient.
+	/** \param colorLeftUp Color of the upper left corner to draw.
+	The alpha component will not be ignored and specifies how
+	transparent the rectangle will be.
+	\param colorRightUp Color of the upper right corner to draw.
+	The alpha component will not be ignored and specifies how
+	transparent the rectangle will be.
+	\param colorLeftDown Color of the lower left corner to draw.
+	The alpha component will not be ignored and specifies how
+	transparent the rectangle will be.
+	\param colorRightDown Color of the lower right corner to draw.
+	The alpha component will not be ignored and specifies how
+	transparent the rectangle will be.
+	\param pos Position of the rectangle.
+	\param clip Pointer to rectangle against which the rectangle
+	will be clipped. If the pointer is null, no clipping will be
+	performed. */
+	virtual void draw2DRectangle(const core::rect<s32> &pos,
+			SColor colorLeftUp, SColor colorRightUp,
+			SColor colorLeftDown, SColor colorRightDown,
+			const core::rect<s32> *clip = 0) = 0;
+
+	//! Draws a 2d line.
+	/** In theory both start and end will be included in coloring.
+	BUG: Currently d3d ignores the last pixel
+	(it uses the so called "diamond exit rule" for drawing lines).
+	\param start Screen coordinates of the start of the line
+	in pixels.
+	\param end Screen coordinates of the start of the line in
+	pixels.
+	\param color Color of the line to draw. */
+	virtual void draw2DLine(const core::position2d<s32> &start,
+			const core::position2d<s32> &end,
+			SColor color = SColor(255, 255, 255, 255)) = 0;
+
+	//! Draws a mesh buffer
+	/** \param mb Buffer to draw */
+	virtual void drawMeshBuffer(const scene::IMeshBuffer *mb) = 0;
+
+	//! Draws normals of a mesh buffer
+	/** \param mb Buffer to draw the normals of
+	\param length length scale factor of the normals
+	\param color Color the normals are rendered with
+	*/
+	virtual void drawMeshBufferNormals(const scene::IMeshBuffer *mb, f32 length = 10.f, SColor color = 0xffffffff) = 0;
+
+	//! Sets the fog mode.
+	/** These are global values attached to each 3d object rendered,
+	which has the fog flag enabled in its material.
+	\param color Color of the fog
+	\param fogType Type of fog used
+	\param start Only used in linear fog mode (linearFog=true).
+	Specifies where fog starts.
+	\param end Only used in linear fog mode (linearFog=true).
+	Specifies where fog ends.
+	\param density Only used in exponential fog mode
+	(linearFog=false). Must be a value between 0 and 1.
+	\param pixelFog Set this to false for vertex fog, and true if
+	you want per-pixel fog.
+	\param rangeFog Set this to true to enable range-based vertex
+	fog. The distance from the viewer is used to compute the fog,
+	not the z-coordinate. This is better, but slower. This might not
+	be available with all drivers and fog settings. */
+	virtual void setFog(SColor color = SColor(0, 255, 255, 255),
+			E_FOG_TYPE fogType = EFT_FOG_LINEAR,
+			f32 start = 50.0f, f32 end = 100.0f, f32 density = 0.01f,
+			bool pixelFog = false, bool rangeFog = false) = 0;
+
+	//! Gets the fog mode.
+	virtual void getFog(SColor &color, E_FOG_TYPE &fogType,
+			f32 &start, f32 &end, f32 &density,
+			bool &pixelFog, bool &rangeFog) = 0;
+
+	//! Get the current color format of the color buffer
+	/** \return Color format of the color buffer. */
+	virtual ECOLOR_FORMAT getColorFormat() const = 0;
+
+	//! Get the size of the screen or render window.
+	/** \return Size of screen or render window. */
+	virtual const core::dimension2d<u32> &getScreenSize() const = 0;
+
+	//! Get the size of the current render target
+	/** This method will return the screen size if the driver
+	doesn't support render to texture, or if the current render
+	target is the screen.
+	\return Size of render target or screen/window */
+	virtual const core::dimension2d<u32> &getCurrentRenderTargetSize() const = 0;
+
+	//! Returns current frames per second value.
+	/** This value is updated approximately every 1.5 seconds and
+	is only intended to provide a rough guide to the average frame
+	rate. It is not suitable for use in performing timing
+	calculations or framerate independent movement.
+	\return Approximate amount of frames per second drawn. */
+	virtual s32 getFPS() const = 0;
+
+	//! Returns amount of primitives (mostly triangles) which were drawn in the last frame.
+	/** Together with getFPS() very useful method for statistics.
+	\param mode Defines if the primitives drawn are accumulated or
+	counted per frame.
+	\return Amount of primitives drawn in the last frame. */
+	virtual u32 getPrimitiveCountDrawn(u32 mode = 0) const = 0;
+
+	//! Gets name of this video driver.
+	/** \return Returns the name of the video driver, e.g. in case
+	of the Direct3D8 driver, it would return "Direct3D 8.1". */
+	virtual const char *getName() const = 0;
+
+	//! Adds an external image loader to the engine.
+	/** This is useful if the Irrlicht Engine should be able to load
+	textures of currently unsupported file formats (e.g. gif). The
+	IImageLoader only needs to be implemented for loading this file
+	format. A pointer to the implementation can be passed to the
+	engine using this method.
+	\param loader Pointer to the external loader created. */
+	virtual void addExternalImageLoader(IImageLoader *loader) = 0;
+
+	//! Adds an external image writer to the engine.
+	/** This is useful if the Irrlicht Engine should be able to
+	write textures of currently unsupported file formats (e.g
+	.gif). The IImageWriter only needs to be implemented for
+	writing this file format. A pointer to the implementation can
+	be passed to the engine using this method.
+	\param writer: Pointer to the external writer created. */
+	virtual void addExternalImageWriter(IImageWriter *writer) = 0;
+
+	//! Returns the maximum amount of primitives
+	/** (mostly vertices) which the device is able to render with
+	one drawVertexPrimitiveList call.
+	\return Maximum amount of primitives. */
+	virtual u32 getMaximalPrimitiveCount() const = 0;
+
+	//! Enables or disables a texture creation flag.
+	/** These flags define how textures should be created. By
+	changing this value, you can influence for example the speed of
+	rendering a lot. But please note that the video drivers take
+	this value only as recommendation. It could happen that you
+	enable the ETCF_ALWAYS_16_BIT mode, but the driver still creates
+	32 bit textures.
+	\param flag Texture creation flag.
+	\param enabled Specifies if the given flag should be enabled or
+	disabled. */
+	virtual void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled = true) = 0;
+
+	//! Returns if a texture creation flag is enabled or disabled.
+	/** You can change this value using setTextureCreationFlag().
+	\param flag Texture creation flag.
+	\return The current texture creation flag enabled mode. */
+	virtual bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const = 0;
+
+	//! Creates a software image from a file.
+	/** No hardware texture will be created for this image. This
+	method is useful for example if you want to read a heightmap
+	for a terrain renderer.
+	\param filename Name of the file from which the image is
+	created.
+	\return The created image.
+	If you no longer need the image, you should call IImage::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IImage *createImageFromFile(const io::path &filename) = 0;
+
+	//! Creates a software image from a file.
+	/** No hardware texture will be created for this image. This
+	method is useful for example if you want to read a heightmap
+	for a terrain renderer.
+	\param file File from which the image is created.
+	\return The created image.
+	If you no longer need the image, you should call IImage::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IImage *createImageFromFile(io::IReadFile *file) = 0;
+
+	//! Writes the provided image to a file.
+	/** Requires that there is a suitable image writer registered
+	for writing the image.
+	\param image Image to write.
+	\param filename Name of the file to write.
+	\param param Control parameter for the backend (e.g. compression
+	level).
+	\return True on successful write. */
+	virtual bool writeImageToFile(IImage *image, const io::path &filename, u32 param = 0) = 0;
+
+	//! Writes the provided image to a file.
+	/** Requires that there is a suitable image writer registered
+	for writing the image.
+	\param image Image to write.
+	\param file  An already open io::IWriteFile object. The name
+	will be used to determine the appropriate image writer to use.
+	\param param Control parameter for the backend (e.g. compression
+	level).
+	\return True on successful write. */
+	virtual bool writeImageToFile(IImage *image, io::IWriteFile *file, u32 param = 0) = 0;
+
+	//! Creates a software image from a byte array.
+	/** No hardware texture will be created for this image. This
+	method is useful for example if you want to read a heightmap
+	for a terrain renderer.
+	\param format Desired color format of the texture
+	\param size Desired size of the image
+	\param data A byte array with pixel color information
+	\param ownForeignMemory If true, the image will use the data
+	pointer directly and own it afterward. If false, the memory
+	will by copied internally.
+	WARNING: Setting this to 'true' will not work across dll boundaries.
+	So unless you link Irrlicht statically you should keep this to 'false'.
+	The parameter is mainly for internal usage.
+	\param deleteMemory Whether the memory is deallocated upon
+	destruction.
+	\return The created image.
+	If you no longer need the image, you should call IImage::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IImage *createImageFromData(ECOLOR_FORMAT format,
+			const core::dimension2d<u32> &size, void *data, bool ownForeignMemory = false,
+			bool deleteMemory = true) = 0;
+
+	//! Creates an empty software image.
+	/**
+	\param format Desired color format of the image.
+	\param size Size of the image to create.
+	\return The created image.
+	If you no longer need the image, you should call IImage::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IImage *createImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size) = 0;
+
+	//! Creates a software image from a part of a texture.
+	/**
+	\param texture Texture to copy to the new image in part.
+	\param pos Position of rectangle to copy.
+	\param size Extents of rectangle to copy.
+	\return The created image.
+	If you no longer need the image, you should call IImage::drop().
+	See IReferenceCounted::drop() for more information. */
+	virtual IImage *createImage(ITexture *texture,
+			const core::position2d<s32> &pos,
+			const core::dimension2d<u32> &size) = 0;
+
+	//! Event handler for resize events. Only used by the engine internally.
+	/** Used to notify the driver that the window was resized.
+	Usually, there is no need to call this method. */
+	virtual void OnResize(const core::dimension2d<u32> &size) = 0;
+
+	//! Adds a new material renderer to the video device.
+	/** Use this method to extend the VideoDriver with new material
+	types. To extend the engine using this method do the following:
+	Derive a class from IMaterialRenderer and override the methods
+	you need. For setting the right renderstates, you can try to
+	get a pointer to the real rendering device using
+	IVideoDriver::getExposedVideoData(). Add your class with
+	IVideoDriver::addMaterialRenderer(). To use an object being
+	displayed with your new material, set the MaterialType member of
+	the SMaterial struct to the value returned by this method.
+	If you simply want to create a new material using vertex and/or
+	pixel shaders it would be easier to use the
+	video::IGPUProgrammingServices interface which you can get
+	using the getGPUProgrammingServices() method.
+	\param renderer A pointer to the new renderer.
+	\param name Optional name for the material renderer entry.
+	\return The number of the material type which can be set in
+	SMaterial::MaterialType to use the renderer. -1 is returned if
+	an error occurred. For example if you tried to add an material
+	renderer to the software renderer or the null device, which do
+	not accept material renderers. */
+	virtual s32 addMaterialRenderer(IMaterialRenderer *renderer, const c8 *name = 0) = 0;
+
+	//! Get access to a material renderer by index.
+	/** \param idx Id of the material renderer. Can be a value of
+	the E_MATERIAL_TYPE enum or a value which was returned by
+	addMaterialRenderer().
+	\return Pointer to material renderer or null if not existing. */
+	virtual IMaterialRenderer *getMaterialRenderer(u32 idx) const = 0;
+
+	//! Get amount of currently available material renderers.
+	/** \return Amount of currently available material renderers. */
+	virtual u32 getMaterialRendererCount() const = 0;
+
+	//! Get name of a material renderer
+	/** This string can, e.g., be used to test if a specific
+	renderer already has been registered/created, or use this
+	string to store data about materials: This returned name will
+	be also used when serializing materials.
+	\param idx Id of the material renderer. Can be a value of the
+	E_MATERIAL_TYPE enum or a value which was returned by
+	addMaterialRenderer().
+	\return String with the name of the renderer, or 0 if not
+	existing */
+	virtual const c8 *getMaterialRendererName(u32 idx) const = 0;
+
+	//! Sets the name of a material renderer.
+	/** Will have no effect on built-in material renderers.
+	\param idx: Id of the material renderer. Can be a value of the
+	E_MATERIAL_TYPE enum or a value which was returned by
+	addMaterialRenderer().
+	\param name: New name of the material renderer. */
+	virtual void setMaterialRendererName(u32 idx, const c8 *name) = 0;
+
+	//! Swap the material renderers used for certain id's
+	/** Swap the IMaterialRenderers responsible for rendering specific
+	 material-id's. This means every SMaterial using a MaterialType
+	 with one of the indices involved here will now render differently.
+	 \param idx1 First material index to swap. It must already exist or nothing happens.
+	 \param idx2 Second material index to swap. It must already exist or nothing happens.
+	 \param swapNames When true the renderer names also swap
+					  When false the names will stay at the original index */
+	virtual void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames = true) = 0;
+
+	//! Returns driver and operating system specific data about the IVideoDriver.
+	/** This method should only be used if the engine should be
+	extended without having to modify the source of the engine.
+	\return Collection of device dependent pointers. */
+	virtual const SExposedVideoData &getExposedVideoData() = 0;
+
+	//! Get type of video driver
+	/** \return Type of driver. */
+	virtual E_DRIVER_TYPE getDriverType() const = 0;
+
+	//! Gets the IGPUProgrammingServices interface.
+	/** \return Pointer to the IGPUProgrammingServices. Returns 0
+	if the video driver does not support this. For example the
+	Software driver and the Null driver will always return 0. */
+	virtual IGPUProgrammingServices *getGPUProgrammingServices() = 0;
+
+	//! Returns a pointer to the mesh manipulator.
+	virtual scene::IMeshManipulator *getMeshManipulator() = 0;
+
+	//! Clear the color, depth and/or stencil buffers.
+	virtual void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) = 0;
+
+	//! Clears the ZBuffer.
+	/** Note that you usually need not to call this method, as it
+	is automatically done in IVideoDriver::beginScene() or
+	IVideoDriver::setRenderTarget() if you enable zBuffer. But if
+	you have to render some special things, you can clear the
+	zbuffer during the rendering process with this method any time.
+	*/
+	void clearZBuffer()
+	{
+		clearBuffers(ECBF_DEPTH, SColor(255, 0, 0, 0), 1.f, 0);
+	}
+
+	//! Make a screenshot of the last rendered frame.
+	/** \return An image created from the last rendered frame. */
+	virtual IImage *createScreenShot(video::ECOLOR_FORMAT format = video::ECF_UNKNOWN, video::E_RENDER_TARGET target = video::ERT_FRAME_BUFFER) = 0;
+
+	//! Check if the image is already loaded.
+	/** Works similar to getTexture(), but does not load the texture
+	if it is not currently loaded.
+	\param filename Name of the texture.
+	\return Pointer to loaded texture, or 0 if not found. */
+	virtual video::ITexture *findTexture(const io::path &filename) = 0;
+
+	//! Set or unset a clipping plane.
+	/** There are at least 6 clipping planes available for the user
+	to set at will.
+	\param index The plane index. Must be between 0 and
+	MaxUserClipPlanes.
+	\param plane The plane itself.
+	\param enable If true, enable the clipping plane else disable
+	it.
+	\return True if the clipping plane is usable. */
+	virtual bool setClipPlane(u32 index, const core::plane3df &plane, bool enable = false) = 0;
+
+	//! Enable or disable a clipping plane.
+	/** There are at least 6 clipping planes available for the user
+	to set at will.
+	\param index The plane index. Must be between 0 and
+	MaxUserClipPlanes.
+	\param enable If true, enable the clipping plane else disable
+	it. */
+	virtual void enableClipPlane(u32 index, bool enable) = 0;
+
+	//! Set the minimum number of vertices for which a hw buffer will be created
+	/** \param count Number of vertices to set as minimum. */
+	virtual void setMinHardwareBufferVertexCount(u32 count) = 0;
+
+	//! Get the global Material, which might override local materials.
+	/** Depending on the enable flags, values from this Material
+	are used to override those of local materials of some
+	meshbuffer being rendered.
+	\return Reference to the Override Material. */
+	virtual SOverrideMaterial &getOverrideMaterial() = 0;
+
+	//! Get the 2d override material for altering its values
+	/** The 2d override material allows to alter certain render
+	states of the 2d methods. Not all members of SMaterial are
+	honored, especially not MaterialType and Textures. Moreover,
+	the zbuffer is always ignored, and lighting is always off. All
+	other flags can be changed, though some might have to effect
+	in most cases.
+	Please note that you have to enable/disable this effect with
+	enableMaterial2D(). This effect is costly, as it increases
+	the number of state changes considerably. Always reset the
+	values when done.
+	\return Material reference which should be altered to reflect
+	the new settings.
+	*/
+	virtual SMaterial &getMaterial2D() = 0;
+
+	//! Enable the 2d override material
+	/** \param enable Flag which tells whether the material shall be
+	enabled or disabled. */
+	virtual void enableMaterial2D(bool enable = true) = 0;
+
+	//! Get the graphics card vendor name.
+	virtual core::stringc getVendorInfo() = 0;
+
+	//! Only used by the engine internally.
+	/** The ambient color is set in the scene manager, see
+	scene::ISceneManager::setAmbientLight().
+	\param color New color of the ambient light. */
+	virtual void setAmbientLight(const SColorf &color) = 0;
+
+	//! Get the global ambient light currently used by the driver
+	virtual const SColorf &getAmbientLight() const = 0;
+
+	//! Only used by the engine internally.
+	/** Passes the global material flag AllowZWriteOnTransparent.
+	Use the SceneManager attribute to set this value from your app.
+	\param flag Default behavior is to disable ZWrite, i.e. false. */
+	virtual void setAllowZWriteOnTransparent(bool flag) = 0;
+
+	//! Get the maximum texture size supported.
+	virtual core::dimension2du getMaxTextureSize() const = 0;
+
+	//! Color conversion convenience function
+	/** Convert an image (as array of pixels) from source to destination
+	array, thereby converting the color format. The pixel size is
+	determined by the color formats.
+	\param sP Pointer to source
+	\param sF Color format of source
+	\param sN Number of pixels to convert, both array must be large enough
+	\param dP Pointer to destination
+	\param dF Color format of destination
+	*/
+	virtual void convertColor(const void *sP, ECOLOR_FORMAT sF, s32 sN,
+			void *dP, ECOLOR_FORMAT dF) const = 0;
+
+	//! Check if the driver supports creating textures with the given color format
+	/**	\return True if the format is available, false if not. */
+	virtual bool queryTextureFormat(ECOLOR_FORMAT format) const = 0;
+
+	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
+	virtual bool needsTransparentRenderPass(const irr::video::SMaterial &material) const = 0;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/IWriteFile.h b/irr/include/IWriteFile.h
new file mode 100644
index 000000000..cc27e5903
--- /dev/null
+++ b/irr/include/IWriteFile.h
@@ -0,0 +1,47 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "path.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Interface providing write access to a file.
+class IWriteFile : public virtual IReferenceCounted
+{
+public:
+	//! Writes an amount of bytes to the file.
+	/** \param buffer Pointer to buffer of bytes to write.
+	\param sizeToWrite Amount of bytes to write to the file.
+	\return How much bytes were written. */
+	virtual size_t write(const void *buffer, size_t sizeToWrite) = 0;
+
+	//! Changes position in file
+	/** \param finalPos Destination position in the file.
+	\param relativeMovement If set to true, the position in the file is
+	changed relative to current position. Otherwise the position is changed
+	from begin of file.
+	\return True if successful, otherwise false. */
+	virtual bool seek(long finalPos, bool relativeMovement = false) = 0;
+
+	//! Get the current position in the file.
+	/** \return Current position in the file in bytes on success or -1L on failure */
+	virtual long getPos() const = 0;
+
+	//! Get name of file.
+	/** \return File name as zero terminated character string. */
+	virtual const path &getFileName() const = 0;
+
+	//! Flush the content of the buffer in the file
+	/** \return True if successful, otherwise false. */
+	virtual bool flush() = 0;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/include/IrrCompileConfig.h b/irr/include/IrrCompileConfig.h
new file mode 100644
index 000000000..eaa6f1dd1
--- /dev/null
+++ b/irr/include/IrrCompileConfig.h
@@ -0,0 +1,11 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+// these are obsolete and never pre-defined
+
+#define IRRCALLCONV
+
+#define IRRLICHT_API
diff --git a/irr/include/IrrlichtDevice.h b/irr/include/IrrlichtDevice.h
new file mode 100644
index 000000000..11619010c
--- /dev/null
+++ b/irr/include/IrrlichtDevice.h
@@ -0,0 +1,337 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "dimension2d.h"
+#include "IVideoDriver.h"
+#include "EDriverTypes.h"
+#include "EDeviceTypes.h"
+#include "IEventReceiver.h"
+#include "ICursorControl.h"
+#include "ITimer.h"
+#include "IOSOperator.h"
+#include "IrrCompileConfig.h"
+
+namespace irr
+{
+class ILogger;
+class IEventReceiver;
+
+namespace io
+{
+class IFileSystem;
+} // end namespace io
+
+namespace gui
+{
+class IGUIEnvironment;
+} // end namespace gui
+
+namespace scene
+{
+class ISceneManager;
+} // end namespace scene
+
+namespace video
+{
+class IContextManager;
+extern "C" IRRLICHT_API bool IRRCALLCONV isDriverSupported(E_DRIVER_TYPE driver);
+} // end namespace video
+
+//! The Irrlicht device. You can create it with createDevice() or createDeviceEx().
+/** This is the most important class of the Irrlicht Engine. You can
+access everything in the engine if you have a pointer to an instance of
+this class.  There should be only one instance of this class at any
+time.
+*/
+class IrrlichtDevice : public virtual IReferenceCounted
+{
+public:
+	//! Runs the device.
+	/** Also increments the virtual timer by calling
+	ITimer::tick();. You can prevent this
+	by calling ITimer::stop(); before and ITimer::start() after
+	calling IrrlichtDevice::run(). Returns false if device wants
+	to be deleted. Use it in this way:
+	\code
+	while(device->run())
+	{
+		// draw everything here
+	}
+	\endcode
+	If you want the device to do nothing if the window is inactive
+	(recommended), use the slightly enhanced code shown at isWindowActive().
+
+	Note if you are running Irrlicht inside an external, custom
+	created window: Calling Device->run() will cause Irrlicht to
+	dispatch windows messages internally.
+	If you are running Irrlicht in your own custom window, you can
+	also simply use your own message loop using GetMessage,
+	DispatchMessage and whatever and simply don't use this method.
+	But note that Irrlicht will not be able to fetch user input
+	then. See irr::SIrrlichtCreationParameters::WindowId for more
+	information and example code.
+	*/
+	virtual bool run() = 0;
+
+	//! Cause the device to temporarily pause execution and let other processes run.
+	/** This should bring down processor usage without major performance loss for Irrlicht.
+	But this is system dependent, so there's a chance your thread won't get control back quickly.
+	*/
+	virtual void yield() = 0;
+
+	//! Pause execution and let other processes to run for a specified amount of time.
+	/** It may not wait the full given time, as sleep may be interrupted and also may wait longer on some OS.
+	\param timeMs: Time to sleep for in milliseconds. Note that the OS can round up this number.
+				   On Windows you usually get at least 15ms sleep time minium for any value > 0.
+				   So if you call this in your main loop you can't get more than 65 FPS anymore in your game.
+				   On most Linux systems it's relatively exact, but also no guarantee.
+	\param pauseTimer: If true, pauses the device timer while sleeping
+	*/
+	virtual void sleep(u32 timeMs, bool pauseTimer = false) = 0;
+
+	//! Provides access to the video driver for drawing 3d and 2d geometry.
+	/** \return Pointer the video driver. */
+	virtual video::IVideoDriver *getVideoDriver() = 0;
+
+	//! Provides access to the virtual file system.
+	/** \return Pointer to the file system. */
+	virtual io::IFileSystem *getFileSystem() = 0;
+
+	//! Provides access to the 2d user interface environment.
+	/** \return Pointer to the gui environment. */
+	virtual gui::IGUIEnvironment *getGUIEnvironment() = 0;
+
+	//! Provides access to the scene manager.
+	/** \return Pointer to the scene manager. */
+	virtual scene::ISceneManager *getSceneManager() = 0;
+
+	//! Provides access to the cursor control.
+	/** \return Pointer to the mouse cursor control interface. */
+	virtual gui::ICursorControl *getCursorControl() = 0;
+
+	//! Provides access to the message logger.
+	/** \return Pointer to the logger. */
+	virtual ILogger *getLogger() = 0;
+
+	//! Get context manager
+	virtual video::IContextManager *getContextManager() = 0;
+
+	//! Provides access to the operation system operator object.
+	/** The OS operator provides methods for
+	getting system specific information and doing system
+	specific operations, such as exchanging data with the clipboard
+	or reading the operation system version.
+	\return Pointer to the OS operator. */
+	virtual IOSOperator *getOSOperator() = 0;
+
+	//! Provides access to the engine's timer.
+	/** The system time can be retrieved by it as
+	well as the virtual time, which also can be manipulated.
+	\return Pointer to the ITimer object. */
+	virtual ITimer *getTimer() = 0;
+
+	//! Sets the caption of the window.
+	/** \param text: New text of the window caption. */
+	virtual void setWindowCaption(const wchar_t *text) = 0;
+
+	//! Sets the window icon.
+	/** \param img The icon texture.
+	\return False if no icon was set. */
+	virtual bool setWindowIcon(const video::IImage *img) = 0;
+
+	//! Returns if the window is active.
+	/** If the window is inactive,
+	nothing needs to be drawn. So if you don't want to draw anything
+	when the window is inactive, create your drawing loop this way:
+	\code
+	while(device->run())
+	{
+		if (device->isWindowActive())
+		{
+			// draw everything here
+		}
+		else
+			device->yield();
+	}
+	\endcode
+	\return True if window is active. */
+	virtual bool isWindowActive() const = 0;
+
+	//! Checks if the Irrlicht window has the input focus
+	/** \return True if window has focus. */
+	virtual bool isWindowFocused() const = 0;
+
+	//! Checks if the Irrlicht window is minimized
+	/** \return True if window is minimized. */
+	virtual bool isWindowMinimized() const = 0;
+
+	//! Checks if the Irrlicht window is maximized
+	//! Only fully works on SDL. Returns false, or the last value set via
+	//! maximizeWindow() and restoreWindow(), on other backends.
+	/** \return True if window is maximized. */
+	virtual bool isWindowMaximized() const = 0;
+
+	//! Checks if the Irrlicht window is running in fullscreen mode
+	/** \return True if window is fullscreen. */
+	virtual bool isFullscreen() const = 0;
+
+	//! Enables or disables fullscreen mode.
+	/** Only works on SDL.
+	\return True on success. */
+	virtual bool setFullscreen(bool fullscreen) { return false; }
+
+	//! Checks if the window could possibly be visible.
+	/** If this returns false, you should not do any rendering. */
+	virtual bool isWindowVisible() const { return true; };
+
+	//! Get the current color format of the window
+	/** \return Color format of the window. */
+	virtual video::ECOLOR_FORMAT getColorFormat() const = 0;
+
+	//! Notifies the device that it should close itself.
+	/** IrrlichtDevice::run() will always return false after closeDevice() was called. */
+	virtual void closeDevice() = 0;
+
+	//! Sets a new user event receiver which will receive events from the engine.
+	/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along
+	the chain of event receivers. The path that an event takes through the system depends
+	on its type. See irr::EEVENT_TYPE for details.
+	\param receiver New receiver to be used. */
+	virtual void setEventReceiver(IEventReceiver *receiver) = 0;
+
+	//! Provides access to the current event receiver.
+	/** \return Pointer to the current event receiver. Returns 0 if there is none. */
+	virtual IEventReceiver *getEventReceiver() = 0;
+
+	//! Sends a user created event to the engine.
+	/** Is is usually not necessary to use this. However, if you
+	are using an own input library for example for doing joystick
+	input, you can use this to post key or mouse input events to
+	the engine. Internally, this method only delegates the events
+	further to the scene manager and the GUI environment. */
+	virtual bool postEventFromUser(const SEvent &event) = 0;
+
+	//! Sets the input receiving scene manager.
+	/** If set to null, the main scene manager (returned by
+	GetSceneManager()) will receive the input
+	\param sceneManager New scene manager to be used. */
+	virtual void setInputReceivingSceneManager(scene::ISceneManager *sceneManager) = 0;
+
+	//! Sets if the window should be resizable in windowed mode.
+	/** The default is false. This method only works in windowed
+	mode.
+	\param resize Flag whether the window should be resizable. */
+	virtual void setResizable(bool resize = false) = 0;
+
+	//! Resize the render window.
+	/**	This will only work in windowed mode and is not yet supported on all systems.
+	It does set the drawing/clientDC size of the window, the window decorations are added to that.
+	You get the current window size with IVideoDriver::getScreenSize() (might be unified in future)
+	*/
+	virtual void setWindowSize(const irr::core::dimension2d<u32> &size) = 0;
+
+	//! Minimizes the window if possible.
+	virtual void minimizeWindow() = 0;
+
+	//! Maximizes the window if possible.
+	virtual void maximizeWindow() = 0;
+
+	//! Restore the window to normal size if possible.
+	virtual void restoreWindow() = 0;
+
+	//! Get the position of the frame on-screen
+	virtual core::position2di getWindowPosition() = 0;
+
+	//! Activate any joysticks, and generate events for them.
+	/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
+	as this would consume joystick info that 3rd party libraries might rely on. Call this method to
+	activate joystick support in Irrlicht and to receive irr::SJoystickEvent events.
+	\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
+	\return true if joysticks are supported on this device, false if joysticks are not
+				 supported or support is compiled out.
+	*/
+	virtual bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) = 0;
+
+	//! Activate accelerometer.
+	virtual bool activateAccelerometer(float updateInterval = 0.016666f) = 0;
+
+	//! Deactivate accelerometer.
+	virtual bool deactivateAccelerometer() = 0;
+
+	//! Is accelerometer active.
+	virtual bool isAccelerometerActive() = 0;
+
+	//! Is accelerometer available.
+	virtual bool isAccelerometerAvailable() = 0;
+
+	//! Activate gyroscope.
+	virtual bool activateGyroscope(float updateInterval = 0.016666f) = 0;
+
+	//! Deactivate gyroscope.
+	virtual bool deactivateGyroscope() = 0;
+
+	//! Is gyroscope active.
+	virtual bool isGyroscopeActive() = 0;
+
+	//! Is gyroscope available.
+	virtual bool isGyroscopeAvailable() = 0;
+
+	//! Activate device motion.
+	virtual bool activateDeviceMotion(float updateInterval = 0.016666f) = 0;
+
+	//! Deactivate device motion.
+	virtual bool deactivateDeviceMotion() = 0;
+
+	//! Is device motion active.
+	virtual bool isDeviceMotionActive() = 0;
+
+	//! Is device motion available.
+	virtual bool isDeviceMotionAvailable() = 0;
+
+	//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior.
+	/** When set to 0 no double- and tripleclicks will be generated.
+	\param timeMs maximal time in milliseconds for two consecutive clicks to be recognized as double click
+	*/
+	virtual void setDoubleClickTime(u32 timeMs) = 0;
+
+	//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
+	/** When return value is 0 no double- and tripleclicks will be generated.
+	\return maximal time in milliseconds for two consecutive clicks to be recognized as double click
+	*/
+	virtual u32 getDoubleClickTime() const = 0;
+
+	//! Remove messages pending in the system message loop
+	/** This function is usually used after messages have been buffered for a longer time, for example
+	when loading a large scene. Clearing the message loop prevents that mouse- or buttonclicks which users
+	have pressed in the meantime will now trigger unexpected actions in the gui. <br>
+	So far the following messages are cleared:<br>
+	Win32: All keyboard and mouse messages<br>
+	Linux: All keyboard and mouse messages<br>
+	All other devices are not yet supported here.<br>
+	The function is still somewhat experimental, as the kind of messages we clear is based on just a few use-cases.
+	If you think further messages should be cleared, or some messages should not be cleared here, then please tell us. */
+	virtual void clearSystemMessages() = 0;
+
+	//! Get the type of the device.
+	/** This allows the user to check which windowing system is currently being
+	used. */
+	virtual E_DEVICE_TYPE getType() const = 0;
+
+	//! Get the display density in dots per inch.
+	//! Returns 0.0f on failure.
+	virtual float getDisplayDensity() const = 0;
+
+	//! Check if a driver type is supported by the engine.
+	/** Even if true is returned the driver may not be available
+	for a configuration requested when creating the device. */
+	static bool isDriverSupported(video::E_DRIVER_TYPE driver)
+	{
+		return video::isDriverSupported(driver);
+	}
+};
+
+} // end namespace irr
diff --git a/irr/include/Keycodes.h b/irr/include/Keycodes.h
new file mode 100644
index 000000000..cdc90d198
--- /dev/null
+++ b/irr/include/Keycodes.h
@@ -0,0 +1,185 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+
+enum EKEY_CODE
+{
+	KEY_UNKNOWN = 0x0,
+	KEY_LBUTTON = 0x01,           // Left mouse button
+	KEY_RBUTTON = 0x02,           // Right mouse button
+	KEY_CANCEL = 0x03,            // Control-break processing
+	KEY_MBUTTON = 0x04,           // Middle mouse button (three-button mouse)
+	KEY_XBUTTON1 = 0x05,          // Windows 2000/XP: X1 mouse button
+	KEY_XBUTTON2 = 0x06,          // Windows 2000/XP: X2 mouse button
+	KEY_BACK = 0x08,              // BACKSPACE key
+	KEY_TAB = 0x09,               // TAB key
+	KEY_CLEAR = 0x0C,             // CLEAR key
+	KEY_RETURN = 0x0D,            // ENTER key
+	KEY_SHIFT = 0x10,             // SHIFT key
+	KEY_CONTROL = 0x11,           // CTRL key
+	KEY_MENU = 0x12,              // ALT key
+	KEY_PAUSE = 0x13,             // PAUSE key
+	KEY_CAPITAL = 0x14,           // CAPS LOCK key
+	KEY_KANA = 0x15,              // IME Kana mode
+	KEY_HANGUEL = 0x15,           // IME Hanguel mode (maintained for compatibility use KEY_HANGUL)
+	KEY_HANGUL = 0x15,            // IME Hangul mode
+	KEY_JUNJA = 0x17,             // IME Junja mode
+	KEY_FINAL = 0x18,             // IME final mode
+	KEY_HANJA = 0x19,             // IME Hanja mode
+	KEY_KANJI = 0x19,             // IME Kanji mode
+	KEY_ESCAPE = 0x1B,            // ESC key
+	KEY_CONVERT = 0x1C,           // IME convert
+	KEY_NONCONVERT = 0x1D,        // IME nonconvert
+	KEY_ACCEPT = 0x1E,            // IME accept
+	KEY_MODECHANGE = 0x1F,        // IME mode change request
+	KEY_SPACE = 0x20,             // SPACEBAR
+	KEY_PRIOR = 0x21,             // PAGE UP key
+	KEY_NEXT = 0x22,              // PAGE DOWN key
+	KEY_END = 0x23,               // END key
+	KEY_HOME = 0x24,              // HOME key
+	KEY_LEFT = 0x25,              // LEFT ARROW key
+	KEY_UP = 0x26,                // UP ARROW key
+	KEY_RIGHT = 0x27,             // RIGHT ARROW key
+	KEY_DOWN = 0x28,              // DOWN ARROW key
+	KEY_SELECT = 0x29,            // SELECT key
+	KEY_PRINT = 0x2A,             // PRINT key
+	KEY_EXECUT = 0x2B,            // EXECUTE key
+	KEY_SNAPSHOT = 0x2C,          // PRINT SCREEN key
+	KEY_INSERT = 0x2D,            // INS key
+	KEY_DELETE = 0x2E,            // DEL key
+	KEY_HELP = 0x2F,              // HELP key
+	KEY_KEY_0 = 0x30,             // 0 key
+	KEY_KEY_1 = 0x31,             // 1 key
+	KEY_KEY_2 = 0x32,             // 2 key
+	KEY_KEY_3 = 0x33,             // 3 key
+	KEY_KEY_4 = 0x34,             // 4 key
+	KEY_KEY_5 = 0x35,             // 5 key
+	KEY_KEY_6 = 0x36,             // 6 key
+	KEY_KEY_7 = 0x37,             // 7 key
+	KEY_KEY_8 = 0x38,             // 8 key
+	KEY_KEY_9 = 0x39,             // 9 key
+	KEY_KEY_A = 0x41,             // A key
+	KEY_KEY_B = 0x42,             // B key
+	KEY_KEY_C = 0x43,             // C key
+	KEY_KEY_D = 0x44,             // D key
+	KEY_KEY_E = 0x45,             // E key
+	KEY_KEY_F = 0x46,             // F key
+	KEY_KEY_G = 0x47,             // G key
+	KEY_KEY_H = 0x48,             // H key
+	KEY_KEY_I = 0x49,             // I key
+	KEY_KEY_J = 0x4A,             // J key
+	KEY_KEY_K = 0x4B,             // K key
+	KEY_KEY_L = 0x4C,             // L key
+	KEY_KEY_M = 0x4D,             // M key
+	KEY_KEY_N = 0x4E,             // N key
+	KEY_KEY_O = 0x4F,             // O key
+	KEY_KEY_P = 0x50,             // P key
+	KEY_KEY_Q = 0x51,             // Q key
+	KEY_KEY_R = 0x52,             // R key
+	KEY_KEY_S = 0x53,             // S key
+	KEY_KEY_T = 0x54,             // T key
+	KEY_KEY_U = 0x55,             // U key
+	KEY_KEY_V = 0x56,             // V key
+	KEY_KEY_W = 0x57,             // W key
+	KEY_KEY_X = 0x58,             // X key
+	KEY_KEY_Y = 0x59,             // Y key
+	KEY_KEY_Z = 0x5A,             // Z key
+	KEY_LWIN = 0x5B,              // Left Windows key (Microsoft Natural keyboard)
+	KEY_RWIN = 0x5C,              // Right Windows key (Natural keyboard)
+	KEY_APPS = 0x5D,              // Applications key (Natural keyboard)
+	KEY_SLEEP = 0x5F,             // Computer Sleep key
+	KEY_NUMPAD0 = 0x60,           // Numeric keypad 0 key
+	KEY_NUMPAD1 = 0x61,           // Numeric keypad 1 key
+	KEY_NUMPAD2 = 0x62,           // Numeric keypad 2 key
+	KEY_NUMPAD3 = 0x63,           // Numeric keypad 3 key
+	KEY_NUMPAD4 = 0x64,           // Numeric keypad 4 key
+	KEY_NUMPAD5 = 0x65,           // Numeric keypad 5 key
+	KEY_NUMPAD6 = 0x66,           // Numeric keypad 6 key
+	KEY_NUMPAD7 = 0x67,           // Numeric keypad 7 key
+	KEY_NUMPAD8 = 0x68,           // Numeric keypad 8 key
+	KEY_NUMPAD9 = 0x69,           // Numeric keypad 9 key
+	KEY_MULTIPLY = 0x6A,          // Multiply key
+	KEY_ADD = 0x6B,               // Add key
+	KEY_SEPARATOR = 0x6C,         // Separator key
+	KEY_SUBTRACT = 0x6D,          // Subtract key
+	KEY_DECIMAL = 0x6E,           // Decimal key
+	KEY_DIVIDE = 0x6F,            // Divide key
+	KEY_F1 = 0x70,                // F1 key
+	KEY_F2 = 0x71,                // F2 key
+	KEY_F3 = 0x72,                // F3 key
+	KEY_F4 = 0x73,                // F4 key
+	KEY_F5 = 0x74,                // F5 key
+	KEY_F6 = 0x75,                // F6 key
+	KEY_F7 = 0x76,                // F7 key
+	KEY_F8 = 0x77,                // F8 key
+	KEY_F9 = 0x78,                // F9 key
+	KEY_F10 = 0x79,               // F10 key
+	KEY_F11 = 0x7A,               // F11 key
+	KEY_F12 = 0x7B,               // F12 key
+	KEY_F13 = 0x7C,               // F13 key
+	KEY_F14 = 0x7D,               // F14 key
+	KEY_F15 = 0x7E,               // F15 key
+	KEY_F16 = 0x7F,               // F16 key
+	KEY_F17 = 0x80,               // F17 key
+	KEY_F18 = 0x81,               // F18 key
+	KEY_F19 = 0x82,               // F19 key
+	KEY_F20 = 0x83,               // F20 key
+	KEY_F21 = 0x84,               // F21 key
+	KEY_F22 = 0x85,               // F22 key
+	KEY_F23 = 0x86,               // F23 key
+	KEY_F24 = 0x87,               // F24 key
+	KEY_NUMLOCK = 0x90,           // NUM LOCK key
+	KEY_SCROLL = 0x91,            // SCROLL LOCK key
+	KEY_LSHIFT = 0xA0,            // Left SHIFT key
+	KEY_RSHIFT = 0xA1,            // Right SHIFT key
+	KEY_LCONTROL = 0xA2,          // Left CONTROL key
+	KEY_RCONTROL = 0xA3,          // Right CONTROL key
+	KEY_LMENU = 0xA4,             // Left MENU key
+	KEY_RMENU = 0xA5,             // Right MENU key
+	KEY_BROWSER_BACK = 0xA6,      // Browser Back key
+	KEY_BROWSER_FORWARD = 0xA7,   // Browser Forward key
+	KEY_BROWSER_REFRESH = 0xA8,   // Browser Refresh key
+	KEY_BROWSER_STOP = 0xA9,      // Browser Stop key
+	KEY_BROWSER_SEARCH = 0xAA,    // Browser Search key
+	KEY_BROWSER_FAVORITES = 0xAB, // Browser Favorites key
+	KEY_BROWSER_HOME = 0xAC,      // Browser Start and Home key
+	KEY_VOLUME_MUTE = 0xAD,       // Volume Mute key
+	KEY_VOLUME_DOWN = 0xAE,       // Volume Down key
+	KEY_VOLUME_UP = 0xAF,         // Volume Up key
+	KEY_MEDIA_NEXT_TRACK = 0xB0,  // Next Track key
+	KEY_MEDIA_PREV_TRACK = 0xB1,  // Previous Track key
+	KEY_MEDIA_STOP = 0xB2,        // Stop Media key
+	KEY_MEDIA_PLAY_PAUSE = 0xB3,  // Play/Pause Media key
+	KEY_OEM_1 = 0xBA,             // for US    ";:"
+	KEY_PLUS = 0xBB,              // Plus Key   "+"
+	KEY_COMMA = 0xBC,             // Comma Key  ","
+	KEY_MINUS = 0xBD,             // Minus Key  "-"
+	KEY_PERIOD = 0xBE,            // Period Key "."
+	KEY_OEM_2 = 0xBF,             // for US    "/?"
+	KEY_OEM_3 = 0xC0,             // for US    "`~"
+	KEY_OEM_4 = 0xDB,             // for US    "[{"
+	KEY_OEM_5 = 0xDC,             // for US    "\|"
+	KEY_OEM_6 = 0xDD,             // for US    "]}"
+	KEY_OEM_7 = 0xDE,             // for US    "'""
+	KEY_OEM_8 = 0xDF,             // None
+	KEY_OEM_AX = 0xE1,            // for Japan "AX"
+	KEY_OEM_102 = 0xE2,           // "<>" or "\|"
+	KEY_ATTN = 0xF6,              // Attn key
+	KEY_CRSEL = 0xF7,             // CrSel key
+	KEY_EXSEL = 0xF8,             // ExSel key
+	KEY_EREOF = 0xF9,             // Erase EOF key
+	KEY_PLAY = 0xFA,              // Play key
+	KEY_ZOOM = 0xFB,              // Zoom key
+	KEY_PA1 = 0xFD,               // PA1 key
+	KEY_OEM_CLEAR = 0xFE,         // Clear key
+	KEY_NONE = 0xFF,              // usually no key mapping, but some laptops use it for fn key
+
+	KEY_KEY_CODES_COUNT = 0x100 // this is not a key, but the amount of keycodes there are.
+};
+
+} // end namespace irr
diff --git a/irr/include/S3DVertex.h b/irr/include/S3DVertex.h
new file mode 100644
index 000000000..2039df0e5
--- /dev/null
+++ b/irr/include/S3DVertex.h
@@ -0,0 +1,288 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "vector3d.h"
+#include "vector2d.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Enumeration for all vertex types there are.
+enum E_VERTEX_TYPE
+{
+	//! Standard vertex type used by the Irrlicht engine, video::S3DVertex.
+	EVT_STANDARD = 0,
+
+	//! Vertex with two texture coordinates, video::S3DVertex2TCoords.
+	/** Usually used for geometry with lightmaps or other special materials. */
+	EVT_2TCOORDS,
+
+	//! Vertex with a tangent and binormal vector, video::S3DVertexTangents.
+	/** Usually used for tangent space normal mapping.
+		Usually tangent and binormal get send to shaders as texture coordinate sets 1 and 2.
+	*/
+	EVT_TANGENTS
+};
+
+//! Array holding the built in vertex type names
+const char *const sBuiltInVertexTypeNames[] = {
+		"standard",
+		"2tcoords",
+		"tangents",
+		0,
+	};
+
+//! standard vertex used by the Irrlicht engine.
+struct S3DVertex
+{
+	//! default constructor
+	constexpr S3DVertex() :
+			Color(0xffffffff) {}
+
+	//! constructor
+	constexpr S3DVertex(f32 x, f32 y, f32 z, f32 nx, f32 ny, f32 nz, SColor c, f32 tu, f32 tv) :
+			Pos(x, y, z), Normal(nx, ny, nz), Color(c), TCoords(tu, tv) {}
+
+	//! constructor
+	constexpr S3DVertex(const core::vector3df &pos, const core::vector3df &normal,
+			SColor color, const core::vector2df &tcoords) :
+			Pos(pos),
+			Normal(normal), Color(color), TCoords(tcoords) {}
+
+	//! Position
+	core::vector3df Pos;
+
+	//! Normal vector
+	core::vector3df Normal;
+
+	//! Color
+	SColor Color;
+
+	//! Texture coordinates
+	core::vector2df TCoords;
+
+	constexpr bool operator==(const S3DVertex &other) const
+	{
+		return ((Pos == other.Pos) && (Normal == other.Normal) &&
+				(Color == other.Color) && (TCoords == other.TCoords));
+	}
+
+	constexpr bool operator!=(const S3DVertex &other) const
+	{
+		return ((Pos != other.Pos) || (Normal != other.Normal) ||
+				(Color != other.Color) || (TCoords != other.TCoords));
+	}
+
+	constexpr bool operator<(const S3DVertex &other) const
+	{
+		return ((Pos < other.Pos) ||
+				((Pos == other.Pos) && (Normal < other.Normal)) ||
+				((Pos == other.Pos) && (Normal == other.Normal) && (Color < other.Color)) ||
+				((Pos == other.Pos) && (Normal == other.Normal) && (Color == other.Color) && (TCoords < other.TCoords)));
+	}
+
+	//! Get type of the class
+	static E_VERTEX_TYPE getType()
+	{
+		return EVT_STANDARD;
+	}
+
+	//\param d d=0 returns other, d=1 returns this, values between interpolate.
+	S3DVertex getInterpolated(const S3DVertex &other, f32 d)
+	{
+		d = core::clamp(d, 0.0f, 1.0f);
+		return S3DVertex(Pos.getInterpolated(other.Pos, d),
+				Normal.getInterpolated(other.Normal, d),
+				Color.getInterpolated(other.Color, d),
+				TCoords.getInterpolated(other.TCoords, d));
+	}
+};
+
+//! Vertex with two texture coordinates.
+/** Usually used for geometry with lightmaps
+or other special materials.
+*/
+struct S3DVertex2TCoords : public S3DVertex
+{
+	//! default constructor
+	constexpr S3DVertex2TCoords() :
+			S3DVertex() {}
+
+	//! constructor with two different texture coords, but no normal
+	constexpr S3DVertex2TCoords(f32 x, f32 y, f32 z, SColor c, f32 tu, f32 tv, f32 tu2, f32 tv2) :
+			S3DVertex(x, y, z, 0.0f, 0.0f, 0.0f, c, tu, tv), TCoords2(tu2, tv2) {}
+
+	//! constructor with two different texture coords, but no normal
+	constexpr S3DVertex2TCoords(const core::vector3df &pos, SColor color,
+			const core::vector2df &tcoords, const core::vector2df &tcoords2) :
+			S3DVertex(pos, core::vector3df(), color, tcoords),
+			TCoords2(tcoords2) {}
+
+	//! constructor with all values
+	constexpr S3DVertex2TCoords(const core::vector3df &pos, const core::vector3df &normal, const SColor &color,
+			const core::vector2df &tcoords, const core::vector2df &tcoords2) :
+			S3DVertex(pos, normal, color, tcoords),
+			TCoords2(tcoords2) {}
+
+	//! constructor with all values
+	constexpr S3DVertex2TCoords(f32 x, f32 y, f32 z, f32 nx, f32 ny, f32 nz,
+			SColor c, f32 tu, f32 tv, f32 tu2, f32 tv2) :
+			S3DVertex(x, y, z, nx, ny, nz, c, tu, tv),
+			TCoords2(tu2, tv2) {}
+
+	//! constructor with the same texture coords and normal
+	constexpr S3DVertex2TCoords(f32 x, f32 y, f32 z, f32 nx, f32 ny, f32 nz,
+			SColor c, f32 tu, f32 tv) :
+			S3DVertex(x, y, z, nx, ny, nz, c, tu, tv),
+			TCoords2(tu, tv) {}
+
+	//! constructor with the same texture coords and normal
+	constexpr S3DVertex2TCoords(const core::vector3df &pos, const core::vector3df &normal,
+			SColor color, const core::vector2df &tcoords) :
+			S3DVertex(pos, normal, color, tcoords),
+			TCoords2(tcoords) {}
+
+	//! constructor from S3DVertex
+	constexpr S3DVertex2TCoords(const S3DVertex &o) :
+			S3DVertex(o) {}
+
+	//! Second set of texture coordinates
+	core::vector2df TCoords2;
+
+	//! Equality operator
+	constexpr bool operator==(const S3DVertex2TCoords &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) == static_cast<const S3DVertex &>(other)) &&
+				(TCoords2 == other.TCoords2));
+	}
+
+	//! Inequality operator
+	constexpr bool operator!=(const S3DVertex2TCoords &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) != static_cast<const S3DVertex &>(other)) ||
+				(TCoords2 != other.TCoords2));
+	}
+
+	constexpr bool operator<(const S3DVertex2TCoords &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) < other) ||
+				((static_cast<S3DVertex>(*this) == static_cast<const S3DVertex &>(other)) && (TCoords2 < other.TCoords2)));
+	}
+
+	static E_VERTEX_TYPE getType()
+	{
+		return EVT_2TCOORDS;
+	}
+
+	//\param d d=0 returns other, d=1 returns this, values between interpolate.
+	S3DVertex2TCoords getInterpolated(const S3DVertex2TCoords &other, f32 d)
+	{
+		d = core::clamp(d, 0.0f, 1.0f);
+		return S3DVertex2TCoords(Pos.getInterpolated(other.Pos, d),
+				Normal.getInterpolated(other.Normal, d),
+				Color.getInterpolated(other.Color, d),
+				TCoords.getInterpolated(other.TCoords, d),
+				TCoords2.getInterpolated(other.TCoords2, d));
+	}
+};
+
+//! Vertex with a tangent and binormal vector.
+/** Usually used for tangent space normal mapping.
+	Usually tangent and binormal get send to shaders as texture coordinate sets 1 and 2.
+*/
+struct S3DVertexTangents : public S3DVertex
+{
+	//! default constructor
+	S3DVertexTangents() :
+			S3DVertex() {}
+
+	//! constructor
+	constexpr S3DVertexTangents(f32 x, f32 y, f32 z, f32 nx = 0.0f, f32 ny = 0.0f, f32 nz = 0.0f,
+			SColor c = 0xFFFFFFFF, f32 tu = 0.0f, f32 tv = 0.0f,
+			f32 tanx = 0.0f, f32 tany = 0.0f, f32 tanz = 0.0f,
+			f32 bx = 0.0f, f32 by = 0.0f, f32 bz = 0.0f) :
+			S3DVertex(x, y, z, nx, ny, nz, c, tu, tv),
+			Tangent(tanx, tany, tanz), Binormal(bx, by, bz) {}
+
+	//! constructor
+	constexpr S3DVertexTangents(const core::vector3df &pos, SColor c,
+			const core::vector2df &tcoords) :
+			S3DVertex(pos, core::vector3df(), c, tcoords) {}
+
+	//! constructor
+	constexpr S3DVertexTangents(const core::vector3df &pos,
+			const core::vector3df &normal, SColor c,
+			const core::vector2df &tcoords,
+			const core::vector3df &tangent = core::vector3df(),
+			const core::vector3df &binormal = core::vector3df()) :
+			S3DVertex(pos, normal, c, tcoords),
+			Tangent(tangent), Binormal(binormal) {}
+
+	//! constructor from S3DVertex
+	constexpr S3DVertexTangents(const S3DVertex &o) :
+			S3DVertex(o) {}
+
+	//! Tangent vector along the x-axis of the texture
+	core::vector3df Tangent;
+
+	//! Binormal vector (tangent x normal)
+	core::vector3df Binormal;
+
+	constexpr bool operator==(const S3DVertexTangents &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) == static_cast<const S3DVertex &>(other)) &&
+				(Tangent == other.Tangent) &&
+				(Binormal == other.Binormal));
+	}
+
+	constexpr bool operator!=(const S3DVertexTangents &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) != static_cast<const S3DVertex &>(other)) ||
+				(Tangent != other.Tangent) ||
+				(Binormal != other.Binormal));
+	}
+
+	constexpr bool operator<(const S3DVertexTangents &other) const
+	{
+		return ((static_cast<S3DVertex>(*this) < other) ||
+				((static_cast<S3DVertex>(*this) == static_cast<const S3DVertex &>(other)) && (Tangent < other.Tangent)) ||
+				((static_cast<S3DVertex>(*this) == static_cast<const S3DVertex &>(other)) && (Tangent == other.Tangent) && (Binormal < other.Binormal)));
+	}
+
+	static E_VERTEX_TYPE getType()
+	{
+		return EVT_TANGENTS;
+	}
+
+	S3DVertexTangents getInterpolated(const S3DVertexTangents &other, f32 d)
+	{
+		d = core::clamp(d, 0.0f, 1.0f);
+		return S3DVertexTangents(Pos.getInterpolated(other.Pos, d),
+				Normal.getInterpolated(other.Normal, d),
+				Color.getInterpolated(other.Color, d),
+				TCoords.getInterpolated(other.TCoords, d),
+				Tangent.getInterpolated(other.Tangent, d),
+				Binormal.getInterpolated(other.Binormal, d));
+	}
+};
+
+inline u32 getVertexPitchFromType(E_VERTEX_TYPE vertexType)
+{
+	switch (vertexType) {
+	case video::EVT_2TCOORDS:
+		return sizeof(video::S3DVertex2TCoords);
+	case video::EVT_TANGENTS:
+		return sizeof(video::S3DVertexTangents);
+	default:
+		return sizeof(video::S3DVertex);
+	}
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SAnimatedMesh.h b/irr/include/SAnimatedMesh.h
new file mode 100644
index 000000000..8fdaae0ee
--- /dev/null
+++ b/irr/include/SAnimatedMesh.h
@@ -0,0 +1,177 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IAnimatedMesh.h"
+#include "IMesh.h"
+#include "aabbox3d.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Simple implementation of the IAnimatedMesh interface.
+struct SAnimatedMesh : public IAnimatedMesh
+{
+	//! constructor
+	SAnimatedMesh(scene::IMesh *mesh = 0, scene::E_ANIMATED_MESH_TYPE type = scene::EAMT_UNKNOWN) :
+			IAnimatedMesh(), FramesPerSecond(25.f), Type(type)
+	{
+#ifdef _DEBUG
+		setDebugName("SAnimatedMesh");
+#endif
+		addMesh(mesh);
+		recalculateBoundingBox();
+	}
+
+	//! destructor
+	virtual ~SAnimatedMesh()
+	{
+		// drop meshes
+		for (u32 i = 0; i < Meshes.size(); ++i)
+			Meshes[i]->drop();
+	}
+
+	//! Gets the frame count of the animated mesh.
+	/** \return Amount of frames. If the amount is 1, it is a static, non animated mesh. */
+	u32 getFrameCount() const override
+	{
+		return Meshes.size();
+	}
+
+	//! Gets the default animation speed of the animated mesh.
+	/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
+	f32 getAnimationSpeed() const override
+	{
+		return FramesPerSecond;
+	}
+
+	//! Gets the frame count of the animated mesh.
+	/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
+	The actual speed is set in the scene node the mesh is instantiated in.*/
+	void setAnimationSpeed(f32 fps) override
+	{
+		FramesPerSecond = fps;
+	}
+
+	//! Returns the IMesh interface for a frame.
+	/** \param frame: Frame number as zero based index. The maximum frame number is
+	getFrameCount() - 1;
+	\param detailLevel: Level of detail. 0 is the lowest,
+	255 the highest level of detail. Most meshes will ignore the detail level.
+	\param startFrameLoop: start frame
+	\param endFrameLoop: end frame
+	\return The animated mesh based on a detail level. */
+	IMesh *getMesh(s32 frame, s32 detailLevel = 255, s32 startFrameLoop = -1, s32 endFrameLoop = -1) override
+	{
+		if (Meshes.empty())
+			return 0;
+
+		return Meshes[frame];
+	}
+
+	//! adds a Mesh
+	void addMesh(IMesh *mesh)
+	{
+		if (mesh) {
+			mesh->grab();
+			Meshes.push_back(mesh);
+		}
+	}
+
+	//! Returns an axis aligned bounding box of the mesh.
+	/** \return A bounding box of this mesh is returned. */
+	const core::aabbox3d<f32> &getBoundingBox() const override
+	{
+		return Box;
+	}
+
+	//! set user axis aligned bounding box
+	void setBoundingBox(const core::aabbox3df &box) override
+	{
+		Box = box;
+	}
+
+	//! Recalculates the bounding box.
+	void recalculateBoundingBox()
+	{
+		Box.reset(0, 0, 0);
+
+		if (Meshes.empty())
+			return;
+
+		Box = Meshes[0]->getBoundingBox();
+
+		for (u32 i = 1; i < Meshes.size(); ++i)
+			Box.addInternalBox(Meshes[i]->getBoundingBox());
+	}
+
+	//! Returns the type of the animated mesh.
+	E_ANIMATED_MESH_TYPE getMeshType() const override
+	{
+		return Type;
+	}
+
+	//! returns amount of mesh buffers.
+	u32 getMeshBufferCount() const override
+	{
+		if (Meshes.empty())
+			return 0;
+
+		return Meshes[0]->getMeshBufferCount();
+	}
+
+	//! returns pointer to a mesh buffer
+	IMeshBuffer *getMeshBuffer(u32 nr) const override
+	{
+		if (Meshes.empty())
+			return 0;
+
+		return Meshes[0]->getMeshBuffer(nr);
+	}
+
+	//! Returns pointer to a mesh buffer which fits a material
+	/** \param material: material to search for
+	\return Returns the pointer to the mesh buffer or
+	NULL if there is no such mesh buffer. */
+	IMeshBuffer *getMeshBuffer(const video::SMaterial &material) const override
+	{
+		if (Meshes.empty())
+			return 0;
+
+		return Meshes[0]->getMeshBuffer(material);
+	}
+
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		for (u32 i = 0; i < Meshes.size(); ++i)
+			Meshes[i]->setHardwareMappingHint(newMappingHint, buffer);
+	}
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		for (u32 i = 0; i < Meshes.size(); ++i)
+			Meshes[i]->setDirty(buffer);
+	}
+
+	//! All meshes defining the animated mesh
+	core::array<IMesh *> Meshes;
+
+	//! The bounding box of this mesh
+	core::aabbox3d<f32> Box;
+
+	//! Default animation speed of this mesh.
+	f32 FramesPerSecond;
+
+	//! The type of the mesh.
+	E_ANIMATED_MESH_TYPE Type;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/SColor.h b/irr/include/SColor.h
new file mode 100644
index 000000000..284ab3351
--- /dev/null
+++ b/irr/include/SColor.h
@@ -0,0 +1,728 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "irrMath.h"
+
+namespace irr
+{
+namespace video
+{
+//! An enum for the color format of textures used by the Irrlicht Engine.
+/** A color format specifies how color information is stored.
+	NOTE: Byte order in memory is usually flipped (it's probably correct in bitmap files, but flipped on reading).
+	So for example ECF_A8R8G8B8 is BGRA in memory same as in DX9's D3DFMT_A8R8G8B8 format.
+*/
+enum ECOLOR_FORMAT
+{
+	//! 16 bit color format used by the software driver.
+	/** It is thus preferred by all other irrlicht engine video drivers.
+	There are 5 bits for every color component, and a single bit is left
+	for alpha information. */
+	ECF_A1R5G5B5 = 0,
+
+	//! Standard 16 bit color format.
+	ECF_R5G6B5,
+
+	//! 24 bit color, no alpha channel, but 8 bit for red, green and blue.
+	//! Warning: 24 bit formats tend to be badly supported. Depending on driver it's usually converted to another
+	//           format or even not working at all. It's mostly better to use 16-bit or 32-bit formats.
+	ECF_R8G8B8,
+
+	//! Default 32 bit color format. 8 bits are used for every component: red, green, blue and alpha.
+	//! Warning: This tends to be BGRA in memory (it's ARGB on file, but with usual big-endian memory it's flipped)
+	ECF_A8R8G8B8,
+
+	/** The following formats may only be used for render target textures. */
+
+	/** Floating point formats. */
+
+	//! 16 bit format using 16 bits for the red channel.
+	ECF_R16F,
+
+	//! 32 bit format using 16 bits for the red and green channels.
+	ECF_G16R16F,
+
+	//! 64 bit format using 16 bits for the red, green, blue and alpha channels.
+	ECF_A16B16G16R16F,
+
+	//! 32 bit format using 32 bits for the red channel.
+	ECF_R32F,
+
+	//! 64 bit format using 32 bits for the red and green channels.
+	ECF_G32R32F,
+
+	//! 128 bit format using 32 bits for the red, green, blue and alpha channels.
+	ECF_A32B32G32R32F,
+
+	/** Unsigned normalized integer formats. */
+
+	//! 8 bit format using 8 bits for the red channel.
+	ECF_R8,
+
+	//! 16 bit format using 8 bits for the red and green channels.
+	ECF_R8G8,
+
+	//! 16 bit format using 16 bits for the red channel.
+	ECF_R16,
+
+	//! 32 bit format using 16 bits for the red and green channels.
+	ECF_R16G16,
+
+	/** Depth and stencil formats. */
+
+	//! 16 bit format using 16 bits for depth.
+	ECF_D16,
+
+	//! 32 bit format using 32 bits for depth.
+	ECF_D32,
+
+	//! 32 bit format using 24 bits for depth and 8 bits for stencil.
+	ECF_D24S8,
+
+	//! Unknown color format:
+	ECF_UNKNOWN
+};
+
+//! Names for ECOLOR_FORMAT types
+const c8 *const ColorFormatNames[ECF_UNKNOWN + 2] = {
+		"A1R5G5B5",
+		"R5G6B5",
+		"R8G8B8",
+		"A8R8G8B8",
+		"R16F",
+		"G16R16F",
+		"A16B16G16R16F",
+		"R32F",
+		"G32R32F",
+		"A32B32G32R32F",
+		"R8",
+		"R8G8",
+		"R16",
+		"R16G16",
+		"D16",
+		"D32",
+		"D24S8",
+		"UNKNOWN",
+		0,
+	};
+
+//! Creates a 16 bit A1R5G5B5 color
+inline u16 RGBA16(u32 r, u32 g, u32 b, u32 a = 0xFF)
+{
+	return (u16)((a & 0x80) << 8 |
+				 (r & 0xF8) << 7 |
+				 (g & 0xF8) << 2 |
+				 (b & 0xF8) >> 3);
+}
+
+//! Creates a 16 bit A1R5G5B5 color
+inline u16 RGB16(u32 r, u32 g, u32 b)
+{
+	return RGBA16(r, g, b);
+}
+
+//! Creates a 16bit A1R5G5B5 color, based on 16bit input values
+inline u16 RGB16from16(u16 r, u16 g, u16 b)
+{
+	return (0x8000 |
+			(r & 0x1F) << 10 |
+			(g & 0x1F) << 5 |
+			(b & 0x1F));
+}
+
+//! Converts a 32bit (X8R8G8B8) color to a 16bit A1R5G5B5 color
+inline u16 X8R8G8B8toA1R5G5B5(u32 color)
+{
+	return (u16)(0x8000 |
+				 (color & 0x00F80000) >> 9 |
+				 (color & 0x0000F800) >> 6 |
+				 (color & 0x000000F8) >> 3);
+}
+
+//! Converts a 32bit (A8R8G8B8) color to a 16bit A1R5G5B5 color
+inline u16 A8R8G8B8toA1R5G5B5(u32 color)
+{
+	return (u16)((color & 0x80000000) >> 16 |
+				 (color & 0x00F80000) >> 9 |
+				 (color & 0x0000F800) >> 6 |
+				 (color & 0x000000F8) >> 3);
+}
+
+//! Converts a 32bit (A8R8G8B8) color to a 16bit R5G6B5 color
+inline u16 A8R8G8B8toR5G6B5(u32 color)
+{
+	return (u16)((color & 0x00F80000) >> 8 |
+				 (color & 0x0000FC00) >> 5 |
+				 (color & 0x000000F8) >> 3);
+}
+
+//! Convert A8R8G8B8 Color from A1R5G5B5 color
+/** build a nicer 32bit Color by extending dest lower bits with source high bits. */
+inline u32 A1R5G5B5toA8R8G8B8(u16 color)
+{
+	return (((-((s32)color & 0x00008000) >> (s32)31) & 0xFF000000) |
+			((color & 0x00007C00) << 9) | ((color & 0x00007000) << 4) |
+			((color & 0x000003E0) << 6) | ((color & 0x00000380) << 1) |
+			((color & 0x0000001F) << 3) | ((color & 0x0000001C) >> 2));
+}
+
+//! Returns A8R8G8B8 Color from R5G6B5 color
+inline u32 R5G6B5toA8R8G8B8(u16 color)
+{
+	return 0xFF000000 |
+		   ((color & 0xF800) << 8) |
+		   ((color & 0x07E0) << 5) |
+		   ((color & 0x001F) << 3);
+}
+
+//! Returns A1R5G5B5 Color from R5G6B5 color
+inline u16 R5G6B5toA1R5G5B5(u16 color)
+{
+	return 0x8000 | (((color & 0xFFC0) >> 1) | (color & 0x1F));
+}
+
+//! Returns R5G6B5 Color from A1R5G5B5 color
+inline u16 A1R5G5B5toR5G6B5(u16 color)
+{
+	return (((color & 0x7FE0) << 1) | (color & 0x1F));
+}
+
+//! Returns the alpha component from A1R5G5B5 color
+/** In Irrlicht, alpha refers to opacity.
+\return The alpha value of the color. 0 is transparent, 1 is opaque. */
+inline u32 getAlpha(u16 color)
+{
+	return ((color >> 15) & 0x1);
+}
+
+//! Returns the red component from A1R5G5B5 color.
+/** Shift left by 3 to get 8 bit value. */
+inline u32 getRed(u16 color)
+{
+	return ((color >> 10) & 0x1F);
+}
+
+//! Returns the green component from A1R5G5B5 color
+/** Shift left by 3 to get 8 bit value. */
+inline u32 getGreen(u16 color)
+{
+	return ((color >> 5) & 0x1F);
+}
+
+//! Returns the blue component from A1R5G5B5 color
+/** Shift left by 3 to get 8 bit value. */
+inline u32 getBlue(u16 color)
+{
+	return (color & 0x1F);
+}
+
+//! Returns the average from a 16 bit A1R5G5B5 color
+inline s32 getAverage(s16 color)
+{
+	return ((getRed(color) << 3) + (getGreen(color) << 3) + (getBlue(color) << 3)) / 3;
+}
+
+//! Class representing a 32 bit ARGB color.
+/** The color values for alpha, red, green, and blue are
+stored in a single u32. So all four values may be between 0 and 255.
+Alpha in Irrlicht is opacity, so 0 is fully transparent, 255 is fully opaque (solid).
+This class is used by most parts of the Irrlicht Engine
+to specify a color. Another way is using the class SColorf, which
+stores the color values in 4 floats.
+This class must consist of only one u32 and must not use virtual functions.
+*/
+class SColor
+{
+public:
+	//! Constructor of the Color. Does nothing.
+	/** The color value is not initialized to save time. */
+	SColor() {}
+
+	//! Constructs the color from 4 values representing the alpha, red, green and blue component.
+	/** Must be values between 0 and 255. */
+	constexpr SColor(u32 a, u32 r, u32 g, u32 b) :
+			color(((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff)) {}
+
+	//! Constructs the color from a 32 bit value. Could be another color.
+	constexpr SColor(u32 clr) :
+			color(clr) {}
+
+	//! Returns the alpha component of the color.
+	/** The alpha component defines how opaque a color is.
+	\return The alpha value of the color. 0 is fully transparent, 255 is fully opaque. */
+	u32 getAlpha() const { return color >> 24; }
+
+	//! Returns the red component of the color.
+	/** \return Value between 0 and 255, specifying how red the color is.
+	0 means no red, 255 means full red. */
+	u32 getRed() const { return (color >> 16) & 0xff; }
+
+	//! Returns the green component of the color.
+	/** \return Value between 0 and 255, specifying how green the color is.
+	0 means no green, 255 means full green. */
+	u32 getGreen() const { return (color >> 8) & 0xff; }
+
+	//! Returns the blue component of the color.
+	/** \return Value between 0 and 255, specifying how blue the color is.
+	0 means no blue, 255 means full blue. */
+	u32 getBlue() const { return color & 0xff; }
+
+	//! Get lightness of the color in the range [0,255]
+	f32 getLightness() const
+	{
+		return 0.5f * (core::max_(core::max_(getRed(), getGreen()), getBlue()) + core::min_(core::min_(getRed(), getGreen()), getBlue()));
+	}
+
+	//! Get luminance of the color in the range [0,255].
+	f32 getLuminance() const
+	{
+		return 0.3f * getRed() + 0.59f * getGreen() + 0.11f * getBlue();
+	}
+
+	//! Get average intensity of the color in the range [0,255].
+	u32 getAverage() const
+	{
+		return (getRed() + getGreen() + getBlue()) / 3;
+	}
+
+	//! Sets the alpha component of the Color.
+	/** The alpha component defines how transparent a color should be.
+	\param a The alpha value of the color. 0 is fully transparent, 255 is fully opaque. */
+	void setAlpha(u32 a) { color = ((a & 0xff) << 24) | (color & 0x00ffffff); }
+
+	//! Sets the red component of the Color.
+	/** \param r: Has to be a value between 0 and 255.
+	0 means no red, 255 means full red. */
+	void setRed(u32 r) { color = ((r & 0xff) << 16) | (color & 0xff00ffff); }
+
+	//! Sets the green component of the Color.
+	/** \param g: Has to be a value between 0 and 255.
+	0 means no green, 255 means full green. */
+	void setGreen(u32 g) { color = ((g & 0xff) << 8) | (color & 0xffff00ff); }
+
+	//! Sets the blue component of the Color.
+	/** \param b: Has to be a value between 0 and 255.
+	0 means no blue, 255 means full blue. */
+	void setBlue(u32 b) { color = (b & 0xff) | (color & 0xffffff00); }
+
+	//! Calculates a 16 bit A1R5G5B5 value of this color.
+	/** \return 16 bit A1R5G5B5 value of this color. */
+	u16 toA1R5G5B5() const { return A8R8G8B8toA1R5G5B5(color); }
+
+	//! Converts color to OpenGL color format
+	/** From ARGB to RGBA in 4 byte components for endian aware
+	passing to OpenGL
+	\param dest: address where the 4x8 bit OpenGL color is stored. */
+	void toOpenGLColor(u8 *dest) const
+	{
+		*dest = (u8)getRed();
+		*++dest = (u8)getGreen();
+		*++dest = (u8)getBlue();
+		*++dest = (u8)getAlpha();
+	}
+
+	//! Sets all four components of the color at once.
+	/** Constructs the color from 4 values representing the alpha,
+	red, green and blue components of the color. Must be values
+	between 0 and 255.
+	\param a: Alpha component of the color. The alpha component
+	defines how transparent a color should be. Has to be a value
+	between 0 and 255. 255 means not transparent (opaque), 0 means
+	fully transparent.
+	\param r: Sets the red component of the Color. Has to be a
+	value between 0 and 255. 0 means no red, 255 means full red.
+	\param g: Sets the green component of the Color. Has to be a
+	value between 0 and 255. 0 means no green, 255 means full
+	green.
+	\param b: Sets the blue component of the Color. Has to be a
+	value between 0 and 255. 0 means no blue, 255 means full blue. */
+	void set(u32 a, u32 r, u32 g, u32 b)
+	{
+		color = (((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff));
+	}
+	void set(u32 col) { color = col; }
+
+	//! Compares the color to another color.
+	/** \return True if the colors are the same, and false if not. */
+	bool operator==(const SColor &other) const { return other.color == color; }
+
+	//! Compares the color to another color.
+	/** \return True if the colors are different, and false if they are the same. */
+	bool operator!=(const SColor &other) const { return other.color != color; }
+
+	//! comparison operator
+	/** \return True if this color is smaller than the other one */
+	bool operator<(const SColor &other) const { return (color < other.color); }
+
+	//! Adds two colors, result is clamped to 0..255 values
+	/** \param other Color to add to this color
+	\return Addition of the two colors, clamped to 0..255 values */
+	SColor operator+(const SColor &other) const
+	{
+		return SColor(core::min_(getAlpha() + other.getAlpha(), 255u),
+				core::min_(getRed() + other.getRed(), 255u),
+				core::min_(getGreen() + other.getGreen(), 255u),
+				core::min_(getBlue() + other.getBlue(), 255u));
+	}
+
+	//! Interpolates the color with a f32 value to another color
+	/** \param other: Other color
+	\param d: value between 0.0f and 1.0f. d=0 returns other, d=1 returns this, values between interpolate.
+	\return Interpolated color. */
+	SColor getInterpolated(const SColor &other, f32 d) const
+	{
+		d = core::clamp(d, 0.f, 1.f);
+		const f32 inv = 1.0f - d;
+		return SColor((u32)core::round32(other.getAlpha() * inv + getAlpha() * d),
+				(u32)core::round32(other.getRed() * inv + getRed() * d),
+				(u32)core::round32(other.getGreen() * inv + getGreen() * d),
+				(u32)core::round32(other.getBlue() * inv + getBlue() * d));
+	}
+
+	//! Returns interpolated color. ( quadratic )
+	/** \param c1: first color to interpolate with
+	\param c2: second color to interpolate with
+	\param d: value between 0.0f and 1.0f. */
+	SColor getInterpolated_quadratic(const SColor &c1, const SColor &c2, f32 d) const
+	{
+		// this*(1-d)*(1-d) + 2 * c1 * (1-d) + c2 * d * d;
+		d = core::clamp(d, 0.f, 1.f);
+		const f32 inv = 1.f - d;
+		const f32 mul0 = inv * inv;
+		const f32 mul1 = 2.f * d * inv;
+		const f32 mul2 = d * d;
+
+		return SColor(
+				core::clamp(core::floor32(
+									getAlpha() * mul0 + c1.getAlpha() * mul1 + c2.getAlpha() * mul2),
+						0, 255),
+				core::clamp(core::floor32(
+									getRed() * mul0 + c1.getRed() * mul1 + c2.getRed() * mul2),
+						0, 255),
+				core::clamp(core::floor32(
+									getGreen() * mul0 + c1.getGreen() * mul1 + c2.getGreen() * mul2),
+						0, 255),
+				core::clamp(core::floor32(
+									getBlue() * mul0 + c1.getBlue() * mul1 + c2.getBlue() * mul2),
+						0, 255));
+	}
+
+	//! set the color by expecting data in the given format
+	/** \param data: must point to valid memory containing color information in the given format
+		\param format: tells the format in which data is available
+	*/
+	void setData(const void *data, ECOLOR_FORMAT format)
+	{
+		switch (format) {
+		case ECF_A1R5G5B5:
+			color = A1R5G5B5toA8R8G8B8(*(u16 *)data);
+			break;
+		case ECF_R5G6B5:
+			color = R5G6B5toA8R8G8B8(*(u16 *)data);
+			break;
+		case ECF_A8R8G8B8:
+			color = *(u32 *)data;
+			break;
+		case ECF_R8G8B8: {
+			const u8 *p = (u8 *)data;
+			set(255, p[0], p[1], p[2]);
+		} break;
+		default:
+			color = 0xffffffff;
+			break;
+		}
+	}
+
+	//! Write the color to data in the defined format
+	/** \param data: target to write the color. Must contain sufficiently large memory to receive the number of bytes neede for format
+		\param format: tells the format used to write the color into data
+	*/
+	void getData(void *data, ECOLOR_FORMAT format) const
+	{
+		switch (format) {
+		case ECF_A1R5G5B5: {
+			u16 *dest = (u16 *)data;
+			*dest = video::A8R8G8B8toA1R5G5B5(color);
+		} break;
+
+		case ECF_R5G6B5: {
+			u16 *dest = (u16 *)data;
+			*dest = video::A8R8G8B8toR5G6B5(color);
+		} break;
+
+		case ECF_R8G8B8: {
+			u8 *dest = (u8 *)data;
+			dest[0] = (u8)getRed();
+			dest[1] = (u8)getGreen();
+			dest[2] = (u8)getBlue();
+		} break;
+
+		case ECF_A8R8G8B8: {
+			u32 *dest = (u32 *)data;
+			*dest = color;
+		} break;
+
+		default:
+			break;
+		}
+	}
+
+	//! color in A8R8G8B8 Format
+	u32 color;
+};
+
+//! Class representing a color with four floats.
+/** The color values for red, green, blue
+and alpha are each stored in a 32 bit floating point variable.
+So all four values may be between 0.0f and 1.0f.
+Another, faster way to define colors is using the class SColor, which
+stores the color values in a single 32 bit integer.
+*/
+class SColorf
+{
+public:
+	//! Default constructor for SColorf.
+	/** Sets red, green and blue to 0.0f and alpha to 1.0f. */
+	SColorf() :
+			r(0.0f), g(0.0f), b(0.0f), a(1.0f) {}
+
+	//! Constructs a color from up to four color values: red, green, blue, and alpha.
+	/** \param r: Red color component. Should be a value between
+	0.0f meaning no red and 1.0f, meaning full red.
+	\param g: Green color component. Should be a value between 0.0f
+	meaning no green and 1.0f, meaning full green.
+	\param b: Blue color component. Should be a value between 0.0f
+	meaning no blue and 1.0f, meaning full blue.
+	\param a: Alpha color component of the color. The alpha
+	component defines how transparent a color should be. Has to be
+	a value between 0.0f and 1.0f, 1.0f means not transparent
+	(opaque), 0.0f means fully transparent. */
+	SColorf(f32 r, f32 g, f32 b, f32 a = 1.0f) :
+			r(r), g(g), b(b), a(a) {}
+
+	//! Constructs a color from 32 bit Color.
+	/** \param c: 32 bit color from which this SColorf class is
+	constructed from. */
+	SColorf(SColor c)
+	{
+		const f32 inv = 1.0f / 255.0f;
+		r = c.getRed() * inv;
+		g = c.getGreen() * inv;
+		b = c.getBlue() * inv;
+		a = c.getAlpha() * inv;
+	}
+
+	//! Converts this color to a SColor without floats.
+	SColor toSColor() const
+	{
+		return SColor((u32)core::round32(a * 255.0f), (u32)core::round32(r * 255.0f), (u32)core::round32(g * 255.0f), (u32)core::round32(b * 255.0f));
+	}
+
+	//! Sets three color components to new values at once.
+	/** \param rr: Red color component. Should be a value between 0.0f meaning
+	no red (=black) and 1.0f, meaning full red.
+	\param gg: Green color component. Should be a value between 0.0f meaning
+	no green (=black) and 1.0f, meaning full green.
+	\param bb: Blue color component. Should be a value between 0.0f meaning
+	no blue (=black) and 1.0f, meaning full blue. */
+	void set(f32 rr, f32 gg, f32 bb)
+	{
+		r = rr;
+		g = gg;
+		b = bb;
+	}
+
+	//! Sets all four color components to new values at once.
+	/** \param aa: Alpha component. Should be a value between 0.0f meaning
+	fully transparent and 1.0f, meaning opaque.
+	\param rr: Red color component. Should be a value between 0.0f meaning
+	no red and 1.0f, meaning full red.
+	\param gg: Green color component. Should be a value between 0.0f meaning
+	no green and 1.0f, meaning full green.
+	\param bb: Blue color component. Should be a value between 0.0f meaning
+	no blue and 1.0f, meaning full blue. */
+	void set(f32 aa, f32 rr, f32 gg, f32 bb)
+	{
+		a = aa;
+		r = rr;
+		g = gg;
+		b = bb;
+	}
+
+	//! Interpolates the color with a f32 value to another color
+	/** \param other: Other color
+	\param d: value between 0.0f and 1.0f
+	\return Interpolated color. */
+	SColorf getInterpolated(const SColorf &other, f32 d) const
+	{
+		d = core::clamp(d, 0.f, 1.f);
+		const f32 inv = 1.0f - d;
+		return SColorf(other.r * inv + r * d,
+				other.g * inv + g * d, other.b * inv + b * d, other.a * inv + a * d);
+	}
+
+	//! Returns interpolated color. ( quadratic )
+	/** \param c1: first color to interpolate with
+	\param c2: second color to interpolate with
+	\param d: value between 0.0f and 1.0f. */
+	inline SColorf getInterpolated_quadratic(const SColorf &c1, const SColorf &c2,
+			f32 d) const
+	{
+		d = core::clamp(d, 0.f, 1.f);
+		// this*(1-d)*(1-d) + 2 * c1 * (1-d) + c2 * d * d;
+		const f32 inv = 1.f - d;
+		const f32 mul0 = inv * inv;
+		const f32 mul1 = 2.f * d * inv;
+		const f32 mul2 = d * d;
+
+		return SColorf(r * mul0 + c1.r * mul1 + c2.r * mul2,
+				g * mul0 + c1.g * mul1 + c2.g * mul2,
+				b * mul0 + c1.b * mul1 + c2.b * mul2,
+				a * mul0 + c1.a * mul1 + c2.a * mul2);
+	}
+
+	//! Sets a color component by index. R=0, G=1, B=2, A=3
+	void setColorComponentValue(s32 index, f32 value)
+	{
+		switch (index) {
+		case 0:
+			r = value;
+			break;
+		case 1:
+			g = value;
+			break;
+		case 2:
+			b = value;
+			break;
+		case 3:
+			a = value;
+			break;
+		}
+	}
+
+	//! Returns the alpha component of the color in the range 0.0 (transparent) to 1.0 (opaque)
+	f32 getAlpha() const { return a; }
+
+	//! Returns the red component of the color in the range 0.0 to 1.0
+	f32 getRed() const { return r; }
+
+	//! Returns the green component of the color in the range 0.0 to 1.0
+	f32 getGreen() const { return g; }
+
+	//! Returns the blue component of the color in the range 0.0 to 1.0
+	f32 getBlue() const { return b; }
+
+	//! red color component
+	f32 r;
+
+	//! green color component
+	f32 g;
+
+	//! blue component
+	f32 b;
+
+	//! alpha color component
+	f32 a;
+};
+
+//! Class representing a color in HSL format
+/** The color values for hue, saturation, luminance
+are stored in 32bit floating point variables. Hue is in range [0,360],
+Luminance and Saturation are in percent [0,100]
+*/
+class SColorHSL
+{
+public:
+	constexpr SColorHSL(f32 h = 0.f, f32 s = 0.f, f32 l = 0.f) :
+			Hue(h), Saturation(s), Luminance(l) {}
+
+	void fromRGB(const SColorf &color);
+	void toRGB(SColorf &color) const;
+
+	f32 Hue;
+	f32 Saturation;
+	f32 Luminance;
+
+private:
+	inline f32 toRGB1(f32 rm1, f32 rm2, f32 rh) const;
+};
+
+inline void SColorHSL::fromRGB(const SColorf &color)
+{
+	const f32 maxVal = core::max_(color.getRed(), color.getGreen(), color.getBlue());
+	const f32 minVal = (f32)core::min_(color.getRed(), color.getGreen(), color.getBlue());
+	Luminance = (maxVal + minVal) * 50;
+	if (core::equals(maxVal, minVal)) {
+		Hue = 0.f;
+		Saturation = 0.f;
+		return;
+	}
+
+	const f32 delta = maxVal - minVal;
+	if (Luminance <= 50) {
+		Saturation = (delta) / (maxVal + minVal);
+	} else {
+		Saturation = (delta) / (2 - maxVal - minVal);
+	}
+	Saturation *= 100;
+
+	if (core::equals(maxVal, color.getRed()))
+		Hue = (color.getGreen() - color.getBlue()) / delta;
+	else if (core::equals(maxVal, color.getGreen()))
+		Hue = 2 + ((color.getBlue() - color.getRed()) / delta);
+	else // blue is max
+		Hue = 4 + ((color.getRed() - color.getGreen()) / delta);
+
+	Hue *= 60.0f;
+	while (Hue < 0.f)
+		Hue += 360;
+}
+
+inline void SColorHSL::toRGB(SColorf &color) const
+{
+	const f32 l = Luminance / 100;
+	if (core::iszero(Saturation)) { // grey
+		color.set(l, l, l);
+		return;
+	}
+
+	f32 rm2;
+
+	if (Luminance <= 50) {
+		rm2 = l + l * (Saturation / 100);
+	} else {
+		rm2 = l + (1 - l) * (Saturation / 100);
+	}
+
+	const f32 rm1 = 2.0f * l - rm2;
+
+	const f32 h = Hue / 360.0f;
+	color.set(toRGB1(rm1, rm2, h + 1.f / 3.f),
+			toRGB1(rm1, rm2, h),
+			toRGB1(rm1, rm2, h - 1.f / 3.f));
+}
+
+// algorithm from Foley/Van-Dam
+inline f32 SColorHSL::toRGB1(f32 rm1, f32 rm2, f32 rh) const
+{
+	if (rh < 0)
+		rh += 1;
+	if (rh > 1)
+		rh -= 1;
+
+	if (rh < 1.f / 6.f)
+		rm1 = rm1 + (rm2 - rm1) * rh * 6.f;
+	else if (rh < 0.5f)
+		rm1 = rm2;
+	else if (rh < 2.f / 3.f)
+		rm1 = rm1 + (rm2 - rm1) * ((2.f / 3.f) - rh) * 6.f;
+
+	return rm1;
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SExposedVideoData.h b/irr/include/SExposedVideoData.h
new file mode 100644
index 000000000..346bd037c
--- /dev/null
+++ b/irr/include/SExposedVideoData.h
@@ -0,0 +1,89 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+namespace irr
+{
+namespace video
+{
+
+//! structure for holding data describing a driver and operating system specific data.
+/** This data can be retrieved by IVideoDriver::getExposedVideoData(). Use this with caution.
+This only should be used to make it possible to extend the engine easily without
+modification of its source. Note that this structure does not contain any valid data, if
+you are using the software or the null device.
+*/
+struct SExposedVideoData
+{
+	SExposedVideoData()
+	{
+		OpenGLWin32.HDc = 0;
+		OpenGLWin32.HRc = 0;
+		OpenGLWin32.HWnd = 0;
+	}
+	explicit SExposedVideoData(void *Window)
+	{
+		OpenGLWin32.HDc = 0;
+		OpenGLWin32.HRc = 0;
+		OpenGLWin32.HWnd = Window;
+	}
+
+	struct SOpenGLWin32
+	{
+		//! Private GDI Device Context.
+		/** Get if for example with: HDC h = reinterpret_cast<HDC>(exposedData.OpenGLWin32.HDc) */
+		void *HDc;
+
+		//! Permanent Rendering Context.
+		/** Get if for example with: HGLRC h = reinterpret_cast<HGLRC>(exposedData.OpenGLWin32.HRc) */
+		void *HRc;
+
+		//! Window handle.
+		/** Get with for example with: HWND h = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd) */
+		void *HWnd;
+	};
+
+	struct SOpenGLLinux
+	{
+		// XWindow handles
+		void *X11Display;
+		void *X11Context;
+		unsigned long X11Window;
+		unsigned long GLXWindow;
+	};
+
+	struct SOpenGLOSX
+	{
+		//! The NSOpenGLContext object.
+		void *Context;
+
+		//! The NSWindow object.
+		void *Window;
+	};
+
+	struct SOpenGLFB
+	{
+		//! The EGLNativeWindowType object.
+		void *Window;
+	};
+
+	struct SOGLESAndroid
+	{
+		//! The ANativeWindow object.
+		void *Window;
+	};
+
+	union
+	{
+		SOpenGLWin32 OpenGLWin32;
+		SOpenGLLinux OpenGLLinux;
+		SOpenGLOSX OpenGLOSX;
+		SOpenGLFB OpenGLFB;
+		SOGLESAndroid OGLESAndroid;
+	};
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SIrrCreationParameters.h b/irr/include/SIrrCreationParameters.h
new file mode 100644
index 000000000..4eedde50f
--- /dev/null
+++ b/irr/include/SIrrCreationParameters.h
@@ -0,0 +1,233 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "EDriverTypes.h"
+#include "EDeviceTypes.h"
+#include "dimension2d.h"
+#include "ILogger.h"
+#include "position2d.h"
+#include "path.h"
+
+namespace irr
+{
+class IEventReceiver;
+
+//! Structure for holding Irrlicht Device creation parameters.
+/** This structure is used in the createDeviceEx() function. */
+struct SIrrlichtCreationParameters
+{
+	//! Constructs a SIrrlichtCreationParameters structure with default values.
+	SIrrlichtCreationParameters() :
+			DeviceType(EIDT_BEST),
+			DriverType(video::EDT_OPENGL),
+			WindowSize(core::dimension2d<u32>(800, 600)),
+			WindowPosition(core::position2di(-1, -1)),
+			Bits(32),
+			ZBufferBits(24),
+			Fullscreen(false),
+			WindowMaximized(false),
+			WindowResizable(2),
+			Stencilbuffer(true),
+			Vsync(false),
+			AntiAlias(0),
+			WithAlphaChannel(false),
+			Doublebuffer(true),
+			Stereobuffer(false),
+			EventReceiver(0),
+			WindowId(0),
+#ifdef _DEBUG
+			LoggingLevel(ELL_DEBUG),
+#else
+			LoggingLevel(ELL_INFORMATION),
+#endif
+			PrivateData(0),
+#ifdef IRR_MOBILE_PATHS
+			OGLES2ShaderPath("media/Shaders/"),
+#else
+			OGLES2ShaderPath("../../media/Shaders/"),
+#endif
+			DriverDebug(false)
+	{
+	}
+
+	//! Type of the device.
+	/** This setting decides the windowing system used by the device, most device types are native
+	to a specific operating system and so may not be available.
+	EIDT_WIN32 is only available on Windows desktops,
+	EIDT_COCOA is only available on Mac OSX,
+	EIDT_X11 is available on Linux, Solaris, BSD and other operating systems which use X11,
+	EIDT_SDL is available on most systems if compiled in,
+	EIDT_BEST will select the best available device for your operating system.
+	Default: EIDT_BEST. */
+	E_DEVICE_TYPE DeviceType;
+
+	//! Type of video driver used to render graphics.
+	video::E_DRIVER_TYPE DriverType;
+
+	//! Size of the window or the video mode in fullscreen mode. Default: 800x600
+	core::dimension2d<u32> WindowSize;
+
+	//! Position of the window on-screen. Default: (-1, -1) or centered.
+	core::position2di WindowPosition;
+
+	//! Minimum Bits per pixel of the color buffer in fullscreen mode. Ignored if windowed mode. Default: 32.
+	u8 Bits;
+
+	//! Minimum Bits per pixel of the depth buffer. Default: 24.
+	u8 ZBufferBits;
+
+	//! Should be set to true if the device should run in fullscreen.
+	/** Otherwise the device runs in windowed mode. Default: false. */
+	bool Fullscreen;
+
+	//! Maximised window. (Only supported on SDL.) Default: false
+	bool WindowMaximized;
+
+	//! Should a non-fullscreen window be resizable.
+	/** Might not be supported by all devices. Ignored when Fullscreen is true.
+	Values: 0 = not resizable, 1 = resizable, 2 = system decides default itself
+	Default: 2*/
+	u8 WindowResizable;
+
+	//! Specifies if the stencil buffer should be enabled.
+	/** Set this to true, if you want the engine be able to draw
+	stencil buffer shadows. Note that not all drivers are able to
+	use the stencil buffer, hence it can be ignored during device
+	creation. Without the stencil buffer no shadows will be drawn.
+	Default: true. */
+	bool Stencilbuffer;
+
+	//! Specifies vertical synchronization.
+	/** If set to true, the driver will wait for the vertical
+	retrace period, otherwise not. May be silently ignored.
+	Default: false */
+	bool Vsync;
+
+	//! Specifies if the device should use fullscreen anti aliasing
+	/** Makes sharp/pixelated edges softer, but requires more
+	performance. Also, 2D elements might look blurred with this
+	switched on. The resulting rendering quality also depends on
+	the hardware and driver you are using, your program might look
+	different on different hardware with this. So if you are
+	writing a game/application with AntiAlias switched on, it would
+	be a good idea to make it possible to switch this option off
+	again by the user.
+	The value is the maximal antialiasing factor requested for
+	the device. The creation method will automatically try smaller
+	values if no window can be created with the given value.
+	Value one is usually the same as 0 (disabled), but might be a
+	special value on some platforms. On D3D devices it maps to
+	NONMASKABLE.
+	Default value: 0 - disabled */
+	u8 AntiAlias;
+
+	//! Whether the main framebuffer uses an alpha channel.
+	/** In some situations it might be desirable to get a color
+	buffer with an alpha channel, e.g. when rendering into a
+	transparent window or overlay. If this flag is set the device
+	tries to create a framebuffer with alpha channel.
+	If this flag is set, only color buffers with alpha channel
+	are considered. Otherwise, it depends on the actual hardware
+	if the colorbuffer has an alpha channel or not.
+	Default value: false */
+	bool WithAlphaChannel;
+
+	//! Whether the main framebuffer uses doublebuffering.
+	/** This should be usually enabled, in order to avoid render
+	artifacts on the visible framebuffer. However, it might be
+	useful to use only one buffer on very small devices. If no
+	doublebuffering is available, the drivers will fall back to
+	single buffers. Default value: true */
+	bool Doublebuffer;
+
+	//! Specifies if the device should use stereo buffers
+	/** Some high-end gfx cards support two framebuffers for direct
+	support of stereoscopic output devices. If this flag is set the
+	device tries to create a stereo context.
+	Currently only supported by OpenGL.
+	Default value: false */
+	bool Stereobuffer;
+
+	//! A user created event receiver.
+	IEventReceiver *EventReceiver;
+
+	//! Window Id.
+	/** If this is set to a value other than 0, the Irrlicht Engine
+	will be created in an already existing window.
+	For Windows, set this to the HWND of the window you want.
+	The windowSize and FullScreen options will be ignored when using
+	the WindowId parameter. Default this is set to 0.
+	To make Irrlicht run inside the custom window, you still will
+	have to draw Irrlicht on your own. You can use this loop, as
+	usual:
+	\code
+	while (device->run())
+	{
+		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, 0);
+		smgr->drawAll();
+		driver->endScene();
+	}
+	\endcode
+	Instead of this, you can also simply use your own message loop
+	using GetMessage, DispatchMessage and whatever. Calling
+	IrrlichtDevice::run() will cause Irrlicht to dispatch messages
+	internally too.  You need not call Device->run() if you want to
+	do your own message dispatching loop, but Irrlicht will not be
+	able to fetch user input then and you have to do it on your own
+	using the window messages, DirectInput, or whatever. Also,
+	you'll have to increment the Irrlicht timer.
+	An alternative, own message dispatching loop without
+	device->run() would look like this:
+	\code
+	MSG msg;
+	while (true)
+	{
+		if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+		{
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+
+			if (msg.message == WM_QUIT)
+				break;
+		}
+
+		// increase virtual timer time
+		device->getTimer()->tick();
+
+		// draw engine picture
+		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, 0);
+		smgr->drawAll();
+		driver->endScene();
+	}
+	\endcode
+	However, there is no need to draw the picture this often. Just
+	do it how you like. */
+	void *WindowId;
+
+	//! Specifies the logging level used in the logging interface.
+	/** The default value is ELL_INFORMATION. You can access the ILogger interface
+	later on from the IrrlichtDevice with getLogger() and set another level.
+	But if you need more or less logging information already from device creation,
+	then you have to change it here.
+	*/
+	ELOG_LEVEL LoggingLevel;
+
+	//! Define some private data storage.
+	/** Used when platform devices need access to OS specific data structures etc.
+	This is only used for Android at the moment in order to access the native
+	Java RE. */
+	void *PrivateData;
+
+	//! Set the path where default-shaders to simulate the fixed-function pipeline can be found.
+	/** This is about the shaders which can be found in media/Shaders by default. It's only necessary
+	to set when using OGL-ES 2.0 */
+	irr::io::path OGLES2ShaderPath;
+
+	//! Enable debug and error checks in video driver.
+	bool DriverDebug;
+};
+
+} // end namespace irr
diff --git a/irr/include/SMaterial.h b/irr/include/SMaterial.h
new file mode 100644
index 000000000..c803f5fde
--- /dev/null
+++ b/irr/include/SMaterial.h
@@ -0,0 +1,566 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SColor.h"
+#include "matrix4.h"
+#include "irrArray.h"
+#include "irrMath.h"
+#include "EMaterialTypes.h"
+#include "EMaterialProps.h"
+#include "SMaterialLayer.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+
+//! Flag for MaterialTypeParam (in combination with EMT_ONETEXTURE_BLEND) or for BlendFactor
+//! BlendFunc = source * sourceFactor + dest * destFactor
+enum E_BLEND_FACTOR
+{
+	EBF_ZERO = 0,            //!< src & dest	(0, 0, 0, 0)
+	EBF_ONE,                 //!< src & dest	(1, 1, 1, 1)
+	EBF_DST_COLOR,           //!< src	(destR, destG, destB, destA)
+	EBF_ONE_MINUS_DST_COLOR, //!< src	(1-destR, 1-destG, 1-destB, 1-destA)
+	EBF_SRC_COLOR,           //!< dest	(srcR, srcG, srcB, srcA)
+	EBF_ONE_MINUS_SRC_COLOR, //!< dest	(1-srcR, 1-srcG, 1-srcB, 1-srcA)
+	EBF_SRC_ALPHA,           //!< src & dest	(srcA, srcA, srcA, srcA)
+	EBF_ONE_MINUS_SRC_ALPHA, //!< src & dest	(1-srcA, 1-srcA, 1-srcA, 1-srcA)
+	EBF_DST_ALPHA,           //!< src & dest	(destA, destA, destA, destA)
+	EBF_ONE_MINUS_DST_ALPHA, //!< src & dest	(1-destA, 1-destA, 1-destA, 1-destA)
+	EBF_SRC_ALPHA_SATURATE   //!< src	(min(srcA, 1-destA), idem, ...)
+};
+
+//! Values defining the blend operation
+enum E_BLEND_OPERATION
+{
+	EBO_NONE = 0,    //!< No blending happens
+	EBO_ADD,         //!< Default blending adds the color values
+	EBO_SUBTRACT,    //!< This mode subtracts the color values
+	EBO_REVSUBTRACT, //!< This modes subtracts destination from source
+	EBO_MIN,         //!< Choose minimum value of each color channel
+	EBO_MAX,         //!< Choose maximum value of each color channel
+	EBO_MIN_FACTOR,  //!< Choose minimum value of each color channel after applying blend factors, not widely supported
+	EBO_MAX_FACTOR,  //!< Choose maximum value of each color channel after applying blend factors, not widely supported
+	EBO_MIN_ALPHA,   //!< Choose minimum value of each color channel based on alpha value, not widely supported
+	EBO_MAX_ALPHA    //!< Choose maximum value of each color channel based on alpha value, not widely supported
+};
+
+//! MaterialTypeParam: e.g. DirectX: D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_MODULATE4X
+enum E_MODULATE_FUNC
+{
+	EMFN_MODULATE_1X = 1,
+	EMFN_MODULATE_2X = 2,
+	EMFN_MODULATE_4X = 4
+};
+
+//! Comparison function, e.g. for depth buffer test
+enum E_COMPARISON_FUNC
+{
+	//! Depth test disabled (disable also write to depth buffer)
+	ECFN_DISABLED = 0,
+	//! <= test, default for e.g. depth test
+	ECFN_LESSEQUAL = 1,
+	//! Exact equality
+	ECFN_EQUAL = 2,
+	//! exclusive less comparison, i.e. <
+	ECFN_LESS,
+	//! Succeeds almost always, except for exact equality
+	ECFN_NOTEQUAL,
+	//! >= test
+	ECFN_GREATEREQUAL,
+	//! inverse of <=
+	ECFN_GREATER,
+	//! test succeeds always
+	ECFN_ALWAYS,
+	//! Test never succeeds
+	ECFN_NEVER
+};
+
+//! Enum values for enabling/disabling color planes for rendering
+enum E_COLOR_PLANE
+{
+	//! No color enabled
+	ECP_NONE = 0,
+	//! Alpha enabled
+	ECP_ALPHA = 1,
+	//! Red enabled
+	ECP_RED = 2,
+	//! Green enabled
+	ECP_GREEN = 4,
+	//! Blue enabled
+	ECP_BLUE = 8,
+	//! All colors, no alpha
+	ECP_RGB = 14,
+	//! All planes enabled
+	ECP_ALL = 15
+};
+
+//! Source of the alpha value to take
+/** This is currently only supported in EMT_ONETEXTURE_BLEND. You can use an
+or'ed combination of values. Alpha values are modulated (multiplied). */
+enum E_ALPHA_SOURCE
+{
+	//! Use no alpha, somewhat redundant with other settings
+	EAS_NONE = 0,
+	//! Use vertex color alpha
+	EAS_VERTEX_COLOR,
+	//! Use texture alpha channel
+	EAS_TEXTURE
+};
+
+//! Pack srcFact, dstFact, Modulate and alpha source to MaterialTypeParam or BlendFactor
+/** alpha source can be an OR'ed combination of E_ALPHA_SOURCE values. */
+inline f32 pack_textureBlendFunc(const E_BLEND_FACTOR srcFact, const E_BLEND_FACTOR dstFact,
+		const E_MODULATE_FUNC modulate = EMFN_MODULATE_1X, const u32 alphaSource = EAS_TEXTURE)
+{
+	const u32 tmp = (alphaSource << 20) | (modulate << 16) | (srcFact << 12) | (dstFact << 8) | (srcFact << 4) | dstFact;
+	return FR(tmp);
+}
+
+//! Pack srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, Modulate and alpha source to MaterialTypeParam or BlendFactor
+/** alpha source can be an OR'ed combination of E_ALPHA_SOURCE values. */
+inline f32 pack_textureBlendFuncSeparate(const E_BLEND_FACTOR srcRGBFact, const E_BLEND_FACTOR dstRGBFact,
+		const E_BLEND_FACTOR srcAlphaFact, const E_BLEND_FACTOR dstAlphaFact,
+		const E_MODULATE_FUNC modulate = EMFN_MODULATE_1X, const u32 alphaSource = EAS_TEXTURE)
+{
+	const u32 tmp = (alphaSource << 20) | (modulate << 16) | (srcAlphaFact << 12) | (dstAlphaFact << 8) | (srcRGBFact << 4) | dstRGBFact;
+	return FR(tmp);
+}
+
+//! Unpack srcFact, dstFact, modulo and alphaSource factors
+/** The fields don't use the full byte range, so we could pack even more... */
+inline void unpack_textureBlendFunc(E_BLEND_FACTOR &srcFact, E_BLEND_FACTOR &dstFact,
+		E_MODULATE_FUNC &modulo, u32 &alphaSource, const f32 param)
+{
+	const u32 state = IR(param);
+	alphaSource = (state & 0x00F00000) >> 20;
+	modulo = E_MODULATE_FUNC((state & 0x000F0000) >> 16);
+	srcFact = E_BLEND_FACTOR((state & 0x000000F0) >> 4);
+	dstFact = E_BLEND_FACTOR((state & 0x0000000F));
+}
+
+//! Unpack srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulo and alphaSource factors
+/** The fields don't use the full byte range, so we could pack even more... */
+inline void unpack_textureBlendFuncSeparate(E_BLEND_FACTOR &srcRGBFact, E_BLEND_FACTOR &dstRGBFact,
+		E_BLEND_FACTOR &srcAlphaFact, E_BLEND_FACTOR &dstAlphaFact,
+		E_MODULATE_FUNC &modulo, u32 &alphaSource, const f32 param)
+{
+	const u32 state = IR(param);
+	alphaSource = (state & 0x00F00000) >> 20;
+	modulo = E_MODULATE_FUNC((state & 0x000F0000) >> 16);
+	srcAlphaFact = E_BLEND_FACTOR((state & 0x0000F000) >> 12);
+	dstAlphaFact = E_BLEND_FACTOR((state & 0x00000F00) >> 8);
+	srcRGBFact = E_BLEND_FACTOR((state & 0x000000F0) >> 4);
+	dstRGBFact = E_BLEND_FACTOR((state & 0x0000000F));
+}
+
+//! has blend factor alphablending
+inline bool textureBlendFunc_hasAlpha(const E_BLEND_FACTOR factor)
+{
+	switch (factor) {
+	case EBF_SRC_ALPHA:
+	case EBF_ONE_MINUS_SRC_ALPHA:
+	case EBF_DST_ALPHA:
+	case EBF_ONE_MINUS_DST_ALPHA:
+	case EBF_SRC_ALPHA_SATURATE:
+		return true;
+	default:
+		return false;
+	}
+}
+
+//! These flags are used to specify the anti-aliasing and smoothing modes
+/** Techniques supported are multisampling, geometry smoothing, and alpha
+to coverage.
+Some drivers don't support a per-material setting of the anti-aliasing
+modes. In those cases, FSAA/multisampling is defined by the device mode
+chosen upon creation via irr::SIrrCreationParameters.
+*/
+enum E_ANTI_ALIASING_MODE
+{
+	//! Use to turn off anti-aliasing for this material
+	EAAM_OFF = 0,
+	//! Default anti-aliasing mode
+	EAAM_SIMPLE = 1,
+	//! High-quality anti-aliasing, not always supported, automatically enables SIMPLE mode
+	EAAM_QUALITY = 3,
+	//! Enhanced anti-aliasing for transparent materials
+	/** Usually used with EMT_TRANSPARENT_ALPHA_CHANNEL_REF and multisampling. */
+	EAAM_ALPHA_TO_COVERAGE = 4
+};
+
+//! These flags allow to define the interpretation of vertex color when lighting is enabled
+/** Without lighting being enabled the vertex color is the only value defining the fragment color.
+Once lighting is enabled, the four values for diffuse, ambient, emissive, and specular take over.
+With these flags it is possible to define which lighting factor shall be defined by the vertex color
+instead of the lighting factor which is the same for all faces of that material.
+The default is to use vertex color for the diffuse value, another pretty common value is to use
+vertex color for both diffuse and ambient factor. */
+enum E_COLOR_MATERIAL
+{
+	//! Don't use vertex color for lighting
+	ECM_NONE = 0,
+	//! Use vertex color for diffuse light, this is default
+	ECM_DIFFUSE,
+	//! Use vertex color for ambient light
+	ECM_AMBIENT,
+	//! Use vertex color for emissive light
+	ECM_EMISSIVE,
+	//! Use vertex color for specular light
+	ECM_SPECULAR,
+	//! Use vertex color for both diffuse and ambient light
+	ECM_DIFFUSE_AND_AMBIENT
+};
+
+//! Names for polygon offset direction
+const c8 *const PolygonOffsetDirectionNames[] = {
+		"Back",
+		"Front",
+		0,
+	};
+
+//! For SMaterial.ZWriteEnable
+enum E_ZWRITE
+{
+	//! zwrite always disabled for this material
+	EZW_OFF = 0,
+
+	//! This is the default setting for SMaterial and tries to handle things automatically.
+	//! This is what you want to set to enable zwriting.
+	//! Usually zwriting is enabled non-transparent materials - as far as Irrlicht can recognize those.
+	//! Basically Irrlicht tries to handle the zwriting for you and assumes transparent materials don't need it.
+	//! This is addionally affected by IVideoDriver::setAllowZWriteOnTransparent
+	EZW_AUTO,
+
+	//! zwrite always enabled for this material
+	EZW_ON
+};
+
+//! Names for E_ZWRITE
+const c8 *const ZWriteNames[] = {
+		"Off",
+		"Auto",
+		"On",
+		0,
+	};
+
+//! Maximum number of texture an SMaterial can have.
+/** SMaterial might ignore some textures in most function, like assignment and comparison,
+	when SIrrlichtCreationParameters::MaxTextureUnits is set to a lower number.
+*/
+const u32 MATERIAL_MAX_TEXTURES = 4;
+
+//! Struct for holding parameters for a material renderer
+// Note for implementors: Serialization is in CNullDriver
+class SMaterial
+{
+public:
+	//! Default constructor. Creates a solid, lit material with white colors
+	SMaterial() :
+			MaterialType(EMT_SOLID), AmbientColor(255, 255, 255, 255),
+			DiffuseColor(255, 255, 255, 255), EmissiveColor(0, 0, 0, 0),
+			SpecularColor(255, 255, 255, 255), Shininess(0.0f),
+			MaterialTypeParam(0.0f), Thickness(1.0f), ZBuffer(ECFN_LESSEQUAL),
+			AntiAliasing(EAAM_SIMPLE), ColorMask(ECP_ALL), ColorMaterial(ECM_DIFFUSE),
+			BlendOperation(EBO_NONE), BlendFactor(0.0f), PolygonOffsetDepthBias(0.f),
+			PolygonOffsetSlopeScale(0.f), Wireframe(false), PointCloud(false),
+			GouraudShading(true), Lighting(true), ZWriteEnable(EZW_AUTO),
+			BackfaceCulling(true), FrontfaceCulling(false), FogEnable(false),
+			NormalizeNormals(false), UseMipMaps(true)
+	{
+	}
+
+	//! Texture layer array.
+	SMaterialLayer TextureLayers[MATERIAL_MAX_TEXTURES];
+
+	//! Type of the material. Specifies how everything is blended together
+	E_MATERIAL_TYPE MaterialType;
+
+	//! How much ambient light (a global light) is reflected by this material.
+	/** The default is full white, meaning objects are completely
+	globally illuminated. Reduce this if you want to see diffuse
+	or specular light effects. */
+	SColor AmbientColor;
+
+	//! How much diffuse light coming from a light source is reflected by this material.
+	/** The default is full white. */
+	SColor DiffuseColor;
+
+	//! Light emitted by this material. Default is to emit no light.
+	SColor EmissiveColor;
+
+	//! How much specular light (highlights from a light) is reflected.
+	/** The default is to reflect white specular light. See
+	SMaterial::Shininess on how to enable specular lights. */
+	SColor SpecularColor;
+
+	//! Value affecting the size of specular highlights.
+	/** A value of 20 is common. If set to 0, no specular
+	highlights are being used. To activate, simply set the
+	shininess of a material to a value in the range [0.5;128]:
+	\code
+	sceneNode->getMaterial(0).Shininess = 20.0f;
+	\endcode
+
+	You can change the color of the highlights using
+	\code
+	sceneNode->getMaterial(0).SpecularColor.set(255,255,255,255);
+	\endcode
+
+	The specular color of the dynamic lights
+	(SLight::SpecularColor) will influence the the highlight color
+	too, but they are set to a useful value by default when
+	creating the light scene node.*/
+	f32 Shininess;
+
+	//! Free parameter, dependent on the material type.
+	/** Mostly ignored, used for example in
+	EMT_TRANSPARENT_ALPHA_CHANNEL and EMT_ONETEXTURE_BLEND. */
+	f32 MaterialTypeParam;
+
+	//! Thickness of non-3dimensional elements such as lines and points.
+	f32 Thickness;
+
+	//! Is the ZBuffer enabled? Default: ECFN_LESSEQUAL
+	/** If you want to disable depth test for this material
+	just set this parameter to ECFN_DISABLED.
+	Values are from E_COMPARISON_FUNC. */
+	u8 ZBuffer;
+
+	//! Sets the antialiasing mode
+	/** Values are chosen from E_ANTI_ALIASING_MODE. Default is
+	EAAM_SIMPLE, i.e. simple multi-sample anti-aliasing. */
+	u8 AntiAliasing;
+
+	//! Defines the enabled color planes
+	/** Values are defined as or'ed values of the E_COLOR_PLANE enum.
+	Only enabled color planes will be rendered to the current render
+	target. Typical use is to disable all colors when rendering only to
+	depth or stencil buffer, or using Red and Green for Stereo rendering. */
+	u8 ColorMask : 4;
+
+	//! Defines the interpretation of vertex color in the lighting equation
+	/** Values should be chosen from E_COLOR_MATERIAL.
+	When lighting is enabled, vertex color can be used instead of the
+	material values for light modulation. This allows to easily change e.g. the
+	diffuse light behavior of each face. The default, ECM_DIFFUSE, will result in
+	a very similar rendering as with lighting turned off, just with light shading. */
+	u8 ColorMaterial : 3;
+
+	//! Store the blend operation of choice
+	/** Values to be chosen from E_BLEND_OPERATION. */
+	E_BLEND_OPERATION BlendOperation : 4;
+
+	//! Store the blend factors
+	/** textureBlendFunc/textureBlendFuncSeparate functions should be used to write
+	properly blending factors to this parameter.
+	Due to historical reasons this parameter is not used for material type
+	EMT_ONETEXTURE_BLEND which uses MaterialTypeParam instead for the blend factor.
+	It's generally used only for materials without any blending otherwise (like EMT_SOLID).
+	It's main use is to allow having shader materials which can enable/disable
+	blending after they have been created.
+	When you set this you usually also have to set BlendOperation to a value != EBO_NONE
+	(setting it to EBO_ADD is probably the most common one value). */
+	f32 BlendFactor;
+
+	//! A constant z-buffer offset for a polygon/line/point
+	/** The range of the value is driver specific.
+	On OpenGL you get units which are multiplied by the smallest value that is guaranteed to produce a resolvable offset.
+	On D3D9 you can pass a range between -1 and 1. But you should likely divide it by the range of the depthbuffer.
+	Like dividing by 65535.0 for a 16 bit depthbuffer. Thought it still might produce too large of a bias.
+	Some article (https://aras-p.info/blog/2008/06/12/depth-bias-and-the-power-of-deceiving-yourself/)
+	recommends multiplying by 2.0*4.8e-7 (and strangely on both 16 bit and 24 bit).	*/
+	f32 PolygonOffsetDepthBias;
+
+	//! Variable Z-Buffer offset based on the slope of the polygon.
+	/** For polygons looking flat at a camera you could use 0 (for example in a 2D game)
+	But in most cases you will have polygons rendered at a certain slope.
+	The driver will calculate the slope for you and this value allows to scale that slope.
+	The complete polygon offset is: PolygonOffsetSlopeScale*slope + PolygonOffsetDepthBias
+	A good default here is to use 1.f if you want to push the polygons away from the camera
+	and -1.f to pull them towards the camera.  */
+	f32 PolygonOffsetSlopeScale;
+
+	//! Draw as wireframe or filled triangles? Default: false
+	bool Wireframe : 1;
+
+	//! Draw as point cloud or filled triangles? Default: false
+	bool PointCloud : 1;
+
+	//! Flat or Gouraud shading? Default: true
+	bool GouraudShading : 1;
+
+	//! Will this material be lighted? Default: true
+	bool Lighting : 1;
+
+	//! Is the zbuffer writable or is it read-only. Default: EZW_AUTO.
+	/** If this parameter is not EZW_OFF, you probably also want to set ZBuffer
+	to values other than ECFN_DISABLED */
+	E_ZWRITE ZWriteEnable : 2;
+
+	//! Is backface culling enabled? Default: true
+	bool BackfaceCulling : 1;
+
+	//! Is frontface culling enabled? Default: false
+	bool FrontfaceCulling : 1;
+
+	//! Is fog enabled? Default: false
+	bool FogEnable : 1;
+
+	//! Should normals be normalized?
+	/** Always use this if the mesh lit and scaled. Default: false */
+	bool NormalizeNormals : 1;
+
+	//! Shall mipmaps be used if available
+	/** Sometimes, disabling mipmap usage can be useful. Default: true */
+	bool UseMipMaps : 1;
+
+	//! Execute a function on all texture layers.
+	/** Useful for setting properties which are not per material, but per
+	texture layer, e.g. bilinear filtering. */
+	template <typename F>
+	void forEachTexture(F &&fn)
+	{
+		for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; i++) {
+			fn(TextureLayers[i]);
+		}
+	}
+
+	//! Gets the texture transformation matrix for level i
+	/** \param i The desired level. Must not be larger than MATERIAL_MAX_TEXTURES
+	\return Texture matrix for texture level i. */
+	core::matrix4 &getTextureMatrix(u32 i)
+	{
+		return TextureLayers[i].getTextureMatrix();
+	}
+
+	//! Gets the immutable texture transformation matrix for level i
+	/** \param i The desired level.
+	\return Texture matrix for texture level i, or identity matrix for levels larger than MATERIAL_MAX_TEXTURES. */
+	const core::matrix4 &getTextureMatrix(u32 i) const
+	{
+		if (i < MATERIAL_MAX_TEXTURES)
+			return TextureLayers[i].getTextureMatrix();
+		else
+			return core::IdentityMatrix;
+	}
+
+	//! Sets the i-th texture transformation matrix
+	/** \param i The desired level.
+	\param mat Texture matrix for texture level i. */
+	void setTextureMatrix(u32 i, const core::matrix4 &mat)
+	{
+		if (i >= MATERIAL_MAX_TEXTURES)
+			return;
+		TextureLayers[i].setTextureMatrix(mat);
+	}
+
+	//! Gets the i-th texture
+	/** \param i The desired level.
+	\return Texture for texture level i, if defined, else 0. */
+	ITexture *getTexture(u32 i) const
+	{
+		return i < MATERIAL_MAX_TEXTURES ? TextureLayers[i].Texture : 0;
+	}
+
+	//! Sets the i-th texture
+	/** If i>=MATERIAL_MAX_TEXTURES this setting will be ignored.
+	\param i The desired level.
+	\param tex Texture for texture level i. */
+	void setTexture(u32 i, ITexture *tex)
+	{
+		if (i >= MATERIAL_MAX_TEXTURES)
+			return;
+		TextureLayers[i].Texture = tex;
+	}
+
+	//! Inequality operator
+	/** \param b Material to compare to.
+	\return True if the materials differ, else false. */
+	inline bool operator!=(const SMaterial &b) const
+	{
+		bool different =
+				MaterialType != b.MaterialType ||
+				AmbientColor != b.AmbientColor ||
+				DiffuseColor != b.DiffuseColor ||
+				EmissiveColor != b.EmissiveColor ||
+				SpecularColor != b.SpecularColor ||
+				Shininess != b.Shininess ||
+				MaterialTypeParam != b.MaterialTypeParam ||
+				Thickness != b.Thickness ||
+				Wireframe != b.Wireframe ||
+				PointCloud != b.PointCloud ||
+				GouraudShading != b.GouraudShading ||
+				Lighting != b.Lighting ||
+				ZBuffer != b.ZBuffer ||
+				ZWriteEnable != b.ZWriteEnable ||
+				BackfaceCulling != b.BackfaceCulling ||
+				FrontfaceCulling != b.FrontfaceCulling ||
+				FogEnable != b.FogEnable ||
+				NormalizeNormals != b.NormalizeNormals ||
+				AntiAliasing != b.AntiAliasing ||
+				ColorMask != b.ColorMask ||
+				ColorMaterial != b.ColorMaterial ||
+				BlendOperation != b.BlendOperation ||
+				BlendFactor != b.BlendFactor ||
+				PolygonOffsetDepthBias != b.PolygonOffsetDepthBias ||
+				PolygonOffsetSlopeScale != b.PolygonOffsetSlopeScale ||
+				UseMipMaps != b.UseMipMaps;
+		for (u32 i = 0; (i < MATERIAL_MAX_TEXTURES) && !different; ++i) {
+			different |= (TextureLayers[i] != b.TextureLayers[i]);
+		}
+		return different;
+	}
+
+	//! Equality operator
+	/** \param b Material to compare to.
+	\return True if the materials are equal, else false. */
+	inline bool operator==(const SMaterial &b) const
+	{
+		return !(b != *this);
+	}
+
+	//! Check if material needs alpha blending
+	bool isAlphaBlendOperation() const
+	{
+		if (BlendOperation != EBO_NONE && BlendFactor != 0.f) {
+			E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
+			E_BLEND_FACTOR dstRGBFact = EBF_ZERO;
+			E_BLEND_FACTOR srcAlphaFact = EBF_ZERO;
+			E_BLEND_FACTOR dstAlphaFact = EBF_ZERO;
+			E_MODULATE_FUNC modulo = EMFN_MODULATE_1X;
+			u32 alphaSource = 0;
+
+			unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulo, alphaSource, BlendFactor);
+
+			if (textureBlendFunc_hasAlpha(srcRGBFact) || textureBlendFunc_hasAlpha(dstRGBFact) ||
+					textureBlendFunc_hasAlpha(srcAlphaFact) || textureBlendFunc_hasAlpha(dstAlphaFact)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	//! Check for some fixed-function transparent types. Still used internally, but might be deprecated soon.
+	//! You probably should not use this anymore, IVideoDriver::needsTransparentRenderPass is more useful in most situations
+	//! as it asks the material renders directly what they do with the material.
+	bool isTransparent() const
+	{
+		if (MaterialType == EMT_TRANSPARENT_ALPHA_CHANNEL ||
+				MaterialType == EMT_TRANSPARENT_VERTEX_ALPHA)
+			return true;
+
+		return false;
+	}
+};
+
+//! global const identity Material
+IRRLICHT_API extern SMaterial IdentityMaterial;
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SMaterialLayer.h b/irr/include/SMaterialLayer.h
new file mode 100644
index 000000000..419a8f1e9
--- /dev/null
+++ b/irr/include/SMaterialLayer.h
@@ -0,0 +1,238 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "matrix4.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+
+//! Texture coord clamp mode outside [0.0, 1.0]
+enum E_TEXTURE_CLAMP
+{
+	//! Texture repeats
+	ETC_REPEAT = 0,
+	//! Texture is clamped to the last pixel
+	ETC_CLAMP,
+	//! Texture is clamped to the edge pixel
+	ETC_CLAMP_TO_EDGE,
+	//! Texture is clamped to the border pixel (if exists)
+	ETC_CLAMP_TO_BORDER,
+	//! Texture is alternatingly mirrored (0..1..0..1..0..)
+	ETC_MIRROR,
+	//! Texture is mirrored once and then clamped (0..1..0)
+	ETC_MIRROR_CLAMP,
+	//! Texture is mirrored once and then clamped to edge
+	ETC_MIRROR_CLAMP_TO_EDGE,
+	//! Texture is mirrored once and then clamped to border
+	ETC_MIRROR_CLAMP_TO_BORDER
+};
+static const char *const aTextureClampNames[] = {
+		"texture_clamp_repeat",
+		"texture_clamp_clamp",
+		"texture_clamp_clamp_to_edge",
+		"texture_clamp_clamp_to_border",
+		"texture_clamp_mirror",
+		"texture_clamp_mirror_clamp",
+		"texture_clamp_mirror_clamp_to_edge",
+		"texture_clamp_mirror_clamp_to_border", 0};
+
+//! Texture minification filter.
+/** Used when scaling textures down. See the documentation on OpenGL's
+`GL_TEXTURE_MIN_FILTER` for more information. */
+enum E_TEXTURE_MIN_FILTER
+{
+	//! Aka nearest-neighbor.
+	ETMINF_NEAREST_MIPMAP_NEAREST = 0,
+	//! Aka bilinear.
+	ETMINF_LINEAR_MIPMAP_NEAREST,
+	//! Isn't known by any other name.
+	ETMINF_NEAREST_MIPMAP_LINEAR,
+	//! Aka trilinear.
+	ETMINF_LINEAR_MIPMAP_LINEAR,
+};
+
+//! Texture magnification filter.
+/** Used when scaling textures up. See the documentation on OpenGL's
+`GL_TEXTURE_MAG_FILTER` for more information.
+Note that mipmaps are only used for minification, not for magnification. */
+enum E_TEXTURE_MAG_FILTER
+{
+	//! Aka nearest-neighbor.
+	ETMAGF_NEAREST = 0,
+	//! Aka bilinear.
+	ETMAGF_LINEAR,
+};
+
+//! Struct for holding material parameters which exist per texture layer
+// Note for implementors: Serialization is in CNullDriver
+class SMaterialLayer
+{
+public:
+	//! Default constructor
+	SMaterialLayer() :
+			Texture(0), TextureWrapU(ETC_REPEAT), TextureWrapV(ETC_REPEAT), TextureWrapW(ETC_REPEAT),
+			MinFilter(ETMINF_LINEAR_MIPMAP_NEAREST), MagFilter(ETMAGF_LINEAR), AnisotropicFilter(0), LODBias(0), TextureMatrix(0)
+	{
+	}
+
+	//! Copy constructor
+	/** \param other Material layer to copy from. */
+	SMaterialLayer(const SMaterialLayer &other)
+	{
+		// This pointer is checked during assignment
+		TextureMatrix = 0;
+		*this = other;
+	}
+
+	//! Destructor
+	~SMaterialLayer()
+	{
+		if (TextureMatrix) {
+			delete TextureMatrix;
+		}
+	}
+
+	//! Assignment operator
+	/** \param other Material layer to copy from.
+	\return This material layer, updated. */
+	SMaterialLayer &operator=(const SMaterialLayer &other)
+	{
+		// Check for self-assignment!
+		if (this == &other)
+			return *this;
+
+		Texture = other.Texture;
+		if (TextureMatrix) {
+			if (other.TextureMatrix)
+				*TextureMatrix = *other.TextureMatrix;
+			else {
+				delete TextureMatrix;
+				TextureMatrix = 0;
+			}
+		} else {
+			if (other.TextureMatrix) {
+				TextureMatrix = new core::matrix4(*other.TextureMatrix);
+			} else
+				TextureMatrix = 0;
+		}
+		TextureWrapU = other.TextureWrapU;
+		TextureWrapV = other.TextureWrapV;
+		TextureWrapW = other.TextureWrapW;
+		MinFilter = other.MinFilter;
+		MagFilter = other.MagFilter;
+		AnisotropicFilter = other.AnisotropicFilter;
+		LODBias = other.LODBias;
+
+		return *this;
+	}
+
+	//! Gets the texture transformation matrix
+	/** \return Texture matrix of this layer. */
+	core::matrix4 &getTextureMatrix()
+	{
+		if (!TextureMatrix) {
+			TextureMatrix = new core::matrix4();
+		}
+		return *TextureMatrix;
+	}
+
+	//! Gets the immutable texture transformation matrix
+	/** \return Texture matrix of this layer. */
+	const core::matrix4 &getTextureMatrix() const
+	{
+		if (TextureMatrix)
+			return *TextureMatrix;
+		else
+			return core::IdentityMatrix;
+	}
+
+	//! Sets the texture transformation matrix to mat
+	/** NOTE: Pipelines can ignore this matrix when the
+	texture	is 0.
+	\param mat New texture matrix for this layer. */
+	void setTextureMatrix(const core::matrix4 &mat)
+	{
+		if (!TextureMatrix) {
+			TextureMatrix = new core::matrix4(mat);
+		} else
+			*TextureMatrix = mat;
+	}
+
+	//! Inequality operator
+	/** \param b Layer to compare to.
+	\return True if layers are different, else false. */
+	inline bool operator!=(const SMaterialLayer &b) const
+	{
+		bool different =
+				Texture != b.Texture ||
+				TextureWrapU != b.TextureWrapU ||
+				TextureWrapV != b.TextureWrapV ||
+				TextureWrapW != b.TextureWrapW ||
+				MinFilter != b.MinFilter ||
+				MagFilter != b.MagFilter ||
+				AnisotropicFilter != b.AnisotropicFilter ||
+				LODBias != b.LODBias;
+		if (different)
+			return true;
+		else
+			different |= (TextureMatrix != b.TextureMatrix) &&
+						 (!TextureMatrix || !b.TextureMatrix || (*TextureMatrix != *(b.TextureMatrix)));
+		return different;
+	}
+
+	//! Equality operator
+	/** \param b Layer to compare to.
+	\return True if layers are equal, else false. */
+	inline bool operator==(const SMaterialLayer &b) const
+	{
+		return !(b != *this);
+	}
+
+	//! Texture
+	ITexture *Texture;
+
+	//! Texture Clamp Mode
+	/** Values are taken from E_TEXTURE_CLAMP. */
+	u8 TextureWrapU : 4;
+	u8 TextureWrapV : 4;
+	u8 TextureWrapW : 4;
+
+	//! Minification (downscaling) filter
+	E_TEXTURE_MIN_FILTER MinFilter;
+
+	//! Magnification (upscaling) filter
+	E_TEXTURE_MAG_FILTER MagFilter;
+
+	//! Is anisotropic filtering enabled? Default: 0, disabled
+	/** In Irrlicht you can use anisotropic texture filtering
+	in conjunction with bilinear or trilinear texture
+	filtering to improve rendering results. Primitives
+	will look less blurry with this flag switched on. The number gives
+	the maximal anisotropy degree, and is often in the range 2-16.
+	Value 1 is equivalent to 0, but should be avoided. */
+	u8 AnisotropicFilter;
+
+	//! Bias for the mipmap choosing decision.
+	/** This value can make the textures more or less blurry than with the
+	default value of 0. The value (divided by 8.f) is added to the mipmap level
+	chosen initially, and thus takes a smaller mipmap for a region
+	if the value is positive. */
+	s8 LODBias;
+
+private:
+	friend class SMaterial;
+
+	//! Texture Matrix
+	/** Do not access this element directly as the internal
+	resource management has to cope with Null pointers etc. */
+	core::matrix4 *TextureMatrix;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SMesh.h b/irr/include/SMesh.h
new file mode 100644
index 000000000..e865a5d2d
--- /dev/null
+++ b/irr/include/SMesh.h
@@ -0,0 +1,132 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMesh.h"
+#include "IMeshBuffer.h"
+#include "aabbox3d.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace scene
+{
+//! Simple implementation of the IMesh interface.
+struct SMesh : public IMesh
+{
+	//! constructor
+	SMesh()
+	{
+#ifdef _DEBUG
+		setDebugName("SMesh");
+#endif
+	}
+
+	//! destructor
+	virtual ~SMesh()
+	{
+		// drop buffers
+		for (u32 i = 0; i < MeshBuffers.size(); ++i)
+			MeshBuffers[i]->drop();
+	}
+
+	//! clean mesh
+	virtual void clear()
+	{
+		for (u32 i = 0; i < MeshBuffers.size(); ++i)
+			MeshBuffers[i]->drop();
+		MeshBuffers.clear();
+		BoundingBox.reset(0.f, 0.f, 0.f);
+	}
+
+	//! returns amount of mesh buffers.
+	u32 getMeshBufferCount() const override
+	{
+		return MeshBuffers.size();
+	}
+
+	//! returns pointer to a mesh buffer
+	IMeshBuffer *getMeshBuffer(u32 nr) const override
+	{
+		return MeshBuffers[nr];
+	}
+
+	//! returns a meshbuffer which fits a material
+	/** reverse search */
+	IMeshBuffer *getMeshBuffer(const video::SMaterial &material) const override
+	{
+		for (s32 i = (s32)MeshBuffers.size() - 1; i >= 0; --i) {
+			if (material == MeshBuffers[i]->getMaterial())
+				return MeshBuffers[i];
+		}
+
+		return 0;
+	}
+
+	//! returns an axis aligned bounding box
+	const core::aabbox3d<f32> &getBoundingBox() const override
+	{
+		return BoundingBox;
+	}
+
+	//! set user axis aligned bounding box
+	void setBoundingBox(const core::aabbox3df &box) override
+	{
+		BoundingBox = box;
+	}
+
+	//! recalculates the bounding box
+	void recalculateBoundingBox()
+	{
+		bool hasMeshBufferBBox = false;
+		for (u32 i = 0; i < MeshBuffers.size(); ++i) {
+			const core::aabbox3df &bb = MeshBuffers[i]->getBoundingBox();
+			if (!bb.isEmpty()) {
+				if (!hasMeshBufferBBox) {
+					hasMeshBufferBBox = true;
+					BoundingBox = bb;
+				} else {
+					BoundingBox.addInternalBox(bb);
+				}
+			}
+		}
+
+		if (!hasMeshBufferBBox)
+			BoundingBox.reset(0.0f, 0.0f, 0.0f);
+	}
+
+	//! adds a MeshBuffer
+	/** The bounding box is not updated automatically. */
+	void addMeshBuffer(IMeshBuffer *buf)
+	{
+		if (buf) {
+			buf->grab();
+			MeshBuffers.push_back(buf);
+		}
+	}
+
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		for (u32 i = 0; i < MeshBuffers.size(); ++i)
+			MeshBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
+	}
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		for (u32 i = 0; i < MeshBuffers.size(); ++i)
+			MeshBuffers[i]->setDirty(buffer);
+	}
+
+	//! The meshbuffers of this mesh
+	core::array<IMeshBuffer *> MeshBuffers;
+
+	//! The bounding box of this mesh
+	core::aabbox3d<f32> BoundingBox;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/SMeshBuffer.h b/irr/include/SMeshBuffer.h
new file mode 100644
index 000000000..2053db958
--- /dev/null
+++ b/irr/include/SMeshBuffer.h
@@ -0,0 +1,6 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// replaced by template
+#include "CMeshBuffer.h"
diff --git a/irr/include/SOverrideMaterial.h b/irr/include/SOverrideMaterial.h
new file mode 100644
index 000000000..6de6e6ebb
--- /dev/null
+++ b/irr/include/SOverrideMaterial.h
@@ -0,0 +1,192 @@
+// Copyright (C) 2017 Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SMaterial.h"
+
+namespace irr
+{
+namespace video
+{
+
+struct SOverrideMaterial
+{
+	//! The Material values
+	SMaterial Material;
+
+	//! Which values are overridden
+	/** OR'ed values from E_MATERIAL_PROPS. */
+	u32 EnableProps;
+
+	//! For those properties in EnableProps which affect layers, set which of the layers are affected
+	bool EnableLayerProps[MATERIAL_MAX_TEXTURES];
+
+	//! Which textures are overridden
+	bool EnableTextures[MATERIAL_MAX_TEXTURES];
+
+	//! Overwrite complete layers (settings of EnableLayerProps and EnableTextures don't matter then for layer data)
+	bool EnableLayers[MATERIAL_MAX_TEXTURES];
+
+	//! Set in which render passes the material override is active.
+	/** OR'ed values from E_SCENE_NODE_RENDER_PASS. */
+	u16 EnablePasses;
+
+	//! Global enable flag, overwritten by the SceneManager in each pass
+	/** NOTE: This is generally _not_ set by users of the engine, but the
+	Scenemanager uses the EnablePass array and sets Enabled to true if the
+	Override material is enabled in the current pass.
+	As user you generally _only_ set EnablePasses.
+	The exception is when rendering without SceneManager but using draw calls in the VideoDriver. */
+	bool Enabled;
+
+	struct SMaterialTypeReplacement
+	{
+		SMaterialTypeReplacement(s32 original, u32 replacement) :
+				Original(original), Replacement(replacement) {}
+		SMaterialTypeReplacement(u32 replacement) :
+				Original(-1), Replacement(replacement) {}
+
+		//! SMaterial.MaterialType to replace.
+		//! -1 for all types or a specific value to only replace that one (which is either one of E_MATERIAL_TYPE or a shader material id)
+		s32 Original;
+
+		//! MaterialType to used to override Original (either one of E_MATERIAL_TYPE or a shader material id)
+		u32 Replacement;
+	};
+
+	//! To overwrite SMaterial::MaterialType
+	core::array<SMaterialTypeReplacement> MaterialTypes;
+
+	//! Default constructor
+	SOverrideMaterial() :
+			EnableProps(0), EnablePasses(0), Enabled(false)
+	{
+	}
+
+	//! disable overrides and reset all properties
+	void reset()
+	{
+		EnableProps = 0;
+		EnablePasses = 0;
+		Enabled = false;
+		for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+			EnableLayerProps[i] = true; // doesn't do anything unless EnableProps is set, just saying by default all texture layers are affected by properties
+			EnableTextures[i] = false;
+			EnableLayers[i] = false;
+		}
+		MaterialTypes.clear();
+	}
+
+	//! Apply the enabled overrides
+	void apply(SMaterial &material)
+	{
+		if (Enabled) {
+			for (u32 i = 0; i < MaterialTypes.size(); ++i) {
+				const SMaterialTypeReplacement &mtr = MaterialTypes[i];
+				if (mtr.Original < 0 || (s32)mtr.Original == material.MaterialType)
+					material.MaterialType = (E_MATERIAL_TYPE)mtr.Replacement;
+			}
+			for (u32 f = 0; f < 32; ++f) {
+				const u32 num = (1 << f);
+				if (EnableProps & num) {
+					switch (num) {
+					case EMP_WIREFRAME:
+						material.Wireframe = Material.Wireframe;
+						break;
+					case EMP_POINTCLOUD:
+						material.PointCloud = Material.PointCloud;
+						break;
+					case EMP_GOURAUD_SHADING:
+						material.GouraudShading = Material.GouraudShading;
+						break;
+					case EMP_LIGHTING:
+						material.Lighting = Material.Lighting;
+						break;
+					case EMP_ZBUFFER:
+						material.ZBuffer = Material.ZBuffer;
+						break;
+					case EMP_ZWRITE_ENABLE:
+						material.ZWriteEnable = Material.ZWriteEnable;
+						break;
+					case EMP_BACK_FACE_CULLING:
+						material.BackfaceCulling = Material.BackfaceCulling;
+						break;
+					case EMP_FRONT_FACE_CULLING:
+						material.FrontfaceCulling = Material.FrontfaceCulling;
+						break;
+					case EMP_MIN_FILTER:
+						for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+							if (EnableLayerProps[i]) {
+								material.TextureLayers[i].MinFilter = Material.TextureLayers[i].MinFilter;
+							}
+						}
+						break;
+					case EMP_MAG_FILTER:
+						for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+							if (EnableLayerProps[i]) {
+								material.TextureLayers[i].MagFilter = Material.TextureLayers[i].MagFilter;
+							}
+						}
+						break;
+					case EMP_ANISOTROPIC_FILTER:
+						for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+							if (EnableLayerProps[i]) {
+								material.TextureLayers[i].AnisotropicFilter = Material.TextureLayers[i].AnisotropicFilter;
+							}
+						}
+						break;
+					case EMP_FOG_ENABLE:
+						material.FogEnable = Material.FogEnable;
+						break;
+					case EMP_NORMALIZE_NORMALS:
+						material.NormalizeNormals = Material.NormalizeNormals;
+						break;
+					case EMP_TEXTURE_WRAP:
+						for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+							if (EnableLayerProps[i]) {
+								material.TextureLayers[i].TextureWrapU = Material.TextureLayers[i].TextureWrapU;
+								material.TextureLayers[i].TextureWrapV = Material.TextureLayers[i].TextureWrapV;
+								material.TextureLayers[i].TextureWrapW = Material.TextureLayers[i].TextureWrapW;
+							}
+						}
+						break;
+					case EMP_ANTI_ALIASING:
+						material.AntiAliasing = Material.AntiAliasing;
+						break;
+					case EMP_COLOR_MASK:
+						material.ColorMask = Material.ColorMask;
+						break;
+					case EMP_COLOR_MATERIAL:
+						material.ColorMaterial = Material.ColorMaterial;
+						break;
+					case EMP_USE_MIP_MAPS:
+						material.UseMipMaps = Material.UseMipMaps;
+						break;
+					case EMP_BLEND_OPERATION:
+						material.BlendOperation = Material.BlendOperation;
+						break;
+					case EMP_BLEND_FACTOR:
+						material.BlendFactor = Material.BlendFactor;
+						break;
+					case EMP_POLYGON_OFFSET:
+						material.PolygonOffsetDepthBias = Material.PolygonOffsetDepthBias;
+						material.PolygonOffsetSlopeScale = Material.PolygonOffsetSlopeScale;
+						break;
+					}
+				}
+			}
+			for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+				if (EnableLayers[i]) {
+					material.TextureLayers[i] = Material.TextureLayers[i];
+				} else if (EnableTextures[i]) {
+					material.TextureLayers[i].Texture = Material.TextureLayers[i].Texture;
+				}
+			}
+		}
+	}
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SSkinMeshBuffer.h b/irr/include/SSkinMeshBuffer.h
new file mode 100644
index 000000000..5ced6057d
--- /dev/null
+++ b/irr/include/SSkinMeshBuffer.h
@@ -0,0 +1,398 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMeshBuffer.h"
+#include "S3DVertex.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! A mesh buffer able to choose between S3DVertex2TCoords, S3DVertex and S3DVertexTangents at runtime
+struct SSkinMeshBuffer : public IMeshBuffer
+{
+	//! Default constructor
+	SSkinMeshBuffer(video::E_VERTEX_TYPE vt = video::EVT_STANDARD) :
+			ChangedID_Vertex(1), ChangedID_Index(1), VertexType(vt),
+			PrimitiveType(EPT_TRIANGLES),
+			MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER),
+			HWBuffer(NULL),
+			BoundingBoxNeedsRecalculated(true)
+	{
+#ifdef _DEBUG
+		setDebugName("SSkinMeshBuffer");
+#endif
+	}
+
+	//! Get Material of this buffer.
+	const video::SMaterial &getMaterial() const override
+	{
+		return Material;
+	}
+
+	//! Get Material of this buffer.
+	video::SMaterial &getMaterial() override
+	{
+		return Material;
+	}
+
+	//! Get standard vertex at given index
+	virtual video::S3DVertex *getVertex(u32 index)
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return (video::S3DVertex *)&Vertices_2TCoords[index];
+		case video::EVT_TANGENTS:
+			return (video::S3DVertex *)&Vertices_Tangents[index];
+		default:
+			return &Vertices_Standard[index];
+		}
+	}
+
+	//! Get pointer to vertex array
+	const void *getVertices() const override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords.const_pointer();
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents.const_pointer();
+		default:
+			return Vertices_Standard.const_pointer();
+		}
+	}
+
+	//! Get pointer to vertex array
+	void *getVertices() override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords.pointer();
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents.pointer();
+		default:
+			return Vertices_Standard.pointer();
+		}
+	}
+
+	//! Get vertex count
+	u32 getVertexCount() const override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords.size();
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents.size();
+		default:
+			return Vertices_Standard.size();
+		}
+	}
+
+	//! Get type of index data which is stored in this meshbuffer.
+	/** \return Index type of this buffer. */
+	video::E_INDEX_TYPE getIndexType() const override
+	{
+		return video::EIT_16BIT;
+	}
+
+	//! Get pointer to index array
+	const u16 *getIndices() const override
+	{
+		return Indices.const_pointer();
+	}
+
+	//! Get pointer to index array
+	u16 *getIndices() override
+	{
+		return Indices.pointer();
+	}
+
+	//! Get index count
+	u32 getIndexCount() const override
+	{
+		return Indices.size();
+	}
+
+	//! Get bounding box
+	const core::aabbox3d<f32> &getBoundingBox() const override
+	{
+		return BoundingBox;
+	}
+
+	//! Set bounding box
+	void setBoundingBox(const core::aabbox3df &box) override
+	{
+		BoundingBox = box;
+	}
+
+	//! Recalculate bounding box
+	void recalculateBoundingBox() override
+	{
+		if (!BoundingBoxNeedsRecalculated)
+			return;
+
+		BoundingBoxNeedsRecalculated = false;
+
+		switch (VertexType) {
+		case video::EVT_STANDARD: {
+			if (Vertices_Standard.empty())
+				BoundingBox.reset(0, 0, 0);
+			else {
+				BoundingBox.reset(Vertices_Standard[0].Pos);
+				for (u32 i = 1; i < Vertices_Standard.size(); ++i)
+					BoundingBox.addInternalPoint(Vertices_Standard[i].Pos);
+			}
+			break;
+		}
+		case video::EVT_2TCOORDS: {
+			if (Vertices_2TCoords.empty())
+				BoundingBox.reset(0, 0, 0);
+			else {
+				BoundingBox.reset(Vertices_2TCoords[0].Pos);
+				for (u32 i = 1; i < Vertices_2TCoords.size(); ++i)
+					BoundingBox.addInternalPoint(Vertices_2TCoords[i].Pos);
+			}
+			break;
+		}
+		case video::EVT_TANGENTS: {
+			if (Vertices_Tangents.empty())
+				BoundingBox.reset(0, 0, 0);
+			else {
+				BoundingBox.reset(Vertices_Tangents[0].Pos);
+				for (u32 i = 1; i < Vertices_Tangents.size(); ++i)
+					BoundingBox.addInternalPoint(Vertices_Tangents[i].Pos);
+			}
+			break;
+		}
+		}
+	}
+
+	//! Get vertex type
+	video::E_VERTEX_TYPE getVertexType() const override
+	{
+		return VertexType;
+	}
+
+	//! Convert to 2tcoords vertex type
+	void convertTo2TCoords()
+	{
+		if (VertexType == video::EVT_STANDARD) {
+			for (u32 n = 0; n < Vertices_Standard.size(); ++n) {
+				video::S3DVertex2TCoords Vertex;
+				Vertex.Color = Vertices_Standard[n].Color;
+				Vertex.Pos = Vertices_Standard[n].Pos;
+				Vertex.Normal = Vertices_Standard[n].Normal;
+				Vertex.TCoords = Vertices_Standard[n].TCoords;
+				Vertices_2TCoords.push_back(Vertex);
+			}
+			Vertices_Standard.clear();
+			VertexType = video::EVT_2TCOORDS;
+		}
+	}
+
+	//! Convert to tangents vertex type
+	void convertToTangents()
+	{
+		if (VertexType == video::EVT_STANDARD) {
+			for (u32 n = 0; n < Vertices_Standard.size(); ++n) {
+				video::S3DVertexTangents Vertex;
+				Vertex.Color = Vertices_Standard[n].Color;
+				Vertex.Pos = Vertices_Standard[n].Pos;
+				Vertex.Normal = Vertices_Standard[n].Normal;
+				Vertex.TCoords = Vertices_Standard[n].TCoords;
+				Vertices_Tangents.push_back(Vertex);
+			}
+			Vertices_Standard.clear();
+			VertexType = video::EVT_TANGENTS;
+		} else if (VertexType == video::EVT_2TCOORDS) {
+			for (u32 n = 0; n < Vertices_2TCoords.size(); ++n) {
+				video::S3DVertexTangents Vertex;
+				Vertex.Color = Vertices_2TCoords[n].Color;
+				Vertex.Pos = Vertices_2TCoords[n].Pos;
+				Vertex.Normal = Vertices_2TCoords[n].Normal;
+				Vertex.TCoords = Vertices_2TCoords[n].TCoords;
+				Vertices_Tangents.push_back(Vertex);
+			}
+			Vertices_2TCoords.clear();
+			VertexType = video::EVT_TANGENTS;
+		}
+	}
+
+	//! returns position of vertex i
+	const core::vector3df &getPosition(u32 i) const override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].Pos;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].Pos;
+		default:
+			return Vertices_Standard[i].Pos;
+		}
+	}
+
+	//! returns position of vertex i
+	core::vector3df &getPosition(u32 i) override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].Pos;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].Pos;
+		default:
+			return Vertices_Standard[i].Pos;
+		}
+	}
+
+	//! returns normal of vertex i
+	const core::vector3df &getNormal(u32 i) const override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].Normal;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].Normal;
+		default:
+			return Vertices_Standard[i].Normal;
+		}
+	}
+
+	//! returns normal of vertex i
+	core::vector3df &getNormal(u32 i) override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].Normal;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].Normal;
+		default:
+			return Vertices_Standard[i].Normal;
+		}
+	}
+
+	//! returns texture coords of vertex i
+	const core::vector2df &getTCoords(u32 i) const override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].TCoords;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].TCoords;
+		default:
+			return Vertices_Standard[i].TCoords;
+		}
+	}
+
+	//! returns texture coords of vertex i
+	core::vector2df &getTCoords(u32 i) override
+	{
+		switch (VertexType) {
+		case video::EVT_2TCOORDS:
+			return Vertices_2TCoords[i].TCoords;
+		case video::EVT_TANGENTS:
+			return Vertices_Tangents[i].TCoords;
+		default:
+			return Vertices_Standard[i].TCoords;
+		}
+	}
+
+	//! append the vertices and indices to the current buffer
+	void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) override {}
+
+	//! get the current hardware mapping hint for vertex buffers
+	E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override
+	{
+		return MappingHint_Vertex;
+	}
+
+	//! get the current hardware mapping hint for index buffers
+	E_HARDWARE_MAPPING getHardwareMappingHint_Index() const override
+	{
+		return MappingHint_Index;
+	}
+
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		if (Buffer == EBT_VERTEX)
+			MappingHint_Vertex = NewMappingHint;
+		else if (Buffer == EBT_INDEX)
+			MappingHint_Index = NewMappingHint;
+		else if (Buffer == EBT_VERTEX_AND_INDEX) {
+			MappingHint_Vertex = NewMappingHint;
+			MappingHint_Index = NewMappingHint;
+		}
+	}
+
+	//! Describe what kind of primitive geometry is used by the meshbuffer
+	void setPrimitiveType(E_PRIMITIVE_TYPE type) override
+	{
+		PrimitiveType = type;
+	}
+
+	//! Get the kind of primitive geometry which is used by the meshbuffer
+	E_PRIMITIVE_TYPE getPrimitiveType() const override
+	{
+		return PrimitiveType;
+	}
+
+	//! flags the mesh as changed, reloads hardware buffers
+	void setDirty(E_BUFFER_TYPE Buffer = EBT_VERTEX_AND_INDEX) override
+	{
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_VERTEX)
+			++ChangedID_Vertex;
+		if (Buffer == EBT_VERTEX_AND_INDEX || Buffer == EBT_INDEX)
+			++ChangedID_Index;
+	}
+
+	u32 getChangedID_Vertex() const override { return ChangedID_Vertex; }
+
+	u32 getChangedID_Index() const override { return ChangedID_Index; }
+
+	void setHWBuffer(void *ptr) const override
+	{
+		HWBuffer = ptr;
+	}
+
+	void *getHWBuffer() const override
+	{
+		return HWBuffer;
+	}
+
+	//! Call this after changing the positions of any vertex.
+	void boundingBoxNeedsRecalculated(void) { BoundingBoxNeedsRecalculated = true; }
+
+	core::array<video::S3DVertexTangents> Vertices_Tangents;
+	core::array<video::S3DVertex2TCoords> Vertices_2TCoords;
+	core::array<video::S3DVertex> Vertices_Standard;
+	core::array<u16> Indices;
+
+	u32 ChangedID_Vertex;
+	u32 ChangedID_Index;
+
+	// ISkinnedMesh::SJoint *AttachedJoint;
+	core::matrix4 Transformation;
+
+	video::SMaterial Material;
+	video::E_VERTEX_TYPE VertexType;
+
+	core::aabbox3d<f32> BoundingBox;
+
+	//! Primitive type used for rendering (triangles, lines, ...)
+	E_PRIMITIVE_TYPE PrimitiveType;
+
+	// hardware mapping hint
+	E_HARDWARE_MAPPING MappingHint_Vertex : 3;
+	E_HARDWARE_MAPPING MappingHint_Index : 3;
+
+	mutable void *HWBuffer;
+
+	bool BoundingBoxNeedsRecalculated : 1;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/SVertexIndex.h b/irr/include/SVertexIndex.h
new file mode 100644
index 000000000..21cf42583
--- /dev/null
+++ b/irr/include/SVertexIndex.h
@@ -0,0 +1,20 @@
+// Copyright (C) 2008-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+enum E_INDEX_TYPE
+{
+	EIT_16BIT = 0,
+	EIT_32BIT
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/include/SVertexManipulator.h b/irr/include/SVertexManipulator.h
new file mode 100644
index 000000000..f302273c8
--- /dev/null
+++ b/irr/include/SVertexManipulator.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2009-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "matrix4.h"
+#include "S3DVertex.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class IMesh;
+class IMeshBuffer;
+struct SMesh;
+
+//! Interface for vertex manipulators.
+/** You should derive your manipulator from this class if it shall be called for every vertex, getting as parameter just the vertex.
+ */
+struct IVertexManipulator
+{
+};
+
+//! Vertex manipulator which scales the position of the vertex
+class SVertexPositionScaleManipulator : public IVertexManipulator
+{
+public:
+	SVertexPositionScaleManipulator(const core::vector3df &factor) :
+			Factor(factor) {}
+	template <typename VType>
+	void operator()(VType &vertex) const
+	{
+		vertex.Pos *= Factor;
+	}
+
+private:
+	core::vector3df Factor;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/SViewFrustum.h b/irr/include/SViewFrustum.h
new file mode 100644
index 000000000..06983cc5e
--- /dev/null
+++ b/irr/include/SViewFrustum.h
@@ -0,0 +1,449 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "plane3d.h"
+#include "vector3d.h"
+#include "line3d.h"
+#include "aabbox3d.h"
+#include "matrix4.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Defines the view frustum. That's the space visible by the camera.
+/** The view frustum is enclosed by 6 planes. These six planes share
+eight points. A bounding box around these eight points is also stored in
+this structure.
+*/
+struct SViewFrustum
+{
+	enum VFPLANES
+	{
+		//! Far plane of the frustum. That is the plane furthest away from the eye.
+		VF_FAR_PLANE = 0,
+		//! Near plane of the frustum. That is the plane nearest to the eye.
+		VF_NEAR_PLANE,
+		//! Left plane of the frustum.
+		VF_LEFT_PLANE,
+		//! Right plane of the frustum.
+		VF_RIGHT_PLANE,
+		//! Bottom plane of the frustum.
+		VF_BOTTOM_PLANE,
+		//! Top plane of the frustum.
+		VF_TOP_PLANE,
+
+		//! Amount of planes enclosing the view frustum. Should be 6.
+		VF_PLANE_COUNT
+	};
+
+	//! Default Constructor
+	SViewFrustum() :
+			BoundingRadius(0.f), FarNearDistance(0.f) {}
+
+	//! Copy Constructor
+	SViewFrustum(const SViewFrustum &other);
+
+	//! This constructor creates a view frustum based on a projection and/or view matrix.
+	//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
+	SViewFrustum(const core::matrix4 &mat, bool zClipFromZero);
+
+	//! This constructor creates a view frustum based on a projection and/or view matrix.
+	//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
+	inline void setFrom(const core::matrix4 &mat, bool zClipFromZero);
+
+	//! transforms the frustum by the matrix
+	/** \param mat: Matrix by which the view frustum is transformed.*/
+	void transform(const core::matrix4 &mat);
+
+	//! returns the point which is on the far left upper corner inside the the view frustum.
+	core::vector3df getFarLeftUp() const;
+
+	//! returns the point which is on the far left bottom corner inside the the view frustum.
+	core::vector3df getFarLeftDown() const;
+
+	//! returns the point which is on the far right top corner inside the the view frustum.
+	core::vector3df getFarRightUp() const;
+
+	//! returns the point which is on the far right bottom corner inside the the view frustum.
+	core::vector3df getFarRightDown() const;
+
+	//! returns the point which is on the near left upper corner inside the the view frustum.
+	core::vector3df getNearLeftUp() const;
+
+	//! returns the point which is on the near left bottom corner inside the the view frustum.
+	core::vector3df getNearLeftDown() const;
+
+	//! returns the point which is on the near right top corner inside the the view frustum.
+	core::vector3df getNearRightUp() const;
+
+	//! returns the point which is on the near right bottom corner inside the the view frustum.
+	core::vector3df getNearRightDown() const;
+
+	//! returns a bounding box enclosing the whole view frustum
+	const core::aabbox3d<f32> &getBoundingBox() const;
+
+	//! recalculates the bounding box and sphere based on the planes
+	inline void recalculateBoundingBox();
+
+	//! get the bounding sphere's radius (of an optimized sphere, not the AABB's)
+	float getBoundingRadius() const;
+
+	//! get the bounding sphere's radius (of an optimized sphere, not the AABB's)
+	core::vector3df getBoundingCenter() const;
+
+	//! the cam should tell the frustum the distance between far and near
+	void setFarNearDistance(float distance);
+
+	//! get the given state's matrix based on frustum E_TRANSFORMATION_STATE
+	core::matrix4 &getTransform(video::E_TRANSFORMATION_STATE state);
+
+	//! get the given state's matrix based on frustum E_TRANSFORMATION_STATE
+	const core::matrix4 &getTransform(video::E_TRANSFORMATION_STATE state) const;
+
+	//! clips a line to the view frustum.
+	/** \return True if the line was clipped, false if not */
+	bool clipLine(core::line3d<f32> &line) const;
+
+	//! the position of the camera
+	core::vector3df cameraPosition;
+
+	//! all planes enclosing the view frustum.
+	core::plane3d<f32> planes[VF_PLANE_COUNT];
+
+	//! bounding box around the view frustum
+	core::aabbox3d<f32> boundingBox;
+
+private:
+	//! Hold a copy of important transform matrices
+	enum E_TRANSFORMATION_STATE_FRUSTUM
+	{
+		ETS_VIEW = 0,
+		ETS_PROJECTION = 1,
+		ETS_COUNT_FRUSTUM
+	};
+
+	//! recalculates the bounding sphere based on the planes
+	inline void recalculateBoundingSphere();
+
+	//! Hold a copy of important transform matrices
+	core::matrix4 Matrices[ETS_COUNT_FRUSTUM];
+
+	float BoundingRadius;
+	float FarNearDistance;
+	core::vector3df BoundingCenter;
+};
+
+/*!
+	Copy constructor ViewFrustum
+*/
+inline SViewFrustum::SViewFrustum(const SViewFrustum &other)
+{
+	cameraPosition = other.cameraPosition;
+	boundingBox = other.boundingBox;
+
+	u32 i;
+	for (i = 0; i < VF_PLANE_COUNT; ++i)
+		planes[i] = other.planes[i];
+
+	for (i = 0; i < ETS_COUNT_FRUSTUM; ++i)
+		Matrices[i] = other.Matrices[i];
+
+	BoundingRadius = other.BoundingRadius;
+	FarNearDistance = other.FarNearDistance;
+	BoundingCenter = other.BoundingCenter;
+}
+
+inline SViewFrustum::SViewFrustum(const core::matrix4 &mat, bool zClipFromZero)
+{
+	setFrom(mat, zClipFromZero);
+}
+
+inline void SViewFrustum::transform(const core::matrix4 &mat)
+{
+	for (u32 i = 0; i < VF_PLANE_COUNT; ++i)
+		mat.transformPlane(planes[i]);
+
+	mat.transformVect(cameraPosition);
+	recalculateBoundingBox();
+}
+
+inline core::vector3df SViewFrustum::getFarLeftUp() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_FAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_TOP_PLANE],
+			planes[scene::SViewFrustum::VF_LEFT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getFarLeftDown() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_FAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_BOTTOM_PLANE],
+			planes[scene::SViewFrustum::VF_LEFT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getFarRightUp() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_FAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_TOP_PLANE],
+			planes[scene::SViewFrustum::VF_RIGHT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getFarRightDown() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_FAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_BOTTOM_PLANE],
+			planes[scene::SViewFrustum::VF_RIGHT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getNearLeftUp() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_NEAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_TOP_PLANE],
+			planes[scene::SViewFrustum::VF_LEFT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getNearLeftDown() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_NEAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_BOTTOM_PLANE],
+			planes[scene::SViewFrustum::VF_LEFT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getNearRightUp() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_NEAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_TOP_PLANE],
+			planes[scene::SViewFrustum::VF_RIGHT_PLANE], p);
+
+	return p;
+}
+
+inline core::vector3df SViewFrustum::getNearRightDown() const
+{
+	core::vector3df p;
+	planes[scene::SViewFrustum::VF_NEAR_PLANE].getIntersectionWithPlanes(
+			planes[scene::SViewFrustum::VF_BOTTOM_PLANE],
+			planes[scene::SViewFrustum::VF_RIGHT_PLANE], p);
+
+	return p;
+}
+
+inline const core::aabbox3d<f32> &SViewFrustum::getBoundingBox() const
+{
+	return boundingBox;
+}
+
+inline void SViewFrustum::recalculateBoundingBox()
+{
+	boundingBox.reset(getNearLeftUp());
+	boundingBox.addInternalPoint(getNearRightUp());
+	boundingBox.addInternalPoint(getNearLeftDown());
+	boundingBox.addInternalPoint(getNearRightDown());
+	boundingBox.addInternalPoint(getFarRightUp());
+	boundingBox.addInternalPoint(getFarLeftDown());
+	boundingBox.addInternalPoint(getFarRightDown());
+	boundingBox.addInternalPoint(getFarLeftUp());
+
+	// Also recalculate the bounding sphere when the bbox changes
+	recalculateBoundingSphere();
+}
+
+inline float SViewFrustum::getBoundingRadius() const
+{
+	return BoundingRadius;
+}
+
+inline core::vector3df SViewFrustum::getBoundingCenter() const
+{
+	return BoundingCenter;
+}
+
+inline void SViewFrustum::setFarNearDistance(float distance)
+{
+	FarNearDistance = distance;
+}
+
+//! This constructor creates a view frustum based on a projection
+//! and/or view matrix.
+inline void SViewFrustum::setFrom(const core::matrix4 &mat, bool zClipFromZero)
+{
+	// left clipping plane
+	planes[VF_LEFT_PLANE].Normal.X = mat[3] + mat[0];
+	planes[VF_LEFT_PLANE].Normal.Y = mat[7] + mat[4];
+	planes[VF_LEFT_PLANE].Normal.Z = mat[11] + mat[8];
+	planes[VF_LEFT_PLANE].D = mat[15] + mat[12];
+
+	// right clipping plane
+	planes[VF_RIGHT_PLANE].Normal.X = mat[3] - mat[0];
+	planes[VF_RIGHT_PLANE].Normal.Y = mat[7] - mat[4];
+	planes[VF_RIGHT_PLANE].Normal.Z = mat[11] - mat[8];
+	planes[VF_RIGHT_PLANE].D = mat[15] - mat[12];
+
+	// top clipping plane
+	planes[VF_TOP_PLANE].Normal.X = mat[3] - mat[1];
+	planes[VF_TOP_PLANE].Normal.Y = mat[7] - mat[5];
+	planes[VF_TOP_PLANE].Normal.Z = mat[11] - mat[9];
+	planes[VF_TOP_PLANE].D = mat[15] - mat[13];
+
+	// bottom clipping plane
+	planes[VF_BOTTOM_PLANE].Normal.X = mat[3] + mat[1];
+	planes[VF_BOTTOM_PLANE].Normal.Y = mat[7] + mat[5];
+	planes[VF_BOTTOM_PLANE].Normal.Z = mat[11] + mat[9];
+	planes[VF_BOTTOM_PLANE].D = mat[15] + mat[13];
+
+	// far clipping plane
+	planes[VF_FAR_PLANE].Normal.X = mat[3] - mat[2];
+	planes[VF_FAR_PLANE].Normal.Y = mat[7] - mat[6];
+	planes[VF_FAR_PLANE].Normal.Z = mat[11] - mat[10];
+	planes[VF_FAR_PLANE].D = mat[15] - mat[14];
+
+	// near clipping plane
+	if (zClipFromZero) {
+		planes[VF_NEAR_PLANE].Normal.X = mat[2];
+		planes[VF_NEAR_PLANE].Normal.Y = mat[6];
+		planes[VF_NEAR_PLANE].Normal.Z = mat[10];
+		planes[VF_NEAR_PLANE].D = mat[14];
+	} else {
+		// near clipping plane
+		planes[VF_NEAR_PLANE].Normal.X = mat[3] + mat[2];
+		planes[VF_NEAR_PLANE].Normal.Y = mat[7] + mat[6];
+		planes[VF_NEAR_PLANE].Normal.Z = mat[11] + mat[10];
+		planes[VF_NEAR_PLANE].D = mat[15] + mat[14];
+	}
+
+	// normalize normals
+	u32 i;
+	for (i = 0; i != VF_PLANE_COUNT; ++i) {
+		const f32 len = -core::reciprocal_squareroot(
+				planes[i].Normal.getLengthSQ());
+		planes[i].Normal *= len;
+		planes[i].D *= len;
+	}
+
+	// make bounding box
+	recalculateBoundingBox();
+}
+
+/*!
+	View Frustum depends on Projection & View Matrix
+*/
+inline core::matrix4 &SViewFrustum::getTransform(video::E_TRANSFORMATION_STATE state)
+{
+	u32 index = 0;
+	switch (state) {
+	case video::ETS_PROJECTION:
+		index = SViewFrustum::ETS_PROJECTION;
+		break;
+	case video::ETS_VIEW:
+		index = SViewFrustum::ETS_VIEW;
+		break;
+	default:
+		break;
+	}
+	return Matrices[index];
+}
+
+/*!
+	View Frustum depends on Projection & View Matrix
+*/
+inline const core::matrix4 &SViewFrustum::getTransform(video::E_TRANSFORMATION_STATE state) const
+{
+	u32 index = 0;
+	switch (state) {
+	case video::ETS_PROJECTION:
+		index = SViewFrustum::ETS_PROJECTION;
+		break;
+	case video::ETS_VIEW:
+		index = SViewFrustum::ETS_VIEW;
+		break;
+	default:
+		break;
+	}
+	return Matrices[index];
+}
+
+//! Clips a line to the frustum
+inline bool SViewFrustum::clipLine(core::line3d<f32> &line) const
+{
+	bool wasClipped = false;
+	for (u32 i = 0; i < VF_PLANE_COUNT; ++i) {
+		if (planes[i].classifyPointRelation(line.start) == core::ISREL3D_FRONT) {
+			line.start = line.start.getInterpolated(line.end,
+					1.f - planes[i].getKnownIntersectionWithLine(line.start, line.end));
+			wasClipped = true;
+		}
+		if (planes[i].classifyPointRelation(line.end) == core::ISREL3D_FRONT) {
+			line.end = line.start.getInterpolated(line.end,
+					1.f - planes[i].getKnownIntersectionWithLine(line.start, line.end));
+			wasClipped = true;
+		}
+	}
+	return wasClipped;
+}
+
+inline void SViewFrustum::recalculateBoundingSphere()
+{
+	// Find the center
+	const float shortlen = (getNearLeftUp() - getNearRightUp()).getLength();
+	const float longlen = (getFarLeftUp() - getFarRightUp()).getLength();
+
+	const float farlen = FarNearDistance;
+	const float fartocenter = (farlen + (shortlen - longlen) * (shortlen + longlen) / (4 * farlen)) / 2;
+	const float neartocenter = farlen - fartocenter;
+
+	BoundingCenter = cameraPosition + -planes[VF_NEAR_PLANE].Normal * neartocenter;
+
+	// Find the radius
+	core::vector3df dir[8];
+	dir[0] = getFarLeftUp() - BoundingCenter;
+	dir[1] = getFarRightUp() - BoundingCenter;
+	dir[2] = getFarLeftDown() - BoundingCenter;
+	dir[3] = getFarRightDown() - BoundingCenter;
+	dir[4] = getNearRightDown() - BoundingCenter;
+	dir[5] = getNearLeftDown() - BoundingCenter;
+	dir[6] = getNearRightUp() - BoundingCenter;
+	dir[7] = getNearLeftUp() - BoundingCenter;
+
+	u32 i = 0;
+	float diam[8] = {0.f};
+
+	for (i = 0; i < 8; ++i)
+		diam[i] = dir[i].getLengthSQ();
+
+	float longest = 0;
+
+	for (i = 0; i < 8; ++i) {
+		if (diam[i] > longest)
+			longest = diam[i];
+	}
+
+	BoundingRadius = sqrtf(longest);
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/SceneParameters.h b/irr/include/SceneParameters.h
new file mode 100644
index 000000000..717797e26
--- /dev/null
+++ b/irr/include/SceneParameters.h
@@ -0,0 +1,50 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+/*! \file SceneParameters.h
+	\brief Header file containing all scene parameters for modifying mesh loading etc.
+
+	This file includes all parameter names which can be set using ISceneManager::getParameters()
+	to modify the behavior of plugins and mesh loaders.
+*/
+
+namespace irr
+{
+namespace scene
+{
+//! Name of the parameter for changing how Irrlicht handles the ZWrite flag for transparent (blending) materials
+/** The default behavior in Irrlicht is to disable writing to the
+z-buffer for all really transparent, i.e. blending materials. This
+avoids problems with intersecting faces, but can also break renderings.
+If transparent materials should use the SMaterial flag for ZWriteEnable
+just as other material types use this attribute.
+Use it like this:
+\code
+SceneManager->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
+\endcode
+**/
+const c8 *const ALLOW_ZWRITE_ON_TRANSPARENT = "Allow_ZWrite_On_Transparent";
+
+//! Flag to avoid loading group structures in .obj files
+/** Use it like this:
+\code
+SceneManager->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_GROUPS, true);
+\endcode
+**/
+const c8 *const OBJ_LOADER_IGNORE_GROUPS = "OBJ_IgnoreGroups";
+
+//! Flag to avoid loading material .mtl file for .obj files
+/** Use it like this:
+\code
+SceneManager->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
+\endcode
+**/
+const c8 *const OBJ_LOADER_IGNORE_MATERIAL_FILES = "OBJ_IgnoreMaterialFiles";
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/include/aabbox3d.h b/irr/include/aabbox3d.h
new file mode 100644
index 000000000..81c2293ad
--- /dev/null
+++ b/irr/include/aabbox3d.h
@@ -0,0 +1,389 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrMath.h"
+#include "plane3d.h"
+#include "line3d.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! Axis aligned bounding box in 3d dimensional space.
+/** Has some useful methods used with occlusion culling or clipping.
+ */
+template <class T>
+class aabbox3d
+{
+public:
+	//! Default Constructor.
+	constexpr aabbox3d() :
+			MinEdge(-1, -1, -1), MaxEdge(1, 1, 1) {}
+	//! Constructor with min edge and max edge.
+	constexpr aabbox3d(const vector3d<T> &min, const vector3d<T> &max) :
+			MinEdge(min), MaxEdge(max) {}
+	//! Constructor with only one point.
+	constexpr aabbox3d(const vector3d<T> &init) :
+			MinEdge(init), MaxEdge(init) {}
+	//! Constructor with min edge and max edge as single values, not vectors.
+	constexpr aabbox3d(T minx, T miny, T minz, T maxx, T maxy, T maxz) :
+			MinEdge(minx, miny, minz), MaxEdge(maxx, maxy, maxz) {}
+
+	// operators
+	//! Equality operator
+	/** \param other box to compare with.
+	\return True if both boxes are equal, else false. */
+	constexpr inline bool operator==(const aabbox3d<T> &other) const
+	{
+		return (MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);
+	}
+	//! Inequality operator
+	/** \param other box to compare with.
+	\return True if both boxes are different, else false. */
+	constexpr inline bool operator!=(const aabbox3d<T> &other) const
+	{
+		return !(MinEdge == other.MinEdge && other.MaxEdge == MaxEdge);
+	}
+
+	// functions
+
+	//! Resets the bounding box to a one-point box.
+	/** \param x X coord of the point.
+	\param y Y coord of the point.
+	\param z Z coord of the point. */
+	void reset(T x, T y, T z)
+	{
+		MaxEdge.set(x, y, z);
+		MinEdge = MaxEdge;
+	}
+
+	//! Resets the bounding box.
+	/** \param initValue New box to set this one to. */
+	void reset(const aabbox3d<T> &initValue)
+	{
+		*this = initValue;
+	}
+
+	//! Resets the bounding box to a one-point box.
+	/** \param initValue New point. */
+	void reset(const vector3d<T> &initValue)
+	{
+		MaxEdge = initValue;
+		MinEdge = initValue;
+	}
+
+	//! Adds a point to the bounding box
+	/** The box grows bigger, if point was outside of the box.
+	\param p: Point to add into the box. */
+	void addInternalPoint(const vector3d<T> &p)
+	{
+		addInternalPoint(p.X, p.Y, p.Z);
+	}
+
+	//! Adds another bounding box
+	/** The box grows bigger, if the new box was outside of the box.
+	\param b: Other bounding box to add into this box. */
+	void addInternalBox(const aabbox3d<T> &b)
+	{
+		addInternalPoint(b.MaxEdge);
+		addInternalPoint(b.MinEdge);
+	}
+
+	//! Adds a point to the bounding box
+	/** The box grows bigger, if point is outside of the box.
+	\param x X coordinate of the point to add to this box.
+	\param y Y coordinate of the point to add to this box.
+	\param z Z coordinate of the point to add to this box. */
+	void addInternalPoint(T x, T y, T z)
+	{
+		if (x > MaxEdge.X)
+			MaxEdge.X = x;
+		if (y > MaxEdge.Y)
+			MaxEdge.Y = y;
+		if (z > MaxEdge.Z)
+			MaxEdge.Z = z;
+
+		if (x < MinEdge.X)
+			MinEdge.X = x;
+		if (y < MinEdge.Y)
+			MinEdge.Y = y;
+		if (z < MinEdge.Z)
+			MinEdge.Z = z;
+	}
+
+	//! Get center of the bounding box
+	/** \return Center of the bounding box. */
+	vector3d<T> getCenter() const
+	{
+		return (MinEdge + MaxEdge) / 2;
+	}
+
+	//! Get extent of the box (maximal distance of two points in the box)
+	/** \return Extent of the bounding box. */
+	vector3d<T> getExtent() const
+	{
+		return MaxEdge - MinEdge;
+	}
+
+	//! Get radius of the bounding sphere
+	/** \return Radius of the bounding sphere. */
+	T getRadius() const
+	{
+		const T radius = getExtent().getLength() / 2;
+		return radius;
+	}
+
+	//! Check if the box is empty.
+	/** This means that there is no space between the min and max edge.
+	\return True if box is empty, else false. */
+	bool isEmpty() const
+	{
+		return MinEdge.equals(MaxEdge);
+	}
+
+	//! Get the volume enclosed by the box in cubed units
+	T getVolume() const
+	{
+		const vector3d<T> e = getExtent();
+		return e.X * e.Y * e.Z;
+	}
+
+	//! Get the surface area of the box in squared units
+	T getArea() const
+	{
+		const vector3d<T> e = getExtent();
+		return 2 * (e.X * e.Y + e.X * e.Z + e.Y * e.Z);
+	}
+
+	//! Stores all 8 edges of the box into an array
+	/** \param edges: Pointer to array of 8 edges. */
+	void getEdges(vector3d<T> *edges) const
+	{
+		const core::vector3d<T> middle = getCenter();
+		const core::vector3d<T> diag = middle - MaxEdge;
+
+		/*
+		Edges are stored in this way:
+		Hey, am I an ascii artist, or what? :) niko.
+			   /3--------/7
+			  / |       / |
+			 /  |      /  |
+			1---------5   |
+			|  /2- - -|- -6
+			| /       |  /
+			|/        | /
+			0---------4/
+		*/
+
+		edges[0].set(middle.X + diag.X, middle.Y + diag.Y, middle.Z + diag.Z);
+		edges[1].set(middle.X + diag.X, middle.Y - diag.Y, middle.Z + diag.Z);
+		edges[2].set(middle.X + diag.X, middle.Y + diag.Y, middle.Z - diag.Z);
+		edges[3].set(middle.X + diag.X, middle.Y - diag.Y, middle.Z - diag.Z);
+		edges[4].set(middle.X - diag.X, middle.Y + diag.Y, middle.Z + diag.Z);
+		edges[5].set(middle.X - diag.X, middle.Y - diag.Y, middle.Z + diag.Z);
+		edges[6].set(middle.X - diag.X, middle.Y + diag.Y, middle.Z - diag.Z);
+		edges[7].set(middle.X - diag.X, middle.Y - diag.Y, middle.Z - diag.Z);
+	}
+
+	//! Repairs the box.
+	/** Necessary if for example MinEdge and MaxEdge are swapped. */
+	void repair()
+	{
+		T t;
+
+		if (MinEdge.X > MaxEdge.X) {
+			t = MinEdge.X;
+			MinEdge.X = MaxEdge.X;
+			MaxEdge.X = t;
+		}
+		if (MinEdge.Y > MaxEdge.Y) {
+			t = MinEdge.Y;
+			MinEdge.Y = MaxEdge.Y;
+			MaxEdge.Y = t;
+		}
+		if (MinEdge.Z > MaxEdge.Z) {
+			t = MinEdge.Z;
+			MinEdge.Z = MaxEdge.Z;
+			MaxEdge.Z = t;
+		}
+	}
+
+	// Check if MaxEdge > MinEdge
+	bool isValid() const
+	{
+		if (MinEdge.X > MaxEdge.X)
+			return false;
+		if (MinEdge.Y > MaxEdge.Y)
+			return false;
+		if (MinEdge.Z > MaxEdge.Z)
+			return false;
+
+		return true;
+	}
+
+	//! Calculates a new interpolated bounding box.
+	/** d=0 returns other, d=1 returns this, all other values blend between
+	the two boxes.
+	\param other Other box to interpolate between
+	\param d Value between 0.0f and 1.0f.
+	\return Interpolated box. */
+	aabbox3d<T> getInterpolated(const aabbox3d<T> &other, f32 d) const
+	{
+		f32 inv = 1.0f - d;
+		return aabbox3d<T>((other.MinEdge * inv) + (MinEdge * d),
+				(other.MaxEdge * inv) + (MaxEdge * d));
+	}
+
+	//! Determines if a point is within this box.
+	/** Border is included (IS part of the box)!
+	\param p: Point to check.
+	\return True if the point is within the box and false if not */
+	bool isPointInside(const vector3d<T> &p) const
+	{
+		return (p.X >= MinEdge.X && p.X <= MaxEdge.X &&
+				p.Y >= MinEdge.Y && p.Y <= MaxEdge.Y &&
+				p.Z >= MinEdge.Z && p.Z <= MaxEdge.Z);
+	}
+
+	//! Determines if a point is within this box and not its borders.
+	/** Border is excluded (NOT part of the box)!
+	\param p: Point to check.
+	\return True if the point is within the box and false if not. */
+	bool isPointTotalInside(const vector3d<T> &p) const
+	{
+		return (p.X > MinEdge.X && p.X < MaxEdge.X &&
+				p.Y > MinEdge.Y && p.Y < MaxEdge.Y &&
+				p.Z > MinEdge.Z && p.Z < MaxEdge.Z);
+	}
+
+	//! Check if this box is completely inside the 'other' box.
+	/** \param other: Other box to check against.
+	\return True if this box is completely inside the other box,
+	otherwise false. */
+	bool isFullInside(const aabbox3d<T> &other) const
+	{
+		return (MinEdge.X >= other.MinEdge.X && MinEdge.Y >= other.MinEdge.Y && MinEdge.Z >= other.MinEdge.Z &&
+				MaxEdge.X <= other.MaxEdge.X && MaxEdge.Y <= other.MaxEdge.Y && MaxEdge.Z <= other.MaxEdge.Z);
+	}
+
+	//! Returns the intersection of this box with another, if possible.
+	aabbox3d<T> intersect(const aabbox3d<T> &other) const
+	{
+		aabbox3d<T> out;
+
+		if (!intersectsWithBox(other))
+			return out;
+
+		out.MaxEdge.X = min_(MaxEdge.X, other.MaxEdge.X);
+		out.MaxEdge.Y = min_(MaxEdge.Y, other.MaxEdge.Y);
+		out.MaxEdge.Z = min_(MaxEdge.Z, other.MaxEdge.Z);
+
+		out.MinEdge.X = max_(MinEdge.X, other.MinEdge.X);
+		out.MinEdge.Y = max_(MinEdge.Y, other.MinEdge.Y);
+		out.MinEdge.Z = max_(MinEdge.Z, other.MinEdge.Z);
+
+		return out;
+	}
+
+	//! Determines if the axis-aligned box intersects with another axis-aligned box.
+	/** \param other: Other box to check a intersection with.
+	\return True if there is an intersection with the other box,
+	otherwise false. */
+	bool intersectsWithBox(const aabbox3d<T> &other) const
+	{
+		return (MinEdge.X <= other.MaxEdge.X && MinEdge.Y <= other.MaxEdge.Y && MinEdge.Z <= other.MaxEdge.Z &&
+				MaxEdge.X >= other.MinEdge.X && MaxEdge.Y >= other.MinEdge.Y && MaxEdge.Z >= other.MinEdge.Z);
+	}
+
+	//! Tests if the box intersects with a line
+	/** \param line: Line to test intersection with.
+	\return True if there is an intersection , else false. */
+	bool intersectsWithLine(const line3d<T> &line) const
+	{
+		return intersectsWithLine(line.getMiddle(), line.getVector().normalize(),
+				(T)(line.getLength() * 0.5));
+	}
+
+	//! Tests if the box intersects with a line
+	/** \param linemiddle Center of the line.
+	\param linevect Vector of the line.
+	\param halflength Half length of the line.
+	\return True if there is an intersection, else false. */
+	bool intersectsWithLine(const vector3d<T> &linemiddle,
+			const vector3d<T> &linevect, T halflength) const
+	{
+		const vector3d<T> e = getExtent() * (T)0.5;
+		const vector3d<T> t = getCenter() - linemiddle;
+
+		if ((fabs(t.X) > e.X + halflength * fabs(linevect.X)) ||
+				(fabs(t.Y) > e.Y + halflength * fabs(linevect.Y)) ||
+				(fabs(t.Z) > e.Z + halflength * fabs(linevect.Z)))
+			return false;
+
+		T r = e.Y * (T)fabs(linevect.Z) + e.Z * (T)fabs(linevect.Y);
+		if (fabs(t.Y * linevect.Z - t.Z * linevect.Y) > r)
+			return false;
+
+		r = e.X * (T)fabs(linevect.Z) + e.Z * (T)fabs(linevect.X);
+		if (fabs(t.Z * linevect.X - t.X * linevect.Z) > r)
+			return false;
+
+		r = e.X * (T)fabs(linevect.Y) + e.Y * (T)fabs(linevect.X);
+		if (fabs(t.X * linevect.Y - t.Y * linevect.X) > r)
+			return false;
+
+		return true;
+	}
+
+	//! Classifies a relation with a plane.
+	/** \param plane Plane to classify relation to.
+	\return Returns ISREL3D_FRONT if the box is in front of the plane,
+	ISREL3D_BACK if the box is behind the plane, and
+	ISREL3D_CLIPPED if it is on both sides of the plane. */
+	EIntersectionRelation3D classifyPlaneRelation(const plane3d<T> &plane) const
+	{
+		vector3d<T> nearPoint(MaxEdge);
+		vector3d<T> farPoint(MinEdge);
+
+		if (plane.Normal.X > (T)0) {
+			nearPoint.X = MinEdge.X;
+			farPoint.X = MaxEdge.X;
+		}
+
+		if (plane.Normal.Y > (T)0) {
+			nearPoint.Y = MinEdge.Y;
+			farPoint.Y = MaxEdge.Y;
+		}
+
+		if (plane.Normal.Z > (T)0) {
+			nearPoint.Z = MinEdge.Z;
+			farPoint.Z = MaxEdge.Z;
+		}
+
+		if (plane.Normal.dotProduct(nearPoint) + plane.D > (T)0)
+			return ISREL3D_FRONT;
+
+		if (plane.Normal.dotProduct(farPoint) + plane.D > (T)0)
+			return ISREL3D_CLIPPED;
+
+		return ISREL3D_BACK;
+	}
+
+	//! The near edge
+	vector3d<T> MinEdge;
+
+	//! The far edge
+	vector3d<T> MaxEdge;
+};
+
+//! Typedef for a f32 3d bounding box.
+typedef aabbox3d<f32> aabbox3df;
+//! Typedef for an integer 3d bounding box.
+typedef aabbox3d<s32> aabbox3di;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/coreutil.h b/irr/include/coreutil.h
new file mode 100644
index 000000000..60014c4a7
--- /dev/null
+++ b/irr/include/coreutil.h
@@ -0,0 +1,194 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrString.h"
+#include "path.h"
+
+namespace irr
+{
+namespace core
+{
+
+/*! \file coreutil.h
+	\brief File containing useful basic utility functions
+*/
+
+// ----------- some basic quite often used string functions -----------------
+
+//! search if a filename has a proper extension
+inline s32 isFileExtension(const io::path &filename, const io::path &ext0,
+		const io::path &ext1, const io::path &ext2)
+{
+	s32 extPos = filename.findLast('.');
+	if (extPos < 0)
+		return 0;
+
+	extPos += 1;
+	if (filename.equals_substring_ignore_case(ext0, extPos))
+		return 1;
+	if (filename.equals_substring_ignore_case(ext1, extPos))
+		return 2;
+	if (filename.equals_substring_ignore_case(ext2, extPos))
+		return 3;
+	return 0;
+}
+
+//! search if a filename has a proper extension
+inline bool hasFileExtension(const io::path &filename, const io::path &ext0,
+		const io::path &ext1 = "", const io::path &ext2 = "")
+{
+	return isFileExtension(filename, ext0, ext1, ext2) > 0;
+}
+
+//! cut the filename extension from a source file path and store it in a dest file path
+inline io::path &cutFilenameExtension(io::path &dest, const io::path &source)
+{
+	s32 endPos = source.findLast('.');
+	dest = source.subString(0, endPos < 0 ? source.size() : endPos);
+	return dest;
+}
+
+//! get the filename extension from a file path
+inline io::path &getFileNameExtension(io::path &dest, const io::path &source)
+{
+	s32 endPos = source.findLast('.');
+	if (endPos < 0)
+		dest = "";
+	else
+		dest = source.subString(endPos, source.size());
+	return dest;
+}
+
+//! delete path from filename
+inline io::path &deletePathFromFilename(io::path &filename)
+{
+	// delete path from filename
+	const fschar_t *s = filename.c_str();
+	const fschar_t *p = s + filename.size();
+
+	// search for path separator or beginning
+	while (*p != '/' && *p != '\\' && p != s)
+		p--;
+
+	if (p != s) {
+		++p;
+		filename = p;
+	}
+	return filename;
+}
+
+//! trim paths
+inline io::path &deletePathFromPath(io::path &filename, s32 pathCount)
+{
+	// delete path from filename
+	s32 i = filename.size();
+
+	// search for path separator or beginning
+	while (i >= 0) {
+		if (filename[i] == '/' || filename[i] == '\\') {
+			if (--pathCount <= 0)
+				break;
+		}
+		--i;
+	}
+
+	if (i > 0) {
+		filename[i + 1] = 0;
+		filename.validate();
+	} else
+		filename = "";
+	return filename;
+}
+
+//! looks if file is in the same directory of path. returns offset of directory.
+//! 0 means in same directory. 1 means file is direct child of path
+inline s32 isInSameDirectory(const io::path &path, const io::path &file)
+{
+	if (path.size() && !path.equalsn(file, path.size()))
+		return -1;
+
+	s32 subA = 0;
+	s32 subB = 0;
+	s32 pos = 0;
+	while ((pos = path.findNext('/', pos)) >= 0) {
+		subA += 1;
+		pos += 1;
+	}
+
+	pos = 0;
+	while ((pos = file.findNext('/', pos)) >= 0) {
+		subB += 1;
+		pos += 1;
+	}
+
+	return subB - subA;
+}
+
+//! splits a path into components
+static inline void splitFilename(const io::path &name, io::path *path = 0,
+		io::path *filename = 0, io::path *extension = 0, bool make_lower = false)
+{
+	s32 i = name.size();
+	s32 extpos = i;
+
+	// search for path separator or beginning
+	while (i >= 0) {
+		if (name[i] == '.') {
+			extpos = i;
+			if (extension)
+				*extension = name.subString(extpos + 1, name.size() - (extpos + 1), make_lower);
+		} else if (name[i] == '/' || name[i] == '\\') {
+			if (filename)
+				*filename = name.subString(i + 1, extpos - (i + 1), make_lower);
+			if (path) {
+				*path = name.subString(0, i + 1, make_lower);
+				path->replace('\\', '/');
+			}
+			return;
+		}
+		i -= 1;
+	}
+	if (filename)
+		*filename = name.subString(0, extpos, make_lower);
+}
+
+//! create a filename from components
+static inline io::path mergeFilename(const io::path &path, const io::path &filename, const io::path &extension = "")
+{
+	io::path result(path);
+
+	if (!result.empty()) {
+		fschar_t last = result.lastChar();
+		if (last != _IRR_TEXT('/') && last != _IRR_TEXT('\\'))
+			result += _IRR_TEXT('/');
+	}
+	if (!filename.empty())
+		result += filename;
+	if (!extension.empty()) {
+		if (!result.empty() && extension[0] != _IRR_TEXT('.'))
+			result += _IRR_TEXT('.');
+		result += extension;
+	}
+
+	return result;
+}
+
+//! some standard function ( to remove dependencies )
+inline bool isdigit(s32 c)
+{
+	return c >= '0' && c <= '9';
+}
+inline bool isspace(s32 c)
+{
+	return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
+}
+inline bool isupper(s32 c)
+{
+	return c >= 'A' && c <= 'Z';
+}
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/dimension2d.h b/irr/include/dimension2d.h
new file mode 100644
index 000000000..ab6c81c30
--- /dev/null
+++ b/irr/include/dimension2d.h
@@ -0,0 +1,216 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "irrMath.h" // for irr::core::equals()
+
+namespace irr
+{
+namespace core
+{
+template <class T>
+class vector2d;
+
+//! Specifies a 2 dimensional size.
+template <class T>
+class dimension2d
+{
+public:
+	//! Default constructor for empty dimension
+	constexpr dimension2d() :
+			Width(0), Height(0) {}
+	//! Constructor with width and height
+	constexpr dimension2d(const T &width, const T &height) :
+			Width(width), Height(height) {}
+
+	dimension2d(const vector2d<T> &other); // Defined in vector2d.h
+
+	//! Use this constructor only where you are sure that the conversion is valid.
+	template <class U>
+	explicit constexpr dimension2d(const dimension2d<U> &other) :
+			Width((T)other.Width), Height((T)other.Height)
+	{
+	}
+
+	template <class U>
+	dimension2d<T> &operator=(const dimension2d<U> &other)
+	{
+		Width = (T)other.Width;
+		Height = (T)other.Height;
+		return *this;
+	}
+
+	//! Equality operator
+	bool operator==(const dimension2d<T> &other) const
+	{
+		return core::equals(Width, other.Width) &&
+			   core::equals(Height, other.Height);
+	}
+
+	//! Inequality operator
+	bool operator!=(const dimension2d<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	bool operator==(const vector2d<T> &other) const; // Defined in vector2d.h
+
+	bool operator!=(const vector2d<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	//! Set to new values
+	dimension2d<T> &set(const T &width, const T &height)
+	{
+		Width = width;
+		Height = height;
+		return *this;
+	}
+
+	//! Divide width and height by scalar
+	dimension2d<T> &operator/=(const T &scale)
+	{
+		Width /= scale;
+		Height /= scale;
+		return *this;
+	}
+
+	//! Divide width and height by scalar
+	dimension2d<T> operator/(const T &scale) const
+	{
+		return dimension2d<T>(Width / scale, Height / scale);
+	}
+
+	//! Multiply width and height by scalar
+	dimension2d<T> &operator*=(const T &scale)
+	{
+		Width *= scale;
+		Height *= scale;
+		return *this;
+	}
+
+	//! Multiply width and height by scalar
+	dimension2d<T> operator*(const T &scale) const
+	{
+		return dimension2d<T>(Width * scale, Height * scale);
+	}
+
+	//! Add another dimension to this one.
+	dimension2d<T> &operator+=(const dimension2d<T> &other)
+	{
+		Width += other.Width;
+		Height += other.Height;
+		return *this;
+	}
+
+	//! Add two dimensions
+	dimension2d<T> operator+(const dimension2d<T> &other) const
+	{
+		return dimension2d<T>(Width + other.Width, Height + other.Height);
+	}
+
+	//! Subtract a dimension from this one
+	dimension2d<T> &operator-=(const dimension2d<T> &other)
+	{
+		Width -= other.Width;
+		Height -= other.Height;
+		return *this;
+	}
+
+	//! Subtract one dimension from another
+	dimension2d<T> operator-(const dimension2d<T> &other) const
+	{
+		return dimension2d<T>(Width - other.Width, Height - other.Height);
+	}
+
+	//! Get area
+	T getArea() const
+	{
+		return Width * Height;
+	}
+
+	//! Get the optimal size according to some properties
+	/** This is a function often used for texture dimension
+	calculations. The function returns the next larger or
+	smaller dimension which is a power-of-two dimension
+	(2^n,2^m) and/or square (Width=Height).
+	\param requirePowerOfTwo Forces the result to use only
+	powers of two as values.
+	\param requireSquare Makes width==height in the result
+	\param larger Choose whether the result is larger or
+	smaller than the current dimension. If one dimension
+	need not be changed it is kept with any value of larger.
+	\param maxValue Maximum texturesize. if value > 0 size is
+	clamped to maxValue
+	\return The optimal dimension under the given
+	constraints. */
+	dimension2d<T> getOptimalSize(
+			bool requirePowerOfTwo = true,
+			bool requireSquare = false,
+			bool larger = true,
+			u32 maxValue = 0) const
+	{
+		u32 i = 1;
+		u32 j = 1;
+		if (requirePowerOfTwo) {
+			while (i < (u32)Width)
+				i <<= 1;
+			if (!larger && i != 1 && i != (u32)Width)
+				i >>= 1;
+			while (j < (u32)Height)
+				j <<= 1;
+			if (!larger && j != 1 && j != (u32)Height)
+				j >>= 1;
+		} else {
+			i = (u32)Width;
+			j = (u32)Height;
+		}
+
+		if (requireSquare) {
+			if ((larger && (i > j)) || (!larger && (i < j)))
+				j = i;
+			else
+				i = j;
+		}
+
+		if (maxValue > 0 && i > maxValue)
+			i = maxValue;
+
+		if (maxValue > 0 && j > maxValue)
+			j = maxValue;
+
+		return dimension2d<T>((T)i, (T)j);
+	}
+
+	//! Get the interpolated dimension
+	/** \param other Other dimension to interpolate with.
+	\param d Value between 0.0f and 1.0f. d=0 returns other, d=1 returns this, values between interpolate.
+	\return Interpolated dimension. */
+	dimension2d<T> getInterpolated(const dimension2d<T> &other, f32 d) const
+	{
+		f32 inv = (1.0f - d);
+		return dimension2d<T>((T)(other.Width * inv + Width * d), (T)(other.Height * inv + Height * d));
+	}
+
+	//! Width of the dimension.
+	T Width;
+	//! Height of the dimension.
+	T Height;
+};
+
+//! Typedef for an f32 dimension.
+typedef dimension2d<f32> dimension2df;
+//! Typedef for an unsigned integer dimension.
+typedef dimension2d<u32> dimension2du;
+
+//! Typedef for an integer dimension.
+/** There are few cases where negative dimensions make sense. Please consider using
+	dimension2du instead. */
+typedef dimension2d<s32> dimension2di;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/exampleHelper.h b/irr/include/exampleHelper.h
new file mode 100755
index 000000000..698430cb9
--- /dev/null
+++ b/irr/include/exampleHelper.h
@@ -0,0 +1,21 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "path.h"
+
+namespace irr
+{
+
+static io::path getExampleMediaPath()
+{
+#ifdef IRR_MOBILE_PATHS
+	return io::path("media/");
+#else
+	return io::path("../../media/");
+#endif
+}
+
+} // end namespace irr
diff --git a/irr/include/fast_atof.h b/irr/include/fast_atof.h
new file mode 100644
index 000000000..8bbd0e9f1
--- /dev/null
+++ b/irr/include/fast_atof.h
@@ -0,0 +1,343 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine" and the "irrXML" project.
+// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
+
+#pragma once
+
+#include "irrMath.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace core
+{
+
+#define IRR_ATOF_TABLE_SIZE 17
+// we write [IRR_ATOF_TABLE_SIZE] here instead of [] to work around a swig bug
+const float fast_atof_table[17] = {
+		0.f,
+		0.1f,
+		0.01f,
+		0.001f,
+		0.0001f,
+		0.00001f,
+		0.000001f,
+		0.0000001f,
+		0.00000001f,
+		0.000000001f,
+		0.0000000001f,
+		0.00000000001f,
+		0.000000000001f,
+		0.0000000000001f,
+		0.00000000000001f,
+		0.000000000000001f,
+		0.0000000000000001f};
+
+//! Convert a simple string of base 10 digits into an unsigned 32 bit integer.
+/** \param[in] in: The string of digits to convert. No leading chars are
+	allowed, only digits 0 to 9. Parsing stops at the first non-digit.
+	\param[out] out: (optional) If provided, it will be set to point at the
+	first character not used in the calculation.
+	\return The unsigned integer value of the digits. If the string specifies
+	too many digits to encode in an u32 then INT_MAX will be returned.
+*/
+inline u32 strtoul10(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0;
+	}
+
+	bool overflow = false;
+	u32 unsignedValue = 0;
+	while ((*in >= '0') && (*in <= '9')) {
+		const u32 tmp = (unsignedValue * 10) + (*in - '0');
+		if (tmp < unsignedValue) {
+			unsignedValue = (u32)0xffffffff;
+			overflow = true;
+		}
+		if (!overflow)
+			unsignedValue = tmp;
+		++in;
+	}
+
+	if (out)
+		*out = in;
+
+	return unsignedValue;
+}
+
+//! Convert a simple string of base 10 digits into a signed 32 bit integer.
+/** \param[in] in: The string of digits to convert. Only a leading - or +
+	followed by digits 0 to 9 will be considered. Parsing stops at the first
+	non-digit.
+	\param[out] out: (optional) If provided, it will be set to point at the
+	first character not used in the calculation.
+	\return The signed integer value of the digits. If the string specifies
+	too many digits to encode in an s32 then +INT_MAX or -INT_MAX will be
+	returned.
+*/
+inline s32 strtol10(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0;
+	}
+
+	const bool negative = ('-' == *in);
+	if (negative || ('+' == *in))
+		++in;
+
+	const u32 unsignedValue = strtoul10(in, out);
+	if (unsignedValue > (u32)INT_MAX) {
+		if (negative)
+			return (s32)INT_MIN;
+		else
+			return (s32)INT_MAX;
+	} else {
+		if (negative)
+			return -((s32)unsignedValue);
+		else
+			return (s32)unsignedValue;
+	}
+}
+
+//! Convert a hex-encoded character to an unsigned integer.
+/** \param[in] in The digit to convert. Only digits 0 to 9 and chars A-F,a-f
+	will be considered.
+	\return The unsigned integer value of the digit. 0xffffffff if the input is
+	not hex
+*/
+inline u32 ctoul16(char in)
+{
+	if (in >= '0' && in <= '9')
+		return in - '0';
+	else if (in >= 'a' && in <= 'f')
+		return 10u + in - 'a';
+	else if (in >= 'A' && in <= 'F')
+		return 10u + in - 'A';
+	else
+		return 0xffffffff;
+}
+
+//! Convert a simple string of base 16 digits into an unsigned 32 bit integer.
+/** \param[in] in: The string of digits to convert. No leading chars are
+	allowed, only digits 0 to 9 and chars A-F,a-f are allowed. Parsing stops
+	at the first illegal char.
+	\param[out] out: (optional) If provided, it will be set to point at the
+	first character not used in the calculation.
+	\return The unsigned integer value of the digits. If the string specifies
+	too many digits to encode in an u32 then INT_MAX will be returned.
+*/
+inline u32 strtoul16(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0;
+	}
+
+	bool overflow = false;
+	u32 unsignedValue = 0;
+	while (true) {
+		u32 tmp = 0;
+		if ((*in >= '0') && (*in <= '9'))
+			tmp = (unsignedValue << 4u) + (*in - '0');
+		else if ((*in >= 'A') && (*in <= 'F'))
+			tmp = (unsignedValue << 4u) + (*in - 'A') + 10;
+		else if ((*in >= 'a') && (*in <= 'f'))
+			tmp = (unsignedValue << 4u) + (*in - 'a') + 10;
+		else
+			break;
+		if (tmp < unsignedValue) {
+			unsignedValue = (u32)INT_MAX;
+			overflow = true;
+		}
+		if (!overflow)
+			unsignedValue = tmp;
+		++in;
+	}
+
+	if (out)
+		*out = in;
+
+	return unsignedValue;
+}
+
+//! Convert a simple string of base 8 digits into an unsigned 32 bit integer.
+/** \param[in] in The string of digits to convert. No leading chars are
+	allowed, only digits 0 to 7 are allowed. Parsing stops at the first illegal
+	char.
+	\param[out] out (optional) If provided, it will be set to point at the
+	first character not used in the calculation.
+	\return The unsigned integer value of the digits. If the string specifies
+	too many digits to encode in an u32 then INT_MAX will be returned.
+*/
+inline u32 strtoul8(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0;
+	}
+
+	bool overflow = false;
+	u32 unsignedValue = 0;
+	while (true) {
+		u32 tmp = 0;
+		if ((*in >= '0') && (*in <= '7'))
+			tmp = (unsignedValue << 3u) + (*in - '0');
+		else
+			break;
+		if (tmp < unsignedValue) {
+			unsignedValue = (u32)INT_MAX;
+			overflow = true;
+		}
+		if (!overflow)
+			unsignedValue = tmp;
+		++in;
+	}
+
+	if (out)
+		*out = in;
+
+	return unsignedValue;
+}
+
+//! Convert a C-style prefixed string (hex, oct, integer) into an unsigned 32 bit integer.
+/** \param[in] in The string of digits to convert. If string starts with 0x the
+	hex parser is used, if only leading 0 is used, oct parser is used. In all
+	other cases, the usual unsigned parser is used.
+	\param[out] out (optional) If provided, it will be set to point at the
+	first character not used in the calculation.
+	\return The unsigned integer value of the digits. If the string specifies
+	too many digits to encode in an u32 then INT_MAX will be returned.
+*/
+inline u32 strtoul_prefix(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0;
+	}
+	if ('0' == in[0])
+		return ('x' == in[1] ? strtoul16(in + 2, out) : strtoul8(in + 1, out));
+	return strtoul10(in, out);
+}
+
+//! Converts a sequence of digits into a whole positive floating point value.
+/** Only digits 0 to 9 are parsed.  Parsing stops at any other character,
+	including sign characters or a decimal point.
+	\param in: the sequence of digits to convert.
+	\param out: (optional) will be set to point at the first non-converted
+	character.
+	\return The whole positive floating point representation of the digit
+	sequence.
+*/
+inline f32 strtof10(const char *in, const char **out = 0)
+{
+	if (!in) {
+		if (out)
+			*out = in;
+		return 0.f;
+	}
+
+	const u32 MAX_SAFE_U32_VALUE = UINT_MAX / 10 - 10;
+	u32 intValue = 0;
+
+	// Use integer arithmetic for as long as possible, for speed
+	// and precision.
+	while ((*in >= '0') && (*in <= '9')) {
+		// If it looks like we're going to overflow, bail out
+		// now and start using floating point.
+		if (intValue >= MAX_SAFE_U32_VALUE)
+			break;
+
+		intValue = (intValue * 10) + (*in - '0');
+		++in;
+	}
+
+	f32 floatValue = (f32)intValue;
+
+	// If there are any digits left to parse, then we need to use
+	// floating point arithmetic from here.
+	while ((*in >= '0') && (*in <= '9')) {
+		floatValue = (floatValue * 10.f) + (f32)(*in - '0');
+		++in;
+		if (floatValue > FLT_MAX) // Just give up.
+			break;
+	}
+
+	if (out)
+		*out = in;
+
+	return floatValue;
+}
+
+//! Provides a fast function for converting a string into a float.
+/** This is not guaranteed to be as accurate as atof(), but is
+	approximately 6 to 8 times as fast.
+	\param[in] in The string to convert.
+	\param[out] result The resultant float will be written here.
+	\return Pointer to the first character in the string that wasn't used
+	to create the float value.
+*/
+inline const char *fast_atof_move(const char *in, f32 &result)
+{
+	// Please run the regression test when making any modifications to this function.
+
+	result = 0.f;
+	if (!in)
+		return 0;
+
+	const bool negative = ('-' == *in);
+	if (negative || ('+' == *in))
+		++in;
+
+	f32 value = strtof10(in, &in);
+
+	if (*in == '.') {
+		const char *afterDecimal = ++in;
+		const f32 decimal = strtof10(in, &afterDecimal);
+		const size_t numDecimals = afterDecimal - in;
+		if (numDecimals < IRR_ATOF_TABLE_SIZE) {
+			value += decimal * fast_atof_table[numDecimals];
+		} else {
+			value += decimal * (f32)pow(10.f, -(float)numDecimals);
+		}
+		in = afterDecimal;
+	}
+
+	if ('e' == *in || 'E' == *in) {
+		++in;
+		// Assume that the exponent is a whole number.
+		// strtol10() will deal with both + and - signs,
+		// but calculate as f32 to prevent overflow at FLT_MAX
+		// Using pow with float cast instead of powf as otherwise accuracy decreases.
+		value *= (f32)pow(10.f, (f32)strtol10(in, &in));
+	}
+
+	result = negative ? -value : value;
+	return in;
+}
+
+//! Convert a string to a floating point number
+/** \param floatAsString The string to convert.
+	\param out Optional pointer to the first character in the string that
+	wasn't used to create the float value.
+	\result Float value parsed from the input string
+*/
+inline float fast_atof(const char *floatAsString, const char **out = 0)
+{
+	float ret;
+	if (out)
+		*out = fast_atof_move(floatAsString, ret);
+	else
+		fast_atof_move(floatAsString, ret);
+	return ret;
+}
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/irrArray.h b/irr/include/irrArray.h
new file mode 100644
index 000000000..b6f573a79
--- /dev/null
+++ b/irr/include/irrArray.h
@@ -0,0 +1,422 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine" and the "irrXML" project.
+// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
+
+#pragma once
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+#include "irrTypes.h"
+#include "irrMath.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! Self reallocating template array (like stl vector) with additional features.
+/** Some features are: Heap sorting, binary search methods, easier debugging.
+ */
+template <class T>
+class array
+{
+public:
+	static_assert(!std::is_same<T, bool>::value,
+			"irr::core::array<T> with T = bool not supported. Use std::vector instead.");
+
+	//! Default constructor for empty array.
+	array() :
+			m_data(), is_sorted(true)
+	{
+	}
+
+	//! Constructs an array and allocates an initial chunk of memory.
+	/** \param start_count Amount of elements to pre-allocate. */
+	explicit array(u32 start_count) :
+			m_data(), is_sorted(true)
+	{
+		m_data.reserve(start_count);
+	}
+
+	//! Copy constructor
+	array(const array<T> &other) :
+			m_data(other.m_data), is_sorted(other.is_sorted)
+	{
+	}
+
+	//! Reallocates the array, make it bigger or smaller.
+	/** \param new_size New size of array.
+	\param canShrink Specifies whether the array is reallocated even if
+	enough space is available. Setting this flag to false can speed up
+	array usage, but may use more memory than required by the data.
+	*/
+	void reallocate(u32 new_size, bool canShrink = true)
+	{
+		size_t allocated = m_data.capacity();
+		if (new_size < allocated) {
+			if (canShrink)
+				m_data.resize(new_size);
+		} else {
+			m_data.reserve(new_size);
+		}
+	}
+
+	//! Adds an element at back of array.
+	/** If the array is too small to add this new element it is made bigger.
+	\param element: Element to add at the back of the array. */
+	void push_back(const T &element)
+	{
+		m_data.push_back(element);
+		is_sorted = false;
+	}
+
+	void push_back(T &&element)
+	{
+		m_data.push_back(std::move(element));
+		is_sorted = false;
+	}
+
+	//! Adds an element at the front of the array.
+	/** If the array is to small to add this new element, the array is
+	made bigger. Please note that this is slow, because the whole array
+	needs to be copied for this.
+	\param element Element to add at the back of the array. */
+	void push_front(const T &element)
+	{
+		m_data.insert(m_data.begin(), element);
+		is_sorted = false;
+	}
+
+	void push_front(T &&element)
+	{
+		m_data.insert(m_data.begin(), std::move(element));
+		is_sorted = false;
+	}
+
+	//! Insert item into array at specified position.
+	/**
+	\param element: Element to be inserted
+	\param index: Where position to insert the new element. */
+	void insert(const T &element, u32 index = 0)
+	{
+		_IRR_DEBUG_BREAK_IF(index > m_data.size()) // access violation
+		auto pos = std::next(m_data.begin(), index);
+		m_data.insert(pos, element);
+		is_sorted = false;
+	}
+
+	//! Clears the array and deletes all allocated memory.
+	void clear()
+	{
+		// vector::clear() reduces the size to 0, but doesn't free memory.
+		// This swap is guaranteed to delete the allocated memory.
+		std::vector<T>().swap(m_data);
+		is_sorted = true;
+	}
+
+	//! Set (copy) data from given memory block
+	/** \param newData data to set, must have newSize elements
+	\param newSize Amount of elements in newData
+	\param canShrink When true we reallocate the array even it can shrink.
+	May reduce memory usage, but call is more whenever size changes.
+	\param newDataIsSorted Info if you pass sorted/unsorted data
+	*/
+	void set_data(const T *newData, u32 newSize, bool newDataIsSorted = false, bool canShrink = false)
+	{
+		m_data.resize(newSize);
+		if (canShrink) {
+			m_data.shrink_to_fit();
+		}
+		std::copy(newData, newData + newSize, m_data.begin());
+		is_sorted = newDataIsSorted;
+	}
+
+	//! Compare if given data block is identical to the data in our array
+	/** Like operator ==, but without the need to create the array
+	\param otherData Address to data against which we compare, must contain size elements
+	\param size Amount of elements in otherData	*/
+	bool equals(const T *otherData, u32 size) const
+	{
+		if (m_data.size() != size)
+			return false;
+		return std::equal(m_data.begin(), m_data.end(), otherData);
+	}
+
+	//! Sets the size of the array and allocates new elements if necessary.
+	/** \param usedNow Amount of elements now used. */
+	void set_used(u32 usedNow)
+	{
+		m_data.resize(usedNow);
+	}
+
+	//! Assignment operator
+	const array<T> &operator=(const array<T> &other)
+	{
+		if (this == &other)
+			return *this;
+		m_data = other.m_data;
+		is_sorted = other.is_sorted;
+		return *this;
+	}
+
+	array<T> &operator=(const std::vector<T> &other)
+	{
+		m_data = other;
+		is_sorted = false;
+		return *this;
+	}
+
+	array<T> &operator=(std::vector<T> &&other)
+	{
+		m_data = std::move(other);
+		is_sorted = false;
+		return *this;
+	}
+
+	//! Equality operator
+	bool operator==(const array<T> &other) const
+	{
+		return equals(other.const_pointer(), other.size());
+	}
+
+	//! Inequality operator
+	bool operator!=(const array<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	//! Direct access operator
+	T &operator[](u32 index)
+	{
+		_IRR_DEBUG_BREAK_IF(index >= m_data.size()) // access violation
+
+		return m_data[index];
+	}
+
+	//! Direct const access operator
+	const T &operator[](u32 index) const
+	{
+		_IRR_DEBUG_BREAK_IF(index >= m_data.size()) // access violation
+
+		return m_data[index];
+	}
+
+	//! Gets last element.
+	T &getLast()
+	{
+		_IRR_DEBUG_BREAK_IF(m_data.empty()) // access violation
+
+		return m_data.back();
+	}
+
+	//! Gets last element
+	const T &getLast() const
+	{
+		_IRR_DEBUG_BREAK_IF(m_data.empty()) // access violation
+
+		return m_data.back();
+	}
+
+	//! Gets a pointer to the array.
+	/** \return Pointer to the array. */
+	T *pointer()
+	{
+		return m_data.empty() ? nullptr : &m_data[0];
+	}
+
+	//! Gets a const pointer to the array.
+	/** \return Pointer to the array. */
+	const T *const_pointer() const
+	{
+		return m_data.empty() ? nullptr : &m_data[0];
+	}
+
+	//! Get number of occupied elements of the array.
+	/** \return Size of elements in the array which are actually occupied. */
+	u32 size() const
+	{
+		return static_cast<u32>(m_data.size());
+	}
+
+	//! Get amount of memory allocated.
+	/** \return Amount of memory allocated. The amount of bytes
+	allocated would be allocated_size() * sizeof(ElementTypeUsed); */
+	u32 allocated_size() const
+	{
+		return m_data.capacity();
+	}
+
+	//! Check if array is empty.
+	/** \return True if the array is empty false if not. */
+	bool empty() const
+	{
+		return m_data.empty();
+	}
+
+	//! Sorts the array using heapsort.
+	/** There is no additional memory waste and the algorithm performs
+	O(n*log n) in worst case. */
+	void sort()
+	{
+		if (!is_sorted) {
+			std::sort(m_data.begin(), m_data.end());
+			is_sorted = true;
+		}
+	}
+
+	//! Performs a binary search for an element, returns -1 if not found.
+	/** The array will be sorted before the binary search if it is not
+	already sorted. Caution is advised! Be careful not to call this on
+	unsorted const arrays, or the slower method will be used.
+	\param element Element to search for.
+	\return Position of the searched element if it was found,
+	otherwise -1 is returned. */
+	s32 binary_search(const T &element)
+	{
+		sort();
+		return binary_search(element, 0, (s32)m_data.size() - 1);
+	}
+
+	//! Performs a binary search for an element if possible, returns -1 if not found.
+	/** This method is for const arrays and so cannot call sort(), if the array is
+	not sorted then linear_search will be used instead. Potentially very slow!
+	\param element Element to search for.
+	\return Position of the searched element if it was found,
+	otherwise -1 is returned. */
+	s32 binary_search(const T &element) const
+	{
+		if (is_sorted)
+			return binary_search(element, 0, (s32)m_data.size() - 1);
+		else
+			return linear_search(element);
+	}
+
+	//! Performs a binary search for an element, returns -1 if not found.
+	/** \param element: Element to search for.
+	\param left First left index
+	\param right Last right index.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
+	s32 binary_search(const T &element, s32 left, s32 right) const
+	{
+		if (left > right)
+			return -1;
+		auto lpos = std::next(m_data.begin(), left);
+		auto rpos = std::next(m_data.begin(), right);
+		auto it = std::lower_bound(lpos, rpos, element);
+		// *it = first element in [first, last) that is >= element, or last if not found.
+		if (*it < element || element < *it)
+			return -1;
+		return static_cast<u32>(it - m_data.begin());
+	}
+
+	//! Performs a binary search for an element, returns -1 if not found.
+	//! it is used for searching a multiset
+	/** The array will be sorted before the binary search if it is not
+	already sorted.
+	\param element Element to search for.
+	\param &last return lastIndex of equal elements
+	\return Position of the first searched element if it was found,
+	otherwise -1 is returned. */
+	s32 binary_search_multi(const T &element, s32 &last)
+	{
+		sort();
+		auto iters = std::equal_range(m_data.begin(), m_data.end(), element);
+		if (iters.first == iters.second)
+			return -1;
+		last = static_cast<s32>((iters.second - m_data.begin()) - 1);
+		return static_cast<s32>(iters.first - m_data.begin());
+	}
+
+	//! Finds an element in linear time, which is very slow.
+	/** Use binary_search for faster finding. Only works if ==operator is
+	implemented.
+	\param element Element to search for.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
+	s32 linear_search(const T &element) const
+	{
+		auto it = std::find(m_data.begin(), m_data.end(), element);
+		if (it == m_data.end())
+			return -1;
+		return static_cast<u32>(it - m_data.begin());
+	}
+
+	//! Finds an element in linear time, which is very slow.
+	/** Use binary_search for faster finding. Only works if ==operator is
+	implemented.
+	\param element: Element to search for.
+	\return Position of the searched element if it was found, otherwise -1
+	is returned. */
+	s32 linear_reverse_search(const T &element) const
+	{
+		auto it = std::find(m_data.rbegin(), m_data.rend(), element);
+		if (it == m_data.rend())
+			return -1;
+		size_t offset = it - m_data.rbegin();
+		return m_data.size() - offset - 1;
+	}
+
+	//! Erases an element from the array.
+	/** May be slow, because all elements following after the erased
+	element have to be copied.
+	\param index: Index of element to be erased. */
+	void erase(u32 index)
+	{
+		_IRR_DEBUG_BREAK_IF(index >= m_data.size()) // access violation
+		auto it = std::next(m_data.begin(), index);
+		m_data.erase(it);
+	}
+
+	//! Erases some elements from the array.
+	/** May be slow, because all elements following after the erased
+	element have to be copied.
+	\param index: Index of the first element to be erased.
+	\param count: Amount of elements to be erased. */
+	void erase(u32 index, s32 count)
+	{
+		if (index >= m_data.size() || count < 1)
+			return;
+		count = core::min_(count, (s32)m_data.size() - (s32)index);
+		auto first = std::next(m_data.begin(), index);
+		auto last = std::next(first, count);
+		m_data.erase(first, last);
+	}
+
+	//! Sets if the array is sorted
+	void set_sorted(bool _is_sorted)
+	{
+		is_sorted = _is_sorted;
+	}
+
+	//! Swap the content of this array container with the content of another array
+	/** Afterward this object will contain the content of the other object and the other
+	object will contain the content of this object.
+	\param other Swap content with this object */
+	void swap(array<T> &other)
+	{
+		m_data.swap(other.m_data);
+		std::swap(is_sorted, other.is_sorted);
+	}
+
+	//! Pull the contents of this array as a vector.
+	// The array is left empty.
+	std::vector<T> steal()
+	{
+		std::vector<T> ret = std::move(m_data);
+		m_data.clear();
+		is_sorted = true;
+		return ret;
+	}
+
+	typedef T value_type;
+	typedef u32 size_type;
+
+private:
+	std::vector<T> m_data;
+	bool is_sorted;
+};
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/irrMath.h b/irr/include/irrMath.h
new file mode 100644
index 000000000..3a1471a02
--- /dev/null
+++ b/irr/include/irrMath.h
@@ -0,0 +1,477 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include <cmath>
+#include <cfloat>
+#include <cstdlib> // for abs() etc.
+#include <climits> // For INT_MAX / UINT_MAX
+#include <type_traits>
+
+namespace irr
+{
+namespace core
+{
+
+//! Rounding error constant often used when comparing f32 values.
+
+const f32 ROUNDING_ERROR_f32 = 0.000001f;
+const f64 ROUNDING_ERROR_f64 = 0.00000001;
+
+#ifdef PI // make sure we don't collide with a define
+#undef PI
+#endif
+//! Constant for PI.
+const f32 PI = 3.14159265359f;
+
+//! Constant for reciprocal of PI.
+const f32 RECIPROCAL_PI = 1.0f / PI;
+
+//! Constant for half of PI.
+const f32 HALF_PI = PI / 2.0f;
+
+#ifdef PI64 // make sure we don't collide with a define
+#undef PI64
+#endif
+//! Constant for 64bit PI.
+const f64 PI64 = 3.1415926535897932384626433832795028841971693993751;
+
+//! Constant for 64bit reciprocal of PI.
+const f64 RECIPROCAL_PI64 = 1.0 / PI64;
+
+//! 32bit Constant for converting from degrees to radians
+const f32 DEGTORAD = PI / 180.0f;
+
+//! 32bit constant for converting from radians to degrees (formally known as GRAD_PI)
+const f32 RADTODEG = 180.0f / PI;
+
+//! 64bit constant for converting from degrees to radians (formally known as GRAD_PI2)
+const f64 DEGTORAD64 = PI64 / 180.0;
+
+//! 64bit constant for converting from radians to degrees
+const f64 RADTODEG64 = 180.0 / PI64;
+
+//! Utility function to convert a radian value to degrees
+/** Provided as it can be clearer to write radToDeg(X) than RADTODEG * X
+\param radians The radians value to convert to degrees.
+*/
+inline f32 radToDeg(f32 radians)
+{
+	return RADTODEG * radians;
+}
+
+//! Utility function to convert a radian value to degrees
+/** Provided as it can be clearer to write radToDeg(X) than RADTODEG * X
+\param radians The radians value to convert to degrees.
+*/
+inline f64 radToDeg(f64 radians)
+{
+	return RADTODEG64 * radians;
+}
+
+//! Utility function to convert a degrees value to radians
+/** Provided as it can be clearer to write degToRad(X) than DEGTORAD * X
+\param degrees The degrees value to convert to radians.
+*/
+inline f32 degToRad(f32 degrees)
+{
+	return DEGTORAD * degrees;
+}
+
+//! Utility function to convert a degrees value to radians
+/** Provided as it can be clearer to write degToRad(X) than DEGTORAD * X
+\param degrees The degrees value to convert to radians.
+*/
+inline f64 degToRad(f64 degrees)
+{
+	return DEGTORAD64 * degrees;
+}
+
+//! returns minimum of two values. Own implementation to get rid of the STL (VS6 problems)
+template <class T>
+inline const T &min_(const T &a, const T &b)
+{
+	return a < b ? a : b;
+}
+
+//! returns minimum of three values. Own implementation to get rid of the STL (VS6 problems)
+template <class T>
+inline const T &min_(const T &a, const T &b, const T &c)
+{
+	return a < b ? min_(a, c) : min_(b, c);
+}
+
+//! returns maximum of two values. Own implementation to get rid of the STL (VS6 problems)
+template <class T>
+inline const T &max_(const T &a, const T &b)
+{
+	return a < b ? b : a;
+}
+
+//! returns maximum of three values. Own implementation to get rid of the STL (VS6 problems)
+template <class T>
+inline const T &max_(const T &a, const T &b, const T &c)
+{
+	return a < b ? max_(b, c) : max_(a, c);
+}
+
+//! returns abs of two values. Own implementation to get rid of STL (VS6 problems)
+template <class T>
+inline T abs_(const T &a)
+{
+	return a < (T)0 ? -a : a;
+}
+
+//! returns linear interpolation of a and b with ratio t
+//! \return: a if t==0, b if t==1, and the linear interpolation else
+template <class T>
+inline T lerp(const T &a, const T &b, const f32 t)
+{
+	return (T)(a * (1.f - t)) + (b * t);
+}
+
+//! clamps a value between low and high
+template <class T>
+inline const T clamp(const T &value, const T &low, const T &high)
+{
+	return min_(max_(value, low), high);
+}
+
+//! swaps the content of the passed parameters
+// Note: We use the same trick as boost and use two template arguments to
+// avoid ambiguity when swapping objects of an Irrlicht type that has not
+// it's own swap overload. Otherwise we get conflicts with some compilers
+// in combination with stl.
+template <class T1, class T2>
+inline void swap(T1 &a, T2 &b)
+{
+	T1 c(a);
+	a = b;
+	b = c;
+}
+
+template <class T>
+inline T roundingError();
+
+template <>
+inline f32 roundingError()
+{
+	return ROUNDING_ERROR_f32;
+}
+
+template <>
+inline f64 roundingError()
+{
+	return ROUNDING_ERROR_f64;
+}
+
+template <class T>
+inline T relativeErrorFactor()
+{
+	return 1;
+}
+
+template <>
+inline f32 relativeErrorFactor()
+{
+	return 4;
+}
+
+template <>
+inline f64 relativeErrorFactor()
+{
+	return 8;
+}
+
+//! returns if a equals b, for types without rounding errors
+template <class T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
+inline bool equals(const T a, const T b)
+{
+	return a == b;
+}
+
+//! returns if a equals b, taking possible rounding errors into account
+template <class T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
+inline bool equals(const T a, const T b, const T tolerance = roundingError<T>())
+{
+	return std::abs(a - b) <= tolerance;
+}
+
+//! returns if a equals b, taking relative error in form of factor
+//! this particular function does not involve any division.
+template <class T>
+inline bool equalsRelative(const T a, const T b, const T factor = relativeErrorFactor<T>())
+{
+	// https://eagergames.wordpress.com/2017/04/01/fast-parallel-lines-and-vectors-test/
+
+	const T maxi = max_(a, b);
+	const T mini = min_(a, b);
+	const T maxMagnitude = max_(maxi, -mini);
+
+	return (maxMagnitude * factor + maxi) == (maxMagnitude * factor + mini); // MAD Wise
+}
+
+union FloatIntUnion32
+{
+	FloatIntUnion32(float f1 = 0.0f) :
+			f(f1) {}
+	// Portable sign-extraction
+	bool sign() const { return (i >> 31) != 0; }
+
+	irr::s32 i;
+	irr::f32 f;
+};
+
+//! We compare the difference in ULP's (spacing between floating-point numbers, aka ULP=1 means there exists no float between).
+//\result true when numbers have a ULP <= maxUlpDiff AND have the same sign.
+inline bool equalsByUlp(f32 a, f32 b, int maxUlpDiff)
+{
+	// Based on the ideas and code from Bruce Dawson on
+	// http://www.altdevblogaday.com/2012/02/22/comparing-floating-point-numbers-2012-edition/
+	// When floats are interpreted as integers the two nearest possible float numbers differ just
+	// by one integer number. Also works the other way round, an integer of 1 interpreted as float
+	// is for example the smallest possible float number.
+
+	const FloatIntUnion32 fa(a);
+	const FloatIntUnion32 fb(b);
+
+	// Different signs, we could maybe get difference to 0, but so close to 0 using epsilons is better.
+	if (fa.sign() != fb.sign()) {
+		// Check for equality to make sure +0==-0
+		if (fa.i == fb.i)
+			return true;
+		return false;
+	}
+
+	// Find the difference in ULPs.
+	const int ulpsDiff = abs_(fa.i - fb.i);
+	if (ulpsDiff <= maxUlpDiff)
+		return true;
+
+	return false;
+}
+
+//! returns if a equals zero, taking rounding errors into account
+inline bool iszero(const f64 a, const f64 tolerance = ROUNDING_ERROR_f64)
+{
+	return fabs(a) <= tolerance;
+}
+
+//! returns if a equals zero, taking rounding errors into account
+inline bool iszero(const f32 a, const f32 tolerance = ROUNDING_ERROR_f32)
+{
+	return fabsf(a) <= tolerance;
+}
+
+//! returns if a equals not zero, taking rounding errors into account
+inline bool isnotzero(const f32 a, const f32 tolerance = ROUNDING_ERROR_f32)
+{
+	return fabsf(a) > tolerance;
+}
+
+//! returns if a equals zero, taking rounding errors into account
+inline bool iszero(const s32 a, const s32 tolerance = 0)
+{
+	return (a & 0x7ffffff) <= tolerance;
+}
+
+//! returns if a equals zero, taking rounding errors into account
+inline bool iszero(const u32 a, const u32 tolerance = 0)
+{
+	return a <= tolerance;
+}
+
+//! returns if a equals zero, taking rounding errors into account
+inline bool iszero(const s64 a, const s64 tolerance = 0)
+{
+	return abs_(a) <= tolerance;
+}
+
+inline s32 s32_min(s32 a, s32 b)
+{
+	return min_(a, b);
+}
+
+inline s32 s32_max(s32 a, s32 b)
+{
+	return max_(a, b);
+}
+
+inline s32 s32_clamp(s32 value, s32 low, s32 high)
+{
+	return clamp(value, low, high);
+}
+
+/*
+	float IEEE-754 bit representation
+
+	0      0x00000000
+	1.0    0x3f800000
+	0.5    0x3f000000
+	3      0x40400000
+	+inf   0x7f800000
+	-inf   0xff800000
+	+NaN   0x7fc00000 or 0x7ff00000
+	in general: number = (sign ? -1:1) * 2^(exponent) * 1.(mantissa bits)
+*/
+
+typedef union
+{
+	u32 u;
+	s32 s;
+	f32 f;
+} inttofloat;
+
+#define F32_AS_S32(f) (*((s32 *)&(f)))
+#define F32_AS_U32(f) (*((u32 *)&(f)))
+#define F32_AS_U32_POINTER(f) (((u32 *)&(f)))
+
+#define F32_VALUE_0 0x00000000
+#define F32_VALUE_1 0x3f800000
+
+//! code is taken from IceFPU
+//! Integer representation of a floating-point value.
+inline u32 IR(f32 x)
+{
+	inttofloat tmp;
+	tmp.f = x;
+	return tmp.u;
+}
+
+//! Floating-point representation of an integer value.
+inline f32 FR(u32 x)
+{
+	inttofloat tmp;
+	tmp.u = x;
+	return tmp.f;
+}
+inline f32 FR(s32 x)
+{
+	inttofloat tmp;
+	tmp.s = x;
+	return tmp.f;
+}
+
+#define F32_LOWER_0(n) ((n) < 0.0f)
+#define F32_LOWER_EQUAL_0(n) ((n) <= 0.0f)
+#define F32_GREATER_0(n) ((n) > 0.0f)
+#define F32_GREATER_EQUAL_0(n) ((n) >= 0.0f)
+#define F32_EQUAL_1(n) ((n) == 1.0f)
+#define F32_EQUAL_0(n) ((n) == 0.0f)
+#define F32_A_GREATER_B(a, b) ((a) > (b))
+
+#ifndef REALINLINE
+#ifdef _MSC_VER
+#define REALINLINE __forceinline
+#else
+#define REALINLINE inline
+#endif
+#endif
+
+// NOTE: This is not as exact as the c99/c++11 round function, especially at high numbers starting with 8388609
+//       (only low number which seems to go wrong is 0.49999997 which is rounded to 1)
+//      Also negative 0.5 is rounded up not down unlike with the standard function (p.E. input -0.5 will be 0 and not -1)
+inline f32 round_(f32 x)
+{
+	return floorf(x + 0.5f);
+}
+
+// calculate: sqrt ( x )
+REALINLINE f32 squareroot(const f32 f)
+{
+	return sqrtf(f);
+}
+
+// calculate: sqrt ( x )
+REALINLINE f64 squareroot(const f64 f)
+{
+	return sqrt(f);
+}
+
+// calculate: sqrt ( x )
+REALINLINE s32 squareroot(const s32 f)
+{
+	return static_cast<s32>(squareroot(static_cast<f32>(f)));
+}
+
+// calculate: sqrt ( x )
+REALINLINE s64 squareroot(const s64 f)
+{
+	return static_cast<s64>(squareroot(static_cast<f64>(f)));
+}
+
+// calculate: 1 / sqrt ( x )
+REALINLINE f64 reciprocal_squareroot(const f64 x)
+{
+	return 1.0 / sqrt(x);
+}
+
+// calculate: 1 / sqrtf ( x )
+REALINLINE f32 reciprocal_squareroot(const f32 f)
+{
+	return 1.f / sqrtf(f);
+}
+
+// calculate: 1 / sqrtf( x )
+REALINLINE s32 reciprocal_squareroot(const s32 x)
+{
+	return static_cast<s32>(reciprocal_squareroot(static_cast<f32>(x)));
+}
+
+// calculate: 1 / x
+REALINLINE f32 reciprocal(const f32 f)
+{
+	return 1.f / f;
+}
+
+// calculate: 1 / x
+REALINLINE f64 reciprocal(const f64 f)
+{
+	return 1.0 / f;
+}
+
+// calculate: 1 / x, low precision allowed
+REALINLINE f32 reciprocal_approxim(const f32 f)
+{
+	return 1.f / f;
+}
+
+REALINLINE s32 floor32(f32 x)
+{
+	return (s32)floorf(x);
+}
+
+REALINLINE s32 ceil32(f32 x)
+{
+	return (s32)ceilf(x);
+}
+
+// NOTE: Please check round_ documentation about some inaccuracies in this compared to standard library round function.
+REALINLINE s32 round32(f32 x)
+{
+	return (s32)round_(x);
+}
+
+inline f32 f32_max3(const f32 a, const f32 b, const f32 c)
+{
+	return a > b ? (a > c ? a : c) : (b > c ? b : c);
+}
+
+inline f32 f32_min3(const f32 a, const f32 b, const f32 c)
+{
+	return a < b ? (a < c ? a : c) : (b < c ? b : c);
+}
+
+inline f32 fract(f32 x)
+{
+	return x - floorf(x);
+}
+
+} // end namespace core
+} // end namespace irr
+
+using irr::core::FR;
+using irr::core::IR;
diff --git a/irr/include/irrString.h b/irr/include/irrString.h
new file mode 100644
index 000000000..a583c9e4b
--- /dev/null
+++ b/irr/include/irrString.h
@@ -0,0 +1,934 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine" and the "irrXML" project.
+// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include <string>
+#include <string_view>
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+#include <cwchar>
+#include <locale>
+
+/* HACK: import these string methods from MT's util/string.h */
+extern std::wstring utf8_to_wide(std::string_view input);
+extern std::string wide_to_utf8(std::wstring_view input);
+/* */
+
+namespace irr
+{
+namespace core
+{
+
+//! Very simple string class with some useful features.
+/** string<c8> and string<wchar_t> both accept Unicode AND ASCII/Latin-1,
+so you can assign Unicode to string<c8> and ASCII/Latin-1 to string<wchar_t>
+(and the other way round) if you want to.
+
+However, note that the conversation between both is not done using any encoding.
+This means that c8 strings are treated as ASCII/Latin-1, not UTF-8, and
+are simply expanded to the equivalent wchar_t, while Unicode/wchar_t
+characters are truncated to 8-bit ASCII/Latin-1 characters, discarding all
+other information in the wchar_t.
+
+Helper functions for converting between UTF-8 and wchar_t are provided
+outside the string class for explicit use.
+*/
+
+// forward declarations
+template <typename T>
+class string;
+
+//! Typedef for character strings
+typedef string<c8> stringc;
+
+//! Typedef for wide character strings
+typedef string<wchar_t> stringw;
+
+//! Returns a character converted to lower case
+static inline u32 locale_lower(u32 x)
+{
+	// ansi
+	return x >= 'A' && x <= 'Z' ? x + 0x20 : x;
+}
+
+//! Returns a character converted to upper case
+static inline u32 locale_upper(u32 x)
+{
+	// ansi
+	return x >= 'a' && x <= 'z' ? x + ('A' - 'a') : x;
+}
+
+template <typename T>
+class string
+{
+public:
+	typedef T char_type;
+
+	//! Default constructor
+	string()
+	{
+	}
+
+	//! Copy constructor
+	string(const string<T> &other)
+	{
+		*this = other;
+	}
+
+	//! Constructor from other string types
+	template <class B>
+	string(const string<B> &other)
+	{
+		*this = other;
+	}
+
+	//! Constructs a string from a float
+	explicit string(const double number)
+	{
+		c8 tmpbuf[32];
+		snprintf_irr(tmpbuf, sizeof(tmpbuf), "%0.6f", number);
+		str = tmpbuf;
+	}
+
+	//! Constructs a string from an int
+	explicit string(int number)
+	{
+		str = std::to_string(number);
+	}
+
+	//! Constructs a string from an unsigned int
+	explicit string(unsigned int number)
+	{
+		str = std::to_string(number);
+	}
+
+	//! Constructs a string from a long
+	explicit string(long number)
+	{
+		str = std::to_string(number);
+	}
+
+	//! Constructs a string from an unsigned long
+	explicit string(unsigned long number)
+	{
+		str = std::to_string(number);
+	}
+
+	//! Constructor for copying a string from a pointer with a given length
+	template <class B>
+	string(const B *const c, u32 length)
+	{
+		if (!c)
+			return;
+
+		str.resize(length);
+		for (u32 l = 0; l < length; ++l)
+			str[l] = (T)c[l];
+	}
+
+	//! Constructor for Unicode and ASCII strings
+	template <class B>
+	string(const B *const c)
+	{
+		*this = c;
+	}
+
+	//! Destructor
+	~string()
+	{
+	}
+
+	//! Assignment operator
+	string<T> &operator=(const string<T> &other)
+	{
+		if (this == &other)
+			return *this;
+
+		str = other.str;
+		return *this;
+	}
+
+	//! Assignment operator for other string types
+	template <class B>
+	string<T> &operator=(const string<B> &other)
+	{
+		*this = other.c_str();
+		return *this;
+	}
+
+	//! Assignment operator for strings, ASCII and Unicode
+	template <class B>
+	string<T> &operator=(const B *const c)
+	{
+		if (!c) {
+			clear();
+			return *this;
+		}
+
+		// no longer allowed!
+		_IRR_DEBUG_BREAK_IF((void *)c == (void *)c_str());
+
+		u32 len = calclen(c);
+		str.resize(len);
+		for (u32 l = 0; l < len; ++l)
+			str[l] = (T)c[l];
+
+		return *this;
+	}
+
+	//! Append operator for other strings
+	string<T> operator+(const string<T> &other) const
+	{
+		string<T> tmp(*this);
+		tmp.append(other);
+
+		return tmp;
+	}
+
+	//! Append operator for strings, ASCII and Unicode
+	template <class B>
+	string<T> operator+(const B *const c) const
+	{
+		string<T> tmp(*this);
+		tmp.append(c);
+
+		return tmp;
+	}
+
+	//! Direct access operator
+	T &operator[](const u32 index)
+	{
+		return str[index];
+	}
+
+	//! Direct access operator
+	const T &operator[](const u32 index) const
+	{
+		return str[index];
+	}
+
+	//! Equality operator
+	bool operator==(const T *const other) const
+	{
+		if (!other)
+			return false;
+		return !cmp(c_str(), other);
+	}
+
+	//! Equality operator
+	bool operator==(const string<T> &other) const
+	{
+		return str == other.str;
+	}
+
+	//! Is smaller comparator
+	bool operator<(const string<T> &other) const
+	{
+		return str < other.str;
+	}
+
+	//! Inequality operator
+	bool operator!=(const T *const other) const
+	{
+		return !(*this == other);
+	}
+
+	//! Inequality operator
+	bool operator!=(const string<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	//! Returns length of the string's content
+	/** \return Length of the string's content in characters, excluding
+	the trailing NUL. */
+	u32 size() const
+	{
+		return static_cast<u32>(str.size());
+	}
+
+	//! Informs if the string is empty or not.
+	//! \return True if the string is empty, false if not.
+	bool empty() const
+	{
+		return str.empty();
+	}
+
+	void clear(bool releaseMemory = true)
+	{
+		if (releaseMemory) {
+			stl_type empty;
+			std::swap(str, empty);
+		} else {
+			str.clear();
+		}
+	}
+
+	//! Returns character string
+	/** \return pointer to C-style NUL terminated string. */
+	const T *c_str() const
+	{
+		return str.c_str();
+	}
+
+	//! Makes the string lower case.
+	string<T> &make_lower()
+	{
+		std::transform(str.begin(), str.end(), str.begin(), [](const T &c) {
+			return locale_lower(c);
+		});
+		return *this;
+	}
+
+	//! Makes the string upper case.
+	string<T> &make_upper()
+	{
+		std::transform(str.begin(), str.end(), str.begin(), [](const T &c) {
+			return locale_upper(c);
+		});
+		return *this;
+	}
+
+	//! Compares the strings ignoring case.
+	/** \param other: Other string to compare.
+	\return True if the strings are equal ignoring case. */
+	bool equals_ignore_case(const string<T> &other) const
+	{
+		const T *array = c_str();
+		for (u32 i = 0; array[i] && other[i]; ++i)
+			if (locale_lower(array[i]) != locale_lower(other[i]))
+				return false;
+
+		return size() == other.size();
+	}
+
+	//! Compares the strings ignoring case.
+	/** \param other: Other string to compare.
+		\param sourcePos: where to start to compare in the string
+	\return True if the strings are equal ignoring case. */
+	bool equals_substring_ignore_case(const string<T> &other, const u32 sourcePos = 0) const
+	{
+		if (sourcePos >= size() + 1)
+			return false;
+
+		const T *array = c_str();
+		u32 i;
+		for (i = 0; array[sourcePos + i] && other[i]; ++i)
+			if (locale_lower(array[sourcePos + i]) != locale_lower(other[i]))
+				return false;
+
+		return array[sourcePos + i] == 0 && other[i] == 0;
+	}
+
+	//! Compares the strings ignoring case.
+	/** \param other: Other string to compare.
+	\return True if this string is smaller ignoring case. */
+	bool lower_ignore_case(const string<T> &other) const
+	{
+		const T *array = c_str();
+		for (u32 i = 0; array[i] && other[i]; ++i) {
+			s32 diff = (s32)locale_lower(array[i]) - (s32)locale_lower(other[i]);
+			if (diff)
+				return diff < 0;
+		}
+
+		return size() < other.size();
+	}
+
+	//! compares the first n characters of the strings
+	/** \param other Other string to compare.
+	\param n Number of characters to compare
+	\return True if the n first characters of both strings are equal. */
+	bool equalsn(const string<T> &other, u32 n) const
+	{
+		const T *array = c_str();
+		u32 i;
+		for (i = 0; i < n && array[i] && other[i]; ++i)
+			if (array[i] != other[i])
+				return false;
+
+		// if one (or both) of the strings was smaller then they
+		// are only equal if they have the same length
+		return (i == n) || (size() == other.size());
+	}
+
+	//! compares the first n characters of the strings
+	/** \param str Other string to compare.
+	\param n Number of characters to compare
+	\return True if the n first characters of both strings are equal. */
+	bool equalsn(const T *const other, u32 n) const
+	{
+		if (!other)
+			return false;
+		const T *array = c_str();
+		u32 i;
+		for (i = 0; i < n && array[i] && other[i]; ++i)
+			if (array[i] != other[i])
+				return false;
+
+		// if one (or both) of the strings was smaller then they
+		// are only equal if they have the same length
+		return (i == n) || (array[i] == 0 && other[i] == 0);
+	}
+
+	//! Appends a character to this string
+	/** \param character: Character to append. */
+	string<T> &append(T character)
+	{
+		str.append(1, character);
+		return *this;
+	}
+
+	//! Appends a char string to this string
+	/** \param other: Char string to append. */
+	/** \param length: The length of the string to append. */
+	string<T> &append(const T *const other, u32 length = 0xffffffff)
+	{
+		if (!other)
+			return *this;
+
+		u32 len = calclen(other);
+		if (len > length)
+			len = length;
+
+		str.append(other, len);
+		return *this;
+	}
+
+	//! Appends a string to this string
+	/** \param other: String to append. */
+	string<T> &append(const string<T> &other)
+	{
+		str.append(other.str);
+		return *this;
+	}
+
+	//! Appends a string of the length l to this string.
+	/** \param other: other String to append to this string.
+	\param length: How much characters of the other string to add to this one. */
+	string<T> &append(const string<T> &other, u32 length)
+	{
+		if (other.size() < length)
+			append(other);
+		else
+			str.append(other.c_str(), length);
+		return *this;
+	}
+
+	//! Insert a certain amount of characters into the string before the given index
+	//\param pos Insert the characters before this index
+	//\param s String to insert. Must be at least of size n
+	//\param n Number of characters from string s to use.
+	string<T> &insert(u32 pos, const T *s, u32 n)
+	{
+		if (pos < size() + 1) {
+			str.insert(pos, s, n);
+		}
+
+		return *this;
+	}
+
+	//! Reserves some memory.
+	/** \param count: Amount of characters to reserve, including
+	the trailing NUL. */
+	void reserve(u32 count)
+	{
+		if (count == 0)
+			return;
+		str.reserve(count - 1);
+	}
+
+	//! finds first occurrence of character in string
+	/** \param c: Character to search for.
+	\return Position where the character has been found,
+	or -1 if not found. */
+	s32 findFirst(T c) const
+	{
+		auto r = str.find(c);
+		return pos_from_stl(r);
+	}
+
+	//! finds first occurrence of a character of a list in string
+	/** \param c: List of characters to find. For example if the method
+	should find the first occurrence of 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where one of the characters has been found,
+	or -1 if not found. */
+	s32 findFirstChar(const T *const c, u32 count = 1) const
+	{
+		if (!c || !count)
+			return -1;
+
+		auto r = str.find_first_of(c, 0, count);
+		return pos_from_stl(r);
+	}
+
+	//! Finds first position of a character not in a given list.
+	/** \param c: List of characters not to find. For example if the method
+	should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where the character has been found,
+	or -1 if not found. */
+	s32 findFirstCharNotInList(const T *const c, u32 count = 1) const
+	{
+		if (!c || !count)
+			return -1;
+
+		auto r = str.find_first_not_of(c, 0, count);
+		return pos_from_stl(r);
+	}
+
+	//! Finds last position of a character not in a given list.
+	/** \param c: List of characters not to find. For example if the method
+	should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where the character has been found,
+	or -1 if not found. */
+	s32 findLastCharNotInList(const T *const c, u32 count = 1) const
+	{
+		if (!c || !count)
+			return -1;
+
+		auto r = str.find_last_not_of(c, npos, count);
+		return pos_from_stl(r);
+	}
+
+	//! finds next occurrence of character in string
+	/** \param c: Character to search for.
+	\param startPos: Position in string to start searching.
+	\return Position where the character has been found,
+	or -1 if not found. */
+	s32 findNext(T c, u32 startPos) const
+	{
+		auto r = str.find(c, startPos);
+		return pos_from_stl(r);
+	}
+
+	//! finds last occurrence of character in string
+	/** \param c: Character to search for.
+	\param start: start to search reverse ( default = -1, on end )
+	\return Position where the character has been found,
+	or -1 if not found. */
+	s32 findLast(T c, s32 start = -1) const
+	{
+		auto r = str.rfind(c, pos_to_stl(start));
+		return pos_from_stl(r);
+	}
+
+	//! finds last occurrence of a character of a list in string
+	/** \param c: List of strings to find. For example if the method
+	should find the last occurrence of 'a' or 'b', this parameter should be "ab".
+	\param count: Amount of characters in the list. Usually,
+	this should be strlen(c)
+	\return Position where one of the characters has been found,
+	or -1 if not found. */
+	s32 findLastChar(const T *const c, u32 count = 1) const
+	{
+		if (!c || !count)
+			return -1;
+
+		auto r = str.find_last_of(c, npos, count);
+		return pos_from_stl(r);
+	}
+
+	//! finds another string in this string
+	/** \param str: Another string
+	\param start: Start position of the search
+	\return Positions where the string has been found,
+	or -1 if not found. */
+	s32 find(const T *const other, const u32 start = 0) const
+	{
+		if (other && *other) {
+			auto r = str.find(other, start);
+			return pos_from_stl(r);
+		}
+
+		return -1;
+	}
+
+	//! Returns a substring
+	/** \param begin Start of substring.
+	\param length Length of substring.
+	\param make_lower copy only lower case */
+	string<T> subString(u32 begin, s32 length, bool make_lower = false) const
+	{
+		// if start after string
+		// or no proper substring length
+		if ((length <= 0) || (begin >= size()))
+			return string<T>("");
+
+		string<T> o = str.substr(begin, length);
+		if (make_lower)
+			o.make_lower();
+		return o;
+	}
+
+	//! Appends a character to this string
+	/** \param c Character to append. */
+	string<T> &operator+=(T c)
+	{
+		append(c);
+		return *this;
+	}
+
+	//! Appends a char string to this string
+	/** \param c Char string to append. */
+	string<T> &operator+=(const T *const c)
+	{
+		append(c);
+		return *this;
+	}
+
+	//! Appends a string to this string
+	/** \param other String to append. */
+	string<T> &operator+=(const string<T> &other)
+	{
+		append(other);
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const int i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const unsigned int i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const long i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const unsigned long i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const double i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Appends a string representation of a number to this string
+	/** \param i Number to append. */
+	string<T> &operator+=(const float i)
+	{
+		append(string<T>(i));
+		return *this;
+	}
+
+	//! Replaces all characters of a special type with another one
+	/** \param toReplace Character to replace.
+	\param replaceWith Character replacing the old one. */
+	string<T> &replace(T toReplace, T replaceWith)
+	{
+		std::replace(str.begin(), str.end(), toReplace, replaceWith);
+		return *this;
+	}
+
+	//! Replaces all instances of a string with another one.
+	/** \param toReplace The string to replace.
+	\param replaceWith The string replacing the old one. */
+	string<T> &replace(const string<T> &toReplace, const string<T> &replaceWith)
+	{
+		size_type pos = 0;
+		while ((pos = str.find(toReplace.str, pos)) != npos) {
+			str.replace(pos, toReplace.size(), replaceWith.str);
+			pos += replaceWith.size();
+		}
+
+		return *this;
+	}
+
+	//! Removes a character from a string.
+	/** \param c: Character to remove. */
+	string<T> &remove(T c)
+	{
+		str.erase(std::remove(str.begin(), str.end(), c), str.end());
+		return *this;
+	}
+
+	//! Removes a string from the string.
+	/** \param toRemove: String to remove. */
+	string<T> &remove(const string<T> &toRemove)
+	{
+		u32 size = toRemove.size();
+		if (size == 0)
+			return *this;
+		u32 pos = 0;
+		u32 found = 0;
+		for (u32 i = 0; i < str.size(); ++i) {
+			u32 j = 0;
+			while (j < size) {
+				if (str[i + j] != toRemove[j])
+					break;
+				++j;
+			}
+			if (j == size) {
+				found += size;
+				i += size - 1;
+				continue;
+			}
+
+			str[pos++] = str[i];
+		}
+		str.resize(str.size() - found);
+		return *this;
+	}
+
+	//! Removes characters from a string.
+	/** \param characters: Characters to remove. */
+	string<T> &removeChars(const string<T> &characters)
+	{
+		if (characters.size() == 0)
+			return *this;
+
+		for (u32 i = 0; i < characters.size(); i++)
+			remove(characters[i]);
+		return *this;
+	}
+
+	//! Trims the string.
+	/** Removes the specified characters (by default, Latin-1 whitespace)
+	from the beginning and the end of the string. */
+	string<T> &trim(const string<T> &whitespace = " \t\n\r")
+	{
+		// find start and end of the substring without the specified characters
+		const s32 begin = findFirstCharNotInList(whitespace.c_str(), whitespace.size());
+		if (begin == -1)
+			return (*this = "");
+
+		const s32 end = findLastCharNotInList(whitespace.c_str(), whitespace.size());
+
+		return (*this = subString(begin, (end + 1) - begin));
+	}
+
+	//! Erases a character from the string.
+	/** May be slow, because all elements
+	following after the erased element have to be copied.
+	\param index: Index of element to be erased. */
+	string<T> &erase(u32 index)
+	{
+		str.erase(str.begin() + index);
+		return *this;
+	}
+
+	//! verify the existing string.
+	string<T> &validate()
+	{
+		// truncate to existing null
+		u32 len = calclen(c_str());
+		if (len != size())
+			str.resize(len);
+
+		return *this;
+	}
+
+	//! gets the last char of a string or null
+	T lastChar() const
+	{
+		return !str.empty() ? str.back() : 0;
+	}
+
+	//! Split string into parts (tokens).
+	/** This method will split a string at certain delimiter characters
+	into the container passed in as reference. The type of the container
+	has to be given as template parameter. It must provide a push_back and
+	a size method.
+	\param ret The result container. Tokens are added, the container is not cleared.
+	\param delimiter C-style string of delimiter characters
+	\param countDelimiters Number of delimiter characters
+	\param ignoreEmptyTokens Flag to avoid empty substrings in the result
+	container. If two delimiters occur without a character in between or an
+	empty substring would be placed in the result. Or if a delimiter is the last
+	character an empty substring would be added at the end.	If this flag is set,
+	only non-empty strings are stored.
+	\param keepSeparators Flag which allows to add the separator to the
+	result string. If this flag is true, the concatenation of the
+	substrings results in the original string. Otherwise, only the
+	characters between the delimiters are returned.
+	\return The number of resulting substrings
+	*/
+	template <class container>
+	u32 split(container &ret, const T *const delimiter, u32 countDelimiters = 1, bool ignoreEmptyTokens = true, bool keepSeparators = false) const
+	{
+		if (!delimiter)
+			return 0;
+
+		const u32 oldSize = static_cast<u32>(ret.size());
+
+		u32 tokenStartIdx = 0;
+		for (u32 i = 0; i < size() + 1; ++i) {
+			for (u32 j = 0; j < countDelimiters; ++j) {
+				if (str[i] == delimiter[j]) {
+					if (i - tokenStartIdx > 0)
+						ret.push_back(string<T>(&str[tokenStartIdx], i - tokenStartIdx));
+					else if (!ignoreEmptyTokens)
+						ret.push_back(string<T>());
+					if (keepSeparators) {
+						ret.push_back(string<T>(&str[i], 1));
+					}
+
+					tokenStartIdx = i + 1;
+					break;
+				}
+			}
+		}
+		if (size() > tokenStartIdx)
+			ret.push_back(string<T>(&str[tokenStartIdx], size() - tokenStartIdx));
+		else if (!ignoreEmptyTokens)
+			ret.push_back(string<T>());
+
+		return static_cast<u32>(ret.size() - oldSize);
+	}
+
+	// This function should not be used and is only kept for "CGUIFileOpenDialog::pathToStringW".
+	friend size_t multibyteToWString(stringw &destination, const stringc &source);
+
+	friend size_t utf8ToWString(stringw &destination, const char *source);
+	friend size_t wStringToUTF8(stringc &destination, const wchar_t *source);
+
+private:
+	typedef std::basic_string<T> stl_type;
+
+	//! Private constructor
+	string(stl_type &&str) :
+			str(str)
+	{
+	}
+
+	//! strlen wrapper
+	template <typename U>
+	static inline u32 calclen(const U *p)
+	{
+		u32 len = 0;
+		while (*p++)
+			len++;
+		return len;
+	}
+	static inline u32 calclen(const char *p)
+	{
+		return static_cast<u32>(strlen(p));
+	}
+	static inline u32 calclen(const wchar_t *p)
+	{
+		return static_cast<u32>(wcslen(p));
+	}
+
+	//! strcmp wrapper
+	template <typename U>
+	static inline int cmp(const U *p, const U *p2)
+	{
+		while (*p && *p == *p2)
+			p++, p2++;
+		return (int)*p - (int)*p2;
+	}
+	static inline int cmp(const char *p, const char *p2)
+	{
+		return strcmp(p, p2);
+	}
+	static inline int cmp(const wchar_t *p, const wchar_t *p2)
+	{
+		return wcscmp(p, p2);
+	}
+
+	typedef typename stl_type::size_type size_type;
+	static const size_type npos = stl_type::npos;
+
+	static inline s32 pos_from_stl(size_type pos)
+	{
+		return pos == npos ? -1 : (s32)pos;
+	}
+	static inline size_type pos_to_stl(s32 pos)
+	{
+		return pos == -1 ? npos : (size_type)pos;
+	}
+
+	stl_type str;
+};
+
+//! Convert multibyte string to wide-character string
+/** Wrapper around mbstowcs from standard library, but directly using Irrlicht string class.
+What the function does exactly depends on the LC_CTYPE of the current c locale.
+\param destination Wide-character string receiving the converted source
+\param source multibyte string
+\return The number of wide characters written to destination, not including the eventual terminating null character or -1 when conversion failed
+
+This function should not be used and is only kept for "CGUIFileOpenDialog::pathToStringW". */
+inline size_t multibyteToWString(stringw &destination, const core::stringc &source)
+{
+	u32 sourceSize = source.size();
+
+	if (sourceSize) {
+		destination.str.resize(sourceSize + 1);
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996) // 'mbstowcs': This function or variable may be unsafe. Consider using mbstowcs_s instead.
+#endif
+		const size_t written = mbstowcs(&destination[0], source.c_str(), (size_t)sourceSize);
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+		if (written != (size_t)-1) {
+			destination.str.resize(written);
+		} else {
+			// Likely character which got converted until the invalid character was encountered are in destination now.
+			// And it seems even 0-terminated, but I found no documentation anywhere that this (the 0-termination) is guaranteed :-(
+			destination.clear();
+		}
+		return written;
+	} else {
+		destination.clear();
+		return 0;
+	}
+}
+
+inline size_t utf8ToWString(stringw &destination, const char *source)
+{
+	destination = utf8_to_wide(source);
+	return destination.size();
+}
+
+inline size_t utf8ToWString(stringw &destination, const stringc &source)
+{
+	return utf8ToWString(destination, source.c_str());
+}
+
+inline size_t wStringToUTF8(stringc &destination, const wchar_t *source)
+{
+	destination = wide_to_utf8(source);
+	return destination.size();
+}
+
+inline size_t wStringToUTF8(stringc &destination, const stringw &source)
+{
+	return wStringToUTF8(destination, source.c_str());
+}
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/irrTypes.h b/irr/include/irrTypes.h
new file mode 100644
index 000000000..6c0ee661c
--- /dev/null
+++ b/irr/include/irrTypes.h
@@ -0,0 +1,93 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <cstdint>
+
+namespace irr
+{
+
+//! 8 bit unsigned variable.
+typedef uint8_t u8;
+
+//! 8 bit signed variable.
+typedef int8_t s8;
+
+//! 8 bit character variable.
+/** This is a typedef for char, it ensures portability of the engine. */
+typedef char c8;
+
+//! 16 bit unsigned variable.
+typedef uint16_t u16;
+
+//! 16 bit signed variable.
+typedef int16_t s16;
+
+//! 32 bit unsigned variable.
+typedef uint32_t u32;
+
+//! 32 bit signed variable.
+typedef int32_t s32;
+
+//! 64 bit unsigned variable.
+typedef uint64_t u64;
+
+//! 64 bit signed variable.
+typedef int64_t s64;
+
+//! 32 bit floating point variable.
+/** This is a typedef for float, it ensures portability of the engine. */
+typedef float f32;
+
+//! 64 bit floating point variable.
+/** This is a typedef for double, it ensures portability of the engine. */
+typedef double f64;
+
+} // end namespace irr
+
+//! Defines for snprintf_irr because snprintf method does not match the ISO C
+//! standard on Windows platforms.
+//! We want int snprintf_irr(char *str, size_t size, const char *format, ...);
+#if defined(_MSC_VER)
+#define snprintf_irr sprintf_s
+#else
+#define snprintf_irr snprintf
+#endif // _MSC_VER
+
+namespace irr
+{
+
+//! Type name for character type used by the file system (legacy).
+typedef char fschar_t;
+#define _IRR_TEXT(X) X
+
+} // end namespace irr
+
+//! define a break macro for debugging.
+#if defined(_DEBUG)
+#if defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)
+#include <crtdbg.h>
+#define _IRR_DEBUG_BREAK_IF(_CONDITION_) \
+	if (_CONDITION_) {                   \
+		_CrtDbgBreak();                  \
+	}
+#else
+#include <assert.h>
+#define _IRR_DEBUG_BREAK_IF(_CONDITION_) assert(!(_CONDITION_));
+#endif
+#else
+#define _IRR_DEBUG_BREAK_IF(_CONDITION_)
+#endif
+
+//! deprecated macro for virtual function override
+/** prefer to use the override keyword for new code */
+#define _IRR_OVERRIDE_ override
+
+//! creates four CC codes used in Irrlicht for simple ids
+/** some compilers can create those by directly writing the
+code like 'code', but some generate warnings so we use this macro here */
+#define MAKE_IRR_ID(c0, c1, c2, c3)                             \
+	((irr::u32)(irr::u8)(c0) | ((irr::u32)(irr::u8)(c1) << 8) | \
+			((irr::u32)(irr::u8)(c2) << 16) | ((irr::u32)(irr::u8)(c3) << 24))
diff --git a/irr/include/irrlicht.h b/irr/include/irrlicht.h
new file mode 100644
index 000000000..5b7042fc6
--- /dev/null
+++ b/irr/include/irrlicht.h
@@ -0,0 +1,318 @@
+/* irrlicht.h -- interface of the 'Irrlicht Engine'
+
+  Copyright (C) 2002-2012 Nikolaus Gebhardt
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+	 claim that you wrote the original software. If you use this software
+	 in a product, an acknowledgment in the product documentation would be
+	 appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+	 misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Please note that the Irrlicht Engine is based in part on the work of the
+  Independent JPEG Group, the zlib and the libPng. This means that if you use
+  the Irrlicht Engine in your product, you must acknowledge somewhere in your
+  documentation that you've used the IJG code. It would also be nice to mention
+  that you use the Irrlicht Engine, the zlib and libPng. See the README files
+  in the jpeglib, the zlib and libPng for further information.
+*/
+
+#pragma once
+
+#include "aabbox3d.h"
+#include "CMeshBuffer.h"
+#include "coreutil.h"
+#include "dimension2d.h"
+#include "ECullingTypes.h"
+#include "EDebugSceneTypes.h"
+#include "EDriverFeatures.h"
+#include "EDriverTypes.h"
+#include "EGUIAlignment.h"
+#include "EGUIElementTypes.h"
+#include "EHardwareBufferFlags.h"
+#include "EMaterialProps.h"
+#include "EMaterialTypes.h"
+#include "ESceneNodeTypes.h"
+#include "fast_atof.h"
+#include "IAnimatedMesh.h"
+#include "IAnimatedMeshSceneNode.h"
+#include "IAttributes.h"
+#include "IBillboardSceneNode.h"
+#include "IBoneSceneNode.h"
+#include "ICameraSceneNode.h"
+#include "IContextManager.h"
+#include "ICursorControl.h"
+#include "IDummyTransformationSceneNode.h"
+#include "IEventReceiver.h"
+#include "IFileList.h"
+#include "IFileSystem.h"
+#include "IGPUProgrammingServices.h"
+#include "IGUIButton.h"
+#include "IGUICheckBox.h"
+#include "IGUIComboBox.h"
+#include "IGUIEditBox.h"
+#include "IGUIElement.h"
+#include "IGUIEnvironment.h"
+#include "IGUIFileOpenDialog.h"
+#include "IGUIFont.h"
+#include "IGUIFontBitmap.h"
+#include "IGUIImage.h"
+#include "IGUIListBox.h"
+#include "IGUIScrollBar.h"
+#include "IGUISkin.h"
+#include "IGUISpriteBank.h"
+#include "IGUIStaticText.h"
+#include "IGUITabControl.h"
+#include "IGUIToolbar.h"
+#include "IImage.h"
+#include "IImageLoader.h"
+#include "IImageWriter.h"
+#include "IIndexBuffer.h"
+#include "ILogger.h"
+#include "IMaterialRenderer.h"
+#include "IMaterialRendererServices.h"
+#include "IMesh.h"
+#include "IMeshBuffer.h"
+#include "IMeshCache.h"
+#include "IMeshLoader.h"
+#include "IMeshManipulator.h"
+#include "IMeshSceneNode.h"
+#include "IOSOperator.h"
+#include "IReadFile.h"
+#include "IReferenceCounted.h"
+#include "irrArray.h"
+#include "IRenderTarget.h"
+#include "IrrlichtDevice.h"
+#include "irrMath.h"
+#include "irrString.h"
+#include "irrTypes.h"
+#include "path.h"
+#include "ISceneCollisionManager.h"
+#include "ISceneManager.h"
+#include "ISceneNode.h"
+#include "IShaderConstantSetCallBack.h"
+#include "ISkinnedMesh.h"
+#include "ITexture.h"
+#include "ITimer.h"
+#include "IVertexBuffer.h"
+#include "IVideoDriver.h"
+#include "IWriteFile.h"
+#include "Keycodes.h"
+#include "line2d.h"
+#include "line3d.h"
+#include "matrix4.h"
+#include "plane3d.h"
+#include "position2d.h"
+#include "quaternion.h"
+#include "rect.h"
+#include "S3DVertex.h"
+#include "SAnimatedMesh.h"
+#include "SceneParameters.h"
+#include "SColor.h"
+#include "SExposedVideoData.h"
+#include "SIrrCreationParameters.h"
+#include "SMaterial.h"
+#include "SMesh.h"
+#include "SMeshBuffer.h"
+#include "SSkinMeshBuffer.h"
+#include "SVertexIndex.h"
+#include "SViewFrustum.h"
+#include "vector2d.h"
+#include "vector3d.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API and IRRCALLCONV
+
+/*! \mainpage Irrlicht Engine 1.9 API documentation
+ *
+ * <div align="center"><img src="logobig.png" ></div>
+ *
+ * \section intro Introduction
+ *
+ * Welcome to the Irrlicht Engine API documentation.
+ * Here you'll find any information you'll need to develop applications with
+ * the Irrlicht Engine. If you are looking for a tutorial on how to start, you'll
+ * find some on the homepage of the Irrlicht Engine at
+ * <A HREF="http://irrlicht.sourceforge.net" >irrlicht.sourceforge.net</A>
+ * or inside the SDK in the examples directory.
+ *
+ * The Irrlicht Engine is intended to be an easy-to-use 3d engine, so
+ * this documentation is an important part of it. If you have any questions or
+ * suggestions, just send a email to the author of the engine, Nikolaus Gebhardt
+ * (niko (at) irrlicht3d.org).
+ *
+ *
+ * \section links Links
+ *
+ * <A HREF="namespaces.html">Namespaces</A>: A very good place to start reading
+ * the documentation.<BR>
+ * <A HREF="annotated.html">Class list</A>: List of all classes with descriptions.<BR>
+ * <A HREF="functions.html">Class members</A>: Good place to find forgotten features.<BR>
+ *
+ * \section irrexample Short example
+ *
+ * A simple application, starting up the engine, loading a Quake 2 animated
+ * model file and the corresponding texture, animating and displaying it
+ * in front of a blue background and placing a user controlable 3d camera
+ * would look like the following code. I think this example shows the usage
+ * of the engine quite well:
+ *
+ * \code
+ * #include <irrlicht.h>
+ * using namespace irr;
+ *
+ * int main()
+ * {
+ *	// start up the engine
+ *	IrrlichtDevice *device = createDevice(video::EDT_OPENGL,
+ *		core::dimension2d<u32>(640,480));
+ *
+ *	video::IVideoDriver* driver = device->getVideoDriver();
+ *	scene::ISceneManager* scenemgr = device->getSceneManager();
+ *
+ *	device->setWindowCaption(L"Hello World!");
+ *
+ *	// load and show quake2 .md2 model
+ *	scene::ISceneNode* node = scenemgr->addAnimatedMeshSceneNode(
+ *		scenemgr->getMesh("quake2model.md2"));
+ *
+ *	// if everything worked, add a texture and disable lighting
+ *	if (node)
+ *	{
+ *		node->setMaterialTexture(0, driver->getTexture("texture.bmp"));
+ *		node->setMaterialFlag(video::EMF_LIGHTING, false);
+ *	}
+ *
+ *	// add a first person shooter style user controlled camera
+ *	scenemgr->addCameraSceneNodeFPS();
+ *
+ *	// draw everything
+ *	while(device->run() && driver)
+ *	{
+ *		driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, video::SColor(255,0,0,255));
+ *		scenemgr->drawAll();
+ *		driver->endScene();
+ *	}
+ *
+ *	// delete device
+ *	device->drop();
+ *	return 0;
+ * }
+ * \endcode
+ *
+ * Irrlicht can load a lot of file formats automatically, see irr::scene::ISceneManager::getMesh()
+ * for a detailed list. So if you would like to replace the simple blue screen background by
+ * a cool Quake 3 Map, optimized by an octree, just insert this code
+ * somewhere before the while loop:
+ *
+ * \code
+ *	// add .pk3 archive to the file system
+ *	device->getFileSystem()->addZipFileArchive("quake3map.pk3");
+ *
+ *	// load .bsp file and show it using an octree
+ *	scenemgr->addOctreeSceneNode(
+ *		scenemgr->getMesh("quake3map.bsp"));
+ * \endcode
+ *
+ * As you can see, the engine uses namespaces. Everything in the engine is
+ * placed into the namespace 'irr', but there are also 5 sub namespaces.
+ * You can find a list of all namespaces with descriptions at the
+ * <A HREF="namespaces.html"> namespaces page</A>.
+ * This is also a good place to start reading the documentation. If you
+ * don't want to write the namespace names all the time, just use all namespaces like
+ * this:
+ * \code
+ * using namespace core;
+ * using namespace scene;
+ * using namespace video;
+ * using namespace io;
+ * using namespace gui;
+ * \endcode
+ *
+ * There is a lot more the engine can do, but I hope this gave a short
+ * overview over the basic features of the engine. For more examples, please take
+ * a look into the examples directory of the SDK.
+ */
+
+#include "SIrrCreationParameters.h"
+
+//! Everything in the Irrlicht Engine can be found in this namespace.
+namespace irr
+{
+//! Creates an Irrlicht device. The Irrlicht device is the root object for using the engine.
+/** If you need more parameters to be passed to the creation of the Irrlicht Engine device,
+use the createDeviceEx() function.
+\param driverType: Type of the video driver to use.
+\param windowSize: Size of the window or the video mode in fullscreen mode.
+\param bits: Bits per pixel in fullscreen mode. Ignored if windowed mode.
+\param fullscreen: Should be set to true if the device should run in fullscreen. Otherwise
+	the device runs in windowed mode.
+\param stencilbuffer: Specifies if the stencil buffer should be enabled. Set this to true,
+if you want the engine be able to draw stencil buffer shadows. Note that not all
+devices are able to use the stencil buffer. If they don't no shadows will be drawn.
+\param vsync: Specifies vertical synchronization: If set to true, the driver will wait
+for the vertical retrace period, otherwise not.
+\param receiver: A user created event receiver.
+\return Returns pointer to the created IrrlichtDevice or null if the
+device could not be created.
+*/
+extern "C" IRRLICHT_API IrrlichtDevice *IRRCALLCONV createDevice(
+		video::E_DRIVER_TYPE driverType = video::EDT_OPENGL,
+		// parentheses are necessary for some compilers
+		const core::dimension2d<u32> &windowSize = (core::dimension2d<u32>(640, 480)),
+		u32 bits = 32,
+		bool fullscreen = false,
+		bool stencilbuffer = true,
+		bool vsync = false,
+		IEventReceiver *receiver = 0);
+
+//! Creates an Irrlicht device with the option to specify advanced parameters.
+/** Usually you should used createDevice() for creating an Irrlicht Engine device.
+Use this function only if you wish to specify advanced parameters like a window
+handle in which the device should be created.
+\param parameters: Structure containing advanced parameters for the creation of the device.
+See irr::SIrrlichtCreationParameters for details.
+\return Returns pointer to the created IrrlichtDevice or null if the
+device could not be created. */
+extern "C" IRRLICHT_API IrrlichtDevice *IRRCALLCONV createDeviceEx(
+		const SIrrlichtCreationParameters &parameters);
+
+// THE FOLLOWING IS AN EMPTY LIST OF ALL SUB NAMESPACES
+// EXISTING ONLY FOR THE DOCUMENTATION SOFTWARE DOXYGEN.
+
+//! Basic classes such as vectors, planes, arrays, lists, and so on can be found in this namespace.
+namespace core
+{
+}
+
+//! The gui namespace contains useful classes for easy creation of a graphical user interface.
+namespace gui
+{
+}
+
+//! This namespace provides interfaces for input/output: Reading and writing files, accessing zip archives, ...
+namespace io
+{
+}
+
+//! All scene management can be found in this namespace: Mesh loading, special scene nodes like octrees and billboards, ...
+namespace scene
+{
+}
+
+//! The video namespace contains classes for accessing the video driver. All 2d and 3d rendering is done here.
+namespace video
+{
+}
+}
+
+/*! \file irrlicht.h
+	\brief Main header file of the irrlicht, the only file needed to include.
+*/
diff --git a/irr/include/irrpack.h b/irr/include/irrpack.h
new file mode 100644
index 000000000..5887cda63
--- /dev/null
+++ b/irr/include/irrpack.h
@@ -0,0 +1,25 @@
+// Copyright (C) 2007-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// include this file right before the data structures to be 1-aligned
+// and add to each structure the PACK_STRUCT define just like this:
+// struct mystruct
+// {
+//	...
+// } PACK_STRUCT;
+// Always include the irrunpack.h file right after the last type declared
+// like this, and do not put any other types with different alignment
+// in between!
+
+// byte-align structures
+#if defined(_MSC_VER)
+#pragma warning(disable : 4103)
+#pragma pack(push, packing)
+#pragma pack(1)
+#define PACK_STRUCT
+#elif defined(__GNUC__)
+#define PACK_STRUCT __attribute__((packed))
+#else
+#error compiler not supported
+#endif
diff --git a/irr/include/irrunpack.h b/irr/include/irrunpack.h
new file mode 100644
index 000000000..999e1ea05
--- /dev/null
+++ b/irr/include/irrunpack.h
@@ -0,0 +1,13 @@
+// Copyright (C) 2007-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// include this file to switch back to default alignment
+// file belongs to irrpack.h, see there for more info
+
+// Default alignment
+#if defined(_MSC_VER)
+#pragma pack(pop, packing)
+#endif
+
+#undef PACK_STRUCT
diff --git a/irr/include/line2d.h b/irr/include/line2d.h
new file mode 100644
index 000000000..fb58f0b7a
--- /dev/null
+++ b/irr/include/line2d.h
@@ -0,0 +1,380 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "vector2d.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! 2D line between two points with intersection methods.
+template <class T>
+class line2d
+{
+public:
+	//! Default constructor for line going from (0,0) to (1,1).
+	constexpr line2d() :
+			start(0, 0), end(1, 1) {}
+	//! Constructor for line between the two points.
+	constexpr line2d(T xa, T ya, T xb, T yb) :
+			start(xa, ya), end(xb, yb) {}
+	//! Constructor for line between the two points given as vectors.
+	constexpr line2d(const vector2d<T> &start, const vector2d<T> &end) :
+			start(start), end(end) {}
+
+	// operators
+
+	line2d<T> operator+(const vector2d<T> &point) const { return line2d<T>(start + point, end + point); }
+	line2d<T> &operator+=(const vector2d<T> &point)
+	{
+		start += point;
+		end += point;
+		return *this;
+	}
+
+	line2d<T> operator-(const vector2d<T> &point) const { return line2d<T>(start - point, end - point); }
+	line2d<T> &operator-=(const vector2d<T> &point)
+	{
+		start -= point;
+		end -= point;
+		return *this;
+	}
+
+	constexpr bool operator==(const line2d<T> &other) const
+	{
+		return (start == other.start && end == other.end) || (end == other.start && start == other.end);
+	}
+	constexpr bool operator!=(const line2d<T> &other) const
+	{
+		return !(start == other.start && end == other.end) || (end == other.start && start == other.end);
+	}
+
+	// functions
+	//! Set this line to new line going through the two points.
+	void setLine(const T &xa, const T &ya, const T &xb, const T &yb)
+	{
+		start.set(xa, ya);
+		end.set(xb, yb);
+	}
+	//! Set this line to new line going through the two points.
+	void setLine(const vector2d<T> &nstart, const vector2d<T> &nend)
+	{
+		start.set(nstart);
+		end.set(nend);
+	}
+	//! Set this line to new line given as parameter.
+	void setLine(const line2d<T> &line)
+	{
+		start.set(line.start);
+		end.set(line.end);
+	}
+
+	//! Get length of line
+	/** \return Length of the line. */
+	T getLength() const { return start.getDistanceFrom(end); }
+
+	//! Get squared length of the line
+	/** \return Squared length of line. */
+	T getLengthSQ() const { return start.getDistanceFromSQ(end); }
+
+	//! Get middle of the line
+	/** \return center of the line. */
+	vector2d<T> getMiddle() const
+	{
+		return (start + end) / (T)2;
+	}
+
+	//! Get the vector of the line.
+	/** \return The vector of the line. */
+	vector2d<T> getVector() const { return vector2d<T>(end.X - start.X, end.Y - start.Y); }
+
+	/*! Check if this segment intersects another segment,
+		or if segments are coincident (colinear). */
+	bool intersectAsSegments(const line2d<T> &other) const
+	{
+		// Taken from:
+		// http://www.geeksforgeeks.org/check-if-two-given-line-segments-intersect/
+
+		// Find the four orientations needed for general and
+		// special cases
+		s32 o1 = start.checkOrientation(end, other.start);
+		s32 o2 = start.checkOrientation(end, other.end);
+		s32 o3 = other.start.checkOrientation(other.end, start);
+		s32 o4 = other.start.checkOrientation(other.end, end);
+
+		// General case
+		if (o1 != o2 && o3 != o4)
+			return true;
+
+		// Special Cases to check if segments are colinear
+		if (o1 == 0 && other.start.isBetweenPoints(start, end))
+			return true;
+		if (o2 == 0 && other.end.isBetweenPoints(start, end))
+			return true;
+		if (o3 == 0 && start.isBetweenPoints(other.start, other.end))
+			return true;
+		if (o4 == 0 && end.isBetweenPoints(other.start, other.end))
+			return true;
+
+		return false; // Doesn't fall in any of the above cases
+	}
+
+	/*! Check if 2 segments are incident (intersects in exactly 1 point).*/
+	bool incidentSegments(const line2d<T> &other) const
+	{
+		return start.checkOrientation(end, other.start) != start.checkOrientation(end, other.end) && other.start.checkOrientation(other.end, start) != other.start.checkOrientation(other.end, end);
+	}
+
+	/*! Check if 2 lines/segments are parallel or nearly parallel.*/
+	bool nearlyParallel(const line2d<T> &line, const T factor = relativeErrorFactor<T>()) const
+	{
+		const vector2d<T> a = getVector();
+		const vector2d<T> b = line.getVector();
+
+		return a.nearlyParallel(b, factor);
+	}
+
+	/*! returns a intersection point of 2 lines (if lines are not parallel). Behaviour
+	undefined if lines are parallel or coincident.
+	It's on optimized intersectWith with checkOnlySegments=false and ignoreCoincidentLines=true
+	*/
+	vector2d<T> fastLinesIntersection(const line2d<T> &l) const
+	{
+		const f32 commonDenominator = (f32)((l.end.Y - l.start.Y) * (end.X - start.X) -
+											(l.end.X - l.start.X) * (end.Y - start.Y));
+
+		if (commonDenominator != 0.f) {
+			const f32 numeratorA = (f32)((l.end.X - l.start.X) * (start.Y - l.start.Y) -
+										 (l.end.Y - l.start.Y) * (start.X - l.start.X));
+
+			const f32 uA = numeratorA / commonDenominator;
+
+			// Calculate the intersection point.
+			return vector2d<T>(
+					(T)(start.X + uA * (end.X - start.X)),
+					(T)(start.Y + uA * (end.Y - start.Y)));
+		} else
+			return l.start;
+	}
+
+	/*! Check if this line intersect a segment. The eventual intersection point is returned in "out".*/
+	bool lineIntersectSegment(const line2d<T> &segment, vector2d<T> &out) const
+	{
+		if (nearlyParallel(segment))
+			return false;
+
+		out = fastLinesIntersection(segment);
+
+		return out.isBetweenPoints(segment.start, segment.end);
+	}
+
+	//! Tests if this line intersects with another line.
+	/** \param l: Other line to test intersection with.
+	\param checkOnlySegments: Default is to check intersection between the begin and endpoints.
+	When set to false the function will check for the first intersection point when extending the lines.
+	\param out: If there is an intersection, the location of the
+	intersection will be stored in this vector.
+	\param ignoreCoincidentLines: When true coincident lines (lines above each other) are never considered as intersecting.
+	When false the center of the overlapping part is returned.
+	\return True if there is an intersection, false if not. */
+	bool intersectWith(const line2d<T> &l, vector2d<T> &out, bool checkOnlySegments = true, bool ignoreCoincidentLines = false) const
+	{
+		// Uses the method given at:
+		// http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
+		const f32 commonDenominator = (f32)((l.end.Y - l.start.Y) * (end.X - start.X) -
+											(l.end.X - l.start.X) * (end.Y - start.Y));
+
+		const f32 numeratorA = (f32)((l.end.X - l.start.X) * (start.Y - l.start.Y) -
+									 (l.end.Y - l.start.Y) * (start.X - l.start.X));
+
+		const f32 numeratorB = (f32)((end.X - start.X) * (start.Y - l.start.Y) -
+									 (end.Y - start.Y) * (start.X - l.start.X));
+
+		if (equals(commonDenominator, 0.f)) {
+			// The lines are either coincident or parallel
+			// if both numerators are 0, the lines are coincident
+			if (!ignoreCoincidentLines && equals(numeratorA, 0.f) && equals(numeratorB, 0.f)) {
+				// Try and find a common endpoint
+				if (l.start == start || l.end == start)
+					out = start;
+				else if (l.end == end || l.start == end)
+					out = end;
+				// now check if the two segments are disjunct
+				else if (l.start.X > start.X && l.end.X > start.X && l.start.X > end.X && l.end.X > end.X)
+					return false;
+				else if (l.start.Y > start.Y && l.end.Y > start.Y && l.start.Y > end.Y && l.end.Y > end.Y)
+					return false;
+				else if (l.start.X < start.X && l.end.X < start.X && l.start.X < end.X && l.end.X < end.X)
+					return false;
+				else if (l.start.Y < start.Y && l.end.Y < start.Y && l.start.Y < end.Y && l.end.Y < end.Y)
+					return false;
+				// else the lines are overlapping to some extent
+				else {
+					// find the points which are not contributing to the
+					// common part
+					vector2d<T> maxp;
+					vector2d<T> minp;
+					if ((start.X > l.start.X && start.X > l.end.X && start.X > end.X) || (start.Y > l.start.Y && start.Y > l.end.Y && start.Y > end.Y))
+						maxp = start;
+					else if ((end.X > l.start.X && end.X > l.end.X && end.X > start.X) || (end.Y > l.start.Y && end.Y > l.end.Y && end.Y > start.Y))
+						maxp = end;
+					else if ((l.start.X > start.X && l.start.X > l.end.X && l.start.X > end.X) || (l.start.Y > start.Y && l.start.Y > l.end.Y && l.start.Y > end.Y))
+						maxp = l.start;
+					else
+						maxp = l.end;
+					if (maxp != start && ((start.X < l.start.X && start.X < l.end.X && start.X < end.X) || (start.Y < l.start.Y && start.Y < l.end.Y && start.Y < end.Y)))
+						minp = start;
+					else if (maxp != end && ((end.X < l.start.X && end.X < l.end.X && end.X < start.X) || (end.Y < l.start.Y && end.Y < l.end.Y && end.Y < start.Y)))
+						minp = end;
+					else if (maxp != l.start && ((l.start.X < start.X && l.start.X < l.end.X && l.start.X < end.X) || (l.start.Y < start.Y && l.start.Y < l.end.Y && l.start.Y < end.Y)))
+						minp = l.start;
+					else
+						minp = l.end;
+
+					// one line is contained in the other. Pick the center
+					// of the remaining points, which overlap for sure
+					out = core::vector2d<T>();
+					if (start != maxp && start != minp)
+						out += start;
+					if (end != maxp && end != minp)
+						out += end;
+					if (l.start != maxp && l.start != minp)
+						out += l.start;
+					if (l.end != maxp && l.end != minp)
+						out += l.end;
+					out.X = (T)(out.X / 2);
+					out.Y = (T)(out.Y / 2);
+				}
+
+				return true; // coincident
+			}
+
+			return false; // parallel
+		}
+
+		// Get the point of intersection on this line, checking that
+		// it is within the line segment.
+		const f32 uA = numeratorA / commonDenominator;
+		if (checkOnlySegments) {
+			if (uA < 0.f || uA > 1.f)
+				return false; // Outside the line segment
+
+			const f32 uB = numeratorB / commonDenominator;
+			if (uB < 0.f || uB > 1.f)
+				return false; // Outside the line segment
+		}
+
+		// Calculate the intersection point.
+		out.X = (T)(start.X + uA * (end.X - start.X));
+		out.Y = (T)(start.Y + uA * (end.Y - start.Y));
+		return true;
+	}
+
+	//! Get unit vector of the line.
+	/** \return Unit vector of this line. */
+	vector2d<T> getUnitVector() const
+	{
+		T len = (T)(1.0 / getLength());
+		return vector2d<T>((end.X - start.X) * len, (end.Y - start.Y) * len);
+	}
+
+	//! Get angle between this line and given line.
+	/** \param l Other line for test.
+	\return Angle in degrees. */
+	f64 getAngleWith(const line2d<T> &l) const
+	{
+		vector2d<T> vect = getVector();
+		vector2d<T> vect2 = l.getVector();
+		return vect.getAngleWith(vect2);
+	}
+
+	//! Tells us if the given point lies to the left, right, or on the line.
+	/** \return 0 if the point is on the line
+	<0 if to the left, or >0 if to the right. */
+	T getPointOrientation(const vector2d<T> &point) const
+	{
+		return ((end.X - start.X) * (point.Y - start.Y) -
+				(point.X - start.X) * (end.Y - start.Y));
+	}
+
+	//! Check if the given point is a member of the line
+	/** \return True if point is between start and end, else false. */
+	bool isPointOnLine(const vector2d<T> &point) const
+	{
+		T d = getPointOrientation(point);
+		return (d == 0 && point.isBetweenPoints(start, end));
+	}
+
+	//! Check if the given point is between start and end of the line.
+	/** Assumes that the point is already somewhere on the line. */
+	bool isPointBetweenStartAndEnd(const vector2d<T> &point) const
+	{
+		return point.isBetweenPoints(start, end);
+	}
+
+	//! Get the closest point on this line to a point
+	/** \param point: Starting search at this point
+	\param checkOnlySegments: Default (true) is to return a point on the line-segment (between begin and end) of the line.
+	When set to false the function will check for the first the closest point on the the line even when outside the segment. */
+	vector2d<T> getClosestPoint(const vector2d<T> &point, bool checkOnlySegments = true) const
+	{
+		vector2d<f64> c((f64)(point.X - start.X), (f64)(point.Y - start.Y));
+		vector2d<f64> v((f64)(end.X - start.X), (f64)(end.Y - start.Y));
+		f64 d = v.getLength();
+		if (d == 0) // can't tell much when the line is just a single point
+			return start;
+		v /= d;
+		f64 t = v.dotProduct(c);
+
+		if (checkOnlySegments) {
+			if (t < 0)
+				return vector2d<T>((T)start.X, (T)start.Y);
+			if (t > d)
+				return vector2d<T>((T)end.X, (T)end.Y);
+		}
+
+		v *= t;
+		return vector2d<T>((T)(start.X + v.X), (T)(start.Y + v.Y));
+	}
+
+	//! Start point of the line.
+	vector2d<T> start;
+	//! End point of the line.
+	vector2d<T> end;
+};
+
+// partial specialization to optimize <f32> lines (avoiding casts)
+template <>
+inline vector2df line2d<irr::f32>::getClosestPoint(const vector2df &point, bool checkOnlySegments) const
+{
+	const vector2df c = point - start;
+	vector2df v = end - start;
+	const f32 d = (f32)v.getLength();
+	if (d == 0) // can't tell much when the line is just a single point
+		return start;
+	v /= d;
+	const f32 t = v.dotProduct(c);
+
+	if (checkOnlySegments) {
+		if (t < 0)
+			return start;
+		if (t > d)
+			return end;
+	}
+
+	v *= t;
+	return start + v;
+}
+
+//! Typedef for an f32 line.
+typedef line2d<f32> line2df;
+//! Typedef for an integer line.
+typedef line2d<s32> line2di;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/line3d.h b/irr/include/line3d.h
new file mode 100644
index 000000000..ea198fba4
--- /dev/null
+++ b/irr/include/line3d.h
@@ -0,0 +1,165 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "vector3d.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! 3D line between two points with intersection methods.
+template <class T>
+class line3d
+{
+public:
+	//! Default constructor
+	/** line from (0,0,0) to (1,1,1) */
+	constexpr line3d() :
+			start(0, 0, 0), end(1, 1, 1) {}
+	//! Constructor with two points
+	constexpr line3d(T xa, T ya, T za, T xb, T yb, T zb) :
+			start(xa, ya, za), end(xb, yb, zb) {}
+	//! Constructor with two points as vectors
+	constexpr line3d(const vector3d<T> &start, const vector3d<T> &end) :
+			start(start), end(end) {}
+
+	// operators
+
+	line3d<T> operator+(const vector3d<T> &point) const { return line3d<T>(start + point, end + point); }
+	line3d<T> &operator+=(const vector3d<T> &point)
+	{
+		start += point;
+		end += point;
+		return *this;
+	}
+
+	line3d<T> operator-(const vector3d<T> &point) const { return line3d<T>(start - point, end - point); }
+	line3d<T> &operator-=(const vector3d<T> &point)
+	{
+		start -= point;
+		end -= point;
+		return *this;
+	}
+
+	constexpr bool operator==(const line3d<T> &other) const
+	{
+		return (start == other.start && end == other.end) || (end == other.start && start == other.end);
+	}
+	constexpr bool operator!=(const line3d<T> &other) const
+	{
+		return !(start == other.start && end == other.end) || (end == other.start && start == other.end);
+	}
+
+	// functions
+	//! Set this line to a new line going through the two points.
+	void setLine(const T &xa, const T &ya, const T &za, const T &xb, const T &yb, const T &zb)
+	{
+		start.set(xa, ya, za);
+		end.set(xb, yb, zb);
+	}
+	//! Set this line to a new line going through the two points.
+	void setLine(const vector3d<T> &nstart, const vector3d<T> &nend)
+	{
+		start.set(nstart);
+		end.set(nend);
+	}
+	//! Set this line to new line given as parameter.
+	void setLine(const line3d<T> &line)
+	{
+		start.set(line.start);
+		end.set(line.end);
+	}
+
+	//! Get length of line
+	/** \return Length of line. */
+	T getLength() const { return start.getDistanceFrom(end); }
+
+	//! Get squared length of line
+	/** \return Squared length of line. */
+	T getLengthSQ() const { return start.getDistanceFromSQ(end); }
+
+	//! Get middle of line
+	/** \return Center of line. */
+	vector3d<T> getMiddle() const
+	{
+		return (start + end) / (T)2;
+	}
+
+	//! Get vector of line
+	/** \return vector of line. */
+	vector3d<T> getVector() const
+	{
+		return end - start;
+	}
+
+	//! Check if the given point is between start and end of the line.
+	/** Assumes that the point is already somewhere on the line.
+	\param point The point to test.
+	\return True if point is on the line between start and end, else false.
+	*/
+	bool isPointBetweenStartAndEnd(const vector3d<T> &point) const
+	{
+		return point.isBetweenPoints(start, end);
+	}
+
+	//! Get the closest point on this line to a point
+	/** \param point The point to compare to.
+	\return The nearest point which is part of the line. */
+	vector3d<T> getClosestPoint(const vector3d<T> &point) const
+	{
+		vector3d<T> c = point - start;
+		vector3d<T> v = end - start;
+		T d = (T)v.getLength();
+		v /= d;
+		T t = v.dotProduct(c);
+
+		if (t < (T)0.0)
+			return start;
+		if (t > d)
+			return end;
+
+		v *= t;
+		return start + v;
+	}
+
+	//! Check if the line intersects with a sphere
+	/** \param sorigin: Origin of the sphere.
+	\param sradius: Radius of the sphere.
+	\param outdistance: The distance to the first intersection point.
+	\return True if there is an intersection.
+	If there is one, the distance to the first intersection point
+	is stored in outdistance. */
+	bool getIntersectionWithSphere(const vector3d<T> &sorigin, T sradius, f64 &outdistance) const
+	{
+		const vector3d<T> q = sorigin - start;
+		T c = q.getLength();
+		T v = q.dotProduct(getVector().normalize());
+		T d = sradius * sradius - (c * c - v * v);
+
+		if (d < 0.0)
+			return false;
+
+		outdistance = v - core::squareroot(d);
+		return true;
+	}
+
+	// member variables
+
+	//! Start point of line
+	vector3d<T> start;
+	//! End point of line
+	vector3d<T> end;
+};
+
+//! Typedef for an f32 line.
+typedef line3d<f32> line3df;
+//! Typedef for an integer line.
+typedef line3d<s32> line3di;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/matrix4.h b/irr/include/matrix4.h
new file mode 100644
index 000000000..374fc6e4a
--- /dev/null
+++ b/irr/include/matrix4.h
@@ -0,0 +1,2282 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <cstring> // memset, memcpy
+#include "irrMath.h"
+#include "vector3d.h"
+#include "vector2d.h"
+#include "plane3d.h"
+#include "aabbox3d.h"
+#include "rect.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
+
+// enable this to keep track of changes to the matrix
+// and make simpler identity check for seldom changing matrices
+// otherwise identity check will always compare the elements
+// #define USE_MATRIX_TEST
+
+namespace irr
+{
+namespace core
+{
+
+//! 4x4 matrix. Mostly used as transformation matrix for 3d calculations.
+/** The matrix is a D3D style matrix, row major with translations in the 4th row. */
+template <class T>
+class CMatrix4
+{
+public:
+	//! Constructor Flags
+	enum eConstructor
+	{
+		EM4CONST_NOTHING = 0,
+		EM4CONST_COPY,
+		EM4CONST_IDENTITY,
+		EM4CONST_TRANSPOSED,
+		EM4CONST_INVERSE,
+		EM4CONST_INVERSE_TRANSPOSED
+	};
+
+	//! Default constructor
+	/** \param constructor Choose the initialization style */
+	CMatrix4(eConstructor constructor = EM4CONST_IDENTITY);
+
+	//! Constructor with value initialization
+	constexpr CMatrix4(const T &r0c0, const T &r0c1, const T &r0c2, const T &r0c3,
+			const T &r1c0, const T &r1c1, const T &r1c2, const T &r1c3,
+			const T &r2c0, const T &r2c1, const T &r2c2, const T &r2c3,
+			const T &r3c0, const T &r3c1, const T &r3c2, const T &r3c3)
+	{
+		M[0] = r0c0;
+		M[1] = r0c1;
+		M[2] = r0c2;
+		M[3] = r0c3;
+		M[4] = r1c0;
+		M[5] = r1c1;
+		M[6] = r1c2;
+		M[7] = r1c3;
+		M[8] = r2c0;
+		M[9] = r2c1;
+		M[10] = r2c2;
+		M[11] = r2c3;
+		M[12] = r3c0;
+		M[13] = r3c1;
+		M[14] = r3c2;
+		M[15] = r3c3;
+	}
+
+	//! Copy constructor
+	/** \param other Other matrix to copy from
+	\param constructor Choose the initialization style */
+	CMatrix4(const CMatrix4<T> &other, eConstructor constructor = EM4CONST_COPY);
+
+	//! Simple operator for directly accessing every element of the matrix.
+	T &operator()(const s32 row, const s32 col)
+	{
+#if defined(USE_MATRIX_TEST)
+		definitelyIdentityMatrix = false;
+#endif
+		return M[row * 4 + col];
+	}
+
+	//! Simple operator for directly accessing every element of the matrix.
+	const T &operator()(const s32 row, const s32 col) const { return M[row * 4 + col]; }
+
+	//! Simple operator for linearly accessing every element of the matrix.
+	T &operator[](u32 index)
+	{
+#if defined(USE_MATRIX_TEST)
+		definitelyIdentityMatrix = false;
+#endif
+		return M[index];
+	}
+
+	//! Simple operator for linearly accessing every element of the matrix.
+	const T &operator[](u32 index) const { return M[index]; }
+
+	//! Sets this matrix equal to the other matrix.
+	CMatrix4<T> &operator=(const CMatrix4<T> &other) = default;
+
+	//! Sets all elements of this matrix to the value.
+	inline CMatrix4<T> &operator=(const T &scalar);
+
+	//! Returns pointer to internal array
+	const T *pointer() const { return M; }
+	T *pointer()
+	{
+#if defined(USE_MATRIX_TEST)
+		definitelyIdentityMatrix = false;
+#endif
+		return M;
+	}
+
+	//! Returns true if other matrix is equal to this matrix.
+	constexpr bool operator==(const CMatrix4<T> &other) const
+	{
+#if defined(USE_MATRIX_TEST)
+		if (definitelyIdentityMatrix && other.definitelyIdentityMatrix)
+			return true;
+#endif
+		for (s32 i = 0; i < 16; ++i)
+			if (M[i] != other.M[i])
+				return false;
+
+		return true;
+	}
+
+	//! Returns true if other matrix is not equal to this matrix.
+	constexpr bool operator!=(const CMatrix4<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	//! Add another matrix.
+	CMatrix4<T> operator+(const CMatrix4<T> &other) const;
+
+	//! Add another matrix.
+	CMatrix4<T> &operator+=(const CMatrix4<T> &other);
+
+	//! Subtract another matrix.
+	CMatrix4<T> operator-(const CMatrix4<T> &other) const;
+
+	//! Subtract another matrix.
+	CMatrix4<T> &operator-=(const CMatrix4<T> &other);
+
+	//! set this matrix to the product of two matrices
+	/** Calculate b*a */
+	inline CMatrix4<T> &setbyproduct(const CMatrix4<T> &other_a, const CMatrix4<T> &other_b);
+
+	//! Set this matrix to the product of two matrices
+	/** Calculate b*a, no optimization used,
+	use it if you know you never have an identity matrix */
+	CMatrix4<T> &setbyproduct_nocheck(const CMatrix4<T> &other_a, const CMatrix4<T> &other_b);
+
+	//! Multiply by another matrix.
+	/** Calculate other*this */
+	CMatrix4<T> operator*(const CMatrix4<T> &other) const;
+
+	//! Multiply by another matrix.
+	/** Like calling: (*this) = (*this) * other
+	 */
+	CMatrix4<T> &operator*=(const CMatrix4<T> &other);
+
+	//! Multiply by scalar.
+	CMatrix4<T> operator*(const T &scalar) const;
+
+	//! Multiply by scalar.
+	CMatrix4<T> &operator*=(const T &scalar);
+
+	//! Set matrix to identity.
+	inline CMatrix4<T> &makeIdentity();
+
+	//! Returns true if the matrix is the identity matrix
+	inline bool isIdentity() const;
+
+	//! Returns true if the matrix is orthogonal
+	inline bool isOrthogonal() const;
+
+	//! Returns true if the matrix is the identity matrix
+	bool isIdentity_integer_base() const;
+
+	//! Set the translation of the current matrix. Will erase any previous values.
+	CMatrix4<T> &setTranslation(const vector3d<T> &translation);
+
+	//! Gets the current translation
+	vector3d<T> getTranslation() const;
+
+	//! Set the inverse translation of the current matrix. Will erase any previous values.
+	CMatrix4<T> &setInverseTranslation(const vector3d<T> &translation);
+
+	//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.
+	inline CMatrix4<T> &setRotationRadians(const vector3d<T> &rotation);
+
+	//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.
+	CMatrix4<T> &setRotationDegrees(const vector3d<T> &rotation);
+
+	//! Get the rotation, as set by setRotation() when you already know the scale used to create the matrix
+	/** NOTE: The scale needs to be the correct one used to create this matrix.
+		You can _not_ use the result of getScale(), but have to save your scale
+		variable in another place (like ISceneNode does).
+	NOTE: No scale value can be 0 or the result is undefined.
+	NOTE: It does not necessarily return the *same* Euler angles as those set by setRotationDegrees(),
+		but the rotation will be equivalent,  i.e. will have the same result when used to rotate a vector or node.
+	NOTE: It will (usually) give wrong results when further transformations have been added in the matrix (like shear).
+	WARNING: There have been troubles with this function over the years and we may still have missed some corner cases.
+		It's generally safer to keep the rotation and scale you used to create the matrix around and work with those.
+	*/
+	core::vector3d<T> getRotationDegrees(const vector3d<T> &scale) const;
+
+	//! Returns the rotation, as set by setRotation().
+	/** NOTE: You will have the same end-rotation as used in setRotation, but it might not use the same axis values.
+		NOTE: This only works correct if no other matrix operations have been done on the inner 3x3 matrix besides
+			setting rotation (so no scale/shear). Thought it (probably) works as long as scale doesn't flip handedness.
+		NOTE: It does not necessarily return the *same* Euler angles as those set by setRotationDegrees(),
+		but the rotation will be equivalent,  i.e. will have the same result when used to rotate a vector or node.
+	*/
+	core::vector3d<T> getRotationDegrees() const;
+
+	//! Make an inverted rotation matrix from Euler angles.
+	/** The 4th row and column are unmodified. */
+	inline CMatrix4<T> &setInverseRotationRadians(const vector3d<T> &rotation);
+
+	//! Make an inverted rotation matrix from Euler angles.
+	/** The 4th row and column are unmodified. */
+	inline CMatrix4<T> &setInverseRotationDegrees(const vector3d<T> &rotation);
+
+	//! Make a rotation matrix from angle and axis, assuming left handed rotation.
+	/** The 4th row and column are unmodified. */
+	inline CMatrix4<T> &setRotationAxisRadians(const T &angle, const vector3d<T> &axis);
+
+	//! Set Scale
+	CMatrix4<T> &setScale(const vector3d<T> &scale);
+
+	//! Set Scale
+	CMatrix4<T> &setScale(const T scale) { return setScale(core::vector3d<T>(scale, scale, scale)); }
+
+	//! Get Scale
+	core::vector3d<T> getScale() const;
+
+	//! Translate a vector by the inverse of the translation part of this matrix.
+	void inverseTranslateVect(vector3df &vect) const;
+
+	//! Rotate a vector by the inverse of the rotation part of this matrix.
+	void inverseRotateVect(vector3df &vect) const;
+
+	//! Rotate a vector by the rotation part of this matrix.
+	void rotateVect(vector3df &vect) const;
+
+	//! An alternate transform vector method, writing into a second vector
+	void rotateVect(core::vector3df &out, const core::vector3df &in) const;
+
+	//! An alternate transform vector method, writing into an array of 3 floats
+	void rotateVect(T *out, const core::vector3df &in) const;
+
+	//! Transforms the vector by this matrix
+	/** This operation is performed as if the vector was 4d with the 4th component =1 */
+	void transformVect(vector3df &vect) const;
+
+	//! Transforms input vector by this matrix and stores result in output vector
+	/** This operation is performed as if the vector was 4d with the 4th component =1 */
+	void transformVect(vector3df &out, const vector3df &in) const;
+
+	//! An alternate transform vector method, writing into an array of 4 floats
+	/** This operation is performed as if the vector was 4d with the 4th component =1.
+		NOTE: out[3] will be written to (4th vector component)*/
+	void transformVect(T *out, const core::vector3df &in) const;
+
+	//! An alternate transform vector method, reading from and writing to an array of 3 floats
+	/** This operation is performed as if the vector was 4d with the 4th component =1
+		NOTE: out[3] will be written to (4th vector component)*/
+	void transformVec3(T *out, const T *in) const;
+
+	//! An alternate transform vector method, reading from and writing to an array of 4 floats
+	void transformVec4(T *out, const T *in) const;
+
+	//! Translate a vector by the translation part of this matrix.
+	/** This operation is performed as if the vector was 4d with the 4th component =1 */
+	void translateVect(vector3df &vect) const;
+
+	//! Transforms a plane by this matrix
+	void transformPlane(core::plane3d<f32> &plane) const;
+
+	//! Transforms a plane by this matrix
+	void transformPlane(const core::plane3d<f32> &in, core::plane3d<f32> &out) const;
+
+	//! Transforms a axis aligned bounding box
+	void transformBoxEx(core::aabbox3d<f32> &box) const;
+
+	//! Multiplies this matrix by a 1x4 matrix
+	void multiplyWith1x4Matrix(T *matrix) const;
+
+	//! Calculates inverse of matrix. Slow.
+	/** \return Returns false if there is no inverse matrix.*/
+	bool makeInverse();
+
+	//! Inverts a primitive matrix which only contains a translation and a rotation
+	/** \param out: where result matrix is written to. */
+	bool getInversePrimitive(CMatrix4<T> &out) const;
+
+	//! Gets the inverse matrix of this one
+	/** \param out: where result matrix is written to.
+	\return Returns false if there is no inverse matrix. */
+	bool getInverse(CMatrix4<T> &out) const;
+
+	//! Builds a right-handed perspective projection matrix based on a field of view
+	//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
+	CMatrix4<T> &buildProjectionMatrixPerspectiveFovRH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a left-handed perspective projection matrix based on a field of view
+	CMatrix4<T> &buildProjectionMatrixPerspectiveFovLH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a left-handed perspective projection matrix based on a field of view, with far plane at infinity
+	CMatrix4<T> &buildProjectionMatrixPerspectiveFovInfinityLH(f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 epsilon = 0);
+
+	//! Builds a right-handed perspective projection matrix.
+	CMatrix4<T> &buildProjectionMatrixPerspectiveRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a left-handed perspective projection matrix.
+	CMatrix4<T> &buildProjectionMatrixPerspectiveLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a left-handed orthogonal projection matrix.
+	//\param zClipFromZero: Clipping of z can be projected from 0 to 1 when true (D3D style) and from -1 to 1 when false (OGL style).
+	CMatrix4<T> &buildProjectionMatrixOrthoLH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a right-handed orthogonal projection matrix.
+	CMatrix4<T> &buildProjectionMatrixOrthoRH(f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero = true);
+
+	//! Builds a left-handed look-at matrix.
+	CMatrix4<T> &buildCameraLookAtMatrixLH(
+			const vector3df &position,
+			const vector3df &target,
+			const vector3df &upVector);
+
+	//! Builds a right-handed look-at matrix.
+	CMatrix4<T> &buildCameraLookAtMatrixRH(
+			const vector3df &position,
+			const vector3df &target,
+			const vector3df &upVector);
+
+	//! Builds a matrix that flattens geometry into a plane.
+	/** \param light: light source
+	\param plane: plane into which the geometry if flattened into
+	\param point: value between 0 and 1, describing the light source.
+	If this is 1, it is a point light, if it is 0, it is a directional light. */
+	CMatrix4<T> &buildShadowMatrix(const core::vector3df &light, core::plane3df plane, f32 point = 1.0f);
+
+	//! Builds a matrix which transforms a normalized Device Coordinate to Device Coordinates.
+	/** Used to scale <-1,-1><1,1> to viewport, for example from <-1,-1> <1,1> to the viewport <0,0><0,640> */
+	CMatrix4<T> &buildNDCToDCMatrix(const core::rect<s32> &area, f32 zScale);
+
+	//! Creates a new matrix as interpolated matrix from two other ones.
+	/** \param b: other matrix to interpolate with
+	\param time: Must be a value between 0 and 1. */
+	CMatrix4<T> interpolate(const core::CMatrix4<T> &b, f32 time) const;
+
+	//! Gets transposed matrix
+	CMatrix4<T> getTransposed() const;
+
+	//! Gets transposed matrix
+	inline void getTransposed(CMatrix4<T> &dest) const;
+
+	//! Builds a matrix that rotates from one vector to another
+	/** \param from: vector to rotate from
+	\param to: vector to rotate to
+	 */
+	CMatrix4<T> &buildRotateFromTo(const core::vector3df &from, const core::vector3df &to);
+
+	//! Builds a combined matrix which translates to a center before rotation and translates from origin afterwards
+	/** \param center Position to rotate around
+	\param translate Translation applied after the rotation
+	 */
+	void setRotationCenter(const core::vector3df &center, const core::vector3df &translate);
+
+	//! Builds a matrix which rotates a source vector to a look vector over an arbitrary axis
+	/** \param camPos: viewer position in world coo
+	\param center: object position in world-coo and rotation pivot
+	\param translation: object final translation from center
+	\param axis: axis to rotate about
+	\param from: source vector to rotate from
+	 */
+	void buildAxisAlignedBillboard(const core::vector3df &camPos,
+			const core::vector3df &center,
+			const core::vector3df &translation,
+			const core::vector3df &axis,
+			const core::vector3df &from);
+
+	/*
+		construct 2D Texture transformations
+		rotate about center, scale, and transform.
+	*/
+	//! Set to a texture transformation matrix with the given parameters.
+	CMatrix4<T> &buildTextureTransform(f32 rotateRad,
+			const core::vector2df &rotatecenter,
+			const core::vector2df &translate,
+			const core::vector2df &scale);
+
+	//! Set texture transformation rotation
+	/** Rotate about z axis, recenter at (0.5,0.5).
+	Doesn't clear other elements than those affected
+	\param radAngle Angle in radians
+	\return Altered matrix */
+	CMatrix4<T> &setTextureRotationCenter(f32 radAngle);
+
+	//! Set texture transformation translation
+	/** Doesn't clear other elements than those affected.
+	\param x Offset on x axis
+	\param y Offset on y axis
+	\return Altered matrix */
+	CMatrix4<T> &setTextureTranslate(f32 x, f32 y);
+
+	//! Get texture transformation translation
+	/** \param x returns offset on x axis
+	\param y returns offset on y axis */
+	void getTextureTranslate(f32 &x, f32 &y) const;
+
+	//! Set texture transformation translation, using a transposed representation
+	/** Doesn't clear other elements than those affected.
+	\param x Offset on x axis
+	\param y Offset on y axis
+	\return Altered matrix */
+	CMatrix4<T> &setTextureTranslateTransposed(f32 x, f32 y);
+
+	//! Set texture transformation scale
+	/** Doesn't clear other elements than those affected.
+	\param sx Scale factor on x axis
+	\param sy Scale factor on y axis
+	\return Altered matrix. */
+	CMatrix4<T> &setTextureScale(f32 sx, f32 sy);
+
+	//! Get texture transformation scale
+	/** \param sx Returns x axis scale factor
+	\param sy Returns y axis scale factor */
+	void getTextureScale(f32 &sx, f32 &sy) const;
+
+	//! Set texture transformation scale, and recenter at (0.5,0.5)
+	/** Doesn't clear other elements than those affected.
+	\param sx Scale factor on x axis
+	\param sy Scale factor on y axis
+	\return Altered matrix. */
+	CMatrix4<T> &setTextureScaleCenter(f32 sx, f32 sy);
+
+	//! Sets all matrix data members at once
+	CMatrix4<T> &setM(const T *data);
+
+	//! Sets if the matrix is definitely identity matrix
+	void setDefinitelyIdentityMatrix(bool isDefinitelyIdentityMatrix);
+
+	//! Gets if the matrix is definitely identity matrix
+	bool getDefinitelyIdentityMatrix() const;
+
+	//! Compare two matrices using the equal method
+	bool equals(const core::CMatrix4<T> &other, const T tolerance = (T)ROUNDING_ERROR_f64) const;
+
+private:
+	//! Matrix data, stored in row-major order
+	T M[16];
+#if defined(USE_MATRIX_TEST)
+	//! Flag is this matrix is identity matrix
+	mutable u32 definitelyIdentityMatrix;
+#endif
+};
+
+// Default constructor
+template <class T>
+inline CMatrix4<T>::CMatrix4(eConstructor constructor)
+#if defined(USE_MATRIX_TEST)
+		:
+		definitelyIdentityMatrix(BIT_UNTESTED)
+#endif
+{
+	switch (constructor) {
+	case EM4CONST_NOTHING:
+	case EM4CONST_COPY:
+		break;
+	case EM4CONST_IDENTITY:
+	case EM4CONST_INVERSE:
+	default:
+		makeIdentity();
+		break;
+	}
+}
+
+// Copy constructor
+template <class T>
+inline CMatrix4<T>::CMatrix4(const CMatrix4<T> &other, eConstructor constructor)
+#if defined(USE_MATRIX_TEST)
+		:
+		definitelyIdentityMatrix(BIT_UNTESTED)
+#endif
+{
+	switch (constructor) {
+	case EM4CONST_IDENTITY:
+		makeIdentity();
+		break;
+	case EM4CONST_NOTHING:
+		break;
+	case EM4CONST_COPY:
+		*this = other;
+		break;
+	case EM4CONST_TRANSPOSED:
+		other.getTransposed(*this);
+		break;
+	case EM4CONST_INVERSE:
+		if (!other.getInverse(*this))
+			memset(M, 0, 16 * sizeof(T));
+		break;
+	case EM4CONST_INVERSE_TRANSPOSED:
+		if (!other.getInverse(*this))
+			memset(M, 0, 16 * sizeof(T));
+		else
+			*this = getTransposed();
+		break;
+	}
+}
+
+//! Add another matrix.
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::operator+(const CMatrix4<T> &other) const
+{
+	CMatrix4<T> temp(EM4CONST_NOTHING);
+
+	temp[0] = M[0] + other[0];
+	temp[1] = M[1] + other[1];
+	temp[2] = M[2] + other[2];
+	temp[3] = M[3] + other[3];
+	temp[4] = M[4] + other[4];
+	temp[5] = M[5] + other[5];
+	temp[6] = M[6] + other[6];
+	temp[7] = M[7] + other[7];
+	temp[8] = M[8] + other[8];
+	temp[9] = M[9] + other[9];
+	temp[10] = M[10] + other[10];
+	temp[11] = M[11] + other[11];
+	temp[12] = M[12] + other[12];
+	temp[13] = M[13] + other[13];
+	temp[14] = M[14] + other[14];
+	temp[15] = M[15] + other[15];
+
+	return temp;
+}
+
+//! Add another matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::operator+=(const CMatrix4<T> &other)
+{
+	M[0] += other[0];
+	M[1] += other[1];
+	M[2] += other[2];
+	M[3] += other[3];
+	M[4] += other[4];
+	M[5] += other[5];
+	M[6] += other[6];
+	M[7] += other[7];
+	M[8] += other[8];
+	M[9] += other[9];
+	M[10] += other[10];
+	M[11] += other[11];
+	M[12] += other[12];
+	M[13] += other[13];
+	M[14] += other[14];
+	M[15] += other[15];
+
+	return *this;
+}
+
+//! Subtract another matrix.
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::operator-(const CMatrix4<T> &other) const
+{
+	CMatrix4<T> temp(EM4CONST_NOTHING);
+
+	temp[0] = M[0] - other[0];
+	temp[1] = M[1] - other[1];
+	temp[2] = M[2] - other[2];
+	temp[3] = M[3] - other[3];
+	temp[4] = M[4] - other[4];
+	temp[5] = M[5] - other[5];
+	temp[6] = M[6] - other[6];
+	temp[7] = M[7] - other[7];
+	temp[8] = M[8] - other[8];
+	temp[9] = M[9] - other[9];
+	temp[10] = M[10] - other[10];
+	temp[11] = M[11] - other[11];
+	temp[12] = M[12] - other[12];
+	temp[13] = M[13] - other[13];
+	temp[14] = M[14] - other[14];
+	temp[15] = M[15] - other[15];
+
+	return temp;
+}
+
+//! Subtract another matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::operator-=(const CMatrix4<T> &other)
+{
+	M[0] -= other[0];
+	M[1] -= other[1];
+	M[2] -= other[2];
+	M[3] -= other[3];
+	M[4] -= other[4];
+	M[5] -= other[5];
+	M[6] -= other[6];
+	M[7] -= other[7];
+	M[8] -= other[8];
+	M[9] -= other[9];
+	M[10] -= other[10];
+	M[11] -= other[11];
+	M[12] -= other[12];
+	M[13] -= other[13];
+	M[14] -= other[14];
+	M[15] -= other[15];
+
+	return *this;
+}
+
+//! Multiply by scalar.
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::operator*(const T &scalar) const
+{
+	CMatrix4<T> temp(EM4CONST_NOTHING);
+
+	temp[0] = M[0] * scalar;
+	temp[1] = M[1] * scalar;
+	temp[2] = M[2] * scalar;
+	temp[3] = M[3] * scalar;
+	temp[4] = M[4] * scalar;
+	temp[5] = M[5] * scalar;
+	temp[6] = M[6] * scalar;
+	temp[7] = M[7] * scalar;
+	temp[8] = M[8] * scalar;
+	temp[9] = M[9] * scalar;
+	temp[10] = M[10] * scalar;
+	temp[11] = M[11] * scalar;
+	temp[12] = M[12] * scalar;
+	temp[13] = M[13] * scalar;
+	temp[14] = M[14] * scalar;
+	temp[15] = M[15] * scalar;
+
+	return temp;
+}
+
+//! Multiply by scalar.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::operator*=(const T &scalar)
+{
+	M[0] *= scalar;
+	M[1] *= scalar;
+	M[2] *= scalar;
+	M[3] *= scalar;
+	M[4] *= scalar;
+	M[5] *= scalar;
+	M[6] *= scalar;
+	M[7] *= scalar;
+	M[8] *= scalar;
+	M[9] *= scalar;
+	M[10] *= scalar;
+	M[11] *= scalar;
+	M[12] *= scalar;
+	M[13] *= scalar;
+	M[14] *= scalar;
+	M[15] *= scalar;
+
+	return *this;
+}
+
+//! Multiply by another matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::operator*=(const CMatrix4<T> &other)
+{
+#if defined(USE_MATRIX_TEST)
+	// do checks on your own in order to avoid copy creation
+	if (!other.isIdentity()) {
+		if (this->isIdentity()) {
+			return (*this = other);
+		} else {
+			CMatrix4<T> temp(*this);
+			return setbyproduct_nocheck(temp, other);
+		}
+	}
+	return *this;
+#else
+	CMatrix4<T> temp(*this);
+	return setbyproduct_nocheck(temp, other);
+#endif
+}
+
+//! multiply by another matrix
+// set this matrix to the product of two other matrices
+// goal is to reduce stack use and copy
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setbyproduct_nocheck(const CMatrix4<T> &other_a, const CMatrix4<T> &other_b)
+{
+	const T *m1 = other_a.M;
+	const T *m2 = other_b.M;
+
+	M[0] = m1[0] * m2[0] + m1[4] * m2[1] + m1[8] * m2[2] + m1[12] * m2[3];
+	M[1] = m1[1] * m2[0] + m1[5] * m2[1] + m1[9] * m2[2] + m1[13] * m2[3];
+	M[2] = m1[2] * m2[0] + m1[6] * m2[1] + m1[10] * m2[2] + m1[14] * m2[3];
+	M[3] = m1[3] * m2[0] + m1[7] * m2[1] + m1[11] * m2[2] + m1[15] * m2[3];
+
+	M[4] = m1[0] * m2[4] + m1[4] * m2[5] + m1[8] * m2[6] + m1[12] * m2[7];
+	M[5] = m1[1] * m2[4] + m1[5] * m2[5] + m1[9] * m2[6] + m1[13] * m2[7];
+	M[6] = m1[2] * m2[4] + m1[6] * m2[5] + m1[10] * m2[6] + m1[14] * m2[7];
+	M[7] = m1[3] * m2[4] + m1[7] * m2[5] + m1[11] * m2[6] + m1[15] * m2[7];
+
+	M[8] = m1[0] * m2[8] + m1[4] * m2[9] + m1[8] * m2[10] + m1[12] * m2[11];
+	M[9] = m1[1] * m2[8] + m1[5] * m2[9] + m1[9] * m2[10] + m1[13] * m2[11];
+	M[10] = m1[2] * m2[8] + m1[6] * m2[9] + m1[10] * m2[10] + m1[14] * m2[11];
+	M[11] = m1[3] * m2[8] + m1[7] * m2[9] + m1[11] * m2[10] + m1[15] * m2[11];
+
+	M[12] = m1[0] * m2[12] + m1[4] * m2[13] + m1[8] * m2[14] + m1[12] * m2[15];
+	M[13] = m1[1] * m2[12] + m1[5] * m2[13] + m1[9] * m2[14] + m1[13] * m2[15];
+	M[14] = m1[2] * m2[12] + m1[6] * m2[13] + m1[10] * m2[14] + m1[14] * m2[15];
+	M[15] = m1[3] * m2[12] + m1[7] * m2[13] + m1[11] * m2[14] + m1[15] * m2[15];
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+//! multiply by another matrix
+// set this matrix to the product of two other matrices
+// goal is to reduce stack use and copy
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setbyproduct(const CMatrix4<T> &other_a, const CMatrix4<T> &other_b)
+{
+#if defined(USE_MATRIX_TEST)
+	if (other_a.isIdentity())
+		return (*this = other_b);
+	else if (other_b.isIdentity())
+		return (*this = other_a);
+	else
+		return setbyproduct_nocheck(other_a, other_b);
+#else
+	return setbyproduct_nocheck(other_a, other_b);
+#endif
+}
+
+//! multiply by another matrix
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::operator*(const CMatrix4<T> &m2) const
+{
+#if defined(USE_MATRIX_TEST)
+	// Testing purpose..
+	if (this->isIdentity())
+		return m2;
+	if (m2.isIdentity())
+		return *this;
+#endif
+
+	CMatrix4<T> m3(EM4CONST_NOTHING);
+
+	const T *m1 = M;
+
+	m3[0] = m1[0] * m2[0] + m1[4] * m2[1] + m1[8] * m2[2] + m1[12] * m2[3];
+	m3[1] = m1[1] * m2[0] + m1[5] * m2[1] + m1[9] * m2[2] + m1[13] * m2[3];
+	m3[2] = m1[2] * m2[0] + m1[6] * m2[1] + m1[10] * m2[2] + m1[14] * m2[3];
+	m3[3] = m1[3] * m2[0] + m1[7] * m2[1] + m1[11] * m2[2] + m1[15] * m2[3];
+
+	m3[4] = m1[0] * m2[4] + m1[4] * m2[5] + m1[8] * m2[6] + m1[12] * m2[7];
+	m3[5] = m1[1] * m2[4] + m1[5] * m2[5] + m1[9] * m2[6] + m1[13] * m2[7];
+	m3[6] = m1[2] * m2[4] + m1[6] * m2[5] + m1[10] * m2[6] + m1[14] * m2[7];
+	m3[7] = m1[3] * m2[4] + m1[7] * m2[5] + m1[11] * m2[6] + m1[15] * m2[7];
+
+	m3[8] = m1[0] * m2[8] + m1[4] * m2[9] + m1[8] * m2[10] + m1[12] * m2[11];
+	m3[9] = m1[1] * m2[8] + m1[5] * m2[9] + m1[9] * m2[10] + m1[13] * m2[11];
+	m3[10] = m1[2] * m2[8] + m1[6] * m2[9] + m1[10] * m2[10] + m1[14] * m2[11];
+	m3[11] = m1[3] * m2[8] + m1[7] * m2[9] + m1[11] * m2[10] + m1[15] * m2[11];
+
+	m3[12] = m1[0] * m2[12] + m1[4] * m2[13] + m1[8] * m2[14] + m1[12] * m2[15];
+	m3[13] = m1[1] * m2[12] + m1[5] * m2[13] + m1[9] * m2[14] + m1[13] * m2[15];
+	m3[14] = m1[2] * m2[12] + m1[6] * m2[13] + m1[10] * m2[14] + m1[14] * m2[15];
+	m3[15] = m1[3] * m2[12] + m1[7] * m2[13] + m1[11] * m2[14] + m1[15] * m2[15];
+	return m3;
+}
+
+template <class T>
+inline vector3d<T> CMatrix4<T>::getTranslation() const
+{
+	return vector3d<T>(M[12], M[13], M[14]);
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTranslation(const vector3d<T> &translation)
+{
+	M[12] = translation.X;
+	M[13] = translation.Y;
+	M[14] = translation.Z;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setInverseTranslation(const vector3d<T> &translation)
+{
+	M[12] = -translation.X;
+	M[13] = -translation.Y;
+	M[14] = -translation.Z;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setScale(const vector3d<T> &scale)
+{
+	M[0] = scale.X;
+	M[5] = scale.Y;
+	M[10] = scale.Z;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+//! Returns the absolute values of the scales of the matrix.
+/**
+Note: You only get back original values if the matrix only set the scale.
+Otherwise the result is a scale you can use to normalize the matrix axes,
+but it's usually no longer what you did set with setScale.
+*/
+template <class T>
+inline vector3d<T> CMatrix4<T>::getScale() const
+{
+	// See http://www.robertblum.com/articles/2005/02/14/decomposing-matrices
+
+	// Deal with the 0 rotation case first
+	// Prior to Irrlicht 1.6, we always returned this value.
+	if (core::iszero(M[1]) && core::iszero(M[2]) &&
+			core::iszero(M[4]) && core::iszero(M[6]) &&
+			core::iszero(M[8]) && core::iszero(M[9]))
+		return vector3d<T>(M[0], M[5], M[10]);
+
+	// We have to do the full calculation.
+	return vector3d<T>(sqrtf(M[0] * M[0] + M[1] * M[1] + M[2] * M[2]),
+			sqrtf(M[4] * M[4] + M[5] * M[5] + M[6] * M[6]),
+			sqrtf(M[8] * M[8] + M[9] * M[9] + M[10] * M[10]));
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setRotationDegrees(const vector3d<T> &rotation)
+{
+	return setRotationRadians(rotation * core::DEGTORAD);
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setInverseRotationDegrees(const vector3d<T> &rotation)
+{
+	return setInverseRotationRadians(rotation * core::DEGTORAD);
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setRotationRadians(const vector3d<T> &rotation)
+{
+	const f64 cr = cos(rotation.X);
+	const f64 sr = sin(rotation.X);
+	const f64 cp = cos(rotation.Y);
+	const f64 sp = sin(rotation.Y);
+	const f64 cy = cos(rotation.Z);
+	const f64 sy = sin(rotation.Z);
+
+	M[0] = (T)(cp * cy);
+	M[1] = (T)(cp * sy);
+	M[2] = (T)(-sp);
+
+	const f64 srsp = sr * sp;
+	const f64 crsp = cr * sp;
+
+	M[4] = (T)(srsp * cy - cr * sy);
+	M[5] = (T)(srsp * sy + cr * cy);
+	M[6] = (T)(sr * cp);
+
+	M[8] = (T)(crsp * cy + sr * sy);
+	M[9] = (T)(crsp * sy - sr * cy);
+	M[10] = (T)(cr * cp);
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+//! Returns a rotation which (mostly) works in combination with the given scale
+/**
+This code was originally written by by Chev (assuming no scaling back then,
+we can be blamed for all problems added by regarding scale)
+*/
+template <class T>
+inline core::vector3d<T> CMatrix4<T>::getRotationDegrees(const vector3d<T> &scale_) const
+{
+	const CMatrix4<T> &mat = *this;
+	const core::vector3d<f64> scale(core::iszero(scale_.X) ? FLT_MAX : scale_.X, core::iszero(scale_.Y) ? FLT_MAX : scale_.Y, core::iszero(scale_.Z) ? FLT_MAX : scale_.Z);
+	const core::vector3d<f64> invScale(core::reciprocal(scale.X), core::reciprocal(scale.Y), core::reciprocal(scale.Z));
+
+	f64 Y = -asin(core::clamp(mat[2] * invScale.X, -1.0, 1.0));
+	const f64 C = cos(Y);
+	Y *= RADTODEG64;
+
+	f64 rotx, roty, X, Z;
+
+	if (!core::iszero((T)C)) {
+		const f64 invC = core::reciprocal(C);
+		rotx = mat[10] * invC * invScale.Z;
+		roty = mat[6] * invC * invScale.Y;
+		X = atan2(roty, rotx) * RADTODEG64;
+		rotx = mat[0] * invC * invScale.X;
+		roty = mat[1] * invC * invScale.X;
+		Z = atan2(roty, rotx) * RADTODEG64;
+	} else {
+		X = 0.0;
+		rotx = mat[5] * invScale.Y;
+		roty = -mat[4] * invScale.Y;
+		Z = atan2(roty, rotx) * RADTODEG64;
+	}
+
+	// fix values that get below zero
+	if (X < 0.0)
+		X += 360.0;
+	if (Y < 0.0)
+		Y += 360.0;
+	if (Z < 0.0)
+		Z += 360.0;
+
+	return vector3d<T>((T)X, (T)Y, (T)Z);
+}
+
+//! Returns a rotation that is equivalent to that set by setRotationDegrees().
+template <class T>
+inline core::vector3d<T> CMatrix4<T>::getRotationDegrees() const
+{
+	// Note: Using getScale() here make it look like it could do matrix decomposition.
+	// It can't! It works (or should work) as long as rotation doesn't flip the handedness
+	// aka scale swapping 1 or 3 axes. (I think we could catch that as well by comparing
+	// crossproduct of first 2 axes to direction of third axis, but TODO)
+	// And maybe it should also offer the solution for the simple calculation
+	// without regarding scaling as Irrlicht did before 1.7
+	core::vector3d<T> scale(getScale());
+
+	// We assume the matrix uses rotations instead of negative scaling 2 axes.
+	// Otherwise it fails even for some simple cases, like rotating around
+	// 2 axes by 180° which getScale thinks is a negative scaling.
+	if (scale.Y < 0 && scale.Z < 0) {
+		scale.Y = -scale.Y;
+		scale.Z = -scale.Z;
+	} else if (scale.X < 0 && scale.Z < 0) {
+		scale.X = -scale.X;
+		scale.Z = -scale.Z;
+	} else if (scale.X < 0 && scale.Y < 0) {
+		scale.X = -scale.X;
+		scale.Y = -scale.Y;
+	}
+
+	return getRotationDegrees(scale);
+}
+
+//! Sets matrix to rotation matrix of inverse angles given as parameters
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setInverseRotationRadians(const vector3d<T> &rotation)
+{
+	f64 cr = cos(rotation.X);
+	f64 sr = sin(rotation.X);
+	f64 cp = cos(rotation.Y);
+	f64 sp = sin(rotation.Y);
+	f64 cy = cos(rotation.Z);
+	f64 sy = sin(rotation.Z);
+
+	M[0] = (T)(cp * cy);
+	M[4] = (T)(cp * sy);
+	M[8] = (T)(-sp);
+
+	f64 srsp = sr * sp;
+	f64 crsp = cr * sp;
+
+	M[1] = (T)(srsp * cy - cr * sy);
+	M[5] = (T)(srsp * sy + cr * cy);
+	M[9] = (T)(sr * cp);
+
+	M[2] = (T)(crsp * cy + sr * sy);
+	M[6] = (T)(crsp * sy - sr * cy);
+	M[10] = (T)(cr * cp);
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+//! Sets matrix to rotation matrix defined by axis and angle, assuming LH rotation
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setRotationAxisRadians(const T &angle, const vector3d<T> &axis)
+{
+	const f64 c = cos(angle);
+	const f64 s = sin(angle);
+	const f64 t = 1.0 - c;
+
+	const f64 tx = t * axis.X;
+	const f64 ty = t * axis.Y;
+	const f64 tz = t * axis.Z;
+
+	const f64 sx = s * axis.X;
+	const f64 sy = s * axis.Y;
+	const f64 sz = s * axis.Z;
+
+	M[0] = (T)(tx * axis.X + c);
+	M[1] = (T)(tx * axis.Y + sz);
+	M[2] = (T)(tx * axis.Z - sy);
+
+	M[4] = (T)(ty * axis.X - sz);
+	M[5] = (T)(ty * axis.Y + c);
+	M[6] = (T)(ty * axis.Z + sx);
+
+	M[8] = (T)(tz * axis.X + sy);
+	M[9] = (T)(tz * axis.Y - sx);
+	M[10] = (T)(tz * axis.Z + c);
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+/*!
+ */
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::makeIdentity()
+{
+	memset(M, 0, 16 * sizeof(T));
+	M[0] = M[5] = M[10] = M[15] = (T)1;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = true;
+#endif
+	return *this;
+}
+
+/*
+	check identity with epsilon
+	solve floating range problems..
+*/
+template <class T>
+inline bool CMatrix4<T>::isIdentity() const
+{
+#if defined(USE_MATRIX_TEST)
+	if (definitelyIdentityMatrix)
+		return true;
+#endif
+	if (!core::equals(M[12], (T)0) || !core::equals(M[13], (T)0) || !core::equals(M[14], (T)0) || !core::equals(M[15], (T)1))
+		return false;
+
+	if (!core::equals(M[0], (T)1) || !core::equals(M[1], (T)0) || !core::equals(M[2], (T)0) || !core::equals(M[3], (T)0))
+		return false;
+
+	if (!core::equals(M[4], (T)0) || !core::equals(M[5], (T)1) || !core::equals(M[6], (T)0) || !core::equals(M[7], (T)0))
+		return false;
+
+	if (!core::equals(M[8], (T)0) || !core::equals(M[9], (T)0) || !core::equals(M[10], (T)1) || !core::equals(M[11], (T)0))
+		return false;
+/*
+		if (!core::equals( M[ 0], (T)1 ) ||
+			!core::equals( M[ 5], (T)1 ) ||
+			!core::equals( M[10], (T)1 ) ||
+			!core::equals( M[15], (T)1 ))
+			return false;
+
+		for (s32 i=0; i<4; ++i)
+			for (s32 j=0; j<4; ++j)
+				if ((j != i) && (!iszero((*this)(i,j))))
+					return false;
+*/
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = true;
+#endif
+	return true;
+}
+
+/* Check orthogonality of matrix. */
+template <class T>
+inline bool CMatrix4<T>::isOrthogonal() const
+{
+	T dp = M[0] * M[4] + M[1] * M[5] + M[2] * M[6] + M[3] * M[7];
+	if (!iszero(dp))
+		return false;
+	dp = M[0] * M[8] + M[1] * M[9] + M[2] * M[10] + M[3] * M[11];
+	if (!iszero(dp))
+		return false;
+	dp = M[0] * M[12] + M[1] * M[13] + M[2] * M[14] + M[3] * M[15];
+	if (!iszero(dp))
+		return false;
+	dp = M[4] * M[8] + M[5] * M[9] + M[6] * M[10] + M[7] * M[11];
+	if (!iszero(dp))
+		return false;
+	dp = M[4] * M[12] + M[5] * M[13] + M[6] * M[14] + M[7] * M[15];
+	if (!iszero(dp))
+		return false;
+	dp = M[8] * M[12] + M[9] * M[13] + M[10] * M[14] + M[11] * M[15];
+	return (iszero(dp));
+}
+
+/*
+	doesn't solve floating range problems..
+	but takes care on +/- 0 on translation because we are changing it..
+	reducing floating point branches
+	but it needs the floats in memory..
+*/
+template <class T>
+inline bool CMatrix4<T>::isIdentity_integer_base() const
+{
+#if defined(USE_MATRIX_TEST)
+	if (definitelyIdentityMatrix)
+		return true;
+#endif
+	if (IR(M[0]) != F32_VALUE_1)
+		return false;
+	if (IR(M[1]) != 0)
+		return false;
+	if (IR(M[2]) != 0)
+		return false;
+	if (IR(M[3]) != 0)
+		return false;
+
+	if (IR(M[4]) != 0)
+		return false;
+	if (IR(M[5]) != F32_VALUE_1)
+		return false;
+	if (IR(M[6]) != 0)
+		return false;
+	if (IR(M[7]) != 0)
+		return false;
+
+	if (IR(M[8]) != 0)
+		return false;
+	if (IR(M[9]) != 0)
+		return false;
+	if (IR(M[10]) != F32_VALUE_1)
+		return false;
+	if (IR(M[11]) != 0)
+		return false;
+
+	if (IR(M[12]) != 0)
+		return false;
+	if (IR(M[13]) != 0)
+		return false;
+	if (IR(M[13]) != 0)
+		return false;
+	if (IR(M[15]) != F32_VALUE_1)
+		return false;
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = true;
+#endif
+	return true;
+}
+
+template <class T>
+inline void CMatrix4<T>::rotateVect(vector3df &vect) const
+{
+	vector3d<T> tmp(static_cast<T>(vect.X), static_cast<T>(vect.Y), static_cast<T>(vect.Z));
+	vect.X = static_cast<f32>(tmp.X * M[0] + tmp.Y * M[4] + tmp.Z * M[8]);
+	vect.Y = static_cast<f32>(tmp.X * M[1] + tmp.Y * M[5] + tmp.Z * M[9]);
+	vect.Z = static_cast<f32>(tmp.X * M[2] + tmp.Y * M[6] + tmp.Z * M[10]);
+}
+
+//! An alternate transform vector method, writing into a second vector
+template <class T>
+inline void CMatrix4<T>::rotateVect(core::vector3df &out, const core::vector3df &in) const
+{
+	out.X = in.X * M[0] + in.Y * M[4] + in.Z * M[8];
+	out.Y = in.X * M[1] + in.Y * M[5] + in.Z * M[9];
+	out.Z = in.X * M[2] + in.Y * M[6] + in.Z * M[10];
+}
+
+//! An alternate transform vector method, writing into an array of 3 floats
+template <class T>
+inline void CMatrix4<T>::rotateVect(T *out, const core::vector3df &in) const
+{
+	out[0] = in.X * M[0] + in.Y * M[4] + in.Z * M[8];
+	out[1] = in.X * M[1] + in.Y * M[5] + in.Z * M[9];
+	out[2] = in.X * M[2] + in.Y * M[6] + in.Z * M[10];
+}
+
+template <class T>
+inline void CMatrix4<T>::inverseRotateVect(vector3df &vect) const
+{
+	vector3d<T> tmp(static_cast<T>(vect.X), static_cast<T>(vect.Y), static_cast<T>(vect.Z));
+	vect.X = static_cast<f32>(tmp.X * M[0] + tmp.Y * M[1] + tmp.Z * M[2]);
+	vect.Y = static_cast<f32>(tmp.X * M[4] + tmp.Y * M[5] + tmp.Z * M[6]);
+	vect.Z = static_cast<f32>(tmp.X * M[8] + tmp.Y * M[9] + tmp.Z * M[10]);
+}
+
+template <class T>
+inline void CMatrix4<T>::transformVect(vector3df &vect) const
+{
+	T vector[3];
+
+	vector[0] = vect.X * M[0] + vect.Y * M[4] + vect.Z * M[8] + M[12];
+	vector[1] = vect.X * M[1] + vect.Y * M[5] + vect.Z * M[9] + M[13];
+	vector[2] = vect.X * M[2] + vect.Y * M[6] + vect.Z * M[10] + M[14];
+
+	vect.X = static_cast<f32>(vector[0]);
+	vect.Y = static_cast<f32>(vector[1]);
+	vect.Z = static_cast<f32>(vector[2]);
+}
+
+template <class T>
+inline void CMatrix4<T>::transformVect(vector3df &out, const vector3df &in) const
+{
+	out.X = in.X * M[0] + in.Y * M[4] + in.Z * M[8] + M[12];
+	out.Y = in.X * M[1] + in.Y * M[5] + in.Z * M[9] + M[13];
+	out.Z = in.X * M[2] + in.Y * M[6] + in.Z * M[10] + M[14];
+}
+
+template <class T>
+inline void CMatrix4<T>::transformVect(T *out, const core::vector3df &in) const
+{
+	out[0] = in.X * M[0] + in.Y * M[4] + in.Z * M[8] + M[12];
+	out[1] = in.X * M[1] + in.Y * M[5] + in.Z * M[9] + M[13];
+	out[2] = in.X * M[2] + in.Y * M[6] + in.Z * M[10] + M[14];
+	out[3] = in.X * M[3] + in.Y * M[7] + in.Z * M[11] + M[15];
+}
+
+template <class T>
+inline void CMatrix4<T>::transformVec3(T *out, const T *in) const
+{
+	out[0] = in[0] * M[0] + in[1] * M[4] + in[2] * M[8] + M[12];
+	out[1] = in[0] * M[1] + in[1] * M[5] + in[2] * M[9] + M[13];
+	out[2] = in[0] * M[2] + in[1] * M[6] + in[2] * M[10] + M[14];
+}
+
+template <class T>
+inline void CMatrix4<T>::transformVec4(T *out, const T *in) const
+{
+	out[0] = in[0] * M[0] + in[1] * M[4] + in[2] * M[8] + in[3] * M[12];
+	out[1] = in[0] * M[1] + in[1] * M[5] + in[2] * M[9] + in[3] * M[13];
+	out[2] = in[0] * M[2] + in[1] * M[6] + in[2] * M[10] + in[3] * M[14];
+	out[3] = in[0] * M[3] + in[1] * M[7] + in[2] * M[11] + in[3] * M[15];
+}
+
+//! Transforms a plane by this matrix
+template <class T>
+inline void CMatrix4<T>::transformPlane(core::plane3d<f32> &plane) const
+{
+	vector3df member;
+	// Transform the plane member point, i.e. rotate, translate and scale it.
+	transformVect(member, plane.getMemberPoint());
+
+	// Transform the normal by the transposed inverse of the matrix
+	CMatrix4<T> transposedInverse(*this, EM4CONST_INVERSE_TRANSPOSED);
+	vector3df normal = plane.Normal;
+	transposedInverse.rotateVect(normal);
+	plane.setPlane(member, normal.normalize());
+}
+
+//! Transforms a plane by this matrix
+template <class T>
+inline void CMatrix4<T>::transformPlane(const core::plane3d<f32> &in, core::plane3d<f32> &out) const
+{
+	out = in;
+	transformPlane(out);
+}
+
+//! Transforms a axis aligned bounding box more accurately than transformBox()
+template <class T>
+inline void CMatrix4<T>::transformBoxEx(core::aabbox3d<f32> &box) const
+{
+#if defined(USE_MATRIX_TEST)
+	if (isIdentity())
+		return;
+#endif
+
+	const f32 Amin[3] = {box.MinEdge.X, box.MinEdge.Y, box.MinEdge.Z};
+	const f32 Amax[3] = {box.MaxEdge.X, box.MaxEdge.Y, box.MaxEdge.Z};
+
+	f32 Bmin[3];
+	f32 Bmax[3];
+
+	Bmin[0] = Bmax[0] = M[12];
+	Bmin[1] = Bmax[1] = M[13];
+	Bmin[2] = Bmax[2] = M[14];
+
+	const CMatrix4<T> &m = *this;
+
+	for (u32 i = 0; i < 3; ++i) {
+		for (u32 j = 0; j < 3; ++j) {
+			const f32 a = m(j, i) * Amin[j];
+			const f32 b = m(j, i) * Amax[j];
+
+			if (a < b) {
+				Bmin[i] += a;
+				Bmax[i] += b;
+			} else {
+				Bmin[i] += b;
+				Bmax[i] += a;
+			}
+		}
+	}
+
+	box.MinEdge.X = Bmin[0];
+	box.MinEdge.Y = Bmin[1];
+	box.MinEdge.Z = Bmin[2];
+
+	box.MaxEdge.X = Bmax[0];
+	box.MaxEdge.Y = Bmax[1];
+	box.MaxEdge.Z = Bmax[2];
+}
+
+//! Multiplies this matrix by a 1x4 matrix
+template <class T>
+inline void CMatrix4<T>::multiplyWith1x4Matrix(T *matrix) const
+{
+	/*
+	0  1  2  3
+	4  5  6  7
+	8  9  10 11
+	12 13 14 15
+	*/
+
+	T mat[4];
+	mat[0] = matrix[0];
+	mat[1] = matrix[1];
+	mat[2] = matrix[2];
+	mat[3] = matrix[3];
+
+	matrix[0] = M[0] * mat[0] + M[4] * mat[1] + M[8] * mat[2] + M[12] * mat[3];
+	matrix[1] = M[1] * mat[0] + M[5] * mat[1] + M[9] * mat[2] + M[13] * mat[3];
+	matrix[2] = M[2] * mat[0] + M[6] * mat[1] + M[10] * mat[2] + M[14] * mat[3];
+	matrix[3] = M[3] * mat[0] + M[7] * mat[1] + M[11] * mat[2] + M[15] * mat[3];
+}
+
+template <class T>
+inline void CMatrix4<T>::inverseTranslateVect(vector3df &vect) const
+{
+	vect.X = vect.X - M[12];
+	vect.Y = vect.Y - M[13];
+	vect.Z = vect.Z - M[14];
+}
+
+template <class T>
+inline void CMatrix4<T>::translateVect(vector3df &vect) const
+{
+	vect.X = vect.X + M[12];
+	vect.Y = vect.Y + M[13];
+	vect.Z = vect.Z + M[14];
+}
+
+template <class T>
+inline bool CMatrix4<T>::getInverse(CMatrix4<T> &out) const
+{
+	/// Calculates the inverse of this Matrix
+	/// The inverse is calculated using Cramers rule.
+	/// If no inverse exists then 'false' is returned.
+
+#if defined(USE_MATRIX_TEST)
+	if (this->isIdentity()) {
+		out = *this;
+		return true;
+	}
+#endif
+	const CMatrix4<T> &m = *this;
+
+	f32 d = (m[0] * m[5] - m[1] * m[4]) * (m[10] * m[15] - m[11] * m[14]) -
+			(m[0] * m[6] - m[2] * m[4]) * (m[9] * m[15] - m[11] * m[13]) +
+			(m[0] * m[7] - m[3] * m[4]) * (m[9] * m[14] - m[10] * m[13]) +
+			(m[1] * m[6] - m[2] * m[5]) * (m[8] * m[15] - m[11] * m[12]) -
+			(m[1] * m[7] - m[3] * m[5]) * (m[8] * m[14] - m[10] * m[12]) +
+			(m[2] * m[7] - m[3] * m[6]) * (m[8] * m[13] - m[9] * m[12]);
+
+	if (core::iszero(d, FLT_MIN))
+		return false;
+
+	d = core::reciprocal(d);
+
+	out[0] = d * (m[5] * (m[10] * m[15] - m[11] * m[14]) +
+						 m[6] * (m[11] * m[13] - m[9] * m[15]) +
+						 m[7] * (m[9] * m[14] - m[10] * m[13]));
+	out[1] = d * (m[9] * (m[2] * m[15] - m[3] * m[14]) +
+						 m[10] * (m[3] * m[13] - m[1] * m[15]) +
+						 m[11] * (m[1] * m[14] - m[2] * m[13]));
+	out[2] = d * (m[13] * (m[2] * m[7] - m[3] * m[6]) +
+						 m[14] * (m[3] * m[5] - m[1] * m[7]) +
+						 m[15] * (m[1] * m[6] - m[2] * m[5]));
+	out[3] = d * (m[1] * (m[7] * m[10] - m[6] * m[11]) +
+						 m[2] * (m[5] * m[11] - m[7] * m[9]) +
+						 m[3] * (m[6] * m[9] - m[5] * m[10]));
+	out[4] = d * (m[6] * (m[8] * m[15] - m[11] * m[12]) +
+						 m[7] * (m[10] * m[12] - m[8] * m[14]) +
+						 m[4] * (m[11] * m[14] - m[10] * m[15]));
+	out[5] = d * (m[10] * (m[0] * m[15] - m[3] * m[12]) +
+						 m[11] * (m[2] * m[12] - m[0] * m[14]) +
+						 m[8] * (m[3] * m[14] - m[2] * m[15]));
+	out[6] = d * (m[14] * (m[0] * m[7] - m[3] * m[4]) +
+						 m[15] * (m[2] * m[4] - m[0] * m[6]) +
+						 m[12] * (m[3] * m[6] - m[2] * m[7]));
+	out[7] = d * (m[2] * (m[7] * m[8] - m[4] * m[11]) +
+						 m[3] * (m[4] * m[10] - m[6] * m[8]) +
+						 m[0] * (m[6] * m[11] - m[7] * m[10]));
+	out[8] = d * (m[7] * (m[8] * m[13] - m[9] * m[12]) +
+						 m[4] * (m[9] * m[15] - m[11] * m[13]) +
+						 m[5] * (m[11] * m[12] - m[8] * m[15]));
+	out[9] = d * (m[11] * (m[0] * m[13] - m[1] * m[12]) +
+						 m[8] * (m[1] * m[15] - m[3] * m[13]) +
+						 m[9] * (m[3] * m[12] - m[0] * m[15]));
+	out[10] = d * (m[15] * (m[0] * m[5] - m[1] * m[4]) +
+						  m[12] * (m[1] * m[7] - m[3] * m[5]) +
+						  m[13] * (m[3] * m[4] - m[0] * m[7]));
+	out[11] = d * (m[3] * (m[5] * m[8] - m[4] * m[9]) +
+						  m[0] * (m[7] * m[9] - m[5] * m[11]) +
+						  m[1] * (m[4] * m[11] - m[7] * m[8]));
+	out[12] = d * (m[4] * (m[10] * m[13] - m[9] * m[14]) +
+						  m[5] * (m[8] * m[14] - m[10] * m[12]) +
+						  m[6] * (m[9] * m[12] - m[8] * m[13]));
+	out[13] = d * (m[8] * (m[2] * m[13] - m[1] * m[14]) +
+						  m[9] * (m[0] * m[14] - m[2] * m[12]) +
+						  m[10] * (m[1] * m[12] - m[0] * m[13]));
+	out[14] = d * (m[12] * (m[2] * m[5] - m[1] * m[6]) +
+						  m[13] * (m[0] * m[6] - m[2] * m[4]) +
+						  m[14] * (m[1] * m[4] - m[0] * m[5]));
+	out[15] = d * (m[0] * (m[5] * m[10] - m[6] * m[9]) +
+						  m[1] * (m[6] * m[8] - m[4] * m[10]) +
+						  m[2] * (m[4] * m[9] - m[5] * m[8]));
+
+#if defined(USE_MATRIX_TEST)
+	out.definitelyIdentityMatrix = definitelyIdentityMatrix;
+#endif
+	return true;
+}
+
+//! Inverts a primitive matrix which only contains a translation and a rotation
+//! \param out: where result matrix is written to.
+template <class T>
+inline bool CMatrix4<T>::getInversePrimitive(CMatrix4<T> &out) const
+{
+	out.M[0] = M[0];
+	out.M[1] = M[4];
+	out.M[2] = M[8];
+	out.M[3] = 0;
+
+	out.M[4] = M[1];
+	out.M[5] = M[5];
+	out.M[6] = M[9];
+	out.M[7] = 0;
+
+	out.M[8] = M[2];
+	out.M[9] = M[6];
+	out.M[10] = M[10];
+	out.M[11] = 0;
+
+	out.M[12] = (T) - (M[12] * M[0] + M[13] * M[1] + M[14] * M[2]);
+	out.M[13] = (T) - (M[12] * M[4] + M[13] * M[5] + M[14] * M[6]);
+	out.M[14] = (T) - (M[12] * M[8] + M[13] * M[9] + M[14] * M[10]);
+	out.M[15] = 1;
+
+#if defined(USE_MATRIX_TEST)
+	out.definitelyIdentityMatrix = definitelyIdentityMatrix;
+#endif
+	return true;
+}
+
+/*!
+ */
+template <class T>
+inline bool CMatrix4<T>::makeInverse()
+{
+#if defined(USE_MATRIX_TEST)
+	if (definitelyIdentityMatrix)
+		return true;
+#endif
+	CMatrix4<T> temp(EM4CONST_NOTHING);
+
+	if (getInverse(temp)) {
+		*this = temp;
+		return true;
+	}
+
+	return false;
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::operator=(const T &scalar)
+{
+	for (s32 i = 0; i < 16; ++i)
+		M[i] = scalar;
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a right-handed perspective projection matrix based on a field of view
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixPerspectiveFovRH(
+		f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	const f64 h = reciprocal(tan(fieldOfViewRadians * 0.5));
+	_IRR_DEBUG_BREAK_IF(aspectRatio == 0.f); // divide by zero
+	const T w = static_cast<T>(h / aspectRatio);
+
+	_IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero
+	M[0] = w;
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)h;
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = -1;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14]
+	M[15] = 0;
+
+	if (zClipFromZero) { // DirectX version
+		M[10] = (T)(zFar / (zNear - zFar));
+		M[14] = (T)(zNear * zFar / (zNear - zFar));
+	} else // OpenGL version
+	{
+		M[10] = (T)((zFar + zNear) / (zNear - zFar));
+		M[14] = (T)(2.0f * zNear * zFar / (zNear - zFar));
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a left-handed perspective projection matrix based on a field of view
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixPerspectiveFovLH(
+		f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	const f64 h = reciprocal(tan(fieldOfViewRadians * 0.5));
+	_IRR_DEBUG_BREAK_IF(aspectRatio == 0.f); // divide by zero
+	const T w = static_cast<T>(h / aspectRatio);
+
+	_IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero
+	M[0] = w;
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)h;
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = 1;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14]
+	M[15] = 0;
+
+	if (zClipFromZero) { // DirectX version
+		M[10] = (T)(zFar / (zFar - zNear));
+		M[14] = (T)(-zNear * zFar / (zFar - zNear));
+	} else // OpenGL version
+	{
+		M[10] = (T)((zFar + zNear) / (zFar - zNear));
+		M[14] = (T)(2.0f * zNear * zFar / (zNear - zFar));
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a left-handed perspective projection matrix based on a field of view, with far plane culling at infinity
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixPerspectiveFovInfinityLH(
+		f32 fieldOfViewRadians, f32 aspectRatio, f32 zNear, f32 epsilon)
+{
+	const f64 h = reciprocal(tan(fieldOfViewRadians * 0.5));
+	_IRR_DEBUG_BREAK_IF(aspectRatio == 0.f); // divide by zero
+	const T w = static_cast<T>(h / aspectRatio);
+
+	M[0] = w;
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)h;
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	M[10] = (T)(1.f - epsilon);
+	M[11] = 1;
+
+	M[12] = 0;
+	M[13] = 0;
+	M[14] = (T)(zNear * (epsilon - 1.f));
+	M[15] = 0;
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a left-handed orthogonal projection matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixOrthoLH(
+		f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	_IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f);  // divide by zero
+	_IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero
+	_IRR_DEBUG_BREAK_IF(zNear == zFar);             // divide by zero
+	M[0] = (T)(2 / widthOfViewVolume);
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)(2 / heightOfViewVolume);
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = 0;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14]
+	M[15] = 1;
+
+	if (zClipFromZero) {
+		M[10] = (T)(1 / (zFar - zNear));
+		M[14] = (T)(zNear / (zNear - zFar));
+	} else {
+		M[10] = (T)(2 / (zFar - zNear));
+		M[14] = (T) - (zFar + zNear) / (zFar - zNear);
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a right-handed orthogonal projection matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixOrthoRH(
+		f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	_IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f);  // divide by zero
+	_IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero
+	_IRR_DEBUG_BREAK_IF(zNear == zFar);             // divide by zero
+	M[0] = (T)(2 / widthOfViewVolume);
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)(2 / heightOfViewVolume);
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = 0;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14]
+	M[15] = 1;
+
+	if (zClipFromZero) {
+		M[10] = (T)(1 / (zNear - zFar));
+		M[14] = (T)(zNear / (zNear - zFar));
+	} else {
+		M[10] = (T)(2 / (zNear - zFar));
+		M[14] = (T) - (zFar + zNear) / (zFar - zNear);
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a right-handed perspective projection matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixPerspectiveRH(
+		f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	_IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f);  // divide by zero
+	_IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero
+	_IRR_DEBUG_BREAK_IF(zNear == zFar);             // divide by zero
+	M[0] = (T)(2 * zNear / widthOfViewVolume);
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)(2 * zNear / heightOfViewVolume);
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = -1;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14]
+	M[15] = 0;
+
+	if (zClipFromZero) { // DirectX version
+		M[10] = (T)(zFar / (zNear - zFar));
+		M[14] = (T)(zNear * zFar / (zNear - zFar));
+	} else // OpenGL version
+	{
+		M[10] = (T)((zFar + zNear) / (zNear - zFar));
+		M[14] = (T)(2.0f * zNear * zFar / (zNear - zFar));
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a left-handed perspective projection matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildProjectionMatrixPerspectiveLH(
+		f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero)
+{
+	_IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f);  // divide by zero
+	_IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero
+	_IRR_DEBUG_BREAK_IF(zNear == zFar);             // divide by zero
+	M[0] = (T)(2 * zNear / widthOfViewVolume);
+	M[1] = 0;
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = 0;
+	M[5] = (T)(2 * zNear / heightOfViewVolume);
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = 0;
+	M[9] = 0;
+	// M[10]
+	M[11] = 1;
+
+	M[12] = 0;
+	M[13] = 0;
+	// M[14] = (T)(zNear*zFar/(zNear-zFar));
+	M[15] = 0;
+
+	if (zClipFromZero) { // DirectX version
+		M[10] = (T)(zFar / (zFar - zNear));
+		M[14] = (T)(zNear * zFar / (zNear - zFar));
+	} else // OpenGL version
+	{
+		M[10] = (T)((zFar + zNear) / (zFar - zNear));
+		M[14] = (T)(2.0f * zNear * zFar / (zNear - zFar));
+	}
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a matrix that flattens geometry into a plane.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildShadowMatrix(const core::vector3df &light, core::plane3df plane, f32 point)
+{
+	plane.Normal.normalize();
+	const f32 d = plane.Normal.dotProduct(light);
+
+	M[0] = (T)(-plane.Normal.X * light.X + d);
+	M[1] = (T)(-plane.Normal.X * light.Y);
+	M[2] = (T)(-plane.Normal.X * light.Z);
+	M[3] = (T)(-plane.Normal.X * point);
+
+	M[4] = (T)(-plane.Normal.Y * light.X);
+	M[5] = (T)(-plane.Normal.Y * light.Y + d);
+	M[6] = (T)(-plane.Normal.Y * light.Z);
+	M[7] = (T)(-plane.Normal.Y * point);
+
+	M[8] = (T)(-plane.Normal.Z * light.X);
+	M[9] = (T)(-plane.Normal.Z * light.Y);
+	M[10] = (T)(-plane.Normal.Z * light.Z + d);
+	M[11] = (T)(-plane.Normal.Z * point);
+
+	M[12] = (T)(-plane.D * light.X);
+	M[13] = (T)(-plane.D * light.Y);
+	M[14] = (T)(-plane.D * light.Z);
+	M[15] = (T)(-plane.D * point + d);
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a left-handed look-at matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildCameraLookAtMatrixLH(
+		const vector3df &position,
+		const vector3df &target,
+		const vector3df &upVector)
+{
+	vector3df zaxis = target - position;
+	zaxis.normalize();
+
+	vector3df xaxis = upVector.crossProduct(zaxis);
+	xaxis.normalize();
+
+	vector3df yaxis = zaxis.crossProduct(xaxis);
+
+	M[0] = (T)xaxis.X;
+	M[1] = (T)yaxis.X;
+	M[2] = (T)zaxis.X;
+	M[3] = 0;
+
+	M[4] = (T)xaxis.Y;
+	M[5] = (T)yaxis.Y;
+	M[6] = (T)zaxis.Y;
+	M[7] = 0;
+
+	M[8] = (T)xaxis.Z;
+	M[9] = (T)yaxis.Z;
+	M[10] = (T)zaxis.Z;
+	M[11] = 0;
+
+	M[12] = (T)-xaxis.dotProduct(position);
+	M[13] = (T)-yaxis.dotProduct(position);
+	M[14] = (T)-zaxis.dotProduct(position);
+	M[15] = 1;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// Builds a right-handed look-at matrix.
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildCameraLookAtMatrixRH(
+		const vector3df &position,
+		const vector3df &target,
+		const vector3df &upVector)
+{
+	vector3df zaxis = position - target;
+	zaxis.normalize();
+
+	vector3df xaxis = upVector.crossProduct(zaxis);
+	xaxis.normalize();
+
+	vector3df yaxis = zaxis.crossProduct(xaxis);
+
+	M[0] = (T)xaxis.X;
+	M[1] = (T)yaxis.X;
+	M[2] = (T)zaxis.X;
+	M[3] = 0;
+
+	M[4] = (T)xaxis.Y;
+	M[5] = (T)yaxis.Y;
+	M[6] = (T)zaxis.Y;
+	M[7] = 0;
+
+	M[8] = (T)xaxis.Z;
+	M[9] = (T)yaxis.Z;
+	M[10] = (T)zaxis.Z;
+	M[11] = 0;
+
+	M[12] = (T)-xaxis.dotProduct(position);
+	M[13] = (T)-yaxis.dotProduct(position);
+	M[14] = (T)-zaxis.dotProduct(position);
+	M[15] = 1;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// creates a new matrix as interpolated matrix from this and the passed one.
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::interpolate(const core::CMatrix4<T> &b, f32 time) const
+{
+	CMatrix4<T> mat(EM4CONST_NOTHING);
+
+	for (u32 i = 0; i < 16; i += 4) {
+		mat.M[i + 0] = (T)(M[i + 0] + (b.M[i + 0] - M[i + 0]) * time);
+		mat.M[i + 1] = (T)(M[i + 1] + (b.M[i + 1] - M[i + 1]) * time);
+		mat.M[i + 2] = (T)(M[i + 2] + (b.M[i + 2] - M[i + 2]) * time);
+		mat.M[i + 3] = (T)(M[i + 3] + (b.M[i + 3] - M[i + 3]) * time);
+	}
+	return mat;
+}
+
+// returns transposed matrix
+template <class T>
+inline CMatrix4<T> CMatrix4<T>::getTransposed() const
+{
+	CMatrix4<T> t(EM4CONST_NOTHING);
+	getTransposed(t);
+	return t;
+}
+
+// returns transposed matrix
+template <class T>
+inline void CMatrix4<T>::getTransposed(CMatrix4<T> &o) const
+{
+	o[0] = M[0];
+	o[1] = M[4];
+	o[2] = M[8];
+	o[3] = M[12];
+
+	o[4] = M[1];
+	o[5] = M[5];
+	o[6] = M[9];
+	o[7] = M[13];
+
+	o[8] = M[2];
+	o[9] = M[6];
+	o[10] = M[10];
+	o[11] = M[14];
+
+	o[12] = M[3];
+	o[13] = M[7];
+	o[14] = M[11];
+	o[15] = M[15];
+#if defined(USE_MATRIX_TEST)
+	o.definitelyIdentityMatrix = definitelyIdentityMatrix;
+#endif
+}
+
+// used to scale <-1,-1><1,1> to viewport
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildNDCToDCMatrix(const core::rect<s32> &viewport, f32 zScale)
+{
+	const f32 scaleX = (viewport.getWidth() - 0.75f) * 0.5f;
+	const f32 scaleY = -(viewport.getHeight() - 0.75f) * 0.5f;
+
+	const f32 dx = -0.5f + ((viewport.UpperLeftCorner.X + viewport.LowerRightCorner.X) * 0.5f);
+	const f32 dy = -0.5f + ((viewport.UpperLeftCorner.Y + viewport.LowerRightCorner.Y) * 0.5f);
+
+	makeIdentity();
+	M[12] = (T)dx;
+	M[13] = (T)dy;
+	return setScale(core::vector3d<T>((T)scaleX, (T)scaleY, (T)zScale));
+}
+
+//! Builds a matrix that rotates from one vector to another
+/** \param from: vector to rotate from
+\param to: vector to rotate to
+
+	http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToMatrix/index.htm
+ */
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildRotateFromTo(const core::vector3df &from, const core::vector3df &to)
+{
+	// unit vectors
+	core::vector3df f(from);
+	core::vector3df t(to);
+	f.normalize();
+	t.normalize();
+
+	// axis multiplication by sin
+	core::vector3df vs(t.crossProduct(f));
+
+	// axis of rotation
+	core::vector3df v(vs);
+	v.normalize();
+
+	// cosine angle
+	T ca = f.dotProduct(t);
+
+	core::vector3df vt(v * (1 - ca));
+
+	M[0] = vt.X * v.X + ca;
+	M[5] = vt.Y * v.Y + ca;
+	M[10] = vt.Z * v.Z + ca;
+
+	vt.X *= v.Y;
+	vt.Z *= v.X;
+	vt.Y *= v.Z;
+
+	M[1] = vt.X - vs.Z;
+	M[2] = vt.Z + vs.Y;
+	M[3] = 0;
+
+	M[4] = vt.X + vs.Z;
+	M[6] = vt.Y - vs.X;
+	M[7] = 0;
+
+	M[8] = vt.Z - vs.Y;
+	M[9] = vt.Y + vs.X;
+	M[11] = 0;
+
+	M[12] = 0;
+	M[13] = 0;
+	M[14] = 0;
+	M[15] = 1;
+
+	return *this;
+}
+
+//! Builds a matrix which rotates a source vector to a look vector over an arbitrary axis
+/** \param camPos: viewer position in world coord
+\param center: object position in world-coord, rotation pivot
+\param translation: object final translation from center
+\param axis: axis to rotate about
+\param from: source vector to rotate from
+ */
+template <class T>
+inline void CMatrix4<T>::buildAxisAlignedBillboard(
+		const core::vector3df &camPos,
+		const core::vector3df &center,
+		const core::vector3df &translation,
+		const core::vector3df &axis,
+		const core::vector3df &from)
+{
+	// axis of rotation
+	core::vector3df up = axis;
+	up.normalize();
+	const core::vector3df forward = (camPos - center).normalize();
+	const core::vector3df right = up.crossProduct(forward).normalize();
+
+	// correct look vector
+	const core::vector3df look = right.crossProduct(up);
+
+	// rotate from to
+	// axis multiplication by sin
+	const core::vector3df vs = look.crossProduct(from);
+
+	// cosine angle
+	const f32 ca = from.dotProduct(look);
+
+	core::vector3df vt(up * (1.f - ca));
+
+	M[0] = static_cast<T>(vt.X * up.X + ca);
+	M[5] = static_cast<T>(vt.Y * up.Y + ca);
+	M[10] = static_cast<T>(vt.Z * up.Z + ca);
+
+	vt.X *= up.Y;
+	vt.Z *= up.X;
+	vt.Y *= up.Z;
+
+	M[1] = static_cast<T>(vt.X - vs.Z);
+	M[2] = static_cast<T>(vt.Z + vs.Y);
+	M[3] = 0;
+
+	M[4] = static_cast<T>(vt.X + vs.Z);
+	M[6] = static_cast<T>(vt.Y - vs.X);
+	M[7] = 0;
+
+	M[8] = static_cast<T>(vt.Z - vs.Y);
+	M[9] = static_cast<T>(vt.Y + vs.X);
+	M[11] = 0;
+
+	setRotationCenter(center, translation);
+}
+
+//! Builds a combined matrix which translate to a center before rotation and translate afterward
+template <class T>
+inline void CMatrix4<T>::setRotationCenter(const core::vector3df &center, const core::vector3df &translation)
+{
+	M[12] = -M[0] * center.X - M[4] * center.Y - M[8] * center.Z + (center.X - translation.X);
+	M[13] = -M[1] * center.X - M[5] * center.Y - M[9] * center.Z + (center.Y - translation.Y);
+	M[14] = -M[2] * center.X - M[6] * center.Y - M[10] * center.Z + (center.Z - translation.Z);
+	M[15] = (T)1.0;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+}
+
+/*!
+	Generate texture coordinates as linear functions so that:
+		u = Ux*x + Uy*y + Uz*z + Uw
+		v = Vx*x + Vy*y + Vz*z + Vw
+	The matrix M for this case is:
+		Ux  Vx  0  0
+		Uy  Vy  0  0
+		Uz  Vz  0  0
+		Uw  Vw  0  0
+*/
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::buildTextureTransform(f32 rotateRad,
+		const core::vector2df &rotatecenter,
+		const core::vector2df &translate,
+		const core::vector2df &scale)
+{
+	const f32 c = cosf(rotateRad);
+	const f32 s = sinf(rotateRad);
+
+	M[0] = (T)(c * scale.X);
+	M[1] = (T)(s * scale.Y);
+	M[2] = 0;
+	M[3] = 0;
+
+	M[4] = (T)(-s * scale.X);
+	M[5] = (T)(c * scale.Y);
+	M[6] = 0;
+	M[7] = 0;
+
+	M[8] = (T)(c * scale.X * rotatecenter.X + -s * rotatecenter.Y + translate.X);
+	M[9] = (T)(s * scale.Y * rotatecenter.X + c * rotatecenter.Y + translate.Y);
+	M[10] = 1;
+	M[11] = 0;
+
+	M[12] = 0;
+	M[13] = 0;
+	M[14] = 0;
+	M[15] = 1;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// rotate about z axis, center ( 0.5, 0.5 )
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTextureRotationCenter(f32 rotateRad)
+{
+	const f32 c = cosf(rotateRad);
+	const f32 s = sinf(rotateRad);
+	M[0] = (T)c;
+	M[1] = (T)s;
+
+	M[4] = (T)-s;
+	M[5] = (T)c;
+
+	M[8] = (T)(0.5f * (s - c) + 0.5f);
+	M[9] = (T)(-0.5f * (s + c) + 0.5f);
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = definitelyIdentityMatrix && (rotateRad == 0.0f);
+#endif
+	return *this;
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTextureTranslate(f32 x, f32 y)
+{
+	M[8] = (T)x;
+	M[9] = (T)y;
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = definitelyIdentityMatrix && (x == 0.0f) && (y == 0.0f);
+#endif
+	return *this;
+}
+
+template <class T>
+inline void CMatrix4<T>::getTextureTranslate(f32 &x, f32 &y) const
+{
+	x = (f32)M[8];
+	y = (f32)M[9];
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTextureTranslateTransposed(f32 x, f32 y)
+{
+	M[2] = (T)x;
+	M[6] = (T)y;
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = definitelyIdentityMatrix && (x == 0.0f) && (y == 0.0f);
+#endif
+	return *this;
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTextureScale(f32 sx, f32 sy)
+{
+	M[0] = (T)sx;
+	M[5] = (T)sy;
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = definitelyIdentityMatrix && (sx == 1.0f) && (sy == 1.0f);
+#endif
+	return *this;
+}
+
+template <class T>
+inline void CMatrix4<T>::getTextureScale(f32 &sx, f32 &sy) const
+{
+	sx = (f32)M[0];
+	sy = (f32)M[5];
+}
+
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setTextureScaleCenter(f32 sx, f32 sy)
+{
+	M[0] = (T)sx;
+	M[5] = (T)sy;
+	M[8] = (T)(0.5f - 0.5f * sx);
+	M[9] = (T)(0.5f - 0.5f * sy);
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = definitelyIdentityMatrix && (sx == 1.0f) && (sy == 1.0f);
+#endif
+	return *this;
+}
+
+// sets all matrix data members at once
+template <class T>
+inline CMatrix4<T> &CMatrix4<T>::setM(const T *data)
+{
+	memcpy(M, data, 16 * sizeof(T));
+
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = false;
+#endif
+	return *this;
+}
+
+// sets if the matrix is definitely identity matrix
+template <class T>
+inline void CMatrix4<T>::setDefinitelyIdentityMatrix(bool isDefinitelyIdentityMatrix)
+{
+#if defined(USE_MATRIX_TEST)
+	definitelyIdentityMatrix = isDefinitelyIdentityMatrix;
+#else
+	(void)isDefinitelyIdentityMatrix; // prevent compiler warning
+#endif
+}
+
+// gets if the matrix is definitely identity matrix
+template <class T>
+inline bool CMatrix4<T>::getDefinitelyIdentityMatrix() const
+{
+#if defined(USE_MATRIX_TEST)
+	return definitelyIdentityMatrix;
+#else
+	return false;
+#endif
+}
+
+//! Compare two matrices using the equal method
+template <class T>
+inline bool CMatrix4<T>::equals(const core::CMatrix4<T> &other, const T tolerance) const
+{
+#if defined(USE_MATRIX_TEST)
+	if (definitelyIdentityMatrix && other.definitelyIdentityMatrix)
+		return true;
+#endif
+	for (s32 i = 0; i < 16; ++i)
+		if (!core::equals(M[i], other.M[i], tolerance))
+			return false;
+
+	return true;
+}
+
+// Multiply by scalar.
+template <class T>
+inline CMatrix4<T> operator*(const T scalar, const CMatrix4<T> &mat)
+{
+	return mat * scalar;
+}
+
+//! Typedef for f32 matrix
+typedef CMatrix4<f32> matrix4;
+
+//! global const identity matrix
+IRRLICHT_API extern const matrix4 IdentityMatrix;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/mt_opengl.h b/irr/include/mt_opengl.h
new file mode 100755
index 000000000..32d3f1c0a
--- /dev/null
+++ b/irr/include/mt_opengl.h
@@ -0,0 +1,3195 @@
+// This code was generated by scripts/BindingGenerator.lua
+// Do not modify it, modify and run the generator instead.
+
+#pragma once
+
+#include <string>
+#include <unordered_set>
+#include "IrrCompileConfig.h" // for IRRLICHT_API
+#include "irrTypes.h"
+#include "IContextManager.h"
+#include <KHR/khrplatform.h>
+
+#ifndef APIENTRY
+	#define APIENTRY KHRONOS_APIENTRY
+#endif
+#ifndef APIENTRYP
+	#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+	#define GLAPI extern
+#endif
+
+class OpenGLProcedures {
+private:
+	// ./glcorearb.h
+	typedef void GLvoid;
+	typedef unsigned int GLenum;
+	typedef khronos_float_t GLfloat;
+	typedef int GLint;
+	typedef int GLsizei;
+	typedef unsigned int GLbitfield;
+	typedef double GLdouble;
+	typedef unsigned int GLuint;
+	typedef unsigned char GLboolean;
+	typedef khronos_uint8_t GLubyte;
+	typedef khronos_float_t GLclampf;
+	typedef double GLclampd;
+	typedef khronos_ssize_t GLsizeiptr;
+	typedef khronos_intptr_t GLintptr;
+	typedef char GLchar;
+	typedef khronos_int16_t GLshort;
+	typedef khronos_int8_t GLbyte;
+	typedef khronos_uint16_t GLushort;
+	typedef khronos_uint16_t GLhalf;
+	typedef struct __GLsync *GLsync;
+	typedef khronos_uint64_t GLuint64;
+	typedef khronos_int64_t GLint64;
+	typedef khronos_uint64_t GLuint64EXT;
+	typedef void *GLeglImageOES;
+	typedef khronos_int64_t GLint64EXT;
+
+	typedef void *GLeglClientBufferEXT;
+	// The script will miss this particular typedef thinking it's a PFN,
+	// so we have to paste it in manually. It's the only such type in OpenGL.
+	typedef void (APIENTRY *GLDEBUGPROC)
+		(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+
+	typedef void (APIENTRYP PFNGLCULLFACEPROC_MT) (GLenum mode);
+	typedef void (APIENTRYP PFNGLFRONTFACEPROC_MT) (GLenum mode);
+	typedef void (APIENTRYP PFNGLHINTPROC_MT) (GLenum target, GLenum mode);
+	typedef void (APIENTRYP PFNGLLINEWIDTHPROC_MT) (GLfloat width);
+	typedef void (APIENTRYP PFNGLPOINTSIZEPROC_MT) (GLfloat size);
+	typedef void (APIENTRYP PFNGLPOLYGONMODEPROC_MT) (GLenum face, GLenum mode);
+	typedef void (APIENTRYP PFNGLSCISSORPROC_MT) (GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC_MT) (GLenum target, GLenum pname, GLfloat param);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC_MT) (GLenum target, GLenum pname, const GLfloat * params);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC_MT) (GLenum target, GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC_MT) (GLenum target, GLenum pname, const GLint * params);
+	typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC_MT) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC_MT) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLDRAWBUFFERPROC_MT) (GLenum buf);
+	typedef void (APIENTRYP PFNGLCLEARPROC_MT) (GLbitfield mask);
+	typedef void (APIENTRYP PFNGLCLEARCOLORPROC_MT) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+	typedef void (APIENTRYP PFNGLCLEARSTENCILPROC_MT) (GLint s);
+	typedef void (APIENTRYP PFNGLCLEARDEPTHPROC_MT) (GLdouble depth);
+	typedef void (APIENTRYP PFNGLSTENCILMASKPROC_MT) (GLuint mask);
+	typedef void (APIENTRYP PFNGLCOLORMASKPROC_MT) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+	typedef void (APIENTRYP PFNGLDEPTHMASKPROC_MT) (GLboolean flag);
+	typedef void (APIENTRYP PFNGLDISABLEPROC_MT) (GLenum cap);
+	typedef void (APIENTRYP PFNGLENABLEPROC_MT) (GLenum cap);
+	typedef void (APIENTRYP PFNGLFINISHPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLFLUSHPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLBLENDFUNCPROC_MT) (GLenum sfactor, GLenum dfactor);
+	typedef void (APIENTRYP PFNGLLOGICOPPROC_MT) (GLenum opcode);
+	typedef void (APIENTRYP PFNGLSTENCILFUNCPROC_MT) (GLenum func, GLint ref, GLuint mask);
+	typedef void (APIENTRYP PFNGLSTENCILOPPROC_MT) (GLenum fail, GLenum zfail, GLenum zpass);
+	typedef void (APIENTRYP PFNGLDEPTHFUNCPROC_MT) (GLenum func);
+	typedef void (APIENTRYP PFNGLPIXELSTOREFPROC_MT) (GLenum pname, GLfloat param);
+	typedef void (APIENTRYP PFNGLPIXELSTOREIPROC_MT) (GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLREADBUFFERPROC_MT) (GLenum src);
+	typedef void (APIENTRYP PFNGLREADPIXELSPROC_MT) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void * pixels);
+	typedef void (APIENTRYP PFNGLGETBOOLEANVPROC_MT) (GLenum pname, GLboolean * data);
+	typedef void (APIENTRYP PFNGLGETDOUBLEVPROC_MT) (GLenum pname, GLdouble * data);
+	typedef GLenum (APIENTRYP PFNGLGETERRORPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLGETFLOATVPROC_MT) (GLenum pname, GLfloat * data);
+	typedef void (APIENTRYP PFNGLGETINTEGERVPROC_MT) (GLenum pname, GLint * data);
+	typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC_MT) (GLenum name);
+	typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC_MT) (GLenum target, GLint level, GLenum format, GLenum type, void * pixels);
+	typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC_MT) (GLenum target, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC_MT) (GLenum target, GLint level, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC_MT) (GLenum target, GLint level, GLenum pname, GLint * params);
+	typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC_MT) (GLenum cap);
+	typedef void (APIENTRYP PFNGLDEPTHRANGEPROC_MT) (GLdouble n, GLdouble f);
+	typedef void (APIENTRYP PFNGLVIEWPORTPROC_MT) (GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLDRAWARRAYSPROC_MT) (GLenum mode, GLint first, GLsizei count);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices);
+	typedef void (APIENTRYP PFNGLGETPOINTERVPROC_MT) (GLenum pname, void ** params);
+	typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC_MT) (GLfloat factor, GLfloat units);
+	typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC_MT) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+	typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC_MT) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+	typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+	typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLBINDTEXTUREPROC_MT) (GLenum target, GLuint texture);
+	typedef void (APIENTRYP PFNGLDELETETEXTURESPROC_MT) (GLsizei n, const GLuint * textures);
+	typedef void (APIENTRYP PFNGLGENTEXTURESPROC_MT) (GLsizei n, GLuint * textures);
+	typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC_MT) (GLuint texture);
+	typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC_MT) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices);
+	typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC_MT) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC_MT) (GLenum texture);
+	typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC_MT) (GLfloat value, GLboolean invert);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC_MT) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC_MT) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC_MT) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC_MT) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC_MT) (GLenum target, GLint level, void * img);
+	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC_MT) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+	typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC_MT) (GLenum mode, const GLint * first, const GLsizei * count, GLsizei drawcount);
+	typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC_MT) (GLenum mode, const GLsizei * count, GLenum type, const void *const* indices, GLsizei drawcount);
+	typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC_MT) (GLenum pname, GLfloat param);
+	typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC_MT) (GLenum pname, const GLfloat * params);
+	typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC_MT) (GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC_MT) (GLenum pname, const GLint * params);
+	typedef void (APIENTRYP PFNGLBLENDCOLORPROC_MT) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC_MT) (GLenum mode);
+	typedef void (APIENTRYP PFNGLGENQUERIESPROC_MT) (GLsizei n, GLuint * ids);
+	typedef void (APIENTRYP PFNGLDELETEQUERIESPROC_MT) (GLsizei n, const GLuint * ids);
+	typedef GLboolean (APIENTRYP PFNGLISQUERYPROC_MT) (GLuint id);
+	typedef void (APIENTRYP PFNGLBEGINQUERYPROC_MT) (GLenum target, GLuint id);
+	typedef void (APIENTRYP PFNGLENDQUERYPROC_MT) (GLenum target);
+	typedef void (APIENTRYP PFNGLGETQUERYIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC_MT) (GLuint id, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC_MT) (GLuint id, GLenum pname, GLuint * params);
+	typedef void (APIENTRYP PFNGLBINDBUFFERPROC_MT) (GLenum target, GLuint buffer);
+	typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC_MT) (GLsizei n, const GLuint * buffers);
+	typedef void (APIENTRYP PFNGLGENBUFFERSPROC_MT) (GLsizei n, GLuint * buffers);
+	typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC_MT) (GLuint buffer);
+	typedef void (APIENTRYP PFNGLBUFFERDATAPROC_MT) (GLenum target, GLsizeiptr size, const void * data, GLenum usage);
+	typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC_MT) (GLenum target, GLintptr offset, GLsizeiptr size, const void * data);
+	typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC_MT) (GLenum target, GLintptr offset, GLsizeiptr size, void * data);
+	typedef void * (APIENTRYP PFNGLMAPBUFFERPROC_MT) (GLenum target, GLenum access);
+	typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC_MT) (GLenum target);
+	typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC_MT) (GLenum target, GLenum pname, void ** params);
+	typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC_MT) (GLenum modeRGB, GLenum modeAlpha);
+	typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC_MT) (GLsizei n, const GLenum * bufs);
+	typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC_MT) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+	typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC_MT) (GLenum face, GLenum func, GLint ref, GLuint mask);
+	typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC_MT) (GLenum face, GLuint mask);
+	typedef void (APIENTRYP PFNGLATTACHSHADERPROC_MT) (GLuint program, GLuint shader);
+	typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC_MT) (GLuint program, GLuint index, const GLchar * name);
+	typedef void (APIENTRYP PFNGLCOMPILESHADERPROC_MT) (GLuint shader);
+	typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC_MT) ( void);
+	typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC_MT) (GLenum type);
+	typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC_MT) (GLuint program);
+	typedef void (APIENTRYP PFNGLDELETESHADERPROC_MT) (GLuint shader);
+	typedef void (APIENTRYP PFNGLDETACHSHADERPROC_MT) (GLuint program, GLuint shader);
+	typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC_MT) (GLuint index);
+	typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC_MT) (GLuint index);
+	typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC_MT) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name);
+	typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC_MT) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name);
+	typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC_MT) (GLuint program, GLsizei maxCount, GLsizei * count, GLuint * shaders);
+	typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC_MT) (GLuint program, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC_MT) (GLuint program, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC_MT) (GLuint program, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+	typedef void (APIENTRYP PFNGLGETSHADERIVPROC_MT) (GLuint shader, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC_MT) (GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+	typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC_MT) (GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * source);
+	typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC_MT) (GLuint program, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC_MT) (GLuint program, GLint location, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC_MT) (GLuint program, GLint location, GLint * params);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC_MT) (GLuint index, GLenum pname, GLdouble * params);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC_MT) (GLuint index, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC_MT) (GLuint index, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC_MT) (GLuint index, GLenum pname, void ** pointer);
+	typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC_MT) (GLuint program);
+	typedef GLboolean (APIENTRYP PFNGLISSHADERPROC_MT) (GLuint shader);
+	typedef void (APIENTRYP PFNGLLINKPROGRAMPROC_MT) (GLuint program);
+	typedef void (APIENTRYP PFNGLSHADERSOURCEPROC_MT) (GLuint shader, GLsizei count, const GLchar *const* string, const GLint * length);
+	typedef void (APIENTRYP PFNGLUSEPROGRAMPROC_MT) (GLuint program);
+	typedef void (APIENTRYP PFNGLUNIFORM1FPROC_MT) (GLint location, GLfloat v0);
+	typedef void (APIENTRYP PFNGLUNIFORM2FPROC_MT) (GLint location, GLfloat v0, GLfloat v1);
+	typedef void (APIENTRYP PFNGLUNIFORM3FPROC_MT) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+	typedef void (APIENTRYP PFNGLUNIFORM4FPROC_MT) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+	typedef void (APIENTRYP PFNGLUNIFORM1IPROC_MT) (GLint location, GLint v0);
+	typedef void (APIENTRYP PFNGLUNIFORM2IPROC_MT) (GLint location, GLint v0, GLint v1);
+	typedef void (APIENTRYP PFNGLUNIFORM3IPROC_MT) (GLint location, GLint v0, GLint v1, GLint v2);
+	typedef void (APIENTRYP PFNGLUNIFORM4IPROC_MT) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+	typedef void (APIENTRYP PFNGLUNIFORM1FVPROC_MT) (GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2FVPROC_MT) (GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3FVPROC_MT) (GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4FVPROC_MT) (GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORM1IVPROC_MT) (GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2IVPROC_MT) (GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3IVPROC_MT) (GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4IVPROC_MT) (GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC_MT) (GLuint program);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC_MT) (GLuint index, GLdouble x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC_MT) (GLuint index, GLfloat x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC_MT) (GLuint index, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC_MT) (GLuint index, GLshort x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC_MT) (GLuint index, GLdouble x, GLdouble y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC_MT) (GLuint index, GLfloat x, GLfloat y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC_MT) (GLuint index, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC_MT) (GLuint index, GLshort x, GLshort y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC_MT) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC_MT) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC_MT) (GLuint index, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC_MT) (GLuint index, GLshort x, GLshort y, GLshort z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC_MT) (GLuint index, const GLbyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC_MT) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC_MT) (GLuint index, const GLubyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC_MT) (GLuint index, const GLushort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC_MT) (GLuint index, const GLbyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC_MT) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC_MT) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC_MT) (GLuint index, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC_MT) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC_MT) (GLuint index, const GLubyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC_MT) (GLuint index, const GLushort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC_MT) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void * pointer);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLCOLORMASKIPROC_MT) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+	typedef void (APIENTRYP PFNGLENABLEIPROC_MT) (GLenum target, GLuint index);
+	typedef void (APIENTRYP PFNGLDISABLEIPROC_MT) (GLenum target, GLuint index);
+	typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC_MT) (GLenum target, GLuint index);
+	typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC_MT) (GLenum primitiveMode);
+	typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC_MT) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC_MT) (GLenum target, GLuint index, GLuint buffer);
+	typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC_MT) (GLuint program, GLsizei count, const GLchar *const* varyings, GLenum bufferMode);
+	typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC_MT) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
+	typedef void (APIENTRYP PFNGLCLAMPCOLORPROC_MT) (GLenum target, GLenum clamp);
+	typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC_MT) (GLuint id, GLenum mode);
+	typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC_MT) (GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC_MT) (GLuint index, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC_MT) (GLuint index, GLenum pname, GLuint * params);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC_MT) (GLuint index, GLint x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC_MT) (GLuint index, GLint x, GLint y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC_MT) (GLuint index, GLint x, GLint y, GLint z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC_MT) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC_MT) (GLuint index, GLuint x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC_MT) (GLuint index, GLuint x, GLuint y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC_MT) (GLuint index, GLuint x, GLuint y, GLuint z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC_MT) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC_MT) (GLuint index, const GLuint * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC_MT) (GLuint index, const GLbyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC_MT) (GLuint index, const GLshort * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC_MT) (GLuint index, const GLubyte * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC_MT) (GLuint index, const GLushort * v);
+	typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC_MT) (GLuint program, GLint location, GLuint * params);
+	typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC_MT) (GLuint program, GLuint color, const GLchar * name);
+	typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC_MT) (GLuint program, const GLchar * name);
+	typedef void (APIENTRYP PFNGLUNIFORM1UIPROC_MT) (GLint location, GLuint v0);
+	typedef void (APIENTRYP PFNGLUNIFORM2UIPROC_MT) (GLint location, GLuint v0, GLuint v1);
+	typedef void (APIENTRYP PFNGLUNIFORM3UIPROC_MT) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+	typedef void (APIENTRYP PFNGLUNIFORM4UIPROC_MT) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+	typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC_MT) (GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC_MT) (GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC_MT) (GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC_MT) (GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC_MT) (GLenum target, GLenum pname, const GLint * params);
+	typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC_MT) (GLenum target, GLenum pname, const GLuint * params);
+	typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC_MT) (GLenum target, GLenum pname, GLuint * params);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC_MT) (GLenum buffer, GLint drawbuffer, const GLint * value);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC_MT) (GLenum buffer, GLint drawbuffer, const GLuint * value);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC_MT) (GLenum buffer, GLint drawbuffer, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC_MT) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+	typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC_MT) (GLenum name, GLuint index);
+	typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC_MT) (GLuint renderbuffer);
+	typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC_MT) (GLenum target, GLuint renderbuffer);
+	typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC_MT) (GLsizei n, const GLuint * renderbuffers);
+	typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC_MT) (GLsizei n, GLuint * renderbuffers);
+	typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC_MT) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC_MT) (GLuint framebuffer);
+	typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC_MT) (GLenum target, GLuint framebuffer);
+	typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC_MT) (GLsizei n, const GLuint * framebuffers);
+	typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC_MT) (GLsizei n, GLuint * framebuffers);
+	typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC_MT) (GLenum target);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC_MT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC_MT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC_MT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC_MT) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+	typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT) (GLenum target, GLenum attachment, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC_MT) (GLenum target);
+	typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC_MT) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+	typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC_MT) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+	typedef void * (APIENTRYP PFNGLMAPBUFFERRANGEPROC_MT) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+	typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC_MT) (GLenum target, GLintptr offset, GLsizeiptr length);
+	typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC_MT) (GLuint array);
+	typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC_MT) (GLsizei n, const GLuint * arrays);
+	typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC_MT) (GLsizei n, GLuint * arrays);
+	typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC_MT) (GLuint array);
+	typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC_MT) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount);
+	typedef void (APIENTRYP PFNGLTEXBUFFERPROC_MT) (GLenum target, GLenum internalformat, GLuint buffer);
+	typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC_MT) (GLuint index);
+	typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC_MT) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC_MT) (GLuint program, GLsizei uniformCount, const GLchar *const* uniformNames, GLuint * uniformIndices);
+	typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC_MT) (GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC_MT) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName);
+	typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC_MT) (GLuint program, const GLchar * uniformBlockName);
+	typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC_MT) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC_MT) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformBlockName);
+	typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC_MT) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex);
+	typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC_MT) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex);
+	typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC_MT) (GLenum mode, const GLsizei * count, GLenum type, const void *const* indices, GLsizei drawcount, const GLint * basevertex);
+	typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC_MT) (GLenum mode);
+	typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC_MT) (GLenum condition, GLbitfield flags);
+	typedef GLboolean (APIENTRYP PFNGLISSYNCPROC_MT) (GLsync sync);
+	typedef void (APIENTRYP PFNGLDELETESYNCPROC_MT) (GLsync sync);
+	typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC_MT) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+	typedef void (APIENTRYP PFNGLWAITSYNCPROC_MT) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+	typedef void (APIENTRYP PFNGLGETINTEGER64VPROC_MT) (GLenum pname, GLint64 * data);
+	typedef void (APIENTRYP PFNGLGETSYNCIVPROC_MT) (GLsync sync, GLenum pname, GLsizei count, GLsizei * length, GLint * values);
+	typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC_MT) (GLenum target, GLenum pname, GLint64 * params);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC_MT) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+	typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC_MT) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC_MT) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC_MT) (GLenum pname, GLuint index, GLfloat * val);
+	typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC_MT) (GLuint maskNumber, GLbitfield mask);
+	typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC_MT) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name);
+	typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC_MT) (GLuint program, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGENSAMPLERSPROC_MT) (GLsizei count, GLuint * samplers);
+	typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC_MT) (GLsizei count, const GLuint * samplers);
+	typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC_MT) (GLuint sampler);
+	typedef void (APIENTRYP PFNGLBINDSAMPLERPROC_MT) (GLuint unit, GLuint sampler);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC_MT) (GLuint sampler, GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC_MT) (GLuint sampler, GLenum pname, const GLint * param);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC_MT) (GLuint sampler, GLenum pname, GLfloat param);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC_MT) (GLuint sampler, GLenum pname, const GLfloat * param);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC_MT) (GLuint sampler, GLenum pname, const GLint * param);
+	typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC_MT) (GLuint sampler, GLenum pname, const GLuint * param);
+	typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC_MT) (GLuint sampler, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC_MT) (GLuint sampler, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC_MT) (GLuint sampler, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC_MT) (GLuint sampler, GLenum pname, GLuint * params);
+	typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC_MT) (GLuint id, GLenum target);
+	typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC_MT) (GLuint id, GLenum pname, GLint64 * params);
+	typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC_MT) (GLuint id, GLenum pname, GLuint64 * params);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC_MT) (GLuint index, GLuint divisor);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC_MT) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC_MT) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC_MT) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC_MT) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC_MT) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC_MT) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC_MT) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC_MT) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);
+	typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC_MT) (GLfloat value);
+	typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC_MT) (GLuint buf, GLenum mode);
+	typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC_MT) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+	typedef void (APIENTRYP PFNGLBLENDFUNCIPROC_MT) (GLuint buf, GLenum src, GLenum dst);
+	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC_MT) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+	typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC_MT) (GLenum mode, const void * indirect);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC_MT) (GLenum mode, GLenum type, const void * indirect);
+	typedef void (APIENTRYP PFNGLUNIFORM1DPROC_MT) (GLint location, GLdouble x);
+	typedef void (APIENTRYP PFNGLUNIFORM2DPROC_MT) (GLint location, GLdouble x, GLdouble y);
+	typedef void (APIENTRYP PFNGLUNIFORM3DPROC_MT) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+	typedef void (APIENTRYP PFNGLUNIFORM4DPROC_MT) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+	typedef void (APIENTRYP PFNGLUNIFORM1DVPROC_MT) (GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2DVPROC_MT) (GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3DVPROC_MT) (GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4DVPROC_MT) (GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC_MT) (GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC_MT) (GLuint program, GLint location, GLdouble * params);
+	typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC_MT) (GLuint program, GLenum shadertype, const GLchar * name);
+	typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC_MT) (GLuint program, GLenum shadertype, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC_MT) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint * values);
+	typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC_MT) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei * length, GLchar * name);
+	typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC_MT) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei * length, GLchar * name);
+	typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC_MT) (GLenum shadertype, GLsizei count, const GLuint * indices);
+	typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC_MT) (GLenum shadertype, GLint location, GLuint * params);
+	typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC_MT) (GLuint program, GLenum shadertype, GLenum pname, GLint * values);
+	typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC_MT) (GLenum pname, GLint value);
+	typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC_MT) (GLenum pname, const GLfloat * values);
+	typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC_MT) (GLenum target, GLuint id);
+	typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC_MT) (GLsizei n, const GLuint * ids);
+	typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC_MT) (GLsizei n, GLuint * ids);
+	typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC_MT) (GLuint id);
+	typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC_MT) (GLenum mode, GLuint id);
+	typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC_MT) (GLenum mode, GLuint id, GLuint stream);
+	typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC_MT) (GLenum target, GLuint index, GLuint id);
+	typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC_MT) (GLenum target, GLuint index);
+	typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC_MT) (GLenum target, GLuint index, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLSHADERBINARYPROC_MT) (GLsizei count, const GLuint * shaders, GLenum binaryFormat, const void * binary, GLsizei length);
+	typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC_MT) (GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision);
+	typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC_MT) (GLfloat n, GLfloat f);
+	typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC_MT) (GLfloat d);
+	typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC_MT) (GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, void * binary);
+	typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC_MT) (GLuint program, GLenum binaryFormat, const void * binary, GLsizei length);
+	typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC_MT) (GLuint program, GLenum pname, GLint value);
+	typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC_MT) (GLuint pipeline, GLbitfield stages, GLuint program);
+	typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC_MT) (GLuint pipeline, GLuint program);
+	typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC_MT) (GLenum type, GLsizei count, const GLchar *const* strings);
+	typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC_MT) (GLuint pipeline);
+	typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC_MT) (GLsizei n, const GLuint * pipelines);
+	typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC_MT) (GLsizei n, GLuint * pipelines);
+	typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC_MT) (GLuint pipeline);
+	typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC_MT) (GLuint pipeline, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC_MT) (GLuint program, GLint location, GLint v0);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC_MT) (GLuint program, GLint location, GLfloat v0);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC_MT) (GLuint program, GLint location, GLdouble v0);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC_MT) (GLuint program, GLint location, GLuint v0);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC_MT) (GLuint program, GLint location, GLint v0, GLint v1);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC_MT) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC_MT) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC_MT) (GLuint program, GLint location, GLuint v0, GLuint v1);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC_MT) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC_MT) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC_MT) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC_MT) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC_MT) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC_MT) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC_MT) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC_MT) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC_MT) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+	typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC_MT) (GLuint pipeline);
+	typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC_MT) (GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC_MT) (GLuint index, GLdouble x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC_MT) (GLuint index, GLdouble x, GLdouble y);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC_MT) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC_MT) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC_MT) (GLuint index, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC_MT) (GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC_MT) (GLuint index, GLenum pname, GLdouble * params);
+	typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC_MT) (GLuint first, GLsizei count, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC_MT) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+	typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC_MT) (GLuint index, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC_MT) (GLuint first, GLsizei count, const GLint * v);
+	typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC_MT) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC_MT) (GLuint index, const GLint * v);
+	typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC_MT) (GLuint first, GLsizei count, const GLdouble * v);
+	typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC_MT) (GLuint index, GLdouble n, GLdouble f);
+	typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC_MT) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLuint baseinstance);
+	typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC_MT) (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+	typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC_MT) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint * params);
+	typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC_MT) (GLuint program, GLuint bufferIndex, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC_MT) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+	typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC_MT) (GLbitfield barriers);
+	typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC_MT) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+	typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC_MT) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC_MT) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+	typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC_MT) (GLenum mode, GLuint id, GLsizei instancecount);
+	typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC_MT) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC_MT) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void * data);
+	typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC_MT) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void * data);
+	typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC_MT) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+	typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC_MT) (GLintptr indirect);
+	typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC_MT) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC_MT) (GLenum target, GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC_MT) (GLenum target, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC_MT) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 * params);
+	typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+	typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC_MT) (GLuint texture, GLint level);
+	typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+	typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC_MT) (GLuint buffer);
+	typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC_MT) (GLenum target, GLsizei numAttachments, const GLenum * attachments);
+	typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC_MT) (GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC_MT) (GLenum mode, const void * indirect, GLsizei drawcount, GLsizei stride);
+	typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC_MT) (GLenum mode, GLenum type, const void * indirect, GLsizei drawcount, GLsizei stride);
+	typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC_MT) (GLuint program, GLenum programInterface, GLenum pname, GLint * params);
+	typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC_MT) (GLuint program, GLenum programInterface, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC_MT) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei * length, GLchar * name);
+	typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC_MT) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum * props, GLsizei count, GLsizei * length, GLint * params);
+	typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC_MT) (GLuint program, GLenum programInterface, const GLchar * name);
+	typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC_MT) (GLuint program, GLenum programInterface, const GLchar * name);
+	typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC_MT) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+	typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC_MT) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC_MT) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC_MT) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC_MT) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+	typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC_MT) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC_MT) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC_MT) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC_MT) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC_MT) (GLuint attribindex, GLuint bindingindex);
+	typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC_MT) (GLuint bindingindex, GLuint divisor);
+	typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC_MT) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled);
+	typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC_MT) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf);
+	typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC_MT) (GLDEBUGPROC callback, const void * userParam);
+	typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC_MT) (GLuint count, GLsizei bufSize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog);
+	typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC_MT) (GLenum source, GLuint id, GLsizei length, const GLchar * message);
+	typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLOBJECTLABELPROC_MT) (GLenum identifier, GLuint name, GLsizei length, const GLchar * label);
+	typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC_MT) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label);
+	typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC_MT) (const void * ptr, GLsizei length, const GLchar * label);
+	typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC_MT) (const void * ptr, GLsizei bufSize, GLsizei * length, GLchar * label);
+	typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC_MT) (GLenum target, GLsizeiptr size, const void * data, GLbitfield flags);
+	typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC_MT) (GLuint texture, GLint level, GLenum format, GLenum type, const void * data);
+	typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void * data);
+	typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC_MT) (GLenum target, GLuint first, GLsizei count, const GLuint * buffers);
+	typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC_MT) (GLenum target, GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizeiptr * sizes);
+	typedef void (APIENTRYP PFNGLBINDTEXTURESPROC_MT) (GLuint first, GLsizei count, const GLuint * textures);
+	typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC_MT) (GLuint first, GLsizei count, const GLuint * samplers);
+	typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC_MT) (GLuint first, GLsizei count, const GLuint * textures);
+	typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC_MT) (GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides);
+	typedef void (APIENTRYP PFNGLCLIPCONTROLPROC_MT) (GLenum origin, GLenum depth);
+	typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC_MT) (GLsizei n, GLuint * ids);
+	typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC_MT) (GLuint xfb, GLuint index, GLuint buffer);
+	typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC_MT) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC_MT) (GLuint xfb, GLenum pname, GLint * param);
+	typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC_MT) (GLsizei n, GLuint * buffers);
+	typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC_MT) (GLuint buffer, GLsizeiptr size, const void * data, GLbitfield flags);
+	typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC_MT) (GLuint buffer, GLsizeiptr size, const void * data, GLenum usage);
+	typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void * data);
+	typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC_MT) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC_MT) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void * data);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC_MT) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void * data);
+	typedef void * (APIENTRYP PFNGLMAPNAMEDBUFFERPROC_MT) (GLuint buffer, GLenum access);
+	typedef void * (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+	typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC_MT) (GLuint buffer);
+	typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+	typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC_MT) (GLuint buffer, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC_MT) (GLuint buffer, GLenum pname, GLint64 * params);
+	typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC_MT) (GLuint buffer, GLenum pname, void ** params);
+	typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr size, void * data);
+	typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC_MT) (GLsizei n, GLuint * framebuffers);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC_MT) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC_MT) (GLuint framebuffer, GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREPROC_MT) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC_MT) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC_MT) (GLuint framebuffer, GLenum buf);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC_MT) (GLuint framebuffer, GLsizei n, const GLenum * bufs);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC_MT) (GLuint framebuffer, GLenum src);
+	typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC_MT) (GLuint framebuffer, GLsizei numAttachments, const GLenum * attachments);
+	typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC_MT) (GLuint framebuffer, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC_MT) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint * value);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC_MT) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint * value);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC_MT) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat * value);
+	typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC_MT) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+	typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC_MT) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+	typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC_MT) (GLuint framebuffer, GLenum target);
+	typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC_MT) (GLuint framebuffer, GLenum pname, GLint * param);
+	typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLCREATERENDERBUFFERSPROC_MT) (GLsizei n, GLuint * renderbuffers);
+	typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEPROC_MT) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC_MT) (GLuint renderbuffer, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLCREATETEXTURESPROC_MT) (GLenum target, GLsizei n, GLuint * textures);
+	typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC_MT) (GLuint texture, GLenum internalformat, GLuint buffer);
+	typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC_MT) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+	typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC_MT) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+	typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC_MT) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC_MT) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+	typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC_MT) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC_MT) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+	typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void * pixels);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void * data);
+	typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+	typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFPROC_MT) (GLuint texture, GLenum pname, GLfloat param);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVPROC_MT) (GLuint texture, GLenum pname, const GLfloat * param);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIPROC_MT) (GLuint texture, GLenum pname, GLint param);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVPROC_MT) (GLuint texture, GLenum pname, const GLint * params);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVPROC_MT) (GLuint texture, GLenum pname, const GLuint * params);
+	typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVPROC_MT) (GLuint texture, GLenum pname, const GLint * param);
+	typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPPROC_MT) (GLuint texture);
+	typedef void (APIENTRYP PFNGLBINDTEXTUREUNITPROC_MT) (GLuint unit, GLuint texture);
+	typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC_MT) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void * pixels);
+	typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC_MT) (GLuint texture, GLint level, GLsizei bufSize, void * pixels);
+	typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVPROC_MT) (GLuint texture, GLint level, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVPROC_MT) (GLuint texture, GLint level, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVPROC_MT) (GLuint texture, GLenum pname, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVPROC_MT) (GLuint texture, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVPROC_MT) (GLuint texture, GLenum pname, GLuint * params);
+	typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVPROC_MT) (GLuint texture, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLCREATEVERTEXARRAYSPROC_MT) (GLsizei n, GLuint * arrays);
+	typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBPROC_MT) (GLuint vaobj, GLuint index);
+	typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBPROC_MT) (GLuint vaobj, GLuint index);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYELEMENTBUFFERPROC_MT) (GLuint vaobj, GLuint buffer);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERPROC_MT) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERSPROC_MT) (GLuint vaobj, GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBBINDINGPROC_MT) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBFORMATPROC_MT) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBIFORMATPROC_MT) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBLFORMATPROC_MT) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+	typedef void (APIENTRYP PFNGLVERTEXARRAYBINDINGDIVISORPROC_MT) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+	typedef void (APIENTRYP PFNGLGETVERTEXARRAYIVPROC_MT) (GLuint vaobj, GLenum pname, GLint * param);
+	typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXEDIVPROC_MT) (GLuint vaobj, GLuint index, GLenum pname, GLint * param);
+	typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXED64IVPROC_MT) (GLuint vaobj, GLuint index, GLenum pname, GLint64 * param);
+	typedef void (APIENTRYP PFNGLCREATESAMPLERSPROC_MT) (GLsizei n, GLuint * samplers);
+	typedef void (APIENTRYP PFNGLCREATEPROGRAMPIPELINESPROC_MT) (GLsizei n, GLuint * pipelines);
+	typedef void (APIENTRYP PFNGLCREATEQUERIESPROC_MT) (GLenum target, GLsizei n, GLuint * ids);
+	typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTI64VPROC_MT) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+	typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTIVPROC_MT) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+	typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUI64VPROC_MT) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+	typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUIVPROC_MT) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+	typedef void (APIENTRYP PFNGLMEMORYBARRIERBYREGIONPROC_MT) (GLbitfield barriers);
+	typedef void (APIENTRYP PFNGLGETTEXTURESUBIMAGEPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void * pixels);
+	typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC_MT) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void * pixels);
+	typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEPROC_MT) (GLenum target, GLint lod, GLsizei bufSize, void * pixels);
+	typedef void (APIENTRYP PFNGLGETNTEXIMAGEPROC_MT) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void * pixels);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMDVPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLdouble * params);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMFVPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLfloat * params);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMIVPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLint * params);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLuint * params);
+	typedef void (APIENTRYP PFNGLREADNPIXELSPROC_MT) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data);
+	typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC_MT) (GLuint shader, const GLchar * pEntryPoint, GLuint numSpecializationConstants, const GLuint * pConstantIndex, const GLuint * pConstantValue);
+	typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC_MT) (GLenum mode, const void * indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+	typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC_MT) (GLenum mode, GLenum type, const void * indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+	typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC_MT) (GLfloat factor, GLfloat units, GLfloat clamp);
+	typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXPROC_MT) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+	typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEPROC_MT) (GLuint texture);
+	typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEPROC_MT) (GLuint texture, GLuint sampler);
+	typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTPROC_MT) (GLuint64 handle);
+	typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTPROC_MT) (GLuint64 handle);
+	typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLEPROC_MT) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+	typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTPROC_MT) (GLuint64 handle, GLenum access);
+	typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTPROC_MT) (GLuint64 handle);
+	typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64PROC_MT) (GLint location, GLuint64 value);
+	typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VPROC_MT) (GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64PROC_MT) (GLuint program, GLint location, GLuint64 value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint64 * values);
+	typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTPROC_MT) (GLuint64 handle);
+	typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTPROC_MT) (GLuint64 handle);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64PROC_MT) (GLuint index, GLuint64 x);
+	typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VPROC_MT) (GLuint index, const GLuint64 * v);
+	typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VPROC_MT) (GLuint index, GLenum pname, GLuint64 * params);
+	typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTPROC_MT) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
+	typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEGROUPSIZEPROC_MT) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEPROC_MT) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+	typedef void (APIENTRYP PFNGLUNIFORM1I64PROC_MT) (GLint location, GLint64 x);
+	typedef void (APIENTRYP PFNGLUNIFORM2I64PROC_MT) (GLint location, GLint64 x, GLint64 y);
+	typedef void (APIENTRYP PFNGLUNIFORM3I64PROC_MT) (GLint location, GLint64 x, GLint64 y, GLint64 z);
+	typedef void (APIENTRYP PFNGLUNIFORM4I64PROC_MT) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+	typedef void (APIENTRYP PFNGLUNIFORM1I64VPROC_MT) (GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2I64VPROC_MT) (GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3I64VPROC_MT) (GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4I64VPROC_MT) (GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM1UI64PROC_MT) (GLint location, GLuint64 x);
+	typedef void (APIENTRYP PFNGLUNIFORM2UI64PROC_MT) (GLint location, GLuint64 x, GLuint64 y);
+	typedef void (APIENTRYP PFNGLUNIFORM3UI64PROC_MT) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+	typedef void (APIENTRYP PFNGLUNIFORM4UI64PROC_MT) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+	typedef void (APIENTRYP PFNGLUNIFORM1UI64VPROC_MT) (GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM2UI64VPROC_MT) (GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM3UI64VPROC_MT) (GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLUNIFORM4UI64VPROC_MT) (GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLGETUNIFORMI64VPROC_MT) (GLuint program, GLint location, GLint64 * params);
+	typedef void (APIENTRYP PFNGLGETUNIFORMUI64VPROC_MT) (GLuint program, GLint location, GLuint64 * params);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMI64VPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLint64 * params);
+	typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VPROC_MT) (GLuint program, GLint location, GLsizei bufSize, GLuint64 * params);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64PROC_MT) (GLuint program, GLint location, GLint64 x);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64PROC_MT) (GLuint program, GLint location, GLint64 x, GLint64 y);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64PROC_MT) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64PROC_MT) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64PROC_MT) (GLuint program, GLint location, GLuint64 x);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64PROC_MT) (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64PROC_MT) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64PROC_MT) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VPROC_MT) (GLuint program, GLint location, GLsizei count, const GLuint64 * value);
+	typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSPROC_MT) (GLuint count);
+	typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT) (GLenum target, GLuint start, GLsizei count, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat * v);
+	typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESPROC_MT) ( void);
+	typedef void (APIENTRYP PFNGLNAMEDSTRINGPROC_MT) (GLenum type, GLint namelen, const GLchar * name, GLint stringlen, const GLchar * string);
+	typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGPROC_MT) (GLint namelen, const GLchar * name);
+	typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEPROC_MT) (GLuint shader, GLsizei count, const GLchar *const* path, const GLint * length);
+	typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGPROC_MT) (GLint namelen, const GLchar * name);
+	typedef void (APIENTRYP PFNGLGETNAMEDSTRINGPROC_MT) (GLint namelen, const GLchar * name, GLsizei bufSize, GLint * stringlen, GLchar * string);
+	typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVPROC_MT) (GLint namelen, const GLchar * name, GLenum pname, GLint * params);
+	typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTPROC_MT) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+	typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTPROC_MT) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+	typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTPROC_MT) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+
+	std::unordered_set<std::string> extensions;
+public:
+	// Call this once after creating the context.
+	void LoadAllProcedures(irr::video::IContextManager *cmgr);
+	// Check if an extension is supported.
+	inline bool IsExtensionPresent(const std::string &ext) const
+	{
+		return extensions.count(ext) > 0;
+	}
+
+	PFNGLCULLFACEPROC_MT CullFace = NULL;
+	PFNGLFRONTFACEPROC_MT FrontFace = NULL;
+	PFNGLHINTPROC_MT Hint = NULL;
+	PFNGLLINEWIDTHPROC_MT LineWidth = NULL;
+	PFNGLPOINTSIZEPROC_MT PointSize = NULL;
+	PFNGLPOLYGONMODEPROC_MT PolygonMode = NULL;
+	PFNGLSCISSORPROC_MT Scissor = NULL;
+	PFNGLTEXPARAMETERFPROC_MT TexParameterf = NULL;
+	PFNGLTEXPARAMETERFVPROC_MT TexParameterfv = NULL;
+	PFNGLTEXPARAMETERIPROC_MT TexParameteri = NULL;
+	PFNGLTEXPARAMETERIVPROC_MT TexParameteriv = NULL;
+	PFNGLTEXIMAGE1DPROC_MT TexImage1D = NULL;
+	PFNGLTEXIMAGE2DPROC_MT TexImage2D = NULL;
+	PFNGLDRAWBUFFERPROC_MT DrawBuffer = NULL;
+	PFNGLCLEARPROC_MT Clear = NULL;
+	PFNGLCLEARCOLORPROC_MT ClearColor = NULL;
+	PFNGLCLEARSTENCILPROC_MT ClearStencil = NULL;
+	PFNGLCLEARDEPTHPROC_MT ClearDepth = NULL;
+	PFNGLSTENCILMASKPROC_MT StencilMask = NULL;
+	PFNGLCOLORMASKPROC_MT ColorMask = NULL;
+	PFNGLDEPTHMASKPROC_MT DepthMask = NULL;
+	PFNGLDISABLEPROC_MT Disable = NULL;
+	PFNGLENABLEPROC_MT Enable = NULL;
+	PFNGLFINISHPROC_MT Finish = NULL;
+	PFNGLFLUSHPROC_MT Flush = NULL;
+	PFNGLBLENDFUNCPROC_MT BlendFunc = NULL;
+	PFNGLLOGICOPPROC_MT LogicOp = NULL;
+	PFNGLSTENCILFUNCPROC_MT StencilFunc = NULL;
+	PFNGLSTENCILOPPROC_MT StencilOp = NULL;
+	PFNGLDEPTHFUNCPROC_MT DepthFunc = NULL;
+	PFNGLPIXELSTOREFPROC_MT PixelStoref = NULL;
+	PFNGLPIXELSTOREIPROC_MT PixelStorei = NULL;
+	PFNGLREADBUFFERPROC_MT ReadBuffer = NULL;
+	PFNGLREADPIXELSPROC_MT ReadPixels = NULL;
+	PFNGLGETBOOLEANVPROC_MT GetBooleanv = NULL;
+	PFNGLGETDOUBLEVPROC_MT GetDoublev = NULL;
+	PFNGLGETERRORPROC_MT GetError = NULL;
+	PFNGLGETFLOATVPROC_MT GetFloatv = NULL;
+	PFNGLGETINTEGERVPROC_MT GetIntegerv = NULL;
+	PFNGLGETSTRINGPROC_MT GetString = NULL;
+	PFNGLGETTEXIMAGEPROC_MT GetTexImage = NULL;
+	PFNGLGETTEXPARAMETERFVPROC_MT GetTexParameterfv = NULL;
+	PFNGLGETTEXPARAMETERIVPROC_MT GetTexParameteriv = NULL;
+	PFNGLGETTEXLEVELPARAMETERFVPROC_MT GetTexLevelParameterfv = NULL;
+	PFNGLGETTEXLEVELPARAMETERIVPROC_MT GetTexLevelParameteriv = NULL;
+	PFNGLISENABLEDPROC_MT IsEnabled = NULL;
+	PFNGLDEPTHRANGEPROC_MT DepthRange = NULL;
+	PFNGLVIEWPORTPROC_MT Viewport = NULL;
+	PFNGLDRAWARRAYSPROC_MT DrawArrays = NULL;
+	PFNGLDRAWELEMENTSPROC_MT DrawElements = NULL;
+	PFNGLGETPOINTERVPROC_MT GetPointerv = NULL;
+	PFNGLPOLYGONOFFSETPROC_MT PolygonOffset = NULL;
+	PFNGLCOPYTEXIMAGE1DPROC_MT CopyTexImage1D = NULL;
+	PFNGLCOPYTEXIMAGE2DPROC_MT CopyTexImage2D = NULL;
+	PFNGLCOPYTEXSUBIMAGE1DPROC_MT CopyTexSubImage1D = NULL;
+	PFNGLCOPYTEXSUBIMAGE2DPROC_MT CopyTexSubImage2D = NULL;
+	PFNGLTEXSUBIMAGE1DPROC_MT TexSubImage1D = NULL;
+	PFNGLTEXSUBIMAGE2DPROC_MT TexSubImage2D = NULL;
+	PFNGLBINDTEXTUREPROC_MT BindTexture = NULL;
+	PFNGLDELETETEXTURESPROC_MT DeleteTextures = NULL;
+	PFNGLGENTEXTURESPROC_MT GenTextures = NULL;
+	PFNGLISTEXTUREPROC_MT IsTexture = NULL;
+	PFNGLDRAWRANGEELEMENTSPROC_MT DrawRangeElements = NULL;
+	PFNGLTEXIMAGE3DPROC_MT TexImage3D = NULL;
+	PFNGLTEXSUBIMAGE3DPROC_MT TexSubImage3D = NULL;
+	PFNGLCOPYTEXSUBIMAGE3DPROC_MT CopyTexSubImage3D = NULL;
+	PFNGLACTIVETEXTUREPROC_MT ActiveTexture = NULL;
+	PFNGLSAMPLECOVERAGEPROC_MT SampleCoverage = NULL;
+	PFNGLCOMPRESSEDTEXIMAGE3DPROC_MT CompressedTexImage3D = NULL;
+	PFNGLCOMPRESSEDTEXIMAGE2DPROC_MT CompressedTexImage2D = NULL;
+	PFNGLCOMPRESSEDTEXIMAGE1DPROC_MT CompressedTexImage1D = NULL;
+	PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC_MT CompressedTexSubImage3D = NULL;
+	PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC_MT CompressedTexSubImage2D = NULL;
+	PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC_MT CompressedTexSubImage1D = NULL;
+	PFNGLGETCOMPRESSEDTEXIMAGEPROC_MT GetCompressedTexImage = NULL;
+	PFNGLBLENDFUNCSEPARATEPROC_MT BlendFuncSeparate = NULL;
+	PFNGLMULTIDRAWARRAYSPROC_MT MultiDrawArrays = NULL;
+	PFNGLMULTIDRAWELEMENTSPROC_MT MultiDrawElements = NULL;
+	PFNGLPOINTPARAMETERFPROC_MT PointParameterf = NULL;
+	PFNGLPOINTPARAMETERFVPROC_MT PointParameterfv = NULL;
+	PFNGLPOINTPARAMETERIPROC_MT PointParameteri = NULL;
+	PFNGLPOINTPARAMETERIVPROC_MT PointParameteriv = NULL;
+	PFNGLBLENDCOLORPROC_MT BlendColor = NULL;
+	PFNGLBLENDEQUATIONPROC_MT BlendEquation = NULL;
+	PFNGLGENQUERIESPROC_MT GenQueries = NULL;
+	PFNGLDELETEQUERIESPROC_MT DeleteQueries = NULL;
+	PFNGLISQUERYPROC_MT IsQuery = NULL;
+	PFNGLBEGINQUERYPROC_MT BeginQuery = NULL;
+	PFNGLENDQUERYPROC_MT EndQuery = NULL;
+	PFNGLGETQUERYIVPROC_MT GetQueryiv = NULL;
+	PFNGLGETQUERYOBJECTIVPROC_MT GetQueryObjectiv = NULL;
+	PFNGLGETQUERYOBJECTUIVPROC_MT GetQueryObjectuiv = NULL;
+	PFNGLBINDBUFFERPROC_MT BindBuffer = NULL;
+	PFNGLDELETEBUFFERSPROC_MT DeleteBuffers = NULL;
+	PFNGLGENBUFFERSPROC_MT GenBuffers = NULL;
+	PFNGLISBUFFERPROC_MT IsBuffer = NULL;
+	PFNGLBUFFERDATAPROC_MT BufferData = NULL;
+	PFNGLBUFFERSUBDATAPROC_MT BufferSubData = NULL;
+	PFNGLGETBUFFERSUBDATAPROC_MT GetBufferSubData = NULL;
+	PFNGLMAPBUFFERPROC_MT MapBuffer = NULL;
+	PFNGLUNMAPBUFFERPROC_MT UnmapBuffer = NULL;
+	PFNGLGETBUFFERPARAMETERIVPROC_MT GetBufferParameteriv = NULL;
+	PFNGLGETBUFFERPOINTERVPROC_MT GetBufferPointerv = NULL;
+	PFNGLBLENDEQUATIONSEPARATEPROC_MT BlendEquationSeparate = NULL;
+	PFNGLDRAWBUFFERSPROC_MT DrawBuffers = NULL;
+	PFNGLSTENCILOPSEPARATEPROC_MT StencilOpSeparate = NULL;
+	PFNGLSTENCILFUNCSEPARATEPROC_MT StencilFuncSeparate = NULL;
+	PFNGLSTENCILMASKSEPARATEPROC_MT StencilMaskSeparate = NULL;
+	PFNGLATTACHSHADERPROC_MT AttachShader = NULL;
+	PFNGLBINDATTRIBLOCATIONPROC_MT BindAttribLocation = NULL;
+	PFNGLCOMPILESHADERPROC_MT CompileShader = NULL;
+	PFNGLCREATEPROGRAMPROC_MT CreateProgram = NULL;
+	PFNGLCREATESHADERPROC_MT CreateShader = NULL;
+	PFNGLDELETEPROGRAMPROC_MT DeleteProgram = NULL;
+	PFNGLDELETESHADERPROC_MT DeleteShader = NULL;
+	PFNGLDETACHSHADERPROC_MT DetachShader = NULL;
+	PFNGLDISABLEVERTEXATTRIBARRAYPROC_MT DisableVertexAttribArray = NULL;
+	PFNGLENABLEVERTEXATTRIBARRAYPROC_MT EnableVertexAttribArray = NULL;
+	PFNGLGETACTIVEATTRIBPROC_MT GetActiveAttrib = NULL;
+	PFNGLGETACTIVEUNIFORMPROC_MT GetActiveUniform = NULL;
+	PFNGLGETATTACHEDSHADERSPROC_MT GetAttachedShaders = NULL;
+	PFNGLGETATTRIBLOCATIONPROC_MT GetAttribLocation = NULL;
+	PFNGLGETPROGRAMIVPROC_MT GetProgramiv = NULL;
+	PFNGLGETPROGRAMINFOLOGPROC_MT GetProgramInfoLog = NULL;
+	PFNGLGETSHADERIVPROC_MT GetShaderiv = NULL;
+	PFNGLGETSHADERINFOLOGPROC_MT GetShaderInfoLog = NULL;
+	PFNGLGETSHADERSOURCEPROC_MT GetShaderSource = NULL;
+	PFNGLGETUNIFORMLOCATIONPROC_MT GetUniformLocation = NULL;
+	PFNGLGETUNIFORMFVPROC_MT GetUniformfv = NULL;
+	PFNGLGETUNIFORMIVPROC_MT GetUniformiv = NULL;
+	PFNGLGETVERTEXATTRIBDVPROC_MT GetVertexAttribdv = NULL;
+	PFNGLGETVERTEXATTRIBFVPROC_MT GetVertexAttribfv = NULL;
+	PFNGLGETVERTEXATTRIBIVPROC_MT GetVertexAttribiv = NULL;
+	PFNGLGETVERTEXATTRIBPOINTERVPROC_MT GetVertexAttribPointerv = NULL;
+	PFNGLISPROGRAMPROC_MT IsProgram = NULL;
+	PFNGLISSHADERPROC_MT IsShader = NULL;
+	PFNGLLINKPROGRAMPROC_MT LinkProgram = NULL;
+	PFNGLSHADERSOURCEPROC_MT ShaderSource = NULL;
+	PFNGLUSEPROGRAMPROC_MT UseProgram = NULL;
+	PFNGLUNIFORM1FPROC_MT Uniform1f = NULL;
+	PFNGLUNIFORM2FPROC_MT Uniform2f = NULL;
+	PFNGLUNIFORM3FPROC_MT Uniform3f = NULL;
+	PFNGLUNIFORM4FPROC_MT Uniform4f = NULL;
+	PFNGLUNIFORM1IPROC_MT Uniform1i = NULL;
+	PFNGLUNIFORM2IPROC_MT Uniform2i = NULL;
+	PFNGLUNIFORM3IPROC_MT Uniform3i = NULL;
+	PFNGLUNIFORM4IPROC_MT Uniform4i = NULL;
+	PFNGLUNIFORM1FVPROC_MT Uniform1fv = NULL;
+	PFNGLUNIFORM2FVPROC_MT Uniform2fv = NULL;
+	PFNGLUNIFORM3FVPROC_MT Uniform3fv = NULL;
+	PFNGLUNIFORM4FVPROC_MT Uniform4fv = NULL;
+	PFNGLUNIFORM1IVPROC_MT Uniform1iv = NULL;
+	PFNGLUNIFORM2IVPROC_MT Uniform2iv = NULL;
+	PFNGLUNIFORM3IVPROC_MT Uniform3iv = NULL;
+	PFNGLUNIFORM4IVPROC_MT Uniform4iv = NULL;
+	PFNGLUNIFORMMATRIX2FVPROC_MT UniformMatrix2fv = NULL;
+	PFNGLUNIFORMMATRIX3FVPROC_MT UniformMatrix3fv = NULL;
+	PFNGLUNIFORMMATRIX4FVPROC_MT UniformMatrix4fv = NULL;
+	PFNGLVALIDATEPROGRAMPROC_MT ValidateProgram = NULL;
+	PFNGLVERTEXATTRIB1DPROC_MT VertexAttrib1d = NULL;
+	PFNGLVERTEXATTRIB1DVPROC_MT VertexAttrib1dv = NULL;
+	PFNGLVERTEXATTRIB1FPROC_MT VertexAttrib1f = NULL;
+	PFNGLVERTEXATTRIB1FVPROC_MT VertexAttrib1fv = NULL;
+	PFNGLVERTEXATTRIB1SPROC_MT VertexAttrib1s = NULL;
+	PFNGLVERTEXATTRIB1SVPROC_MT VertexAttrib1sv = NULL;
+	PFNGLVERTEXATTRIB2DPROC_MT VertexAttrib2d = NULL;
+	PFNGLVERTEXATTRIB2DVPROC_MT VertexAttrib2dv = NULL;
+	PFNGLVERTEXATTRIB2FPROC_MT VertexAttrib2f = NULL;
+	PFNGLVERTEXATTRIB2FVPROC_MT VertexAttrib2fv = NULL;
+	PFNGLVERTEXATTRIB2SPROC_MT VertexAttrib2s = NULL;
+	PFNGLVERTEXATTRIB2SVPROC_MT VertexAttrib2sv = NULL;
+	PFNGLVERTEXATTRIB3DPROC_MT VertexAttrib3d = NULL;
+	PFNGLVERTEXATTRIB3DVPROC_MT VertexAttrib3dv = NULL;
+	PFNGLVERTEXATTRIB3FPROC_MT VertexAttrib3f = NULL;
+	PFNGLVERTEXATTRIB3FVPROC_MT VertexAttrib3fv = NULL;
+	PFNGLVERTEXATTRIB3SPROC_MT VertexAttrib3s = NULL;
+	PFNGLVERTEXATTRIB3SVPROC_MT VertexAttrib3sv = NULL;
+	PFNGLVERTEXATTRIB4NBVPROC_MT VertexAttrib4Nbv = NULL;
+	PFNGLVERTEXATTRIB4NIVPROC_MT VertexAttrib4Niv = NULL;
+	PFNGLVERTEXATTRIB4NSVPROC_MT VertexAttrib4Nsv = NULL;
+	PFNGLVERTEXATTRIB4NUBPROC_MT VertexAttrib4Nub = NULL;
+	PFNGLVERTEXATTRIB4NUBVPROC_MT VertexAttrib4Nubv = NULL;
+	PFNGLVERTEXATTRIB4NUIVPROC_MT VertexAttrib4Nuiv = NULL;
+	PFNGLVERTEXATTRIB4NUSVPROC_MT VertexAttrib4Nusv = NULL;
+	PFNGLVERTEXATTRIB4BVPROC_MT VertexAttrib4bv = NULL;
+	PFNGLVERTEXATTRIB4DPROC_MT VertexAttrib4d = NULL;
+	PFNGLVERTEXATTRIB4DVPROC_MT VertexAttrib4dv = NULL;
+	PFNGLVERTEXATTRIB4FPROC_MT VertexAttrib4f = NULL;
+	PFNGLVERTEXATTRIB4FVPROC_MT VertexAttrib4fv = NULL;
+	PFNGLVERTEXATTRIB4IVPROC_MT VertexAttrib4iv = NULL;
+	PFNGLVERTEXATTRIB4SPROC_MT VertexAttrib4s = NULL;
+	PFNGLVERTEXATTRIB4SVPROC_MT VertexAttrib4sv = NULL;
+	PFNGLVERTEXATTRIB4UBVPROC_MT VertexAttrib4ubv = NULL;
+	PFNGLVERTEXATTRIB4UIVPROC_MT VertexAttrib4uiv = NULL;
+	PFNGLVERTEXATTRIB4USVPROC_MT VertexAttrib4usv = NULL;
+	PFNGLVERTEXATTRIBPOINTERPROC_MT VertexAttribPointer = NULL;
+	PFNGLUNIFORMMATRIX2X3FVPROC_MT UniformMatrix2x3fv = NULL;
+	PFNGLUNIFORMMATRIX3X2FVPROC_MT UniformMatrix3x2fv = NULL;
+	PFNGLUNIFORMMATRIX2X4FVPROC_MT UniformMatrix2x4fv = NULL;
+	PFNGLUNIFORMMATRIX4X2FVPROC_MT UniformMatrix4x2fv = NULL;
+	PFNGLUNIFORMMATRIX3X4FVPROC_MT UniformMatrix3x4fv = NULL;
+	PFNGLUNIFORMMATRIX4X3FVPROC_MT UniformMatrix4x3fv = NULL;
+	PFNGLCOLORMASKIPROC_MT ColorMaski = NULL;
+	PFNGLENABLEIPROC_MT Enablei = NULL;
+	PFNGLDISABLEIPROC_MT Disablei = NULL;
+	PFNGLISENABLEDIPROC_MT IsEnabledi = NULL;
+	PFNGLBEGINTRANSFORMFEEDBACKPROC_MT BeginTransformFeedback = NULL;
+	PFNGLENDTRANSFORMFEEDBACKPROC_MT EndTransformFeedback = NULL;
+	PFNGLBINDBUFFERRANGEPROC_MT BindBufferRange = NULL;
+	PFNGLBINDBUFFERBASEPROC_MT BindBufferBase = NULL;
+	PFNGLTRANSFORMFEEDBACKVARYINGSPROC_MT TransformFeedbackVaryings = NULL;
+	PFNGLGETTRANSFORMFEEDBACKVARYINGPROC_MT GetTransformFeedbackVarying = NULL;
+	PFNGLCLAMPCOLORPROC_MT ClampColor = NULL;
+	PFNGLBEGINCONDITIONALRENDERPROC_MT BeginConditionalRender = NULL;
+	PFNGLENDCONDITIONALRENDERPROC_MT EndConditionalRender = NULL;
+	PFNGLVERTEXATTRIBIPOINTERPROC_MT VertexAttribIPointer = NULL;
+	PFNGLGETVERTEXATTRIBIIVPROC_MT GetVertexAttribIiv = NULL;
+	PFNGLGETVERTEXATTRIBIUIVPROC_MT GetVertexAttribIuiv = NULL;
+	PFNGLVERTEXATTRIBI1IPROC_MT VertexAttribI1i = NULL;
+	PFNGLVERTEXATTRIBI2IPROC_MT VertexAttribI2i = NULL;
+	PFNGLVERTEXATTRIBI3IPROC_MT VertexAttribI3i = NULL;
+	PFNGLVERTEXATTRIBI4IPROC_MT VertexAttribI4i = NULL;
+	PFNGLVERTEXATTRIBI1UIPROC_MT VertexAttribI1ui = NULL;
+	PFNGLVERTEXATTRIBI2UIPROC_MT VertexAttribI2ui = NULL;
+	PFNGLVERTEXATTRIBI3UIPROC_MT VertexAttribI3ui = NULL;
+	PFNGLVERTEXATTRIBI4UIPROC_MT VertexAttribI4ui = NULL;
+	PFNGLVERTEXATTRIBI1IVPROC_MT VertexAttribI1iv = NULL;
+	PFNGLVERTEXATTRIBI2IVPROC_MT VertexAttribI2iv = NULL;
+	PFNGLVERTEXATTRIBI3IVPROC_MT VertexAttribI3iv = NULL;
+	PFNGLVERTEXATTRIBI4IVPROC_MT VertexAttribI4iv = NULL;
+	PFNGLVERTEXATTRIBI1UIVPROC_MT VertexAttribI1uiv = NULL;
+	PFNGLVERTEXATTRIBI2UIVPROC_MT VertexAttribI2uiv = NULL;
+	PFNGLVERTEXATTRIBI3UIVPROC_MT VertexAttribI3uiv = NULL;
+	PFNGLVERTEXATTRIBI4UIVPROC_MT VertexAttribI4uiv = NULL;
+	PFNGLVERTEXATTRIBI4BVPROC_MT VertexAttribI4bv = NULL;
+	PFNGLVERTEXATTRIBI4SVPROC_MT VertexAttribI4sv = NULL;
+	PFNGLVERTEXATTRIBI4UBVPROC_MT VertexAttribI4ubv = NULL;
+	PFNGLVERTEXATTRIBI4USVPROC_MT VertexAttribI4usv = NULL;
+	PFNGLGETUNIFORMUIVPROC_MT GetUniformuiv = NULL;
+	PFNGLBINDFRAGDATALOCATIONPROC_MT BindFragDataLocation = NULL;
+	PFNGLGETFRAGDATALOCATIONPROC_MT GetFragDataLocation = NULL;
+	PFNGLUNIFORM1UIPROC_MT Uniform1ui = NULL;
+	PFNGLUNIFORM2UIPROC_MT Uniform2ui = NULL;
+	PFNGLUNIFORM3UIPROC_MT Uniform3ui = NULL;
+	PFNGLUNIFORM4UIPROC_MT Uniform4ui = NULL;
+	PFNGLUNIFORM1UIVPROC_MT Uniform1uiv = NULL;
+	PFNGLUNIFORM2UIVPROC_MT Uniform2uiv = NULL;
+	PFNGLUNIFORM3UIVPROC_MT Uniform3uiv = NULL;
+	PFNGLUNIFORM4UIVPROC_MT Uniform4uiv = NULL;
+	PFNGLTEXPARAMETERIIVPROC_MT TexParameterIiv = NULL;
+	PFNGLTEXPARAMETERIUIVPROC_MT TexParameterIuiv = NULL;
+	PFNGLGETTEXPARAMETERIIVPROC_MT GetTexParameterIiv = NULL;
+	PFNGLGETTEXPARAMETERIUIVPROC_MT GetTexParameterIuiv = NULL;
+	PFNGLCLEARBUFFERIVPROC_MT ClearBufferiv = NULL;
+	PFNGLCLEARBUFFERUIVPROC_MT ClearBufferuiv = NULL;
+	PFNGLCLEARBUFFERFVPROC_MT ClearBufferfv = NULL;
+	PFNGLCLEARBUFFERFIPROC_MT ClearBufferfi = NULL;
+	PFNGLGETSTRINGIPROC_MT GetStringi = NULL;
+	PFNGLISRENDERBUFFERPROC_MT IsRenderbuffer = NULL;
+	PFNGLBINDRENDERBUFFERPROC_MT BindRenderbuffer = NULL;
+	PFNGLDELETERENDERBUFFERSPROC_MT DeleteRenderbuffers = NULL;
+	PFNGLGENRENDERBUFFERSPROC_MT GenRenderbuffers = NULL;
+	PFNGLRENDERBUFFERSTORAGEPROC_MT RenderbufferStorage = NULL;
+	PFNGLGETRENDERBUFFERPARAMETERIVPROC_MT GetRenderbufferParameteriv = NULL;
+	PFNGLISFRAMEBUFFERPROC_MT IsFramebuffer = NULL;
+	PFNGLBINDFRAMEBUFFERPROC_MT BindFramebuffer = NULL;
+	PFNGLDELETEFRAMEBUFFERSPROC_MT DeleteFramebuffers = NULL;
+	PFNGLGENFRAMEBUFFERSPROC_MT GenFramebuffers = NULL;
+	PFNGLCHECKFRAMEBUFFERSTATUSPROC_MT CheckFramebufferStatus = NULL;
+	PFNGLFRAMEBUFFERTEXTURE1DPROC_MT FramebufferTexture1D = NULL;
+	PFNGLFRAMEBUFFERTEXTURE2DPROC_MT FramebufferTexture2D = NULL;
+	PFNGLFRAMEBUFFERTEXTURE3DPROC_MT FramebufferTexture3D = NULL;
+	PFNGLFRAMEBUFFERRENDERBUFFERPROC_MT FramebufferRenderbuffer = NULL;
+	PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT GetFramebufferAttachmentParameteriv = NULL;
+	PFNGLGENERATEMIPMAPPROC_MT GenerateMipmap = NULL;
+	PFNGLBLITFRAMEBUFFERPROC_MT BlitFramebuffer = NULL;
+	PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT RenderbufferStorageMultisample = NULL;
+	PFNGLFRAMEBUFFERTEXTURELAYERPROC_MT FramebufferTextureLayer = NULL;
+	PFNGLMAPBUFFERRANGEPROC_MT MapBufferRange = NULL;
+	PFNGLFLUSHMAPPEDBUFFERRANGEPROC_MT FlushMappedBufferRange = NULL;
+	PFNGLBINDVERTEXARRAYPROC_MT BindVertexArray = NULL;
+	PFNGLDELETEVERTEXARRAYSPROC_MT DeleteVertexArrays = NULL;
+	PFNGLGENVERTEXARRAYSPROC_MT GenVertexArrays = NULL;
+	PFNGLISVERTEXARRAYPROC_MT IsVertexArray = NULL;
+	PFNGLDRAWARRAYSINSTANCEDPROC_MT DrawArraysInstanced = NULL;
+	PFNGLDRAWELEMENTSINSTANCEDPROC_MT DrawElementsInstanced = NULL;
+	PFNGLTEXBUFFERPROC_MT TexBuffer = NULL;
+	PFNGLPRIMITIVERESTARTINDEXPROC_MT PrimitiveRestartIndex = NULL;
+	PFNGLCOPYBUFFERSUBDATAPROC_MT CopyBufferSubData = NULL;
+	PFNGLGETUNIFORMINDICESPROC_MT GetUniformIndices = NULL;
+	PFNGLGETACTIVEUNIFORMSIVPROC_MT GetActiveUniformsiv = NULL;
+	PFNGLGETACTIVEUNIFORMNAMEPROC_MT GetActiveUniformName = NULL;
+	PFNGLGETUNIFORMBLOCKINDEXPROC_MT GetUniformBlockIndex = NULL;
+	PFNGLGETACTIVEUNIFORMBLOCKIVPROC_MT GetActiveUniformBlockiv = NULL;
+	PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC_MT GetActiveUniformBlockName = NULL;
+	PFNGLUNIFORMBLOCKBINDINGPROC_MT UniformBlockBinding = NULL;
+	PFNGLDRAWELEMENTSBASEVERTEXPROC_MT DrawElementsBaseVertex = NULL;
+	PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC_MT DrawRangeElementsBaseVertex = NULL;
+	PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC_MT DrawElementsInstancedBaseVertex = NULL;
+	PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC_MT MultiDrawElementsBaseVertex = NULL;
+	PFNGLPROVOKINGVERTEXPROC_MT ProvokingVertex = NULL;
+	PFNGLFENCESYNCPROC_MT FenceSync = NULL;
+	PFNGLISSYNCPROC_MT IsSync = NULL;
+	PFNGLDELETESYNCPROC_MT DeleteSync = NULL;
+	PFNGLCLIENTWAITSYNCPROC_MT ClientWaitSync = NULL;
+	PFNGLWAITSYNCPROC_MT WaitSync = NULL;
+	PFNGLGETINTEGER64VPROC_MT GetInteger64v = NULL;
+	PFNGLGETSYNCIVPROC_MT GetSynciv = NULL;
+	PFNGLGETBUFFERPARAMETERI64VPROC_MT GetBufferParameteri64v = NULL;
+	PFNGLFRAMEBUFFERTEXTUREPROC_MT FramebufferTexture = NULL;
+	PFNGLTEXIMAGE2DMULTISAMPLEPROC_MT TexImage2DMultisample = NULL;
+	PFNGLTEXIMAGE3DMULTISAMPLEPROC_MT TexImage3DMultisample = NULL;
+	PFNGLGETMULTISAMPLEFVPROC_MT GetMultisamplefv = NULL;
+	PFNGLSAMPLEMASKIPROC_MT SampleMaski = NULL;
+	PFNGLBINDFRAGDATALOCATIONINDEXEDPROC_MT BindFragDataLocationIndexed = NULL;
+	PFNGLGETFRAGDATAINDEXPROC_MT GetFragDataIndex = NULL;
+	PFNGLGENSAMPLERSPROC_MT GenSamplers = NULL;
+	PFNGLDELETESAMPLERSPROC_MT DeleteSamplers = NULL;
+	PFNGLISSAMPLERPROC_MT IsSampler = NULL;
+	PFNGLBINDSAMPLERPROC_MT BindSampler = NULL;
+	PFNGLSAMPLERPARAMETERIPROC_MT SamplerParameteri = NULL;
+	PFNGLSAMPLERPARAMETERIVPROC_MT SamplerParameteriv = NULL;
+	PFNGLSAMPLERPARAMETERFPROC_MT SamplerParameterf = NULL;
+	PFNGLSAMPLERPARAMETERFVPROC_MT SamplerParameterfv = NULL;
+	PFNGLSAMPLERPARAMETERIIVPROC_MT SamplerParameterIiv = NULL;
+	PFNGLSAMPLERPARAMETERIUIVPROC_MT SamplerParameterIuiv = NULL;
+	PFNGLGETSAMPLERPARAMETERIVPROC_MT GetSamplerParameteriv = NULL;
+	PFNGLGETSAMPLERPARAMETERIIVPROC_MT GetSamplerParameterIiv = NULL;
+	PFNGLGETSAMPLERPARAMETERFVPROC_MT GetSamplerParameterfv = NULL;
+	PFNGLGETSAMPLERPARAMETERIUIVPROC_MT GetSamplerParameterIuiv = NULL;
+	PFNGLQUERYCOUNTERPROC_MT QueryCounter = NULL;
+	PFNGLGETQUERYOBJECTI64VPROC_MT GetQueryObjecti64v = NULL;
+	PFNGLGETQUERYOBJECTUI64VPROC_MT GetQueryObjectui64v = NULL;
+	PFNGLVERTEXATTRIBDIVISORPROC_MT VertexAttribDivisor = NULL;
+	PFNGLVERTEXATTRIBP1UIPROC_MT VertexAttribP1ui = NULL;
+	PFNGLVERTEXATTRIBP1UIVPROC_MT VertexAttribP1uiv = NULL;
+	PFNGLVERTEXATTRIBP2UIPROC_MT VertexAttribP2ui = NULL;
+	PFNGLVERTEXATTRIBP2UIVPROC_MT VertexAttribP2uiv = NULL;
+	PFNGLVERTEXATTRIBP3UIPROC_MT VertexAttribP3ui = NULL;
+	PFNGLVERTEXATTRIBP3UIVPROC_MT VertexAttribP3uiv = NULL;
+	PFNGLVERTEXATTRIBP4UIPROC_MT VertexAttribP4ui = NULL;
+	PFNGLVERTEXATTRIBP4UIVPROC_MT VertexAttribP4uiv = NULL;
+	PFNGLMINSAMPLESHADINGPROC_MT MinSampleShading = NULL;
+	PFNGLBLENDEQUATIONIPROC_MT BlendEquationi = NULL;
+	PFNGLBLENDEQUATIONSEPARATEIPROC_MT BlendEquationSeparatei = NULL;
+	PFNGLBLENDFUNCIPROC_MT BlendFunci = NULL;
+	PFNGLBLENDFUNCSEPARATEIPROC_MT BlendFuncSeparatei = NULL;
+	PFNGLDRAWARRAYSINDIRECTPROC_MT DrawArraysIndirect = NULL;
+	PFNGLDRAWELEMENTSINDIRECTPROC_MT DrawElementsIndirect = NULL;
+	PFNGLUNIFORM1DPROC_MT Uniform1d = NULL;
+	PFNGLUNIFORM2DPROC_MT Uniform2d = NULL;
+	PFNGLUNIFORM3DPROC_MT Uniform3d = NULL;
+	PFNGLUNIFORM4DPROC_MT Uniform4d = NULL;
+	PFNGLUNIFORM1DVPROC_MT Uniform1dv = NULL;
+	PFNGLUNIFORM2DVPROC_MT Uniform2dv = NULL;
+	PFNGLUNIFORM3DVPROC_MT Uniform3dv = NULL;
+	PFNGLUNIFORM4DVPROC_MT Uniform4dv = NULL;
+	PFNGLUNIFORMMATRIX2DVPROC_MT UniformMatrix2dv = NULL;
+	PFNGLUNIFORMMATRIX3DVPROC_MT UniformMatrix3dv = NULL;
+	PFNGLUNIFORMMATRIX4DVPROC_MT UniformMatrix4dv = NULL;
+	PFNGLUNIFORMMATRIX2X3DVPROC_MT UniformMatrix2x3dv = NULL;
+	PFNGLUNIFORMMATRIX2X4DVPROC_MT UniformMatrix2x4dv = NULL;
+	PFNGLUNIFORMMATRIX3X2DVPROC_MT UniformMatrix3x2dv = NULL;
+	PFNGLUNIFORMMATRIX3X4DVPROC_MT UniformMatrix3x4dv = NULL;
+	PFNGLUNIFORMMATRIX4X2DVPROC_MT UniformMatrix4x2dv = NULL;
+	PFNGLUNIFORMMATRIX4X3DVPROC_MT UniformMatrix4x3dv = NULL;
+	PFNGLGETUNIFORMDVPROC_MT GetUniformdv = NULL;
+	PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC_MT GetSubroutineUniformLocation = NULL;
+	PFNGLGETSUBROUTINEINDEXPROC_MT GetSubroutineIndex = NULL;
+	PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC_MT GetActiveSubroutineUniformiv = NULL;
+	PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC_MT GetActiveSubroutineUniformName = NULL;
+	PFNGLGETACTIVESUBROUTINENAMEPROC_MT GetActiveSubroutineName = NULL;
+	PFNGLUNIFORMSUBROUTINESUIVPROC_MT UniformSubroutinesuiv = NULL;
+	PFNGLGETUNIFORMSUBROUTINEUIVPROC_MT GetUniformSubroutineuiv = NULL;
+	PFNGLGETPROGRAMSTAGEIVPROC_MT GetProgramStageiv = NULL;
+	PFNGLPATCHPARAMETERIPROC_MT PatchParameteri = NULL;
+	PFNGLPATCHPARAMETERFVPROC_MT PatchParameterfv = NULL;
+	PFNGLBINDTRANSFORMFEEDBACKPROC_MT BindTransformFeedback = NULL;
+	PFNGLDELETETRANSFORMFEEDBACKSPROC_MT DeleteTransformFeedbacks = NULL;
+	PFNGLGENTRANSFORMFEEDBACKSPROC_MT GenTransformFeedbacks = NULL;
+	PFNGLISTRANSFORMFEEDBACKPROC_MT IsTransformFeedback = NULL;
+	PFNGLPAUSETRANSFORMFEEDBACKPROC_MT PauseTransformFeedback = NULL;
+	PFNGLRESUMETRANSFORMFEEDBACKPROC_MT ResumeTransformFeedback = NULL;
+	PFNGLDRAWTRANSFORMFEEDBACKPROC_MT DrawTransformFeedback = NULL;
+	PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC_MT DrawTransformFeedbackStream = NULL;
+	PFNGLBEGINQUERYINDEXEDPROC_MT BeginQueryIndexed = NULL;
+	PFNGLENDQUERYINDEXEDPROC_MT EndQueryIndexed = NULL;
+	PFNGLGETQUERYINDEXEDIVPROC_MT GetQueryIndexediv = NULL;
+	PFNGLRELEASESHADERCOMPILERPROC_MT ReleaseShaderCompiler = NULL;
+	PFNGLSHADERBINARYPROC_MT ShaderBinary = NULL;
+	PFNGLGETSHADERPRECISIONFORMATPROC_MT GetShaderPrecisionFormat = NULL;
+	PFNGLDEPTHRANGEFPROC_MT DepthRangef = NULL;
+	PFNGLCLEARDEPTHFPROC_MT ClearDepthf = NULL;
+	PFNGLGETPROGRAMBINARYPROC_MT GetProgramBinary = NULL;
+	PFNGLPROGRAMBINARYPROC_MT ProgramBinary = NULL;
+	PFNGLPROGRAMPARAMETERIPROC_MT ProgramParameteri = NULL;
+	PFNGLUSEPROGRAMSTAGESPROC_MT UseProgramStages = NULL;
+	PFNGLACTIVESHADERPROGRAMPROC_MT ActiveShaderProgram = NULL;
+	PFNGLCREATESHADERPROGRAMVPROC_MT CreateShaderProgramv = NULL;
+	PFNGLBINDPROGRAMPIPELINEPROC_MT BindProgramPipeline = NULL;
+	PFNGLDELETEPROGRAMPIPELINESPROC_MT DeleteProgramPipelines = NULL;
+	PFNGLGENPROGRAMPIPELINESPROC_MT GenProgramPipelines = NULL;
+	PFNGLISPROGRAMPIPELINEPROC_MT IsProgramPipeline = NULL;
+	PFNGLGETPROGRAMPIPELINEIVPROC_MT GetProgramPipelineiv = NULL;
+	PFNGLPROGRAMUNIFORM1IPROC_MT ProgramUniform1i = NULL;
+	PFNGLPROGRAMUNIFORM1IVPROC_MT ProgramUniform1iv = NULL;
+	PFNGLPROGRAMUNIFORM1FPROC_MT ProgramUniform1f = NULL;
+	PFNGLPROGRAMUNIFORM1FVPROC_MT ProgramUniform1fv = NULL;
+	PFNGLPROGRAMUNIFORM1DPROC_MT ProgramUniform1d = NULL;
+	PFNGLPROGRAMUNIFORM1DVPROC_MT ProgramUniform1dv = NULL;
+	PFNGLPROGRAMUNIFORM1UIPROC_MT ProgramUniform1ui = NULL;
+	PFNGLPROGRAMUNIFORM1UIVPROC_MT ProgramUniform1uiv = NULL;
+	PFNGLPROGRAMUNIFORM2IPROC_MT ProgramUniform2i = NULL;
+	PFNGLPROGRAMUNIFORM2IVPROC_MT ProgramUniform2iv = NULL;
+	PFNGLPROGRAMUNIFORM2FPROC_MT ProgramUniform2f = NULL;
+	PFNGLPROGRAMUNIFORM2FVPROC_MT ProgramUniform2fv = NULL;
+	PFNGLPROGRAMUNIFORM2DPROC_MT ProgramUniform2d = NULL;
+	PFNGLPROGRAMUNIFORM2DVPROC_MT ProgramUniform2dv = NULL;
+	PFNGLPROGRAMUNIFORM2UIPROC_MT ProgramUniform2ui = NULL;
+	PFNGLPROGRAMUNIFORM2UIVPROC_MT ProgramUniform2uiv = NULL;
+	PFNGLPROGRAMUNIFORM3IPROC_MT ProgramUniform3i = NULL;
+	PFNGLPROGRAMUNIFORM3IVPROC_MT ProgramUniform3iv = NULL;
+	PFNGLPROGRAMUNIFORM3FPROC_MT ProgramUniform3f = NULL;
+	PFNGLPROGRAMUNIFORM3FVPROC_MT ProgramUniform3fv = NULL;
+	PFNGLPROGRAMUNIFORM3DPROC_MT ProgramUniform3d = NULL;
+	PFNGLPROGRAMUNIFORM3DVPROC_MT ProgramUniform3dv = NULL;
+	PFNGLPROGRAMUNIFORM3UIPROC_MT ProgramUniform3ui = NULL;
+	PFNGLPROGRAMUNIFORM3UIVPROC_MT ProgramUniform3uiv = NULL;
+	PFNGLPROGRAMUNIFORM4IPROC_MT ProgramUniform4i = NULL;
+	PFNGLPROGRAMUNIFORM4IVPROC_MT ProgramUniform4iv = NULL;
+	PFNGLPROGRAMUNIFORM4FPROC_MT ProgramUniform4f = NULL;
+	PFNGLPROGRAMUNIFORM4FVPROC_MT ProgramUniform4fv = NULL;
+	PFNGLPROGRAMUNIFORM4DPROC_MT ProgramUniform4d = NULL;
+	PFNGLPROGRAMUNIFORM4DVPROC_MT ProgramUniform4dv = NULL;
+	PFNGLPROGRAMUNIFORM4UIPROC_MT ProgramUniform4ui = NULL;
+	PFNGLPROGRAMUNIFORM4UIVPROC_MT ProgramUniform4uiv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2FVPROC_MT ProgramUniformMatrix2fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3FVPROC_MT ProgramUniformMatrix3fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4FVPROC_MT ProgramUniformMatrix4fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2DVPROC_MT ProgramUniformMatrix2dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3DVPROC_MT ProgramUniformMatrix3dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4DVPROC_MT ProgramUniformMatrix4dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC_MT ProgramUniformMatrix2x3fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC_MT ProgramUniformMatrix3x2fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC_MT ProgramUniformMatrix2x4fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC_MT ProgramUniformMatrix4x2fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC_MT ProgramUniformMatrix3x4fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC_MT ProgramUniformMatrix4x3fv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC_MT ProgramUniformMatrix2x3dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC_MT ProgramUniformMatrix3x2dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC_MT ProgramUniformMatrix2x4dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC_MT ProgramUniformMatrix4x2dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC_MT ProgramUniformMatrix3x4dv = NULL;
+	PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC_MT ProgramUniformMatrix4x3dv = NULL;
+	PFNGLVALIDATEPROGRAMPIPELINEPROC_MT ValidateProgramPipeline = NULL;
+	PFNGLGETPROGRAMPIPELINEINFOLOGPROC_MT GetProgramPipelineInfoLog = NULL;
+	PFNGLVERTEXATTRIBL1DPROC_MT VertexAttribL1d = NULL;
+	PFNGLVERTEXATTRIBL2DPROC_MT VertexAttribL2d = NULL;
+	PFNGLVERTEXATTRIBL3DPROC_MT VertexAttribL3d = NULL;
+	PFNGLVERTEXATTRIBL4DPROC_MT VertexAttribL4d = NULL;
+	PFNGLVERTEXATTRIBL1DVPROC_MT VertexAttribL1dv = NULL;
+	PFNGLVERTEXATTRIBL2DVPROC_MT VertexAttribL2dv = NULL;
+	PFNGLVERTEXATTRIBL3DVPROC_MT VertexAttribL3dv = NULL;
+	PFNGLVERTEXATTRIBL4DVPROC_MT VertexAttribL4dv = NULL;
+	PFNGLVERTEXATTRIBLPOINTERPROC_MT VertexAttribLPointer = NULL;
+	PFNGLGETVERTEXATTRIBLDVPROC_MT GetVertexAttribLdv = NULL;
+	PFNGLVIEWPORTARRAYVPROC_MT ViewportArrayv = NULL;
+	PFNGLVIEWPORTINDEXEDFPROC_MT ViewportIndexedf = NULL;
+	PFNGLVIEWPORTINDEXEDFVPROC_MT ViewportIndexedfv = NULL;
+	PFNGLSCISSORARRAYVPROC_MT ScissorArrayv = NULL;
+	PFNGLSCISSORINDEXEDPROC_MT ScissorIndexed = NULL;
+	PFNGLSCISSORINDEXEDVPROC_MT ScissorIndexedv = NULL;
+	PFNGLDEPTHRANGEARRAYVPROC_MT DepthRangeArrayv = NULL;
+	PFNGLDEPTHRANGEINDEXEDPROC_MT DepthRangeIndexed = NULL;
+	PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC_MT DrawArraysInstancedBaseInstance = NULL;
+	PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC_MT DrawElementsInstancedBaseInstance = NULL;
+	PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC_MT DrawElementsInstancedBaseVertexBaseInstance = NULL;
+	PFNGLGETINTERNALFORMATIVPROC_MT GetInternalformativ = NULL;
+	PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC_MT GetActiveAtomicCounterBufferiv = NULL;
+	PFNGLBINDIMAGETEXTUREPROC_MT BindImageTexture = NULL;
+	PFNGLMEMORYBARRIERPROC_MT MemoryBarrier = NULL;
+	PFNGLTEXSTORAGE1DPROC_MT TexStorage1D = NULL;
+	PFNGLTEXSTORAGE2DPROC_MT TexStorage2D = NULL;
+	PFNGLTEXSTORAGE3DPROC_MT TexStorage3D = NULL;
+	PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC_MT DrawTransformFeedbackInstanced = NULL;
+	PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC_MT DrawTransformFeedbackStreamInstanced = NULL;
+	PFNGLCLEARBUFFERDATAPROC_MT ClearBufferData = NULL;
+	PFNGLCLEARBUFFERSUBDATAPROC_MT ClearBufferSubData = NULL;
+	PFNGLDISPATCHCOMPUTEPROC_MT DispatchCompute = NULL;
+	PFNGLDISPATCHCOMPUTEINDIRECTPROC_MT DispatchComputeIndirect = NULL;
+	PFNGLCOPYIMAGESUBDATAPROC_MT CopyImageSubData = NULL;
+	PFNGLFRAMEBUFFERPARAMETERIPROC_MT FramebufferParameteri = NULL;
+	PFNGLGETFRAMEBUFFERPARAMETERIVPROC_MT GetFramebufferParameteriv = NULL;
+	PFNGLGETINTERNALFORMATI64VPROC_MT GetInternalformati64v = NULL;
+	PFNGLINVALIDATETEXSUBIMAGEPROC_MT InvalidateTexSubImage = NULL;
+	PFNGLINVALIDATETEXIMAGEPROC_MT InvalidateTexImage = NULL;
+	PFNGLINVALIDATEBUFFERSUBDATAPROC_MT InvalidateBufferSubData = NULL;
+	PFNGLINVALIDATEBUFFERDATAPROC_MT InvalidateBufferData = NULL;
+	PFNGLINVALIDATEFRAMEBUFFERPROC_MT InvalidateFramebuffer = NULL;
+	PFNGLINVALIDATESUBFRAMEBUFFERPROC_MT InvalidateSubFramebuffer = NULL;
+	PFNGLMULTIDRAWARRAYSINDIRECTPROC_MT MultiDrawArraysIndirect = NULL;
+	PFNGLMULTIDRAWELEMENTSINDIRECTPROC_MT MultiDrawElementsIndirect = NULL;
+	PFNGLGETPROGRAMINTERFACEIVPROC_MT GetProgramInterfaceiv = NULL;
+	PFNGLGETPROGRAMRESOURCEINDEXPROC_MT GetProgramResourceIndex = NULL;
+	PFNGLGETPROGRAMRESOURCENAMEPROC_MT GetProgramResourceName = NULL;
+	PFNGLGETPROGRAMRESOURCEIVPROC_MT GetProgramResourceiv = NULL;
+	PFNGLGETPROGRAMRESOURCELOCATIONPROC_MT GetProgramResourceLocation = NULL;
+	PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC_MT GetProgramResourceLocationIndex = NULL;
+	PFNGLSHADERSTORAGEBLOCKBINDINGPROC_MT ShaderStorageBlockBinding = NULL;
+	PFNGLTEXBUFFERRANGEPROC_MT TexBufferRange = NULL;
+	PFNGLTEXSTORAGE2DMULTISAMPLEPROC_MT TexStorage2DMultisample = NULL;
+	PFNGLTEXSTORAGE3DMULTISAMPLEPROC_MT TexStorage3DMultisample = NULL;
+	PFNGLTEXTUREVIEWPROC_MT TextureView = NULL;
+	PFNGLBINDVERTEXBUFFERPROC_MT BindVertexBuffer = NULL;
+	PFNGLVERTEXATTRIBFORMATPROC_MT VertexAttribFormat = NULL;
+	PFNGLVERTEXATTRIBIFORMATPROC_MT VertexAttribIFormat = NULL;
+	PFNGLVERTEXATTRIBLFORMATPROC_MT VertexAttribLFormat = NULL;
+	PFNGLVERTEXATTRIBBINDINGPROC_MT VertexAttribBinding = NULL;
+	PFNGLVERTEXBINDINGDIVISORPROC_MT VertexBindingDivisor = NULL;
+	PFNGLDEBUGMESSAGECONTROLPROC_MT DebugMessageControl = NULL;
+	PFNGLDEBUGMESSAGEINSERTPROC_MT DebugMessageInsert = NULL;
+	PFNGLDEBUGMESSAGECALLBACKPROC_MT DebugMessageCallback = NULL;
+	PFNGLGETDEBUGMESSAGELOGPROC_MT GetDebugMessageLog = NULL;
+	PFNGLPUSHDEBUGGROUPPROC_MT PushDebugGroup = NULL;
+	PFNGLPOPDEBUGGROUPPROC_MT PopDebugGroup = NULL;
+	PFNGLOBJECTLABELPROC_MT ObjectLabel = NULL;
+	PFNGLGETOBJECTLABELPROC_MT GetObjectLabel = NULL;
+	PFNGLOBJECTPTRLABELPROC_MT ObjectPtrLabel = NULL;
+	PFNGLGETOBJECTPTRLABELPROC_MT GetObjectPtrLabel = NULL;
+	PFNGLBUFFERSTORAGEPROC_MT BufferStorage = NULL;
+	PFNGLCLEARTEXIMAGEPROC_MT ClearTexImage = NULL;
+	PFNGLCLEARTEXSUBIMAGEPROC_MT ClearTexSubImage = NULL;
+	PFNGLBINDBUFFERSBASEPROC_MT BindBuffersBase = NULL;
+	PFNGLBINDBUFFERSRANGEPROC_MT BindBuffersRange = NULL;
+	PFNGLBINDTEXTURESPROC_MT BindTextures = NULL;
+	PFNGLBINDSAMPLERSPROC_MT BindSamplers = NULL;
+	PFNGLBINDIMAGETEXTURESPROC_MT BindImageTextures = NULL;
+	PFNGLBINDVERTEXBUFFERSPROC_MT BindVertexBuffers = NULL;
+	PFNGLCLIPCONTROLPROC_MT ClipControl = NULL;
+	PFNGLCREATETRANSFORMFEEDBACKSPROC_MT CreateTransformFeedbacks = NULL;
+	PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC_MT TransformFeedbackBufferBase = NULL;
+	PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC_MT TransformFeedbackBufferRange = NULL;
+	PFNGLGETTRANSFORMFEEDBACKIVPROC_MT GetTransformFeedbackiv = NULL;
+	PFNGLCREATEBUFFERSPROC_MT CreateBuffers = NULL;
+	PFNGLNAMEDBUFFERSTORAGEPROC_MT NamedBufferStorage = NULL;
+	PFNGLNAMEDBUFFERDATAPROC_MT NamedBufferData = NULL;
+	PFNGLNAMEDBUFFERSUBDATAPROC_MT NamedBufferSubData = NULL;
+	PFNGLCOPYNAMEDBUFFERSUBDATAPROC_MT CopyNamedBufferSubData = NULL;
+	PFNGLCLEARNAMEDBUFFERDATAPROC_MT ClearNamedBufferData = NULL;
+	PFNGLCLEARNAMEDBUFFERSUBDATAPROC_MT ClearNamedBufferSubData = NULL;
+	PFNGLMAPNAMEDBUFFERPROC_MT MapNamedBuffer = NULL;
+	PFNGLMAPNAMEDBUFFERRANGEPROC_MT MapNamedBufferRange = NULL;
+	PFNGLUNMAPNAMEDBUFFERPROC_MT UnmapNamedBuffer = NULL;
+	PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC_MT FlushMappedNamedBufferRange = NULL;
+	PFNGLGETNAMEDBUFFERPARAMETERIVPROC_MT GetNamedBufferParameteriv = NULL;
+	PFNGLGETNAMEDBUFFERPARAMETERI64VPROC_MT GetNamedBufferParameteri64v = NULL;
+	PFNGLGETNAMEDBUFFERPOINTERVPROC_MT GetNamedBufferPointerv = NULL;
+	PFNGLGETNAMEDBUFFERSUBDATAPROC_MT GetNamedBufferSubData = NULL;
+	PFNGLCREATEFRAMEBUFFERSPROC_MT CreateFramebuffers = NULL;
+	PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC_MT NamedFramebufferRenderbuffer = NULL;
+	PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC_MT NamedFramebufferParameteri = NULL;
+	PFNGLNAMEDFRAMEBUFFERTEXTUREPROC_MT NamedFramebufferTexture = NULL;
+	PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC_MT NamedFramebufferTextureLayer = NULL;
+	PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC_MT NamedFramebufferDrawBuffer = NULL;
+	PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC_MT NamedFramebufferDrawBuffers = NULL;
+	PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC_MT NamedFramebufferReadBuffer = NULL;
+	PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC_MT InvalidateNamedFramebufferData = NULL;
+	PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC_MT InvalidateNamedFramebufferSubData = NULL;
+	PFNGLCLEARNAMEDFRAMEBUFFERIVPROC_MT ClearNamedFramebufferiv = NULL;
+	PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC_MT ClearNamedFramebufferuiv = NULL;
+	PFNGLCLEARNAMEDFRAMEBUFFERFVPROC_MT ClearNamedFramebufferfv = NULL;
+	PFNGLCLEARNAMEDFRAMEBUFFERFIPROC_MT ClearNamedFramebufferfi = NULL;
+	PFNGLBLITNAMEDFRAMEBUFFERPROC_MT BlitNamedFramebuffer = NULL;
+	PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC_MT CheckNamedFramebufferStatus = NULL;
+	PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC_MT GetNamedFramebufferParameteriv = NULL;
+	PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT GetNamedFramebufferAttachmentParameteriv = NULL;
+	PFNGLCREATERENDERBUFFERSPROC_MT CreateRenderbuffers = NULL;
+	PFNGLNAMEDRENDERBUFFERSTORAGEPROC_MT NamedRenderbufferStorage = NULL;
+	PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT NamedRenderbufferStorageMultisample = NULL;
+	PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC_MT GetNamedRenderbufferParameteriv = NULL;
+	PFNGLCREATETEXTURESPROC_MT CreateTextures = NULL;
+	PFNGLTEXTUREBUFFERPROC_MT TextureBuffer = NULL;
+	PFNGLTEXTUREBUFFERRANGEPROC_MT TextureBufferRange = NULL;
+	PFNGLTEXTURESTORAGE1DPROC_MT TextureStorage1D = NULL;
+	PFNGLTEXTURESTORAGE2DPROC_MT TextureStorage2D = NULL;
+	PFNGLTEXTURESTORAGE3DPROC_MT TextureStorage3D = NULL;
+	PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC_MT TextureStorage2DMultisample = NULL;
+	PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC_MT TextureStorage3DMultisample = NULL;
+	PFNGLTEXTURESUBIMAGE1DPROC_MT TextureSubImage1D = NULL;
+	PFNGLTEXTURESUBIMAGE2DPROC_MT TextureSubImage2D = NULL;
+	PFNGLTEXTURESUBIMAGE3DPROC_MT TextureSubImage3D = NULL;
+	PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC_MT CompressedTextureSubImage1D = NULL;
+	PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC_MT CompressedTextureSubImage2D = NULL;
+	PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC_MT CompressedTextureSubImage3D = NULL;
+	PFNGLCOPYTEXTURESUBIMAGE1DPROC_MT CopyTextureSubImage1D = NULL;
+	PFNGLCOPYTEXTURESUBIMAGE2DPROC_MT CopyTextureSubImage2D = NULL;
+	PFNGLCOPYTEXTURESUBIMAGE3DPROC_MT CopyTextureSubImage3D = NULL;
+	PFNGLTEXTUREPARAMETERFPROC_MT TextureParameterf = NULL;
+	PFNGLTEXTUREPARAMETERFVPROC_MT TextureParameterfv = NULL;
+	PFNGLTEXTUREPARAMETERIPROC_MT TextureParameteri = NULL;
+	PFNGLTEXTUREPARAMETERIIVPROC_MT TextureParameterIiv = NULL;
+	PFNGLTEXTUREPARAMETERIUIVPROC_MT TextureParameterIuiv = NULL;
+	PFNGLTEXTUREPARAMETERIVPROC_MT TextureParameteriv = NULL;
+	PFNGLGENERATETEXTUREMIPMAPPROC_MT GenerateTextureMipmap = NULL;
+	PFNGLBINDTEXTUREUNITPROC_MT BindTextureUnit = NULL;
+	PFNGLGETTEXTUREIMAGEPROC_MT GetTextureImage = NULL;
+	PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC_MT GetCompressedTextureImage = NULL;
+	PFNGLGETTEXTURELEVELPARAMETERFVPROC_MT GetTextureLevelParameterfv = NULL;
+	PFNGLGETTEXTURELEVELPARAMETERIVPROC_MT GetTextureLevelParameteriv = NULL;
+	PFNGLGETTEXTUREPARAMETERFVPROC_MT GetTextureParameterfv = NULL;
+	PFNGLGETTEXTUREPARAMETERIIVPROC_MT GetTextureParameterIiv = NULL;
+	PFNGLGETTEXTUREPARAMETERIUIVPROC_MT GetTextureParameterIuiv = NULL;
+	PFNGLGETTEXTUREPARAMETERIVPROC_MT GetTextureParameteriv = NULL;
+	PFNGLCREATEVERTEXARRAYSPROC_MT CreateVertexArrays = NULL;
+	PFNGLDISABLEVERTEXARRAYATTRIBPROC_MT DisableVertexArrayAttrib = NULL;
+	PFNGLENABLEVERTEXARRAYATTRIBPROC_MT EnableVertexArrayAttrib = NULL;
+	PFNGLVERTEXARRAYELEMENTBUFFERPROC_MT VertexArrayElementBuffer = NULL;
+	PFNGLVERTEXARRAYVERTEXBUFFERPROC_MT VertexArrayVertexBuffer = NULL;
+	PFNGLVERTEXARRAYVERTEXBUFFERSPROC_MT VertexArrayVertexBuffers = NULL;
+	PFNGLVERTEXARRAYATTRIBBINDINGPROC_MT VertexArrayAttribBinding = NULL;
+	PFNGLVERTEXARRAYATTRIBFORMATPROC_MT VertexArrayAttribFormat = NULL;
+	PFNGLVERTEXARRAYATTRIBIFORMATPROC_MT VertexArrayAttribIFormat = NULL;
+	PFNGLVERTEXARRAYATTRIBLFORMATPROC_MT VertexArrayAttribLFormat = NULL;
+	PFNGLVERTEXARRAYBINDINGDIVISORPROC_MT VertexArrayBindingDivisor = NULL;
+	PFNGLGETVERTEXARRAYIVPROC_MT GetVertexArrayiv = NULL;
+	PFNGLGETVERTEXARRAYINDEXEDIVPROC_MT GetVertexArrayIndexediv = NULL;
+	PFNGLGETVERTEXARRAYINDEXED64IVPROC_MT GetVertexArrayIndexed64iv = NULL;
+	PFNGLCREATESAMPLERSPROC_MT CreateSamplers = NULL;
+	PFNGLCREATEPROGRAMPIPELINESPROC_MT CreateProgramPipelines = NULL;
+	PFNGLCREATEQUERIESPROC_MT CreateQueries = NULL;
+	PFNGLGETQUERYBUFFEROBJECTI64VPROC_MT GetQueryBufferObjecti64v = NULL;
+	PFNGLGETQUERYBUFFEROBJECTIVPROC_MT GetQueryBufferObjectiv = NULL;
+	PFNGLGETQUERYBUFFEROBJECTUI64VPROC_MT GetQueryBufferObjectui64v = NULL;
+	PFNGLGETQUERYBUFFEROBJECTUIVPROC_MT GetQueryBufferObjectuiv = NULL;
+	PFNGLMEMORYBARRIERBYREGIONPROC_MT MemoryBarrierByRegion = NULL;
+	PFNGLGETTEXTURESUBIMAGEPROC_MT GetTextureSubImage = NULL;
+	PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC_MT GetCompressedTextureSubImage = NULL;
+	PFNGLGETGRAPHICSRESETSTATUSPROC_MT GetGraphicsResetStatus = NULL;
+	PFNGLGETNCOMPRESSEDTEXIMAGEPROC_MT GetnCompressedTexImage = NULL;
+	PFNGLGETNTEXIMAGEPROC_MT GetnTexImage = NULL;
+	PFNGLGETNUNIFORMDVPROC_MT GetnUniformdv = NULL;
+	PFNGLGETNUNIFORMFVPROC_MT GetnUniformfv = NULL;
+	PFNGLGETNUNIFORMIVPROC_MT GetnUniformiv = NULL;
+	PFNGLGETNUNIFORMUIVPROC_MT GetnUniformuiv = NULL;
+	PFNGLREADNPIXELSPROC_MT ReadnPixels = NULL;
+	PFNGLTEXTUREBARRIERPROC_MT TextureBarrier = NULL;
+	PFNGLSPECIALIZESHADERPROC_MT SpecializeShader = NULL;
+	PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC_MT MultiDrawArraysIndirectCount = NULL;
+	PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC_MT MultiDrawElementsIndirectCount = NULL;
+	PFNGLPOLYGONOFFSETCLAMPPROC_MT PolygonOffsetClamp = NULL;
+	PFNGLPRIMITIVEBOUNDINGBOXPROC_MT PrimitiveBoundingBox = NULL;
+	PFNGLGETTEXTUREHANDLEPROC_MT GetTextureHandle = NULL;
+	PFNGLGETTEXTURESAMPLERHANDLEPROC_MT GetTextureSamplerHandle = NULL;
+	PFNGLMAKETEXTUREHANDLERESIDENTPROC_MT MakeTextureHandleResident = NULL;
+	PFNGLMAKETEXTUREHANDLENONRESIDENTPROC_MT MakeTextureHandleNonResident = NULL;
+	PFNGLGETIMAGEHANDLEPROC_MT GetImageHandle = NULL;
+	PFNGLMAKEIMAGEHANDLERESIDENTPROC_MT MakeImageHandleResident = NULL;
+	PFNGLMAKEIMAGEHANDLENONRESIDENTPROC_MT MakeImageHandleNonResident = NULL;
+	PFNGLUNIFORMHANDLEUI64PROC_MT UniformHandleui64 = NULL;
+	PFNGLUNIFORMHANDLEUI64VPROC_MT UniformHandleui64v = NULL;
+	PFNGLPROGRAMUNIFORMHANDLEUI64PROC_MT ProgramUniformHandleui64 = NULL;
+	PFNGLPROGRAMUNIFORMHANDLEUI64VPROC_MT ProgramUniformHandleui64v = NULL;
+	PFNGLISTEXTUREHANDLERESIDENTPROC_MT IsTextureHandleResident = NULL;
+	PFNGLISIMAGEHANDLERESIDENTPROC_MT IsImageHandleResident = NULL;
+	PFNGLVERTEXATTRIBL1UI64PROC_MT VertexAttribL1ui64 = NULL;
+	PFNGLVERTEXATTRIBL1UI64VPROC_MT VertexAttribL1ui64v = NULL;
+	PFNGLGETVERTEXATTRIBLUI64VPROC_MT GetVertexAttribLui64v = NULL;
+	PFNGLCREATESYNCFROMCLEVENTPROC_MT CreateSyncFromCLevent = NULL;
+	PFNGLDISPATCHCOMPUTEGROUPSIZEPROC_MT DispatchComputeGroupSize = NULL;
+	PFNGLFRAMEBUFFERTEXTUREFACEPROC_MT FramebufferTextureFace = NULL;
+	PFNGLUNIFORM1I64PROC_MT Uniform1i64 = NULL;
+	PFNGLUNIFORM2I64PROC_MT Uniform2i64 = NULL;
+	PFNGLUNIFORM3I64PROC_MT Uniform3i64 = NULL;
+	PFNGLUNIFORM4I64PROC_MT Uniform4i64 = NULL;
+	PFNGLUNIFORM1I64VPROC_MT Uniform1i64v = NULL;
+	PFNGLUNIFORM2I64VPROC_MT Uniform2i64v = NULL;
+	PFNGLUNIFORM3I64VPROC_MT Uniform3i64v = NULL;
+	PFNGLUNIFORM4I64VPROC_MT Uniform4i64v = NULL;
+	PFNGLUNIFORM1UI64PROC_MT Uniform1ui64 = NULL;
+	PFNGLUNIFORM2UI64PROC_MT Uniform2ui64 = NULL;
+	PFNGLUNIFORM3UI64PROC_MT Uniform3ui64 = NULL;
+	PFNGLUNIFORM4UI64PROC_MT Uniform4ui64 = NULL;
+	PFNGLUNIFORM1UI64VPROC_MT Uniform1ui64v = NULL;
+	PFNGLUNIFORM2UI64VPROC_MT Uniform2ui64v = NULL;
+	PFNGLUNIFORM3UI64VPROC_MT Uniform3ui64v = NULL;
+	PFNGLUNIFORM4UI64VPROC_MT Uniform4ui64v = NULL;
+	PFNGLGETUNIFORMI64VPROC_MT GetUniformi64v = NULL;
+	PFNGLGETUNIFORMUI64VPROC_MT GetUniformui64v = NULL;
+	PFNGLGETNUNIFORMI64VPROC_MT GetnUniformi64v = NULL;
+	PFNGLGETNUNIFORMUI64VPROC_MT GetnUniformui64v = NULL;
+	PFNGLPROGRAMUNIFORM1I64PROC_MT ProgramUniform1i64 = NULL;
+	PFNGLPROGRAMUNIFORM2I64PROC_MT ProgramUniform2i64 = NULL;
+	PFNGLPROGRAMUNIFORM3I64PROC_MT ProgramUniform3i64 = NULL;
+	PFNGLPROGRAMUNIFORM4I64PROC_MT ProgramUniform4i64 = NULL;
+	PFNGLPROGRAMUNIFORM1I64VPROC_MT ProgramUniform1i64v = NULL;
+	PFNGLPROGRAMUNIFORM2I64VPROC_MT ProgramUniform2i64v = NULL;
+	PFNGLPROGRAMUNIFORM3I64VPROC_MT ProgramUniform3i64v = NULL;
+	PFNGLPROGRAMUNIFORM4I64VPROC_MT ProgramUniform4i64v = NULL;
+	PFNGLPROGRAMUNIFORM1UI64PROC_MT ProgramUniform1ui64 = NULL;
+	PFNGLPROGRAMUNIFORM2UI64PROC_MT ProgramUniform2ui64 = NULL;
+	PFNGLPROGRAMUNIFORM3UI64PROC_MT ProgramUniform3ui64 = NULL;
+	PFNGLPROGRAMUNIFORM4UI64PROC_MT ProgramUniform4ui64 = NULL;
+	PFNGLPROGRAMUNIFORM1UI64VPROC_MT ProgramUniform1ui64v = NULL;
+	PFNGLPROGRAMUNIFORM2UI64VPROC_MT ProgramUniform2ui64v = NULL;
+	PFNGLPROGRAMUNIFORM3UI64VPROC_MT ProgramUniform3ui64v = NULL;
+	PFNGLPROGRAMUNIFORM4UI64VPROC_MT ProgramUniform4ui64v = NULL;
+	PFNGLMAXSHADERCOMPILERTHREADSPROC_MT MaxShaderCompilerThreads = NULL;
+	PFNGLFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT FramebufferSampleLocationsfv = NULL;
+	PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT NamedFramebufferSampleLocationsfv = NULL;
+	PFNGLEVALUATEDEPTHVALUESPROC_MT EvaluateDepthValues = NULL;
+	PFNGLNAMEDSTRINGPROC_MT NamedString = NULL;
+	PFNGLDELETENAMEDSTRINGPROC_MT DeleteNamedString = NULL;
+	PFNGLCOMPILESHADERINCLUDEPROC_MT CompileShaderInclude = NULL;
+	PFNGLISNAMEDSTRINGPROC_MT IsNamedString = NULL;
+	PFNGLGETNAMEDSTRINGPROC_MT GetNamedString = NULL;
+	PFNGLGETNAMEDSTRINGIVPROC_MT GetNamedStringiv = NULL;
+	PFNGLBUFFERPAGECOMMITMENTPROC_MT BufferPageCommitment = NULL;
+	PFNGLNAMEDBUFFERPAGECOMMITMENTPROC_MT NamedBufferPageCommitment = NULL;
+	PFNGLTEXPAGECOMMITMENTPROC_MT TexPageCommitment = NULL;
+
+	static constexpr const GLenum DEPTH_BUFFER_BIT = 0x00000100;
+	static constexpr const GLenum STENCIL_BUFFER_BIT = 0x00000400;
+	static constexpr const GLenum COLOR_BUFFER_BIT = 0x00004000;
+	static constexpr const GLenum POINTS = 0x0000;
+	static constexpr const GLenum LINES = 0x0001;
+	static constexpr const GLenum LINE_LOOP = 0x0002;
+	static constexpr const GLenum LINE_STRIP = 0x0003;
+	static constexpr const GLenum TRIANGLES = 0x0004;
+	static constexpr const GLenum TRIANGLE_STRIP = 0x0005;
+	static constexpr const GLenum TRIANGLE_FAN = 0x0006;
+	static constexpr const GLenum QUADS = 0x0007;
+	static constexpr const GLenum NEVER = 0x0200;
+	static constexpr const GLenum LESS = 0x0201;
+	static constexpr const GLenum EQUAL = 0x0202;
+	static constexpr const GLenum LEQUAL = 0x0203;
+	static constexpr const GLenum GREATER = 0x0204;
+	static constexpr const GLenum NOTEQUAL = 0x0205;
+	static constexpr const GLenum GEQUAL = 0x0206;
+	static constexpr const GLenum ALWAYS = 0x0207;
+	static constexpr const GLenum SRC_COLOR = 0x0300;
+	static constexpr const GLenum ONE_MINUS_SRC_COLOR = 0x0301;
+	static constexpr const GLenum SRC_ALPHA = 0x0302;
+	static constexpr const GLenum ONE_MINUS_SRC_ALPHA = 0x0303;
+	static constexpr const GLenum DST_ALPHA = 0x0304;
+	static constexpr const GLenum ONE_MINUS_DST_ALPHA = 0x0305;
+	static constexpr const GLenum DST_COLOR = 0x0306;
+	static constexpr const GLenum ONE_MINUS_DST_COLOR = 0x0307;
+	static constexpr const GLenum SRC_ALPHA_SATURATE = 0x0308;
+	static constexpr const GLenum FRONT_LEFT = 0x0400;
+	static constexpr const GLenum FRONT_RIGHT = 0x0401;
+	static constexpr const GLenum BACK_LEFT = 0x0402;
+	static constexpr const GLenum BACK_RIGHT = 0x0403;
+	static constexpr const GLenum FRONT = 0x0404;
+	static constexpr const GLenum BACK = 0x0405;
+	static constexpr const GLenum LEFT = 0x0406;
+	static constexpr const GLenum RIGHT = 0x0407;
+	static constexpr const GLenum FRONT_AND_BACK = 0x0408;
+	static constexpr const GLenum INVALID_ENUM = 0x0500;
+	static constexpr const GLenum INVALID_VALUE = 0x0501;
+	static constexpr const GLenum INVALID_OPERATION = 0x0502;
+	static constexpr const GLenum OUT_OF_MEMORY = 0x0505;
+	static constexpr const GLenum CW = 0x0900;
+	static constexpr const GLenum CCW = 0x0901;
+	static constexpr const GLenum POINT_SIZE = 0x0B11;
+	static constexpr const GLenum POINT_SIZE_RANGE = 0x0B12;
+	static constexpr const GLenum POINT_SIZE_GRANULARITY = 0x0B13;
+	static constexpr const GLenum LINE_SMOOTH = 0x0B20;
+	static constexpr const GLenum LINE_WIDTH = 0x0B21;
+	static constexpr const GLenum LINE_WIDTH_RANGE = 0x0B22;
+	static constexpr const GLenum LINE_WIDTH_GRANULARITY = 0x0B23;
+	static constexpr const GLenum POLYGON_MODE = 0x0B40;
+	static constexpr const GLenum POLYGON_SMOOTH = 0x0B41;
+	static constexpr const GLenum CULL_FACE = 0x0B44;
+	static constexpr const GLenum CULL_FACE_MODE = 0x0B45;
+	static constexpr const GLenum FRONT_FACE = 0x0B46;
+	static constexpr const GLenum DEPTH_RANGE = 0x0B70;
+	static constexpr const GLenum DEPTH_TEST = 0x0B71;
+	static constexpr const GLenum DEPTH_WRITEMASK = 0x0B72;
+	static constexpr const GLenum DEPTH_CLEAR_VALUE = 0x0B73;
+	static constexpr const GLenum DEPTH_FUNC = 0x0B74;
+	static constexpr const GLenum STENCIL_TEST = 0x0B90;
+	static constexpr const GLenum STENCIL_CLEAR_VALUE = 0x0B91;
+	static constexpr const GLenum STENCIL_FUNC = 0x0B92;
+	static constexpr const GLenum STENCIL_VALUE_MASK = 0x0B93;
+	static constexpr const GLenum STENCIL_FAIL = 0x0B94;
+	static constexpr const GLenum STENCIL_PASS_DEPTH_FAIL = 0x0B95;
+	static constexpr const GLenum STENCIL_PASS_DEPTH_PASS = 0x0B96;
+	static constexpr const GLenum STENCIL_REF = 0x0B97;
+	static constexpr const GLenum STENCIL_WRITEMASK = 0x0B98;
+	static constexpr const GLenum VIEWPORT = 0x0BA2;
+	static constexpr const GLenum DITHER = 0x0BD0;
+	static constexpr const GLenum BLEND_DST = 0x0BE0;
+	static constexpr const GLenum BLEND_SRC = 0x0BE1;
+	static constexpr const GLenum BLEND = 0x0BE2;
+	static constexpr const GLenum LOGIC_OP_MODE = 0x0BF0;
+	static constexpr const GLenum DRAW_BUFFER = 0x0C01;
+	static constexpr const GLenum READ_BUFFER = 0x0C02;
+	static constexpr const GLenum SCISSOR_BOX = 0x0C10;
+	static constexpr const GLenum SCISSOR_TEST = 0x0C11;
+	static constexpr const GLenum COLOR_CLEAR_VALUE = 0x0C22;
+	static constexpr const GLenum COLOR_WRITEMASK = 0x0C23;
+	static constexpr const GLenum DOUBLEBUFFER = 0x0C32;
+	static constexpr const GLenum STEREO = 0x0C33;
+	static constexpr const GLenum LINE_SMOOTH_HINT = 0x0C52;
+	static constexpr const GLenum POLYGON_SMOOTH_HINT = 0x0C53;
+	static constexpr const GLenum UNPACK_SWAP_BYTES = 0x0CF0;
+	static constexpr const GLenum UNPACK_LSB_FIRST = 0x0CF1;
+	static constexpr const GLenum UNPACK_ROW_LENGTH = 0x0CF2;
+	static constexpr const GLenum UNPACK_SKIP_ROWS = 0x0CF3;
+	static constexpr const GLenum UNPACK_SKIP_PIXELS = 0x0CF4;
+	static constexpr const GLenum UNPACK_ALIGNMENT = 0x0CF5;
+	static constexpr const GLenum PACK_SWAP_BYTES = 0x0D00;
+	static constexpr const GLenum PACK_LSB_FIRST = 0x0D01;
+	static constexpr const GLenum PACK_ROW_LENGTH = 0x0D02;
+	static constexpr const GLenum PACK_SKIP_ROWS = 0x0D03;
+	static constexpr const GLenum PACK_SKIP_PIXELS = 0x0D04;
+	static constexpr const GLenum PACK_ALIGNMENT = 0x0D05;
+	static constexpr const GLenum MAX_TEXTURE_SIZE = 0x0D33;
+	static constexpr const GLenum MAX_VIEWPORT_DIMS = 0x0D3A;
+	static constexpr const GLenum SUBPIXEL_BITS = 0x0D50;
+	static constexpr const GLenum TEXTURE_1D = 0x0DE0;
+	static constexpr const GLenum TEXTURE_2D = 0x0DE1;
+	static constexpr const GLenum TEXTURE_WIDTH = 0x1000;
+	static constexpr const GLenum TEXTURE_HEIGHT = 0x1001;
+	static constexpr const GLenum TEXTURE_BORDER_COLOR = 0x1004;
+	static constexpr const GLenum DONT_CARE = 0x1100;
+	static constexpr const GLenum FASTEST = 0x1101;
+	static constexpr const GLenum NICEST = 0x1102;
+	static constexpr const GLenum BYTE = 0x1400;
+	static constexpr const GLenum UNSIGNED_BYTE = 0x1401;
+	static constexpr const GLenum SHORT = 0x1402;
+	static constexpr const GLenum UNSIGNED_SHORT = 0x1403;
+	static constexpr const GLenum INT = 0x1404;
+	static constexpr const GLenum UNSIGNED_INT = 0x1405;
+	static constexpr const GLenum FLOAT = 0x1406;
+	static constexpr const GLenum STACK_OVERFLOW = 0x0503;
+	static constexpr const GLenum STACK_UNDERFLOW = 0x0504;
+	static constexpr const GLenum CLEAR = 0x1500;
+	static constexpr const GLenum AND = 0x1501;
+	static constexpr const GLenum AND_REVERSE = 0x1502;
+	static constexpr const GLenum COPY = 0x1503;
+	static constexpr const GLenum AND_INVERTED = 0x1504;
+	static constexpr const GLenum NOOP = 0x1505;
+	static constexpr const GLenum XOR = 0x1506;
+	static constexpr const GLenum OR = 0x1507;
+	static constexpr const GLenum NOR = 0x1508;
+	static constexpr const GLenum EQUIV = 0x1509;
+	static constexpr const GLenum INVERT = 0x150A;
+	static constexpr const GLenum OR_REVERSE = 0x150B;
+	static constexpr const GLenum COPY_INVERTED = 0x150C;
+	static constexpr const GLenum OR_INVERTED = 0x150D;
+	static constexpr const GLenum NAND = 0x150E;
+	static constexpr const GLenum SET = 0x150F;
+	static constexpr const GLenum TEXTURE = 0x1702;
+	static constexpr const GLenum COLOR = 0x1800;
+	static constexpr const GLenum DEPTH = 0x1801;
+	static constexpr const GLenum STENCIL = 0x1802;
+	static constexpr const GLenum STENCIL_INDEX = 0x1901;
+	static constexpr const GLenum DEPTH_COMPONENT = 0x1902;
+	static constexpr const GLenum RED = 0x1903;
+	static constexpr const GLenum GREEN = 0x1904;
+	static constexpr const GLenum BLUE = 0x1905;
+	static constexpr const GLenum ALPHA = 0x1906;
+	static constexpr const GLenum RGB = 0x1907;
+	static constexpr const GLenum RGBA = 0x1908;
+	static constexpr const GLenum POINT = 0x1B00;
+	static constexpr const GLenum LINE = 0x1B01;
+	static constexpr const GLenum FILL = 0x1B02;
+	static constexpr const GLenum KEEP = 0x1E00;
+	static constexpr const GLenum REPLACE = 0x1E01;
+	static constexpr const GLenum INCR = 0x1E02;
+	static constexpr const GLenum DECR = 0x1E03;
+	static constexpr const GLenum VENDOR = 0x1F00;
+	static constexpr const GLenum RENDERER = 0x1F01;
+	static constexpr const GLenum VERSION = 0x1F02;
+	static constexpr const GLenum EXTENSIONS = 0x1F03;
+	static constexpr const GLenum NEAREST = 0x2600;
+	static constexpr const GLenum LINEAR = 0x2601;
+	static constexpr const GLenum NEAREST_MIPMAP_NEAREST = 0x2700;
+	static constexpr const GLenum LINEAR_MIPMAP_NEAREST = 0x2701;
+	static constexpr const GLenum NEAREST_MIPMAP_LINEAR = 0x2702;
+	static constexpr const GLenum LINEAR_MIPMAP_LINEAR = 0x2703;
+	static constexpr const GLenum TEXTURE_MAG_FILTER = 0x2800;
+	static constexpr const GLenum TEXTURE_MIN_FILTER = 0x2801;
+	static constexpr const GLenum TEXTURE_WRAP_S = 0x2802;
+	static constexpr const GLenum TEXTURE_WRAP_T = 0x2803;
+	static constexpr const GLenum REPEAT = 0x2901;
+	static constexpr const GLenum COLOR_LOGIC_OP = 0x0BF2;
+	static constexpr const GLenum POLYGON_OFFSET_UNITS = 0x2A00;
+	static constexpr const GLenum POLYGON_OFFSET_POINT = 0x2A01;
+	static constexpr const GLenum POLYGON_OFFSET_LINE = 0x2A02;
+	static constexpr const GLenum POLYGON_OFFSET_FILL = 0x8037;
+	static constexpr const GLenum POLYGON_OFFSET_FACTOR = 0x8038;
+	static constexpr const GLenum TEXTURE_BINDING_1D = 0x8068;
+	static constexpr const GLenum TEXTURE_BINDING_2D = 0x8069;
+	static constexpr const GLenum TEXTURE_INTERNAL_FORMAT = 0x1003;
+	static constexpr const GLenum TEXTURE_RED_SIZE = 0x805C;
+	static constexpr const GLenum TEXTURE_GREEN_SIZE = 0x805D;
+	static constexpr const GLenum TEXTURE_BLUE_SIZE = 0x805E;
+	static constexpr const GLenum TEXTURE_ALPHA_SIZE = 0x805F;
+	static constexpr const GLenum DOUBLE = 0x140A;
+	static constexpr const GLenum PROXY_TEXTURE_1D = 0x8063;
+	static constexpr const GLenum PROXY_TEXTURE_2D = 0x8064;
+	static constexpr const GLenum R3_G3_B2 = 0x2A10;
+	static constexpr const GLenum RGB4 = 0x804F;
+	static constexpr const GLenum RGB5 = 0x8050;
+	static constexpr const GLenum RGB8 = 0x8051;
+	static constexpr const GLenum RGB10 = 0x8052;
+	static constexpr const GLenum RGB12 = 0x8053;
+	static constexpr const GLenum RGB16 = 0x8054;
+	static constexpr const GLenum RGBA2 = 0x8055;
+	static constexpr const GLenum RGBA4 = 0x8056;
+	static constexpr const GLenum RGB5_A1 = 0x8057;
+	static constexpr const GLenum RGBA8 = 0x8058;
+	static constexpr const GLenum RGB10_A2 = 0x8059;
+	static constexpr const GLenum RGBA12 = 0x805A;
+	static constexpr const GLenum RGBA16 = 0x805B;
+	static constexpr const GLenum VERTEX_ARRAY = 0x8074;
+	static constexpr const GLenum UNSIGNED_BYTE_3_3_2 = 0x8032;
+	static constexpr const GLenum UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+	static constexpr const GLenum UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+	static constexpr const GLenum UNSIGNED_INT_8_8_8_8 = 0x8035;
+	static constexpr const GLenum UNSIGNED_INT_10_10_10_2 = 0x8036;
+	static constexpr const GLenum TEXTURE_BINDING_3D = 0x806A;
+	static constexpr const GLenum PACK_SKIP_IMAGES = 0x806B;
+	static constexpr const GLenum PACK_IMAGE_HEIGHT = 0x806C;
+	static constexpr const GLenum UNPACK_SKIP_IMAGES = 0x806D;
+	static constexpr const GLenum UNPACK_IMAGE_HEIGHT = 0x806E;
+	static constexpr const GLenum TEXTURE_3D = 0x806F;
+	static constexpr const GLenum PROXY_TEXTURE_3D = 0x8070;
+	static constexpr const GLenum TEXTURE_DEPTH = 0x8071;
+	static constexpr const GLenum TEXTURE_WRAP_R = 0x8072;
+	static constexpr const GLenum MAX_3D_TEXTURE_SIZE = 0x8073;
+	static constexpr const GLenum UNSIGNED_BYTE_2_3_3_REV = 0x8362;
+	static constexpr const GLenum UNSIGNED_SHORT_5_6_5 = 0x8363;
+	static constexpr const GLenum UNSIGNED_SHORT_5_6_5_REV = 0x8364;
+	static constexpr const GLenum UNSIGNED_SHORT_4_4_4_4_REV = 0x8365;
+	static constexpr const GLenum UNSIGNED_SHORT_1_5_5_5_REV = 0x8366;
+	static constexpr const GLenum UNSIGNED_INT_8_8_8_8_REV = 0x8367;
+	static constexpr const GLenum UNSIGNED_INT_2_10_10_10_REV = 0x8368;
+	static constexpr const GLenum BGR = 0x80E0;
+	static constexpr const GLenum BGRA = 0x80E1;
+	static constexpr const GLenum MAX_ELEMENTS_VERTICES = 0x80E8;
+	static constexpr const GLenum MAX_ELEMENTS_INDICES = 0x80E9;
+	static constexpr const GLenum CLAMP_TO_EDGE = 0x812F;
+	static constexpr const GLenum TEXTURE_MIN_LOD = 0x813A;
+	static constexpr const GLenum TEXTURE_MAX_LOD = 0x813B;
+	static constexpr const GLenum TEXTURE_BASE_LEVEL = 0x813C;
+	static constexpr const GLenum TEXTURE_MAX_LEVEL = 0x813D;
+	static constexpr const GLenum SMOOTH_POINT_SIZE_RANGE = 0x0B12;
+	static constexpr const GLenum SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13;
+	static constexpr const GLenum SMOOTH_LINE_WIDTH_RANGE = 0x0B22;
+	static constexpr const GLenum SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23;
+	static constexpr const GLenum ALIASED_LINE_WIDTH_RANGE = 0x846E;
+	static constexpr const GLenum TEXTURE0 = 0x84C0;
+	static constexpr const GLenum TEXTURE1 = 0x84C1;
+	static constexpr const GLenum TEXTURE2 = 0x84C2;
+	static constexpr const GLenum TEXTURE3 = 0x84C3;
+	static constexpr const GLenum TEXTURE4 = 0x84C4;
+	static constexpr const GLenum TEXTURE5 = 0x84C5;
+	static constexpr const GLenum TEXTURE6 = 0x84C6;
+	static constexpr const GLenum TEXTURE7 = 0x84C7;
+	static constexpr const GLenum TEXTURE8 = 0x84C8;
+	static constexpr const GLenum TEXTURE9 = 0x84C9;
+	static constexpr const GLenum TEXTURE10 = 0x84CA;
+	static constexpr const GLenum TEXTURE11 = 0x84CB;
+	static constexpr const GLenum TEXTURE12 = 0x84CC;
+	static constexpr const GLenum TEXTURE13 = 0x84CD;
+	static constexpr const GLenum TEXTURE14 = 0x84CE;
+	static constexpr const GLenum TEXTURE15 = 0x84CF;
+	static constexpr const GLenum TEXTURE16 = 0x84D0;
+	static constexpr const GLenum TEXTURE17 = 0x84D1;
+	static constexpr const GLenum TEXTURE18 = 0x84D2;
+	static constexpr const GLenum TEXTURE19 = 0x84D3;
+	static constexpr const GLenum TEXTURE20 = 0x84D4;
+	static constexpr const GLenum TEXTURE21 = 0x84D5;
+	static constexpr const GLenum TEXTURE22 = 0x84D6;
+	static constexpr const GLenum TEXTURE23 = 0x84D7;
+	static constexpr const GLenum TEXTURE24 = 0x84D8;
+	static constexpr const GLenum TEXTURE25 = 0x84D9;
+	static constexpr const GLenum TEXTURE26 = 0x84DA;
+	static constexpr const GLenum TEXTURE27 = 0x84DB;
+	static constexpr const GLenum TEXTURE28 = 0x84DC;
+	static constexpr const GLenum TEXTURE29 = 0x84DD;
+	static constexpr const GLenum TEXTURE30 = 0x84DE;
+	static constexpr const GLenum TEXTURE31 = 0x84DF;
+	static constexpr const GLenum ACTIVE_TEXTURE = 0x84E0;
+	static constexpr const GLenum MULTISAMPLE = 0x809D;
+	static constexpr const GLenum SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
+	static constexpr const GLenum SAMPLE_ALPHA_TO_ONE = 0x809F;
+	static constexpr const GLenum SAMPLE_COVERAGE = 0x80A0;
+	static constexpr const GLenum SAMPLE_BUFFERS = 0x80A8;
+	static constexpr const GLenum SAMPLES = 0x80A9;
+	static constexpr const GLenum SAMPLE_COVERAGE_VALUE = 0x80AA;
+	static constexpr const GLenum SAMPLE_COVERAGE_INVERT = 0x80AB;
+	static constexpr const GLenum TEXTURE_CUBE_MAP = 0x8513;
+	static constexpr const GLenum TEXTURE_BINDING_CUBE_MAP = 0x8514;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
+	static constexpr const GLenum PROXY_TEXTURE_CUBE_MAP = 0x851B;
+	static constexpr const GLenum MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
+	static constexpr const GLenum COMPRESSED_RGB = 0x84ED;
+	static constexpr const GLenum COMPRESSED_RGBA = 0x84EE;
+	static constexpr const GLenum TEXTURE_COMPRESSION_HINT = 0x84EF;
+	static constexpr const GLenum TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0;
+	static constexpr const GLenum TEXTURE_COMPRESSED = 0x86A1;
+	static constexpr const GLenum NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
+	static constexpr const GLenum COMPRESSED_TEXTURE_FORMATS = 0x86A3;
+	static constexpr const GLenum CLAMP_TO_BORDER = 0x812D;
+	static constexpr const GLenum BLEND_DST_RGB = 0x80C8;
+	static constexpr const GLenum BLEND_SRC_RGB = 0x80C9;
+	static constexpr const GLenum BLEND_DST_ALPHA = 0x80CA;
+	static constexpr const GLenum BLEND_SRC_ALPHA = 0x80CB;
+	static constexpr const GLenum POINT_FADE_THRESHOLD_SIZE = 0x8128;
+	static constexpr const GLenum DEPTH_COMPONENT16 = 0x81A5;
+	static constexpr const GLenum DEPTH_COMPONENT24 = 0x81A6;
+	static constexpr const GLenum DEPTH_COMPONENT32 = 0x81A7;
+	static constexpr const GLenum MIRRORED_REPEAT = 0x8370;
+	static constexpr const GLenum MAX_TEXTURE_LOD_BIAS = 0x84FD;
+	static constexpr const GLenum TEXTURE_LOD_BIAS = 0x8501;
+	static constexpr const GLenum INCR_WRAP = 0x8507;
+	static constexpr const GLenum DECR_WRAP = 0x8508;
+	static constexpr const GLenum TEXTURE_DEPTH_SIZE = 0x884A;
+	static constexpr const GLenum TEXTURE_COMPARE_MODE = 0x884C;
+	static constexpr const GLenum TEXTURE_COMPARE_FUNC = 0x884D;
+	static constexpr const GLenum BLEND_COLOR = 0x8005;
+	static constexpr const GLenum BLEND_EQUATION = 0x8009;
+	static constexpr const GLenum CONSTANT_COLOR = 0x8001;
+	static constexpr const GLenum ONE_MINUS_CONSTANT_COLOR = 0x8002;
+	static constexpr const GLenum CONSTANT_ALPHA = 0x8003;
+	static constexpr const GLenum ONE_MINUS_CONSTANT_ALPHA = 0x8004;
+	static constexpr const GLenum FUNC_ADD = 0x8006;
+	static constexpr const GLenum FUNC_REVERSE_SUBTRACT = 0x800B;
+	static constexpr const GLenum FUNC_SUBTRACT = 0x800A;
+	static constexpr const GLenum MIN = 0x8007;
+	static constexpr const GLenum MAX = 0x8008;
+	static constexpr const GLenum BUFFER_SIZE = 0x8764;
+	static constexpr const GLenum BUFFER_USAGE = 0x8765;
+	static constexpr const GLenum QUERY_COUNTER_BITS = 0x8864;
+	static constexpr const GLenum CURRENT_QUERY = 0x8865;
+	static constexpr const GLenum QUERY_RESULT = 0x8866;
+	static constexpr const GLenum QUERY_RESULT_AVAILABLE = 0x8867;
+	static constexpr const GLenum ARRAY_BUFFER = 0x8892;
+	static constexpr const GLenum ELEMENT_ARRAY_BUFFER = 0x8893;
+	static constexpr const GLenum ARRAY_BUFFER_BINDING = 0x8894;
+	static constexpr const GLenum ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
+	static constexpr const GLenum READ_ONLY = 0x88B8;
+	static constexpr const GLenum WRITE_ONLY = 0x88B9;
+	static constexpr const GLenum READ_WRITE = 0x88BA;
+	static constexpr const GLenum BUFFER_ACCESS = 0x88BB;
+	static constexpr const GLenum BUFFER_MAPPED = 0x88BC;
+	static constexpr const GLenum BUFFER_MAP_POINTER = 0x88BD;
+	static constexpr const GLenum STREAM_DRAW = 0x88E0;
+	static constexpr const GLenum STREAM_READ = 0x88E1;
+	static constexpr const GLenum STREAM_COPY = 0x88E2;
+	static constexpr const GLenum STATIC_DRAW = 0x88E4;
+	static constexpr const GLenum STATIC_READ = 0x88E5;
+	static constexpr const GLenum STATIC_COPY = 0x88E6;
+	static constexpr const GLenum DYNAMIC_DRAW = 0x88E8;
+	static constexpr const GLenum DYNAMIC_READ = 0x88E9;
+	static constexpr const GLenum DYNAMIC_COPY = 0x88EA;
+	static constexpr const GLenum SAMPLES_PASSED = 0x8914;
+	static constexpr const GLenum SRC1_ALPHA = 0x8589;
+	static constexpr const GLenum BLEND_EQUATION_RGB = 0x8009;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
+	static constexpr const GLenum CURRENT_VERTEX_ATTRIB = 0x8626;
+	static constexpr const GLenum VERTEX_PROGRAM_POINT_SIZE = 0x8642;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
+	static constexpr const GLenum STENCIL_BACK_FUNC = 0x8800;
+	static constexpr const GLenum STENCIL_BACK_FAIL = 0x8801;
+	static constexpr const GLenum STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
+	static constexpr const GLenum STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
+	static constexpr const GLenum MAX_DRAW_BUFFERS = 0x8824;
+	static constexpr const GLenum DRAW_BUFFER0 = 0x8825;
+	static constexpr const GLenum DRAW_BUFFER1 = 0x8826;
+	static constexpr const GLenum DRAW_BUFFER2 = 0x8827;
+	static constexpr const GLenum DRAW_BUFFER3 = 0x8828;
+	static constexpr const GLenum DRAW_BUFFER4 = 0x8829;
+	static constexpr const GLenum DRAW_BUFFER5 = 0x882A;
+	static constexpr const GLenum DRAW_BUFFER6 = 0x882B;
+	static constexpr const GLenum DRAW_BUFFER7 = 0x882C;
+	static constexpr const GLenum DRAW_BUFFER8 = 0x882D;
+	static constexpr const GLenum DRAW_BUFFER9 = 0x882E;
+	static constexpr const GLenum DRAW_BUFFER10 = 0x882F;
+	static constexpr const GLenum DRAW_BUFFER11 = 0x8830;
+	static constexpr const GLenum DRAW_BUFFER12 = 0x8831;
+	static constexpr const GLenum DRAW_BUFFER13 = 0x8832;
+	static constexpr const GLenum DRAW_BUFFER14 = 0x8833;
+	static constexpr const GLenum DRAW_BUFFER15 = 0x8834;
+	static constexpr const GLenum BLEND_EQUATION_ALPHA = 0x883D;
+	static constexpr const GLenum MAX_VERTEX_ATTRIBS = 0x8869;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
+	static constexpr const GLenum MAX_TEXTURE_IMAGE_UNITS = 0x8872;
+	static constexpr const GLenum FRAGMENT_SHADER = 0x8B30;
+	static constexpr const GLenum VERTEX_SHADER = 0x8B31;
+	static constexpr const GLenum MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
+	static constexpr const GLenum MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
+	static constexpr const GLenum MAX_VARYING_FLOATS = 0x8B4B;
+	static constexpr const GLenum MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
+	static constexpr const GLenum MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
+	static constexpr const GLenum SHADER_TYPE = 0x8B4F;
+	static constexpr const GLenum FLOAT_VEC2 = 0x8B50;
+	static constexpr const GLenum FLOAT_VEC3 = 0x8B51;
+	static constexpr const GLenum FLOAT_VEC4 = 0x8B52;
+	static constexpr const GLenum INT_VEC2 = 0x8B53;
+	static constexpr const GLenum INT_VEC3 = 0x8B54;
+	static constexpr const GLenum INT_VEC4 = 0x8B55;
+	static constexpr const GLenum BOOL = 0x8B56;
+	static constexpr const GLenum BOOL_VEC2 = 0x8B57;
+	static constexpr const GLenum BOOL_VEC3 = 0x8B58;
+	static constexpr const GLenum BOOL_VEC4 = 0x8B59;
+	static constexpr const GLenum FLOAT_MAT2 = 0x8B5A;
+	static constexpr const GLenum FLOAT_MAT3 = 0x8B5B;
+	static constexpr const GLenum FLOAT_MAT4 = 0x8B5C;
+	static constexpr const GLenum SAMPLER_1D = 0x8B5D;
+	static constexpr const GLenum SAMPLER_2D = 0x8B5E;
+	static constexpr const GLenum SAMPLER_3D = 0x8B5F;
+	static constexpr const GLenum SAMPLER_CUBE = 0x8B60;
+	static constexpr const GLenum SAMPLER_1D_SHADOW = 0x8B61;
+	static constexpr const GLenum SAMPLER_2D_SHADOW = 0x8B62;
+	static constexpr const GLenum DELETE_STATUS = 0x8B80;
+	static constexpr const GLenum COMPILE_STATUS = 0x8B81;
+	static constexpr const GLenum LINK_STATUS = 0x8B82;
+	static constexpr const GLenum VALIDATE_STATUS = 0x8B83;
+	static constexpr const GLenum INFO_LOG_LENGTH = 0x8B84;
+	static constexpr const GLenum ATTACHED_SHADERS = 0x8B85;
+	static constexpr const GLenum ACTIVE_UNIFORMS = 0x8B86;
+	static constexpr const GLenum ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87;
+	static constexpr const GLenum SHADER_SOURCE_LENGTH = 0x8B88;
+	static constexpr const GLenum ACTIVE_ATTRIBUTES = 0x8B89;
+	static constexpr const GLenum ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
+	static constexpr const GLenum FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
+	static constexpr const GLenum SHADING_LANGUAGE_VERSION = 0x8B8C;
+	static constexpr const GLenum CURRENT_PROGRAM = 0x8B8D;
+	static constexpr const GLenum POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
+	static constexpr const GLenum LOWER_LEFT = 0x8CA1;
+	static constexpr const GLenum UPPER_LEFT = 0x8CA2;
+	static constexpr const GLenum STENCIL_BACK_REF = 0x8CA3;
+	static constexpr const GLenum STENCIL_BACK_VALUE_MASK = 0x8CA4;
+	static constexpr const GLenum STENCIL_BACK_WRITEMASK = 0x8CA5;
+	static constexpr const GLenum PIXEL_PACK_BUFFER = 0x88EB;
+	static constexpr const GLenum PIXEL_UNPACK_BUFFER = 0x88EC;
+	static constexpr const GLenum PIXEL_PACK_BUFFER_BINDING = 0x88ED;
+	static constexpr const GLenum PIXEL_UNPACK_BUFFER_BINDING = 0x88EF;
+	static constexpr const GLenum FLOAT_MAT2x3 = 0x8B65;
+	static constexpr const GLenum FLOAT_MAT2x4 = 0x8B66;
+	static constexpr const GLenum FLOAT_MAT3x2 = 0x8B67;
+	static constexpr const GLenum FLOAT_MAT3x4 = 0x8B68;
+	static constexpr const GLenum FLOAT_MAT4x2 = 0x8B69;
+	static constexpr const GLenum FLOAT_MAT4x3 = 0x8B6A;
+	static constexpr const GLenum SRGB = 0x8C40;
+	static constexpr const GLenum SRGB8 = 0x8C41;
+	static constexpr const GLenum SRGB_ALPHA = 0x8C42;
+	static constexpr const GLenum SRGB8_ALPHA8 = 0x8C43;
+	static constexpr const GLenum COMPRESSED_SRGB = 0x8C48;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA = 0x8C49;
+	static constexpr const GLenum COMPARE_REF_TO_TEXTURE = 0x884E;
+	static constexpr const GLenum CLIP_DISTANCE0 = 0x3000;
+	static constexpr const GLenum CLIP_DISTANCE1 = 0x3001;
+	static constexpr const GLenum CLIP_DISTANCE2 = 0x3002;
+	static constexpr const GLenum CLIP_DISTANCE3 = 0x3003;
+	static constexpr const GLenum CLIP_DISTANCE4 = 0x3004;
+	static constexpr const GLenum CLIP_DISTANCE5 = 0x3005;
+	static constexpr const GLenum CLIP_DISTANCE6 = 0x3006;
+	static constexpr const GLenum CLIP_DISTANCE7 = 0x3007;
+	static constexpr const GLenum MAX_CLIP_DISTANCES = 0x0D32;
+	static constexpr const GLenum MAJOR_VERSION = 0x821B;
+	static constexpr const GLenum MINOR_VERSION = 0x821C;
+	static constexpr const GLenum NUM_EXTENSIONS = 0x821D;
+	static constexpr const GLenum CONTEXT_FLAGS = 0x821E;
+	static constexpr const GLenum COMPRESSED_RED = 0x8225;
+	static constexpr const GLenum COMPRESSED_RG = 0x8226;
+	static constexpr const GLenum CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT = 0x00000001;
+	static constexpr const GLenum RGBA32F = 0x8814;
+	static constexpr const GLenum RGB32F = 0x8815;
+	static constexpr const GLenum RGBA16F = 0x881A;
+	static constexpr const GLenum RGB16F = 0x881B;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD;
+	static constexpr const GLenum MAX_ARRAY_TEXTURE_LAYERS = 0x88FF;
+	static constexpr const GLenum MIN_PROGRAM_TEXEL_OFFSET = 0x8904;
+	static constexpr const GLenum MAX_PROGRAM_TEXEL_OFFSET = 0x8905;
+	static constexpr const GLenum CLAMP_READ_COLOR = 0x891C;
+	static constexpr const GLenum FIXED_ONLY = 0x891D;
+	static constexpr const GLenum MAX_VARYING_COMPONENTS = 0x8B4B;
+	static constexpr const GLenum TEXTURE_1D_ARRAY = 0x8C18;
+	static constexpr const GLenum PROXY_TEXTURE_1D_ARRAY = 0x8C19;
+	static constexpr const GLenum TEXTURE_2D_ARRAY = 0x8C1A;
+	static constexpr const GLenum PROXY_TEXTURE_2D_ARRAY = 0x8C1B;
+	static constexpr const GLenum TEXTURE_BINDING_1D_ARRAY = 0x8C1C;
+	static constexpr const GLenum TEXTURE_BINDING_2D_ARRAY = 0x8C1D;
+	static constexpr const GLenum R11F_G11F_B10F = 0x8C3A;
+	static constexpr const GLenum UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B;
+	static constexpr const GLenum RGB9_E5 = 0x8C3D;
+	static constexpr const GLenum UNSIGNED_INT_5_9_9_9_REV = 0x8C3E;
+	static constexpr const GLenum TEXTURE_SHARED_SIZE = 0x8C3F;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F;
+	static constexpr const GLenum MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_VARYINGS = 0x8C83;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85;
+	static constexpr const GLenum PRIMITIVES_GENERATED = 0x8C87;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88;
+	static constexpr const GLenum RASTERIZER_DISCARD = 0x8C89;
+	static constexpr const GLenum MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
+	static constexpr const GLenum MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B;
+	static constexpr const GLenum INTERLEAVED_ATTRIBS = 0x8C8C;
+	static constexpr const GLenum SEPARATE_ATTRIBS = 0x8C8D;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER = 0x8C8E;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F;
+	static constexpr const GLenum RGBA32UI = 0x8D70;
+	static constexpr const GLenum RGB32UI = 0x8D71;
+	static constexpr const GLenum RGBA16UI = 0x8D76;
+	static constexpr const GLenum RGB16UI = 0x8D77;
+	static constexpr const GLenum RGBA8UI = 0x8D7C;
+	static constexpr const GLenum RGB8UI = 0x8D7D;
+	static constexpr const GLenum RGBA32I = 0x8D82;
+	static constexpr const GLenum RGB32I = 0x8D83;
+	static constexpr const GLenum RGBA16I = 0x8D88;
+	static constexpr const GLenum RGB16I = 0x8D89;
+	static constexpr const GLenum RGBA8I = 0x8D8E;
+	static constexpr const GLenum RGB8I = 0x8D8F;
+	static constexpr const GLenum RED_INTEGER = 0x8D94;
+	static constexpr const GLenum GREEN_INTEGER = 0x8D95;
+	static constexpr const GLenum BLUE_INTEGER = 0x8D96;
+	static constexpr const GLenum RGB_INTEGER = 0x8D98;
+	static constexpr const GLenum RGBA_INTEGER = 0x8D99;
+	static constexpr const GLenum BGR_INTEGER = 0x8D9A;
+	static constexpr const GLenum BGRA_INTEGER = 0x8D9B;
+	static constexpr const GLenum SAMPLER_1D_ARRAY = 0x8DC0;
+	static constexpr const GLenum SAMPLER_2D_ARRAY = 0x8DC1;
+	static constexpr const GLenum SAMPLER_1D_ARRAY_SHADOW = 0x8DC3;
+	static constexpr const GLenum SAMPLER_2D_ARRAY_SHADOW = 0x8DC4;
+	static constexpr const GLenum SAMPLER_CUBE_SHADOW = 0x8DC5;
+	static constexpr const GLenum UNSIGNED_INT_VEC2 = 0x8DC6;
+	static constexpr const GLenum UNSIGNED_INT_VEC3 = 0x8DC7;
+	static constexpr const GLenum UNSIGNED_INT_VEC4 = 0x8DC8;
+	static constexpr const GLenum INT_SAMPLER_1D = 0x8DC9;
+	static constexpr const GLenum INT_SAMPLER_2D = 0x8DCA;
+	static constexpr const GLenum INT_SAMPLER_3D = 0x8DCB;
+	static constexpr const GLenum INT_SAMPLER_CUBE = 0x8DCC;
+	static constexpr const GLenum INT_SAMPLER_1D_ARRAY = 0x8DCE;
+	static constexpr const GLenum INT_SAMPLER_2D_ARRAY = 0x8DCF;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_1D = 0x8DD1;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_2D = 0x8DD2;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_3D = 0x8DD3;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7;
+	static constexpr const GLenum QUERY_WAIT = 0x8E13;
+	static constexpr const GLenum QUERY_NO_WAIT = 0x8E14;
+	static constexpr const GLenum QUERY_BY_REGION_WAIT = 0x8E15;
+	static constexpr const GLenum QUERY_BY_REGION_NO_WAIT = 0x8E16;
+	static constexpr const GLenum BUFFER_ACCESS_FLAGS = 0x911F;
+	static constexpr const GLenum BUFFER_MAP_LENGTH = 0x9120;
+	static constexpr const GLenum BUFFER_MAP_OFFSET = 0x9121;
+	static constexpr const GLenum DEPTH_COMPONENT32F = 0x8CAC;
+	static constexpr const GLenum DEPTH32F_STENCIL8 = 0x8CAD;
+	static constexpr const GLenum FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
+	static constexpr const GLenum INVALID_FRAMEBUFFER_OPERATION = 0x0506;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 0x8210;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 0x8211;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_RED_SIZE = 0x8212;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 0x8213;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 0x8214;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 0x8215;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 0x8216;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 0x8217;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT = 0x8218;
+	static constexpr const GLenum FRAMEBUFFER_UNDEFINED = 0x8219;
+	static constexpr const GLenum DEPTH_STENCIL_ATTACHMENT = 0x821A;
+	static constexpr const GLenum MAX_RENDERBUFFER_SIZE = 0x84E8;
+	static constexpr const GLenum DEPTH_STENCIL = 0x84F9;
+	static constexpr const GLenum UNSIGNED_INT_24_8 = 0x84FA;
+	static constexpr const GLenum DEPTH24_STENCIL8 = 0x88F0;
+	static constexpr const GLenum TEXTURE_STENCIL_SIZE = 0x88F1;
+	static constexpr const GLenum TEXTURE_RED_TYPE = 0x8C10;
+	static constexpr const GLenum TEXTURE_GREEN_TYPE = 0x8C11;
+	static constexpr const GLenum TEXTURE_BLUE_TYPE = 0x8C12;
+	static constexpr const GLenum TEXTURE_ALPHA_TYPE = 0x8C13;
+	static constexpr const GLenum TEXTURE_DEPTH_TYPE = 0x8C16;
+	static constexpr const GLenum UNSIGNED_NORMALIZED = 0x8C17;
+	static constexpr const GLenum FRAMEBUFFER_BINDING = 0x8CA6;
+	static constexpr const GLenum DRAW_FRAMEBUFFER_BINDING = 0x8CA6;
+	static constexpr const GLenum RENDERBUFFER_BINDING = 0x8CA7;
+	static constexpr const GLenum READ_FRAMEBUFFER = 0x8CA8;
+	static constexpr const GLenum DRAW_FRAMEBUFFER = 0x8CA9;
+	static constexpr const GLenum READ_FRAMEBUFFER_BINDING = 0x8CAA;
+	static constexpr const GLenum RENDERBUFFER_SAMPLES = 0x8CAB;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 0x8CD4;
+	static constexpr const GLenum FRAMEBUFFER_COMPLETE = 0x8CD5;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0x8CDB;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0x8CDC;
+	static constexpr const GLenum FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+	static constexpr const GLenum MAX_COLOR_ATTACHMENTS = 0x8CDF;
+	static constexpr const GLenum COLOR_ATTACHMENT0 = 0x8CE0;
+	static constexpr const GLenum COLOR_ATTACHMENT1 = 0x8CE1;
+	static constexpr const GLenum COLOR_ATTACHMENT2 = 0x8CE2;
+	static constexpr const GLenum COLOR_ATTACHMENT3 = 0x8CE3;
+	static constexpr const GLenum COLOR_ATTACHMENT4 = 0x8CE4;
+	static constexpr const GLenum COLOR_ATTACHMENT5 = 0x8CE5;
+	static constexpr const GLenum COLOR_ATTACHMENT6 = 0x8CE6;
+	static constexpr const GLenum COLOR_ATTACHMENT7 = 0x8CE7;
+	static constexpr const GLenum COLOR_ATTACHMENT8 = 0x8CE8;
+	static constexpr const GLenum COLOR_ATTACHMENT9 = 0x8CE9;
+	static constexpr const GLenum COLOR_ATTACHMENT10 = 0x8CEA;
+	static constexpr const GLenum COLOR_ATTACHMENT11 = 0x8CEB;
+	static constexpr const GLenum COLOR_ATTACHMENT12 = 0x8CEC;
+	static constexpr const GLenum COLOR_ATTACHMENT13 = 0x8CED;
+	static constexpr const GLenum COLOR_ATTACHMENT14 = 0x8CEE;
+	static constexpr const GLenum COLOR_ATTACHMENT15 = 0x8CEF;
+	static constexpr const GLenum COLOR_ATTACHMENT16 = 0x8CF0;
+	static constexpr const GLenum COLOR_ATTACHMENT17 = 0x8CF1;
+	static constexpr const GLenum COLOR_ATTACHMENT18 = 0x8CF2;
+	static constexpr const GLenum COLOR_ATTACHMENT19 = 0x8CF3;
+	static constexpr const GLenum COLOR_ATTACHMENT20 = 0x8CF4;
+	static constexpr const GLenum COLOR_ATTACHMENT21 = 0x8CF5;
+	static constexpr const GLenum COLOR_ATTACHMENT22 = 0x8CF6;
+	static constexpr const GLenum COLOR_ATTACHMENT23 = 0x8CF7;
+	static constexpr const GLenum COLOR_ATTACHMENT24 = 0x8CF8;
+	static constexpr const GLenum COLOR_ATTACHMENT25 = 0x8CF9;
+	static constexpr const GLenum COLOR_ATTACHMENT26 = 0x8CFA;
+	static constexpr const GLenum COLOR_ATTACHMENT27 = 0x8CFB;
+	static constexpr const GLenum COLOR_ATTACHMENT28 = 0x8CFC;
+	static constexpr const GLenum COLOR_ATTACHMENT29 = 0x8CFD;
+	static constexpr const GLenum COLOR_ATTACHMENT30 = 0x8CFE;
+	static constexpr const GLenum COLOR_ATTACHMENT31 = 0x8CFF;
+	static constexpr const GLenum DEPTH_ATTACHMENT = 0x8D00;
+	static constexpr const GLenum STENCIL_ATTACHMENT = 0x8D20;
+	static constexpr const GLenum FRAMEBUFFER = 0x8D40;
+	static constexpr const GLenum RENDERBUFFER = 0x8D41;
+	static constexpr const GLenum RENDERBUFFER_WIDTH = 0x8D42;
+	static constexpr const GLenum RENDERBUFFER_HEIGHT = 0x8D43;
+	static constexpr const GLenum RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+	static constexpr const GLenum STENCIL_INDEX1 = 0x8D46;
+	static constexpr const GLenum STENCIL_INDEX4 = 0x8D47;
+	static constexpr const GLenum STENCIL_INDEX8 = 0x8D48;
+	static constexpr const GLenum STENCIL_INDEX16 = 0x8D49;
+	static constexpr const GLenum RENDERBUFFER_RED_SIZE = 0x8D50;
+	static constexpr const GLenum RENDERBUFFER_GREEN_SIZE = 0x8D51;
+	static constexpr const GLenum RENDERBUFFER_BLUE_SIZE = 0x8D52;
+	static constexpr const GLenum RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+	static constexpr const GLenum RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+	static constexpr const GLenum RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0x8D56;
+	static constexpr const GLenum MAX_SAMPLES = 0x8D57;
+	static constexpr const GLenum FRAMEBUFFER_SRGB = 0x8DB9;
+	static constexpr const GLenum HALF_FLOAT = 0x140B;
+	static constexpr const GLenum MAP_READ_BIT = 0x0001;
+	static constexpr const GLenum MAP_WRITE_BIT = 0x0002;
+	static constexpr const GLenum MAP_INVALIDATE_RANGE_BIT = 0x0004;
+	static constexpr const GLenum MAP_INVALIDATE_BUFFER_BIT = 0x0008;
+	static constexpr const GLenum MAP_FLUSH_EXPLICIT_BIT = 0x0010;
+	static constexpr const GLenum MAP_UNSYNCHRONIZED_BIT = 0x0020;
+	static constexpr const GLenum COMPRESSED_RED_RGTC1 = 0x8DBB;
+	static constexpr const GLenum COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
+	static constexpr const GLenum COMPRESSED_RG_RGTC2 = 0x8DBD;
+	static constexpr const GLenum COMPRESSED_SIGNED_RG_RGTC2 = 0x8DBE;
+	static constexpr const GLenum RG = 0x8227;
+	static constexpr const GLenum RG_INTEGER = 0x8228;
+	static constexpr const GLenum R8 = 0x8229;
+	static constexpr const GLenum R16 = 0x822A;
+	static constexpr const GLenum RG8 = 0x822B;
+	static constexpr const GLenum RG16 = 0x822C;
+	static constexpr const GLenum R16F = 0x822D;
+	static constexpr const GLenum R32F = 0x822E;
+	static constexpr const GLenum RG16F = 0x822F;
+	static constexpr const GLenum RG32F = 0x8230;
+	static constexpr const GLenum R8I = 0x8231;
+	static constexpr const GLenum R8UI = 0x8232;
+	static constexpr const GLenum R16I = 0x8233;
+	static constexpr const GLenum R16UI = 0x8234;
+	static constexpr const GLenum R32I = 0x8235;
+	static constexpr const GLenum R32UI = 0x8236;
+	static constexpr const GLenum RG8I = 0x8237;
+	static constexpr const GLenum RG8UI = 0x8238;
+	static constexpr const GLenum RG16I = 0x8239;
+	static constexpr const GLenum RG16UI = 0x823A;
+	static constexpr const GLenum RG32I = 0x823B;
+	static constexpr const GLenum RG32UI = 0x823C;
+	static constexpr const GLenum VERTEX_ARRAY_BINDING = 0x85B5;
+	static constexpr const GLenum SAMPLER_2D_RECT = 0x8B63;
+	static constexpr const GLenum SAMPLER_2D_RECT_SHADOW = 0x8B64;
+	static constexpr const GLenum SAMPLER_BUFFER = 0x8DC2;
+	static constexpr const GLenum INT_SAMPLER_2D_RECT = 0x8DCD;
+	static constexpr const GLenum INT_SAMPLER_BUFFER = 0x8DD0;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_2D_RECT = 0x8DD5;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_BUFFER = 0x8DD8;
+	static constexpr const GLenum TEXTURE_BUFFER = 0x8C2A;
+	static constexpr const GLenum MAX_TEXTURE_BUFFER_SIZE = 0x8C2B;
+	static constexpr const GLenum TEXTURE_BINDING_BUFFER = 0x8C2C;
+	static constexpr const GLenum TEXTURE_BUFFER_DATA_STORE_BINDING = 0x8C2D;
+	static constexpr const GLenum TEXTURE_RECTANGLE = 0x84F5;
+	static constexpr const GLenum TEXTURE_BINDING_RECTANGLE = 0x84F6;
+	static constexpr const GLenum PROXY_TEXTURE_RECTANGLE = 0x84F7;
+	static constexpr const GLenum MAX_RECTANGLE_TEXTURE_SIZE = 0x84F8;
+	static constexpr const GLenum R8_SNORM = 0x8F94;
+	static constexpr const GLenum RG8_SNORM = 0x8F95;
+	static constexpr const GLenum RGB8_SNORM = 0x8F96;
+	static constexpr const GLenum RGBA8_SNORM = 0x8F97;
+	static constexpr const GLenum R16_SNORM = 0x8F98;
+	static constexpr const GLenum RG16_SNORM = 0x8F99;
+	static constexpr const GLenum RGB16_SNORM = 0x8F9A;
+	static constexpr const GLenum RGBA16_SNORM = 0x8F9B;
+	static constexpr const GLenum SIGNED_NORMALIZED = 0x8F9C;
+	static constexpr const GLenum PRIMITIVE_RESTART = 0x8F9D;
+	static constexpr const GLenum PRIMITIVE_RESTART_INDEX = 0x8F9E;
+	static constexpr const GLenum COPY_READ_BUFFER = 0x8F36;
+	static constexpr const GLenum COPY_WRITE_BUFFER = 0x8F37;
+	static constexpr const GLenum UNIFORM_BUFFER = 0x8A11;
+	static constexpr const GLenum UNIFORM_BUFFER_BINDING = 0x8A28;
+	static constexpr const GLenum UNIFORM_BUFFER_START = 0x8A29;
+	static constexpr const GLenum UNIFORM_BUFFER_SIZE = 0x8A2A;
+	static constexpr const GLenum MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+	static constexpr const GLenum MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+	static constexpr const GLenum MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+	static constexpr const GLenum MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+	static constexpr const GLenum MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+	static constexpr const GLenum MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+	static constexpr const GLenum MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+	static constexpr const GLenum MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+	static constexpr const GLenum MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+	static constexpr const GLenum UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
+	static constexpr const GLenum ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+	static constexpr const GLenum ACTIVE_UNIFORM_BLOCKS = 0x8A36;
+	static constexpr const GLenum UNIFORM_TYPE = 0x8A37;
+	static constexpr const GLenum UNIFORM_SIZE = 0x8A38;
+	static constexpr const GLenum UNIFORM_NAME_LENGTH = 0x8A39;
+	static constexpr const GLenum UNIFORM_BLOCK_INDEX = 0x8A3A;
+	static constexpr const GLenum UNIFORM_OFFSET = 0x8A3B;
+	static constexpr const GLenum UNIFORM_ARRAY_STRIDE = 0x8A3C;
+	static constexpr const GLenum UNIFORM_MATRIX_STRIDE = 0x8A3D;
+	static constexpr const GLenum UNIFORM_IS_ROW_MAJOR = 0x8A3E;
+	static constexpr const GLenum UNIFORM_BLOCK_BINDING = 0x8A3F;
+	static constexpr const GLenum UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+	static constexpr const GLenum UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+	static constexpr const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+	static constexpr const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+	static constexpr const GLenum INVALID_INDEX = 0xFFFFFFFFu;
+	static constexpr const GLenum CONTEXT_CORE_PROFILE_BIT = 0x00000001;
+	static constexpr const GLenum CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002;
+	static constexpr const GLenum LINES_ADJACENCY = 0x000A;
+	static constexpr const GLenum LINE_STRIP_ADJACENCY = 0x000B;
+	static constexpr const GLenum TRIANGLES_ADJACENCY = 0x000C;
+	static constexpr const GLenum TRIANGLE_STRIP_ADJACENCY = 0x000D;
+	static constexpr const GLenum PROGRAM_POINT_SIZE = 0x8642;
+	static constexpr const GLenum MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8;
+	static constexpr const GLenum GEOMETRY_SHADER = 0x8DD9;
+	static constexpr const GLenum GEOMETRY_VERTICES_OUT = 0x8916;
+	static constexpr const GLenum GEOMETRY_INPUT_TYPE = 0x8917;
+	static constexpr const GLenum GEOMETRY_OUTPUT_TYPE = 0x8918;
+	static constexpr const GLenum MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF;
+	static constexpr const GLenum MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0;
+	static constexpr const GLenum MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1;
+	static constexpr const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
+	static constexpr const GLenum MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123;
+	static constexpr const GLenum MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124;
+	static constexpr const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
+	static constexpr const GLenum CONTEXT_PROFILE_MASK = 0x9126;
+	static constexpr const GLenum DEPTH_CLAMP = 0x864F;
+	static constexpr const GLenum QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 0x8E4C;
+	static constexpr const GLenum FIRST_VERTEX_CONVENTION = 0x8E4D;
+	static constexpr const GLenum LAST_VERTEX_CONVENTION = 0x8E4E;
+	static constexpr const GLenum PROVOKING_VERTEX = 0x8E4F;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_SEAMLESS = 0x884F;
+	static constexpr const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111;
+	static constexpr const GLenum OBJECT_TYPE = 0x9112;
+	static constexpr const GLenum SYNC_CONDITION = 0x9113;
+	static constexpr const GLenum SYNC_STATUS = 0x9114;
+	static constexpr const GLenum SYNC_FLAGS = 0x9115;
+	static constexpr const GLenum SYNC_FENCE = 0x9116;
+	static constexpr const GLenum SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
+	static constexpr const GLenum UNSIGNALED = 0x9118;
+	static constexpr const GLenum SIGNALED = 0x9119;
+	static constexpr const GLenum ALREADY_SIGNALED = 0x911A;
+	static constexpr const GLenum TIMEOUT_EXPIRED = 0x911B;
+	static constexpr const GLenum CONDITION_SATISFIED = 0x911C;
+	static constexpr const GLenum _WAIT_FAILED = 0x911D;
+	static constexpr const GLuint64 TIMEOUT_IGNORED = 0xFFFFFFFFFFFFFFFFull;
+	static constexpr const GLenum SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
+	static constexpr const GLenum SAMPLE_POSITION = 0x8E50;
+	static constexpr const GLenum SAMPLE_MASK = 0x8E51;
+	static constexpr const GLenum SAMPLE_MASK_VALUE = 0x8E52;
+	static constexpr const GLenum MAX_SAMPLE_MASK_WORDS = 0x8E59;
+	static constexpr const GLenum TEXTURE_2D_MULTISAMPLE = 0x9100;
+	static constexpr const GLenum PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101;
+	static constexpr const GLenum TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102;
+	static constexpr const GLenum PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103;
+	static constexpr const GLenum TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104;
+	static constexpr const GLenum TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105;
+	static constexpr const GLenum TEXTURE_SAMPLES = 0x9106;
+	static constexpr const GLenum TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107;
+	static constexpr const GLenum SAMPLER_2D_MULTISAMPLE = 0x9108;
+	static constexpr const GLenum INT_SAMPLER_2D_MULTISAMPLE = 0x9109;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A;
+	static constexpr const GLenum SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B;
+	static constexpr const GLenum INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D;
+	static constexpr const GLenum MAX_COLOR_TEXTURE_SAMPLES = 0x910E;
+	static constexpr const GLenum MAX_DEPTH_TEXTURE_SAMPLES = 0x910F;
+	static constexpr const GLenum MAX_INTEGER_SAMPLES = 0x9110;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE;
+	static constexpr const GLenum SRC1_COLOR = 0x88F9;
+	static constexpr const GLenum ONE_MINUS_SRC1_COLOR = 0x88FA;
+	static constexpr const GLenum ONE_MINUS_SRC1_ALPHA = 0x88FB;
+	static constexpr const GLenum MAX_DUAL_SOURCE_DRAW_BUFFERS = 0x88FC;
+	static constexpr const GLenum ANY_SAMPLES_PASSED = 0x8C2F;
+	static constexpr const GLenum SAMPLER_BINDING = 0x8919;
+	static constexpr const GLenum RGB10_A2UI = 0x906F;
+	static constexpr const GLenum TEXTURE_SWIZZLE_R = 0x8E42;
+	static constexpr const GLenum TEXTURE_SWIZZLE_G = 0x8E43;
+	static constexpr const GLenum TEXTURE_SWIZZLE_B = 0x8E44;
+	static constexpr const GLenum TEXTURE_SWIZZLE_A = 0x8E45;
+	static constexpr const GLenum TEXTURE_SWIZZLE_RGBA = 0x8E46;
+	static constexpr const GLenum TIME_ELAPSED = 0x88BF;
+	static constexpr const GLenum TIMESTAMP = 0x8E28;
+	static constexpr const GLenum INT_2_10_10_10_REV = 0x8D9F;
+	static constexpr const GLenum SAMPLE_SHADING = 0x8C36;
+	static constexpr const GLenum MIN_SAMPLE_SHADING_VALUE = 0x8C37;
+	static constexpr const GLenum MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E;
+	static constexpr const GLenum MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F;
+	static constexpr const GLenum TEXTURE_CUBE_MAP_ARRAY = 0x9009;
+	static constexpr const GLenum TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A;
+	static constexpr const GLenum PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B;
+	static constexpr const GLenum SAMPLER_CUBE_MAP_ARRAY = 0x900C;
+	static constexpr const GLenum SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D;
+	static constexpr const GLenum INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E;
+	static constexpr const GLenum UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F;
+	static constexpr const GLenum DRAW_INDIRECT_BUFFER = 0x8F3F;
+	static constexpr const GLenum DRAW_INDIRECT_BUFFER_BINDING = 0x8F43;
+	static constexpr const GLenum GEOMETRY_SHADER_INVOCATIONS = 0x887F;
+	static constexpr const GLenum MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A;
+	static constexpr const GLenum MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B;
+	static constexpr const GLenum MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C;
+	static constexpr const GLenum FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D;
+	static constexpr const GLenum MAX_VERTEX_STREAMS = 0x8E71;
+	static constexpr const GLenum DOUBLE_VEC2 = 0x8FFC;
+	static constexpr const GLenum DOUBLE_VEC3 = 0x8FFD;
+	static constexpr const GLenum DOUBLE_VEC4 = 0x8FFE;
+	static constexpr const GLenum DOUBLE_MAT2 = 0x8F46;
+	static constexpr const GLenum DOUBLE_MAT3 = 0x8F47;
+	static constexpr const GLenum DOUBLE_MAT4 = 0x8F48;
+	static constexpr const GLenum DOUBLE_MAT2x3 = 0x8F49;
+	static constexpr const GLenum DOUBLE_MAT2x4 = 0x8F4A;
+	static constexpr const GLenum DOUBLE_MAT3x2 = 0x8F4B;
+	static constexpr const GLenum DOUBLE_MAT3x4 = 0x8F4C;
+	static constexpr const GLenum DOUBLE_MAT4x2 = 0x8F4D;
+	static constexpr const GLenum DOUBLE_MAT4x3 = 0x8F4E;
+	static constexpr const GLenum ACTIVE_SUBROUTINES = 0x8DE5;
+	static constexpr const GLenum ACTIVE_SUBROUTINE_UNIFORMS = 0x8DE6;
+	static constexpr const GLenum ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS = 0x8E47;
+	static constexpr const GLenum ACTIVE_SUBROUTINE_MAX_LENGTH = 0x8E48;
+	static constexpr const GLenum ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH = 0x8E49;
+	static constexpr const GLenum MAX_SUBROUTINES = 0x8DE7;
+	static constexpr const GLenum MAX_SUBROUTINE_UNIFORM_LOCATIONS = 0x8DE8;
+	static constexpr const GLenum NUM_COMPATIBLE_SUBROUTINES = 0x8E4A;
+	static constexpr const GLenum COMPATIBLE_SUBROUTINES = 0x8E4B;
+	static constexpr const GLenum PATCHES = 0x000E;
+	static constexpr const GLenum PATCH_VERTICES = 0x8E72;
+	static constexpr const GLenum PATCH_DEFAULT_INNER_LEVEL = 0x8E73;
+	static constexpr const GLenum PATCH_DEFAULT_OUTER_LEVEL = 0x8E74;
+	static constexpr const GLenum TESS_CONTROL_OUTPUT_VERTICES = 0x8E75;
+	static constexpr const GLenum TESS_GEN_MODE = 0x8E76;
+	static constexpr const GLenum TESS_GEN_SPACING = 0x8E77;
+	static constexpr const GLenum TESS_GEN_VERTEX_ORDER = 0x8E78;
+	static constexpr const GLenum TESS_GEN_POINT_MODE = 0x8E79;
+	static constexpr const GLenum ISOLINES = 0x8E7A;
+	static constexpr const GLenum FRACTIONAL_ODD = 0x8E7B;
+	static constexpr const GLenum FRACTIONAL_EVEN = 0x8E7C;
+	static constexpr const GLenum MAX_PATCH_VERTICES = 0x8E7D;
+	static constexpr const GLenum MAX_TESS_GEN_LEVEL = 0x8E7E;
+	static constexpr const GLenum MAX_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E7F;
+	static constexpr const GLenum MAX_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E80;
+	static constexpr const GLenum MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS = 0x8E81;
+	static constexpr const GLenum MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS = 0x8E82;
+	static constexpr const GLenum MAX_TESS_CONTROL_OUTPUT_COMPONENTS = 0x8E83;
+	static constexpr const GLenum MAX_TESS_PATCH_COMPONENTS = 0x8E84;
+	static constexpr const GLenum MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS = 0x8E85;
+	static constexpr const GLenum MAX_TESS_EVALUATION_OUTPUT_COMPONENTS = 0x8E86;
+	static constexpr const GLenum MAX_TESS_CONTROL_UNIFORM_BLOCKS = 0x8E89;
+	static constexpr const GLenum MAX_TESS_EVALUATION_UNIFORM_BLOCKS = 0x8E8A;
+	static constexpr const GLenum MAX_TESS_CONTROL_INPUT_COMPONENTS = 0x886C;
+	static constexpr const GLenum MAX_TESS_EVALUATION_INPUT_COMPONENTS = 0x886D;
+	static constexpr const GLenum MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS = 0x8E1E;
+	static constexpr const GLenum MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS = 0x8E1F;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1;
+	static constexpr const GLenum TESS_EVALUATION_SHADER = 0x8E87;
+	static constexpr const GLenum TESS_CONTROL_SHADER = 0x8E88;
+	static constexpr const GLenum TRANSFORM_FEEDBACK = 0x8E22;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BINDING = 0x8E25;
+	static constexpr const GLenum MAX_TRANSFORM_FEEDBACK_BUFFERS = 0x8E70;
+	static constexpr const GLenum FIXED = 0x140C;
+	static constexpr const GLenum IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
+	static constexpr const GLenum IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
+	static constexpr const GLenum LOW_FLOAT = 0x8DF0;
+	static constexpr const GLenum MEDIUM_FLOAT = 0x8DF1;
+	static constexpr const GLenum HIGH_FLOAT = 0x8DF2;
+	static constexpr const GLenum LOW_INT = 0x8DF3;
+	static constexpr const GLenum MEDIUM_INT = 0x8DF4;
+	static constexpr const GLenum HIGH_INT = 0x8DF5;
+	static constexpr const GLenum SHADER_COMPILER = 0x8DFA;
+	static constexpr const GLenum SHADER_BINARY_FORMATS = 0x8DF8;
+	static constexpr const GLenum NUM_SHADER_BINARY_FORMATS = 0x8DF9;
+	static constexpr const GLenum MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
+	static constexpr const GLenum MAX_VARYING_VECTORS = 0x8DFC;
+	static constexpr const GLenum MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
+	static constexpr const GLenum RGB565 = 0x8D62;
+	static constexpr const GLenum PROGRAM_BINARY_RETRIEVABLE_HINT = 0x8257;
+	static constexpr const GLenum PROGRAM_BINARY_LENGTH = 0x8741;
+	static constexpr const GLenum NUM_PROGRAM_BINARY_FORMATS = 0x87FE;
+	static constexpr const GLenum PROGRAM_BINARY_FORMATS = 0x87FF;
+	static constexpr const GLenum VERTEX_SHADER_BIT = 0x00000001;
+	static constexpr const GLenum FRAGMENT_SHADER_BIT = 0x00000002;
+	static constexpr const GLenum GEOMETRY_SHADER_BIT = 0x00000004;
+	static constexpr const GLenum TESS_CONTROL_SHADER_BIT = 0x00000008;
+	static constexpr const GLenum TESS_EVALUATION_SHADER_BIT = 0x00000010;
+	static constexpr const GLenum ALL_SHADER_BITS = 0xFFFFFFFF;
+	static constexpr const GLenum PROGRAM_SEPARABLE = 0x8258;
+	static constexpr const GLenum ACTIVE_PROGRAM = 0x8259;
+	static constexpr const GLenum PROGRAM_PIPELINE_BINDING = 0x825A;
+	static constexpr const GLenum MAX_VIEWPORTS = 0x825B;
+	static constexpr const GLenum VIEWPORT_SUBPIXEL_BITS = 0x825C;
+	static constexpr const GLenum VIEWPORT_BOUNDS_RANGE = 0x825D;
+	static constexpr const GLenum LAYER_PROVOKING_VERTEX = 0x825E;
+	static constexpr const GLenum VIEWPORT_INDEX_PROVOKING_VERTEX = 0x825F;
+	static constexpr const GLenum UNDEFINED_VERTEX = 0x8260;
+	static constexpr const GLenum COPY_READ_BUFFER_BINDING = 0x8F36;
+	static constexpr const GLenum COPY_WRITE_BUFFER_BINDING = 0x8F37;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_ACTIVE = 0x8E24;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_PAUSED = 0x8E23;
+	static constexpr const GLenum UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127;
+	static constexpr const GLenum UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128;
+	static constexpr const GLenum UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129;
+	static constexpr const GLenum UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A;
+	static constexpr const GLenum PACK_COMPRESSED_BLOCK_WIDTH = 0x912B;
+	static constexpr const GLenum PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C;
+	static constexpr const GLenum PACK_COMPRESSED_BLOCK_DEPTH = 0x912D;
+	static constexpr const GLenum PACK_COMPRESSED_BLOCK_SIZE = 0x912E;
+	static constexpr const GLenum NUM_SAMPLE_COUNTS = 0x9380;
+	static constexpr const GLenum MIN_MAP_BUFFER_ALIGNMENT = 0x90BC;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER = 0x92C0;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_BINDING = 0x92C1;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_START = 0x92C2;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_SIZE = 0x92C3;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_DATA_SIZE = 0x92C4;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS = 0x92C5;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES = 0x92C6;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER = 0x92C7;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER = 0x92C8;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x92C9;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER = 0x92CA;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER = 0x92CB;
+	static constexpr const GLenum MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 0x92CC;
+	static constexpr const GLenum MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS = 0x92CD;
+	static constexpr const GLenum MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS = 0x92CE;
+	static constexpr const GLenum MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS = 0x92CF;
+	static constexpr const GLenum MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 0x92D0;
+	static constexpr const GLenum MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 0x92D1;
+	static constexpr const GLenum MAX_VERTEX_ATOMIC_COUNTERS = 0x92D2;
+	static constexpr const GLenum MAX_TESS_CONTROL_ATOMIC_COUNTERS = 0x92D3;
+	static constexpr const GLenum MAX_TESS_EVALUATION_ATOMIC_COUNTERS = 0x92D4;
+	static constexpr const GLenum MAX_GEOMETRY_ATOMIC_COUNTERS = 0x92D5;
+	static constexpr const GLenum MAX_FRAGMENT_ATOMIC_COUNTERS = 0x92D6;
+	static constexpr const GLenum MAX_COMBINED_ATOMIC_COUNTERS = 0x92D7;
+	static constexpr const GLenum MAX_ATOMIC_COUNTER_BUFFER_SIZE = 0x92D8;
+	static constexpr const GLenum MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 0x92DC;
+	static constexpr const GLenum ACTIVE_ATOMIC_COUNTER_BUFFERS = 0x92D9;
+	static constexpr const GLenum UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX = 0x92DA;
+	static constexpr const GLenum UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 0x00000001;
+	static constexpr const GLenum ELEMENT_ARRAY_BARRIER_BIT = 0x00000002;
+	static constexpr const GLenum UNIFORM_BARRIER_BIT = 0x00000004;
+	static constexpr const GLenum TEXTURE_FETCH_BARRIER_BIT = 0x00000008;
+	static constexpr const GLenum SHADER_IMAGE_ACCESS_BARRIER_BIT = 0x00000020;
+	static constexpr const GLenum COMMAND_BARRIER_BIT = 0x00000040;
+	static constexpr const GLenum PIXEL_BUFFER_BARRIER_BIT = 0x00000080;
+	static constexpr const GLenum TEXTURE_UPDATE_BARRIER_BIT = 0x00000100;
+	static constexpr const GLenum BUFFER_UPDATE_BARRIER_BIT = 0x00000200;
+	static constexpr const GLenum FRAMEBUFFER_BARRIER_BIT = 0x00000400;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BARRIER_BIT = 0x00000800;
+	static constexpr const GLenum ATOMIC_COUNTER_BARRIER_BIT = 0x00001000;
+	static constexpr const GLenum ALL_BARRIER_BITS = 0xFFFFFFFF;
+	static constexpr const GLenum MAX_IMAGE_UNITS = 0x8F38;
+	static constexpr const GLenum MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS = 0x8F39;
+	static constexpr const GLenum IMAGE_BINDING_NAME = 0x8F3A;
+	static constexpr const GLenum IMAGE_BINDING_LEVEL = 0x8F3B;
+	static constexpr const GLenum IMAGE_BINDING_LAYERED = 0x8F3C;
+	static constexpr const GLenum IMAGE_BINDING_LAYER = 0x8F3D;
+	static constexpr const GLenum IMAGE_BINDING_ACCESS = 0x8F3E;
+	static constexpr const GLenum IMAGE_1D = 0x904C;
+	static constexpr const GLenum IMAGE_2D = 0x904D;
+	static constexpr const GLenum IMAGE_3D = 0x904E;
+	static constexpr const GLenum IMAGE_2D_RECT = 0x904F;
+	static constexpr const GLenum IMAGE_CUBE = 0x9050;
+	static constexpr const GLenum IMAGE_BUFFER = 0x9051;
+	static constexpr const GLenum IMAGE_1D_ARRAY = 0x9052;
+	static constexpr const GLenum IMAGE_2D_ARRAY = 0x9053;
+	static constexpr const GLenum IMAGE_CUBE_MAP_ARRAY = 0x9054;
+	static constexpr const GLenum IMAGE_2D_MULTISAMPLE = 0x9055;
+	static constexpr const GLenum IMAGE_2D_MULTISAMPLE_ARRAY = 0x9056;
+	static constexpr const GLenum INT_IMAGE_1D = 0x9057;
+	static constexpr const GLenum INT_IMAGE_2D = 0x9058;
+	static constexpr const GLenum INT_IMAGE_3D = 0x9059;
+	static constexpr const GLenum INT_IMAGE_2D_RECT = 0x905A;
+	static constexpr const GLenum INT_IMAGE_CUBE = 0x905B;
+	static constexpr const GLenum INT_IMAGE_BUFFER = 0x905C;
+	static constexpr const GLenum INT_IMAGE_1D_ARRAY = 0x905D;
+	static constexpr const GLenum INT_IMAGE_2D_ARRAY = 0x905E;
+	static constexpr const GLenum INT_IMAGE_CUBE_MAP_ARRAY = 0x905F;
+	static constexpr const GLenum INT_IMAGE_2D_MULTISAMPLE = 0x9060;
+	static constexpr const GLenum INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x9061;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_1D = 0x9062;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_2D = 0x9063;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_3D = 0x9064;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_2D_RECT = 0x9065;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_CUBE = 0x9066;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_BUFFER = 0x9067;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_1D_ARRAY = 0x9068;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_2D_ARRAY = 0x9069;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY = 0x906A;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_2D_MULTISAMPLE = 0x906B;
+	static constexpr const GLenum UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY = 0x906C;
+	static constexpr const GLenum MAX_IMAGE_SAMPLES = 0x906D;
+	static constexpr const GLenum IMAGE_BINDING_FORMAT = 0x906E;
+	static constexpr const GLenum IMAGE_FORMAT_COMPATIBILITY_TYPE = 0x90C7;
+	static constexpr const GLenum IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 0x90C8;
+	static constexpr const GLenum IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 0x90C9;
+	static constexpr const GLenum MAX_VERTEX_IMAGE_UNIFORMS = 0x90CA;
+	static constexpr const GLenum MAX_TESS_CONTROL_IMAGE_UNIFORMS = 0x90CB;
+	static constexpr const GLenum MAX_TESS_EVALUATION_IMAGE_UNIFORMS = 0x90CC;
+	static constexpr const GLenum MAX_GEOMETRY_IMAGE_UNIFORMS = 0x90CD;
+	static constexpr const GLenum MAX_FRAGMENT_IMAGE_UNIFORMS = 0x90CE;
+	static constexpr const GLenum MAX_COMBINED_IMAGE_UNIFORMS = 0x90CF;
+	static constexpr const GLenum COMPRESSED_RGBA_BPTC_UNORM = 0x8E8C;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_BPTC_UNORM = 0x8E8D;
+	static constexpr const GLenum COMPRESSED_RGB_BPTC_SIGNED_FLOAT = 0x8E8E;
+	static constexpr const GLenum COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = 0x8E8F;
+	static constexpr const GLenum TEXTURE_IMMUTABLE_FORMAT = 0x912F;
+	static constexpr const GLenum NUM_SHADING_LANGUAGE_VERSIONS = 0x82E9;
+	static constexpr const GLenum VERTEX_ATTRIB_ARRAY_LONG = 0x874E;
+	static constexpr const GLenum COMPRESSED_RGB8_ETC2 = 0x9274;
+	static constexpr const GLenum COMPRESSED_SRGB8_ETC2 = 0x9275;
+	static constexpr const GLenum COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9276;
+	static constexpr const GLenum COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 0x9277;
+	static constexpr const GLenum COMPRESSED_RGBA8_ETC2_EAC = 0x9278;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279;
+	static constexpr const GLenum COMPRESSED_R11_EAC = 0x9270;
+	static constexpr const GLenum COMPRESSED_SIGNED_R11_EAC = 0x9271;
+	static constexpr const GLenum COMPRESSED_RG11_EAC = 0x9272;
+	static constexpr const GLenum COMPRESSED_SIGNED_RG11_EAC = 0x9273;
+	static constexpr const GLenum PRIMITIVE_RESTART_FIXED_INDEX = 0x8D69;
+	static constexpr const GLenum ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8D6A;
+	static constexpr const GLenum MAX_ELEMENT_INDEX = 0x8D6B;
+	static constexpr const GLenum COMPUTE_SHADER = 0x91B9;
+	static constexpr const GLenum MAX_COMPUTE_UNIFORM_BLOCKS = 0x91BB;
+	static constexpr const GLenum MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 0x91BC;
+	static constexpr const GLenum MAX_COMPUTE_IMAGE_UNIFORMS = 0x91BD;
+	static constexpr const GLenum MAX_COMPUTE_SHARED_MEMORY_SIZE = 0x8262;
+	static constexpr const GLenum MAX_COMPUTE_UNIFORM_COMPONENTS = 0x8263;
+	static constexpr const GLenum MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 0x8264;
+	static constexpr const GLenum MAX_COMPUTE_ATOMIC_COUNTERS = 0x8265;
+	static constexpr const GLenum MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 0x8266;
+	static constexpr const GLenum MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 0x90EB;
+	static constexpr const GLenum MAX_COMPUTE_WORK_GROUP_COUNT = 0x91BE;
+	static constexpr const GLenum MAX_COMPUTE_WORK_GROUP_SIZE = 0x91BF;
+	static constexpr const GLenum COMPUTE_WORK_GROUP_SIZE = 0x8267;
+	static constexpr const GLenum UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER = 0x90ED;
+	static constexpr const GLenum DISPATCH_INDIRECT_BUFFER = 0x90EE;
+	static constexpr const GLenum DISPATCH_INDIRECT_BUFFER_BINDING = 0x90EF;
+	static constexpr const GLenum COMPUTE_SHADER_BIT = 0x00000020;
+	static constexpr const GLenum DEBUG_OUTPUT_SYNCHRONOUS = 0x8242;
+	static constexpr const GLenum DEBUG_NEXT_LOGGED_MESSAGE_LENGTH = 0x8243;
+	static constexpr const GLenum DEBUG_CALLBACK_FUNCTION = 0x8244;
+	static constexpr const GLenum DEBUG_CALLBACK_USER_PARAM = 0x8245;
+	static constexpr const GLenum DEBUG_SOURCE_API = 0x8246;
+	static constexpr const GLenum DEBUG_SOURCE_WINDOW_SYSTEM = 0x8247;
+	static constexpr const GLenum DEBUG_SOURCE_SHADER_COMPILER = 0x8248;
+	static constexpr const GLenum DEBUG_SOURCE_THIRD_PARTY = 0x8249;
+	static constexpr const GLenum DEBUG_SOURCE_APPLICATION = 0x824A;
+	static constexpr const GLenum DEBUG_SOURCE_OTHER = 0x824B;
+	static constexpr const GLenum DEBUG_TYPE_ERROR = 0x824C;
+	static constexpr const GLenum DEBUG_TYPE_DEPRECATED_BEHAVIOR = 0x824D;
+	static constexpr const GLenum DEBUG_TYPE_UNDEFINED_BEHAVIOR = 0x824E;
+	static constexpr const GLenum DEBUG_TYPE_PORTABILITY = 0x824F;
+	static constexpr const GLenum DEBUG_TYPE_PERFORMANCE = 0x8250;
+	static constexpr const GLenum DEBUG_TYPE_OTHER = 0x8251;
+	static constexpr const GLenum MAX_DEBUG_MESSAGE_LENGTH = 0x9143;
+	static constexpr const GLenum MAX_DEBUG_LOGGED_MESSAGES = 0x9144;
+	static constexpr const GLenum DEBUG_LOGGED_MESSAGES = 0x9145;
+	static constexpr const GLenum DEBUG_SEVERITY_HIGH = 0x9146;
+	static constexpr const GLenum DEBUG_SEVERITY_MEDIUM = 0x9147;
+	static constexpr const GLenum DEBUG_SEVERITY_LOW = 0x9148;
+	static constexpr const GLenum DEBUG_TYPE_MARKER = 0x8268;
+	static constexpr const GLenum DEBUG_TYPE_PUSH_GROUP = 0x8269;
+	static constexpr const GLenum DEBUG_TYPE_POP_GROUP = 0x826A;
+	static constexpr const GLenum DEBUG_SEVERITY_NOTIFICATION = 0x826B;
+	static constexpr const GLenum MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C;
+	static constexpr const GLenum DEBUG_GROUP_STACK_DEPTH = 0x826D;
+	static constexpr const GLenum BUFFER = 0x82E0;
+	static constexpr const GLenum SHADER = 0x82E1;
+	static constexpr const GLenum PROGRAM = 0x82E2;
+	static constexpr const GLenum QUERY = 0x82E3;
+	static constexpr const GLenum PROGRAM_PIPELINE = 0x82E4;
+	static constexpr const GLenum SAMPLER = 0x82E6;
+	static constexpr const GLenum MAX_LABEL_LENGTH = 0x82E8;
+	static constexpr const GLenum DEBUG_OUTPUT = 0x92E0;
+	static constexpr const GLenum CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
+	static constexpr const GLenum MAX_UNIFORM_LOCATIONS = 0x826E;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT_WIDTH = 0x9310;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT_HEIGHT = 0x9311;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT_LAYERS = 0x9312;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT_SAMPLES = 0x9313;
+	static constexpr const GLenum FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 0x9314;
+	static constexpr const GLenum MAX_FRAMEBUFFER_WIDTH = 0x9315;
+	static constexpr const GLenum MAX_FRAMEBUFFER_HEIGHT = 0x9316;
+	static constexpr const GLenum MAX_FRAMEBUFFER_LAYERS = 0x9317;
+	static constexpr const GLenum MAX_FRAMEBUFFER_SAMPLES = 0x9318;
+	static constexpr const GLenum INTERNALFORMAT_SUPPORTED = 0x826F;
+	static constexpr const GLenum INTERNALFORMAT_PREFERRED = 0x8270;
+	static constexpr const GLenum INTERNALFORMAT_RED_SIZE = 0x8271;
+	static constexpr const GLenum INTERNALFORMAT_GREEN_SIZE = 0x8272;
+	static constexpr const GLenum INTERNALFORMAT_BLUE_SIZE = 0x8273;
+	static constexpr const GLenum INTERNALFORMAT_ALPHA_SIZE = 0x8274;
+	static constexpr const GLenum INTERNALFORMAT_DEPTH_SIZE = 0x8275;
+	static constexpr const GLenum INTERNALFORMAT_STENCIL_SIZE = 0x8276;
+	static constexpr const GLenum INTERNALFORMAT_SHARED_SIZE = 0x8277;
+	static constexpr const GLenum INTERNALFORMAT_RED_TYPE = 0x8278;
+	static constexpr const GLenum INTERNALFORMAT_GREEN_TYPE = 0x8279;
+	static constexpr const GLenum INTERNALFORMAT_BLUE_TYPE = 0x827A;
+	static constexpr const GLenum INTERNALFORMAT_ALPHA_TYPE = 0x827B;
+	static constexpr const GLenum INTERNALFORMAT_DEPTH_TYPE = 0x827C;
+	static constexpr const GLenum INTERNALFORMAT_STENCIL_TYPE = 0x827D;
+	static constexpr const GLenum MAX_WIDTH = 0x827E;
+	static constexpr const GLenum MAX_HEIGHT = 0x827F;
+	static constexpr const GLenum MAX_DEPTH = 0x8280;
+	static constexpr const GLenum MAX_LAYERS = 0x8281;
+	static constexpr const GLenum MAX_COMBINED_DIMENSIONS = 0x8282;
+	static constexpr const GLenum COLOR_COMPONENTS = 0x8283;
+	static constexpr const GLenum DEPTH_COMPONENTS = 0x8284;
+	static constexpr const GLenum STENCIL_COMPONENTS = 0x8285;
+	static constexpr const GLenum COLOR_RENDERABLE = 0x8286;
+	static constexpr const GLenum DEPTH_RENDERABLE = 0x8287;
+	static constexpr const GLenum STENCIL_RENDERABLE = 0x8288;
+	static constexpr const GLenum FRAMEBUFFER_RENDERABLE = 0x8289;
+	static constexpr const GLenum FRAMEBUFFER_RENDERABLE_LAYERED = 0x828A;
+	static constexpr const GLenum FRAMEBUFFER_BLEND = 0x828B;
+	static constexpr const GLenum READ_PIXELS = 0x828C;
+	static constexpr const GLenum READ_PIXELS_FORMAT = 0x828D;
+	static constexpr const GLenum READ_PIXELS_TYPE = 0x828E;
+	static constexpr const GLenum TEXTURE_IMAGE_FORMAT = 0x828F;
+	static constexpr const GLenum TEXTURE_IMAGE_TYPE = 0x8290;
+	static constexpr const GLenum GET_TEXTURE_IMAGE_FORMAT = 0x8291;
+	static constexpr const GLenum GET_TEXTURE_IMAGE_TYPE = 0x8292;
+	static constexpr const GLenum MIPMAP = 0x8293;
+	static constexpr const GLenum MANUAL_GENERATE_MIPMAP = 0x8294;
+	static constexpr const GLenum AUTO_GENERATE_MIPMAP = 0x8295;
+	static constexpr const GLenum COLOR_ENCODING = 0x8296;
+	static constexpr const GLenum SRGB_READ = 0x8297;
+	static constexpr const GLenum SRGB_WRITE = 0x8298;
+	static constexpr const GLenum FILTER = 0x829A;
+	static constexpr const GLenum VERTEX_TEXTURE = 0x829B;
+	static constexpr const GLenum TESS_CONTROL_TEXTURE = 0x829C;
+	static constexpr const GLenum TESS_EVALUATION_TEXTURE = 0x829D;
+	static constexpr const GLenum GEOMETRY_TEXTURE = 0x829E;
+	static constexpr const GLenum FRAGMENT_TEXTURE = 0x829F;
+	static constexpr const GLenum COMPUTE_TEXTURE = 0x82A0;
+	static constexpr const GLenum TEXTURE_SHADOW = 0x82A1;
+	static constexpr const GLenum TEXTURE_GATHER = 0x82A2;
+	static constexpr const GLenum TEXTURE_GATHER_SHADOW = 0x82A3;
+	static constexpr const GLenum SHADER_IMAGE_LOAD = 0x82A4;
+	static constexpr const GLenum SHADER_IMAGE_STORE = 0x82A5;
+	static constexpr const GLenum SHADER_IMAGE_ATOMIC = 0x82A6;
+	static constexpr const GLenum IMAGE_TEXEL_SIZE = 0x82A7;
+	static constexpr const GLenum IMAGE_COMPATIBILITY_CLASS = 0x82A8;
+	static constexpr const GLenum IMAGE_PIXEL_FORMAT = 0x82A9;
+	static constexpr const GLenum IMAGE_PIXEL_TYPE = 0x82AA;
+	static constexpr const GLenum SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST = 0x82AC;
+	static constexpr const GLenum SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST = 0x82AD;
+	static constexpr const GLenum SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE = 0x82AE;
+	static constexpr const GLenum SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE = 0x82AF;
+	static constexpr const GLenum TEXTURE_COMPRESSED_BLOCK_WIDTH = 0x82B1;
+	static constexpr const GLenum TEXTURE_COMPRESSED_BLOCK_HEIGHT = 0x82B2;
+	static constexpr const GLenum TEXTURE_COMPRESSED_BLOCK_SIZE = 0x82B3;
+	static constexpr const GLenum CLEAR_BUFFER = 0x82B4;
+	static constexpr const GLenum TEXTURE_VIEW = 0x82B5;
+	static constexpr const GLenum VIEW_COMPATIBILITY_CLASS = 0x82B6;
+	static constexpr const GLenum FULL_SUPPORT = 0x82B7;
+	static constexpr const GLenum CAVEAT_SUPPORT = 0x82B8;
+	static constexpr const GLenum IMAGE_CLASS_4_X_32 = 0x82B9;
+	static constexpr const GLenum IMAGE_CLASS_2_X_32 = 0x82BA;
+	static constexpr const GLenum IMAGE_CLASS_1_X_32 = 0x82BB;
+	static constexpr const GLenum IMAGE_CLASS_4_X_16 = 0x82BC;
+	static constexpr const GLenum IMAGE_CLASS_2_X_16 = 0x82BD;
+	static constexpr const GLenum IMAGE_CLASS_1_X_16 = 0x82BE;
+	static constexpr const GLenum IMAGE_CLASS_4_X_8 = 0x82BF;
+	static constexpr const GLenum IMAGE_CLASS_2_X_8 = 0x82C0;
+	static constexpr const GLenum IMAGE_CLASS_1_X_8 = 0x82C1;
+	static constexpr const GLenum IMAGE_CLASS_11_11_10 = 0x82C2;
+	static constexpr const GLenum IMAGE_CLASS_10_10_10_2 = 0x82C3;
+	static constexpr const GLenum VIEW_CLASS_128_BITS = 0x82C4;
+	static constexpr const GLenum VIEW_CLASS_96_BITS = 0x82C5;
+	static constexpr const GLenum VIEW_CLASS_64_BITS = 0x82C6;
+	static constexpr const GLenum VIEW_CLASS_48_BITS = 0x82C7;
+	static constexpr const GLenum VIEW_CLASS_32_BITS = 0x82C8;
+	static constexpr const GLenum VIEW_CLASS_24_BITS = 0x82C9;
+	static constexpr const GLenum VIEW_CLASS_16_BITS = 0x82CA;
+	static constexpr const GLenum VIEW_CLASS_8_BITS = 0x82CB;
+	static constexpr const GLenum VIEW_CLASS_S3TC_DXT1_RGB = 0x82CC;
+	static constexpr const GLenum VIEW_CLASS_S3TC_DXT1_RGBA = 0x82CD;
+	static constexpr const GLenum VIEW_CLASS_S3TC_DXT3_RGBA = 0x82CE;
+	static constexpr const GLenum VIEW_CLASS_S3TC_DXT5_RGBA = 0x82CF;
+	static constexpr const GLenum VIEW_CLASS_RGTC1_RED = 0x82D0;
+	static constexpr const GLenum VIEW_CLASS_RGTC2_RG = 0x82D1;
+	static constexpr const GLenum VIEW_CLASS_BPTC_UNORM = 0x82D2;
+	static constexpr const GLenum VIEW_CLASS_BPTC_FLOAT = 0x82D3;
+	static constexpr const GLenum UNIFORM = 0x92E1;
+	static constexpr const GLenum UNIFORM_BLOCK = 0x92E2;
+	static constexpr const GLenum PROGRAM_INPUT = 0x92E3;
+	static constexpr const GLenum PROGRAM_OUTPUT = 0x92E4;
+	static constexpr const GLenum BUFFER_VARIABLE = 0x92E5;
+	static constexpr const GLenum SHADER_STORAGE_BLOCK = 0x92E6;
+	static constexpr const GLenum VERTEX_SUBROUTINE = 0x92E8;
+	static constexpr const GLenum TESS_CONTROL_SUBROUTINE = 0x92E9;
+	static constexpr const GLenum TESS_EVALUATION_SUBROUTINE = 0x92EA;
+	static constexpr const GLenum GEOMETRY_SUBROUTINE = 0x92EB;
+	static constexpr const GLenum FRAGMENT_SUBROUTINE = 0x92EC;
+	static constexpr const GLenum COMPUTE_SUBROUTINE = 0x92ED;
+	static constexpr const GLenum VERTEX_SUBROUTINE_UNIFORM = 0x92EE;
+	static constexpr const GLenum TESS_CONTROL_SUBROUTINE_UNIFORM = 0x92EF;
+	static constexpr const GLenum TESS_EVALUATION_SUBROUTINE_UNIFORM = 0x92F0;
+	static constexpr const GLenum GEOMETRY_SUBROUTINE_UNIFORM = 0x92F1;
+	static constexpr const GLenum FRAGMENT_SUBROUTINE_UNIFORM = 0x92F2;
+	static constexpr const GLenum COMPUTE_SUBROUTINE_UNIFORM = 0x92F3;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_VARYING = 0x92F4;
+	static constexpr const GLenum ACTIVE_RESOURCES = 0x92F5;
+	static constexpr const GLenum MAX_NAME_LENGTH = 0x92F6;
+	static constexpr const GLenum MAX_NUM_ACTIVE_VARIABLES = 0x92F7;
+	static constexpr const GLenum MAX_NUM_COMPATIBLE_SUBROUTINES = 0x92F8;
+	static constexpr const GLenum NAME_LENGTH = 0x92F9;
+	static constexpr const GLenum TYPE = 0x92FA;
+	static constexpr const GLenum ARRAY_SIZE = 0x92FB;
+	static constexpr const GLenum OFFSET = 0x92FC;
+	static constexpr const GLenum BLOCK_INDEX = 0x92FD;
+	static constexpr const GLenum ARRAY_STRIDE = 0x92FE;
+	static constexpr const GLenum MATRIX_STRIDE = 0x92FF;
+	static constexpr const GLenum IS_ROW_MAJOR = 0x9300;
+	static constexpr const GLenum ATOMIC_COUNTER_BUFFER_INDEX = 0x9301;
+	static constexpr const GLenum BUFFER_BINDING = 0x9302;
+	static constexpr const GLenum BUFFER_DATA_SIZE = 0x9303;
+	static constexpr const GLenum NUM_ACTIVE_VARIABLES = 0x9304;
+	static constexpr const GLenum ACTIVE_VARIABLES = 0x9305;
+	static constexpr const GLenum REFERENCED_BY_VERTEX_SHADER = 0x9306;
+	static constexpr const GLenum REFERENCED_BY_TESS_CONTROL_SHADER = 0x9307;
+	static constexpr const GLenum REFERENCED_BY_TESS_EVALUATION_SHADER = 0x9308;
+	static constexpr const GLenum REFERENCED_BY_GEOMETRY_SHADER = 0x9309;
+	static constexpr const GLenum REFERENCED_BY_FRAGMENT_SHADER = 0x930A;
+	static constexpr const GLenum REFERENCED_BY_COMPUTE_SHADER = 0x930B;
+	static constexpr const GLenum TOP_LEVEL_ARRAY_SIZE = 0x930C;
+	static constexpr const GLenum TOP_LEVEL_ARRAY_STRIDE = 0x930D;
+	static constexpr const GLenum LOCATION = 0x930E;
+	static constexpr const GLenum LOCATION_INDEX = 0x930F;
+	static constexpr const GLenum IS_PER_PATCH = 0x92E7;
+	static constexpr const GLenum SHADER_STORAGE_BUFFER = 0x90D2;
+	static constexpr const GLenum SHADER_STORAGE_BUFFER_BINDING = 0x90D3;
+	static constexpr const GLenum SHADER_STORAGE_BUFFER_START = 0x90D4;
+	static constexpr const GLenum SHADER_STORAGE_BUFFER_SIZE = 0x90D5;
+	static constexpr const GLenum MAX_VERTEX_SHADER_STORAGE_BLOCKS = 0x90D6;
+	static constexpr const GLenum MAX_GEOMETRY_SHADER_STORAGE_BLOCKS = 0x90D7;
+	static constexpr const GLenum MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS = 0x90D8;
+	static constexpr const GLenum MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS = 0x90D9;
+	static constexpr const GLenum MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 0x90DA;
+	static constexpr const GLenum MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 0x90DB;
+	static constexpr const GLenum MAX_COMBINED_SHADER_STORAGE_BLOCKS = 0x90DC;
+	static constexpr const GLenum MAX_SHADER_STORAGE_BUFFER_BINDINGS = 0x90DD;
+	static constexpr const GLenum MAX_SHADER_STORAGE_BLOCK_SIZE = 0x90DE;
+	static constexpr const GLenum SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 0x90DF;
+	static constexpr const GLenum SHADER_STORAGE_BARRIER_BIT = 0x00002000;
+	static constexpr const GLenum MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 0x8F39;
+	static constexpr const GLenum DEPTH_STENCIL_TEXTURE_MODE = 0x90EA;
+	static constexpr const GLenum TEXTURE_BUFFER_OFFSET = 0x919D;
+	static constexpr const GLenum TEXTURE_BUFFER_SIZE = 0x919E;
+	static constexpr const GLenum TEXTURE_BUFFER_OFFSET_ALIGNMENT = 0x919F;
+	static constexpr const GLenum TEXTURE_VIEW_MIN_LEVEL = 0x82DB;
+	static constexpr const GLenum TEXTURE_VIEW_NUM_LEVELS = 0x82DC;
+	static constexpr const GLenum TEXTURE_VIEW_MIN_LAYER = 0x82DD;
+	static constexpr const GLenum TEXTURE_VIEW_NUM_LAYERS = 0x82DE;
+	static constexpr const GLenum TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
+	static constexpr const GLenum VERTEX_ATTRIB_BINDING = 0x82D4;
+	static constexpr const GLenum VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D5;
+	static constexpr const GLenum VERTEX_BINDING_DIVISOR = 0x82D6;
+	static constexpr const GLenum VERTEX_BINDING_OFFSET = 0x82D7;
+	static constexpr const GLenum VERTEX_BINDING_STRIDE = 0x82D8;
+	static constexpr const GLenum MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 0x82D9;
+	static constexpr const GLenum MAX_VERTEX_ATTRIB_BINDINGS = 0x82DA;
+	static constexpr const GLenum VERTEX_BINDING_BUFFER = 0x8F4F;
+	static constexpr const GLenum MAX_VERTEX_ATTRIB_STRIDE = 0x82E5;
+	static constexpr const GLenum PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221;
+	static constexpr const GLenum TEXTURE_BUFFER_BINDING = 0x8C2A;
+	static constexpr const GLenum MAP_PERSISTENT_BIT = 0x0040;
+	static constexpr const GLenum MAP_COHERENT_BIT = 0x0080;
+	static constexpr const GLenum DYNAMIC_STORAGE_BIT = 0x0100;
+	static constexpr const GLenum CLIENT_STORAGE_BIT = 0x0200;
+	static constexpr const GLenum CLIENT_MAPPED_BUFFER_BARRIER_BIT = 0x00004000;
+	static constexpr const GLenum BUFFER_IMMUTABLE_STORAGE = 0x821F;
+	static constexpr const GLenum BUFFER_STORAGE_FLAGS = 0x8220;
+	static constexpr const GLenum CLEAR_TEXTURE = 0x9365;
+	static constexpr const GLenum LOCATION_COMPONENT = 0x934A;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_INDEX = 0x934B;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_BUFFER_STRIDE = 0x934C;
+	static constexpr const GLenum QUERY_BUFFER = 0x9192;
+	static constexpr const GLenum QUERY_BUFFER_BARRIER_BIT = 0x00008000;
+	static constexpr const GLenum QUERY_BUFFER_BINDING = 0x9193;
+	static constexpr const GLenum QUERY_RESULT_NO_WAIT = 0x9194;
+	static constexpr const GLenum MIRROR_CLAMP_TO_EDGE = 0x8743;
+	static constexpr const GLenum CONTEXT_LOST = 0x0507;
+	static constexpr const GLenum NEGATIVE_ONE_TO_ONE = 0x935E;
+	static constexpr const GLenum ZERO_TO_ONE = 0x935F;
+	static constexpr const GLenum CLIP_ORIGIN = 0x935C;
+	static constexpr const GLenum CLIP_DEPTH_MODE = 0x935D;
+	static constexpr const GLenum QUERY_WAIT_INVERTED = 0x8E17;
+	static constexpr const GLenum QUERY_NO_WAIT_INVERTED = 0x8E18;
+	static constexpr const GLenum QUERY_BY_REGION_WAIT_INVERTED = 0x8E19;
+	static constexpr const GLenum QUERY_BY_REGION_NO_WAIT_INVERTED = 0x8E1A;
+	static constexpr const GLenum MAX_CULL_DISTANCES = 0x82F9;
+	static constexpr const GLenum MAX_COMBINED_CLIP_AND_CULL_DISTANCES = 0x82FA;
+	static constexpr const GLenum TEXTURE_TARGET = 0x1006;
+	static constexpr const GLenum QUERY_TARGET = 0x82EA;
+	static constexpr const GLenum GUILTY_CONTEXT_RESET = 0x8253;
+	static constexpr const GLenum INNOCENT_CONTEXT_RESET = 0x8254;
+	static constexpr const GLenum UNKNOWN_CONTEXT_RESET = 0x8255;
+	static constexpr const GLenum RESET_NOTIFICATION_STRATEGY = 0x8256;
+	static constexpr const GLenum LOSE_CONTEXT_ON_RESET = 0x8252;
+	static constexpr const GLenum NO_RESET_NOTIFICATION = 0x8261;
+	static constexpr const GLenum CONTEXT_FLAG_ROBUST_ACCESS_BIT = 0x00000004;
+	static constexpr const GLenum CONTEXT_RELEASE_BEHAVIOR = 0x82FB;
+	static constexpr const GLenum CONTEXT_RELEASE_BEHAVIOR_FLUSH = 0x82FC;
+	static constexpr const GLenum SHADER_BINARY_FORMAT_SPIR_V = 0x9551;
+	static constexpr const GLenum SPIR_V_BINARY = 0x9552;
+	static constexpr const GLenum PARAMETER_BUFFER = 0x80EE;
+	static constexpr const GLenum PARAMETER_BUFFER_BINDING = 0x80EF;
+	static constexpr const GLenum CONTEXT_FLAG_NO_ERROR_BIT = 0x00000008;
+	static constexpr const GLenum VERTICES_SUBMITTED = 0x82EE;
+	static constexpr const GLenum PRIMITIVES_SUBMITTED = 0x82EF;
+	static constexpr const GLenum VERTEX_SHADER_INVOCATIONS = 0x82F0;
+	static constexpr const GLenum TESS_CONTROL_SHADER_PATCHES = 0x82F1;
+	static constexpr const GLenum TESS_EVALUATION_SHADER_INVOCATIONS = 0x82F2;
+	static constexpr const GLenum GEOMETRY_SHADER_PRIMITIVES_EMITTED = 0x82F3;
+	static constexpr const GLenum FRAGMENT_SHADER_INVOCATIONS = 0x82F4;
+	static constexpr const GLenum COMPUTE_SHADER_INVOCATIONS = 0x82F5;
+	static constexpr const GLenum CLIPPING_INPUT_PRIMITIVES = 0x82F6;
+	static constexpr const GLenum CLIPPING_OUTPUT_PRIMITIVES = 0x82F7;
+	static constexpr const GLenum POLYGON_OFFSET_CLAMP = 0x8E1B;
+	static constexpr const GLenum SPIR_V_EXTENSIONS = 0x9553;
+	static constexpr const GLenum NUM_SPIR_V_EXTENSIONS = 0x9554;
+	static constexpr const GLenum TEXTURE_MAX_ANISOTROPY = 0x84FE;
+	static constexpr const GLenum MAX_TEXTURE_MAX_ANISOTROPY = 0x84FF;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_OVERFLOW = 0x82EC;
+	static constexpr const GLenum TRANSFORM_FEEDBACK_STREAM_OVERFLOW = 0x82ED;
+	static constexpr const GLenum PRIMITIVE_BOUNDING_BOX = 0x92BE;
+	static constexpr const GLenum MULTISAMPLE_LINE_WIDTH_RANGE = 0x9381;
+	static constexpr const GLenum MULTISAMPLE_LINE_WIDTH_GRANULARITY = 0x9382;
+	static constexpr const GLenum UNSIGNED_INT64 = 0x140F;
+	static constexpr const GLenum SYNC_CL_EVENT = 0x8240;
+	static constexpr const GLenum SYNC_CL_EVENT_COMPLETE = 0x8241;
+	static constexpr const GLenum MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS = 0x9344;
+	static constexpr const GLenum MAX_COMPUTE_FIXED_GROUP_INVOCATIONS = 0x90EB;
+	static constexpr const GLenum MAX_COMPUTE_VARIABLE_GROUP_SIZE = 0x9345;
+	static constexpr const GLenum MAX_COMPUTE_FIXED_GROUP_SIZE = 0x91BF;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_LAYER_COUNT = 0x8DA9;
+	static constexpr const GLenum MAX_GEOMETRY_VARYING_COMPONENTS = 0x8DDD;
+	static constexpr const GLenum MAX_VERTEX_VARYING_COMPONENTS = 0x8DDE;
+	static constexpr const GLenum INT64 = 0x140E;
+	static constexpr const GLenum INT64_VEC2 = 0x8FE9;
+	static constexpr const GLenum INT64_VEC3 = 0x8FEA;
+	static constexpr const GLenum INT64_VEC4 = 0x8FEB;
+	static constexpr const GLenum UNSIGNED_INT64_VEC2 = 0x8FF5;
+	static constexpr const GLenum UNSIGNED_INT64_VEC3 = 0x8FF6;
+	static constexpr const GLenum UNSIGNED_INT64_VEC4 = 0x8FF7;
+	static constexpr const GLenum SRGB_DECODE = 0x8299;
+	static constexpr const GLenum VIEW_CLASS_EAC_R11 = 0x9383;
+	static constexpr const GLenum VIEW_CLASS_EAC_RG11 = 0x9384;
+	static constexpr const GLenum VIEW_CLASS_ETC2_RGB = 0x9385;
+	static constexpr const GLenum VIEW_CLASS_ETC2_RGBA = 0x9386;
+	static constexpr const GLenum VIEW_CLASS_ETC2_EAC_RGBA = 0x9387;
+	static constexpr const GLenum VIEW_CLASS_ASTC_4x4_RGBA = 0x9388;
+	static constexpr const GLenum VIEW_CLASS_ASTC_5x4_RGBA = 0x9389;
+	static constexpr const GLenum VIEW_CLASS_ASTC_5x5_RGBA = 0x938A;
+	static constexpr const GLenum VIEW_CLASS_ASTC_6x5_RGBA = 0x938B;
+	static constexpr const GLenum VIEW_CLASS_ASTC_6x6_RGBA = 0x938C;
+	static constexpr const GLenum VIEW_CLASS_ASTC_8x5_RGBA = 0x938D;
+	static constexpr const GLenum VIEW_CLASS_ASTC_8x6_RGBA = 0x938E;
+	static constexpr const GLenum VIEW_CLASS_ASTC_8x8_RGBA = 0x938F;
+	static constexpr const GLenum VIEW_CLASS_ASTC_10x5_RGBA = 0x9390;
+	static constexpr const GLenum VIEW_CLASS_ASTC_10x6_RGBA = 0x9391;
+	static constexpr const GLenum VIEW_CLASS_ASTC_10x8_RGBA = 0x9392;
+	static constexpr const GLenum VIEW_CLASS_ASTC_10x10_RGBA = 0x9393;
+	static constexpr const GLenum VIEW_CLASS_ASTC_12x10_RGBA = 0x9394;
+	static constexpr const GLenum VIEW_CLASS_ASTC_12x12_RGBA = 0x9395;
+	static constexpr const GLenum MAX_SHADER_COMPILER_THREADS = 0x91B0;
+	static constexpr const GLenum COMPLETION_STATUS = 0x91B1;
+	static constexpr const GLenum SAMPLE_LOCATION_SUBPIXEL_BITS = 0x933D;
+	static constexpr const GLenum SAMPLE_LOCATION_PIXEL_GRID_WIDTH = 0x933E;
+	static constexpr const GLenum SAMPLE_LOCATION_PIXEL_GRID_HEIGHT = 0x933F;
+	static constexpr const GLenum PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE = 0x9340;
+	static constexpr const GLenum SAMPLE_LOCATION = 0x8E50;
+	static constexpr const GLenum PROGRAMMABLE_SAMPLE_LOCATION = 0x9341;
+	static constexpr const GLenum FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS = 0x9342;
+	static constexpr const GLenum FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID = 0x9343;
+	static constexpr const GLenum SHADER_INCLUDE = 0x8DAE;
+	static constexpr const GLenum NAMED_STRING_LENGTH = 0x8DE9;
+	static constexpr const GLenum NAMED_STRING_TYPE = 0x8DEA;
+	static constexpr const GLenum SPARSE_STORAGE_BIT = 0x0400;
+	static constexpr const GLenum SPARSE_BUFFER_PAGE_SIZE = 0x82F8;
+	static constexpr const GLenum TEXTURE_SPARSE = 0x91A6;
+	static constexpr const GLenum VIRTUAL_PAGE_SIZE_INDEX = 0x91A7;
+	static constexpr const GLenum NUM_SPARSE_LEVELS = 0x91AA;
+	static constexpr const GLenum NUM_VIRTUAL_PAGE_SIZES = 0x91A8;
+	static constexpr const GLenum VIRTUAL_PAGE_SIZE_X = 0x9195;
+	static constexpr const GLenum VIRTUAL_PAGE_SIZE_Y = 0x9196;
+	static constexpr const GLenum VIRTUAL_PAGE_SIZE_Z = 0x9197;
+	static constexpr const GLenum MAX_SPARSE_TEXTURE_SIZE = 0x9198;
+	static constexpr const GLenum MAX_SPARSE_3D_TEXTURE_SIZE = 0x9199;
+	static constexpr const GLenum MAX_SPARSE_ARRAY_TEXTURE_LAYERS = 0x919A;
+	static constexpr const GLenum SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS = 0x91A9;
+	static constexpr const GLenum TEXTURE_BUFFER_FORMAT = 0x8C2E;
+	static constexpr const GLenum TEXTURE_REDUCTION_MODE = 0x9366;
+	static constexpr const GLenum WEIGHTED_AVERAGE = 0x9367;
+	static constexpr const GLenum MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS = 0x8F9F;
+	static constexpr const GLenum MULTIPLY = 0x9294;
+	static constexpr const GLenum SCREEN = 0x9295;
+	static constexpr const GLenum OVERLAY = 0x9296;
+	static constexpr const GLenum DARKEN = 0x9297;
+	static constexpr const GLenum LIGHTEN = 0x9298;
+	static constexpr const GLenum COLORDODGE = 0x9299;
+	static constexpr const GLenum COLORBURN = 0x929A;
+	static constexpr const GLenum HARDLIGHT = 0x929B;
+	static constexpr const GLenum SOFTLIGHT = 0x929C;
+	static constexpr const GLenum _DIFFERENCE = 0x929E;
+	static constexpr const GLenum EXCLUSION = 0x92A0;
+	static constexpr const GLenum HSL_HUE = 0x92AD;
+	static constexpr const GLenum HSL_SATURATION = 0x92AE;
+	static constexpr const GLenum HSL_COLOR = 0x92AF;
+	static constexpr const GLenum HSL_LUMINOSITY = 0x92B0;
+	static constexpr const GLenum BLEND_ADVANCED_COHERENT = 0x9285;
+	static constexpr const GLenum CONTEXT_ROBUST_ACCESS = 0x90F3;
+	static constexpr const GLenum SUBGROUP_SIZE = 0x9532;
+	static constexpr const GLenum SUBGROUP_SUPPORTED_STAGES = 0x9533;
+	static constexpr const GLenum SUBGROUP_SUPPORTED_FEATURES = 0x9534;
+	static constexpr const GLenum SUBGROUP_QUAD_ALL_STAGES = 0x9535;
+	static constexpr const GLenum SUBGROUP_FEATURE_BASIC_BIT = 0x00000001;
+	static constexpr const GLenum SUBGROUP_FEATURE_VOTE_BIT = 0x00000002;
+	static constexpr const GLenum SUBGROUP_FEATURE_ARITHMETIC_BIT = 0x00000004;
+	static constexpr const GLenum SUBGROUP_FEATURE_BALLOT_BIT = 0x00000008;
+	static constexpr const GLenum SUBGROUP_FEATURE_SHUFFLE_BIT = 0x00000010;
+	static constexpr const GLenum SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT = 0x00000020;
+	static constexpr const GLenum SUBGROUP_FEATURE_CLUSTERED_BIT = 0x00000040;
+	static constexpr const GLenum SUBGROUP_FEATURE_QUAD_BIT = 0x00000080;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_4x4 = 0x93B0;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_5x4 = 0x93B1;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_5x5 = 0x93B2;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_6x5 = 0x93B3;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_6x6 = 0x93B4;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_8x5 = 0x93B5;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_8x6 = 0x93B6;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_8x8 = 0x93B7;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_10x5 = 0x93B8;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_10x6 = 0x93B9;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_10x8 = 0x93BA;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_10x10 = 0x93BB;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_12x10 = 0x93BC;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_12x12 = 0x93BD;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_4x4 = 0x93D0;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_5x4 = 0x93D1;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_5x5 = 0x93D2;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_6x5 = 0x93D3;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_6x6 = 0x93D4;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_8x5 = 0x93D5;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_8x6 = 0x93D6;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_8x8 = 0x93D7;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_10x5 = 0x93D8;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_10x6 = 0x93D9;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_10x8 = 0x93DA;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_10x10 = 0x93DB;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_12x10 = 0x93DC;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_12x12 = 0x93DD;
+	static constexpr const GLenum PROGRAM_PIPELINE_OBJECT = 0x8A4F;
+	static constexpr const GLenum PROGRAM_OBJECT = 0x8B40;
+	static constexpr const GLenum SHADER_OBJECT = 0x8B48;
+	static constexpr const GLenum BUFFER_OBJECT = 0x9151;
+	static constexpr const GLenum QUERY_OBJECT = 0x9153;
+	static constexpr const GLenum VERTEX_ARRAY_OBJECT = 0x9154;
+	static constexpr const GLenum PROGRAM_MATRIX = 0x8E2D;
+	static constexpr const GLenum TRANSPOSE_PROGRAM_MATRIX = 0x8E2E;
+	static constexpr const GLenum PROGRAM_MATRIX_STACK_DEPTH = 0x8E2F;
+	static constexpr const GLenum RASTER_MULTISAMPLE = 0x9327;
+	static constexpr const GLenum RASTER_SAMPLES = 0x9328;
+	static constexpr const GLenum MAX_RASTER_SAMPLES = 0x9329;
+	static constexpr const GLenum RASTER_FIXED_SAMPLE_LOCATIONS = 0x932A;
+	static constexpr const GLenum MULTISAMPLE_RASTERIZATION_ALLOWED = 0x932B;
+	static constexpr const GLenum EFFECTIVE_RASTER_SAMPLES = 0x932C;
+	static constexpr const GLenum FRAGMENT_SHADER_DISCARDS_SAMPLES = 0x8A52;
+	static constexpr const GLenum COMPRESSED_RGB_S3TC_DXT1 = 0x83F0;
+	static constexpr const GLenum COMPRESSED_RGBA_S3TC_DXT1 = 0x83F1;
+	static constexpr const GLenum COMPRESSED_RGBA_S3TC_DXT3 = 0x83F2;
+	static constexpr const GLenum COMPRESSED_RGBA_S3TC_DXT5 = 0x83F3;
+	static constexpr const GLenum SR8 = 0x8FBD;
+	static constexpr const GLenum SRG8 = 0x8FBE;
+	static constexpr const GLenum TEXTURE_SRGB_DECODE = 0x8A48;
+	static constexpr const GLenum DECODE = 0x8A49;
+	static constexpr const GLenum SKIP_DECODE = 0x8A4A;
+	static constexpr const GLenum ALPHA8 = 0x803C;
+	static constexpr const GLenum LUMINANCE8 = 0x8040;
+	static constexpr const GLenum LUMINANCE8_ALPHA8 = 0x8045;
+	static constexpr const GLenum ALPHA32F = 0x8816;
+	static constexpr const GLenum LUMINANCE32F = 0x8818;
+	static constexpr const GLenum LUMINANCE_ALPHA32F = 0x8819;
+	static constexpr const GLenum ALPHA16F = 0x881C;
+	static constexpr const GLenum LUMINANCE16F = 0x881E;
+	static constexpr const GLenum LUMINANCE_ALPHA16F = 0x881F;
+	static constexpr const GLenum BGRA8 = 0x93A1;
+	static constexpr const GLenum INCLUSIVE = 0x8F10;
+	static constexpr const GLenum EXCLUSIVE = 0x8F11;
+	static constexpr const GLenum WINDOW_RECTANGLE = 0x8F12;
+	static constexpr const GLenum WINDOW_RECTANGLE_MODE = 0x8F13;
+	static constexpr const GLenum MAX_WINDOW_RECTANGLES = 0x8F14;
+	static constexpr const GLenum NUM_WINDOW_RECTANGLES = 0x8F15;
+	static constexpr const GLenum TEXTURE_EXTERNAL = 0x8D65;
+	static constexpr const GLenum TEXTURE_BINDING_EXTERNAL = 0x8D67;
+	static constexpr const GLenum REQUIRED_TEXTURE_IMAGE_UNITS = 0x8D68;
+	static constexpr const GLenum SAMPLER_EXTERNAL = 0x8D66;
+	static constexpr const GLenum ETC1_RGB8 = 0x8D64;
+	static constexpr const GLenum PALETTE4_RGB8 = 0x8B90;
+	static constexpr const GLenum PALETTE4_RGBA8 = 0x8B91;
+	static constexpr const GLenum PALETTE4_R5_G6_B5 = 0x8B92;
+	static constexpr const GLenum PALETTE4_RGBA4 = 0x8B93;
+	static constexpr const GLenum PALETTE4_RGB5_A1 = 0x8B94;
+	static constexpr const GLenum PALETTE8_RGB8 = 0x8B95;
+	static constexpr const GLenum PALETTE8_RGBA8 = 0x8B96;
+	static constexpr const GLenum PALETTE8_R5_G6_B5 = 0x8B97;
+	static constexpr const GLenum PALETTE8_RGBA4 = 0x8B98;
+	static constexpr const GLenum PALETTE8_RGB5_A1 = 0x8B99;
+	static constexpr const GLenum GEOMETRY_LINKED_VERTICES_OUT = 0x8916;
+	static constexpr const GLenum GEOMETRY_LINKED_INPUT_TYPE = 0x8917;
+	static constexpr const GLenum GEOMETRY_LINKED_OUTPUT_TYPE = 0x8918;
+	static constexpr const GLenum LUMINANCE4_ALPHA4 = 0x8043;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET = 0x8CD4;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_3x3x3 = 0x93C0;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_4x3x3 = 0x93C1;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_4x4x3 = 0x93C2;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_4x4x4 = 0x93C3;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_5x4x4 = 0x93C4;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_5x5x4 = 0x93C5;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_5x5x5 = 0x93C6;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_6x5x5 = 0x93C7;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_6x6x5 = 0x93C8;
+	static constexpr const GLenum COMPRESSED_RGBA_ASTC_6x6x6 = 0x93C9;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3 = 0x93E0;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3 = 0x93E1;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3 = 0x93E2;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4 = 0x93E3;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4 = 0x93E4;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4 = 0x93E5;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5 = 0x93E6;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5 = 0x93E7;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5 = 0x93E8;
+	static constexpr const GLenum COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6 = 0x93E9;
+	static constexpr const GLenum INT_10_10_10_2 = 0x8DF7;
+	static constexpr const GLenum MALI_PROGRAM_BINARY_ARM = 0x8F61;
+	static constexpr const GLenum MALI_SHADER_BINARY_ARM = 0x8F60;
+	static constexpr const GLenum FETCH_PER_SAMPLE_ARM = 0x8F65;
+	static constexpr const GLenum FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM = 0x8F66;
+	static constexpr const GLenum TEXTURE_UNNORMALIZED_COORDINATES_ARM = 0x8F6A;
+	static constexpr const GLenum SMAPHS30_PROGRAM_BINARY_DMP = 0x9251;
+	static constexpr const GLenum SMAPHS_PROGRAM_BINARY_DMP = 0x9252;
+	static constexpr const GLenum DMP_PROGRAM_BINARY_DMP = 0x9253;
+	static constexpr const GLenum SHADER_BINARY_DMP = 0x9250;
+	static constexpr const GLenum SURFACE_COMPRESSION = 0x96C0;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_NONE = 0x96C1;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_DEFAULT = 0x96C2;
+	static constexpr const GLenum SAMPLER_EXTERNAL_2D_Y2Y = 0x8BE7;
+	static constexpr const GLenum GPU_DISJOINT = 0x8FBB;
+	static constexpr const GLenum SHADING_RATE_1X1_PIXELS = 0x96A6;
+	static constexpr const GLenum SHADING_RATE_1X2_PIXELS = 0x96A7;
+	static constexpr const GLenum SHADING_RATE_2X1_PIXELS = 0x96A8;
+	static constexpr const GLenum SHADING_RATE_2X2_PIXELS = 0x96A9;
+	static constexpr const GLenum SHADING_RATE_1X4_PIXELS = 0x96AA;
+	static constexpr const GLenum SHADING_RATE_4X1_PIXELS = 0x96AB;
+	static constexpr const GLenum SHADING_RATE_4X2_PIXELS = 0x96AC;
+	static constexpr const GLenum SHADING_RATE_2X4_PIXELS = 0x96AD;
+	static constexpr const GLenum SHADING_RATE_4X4_PIXELS = 0x96AE;
+	static constexpr const GLenum SHADING_RATE = 0x96D0;
+	static constexpr const GLenum SHADING_RATE_ATTACHMENT = 0x96D1;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP = 0x96D2;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE = 0x96D3;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_COMBINER_OP_MIN = 0x96D4;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_COMBINER_OP_MAX = 0x96D5;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_COMBINER_OP_MUL = 0x96D6;
+	static constexpr const GLenum MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH = 0x96D7;
+	static constexpr const GLenum MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH = 0x96D8;
+	static constexpr const GLenum MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT = 0x96D9;
+	static constexpr const GLenum MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT = 0x96DA;
+	static constexpr const GLenum MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_ASPECT_RATIO = 0x96DB;
+	static constexpr const GLenum MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_LAYERS = 0x96DC;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_WITH_SHADER_DEPTH_STENCIL_WRITES_SUPPORTED = 0x96DD;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_WITH_SAMPLE_MASK_SUPPORTED = 0x96DE;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_ATTACHMENT_WITH_DEFAULT_FRAMEBUFFER_SUPPORTED = 0x96DF;
+	static constexpr const GLenum FRAGMENT_SHADING_RATE_NON_TRIVIAL_COMBINERS_SUPPORTED = 0x8F6F;
+	static constexpr const GLenum TEXTURE_TILING = 0x9580;
+	static constexpr const GLenum DEDICATED_MEMORY_OBJECT = 0x9581;
+	static constexpr const GLenum PROTECTED_MEMORY_OBJECT = 0x959B;
+	static constexpr const GLenum NUM_TILING_TYPES = 0x9582;
+	static constexpr const GLenum TILING_TYPES = 0x9583;
+	static constexpr const GLenum OPTIMAL_TILING = 0x9584;
+	static constexpr const GLenum LINEAR_TILING = 0x9585;
+	static constexpr const GLenum NUM_DEVICE_UUIDS = 0x9596;
+	static constexpr const GLenum DEVICE_UUID = 0x9597;
+	static constexpr const GLenum DRIVER_UUID = 0x9598;
+	static constexpr const GLenum HANDLE_TYPE_OPAQUE_FD = 0x9586;
+	static constexpr const GLenum HANDLE_TYPE_OPAQUE_WIN32 = 0x9587;
+	static constexpr const GLenum HANDLE_TYPE_OPAQUE_WIN32_KMT = 0x9588;
+	static constexpr const GLenum DEVICE_LUID = 0x9599;
+	static constexpr const GLenum DEVICE_NODE_MASK = 0x959A;
+	static constexpr const GLenum HANDLE_TYPE_D3D12_TILEPOOL = 0x9589;
+	static constexpr const GLenum HANDLE_TYPE_D3D12_RESOURCE = 0x958A;
+	static constexpr const GLenum HANDLE_TYPE_D3D11_IMAGE = 0x958B;
+	static constexpr const GLenum HANDLE_TYPE_D3D11_IMAGE_KMT = 0x958C;
+	static constexpr const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES = 0x8D6C;
+	static constexpr const GLenum COLOR_ATTACHMENT = 0x90F0;
+	static constexpr const GLenum MULTIVIEW = 0x90F1;
+	static constexpr const GLenum MAX_MULTIVIEW_BUFFERS = 0x90F2;
+	static constexpr const GLenum CONTEXT_FLAG_PROTECTED_CONTENT_BIT = 0x00000010;
+	static constexpr const GLenum TEXTURE_PROTECTED = 0x8BFA;
+	static constexpr const GLenum COMPRESSED_SRGB_PVRTC_2BPPV1 = 0x8A54;
+	static constexpr const GLenum COMPRESSED_SRGB_PVRTC_4BPPV1 = 0x8A55;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1 = 0x8A56;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1 = 0x8A57;
+	static constexpr const GLenum LAYOUT_GENERAL = 0x958D;
+	static constexpr const GLenum LAYOUT_COLOR_ATTACHMENT = 0x958E;
+	static constexpr const GLenum LAYOUT_DEPTH_STENCIL_ATTACHMENT = 0x958F;
+	static constexpr const GLenum LAYOUT_DEPTH_STENCIL_READ_ONLY = 0x9590;
+	static constexpr const GLenum LAYOUT_SHADER_READ_ONLY = 0x9591;
+	static constexpr const GLenum LAYOUT_TRANSFER_SRC = 0x9592;
+	static constexpr const GLenum LAYOUT_TRANSFER_DST = 0x9593;
+	static constexpr const GLenum LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT = 0x9530;
+	static constexpr const GLenum LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY = 0x9531;
+	static constexpr const GLenum HANDLE_TYPE_D3D12_FENCE = 0x9594;
+	static constexpr const GLenum D3D12_FENCE_VALUE = 0x9595;
+	static constexpr const GLenum MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE = 0x8F63;
+	static constexpr const GLenum MAX_SHADER_PIXEL_LOCAL_STORAGE_SIZE = 0x8F67;
+	static constexpr const GLenum SHADER_PIXEL_LOCAL_STORAGE = 0x8F64;
+	static constexpr const GLenum MAX_SHADER_COMBINED_LOCAL_STORAGE_FAST_SIZE = 0x9650;
+	static constexpr const GLenum MAX_SHADER_COMBINED_LOCAL_STORAGE_SIZE = 0x9651;
+	static constexpr const GLenum FRAMEBUFFER_INCOMPLETE_INSUFFICIENT_SHADER_COMBINED_LOCAL_STORAGE = 0x9652;
+	static constexpr const GLenum TEXTURE_ASTC_DECODE_PRECISION = 0x8F69;
+	static constexpr const GLenum COMPRESSED_RED_GREEN_RGTC2 = 0x8DBD;
+	static constexpr const GLenum COMPRESSED_SIGNED_RED_GREEN_RGTC2 = 0x8DBE;
+	static constexpr const GLenum COMPRESSED_SRGB_S3TC_DXT1 = 0x8C4C;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT1 = 0x8C4D;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT3 = 0x8C4E;
+	static constexpr const GLenum COMPRESSED_SRGB_ALPHA_S3TC_DXT5 = 0x8C4F;
+	static constexpr const GLenum TEXTURE_FORMAT_SRGB_OVERRIDE = 0x8FBF;
+	static constexpr const GLenum NUM_SURFACE_COMPRESSION_FIXED_RATES = 0x8F6E;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_1BPC = 0x96C4;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_2BPC = 0x96C5;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_3BPC = 0x96C6;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_4BPC = 0x96C7;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_5BPC = 0x96C8;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_6BPC = 0x96C9;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_7BPC = 0x96CA;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_8BPC = 0x96CB;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_9BPC = 0x96CC;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_10BPC = 0x96CD;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_11BPC = 0x96CE;
+	static constexpr const GLenum SURFACE_COMPRESSION_FIXED_RATE_12BPC = 0x96CF;
+	static constexpr const GLenum GCCSO_SHADER_BINARY_FJ = 0x9260;
+	static constexpr const GLenum STATE_RESTORE = 0x8BDC;
+	static constexpr const GLenum SHADER_BINARY_VIV = 0x8FC4;
+
+	static constexpr const GLenum ZERO = 0;
+	static constexpr const GLenum ONE = 1;
+	static constexpr const GLenum NONE = 0;
+};
+
+// Global GL procedures object.
+IRRLICHT_API extern OpenGLProcedures GL;
diff --git a/irr/include/path.h b/irr/include/path.h
new file mode 100644
index 000000000..06476ef7b
--- /dev/null
+++ b/irr/include/path.h
@@ -0,0 +1,86 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine" and the "irrXML" project.
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrString.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! Type used for all file system related strings.
+/** This type will transparently handle different file system encodings.
+	NOTE: For historical reasons the tool-functions using io::path are all in coreutil.h
+*/
+typedef core::string<fschar_t> path;
+
+// Type only exists for historcal reasons, paths are always char now.
+static_assert(sizeof(fschar_t) == sizeof(char));
+
+//! Used in places where we identify objects by a filename, but don't actually work with the real filename
+/** Irrlicht is internally not case-sensitive when it comes to names.
+	Also this class is a first step towards support for correctly serializing renamed objects.
+*/
+struct SNamedPath
+{
+	//! Constructor
+	SNamedPath() {}
+
+	//! Constructor
+	SNamedPath(const path &p) :
+			Path(p), InternalName(PathToName(p))
+	{
+	}
+
+	//! Is smaller comparator
+	bool operator<(const SNamedPath &other) const
+	{
+		return InternalName < other.InternalName;
+	}
+
+	//! Set the path.
+	void setPath(const path &p)
+	{
+		Path = p;
+		InternalName = PathToName(p);
+	}
+
+	//! Get the path.
+	const path &getPath() const
+	{
+		return Path;
+	};
+
+	//! Get the name which is used to identify the file.
+	//! This string is similar to the names and filenames used before Irrlicht 1.7
+	const path &getInternalName() const
+	{
+		return InternalName;
+	}
+
+	//! Implicit cast to io::path
+	operator core::stringc() const
+	{
+		return core::stringc(getPath());
+	}
+
+protected:
+	// convert the given path string to a name string.
+	path PathToName(const path &p) const
+	{
+		path name(p);
+		name.replace('\\', '/');
+		name.make_lower();
+		return name;
+	}
+
+private:
+	path Path;
+	path InternalName;
+};
+
+} // io
+} // irr
diff --git a/irr/include/plane3d.h b/irr/include/plane3d.h
new file mode 100644
index 000000000..4003325b5
--- /dev/null
+++ b/irr/include/plane3d.h
@@ -0,0 +1,244 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrMath.h"
+#include "vector3d.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! Enumeration for intersection relations of 3d objects
+enum EIntersectionRelation3D
+{
+	ISREL3D_FRONT = 0,
+	ISREL3D_BACK,
+	ISREL3D_PLANAR,
+	ISREL3D_SPANNING,
+	ISREL3D_CLIPPED
+};
+
+//! Template plane class with some intersection testing methods.
+/** It has to be ensured, that the normal is always normalized. The constructors
+	and setters of this class will not ensure this automatically. So any normal
+	passed in has to be normalized in advance. No change to the normal will be
+	made by any of the class methods.
+*/
+template <class T>
+class plane3d
+{
+public:
+	// Constructors
+
+	plane3d() :
+			Normal(0, 1, 0) { recalculateD(vector3d<T>(0, 0, 0)); }
+
+	plane3d(const vector3d<T> &MPoint, const vector3d<T> &Normal) :
+			Normal(Normal) { recalculateD(MPoint); }
+
+	plane3d(T px, T py, T pz, T nx, T ny, T nz) :
+			Normal(nx, ny, nz) { recalculateD(vector3d<T>(px, py, pz)); }
+
+	plane3d(const vector3d<T> &point1, const vector3d<T> &point2, const vector3d<T> &point3)
+	{
+		setPlane(point1, point2, point3);
+	}
+
+	plane3d(const vector3d<T> &normal, const T d) :
+			Normal(normal), D(d) {}
+
+	// operators
+
+	inline bool operator==(const plane3d<T> &other) const { return (equals(D, other.D) && Normal == other.Normal); }
+
+	inline bool operator!=(const plane3d<T> &other) const { return !(*this == other); }
+
+	// functions
+
+	void setPlane(const vector3d<T> &point, const vector3d<T> &nvector)
+	{
+		Normal = nvector;
+		recalculateD(point);
+	}
+
+	void setPlane(const vector3d<T> &nvect, T d)
+	{
+		Normal = nvect;
+		D = d;
+	}
+
+	void setPlane(const vector3d<T> &point1, const vector3d<T> &point2, const vector3d<T> &point3)
+	{
+		// creates the plane from 3 memberpoints
+		Normal = (point2 - point1).crossProduct(point3 - point1);
+		Normal.normalize();
+
+		recalculateD(point1);
+	}
+
+	//! Get an intersection with a 3d line.
+	/** \param lineVect Vector of the line to intersect with.
+	\param linePoint Point of the line to intersect with.
+	\param outIntersection Place to store the intersection point, if there is one.
+	\return True if there was an intersection, false if there was not.
+	*/
+	bool getIntersectionWithLine(const vector3d<T> &linePoint,
+			const vector3d<T> &lineVect,
+			vector3d<T> &outIntersection) const
+	{
+		T t2 = Normal.dotProduct(lineVect);
+
+		if (t2 == 0)
+			return false;
+
+		T t = -(Normal.dotProduct(linePoint) + D) / t2;
+		outIntersection = linePoint + (lineVect * t);
+		return true;
+	}
+
+	//! Get percentage of line between two points where an intersection with this plane happens.
+	/** Only useful if known that there is an intersection.
+	\param linePoint1 Point1 of the line to intersect with.
+	\param linePoint2 Point2 of the line to intersect with.
+	\return Where on a line between two points an intersection with this plane happened.
+	For example, 0.5 is returned if the intersection happened exactly in the middle of the two points.
+	*/
+	f32 getKnownIntersectionWithLine(const vector3d<T> &linePoint1,
+			const vector3d<T> &linePoint2) const
+	{
+		vector3d<T> vect = linePoint2 - linePoint1;
+		T t2 = (f32)Normal.dotProduct(vect);
+		return (f32) - ((Normal.dotProduct(linePoint1) + D) / t2);
+	}
+
+	//! Get an intersection with a 3d line, limited between two 3d points.
+	/** \param linePoint1 Point 1 of the line.
+	\param linePoint2 Point 2 of the line.
+	\param outIntersection Place to store the intersection point, if there is one.
+	\return True if there was an intersection, false if there was not.
+	*/
+	bool getIntersectionWithLimitedLine(
+			const vector3d<T> &linePoint1,
+			const vector3d<T> &linePoint2,
+			vector3d<T> &outIntersection) const
+	{
+		return (getIntersectionWithLine(linePoint1, linePoint2 - linePoint1, outIntersection) &&
+				outIntersection.isBetweenPoints(linePoint1, linePoint2));
+	}
+
+	//! Classifies the relation of a point to this plane.
+	/** \param point Point to classify its relation.
+	\return ISREL3D_FRONT if the point is in front of the plane,
+	ISREL3D_BACK if the point is behind of the plane, and
+	ISREL3D_PLANAR if the point is within the plane. */
+	EIntersectionRelation3D classifyPointRelation(const vector3d<T> &point) const
+	{
+		const T d = Normal.dotProduct(point) + D;
+
+		if (d < -ROUNDING_ERROR_f32)
+			return ISREL3D_BACK;
+
+		if (d > ROUNDING_ERROR_f32)
+			return ISREL3D_FRONT;
+
+		return ISREL3D_PLANAR;
+	}
+
+	//! Recalculates the distance from origin by applying a new member point to the plane.
+	void recalculateD(const vector3d<T> &MPoint)
+	{
+		D = -MPoint.dotProduct(Normal);
+	}
+
+	//! Gets a member point of the plane.
+	vector3d<T> getMemberPoint() const
+	{
+		return Normal * -D;
+	}
+
+	//! Tests if there is an intersection with the other plane
+	/** \return True if there is a intersection. */
+	bool existsIntersection(const plane3d<T> &other) const
+	{
+		vector3d<T> cross = other.Normal.crossProduct(Normal);
+		return cross.getLength() > core::ROUNDING_ERROR_f32;
+	}
+
+	//! Intersects this plane with another.
+	/** \param other Other plane to intersect with.
+	\param outLinePoint Base point of intersection line.
+	\param outLineVect Vector of intersection.
+	\return True if there is a intersection, false if not. */
+	bool getIntersectionWithPlane(const plane3d<T> &other,
+			vector3d<T> &outLinePoint,
+			vector3d<T> &outLineVect) const
+	{
+		const T fn00 = Normal.getLength();
+		const T fn01 = Normal.dotProduct(other.Normal);
+		const T fn11 = other.Normal.getLength();
+		const f64 det = fn00 * fn11 - fn01 * fn01;
+
+		if (fabs(det) < ROUNDING_ERROR_f64)
+			return false;
+
+		const f64 invdet = 1.0 / det;
+		const f64 fc0 = (fn11 * -D + fn01 * other.D) * invdet;
+		const f64 fc1 = (fn00 * -other.D + fn01 * D) * invdet;
+
+		outLineVect = Normal.crossProduct(other.Normal);
+		outLinePoint = Normal * (T)fc0 + other.Normal * (T)fc1;
+		return true;
+	}
+
+	//! Get the intersection point with two other planes if there is one.
+	bool getIntersectionWithPlanes(const plane3d<T> &o1,
+			const plane3d<T> &o2, vector3d<T> &outPoint) const
+	{
+		vector3d<T> linePoint, lineVect;
+		if (getIntersectionWithPlane(o1, linePoint, lineVect))
+			return o2.getIntersectionWithLine(linePoint, lineVect, outPoint);
+
+		return false;
+	}
+
+	//! Test if the triangle would be front or backfacing from any point.
+	/** Thus, this method assumes a camera position from
+	which the triangle is definitely visible when looking into
+	the given direction.
+	Note that this only works if the normal is Normalized.
+	Do not use this method with points as it will give wrong results!
+	\param lookDirection: Look direction.
+	\return True if the plane is front facing and
+	false if it is backfacing. */
+	bool isFrontFacing(const vector3d<T> &lookDirection) const
+	{
+		const f32 d = Normal.dotProduct(lookDirection);
+		return F32_LOWER_EQUAL_0(d);
+	}
+
+	//! Get the distance to a point.
+	/** Note that this only works if the normal is normalized. */
+	T getDistanceTo(const vector3d<T> &point) const
+	{
+		return point.dotProduct(Normal) + D;
+	}
+
+	//! Normal vector of the plane.
+	vector3d<T> Normal;
+
+	//! Distance from origin.
+	T D;
+};
+
+//! Typedef for a f32 3d plane.
+typedef plane3d<f32> plane3df;
+
+//! Typedef for an integer 3d plane.
+typedef plane3d<s32> plane3di;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/position2d.h b/irr/include/position2d.h
new file mode 100644
index 000000000..ff0d30f4f
--- /dev/null
+++ b/irr/include/position2d.h
@@ -0,0 +1,28 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+//! As of Irrlicht 1.6, position2d is a synonym for vector2d.
+/** You should consider position2d to be deprecated, and use vector2d by preference. */
+
+#pragma once
+
+#include "vector2d.h"
+
+namespace irr
+{
+namespace core
+{
+
+// Use typedefs where possible as they are more explicit...
+
+//! \deprecated position2d is now a synonym for vector2d, but vector2d should be used directly.
+typedef vector2d<f32> position2df;
+
+//! \deprecated position2d is now a synonym for vector2d, but vector2d should be used directly.
+typedef vector2d<s32> position2di;
+} // namespace core
+} // namespace irr
+
+// ...and use a #define to catch the rest, for (e.g.) position2d<f64>
+#define position2d vector2d
diff --git a/irr/include/quaternion.h b/irr/include/quaternion.h
new file mode 100644
index 000000000..5a2e16367
--- /dev/null
+++ b/irr/include/quaternion.h
@@ -0,0 +1,712 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "irrMath.h"
+#include "matrix4.h"
+#include "vector3d.h"
+
+// NOTE: You *only* need this when updating an application from Irrlicht before 1.8 to Irrlicht 1.8 or later.
+// Between Irrlicht 1.7 and Irrlicht 1.8 the quaternion-matrix conversions changed.
+// Before the fix they had mixed left- and right-handed rotations.
+// To test if your code was affected by the change enable IRR_TEST_BROKEN_QUATERNION_USE and try to compile your application.
+// This defines removes those functions so you get compile errors anywhere you use them in your code.
+// For every line with a compile-errors you have to change the corresponding lines like that:
+// - When you pass the matrix to the quaternion constructor then replace the matrix by the transposed matrix.
+// - For uses of getMatrix() you have to use quaternion::getMatrix_transposed instead.
+// #define IRR_TEST_BROKEN_QUATERNION_USE
+
+namespace irr
+{
+namespace core
+{
+
+//! Quaternion class for representing rotations.
+/** It provides cheap combinations and avoids gimbal locks.
+Also useful for interpolations. */
+class quaternion
+{
+public:
+	//! Default Constructor
+	constexpr quaternion() :
+			X(0.0f), Y(0.0f), Z(0.0f), W(1.0f) {}
+
+	//! Constructor
+	constexpr quaternion(f32 x, f32 y, f32 z, f32 w) :
+			X(x), Y(y), Z(z), W(w) {}
+
+	//! Constructor which converts Euler angles (radians) to a quaternion
+	quaternion(f32 x, f32 y, f32 z);
+
+	//! Constructor which converts Euler angles (radians) to a quaternion
+	quaternion(const vector3df &vec);
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+	//! Constructor which converts a matrix to a quaternion
+	quaternion(const matrix4 &mat);
+#endif
+
+	//! Equality operator
+	constexpr bool operator==(const quaternion &other) const
+	{
+		return ((X == other.X) &&
+				(Y == other.Y) &&
+				(Z == other.Z) &&
+				(W == other.W));
+	}
+
+	//! inequality operator
+	constexpr bool operator!=(const quaternion &other) const
+	{
+		return !(*this == other);
+	}
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+	//! Matrix assignment operator
+	inline quaternion &operator=(const matrix4 &other);
+#endif
+
+	//! Add operator
+	quaternion operator+(const quaternion &other) const;
+
+	//! Multiplication operator
+	//! Be careful, unfortunately the operator order here is opposite of that in CMatrix4::operator*
+	quaternion operator*(const quaternion &other) const;
+
+	//! Multiplication operator with scalar
+	quaternion operator*(f32 s) const;
+
+	//! Multiplication operator with scalar
+	quaternion &operator*=(f32 s);
+
+	//! Multiplication operator
+	vector3df operator*(const vector3df &v) const;
+
+	//! Multiplication operator
+	quaternion &operator*=(const quaternion &other);
+
+	//! Calculates the dot product
+	inline f32 dotProduct(const quaternion &other) const;
+
+	//! Sets new quaternion
+	inline quaternion &set(f32 x, f32 y, f32 z, f32 w);
+
+	//! Sets new quaternion based on Euler angles (radians)
+	inline quaternion &set(f32 x, f32 y, f32 z);
+
+	//! Sets new quaternion based on Euler angles (radians)
+	inline quaternion &set(const core::vector3df &vec);
+
+	//! Sets new quaternion from other quaternion
+	inline quaternion &set(const core::quaternion &quat);
+
+	//! returns if this quaternion equals the other one, taking floating point rounding errors into account
+	inline bool equals(const quaternion &other,
+			const f32 tolerance = ROUNDING_ERROR_f32) const;
+
+	//! Normalizes the quaternion
+	inline quaternion &normalize();
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+	//! Creates a matrix from this quaternion
+	matrix4 getMatrix() const;
+#endif
+	//! Faster method to create a rotation matrix, you should normalize the quaternion before!
+	void getMatrixFast(matrix4 &dest) const;
+
+	//! Creates a matrix from this quaternion
+	void getMatrix(matrix4 &dest, const core::vector3df &translation = core::vector3df()) const;
+
+	/*!
+		Creates a matrix from this quaternion
+		Rotate about a center point
+		shortcut for
+		core::quaternion q;
+		q.rotationFromTo ( vin[i].Normal, forward );
+		q.getMatrixCenter ( lookat, center, newPos );
+
+		core::matrix4 m2;
+		m2.setInverseTranslation ( center );
+		lookat *= m2;
+
+		core::matrix4 m3;
+		m2.setTranslation ( newPos );
+		lookat *= m3;
+
+	*/
+	void getMatrixCenter(matrix4 &dest, const core::vector3df &center, const core::vector3df &translation) const;
+
+	//! Creates a matrix from this quaternion
+	inline void getMatrix_transposed(matrix4 &dest) const;
+
+	//! Inverts this quaternion
+	quaternion &makeInverse();
+
+	//! Set this quaternion to the linear interpolation between two quaternions
+	/** NOTE: lerp result is *not* a normalized quaternion. In most cases
+	you will want to use lerpN instead as most other quaternion functions expect
+	to work with a normalized quaternion.
+	\param q1 First quaternion to be interpolated.
+	\param q2 Second quaternion to be interpolated.
+	\param time Progress of interpolation. For time=0 the result is
+	q1, for time=1 the result is q2. Otherwise interpolation
+	between q1 and q2. Result is not normalized.
+	*/
+	quaternion &lerp(quaternion q1, quaternion q2, f32 time);
+
+	//! Set this quaternion to the linear interpolation between two quaternions and normalize the result
+	/**
+	\param q1 First quaternion to be interpolated.
+	\param q2 Second quaternion to be interpolated.
+	\param time Progress of interpolation. For time=0 the result is
+	q1, for time=1 the result is q2. Otherwise interpolation
+	between q1 and q2. Result is normalized.
+	*/
+	quaternion &lerpN(quaternion q1, quaternion q2, f32 time);
+
+	//! Set this quaternion to the result of the spherical interpolation between two quaternions
+	/** \param q1 First quaternion to be interpolated.
+	\param q2 Second quaternion to be interpolated.
+	\param time Progress of interpolation. For time=0 the result is
+	q1, for time=1 the result is q2. Otherwise interpolation
+	between q1 and q2.
+	\param threshold To avoid inaccuracies at the end (time=1) the
+	interpolation switches to linear interpolation at some point.
+	This value defines how much of the remaining interpolation will
+	be calculated with lerp. Everything from 1-threshold up will be
+	linear interpolation.
+	*/
+	quaternion &slerp(quaternion q1, quaternion q2,
+			f32 time, f32 threshold = .05f);
+
+	//! Set this quaternion to represent a rotation from angle and axis.
+	/** Axis must be unit length.
+	The quaternion representing the rotation is
+	q = cos(A/2)+sin(A/2)*(x*i+y*j+z*k).
+	\param angle Rotation Angle in radians.
+	\param axis Rotation axis. */
+	quaternion &fromAngleAxis(f32 angle, const vector3df &axis);
+
+	//! Fills an angle (radians) around an axis (unit vector)
+	void toAngleAxis(f32 &angle, core::vector3df &axis) const;
+
+	//! Output this quaternion to an Euler angle (radians)
+	void toEuler(vector3df &euler) const;
+
+	//! Set quaternion to identity
+	quaternion &makeIdentity();
+
+	//! Set quaternion to represent a rotation from one vector to another.
+	quaternion &rotationFromTo(const vector3df &from, const vector3df &to);
+
+	//! Quaternion elements.
+	f32 X; // vectorial (imaginary) part
+	f32 Y;
+	f32 Z;
+	f32 W; // real part
+};
+
+// Constructor which converts Euler angles to a quaternion
+inline quaternion::quaternion(f32 x, f32 y, f32 z)
+{
+	set(x, y, z);
+}
+
+// Constructor which converts Euler angles to a quaternion
+inline quaternion::quaternion(const vector3df &vec)
+{
+	set(vec.X, vec.Y, vec.Z);
+}
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+// Constructor which converts a matrix to a quaternion
+inline quaternion::quaternion(const matrix4 &mat)
+{
+	(*this) = mat;
+}
+#endif
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+// matrix assignment operator
+inline quaternion &quaternion::operator=(const matrix4 &m)
+{
+	const f32 diag = m[0] + m[5] + m[10] + 1;
+
+	if (diag > 0.0f) {
+		const f32 scale = sqrtf(diag) * 2.0f; // get scale from diagonal
+
+		// TODO: speed this up
+		X = (m[6] - m[9]) / scale;
+		Y = (m[8] - m[2]) / scale;
+		Z = (m[1] - m[4]) / scale;
+		W = 0.25f * scale;
+	} else {
+		if (m[0] > m[5] && m[0] > m[10]) {
+			// 1st element of diag is greatest value
+			// find scale according to 1st element, and double it
+			const f32 scale = sqrtf(1.0f + m[0] - m[5] - m[10]) * 2.0f;
+
+			// TODO: speed this up
+			X = 0.25f * scale;
+			Y = (m[4] + m[1]) / scale;
+			Z = (m[2] + m[8]) / scale;
+			W = (m[6] - m[9]) / scale;
+		} else if (m[5] > m[10]) {
+			// 2nd element of diag is greatest value
+			// find scale according to 2nd element, and double it
+			const f32 scale = sqrtf(1.0f + m[5] - m[0] - m[10]) * 2.0f;
+
+			// TODO: speed this up
+			X = (m[4] + m[1]) / scale;
+			Y = 0.25f * scale;
+			Z = (m[9] + m[6]) / scale;
+			W = (m[8] - m[2]) / scale;
+		} else {
+			// 3rd element of diag is greatest value
+			// find scale according to 3rd element, and double it
+			const f32 scale = sqrtf(1.0f + m[10] - m[0] - m[5]) * 2.0f;
+
+			// TODO: speed this up
+			X = (m[8] + m[2]) / scale;
+			Y = (m[9] + m[6]) / scale;
+			Z = 0.25f * scale;
+			W = (m[1] - m[4]) / scale;
+		}
+	}
+
+	return normalize();
+}
+#endif
+
+// multiplication operator
+inline quaternion quaternion::operator*(const quaternion &other) const
+{
+	quaternion tmp;
+
+	tmp.W = (other.W * W) - (other.X * X) - (other.Y * Y) - (other.Z * Z);
+	tmp.X = (other.W * X) + (other.X * W) + (other.Y * Z) - (other.Z * Y);
+	tmp.Y = (other.W * Y) + (other.Y * W) + (other.Z * X) - (other.X * Z);
+	tmp.Z = (other.W * Z) + (other.Z * W) + (other.X * Y) - (other.Y * X);
+
+	return tmp;
+}
+
+// multiplication operator
+inline quaternion quaternion::operator*(f32 s) const
+{
+	return quaternion(s * X, s * Y, s * Z, s * W);
+}
+
+// multiplication operator
+inline quaternion &quaternion::operator*=(f32 s)
+{
+	X *= s;
+	Y *= s;
+	Z *= s;
+	W *= s;
+	return *this;
+}
+
+// multiplication operator
+inline quaternion &quaternion::operator*=(const quaternion &other)
+{
+	return (*this = other * (*this));
+}
+
+// add operator
+inline quaternion quaternion::operator+(const quaternion &b) const
+{
+	return quaternion(X + b.X, Y + b.Y, Z + b.Z, W + b.W);
+}
+
+#ifndef IRR_TEST_BROKEN_QUATERNION_USE
+// Creates a matrix from this quaternion
+inline matrix4 quaternion::getMatrix() const
+{
+	core::matrix4 m;
+	getMatrix(m);
+	return m;
+}
+#endif
+
+//! Faster method to create a rotation matrix, you should normalize the quaternion before!
+inline void quaternion::getMatrixFast(matrix4 &dest) const
+{
+	// TODO:
+	// gpu quaternion skinning => fast Bones transform chain O_O YEAH!
+	// http://www.mrelusive.com/publications/papers/SIMD-From-Quaternion-to-Matrix-and-Back.pdf
+	dest[0] = 1.0f - 2.0f * Y * Y - 2.0f * Z * Z;
+	dest[1] = 2.0f * X * Y + 2.0f * Z * W;
+	dest[2] = 2.0f * X * Z - 2.0f * Y * W;
+	dest[3] = 0.0f;
+
+	dest[4] = 2.0f * X * Y - 2.0f * Z * W;
+	dest[5] = 1.0f - 2.0f * X * X - 2.0f * Z * Z;
+	dest[6] = 2.0f * Z * Y + 2.0f * X * W;
+	dest[7] = 0.0f;
+
+	dest[8] = 2.0f * X * Z + 2.0f * Y * W;
+	dest[9] = 2.0f * Z * Y - 2.0f * X * W;
+	dest[10] = 1.0f - 2.0f * X * X - 2.0f * Y * Y;
+	dest[11] = 0.0f;
+
+	dest[12] = 0.f;
+	dest[13] = 0.f;
+	dest[14] = 0.f;
+	dest[15] = 1.f;
+
+	dest.setDefinitelyIdentityMatrix(false);
+}
+
+/*!
+	Creates a matrix from this quaternion
+*/
+inline void quaternion::getMatrix(matrix4 &dest,
+		const core::vector3df &center) const
+{
+	// ok creating a copy may be slower, but at least avoid internal
+	// state chance (also because otherwise we cannot keep this method "const").
+
+	quaternion q(*this);
+	q.normalize();
+	f32 X = q.X;
+	f32 Y = q.Y;
+	f32 Z = q.Z;
+	f32 W = q.W;
+
+	dest[0] = 1.0f - 2.0f * Y * Y - 2.0f * Z * Z;
+	dest[1] = 2.0f * X * Y + 2.0f * Z * W;
+	dest[2] = 2.0f * X * Z - 2.0f * Y * W;
+	dest[3] = 0.0f;
+
+	dest[4] = 2.0f * X * Y - 2.0f * Z * W;
+	dest[5] = 1.0f - 2.0f * X * X - 2.0f * Z * Z;
+	dest[6] = 2.0f * Z * Y + 2.0f * X * W;
+	dest[7] = 0.0f;
+
+	dest[8] = 2.0f * X * Z + 2.0f * Y * W;
+	dest[9] = 2.0f * Z * Y - 2.0f * X * W;
+	dest[10] = 1.0f - 2.0f * X * X - 2.0f * Y * Y;
+	dest[11] = 0.0f;
+
+	dest[12] = center.X;
+	dest[13] = center.Y;
+	dest[14] = center.Z;
+	dest[15] = 1.f;
+
+	dest.setDefinitelyIdentityMatrix(false);
+}
+
+/*!
+	Creates a matrix from this quaternion
+	Rotate about a center point
+	shortcut for
+	core::quaternion q;
+	q.rotationFromTo(vin[i].Normal, forward);
+	q.getMatrix(lookat, center);
+
+	core::matrix4 m2;
+	m2.setInverseTranslation(center);
+	lookat *= m2;
+*/
+inline void quaternion::getMatrixCenter(matrix4 &dest,
+		const core::vector3df &center,
+		const core::vector3df &translation) const
+{
+	quaternion q(*this);
+	q.normalize();
+	f32 X = q.X;
+	f32 Y = q.Y;
+	f32 Z = q.Z;
+	f32 W = q.W;
+
+	dest[0] = 1.0f - 2.0f * Y * Y - 2.0f * Z * Z;
+	dest[1] = 2.0f * X * Y + 2.0f * Z * W;
+	dest[2] = 2.0f * X * Z - 2.0f * Y * W;
+	dest[3] = 0.0f;
+
+	dest[4] = 2.0f * X * Y - 2.0f * Z * W;
+	dest[5] = 1.0f - 2.0f * X * X - 2.0f * Z * Z;
+	dest[6] = 2.0f * Z * Y + 2.0f * X * W;
+	dest[7] = 0.0f;
+
+	dest[8] = 2.0f * X * Z + 2.0f * Y * W;
+	dest[9] = 2.0f * Z * Y - 2.0f * X * W;
+	dest[10] = 1.0f - 2.0f * X * X - 2.0f * Y * Y;
+	dest[11] = 0.0f;
+
+	dest.setRotationCenter(center, translation);
+}
+
+// Creates a matrix from this quaternion
+inline void quaternion::getMatrix_transposed(matrix4 &dest) const
+{
+	quaternion q(*this);
+	q.normalize();
+	f32 X = q.X;
+	f32 Y = q.Y;
+	f32 Z = q.Z;
+	f32 W = q.W;
+
+	dest[0] = 1.0f - 2.0f * Y * Y - 2.0f * Z * Z;
+	dest[4] = 2.0f * X * Y + 2.0f * Z * W;
+	dest[8] = 2.0f * X * Z - 2.0f * Y * W;
+	dest[12] = 0.0f;
+
+	dest[1] = 2.0f * X * Y - 2.0f * Z * W;
+	dest[5] = 1.0f - 2.0f * X * X - 2.0f * Z * Z;
+	dest[9] = 2.0f * Z * Y + 2.0f * X * W;
+	dest[13] = 0.0f;
+
+	dest[2] = 2.0f * X * Z + 2.0f * Y * W;
+	dest[6] = 2.0f * Z * Y - 2.0f * X * W;
+	dest[10] = 1.0f - 2.0f * X * X - 2.0f * Y * Y;
+	dest[14] = 0.0f;
+
+	dest[3] = 0.f;
+	dest[7] = 0.f;
+	dest[11] = 0.f;
+	dest[15] = 1.f;
+
+	dest.setDefinitelyIdentityMatrix(false);
+}
+
+// Inverts this quaternion
+inline quaternion &quaternion::makeInverse()
+{
+	X = -X;
+	Y = -Y;
+	Z = -Z;
+	return *this;
+}
+
+// sets new quaternion
+inline quaternion &quaternion::set(f32 x, f32 y, f32 z, f32 w)
+{
+	X = x;
+	Y = y;
+	Z = z;
+	W = w;
+	return *this;
+}
+
+// sets new quaternion based on Euler angles
+inline quaternion &quaternion::set(f32 x, f32 y, f32 z)
+{
+	f64 angle;
+
+	angle = x * 0.5;
+	const f64 sr = sin(angle);
+	const f64 cr = cos(angle);
+
+	angle = y * 0.5;
+	const f64 sp = sin(angle);
+	const f64 cp = cos(angle);
+
+	angle = z * 0.5;
+	const f64 sy = sin(angle);
+	const f64 cy = cos(angle);
+
+	const f64 cpcy = cp * cy;
+	const f64 spcy = sp * cy;
+	const f64 cpsy = cp * sy;
+	const f64 spsy = sp * sy;
+
+	X = (f32)(sr * cpcy - cr * spsy);
+	Y = (f32)(cr * spcy + sr * cpsy);
+	Z = (f32)(cr * cpsy - sr * spcy);
+	W = (f32)(cr * cpcy + sr * spsy);
+
+	return normalize();
+}
+
+// sets new quaternion based on Euler angles
+inline quaternion &quaternion::set(const core::vector3df &vec)
+{
+	return set(vec.X, vec.Y, vec.Z);
+}
+
+// sets new quaternion based on other quaternion
+inline quaternion &quaternion::set(const core::quaternion &quat)
+{
+	return (*this = quat);
+}
+
+//! returns if this quaternion equals the other one, taking floating point rounding errors into account
+inline bool quaternion::equals(const quaternion &other, const f32 tolerance) const
+{
+	return core::equals(X, other.X, tolerance) &&
+		   core::equals(Y, other.Y, tolerance) &&
+		   core::equals(Z, other.Z, tolerance) &&
+		   core::equals(W, other.W, tolerance);
+}
+
+// normalizes the quaternion
+inline quaternion &quaternion::normalize()
+{
+	// removed conditional branch since it may slow down and anyway the condition was
+	// false even after normalization in some cases.
+	return (*this *= (f32)reciprocal_squareroot((f64)(X * X + Y * Y + Z * Z + W * W)));
+}
+
+// Set this quaternion to the result of the linear interpolation between two quaternions
+inline quaternion &quaternion::lerp(quaternion q1, quaternion q2, f32 time)
+{
+	const f32 scale = 1.0f - time;
+	return (*this = (q1 * scale) + (q2 * time));
+}
+
+// Set this quaternion to the result of the linear interpolation between two quaternions and normalize the result
+inline quaternion &quaternion::lerpN(quaternion q1, quaternion q2, f32 time)
+{
+	const f32 scale = 1.0f - time;
+	return (*this = ((q1 * scale) + (q2 * time)).normalize());
+}
+
+// set this quaternion to the result of the interpolation between two quaternions
+inline quaternion &quaternion::slerp(quaternion q1, quaternion q2, f32 time, f32 threshold)
+{
+	f32 angle = q1.dotProduct(q2);
+
+	// make sure we use the short rotation
+	if (angle < 0.0f) {
+		q1 *= -1.0f;
+		angle *= -1.0f;
+	}
+
+	if (angle <= (1 - threshold)) { // spherical interpolation
+		const f32 theta = acosf(angle);
+		const f32 invsintheta = reciprocal(sinf(theta));
+		const f32 scale = sinf(theta * (1.0f - time)) * invsintheta;
+		const f32 invscale = sinf(theta * time) * invsintheta;
+		return (*this = (q1 * scale) + (q2 * invscale));
+	} else // linear interpolation
+		return lerpN(q1, q2, time);
+}
+
+// calculates the dot product
+inline f32 quaternion::dotProduct(const quaternion &q2) const
+{
+	return (X * q2.X) + (Y * q2.Y) + (Z * q2.Z) + (W * q2.W);
+}
+
+//! axis must be unit length, angle in radians
+inline quaternion &quaternion::fromAngleAxis(f32 angle, const vector3df &axis)
+{
+	const f32 fHalfAngle = 0.5f * angle;
+	const f32 fSin = sinf(fHalfAngle);
+	W = cosf(fHalfAngle);
+	X = fSin * axis.X;
+	Y = fSin * axis.Y;
+	Z = fSin * axis.Z;
+	return *this;
+}
+
+inline void quaternion::toAngleAxis(f32 &angle, core::vector3df &axis) const
+{
+	const f32 scale = sqrtf(X * X + Y * Y + Z * Z);
+
+	if (core::iszero(scale) || W > 1.0f || W < -1.0f) {
+		angle = 0.0f;
+		axis.X = 0.0f;
+		axis.Y = 1.0f;
+		axis.Z = 0.0f;
+	} else {
+		const f32 invscale = reciprocal(scale);
+		angle = 2.0f * acosf(W);
+		axis.X = X * invscale;
+		axis.Y = Y * invscale;
+		axis.Z = Z * invscale;
+	}
+}
+
+inline void quaternion::toEuler(vector3df &euler) const
+{
+	const f64 sqw = W * W;
+	const f64 sqx = X * X;
+	const f64 sqy = Y * Y;
+	const f64 sqz = Z * Z;
+	const f64 test = 2.0 * (Y * W - X * Z);
+
+	if (core::equals(test, 1.0, 0.000001)) {
+		// heading = rotation about z-axis
+		euler.Z = (f32)(-2.0 * atan2(X, W));
+		// bank = rotation about x-axis
+		euler.X = 0;
+		// attitude = rotation about y-axis
+		euler.Y = (f32)(core::PI64 / 2.0);
+	} else if (core::equals(test, -1.0, 0.000001)) {
+		// heading = rotation about z-axis
+		euler.Z = (f32)(2.0 * atan2(X, W));
+		// bank = rotation about x-axis
+		euler.X = 0;
+		// attitude = rotation about y-axis
+		euler.Y = (f32)(core::PI64 / -2.0);
+	} else {
+		// heading = rotation about z-axis
+		euler.Z = (f32)atan2(2.0 * (X * Y + Z * W), (sqx - sqy - sqz + sqw));
+		// bank = rotation about x-axis
+		euler.X = (f32)atan2(2.0 * (Y * Z + X * W), (-sqx - sqy + sqz + sqw));
+		// attitude = rotation about y-axis
+		euler.Y = (f32)asin(clamp(test, -1.0, 1.0));
+	}
+}
+
+inline vector3df quaternion::operator*(const vector3df &v) const
+{
+	// nVidia SDK implementation
+
+	vector3df uv, uuv;
+	const vector3df qvec(X, Y, Z);
+	uv = qvec.crossProduct(v);
+	uuv = qvec.crossProduct(uv);
+	uv *= (2.0f * W);
+	uuv *= 2.0f;
+
+	return v + uv + uuv;
+}
+
+// set quaternion to identity
+inline core::quaternion &quaternion::makeIdentity()
+{
+	W = 1.f;
+	X = 0.f;
+	Y = 0.f;
+	Z = 0.f;
+	return *this;
+}
+
+inline core::quaternion &quaternion::rotationFromTo(const vector3df &from, const vector3df &to)
+{
+	// Based on Stan Melax's article in Game Programming Gems
+	// Optimized by Robert Eisele: https://raw.org/proof/quaternion-from-two-vectors
+
+	// Copy, since cannot modify local
+	vector3df v0 = from;
+	vector3df v1 = to;
+	v0.normalize();
+	v1.normalize();
+
+	const f32 d = v0.dotProduct(v1);
+	if (d >= 1.0f) { // If dot == 1, vectors are the same
+		return makeIdentity();
+	} else if (d <= -1.0f) { // exactly opposite
+		core::vector3df axis(1.0f, 0.f, 0.f);
+		axis = axis.crossProduct(v0);
+		if (axis.getLength() == 0) {
+			axis.set(0.f, 1.f, 0.f);
+			axis = axis.crossProduct(v0);
+		}
+		// same as fromAngleAxis(core::PI, axis).normalize();
+		return set(axis.X, axis.Y, axis.Z, 0).normalize();
+	}
+
+	const vector3df c = v0.crossProduct(v1);
+	return set(c.X, c.Y, c.Z, 1 + d).normalize();
+}
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/rect.h b/irr/include/rect.h
new file mode 100644
index 000000000..bced2d59e
--- /dev/null
+++ b/irr/include/rect.h
@@ -0,0 +1,281 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "dimension2d.h"
+#include "position2d.h"
+
+namespace irr
+{
+namespace core
+{
+
+//! Rectangle template.
+/** Mostly used by 2D GUI elements and for 2D drawing methods.
+It has 2 positions instead of position and dimension and a fast
+method for collision detection with other rectangles and points.
+
+Coordinates are (0,0) for top-left corner, and increasing to the right
+and to the bottom.
+*/
+template <class T>
+class rect
+{
+public:
+	//! Default constructor creating empty rectangle at (0,0)
+	constexpr rect() :
+			UpperLeftCorner(0, 0), LowerRightCorner(0, 0) {}
+
+	//! Constructor with two corners
+	constexpr rect(T x, T y, T x2, T y2) :
+			UpperLeftCorner(x, y), LowerRightCorner(x2, y2) {}
+
+	//! Constructor with two corners
+	constexpr rect(const position2d<T> &upperLeft, const position2d<T> &lowerRight) :
+			UpperLeftCorner(upperLeft), LowerRightCorner(lowerRight) {}
+
+	//! Constructor with upper left corner and dimension
+	template <class U>
+	constexpr rect(const position2d<T> &pos, const dimension2d<U> &size) :
+			UpperLeftCorner(pos), LowerRightCorner(pos.X + size.Width, pos.Y + size.Height)
+	{
+	}
+
+	//! Constructor with upper left at 0,0 and lower right using dimension
+	template <class U>
+	explicit constexpr rect(const dimension2d<U> &size) :
+			UpperLeftCorner(0, 0), LowerRightCorner(size.Width, size.Height)
+	{
+	}
+
+	//! move right by given numbers
+	rect<T> operator+(const position2d<T> &pos) const
+	{
+		rect<T> ret(*this);
+		return ret += pos;
+	}
+
+	//! move right by given numbers
+	rect<T> &operator+=(const position2d<T> &pos)
+	{
+		UpperLeftCorner += pos;
+		LowerRightCorner += pos;
+		return *this;
+	}
+
+	//! move left by given numbers
+	rect<T> operator-(const position2d<T> &pos) const
+	{
+		rect<T> ret(*this);
+		return ret -= pos;
+	}
+
+	//! move left by given numbers
+	rect<T> &operator-=(const position2d<T> &pos)
+	{
+		UpperLeftCorner -= pos;
+		LowerRightCorner -= pos;
+		return *this;
+	}
+
+	//! equality operator
+	constexpr bool operator==(const rect<T> &other) const
+	{
+		return (UpperLeftCorner == other.UpperLeftCorner &&
+				LowerRightCorner == other.LowerRightCorner);
+	}
+
+	//! inequality operator
+	constexpr bool operator!=(const rect<T> &other) const
+	{
+		return (UpperLeftCorner != other.UpperLeftCorner ||
+				LowerRightCorner != other.LowerRightCorner);
+	}
+
+	//! compares size of rectangles
+	bool operator<(const rect<T> &other) const
+	{
+		return getArea() < other.getArea();
+	}
+
+	//! Returns size of rectangle
+	T getArea() const
+	{
+		return getWidth() * getHeight();
+	}
+
+	//! Returns if a 2d point is within this rectangle.
+	/** \param pos Position to test if it lies within this rectangle.
+	\return True if the position is within the rectangle, false if not. */
+	bool isPointInside(const position2d<T> &pos) const
+	{
+		return (UpperLeftCorner.X <= pos.X &&
+				UpperLeftCorner.Y <= pos.Y &&
+				LowerRightCorner.X >= pos.X &&
+				LowerRightCorner.Y >= pos.Y);
+	}
+
+	//! Check if the rectangle collides with another rectangle.
+	/** \param other Rectangle to test collision with
+	\return True if the rectangles collide. */
+	bool isRectCollided(const rect<T> &other) const
+	{
+		return (LowerRightCorner.Y > other.UpperLeftCorner.Y &&
+				UpperLeftCorner.Y < other.LowerRightCorner.Y &&
+				LowerRightCorner.X > other.UpperLeftCorner.X &&
+				UpperLeftCorner.X < other.LowerRightCorner.X);
+	}
+
+	//! Clips this rectangle with another one.
+	/** \param other Rectangle to clip with */
+	void clipAgainst(const rect<T> &other)
+	{
+		if (other.LowerRightCorner.X < LowerRightCorner.X)
+			LowerRightCorner.X = other.LowerRightCorner.X;
+		if (other.LowerRightCorner.Y < LowerRightCorner.Y)
+			LowerRightCorner.Y = other.LowerRightCorner.Y;
+
+		if (other.UpperLeftCorner.X > LowerRightCorner.X)
+			LowerRightCorner.X = other.UpperLeftCorner.X;
+		if (other.UpperLeftCorner.Y > LowerRightCorner.Y)
+			LowerRightCorner.Y = other.UpperLeftCorner.Y;
+
+		if (other.LowerRightCorner.X < UpperLeftCorner.X)
+			UpperLeftCorner.X = other.LowerRightCorner.X;
+		if (other.LowerRightCorner.Y < UpperLeftCorner.Y)
+			UpperLeftCorner.Y = other.LowerRightCorner.Y;
+
+		if (other.UpperLeftCorner.X > UpperLeftCorner.X)
+			UpperLeftCorner.X = other.UpperLeftCorner.X;
+		if (other.UpperLeftCorner.Y > UpperLeftCorner.Y)
+			UpperLeftCorner.Y = other.UpperLeftCorner.Y;
+	}
+
+	//! Moves this rectangle to fit inside another one.
+	/** \return True on success, false if not possible */
+	bool constrainTo(const rect<T> &other)
+	{
+		if (other.getWidth() < getWidth() || other.getHeight() < getHeight())
+			return false;
+
+		T diff = other.LowerRightCorner.X - LowerRightCorner.X;
+		if (diff < 0) {
+			LowerRightCorner.X += diff;
+			UpperLeftCorner.X += diff;
+		}
+
+		diff = other.LowerRightCorner.Y - LowerRightCorner.Y;
+		if (diff < 0) {
+			LowerRightCorner.Y += diff;
+			UpperLeftCorner.Y += diff;
+		}
+
+		diff = UpperLeftCorner.X - other.UpperLeftCorner.X;
+		if (diff < 0) {
+			UpperLeftCorner.X -= diff;
+			LowerRightCorner.X -= diff;
+		}
+
+		diff = UpperLeftCorner.Y - other.UpperLeftCorner.Y;
+		if (diff < 0) {
+			UpperLeftCorner.Y -= diff;
+			LowerRightCorner.Y -= diff;
+		}
+
+		return true;
+	}
+
+	//! Get width of rectangle.
+	T getWidth() const
+	{
+		return LowerRightCorner.X - UpperLeftCorner.X;
+	}
+
+	//! Get height of rectangle.
+	T getHeight() const
+	{
+		return LowerRightCorner.Y - UpperLeftCorner.Y;
+	}
+
+	//! If the lower right corner of the rect is smaller then the upper left, the points are swapped.
+	void repair()
+	{
+		if (LowerRightCorner.X < UpperLeftCorner.X) {
+			T t = LowerRightCorner.X;
+			LowerRightCorner.X = UpperLeftCorner.X;
+			UpperLeftCorner.X = t;
+		}
+
+		if (LowerRightCorner.Y < UpperLeftCorner.Y) {
+			T t = LowerRightCorner.Y;
+			LowerRightCorner.Y = UpperLeftCorner.Y;
+			UpperLeftCorner.Y = t;
+		}
+	}
+
+	//! Returns if the rect is valid to draw.
+	/** It would be invalid if the UpperLeftCorner is lower or more
+	right than the LowerRightCorner. */
+	bool isValid() const
+	{
+		return ((LowerRightCorner.X >= UpperLeftCorner.X) &&
+				(LowerRightCorner.Y >= UpperLeftCorner.Y));
+	}
+
+	//! Get the center of the rectangle
+	position2d<T> getCenter() const
+	{
+		return position2d<T>(
+				(UpperLeftCorner.X + LowerRightCorner.X) / 2,
+				(UpperLeftCorner.Y + LowerRightCorner.Y) / 2);
+	}
+
+	//! Get the dimensions of the rectangle
+	dimension2d<T> getSize() const
+	{
+		return dimension2d<T>(getWidth(), getHeight());
+	}
+
+	//! Adds a point to the rectangle
+	/** Causes the rectangle to grow bigger if point is outside of
+	the box
+	\param p Point to add to the box. */
+	void addInternalPoint(const position2d<T> &p)
+	{
+		addInternalPoint(p.X, p.Y);
+	}
+
+	//! Adds a point to the bounding rectangle
+	/** Causes the rectangle to grow bigger if point is outside of
+	the box
+	\param x X-Coordinate of the point to add to this box.
+	\param y Y-Coordinate of the point to add to this box. */
+	void addInternalPoint(T x, T y)
+	{
+		if (x > LowerRightCorner.X)
+			LowerRightCorner.X = x;
+		if (y > LowerRightCorner.Y)
+			LowerRightCorner.Y = y;
+
+		if (x < UpperLeftCorner.X)
+			UpperLeftCorner.X = x;
+		if (y < UpperLeftCorner.Y)
+			UpperLeftCorner.Y = y;
+	}
+
+	//! Upper left corner
+	position2d<T> UpperLeftCorner;
+	//! Lower right corner
+	position2d<T> LowerRightCorner;
+};
+
+//! Rectangle with float values
+typedef rect<f32> rectf;
+//! Rectangle with int values
+typedef rect<s32> recti;
+
+} // end namespace core
+} // end namespace irr
diff --git a/irr/include/vector2d.h b/irr/include/vector2d.h
new file mode 100644
index 000000000..4c41389f4
--- /dev/null
+++ b/irr/include/vector2d.h
@@ -0,0 +1,503 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrMath.h"
+#include "dimension2d.h"
+
+#include <functional>
+
+namespace irr
+{
+namespace core
+{
+
+//! 2d vector template class with lots of operators and methods.
+/** As of Irrlicht 1.6, this class supersedes position2d, which should
+	be considered deprecated. */
+template <class T>
+class vector2d
+{
+public:
+	//! Default constructor (null vector)
+	constexpr vector2d() :
+			X(0), Y(0) {}
+	//! Constructor with two different values
+	constexpr vector2d(T nx, T ny) :
+			X(nx), Y(ny) {}
+	//! Constructor with the same value for both members
+	explicit constexpr vector2d(T n) :
+			X(n), Y(n) {}
+
+	constexpr vector2d(const dimension2d<T> &other) :
+			X(other.Width), Y(other.Height) {}
+
+	// operators
+
+	vector2d<T> operator-() const { return vector2d<T>(-X, -Y); }
+
+	vector2d<T> &operator=(const dimension2d<T> &other)
+	{
+		X = other.Width;
+		Y = other.Height;
+		return *this;
+	}
+
+	vector2d<T> operator+(const vector2d<T> &other) const { return vector2d<T>(X + other.X, Y + other.Y); }
+	vector2d<T> operator+(const dimension2d<T> &other) const { return vector2d<T>(X + other.Width, Y + other.Height); }
+	vector2d<T> &operator+=(const vector2d<T> &other)
+	{
+		X += other.X;
+		Y += other.Y;
+		return *this;
+	}
+	vector2d<T> operator+(const T v) const { return vector2d<T>(X + v, Y + v); }
+	vector2d<T> &operator+=(const T v)
+	{
+		X += v;
+		Y += v;
+		return *this;
+	}
+	vector2d<T> &operator+=(const dimension2d<T> &other)
+	{
+		X += other.Width;
+		Y += other.Height;
+		return *this;
+	}
+
+	vector2d<T> operator-(const vector2d<T> &other) const { return vector2d<T>(X - other.X, Y - other.Y); }
+	vector2d<T> operator-(const dimension2d<T> &other) const { return vector2d<T>(X - other.Width, Y - other.Height); }
+	vector2d<T> &operator-=(const vector2d<T> &other)
+	{
+		X -= other.X;
+		Y -= other.Y;
+		return *this;
+	}
+	vector2d<T> operator-(const T v) const { return vector2d<T>(X - v, Y - v); }
+	vector2d<T> &operator-=(const T v)
+	{
+		X -= v;
+		Y -= v;
+		return *this;
+	}
+	vector2d<T> &operator-=(const dimension2d<T> &other)
+	{
+		X -= other.Width;
+		Y -= other.Height;
+		return *this;
+	}
+
+	vector2d<T> operator*(const vector2d<T> &other) const { return vector2d<T>(X * other.X, Y * other.Y); }
+	vector2d<T> &operator*=(const vector2d<T> &other)
+	{
+		X *= other.X;
+		Y *= other.Y;
+		return *this;
+	}
+	vector2d<T> operator*(const T v) const { return vector2d<T>(X * v, Y * v); }
+	vector2d<T> &operator*=(const T v)
+	{
+		X *= v;
+		Y *= v;
+		return *this;
+	}
+
+	vector2d<T> operator/(const vector2d<T> &other) const { return vector2d<T>(X / other.X, Y / other.Y); }
+	vector2d<T> &operator/=(const vector2d<T> &other)
+	{
+		X /= other.X;
+		Y /= other.Y;
+		return *this;
+	}
+	vector2d<T> operator/(const T v) const { return vector2d<T>(X / v, Y / v); }
+	vector2d<T> &operator/=(const T v)
+	{
+		X /= v;
+		Y /= v;
+		return *this;
+	}
+
+	T &operator[](u32 index)
+	{
+		_IRR_DEBUG_BREAK_IF(index > 1) // access violation
+
+		return *(&X + index);
+	}
+
+	const T &operator[](u32 index) const
+	{
+		_IRR_DEBUG_BREAK_IF(index > 1) // access violation
+
+		return *(&X + index);
+	}
+
+	//! sort in order X, Y.
+	constexpr bool operator<=(const vector2d<T> &other) const
+	{
+		return !(*this > other);
+	}
+
+	//! sort in order X, Y.
+	constexpr bool operator>=(const vector2d<T> &other) const
+	{
+		return !(*this < other);
+	}
+
+	//! sort in order X, Y.
+	constexpr bool operator<(const vector2d<T> &other) const
+	{
+		return X < other.X || (X == other.X && Y < other.Y);
+	}
+
+	//! sort in order X, Y.
+	constexpr bool operator>(const vector2d<T> &other) const
+	{
+		return X > other.X || (X == other.X && Y > other.Y);
+	}
+
+	constexpr bool operator==(const vector2d<T> &other) const
+	{
+		return X == other.X && Y == other.Y;
+	}
+
+	constexpr bool operator!=(const vector2d<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	// functions
+
+	//! Checks if this vector equals the other one.
+	/** Takes floating point rounding errors into account.
+	\param other Vector to compare with.
+	\return True if the two vector are (almost) equal, else false. */
+	bool equals(const vector2d<T> &other) const
+	{
+		return core::equals(X, other.X) && core::equals(Y, other.Y);
+	}
+
+	vector2d<T> &set(T nx, T ny)
+	{
+		X = nx;
+		Y = ny;
+		return *this;
+	}
+	vector2d<T> &set(const vector2d<T> &p)
+	{
+		X = p.X;
+		Y = p.Y;
+		return *this;
+	}
+
+	//! Gets the length of the vector.
+	/** \return The length of the vector. */
+	T getLength() const { return core::squareroot(X * X + Y * Y); }
+
+	//! Get the squared length of this vector
+	/** This is useful because it is much faster than getLength().
+	\return The squared length of the vector. */
+	T getLengthSQ() const { return X * X + Y * Y; }
+
+	//! Get the dot product of this vector with another.
+	/** \param other Other vector to take dot product with.
+	\return The dot product of the two vectors. */
+	T dotProduct(const vector2d<T> &other) const
+	{
+		return X * other.X + Y * other.Y;
+	}
+
+	//! check if this vector is parallel to another vector
+	bool nearlyParallel(const vector2d<T> &other, const T factor = relativeErrorFactor<T>()) const
+	{
+		// https://eagergames.wordpress.com/2017/04/01/fast-parallel-lines-and-vectors-test/
+		// if a || b then  a.x/a.y = b.x/b.y (similar triangles)
+		// if a || b then either both x are 0 or both y are 0.
+
+		return equalsRelative(X * other.Y, other.X * Y, factor) && // a bit counterintuitive, but makes sure  that
+																   // only y or only x are 0, and at same time deals
+																   // with the case where one vector is zero vector.
+			   (X * other.X + Y * other.Y) != 0;
+	}
+
+	//! Gets distance from another point.
+	/** Here, the vector is interpreted as a point in 2-dimensional space.
+	\param other Other vector to measure from.
+	\return Distance from other point. */
+	T getDistanceFrom(const vector2d<T> &other) const
+	{
+		return vector2d<T>(X - other.X, Y - other.Y).getLength();
+	}
+
+	//! Returns squared distance from another point.
+	/** Here, the vector is interpreted as a point in 2-dimensional space.
+	\param other Other vector to measure from.
+	\return Squared distance from other point. */
+	T getDistanceFromSQ(const vector2d<T> &other) const
+	{
+		return vector2d<T>(X - other.X, Y - other.Y).getLengthSQ();
+	}
+
+	//! rotates the point anticlockwise around a center by an amount of degrees.
+	/** \param degrees Amount of degrees to rotate by, anticlockwise.
+	\param center Rotation center.
+	\return This vector after transformation. */
+	vector2d<T> &rotateBy(f64 degrees, const vector2d<T> &center = vector2d<T>())
+	{
+		degrees *= DEGTORAD64;
+		const f64 cs = cos(degrees);
+		const f64 sn = sin(degrees);
+
+		X -= center.X;
+		Y -= center.Y;
+
+		set((T)(X * cs - Y * sn), (T)(X * sn + Y * cs));
+
+		X += center.X;
+		Y += center.Y;
+		return *this;
+	}
+
+	//! Normalize the vector.
+	/** The null vector is left untouched.
+	\return Reference to this vector, after normalization. */
+	vector2d<T> &normalize()
+	{
+		f32 length = (f32)(X * X + Y * Y);
+		if (length == 0)
+			return *this;
+		length = core::reciprocal_squareroot(length);
+		X = (T)(X * length);
+		Y = (T)(Y * length);
+		return *this;
+	}
+
+	//! Calculates the angle of this vector in degrees in the trigonometric sense.
+	/** 0 is to the right (3 o'clock), values increase counter-clockwise.
+	This method has been suggested by Pr3t3nd3r.
+	\return Returns a value between 0 and 360. */
+	f64 getAngleTrig() const
+	{
+		if (Y == 0)
+			return X < 0 ? 180 : 0;
+		else if (X == 0)
+			return Y < 0 ? 270 : 90;
+
+		if (Y > 0)
+			if (X > 0)
+				return atan((irr::f64)Y / (irr::f64)X) * RADTODEG64;
+			else
+				return 180.0 - atan((irr::f64)Y / -(irr::f64)X) * RADTODEG64;
+		else if (X > 0)
+			return 360.0 - atan(-(irr::f64)Y / (irr::f64)X) * RADTODEG64;
+		else
+			return 180.0 + atan(-(irr::f64)Y / -(irr::f64)X) * RADTODEG64;
+	}
+
+	//! Calculates the angle of this vector in degrees in the counter trigonometric sense.
+	/** 0 is to the right (3 o'clock), values increase clockwise.
+	\return Returns a value between 0 and 360. */
+	inline f64 getAngle() const
+	{
+		if (Y == 0) // corrected thanks to a suggestion by Jox
+			return X < 0 ? 180 : 0;
+		else if (X == 0)
+			return Y < 0 ? 90 : 270;
+
+		// don't use getLength here to avoid precision loss with s32 vectors
+		// avoid floating-point trouble as sqrt(y*y) is occasionally larger than y, so clamp
+		const f64 tmp = core::clamp(Y / sqrt((f64)(X * X + Y * Y)), -1.0, 1.0);
+		const f64 angle = atan(core::squareroot(1 - tmp * tmp) / tmp) * RADTODEG64;
+
+		if (X > 0 && Y > 0)
+			return angle + 270;
+		else if (X > 0 && Y < 0)
+			return angle + 90;
+		else if (X < 0 && Y < 0)
+			return 90 - angle;
+		else if (X < 0 && Y > 0)
+			return 270 - angle;
+
+		return angle;
+	}
+
+	//! Calculates the angle between this vector and another one in degree.
+	/** \param b Other vector to test with.
+	\return Returns a value between 0 and 90. */
+	inline f64 getAngleWith(const vector2d<T> &b) const
+	{
+		f64 tmp = (f64)(X * b.X + Y * b.Y);
+
+		if (tmp == 0.0)
+			return 90.0;
+
+		tmp = tmp / core::squareroot((f64)((X * X + Y * Y) * (b.X * b.X + b.Y * b.Y)));
+		if (tmp < 0.0)
+			tmp = -tmp;
+		if (tmp > 1.0) //   avoid floating-point trouble
+			tmp = 1.0;
+
+		return atan(sqrt(1 - tmp * tmp) / tmp) * RADTODEG64;
+	}
+
+	//! Returns if this vector interpreted as a point is on a line between two other points.
+	/** It is assumed that the point is on the line.
+	\param begin Beginning vector to compare between.
+	\param end Ending vector to compare between.
+	\return True if this vector is between begin and end, false if not. */
+	bool isBetweenPoints(const vector2d<T> &begin, const vector2d<T> &end) const
+	{
+		//             .  end
+		//            /
+		//           /
+		//          /
+		//         . begin
+		//        -
+		//       -
+		//      . this point (am I inside or outside)?
+		//
+		if (begin.X != end.X) {
+			return ((begin.X <= X && X <= end.X) ||
+					(begin.X >= X && X >= end.X));
+		} else {
+			return ((begin.Y <= Y && Y <= end.Y) ||
+					(begin.Y >= Y && Y >= end.Y));
+		}
+	}
+
+	//! Creates an interpolated vector between this vector and another vector.
+	/** \param other The other vector to interpolate with.
+	\param d Interpolation value between 0.0f (all the other vector) and 1.0f (all this vector).
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	\return An interpolated vector.  This vector is not modified. */
+	vector2d<T> getInterpolated(const vector2d<T> &other, f64 d) const
+	{
+		const f64 inv = 1.0f - d;
+		return vector2d<T>((T)(other.X * inv + X * d), (T)(other.Y * inv + Y * d));
+	}
+
+	//! Creates a quadratically interpolated vector between this and two other vectors.
+	/** \param v2 Second vector to interpolate with.
+	\param v3 Third vector to interpolate with (maximum at 1.0f)
+	\param d Interpolation value between 0.0f (all this vector) and 1.0f (all the 3rd vector).
+	Note that this is the opposite direction of interpolation to getInterpolated() and interpolate()
+	\return An interpolated vector. This vector is not modified. */
+	vector2d<T> getInterpolated_quadratic(const vector2d<T> &v2, const vector2d<T> &v3, f64 d) const
+	{
+		// this*(1-d)*(1-d) + 2 * v2 * (1-d) + v3 * d * d;
+		const f64 inv = 1.0f - d;
+		const f64 mul0 = inv * inv;
+		const f64 mul1 = 2.0f * d * inv;
+		const f64 mul2 = d * d;
+
+		return vector2d<T>((T)(X * mul0 + v2.X * mul1 + v3.X * mul2),
+				(T)(Y * mul0 + v2.Y * mul1 + v3.Y * mul2));
+	}
+
+	/*! Test if this point and another 2 points taken as triplet
+		are colinear, clockwise, anticlockwise. This can be used also
+		to check winding order in triangles for 2D meshes.
+		\return 0 if points are colinear, 1 if clockwise, 2 if anticlockwise
+	*/
+	s32 checkOrientation(const vector2d<T> &b, const vector2d<T> &c) const
+	{
+		// Example of clockwise points
+		//
+		//   ^ Y
+		//   |       A
+		//   |      . .
+		//   |     .   .
+		//   |    C.....B
+		//   +---------------> X
+
+		T val = (b.Y - Y) * (c.X - b.X) -
+				(b.X - X) * (c.Y - b.Y);
+
+		if (val == 0)
+			return 0; // colinear
+
+		return (val > 0) ? 1 : 2; // clock or counterclock wise
+	}
+
+	/*! Returns true if points (a,b,c) are clockwise on the X,Y plane*/
+	inline bool areClockwise(const vector2d<T> &b, const vector2d<T> &c) const
+	{
+		T val = (b.Y - Y) * (c.X - b.X) -
+				(b.X - X) * (c.Y - b.Y);
+
+		return val > 0;
+	}
+
+	/*! Returns true if points (a,b,c) are counterclockwise on the X,Y plane*/
+	inline bool areCounterClockwise(const vector2d<T> &b, const vector2d<T> &c) const
+	{
+		T val = (b.Y - Y) * (c.X - b.X) -
+				(b.X - X) * (c.Y - b.Y);
+
+		return val < 0;
+	}
+
+	//! Sets this vector to the linearly interpolated vector between a and b.
+	/** \param a first vector to interpolate with, maximum at 1.0f
+	\param b second vector to interpolate with, maximum at 0.0f
+	\param d Interpolation value between 0.0f (all vector b) and 1.0f (all vector a)
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	*/
+	vector2d<T> &interpolate(const vector2d<T> &a, const vector2d<T> &b, f64 d)
+	{
+		X = (T)((f64)b.X + ((a.X - b.X) * d));
+		Y = (T)((f64)b.Y + ((a.Y - b.Y) * d));
+		return *this;
+	}
+
+	//! X coordinate of vector.
+	T X;
+
+	//! Y coordinate of vector.
+	T Y;
+};
+
+//! Typedef for f32 2d vector.
+typedef vector2d<f32> vector2df;
+
+//! Typedef for integer 2d vector.
+typedef vector2d<s32> vector2di;
+
+template <class S, class T>
+vector2d<T> operator*(const S scalar, const vector2d<T> &vector)
+{
+	return vector * scalar;
+}
+
+// These methods are declared in dimension2d, but need definitions of vector2d
+template <class T>
+dimension2d<T>::dimension2d(const vector2d<T> &other) :
+		Width(other.X), Height(other.Y)
+{
+}
+
+template <class T>
+bool dimension2d<T>::operator==(const vector2d<T> &other) const
+{
+	return Width == other.X && Height == other.Y;
+}
+
+} // end namespace core
+} // end namespace irr
+
+namespace std
+{
+
+template <class T>
+struct hash<irr::core::vector2d<T>>
+{
+	size_t operator()(const irr::core::vector2d<T> &vec) const
+	{
+		size_t h1 = hash<T>()(vec.X);
+		size_t h2 = hash<T>()(vec.Y);
+		return (h1 << (4 * sizeof(h1)) | h1 >> (4 * sizeof(h1))) ^ h2;
+	}
+};
+
+}
diff --git a/irr/include/vector3d.h b/irr/include/vector3d.h
new file mode 100644
index 000000000..a69f17e16
--- /dev/null
+++ b/irr/include/vector3d.h
@@ -0,0 +1,549 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrMath.h"
+
+#include <functional>
+
+namespace irr
+{
+namespace core
+{
+
+//! 3d vector template class with lots of operators and methods.
+/** The vector3d class is used in Irrlicht for three main purposes:
+	1) As a direction vector (most of the methods assume this).
+	2) As a position in 3d space (which is synonymous with a direction vector from the origin to this position).
+	3) To hold three Euler rotations, where X is pitch, Y is yaw and Z is roll.
+*/
+template <class T>
+class vector3d
+{
+public:
+	//! Default constructor (null vector).
+	constexpr vector3d() :
+			X(0), Y(0), Z(0) {}
+	//! Constructor with three different values
+	constexpr vector3d(T nx, T ny, T nz) :
+			X(nx), Y(ny), Z(nz) {}
+	//! Constructor with the same value for all elements
+	explicit constexpr vector3d(T n) :
+			X(n), Y(n), Z(n) {}
+
+	// operators
+
+	vector3d<T> operator-() const { return vector3d<T>(-X, -Y, -Z); }
+
+	vector3d<T> operator+(const vector3d<T> &other) const { return vector3d<T>(X + other.X, Y + other.Y, Z + other.Z); }
+	vector3d<T> &operator+=(const vector3d<T> &other)
+	{
+		X += other.X;
+		Y += other.Y;
+		Z += other.Z;
+		return *this;
+	}
+	vector3d<T> operator+(const T val) const { return vector3d<T>(X + val, Y + val, Z + val); }
+	vector3d<T> &operator+=(const T val)
+	{
+		X += val;
+		Y += val;
+		Z += val;
+		return *this;
+	}
+
+	vector3d<T> operator-(const vector3d<T> &other) const { return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z); }
+	vector3d<T> &operator-=(const vector3d<T> &other)
+	{
+		X -= other.X;
+		Y -= other.Y;
+		Z -= other.Z;
+		return *this;
+	}
+	vector3d<T> operator-(const T val) const { return vector3d<T>(X - val, Y - val, Z - val); }
+	vector3d<T> &operator-=(const T val)
+	{
+		X -= val;
+		Y -= val;
+		Z -= val;
+		return *this;
+	}
+
+	vector3d<T> operator*(const vector3d<T> &other) const { return vector3d<T>(X * other.X, Y * other.Y, Z * other.Z); }
+	vector3d<T> &operator*=(const vector3d<T> &other)
+	{
+		X *= other.X;
+		Y *= other.Y;
+		Z *= other.Z;
+		return *this;
+	}
+	vector3d<T> operator*(const T v) const { return vector3d<T>(X * v, Y * v, Z * v); }
+	vector3d<T> &operator*=(const T v)
+	{
+		X *= v;
+		Y *= v;
+		Z *= v;
+		return *this;
+	}
+
+	vector3d<T> operator/(const vector3d<T> &other) const { return vector3d<T>(X / other.X, Y / other.Y, Z / other.Z); }
+	vector3d<T> &operator/=(const vector3d<T> &other)
+	{
+		X /= other.X;
+		Y /= other.Y;
+		Z /= other.Z;
+		return *this;
+	}
+	vector3d<T> operator/(const T v) const { return vector3d<T>(X / v, Y / v, Z / v); }
+	vector3d<T> &operator/=(const T v)
+	{
+		X /= v;
+		Y /= v;
+		Z /= v;
+		return *this;
+	}
+
+	T &operator[](u32 index)
+	{
+		_IRR_DEBUG_BREAK_IF(index > 2) // access violation
+
+		return *(&X + index);
+	}
+
+	const T &operator[](u32 index) const
+	{
+		_IRR_DEBUG_BREAK_IF(index > 2) // access violation
+
+		return *(&X + index);
+	}
+
+	//! sort in order X, Y, Z.
+	constexpr bool operator<=(const vector3d<T> &other) const
+	{
+		return !(*this > other);
+	}
+
+	//! sort in order X, Y, Z.
+	constexpr bool operator>=(const vector3d<T> &other) const
+	{
+		return !(*this < other);
+	}
+
+	//! sort in order X, Y, Z.
+	constexpr bool operator<(const vector3d<T> &other) const
+	{
+		return X < other.X || (X == other.X && Y < other.Y) ||
+			   (X == other.X && Y == other.Y && Z < other.Z);
+	}
+
+	//! sort in order X, Y, Z.
+	constexpr bool operator>(const vector3d<T> &other) const
+	{
+		return X > other.X || (X == other.X && Y > other.Y) ||
+			   (X == other.X && Y == other.Y && Z > other.Z);
+	}
+
+	constexpr bool operator==(const vector3d<T> &other) const
+	{
+		return X == other.X && Y == other.Y && Z == other.Z;
+	}
+
+	constexpr bool operator!=(const vector3d<T> &other) const
+	{
+		return !(*this == other);
+	}
+
+	// functions
+
+	//! Checks if this vector equals the other one.
+	/** Takes floating point rounding errors into account.
+	\param other Vector to compare with.
+	\return True if the two vector are (almost) equal, else false. */
+	bool equals(const vector3d<T> &other) const
+	{
+		return core::equals(X, other.X) && core::equals(Y, other.Y) && core::equals(Z, other.Z);
+	}
+
+	vector3d<T> &set(const T nx, const T ny, const T nz)
+	{
+		X = nx;
+		Y = ny;
+		Z = nz;
+		return *this;
+	}
+	vector3d<T> &set(const vector3d<T> &p)
+	{
+		X = p.X;
+		Y = p.Y;
+		Z = p.Z;
+		return *this;
+	}
+
+	//! Get length of the vector.
+	T getLength() const { return core::squareroot(X * X + Y * Y + Z * Z); }
+
+	//! Get squared length of the vector.
+	/** This is useful because it is much faster than getLength().
+	\return Squared length of the vector. */
+	T getLengthSQ() const { return X * X + Y * Y + Z * Z; }
+
+	//! Get the dot product with another vector.
+	T dotProduct(const vector3d<T> &other) const
+	{
+		return X * other.X + Y * other.Y + Z * other.Z;
+	}
+
+	//! Get distance from another point.
+	/** Here, the vector is interpreted as point in 3 dimensional space. */
+	T getDistanceFrom(const vector3d<T> &other) const
+	{
+		return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z).getLength();
+	}
+
+	//! Returns squared distance from another point.
+	/** Here, the vector is interpreted as point in 3 dimensional space. */
+	T getDistanceFromSQ(const vector3d<T> &other) const
+	{
+		return vector3d<T>(X - other.X, Y - other.Y, Z - other.Z).getLengthSQ();
+	}
+
+	//! Calculates the cross product with another vector.
+	/** \param p Vector to multiply with.
+	\return Cross product of this vector with p. */
+	vector3d<T> crossProduct(const vector3d<T> &p) const
+	{
+		return vector3d<T>(Y * p.Z - Z * p.Y, Z * p.X - X * p.Z, X * p.Y - Y * p.X);
+	}
+
+	//! Returns if this vector interpreted as a point is on a line between two other points.
+	/** It is assumed that the point is on the line.
+	\param begin Beginning vector to compare between.
+	\param end Ending vector to compare between.
+	\return True if this vector is between begin and end, false if not. */
+	bool isBetweenPoints(const vector3d<T> &begin, const vector3d<T> &end) const
+	{
+		const T f = (end - begin).getLengthSQ();
+		return getDistanceFromSQ(begin) <= f &&
+			   getDistanceFromSQ(end) <= f;
+	}
+
+	//! Normalizes the vector.
+	/** In case of the 0 vector the result is still 0, otherwise
+	the length of the vector will be 1.
+	\return Reference to this vector after normalization. */
+	vector3d<T> &normalize()
+	{
+		f64 length = X * X + Y * Y + Z * Z;
+		if (length == 0) // this check isn't an optimization but prevents getting NAN in the sqrt.
+			return *this;
+		length = core::reciprocal_squareroot(length);
+
+		X = (T)(X * length);
+		Y = (T)(Y * length);
+		Z = (T)(Z * length);
+		return *this;
+	}
+
+	//! Sets the length of the vector to a new value
+	vector3d<T> &setLength(T newlength)
+	{
+		normalize();
+		return (*this *= newlength);
+	}
+
+	//! Inverts the vector.
+	vector3d<T> &invert()
+	{
+		X *= -1;
+		Y *= -1;
+		Z *= -1;
+		return *this;
+	}
+
+	//! Rotates the vector by a specified number of degrees around the Y axis and the specified center.
+	/** CAREFUL: For historical reasons rotateXZBy uses a right-handed rotation
+	(maybe to make it more similar to the 2D vector rotations which are counterclockwise).
+	To have this work the same way as rest of Irrlicht (nodes, matrices, other rotateBy functions) pass -1*degrees in here.
+	\param degrees Number of degrees to rotate around the Y axis.
+	\param center The center of the rotation. */
+	void rotateXZBy(f64 degrees, const vector3d<T> &center = vector3d<T>())
+	{
+		degrees *= DEGTORAD64;
+		f64 cs = cos(degrees);
+		f64 sn = sin(degrees);
+		X -= center.X;
+		Z -= center.Z;
+		set((T)(X * cs - Z * sn), Y, (T)(X * sn + Z * cs));
+		X += center.X;
+		Z += center.Z;
+	}
+
+	//! Rotates the vector by a specified number of degrees around the Z axis and the specified center.
+	/** \param degrees: Number of degrees to rotate around the Z axis.
+	\param center: The center of the rotation. */
+	void rotateXYBy(f64 degrees, const vector3d<T> &center = vector3d<T>())
+	{
+		degrees *= DEGTORAD64;
+		f64 cs = cos(degrees);
+		f64 sn = sin(degrees);
+		X -= center.X;
+		Y -= center.Y;
+		set((T)(X * cs - Y * sn), (T)(X * sn + Y * cs), Z);
+		X += center.X;
+		Y += center.Y;
+	}
+
+	//! Rotates the vector by a specified number of degrees around the X axis and the specified center.
+	/** \param degrees: Number of degrees to rotate around the X axis.
+	\param center: The center of the rotation. */
+	void rotateYZBy(f64 degrees, const vector3d<T> &center = vector3d<T>())
+	{
+		degrees *= DEGTORAD64;
+		f64 cs = cos(degrees);
+		f64 sn = sin(degrees);
+		Z -= center.Z;
+		Y -= center.Y;
+		set(X, (T)(Y * cs - Z * sn), (T)(Y * sn + Z * cs));
+		Z += center.Z;
+		Y += center.Y;
+	}
+
+	//! Creates an interpolated vector between this vector and another vector.
+	/** \param other The other vector to interpolate with.
+	\param d Interpolation value between 0.0f (all the other vector) and 1.0f (all this vector).
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	\return An interpolated vector.  This vector is not modified. */
+	vector3d<T> getInterpolated(const vector3d<T> &other, f64 d) const
+	{
+		const f64 inv = 1.0 - d;
+		return vector3d<T>((T)(other.X * inv + X * d), (T)(other.Y * inv + Y * d), (T)(other.Z * inv + Z * d));
+	}
+
+	//! Creates a quadratically interpolated vector between this and two other vectors.
+	/** \param v2 Second vector to interpolate with.
+	\param v3 Third vector to interpolate with (maximum at 1.0f)
+	\param d Interpolation value between 0.0f (all this vector) and 1.0f (all the 3rd vector).
+	Note that this is the opposite direction of interpolation to getInterpolated() and interpolate()
+	\return An interpolated vector. This vector is not modified. */
+	vector3d<T> getInterpolated_quadratic(const vector3d<T> &v2, const vector3d<T> &v3, f64 d) const
+	{
+		// this*(1-d)*(1-d) + 2 * v2 * (1-d) + v3 * d * d;
+		const f64 inv = (T)1.0 - d;
+		const f64 mul0 = inv * inv;
+		const f64 mul1 = (T)2.0 * d * inv;
+		const f64 mul2 = d * d;
+
+		return vector3d<T>((T)(X * mul0 + v2.X * mul1 + v3.X * mul2),
+				(T)(Y * mul0 + v2.Y * mul1 + v3.Y * mul2),
+				(T)(Z * mul0 + v2.Z * mul1 + v3.Z * mul2));
+	}
+
+	//! Sets this vector to the linearly interpolated vector between a and b.
+	/** \param a first vector to interpolate with, maximum at 1.0f
+	\param b second vector to interpolate with, maximum at 0.0f
+	\param d Interpolation value between 0.0f (all vector b) and 1.0f (all vector a)
+	Note that this is the opposite direction of interpolation to getInterpolated_quadratic()
+	*/
+	vector3d<T> &interpolate(const vector3d<T> &a, const vector3d<T> &b, f64 d)
+	{
+		X = (T)((f64)b.X + ((a.X - b.X) * d));
+		Y = (T)((f64)b.Y + ((a.Y - b.Y) * d));
+		Z = (T)((f64)b.Z + ((a.Z - b.Z) * d));
+		return *this;
+	}
+
+	//! Get the rotations that would make a (0,0,1) direction vector point in the same direction as this direction vector.
+	/** Thanks to Arras on the Irrlicht forums for this method.  This utility method is very useful for
+	orienting scene nodes towards specific targets.  For example, if this vector represents the difference
+	between two scene nodes, then applying the result of getHorizontalAngle() to one scene node will point
+	it at the other one.
+	Example code:
+	// Where target and seeker are of type ISceneNode*
+	const vector3df toTarget(target->getAbsolutePosition() - seeker->getAbsolutePosition());
+	const vector3df requiredRotation = toTarget.getHorizontalAngle();
+	seeker->setRotation(requiredRotation);
+
+	\return A rotation vector containing the X (pitch) and Y (raw) rotations (in degrees) that when applied to a
+	+Z (e.g. 0, 0, 1) direction vector would make it point in the same direction as this vector. The Z (roll) rotation
+	is always 0, since two Euler rotations are sufficient to point in any given direction. */
+	vector3d<T> getHorizontalAngle() const
+	{
+		vector3d<T> angle;
+
+		// tmp avoids some precision troubles on some compilers when working with T=s32
+		f64 tmp = (atan2((f64)X, (f64)Z) * RADTODEG64);
+		angle.Y = (T)tmp;
+
+		if (angle.Y < 0)
+			angle.Y += 360;
+		if (angle.Y >= 360)
+			angle.Y -= 360;
+
+		const f64 z1 = core::squareroot(X * X + Z * Z);
+
+		tmp = (atan2((f64)z1, (f64)Y) * RADTODEG64 - 90.0);
+		angle.X = (T)tmp;
+
+		if (angle.X < 0)
+			angle.X += 360;
+		if (angle.X >= 360)
+			angle.X -= 360;
+
+		return angle;
+	}
+
+	//! Get the spherical coordinate angles
+	/** This returns Euler degrees for the point represented by
+	this vector.  The calculation assumes the pole at (0,1,0) and
+	returns the angles in X and Y.
+	*/
+	vector3d<T> getSphericalCoordinateAngles() const
+	{
+		vector3d<T> angle;
+		const f64 length = X * X + Y * Y + Z * Z;
+
+		if (length) {
+			if (X != 0) {
+				angle.Y = (T)(atan2((f64)Z, (f64)X) * RADTODEG64);
+			} else if (Z < 0)
+				angle.Y = 180;
+
+			angle.X = (T)(acos(Y * core::reciprocal_squareroot(length)) * RADTODEG64);
+		}
+		return angle;
+	}
+
+	//! Builds a direction vector from (this) rotation vector.
+	/** This vector is assumed to be a rotation vector composed of 3 Euler angle rotations, in degrees.
+	The implementation performs the same calculations as using a matrix to do the rotation.
+
+	\param[in] forwards  The direction representing "forwards" which will be rotated by this vector.
+	If you do not provide a direction, then the +Z axis (0, 0, 1) will be assumed to be forwards.
+	\return A direction vector calculated by rotating the forwards direction by the 3 Euler angles
+	(in degrees) represented by this vector. */
+	vector3d<T> rotationToDirection(const vector3d<T> &forwards = vector3d<T>(0, 0, 1)) const
+	{
+		const f64 cr = cos(core::DEGTORAD64 * X);
+		const f64 sr = sin(core::DEGTORAD64 * X);
+		const f64 cp = cos(core::DEGTORAD64 * Y);
+		const f64 sp = sin(core::DEGTORAD64 * Y);
+		const f64 cy = cos(core::DEGTORAD64 * Z);
+		const f64 sy = sin(core::DEGTORAD64 * Z);
+
+		const f64 srsp = sr * sp;
+		const f64 crsp = cr * sp;
+
+		const f64 pseudoMatrix[] = {
+				(cp * cy), (cp * sy), (-sp),
+				(srsp * cy - cr * sy), (srsp * sy + cr * cy), (sr * cp),
+				(crsp * cy + sr * sy), (crsp * sy - sr * cy), (cr * cp)};
+
+		return vector3d<T>(
+				(T)(forwards.X * pseudoMatrix[0] +
+						forwards.Y * pseudoMatrix[3] +
+						forwards.Z * pseudoMatrix[6]),
+				(T)(forwards.X * pseudoMatrix[1] +
+						forwards.Y * pseudoMatrix[4] +
+						forwards.Z * pseudoMatrix[7]),
+				(T)(forwards.X * pseudoMatrix[2] +
+						forwards.Y * pseudoMatrix[5] +
+						forwards.Z * pseudoMatrix[8]));
+	}
+
+	//! Fills an array of 4 values with the vector data (usually floats).
+	/** Useful for setting in shader constants for example. The fourth value
+	will always be 0. */
+	void getAs4Values(T *array) const
+	{
+		array[0] = X;
+		array[1] = Y;
+		array[2] = Z;
+		array[3] = 0;
+	}
+
+	//! Fills an array of 3 values with the vector data (usually floats).
+	/** Useful for setting in shader constants for example.*/
+	void getAs3Values(T *array) const
+	{
+		array[0] = X;
+		array[1] = Y;
+		array[2] = Z;
+	}
+
+	//! X coordinate of the vector
+	T X;
+
+	//! Y coordinate of the vector
+	T Y;
+
+	//! Z coordinate of the vector
+	T Z;
+};
+
+//! partial specialization for integer vectors
+// Implementer note: inline keyword needed due to template specialization for s32. Otherwise put specialization into a .cpp
+template <>
+inline vector3d<s32> vector3d<s32>::operator/(s32 val) const
+{
+	return core::vector3d<s32>(X / val, Y / val, Z / val);
+}
+template <>
+inline vector3d<s32> &vector3d<s32>::operator/=(s32 val)
+{
+	X /= val;
+	Y /= val;
+	Z /= val;
+	return *this;
+}
+
+template <>
+inline vector3d<s32> vector3d<s32>::getSphericalCoordinateAngles() const
+{
+	vector3d<s32> angle;
+	const f64 length = X * X + Y * Y + Z * Z;
+
+	if (length) {
+		if (X != 0) {
+			angle.Y = round32((f32)(atan2((f64)Z, (f64)X) * RADTODEG64));
+		} else if (Z < 0)
+			angle.Y = 180;
+
+		angle.X = round32((f32)(acos(Y * core::reciprocal_squareroot(length)) * RADTODEG64));
+	}
+	return angle;
+}
+
+//! Typedef for a f32 3d vector.
+typedef vector3d<f32> vector3df;
+
+//! Typedef for an integer 3d vector.
+typedef vector3d<s32> vector3di;
+
+//! Function multiplying a scalar and a vector component-wise.
+template <class S, class T>
+vector3d<T> operator*(const S scalar, const vector3d<T> &vector)
+{
+	return vector * scalar;
+}
+
+} // end namespace core
+} // end namespace irr
+
+namespace std
+{
+
+template <class T>
+struct hash<irr::core::vector3d<T>>
+{
+	size_t operator()(const irr::core::vector3d<T> &vec) const
+	{
+		size_t h1 = hash<T>()(vec.X);
+		size_t h2 = hash<T>()(vec.Y);
+		size_t h3 = hash<T>()(vec.Z);
+		return (h1 << (5 * sizeof(h1)) | h1 >> (3 * sizeof(h1))) ^ (h2 << (2 * sizeof(h2)) | h2 >> (6 * sizeof(h2))) ^ h3;
+	}
+};
+
+}
diff --git a/irr/media/Shaders/OneTextureBlend.fsh b/irr/media/Shaders/OneTextureBlend.fsh
new file mode 100644
index 000000000..7ecb7e1a2
--- /dev/null
+++ b/irr/media/Shaders/OneTextureBlend.fsh
@@ -0,0 +1,75 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform int uTextureUsage0;
+uniform sampler2D uTextureUnit0;
+uniform int uBlendType;
+uniform int uFogEnable;
+uniform int uFogType;
+uniform vec4 uFogColor;
+uniform float uFogStart;
+uniform float uFogEnd;
+uniform float uFogDensity;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+float computeFog()
+{
+	const float LOG2 = 1.442695;
+	float FogFactor = 0.0;
+
+	if (uFogType == 0) // Exp
+	{
+		FogFactor = exp2(-uFogDensity * vFogCoord * LOG2);
+	}
+	else if (uFogType == 1) // Linear
+	{
+		float Scale = 1.0 / (uFogEnd - uFogStart);
+		FogFactor = (uFogEnd - vFogCoord) * Scale;
+	}
+	else if (uFogType == 2) // Exp2
+	{
+		FogFactor = exp2(-uFogDensity * uFogDensity * vFogCoord * vFogCoord * LOG2);
+	}
+
+	FogFactor = clamp(FogFactor, 0.0, 1.0);
+
+	return FogFactor;
+}
+
+void main()
+{
+	vec4 Color0 = vVertexColor;
+	vec4 Color1 = vec4(1.0, 1.0, 1.0, 1.0);
+
+	if (bool(uTextureUsage0))
+		Color1 = texture2D(uTextureUnit0, vTextureCoord0);
+
+	vec4 FinalColor = Color0 * Color1;
+
+	if (uBlendType == 1)
+	{
+		FinalColor.w = Color0.w;
+	}
+	else if (uBlendType == 2)
+	{
+		FinalColor.w = Color1.w;
+	}
+
+	if (bool(uFogEnable))
+	{
+		float FogFactor = computeFog();
+		vec4 FogColor = uFogColor;
+		FogColor.a = 1.0;
+		FinalColor = mix(FogColor, FinalColor, FogFactor);
+	}
+
+	gl_FragColor = FinalColor;
+}
diff --git a/irr/media/Shaders/Renderer2D.fsh b/irr/media/Shaders/Renderer2D.fsh
new file mode 100644
index 000000000..89aef7e59
--- /dev/null
+++ b/irr/media/Shaders/Renderer2D.fsh
@@ -0,0 +1,23 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform int uTextureUsage;
+uniform sampler2D uTextureUnit;
+
+/* Varyings */
+
+varying vec2 vTextureCoord;
+varying vec4 vVertexColor;
+
+void main()
+{
+	vec4 Color = vVertexColor;
+
+	if (bool(uTextureUsage))
+		Color *= texture2D(uTextureUnit, vTextureCoord);
+
+	gl_FragColor = Color;
+}
diff --git a/irr/media/Shaders/Renderer2D.vsh b/irr/media/Shaders/Renderer2D.vsh
new file mode 100644
index 000000000..914214895
--- /dev/null
+++ b/irr/media/Shaders/Renderer2D.vsh
@@ -0,0 +1,24 @@
+#version 100
+
+/* Attributes */
+
+attribute vec4 inVertexPosition;
+attribute vec4 inVertexColor;
+attribute vec2 inTexCoord0;
+
+/* Uniforms */
+
+uniform float uThickness;
+
+/* Varyings */
+
+varying vec2 vTextureCoord;
+varying vec4 vVertexColor;
+
+void main()
+{
+	gl_Position = inVertexPosition;
+	gl_PointSize = uThickness;
+	vTextureCoord = inTexCoord0;
+	vVertexColor = inVertexColor.bgra;
+}
diff --git a/irr/media/Shaders/Renderer2D_noTex.fsh b/irr/media/Shaders/Renderer2D_noTex.fsh
new file mode 100644
index 000000000..600097232
--- /dev/null
+++ b/irr/media/Shaders/Renderer2D_noTex.fsh
@@ -0,0 +1,11 @@
+#version 100
+
+precision mediump float;
+
+/* Varyings */
+varying vec4 vVertexColor;
+
+void main()
+{
+	gl_FragColor = vVertexColor;
+}
diff --git a/irr/media/Shaders/Solid.fsh b/irr/media/Shaders/Solid.fsh
new file mode 100644
index 000000000..c85c6baf1
--- /dev/null
+++ b/irr/media/Shaders/Solid.fsh
@@ -0,0 +1,62 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform int uTextureUsage0;
+uniform sampler2D uTextureUnit0;
+uniform int uFogEnable;
+uniform int uFogType;
+uniform vec4 uFogColor;
+uniform float uFogStart;
+uniform float uFogEnd;
+uniform float uFogDensity;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+float computeFog()
+{
+	const float LOG2 = 1.442695;
+	float FogFactor = 0.0;
+
+	if (uFogType == 0) // Exp
+	{
+		FogFactor = exp2(-uFogDensity * vFogCoord * LOG2);
+	}
+	else if (uFogType == 1) // Linear
+	{
+		float Scale = 1.0 / (uFogEnd - uFogStart);
+		FogFactor = (uFogEnd - vFogCoord) * Scale;
+	}
+	else if (uFogType == 2) // Exp2
+	{
+		FogFactor = exp2(-uFogDensity * uFogDensity * vFogCoord * vFogCoord * LOG2);
+	}
+
+	FogFactor = clamp(FogFactor, 0.0, 1.0);
+
+	return FogFactor;
+}
+
+void main()
+{
+	vec4 Color = vVertexColor;
+
+	if (bool(uTextureUsage0))
+		Color *= texture2D(uTextureUnit0, vTextureCoord0);
+
+	if (bool(uFogEnable))
+	{
+		float FogFactor = computeFog();
+		vec4 FogColor = uFogColor;
+		FogColor.a = 1.0;
+		Color = mix(FogColor, Color, FogFactor);
+	}
+
+	gl_FragColor = Color;
+}
diff --git a/irr/media/Shaders/Solid.vsh b/irr/media/Shaders/Solid.vsh
new file mode 100644
index 000000000..7379e5bb4
--- /dev/null
+++ b/irr/media/Shaders/Solid.vsh
@@ -0,0 +1,38 @@
+#version 100
+
+/* Attributes */
+
+attribute vec3 inVertexPosition;
+attribute vec3 inVertexNormal;
+attribute vec4 inVertexColor;
+attribute vec2 inTexCoord0;
+
+/* Uniforms */
+
+uniform mat4 uWVPMatrix;
+uniform mat4 uWVMatrix;
+uniform mat4 uNMatrix;
+uniform mat4 uTMatrix0;
+
+uniform float uThickness;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+void main()
+{
+	gl_Position = uWVPMatrix * vec4(inVertexPosition, 1.0);
+	gl_PointSize = uThickness;
+
+	vec4 TextureCoord0 = vec4(inTexCoord0.x, inTexCoord0.y, 1.0, 1.0);
+	vTextureCoord0 = vec4(uTMatrix0 * TextureCoord0).xy;
+
+	vVertexColor = inVertexColor.bgra;
+
+	vec3 Position = (uWVMatrix * vec4(inVertexPosition, 1.0)).xyz;
+
+	vFogCoord = length(Position);
+}
diff --git a/irr/media/Shaders/TransparentAlphaChannel.fsh b/irr/media/Shaders/TransparentAlphaChannel.fsh
new file mode 100644
index 000000000..8491068aa
--- /dev/null
+++ b/irr/media/Shaders/TransparentAlphaChannel.fsh
@@ -0,0 +1,69 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform float uAlphaRef;
+uniform int uTextureUsage0;
+uniform sampler2D uTextureUnit0;
+uniform int uFogEnable;
+uniform int uFogType;
+uniform vec4 uFogColor;
+uniform float uFogStart;
+uniform float uFogEnd;
+uniform float uFogDensity;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+float computeFog()
+{
+	const float LOG2 = 1.442695;
+	float FogFactor = 0.0;
+
+	if (uFogType == 0) // Exp
+	{
+		FogFactor = exp2(-uFogDensity * vFogCoord * LOG2);
+	}
+	else if (uFogType == 1) // Linear
+	{
+		float Scale = 1.0 / (uFogEnd - uFogStart);
+		FogFactor = (uFogEnd - vFogCoord) * Scale;
+	}
+	else if (uFogType == 2) // Exp2
+	{
+		FogFactor = exp2(-uFogDensity * uFogDensity * vFogCoord * vFogCoord * LOG2);
+	}
+
+	FogFactor = clamp(FogFactor, 0.0, 1.0);
+
+	return FogFactor;
+}
+
+void main()
+{
+	vec4 Color = vVertexColor;
+
+	if (bool(uTextureUsage0))
+	{
+		Color *= texture2D(uTextureUnit0, vTextureCoord0);
+
+		// TODO: uAlphaRef should rather control sharpness of alpha, don't know how to do that right now and this works in most cases.
+		if (Color.a < uAlphaRef)
+			discard;
+	}
+
+	if (bool(uFogEnable))
+	{
+		float FogFactor = computeFog();
+		vec4 FogColor = uFogColor;
+		FogColor.a = 1.0;
+		Color = mix(FogColor, Color, FogFactor);
+	}
+
+	gl_FragColor = Color;
+}
diff --git a/irr/media/Shaders/TransparentAlphaChannelRef.fsh b/irr/media/Shaders/TransparentAlphaChannelRef.fsh
new file mode 100644
index 000000000..ac762f0c2
--- /dev/null
+++ b/irr/media/Shaders/TransparentAlphaChannelRef.fsh
@@ -0,0 +1,66 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform float uAlphaRef;
+uniform int uTextureUsage0;
+uniform sampler2D uTextureUnit0;
+uniform int uFogEnable;
+uniform int uFogType;
+uniform vec4 uFogColor;
+uniform float uFogStart;
+uniform float uFogEnd;
+uniform float uFogDensity;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+float computeFog()
+{
+	const float LOG2 = 1.442695;
+	float FogFactor = 0.0;
+
+	if (uFogType == 0) // Exp
+	{
+		FogFactor = exp2(-uFogDensity * vFogCoord * LOG2);
+	}
+	else if (uFogType == 1) // Linear
+	{
+		float Scale = 1.0 / (uFogEnd - uFogStart);
+		FogFactor = (uFogEnd - vFogCoord) * Scale;
+	}
+	else if (uFogType == 2) // Exp2
+	{
+		FogFactor = exp2(-uFogDensity * uFogDensity * vFogCoord * vFogCoord * LOG2);
+	}
+
+	FogFactor = clamp(FogFactor, 0.0, 1.0);
+
+	return FogFactor;
+}
+
+void main()
+{
+	vec4 Color = vVertexColor;
+
+	if (bool(uTextureUsage0))
+		Color *= texture2D(uTextureUnit0, vTextureCoord0);
+
+	if (Color.a < uAlphaRef)
+		discard;
+
+	if (bool(uFogEnable))
+	{
+		float FogFactor = computeFog();
+		vec4 FogColor = uFogColor;
+		FogColor.a = 1.0;
+		Color = mix(FogColor, Color, FogFactor);
+	}
+
+	gl_FragColor = Color;
+}
diff --git a/irr/media/Shaders/TransparentVertexAlpha.fsh b/irr/media/Shaders/TransparentVertexAlpha.fsh
new file mode 100644
index 000000000..c85c6baf1
--- /dev/null
+++ b/irr/media/Shaders/TransparentVertexAlpha.fsh
@@ -0,0 +1,62 @@
+#version 100
+
+precision mediump float;
+
+/* Uniforms */
+
+uniform int uTextureUsage0;
+uniform sampler2D uTextureUnit0;
+uniform int uFogEnable;
+uniform int uFogType;
+uniform vec4 uFogColor;
+uniform float uFogStart;
+uniform float uFogEnd;
+uniform float uFogDensity;
+
+/* Varyings */
+
+varying vec2 vTextureCoord0;
+varying vec4 vVertexColor;
+varying float vFogCoord;
+
+float computeFog()
+{
+	const float LOG2 = 1.442695;
+	float FogFactor = 0.0;
+
+	if (uFogType == 0) // Exp
+	{
+		FogFactor = exp2(-uFogDensity * vFogCoord * LOG2);
+	}
+	else if (uFogType == 1) // Linear
+	{
+		float Scale = 1.0 / (uFogEnd - uFogStart);
+		FogFactor = (uFogEnd - vFogCoord) * Scale;
+	}
+	else if (uFogType == 2) // Exp2
+	{
+		FogFactor = exp2(-uFogDensity * uFogDensity * vFogCoord * vFogCoord * LOG2);
+	}
+
+	FogFactor = clamp(FogFactor, 0.0, 1.0);
+
+	return FogFactor;
+}
+
+void main()
+{
+	vec4 Color = vVertexColor;
+
+	if (bool(uTextureUsage0))
+		Color *= texture2D(uTextureUnit0, vTextureCoord0);
+
+	if (bool(uFogEnable))
+	{
+		float FogFactor = computeFog();
+		vec4 FogColor = uFogColor;
+		FogColor.a = 1.0;
+		Color = mix(FogColor, Color, FogFactor);
+	}
+
+	gl_FragColor = Color;
+}
diff --git a/irr/media/coolguy_opt.x b/irr/media/coolguy_opt.x
new file mode 100755
index 000000000..e806d8315
--- /dev/null
+++ b/irr/media/coolguy_opt.x
@@ -0,0 +1,2 @@
+xof 0303txt 0032
+AnimationSet{Animation{{Armature}AnimationKey{0;2;0;4;1,0,0,0;;,29;4;1,0,0,0;;;}AnimationKey{2;2;0;3;0,0,0;;,29;3;0,0,0;;;}}Animation{{Armature_knee_r}AnimationKey{0;16;0;4;0.864183,0.503177,0,0;;,1;4;0.829812,0.558043,0,0;;,3;4;0.708698,0.705512,0,0;;,5;4;0.589108,0.808054,0,0;;,7;4;0.593659,0.804717,0,0;;,9;4;0.748627,0.662991,0,0;;,11;4;0.910305,0.413938,0,0;;,13;4;0.975925,0.218107,0,0;;,15;4;0.981302,0.192476,0,0;;,17;4;0.975476,0.220108,0,0;;,19;4;0.963662,0.267124,0,0;;,21;4;0.945893,0.324478,0,0;;,23;4;0.923816,0.382838,0,0;;,25;4;0.901205,0.433394,0,0;;,27;4;0.883429,0.468566,0,0;;,29;4;0.876305,0.481757,0,0;;;}AnimationKey{2;2;0;3;0,0,1.10139;;,29;3;0,0,1.10139;;;}}Animation{{Armature_elbow_r}AnimationKey{0;16;0;4;0.756295,0.004619,-0.619265,0.210967;;,1;4;0.771977,0.005599,-0.60257,0.202311;;,3;4;0.825501,0.009164,-0.538259,0.169533;;,5;4;0.891859,0.014253,-0.436142,0.119019;;,7;4;0.949154,0.019821,-0.308768,0.058108;;,9;4;0.983251,0.024703,-0.18057,-0.001258;;,11;4;0.995416,0.028143,-0.07812,-0.047458;;,13;4;0.996672,0.02991,-0.020368,-0.073041;;,15;4;0.996672,0.02991,-0.020368,-0.073041;;,17;4;0.995416,0.028143,-0.07812,-0.047458;;,19;4;0.983251,0.024703,-0.18057,-0.001258;;,21;4;0.949154,0.019821,-0.308768,0.058108;;,23;4;0.891859,0.014253,-0.436142,0.119019;;,25;4;0.825501,0.009164,-0.538259,0.169533;;,27;4;0.771977,0.005599,-0.60257,0.202311;;,29;4;0.750682,0.004275,-0.625038,0.213976;;;}AnimationKey{2;2;0;3;0,0,0.754892;;,29;3;0,0,0.754892;;;}}Animation{{Armature_arm_r}AnimationKey{0;16;0;4;0.28219,0.629905,0.723388,-0.017285;;,1;4;0.277641,0.632543,0.722699,-0.022614;;,3;4;0.261375,0.641615,0.719924,-0.041507;;,5;4;0.238321,0.653533,0.715186,-0.067874;;,7;4;0.212026,0.665838,0.708676,-0.097381;;,9;4;0.186345,0.676585,0.701229,-0.125643;;,11;4;0.165298,0.684491,0.694351,-0.14841;;,13;4;0.152894,0.688778,0.68998,-0.161665;;,15;4;0.152894,0.688779,0.68998,-0.161665;;,17;4;0.165298,0.684491,0.694351,-0.14841;;,19;4;0.186345,0.676585,0.701229,-0.125643;;,21;4;0.212026,0.665838,0.708676,-0.097381;;,23;4;0.238321,0.653533,0.715186,-0.067874;;,25;4;0.261375,0.641615,0.719924,-0.041507;;,27;4;0.277641,0.632543,0.722699,-0.022614;;,29;4;0.283802,0.628959,0.723623,-0.015394;;;}AnimationKey{2;2;0;3;-0.545315,0,1;;,29;3;-0.545315,0,1;;;}}Animation{{Armature_knee_l}AnimationKey{0;16;0;4;0.981896,0.189423,0,0;;,1;4;0.9814,0.191974,0,0;;,3;4;0.979127,0.203251,0,0;;,5;4;0.974526,0.224276,0,0;;,7;4;0.96645,0.256853,0,0;;,9;4;0.953088,0.302692,0,0;;,11;4;0.931731,0.36315,0,0;;,13;4;0.898645,0.438676,0,0;;,15;4;0.848226,0.529634,0,0;;,17;4;0.773692,0.633562,0,0;;,19;4;0.689831,0.72397,0,0;;,21;4;0.629304,0.777159,0,0;;,23;4;0.648685,0.761057,0,0;;,25;4;0.812268,0.583284,0,0;;,27;4;0.948066,0.318074,0,0;;,29;4;0.982049,0.188624,0,0;;;}AnimationKey{2;2;0;3;0,0,1.10139;;,29;3;0,0,1.10139;;;}}Animation{{Armature_Bone_007}AnimationKey{0;16;0;4;0.993671,-0.112331,0,0;;,1;4;0.994784,-0.102002,0,0;;,3;4;0.997507,-0.070564,0,0;;,5;4;0.999237,-0.039056,0,0;;,7;4;0.999694,-0.024737,0,0;;,9;4;0.999079,-0.042907,0,0;;,11;4;0.99677,-0.080308,0,0;;,13;4;0.993798,-0.111199,0,0;;,15;4;0.993599,-0.112965,0,0;;,17;4;0.995813,-0.091409,0,0;;,19;4;0.998181,-0.060285,0,0;;,21;4;0.999479,-0.032286,0,0;;,23;4;0.999797,-0.020142,0,0;;,25;4;0.998983,-0.045097,0,0;;,27;4;0.995813,-0.091409,0,0;;,29;4;0.993221,-0.116243,0,0;;;}AnimationKey{2;2;0;3;0,0,1.221802;;,29;3;0,0,1.221802;;;}}Animation{{Armature_elbow_l}AnimationKey{0;16;0;4;0.995195,-0.034868,-0.015799,-0.090119;;,1;4;0.993465,-0.046368,-0.030155,-0.099838;;,3;4;0.983557,-0.0879,-0.082099,-0.134715;;,5;4;0.959324,-0.146904,-0.156177,-0.183648;;,7;4;0.917546,-0.212233,-0.238611,-0.236921;;,9;4;0.864109,-0.271657,-0.314022,-0.284443;;,11;4;0.813172,-0.315829,-0.370387,-0.319087;;,13;4;0.781004,-0.339668,-0.400938,-0.337501;;,15;4;0.781004,-0.339668,-0.400938,-0.337501;;,17;4;0.813172,-0.315829,-0.370387,-0.319087;;,19;4;0.864109,-0.271657,-0.314022,-0.284443;;,21;4;0.917546,-0.212233,-0.238611,-0.236921;;,23;4;0.959324,-0.146904,-0.156177,-0.183648;;,25;4;0.983557,-0.0879,-0.082099,-0.134715;;,27;4;0.993465,-0.046368,-0.030155,-0.099838;;,29;4;0.995701,-0.030812,-0.010739,-0.086685;;;}AnimationKey{2;2;0;3;0,0,0.754892;;,29;3;0,0,0.754892;;;}}Animation{{Armature_body}AnimationKey{0;16;0;4;-0,0,0.601298,0.799025;;,1;4;-0,0,0.608144,0.793827;;,3;4;-0,0,0.627465,0.778645;;,5;4;-0,0,0.643183,0.765712;;,7;4;-0,0,0.643755,0.765231;;,9;4;-0,0,0.631076,0.775721;;,11;4;-0,0,0.613775,0.789481;;,13;4;-0,0,0.6007,0.799474;;,15;4;-0,0,0.601488,0.798882;;,17;4;-0,0,0.619499,0.784997;;,19;4;-0,0,0.643196,0.765702;;,21;4;-0,0,0.660441,0.750878;;,23;4;-0,0,0.659666,0.751559;;,25;4;-0,0,0.638264,0.769817;;,27;4;-0,0,0.611752,0.791049;;,29;4;-0,0,0.598631,0.801025;;;}AnimationKey{2;2;0;3;0,2.580534,0;;,29;3;0,2.571201,0;;;}}Animation{{Armature_leg_l}AnimationKey{0;16;0;4;0.390287,0.920693,0,0;;,1;4;0.362565,0.931959,0,0;;,3;4;0.266163,0.963928,0,0;;,5;4;0.138294,0.990391,0,0;;,7;4;0.012725,0.999919,0,0;;,9;4;-0.090194,0.995924,0,0;;,11;4;-0.162502,0.986708,0,0;;,13;4;-0.201466,0.979496,0,0;;,15;4;-0.185641,0.982618,0,0;;,17;4;-0.013697,0.999906,0,0;;,19;4;0.24238,0.970181,0,0;;,21;4;0.417271,0.908782,0,0;;,23;4;0.439308,0.898336,0,0;;,25;4;0.424255,0.905543,0,0;;,27;4;0.407664,0.913132,0,0;;,29;4;0.400263,0.9164,0,0;;;}AnimationKey{2;2;0;3;0.246294,0,-0.171352;;,29;3;0.246294,0,-0.171351;;;}}Animation{{Armature_leg_r}AnimationKey{0;16;0;4;0.174933,-0.98458,0,0;;,1;4;0.082829,-0.996564,0,0;;,3;4;-0.21147,-0.977384,0,0;;,5;4;-0.442802,-0.89662,0,0;;,7;4;-0.47604,-0.879424,0,0;;,9;4;-0.47279,-0.881175,0,0;;,11;4;-0.459567,-0.888143,0,0;;,13;4;-0.427425,-0.904051,0,0;;,15;4;-0.361724,-0.932285,0,0;;,17;4;-0.251362,-0.967893,0,0;;,19;4;-0.114531,-0.99342,0,0;;,21;4;0.021053,-0.999778,0,0;;,23;4;0.12473,-0.992191,0,0;;,25;4;0.181473,-0.983396,0,0;;,27;4;0.204037,-0.978963,0,0;;,29;4;0.208187,-0.978089,0,0;;;}AnimationKey{2;2;0;3;-0.246294,0,-0.171352;;,29;3;-0.246294,0,-0.171351;;;}}Animation{{Armature_arm_l}AnimationKey{0;16;0;4;0.200754,-0.659656,-0.716264,-0.107316;;,1;4;0.192268,-0.660735,-0.716526,-0.114246;;,3;4;0.161871,-0.663925,-0.716753,-0.138802;;,5;4;0.118745,-0.666682,-0.715211,-0.17294;;,7;4;0.069733,-0.667364,-0.710872,-0.210767;;,9;4;0.022313,-0.665594,-0.704111,-0.246404;;,11;4;-0.016046,-0.662426,-0.696821,-0.274543;;,13;4;-0.038374,-0.659874,-0.691824,-0.290643;;,15;4;-0.038373,-0.659874,-0.691824,-0.290643;;,17;4;-0.016044,-0.662427,-0.696822,-0.274543;;,19;4;0.022312,-0.665594,-0.70411,-0.246404;;,21;4;0.069733,-0.667365,-0.710872,-0.210767;;,23;4;0.118745,-0.666682,-0.715211,-0.17294;;,25;4;0.161871,-0.663925,-0.716753,-0.138802;;,27;4;0.192268,-0.660735,-0.716526,-0.114246;;,29;4;0.203757,-0.659255,-0.716151,-0.104856;;;}AnimationKey{2;2;0;3;0.545315,0,1;;,29;3;0.545315,0,1;;;}}}Frame Root{FrameTransformMatrix{1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1;;}Frame Armature{FrameTransformMatrix{1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1;;}Frame Armature_body{FrameTransformMatrix{-1,0,0,0,0,0,1,0,0,1,0,0,0,2.571201,0,1;;}Frame Armature_arm_r{FrameTransformMatrix{-0.047733,0.997488,-0.05233,0,0.901521,0.020464,-0.432251,0,-0.430095,-0.067809,-0.900233,0,-0.545315,0,1,1;;}Frame Armature_elbow_r{FrameTransformMatrix{0.987983,0.151721,-0.029519,0,-0.153228,0.986478,-0.058162,0,0.020295,0.061987,0.997871,0,0,0,0.754892,1;;}}}Frame Armature_arm_l{FrameTransformMatrix{-0.047732,0.994072,-0.097683,0,0.901521,0.084983,0.424309,0,0.430095,-0.067809,-0.900233,0,0.545315,0,1,1;;}Frame Armature_elbow_l{FrameTransformMatrix{0.984741,0.173286,-0.016044,0,-0.171963,0.983073,0.063221,0,0.026727,-0.059497,0.99787,0,0,0,0.754892,1;;}}}Frame Armature_leg_l{FrameTransformMatrix{1,0,0,0,0,-0.998426,-0.056453,0,0,0.056453,-0.998405,0,0.246294,0,-0.171351,1;;}Frame Armature_knee_l{FrameTransformMatrix{1,0,0,0,0,0.993861,-0.110639,0,0,0.110639,0.993861,0,0,0,1.10139,1;;}}}Frame Armature_leg_r{FrameTransformMatrix{1,0,0,0,0,-0.998426,-0.056453,0,0,0.056453,-0.998405,0,-0.246294,0,-0.171351,1;;}Frame Armature_knee_r{FrameTransformMatrix{1,0,0,0,0,0.993861,-0.110639,0,0,0.110639,0.993861,0,0,0,1.10139,1;;}}}Frame Armature_Bone_007{FrameTransformMatrix{1,0,0,0,0,1,0,0,0,0,1,0,0,0,1.221802,1;;}}}Frame cool_dude{FrameTransformMatrix{-1,0,0,0,0,1,0,0,0,0,-1,0,0,0,0,1;;}Mesh{272;0;2.440814;0.219926;,0;3.688199;0.219926;,0.466212;3.688199;0.219926;,0.466212;2.440814;0.219926;,0.466212;2.440814;0.219926;,0.466212;3.688199;0.219926;,0.466212;3.688199;-0.219926;,0.466212;2.440814;-0.219926;,0;2.440814;0.219926;,0.466212;2.440814;0.219926;,0.466212;2.440814;-0.219926;,0;2.440814;-0.219926;,0.055633;1.27575;-0.190081;,0.055633;2.35741;-0.190081;,0.055633;2.35741;0.190081;,0.055633;1.27575;0.190081;,0.055633;1.27575;0.190081;,0.055633;2.35741;0.190081;,0.43017;2.35741;0.190081;,0.43017;1.27575;0.190081;,0.43017;1.27575;0.190081;,0.43017;2.35741;0.190081;,0.43017;2.35741;-0.190081;,0.43017;1.27575;-0.190081;,0.43017;1.27575;-0.190081;,0.43017;2.35741;-0.190081;,0.055633;2.35741;-0.190081;,0.055633;1.27575;-0.190081;,0.055633;1.27575;0.190081;,0.43017;1.27575;0.190081;,0.43017;1.27575;-0.190081;,0.055633;1.27575;-0.190081;,0.43017;2.35741;0.190081;,0.055633;2.35741;0.190081;,0.055633;2.35741;-0.190081;,0.43017;2.35741;-0.190081;,0.466212;3.688199;0.219926;,0;3.688199;0.219926;,0;3.688199;-0.219926;,0.466212;3.688199;-0.219926;,0.466212;2.440814;-0.219926;,0.466212;3.688199;-0.219926;,0;3.688199;-0.219926;,0;2.440814;-0.219926;,0.769341;2.834949;-0.041122;,0.440953;3.555781;-0.041122;,0.440953;3.555781;0.207294;,0.769341;2.834949;0.207294;,0.769341;2.834949;0.207294;,0.440953;3.555781;0.207294;,0.616273;3.635651;0.207294;,0.944661;2.914819;0.207294;,0.944661;2.914819;0.207294;,0.616273;3.635651;0.207294;,0.616273;3.635651;-0.041122;,0.944661;2.914819;-0.041122;,0.944661;2.914819;-0.041122;,0.616273;3.635651;-0.041122;,0.440953;3.555781;-0.041122;,0.769341;2.834949;-0.041122;,0.769341;2.834949;0.207294;,0.944661;2.914819;0.207294;,0.944661;2.914819;-0.041122;,0.769341;2.834949;-0.041122;,0.616273;3.635651;0.207294;,0.440953;3.555781;0.207294;,0.440953;3.555781;-0.041122;,0.616273;3.635651;-0.041122;,1.104504;2.080977;-0.086788;,0.776116;2.801809;-0.086788;,0.776116;2.801809;0.161627;,1.104504;2.080977;0.161627;,1.104504;2.080977;0.161627;,0.776116;2.801809;0.161627;,0.951436;2.881679;0.161627;,1.279824;2.160847;0.161627;,1.279824;2.160847;0.161627;,0.951436;2.881679;0.161627;,0.951436;2.881679;-0.086788;,1.279824;2.160847;-0.086788;,1.279824;2.160847;-0.086788;,0.951436;2.881679;-0.086788;,0.776116;2.801809;-0.086788;,1.104504;2.080977;-0.086788;,1.104504;2.080977;0.161627;,1.279824;2.160847;0.161627;,1.279824;2.160847;-0.086788;,1.104504;2.080977;-0.086788;,0.951436;2.881679;0.161627;,0.776116;2.801809;0.161627;,0.776116;2.801809;-0.086788;,0.951436;2.881679;-0.086788;,0.055633;0.093601;-0.190081;,0.055633;1.205294;-0.190081;,0.055633;1.205294;0.190081;,0.055633;0.093601;0.190081;,0.055633;0.093601;0.190081;,0.055633;1.205294;0.190081;,0.43017;1.205294;0.190081;,0.43017;0.093601;0.190081;,0.43017;0.093601;0.190081;,0.43017;1.205294;0.190081;,0.43017;1.205294;-0.190081;,0.43017;0.093601;-0.190081;,0.43017;0.093601;-0.190081;,0.43017;1.205294;-0.190081;,0.055633;1.205294;-0.190081;,0.055633;0.093601;-0.190081;,0.055633;0.093601;0.190081;,0.43017;0.093601;0.190081;,0.43017;0.093601;-0.190081;,0.055633;0.093601;-0.190081;,0.43017;1.205294;0.190081;,0.055633;1.205294;0.190081;,0.055633;1.205294;-0.190081;,0.43017;1.205294;-0.190081;,0;3.790919;0.428464;,0;4.579204;0.428464;,0.43344;4.560537;0.409797;,0.43344;3.809586;0.409797;,0.43344;3.809586;0.409797;,0.43344;4.560537;0.409797;,0.43344;4.560537;-0.284975;,0.43344;3.809586;-0.284975;,0;3.790919;0.428464;,0.43344;3.809586;0.409797;,0.43344;3.809586;-0.284975;,0;3.790919;-0.303642;,0.43344;4.560537;0.409797;,0;4.579204;0.428464;,0;4.579204;-0.303642;,0.43344;4.560537;-0.284975;,0.43344;3.809586;-0.284975;,0.43344;4.560537;-0.284975;,0;4.579204;-0.303642;,0;3.790919;-0.303642;,0;2.440814;0.219926;,-0.466212;2.440814;0.219926;,-0.466212;3.688199;0.219926;,0;3.688199;0.219926;,-0.466212;2.440814;0.219926;,-0.466212;2.440814;-0.219926;,-0.466212;3.688199;-0.219926;,-0.466212;3.688199;0.219926;,0;2.440814;0.219926;,0;2.440814;-0.219926;,-0.466212;2.440814;-0.219926;,-0.466212;2.440814;0.219926;,-0.055633;1.27575;-0.190081;,-0.055633;1.27575;0.190081;,-0.055633;2.35741;0.190081;,-0.055633;2.35741;-0.190081;,-0.055633;1.27575;0.190081;,-0.43017;1.27575;0.190081;,-0.43017;2.35741;0.190081;,-0.055633;2.35741;0.190081;,-0.43017;1.27575;0.190081;,-0.43017;1.27575;-0.190081;,-0.43017;2.35741;-0.190081;,-0.43017;2.35741;0.190081;,-0.43017;1.27575;-0.190081;,-0.055633;1.27575;-0.190081;,-0.055633;2.35741;-0.190081;,-0.43017;2.35741;-0.190081;,-0.055633;1.27575;0.190081;,-0.055633;1.27575;-0.190081;,-0.43017;1.27575;-0.190081;,-0.43017;1.27575;0.190081;,-0.43017;2.35741;0.190081;,-0.43017;2.35741;-0.190081;,-0.055633;2.35741;-0.190081;,-0.055633;2.35741;0.190081;,-0.466212;3.688199;0.219926;,-0.466212;3.688199;-0.219926;,0;3.688199;-0.219926;,0;3.688199;0.219926;,-0.466212;2.440814;-0.219926;,0;2.440814;-0.219926;,0;3.688199;-0.219926;,-0.466212;3.688199;-0.219926;,-0.769341;2.834949;-0.041122;,-0.769341;2.834949;0.207294;,-0.440953;3.555781;0.207294;,-0.440953;3.555781;-0.041122;,-0.769341;2.834949;0.207294;,-0.944661;2.914819;0.207294;,-0.616273;3.635651;0.207294;,-0.440953;3.555781;0.207294;,-0.944661;2.914819;0.207294;,-0.944661;2.914819;-0.041122;,-0.616273;3.635651;-0.041122;,-0.616273;3.635651;0.207294;,-0.944661;2.914819;-0.041122;,-0.769341;2.834949;-0.041122;,-0.440953;3.555781;-0.041122;,-0.616273;3.635651;-0.041122;,-0.769341;2.834949;0.207294;,-0.769341;2.834949;-0.041122;,-0.944661;2.914819;-0.041122;,-0.944661;2.914819;0.207294;,-0.616273;3.635651;0.207294;,-0.616273;3.635651;-0.041122;,-0.440953;3.555781;-0.041122;,-0.440953;3.555781;0.207294;,-1.104504;2.080977;-0.086788;,-1.104504;2.080977;0.161627;,-0.776116;2.801809;0.161627;,-0.776116;2.801809;-0.086788;,-1.104504;2.080977;0.161627;,-1.279824;2.160847;0.161627;,-0.951436;2.881679;0.161627;,-0.776116;2.801809;0.161627;,-1.279824;2.160847;0.161627;,-1.279824;2.160847;-0.086788;,-0.951436;2.881679;-0.086788;,-0.951436;2.881679;0.161627;,-1.279824;2.160847;-0.086788;,-1.104504;2.080977;-0.086788;,-0.776116;2.801809;-0.086788;,-0.951436;2.881679;-0.086788;,-1.104504;2.080977;0.161627;,-1.104504;2.080977;-0.086788;,-1.279824;2.160847;-0.086788;,-1.279824;2.160847;0.161627;,-0.951436;2.881679;0.161627;,-0.951436;2.881679;-0.086788;,-0.776116;2.801809;-0.086788;,-0.776116;2.801809;0.161627;,-0.055633;0.093601;-0.190081;,-0.055633;0.093601;0.190081;,-0.055633;1.205294;0.190081;,-0.055633;1.205294;-0.190081;,-0.055633;0.093601;0.190081;,-0.43017;0.093601;0.190081;,-0.43017;1.205294;0.190081;,-0.055633;1.205294;0.190081;,-0.43017;0.093601;0.190081;,-0.43017;0.093601;-0.190081;,-0.43017;1.205294;-0.190081;,-0.43017;1.205294;0.190081;,-0.43017;0.093601;-0.190081;,-0.055633;0.093601;-0.190081;,-0.055633;1.205294;-0.190081;,-0.43017;1.205294;-0.190081;,-0.055633;0.093601;0.190081;,-0.055633;0.093601;-0.190081;,-0.43017;0.093601;-0.190081;,-0.43017;0.093601;0.190081;,-0.43017;1.205294;0.190081;,-0.43017;1.205294;-0.190081;,-0.055633;1.205294;-0.190081;,-0.055633;1.205294;0.190081;,0;3.790919;0.428464;,-0.43344;3.809586;0.409797;,-0.43344;4.560537;0.409797;,0;4.579204;0.428464;,-0.43344;3.809586;0.409797;,-0.43344;3.809586;-0.284975;,-0.43344;4.560537;-0.284975;,-0.43344;4.560537;0.409797;,0;3.790919;0.428464;,0;3.790919;-0.303642;,-0.43344;3.809586;-0.284975;,-0.43344;3.809586;0.409797;,-0.43344;4.560537;0.409797;,-0.43344;4.560537;-0.284975;,0;4.579204;-0.303642;,0;4.579204;0.428464;,-0.43344;3.809586;-0.284975;,0;3.790919;-0.303642;,0;4.579204;-0.303642;,-0.43344;4.560537;-0.284975;;68;4;3,2,1,0;,4;7,6,5,4;,4;11,10,9,8;,4;15,14,13,12;,4;19,18,17,16;,4;23,22,21,20;,4;27,26,25,24;,4;31,30,29,28;,4;35,34,33,32;,4;39,38,37,36;,4;43,42,41,40;,4;47,46,45,44;,4;51,50,49,48;,4;55,54,53,52;,4;59,58,57,56;,4;63,62,61,60;,4;67,66,65,64;,4;71,70,69,68;,4;75,74,73,72;,4;79,78,77,76;,4;83,82,81,80;,4;87,86,85,84;,4;91,90,89,88;,4;95,94,93,92;,4;99,98,97,96;,4;103,102,101,100;,4;107,106,105,104;,4;111,110,109,108;,4;115,114,113,112;,4;119,118,117,116;,4;123,122,121,120;,4;127,126,125,124;,4;131,130,129,128;,4;135,134,133,132;,4;139,138,137,136;,4;143,142,141,140;,4;147,146,145,144;,4;151,150,149,148;,4;155,154,153,152;,4;159,158,157,156;,4;163,162,161,160;,4;167,166,165,164;,4;171,170,169,168;,4;175,174,173,172;,4;179,178,177,176;,4;183,182,181,180;,4;187,186,185,184;,4;191,190,189,188;,4;195,194,193,192;,4;199,198,197,196;,4;203,202,201,200;,4;207,206,205,204;,4;211,210,209,208;,4;215,214,213,212;,4;219,218,217,216;,4;223,222,221,220;,4;227,226,225,224;,4;231,230,229,228;,4;235,234,233,232;,4;239,238,237,236;,4;243,242,241,240;,4;247,246,245,244;,4;251,250,249,248;,4;255,254,253,252;,4;259,258,257,256;,4;263,262,261,260;,4;267,266,265,264;,4;271,270,269,268;;MeshNormals{272;0;-0.707083;0.707083;,0;0.707083;0.707083;,0.577349;0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0;-0.707083;0.707083;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,0;-0.707083;-0.707083;,-0.577349;-0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,0.577349;0.577349;0.577349;,-0.577349;0.577349;0.577349;,-0.577349;0.577349;-0.577349;,0.577349;0.577349;-0.577349;,0.577349;0.577349;0.577349;,0;0.707083;0.707083;,0;0.707083;-0.707083;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;0.577349;-0.577349;,0;0.707083;-0.707083;,0;-0.707083;-0.707083;,-0.286019;-0.764733;-0.577349;,-0.764733;0.286019;-0.577349;,-0.764733;0.286019;0.577349;,-0.286019;-0.764733;0.577349;,-0.286019;-0.764733;0.577349;,-0.764733;0.286019;0.577349;,0.286019;0.764733;0.577349;,0.764733;-0.286019;0.577349;,0.764733;-0.286019;0.577349;,0.286019;0.764733;0.577349;,0.286019;0.764733;-0.577349;,0.764733;-0.286019;-0.577349;,0.764733;-0.286019;-0.577349;,0.286019;0.764733;-0.577349;,-0.764733;0.286019;-0.577349;,-0.286019;-0.764733;-0.577349;,-0.286019;-0.764733;0.577349;,0.764733;-0.286019;0.577349;,0.764733;-0.286019;-0.577349;,-0.286019;-0.764733;-0.577349;,0.286019;0.764733;0.577349;,-0.764733;0.286019;0.577349;,-0.764733;0.286019;-0.577349;,0.286019;0.764733;-0.577349;,-0.286019;-0.764733;-0.577349;,-0.764733;0.286019;-0.577349;,-0.764733;0.286019;0.577349;,-0.286019;-0.764733;0.577349;,-0.286019;-0.764733;0.577349;,-0.764733;0.286019;0.577349;,0.286019;0.764733;0.577349;,0.764733;-0.286019;0.577349;,0.764733;-0.286019;0.577349;,0.286019;0.764733;0.577349;,0.286019;0.764733;-0.577349;,0.764733;-0.286019;-0.577349;,0.764733;-0.286019;-0.577349;,0.286019;0.764733;-0.577349;,-0.764733;0.286019;-0.577349;,-0.286019;-0.764733;-0.577349;,-0.286019;-0.764733;0.577349;,0.764733;-0.286019;0.577349;,0.764733;-0.286019;-0.577349;,-0.286019;-0.764733;-0.577349;,0.286019;0.764733;0.577349;,-0.764733;0.286019;0.577349;,-0.764733;0.286019;-0.577349;,0.286019;0.764733;-0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,0.577349;0.577349;0.577349;,-0.577349;0.577349;0.577349;,-0.577349;0.577349;-0.577349;,0.577349;0.577349;-0.577349;,0;-0.707083;0.707083;,0;0.707083;0.707083;,0.599902;0.565722;0.565722;,0.599902;-0.565722;0.565722;,0.599902;-0.565722;0.565722;,0.599902;0.565722;0.565722;,0.599902;0.565722;-0.565722;,0.599902;-0.565722;-0.565722;,0;-0.707083;0.707083;,0.599902;-0.565722;0.565722;,0.599902;-0.565722;-0.565722;,0;-0.707083;-0.707083;,0.599902;0.565722;0.565722;,0;0.707083;0.707083;,0;0.707083;-0.707083;,0.599902;0.565722;-0.565722;,0.599902;-0.565722;-0.565722;,0.599902;0.565722;-0.565722;,0;0.707083;-0.707083;,0;-0.707083;-0.707083;,0;-0.707083;0.707083;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,0;0.707083;0.707083;,-0.577349;-0.577349;0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;0.577349;0.577349;,0;-0.707083;0.707083;,0;-0.707083;-0.707083;,-0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,0.577349;-0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,0.577349;0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;0.577349;0.577349;,-0.577349;-0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,-0.577349;0.577349;-0.577349;,0.577349;0.577349;-0.577349;,0.577349;0.577349;0.577349;,-0.577349;0.577349;0.577349;,-0.577349;0.577349;-0.577349;,0;0.707083;-0.707083;,0;0.707083;0.707083;,-0.577349;-0.577349;-0.577349;,0;-0.707083;-0.707083;,0;0.707083;-0.707083;,-0.577349;0.577349;-0.577349;,0.286019;-0.764733;-0.577349;,0.286019;-0.764733;0.577349;,0.764733;0.286019;0.577349;,0.764733;0.286019;-0.577349;,0.286019;-0.764733;0.577349;,-0.764733;-0.286019;0.577349;,-0.286019;0.764733;0.577349;,0.764733;0.286019;0.577349;,-0.764733;-0.286019;0.577349;,-0.764733;-0.286019;-0.577349;,-0.286019;0.764733;-0.577349;,-0.286019;0.764733;0.577349;,-0.764733;-0.286019;-0.577349;,0.286019;-0.764733;-0.577349;,0.764733;0.286019;-0.577349;,-0.286019;0.764733;-0.577349;,0.286019;-0.764733;0.577349;,0.286019;-0.764733;-0.577349;,-0.764733;-0.286019;-0.577349;,-0.764733;-0.286019;0.577349;,-0.286019;0.764733;0.577349;,-0.286019;0.764733;-0.577349;,0.764733;0.286019;-0.577349;,0.764733;0.286019;0.577349;,0.286019;-0.764733;-0.577349;,0.286019;-0.764733;0.577349;,0.764733;0.286019;0.577349;,0.764733;0.286019;-0.577349;,0.286019;-0.764733;0.577349;,-0.764733;-0.286019;0.577349;,-0.286019;0.764733;0.577349;,0.764733;0.286019;0.577349;,-0.764733;-0.286019;0.577349;,-0.764733;-0.286019;-0.577349;,-0.286019;0.764733;-0.577349;,-0.286019;0.764733;0.577349;,-0.764733;-0.286019;-0.577349;,0.286019;-0.764733;-0.577349;,0.764733;0.286019;-0.577349;,-0.286019;0.764733;-0.577349;,0.286019;-0.764733;0.577349;,0.286019;-0.764733;-0.577349;,-0.764733;-0.286019;-0.577349;,-0.764733;-0.286019;0.577349;,-0.286019;0.764733;0.577349;,-0.286019;0.764733;-0.577349;,0.764733;0.286019;-0.577349;,0.764733;0.286019;0.577349;,0.577349;-0.577349;-0.577349;,0.577349;-0.577349;0.577349;,0.577349;0.577349;0.577349;,0.577349;0.577349;-0.577349;,0.577349;-0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,0.577349;0.577349;0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,-0.577349;0.577349;0.577349;,-0.577349;-0.577349;-0.577349;,0.577349;-0.577349;-0.577349;,0.577349;0.577349;-0.577349;,-0.577349;0.577349;-0.577349;,0.577349;-0.577349;0.577349;,0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;-0.577349;,-0.577349;-0.577349;0.577349;,-0.577349;0.577349;0.577349;,-0.577349;0.577349;-0.577349;,0.577349;0.577349;-0.577349;,0.577349;0.577349;0.577349;,0;-0.707083;0.707083;,-0.599902;-0.565722;0.565722;,-0.599872;0.565722;0.565722;,0;0.707083;0.707083;,-0.599902;-0.565722;0.565722;,-0.599902;-0.565722;-0.565722;,-0.599872;0.565722;-0.565722;,-0.599872;0.565722;0.565722;,0;-0.707083;0.707083;,0;-0.707083;-0.707083;,-0.599902;-0.565722;-0.565722;,-0.599902;-0.565722;0.565722;,-0.599872;0.565722;0.565722;,-0.599872;0.565722;-0.565722;,0;0.707083;-0.707083;,0;0.707083;0.707083;,-0.599902;-0.565722;-0.565722;,0;-0.707083;-0.707083;,0;0.707083;-0.707083;,-0.599872;0.565722;-0.565722;;68;4;3,2,1,0;,4;7,6,5,4;,4;11,10,9,8;,4;15,14,13,12;,4;19,18,17,16;,4;23,22,21,20;,4;27,26,25,24;,4;31,30,29,28;,4;35,34,33,32;,4;39,38,37,36;,4;43,42,41,40;,4;47,46,45,44;,4;51,50,49,48;,4;55,54,53,52;,4;59,58,57,56;,4;63,62,61,60;,4;67,66,65,64;,4;71,70,69,68;,4;75,74,73,72;,4;79,78,77,76;,4;83,82,81,80;,4;87,86,85,84;,4;91,90,89,88;,4;95,94,93,92;,4;99,98,97,96;,4;103,102,101,100;,4;107,106,105,104;,4;111,110,109,108;,4;115,114,113,112;,4;119,118,117,116;,4;123,122,121,120;,4;127,126,125,124;,4;131,130,129,128;,4;135,134,133,132;,4;139,138,137,136;,4;143,142,141,140;,4;147,146,145,144;,4;151,150,149,148;,4;155,154,153,152;,4;159,158,157,156;,4;163,162,161,160;,4;167,166,165,164;,4;171,170,169,168;,4;175,174,173,172;,4;179,178,177,176;,4;183,182,181,180;,4;187,186,185,184;,4;191,190,189,188;,4;195,194,193,192;,4;199,198,197,196;,4;203,202,201,200;,4;207,206,205,204;,4;211,210,209,208;,4;215,214,213,212;,4;219,218,217,216;,4;223,222,221,220;,4;227,226,225,224;,4;231,230,229,228;,4;235,234,233,232;,4;239,238,237,236;,4;243,242,241,240;,4;247,246,245,244;,4;251,250,249,248;,4;255,254,253,252;,4;259,258,257,256;,4;263,262,261,260;,4;267,266,265,264;,4;271,270,269,268;;}MeshTextureCoords{272;0.849264;0.899246;,0.849264;0.931916;,0.861547;0.931916;,0.861547;0.899246;,0.916988;0.931916;,0.916988;0.899246;,0.9054;0.899246;,0.9054;0.931916;,0.84857;0.844707;,0.84857;0.83254;,0.836981;0.83254;,0.836981;0.844707;,0.927004;0.903587;,0.927004;0.931916;,0.937019;0.931916;,0.937019;0.903587;,0.937019;0.903587;,0.937019;0.931916;,0.946887;0.931916;,0.946887;0.903587;,0.888533;0.856954;,0.888533;0.828625;,0.878517;0.828625;,0.878517;0.856954;,0.939292;0.870917;,0.939292;0.899246;,0.949159;0.899246;,0.949159;0.870917;,0.946887;0.91117;,0.956719;0.91117;,0.956719;0.901213;,0.946887;0.901213;,0.865118;0.813135;,0.855286;0.813135;,0.855286;0.823092;,0.865118;0.823092;,0.866874;0.847426;,0.866874;0.835259;,0.855286;0.835259;,0.855286;0.847426;,0.598002;0.973516;,0.598002;0.206739;,0.309722;0.206739;,0.309722;0.973516;,0.909393;0.822135;,0.909393;0.841014;,0.915938;0.841014;,0.915938;0.822135;,0.951962;0.931916;,0.951962;0.91117;,0.946887;0.91117;,0.946887;0.931916;,0.948762;0.841801;,0.948762;0.822921;,0.942217;0.822921;,0.942217;0.841801;,0.893608;0.838075;,0.893608;0.817329;,0.888533;0.817329;,0.888533;0.838075;,0.900724;0.909292;,0.90515;0.909292;,0.90515;0.902786;,0.900724;0.902786;,0.953585;0.871994;,0.949159;0.871994;,0.949159;0.8785;,0.953585;0.8785;,0.84857;0.837995;,0.84857;0.856874;,0.855114;0.856874;,0.855114;0.837995;,0.902881;0.83746;,0.902881;0.816714;,0.897805;0.816714;,0.897805;0.83746;,0.942217;0.841801;,0.942217;0.822921;,0.935673;0.822921;,0.935673;0.841801;,0.949159;0.8785;,0.949159;0.899246;,0.954235;0.899246;,0.954235;0.8785;,0.919226;0.822135;,0.923651;0.822135;,0.923651;0.815629;,0.919226;0.815629;,0.928077;0.815629;,0.923651;0.815629;,0.923651;0.822135;,0.928077;0.822135;,0.865301;0.847426;,0.865301;0.876542;,0.875317;0.876542;,0.875317;0.847426;,0.909393;0.841014;,0.909393;0.87013;,0.919261;0.87013;,0.919261;0.841014;,0.855286;0.847426;,0.855286;0.876542;,0.865301;0.876542;,0.865301;0.847426;,0.919261;0.841014;,0.919261;0.87013;,0.929128;0.87013;,0.929128;0.841014;,0.878517;0.828625;,0.888349;0.828625;,0.88835;0.818668;,0.878517;0.818668;,0.836981;0.83254;,0.846814;0.83254;,0.846814;0.822583;,0.836981;0.822583;,0.857749;0.887894;,0.836981;0.887894;,0.837473;0.899246;,0.857257;0.899246;,0.855286;0.876542;,0.855286;0.856874;,0.836981;0.856874;,0.836981;0.876542;,0.897805;0.887893;,0.897313;0.876622;,0.879009;0.876622;,0.878517;0.887893;,0.886604;0.909292;,0.886112;0.920645;,0.9054;0.920645;,0.904908;0.909292;,0.977665;0.442421;,0.977665;0.131438;,0.799225;0.123708;,0.799225;0.450151;,0.849264;0.899246;,0.836981;0.899246;,0.836981;0.931916;,0.849264;0.931916;,0.909393;0.866576;,0.897805;0.866576;,0.897805;0.899246;,0.909393;0.899246;,0.84857;0.844707;,0.836981;0.844707;,0.836981;0.856874;,0.84857;0.856874;,0.929276;0.899246;,0.939292;0.899246;,0.939292;0.870917;,0.929276;0.870917;,0.876741;0.819096;,0.866874;0.819096;,0.866874;0.847426;,0.876741;0.847426;,0.939144;0.841801;,0.929128;0.841801;,0.929128;0.87013;,0.939144;0.87013;,0.949011;0.841801;,0.939144;0.841801;,0.939144;0.87013;,0.949011;0.87013;,0.836981;0.812626;,0.836981;0.822583;,0.846814;0.822583;,0.846814;0.812626;,0.909393;0.812178;,0.909393;0.822135;,0.919226;0.822135;,0.919226;0.812178;,0.866874;0.823092;,0.855286;0.823092;,0.855286;0.835259;,0.866874;0.835259;,0.021442;0.973516;,0.309722;0.973516;,0.309722;0.206739;,0.021442;0.206739;,0.916039;0.841014;,0.922583;0.841014;,0.922583;0.822135;,0.916039;0.822135;,0.907956;0.816714;,0.902881;0.816714;,0.902881;0.83746;,0.907956;0.83746;,0.929128;0.822135;,0.922583;0.822135;,0.922583;0.841014;,0.929128;0.841014;,0.853645;0.817249;,0.84857;0.817249;,0.84857;0.837995;,0.853645;0.837995;,0.900724;0.909292;,0.900724;0.902786;,0.895944;0.902786;,0.895944;0.909292;,0.93896;0.816415;,0.93896;0.822921;,0.94374;0.822921;,0.94374;0.816415;,0.935673;0.822921;,0.929128;0.822921;,0.929128;0.841801;,0.935673;0.841801;,0.954087;0.849384;,0.949011;0.849384;,0.949011;0.87013;,0.954087;0.87013;,0.895077;0.838075;,0.888533;0.838075;,0.888533;0.856954;,0.895077;0.856954;,0.948762;0.841801;,0.953838;0.841801;,0.953838;0.821055;,0.948762;0.821055;,0.94374;0.816415;,0.94374;0.822921;,0.94852;0.822921;,0.94852;0.816415;,0.949011;0.842878;,0.949011;0.849384;,0.953791;0.849384;,0.953791;0.842878;,0.919409;0.87013;,0.909393;0.87013;,0.909393;0.899246;,0.919409;0.899246;,0.897805;0.866576;,0.907672;0.866576;,0.907672;0.83746;,0.897805;0.83746;,0.927004;0.9028;,0.916988;0.9028;,0.916988;0.931916;,0.927004;0.931916;,0.929276;0.87013;,0.919409;0.87013;,0.919409;0.899246;,0.929276;0.899246;,0.93896;0.822921;,0.93896;0.812965;,0.929128;0.812965;,0.929128;0.822921;,0.886112;0.899336;,0.886112;0.909292;,0.895944;0.909292;,0.895944;0.899336;,0.857749;0.887894;,0.857257;0.876542;,0.837473;0.876542;,0.836981;0.887894;,0.896821;0.856954;,0.878517;0.856954;,0.878517;0.876622;,0.896821;0.876622;,0.897805;0.887893;,0.878517;0.887893;,0.879009;0.899246;,0.897313;0.899246;,0.886604;0.931916;,0.904908;0.931916;,0.9054;0.920645;,0.886112;0.920645;,0.620785;0.44242;,0.799225;0.450151;,0.799225;0.123708;,0.620785;0.131438;;}XSkinMeshHeader{3;9;10;}SkinWeights{"Armature_arm_l";24;44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,67,66;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;-0.047733,0.901521,0.430095,0,-0.097683,0.424309,-0.900233,0,-0.994073,-0.084983,0.06781,0,0.374873,-2.006904,2.980378,1;;}SkinWeights{"Armature_elbow_r";24;216,219,218,213,212,215,214,209,224,208,227,211,226,210,206,221,207,220,204,223,205,222,225,217;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;0.102316,0.92166,-0.374266,0,-0.090709,-0.366028,-0.926173,0,-0.990608,0.128712,0.046152,0,0.402018,1.853661,2.350172,1;;}SkinWeights{"Armature_arm_r";24;186,187,184,185,182,183,180,194,195,203,202,192,193,201,200,199,190,198,191,197,188,196,189,181;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;-0.047733,0.901521,-0.430095,0,-0.05233,-0.432251,-0.900234,0,-0.997489,-0.020464,0.067809,0,0.160852,2.035269,2.980378,1;;}SkinWeights{"Armature_knee_l";24;105,99,114,106,98,115,107,101,93,108,100,92,109,103,95,110,102,94,111,97,112,104,113,96;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;1,0,0,0,0,0.054357,-0.998522,0,0,0.998501,0.054355,0,-0.246294,-0.008592,1.301673,1;;}SkinWeights{"Armature_Bone_007";40;132,133,134,135,124,125,126,252,253,254,255,121,122,264,265,123,267,268,269,270,116,256,258,259,260,261,262,263,271,266,120,119,117,128,129,127,130,118,131,257;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;1,0,0,0,0,0,1,0,0,-1,0,0,0,0,-3.793003,1;;}SkinWeights{"Armature_elbow_l";24;88,80,72,91,83,75,90,82,74,70,85,77,71,84,76,68,87,79,69,86,78,89,81,73;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;0.102316,0.92166,0.374266,0,-0.008222,0.377011,-0.926173,0,-0.994719,0.091686,0.046152,0,-0.014321,-1.896701,2.350171,1;;}SkinWeights{"Armature_knee_r";24;249,235,250,234,251,229,244,228,245,231,246,230,247,240,241,242,243,237,236,239,238,233,248,232;1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1;1,0,0,0,0,0.054357,-0.998522,0,0,0.998501,0.054355,0,0.246294,-0.008592,1.301673,1;;}SkinWeights{"Armature_leg_l";38;0,3,4,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,40,43,136,145,177,144;0.055873,0.852304,0.852304,0.82998,0.055873,0.852304,0.82998,0.054606,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0.82998,0.054606,0.055873,0.054606,0.054606,0.055873;1,0,0,0,0,-0.056452,-0.998405,0,0,0.998385,-0.056452,0,-0.246294,0.135476,2.396023,1;;}SkinWeights{"Armature_leg_r";38;0,170,169,11,168,151,150,149,148,147,146,176,145,177,144,159,158,157,156,155,154,153,167,136,166,137,165,164,163,140,162,141,161,43,160,152,8,171;0.055873,1,1,0.054606,1,1,1,1,1,0.852304,0.82998,0.82998,0.054606,0.054606,0.055873,1,1,1,1,1,1,1,1,0.055873,1,0.852304,1,1,1,0.852304,1,0.82998,1,0.054606,1,1,0.055873,1;1,0,0,0,0,-0.056452,-0.998405,0,0,0.998385,-0.056452,0,0.246294,0.135476,2.396023,1;;}SkinWeights{"Armature_body";40;0,1,2,3,4,5,6,7,8,9,10,11,36,37,38,39,40,41,42,43,136,137,138,139,140,147,141,146,142,145,143,144,179,174,178,173,177,172,176,175;0.888255,1,1,0.147696,0.147696,1,1,0.17002,0.888255,0.147696,0.17002,0.890788,1,1,1,1,0.17002,1,1,0.890788,0.888255,0.147696,1,1,0.147696,0.147696,0.17002,0.17002,1,0.890788,1,0.888255,1,1,1,1,0.890788,1,0.17002,1;1,0,0,0,0,0,1,0,0,-1,0,0,0,0,-2.571201,1;;}}}}}
\ No newline at end of file
diff --git a/irr/media/cooltexture.png b/irr/media/cooltexture.png
new file mode 100755
index 000000000..fcc219ac7
Binary files /dev/null and b/irr/media/cooltexture.png differ
diff --git a/irr/scripts/BindingGenerator.lua b/irr/scripts/BindingGenerator.lua
new file mode 100755
index 000000000..0f9ffa764
--- /dev/null
+++ b/irr/scripts/BindingGenerator.lua
@@ -0,0 +1,453 @@
+#!/usr/bin/lua
+-- BindingGenerator.lua (c) hecks 2021
+-- This script is a part of IrrlichtMT, released under the same license.
+
+-- By default we assume you're running this from /scripts/
+-- and that you have the necessary headers there (gitignored for your convenience)
+local sourceTreePath = os.getenv( "IRRMTREPO" ) or "..";
+-- Otherwise run this from wherever you want and set the above env variable.
+local glHeaderPath = os.getenv( "GLHEADERPATH" ) or ".";
+-- GL headers will be looked for in the current directory or GLHEADERPATH.
+-- At the moment we require:
+-- 		"glcorearb.h"
+-- 		"gl2ext.h"
+-- Files other than glcorearb.h are only parsed for vendor specific defines
+-- and aliases. Otherwise we only use what exists in glcorearb.h, further
+-- restricted to procedures that are either core or ARB.
+
+
+-- Emulate a portion of the libraries that this was written against.
+getmetatable( "" ).__index = string;
+getmetatable( "" ).__len = string.len;
+getmetatable( "" ).__call = string.format;
+function string:Split( pat )
+	local r = {};
+	local pos = 1;
+	local from, to;
+	while pos and pos <= #self do
+		from, to = self:find( pat, pos );
+		if not from then
+			break;
+		end
+		r[#r+1] = self:sub( pos, from - 1 );
+		pos = to + 1;
+	end
+	r[#r+1] = self:sub( pos, #self );
+	return r;
+end
+function string:TrimBothEnds()
+	return self:gsub("^%s+",""):gsub("%s+$","");
+end
+local List;
+List = function( t )
+	return setmetatable( t or {}, {
+		__index = {
+			Add = function( t, v )
+				t[#t+1] = v;
+			end;
+			AddFormat = function( t, str, ... )
+				t:Add( str( ... ) );
+			end;
+			Where = function( t, f )
+				local r = {};
+				for i=1, #t do
+					if f(t[i]) then r[#r+1] = t[i]; end
+				end
+				return List( r );
+			end;
+			Select = function( t, f )
+				local r = {};
+				for i=1, #t do
+					r[#r+1] = f( t[i] );
+				end
+				return List( r );
+			end;
+			Join = function( t, n )
+				local r = {};
+				for i=1, #t do
+					r[i] = t[i];
+				end
+				for i=1, #n do
+					r[#r+1] = n[i];
+				end
+				return List( r );
+			end;
+			Concat = table.concat;
+		};
+	} );
+end
+
+
+------------ Header parsing ------------
+
+-- GL and GLES alike
+local driverVendors = {
+	"NV", "AMD", "INTEL", "OVR", "QCOM", "IMG", "ANGLE", "APPLE", "MESA"
+}
+local vendorSuffixes = {
+	"ARB", "EXT", "KHR", "OES",
+	unpack( driverVendors )
+};
+local vendorSuffixPattern = {};
+local constSuffixPattern = {};
+for i=1, #vendorSuffixes do
+	vendorSuffixPattern[i] = vendorSuffixes[i] .. "$";
+	constSuffixPattern[i] = ("_%s$")( vendorSuffixes[i] );
+end
+local constBanned = {};
+for i=1, #driverVendors do
+	constBanned[driverVendors[i]] = true;
+end
+-- Strip the uppercase extension vendor suffix from a name.
+local function StripVendorSuffix( str, const )
+	local patterns = const and constSuffixPattern or vendorSuffixPattern;
+	local n;
+	for i=1, #patterns do
+		str, n = str:gsub( patterns[i], "" );
+		if n > 0 then
+			return str, vendorSuffixes[i];
+		end
+	end
+	return str;
+end
+
+-- Normalize the type of an argument or return, also stripping any suffix
+-- and normalizing all whitespace regions to single spaces.
+local function NormalizeType( str )
+	local chunks = str:Split( "%s+" );
+	for j=1, #chunks do
+		chunks[j] = StripVendorSuffix( chunks[j] );
+	end
+	local T = table.concat(chunks, " " );
+	return T:TrimBothEnds();
+end
+
+-- Normalize an argument, returning the normalized type and the name separately,
+-- always sticking the * of a pointer to the type rather than the name.
+-- We need this to generate a normalized arg list and function signature (below)
+local function NormalizeArgument( str )
+	local chunks = str:Split( "%s+" );
+	for j=1, #chunks do
+		chunks[j] = StripVendorSuffix( chunks[j] );
+	end
+	local last = chunks[#chunks];
+	local name = last:match( "[%w_]+$" );
+	chunks[#chunks] = #name ~= #last and last:sub( 1, #last-#name) or nil;
+	local T = table.concat(chunks, " " ):TrimBothEnds();
+	return T, name
+end
+
+-- Normalize an argument list so that two matching prototypes
+-- will produce the same table if fed to this function.
+local function NormalizeArgList( str )
+	local args = str:Split( ",%s*" );
+	local r = {};
+	for i=1, #args do
+		local T, name = NormalizeArgument( args[i] );
+		r[i] = { T, name };
+	end
+	return r;
+end
+
+-- Normalize a function signature into a unique string for keying
+-- in such a way that if two different GL procedures may be assigned
+-- to the same function pointer, this will produce an identical string for both.
+-- This makes it possible to detect function aliases that may work as a fallback.
+-- You still have to check for the appropriate extension.
+local function NormalizeFunctionSignature( T, str )
+	local args = str:Split( ",%s*" );
+	local r = {};
+	for i=1, #args do
+		r[i] = NormalizeArgument( args[i] );
+	end
+	return ("%s(%s)")( T, table.concat( r, ", " ) );
+end
+
+-- Mangle the PFN name so that we don't collide with a
+-- typedef from any of the GL headers.
+local pfnFormat = "PFNGL%sPROC_MT";
+
+--( T, name, args )
+local typedefFormat = "\ttypedef %s (APIENTRYP %s) (%s);"
+-- Generate a PFN...GL style typedef for a procedure
+--
+local function GetProcedureTypedef( proc )
+	local args = {};
+	for i=1, #proc.args do
+		args[i] = ("%s %s")( unpack( proc.args[i] ) )
+	end
+	return typedefFormat( proc.retType, pfnFormat( proc.name:upper() ), table.concat( args, ", " ) );
+end
+
+local procedures = List();
+local nameset = {};
+local definitions = List();
+local consts = List();
+
+--[[
+	Structured procedure representation:
+
+	ProcSpec = {
+		string name;		-- Normalized name as it appears in the GL spec
+		string? vendor;		-- Uppercase vendor string (ARB, EXT, AMD, NV etc)
+		string signature;
+		string retType;
+		args = { { type, name } };
+	};
+]]
+-- Parse a whole header, extracting the data.
+local function ParseHeader( path, into, apiRegex, defs, consts, nameSet, noNewNames )
+	defs:AddFormat( "\t// %s", path );
+	local f = assert( io.open( path, "r" ), "Could not open " .. path );
+	for line in f:lines() do
+		-- Do not parse PFN typedefs; they're easily reconstructible.
+		local T, rawName, args = line:match( apiRegex );
+		if T then
+			T = NormalizeType( T );
+			-- Strip the 'gl' namespace prefix.
+			local procName = rawName:sub(3,-1);
+			local name, vendor = StripVendorSuffix( procName );
+			if not (noNewNames and nameSet[name]) then
+				nameSet[name] = true;
+				into:Add{
+					name = name;
+					vendor = vendor;
+					-- pfnType = pfnFormat( procName:upper() );
+					signature = NormalizeFunctionSignature( T, args );
+					retType = T;
+					args = NormalizeArgList( args );
+				};
+			end
+		elseif ( line:find( "#" ) and not line:find( "#include" ) ) then
+			local rawName, value = line:match( "#define%s+GL_([_%w]+)%s+0x(%w+)" );
+			if rawName and value then
+				local name, vendor = StripVendorSuffix( rawName, true );
+				if not constBanned[vendor] then
+					consts:Add{ name = name, vendor = vendor, value = "0x"..value };
+				end
+			end
+			::skip::
+		elseif( line:find( "typedef" ) and not line:find( "%(" ) ) then
+			-- Passthrough non-PFN typedefs
+			defs:Add( "\t" .. line );
+		end
+	end
+	defs:Add "";
+	f:close();
+end
+
+------------ Parse the headers ------------
+
+-- ES/gl2.h is a subset of glcorearb.h and does not need parsing.
+
+local funcRegex = "GLAPI%s+(.+)APIENTRY%s+(%w+)%s*%((.*)%)";
+local funcRegexES = "GL_APICALL%s+(.+)GL_APIENTRY%s+(%w+)%s*%((.*)%)";
+ParseHeader( glHeaderPath .. "/glcorearb.h", procedures, funcRegex, definitions, consts, nameset );
+ParseHeader( glHeaderPath .. "/gl2ext.h", procedures, funcRegexES, List(), consts, nameset, true );
+-- Typedefs are redirected to a dummy list here on purpose.
+-- The only unique typedef from gl2ext is this:
+definitions:Add "\ttypedef void *GLeglClientBufferEXT;";
+
+------------ Sort out constants ------------
+
+local cppConsts = List();
+do
+	local constBuckets = {};
+	for i=1, #consts do
+		local vendor = consts[i].vendor or "core";
+		constBuckets[consts[i].name] = constBuckets[consts[i].name] or {};
+		constBuckets[consts[i].name][vendor] = consts[i].value;
+	end
+	local names = {};
+	for i=1, #consts do
+		local k = consts[i].name;
+		local b = constBuckets[k];
+		if k == "WAIT_FAILED" or k == "DIFFERENCE" then
+			-- This is why using #define as const is evil.
+			k = "_" .. k;
+		end
+		if b and not names[k] then
+			names[k] = true;
+			-- I have empirically tested that constants in GL with the same name do not differ,
+			-- at least for these suffixes.
+			local v = b.core or b.KHR or b.ARB or b.OES or b.EXT;
+			if v then
+				local T = v:find( "ull" ) and "GLuint64" or "GLenum";
+				cppConsts:AddFormat( "\tstatic constexpr const %s %s = %s;", T, k, v );
+			end
+		end
+	end
+end
+
+
+------------ Sort out procedures ------------
+
+local procTable = {};
+
+local coreProcedures = procedures:Where( function(x) return not x.vendor; end );
+local arbProcedures = procedures:Where( function(x) return x.vendor == "ARB"; end );
+
+-- Only consider core and ARB functions.
+local nameList = coreProcedures:Join( arbProcedures ):Select(
+	function(p)
+		return p.name;
+	end );
+
+local nameSet = {};
+local uniqueNames = List();
+
+for s, k in ipairs( nameList ) do
+	if not nameSet[k] then
+		nameSet[k] = true;
+		uniqueNames:Add( k );
+	end
+end
+
+for i=1, #procedures do
+	local p = procedures[i];
+	procTable[p.name] = procTable[p.name] or {};
+	local key = p.vendor or "core";
+	procTable[p.name][key] = p;
+end
+
+local priorityList = List{ "core", "ARB", "OES", "KHR" };
+
+local typedefs = List();
+local pointers = List();
+local loader = List();
+
+for s, str in ipairs( uniqueNames ) do
+	pointers:Add( ("\t%s %s = NULL;")( pfnFormat( str:upper() ), str ) );
+	local typeDefGenerated = false;
+	for i=1, #priorityList do
+		local k = priorityList[i];
+		local proc = procTable[str][k]
+		if proc then
+			if not typeDefGenerated then
+				typedefs:Add( GetProcedureTypedef( proc ) );
+				typeDefGenerated = true;
+			end
+			local vendor = k == "core" and "" or k;
+			loader:AddFormat(
+				'\tif (!%s) %s = (%s)cmgr->getProcAddress("%s");\n',
+				str, str, pfnFormat( proc.name:upper() ), ("gl%s%s")(str,vendor)
+			);
+		end
+	end
+end
+
+
+------------ Write files ------------
+
+-- Write loader header
+local f = io.open( sourceTreePath .. "/include/mt_opengl.h", "wb" );
+f:write[[
+// This code was generated by scripts/BindingGenerator.lua
+// Do not modify it, modify and run the generator instead.
+
+#pragma once
+
+#include <string>
+#include <unordered_set>
+#include "IrrCompileConfig.h" // for IRRLICHT_API
+#include "irrTypes.h"
+#include "IContextManager.h"
+#include <KHR/khrplatform.h>
+
+#ifndef APIENTRY
+	#define APIENTRY KHRONOS_APIENTRY
+#endif
+#ifndef APIENTRYP
+	#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+	#define GLAPI extern
+#endif
+
+]];
+
+f:write[[
+class OpenGLProcedures {
+private:
+]];
+f:write( definitions:Concat( "\n" ) );
+f:write( "\n" );
+f:write[[
+	// The script will miss this particular typedef thinking it's a PFN,
+	// so we have to paste it in manually. It's the only such type in OpenGL.
+	typedef void (APIENTRY *GLDEBUGPROC)
+		(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+
+]]
+f:write( typedefs:Concat( "\n" ) );
+f:write( "\n\n" );
+f:write [[
+	std::unordered_set<std::string> extensions;
+public:
+	// Call this once after creating the context.
+	void LoadAllProcedures(irr::video::IContextManager *cmgr);
+	// Check if an extension is supported.
+	inline bool IsExtensionPresent(const std::string &ext) const
+	{
+		return extensions.count(ext) > 0;
+	}
+
+]];
+f:write( pointers:Concat( "\n" ) );
+f:write( "\n\n" );
+f:write( cppConsts:Concat( "\n" ) );
+f:write( "\n\n" );
+f:write[[
+	static constexpr const GLenum ZERO = 0;
+	static constexpr const GLenum ONE = 1;
+	static constexpr const GLenum NONE = 0;
+]];
+f:write( "};\n" );
+f:write( "\n// Global GL procedures object.\n" );
+f:write( "IRRLICHT_API extern OpenGLProcedures GL;\n" );
+f:close();
+
+-- Write loader implementation
+f = io.open( sourceTreePath .. "/src/mt_opengl_loader.cpp", "wb" );
+f:write[[
+// This code was generated by scripts/BindingGenerator.lua
+// Do not modify it, modify and run the generator instead.
+
+#include "mt_opengl.h"
+#include <string>
+#include <sstream>
+
+OpenGLProcedures GL = OpenGLProcedures();
+
+void OpenGLProcedures::LoadAllProcedures(irr::video::IContextManager *cmgr)
+{
+
+]];
+f:write( loader:Concat() );
+f:write[[
+
+	// OpenGL 3 way to enumerate extensions
+	GLint ext_count = 0;
+	GetIntegerv(NUM_EXTENSIONS, &ext_count);
+	extensions.reserve(ext_count);
+	for (GLint k = 0; k < ext_count; k++) {
+		auto tmp = GetStringi(EXTENSIONS, k);
+		if (tmp)
+			extensions.emplace((char*)tmp);
+	}
+	if (!extensions.empty())
+		return;
+
+	// OpenGL 2 / ES 2 way to enumerate extensions
+	auto ext_str = GetString(EXTENSIONS);
+	if (!ext_str)
+		return;
+	// get the extension string, chop it up
+	std::stringstream ext_ss((char*)ext_str);
+	std::string tmp;
+	while (std::getline(ext_ss, tmp, ' '))
+		extensions.emplace(tmp);
+
+}
+]];
+f:close();
diff --git a/irr/scripts/ci-build-android.sh b/irr/scripts/ci-build-android.sh
new file mode 100755
index 000000000..a865e56a4
--- /dev/null
+++ b/irr/scripts/ci-build-android.sh
@@ -0,0 +1,123 @@
+#!/bin/bash -e
+
+# NOTE: this code is mostly copied from minetest_android_deps
+# <https://github.com/minetest/minetest_android_deps>
+
+png_ver=1.6.40
+jpeg_ver=3.0.1
+
+download () {
+	get_tar_archive libpng "https://download.sourceforge.net/libpng/libpng-${png_ver}.tar.gz"
+	get_tar_archive libjpeg "https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${jpeg_ver}.tar.gz"
+}
+
+build () {
+	# Build libjpg and libpng first because Irrlicht needs them
+	mkdir -p libpng
+	pushd libpng
+	$srcdir/libpng/configure --host=$CROSS_PREFIX
+	make && make DESTDIR=$PWD install
+	popd
+
+	mkdir -p libjpeg
+	pushd libjpeg
+	cmake $srcdir/libjpeg "${CMAKE_FLAGS[@]}" -DENABLE_SHARED=OFF
+	make && make DESTDIR=$PWD install
+	popd
+
+	local libpng=$PWD/libpng/usr/local/lib/libpng.a
+	local libjpeg=$(echo $PWD/libjpeg/opt/libjpeg-turbo/lib*/libjpeg.a)
+	cmake $srcdir/irrlicht "${CMAKE_FLAGS[@]}" \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DPNG_LIBRARY=$libpng \
+		-DPNG_PNG_INCLUDE_DIR=$(dirname "$libpng")/../include \
+		-DJPEG_LIBRARY=$libjpeg \
+		-DJPEG_INCLUDE_DIR=$(dirname "$libjpeg")/../include
+	make
+
+	cp -p lib/Android/libIrrlichtMt.a $libpng $libjpeg $pkgdir/
+	cp -a $srcdir/irrlicht/include $pkgdir/include
+	cp -a $srcdir/irrlicht/media/Shaders $pkgdir/Shaders
+}
+
+get_tar_archive () {
+	# $1: folder to extract to, $2: URL
+	local filename="${2##*/}"
+	[ -d "$1" ] && return 0
+	wget -c "$2" -O "$filename"
+	mkdir -p "$1"
+	tar -xaf "$filename" -C "$1" --strip-components=1
+	rm "$filename"
+}
+
+_setup_toolchain () {
+	local toolchain=$(echo "$ANDROID_NDK"/toolchains/llvm/prebuilt/*)
+	if [ ! -d "$toolchain" ]; then
+		echo "Android NDK path not specified or incorrect"; return 1
+	fi
+	export PATH="$toolchain/bin:$ANDROID_NDK:$PATH"
+
+	unset CFLAGS CPPFLAGS CXXFLAGS
+
+	TARGET_ABI="$1"
+	API=21
+	if [ "$TARGET_ABI" == armeabi-v7a ]; then
+		CROSS_PREFIX=armv7a-linux-androideabi
+		CFLAGS="-mthumb"
+		CXXFLAGS="-mthumb"
+	elif [ "$TARGET_ABI" == arm64-v8a ]; then
+		CROSS_PREFIX=aarch64-linux-android
+	elif [ "$TARGET_ABI" == x86 ]; then
+		CROSS_PREFIX=i686-linux-android
+		CFLAGS="-mssse3 -mfpmath=sse"
+		CXXFLAGS="-mssse3 -mfpmath=sse"
+	elif [ "$TARGET_ABI" == x86_64 ]; then
+		CROSS_PREFIX=x86_64-linux-android
+	else
+		echo "Invalid ABI given"; return 1
+	fi
+	export CC=$CROSS_PREFIX$API-clang
+	export CXX=$CROSS_PREFIX$API-clang++
+	export AR=llvm-ar
+	export RANLIB=llvm-ranlib
+	export CFLAGS="-fPIC ${CFLAGS}"
+	export CXXFLAGS="-fPIC ${CXXFLAGS}"
+
+	CMAKE_FLAGS=(
+		"-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake"
+		"-DANDROID_ABI=$TARGET_ABI" "-DANDROID_NATIVE_API_LEVEL=$API"
+		"-DCMAKE_BUILD_TYPE=Release"
+	)
+
+	# make sure pkg-config doesn't interfere
+	export PKG_CONFIG=/bin/false
+
+	export MAKEFLAGS="-j$(nproc)"
+}
+
+_run_build () {
+	local abi=$1
+	irrdir=$PWD
+
+	mkdir -p $RUNNER_TEMP/src
+	cd $RUNNER_TEMP/src
+	srcdir=$PWD
+	[ -d irrlicht ] || ln -s $irrdir irrlicht
+	download
+
+	builddir=$RUNNER_TEMP/build/irrlicht-$abi
+	pkgdir=$RUNNER_TEMP/pkg/$abi/Irrlicht
+	rm -rf "$pkgdir"
+	mkdir -p "$builddir" "$pkgdir"
+
+	cd "$builddir"
+	build
+}
+
+if [ $# -lt 1 ]; then
+	echo "Usage: ci-build-android.sh <ABI>"
+	exit 1
+fi
+
+_setup_toolchain $1
+_run_build $1
diff --git a/irr/scripts/ci-build-mingw.sh b/irr/scripts/ci-build-mingw.sh
new file mode 100755
index 000000000..b1fdd7b99
--- /dev/null
+++ b/irr/scripts/ci-build-mingw.sh
@@ -0,0 +1,70 @@
+#!/bin/bash -e
+topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+[[ -z "$CC" || -z "$CXX" ]] && exit 255
+variant=win32
+[[ "$(basename "$CXX")" == "x86_64-"* ]] && variant=win64
+with_sdl=0
+[[ "$extras" == *"-sdl"* ]] && with_sdl=1
+#with_gl3=0
+#[[ "$extras" == *"-gl3"* ]] && with_gl3=1
+
+libjpeg_version=3.0.1
+libpng_version=1.6.40
+sdl2_version=2.28.5
+zlib_version=1.3.1
+
+download () {
+	local url=$1
+	local filename=${url##*/}
+	local foldername=${filename%%[.-]*}
+
+	[ -d "./$foldername" ] && return 0
+    [ -e "$filename" ] || wget "$url" -O "$filename"
+	sha256sum -w -c <(grep -F "$filename" "$topdir/sha256sums.txt")
+	unzip -o "$filename" -d "$foldername"
+}
+
+libs=$PWD/libs
+mkdir -p libs
+pushd libs
+libhost="http://minetest.kitsunemimi.pw"
+download "$libhost/llvm/libjpeg-$libjpeg_version-$variant.zip"
+download "$libhost/llvm/libpng-$libpng_version-$variant.zip"
+[ $with_sdl -eq 1 ] && download "$libhost/llvm/sdl2-$sdl2_version-$variant.zip"
+download "$libhost/llvm/zlib-$zlib_version-$variant.zip"
+popd
+
+tmp=(
+	-DCMAKE_SYSTEM_NAME=Windows \
+	-DPNG_LIBRARY=$libs/libpng/lib/libpng.dll.a \
+	-DPNG_PNG_INCLUDE_DIR=$libs/libpng/include \
+	-DJPEG_LIBRARY=$libs/libjpeg/lib/libjpeg.dll.a \
+	-DJPEG_INCLUDE_DIR=$libs/libjpeg/include \
+	-DZLIB_LIBRARY=$libs/zlib/lib/libz.dll.a \
+	-DZLIB_INCLUDE_DIR=$libs/zlib/include
+)
+if [ $with_sdl -eq 1 ]; then
+	tmp+=(
+		-DUSE_SDL2=ON
+		-DCMAKE_PREFIX_PATH=$libs/sdl2/lib/cmake
+	)
+else
+	tmp+=(-DUSE_SDL2=OFF)
+fi
+#[ $with_gl3 -eq 1 ] && tmp+=(-DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON)
+
+cmake . "${tmp[@]}"
+make -j$(nproc)
+
+if [ "$1" = "package" ]; then
+	make DESTDIR=$PWD/_install install
+	# strip library
+	"${CXX%-*}-strip" --strip-unneeded _install/usr/local/lib/*.dll
+	# bundle the DLLs that are specific to Irrlicht (kind of a hack)
+	shopt -s nullglob
+	cp -p $libs/*/bin/{libjpeg,libpng,SDL}*.dll _install/usr/local/lib/
+	# create a ZIP
+	(cd _install/usr/local; zip -9r "$OLDPWD/irrlicht-$variant$extras.zip" -- *)
+fi
+exit 0
diff --git a/irr/scripts/ci-get-mingw.sh b/irr/scripts/ci-get-mingw.sh
new file mode 100755
index 000000000..9cf933fea
--- /dev/null
+++ b/irr/scripts/ci-get-mingw.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+name=llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
+wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/$name" -O "$name"
+sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt")
+sudo tar -xaf "$name" -C /usr --strip-components=1
+rm -f "$name"
diff --git a/irr/scripts/sha256sums.txt b/irr/scripts/sha256sums.txt
new file mode 100644
index 000000000..0c080de3b
--- /dev/null
+++ b/irr/scripts/sha256sums.txt
@@ -0,0 +1,9 @@
+0f21ff3be90311092fe32e0e30878ef3ae9d9437b8d9ac25ef279e0d84e9bb8e  llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
+53dfd31285f470fcf0dca88217c5cf9c557729af6d103afae5936e72ddc38d3c  libjpeg-3.0.1-win32.zip
+3d44e0740914e6878300e30653aad39e974821b5d7f6c2567e246b4eb04a5324  libjpeg-3.0.1-win64.zip
+6baf4e819bfb3573760524b5dc9a04b5e479090d6d2046b86cf39a3107c0071f  libpng-1.6.40-win32.zip
+c02e029f01fce44baea7f4aecfd2564bd8a03507c0c6af8b03339ae0452c8b7d  libpng-1.6.40-win64.zip
+f9f890af960e92fd3f532f2e9ac00681c33bc67a722e000dfdaeb41b0064f1a0  sdl2-2.28.5-win32.zip
+8dde2c6963544b7d8a2e87c128ebbdf51ad0e70c7e2df986ff4e963ce9996d9b  sdl2-2.28.5-win64.zip
+8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c  zlib-1.3.1-win32.zip
+ad43f5d23052590c65633530743e5d622cc76b33c109072e6fd7b487aff56bca  zlib-1.3.1-win64.zip
diff --git a/irr/src/BuiltInFont.h b/irr/src/BuiltInFont.h
new file mode 100644
index 000000000..1df5b7da4
--- /dev/null
+++ b/irr/src/BuiltInFont.h
@@ -0,0 +1,135 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+// header file generated by xxd
+// for the source bitmap, see builtInFont.png
+
+namespace irr
+{
+namespace gui
+{
+const u8 BuiltInFontData[] = {
+		0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+		0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80,
+		0x04, 0x03, 0x00, 0x00, 0x00, 0x31, 0x10, 0x7c, 0xf8, 0x00, 0x00, 0x00,
+		0x0f, 0x50, 0x4c, 0x54, 0x45, 0x18, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff,
+		0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0xc8, 0xc8, 0xae,
+		0x00, 0x00, 0x05, 0x11, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0x62, 0x50,
+		0x06, 0xf0, 0x62, 0x06, 0xb6, 0xed, 0xf4, 0x3a, 0x0c, 0xff, 0xf1, 0xba,
+		0x00, 0xb9, 0x41, 0xde, 0x06, 0xd9, 0x7f, 0xba, 0x07, 0x98, 0x10, 0x6a,
+		0x1f, 0xd2, 0xe2, 0x9f, 0xa0, 0xf8, 0x74, 0xaa, 0x65, 0xc9, 0x32, 0x23,
+		0x39, 0xc4, 0xc1, 0xe9, 0xc5, 0x83, 0x0b, 0xd6, 0x58, 0x7d, 0xf4, 0xe9,
+		0xec, 0x6a, 0xac, 0x6b, 0xd5, 0xc7, 0x9e, 0xfc, 0x17, 0x62, 0x09, 0x09,
+		0x4c, 0x60, 0x59, 0x0b, 0x99, 0x0a, 0x6b, 0xde, 0xc1, 0x60, 0x62, 0x82,
+		0xd2, 0xc0, 0x00, 0x90, 0x58, 0x21, 0xc2, 0xc6, 0x02, 0xef, 0x00, 0x16,
+		0xc1, 0x2a, 0x2e, 0x46, 0x13, 0xb5, 0x0a, 0x00, 0x48, 0xc5, 0xef, 0x62,
+		0x63, 0xde, 0x00, 0xd4, 0x28, 0xea, 0xc7, 0x77, 0x8a, 0x82, 0x07, 0xa0,
+		0xcb, 0xe0, 0x0c, 0x80, 0x42, 0x41, 0x0b, 0x20, 0x83, 0xb0, 0xc1, 0xc2,
+		0x8d, 0x22, 0x46, 0x12, 0x13, 0x1c, 0xec, 0x5b, 0x05, 0x03, 0xd0, 0x9d,
+		0xc9, 0x00, 0xbc, 0x68, 0x21, 0x10, 0xa4, 0x01, 0xe8, 0x8a, 0x68, 0xb1,
+		0x24, 0x73, 0x88, 0x30, 0x2d, 0xc8, 0x98, 0x11, 0x66, 0x7e, 0x02, 0x7c,
+		0x26, 0x16, 0x6f, 0xc8, 0xf3, 0x0b, 0x9e, 0xd0, 0xf1, 0xb9, 0xfc, 0x3e,
+		0x9d, 0x3d, 0x79, 0xd2, 0x61, 0xf4, 0xeb, 0x4c, 0x7e, 0x2c, 0x6e, 0x0e,
+		0x41, 0x29, 0xab, 0x37, 0x53, 0xed, 0xf2, 0x46, 0xe3, 0x59, 0xfd, 0x53,
+		0x09, 0x28, 0x80, 0x51, 0x8c, 0xb2, 0x4c, 0x42, 0xca, 0xdc, 0x32, 0xb4,
+		0x26, 0xc8, 0xb2, 0x9a, 0x0f, 0xee, 0x2e, 0x8c, 0x29, 0x1d, 0xeb, 0xd4,
+		0x54, 0x3d, 0x00, 0x62, 0x03, 0x70, 0x93, 0xfb, 0x01, 0xdd, 0xa6, 0x52,
+		0xc2, 0xb8, 0x81, 0x98, 0x3a, 0x4a, 0x01, 0xca, 0x57, 0xdb, 0x92, 0xf0,
+		0x37, 0xe3, 0x0a, 0x26, 0x15, 0x0d, 0x0d, 0x80, 0x59, 0x2a, 0x8b, 0x1f,
+		0x01, 0xa6, 0x02, 0x50, 0x3f, 0xcd, 0x3f, 0xb6, 0xe0, 0xb6, 0x40, 0xbd,
+		0x60, 0x8a, 0x47, 0xb3, 0x66, 0xe6, 0xf3, 0x10, 0xa7, 0x7e, 0x8b, 0x9e,
+		0x65, 0x18, 0x4f, 0x01, 0xb1, 0x89, 0xc2, 0x7f, 0x2f, 0xe5, 0xe6, 0x10,
+		0xb4, 0xac, 0xde, 0x4d, 0xb5, 0xcb, 0xdf, 0x34, 0xde, 0x92, 0x1e, 0x1b,
+		0x73, 0x0f, 0xe7, 0xa0, 0x73, 0x9f, 0x26, 0x94, 0xcb, 0x75, 0x3e, 0x11,
+		0xdd, 0xfd, 0x40, 0x4f, 0x9b, 0x90, 0x7c, 0x7f, 0x85, 0x63, 0x45, 0x42,
+		0x30, 0x41, 0x1b, 0x71, 0x67, 0x8a, 0x98, 0x3d, 0x6b, 0x60, 0x07, 0x90,
+		0xc0, 0x86, 0x59, 0xb1, 0xa9, 0xbc, 0x06, 0x28, 0x11, 0xc4, 0x6c, 0x5c,
+		0x2e, 0x02, 0x3c, 0x8c, 0xa9, 0xc8, 0xc4, 0x1d, 0xdb, 0x82, 0x24, 0x12,
+		0xd0, 0x4b, 0x80, 0x2d, 0x3e, 0x52, 0x56, 0x96, 0xa7, 0x4d, 0xf0, 0xd1,
+		0x42, 0x37, 0xaa, 0x7f, 0xf5, 0x0e, 0x00, 0xdd, 0x01, 0x48, 0xf7, 0x06,
+		0x0c, 0xf1, 0x00, 0x4c, 0xe1, 0xc9, 0x09, 0x40, 0xf6, 0x16, 0xfe, 0x4d,
+		0x32, 0x7f, 0x31, 0x7f, 0x2f, 0x43, 0xca, 0xd1, 0x3a, 0x27, 0x9d, 0xfb,
+		0x34, 0xa1, 0x5c, 0xae, 0xd3, 0x7b, 0xc5, 0x30, 0xf3, 0x5a, 0xce, 0xa3,
+		0x0e, 0xa3, 0xcd, 0x68, 0x62, 0xc7, 0x46, 0xba, 0xc2, 0x9f, 0x88, 0x00,
+		0x3c, 0xef, 0x5d, 0xfe, 0x49, 0xe6, 0xf5, 0x69, 0x60, 0x1b, 0x7e, 0x02,
+		0xf0, 0x6b, 0x00, 0x97, 0xbd, 0x04, 0x85, 0xac, 0x98, 0xb0, 0x62, 0x42,
+		0x83, 0xc4, 0x32, 0x21, 0x78, 0xad, 0xb9, 0xa3, 0x9a, 0x5c, 0x68, 0x09,
+		0x17, 0x4d, 0x58, 0xc6, 0x52, 0x9d, 0xd1, 0x96, 0x35, 0x00, 0x6b, 0x3a,
+		0xdc, 0x2d, 0x00, 0x3b, 0x80, 0x5e, 0x00, 0x34, 0xdd, 0x18, 0x0d, 0x16,
+		0x5b, 0x05, 0x04, 0xa3, 0xdc, 0x01, 0x98, 0x16, 0xe6, 0x92, 0x56, 0x80,
+		0xa5, 0x1c, 0x2d, 0x54, 0xf4, 0xe2, 0xac, 0x8e, 0x84, 0x5b, 0x7c, 0x00,
+		0x46, 0xe4, 0x37, 0x00, 0xcc, 0x4d, 0x9e, 0xc3, 0xcc, 0x67, 0x2f, 0x15,
+		0x75, 0x46, 0xcb, 0xdc, 0x67, 0x4d, 0xc7, 0x46, 0xd6, 0x4a, 0x2f, 0x18,
+		0x6f, 0x6b, 0xb9, 0xff, 0x57, 0x4c, 0x16, 0x7e, 0x4b, 0xa9, 0x0c, 0x33,
+		0x3e, 0x01, 0x30, 0x42, 0xc3, 0xaf, 0xcf, 0x2a, 0x08, 0xa2, 0x8c, 0xfe,
+		0xac, 0x02, 0x41, 0xdc, 0x3e, 0xf8, 0x14, 0x40, 0x00, 0x9f, 0x56, 0x30,
+		0x34, 0x07, 0x63, 0xde, 0x95, 0x73, 0xdb, 0xa7, 0x00, 0xf7, 0xbb, 0xf2,
+		0xdb, 0x3a, 0xdc, 0x5f, 0xf3, 0xbe, 0x61, 0xfb, 0xf6, 0x5d, 0x5a, 0xa7,
+		0x84, 0x5d, 0xbc, 0xdd, 0x7f, 0x00, 0x36, 0x75, 0xcc, 0x25, 0x7e, 0x90,
+		0xe4, 0x8d, 0x76, 0x2c, 0xa1, 0x6c, 0xad, 0xcd, 0x09, 0xb3, 0x11, 0x07,
+		0xd0, 0x18, 0x70, 0x43, 0x9d, 0xa9, 0x11, 0xcb, 0xf7, 0x53, 0x2e, 0x36,
+		0xa0, 0x13, 0xc0, 0xcc, 0x25, 0xb3, 0x00, 0x06, 0x6c, 0x33, 0x32, 0x4e,
+		0x13, 0x91, 0x86, 0x30, 0x54, 0x04, 0xe3, 0x22, 0x1d, 0x15, 0xd8, 0x8a,
+		0x35, 0x15, 0x28, 0x34, 0x67, 0x66, 0x04, 0x1b, 0xec, 0x62, 0x18, 0x77,
+		0x73, 0x26, 0x59, 0x83, 0x3d, 0xfd, 0x0d, 0x00, 0x01, 0xc6, 0x91, 0x8c,
+		0x53, 0x43, 0x52, 0x90, 0x0a, 0x36, 0x23, 0x5b, 0x05, 0x36, 0xd9, 0x32,
+		0x7a, 0x02, 0x35, 0x73, 0x0e, 0xbf, 0x4a, 0x8b, 0x7c, 0x99, 0x96, 0x77,
+		0xee, 0x95, 0x32, 0x3f, 0xca, 0x93, 0x67, 0xdf, 0xbe, 0xd5, 0x27, 0x25,
+		0xe9, 0x90, 0xfc, 0xfc, 0x01, 0xd8, 0xd5, 0x9a, 0x8e, 0x0f, 0x7c, 0x61,
+		0x1e, 0xd2, 0x25, 0xf1, 0x10, 0x17, 0x94, 0xd3, 0xe6, 0xb1, 0x02, 0xff,
+		0xc3, 0x8f, 0x4b, 0x97, 0x2f, 0x5d, 0xd0, 0x44, 0x66, 0x5b, 0x6b, 0x9c,
+		0x1b, 0x29, 0x8c, 0x99, 0x05, 0x37, 0x80, 0x86, 0x53, 0x34, 0xe0, 0xd9,
+		0x76, 0x12, 0x63, 0x8c, 0x62, 0x82, 0xe2, 0xd1, 0x01, 0x25, 0x41, 0x68,
+		0xee, 0xd7, 0xca, 0x0f, 0x00, 0xe9, 0x47, 0xc2, 0xa6, 0x9e, 0x47, 0xd6,
+		0x32, 0x8d, 0x41, 0x99, 0xa5, 0xdd, 0x90, 0x58, 0x1c, 0x15, 0x34, 0xd9,
+		0x0a, 0x96, 0x7e, 0x05, 0x18, 0x53, 0x7d, 0x59, 0x01, 0x39, 0x01, 0x94,
+		0x90, 0xf8, 0x30, 0xbf, 0xb6, 0x80, 0x6e, 0x00, 0xe8, 0x1e, 0x57, 0x4c,
+		0x5e, 0xb5, 0xf0, 0xf2, 0x10, 0x7f, 0x27, 0xe0, 0xe7, 0x12, 0xde, 0x90,
+		0xa1, 0xe7, 0x98, 0x65, 0x4f, 0x7d, 0xf6, 0x69, 0xc6, 0x69, 0x86, 0xc3,
+		0x7d, 0xd1, 0x9a, 0x8b, 0x12, 0x5a, 0x2a, 0x5d, 0xa9, 0x3e, 0x8e, 0x61,
+		0xa6, 0x77, 0xf2, 0x0e, 0x9d, 0x26, 0x26, 0x2a, 0x65, 0x98, 0xda, 0x98,
+		0x26, 0x5f, 0x4b, 0xb7, 0xe3, 0x54, 0xfc, 0xe2, 0x2b, 0x99, 0x44, 0x63,
+		0xab, 0x03, 0x95, 0xf3, 0x6b, 0x04, 0xac, 0x1b, 0x00, 0x36, 0x59, 0xe3,
+		0x6f, 0x32, 0x7b, 0x84, 0x7d, 0x07, 0x10, 0x58, 0x94, 0x15, 0xc7, 0xd0,
+		0x09, 0x47, 0x05, 0xfe, 0x11, 0xc0, 0x02, 0x73, 0x0e, 0xee, 0xa0, 0xa3,
+		0x82, 0xf0, 0x02, 0x20, 0x73, 0x91, 0x3e, 0x86, 0x0c, 0xd4, 0x71, 0x88,
+		0xc9, 0x38, 0x63, 0xe6, 0x95, 0x72, 0x6b, 0x80, 0x64, 0xa6, 0x7c, 0x24,
+		0x7f, 0xcf, 0xf5, 0x72, 0xb2, 0xe3, 0xdd, 0x54, 0xf9, 0x3a, 0x87, 0x7d,
+		0x5a, 0x4e, 0x5e, 0xf4, 0x59, 0xce, 0x5d, 0xef, 0x64, 0x9e, 0x2d, 0x70,
+		0xfe, 0x23, 0xac, 0xae, 0x8c, 0x41, 0x55, 0x53, 0xa9, 0x77, 0xfe, 0xaa,
+		0x50, 0x92, 0x00, 0xf3, 0x03, 0x47, 0x92, 0x00, 0xf6, 0xc3, 0xcf, 0x37,
+		0x2e, 0x65, 0x8a, 0x8a, 0x82, 0xad, 0x01, 0x38, 0x44, 0xfe, 0xe7, 0x2f,
+		0x40, 0x9a, 0x99, 0x37, 0x32, 0x62, 0xc2, 0x5d, 0x8d, 0x72, 0x52, 0xc9,
+		0x0c, 0x0b, 0xa7, 0x85, 0x01, 0xe8, 0x12, 0xa7, 0x06, 0xdf, 0x00, 0x74,
+		0x00, 0x80, 0x19, 0x00, 0x17, 0xed, 0x50, 0x4c, 0xf4, 0x0b, 0x00, 0x41,
+		0x67, 0x05, 0xf7, 0x16, 0x20, 0x07, 0x99, 0x91, 0x11, 0x03, 0xf0, 0xbe,
+		0x08, 0x51, 0xfd, 0x10, 0xc0, 0xed, 0x7a, 0x78, 0x40, 0x39, 0xf9, 0xec,
+		0x53, 0xe7, 0xd4, 0x57, 0x64, 0xee, 0x16, 0x28, 0x95, 0xd9, 0xff, 0x4f,
+		0x3c, 0x7f, 0x8f, 0x99, 0xcc, 0x7c, 0x72, 0xb8, 0x46, 0x47, 0x92, 0xf0,
+		0xb9, 0x14, 0x40, 0xbe, 0x73, 0xd0, 0x2e, 0xdb, 0x5e, 0x81, 0x6b, 0x3d,
+		0xe7, 0xa1, 0x84, 0x8c, 0xd3, 0x1c, 0x2f, 0x3f, 0xc4, 0x13, 0x40, 0x96,
+		0x43, 0x20, 0xee, 0x32, 0x62, 0x0a, 0x40, 0x4d, 0x44, 0x41, 0x49, 0x88,
+		0x63, 0x2d, 0x0f, 0x96, 0x4d, 0x48, 0x19, 0x53, 0x18, 0x17, 0x7f, 0x00,
+		0x66, 0x4e, 0x62, 0x12, 0x2b, 0x4e, 0xe4, 0x34, 0xcd, 0x98, 0x44, 0x96,
+		0x21, 0x64, 0x3a, 0x98, 0xae, 0x8d, 0x32, 0x15, 0x28, 0x09, 0x0a, 0xad,
+		0x60, 0xcd, 0xc3, 0xb4, 0x30, 0x15, 0x30, 0x08, 0x61, 0x00, 0x20, 0xe3,
+		0x35, 0xd2, 0x33, 0x88, 0xd9, 0xe5, 0x7e, 0x06, 0xb2, 0x06, 0xa0, 0x47,
+		0x94, 0xec, 0x20, 0xfe, 0x91, 0xa7, 0x73, 0x06, 0xf9, 0x3e, 0x83, 0xf7,
+		0xf8, 0xd0, 0x0e, 0xda, 0x4d, 0x65, 0xff, 0x3f, 0xf1, 0xfc, 0x7d, 0xcd,
+		0x64, 0xe6, 0x93, 0x33, 0xf3, 0x21, 0xf2, 0x76, 0x53, 0x78, 0xfc, 0x7f,
+		0x94, 0xa4, 0x46, 0x17, 0x17, 0x06, 0xca, 0x80, 0xa3, 0x88, 0x03, 0xa5,
+		0x06, 0x88, 0x30, 0xb0, 0xb8, 0x90, 0x69, 0x88, 0x00, 0xd8, 0x00, 0x17,
+		0x07, 0x17, 0x41, 0xf2, 0x3c, 0xc2, 0x08, 0x8a, 0x55, 0x47, 0x41, 0x41,
+		0x07, 0x20, 0x16, 0x21, 0xdb, 0x05, 0x14, 0x19, 0xc0, 0x30, 0x28, 0x0c,
+		0x70, 0x71, 0x01, 0x06, 0x22, 0x10, 0x90, 0x3d, 0x47, 0x82, 0x48, 0xa6,
+		0x23, 0x13, 0x8c, 0x02, 0x00, 0xe7, 0xfb, 0x84, 0x1b, 0xf9, 0x8e, 0xc0,
+		0x23, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
+		0x82
+	};
+
+const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CAnimatedMeshSceneNode.cpp b/irr/src/CAnimatedMeshSceneNode.cpp
new file mode 100644
index 000000000..c3a71f943
--- /dev/null
+++ b/irr/src/CAnimatedMeshSceneNode.cpp
@@ -0,0 +1,755 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CAnimatedMeshSceneNode.h"
+#include "IVideoDriver.h"
+#include "ISceneManager.h"
+#include "S3DVertex.h"
+#include "os.h"
+#include "CSkinnedMesh.h"
+#include "IDummyTransformationSceneNode.h"
+#include "IBoneSceneNode.h"
+#include "IMaterialRenderer.h"
+#include "IMesh.h"
+#include "IMeshCache.h"
+#include "IAnimatedMesh.h"
+#include "IFileSystem.h"
+#include "quaternion.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CAnimatedMeshSceneNode::CAnimatedMeshSceneNode(IAnimatedMesh *mesh,
+		ISceneNode *parent, ISceneManager *mgr, s32 id,
+		const core::vector3df &position,
+		const core::vector3df &rotation,
+		const core::vector3df &scale) :
+		IAnimatedMeshSceneNode(parent, mgr, id, position, rotation, scale),
+		Mesh(0),
+		StartFrame(0), EndFrame(0), FramesPerSecond(0.025f),
+		CurrentFrameNr(0.f), LastTimeMs(0),
+		TransitionTime(0), Transiting(0.f), TransitingBlend(0.f),
+		JointMode(EJUOR_NONE), JointsUsed(false),
+		Looping(true), ReadOnlyMaterials(false), RenderFromIdentity(false),
+		LoopCallBack(0), PassCount(0)
+{
+#ifdef _DEBUG
+	setDebugName("CAnimatedMeshSceneNode");
+#endif
+
+	setMesh(mesh);
+}
+
+//! destructor
+CAnimatedMeshSceneNode::~CAnimatedMeshSceneNode()
+{
+	if (LoopCallBack)
+		LoopCallBack->drop();
+	if (Mesh)
+		Mesh->drop();
+}
+
+//! Sets the current frame. From now on the animation is played from this frame.
+void CAnimatedMeshSceneNode::setCurrentFrame(f32 frame)
+{
+	// if you pass an out of range value, we just clamp it
+	CurrentFrameNr = core::clamp(frame, (f32)StartFrame, (f32)EndFrame);
+
+	beginTransition(); // transit to this frame if enabled
+}
+
+//! Returns the currently displayed frame number.
+f32 CAnimatedMeshSceneNode::getFrameNr() const
+{
+	return CurrentFrameNr;
+}
+
+//! Get CurrentFrameNr and update transiting settings
+void CAnimatedMeshSceneNode::buildFrameNr(u32 timeMs)
+{
+	if (Transiting != 0.f) {
+		TransitingBlend += (f32)(timeMs)*Transiting;
+		if (TransitingBlend > 1.f) {
+			Transiting = 0.f;
+			TransitingBlend = 0.f;
+		}
+	}
+
+	if (StartFrame == EndFrame) {
+		CurrentFrameNr = (f32)StartFrame; // Support for non animated meshes
+	} else if (Looping) {
+		// play animation looped
+		CurrentFrameNr += timeMs * FramesPerSecond;
+
+		// We have no interpolation between EndFrame and StartFrame,
+		// the last frame must be identical to first one with our current solution.
+		if (FramesPerSecond > 0.f) { // forwards...
+			if (CurrentFrameNr > EndFrame)
+				CurrentFrameNr = StartFrame + fmodf(CurrentFrameNr - StartFrame, (f32)(EndFrame - StartFrame));
+		} else // backwards...
+		{
+			if (CurrentFrameNr < StartFrame)
+				CurrentFrameNr = EndFrame - fmodf(EndFrame - CurrentFrameNr, (f32)(EndFrame - StartFrame));
+		}
+	} else {
+		// play animation non looped
+
+		CurrentFrameNr += timeMs * FramesPerSecond;
+		if (FramesPerSecond > 0.f) { // forwards...
+			if (CurrentFrameNr > (f32)EndFrame) {
+				CurrentFrameNr = (f32)EndFrame;
+				if (LoopCallBack)
+					LoopCallBack->OnAnimationEnd(this);
+			}
+		} else // backwards...
+		{
+			if (CurrentFrameNr < (f32)StartFrame) {
+				CurrentFrameNr = (f32)StartFrame;
+				if (LoopCallBack)
+					LoopCallBack->OnAnimationEnd(this);
+			}
+		}
+	}
+}
+
+void CAnimatedMeshSceneNode::OnRegisterSceneNode()
+{
+	if (IsVisible && Mesh) {
+		// because this node supports rendering of mixed mode meshes consisting of
+		// transparent and solid material at the same time, we need to go through all
+		// materials, check of what type they are and register this node for the right
+		// render pass according to that.
+
+		video::IVideoDriver *driver = SceneManager->getVideoDriver();
+
+		PassCount = 0;
+		int transparentCount = 0;
+		int solidCount = 0;
+
+		// count transparent and solid materials in this scene node
+		const u32 numMaterials = ReadOnlyMaterials ? Mesh->getMeshBufferCount() : Materials.size();
+		for (u32 i = 0; i < numMaterials; ++i) {
+			const video::SMaterial &material = ReadOnlyMaterials ? Mesh->getMeshBuffer(i)->getMaterial() : Materials[i];
+
+			if (driver->needsTransparentRenderPass(material))
+				++transparentCount;
+			else
+				++solidCount;
+
+			if (solidCount && transparentCount)
+				break;
+		}
+
+		// register according to material types counted
+
+		if (solidCount)
+			SceneManager->registerNodeForRendering(this, scene::ESNRP_SOLID);
+
+		if (transparentCount)
+			SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT);
+
+		ISceneNode::OnRegisterSceneNode();
+	}
+}
+
+IMesh *CAnimatedMeshSceneNode::getMeshForCurrentFrame()
+{
+	if (Mesh->getMeshType() != EAMT_SKINNED) {
+		s32 frameNr = (s32)getFrameNr();
+		s32 frameBlend = (s32)(core::fract(getFrameNr()) * 1000.f);
+		return Mesh->getMesh(frameNr, frameBlend, StartFrame, EndFrame);
+	} else {
+		// As multiple scene nodes may be sharing the same skinned mesh, we have to
+		// re-animate it every frame to ensure that this node gets the mesh that it needs.
+
+		CSkinnedMesh *skinnedMesh = static_cast<CSkinnedMesh *>(Mesh);
+
+		if (JointMode == EJUOR_CONTROL) // write to mesh
+			skinnedMesh->transferJointsToMesh(JointChildSceneNodes);
+		else
+			skinnedMesh->animateMesh(getFrameNr(), 1.0f);
+
+		// Update the skinned mesh for the current joint transforms.
+		skinnedMesh->skinMesh();
+
+		if (JointMode == EJUOR_READ) { // read from mesh
+			skinnedMesh->recoverJointsFromMesh(JointChildSceneNodes);
+
+			//---slow---
+			for (u32 n = 0; n < JointChildSceneNodes.size(); ++n)
+				if (JointChildSceneNodes[n]->getParent() == this) {
+					JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); // temp, should be an option
+				}
+		}
+
+		if (JointMode == EJUOR_CONTROL) {
+			// For meshes other than EJUOR_CONTROL, this is done by calling animateMesh()
+			skinnedMesh->updateBoundingBox();
+		}
+
+		return skinnedMesh;
+	}
+}
+
+//! OnAnimate() is called just before rendering the whole scene.
+void CAnimatedMeshSceneNode::OnAnimate(u32 timeMs)
+{
+	if (LastTimeMs == 0) { // first frame
+		LastTimeMs = timeMs;
+	}
+
+	// set CurrentFrameNr
+	buildFrameNr(timeMs - LastTimeMs);
+	LastTimeMs = timeMs;
+
+	IAnimatedMeshSceneNode::OnAnimate(timeMs);
+}
+
+//! renders the node.
+void CAnimatedMeshSceneNode::render()
+{
+	video::IVideoDriver *driver = SceneManager->getVideoDriver();
+
+	if (!Mesh || !driver)
+		return;
+
+	const bool isTransparentPass =
+			SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
+
+	++PassCount;
+
+	scene::IMesh *m = getMeshForCurrentFrame();
+
+	if (m) {
+		Box = m->getBoundingBox();
+	} else {
+#ifdef _DEBUG
+		os::Printer::log("Animated Mesh returned no mesh to render.", Mesh->getDebugName(), ELL_WARNING);
+#endif
+		return;
+	}
+
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+
+	for (u32 i = 0; i < m->getMeshBufferCount(); ++i) {
+		const bool transparent = driver->needsTransparentRenderPass(Materials[i]);
+
+		// only render transparent buffer if this is the transparent render pass
+		// and solid only in solid pass
+		if (transparent == isTransparentPass) {
+			scene::IMeshBuffer *mb = m->getMeshBuffer(i);
+			const video::SMaterial &material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
+			if (RenderFromIdentity)
+				driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+			else if (Mesh->getMeshType() == EAMT_SKINNED)
+				driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer *)mb)->Transformation);
+
+			driver->setMaterial(material);
+			driver->drawMeshBuffer(mb);
+		}
+	}
+
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+
+	// for debug purposes only:
+	if (DebugDataVisible && PassCount == 1) {
+		video::SMaterial debug_mat;
+		debug_mat.Lighting = false;
+		debug_mat.AntiAliasing = 0;
+		driver->setMaterial(debug_mat);
+		// show normals
+		if (DebugDataVisible & scene::EDS_NORMALS) {
+			const f32 debugNormalLength = 1.f;
+			const video::SColor debugNormalColor = video::SColor(255, 34, 221, 221);
+			const u32 count = m->getMeshBufferCount();
+
+			// draw normals
+			for (u32 g = 0; g < count; ++g) {
+				scene::IMeshBuffer *mb = m->getMeshBuffer(g);
+				if (RenderFromIdentity)
+					driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+				else if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer *)mb)->Transformation);
+
+				driver->drawMeshBufferNormals(mb, debugNormalLength, debugNormalColor);
+			}
+		}
+
+		debug_mat.ZBuffer = video::ECFN_DISABLED;
+		debug_mat.Lighting = false;
+		driver->setMaterial(debug_mat);
+
+		if (DebugDataVisible & scene::EDS_BBOX)
+			driver->draw3DBox(Box, video::SColor(255, 255, 255, 255));
+
+		// show bounding box
+		if (DebugDataVisible & scene::EDS_BBOX_BUFFERS) {
+			for (u32 g = 0; g < m->getMeshBufferCount(); ++g) {
+				const IMeshBuffer *mb = m->getMeshBuffer(g);
+
+				if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer *)mb)->Transformation);
+				driver->draw3DBox(mb->getBoundingBox(), video::SColor(255, 190, 128, 128));
+			}
+		}
+
+		// show skeleton
+		if (DebugDataVisible & scene::EDS_SKELETON) {
+			if (Mesh->getMeshType() == EAMT_SKINNED) {
+				// draw skeleton
+
+				for (u32 g = 0; g < ((ISkinnedMesh *)Mesh)->getAllJoints().size(); ++g) {
+					ISkinnedMesh::SJoint *joint = ((ISkinnedMesh *)Mesh)->getAllJoints()[g];
+
+					for (u32 n = 0; n < joint->Children.size(); ++n) {
+						driver->draw3DLine(joint->GlobalAnimatedMatrix.getTranslation(),
+								joint->Children[n]->GlobalAnimatedMatrix.getTranslation(),
+								video::SColor(255, 51, 66, 255));
+					}
+				}
+			}
+		}
+
+		// show mesh
+		if (DebugDataVisible & scene::EDS_MESH_WIRE_OVERLAY) {
+			debug_mat.Lighting = false;
+			debug_mat.Wireframe = true;
+			debug_mat.ZBuffer = video::ECFN_DISABLED;
+			driver->setMaterial(debug_mat);
+
+			for (u32 g = 0; g < m->getMeshBufferCount(); ++g) {
+				const IMeshBuffer *mb = m->getMeshBuffer(g);
+				if (RenderFromIdentity)
+					driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+				else if (Mesh->getMeshType() == EAMT_SKINNED)
+					driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer *)mb)->Transformation);
+				driver->drawMeshBuffer(mb);
+			}
+		}
+	}
+}
+
+//! Returns the current start frame number.
+s32 CAnimatedMeshSceneNode::getStartFrame() const
+{
+	return StartFrame;
+}
+
+//! Returns the current start frame number.
+s32 CAnimatedMeshSceneNode::getEndFrame() const
+{
+	return EndFrame;
+}
+
+//! sets the frames between the animation is looped.
+//! the default is 0 - MaximalFrameCount of the mesh.
+bool CAnimatedMeshSceneNode::setFrameLoop(s32 begin, s32 end)
+{
+	const s32 maxFrameCount = Mesh->getFrameCount() - 1;
+	if (end < begin) {
+		StartFrame = core::s32_clamp(end, 0, maxFrameCount);
+		EndFrame = core::s32_clamp(begin, StartFrame, maxFrameCount);
+	} else {
+		StartFrame = core::s32_clamp(begin, 0, maxFrameCount);
+		EndFrame = core::s32_clamp(end, StartFrame, maxFrameCount);
+	}
+	if (FramesPerSecond < 0)
+		setCurrentFrame((f32)EndFrame);
+	else
+		setCurrentFrame((f32)StartFrame);
+
+	return true;
+}
+
+//! sets the speed with witch the animation is played
+void CAnimatedMeshSceneNode::setAnimationSpeed(f32 framesPerSecond)
+{
+	FramesPerSecond = framesPerSecond * 0.001f;
+}
+
+f32 CAnimatedMeshSceneNode::getAnimationSpeed() const
+{
+	return FramesPerSecond * 1000.f;
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CAnimatedMeshSceneNode::getBoundingBox() const
+{
+	return Box;
+}
+
+//! returns the material based on the zero based index i.
+video::SMaterial &CAnimatedMeshSceneNode::getMaterial(u32 i)
+{
+	if (i >= Materials.size())
+		return ISceneNode::getMaterial(i);
+
+	return Materials[i];
+}
+
+//! returns amount of materials used by this scene node.
+u32 CAnimatedMeshSceneNode::getMaterialCount() const
+{
+	return Materials.size();
+}
+
+//! Returns a pointer to a child node, which has the same transformation as
+//! the corresponding joint, if the mesh in this scene node is a skinned mesh.
+IBoneSceneNode *CAnimatedMeshSceneNode::getJointNode(const c8 *jointName)
+{
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) {
+		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
+		return 0;
+	}
+
+	checkJoints();
+
+	ISkinnedMesh *skinnedMesh = (ISkinnedMesh *)Mesh;
+
+	const std::optional<u32> number = skinnedMesh->getJointNumber(jointName);
+
+	if (!number.has_value()) {
+		os::Printer::log("Joint with specified name not found in skinned mesh", jointName, ELL_DEBUG);
+		return 0;
+	}
+
+	if (JointChildSceneNodes.size() <= *number) {
+		os::Printer::log("Joint was found in mesh, but is not loaded into node", jointName, ELL_WARNING);
+		return 0;
+	}
+
+	return JointChildSceneNodes[*number];
+}
+
+//! Returns a pointer to a child node, which has the same transformation as
+//! the corresponding joint, if the mesh in this scene node is a skinned mesh.
+IBoneSceneNode *CAnimatedMeshSceneNode::getJointNode(u32 jointID)
+{
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED) {
+		os::Printer::log("No mesh, or mesh not of skinned mesh type", ELL_WARNING);
+		return 0;
+	}
+
+	checkJoints();
+
+	if (JointChildSceneNodes.size() <= jointID) {
+		os::Printer::log("Joint not loaded into node", ELL_WARNING);
+		return 0;
+	}
+
+	return JointChildSceneNodes[jointID];
+}
+
+//! Gets joint count.
+u32 CAnimatedMeshSceneNode::getJointCount() const
+{
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
+		return 0;
+
+	ISkinnedMesh *skinnedMesh = (ISkinnedMesh *)Mesh;
+
+	return skinnedMesh->getJointCount();
+}
+
+//! Removes a child from this scene node.
+//! Implemented here, to be able to remove the shadow properly, if there is one,
+//! or to remove attached childs.
+bool CAnimatedMeshSceneNode::removeChild(ISceneNode *child)
+{
+	if (ISceneNode::removeChild(child)) {
+		if (JointsUsed) { // stop weird bugs caused while changing parents as the joints are being created
+			for (u32 i = 0; i < JointChildSceneNodes.size(); ++i) {
+				if (JointChildSceneNodes[i] == child) {
+					JointChildSceneNodes[i] = 0; // remove link to child
+					break;
+				}
+			}
+		}
+		return true;
+	}
+
+	return false;
+}
+
+//! Sets looping mode which is on by default. If set to false,
+//! animations will not be looped.
+void CAnimatedMeshSceneNode::setLoopMode(bool playAnimationLooped)
+{
+	Looping = playAnimationLooped;
+}
+
+//! returns the current loop mode
+bool CAnimatedMeshSceneNode::getLoopMode() const
+{
+	return Looping;
+}
+
+//! Sets a callback interface which will be called if an animation
+//! playback has ended. Set this to 0 to disable the callback again.
+void CAnimatedMeshSceneNode::setAnimationEndCallback(IAnimationEndCallBack *callback)
+{
+	if (callback == LoopCallBack)
+		return;
+
+	if (LoopCallBack)
+		LoopCallBack->drop();
+
+	LoopCallBack = callback;
+
+	if (LoopCallBack)
+		LoopCallBack->grab();
+}
+
+//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+void CAnimatedMeshSceneNode::setReadOnlyMaterials(bool readonly)
+{
+	ReadOnlyMaterials = readonly;
+}
+
+//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+bool CAnimatedMeshSceneNode::isReadOnlyMaterials() const
+{
+	return ReadOnlyMaterials;
+}
+
+//! Sets a new mesh
+void CAnimatedMeshSceneNode::setMesh(IAnimatedMesh *mesh)
+{
+	if (!mesh)
+		return; // won't set null mesh
+
+	if (Mesh != mesh) {
+		if (Mesh)
+			Mesh->drop();
+
+		Mesh = mesh;
+
+		// grab the mesh (it's non-null!)
+		Mesh->grab();
+	}
+
+	// get materials and bounding box
+	Box = Mesh->getBoundingBox();
+
+	IMesh *m = Mesh->getMesh(0, 0);
+	if (m) {
+		Materials.clear();
+		Materials.reallocate(m->getMeshBufferCount());
+
+		for (u32 i = 0; i < m->getMeshBufferCount(); ++i) {
+			IMeshBuffer *mb = m->getMeshBuffer(i);
+			if (mb)
+				Materials.push_back(mb->getMaterial());
+			else
+				Materials.push_back(video::SMaterial());
+		}
+	}
+
+	// clean up joint nodes
+	if (JointsUsed) {
+		JointsUsed = false;
+		checkJoints();
+	}
+
+	// get start and begin time
+	setAnimationSpeed(Mesh->getAnimationSpeed()); // NOTE: This had been commented out (but not removed!) in r3526. Which caused meshloader-values for speed to be ignored unless users specified explicitly. Missing a test-case where this could go wrong so I put the code back in.
+	setFrameLoop(0, Mesh->getFrameCount() - 1);
+}
+
+//! updates the absolute position based on the relative and the parents position
+void CAnimatedMeshSceneNode::updateAbsolutePosition()
+{
+	IAnimatedMeshSceneNode::updateAbsolutePosition();
+}
+
+//! Set the joint update mode (0-unused, 1-get joints only, 2-set joints only, 3-move and set)
+void CAnimatedMeshSceneNode::setJointMode(E_JOINT_UPDATE_ON_RENDER mode)
+{
+	checkJoints();
+	JointMode = mode;
+}
+
+//! Sets the transition time in seconds (note: This needs to enable joints, and setJointmode maybe set to 2)
+//! you must call animateJoints(), or the mesh will not animate
+void CAnimatedMeshSceneNode::setTransitionTime(f32 time)
+{
+	const u32 ttime = (u32)core::floor32(time * 1000.0f);
+	if (TransitionTime == ttime)
+		return;
+	TransitionTime = ttime;
+	if (ttime != 0)
+		setJointMode(EJUOR_CONTROL);
+	else
+		setJointMode(EJUOR_NONE);
+}
+
+//! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected)
+void CAnimatedMeshSceneNode::setRenderFromIdentity(bool enable)
+{
+	RenderFromIdentity = enable;
+}
+
+//! updates the joint positions of this mesh
+void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions)
+{
+	if (Mesh && Mesh->getMeshType() == EAMT_SKINNED) {
+		checkJoints();
+		const f32 frame = getFrameNr(); // old?
+
+		CSkinnedMesh *skinnedMesh = static_cast<CSkinnedMesh *>(Mesh);
+
+		skinnedMesh->transferOnlyJointsHintsToMesh(JointChildSceneNodes);
+		skinnedMesh->animateMesh(frame, 1.0f);
+		skinnedMesh->recoverJointsFromMesh(JointChildSceneNodes);
+
+		//-----------------------------------------
+		//		Transition
+		//-----------------------------------------
+
+		if (Transiting != 0.f) {
+			// Init additional matrices
+			if (PretransitingSave.size() < JointChildSceneNodes.size()) {
+				for (u32 n = PretransitingSave.size(); n < JointChildSceneNodes.size(); ++n)
+					PretransitingSave.push_back(core::matrix4());
+			}
+
+			for (u32 n = 0; n < JointChildSceneNodes.size(); ++n) {
+				//------Position------
+
+				JointChildSceneNodes[n]->setPosition(
+						core::lerp(
+								PretransitingSave[n].getTranslation(),
+								JointChildSceneNodes[n]->getPosition(),
+								TransitingBlend));
+
+				//------Rotation------
+
+				// Code is slow, needs to be fixed up
+
+				const core::quaternion RotationStart(PretransitingSave[n].getRotationDegrees() * core::DEGTORAD);
+				const core::quaternion RotationEnd(JointChildSceneNodes[n]->getRotation() * core::DEGTORAD);
+
+				core::quaternion QRotation;
+				QRotation.slerp(RotationStart, RotationEnd, TransitingBlend);
+
+				core::vector3df tmpVector;
+				QRotation.toEuler(tmpVector);
+				tmpVector *= core::RADTODEG; // convert from radians back to degrees
+				JointChildSceneNodes[n]->setRotation(tmpVector);
+
+				//------Scale------
+
+				// JointChildSceneNodes[n]->setScale(
+				//		core::lerp(
+				//			PretransitingSave[n].getScale(),
+				//			JointChildSceneNodes[n]->getScale(),
+				//			TransitingBlend));
+			}
+		}
+
+		if (CalculateAbsolutePositions) {
+			//---slow---
+			for (u32 n = 0; n < JointChildSceneNodes.size(); ++n) {
+				if (JointChildSceneNodes[n]->getParent() == this) {
+					JointChildSceneNodes[n]->updateAbsolutePositionOfAllChildren(); // temp, should be an option
+				}
+			}
+		}
+	}
+}
+
+/*!
+ */
+void CAnimatedMeshSceneNode::checkJoints()
+{
+	if (!Mesh || Mesh->getMeshType() != EAMT_SKINNED)
+		return;
+
+	if (!JointsUsed) {
+		for (u32 i = 0; i < JointChildSceneNodes.size(); ++i)
+			removeChild(JointChildSceneNodes[i]);
+		JointChildSceneNodes.clear();
+
+		// Create joints for SkinnedMesh
+		((CSkinnedMesh *)Mesh)->addJoints(JointChildSceneNodes, this, SceneManager);
+		((CSkinnedMesh *)Mesh)->recoverJointsFromMesh(JointChildSceneNodes);
+
+		JointsUsed = true;
+		JointMode = EJUOR_READ;
+	}
+}
+
+/*!
+ */
+void CAnimatedMeshSceneNode::beginTransition()
+{
+	if (!JointsUsed)
+		return;
+
+	if (TransitionTime != 0) {
+		// Check the array is big enough
+		if (PretransitingSave.size() < JointChildSceneNodes.size()) {
+			for (u32 n = PretransitingSave.size(); n < JointChildSceneNodes.size(); ++n)
+				PretransitingSave.push_back(core::matrix4());
+		}
+
+		// Copy the position of joints
+		for (u32 n = 0; n < JointChildSceneNodes.size(); ++n)
+			PretransitingSave[n] = JointChildSceneNodes[n]->getRelativeTransformation();
+
+		Transiting = core::reciprocal((f32)TransitionTime);
+	}
+	TransitingBlend = 0.f;
+}
+
+/*!
+ */
+ISceneNode *CAnimatedMeshSceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CAnimatedMeshSceneNode *newNode =
+			new CAnimatedMeshSceneNode(Mesh, NULL, newManager, ID, RelativeTranslation,
+					RelativeRotation, RelativeScale);
+
+	if (newParent) {
+		newNode->setParent(newParent); // not in constructor because virtual overload for updateAbsolutePosition won't be called
+		newNode->drop();
+	}
+
+	newNode->cloneMembers(this, newManager);
+
+	newNode->Materials = Materials;
+	newNode->Box = Box;
+	newNode->Mesh = Mesh;
+	newNode->StartFrame = StartFrame;
+	newNode->EndFrame = EndFrame;
+	newNode->FramesPerSecond = FramesPerSecond;
+	newNode->CurrentFrameNr = CurrentFrameNr;
+	newNode->JointMode = JointMode;
+	newNode->JointsUsed = JointsUsed;
+	newNode->TransitionTime = TransitionTime;
+	newNode->Transiting = Transiting;
+	newNode->TransitingBlend = TransitingBlend;
+	newNode->Looping = Looping;
+	newNode->ReadOnlyMaterials = ReadOnlyMaterials;
+	newNode->LoopCallBack = LoopCallBack;
+	if (newNode->LoopCallBack)
+		newNode->LoopCallBack->grab();
+	newNode->PassCount = PassCount;
+	newNode->JointChildSceneNodes = JointChildSceneNodes;
+	newNode->PretransitingSave = PretransitingSave;
+	newNode->RenderFromIdentity = RenderFromIdentity;
+
+	return newNode;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CAnimatedMeshSceneNode.h b/irr/src/CAnimatedMeshSceneNode.h
new file mode 100644
index 000000000..0364ab527
--- /dev/null
+++ b/irr/src/CAnimatedMeshSceneNode.h
@@ -0,0 +1,177 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IAnimatedMeshSceneNode.h"
+#include "IAnimatedMesh.h"
+
+#include "matrix4.h"
+
+namespace irr
+{
+namespace scene
+{
+class IDummyTransformationSceneNode;
+
+class CAnimatedMeshSceneNode : public IAnimatedMeshSceneNode
+{
+public:
+	//! constructor
+	CAnimatedMeshSceneNode(IAnimatedMesh *mesh, ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f));
+
+	//! destructor
+	virtual ~CAnimatedMeshSceneNode();
+
+	//! sets the current frame. from now on the animation is played from this frame.
+	void setCurrentFrame(f32 frame) override;
+
+	//! frame
+	void OnRegisterSceneNode() override;
+
+	//! OnAnimate() is called just before rendering the whole scene.
+	void OnAnimate(u32 timeMs) override;
+
+	//! renders the node.
+	void render() override;
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! sets the frames between the animation is looped.
+	//! the default is 0 - MaximalFrameCount of the mesh.
+	//! NOTE: setMesh will also change this value and set it to the full range of animations of the mesh
+	bool setFrameLoop(s32 begin, s32 end) override;
+
+	//! Sets looping mode which is on by default. If set to false,
+	//! animations will not be looped.
+	void setLoopMode(bool playAnimationLooped) override;
+
+	//! returns the current loop mode
+	bool getLoopMode() const override;
+
+	//! Sets a callback interface which will be called if an animation
+	//! playback has ended. Set this to 0 to disable the callback again.
+	void setAnimationEndCallback(IAnimationEndCallBack *callback = 0) override;
+
+	//! sets the speed with which the animation is played
+	//! NOTE: setMesh will also change this value and set it to the default speed of the mesh
+	void setAnimationSpeed(f32 framesPerSecond) override;
+
+	//! gets the speed with which the animation is played
+	f32 getAnimationSpeed() const override;
+
+	//! returns the material based on the zero based index i. To get the amount
+	//! of materials used by this scene node, use getMaterialCount().
+	//! This function is needed for inserting the node into the scene hierarchy on a
+	//! optimal position for minimizing renderstate changes, but can also be used
+	//! to directly modify the material of a scene node.
+	video::SMaterial &getMaterial(u32 i) override;
+
+	//! returns amount of materials used by this scene node.
+	u32 getMaterialCount() const override;
+
+	//! Returns a pointer to a child node, which has the same transformation as
+	//! the corresponding joint, if the mesh in this scene node is a skinned mesh.
+	IBoneSceneNode *getJointNode(const c8 *jointName) override;
+
+	//! same as getJointNode(const c8* jointName), but based on id
+	IBoneSceneNode *getJointNode(u32 jointID) override;
+
+	//! Gets joint count.
+	u32 getJointCount() const override;
+
+	//! Removes a child from this scene node.
+	//! Implemented here, to be able to remove the shadow properly, if there is one,
+	//! or to remove attached child.
+	bool removeChild(ISceneNode *child) override;
+
+	//! Returns the current displayed frame number.
+	f32 getFrameNr() const override;
+	//! Returns the current start frame number.
+	s32 getStartFrame() const override;
+	//! Returns the current end frame number.
+	s32 getEndFrame() const override;
+
+	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+	/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
+	referencing this mesh to change too. */
+	void setReadOnlyMaterials(bool readonly) override;
+
+	//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+	bool isReadOnlyMaterials() const override;
+
+	//! Sets a new mesh
+	void setMesh(IAnimatedMesh *mesh) override;
+
+	//! Returns the current mesh
+	IAnimatedMesh *getMesh(void) override { return Mesh; }
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_ANIMATED_MESH; }
+
+	//! updates the absolute position based on the relative and the parents position
+	void updateAbsolutePosition() override;
+
+	//! Set the joint update mode (0-unused, 1-get joints only, 2-set joints only, 3-move and set)
+	void setJointMode(E_JOINT_UPDATE_ON_RENDER mode) override;
+
+	//! Sets the transition time in seconds (note: This needs to enable joints, and setJointmode maybe set to 2)
+	//! you must call animateJoints(), or the mesh will not animate
+	void setTransitionTime(f32 Time) override;
+
+	//! updates the joint positions of this mesh
+	void animateJoints(bool CalculateAbsolutePositions = true) override;
+
+	//! render mesh ignoring its transformation. Used with ragdolls. (culling is unaffected)
+	void setRenderFromIdentity(bool On) override;
+
+	//! Creates a clone of this scene node and its children.
+	/** \param newParent An optional new parent.
+	\param newManager An optional new scene manager.
+	\return The newly created clone of this node. */
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+private:
+	//! Get a static mesh for the current frame of this animated mesh
+	IMesh *getMeshForCurrentFrame();
+
+	void buildFrameNr(u32 timeMs);
+	void checkJoints();
+	void beginTransition();
+
+	core::array<video::SMaterial> Materials;
+	core::aabbox3d<f32> Box;
+	IAnimatedMesh *Mesh;
+
+	s32 StartFrame;
+	s32 EndFrame;
+	f32 FramesPerSecond;
+	f32 CurrentFrameNr;
+
+	u32 LastTimeMs;
+	u32 TransitionTime;  // Transition time in millisecs
+	f32 Transiting;      // is mesh transiting (plus cache of TransitionTime)
+	f32 TransitingBlend; // 0-1, calculated on buildFrameNr
+
+	// 0-unused, 1-get joints only, 2-set joints only, 3-move and set
+	E_JOINT_UPDATE_ON_RENDER JointMode;
+	bool JointsUsed;
+
+	bool Looping;
+	bool ReadOnlyMaterials;
+	bool RenderFromIdentity;
+
+	IAnimationEndCallBack *LoopCallBack;
+	s32 PassCount;
+
+	core::array<IBoneSceneNode *> JointChildSceneNodes;
+	core::array<core::matrix4> PretransitingSave;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CAttributeImpl.h b/irr/src/CAttributeImpl.h
new file mode 100644
index 000000000..9065a7342
--- /dev/null
+++ b/irr/src/CAttributeImpl.h
@@ -0,0 +1,144 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CAttributes.h"
+#include "fast_atof.h"
+#include "ITexture.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace io
+{
+
+/*
+	Basic types, check documentation in IAttribute.h to see how they generally work.
+*/
+
+// Attribute implemented for boolean values
+class CBoolAttribute : public IAttribute
+{
+public:
+	CBoolAttribute(const char *name, bool value)
+	{
+		Name = name;
+		setBool(value);
+	}
+
+	s32 getInt() const override
+	{
+		return BoolValue ? 1 : 0;
+	}
+
+	f32 getFloat() const override
+	{
+		return BoolValue ? 1.0f : 0.0f;
+	}
+
+	bool getBool() const override
+	{
+		return BoolValue;
+	}
+
+	void setInt(s32 intValue) override
+	{
+		BoolValue = (intValue != 0);
+	}
+
+	void setFloat(f32 floatValue) override
+	{
+		BoolValue = (floatValue != 0);
+	}
+
+	void setBool(bool boolValue) override
+	{
+		BoolValue = boolValue;
+	}
+
+	E_ATTRIBUTE_TYPE getType() const override
+	{
+		return EAT_BOOL;
+	}
+
+	bool BoolValue;
+};
+
+// Attribute implemented for integers
+class CIntAttribute : public IAttribute
+{
+public:
+	CIntAttribute(const char *name, s32 value)
+	{
+		Name = name;
+		setInt(value);
+	}
+
+	s32 getInt() const override
+	{
+		return Value;
+	}
+
+	f32 getFloat() const override
+	{
+		return (f32)Value;
+	}
+
+	void setInt(s32 intValue) override
+	{
+		Value = intValue;
+	}
+
+	void setFloat(f32 floatValue) override
+	{
+		Value = (s32)floatValue;
+	};
+
+	E_ATTRIBUTE_TYPE getType() const override
+	{
+		return EAT_INT;
+	}
+
+	s32 Value;
+};
+
+// Attribute implemented for floats
+class CFloatAttribute : public IAttribute
+{
+public:
+	CFloatAttribute(const char *name, f32 value)
+	{
+		Name = name;
+		setFloat(value);
+	}
+
+	s32 getInt() const override
+	{
+		return (s32)Value;
+	}
+
+	f32 getFloat() const override
+	{
+		return Value;
+	}
+
+	void setInt(s32 intValue) override
+	{
+		Value = (f32)intValue;
+	}
+
+	void setFloat(f32 floatValue) override
+	{
+		Value = floatValue;
+	}
+
+	E_ATTRIBUTE_TYPE getType() const override
+	{
+		return EAT_FLOAT;
+	}
+
+	f32 Value;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CAttributes.cpp b/irr/src/CAttributes.cpp
new file mode 100644
index 000000000..2696d6bcf
--- /dev/null
+++ b/irr/src/CAttributes.cpp
@@ -0,0 +1,249 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CAttributes.h"
+#include "CAttributeImpl.h"
+#include "ITexture.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace io
+{
+
+CAttributes::CAttributes(video::IVideoDriver *driver) :
+		Driver(driver)
+{
+#ifdef _DEBUG
+	setDebugName("CAttributes");
+#endif
+
+	if (Driver)
+		Driver->grab();
+}
+
+CAttributes::~CAttributes()
+{
+	clear();
+
+	if (Driver)
+		Driver->drop();
+}
+
+//! Removes all attributes
+void CAttributes::clear()
+{
+	for (u32 i = 0; i < Attributes.size(); ++i)
+		Attributes[i]->drop();
+
+	Attributes.clear();
+}
+
+//! Returns attribute index from name, -1 if not found
+s32 CAttributes::findAttribute(const c8 *attributeName) const
+{
+	for (u32 i = 0; i < Attributes.size(); ++i)
+		if (Attributes[i]->Name == attributeName)
+			return i;
+
+	return -1;
+}
+
+IAttribute *CAttributes::getAttributeP(const c8 *attributeName) const
+{
+	for (u32 i = 0; i < Attributes.size(); ++i)
+		if (Attributes[i]->Name == attributeName)
+			return Attributes[i];
+
+	return 0;
+}
+
+//! Sets a attribute as boolean value
+void CAttributes::setAttribute(const c8 *attributeName, bool value)
+{
+	IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		att->setBool(value);
+	else {
+		Attributes.push_back(new CBoolAttribute(attributeName, value));
+	}
+}
+
+//! Gets a attribute as boolean value
+//! \param attributeName: Name of the attribute to get.
+//! \return Returns value of the attribute previously set by setAttribute() as bool
+//! or 0 if attribute is not set.
+bool CAttributes::getAttributeAsBool(const c8 *attributeName, bool defaultNotFound) const
+{
+	const IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		return att->getBool();
+	else
+		return defaultNotFound;
+}
+
+//! Sets a attribute as integer value
+void CAttributes::setAttribute(const c8 *attributeName, s32 value)
+{
+	IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		att->setInt(value);
+	else {
+		Attributes.push_back(new CIntAttribute(attributeName, value));
+	}
+}
+
+//! Gets a attribute as integer value
+//! \param attributeName: Name of the attribute to get.
+//! \return Returns value of the attribute previously set by setAttribute() as integer
+//! or 0 if attribute is not set.
+s32 CAttributes::getAttributeAsInt(const c8 *attributeName, irr::s32 defaultNotFound) const
+{
+	const IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		return att->getInt();
+	else
+		return defaultNotFound;
+}
+
+//! Sets a attribute as float value
+void CAttributes::setAttribute(const c8 *attributeName, f32 value)
+{
+	IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		att->setFloat(value);
+	else
+		Attributes.push_back(new CFloatAttribute(attributeName, value));
+}
+
+//! Gets a attribute as integer value
+//! \param attributeName: Name of the attribute to get.
+//! \return Returns value of the attribute previously set by setAttribute() as float value
+//! or 0 if attribute is not set.
+f32 CAttributes::getAttributeAsFloat(const c8 *attributeName, irr::f32 defaultNotFound) const
+{
+	const IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		return att->getFloat();
+
+	return defaultNotFound;
+}
+
+//! Returns amount of string attributes set in this scene manager.
+u32 CAttributes::getAttributeCount() const
+{
+	return Attributes.size();
+}
+
+//! Returns string attribute name by index.
+//! \param index: Index value, must be between 0 and getStringAttributeCount()-1.
+const c8 *CAttributes::getAttributeName(s32 index) const
+{
+	if ((u32)index >= Attributes.size())
+		return 0;
+
+	return Attributes[index]->Name.c_str();
+}
+
+//! Returns the type of an attribute
+E_ATTRIBUTE_TYPE CAttributes::getAttributeType(const c8 *attributeName) const
+{
+	E_ATTRIBUTE_TYPE ret = EAT_UNKNOWN;
+
+	const IAttribute *att = getAttributeP(attributeName);
+	if (att)
+		ret = att->getType();
+
+	return ret;
+}
+
+//! Returns attribute type by index.
+//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+E_ATTRIBUTE_TYPE CAttributes::getAttributeType(s32 index) const
+{
+	if ((u32)index >= Attributes.size())
+		return EAT_UNKNOWN;
+
+	return Attributes[index]->getType();
+}
+
+//! Gets an attribute as integer value
+//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+s32 CAttributes::getAttributeAsInt(s32 index) const
+{
+	if ((u32)index < Attributes.size())
+		return Attributes[index]->getInt();
+	else
+		return 0;
+}
+
+//! Gets an attribute as float value
+//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+f32 CAttributes::getAttributeAsFloat(s32 index) const
+{
+	if ((u32)index < Attributes.size())
+		return Attributes[index]->getFloat();
+	else
+		return 0.f;
+}
+
+//! Gets an attribute as boolean value
+//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+bool CAttributes::getAttributeAsBool(s32 index) const
+{
+	bool ret = false;
+
+	if ((u32)index < Attributes.size())
+		ret = Attributes[index]->getBool();
+
+	return ret;
+}
+
+//! Adds an attribute as integer
+void CAttributes::addInt(const c8 *attributeName, s32 value)
+{
+	Attributes.push_back(new CIntAttribute(attributeName, value));
+}
+
+//! Adds an attribute as float
+void CAttributes::addFloat(const c8 *attributeName, f32 value)
+{
+	Attributes.push_back(new CFloatAttribute(attributeName, value));
+}
+
+//! Adds an attribute as bool
+void CAttributes::addBool(const c8 *attributeName, bool value)
+{
+	Attributes.push_back(new CBoolAttribute(attributeName, value));
+}
+
+//! Returns if an attribute with a name exists
+bool CAttributes::existsAttribute(const c8 *attributeName) const
+{
+	return getAttributeP(attributeName) != 0;
+}
+
+//! Sets an attribute as boolean value
+void CAttributes::setAttribute(s32 index, bool value)
+{
+	if ((u32)index < Attributes.size())
+		Attributes[index]->setBool(value);
+}
+
+//! Sets an attribute as integer value
+void CAttributes::setAttribute(s32 index, s32 value)
+{
+	if ((u32)index < Attributes.size())
+		Attributes[index]->setInt(value);
+}
+
+//! Sets a attribute as float value
+void CAttributes::setAttribute(s32 index, f32 value)
+{
+	if ((u32)index < Attributes.size())
+		Attributes[index]->setFloat(value);
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CAttributes.h b/irr/src/CAttributes.h
new file mode 100644
index 000000000..0fe2739b6
--- /dev/null
+++ b/irr/src/CAttributes.h
@@ -0,0 +1,133 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IAttributes.h"
+#include "IAttribute.h"
+
+namespace irr
+{
+namespace video
+{
+class ITexture;
+class IVideoDriver;
+}
+namespace io
+{
+
+//! Implementation of the IAttributes interface
+class CAttributes : public IAttributes
+{
+public:
+	CAttributes(video::IVideoDriver *driver = 0);
+	~CAttributes();
+
+	//! Returns amount of attributes in this collection of attributes.
+	u32 getAttributeCount() const override;
+
+	//! Returns attribute name by index.
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	const c8 *getAttributeName(s32 index) const override;
+
+	//! Returns the type of an attribute
+	//! \param attributeName: Name for the attribute
+	E_ATTRIBUTE_TYPE getAttributeType(const c8 *attributeName) const override;
+
+	//! Returns attribute type by index.
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	E_ATTRIBUTE_TYPE getAttributeType(s32 index) const override;
+
+	//! Returns if an attribute with a name exists
+	bool existsAttribute(const c8 *attributeName) const override;
+
+	//! Returns attribute index from name, -1 if not found
+	s32 findAttribute(const c8 *attributeName) const override;
+
+	//! Removes all attributes
+	void clear() override;
+
+	/*
+
+		Integer Attribute
+
+	*/
+
+	//! Adds an attribute as integer
+	void addInt(const c8 *attributeName, s32 value) override;
+
+	//! Sets an attribute as integer value
+	void setAttribute(const c8 *attributeName, s32 value) override;
+
+	//! Gets an attribute as integer value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	s32 getAttributeAsInt(const c8 *attributeName, irr::s32 defaultNotFound = 0) const override;
+
+	//! Gets an attribute as integer value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	s32 getAttributeAsInt(s32 index) const override;
+
+	//! Sets an attribute as integer value
+	void setAttribute(s32 index, s32 value) override;
+
+	/*
+
+		Float Attribute
+
+	*/
+
+	//! Adds an attribute as float
+	void addFloat(const c8 *attributeName, f32 value) override;
+
+	//! Sets a attribute as float value
+	void setAttribute(const c8 *attributeName, f32 value) override;
+
+	//! Gets an attribute as float value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	f32 getAttributeAsFloat(const c8 *attributeName, irr::f32 defaultNotFound = 0.f) const override;
+
+	//! Gets an attribute as float value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	f32 getAttributeAsFloat(s32 index) const override;
+
+	//! Sets an attribute as float value
+	void setAttribute(s32 index, f32 value) override;
+
+	/*
+		Bool Attribute
+	*/
+
+	//! Adds an attribute as bool
+	void addBool(const c8 *attributeName, bool value) override;
+
+	//! Sets an attribute as boolean value
+	void setAttribute(const c8 *attributeName, bool value) override;
+
+	//! Gets an attribute as boolean value
+	//! \param attributeName: Name of the attribute to get.
+	//! \param defaultNotFound Value returned when attributeName was not found
+	//! \return Returns value of the attribute previously set by setAttribute()
+	bool getAttributeAsBool(const c8 *attributeName, bool defaultNotFound = false) const override;
+
+	//! Gets an attribute as boolean value
+	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
+	bool getAttributeAsBool(s32 index) const override;
+
+	//! Sets an attribute as boolean value
+	void setAttribute(s32 index, bool value) override;
+
+protected:
+	core::array<IAttribute *> Attributes;
+
+	IAttribute *getAttributeP(const c8 *attributeName) const;
+
+	video::IVideoDriver *Driver;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CB3DMeshFileLoader.cpp b/irr/src/CB3DMeshFileLoader.cpp
new file mode 100644
index 000000000..6ee24af0e
--- /dev/null
+++ b/irr/src/CB3DMeshFileLoader.cpp
@@ -0,0 +1,949 @@
+// Copyright (C) 2006-2012 Luke Hoschke
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// B3D Mesh loader
+// File format designed by Mark Sibly for the Blitz3D engine and has been
+// declared public domain
+
+#include "CB3DMeshFileLoader.h"
+
+#include "IVideoDriver.h"
+#include "IFileSystem.h"
+#include "os.h"
+
+#include <algorithm>
+
+#ifdef _DEBUG
+#define _B3D_READER_DEBUG
+#endif
+
+namespace irr
+{
+namespace scene
+{
+
+//! Constructor
+CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager *smgr) :
+		AnimatedMesh(0), B3DFile(0), VerticesStart(0), NormalsInFile(false),
+		HasVertexColors(false), ShowWarning(true)
+{
+#ifdef _DEBUG
+	setDebugName("CB3DMeshFileLoader");
+#endif
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".bsp")
+bool CB3DMeshFileLoader::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "b3d");
+}
+
+//! creates/loads an animated mesh from the file.
+//! \return Pointer to the created mesh. Returns 0 if loading failed.
+//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+//! See IReferenceCounted::drop() for more information.
+IAnimatedMesh *CB3DMeshFileLoader::createMesh(io::IReadFile *file)
+{
+	if (!file)
+		return 0;
+
+	B3DFile = file;
+	AnimatedMesh = new scene::CSkinnedMesh();
+	ShowWarning = true; // If true a warning is issued if too many textures are used
+	VerticesStart = 0;
+
+	if (load()) {
+		AnimatedMesh->finalize();
+	} else {
+		AnimatedMesh->drop();
+		AnimatedMesh = 0;
+	}
+
+	return AnimatedMesh;
+}
+
+bool CB3DMeshFileLoader::load()
+{
+	B3dStack.clear();
+
+	NormalsInFile = false;
+	HasVertexColors = false;
+
+	//------ Get header ------
+
+	SB3dChunkHeader header;
+	B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+	header.size = os::Byteswap::byteswap(header.size);
+#endif
+
+	if (strncmp(header.name, "BB3D", 4) != 0) {
+		os::Printer::log("File is not a b3d file. Loading failed (No header found)", B3DFile->getFileName(), ELL_ERROR);
+		return false;
+	}
+
+	// Add main chunk...
+	B3dStack.push_back(SB3dChunk(header, B3DFile->getPos() - 8));
+
+	// Get file version, but ignore it, as it's not important with b3d files...
+	s32 fileVersion;
+	B3DFile->read(&fileVersion, sizeof(fileVersion));
+#ifdef __BIG_ENDIAN__
+	fileVersion = os::Byteswap::byteswap(fileVersion);
+#endif
+
+	//------ Read main chunk ------
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) {
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos() - 8));
+
+		if (strncmp(B3dStack.getLast().name, "TEXS", 4) == 0) {
+			if (!readChunkTEXS())
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "BRUS", 4) == 0) {
+			if (!readChunkBRUS())
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "NODE", 4) == 0) {
+			if (!readChunkNODE((CSkinnedMesh::SJoint *)0))
+				return false;
+		} else {
+			os::Printer::log("Unknown chunk found in mesh base - skipping");
+			if (!B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length))
+				return false;
+			B3dStack.erase(B3dStack.size() - 1);
+		}
+	}
+
+	B3dStack.clear();
+
+	BaseVertices.clear();
+	AnimatedVertices_VertexID.clear();
+	AnimatedVertices_BufferID.clear();
+
+	Materials.clear();
+	Textures.clear();
+
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkNODE(CSkinnedMesh::SJoint *inJoint)
+{
+	CSkinnedMesh::SJoint *joint = AnimatedMesh->addJoint(inJoint);
+	joint->Name = readString();
+
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkNODE";
+	os::Printer::log(logStr.c_str(), joint->Name.value_or("").c_str(), ELL_DEBUG);
+#endif
+
+	f32 position[3], scale[3], rotation[4];
+
+	readFloats(position, 3);
+	readFloats(scale, 3);
+	readFloats(rotation, 4);
+
+	joint->Animatedposition = core::vector3df(position[0], position[1], position[2]);
+	joint->Animatedscale = core::vector3df(scale[0], scale[1], scale[2]);
+	joint->Animatedrotation = core::quaternion(rotation[1], rotation[2], rotation[3], rotation[0]);
+
+	// Build LocalMatrix:
+
+	core::matrix4 positionMatrix;
+	positionMatrix.setTranslation(joint->Animatedposition);
+	core::matrix4 scaleMatrix;
+	scaleMatrix.setScale(joint->Animatedscale);
+	core::matrix4 rotationMatrix;
+	joint->Animatedrotation.getMatrix_transposed(rotationMatrix);
+
+	joint->LocalMatrix = positionMatrix * rotationMatrix * scaleMatrix;
+
+	if (inJoint)
+		joint->GlobalMatrix = inJoint->GlobalMatrix * joint->LocalMatrix;
+	else
+		joint->GlobalMatrix = joint->LocalMatrix;
+
+	while (B3dStack.getLast().startposition + B3dStack.getLast().length > B3DFile->getPos()) // this chunk repeats
+	{
+		SB3dChunkHeader header;
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
+
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos() - 8));
+
+		if (strncmp(B3dStack.getLast().name, "NODE", 4) == 0) {
+			if (!readChunkNODE(joint))
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "MESH", 4) == 0) {
+			VerticesStart = BaseVertices.size();
+			if (!readChunkMESH(joint))
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "BONE", 4) == 0) {
+			if (!readChunkBONE(joint))
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "KEYS", 4) == 0) {
+			if (!readChunkKEYS(joint))
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "ANIM", 4) == 0) {
+			if (!readChunkANIM())
+				return false;
+		} else {
+			os::Printer::log("Unknown chunk found in node chunk - skipping");
+			if (!B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length))
+				return false;
+			B3dStack.erase(B3dStack.size() - 1);
+		}
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *inJoint)
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkMESH";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	s32 brushID;
+	B3DFile->read(&brushID, sizeof(brushID));
+#ifdef __BIG_ENDIAN__
+	brushID = os::Byteswap::byteswap(brushID);
+#endif
+
+	NormalsInFile = false;
+	HasVertexColors = false;
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		SB3dChunkHeader header;
+		B3DFile->read(&header, sizeof(header));
+#ifdef __BIG_ENDIAN__
+		header.size = os::Byteswap::byteswap(header.size);
+#endif
+
+		B3dStack.push_back(SB3dChunk(header, B3DFile->getPos() - 8));
+
+		if (strncmp(B3dStack.getLast().name, "VRTS", 4) == 0) {
+			if (!readChunkVRTS(inJoint))
+				return false;
+		} else if (strncmp(B3dStack.getLast().name, "TRIS", 4) == 0) {
+			scene::SSkinMeshBuffer *meshBuffer = AnimatedMesh->addMeshBuffer();
+
+			if (brushID == -1) { /* ok */
+			} else if (brushID < 0 || (u32)brushID >= Materials.size()) {
+				os::Printer::log("Illegal brush ID found", B3DFile->getFileName(), ELL_ERROR);
+				return false;
+			} else {
+				meshBuffer->Material = Materials[brushID].Material;
+			}
+
+			if (readChunkTRIS(meshBuffer, AnimatedMesh->getMeshBuffers().size() - 1, VerticesStart) == false)
+				return false;
+
+			if (!NormalsInFile) {
+				s32 i;
+
+				for (i = 0; i < (s32)meshBuffer->Indices.size(); i += 3) {
+					core::plane3df p(meshBuffer->getVertex(meshBuffer->Indices[i + 0])->Pos,
+							meshBuffer->getVertex(meshBuffer->Indices[i + 1])->Pos,
+							meshBuffer->getVertex(meshBuffer->Indices[i + 2])->Pos);
+
+					meshBuffer->getVertex(meshBuffer->Indices[i + 0])->Normal += p.Normal;
+					meshBuffer->getVertex(meshBuffer->Indices[i + 1])->Normal += p.Normal;
+					meshBuffer->getVertex(meshBuffer->Indices[i + 2])->Normal += p.Normal;
+				}
+
+				for (i = 0; i < (s32)meshBuffer->getVertexCount(); ++i) {
+					meshBuffer->getVertex(i)->Normal.normalize();
+					BaseVertices[VerticesStart + i].Normal = meshBuffer->getVertex(i)->Normal;
+				}
+			}
+		} else {
+			os::Printer::log("Unknown chunk found in mesh - skipping");
+			if (!B3DFile->seek(B3dStack.getLast().startposition + B3dStack.getLast().length))
+				return false;
+			B3dStack.erase(B3dStack.size() - 1);
+		}
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	return true;
+}
+
+/*
+VRTS:
+  int flags                   ;1=normal values present, 2=rgba values present
+  int tex_coord_sets          ;texture coords per vertex (eg: 1 for simple U/V) max=8
+				but we only support 3
+  int tex_coord_set_size      ;components per set (eg: 2 for simple U/V) max=4
+  {
+  float x,y,z                 ;always present
+  float nx,ny,nz              ;vertex normal: present if (flags&1)
+  float red,green,blue,alpha  ;vertex color: present if (flags&2)
+  float tex_coords[tex_coord_sets][tex_coord_set_size]	;tex coords
+  }
+*/
+bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *inJoint)
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "ChunkVRTS";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	const s32 max_tex_coords = 3;
+	s32 flags, tex_coord_sets, tex_coord_set_size;
+
+	B3DFile->read(&flags, sizeof(flags));
+	B3DFile->read(&tex_coord_sets, sizeof(tex_coord_sets));
+	B3DFile->read(&tex_coord_set_size, sizeof(tex_coord_set_size));
+#ifdef __BIG_ENDIAN__
+	flags = os::Byteswap::byteswap(flags);
+	tex_coord_sets = os::Byteswap::byteswap(tex_coord_sets);
+	tex_coord_set_size = os::Byteswap::byteswap(tex_coord_set_size);
+#endif
+
+	if (tex_coord_sets < 0 || tex_coord_set_size < 0 ||
+			tex_coord_sets >= max_tex_coords || tex_coord_set_size >= 4) // Something is wrong
+	{
+		os::Printer::log("tex_coord_sets or tex_coord_set_size too big", B3DFile->getFileName(), ELL_ERROR);
+		return false;
+	}
+
+	//------ Allocate Memory, for speed -----------//
+
+	s32 numberOfReads = 3;
+
+	if (flags & 1) {
+		NormalsInFile = true;
+		numberOfReads += 3;
+	}
+	if (flags & 2) {
+		numberOfReads += 4;
+		HasVertexColors = true;
+	}
+
+	numberOfReads += tex_coord_sets * tex_coord_set_size;
+
+	const s32 memoryNeeded = (B3dStack.getLast().length / sizeof(f32)) / numberOfReads;
+
+	BaseVertices.reallocate(memoryNeeded + BaseVertices.size() + 1);
+	AnimatedVertices_VertexID.reallocate(memoryNeeded + AnimatedVertices_VertexID.size() + 1);
+
+	//--------------------------------------------//
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		f32 position[3];
+		f32 normal[3] = {0.f, 0.f, 0.f};
+		f32 color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+		f32 tex_coords[max_tex_coords][4];
+
+		readFloats(position, 3);
+
+		if (flags & 1)
+			readFloats(normal, 3);
+		if (flags & 2)
+			readFloats(color, 4);
+
+		for (s32 i = 0; i < tex_coord_sets; ++i)
+			readFloats(tex_coords[i], tex_coord_set_size);
+
+		f32 tu = 0.0f, tv = 0.0f;
+		if (tex_coord_sets >= 1 && tex_coord_set_size >= 2) {
+			tu = tex_coords[0][0];
+			tv = tex_coords[0][1];
+		}
+
+		f32 tu2 = 0.0f, tv2 = 0.0f;
+		if (tex_coord_sets > 1 && tex_coord_set_size > 1) {
+			tu2 = tex_coords[1][0];
+			tv2 = tex_coords[1][1];
+		}
+
+		// Create Vertex...
+		video::S3DVertex2TCoords Vertex(position[0], position[1], position[2],
+				normal[0], normal[1], normal[2],
+				video::SColorf(color[0], color[1], color[2], color[3]).toSColor(),
+				tu, tv, tu2, tv2);
+
+		// Transform the Vertex position by nested node...
+		inJoint->GlobalMatrix.transformVect(Vertex.Pos);
+		inJoint->GlobalMatrix.rotateVect(Vertex.Normal);
+
+		// Add it...
+		BaseVertices.push_back(Vertex);
+
+		AnimatedVertices_VertexID.push_back(-1);
+		AnimatedVertices_BufferID.push_back(-1);
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkTRIS(scene::SSkinMeshBuffer *meshBuffer, u32 meshBufferID, s32 vertices_Start)
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "ChunkTRIS";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	bool showVertexWarning = false;
+
+	s32 triangle_brush_id; // Note: Irrlicht can't have different brushes for each triangle (using a workaround)
+	B3DFile->read(&triangle_brush_id, sizeof(triangle_brush_id));
+#ifdef __BIG_ENDIAN__
+	triangle_brush_id = os::Byteswap::byteswap(triangle_brush_id);
+#endif
+
+	SB3dMaterial *B3dMaterial;
+
+	if (triangle_brush_id == -1)
+		B3dMaterial = 0;
+	else if (triangle_brush_id < 0 || (u32)triangle_brush_id >= Materials.size()) {
+		os::Printer::log("Illegal material index found", B3DFile->getFileName(), ELL_ERROR);
+		return false;
+	} else {
+		B3dMaterial = &Materials[triangle_brush_id];
+		meshBuffer->Material = B3dMaterial->Material;
+	}
+
+	const s32 memoryNeeded = B3dStack.getLast().length / sizeof(s32);
+	meshBuffer->Indices.reallocate(memoryNeeded + meshBuffer->Indices.size() + 1);
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		s32 vertex_id[3];
+
+		B3DFile->read(vertex_id, 3 * sizeof(s32));
+#ifdef __BIG_ENDIAN__
+		vertex_id[0] = os::Byteswap::byteswap(vertex_id[0]);
+		vertex_id[1] = os::Byteswap::byteswap(vertex_id[1]);
+		vertex_id[2] = os::Byteswap::byteswap(vertex_id[2]);
+#endif
+
+		// Make Ids global:
+		vertex_id[0] += vertices_Start;
+		vertex_id[1] += vertices_Start;
+		vertex_id[2] += vertices_Start;
+
+		for (s32 i = 0; i < 3; ++i) {
+			if ((u32)vertex_id[i] >= AnimatedVertices_VertexID.size()) {
+				os::Printer::log("Illegal vertex index found", B3DFile->getFileName(), ELL_ERROR);
+				return false;
+			}
+
+			if (AnimatedVertices_VertexID[vertex_id[i]] != -1) {
+				if (AnimatedVertices_BufferID[vertex_id[i]] != (s32)meshBufferID) { // If this vertex is linked in a different meshbuffer
+					AnimatedVertices_VertexID[vertex_id[i]] = -1;
+					AnimatedVertices_BufferID[vertex_id[i]] = -1;
+					showVertexWarning = true;
+				}
+			}
+			if (AnimatedVertices_VertexID[vertex_id[i]] == -1) { // If this vertex is not in the meshbuffer
+				// Check for lightmapping:
+				if (BaseVertices[vertex_id[i]].TCoords2 != core::vector2df(0.f, 0.f))
+					meshBuffer->convertTo2TCoords(); // Will only affect the meshbuffer the first time this is called
+
+				// Add the vertex to the meshbuffer:
+				if (meshBuffer->VertexType == video::EVT_STANDARD)
+					meshBuffer->Vertices_Standard.push_back(BaseVertices[vertex_id[i]]);
+				else
+					meshBuffer->Vertices_2TCoords.push_back(BaseVertices[vertex_id[i]]);
+
+				// create vertex id to meshbuffer index link:
+				AnimatedVertices_VertexID[vertex_id[i]] = meshBuffer->getVertexCount() - 1;
+				AnimatedVertices_BufferID[vertex_id[i]] = meshBufferID;
+
+				if (B3dMaterial) {
+					// Apply Material/Color/etc...
+					video::S3DVertex *Vertex = meshBuffer->getVertex(meshBuffer->getVertexCount() - 1);
+
+					if (!HasVertexColors)
+						Vertex->Color = B3dMaterial->Material.DiffuseColor;
+					else if (Vertex->Color.getAlpha() == 255)
+						Vertex->Color.setAlpha((s32)(B3dMaterial->alpha * 255.0f));
+
+					// Use texture's scale
+					if (B3dMaterial->Textures[0]) {
+						Vertex->TCoords.X *= B3dMaterial->Textures[0]->Xscale;
+						Vertex->TCoords.Y *= B3dMaterial->Textures[0]->Yscale;
+					}
+					/*
+					if (B3dMaterial->Textures[1])
+					{
+						Vertex->TCoords2.X *=B3dMaterial->Textures[1]->Xscale;
+						Vertex->TCoords2.Y *=B3dMaterial->Textures[1]->Yscale;
+					}
+					*/
+				}
+			}
+		}
+
+		meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[0]]);
+		meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[1]]);
+		meshBuffer->Indices.push_back(AnimatedVertices_VertexID[vertex_id[2]]);
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	if (showVertexWarning)
+		os::Printer::log("B3dMeshLoader: Warning, different meshbuffers linking to the same vertex, this will cause problems with animated meshes");
+
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkBONE(CSkinnedMesh::SJoint *inJoint)
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkBONE";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	if (B3dStack.getLast().length > 8) {
+		while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+		{
+			u32 globalVertexID;
+			f32 strength;
+			B3DFile->read(&globalVertexID, sizeof(globalVertexID));
+			B3DFile->read(&strength, sizeof(strength));
+#ifdef __BIG_ENDIAN__
+			globalVertexID = os::Byteswap::byteswap(globalVertexID);
+			strength = os::Byteswap::byteswap(strength);
+#endif
+			globalVertexID += VerticesStart;
+
+			if (globalVertexID >= AnimatedVertices_VertexID.size()) {
+				os::Printer::log("Illegal vertex index found", B3DFile->getFileName(), ELL_ERROR);
+				return false;
+			}
+
+			if (AnimatedVertices_VertexID[globalVertexID] == -1) {
+				os::Printer::log("B3dMeshLoader: Weight has bad vertex id (no link to meshbuffer index found)");
+			} else if (strength > 0) {
+				CSkinnedMesh::SWeight *weight = AnimatedMesh->addWeight(inJoint);
+				weight->strength = strength;
+				// Find the meshbuffer and Vertex index from the Global Vertex ID:
+				weight->vertex_id = AnimatedVertices_VertexID[globalVertexID];
+				weight->buffer_id = AnimatedVertices_BufferID[globalVertexID];
+			}
+		}
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkKEYS(CSkinnedMesh::SJoint *inJoint)
+{
+#ifdef _B3D_READER_DEBUG
+	// Only print first, that's just too much output otherwise
+	if (!inJoint || (inJoint->PositionKeys.empty() && inJoint->ScaleKeys.empty() && inJoint->RotationKeys.empty())) {
+		core::stringc logStr;
+		for (u32 i = 1; i < B3dStack.size(); ++i)
+			logStr += "-";
+		logStr += "read ChunkKEYS";
+		os::Printer::log(logStr.c_str(), ELL_DEBUG);
+	}
+#endif
+
+	s32 flags;
+	B3DFile->read(&flags, sizeof(flags));
+#ifdef __BIG_ENDIAN__
+	flags = os::Byteswap::byteswap(flags);
+#endif
+
+	CSkinnedMesh::SPositionKey *oldPosKey = 0;
+	core::vector3df oldPos[2];
+	CSkinnedMesh::SScaleKey *oldScaleKey = 0;
+	core::vector3df oldScale[2];
+	CSkinnedMesh::SRotationKey *oldRotKey = 0;
+	core::quaternion oldRot[2];
+	bool isFirst[3] = {true, true, true};
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		s32 frame;
+
+		B3DFile->read(&frame, sizeof(frame));
+#ifdef __BIG_ENDIAN__
+		frame = os::Byteswap::byteswap(frame);
+#endif
+
+		// Add key frames, frames in Irrlicht are zero-based
+		f32 data[4];
+		if (flags & 1) {
+			readFloats(data, 3);
+			if ((oldPosKey != 0) && (oldPos[0] == oldPos[1])) {
+				const core::vector3df pos(data[0], data[1], data[2]);
+				if (oldPos[1] == pos)
+					oldPosKey->frame = (f32)frame - 1;
+				else {
+					oldPos[0] = oldPos[1];
+					oldPosKey = AnimatedMesh->addPositionKey(inJoint);
+					oldPosKey->frame = (f32)frame - 1;
+					oldPos[1].set(oldPosKey->position.set(pos));
+				}
+			} else if (oldPosKey == 0 && isFirst[0]) {
+				oldPosKey = AnimatedMesh->addPositionKey(inJoint);
+				oldPosKey->frame = (f32)frame - 1;
+				oldPos[0].set(oldPosKey->position.set(data[0], data[1], data[2]));
+				oldPosKey = 0;
+				isFirst[0] = false;
+			} else {
+				if (oldPosKey != 0)
+					oldPos[0] = oldPos[1];
+				oldPosKey = AnimatedMesh->addPositionKey(inJoint);
+				oldPosKey->frame = (f32)frame - 1;
+				oldPos[1].set(oldPosKey->position.set(data[0], data[1], data[2]));
+			}
+		}
+		if (flags & 2) {
+			readFloats(data, 3);
+			if ((oldScaleKey != 0) && (oldScale[0] == oldScale[1])) {
+				const core::vector3df scale(data[0], data[1], data[2]);
+				if (oldScale[1] == scale)
+					oldScaleKey->frame = (f32)frame - 1;
+				else {
+					oldScale[0] = oldScale[1];
+					oldScaleKey = AnimatedMesh->addScaleKey(inJoint);
+					oldScaleKey->frame = (f32)frame - 1;
+					oldScale[1].set(oldScaleKey->scale.set(scale));
+				}
+			} else if (oldScaleKey == 0 && isFirst[1]) {
+				oldScaleKey = AnimatedMesh->addScaleKey(inJoint);
+				oldScaleKey->frame = (f32)frame - 1;
+				oldScale[0].set(oldScaleKey->scale.set(data[0], data[1], data[2]));
+				oldScaleKey = 0;
+				isFirst[1] = false;
+			} else {
+				if (oldScaleKey != 0)
+					oldScale[0] = oldScale[1];
+				oldScaleKey = AnimatedMesh->addScaleKey(inJoint);
+				oldScaleKey->frame = (f32)frame - 1;
+				oldScale[1].set(oldScaleKey->scale.set(data[0], data[1], data[2]));
+			}
+		}
+		if (flags & 4) {
+			readFloats(data, 4);
+			if ((oldRotKey != 0) && (oldRot[0] == oldRot[1])) {
+				// meant to be in this order since b3d stores W first
+				const core::quaternion rot(data[1], data[2], data[3], data[0]);
+				if (oldRot[1] == rot)
+					oldRotKey->frame = (f32)frame - 1;
+				else {
+					oldRot[0] = oldRot[1];
+					oldRotKey = AnimatedMesh->addRotationKey(inJoint);
+					oldRotKey->frame = (f32)frame - 1;
+					oldRot[1].set(oldRotKey->rotation.set(data[1], data[2], data[3], data[0]));
+					oldRot[1].normalize();
+				}
+			} else if (oldRotKey == 0 && isFirst[2]) {
+				oldRotKey = AnimatedMesh->addRotationKey(inJoint);
+				oldRotKey->frame = (f32)frame - 1;
+				// meant to be in this order since b3d stores W first
+				oldRot[0].set(oldRotKey->rotation.set(data[1], data[2], data[3], data[0]));
+				oldRot[0].normalize();
+				oldRotKey = 0;
+				isFirst[2] = false;
+			} else {
+				if (oldRotKey != 0)
+					oldRot[0] = oldRot[1];
+				oldRotKey = AnimatedMesh->addRotationKey(inJoint);
+				oldRotKey->frame = (f32)frame - 1;
+				// meant to be in this order since b3d stores W first
+				oldRot[1].set(oldRotKey->rotation.set(data[1], data[2], data[3], data[0]));
+				oldRot[1].normalize();
+			}
+		}
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkANIM()
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkANIM";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	s32 animFlags;  // not stored\used
+	s32 animFrames; // not stored\used
+	f32 animFPS;    // not stored\used
+
+	B3DFile->read(&animFlags, sizeof(s32));
+	B3DFile->read(&animFrames, sizeof(s32));
+	readFloats(&animFPS, 1);
+	if (animFPS > 0.f)
+		AnimatedMesh->setAnimationSpeed(animFPS);
+	os::Printer::log("FPS", io::path((double)animFPS), ELL_DEBUG);
+
+#ifdef __BIG_ENDIAN__
+	animFlags = os::Byteswap::byteswap(animFlags);
+	animFrames = os::Byteswap::byteswap(animFrames);
+#endif
+
+	B3dStack.erase(B3dStack.size() - 1);
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkTEXS()
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkTEXS";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		Textures.push_back(SB3dTexture());
+		SB3dTexture &B3dTexture = Textures.getLast();
+
+		B3dTexture.TextureName = readString();
+		std::replace(B3dTexture.TextureName.begin(), B3dTexture.TextureName.end(), '\\', '/');
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("read Texture", B3dTexture.TextureName.c_str(), ELL_DEBUG);
+#endif
+
+		B3DFile->read(&B3dTexture.Flags, sizeof(s32));
+		B3DFile->read(&B3dTexture.Blend, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+		B3dTexture.Flags = os::Byteswap::byteswap(B3dTexture.Flags);
+		B3dTexture.Blend = os::Byteswap::byteswap(B3dTexture.Blend);
+#endif
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("Flags", core::stringc(B3dTexture.Flags).c_str(), ELL_DEBUG);
+		os::Printer::log("Blend", core::stringc(B3dTexture.Blend).c_str(), ELL_DEBUG);
+#endif
+		readFloats(&B3dTexture.Xpos, 1);
+		readFloats(&B3dTexture.Ypos, 1);
+		readFloats(&B3dTexture.Xscale, 1);
+		readFloats(&B3dTexture.Yscale, 1);
+		readFloats(&B3dTexture.Angle, 1);
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	return true;
+}
+
+bool CB3DMeshFileLoader::readChunkBRUS()
+{
+#ifdef _B3D_READER_DEBUG
+	core::stringc logStr;
+	for (u32 i = 1; i < B3dStack.size(); ++i)
+		logStr += "-";
+	logStr += "read ChunkBRUS";
+	os::Printer::log(logStr.c_str(), ELL_DEBUG);
+#endif
+
+	u32 n_texs;
+	B3DFile->read(&n_texs, sizeof(u32));
+#ifdef __BIG_ENDIAN__
+	n_texs = os::Byteswap::byteswap(n_texs);
+#endif
+
+	// number of texture ids read for Irrlicht
+	const u32 num_textures = core::min_(n_texs, video::MATERIAL_MAX_TEXTURES);
+	// number of bytes to skip (for ignored texture ids)
+	const u32 n_texs_offset = (num_textures < n_texs) ? (n_texs - num_textures) : 0;
+
+	while ((B3dStack.getLast().startposition + B3dStack.getLast().length) > B3DFile->getPos()) // this chunk repeats
+	{
+		// This is what blitz basic calls a brush, like a Irrlicht Material
+
+		auto name = readString();
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("read Material", name.c_str(), ELL_DEBUG);
+#endif
+		Materials.push_back(SB3dMaterial());
+		SB3dMaterial &B3dMaterial = Materials.getLast();
+
+		readFloats(&B3dMaterial.red, 1);
+		readFloats(&B3dMaterial.green, 1);
+		readFloats(&B3dMaterial.blue, 1);
+		readFloats(&B3dMaterial.alpha, 1);
+		readFloats(&B3dMaterial.shininess, 1);
+
+		B3DFile->read(&B3dMaterial.blend, sizeof(B3dMaterial.blend));
+		B3DFile->read(&B3dMaterial.fx, sizeof(B3dMaterial.fx));
+#ifdef __BIG_ENDIAN__
+		B3dMaterial.blend = os::Byteswap::byteswap(B3dMaterial.blend);
+		B3dMaterial.fx = os::Byteswap::byteswap(B3dMaterial.fx);
+#endif
+#ifdef _B3D_READER_DEBUG
+		os::Printer::log("Blend", core::stringc(B3dMaterial.blend).c_str(), ELL_DEBUG);
+		os::Printer::log("FX", core::stringc(B3dMaterial.fx).c_str(), ELL_DEBUG);
+#endif
+
+		u32 i;
+		for (i = 0; i < num_textures; ++i) {
+			s32 texture_id = -1;
+			B3DFile->read(&texture_id, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+			texture_id = os::Byteswap::byteswap(texture_id);
+#endif
+			//--- Get pointers to the texture, based on the IDs ---
+			if ((u32)texture_id < Textures.size()) {
+				B3dMaterial.Textures[i] = &Textures[texture_id];
+#ifdef _B3D_READER_DEBUG
+				os::Printer::log("Layer", core::stringc(i).c_str(), ELL_DEBUG);
+				os::Printer::log("using texture", Textures[texture_id].TextureName.c_str(), ELL_DEBUG);
+#endif
+			} else
+				B3dMaterial.Textures[i] = 0;
+		}
+		// skip other texture ids
+		for (i = 0; i < n_texs_offset; ++i) {
+			s32 texture_id = -1;
+			B3DFile->read(&texture_id, sizeof(s32));
+#ifdef __BIG_ENDIAN__
+			texture_id = os::Byteswap::byteswap(texture_id);
+#endif
+			if (ShowWarning && (texture_id != -1) && (n_texs > video::MATERIAL_MAX_TEXTURES)) {
+				os::Printer::log("Too many textures used in one material", B3DFile->getFileName(), ELL_WARNING);
+				ShowWarning = false;
+			}
+		}
+
+		// Fixes problems when the lightmap is on the first texture:
+		if (B3dMaterial.Textures[0] != 0) {
+			if (B3dMaterial.Textures[0]->Flags & 65536) { // 65536 = secondary UV
+				SB3dTexture *TmpTexture;
+				TmpTexture = B3dMaterial.Textures[1];
+				B3dMaterial.Textures[1] = B3dMaterial.Textures[0];
+				B3dMaterial.Textures[0] = TmpTexture;
+			}
+		}
+
+		// If a preceeding texture slot is empty move the others down:
+		for (i = num_textures; i > 0; --i) {
+			for (u32 j = i - 1; j < num_textures - 1; ++j) {
+				if (B3dMaterial.Textures[j + 1] != 0 && B3dMaterial.Textures[j] == 0) {
+					B3dMaterial.Textures[j] = B3dMaterial.Textures[j + 1];
+					B3dMaterial.Textures[j + 1] = 0;
+				}
+			}
+		}
+
+		//------ Convert blitz flags/blend to irrlicht -------
+
+		// Two textures:
+		if (B3dMaterial.Textures[1]) {
+			B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+			B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
+		} else if (B3dMaterial.Textures[0]) { // One texture:
+			// Flags & 0x1 is usual SOLID, 0x8 is mipmap (handled before)
+			if (B3dMaterial.Textures[0]->Flags & 0x2) { // (Alpha mapped)
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+				B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
+			} else if (B3dMaterial.Textures[0]->Flags & 0x4)                                  //(Masked)
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // TODO: create color key texture
+			else if (B3dMaterial.alpha == 1.f)
+				B3dMaterial.Material.MaterialType = video::EMT_SOLID;
+			else {
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+				B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
+			}
+		} else // No texture:
+		{
+			if (B3dMaterial.alpha == 1.f)
+				B3dMaterial.Material.MaterialType = video::EMT_SOLID;
+			else {
+				B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+				B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
+			}
+		}
+
+		B3dMaterial.Material.DiffuseColor = video::SColorf(B3dMaterial.red, B3dMaterial.green, B3dMaterial.blue, B3dMaterial.alpha).toSColor();
+		B3dMaterial.Material.ColorMaterial = video::ECM_NONE;
+
+		//------ Material fx ------
+
+		if (B3dMaterial.fx & 1) { // full-bright
+			B3dMaterial.Material.AmbientColor = video::SColor(255, 255, 255, 255);
+			B3dMaterial.Material.Lighting = false;
+		} else
+			B3dMaterial.Material.AmbientColor = B3dMaterial.Material.DiffuseColor;
+
+		if (B3dMaterial.fx & 2) // use vertex colors instead of brush color
+			B3dMaterial.Material.ColorMaterial = video::ECM_DIFFUSE_AND_AMBIENT;
+
+		if (B3dMaterial.fx & 4) // flatshaded
+			B3dMaterial.Material.GouraudShading = false;
+
+		if (B3dMaterial.fx & 16) // disable backface culling
+			B3dMaterial.Material.BackfaceCulling = false;
+
+		if (B3dMaterial.fx & 32) { // force vertex alpha-blending
+			B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+			B3dMaterial.Material.ZWriteEnable = video::EZW_OFF;
+		}
+
+		B3dMaterial.Material.Shininess = B3dMaterial.shininess;
+	}
+
+	B3dStack.erase(B3dStack.size() - 1);
+
+	return true;
+}
+
+std::string CB3DMeshFileLoader::readString()
+{
+	std::string newstring = "";
+	while (true) {
+		c8 character;
+		if (B3DFile->read(&character, sizeof(character)) == 0)
+			break; // eof
+		if (character == 0)
+			break;
+		newstring.push_back(character);
+	}
+	return newstring;
+}
+
+void CB3DMeshFileLoader::readFloats(f32 *vec, u32 count)
+{
+	B3DFile->read(vec, count * sizeof(f32));
+#ifdef __BIG_ENDIAN__
+	for (u32 n = 0; n < count; ++n)
+		vec[n] = os::Byteswap::byteswap(vec[n]);
+#endif
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CB3DMeshFileLoader.h b/irr/src/CB3DMeshFileLoader.h
new file mode 100644
index 000000000..808b68170
--- /dev/null
+++ b/irr/src/CB3DMeshFileLoader.h
@@ -0,0 +1,79 @@
+// Copyright (C) 2006-2012 Luke Hoschke
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// B3D Mesh loader
+// File format designed by Mark Sibly for the Blitz3D engine and has been
+// declared public domain
+
+#pragma once
+
+#include "IMeshLoader.h"
+#include "ISceneManager.h"
+#include "CSkinnedMesh.h"
+#include "SB3DStructs.h"
+#include "IReadFile.h"
+
+namespace irr
+{
+
+namespace scene
+{
+
+//! Meshloader for B3D format
+class CB3DMeshFileLoader : public IMeshLoader
+{
+public:
+	//! Constructor
+	CB3DMeshFileLoader(scene::ISceneManager *smgr);
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".bsp")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! creates/loads an animated mesh from the file.
+	//! \return Pointer to the created mesh. Returns 0 if loading failed.
+	//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+	//! See IReferenceCounted::drop() for more information.
+	IAnimatedMesh *createMesh(io::IReadFile *file) override;
+
+private:
+	bool load();
+	bool readChunkNODE(CSkinnedMesh::SJoint *InJoint);
+	bool readChunkMESH(CSkinnedMesh::SJoint *InJoint);
+	bool readChunkVRTS(CSkinnedMesh::SJoint *InJoint);
+	bool readChunkTRIS(scene::SSkinMeshBuffer *MeshBuffer, u32 MeshBufferID, s32 Vertices_Start);
+	bool readChunkBONE(CSkinnedMesh::SJoint *InJoint);
+	bool readChunkKEYS(CSkinnedMesh::SJoint *InJoint);
+	bool readChunkANIM();
+	bool readChunkTEXS();
+	bool readChunkBRUS();
+
+	std::string readString();
+	void readFloats(f32 *vec, u32 count);
+
+	core::array<SB3dChunk> B3dStack;
+
+	core::array<SB3dMaterial> Materials;
+	core::array<SB3dTexture> Textures;
+
+	core::array<s32> AnimatedVertices_VertexID;
+
+	core::array<s32> AnimatedVertices_BufferID;
+
+	core::array<video::S3DVertex2TCoords> BaseVertices;
+
+	CSkinnedMesh *AnimatedMesh;
+	io::IReadFile *B3DFile;
+
+	// B3Ds have Vertex ID's local within the mesh I don't want this
+	//  Variable needs to be class member due to recursion in calls
+	u32 VerticesStart;
+
+	bool NormalsInFile;
+	bool HasVertexColors;
+	bool ShowWarning;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CBillboardSceneNode.cpp b/irr/src/CBillboardSceneNode.cpp
new file mode 100644
index 000000000..ddb9d465a
--- /dev/null
+++ b/irr/src/CBillboardSceneNode.cpp
@@ -0,0 +1,266 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CBillboardSceneNode.h"
+#include "IVideoDriver.h"
+#include "ISceneManager.h"
+#include "ICameraSceneNode.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CBillboardSceneNode::CBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+		const core::vector3df &position, const core::dimension2d<f32> &size,
+		video::SColor colorTop, video::SColor colorBottom) :
+		IBillboardSceneNode(parent, mgr, id, position),
+		Buffer(new SMeshBuffer())
+{
+#ifdef _DEBUG
+	setDebugName("CBillboardSceneNode");
+#endif
+
+	setSize(size);
+
+	Buffer->Vertices.set_used(4);
+	Buffer->Indices.set_used(6);
+
+	Buffer->Indices[0] = 0;
+	Buffer->Indices[1] = 2;
+	Buffer->Indices[2] = 1;
+	Buffer->Indices[3] = 0;
+	Buffer->Indices[4] = 3;
+	Buffer->Indices[5] = 2;
+
+	Buffer->Vertices[0].TCoords.set(1.0f, 1.0f);
+	Buffer->Vertices[0].Color = colorBottom;
+
+	Buffer->Vertices[1].TCoords.set(1.0f, 0.0f);
+	Buffer->Vertices[1].Color = colorTop;
+
+	Buffer->Vertices[2].TCoords.set(0.0f, 0.0f);
+	Buffer->Vertices[2].Color = colorTop;
+
+	Buffer->Vertices[3].TCoords.set(0.0f, 1.0f);
+	Buffer->Vertices[3].Color = colorBottom;
+}
+
+CBillboardSceneNode::~CBillboardSceneNode()
+{
+	Buffer->drop();
+}
+
+//! pre render event
+void CBillboardSceneNode::OnRegisterSceneNode()
+{
+	if (IsVisible)
+		SceneManager->registerNodeForRendering(this);
+
+	ISceneNode::OnRegisterSceneNode();
+}
+
+//! render
+void CBillboardSceneNode::render()
+{
+	video::IVideoDriver *driver = SceneManager->getVideoDriver();
+	ICameraSceneNode *camera = SceneManager->getActiveCamera();
+
+	if (!camera || !driver)
+		return;
+
+	// make billboard look to camera
+	updateMesh(camera);
+
+	driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+	driver->setMaterial(Buffer->Material);
+	driver->drawMeshBuffer(Buffer);
+
+	if (DebugDataVisible & scene::EDS_BBOX) {
+		driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+		video::SMaterial m;
+		m.Lighting = false;
+		driver->setMaterial(m);
+		driver->draw3DBox(BBoxSafe, video::SColor(0, 208, 195, 152));
+	}
+}
+
+void CBillboardSceneNode::updateMesh(const irr::scene::ICameraSceneNode *camera)
+{
+	// billboard looks toward camera
+	core::vector3df pos = getAbsolutePosition();
+
+	core::vector3df campos = camera->getAbsolutePosition();
+	core::vector3df target = camera->getTarget();
+	core::vector3df up = camera->getUpVector();
+	core::vector3df view = target - campos;
+	view.normalize();
+
+	core::vector3df horizontal = up.crossProduct(view);
+	if (horizontal.getLength() == 0) {
+		horizontal.set(up.Y, up.X, up.Z);
+	}
+	horizontal.normalize();
+	core::vector3df topHorizontal = horizontal * 0.5f * TopEdgeWidth;
+	horizontal *= 0.5f * Size.Width;
+
+	// pointing down!
+	core::vector3df vertical = horizontal.crossProduct(view);
+	vertical.normalize();
+	vertical *= 0.5f * Size.Height;
+
+	view *= -1.0f;
+
+	core::array<video::S3DVertex> &vertices = Buffer->Vertices;
+
+	for (s32 i = 0; i < 4; ++i)
+		vertices[i].Normal = view;
+
+	/* Vertices are:
+	2--1
+	|\ |
+	| \|
+	3--0
+	*/
+	vertices[0].Pos = pos + horizontal + vertical;
+	vertices[1].Pos = pos + topHorizontal - vertical;
+	vertices[2].Pos = pos - topHorizontal - vertical;
+	vertices[3].Pos = pos - horizontal + vertical;
+
+	Buffer->setDirty(EBT_VERTEX);
+	Buffer->recalculateBoundingBox();
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CBillboardSceneNode::getBoundingBox() const
+{
+	// Really wrong when scaled (as the node does not scale it's vertices - maybe it should?)
+	return BBoxSafe;
+}
+
+const core::aabbox3d<f32> &CBillboardSceneNode::getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera)
+{
+	updateMesh(camera);
+	return Buffer->BoundingBox;
+}
+
+void CBillboardSceneNode::setSize(const core::dimension2d<f32> &size)
+{
+	Size = size;
+
+	if (core::equals(Size.Width, 0.0f))
+		Size.Width = 1.0f;
+	TopEdgeWidth = Size.Width;
+
+	if (core::equals(Size.Height, 0.0f))
+		Size.Height = 1.0f;
+
+	const f32 extent = 0.5f * sqrtf(Size.Width * Size.Width + Size.Height * Size.Height);
+	BBoxSafe.MinEdge.set(-extent, -extent, -extent);
+	BBoxSafe.MaxEdge.set(extent, extent, extent);
+}
+
+void CBillboardSceneNode::setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth)
+{
+	Size.set(bottomEdgeWidth, height);
+	TopEdgeWidth = topEdgeWidth;
+
+	if (core::equals(Size.Height, 0.0f))
+		Size.Height = 1.0f;
+
+	if (core::equals(Size.Width, 0.f) && core::equals(TopEdgeWidth, 0.f)) {
+		Size.Width = 1.0f;
+		TopEdgeWidth = 1.0f;
+	}
+
+	const f32 extent = 0.5f * sqrtf(Size.Width * Size.Width + Size.Height * Size.Height);
+	BBoxSafe.MinEdge.set(-extent, -extent, -extent);
+	BBoxSafe.MaxEdge.set(extent, extent, extent);
+}
+
+video::SMaterial &CBillboardSceneNode::getMaterial(u32 i)
+{
+	return Buffer->Material;
+}
+
+//! returns amount of materials used by this scene node.
+u32 CBillboardSceneNode::getMaterialCount() const
+{
+	return 1;
+}
+
+//! gets the size of the billboard
+const core::dimension2d<f32> &CBillboardSceneNode::getSize() const
+{
+	return Size;
+}
+
+//! Gets the widths of the top and bottom edges of the billboard.
+void CBillboardSceneNode::getSize(f32 &height, f32 &bottomEdgeWidth,
+		f32 &topEdgeWidth) const
+{
+	height = Size.Height;
+	bottomEdgeWidth = Size.Width;
+	topEdgeWidth = TopEdgeWidth;
+}
+
+//! Set the color of all vertices of the billboard
+//! \param overallColor: the color to set
+void CBillboardSceneNode::setColor(const video::SColor &overallColor)
+{
+	for (u32 vertex = 0; vertex < 4; ++vertex)
+		Buffer->Vertices[vertex].Color = overallColor;
+}
+
+//! Set the color of the top and bottom vertices of the billboard
+//! \param topColor: the color to set the top vertices
+//! \param bottomColor: the color to set the bottom vertices
+void CBillboardSceneNode::setColor(const video::SColor &topColor,
+		const video::SColor &bottomColor)
+{
+	Buffer->Vertices[0].Color = bottomColor;
+	Buffer->Vertices[1].Color = topColor;
+	Buffer->Vertices[2].Color = topColor;
+	Buffer->Vertices[3].Color = bottomColor;
+}
+
+//! Gets the color of the top and bottom vertices of the billboard
+//! \param[out] topColor: stores the color of the top vertices
+//! \param[out] bottomColor: stores the color of the bottom vertices
+void CBillboardSceneNode::getColor(video::SColor &topColor,
+		video::SColor &bottomColor) const
+{
+	bottomColor = Buffer->Vertices[0].Color;
+	topColor = Buffer->Vertices[1].Color;
+}
+
+//! Creates a clone of this scene node and its children.
+ISceneNode *CBillboardSceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CBillboardSceneNode *nb = new CBillboardSceneNode(newParent,
+			newManager, ID, RelativeTranslation, Size);
+
+	nb->cloneMembers(this, newManager);
+	nb->Buffer->Material = Buffer->Material;
+	nb->Size = Size;
+	nb->TopEdgeWidth = this->TopEdgeWidth;
+
+	video::SColor topColor, bottomColor;
+	getColor(topColor, bottomColor);
+	nb->setColor(topColor, bottomColor);
+
+	if (newParent)
+		nb->drop();
+	return nb;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CBillboardSceneNode.h b/irr/src/CBillboardSceneNode.h
new file mode 100644
index 000000000..f0d7f9dcf
--- /dev/null
+++ b/irr/src/CBillboardSceneNode.h
@@ -0,0 +1,113 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IBillboardSceneNode.h"
+#include "SMeshBuffer.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Scene node which is a billboard. A billboard is like a 3d sprite: A 2d element,
+//! which always looks to the camera.
+class CBillboardSceneNode : virtual public IBillboardSceneNode
+{
+public:
+	//! constructor
+	CBillboardSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position, const core::dimension2d<f32> &size,
+			video::SColor colorTop = video::SColor(0xFFFFFFFF),
+			video::SColor colorBottom = video::SColor(0xFFFFFFFF));
+
+	virtual ~CBillboardSceneNode();
+
+	//! pre render event
+	void OnRegisterSceneNode() override;
+
+	//! render
+	void render() override;
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! sets the size of the billboard
+	void setSize(const core::dimension2d<f32> &size) override;
+
+	//! Sets the widths of the top and bottom edges of the billboard independently.
+	void setSize(f32 height, f32 bottomEdgeWidth, f32 topEdgeWidth) override;
+
+	//! gets the size of the billboard
+	const core::dimension2d<f32> &getSize() const override;
+
+	//! Gets the widths of the top and bottom edges of the billboard.
+	void getSize(f32 &height, f32 &bottomEdgeWidth, f32 &topEdgeWidth) const override;
+
+	video::SMaterial &getMaterial(u32 i) override;
+
+	//! returns amount of materials used by this scene node.
+	u32 getMaterialCount() const override;
+
+	//! Set the color of all vertices of the billboard
+	//! \param overallColor: the color to set
+	void setColor(const video::SColor &overallColor) override;
+
+	//! Set the color of the top and bottom vertices of the billboard
+	//! \param topColor: the color to set the top vertices
+	//! \param bottomColor: the color to set the bottom vertices
+	virtual void setColor(const video::SColor &topColor,
+			const video::SColor &bottomColor) override;
+
+	//! Gets the color of the top and bottom vertices of the billboard
+	//! \param[out] topColor: stores the color of the top vertices
+	//! \param[out] bottomColor: stores the color of the bottom vertices
+	virtual void getColor(video::SColor &topColor,
+			video::SColor &bottomColor) const override;
+
+	//! Get the real boundingbox used by the billboard (which depends on the active camera)
+	const core::aabbox3d<f32> &getTransformedBillboardBoundingBox(const irr::scene::ICameraSceneNode *camera) override;
+
+	//! Get the amount of mesh buffers.
+	u32 getMeshBufferCount() const override
+	{
+		return Buffer ? 1 : 0;
+	}
+
+	//! Get pointer to the mesh buffer.
+	IMeshBuffer *getMeshBuffer(u32 nr) const override
+	{
+		if (nr == 0)
+			return Buffer;
+		return 0;
+	}
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_BILLBOARD; }
+
+	//! Creates a clone of this scene node and its children.
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+protected:
+	void updateMesh(const irr::scene::ICameraSceneNode *camera);
+
+private:
+	//! Size.Width is the bottom edge width
+	core::dimension2d<f32> Size;
+	f32 TopEdgeWidth;
+
+	//! BoundingBox which is large enough to contain the billboard independent of the camera
+	// TODO: BUG - still can be wrong with scaling < 1. Billboards should calculate relative coordinates for their mesh
+	// and then use the node-scaling. But needs some work...
+	/** Note that we can't use the real boundingbox for culling because at that point
+		the camera which is used to calculate the billboard is not yet updated. So we only
+		know the real boundingbox after rendering - which is too late for culling. */
+	core::aabbox3d<f32> BBoxSafe;
+
+	scene::SMeshBuffer *Buffer;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CBlit.h b/irr/src/CBlit.h
new file mode 100644
index 000000000..90450ec2f
--- /dev/null
+++ b/irr/src/CBlit.h
@@ -0,0 +1,942 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt / Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SoftwareDriver2_helper.h"
+
+namespace irr
+{
+
+//! f18 - fixpoint 14.18 limit to 16k Textures
+#define CBLIT_USE_FIXPOINT18
+
+#if defined(CBLIT_USE_FIXPOINT18)
+typedef int f18;
+#define f18_one 262144
+#define f18_zero 0
+#define f32_to_f18(x) ((f18)floorf(((x) * 262144.f) + 0.f))
+#define f32_to_f32(x) (x)
+#define f18_floor(x) ((x) >> 18)
+#define f18_round(x) ((x + 131.072) >> 18)
+#else
+typedef float f18;
+#define f18_one 1.f
+#define f18_zero_dot_five 0.5f
+#define f18_zero 0.f
+#define f32_to_f18(x) (x)
+#define f32_to_f32(x) (x)
+#define f18_floor(x) ((int)(x))
+#define f18_round(x) ((int)(x + 0.5f))
+#endif
+
+struct SBlitJob
+{
+	AbsRectangle Dest;
+	AbsRectangle Source;
+
+	u32 argb;
+
+	const void *src;
+	void *dst;
+
+	u32 width; // draw size
+	u32 height;
+
+	u32 srcPixelMul; // pixel byte size
+	u32 dstPixelMul;
+
+	int srcPitch; // scanline byte size. allow negative for mirror
+	u32 dstPitch;
+
+	bool stretch;
+	f32 x_stretch;
+	f32 y_stretch;
+};
+
+// Bitfields Cohen Sutherland
+enum eClipCode
+{
+	CLIPCODE_EMPTY = 0,
+	CLIPCODE_BOTTOM = 1,
+	CLIPCODE_TOP = 2,
+	CLIPCODE_LEFT = 4,
+	CLIPCODE_RIGHT = 8
+};
+
+inline u32 GetClipCode(const AbsRectangle &r, const core::position2d<s32> &p)
+{
+	u32 code = CLIPCODE_EMPTY;
+
+	if (p.X < r.x0)
+		code = CLIPCODE_LEFT;
+	else if (p.X > r.x1)
+		code = CLIPCODE_RIGHT;
+
+	if (p.Y < r.y0)
+		code |= CLIPCODE_TOP;
+	else if (p.Y > r.y1)
+		code |= CLIPCODE_BOTTOM;
+
+	return code;
+}
+
+/*
+ */
+inline void GetClip(AbsRectangle &clipping, video::IImage *t)
+{
+	clipping.x0 = 0;
+	clipping.y0 = 0;
+	clipping.x1 = t->getDimension().Width - 1;
+	clipping.y1 = t->getDimension().Height - 1;
+}
+
+/*
+	return alpha in [0;256] Granularity from 32-Bit ARGB
+	add highbit alpha ( alpha > 127 ? + 1 )
+*/
+static inline u32 extractAlpha(const u32 c)
+{
+	return (c >> 24) + (c >> 31);
+}
+
+/*
+	return alpha in [0;255] Granularity and 32-Bit ARGB
+	add highbit alpha ( alpha > 127 ? + 1 )
+*/
+static inline u32 packAlpha(const u32 c)
+{
+	return (c > 127 ? c - 1 : c) << 24;
+}
+
+/*!
+	Scale Color by (1/value)
+	value 0 - 256 ( alpha )
+*/
+inline u32 PixelLerp32(const u32 source, const u32 value)
+{
+	u32 srcRB = source & 0x00FF00FF;
+	u32 srcXG = (source & 0xFF00FF00) >> 8;
+
+	srcRB *= value;
+	srcXG *= value;
+
+	srcRB >>= 8;
+	// srcXG >>= 8;
+
+	srcXG &= 0xFF00FF00;
+	srcRB &= 0x00FF00FF;
+
+	return srcRB | srcXG;
+}
+
+/*!
+ */
+static void executeBlit_TextureCopy_x_to_x(const SBlitJob *job)
+{
+	if (job->stretch) {
+		const f18 wscale = f32_to_f18(job->x_stretch);
+		const f18 hscale = f32_to_f18(job->y_stretch);
+
+		f18 src_y = f18_zero;
+
+		if (job->srcPixelMul == 4) {
+			const u32 *src = (u32 *)(job->src);
+			u32 *dst = (u32 *)(job->dst);
+
+			for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+				src = (u32 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+
+				f18 src_x = f18_zero;
+				for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+					dst[dx] = src[f18_floor(src_x)];
+				}
+				dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+			}
+		} else if (job->srcPixelMul == 2) {
+			const u16 *src = (u16 *)(job->src);
+			u16 *dst = (u16 *)(job->dst);
+
+			for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+				src = (u16 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+
+				f18 src_x = f18_zero;
+				for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+					dst[dx] = src[f18_floor(src_x)];
+				}
+				dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+			}
+		}
+	} else {
+		const size_t widthPitch = job->width * job->dstPixelMul;
+		const void *src = (void *)job->src;
+		void *dst = (void *)job->dst;
+
+		for (u32 dy = 0; dy < job->height; ++dy) {
+			memcpy(dst, src, widthPitch);
+
+			src = (void *)((u8 *)(src) + job->srcPitch);
+			dst = (void *)((u8 *)(dst) + job->dstPitch);
+		}
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureCopy_32_to_16(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u32 *src = static_cast<const u32 *>(job->src);
+	u16 *dst = static_cast<u16 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u32 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = (u32)(dx * wscale);
+				// 16 bit Blitter depends on pre-multiplied color
+				const u32 s = PixelLerp32(src[src_x] | 0xFF000000, extractAlpha(src[src_x]));
+				dst[dx] = video::A8R8G8B8toA1R5G5B5(s);
+			}
+			dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				// 16 bit Blitter depends on pre-multiplied color
+				const u32 s = PixelLerp32(src[dx] | 0xFF000000, extractAlpha(src[dx]));
+				dst[dx] = video::A8R8G8B8toA1R5G5B5(s);
+			}
+
+			src = (u32 *)((u8 *)(src) + job->srcPitch);
+			dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+		}
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureCopy_24_to_16(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u8 *src = static_cast<const u8 *>(job->src);
+	u16 *dst = static_cast<u16 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch * 3.f;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u8 *)(job->src) + job->srcPitch * src_y;
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u8 *src_x = src + (u32)(dx * wscale);
+				dst[dx] = video::RGBA16(src_x[0], src_x[1], src_x[2]);
+			}
+			dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			const u8 *s = src;
+			for (u32 dx = 0; dx != w; ++dx) {
+				dst[dx] = video::RGBA16(s[0], s[1], s[2]);
+				s += 3;
+			}
+
+			src = src + job->srcPitch;
+			dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+		}
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureCopy_16_to_32(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u16 *src = static_cast<const u16 *>(job->src);
+	u32 *dst = static_cast<u32 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u16 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = (u32)(dx * wscale);
+				dst[dx] = video::A1R5G5B5toA8R8G8B8(src[src_x]);
+			}
+			dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				dst[dx] = video::A1R5G5B5toA8R8G8B8(src[dx]);
+			}
+
+			src = (u16 *)((u8 *)(src) + job->srcPitch);
+			dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+		}
+	}
+}
+
+static void executeBlit_TextureCopy_16_to_24(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u16 *src = static_cast<const u16 *>(job->src);
+	u8 *dst = static_cast<u8 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u16 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = (u32)(dx * wscale);
+				u32 color = video::A1R5G5B5toA8R8G8B8(src[src_x]);
+				u8 *writeTo = &dst[dx * 3];
+				*writeTo++ = (color >> 16) & 0xFF;
+				*writeTo++ = (color >> 8) & 0xFF;
+				*writeTo++ = color & 0xFF;
+			}
+			dst += job->dstPitch;
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				u32 color = video::A1R5G5B5toA8R8G8B8(src[dx]);
+				u8 *writeTo = &dst[dx * 3];
+				*writeTo++ = (color >> 16) & 0xFF;
+				*writeTo++ = (color >> 8) & 0xFF;
+				*writeTo++ = color & 0xFF;
+			}
+
+			src = (u16 *)((u8 *)(src) + job->srcPitch);
+			dst += job->dstPitch;
+		}
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureCopy_24_to_32(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u8 *src = static_cast<const u8 *>(job->src);
+	u32 *dst = static_cast<u32 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch * 3.f;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (const u8 *)job->src + (job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u8 *s = src + (u32)(dx * wscale);
+				dst[dx] = 0xFF000000 | s[0] << 16 | s[1] << 8 | s[2];
+			}
+			dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+		}
+	} else {
+		for (u32 dy = 0; dy < job->height; ++dy) {
+			const u8 *s = src;
+
+			for (u32 dx = 0; dx < job->width; ++dx) {
+				dst[dx] = 0xFF000000 | s[0] << 16 | s[1] << 8 | s[2];
+				s += 3;
+			}
+
+			src = src + job->srcPitch;
+			dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+		}
+	}
+}
+
+static void executeBlit_TextureCopy_32_to_24(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u32 *src = static_cast<const u32 *>(job->src);
+	u8 *dst = static_cast<u8 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u32 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = src[(u32)(dx * wscale)];
+				u8 *writeTo = &dst[dx * 3];
+				*writeTo++ = (src_x >> 16) & 0xFF;
+				*writeTo++ = (src_x >> 8) & 0xFF;
+				*writeTo++ = src_x & 0xFF;
+			}
+			dst += job->dstPitch;
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				u8 *writeTo = &dst[dx * 3];
+				*writeTo++ = (src[dx] >> 16) & 0xFF;
+				*writeTo++ = (src[dx] >> 8) & 0xFF;
+				*writeTo++ = src[dx] & 0xFF;
+			}
+
+			src = (u32 *)((u8 *)(src) + job->srcPitch);
+			dst += job->dstPitch;
+		}
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureBlend_16_to_16(const SBlitJob *job)
+{
+	const f18 wscale = f32_to_f18(job->x_stretch);
+	const f18 hscale = f32_to_f18(job->y_stretch);
+
+	f18 src_y = f18_zero;
+	u16 *dst = (u16 *)job->dst;
+
+	for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+		const u16 *src = (u16 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+		f18 src_x = f18_zero;
+		for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+			dst[dx] = PixelBlend16(dst[dx], src[f18_floor(src_x)]);
+		}
+		dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureBlend_32_to_32(const SBlitJob *job)
+{
+	const f18 wscale = f32_to_f18(job->x_stretch);
+	const f18 hscale = f32_to_f18(job->y_stretch);
+
+	f18 src_y = f18_zero;
+	u32 *dst = (u32 *)job->dst;
+	for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+		const u32 *src = (u32 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+
+		f18 src_x = f18_zero;
+		for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+			dst[dx] = PixelBlend32(dst[dx], src[f18_floor(src_x)]);
+		}
+		dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureBlendColor_16_to_16(const SBlitJob *job)
+{
+	const u16 blend = video::A8R8G8B8toA1R5G5B5(job->argb);
+
+	const f18 wscale = f32_to_f18(job->x_stretch);
+	const f18 hscale = f32_to_f18(job->y_stretch);
+
+	f18 src_y = f18_zero;
+	u16 *dst = (u16 *)job->dst;
+	for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+		const u16 *src = (u16 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+		f18 src_x = f18_zero;
+		for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+			u16 c0 = src[f18_floor(src_x)];
+			if (0 == (c0 & 0x8000))
+				continue;
+
+			dst[dx] = PixelMul16_2(c0, blend);
+		}
+		dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_TextureBlendColor_32_to_32(const SBlitJob *job)
+{
+	const f18 wscale = f32_to_f18(job->x_stretch);
+	const f18 hscale = f32_to_f18(job->y_stretch);
+
+	u32 *dst = (u32 *)job->dst;
+	f18 src_y = f18_zero;
+	for (u32 dy = 0; dy < job->height; ++dy, src_y += hscale) {
+		const u32 *src = (u32 *)((u8 *)(job->src) + job->srcPitch * f18_floor(src_y));
+
+		f18 src_x = f18_zero;
+		for (u32 dx = 0; dx < job->width; ++dx, src_x += wscale) {
+			dst[dx] = PixelBlend32(dst[dx], PixelMul32_2(src[f18_floor(src_x)], job->argb));
+		}
+		dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_Color_16_to_16(const SBlitJob *job)
+{
+	const u16 c = video::A8R8G8B8toA1R5G5B5(job->argb);
+	u16 *dst = (u16 *)job->dst;
+
+	for (u32 dy = 0; dy < job->height; ++dy) {
+		memset16(dst, c, job->srcPitch);
+		dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_Color_32_to_32(const SBlitJob *job)
+{
+	u32 *dst = (u32 *)job->dst;
+
+	for (u32 dy = 0; dy < job->height; ++dy) {
+		memset32(dst, job->argb, job->srcPitch);
+		dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_ColorAlpha_16_to_16(const SBlitJob *job)
+{
+	u16 *dst = (u16 *)job->dst;
+
+	const u16 alpha = extractAlpha(job->argb) >> 3;
+	if (0 == alpha)
+		return;
+	const u32 src = video::A8R8G8B8toA1R5G5B5(job->argb);
+
+	for (u32 dy = 0; dy != job->height; ++dy) {
+		for (u32 dx = 0; dx != job->width; ++dx) {
+			dst[dx] = PixelBlend16(dst[dx], src, alpha);
+		}
+		dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+ */
+static void executeBlit_ColorAlpha_32_to_32(const SBlitJob *job)
+{
+	const u32 alpha = extractAlpha(job->argb);
+	if (0 == alpha)
+		return;
+
+	u32 *dst = (u32 *)job->dst;
+	for (u32 dy = 0; dy < job->height; ++dy) {
+		for (u32 dx = 0; dx < job->width; ++dx) {
+			dst[dx] = PixelBlend32(dst[dx], job->argb, alpha);
+		}
+		dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+	Pixel =>
+			color = sourceAlpha > 0 ? source, else dest
+			alpha = max(destAlpha, sourceAlpha)
+*/
+inline u16 PixelCombine16(const u16 c2, const u16 c1)
+{
+	if (video::getAlpha(c1) > 0)
+		return c1;
+	else
+		return c2;
+}
+
+/*!
+	Combine alpha channels (increases alpha / reduces transparency)
+*/
+static void executeBlit_TextureCombineColor_16_to_16(const SBlitJob *job)
+{
+	const u32 w = job->width * 2;
+	const u32 h = job->height * 2;
+	u16 *src = (u16 *)job->src;
+	u16 *dst = (u16 *)job->dst;
+
+	const u16 jobColor = video::A8R8G8B8toA1R5G5B5(job->argb);
+
+	/*
+		Stretch not supported.
+	*/
+	for (u32 dy = 0; dy != h; dy++) {
+		for (u32 dx = 0; dx != w; dx++) {
+			const u16 src_x = src[dx];
+			const u16 dst_x = dst[dx];
+			dst[dx] = PixelCombine16(dst_x, PixelMul16_2(src_x, jobColor));
+		}
+		src = (u16 *)((u8 *)(src) + job->srcPitch);
+		dst = (u16 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+/*!
+	Combine alpha channels (increases alpha / reduces transparency)
+*/
+static void executeBlit_TextureCombineColor_16_to_24(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u16 *src = static_cast<const u16 *>(job->src);
+	u8 *dst = static_cast<u8 *>(job->dst);
+
+	const u16 jobColor = video::A8R8G8B8toA1R5G5B5(job->argb);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u16 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = (u32)(dx * wscale);
+				u32 color = PixelMul16_2(video::A1R5G5B5toA8R8G8B8(src[src_x]), jobColor);
+				u8 *writeTo = &dst[dx * 3];
+				if (video::getAlpha(src[src_x]) > 0) { // only overlay if source has visible alpha (alpha == 1)
+					*writeTo++ = (color >> 16) & 0xFF;
+					*writeTo++ = (color >> 8) & 0xFF;
+					*writeTo++ = color & 0xFF;
+				}
+			}
+			dst += job->dstPitch;
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				u32 color = PixelMul16_2(video::A1R5G5B5toA8R8G8B8(src[dx]), jobColor);
+				u8 *writeTo = &dst[dx * 3];
+				if (video::getAlpha(src[dx]) > 0) { // only overlay if source has visible alpha (alpha == 1)
+					*writeTo++ = (color >> 16) & 0xFF;
+					*writeTo++ = (color >> 8) & 0xFF;
+					*writeTo++ = color & 0xFF;
+				}
+			}
+
+			src = (u16 *)((u8 *)(src) + job->srcPitch);
+			dst += job->dstPitch;
+		}
+	}
+}
+
+/*!
+	Pixel =>
+			color = dest * ( 1 - SourceAlpha ) + source * SourceAlpha,
+			alpha = destAlpha * ( 1 - SourceAlpha ) + sourceAlpha
+
+	where "1" means "full scale" (255)
+*/
+inline u32 PixelCombine32(const u32 c2, const u32 c1)
+{
+	// alpha test
+	u32 alpha = c1 & 0xFF000000;
+
+	if (0 == alpha)
+		return c2;
+	if (0xFF000000 == alpha) {
+		return c1;
+	}
+
+	alpha >>= 24;
+
+	// add highbit alpha, if ( alpha > 127 ) alpha += 1;
+	// stretches [0;255] to [0;256] to avoid division by 255. use division 256 == shr 8
+	alpha += (alpha >> 7);
+
+	u32 srcRB = c1 & 0x00FF00FF;
+	u32 srcXG = c1 & 0x0000FF00;
+
+	u32 dstRB = c2 & 0x00FF00FF;
+	u32 dstXG = c2 & 0x0000FF00;
+
+	u32 rb = srcRB - dstRB;
+	u32 xg = srcXG - dstXG;
+
+	rb *= alpha;
+	xg *= alpha;
+	rb >>= 8;
+	xg >>= 8;
+
+	rb += dstRB;
+	xg += dstXG;
+
+	rb &= 0x00FF00FF;
+	xg &= 0x0000FF00;
+
+	u32 sa = c1 >> 24;
+	u32 da = c2 >> 24;
+	u32 blendAlpha_fix8 = (sa * 256 + da * (256 - alpha)) >> 8;
+	return blendAlpha_fix8 << 24 | rb | xg;
+}
+
+/*!
+	Combine alpha channels (increases alpha / reduces transparency)
+	Destination alpha is treated as full 255
+*/
+static void executeBlit_TextureCombineColor_32_to_24(const SBlitJob *job)
+{
+	const u32 w = job->width;
+	const u32 h = job->height;
+	const u32 *src = static_cast<const u32 *>(job->src);
+	u8 *dst = static_cast<u8 *>(job->dst);
+
+	if (job->stretch) {
+		const float wscale = job->x_stretch;
+		const float hscale = job->y_stretch;
+
+		for (u32 dy = 0; dy < h; ++dy) {
+			const u32 src_y = (u32)(dy * hscale);
+			src = (u32 *)((u8 *)(job->src) + job->srcPitch * src_y);
+
+			for (u32 dx = 0; dx < w; ++dx) {
+				const u32 src_x = src[(u32)(dx * wscale)];
+				u8 *writeTo = &dst[dx * 3];
+				const u32 dst_x = 0xFF000000 | writeTo[0] << 16 | writeTo[1] << 8 | writeTo[2];
+				const u32 combo = PixelCombine32(dst_x, PixelMul32_2(src_x, job->argb));
+				*writeTo++ = (combo >> 16) & 0xFF;
+				*writeTo++ = (combo >> 8) & 0xFF;
+				*writeTo++ = combo & 0xFF;
+			}
+			dst += job->dstPitch;
+		}
+	} else {
+		for (u32 dy = 0; dy != h; ++dy) {
+			for (u32 dx = 0; dx != w; ++dx) {
+				u8 *writeTo = &dst[dx * 3];
+				const u32 dst_x = 0xFF000000 | writeTo[0] << 16 | writeTo[1] << 8 | writeTo[2];
+				const u32 combo = PixelCombine32(dst_x, PixelMul32_2(src[dx], job->argb));
+				*writeTo++ = (combo >> 16) & 0xFF;
+				*writeTo++ = (combo >> 8) & 0xFF;
+				*writeTo++ = combo & 0xFF;
+			}
+
+			src = (u32 *)((u8 *)(src) + job->srcPitch);
+			dst += job->dstPitch;
+		}
+	}
+}
+
+/*!
+	Combine alpha channels (increases alpha / reduces transparency)
+*/
+static void executeBlit_TextureCombineColor_32_to_32(const SBlitJob *job)
+{
+	u32 *src = (u32 *)job->src;
+	u32 *dst = (u32 *)job->dst;
+
+	for (u32 dy = 0; dy != job->height; ++dy) {
+		for (u32 dx = 0; dx != job->width; ++dx) {
+			dst[dx] = PixelCombine32(dst[dx], PixelMul32_2(src[dx], job->argb));
+		}
+		src = (u32 *)((u8 *)(src) + job->srcPitch);
+		dst = (u32 *)((u8 *)(dst) + job->dstPitch);
+	}
+}
+
+// Blitter Operation
+enum eBlitter
+{
+	BLITTER_INVALID = 0,
+	BLITTER_COLOR,
+	BLITTER_COLOR_ALPHA,
+	BLITTER_TEXTURE,
+	BLITTER_TEXTURE_ALPHA_BLEND,
+	BLITTER_TEXTURE_ALPHA_COLOR_BLEND,
+	BLITTER_TEXTURE_COMBINE_ALPHA,
+};
+
+typedef void (*tExecuteBlit)(const SBlitJob *job);
+
+/*!
+ */
+struct blitterTable
+{
+	eBlitter operation;
+	s32 destFormat;
+	s32 sourceFormat;
+	tExecuteBlit func;
+};
+
+static const blitterTable blitTable[] = {
+		{BLITTER_TEXTURE,                   -2,                  -2,                  executeBlit_TextureCopy_x_to_x},
+		{BLITTER_TEXTURE,                   video::ECF_A1R5G5B5, video::ECF_A8R8G8B8, executeBlit_TextureCopy_32_to_16},
+		{BLITTER_TEXTURE,                   video::ECF_A1R5G5B5, video::ECF_R8G8B8,   executeBlit_TextureCopy_24_to_16},
+		{BLITTER_TEXTURE,                   video::ECF_A8R8G8B8, video::ECF_A1R5G5B5, executeBlit_TextureCopy_16_to_32},
+		{BLITTER_TEXTURE,                   video::ECF_A8R8G8B8, video::ECF_R8G8B8,   executeBlit_TextureCopy_24_to_32},
+		{BLITTER_TEXTURE,                   video::ECF_R8G8B8,   video::ECF_A1R5G5B5, executeBlit_TextureCopy_16_to_24},
+		{BLITTER_TEXTURE,                   video::ECF_R8G8B8,   video::ECF_A8R8G8B8, executeBlit_TextureCopy_32_to_24},
+		{BLITTER_TEXTURE_ALPHA_BLEND,       video::ECF_A1R5G5B5, video::ECF_A1R5G5B5, executeBlit_TextureBlend_16_to_16},
+		{BLITTER_TEXTURE_ALPHA_BLEND,       video::ECF_A8R8G8B8, video::ECF_A8R8G8B8, executeBlit_TextureBlend_32_to_32},
+		{BLITTER_TEXTURE_ALPHA_COLOR_BLEND, video::ECF_A1R5G5B5, video::ECF_A1R5G5B5, executeBlit_TextureBlendColor_16_to_16},
+		{BLITTER_TEXTURE_ALPHA_COLOR_BLEND, video::ECF_A8R8G8B8, video::ECF_A8R8G8B8, executeBlit_TextureBlendColor_32_to_32},
+		{BLITTER_COLOR,                     video::ECF_A1R5G5B5, -1,                  executeBlit_Color_16_to_16},
+		{BLITTER_COLOR,                     video::ECF_A8R8G8B8, -1,                  executeBlit_Color_32_to_32},
+		{BLITTER_COLOR_ALPHA,               video::ECF_A1R5G5B5, -1,                  executeBlit_ColorAlpha_16_to_16},
+		{BLITTER_COLOR_ALPHA,               video::ECF_A8R8G8B8, -1,                  executeBlit_ColorAlpha_32_to_32},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_A8R8G8B8, video::ECF_A8R8G8B8, executeBlit_TextureCombineColor_32_to_32},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_A8R8G8B8, video::ECF_R8G8B8,   executeBlit_TextureCopy_24_to_32},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_R8G8B8,   video::ECF_A8R8G8B8, executeBlit_TextureCombineColor_32_to_24},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_R8G8B8,   video::ECF_R8G8B8,   executeBlit_TextureCopy_x_to_x},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_A1R5G5B5, video::ECF_R8G8B8,   executeBlit_TextureCopy_24_to_16},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_A1R5G5B5, video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_16},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_A1R5G5B5, video::ECF_R8G8B8,   executeBlit_TextureCopy_24_to_16},
+		{BLITTER_TEXTURE_COMBINE_ALPHA,     video::ECF_R8G8B8,   video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_24},
+		{BLITTER_INVALID,                   -1,                  -1,                  0},
+	};
+
+static inline tExecuteBlit getBlitter2(eBlitter operation, const video::IImage *dest, const video::IImage *source)
+{
+	video::ECOLOR_FORMAT sourceFormat = (video::ECOLOR_FORMAT)(source ? source->getColorFormat() : -1);
+	video::ECOLOR_FORMAT destFormat = (video::ECOLOR_FORMAT)(dest ? dest->getColorFormat() : -1);
+
+	const blitterTable *b = blitTable;
+
+	while (b->operation != BLITTER_INVALID) {
+		if (b->operation == operation) {
+			if ((b->destFormat == -1 || b->destFormat == destFormat) &&
+					(b->sourceFormat == -1 || b->sourceFormat == sourceFormat))
+				return b->func;
+			else if (b->destFormat == -2 && (sourceFormat == destFormat))
+				return b->func;
+		}
+		b += 1;
+	}
+	return 0;
+}
+
+// bounce clipping to texture
+inline void setClip(AbsRectangle &out, const core::rect<s32> *clip,
+		const video::IImage *tex, s32 passnative, const core::dimension2d<u32> *tex_org)
+{
+	if (0 == tex) {
+		if (clip && passnative) {
+			out.x0 = clip->UpperLeftCorner.X;
+			out.x1 = clip->LowerRightCorner.X;
+			out.y0 = clip->UpperLeftCorner.Y;
+			out.y1 = clip->LowerRightCorner.Y;
+		} else {
+			out.x0 = 0;
+			out.x1 = 0;
+			out.y0 = 0;
+			out.y1 = 0;
+		}
+		return;
+	}
+
+	const s32 w = tex->getDimension().Width;
+	const s32 h = tex->getDimension().Height;
+
+	// driver could have changed texture size.
+	if (clip && tex_org && ((u32)w != tex_org->Width || (u32)h != tex_org->Height)) {
+		out.x0 = core::s32_clamp((clip->UpperLeftCorner.X * w) / tex_org->Width, 0, w - 1);
+		out.x1 = core::s32_clamp((clip->LowerRightCorner.X * w) / tex_org->Width, out.x0, w);
+		out.y0 = core::s32_clamp((clip->UpperLeftCorner.Y * h) / tex_org->Height, 0, h - 1);
+		out.y1 = core::s32_clamp((clip->LowerRightCorner.Y * h) / tex_org->Height, out.y0, h);
+	} else if (clip) {
+		// y-1 to prevent starting on illegal memory (not ideal!).
+		out.x0 = core::s32_clamp(clip->UpperLeftCorner.X, 0, w - 1);
+		out.x1 = core::s32_clamp(clip->LowerRightCorner.X, passnative ? 0 : out.x0, w);
+		out.y0 = core::s32_clamp(clip->UpperLeftCorner.Y, 0, h - 1);
+		out.y1 = core::s32_clamp(clip->LowerRightCorner.Y, passnative ? 0 : out.y0, h);
+	} else {
+		out.x0 = 0;
+		out.y0 = 0;
+		out.x1 = w;
+		out.y1 = h;
+	}
+}
+
+/*!
+	a generic 2D Blitter
+*/
+static s32 Blit(eBlitter operation,
+		video::IImage *dest,
+		const core::rect<s32> *destClipping,
+		const core::position2d<s32> *destPos,
+		video::IImage *const source,
+		const core::rect<s32> *sourceClipping,
+		u32 argb)
+{
+	tExecuteBlit blitter = getBlitter2(operation, dest, source);
+	if (0 == blitter) {
+		return 0;
+	}
+
+	// Clipping
+	AbsRectangle sourceClip;
+	AbsRectangle destClip;
+	AbsRectangle v;
+
+	SBlitJob job;
+
+	setClip(sourceClip, sourceClipping, source, 1, 0);
+	setClip(destClip, destClipping, dest, 0, 0);
+
+	v.x0 = destPos ? destPos->X : 0;
+	v.y0 = destPos ? destPos->Y : 0;
+	v.x1 = v.x0 + (sourceClip.x1 - sourceClip.x0);
+	v.y1 = v.y0 + (sourceClip.y1 - sourceClip.y0);
+
+	if (!intersect(job.Dest, destClip, v))
+		return 0;
+
+	job.width = job.Dest.x1 - job.Dest.x0;
+	job.height = job.Dest.y1 - job.Dest.y0;
+
+	job.Source.x0 = sourceClip.x0 + (job.Dest.x0 - v.x0);
+	job.Source.x1 = job.Source.x0 + job.width;
+	job.Source.y0 = sourceClip.y0 + (job.Dest.y0 - v.y0);
+	job.Source.y1 = job.Source.y0 + job.height;
+
+	job.argb = argb;
+
+	job.stretch = false;
+	job.x_stretch = 1.f;
+	job.y_stretch = 1.f;
+
+	if (source) {
+		job.srcPitch = source->getPitch();
+		job.srcPixelMul = source->getBytesPerPixel();
+		job.src = (void *)((u8 *)source->getData() + (job.Source.y0 * job.srcPitch) + (job.Source.x0 * job.srcPixelMul));
+	} else {
+		// use srcPitch for color operation on dest
+		job.srcPitch = job.width * dest->getBytesPerPixel();
+	}
+
+	job.dstPitch = dest->getPitch();
+	job.dstPixelMul = dest->getBytesPerPixel();
+	job.dst = (void *)((u8 *)dest->getData() + (job.Dest.y0 * job.dstPitch) + (job.Dest.x0 * job.dstPixelMul));
+
+	blitter(&job);
+
+	return 1;
+}
+
+}
diff --git a/irr/src/CBoneSceneNode.cpp b/irr/src/CBoneSceneNode.cpp
new file mode 100644
index 000000000..b9eb8892e
--- /dev/null
+++ b/irr/src/CBoneSceneNode.cpp
@@ -0,0 +1,89 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CBoneSceneNode.h"
+
+#include <optional>
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CBoneSceneNode::CBoneSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+		u32 boneIndex, const std::optional<std::string> &boneName) :
+		IBoneSceneNode(parent, mgr, id),
+		BoneIndex(boneIndex),
+		AnimationMode(EBAM_AUTOMATIC), SkinningSpace(EBSS_LOCAL)
+{
+#ifdef _DEBUG
+	setDebugName("CBoneSceneNode");
+#endif
+	setName(boneName);
+}
+
+//! Returns the index of the bone
+u32 CBoneSceneNode::getBoneIndex() const
+{
+	return BoneIndex;
+}
+
+//! Sets the animation mode of the bone. Returns true if successful.
+bool CBoneSceneNode::setAnimationMode(E_BONE_ANIMATION_MODE mode)
+{
+	AnimationMode = mode;
+	return true;
+}
+
+//! Gets the current animation mode of the bone
+E_BONE_ANIMATION_MODE CBoneSceneNode::getAnimationMode() const
+{
+	return AnimationMode;
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CBoneSceneNode::getBoundingBox() const
+{
+	return Box;
+}
+
+/*
+//! Returns the relative transformation of the scene node.
+core::matrix4 CBoneSceneNode::getRelativeTransformation() const
+{
+	return core::matrix4(); // RelativeTransformation;
+}
+*/
+
+void CBoneSceneNode::OnAnimate(u32 timeMs)
+{
+	if (IsVisible) {
+		// update absolute position
+		// updateAbsolutePosition();
+
+		// perform the post render process on all children
+		ISceneNodeList::iterator it = Children.begin();
+		for (; it != Children.end(); ++it)
+			(*it)->OnAnimate(timeMs);
+	}
+}
+
+void CBoneSceneNode::helper_updateAbsolutePositionOfAllChildren(ISceneNode *Node)
+{
+	Node->updateAbsolutePosition();
+
+	ISceneNodeList::const_iterator it = Node->getChildren().begin();
+	for (; it != Node->getChildren().end(); ++it) {
+		helper_updateAbsolutePositionOfAllChildren((*it));
+	}
+}
+
+void CBoneSceneNode::updateAbsolutePositionOfAllChildren()
+{
+	helper_updateAbsolutePositionOfAllChildren(this);
+}
+
+} // namespace scene
+} // namespace irr
diff --git a/irr/src/CBoneSceneNode.h b/irr/src/CBoneSceneNode.h
new file mode 100644
index 000000000..8e1a0f7a1
--- /dev/null
+++ b/irr/src/CBoneSceneNode.h
@@ -0,0 +1,70 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+// Used with SkinnedMesh and IAnimatedMeshSceneNode, for boned meshes
+
+#include "IBoneSceneNode.h"
+
+#include <optional>
+
+namespace irr
+{
+namespace scene
+{
+
+class CBoneSceneNode : public IBoneSceneNode
+{
+public:
+	//! constructor
+	CBoneSceneNode(ISceneNode *parent, ISceneManager *mgr,
+			s32 id = -1, u32 boneIndex = 0,
+			const std::optional<std::string> &boneName = std::nullopt);
+
+	//! Returns the index of the bone
+	u32 getBoneIndex() const override;
+
+	//! Sets the animation mode of the bone. Returns true if successful.
+	bool setAnimationMode(E_BONE_ANIMATION_MODE mode) override;
+
+	//! Gets the current animation mode of the bone
+	E_BONE_ANIMATION_MODE getAnimationMode() const override;
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	/*
+	//! Returns the relative transformation of the scene node.
+	//core::matrix4 getRelativeTransformation() const override;
+	*/
+
+	void OnAnimate(u32 timeMs) override;
+
+	void updateAbsolutePositionOfAllChildren() override;
+
+	//! How the relative transformation of the bone is used
+	void setSkinningSpace(E_BONE_SKINNING_SPACE space) override
+	{
+		SkinningSpace = space;
+	}
+
+	E_BONE_SKINNING_SPACE getSkinningSpace() const override
+	{
+		return SkinningSpace;
+	}
+
+private:
+	void helper_updateAbsolutePositionOfAllChildren(ISceneNode *Node);
+
+	u32 BoneIndex;
+
+	core::aabbox3d<f32> Box;
+
+	E_BONE_ANIMATION_MODE AnimationMode;
+	E_BONE_SKINNING_SPACE SkinningSpace;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CCameraSceneNode.cpp b/irr/src/CCameraSceneNode.cpp
new file mode 100644
index 000000000..f8899e5ff
--- /dev/null
+++ b/irr/src/CCameraSceneNode.cpp
@@ -0,0 +1,314 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CCameraSceneNode.h"
+#include "ISceneManager.h"
+#include "IVideoDriver.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CCameraSceneNode::CCameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+		const core::vector3df &position, const core::vector3df &lookat) :
+		ICameraSceneNode(parent, mgr, id, position),
+		BoundingBox(core::vector3df(0, 0, 0)), // Camera has no size. Still not sure if FLT_MAX might be the better variant
+		Target(lookat), UpVector(0.0f, 1.0f, 0.0f), ZNear(1.0f), ZFar(3000.0f),
+		InputReceiverEnabled(true), TargetAndRotationAreBound(false)
+{
+#ifdef _DEBUG
+	setDebugName("CCameraSceneNode");
+#endif
+
+	// set default projection
+	Fovy = core::PI / 2.5f; // Field of view, in radians.
+	Aspect = 4.0f / 3.0f;   // Aspect ratio.
+
+	const video::IVideoDriver *const d = mgr ? mgr->getVideoDriver() : 0;
+	if (d) {
+		if (d->getCurrentRenderTargetSize().Height)
+			Aspect = (f32)d->getCurrentRenderTargetSize().Width /
+					 (f32)d->getCurrentRenderTargetSize().Height;
+	}
+
+	ViewArea.setFarNearDistance(ZFar - ZNear);
+	recalculateProjectionMatrix();
+	recalculateViewArea();
+}
+
+//! Disables or enables the camera to get key or mouse inputs.
+void CCameraSceneNode::setInputReceiverEnabled(bool enabled)
+{
+	InputReceiverEnabled = enabled;
+}
+
+//! Returns if the input receiver of the camera is currently enabled.
+bool CCameraSceneNode::isInputReceiverEnabled() const
+{
+	return InputReceiverEnabled;
+}
+
+//! Sets the projection matrix of the camera.
+/** The core::matrix4 class has some methods
+to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH
+\param projection: The new projection matrix of the camera. */
+void CCameraSceneNode::setProjectionMatrix(const core::matrix4 &projection, bool isOrthogonal)
+{
+	IsOrthogonal = isOrthogonal;
+	ViewArea.getTransform(video::ETS_PROJECTION) = projection;
+}
+
+//! Gets the current projection matrix of the camera
+//! \return Returns the current projection matrix of the camera.
+const core::matrix4 &CCameraSceneNode::getProjectionMatrix() const
+{
+	return ViewArea.getTransform(video::ETS_PROJECTION);
+}
+
+//! Gets the current view matrix of the camera
+//! \return Returns the current view matrix of the camera.
+const core::matrix4 &CCameraSceneNode::getViewMatrix() const
+{
+	return ViewArea.getTransform(video::ETS_VIEW);
+}
+
+//! Sets a custom view matrix affector. The matrix passed here, will be
+//! multiplied with the view matrix when it gets updated.
+//! This allows for custom camera setups like, for example, a reflection camera.
+/** \param affector: The affector matrix. */
+void CCameraSceneNode::setViewMatrixAffector(const core::matrix4 &affector)
+{
+	Affector = affector;
+}
+
+//! Gets the custom view matrix affector.
+const core::matrix4 &CCameraSceneNode::getViewMatrixAffector() const
+{
+	return Affector;
+}
+
+//! It is possible to send mouse and key events to the camera. Most cameras
+//! may ignore this input, but camera scene nodes which are created for
+//! example with scene::ISceneManager::addMayaCameraSceneNode or
+//! scene::ISceneManager::addFPSCameraSceneNode, may want to get this input
+//! for changing their position, look at target or whatever.
+bool CCameraSceneNode::OnEvent(const SEvent &event)
+{
+	// animators have been deleted; nothing happens here now!
+	return false;
+}
+
+//! sets the look at target of the camera
+//! \param pos: Look at target of the camera.
+void CCameraSceneNode::setTarget(const core::vector3df &pos)
+{
+	Target = pos;
+
+	if (TargetAndRotationAreBound) {
+		const core::vector3df toTarget = Target - getAbsolutePosition();
+		ISceneNode::setRotation(toTarget.getHorizontalAngle());
+	}
+}
+
+//! Sets the rotation of the node.
+/** This only modifies the relative rotation of the node.
+If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+then calling this will also change the camera's target to match the rotation.
+\param rotation New rotation of the node in degrees. */
+void CCameraSceneNode::setRotation(const core::vector3df &rotation)
+{
+	if (TargetAndRotationAreBound)
+		Target = getAbsolutePosition() + rotation.rotationToDirection();
+
+	ISceneNode::setRotation(rotation);
+}
+
+//! Gets the current look at target of the camera
+//! \return Returns the current look at target of the camera
+const core::vector3df &CCameraSceneNode::getTarget() const
+{
+	return Target;
+}
+
+//! sets the up vector of the camera
+//! \param pos: New upvector of the camera.
+void CCameraSceneNode::setUpVector(const core::vector3df &pos)
+{
+	UpVector = pos;
+}
+
+//! Gets the up vector of the camera.
+//! \return Returns the up vector of the camera.
+const core::vector3df &CCameraSceneNode::getUpVector() const
+{
+	return UpVector;
+}
+
+f32 CCameraSceneNode::getNearValue() const
+{
+	return ZNear;
+}
+
+f32 CCameraSceneNode::getFarValue() const
+{
+	return ZFar;
+}
+
+f32 CCameraSceneNode::getAspectRatio() const
+{
+	return Aspect;
+}
+
+f32 CCameraSceneNode::getFOV() const
+{
+	return Fovy;
+}
+
+void CCameraSceneNode::setNearValue(f32 f)
+{
+	ZNear = f;
+	recalculateProjectionMatrix();
+	ViewArea.setFarNearDistance(ZFar - ZNear);
+}
+
+void CCameraSceneNode::setFarValue(f32 f)
+{
+	ZFar = f;
+	recalculateProjectionMatrix();
+	ViewArea.setFarNearDistance(ZFar - ZNear);
+}
+
+void CCameraSceneNode::setAspectRatio(f32 f)
+{
+	Aspect = f;
+	recalculateProjectionMatrix();
+}
+
+void CCameraSceneNode::setFOV(f32 f)
+{
+	Fovy = f;
+	recalculateProjectionMatrix();
+}
+
+void CCameraSceneNode::recalculateProjectionMatrix()
+{
+	ViewArea.getTransform(video::ETS_PROJECTION).buildProjectionMatrixPerspectiveFovLH(Fovy, Aspect, ZNear, ZFar, false);
+	IsOrthogonal = false;
+}
+
+//! prerender
+void CCameraSceneNode::OnRegisterSceneNode()
+{
+	if (SceneManager->getActiveCamera() == this)
+		SceneManager->registerNodeForRendering(this, ESNRP_CAMERA);
+
+	ISceneNode::OnRegisterSceneNode();
+}
+
+//! render
+void CCameraSceneNode::render()
+{
+	updateMatrices();
+
+	video::IVideoDriver *driver = SceneManager->getVideoDriver();
+	if (driver) {
+		driver->setTransform(video::ETS_PROJECTION, ViewArea.getTransform(video::ETS_PROJECTION));
+		driver->setTransform(video::ETS_VIEW, ViewArea.getTransform(video::ETS_VIEW));
+	}
+}
+
+//! update
+void CCameraSceneNode::updateMatrices()
+{
+	core::vector3df pos = getAbsolutePosition();
+	core::vector3df tgtv = Target - pos;
+	tgtv.normalize();
+
+	// if upvector and vector to the target are the same, we have a
+	// problem. so solve this problem:
+	core::vector3df up = UpVector;
+	up.normalize();
+
+	f32 dp = tgtv.dotProduct(up);
+
+	if (core::equals(core::abs_<f32>(dp), 1.f)) {
+		up.X += 0.5f;
+	}
+
+	ViewArea.getTransform(video::ETS_VIEW).buildCameraLookAtMatrixLH(pos, Target, up);
+	ViewArea.getTransform(video::ETS_VIEW) *= Affector;
+	recalculateViewArea();
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CCameraSceneNode::getBoundingBox() const
+{
+	return BoundingBox;
+}
+
+//! returns the view frustum.
+const SViewFrustum *CCameraSceneNode::getViewFrustum() const
+{
+	return &ViewArea;
+}
+
+void CCameraSceneNode::recalculateViewArea()
+{
+	ViewArea.cameraPosition = getAbsolutePosition();
+
+	core::matrix4 m(core::matrix4::EM4CONST_NOTHING);
+	m.setbyproduct_nocheck(ViewArea.getTransform(video::ETS_PROJECTION),
+			ViewArea.getTransform(video::ETS_VIEW));
+	ViewArea.setFrom(m, false);
+}
+
+//! Set the binding between the camera's rotation adn target.
+void CCameraSceneNode::bindTargetAndRotation(bool bound)
+{
+	TargetAndRotationAreBound = bound;
+}
+
+//! Gets the binding between the camera's rotation and target.
+bool CCameraSceneNode::getTargetAndRotationBinding(void) const
+{
+	return TargetAndRotationAreBound;
+}
+
+//! Creates a clone of this scene node and its children.
+ISceneNode *CCameraSceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	ICameraSceneNode::clone(newParent, newManager);
+
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CCameraSceneNode *nb = new CCameraSceneNode(newParent,
+			newManager, ID, RelativeTranslation, Target);
+
+	nb->ISceneNode::cloneMembers(this, newManager);
+	nb->ICameraSceneNode::cloneMembers(this);
+
+	nb->Target = Target;
+	nb->UpVector = UpVector;
+	nb->Fovy = Fovy;
+	nb->Aspect = Aspect;
+	nb->ZNear = ZNear;
+	nb->ZFar = ZFar;
+	nb->ViewArea = ViewArea;
+	nb->Affector = Affector;
+	nb->InputReceiverEnabled = InputReceiverEnabled;
+	nb->TargetAndRotationAreBound = TargetAndRotationAreBound;
+
+	if (newParent)
+		nb->drop();
+	return nb;
+}
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/CCameraSceneNode.h b/irr/src/CCameraSceneNode.h
new file mode 100644
index 000000000..668756300
--- /dev/null
+++ b/irr/src/CCameraSceneNode.h
@@ -0,0 +1,165 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ICameraSceneNode.h"
+#include "SViewFrustum.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class CCameraSceneNode : public ICameraSceneNode
+{
+public:
+	//! constructor
+	CCameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &lookat = core::vector3df(0, 0, 100));
+
+	//! Sets the projection matrix of the camera.
+	/** The core::matrix4 class has some methods
+	to build a projection matrix. e.g: core::matrix4::buildProjectionMatrixPerspectiveFovLH.
+	Note that the matrix will only stay as set by this method until one of
+	the following Methods are called: setNearValue, setFarValue, setAspectRatio, setFOV.
+	\param projection The new projection matrix of the camera.
+	\param isOrthogonal Set this to true if the matrix is an orthogonal one (e.g.
+	from matrix4::buildProjectionMatrixOrthoLH(). */
+	void setProjectionMatrix(const core::matrix4 &projection, bool isOrthogonal = false) override;
+
+	//! Gets the current projection matrix of the camera
+	//! \return Returns the current projection matrix of the camera.
+	const core::matrix4 &getProjectionMatrix() const override;
+
+	//! Gets the current view matrix of the camera
+	//! \return Returns the current view matrix of the camera.
+	const core::matrix4 &getViewMatrix() const override;
+
+	//! Sets a custom view matrix affector.
+	/** \param affector: The affector matrix. */
+	void setViewMatrixAffector(const core::matrix4 &affector) override;
+
+	//! Gets the custom view matrix affector.
+	const core::matrix4 &getViewMatrixAffector() const override;
+
+	//! It is possible to send mouse and key events to the camera. Most cameras
+	//! may ignore this input, but camera scene nodes which are created for
+	//! example with scene::ISceneManager::addMayaCameraSceneNode or
+	//! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
+	//! for changing their position, look at target or whatever.
+	bool OnEvent(const SEvent &event) override;
+
+	//! Sets the look at target of the camera
+	/** If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+	then calling this will also change the camera's scene node rotation to match the target.
+	\param pos: Look at target of the camera. */
+	void setTarget(const core::vector3df &pos) override;
+
+	//! Sets the rotation of the node.
+	/** This only modifies the relative rotation of the node.
+	If the camera's target and rotation are bound ( @see bindTargetAndRotation() )
+	then calling this will also change the camera's target to match the rotation.
+	\param rotation New rotation of the node in degrees. */
+	void setRotation(const core::vector3df &rotation) override;
+
+	//! Gets the current look at target of the camera
+	/** \return The current look at target of the camera */
+	const core::vector3df &getTarget() const override;
+
+	//! Sets the up vector of the camera.
+	//! \param pos: New upvector of the camera.
+	void setUpVector(const core::vector3df &pos) override;
+
+	//! Gets the up vector of the camera.
+	//! \return Returns the up vector of the camera.
+	const core::vector3df &getUpVector() const override;
+
+	//! Gets distance from the camera to the near plane.
+	//! \return Value of the near plane of the camera.
+	f32 getNearValue() const override;
+
+	//! Gets the distance from the camera to the far plane.
+	//! \return Value of the far plane of the camera.
+	f32 getFarValue() const override;
+
+	//! Get the aspect ratio of the camera.
+	//! \return The aspect ratio of the camera.
+	f32 getAspectRatio() const override;
+
+	//! Gets the field of view of the camera.
+	//! \return Field of view of the camera
+	f32 getFOV() const override;
+
+	//! Sets the value of the near clipping plane. (default: 1.0f)
+	void setNearValue(f32 zn) override;
+
+	//! Sets the value of the far clipping plane (default: 2000.0f)
+	void setFarValue(f32 zf) override;
+
+	//! Sets the aspect ratio (default: 4.0f / 3.0f)
+	void setAspectRatio(f32 aspect) override;
+
+	//! Sets the field of view (Default: PI / 3.5f)
+	void setFOV(f32 fovy) override;
+
+	//! PreRender event
+	void OnRegisterSceneNode() override;
+
+	//! Render
+	void render() override;
+
+	//! Update
+	void updateMatrices() override;
+
+	//! Returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! Returns the view area.
+	const SViewFrustum *getViewFrustum() const override;
+
+	//! Disables or enables the camera to get key or mouse inputs.
+	//! If this is set to true, the camera will respond to key inputs
+	//! otherwise not.
+	void setInputReceiverEnabled(bool enabled) override;
+
+	//! Returns if the input receiver of the camera is currently enabled.
+	bool isInputReceiverEnabled() const override;
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_CAMERA; }
+
+	//! Binds the camera scene node's rotation to its target position and vice versa, or unbinds them.
+	void bindTargetAndRotation(bool bound) override;
+
+	//! Queries if the camera scene node's rotation and its target position are bound together.
+	bool getTargetAndRotationBinding(void) const override;
+
+	//! Creates a clone of this scene node and its children.
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+protected:
+	void recalculateProjectionMatrix();
+	void recalculateViewArea();
+
+	core::aabbox3d<f32> BoundingBox;
+
+	core::vector3df Target;
+	core::vector3df UpVector;
+
+	f32 Fovy;   // Field of view, in radians.
+	f32 Aspect; // Aspect ratio.
+	f32 ZNear;  // value of the near view-plane.
+	f32 ZFar;   // Z-value of the far view-plane.
+
+	SViewFrustum ViewArea;
+	core::matrix4 Affector;
+
+	bool InputReceiverEnabled;
+	bool TargetAndRotationAreBound;
+};
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/CColorConverter.cpp b/irr/src/CColorConverter.cpp
new file mode 100644
index 000000000..96b22c544
--- /dev/null
+++ b/irr/src/CColorConverter.cpp
@@ -0,0 +1,760 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CColorConverter.h"
+#include "SColor.h"
+#include "os.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! converts a monochrome bitmap to A1R5G5B5 data
+void CColorConverter::convert1BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, s32 linepad, bool flip)
+{
+	if (!in || !out)
+		return;
+
+	if (flip)
+		out += width * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		s32 shift = 7;
+		if (flip)
+			out -= width;
+
+		for (s32 x = 0; x < width; ++x) {
+			out[x] = *in >> shift & 0x01 ? (s16)0xffff : (s16)0x8000;
+
+			if ((--shift) < 0) { // 8 pixel done
+				shift = 7;
+				++in;
+			}
+		}
+
+		if (shift != 7) // width did not fill last byte
+			++in;
+
+		if (!flip)
+			out += width;
+		in += linepad;
+	}
+}
+
+//! converts a 4 bit palettized image to A1R5G5B5
+void CColorConverter::convert4BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, const s32 *palette, s32 linepad, bool flip)
+{
+	if (!in || !out || !palette)
+		return;
+
+	if (flip)
+		out += width * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		s32 shift = 4;
+		if (flip)
+			out -= width;
+
+		for (s32 x = 0; x < width; ++x) {
+			out[x] = X8R8G8B8toA1R5G5B5(palette[(u8)((*in >> shift) & 0xf)]);
+
+			if (shift == 0) {
+				shift = 4;
+				++in;
+			} else
+				shift = 0;
+		}
+
+		if (shift == 0) // odd width
+			++in;
+
+		if (!flip)
+			out += width;
+		in += linepad;
+	}
+}
+
+//! converts a 8 bit palettized image into A1R5G5B5
+void CColorConverter::convert8BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, const s32 *palette, s32 linepad, bool flip)
+{
+	if (!in || !out || !palette)
+		return;
+
+	if (flip)
+		out += width * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		if (flip)
+			out -= width; // one line back
+		for (s32 x = 0; x < width; ++x) {
+			out[x] = X8R8G8B8toA1R5G5B5(palette[(u8)(*in)]);
+			++in;
+		}
+		if (!flip)
+			out += width;
+		in += linepad;
+	}
+}
+
+//! converts a 8 bit palettized or non palettized image (A8) into R8G8B8
+void CColorConverter::convert8BitTo24Bit(const u8 *in, u8 *out, s32 width, s32 height, const u8 *palette, s32 linepad, bool flip)
+{
+	if (!in || !out)
+		return;
+
+	const s32 lineWidth = 3 * width;
+	if (flip)
+		out += lineWidth * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		if (flip)
+			out -= lineWidth; // one line back
+		for (s32 x = 0; x < lineWidth; x += 3) {
+			if (palette) {
+#ifdef __BIG_ENDIAN__
+				out[x + 0] = palette[(in[0] << 2) + 0];
+				out[x + 1] = palette[(in[0] << 2) + 1];
+				out[x + 2] = palette[(in[0] << 2) + 2];
+#else
+				out[x + 0] = palette[(in[0] << 2) + 2];
+				out[x + 1] = palette[(in[0] << 2) + 1];
+				out[x + 2] = palette[(in[0] << 2) + 0];
+#endif
+			} else {
+				out[x + 0] = in[0];
+				out[x + 1] = in[0];
+				out[x + 2] = in[0];
+			}
+			++in;
+		}
+		if (!flip)
+			out += lineWidth;
+		in += linepad;
+	}
+}
+
+//! converts a 8 bit palettized or non palettized image (A8) into R8G8B8
+void CColorConverter::convert8BitTo32Bit(const u8 *in, u8 *out, s32 width, s32 height, const u8 *palette, s32 linepad, bool flip)
+{
+	if (!in || !out)
+		return;
+
+	const u32 lineWidth = 4 * width;
+	if (flip)
+		out += lineWidth * height;
+
+	u32 x;
+	u32 c;
+	for (u32 y = 0; y < (u32)height; ++y) {
+		if (flip)
+			out -= lineWidth; // one line back
+
+		if (palette) {
+			for (x = 0; x < (u32)width; x += 1) {
+				c = in[x];
+				((u32 *)out)[x] = ((u32 *)palette)[c];
+			}
+		} else {
+			for (x = 0; x < (u32)width; x += 1) {
+				c = in[x];
+#ifdef __BIG_ENDIAN__
+				((u32 *)out)[x] = c << 24 | c << 16 | c << 8 | 0x000000FF;
+#else
+				((u32 *)out)[x] = 0xFF000000 | c << 16 | c << 8 | c;
+#endif
+			}
+		}
+
+		if (!flip)
+			out += lineWidth;
+		in += width + linepad;
+	}
+}
+
+//! converts 16bit data to 16bit data
+void CColorConverter::convert16BitTo16Bit(const s16 *in, s16 *out, s32 width, s32 height, s32 linepad, bool flip)
+{
+	if (!in || !out)
+		return;
+
+	if (flip)
+		out += width * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		if (flip)
+			out -= width;
+#ifdef __BIG_ENDIAN__
+		for (s32 x = 0; x < width; ++x)
+			out[x] = os::Byteswap::byteswap(in[x]);
+#else
+		memcpy(out, in, width * sizeof(s16));
+#endif
+		if (!flip)
+			out += width;
+		in += width;
+		in += linepad;
+	}
+}
+
+//! copies R8G8B8 24bit data to 24bit data
+void CColorConverter::convert24BitTo24Bit(const u8 *in, u8 *out, s32 width, s32 height, s32 linepad, bool flip, bool bgr)
+{
+	if (!in || !out)
+		return;
+
+	const s32 lineWidth = 3 * width;
+	if (flip)
+		out += lineWidth * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		if (flip)
+			out -= lineWidth;
+		if (bgr) {
+			for (s32 x = 0; x < lineWidth; x += 3) {
+				out[x + 0] = in[x + 2];
+				out[x + 1] = in[x + 1];
+				out[x + 2] = in[x + 0];
+			}
+		} else {
+			memcpy(out, in, lineWidth);
+		}
+		if (!flip)
+			out += lineWidth;
+		in += lineWidth;
+		in += linepad;
+	}
+}
+
+//! Resizes the surface to a new size and converts it at the same time
+//! to an A8R8G8B8 format, returning the pointer to the new buffer.
+void CColorConverter::convert16bitToA8R8G8B8andResize(const s16 *in, s32 *out, s32 newWidth, s32 newHeight, s32 currentWidth, s32 currentHeight)
+{
+	if (!newWidth || !newHeight)
+		return;
+
+	// note: this is very very slow. (i didn't want to write a fast version.
+	// but hopefully, nobody wants to convert surfaces every frame.
+
+	f32 sourceXStep = (f32)currentWidth / (f32)newWidth;
+	f32 sourceYStep = (f32)currentHeight / (f32)newHeight;
+	f32 sy;
+	s32 t;
+
+	for (s32 x = 0; x < newWidth; ++x) {
+		sy = 0.0f;
+
+		for (s32 y = 0; y < newHeight; ++y) {
+			t = in[(s32)(((s32)sy) * currentWidth + x * sourceXStep)];
+			t = (((t >> 15) & 0x1) << 31) | (((t >> 10) & 0x1F) << 19) |
+				(((t >> 5) & 0x1F) << 11) | (t & 0x1F) << 3;
+			out[(s32)(y * newWidth + x)] = t;
+
+			sy += sourceYStep;
+		}
+	}
+}
+
+//! copies X8R8G8B8 32 bit data
+void CColorConverter::convert32BitTo32Bit(const s32 *in, s32 *out, s32 width, s32 height, s32 linepad, bool flip)
+{
+	if (!in || !out)
+		return;
+
+	if (flip)
+		out += width * height;
+
+	for (s32 y = 0; y < height; ++y) {
+		if (flip)
+			out -= width;
+#ifdef __BIG_ENDIAN__
+		for (s32 x = 0; x < width; ++x)
+			out[x] = os::Byteswap::byteswap(in[x]);
+#else
+		memcpy(out, in, width * sizeof(s32));
+#endif
+		if (!flip)
+			out += width;
+		in += width;
+		in += linepad;
+	}
+}
+
+void CColorConverter::convert_A1R5G5B5toR8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[2] = (*sB & 0x7c00) >> 7;
+		dB[1] = (*sB & 0x03e0) >> 2;
+		dB[0] = (*sB & 0x1f) << 3;
+
+		sB += 1;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_A1R5G5B5toB8G8R8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[0] = (*sB & 0x7c00) >> 7;
+		dB[1] = (*sB & 0x03e0) >> 2;
+		dB[2] = (*sB & 0x1f) << 3;
+
+		sB += 1;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_A1R5G5B5toR5G5B5A1(const void *sP, s32 sN, void *dP)
+{
+	const u16 *sB = (const u16 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		*dB = (*sB << 1) | (*sB >> 15);
+		++sB;
+		++dB;
+	}
+}
+
+void CColorConverter::convert_A1R5G5B5toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x)
+		*dB++ = A1R5G5B5toA8R8G8B8(*sB++);
+}
+
+void CColorConverter::convert_A1R5G5B5toA1R5G5B5(const void *sP, s32 sN, void *dP)
+{
+	memcpy(dP, sP, sN * 2);
+}
+
+void CColorConverter::convert_A1R5G5B5toR5G6B5(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x)
+		*dB++ = A1R5G5B5toR5G6B5(*sB++);
+}
+
+void CColorConverter::convert_A8R8G8B8toR8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		// sB[3] is alpha
+		dB[0] = sB[2];
+		dB[1] = sB[1];
+		dB[2] = sB[0];
+
+		sB += 4;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toB8G8R8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		// sB[3] is alpha
+		dB[0] = sB[0];
+		dB[1] = sB[1];
+		dB[2] = sB[2];
+
+		sB += 4;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	memcpy(dP, sP, sN * 4);
+}
+
+void CColorConverter::convert_A8R8G8B8toA1R5G5B5(const void *sP, s32 sN, void *dP)
+{
+	u32 *sB = (u32 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x)
+		*dB++ = A8R8G8B8toA1R5G5B5(*sB++);
+}
+
+void CColorConverter::convert_A8R8G8B8toA1B5G5R5(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		s32 r = sB[0] >> 3;
+		s32 g = sB[1] >> 3;
+		s32 b = sB[2] >> 3;
+		s32 a = sB[3] >> 3;
+
+		dB[0] = (a << 15) | (r << 10) | (g << 5) | (b);
+
+		sB += 4;
+		dB += 1;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toR5G6B5(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		s32 r = sB[2] >> 3;
+		s32 g = sB[1] >> 2;
+		s32 b = sB[0] >> 3;
+
+		dB[0] = (r << 11) | (g << 5) | (b);
+
+		sB += 4;
+		dB += 1;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toR3G3B2(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		u8 r = sB[2] & 0xe0;
+		u8 g = (sB[1] & 0xe0) >> 3;
+		u8 b = (sB[0] & 0xc0) >> 6;
+
+		dB[0] = (r | g | b);
+
+		sB += 4;
+		dB += 1;
+	}
+}
+
+void CColorConverter::convert_R8G8B8toR8G8B8(const void *sP, s32 sN, void *dP)
+{
+	memcpy(dP, sP, sN * 3);
+}
+
+void CColorConverter::convert_R8G8B8toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		*dB = 0xff000000 | (sB[0] << 16) | (sB[1] << 8) | sB[2];
+
+		sB += 3;
+		++dB;
+	}
+}
+
+void CColorConverter::convert_R8G8B8toA1R5G5B5(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		s32 r = sB[0] >> 3;
+		s32 g = sB[1] >> 3;
+		s32 b = sB[2] >> 3;
+
+		dB[0] = (0x8000) | (r << 10) | (g << 5) | (b);
+
+		sB += 3;
+		dB += 1;
+	}
+}
+
+void CColorConverter::convert_B8G8R8toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		*dB = 0xff000000 | (sB[2] << 16) | (sB[1] << 8) | sB[0];
+
+		sB += 3;
+		++dB;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toR8G8B8A8(const void *sP, s32 sN, void *dP)
+{
+	const u32 *sB = (const u32 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		*dB++ = (*sB << 8) | (*sB >> 24);
+		++sB;
+	}
+}
+
+void CColorConverter::convert_A8R8G8B8toA8B8G8R8(const void *sP, s32 sN, void *dP)
+{
+	const u32 *sB = (const u32 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		*dB++ = (*sB & 0xff00ff00) | ((*sB & 0x00ff0000) >> 16) | ((*sB & 0x000000ff) << 16);
+		++sB;
+	}
+}
+
+void CColorConverter::convert_B8G8R8A8toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[0] = sB[3];
+		dB[1] = sB[2];
+		dB[2] = sB[1];
+		dB[3] = sB[0];
+
+		sB += 4;
+		dB += 4;
+	}
+}
+
+void CColorConverter::convert_R8G8B8toB8G8R8(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[2] = sB[0];
+		dB[1] = sB[1];
+		dB[0] = sB[2];
+
+		sB += 3;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_R8G8B8toR5G6B5(const void *sP, s32 sN, void *dP)
+{
+	u8 *sB = (u8 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		s32 r = sB[0] >> 3;
+		s32 g = sB[1] >> 2;
+		s32 b = sB[2] >> 3;
+
+		dB[0] = (r << 11) | (g << 5) | (b);
+
+		sB += 3;
+		dB += 1;
+	}
+}
+
+void CColorConverter::convert_R5G6B5toR5G6B5(const void *sP, s32 sN, void *dP)
+{
+	memcpy(dP, sP, sN * 2);
+}
+
+void CColorConverter::convert_R5G6B5toR8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[0] = (*sB & 0xf800) >> 8;
+		dB[1] = (*sB & 0x07e0) >> 3;
+		dB[2] = (*sB & 0x001f) << 3;
+
+		sB += 1;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_R5G6B5toB8G8R8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u8 *dB = (u8 *)dP;
+
+	for (s32 x = 0; x < sN; ++x) {
+		dB[2] = (*sB & 0xf800) >> 8;
+		dB[1] = (*sB & 0x07e0) >> 3;
+		dB[0] = (*sB & 0x001f) << 3;
+
+		sB += 1;
+		dB += 3;
+	}
+}
+
+void CColorConverter::convert_R5G6B5toA8R8G8B8(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u32 *dB = (u32 *)dP;
+
+	for (s32 x = 0; x < sN; ++x)
+		*dB++ = R5G6B5toA8R8G8B8(*sB++);
+}
+
+void CColorConverter::convert_R5G6B5toA1R5G5B5(const void *sP, s32 sN, void *dP)
+{
+	u16 *sB = (u16 *)sP;
+	u16 *dB = (u16 *)dP;
+
+	for (s32 x = 0; x < sN; ++x)
+		*dB++ = R5G6B5toA1R5G5B5(*sB++);
+}
+
+bool CColorConverter::canConvertFormat(ECOLOR_FORMAT sourceFormat, ECOLOR_FORMAT destFormat)
+{
+	switch (sourceFormat) {
+	case ECF_A1R5G5B5:
+		switch (destFormat) {
+		case ECF_A1R5G5B5:
+		case ECF_R5G6B5:
+		case ECF_A8R8G8B8:
+		case ECF_R8G8B8:
+			return true;
+		default:
+			break;
+		}
+		break;
+	case ECF_R5G6B5:
+		switch (destFormat) {
+		case ECF_A1R5G5B5:
+		case ECF_R5G6B5:
+		case ECF_A8R8G8B8:
+		case ECF_R8G8B8:
+			return true;
+		default:
+			break;
+		}
+		break;
+	case ECF_A8R8G8B8:
+		switch (destFormat) {
+		case ECF_A1R5G5B5:
+		case ECF_R5G6B5:
+		case ECF_A8R8G8B8:
+		case ECF_R8G8B8:
+			return true;
+		default:
+			break;
+		}
+		break;
+	case ECF_R8G8B8:
+		switch (destFormat) {
+		case ECF_A1R5G5B5:
+		case ECF_R5G6B5:
+		case ECF_A8R8G8B8:
+		case ECF_R8G8B8:
+			return true;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+void CColorConverter::convert_viaFormat(const void *sP, ECOLOR_FORMAT sF, s32 sN,
+		void *dP, ECOLOR_FORMAT dF)
+{
+	// please also update can_convert_viaFormat when adding new conversions
+	switch (sF) {
+	case ECF_A1R5G5B5:
+		switch (dF) {
+		case ECF_A1R5G5B5:
+			convert_A1R5G5B5toA1R5G5B5(sP, sN, dP);
+			break;
+		case ECF_R5G6B5:
+			convert_A1R5G5B5toR5G6B5(sP, sN, dP);
+			break;
+		case ECF_A8R8G8B8:
+			convert_A1R5G5B5toA8R8G8B8(sP, sN, dP);
+			break;
+		case ECF_R8G8B8:
+			convert_A1R5G5B5toR8G8B8(sP, sN, dP);
+			break;
+
+		default:
+			break;
+		}
+		break;
+	case ECF_R5G6B5:
+		switch (dF) {
+		case ECF_A1R5G5B5:
+			convert_R5G6B5toA1R5G5B5(sP, sN, dP);
+			break;
+		case ECF_R5G6B5:
+			convert_R5G6B5toR5G6B5(sP, sN, dP);
+			break;
+		case ECF_A8R8G8B8:
+			convert_R5G6B5toA8R8G8B8(sP, sN, dP);
+			break;
+		case ECF_R8G8B8:
+			convert_R5G6B5toR8G8B8(sP, sN, dP);
+			break;
+
+		default:
+			break;
+		}
+		break;
+	case ECF_A8R8G8B8:
+		switch (dF) {
+		case ECF_A1R5G5B5:
+			convert_A8R8G8B8toA1R5G5B5(sP, sN, dP);
+			break;
+		case ECF_R5G6B5:
+			convert_A8R8G8B8toR5G6B5(sP, sN, dP);
+			break;
+		case ECF_A8R8G8B8:
+			convert_A8R8G8B8toA8R8G8B8(sP, sN, dP);
+			break;
+		case ECF_R8G8B8:
+			convert_A8R8G8B8toR8G8B8(sP, sN, dP);
+			break;
+
+		default:
+			break;
+		}
+		break;
+	case ECF_R8G8B8:
+		switch (dF) {
+		case ECF_A1R5G5B5:
+			convert_R8G8B8toA1R5G5B5(sP, sN, dP);
+			break;
+		case ECF_R5G6B5:
+			convert_R8G8B8toR5G6B5(sP, sN, dP);
+			break;
+		case ECF_A8R8G8B8:
+			convert_R8G8B8toA8R8G8B8(sP, sN, dP);
+			break;
+		case ECF_R8G8B8:
+			convert_R8G8B8toR8G8B8(sP, sN, dP);
+			break;
+
+		default:
+			break;
+		}
+		break;
+
+	default:
+		break;
+	}
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CColorConverter.h b/irr/src/CColorConverter.h
new file mode 100644
index 000000000..7f1628297
--- /dev/null
+++ b/irr/src/CColorConverter.h
@@ -0,0 +1,94 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "IImage.h"
+
+namespace irr
+{
+namespace video
+{
+
+class CColorConverter
+{
+public:
+	//! converts a monochrome bitmap to A1R5G5B5
+	static void convert1BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, s32 linepad = 0, bool flip = false);
+
+	//! converts a 4 bit palettized image to A1R5G5B5
+	static void convert4BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, const s32 *palette, s32 linepad = 0, bool flip = false);
+
+	//! converts a 8 bit palettized image to A1R5G5B5
+	static void convert8BitTo16Bit(const u8 *in, s16 *out, s32 width, s32 height, const s32 *palette, s32 linepad = 0, bool flip = false);
+
+	//! converts a 8 bit palettized or non palettized image (A8) into R8G8B8
+	static void convert8BitTo24Bit(const u8 *in, u8 *out, s32 width, s32 height, const u8 *palette, s32 linepad = 0, bool flip = false);
+
+	//! converts a 8 bit palettized or non palettized image (A8) into A8R8G8B8
+	static void convert8BitTo32Bit(const u8 *in, u8 *out, s32 width, s32 height, const u8 *palette, s32 linepad = 0, bool flip = false);
+
+	//! converts R8G8B8 16 bit data to A1R5G5B5 data
+	static void convert16BitTo16Bit(const s16 *in, s16 *out, s32 width, s32 height, s32 linepad = 0, bool flip = false);
+
+	//! copies R8G8B8 24 bit data to 24 data, and flips and
+	//! mirrors the image during the process.
+	static void convert24BitTo24Bit(const u8 *in, u8 *out, s32 width, s32 height, s32 linepad = 0, bool flip = false, bool bgr = false);
+
+	//! Resizes the surface to a new size and converts it at the same time
+	//! to an A8R8G8B8 format, returning the pointer to the new buffer.
+	static void convert16bitToA8R8G8B8andResize(const s16 *in, s32 *out, s32 newWidth, s32 newHeight, s32 currentWidth, s32 currentHeight);
+
+	//! copies X8R8G8B8 32 bit data, and flips and
+	//! mirrors the image during the process.
+	static void convert32BitTo32Bit(const s32 *in, s32 *out, s32 width, s32 height, s32 linepad, bool flip = false);
+
+	//! Functions for converting one image format to another efficiently
+	//! and hopefully correctly.
+	//! Note that the format descriptions refer to the ECOLOR_FORMAT's and not to memory layout.
+	//! Reasons for that go back to DX9 naming which tended to flip 32-bit and 16-bit byte orders so ARGB usually means BGRA.
+	//!
+	//! \param sP pointer to source pixel data
+	//! \param sN number of source pixels to copy
+	//! \param dP pointer to destination data buffer. must be big enough
+	//! to hold sN pixels in the output format.
+	static void convert_A1R5G5B5toR8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_A1R5G5B5toB8G8R8(const void *sP, s32 sN, void *dP);
+	static void convert_A1R5G5B5toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_A1R5G5B5toA1R5G5B5(const void *sP, s32 sN, void *dP);
+	static void convert_A1R5G5B5toR5G5B5A1(const void *sP, s32 sN, void *dP);
+	static void convert_A1R5G5B5toR5G6B5(const void *sP, s32 sN, void *dP);
+
+	static void convert_A8R8G8B8toR8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toB8G8R8(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toA1R5G5B5(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toA1B5G5R5(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toR5G6B5(const void *sP, s32 sN, void *dP);
+
+	static void convert_A8R8G8B8toR3G3B2(const void *sP, s32 sN, void *dP);
+	static void convert_R8G8B8toR8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_R8G8B8toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_R8G8B8toA1R5G5B5(const void *sP, s32 sN, void *dP);
+	static void convert_R8G8B8toB8G8R8(const void *sP, s32 sN, void *dP);
+	static void convert_R8G8B8toR5G6B5(const void *sP, s32 sN, void *dP);
+	static void convert_B8G8R8toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_B8G8R8A8toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toR8G8B8A8(const void *sP, s32 sN, void *dP);
+	static void convert_A8R8G8B8toA8B8G8R8(const void *sP, s32 sN, void *dP);
+
+	static void convert_R5G6B5toR5G6B5(const void *sP, s32 sN, void *dP);
+	static void convert_R5G6B5toR8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_R5G6B5toB8G8R8(const void *sP, s32 sN, void *dP);
+	static void convert_R5G6B5toA8R8G8B8(const void *sP, s32 sN, void *dP);
+	static void convert_R5G6B5toA1R5G5B5(const void *sP, s32 sN, void *dP);
+	static void convert_viaFormat(const void *sP, ECOLOR_FORMAT sF, s32 sN,
+			void *dP, ECOLOR_FORMAT dF);
+	// Check if convert_viaFormat is usable
+	static bool canConvertFormat(ECOLOR_FORMAT sourceFormat, ECOLOR_FORMAT destFormat);
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CDummyTransformationSceneNode.cpp b/irr/src/CDummyTransformationSceneNode.cpp
new file mode 100644
index 000000000..73953dd38
--- /dev/null
+++ b/irr/src/CDummyTransformationSceneNode.cpp
@@ -0,0 +1,102 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CDummyTransformationSceneNode.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CDummyTransformationSceneNode::CDummyTransformationSceneNode(
+		ISceneNode *parent, ISceneManager *mgr, s32 id) :
+		IDummyTransformationSceneNode(parent, mgr, id)
+{
+#ifdef _DEBUG
+	setDebugName("CDummyTransformationSceneNode");
+#endif
+
+	setAutomaticCulling(scene::EAC_OFF);
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CDummyTransformationSceneNode::getBoundingBox() const
+{
+	return Box;
+}
+
+//! Returns a reference to the current relative transformation matrix.
+//! This is the matrix, this scene node uses instead of scale, translation
+//! and rotation.
+core::matrix4 &CDummyTransformationSceneNode::getRelativeTransformationMatrix()
+{
+	return RelativeTransformationMatrix;
+}
+
+//! Returns the relative transformation of the scene node.
+core::matrix4 CDummyTransformationSceneNode::getRelativeTransformation() const
+{
+	return RelativeTransformationMatrix;
+}
+
+//! Creates a clone of this scene node and its children.
+ISceneNode *CDummyTransformationSceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CDummyTransformationSceneNode *nb = new CDummyTransformationSceneNode(newParent,
+			newManager, ID);
+
+	nb->cloneMembers(this, newManager);
+	nb->RelativeTransformationMatrix = RelativeTransformationMatrix;
+	nb->Box = Box;
+
+	if (newParent)
+		nb->drop();
+	return nb;
+}
+
+const core::vector3df &CDummyTransformationSceneNode::getScale() const
+{
+	os::Printer::log("CDummyTransformationSceneNode::getScale() does not contain the relative transformation.", ELL_DEBUG);
+	return RelativeScale;
+}
+
+void CDummyTransformationSceneNode::setScale(const core::vector3df &scale)
+{
+	os::Printer::log("CDummyTransformationSceneNode::setScale() does not affect the relative transformation.", ELL_DEBUG);
+	RelativeScale = scale;
+}
+
+const core::vector3df &CDummyTransformationSceneNode::getRotation() const
+{
+	os::Printer::log("CDummyTransformationSceneNode::getRotation() does not contain the relative transformation.", ELL_DEBUG);
+	return RelativeRotation;
+}
+
+void CDummyTransformationSceneNode::setRotation(const core::vector3df &rotation)
+{
+	os::Printer::log("CDummyTransformationSceneNode::setRotation() does not affect the relative transformation.", ELL_DEBUG);
+	RelativeRotation = rotation;
+}
+
+const core::vector3df &CDummyTransformationSceneNode::getPosition() const
+{
+	os::Printer::log("CDummyTransformationSceneNode::getPosition() does not contain the relative transformation.", ELL_DEBUG);
+	return RelativeTranslation;
+}
+
+void CDummyTransformationSceneNode::setPosition(const core::vector3df &newpos)
+{
+	os::Printer::log("CDummyTransformationSceneNode::setPosition() does not affect the relative transformation.", ELL_DEBUG);
+	RelativeTranslation = newpos;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CDummyTransformationSceneNode.h b/irr/src/CDummyTransformationSceneNode.h
new file mode 100644
index 000000000..86fda3639
--- /dev/null
+++ b/irr/src/CDummyTransformationSceneNode.h
@@ -0,0 +1,55 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IDummyTransformationSceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class CDummyTransformationSceneNode : public IDummyTransformationSceneNode
+{
+public:
+	//! constructor
+	CDummyTransformationSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id);
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! Returns a reference to the current relative transformation matrix.
+	//! This is the matrix, this scene node uses instead of scale, translation
+	//! and rotation.
+	core::matrix4 &getRelativeTransformationMatrix() override;
+
+	//! Returns the relative transformation of the scene node.
+	core::matrix4 getRelativeTransformation() const override;
+
+	//! does nothing.
+	void render() override {}
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_DUMMY_TRANSFORMATION; }
+
+	//! Creates a clone of this scene node and its children.
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+private:
+	// TODO: We can add least add some warnings to find troubles faster until we have
+	// fixed bug id 2318691.
+	const core::vector3df &getScale() const override;
+	void setScale(const core::vector3df &scale) override;
+	const core::vector3df &getRotation() const override;
+	void setRotation(const core::vector3df &rotation) override;
+	const core::vector3df &getPosition() const override;
+	void setPosition(const core::vector3df &newpos) override;
+
+	core::matrix4 RelativeTransformationMatrix;
+	core::aabbox3d<f32> Box;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CEGLManager.cpp b/irr/src/CEGLManager.cpp
new file mode 100644
index 000000000..ffe7a44cf
--- /dev/null
+++ b/irr/src/CEGLManager.cpp
@@ -0,0 +1,591 @@
+// Copyright (C) 2013 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "CEGLManager.h"
+
+#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
+
+#include "irrString.h"
+#include "irrArray.h"
+#include "os.h"
+
+namespace irr
+{
+namespace video
+{
+
+CEGLManager::CEGLManager() :
+		IContextManager(), EglWindow(0), EglDisplay(EGL_NO_DISPLAY),
+		EglSurface(EGL_NO_SURFACE), EglContext(EGL_NO_CONTEXT), EglConfig(0), MajorVersion(0), MinorVersion(0)
+{
+#ifdef _DEBUG
+	setDebugName("CEGLManager");
+#endif
+}
+
+CEGLManager::~CEGLManager()
+{
+	destroyContext();
+	destroySurface();
+	terminate();
+}
+
+bool CEGLManager::initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data)
+{
+	// store new data
+	Params = params;
+	Data = data;
+
+	if (EglWindow != 0 && EglDisplay != EGL_NO_DISPLAY)
+		return true;
+
+		// Window is depend on platform.
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
+	EglWindow = (NativeWindowType)Data.OpenGLWin32.HWnd;
+	Data.OpenGLWin32.HDc = GetDC((HWND)EglWindow);
+	EglDisplay = eglGetDisplay((NativeDisplayType)Data.OpenGLWin32.HDc);
+#elif defined(_IRR_EMSCRIPTEN_PLATFORM_)
+	EglWindow = 0;
+	EglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	EglWindow = (NativeWindowType)Data.OpenGLLinux.X11Window;
+	EglDisplay = eglGetDisplay((NativeDisplayType)Data.OpenGLLinux.X11Display);
+#elif defined(_IRR_COMPILE_WITH_FB_DEVICE_)
+	EglWindow = (NativeWindowType)Data.OpenGLFB.Window;
+	EglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+#endif
+
+	// We must check if EGL display is valid.
+	if (EglDisplay == EGL_NO_DISPLAY) {
+		os::Printer::log("Could not get EGL display.");
+		terminate();
+		return false;
+	}
+
+	// Initialize EGL here.
+	if (!eglInitialize(EglDisplay, &MajorVersion, &MinorVersion)) {
+		os::Printer::log("Could not initialize EGL display.");
+
+		EglDisplay = EGL_NO_DISPLAY;
+		terminate();
+		return false;
+	} else
+		os::Printer::log("EGL version", core::stringc(MajorVersion + (MinorVersion * 0.1f)).c_str());
+
+	return true;
+}
+
+void CEGLManager::terminate()
+{
+	if (EglWindow == 0 && EglDisplay == EGL_NO_DISPLAY)
+		return;
+
+	if (EglDisplay != EGL_NO_DISPLAY) {
+		// We should unbind current EGL context before terminate EGL.
+		eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+		eglTerminate(EglDisplay);
+		EglDisplay = EGL_NO_DISPLAY;
+	}
+
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
+	if (Data.OpenGLWin32.HDc) {
+		ReleaseDC((HWND)EglWindow, (HDC)Data.OpenGLWin32.HDc);
+		Data.OpenGLWin32.HDc = 0;
+	}
+#endif
+
+	MajorVersion = 0;
+	MinorVersion = 0;
+}
+
+bool CEGLManager::generateSurface()
+{
+	if (EglDisplay == EGL_NO_DISPLAY)
+		return false;
+
+	if (EglSurface != EGL_NO_SURFACE)
+		return true;
+
+		// We should assign new WindowID on platforms, where WindowID may change at runtime,
+		// at this time only Android support this feature.
+		// this needs an update method instead!
+
+#if defined(_IRR_EMSCRIPTEN_PLATFORM_)
+	// eglChooseConfig is currently only implemented as stub in emscripten (version 1.37.22 at point of writing)
+	// But the other solution would also be fine as it also only generates a single context so there is not much to choose from.
+	EglConfig = chooseConfig(ECS_IRR_CHOOSE);
+#else
+	EglConfig = chooseConfig(ECS_EGL_CHOOSE_FIRST_LOWER_EXPECTATIONS);
+#endif
+
+	if (EglConfig == 0) {
+		os::Printer::log("Could not get config for EGL display.");
+		return false;
+	}
+
+	// Now we are able to create EGL surface.
+	EglSurface = eglCreateWindowSurface(EglDisplay, EglConfig, EglWindow, 0);
+
+	if (EGL_NO_SURFACE == EglSurface)
+		EglSurface = eglCreateWindowSurface(EglDisplay, EglConfig, 0, 0);
+
+	if (EGL_NO_SURFACE == EglSurface)
+		os::Printer::log("Could not create EGL surface.");
+
+#ifdef EGL_VERSION_1_2
+	if (MinorVersion > 1)
+		eglBindAPI(EGL_OPENGL_ES_API);
+#endif
+
+	if (Params.Vsync)
+		eglSwapInterval(EglDisplay, 1);
+
+	return true;
+}
+
+EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle)
+{
+	EGLConfig configResult = 0;
+
+	// Find proper OpenGL BIT.
+	EGLint eglOpenGLBIT = 0;
+	switch (Params.DriverType) {
+	case EDT_OGLES1:
+		eglOpenGLBIT = EGL_OPENGL_ES_BIT;
+		break;
+	case EDT_OGLES2:
+	case EDT_WEBGL1:
+		eglOpenGLBIT = EGL_OPENGL_ES2_BIT;
+		break;
+	default:
+		break;
+	}
+
+	if (confStyle == ECS_EGL_CHOOSE_FIRST_LOWER_EXPECTATIONS) {
+		EGLint Attribs[] = {
+				EGL_RED_SIZE, 8,
+				EGL_GREEN_SIZE, 8,
+				EGL_BLUE_SIZE, 8,
+				EGL_ALPHA_SIZE, Params.WithAlphaChannel ? 1 : 0,
+				EGL_BUFFER_SIZE, Params.Bits,
+				EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+				EGL_DEPTH_SIZE, Params.ZBufferBits,
+				EGL_STENCIL_SIZE, Params.Stencilbuffer,
+				EGL_SAMPLE_BUFFERS, Params.AntiAlias ? 1 : 0,
+				EGL_SAMPLES, Params.AntiAlias,
+#ifdef EGL_VERSION_1_3
+				EGL_RENDERABLE_TYPE, eglOpenGLBIT,
+#endif
+				EGL_NONE, 0,
+			};
+
+		EGLint numConfigs = 0;
+		u32 steps = 5;
+
+		// Choose the best EGL config.
+		// TODO: We should also have a confStyle ECS_EGL_CHOOSE_CLOSEST
+		//       which doesn't take first result of eglChooseConfigs,
+		//       but the closest to requested parameters. eglChooseConfigs
+		//       can return more than 1 result and first one might have
+		//       "better" values than requested (more bits per pixel etc).
+		//       So this returns the config which can do most, not the
+		//       config which is closest to the requested parameters.
+		//
+		while (!eglChooseConfig(EglDisplay, Attribs, &configResult, 1, &numConfigs) || !numConfigs) {
+			switch (steps) {
+			case 5:                  // samples
+				if (Attribs[19] > 2) // Params.AntiAlias
+					--Attribs[19];
+				else {
+					Attribs[17] = 0; // Params.Stencilbuffer
+					Attribs[19] = 0; // Params.AntiAlias
+					--steps;
+				}
+				break;
+			case 4:             // alpha
+				if (Attribs[7]) { // Params.WithAlphaChannel
+					Attribs[7] = 0;
+
+					if (Params.AntiAlias) {
+						Attribs[17] = 1;
+						Attribs[19] = Params.AntiAlias;
+						steps = 5;
+					}
+				} else
+					--steps;
+				break;
+			case 3:              // stencil
+				if (Attribs[15]) { // Params.Stencilbuffer
+					Attribs[15] = 0;
+
+					if (Params.AntiAlias) {
+						Attribs[17] = 1;
+						Attribs[19] = Params.AntiAlias;
+						steps = 5;
+					}
+				} else
+					--steps;
+				break;
+			case 2:                   // depth size
+				if (Attribs[13] > 16) { // Params.ZBufferBits
+					Attribs[13] -= 8;
+				} else
+					--steps;
+				break;
+			case 1:                  // buffer size
+				if (Attribs[9] > 16) { // Params.Bits
+					Attribs[9] -= 8;
+				} else
+					--steps;
+				break;
+			default:
+				return 0;
+			}
+		}
+
+		if (Params.AntiAlias && !Attribs[17])
+			os::Printer::log("No multisampling.");
+
+		if (Params.WithAlphaChannel && !Attribs[7])
+			os::Printer::log("No alpha.");
+
+		if (Params.Stencilbuffer && !Attribs[15])
+			os::Printer::log("No stencil buffer.");
+
+		if (Params.ZBufferBits > Attribs[13])
+			os::Printer::log("No full depth buffer.");
+
+		if (Params.Bits > Attribs[9])
+			os::Printer::log("No full color buffer.");
+	} else if (confStyle == ECS_IRR_CHOOSE) {
+		// find number of available configs
+		EGLint numConfigs;
+		if (eglGetConfigs(EglDisplay, NULL, 0, &numConfigs) == EGL_FALSE) {
+			testEGLError();
+			return 0;
+		}
+
+		if (numConfigs <= 0)
+			return 0;
+
+		// Get all available configs.
+		EGLConfig *configs = new EGLConfig[numConfigs];
+		if (eglGetConfigs(EglDisplay, configs, numConfigs, &numConfigs) == EGL_FALSE) {
+			testEGLError();
+			return 0;
+		}
+
+		// Find the best one.
+		core::array<SConfigRating> ratings((u32)numConfigs);
+		for (u32 i = 0; i < (u32)numConfigs; ++i) {
+			SConfigRating r;
+			r.config = configs[i];
+			r.rating = rateConfig(r.config, eglOpenGLBIT);
+
+			if (r.rating >= 0)
+				ratings.push_back(r);
+		}
+
+		if (ratings.size() > 0) {
+			ratings.sort();
+			configResult = ratings[0].config;
+
+			if (ratings[0].rating != 0) {
+				// This is just to print some log info (it also rates again while doing that, but rating is cheap enough, so that doesn't matter here).
+				rateConfig(ratings[0].config, eglOpenGLBIT, true);
+			}
+		}
+
+		delete[] configs;
+	}
+
+	return configResult;
+}
+
+irr::s32 CEGLManager::rateConfig(EGLConfig config, EGLint eglOpenGLBIT, bool log)
+{
+	// some values must be there or we ignore the config
+#ifdef EGL_VERSION_1_3
+	EGLint attribRenderableType = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_RENDERABLE_TYPE, &attribRenderableType);
+	if (attribRenderableType != eglOpenGLBIT) {
+		if (log)
+			os::Printer::log("EGL_RENDERABLE_TYPE != eglOpenGLBIT");
+		return -1;
+	}
+#endif
+	EGLint attribSurfaceType = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_SURFACE_TYPE, &attribSurfaceType);
+	if (attribSurfaceType != EGL_WINDOW_BIT) {
+		if (log)
+			os::Printer::log("EGL_SURFACE_TYPE!= EGL_WINDOW_BIT");
+		return -1;
+	}
+
+	// Generally we give a really bad rating if attributes are worse than requested
+	// We give a slight worse rating if attributes are not exact as requested
+	// And we use some priorities which might make sense (but not really fine-tuned,
+	// so if you think other priorities would be better don't worry about changing the values.
+	int rating = 0;
+
+	EGLint attribBufferSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_BUFFER_SIZE, &attribBufferSize);
+	if (attribBufferSize < Params.Bits) {
+		if (log)
+			os::Printer::log("No full color buffer.");
+		rating += 100;
+	}
+	if (attribBufferSize > Params.Bits) {
+		if (log)
+			os::Printer::log("Larger color buffer.", ELL_DEBUG);
+		++rating;
+	}
+
+	EGLint attribRedSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_RED_SIZE, &attribRedSize);
+	if (attribRedSize < 5 && Params.Bits >= 4)
+		rating += 100;
+	else if (attribRedSize < 8 && Params.Bits >= 24)
+		rating += 10;
+	else if (attribRedSize >= 8 && Params.Bits < 24)
+		rating++;
+	EGLint attribGreenSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_GREEN_SIZE, &attribGreenSize);
+	if (attribGreenSize < 5 && Params.Bits >= 4)
+		rating += 100;
+	else if (attribGreenSize < 8 && Params.Bits >= 24)
+		rating += 10;
+	else if (attribGreenSize >= 8 && Params.Bits < 24)
+		rating++;
+	EGLint attribBlueSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_BLUE_SIZE, &attribBlueSize);
+	if (attribBlueSize < 5 && Params.Bits >= 4)
+		rating += 100;
+	else if (attribBlueSize < 8 && Params.Bits >= 24)
+		rating += 10;
+	else if (attribBlueSize >= 8 && Params.Bits < 24)
+		rating++;
+
+	EGLint attribAlphaSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_ALPHA_SIZE, &attribAlphaSize);
+	if (Params.WithAlphaChannel && attribAlphaSize == 0) {
+		if (log)
+			os::Printer::log("No alpha.");
+		rating += 10;
+	} else if (!Params.WithAlphaChannel && attribAlphaSize > 0) {
+		if (log)
+			os::Printer::log("Got alpha (unrequested).", ELL_DEBUG);
+		rating++;
+	}
+
+	EGLint attribStencilSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_STENCIL_SIZE, &attribStencilSize);
+	if (Params.Stencilbuffer && attribStencilSize == 0) {
+		if (log)
+			os::Printer::log("No stencil buffer.");
+		rating += 10;
+	} else if (!Params.Stencilbuffer && attribStencilSize > 0) {
+		if (log)
+			os::Printer::log("Got a stencil buffer (unrequested).", ELL_DEBUG);
+		rating++;
+	}
+
+	EGLint attribDepthSize = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_DEPTH_SIZE, &attribDepthSize);
+	if (attribDepthSize < Params.ZBufferBits) {
+		if (log) {
+			if (attribDepthSize > 0)
+				os::Printer::log("No full depth buffer.");
+			else
+				os::Printer::log("No depth buffer.");
+		}
+		rating += 50;
+	} else if (attribDepthSize != Params.ZBufferBits) {
+		if (log) {
+			if (Params.ZBufferBits == 0)
+				os::Printer::log("Got a depth buffer (unrequested).", ELL_DEBUG);
+			else
+				os::Printer::log("Got a larger depth buffer.", ELL_DEBUG);
+		}
+		rating++;
+	}
+
+	EGLint attribSampleBuffers = 0, attribSamples = 0;
+	eglGetConfigAttrib(EglDisplay, config, EGL_SAMPLE_BUFFERS, &attribSampleBuffers);
+	eglGetConfigAttrib(EglDisplay, config, EGL_SAMPLES, &attribSamples);
+	if (Params.AntiAlias && attribSampleBuffers == 0) {
+		if (log)
+			os::Printer::log("No multisampling.");
+		rating += 20;
+	} else if (Params.AntiAlias && attribSampleBuffers && attribSamples < Params.AntiAlias) {
+		if (log)
+			os::Printer::log("Multisampling with less samples than requested.", ELL_DEBUG);
+		rating += 10;
+	} else if (Params.AntiAlias && attribSampleBuffers && attribSamples > Params.AntiAlias) {
+		if (log)
+			os::Printer::log("Multisampling with more samples than requested.", ELL_DEBUG);
+		rating += 5;
+	} else if (!Params.AntiAlias && attribSampleBuffers > 0) {
+		if (log)
+			os::Printer::log("Got multisampling (unrequested).", ELL_DEBUG);
+		rating += 3;
+	}
+
+	return rating;
+}
+
+void CEGLManager::destroySurface()
+{
+	if (EglSurface == EGL_NO_SURFACE)
+		return;
+
+	// We should unbind current EGL context before destroy EGL surface.
+	eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+	eglDestroySurface(EglDisplay, EglSurface);
+	EglSurface = EGL_NO_SURFACE;
+}
+
+bool CEGLManager::generateContext()
+{
+	if (EglDisplay == EGL_NO_DISPLAY || EglSurface == EGL_NO_SURFACE)
+		return false;
+
+	if (EglContext != EGL_NO_CONTEXT)
+		return true;
+
+	EGLint OpenGLESVersion = 0;
+
+	switch (Params.DriverType) {
+	case EDT_OGLES1:
+		OpenGLESVersion = 1;
+		break;
+	case EDT_OGLES2:
+	case EDT_WEBGL1:
+		OpenGLESVersion = 2;
+		break;
+	default:
+		break;
+	}
+
+	EGLint ContextAttrib[] = {
+#ifdef EGL_VERSION_1_3
+			EGL_CONTEXT_CLIENT_VERSION, OpenGLESVersion,
+#endif
+			EGL_NONE, 0,
+		};
+
+	EglContext = eglCreateContext(EglDisplay, EglConfig, EGL_NO_CONTEXT, ContextAttrib);
+
+	if (testEGLError()) {
+		os::Printer::log("Could not create EGL context.", ELL_ERROR);
+		return false;
+	}
+
+	os::Printer::log("EGL context created with OpenGLESVersion: ", core::stringc((int)OpenGLESVersion), ELL_DEBUG);
+
+	return true;
+}
+
+void CEGLManager::destroyContext()
+{
+	if (EglContext == EGL_NO_CONTEXT)
+		return;
+
+	// We must unbind current EGL context before destroy it.
+	eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+	eglDestroyContext(EglDisplay, EglContext);
+
+	EglContext = EGL_NO_CONTEXT;
+}
+
+bool CEGLManager::activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero)
+{
+	eglMakeCurrent(EglDisplay, EglSurface, EglSurface, EglContext);
+
+	if (testEGLError()) {
+		os::Printer::log("Could not make EGL context current.");
+		return false;
+	}
+	return true;
+}
+
+const SExposedVideoData &CEGLManager::getContext() const
+{
+	return Data;
+}
+
+void *CEGLManager::getProcAddress(const std::string &procName)
+{
+	return (void *)eglGetProcAddress(procName.c_str());
+}
+
+bool CEGLManager::swapBuffers()
+{
+	return (eglSwapBuffers(EglDisplay, EglSurface) == EGL_TRUE);
+}
+
+bool CEGLManager::testEGLError()
+{
+	if (!Params.DriverDebug)
+		return false;
+	EGLint status = eglGetError();
+
+	switch (status) {
+	case EGL_SUCCESS:
+		return false;
+	case EGL_NOT_INITIALIZED:
+		os::Printer::log("Not Initialized", ELL_ERROR);
+		break;
+	case EGL_BAD_ACCESS:
+		os::Printer::log("Bad Access", ELL_ERROR);
+		break;
+	case EGL_BAD_ALLOC:
+		os::Printer::log("Bad Alloc", ELL_ERROR);
+		break;
+	case EGL_BAD_ATTRIBUTE:
+		os::Printer::log("Bad Attribute", ELL_ERROR);
+		break;
+	case EGL_BAD_CONTEXT:
+		os::Printer::log("Bad Context", ELL_ERROR);
+		break;
+	case EGL_BAD_CONFIG:
+		os::Printer::log("Bad Config", ELL_ERROR);
+		break;
+	case EGL_BAD_CURRENT_SURFACE:
+		os::Printer::log("Bad Current Surface", ELL_ERROR);
+		break;
+	case EGL_BAD_DISPLAY:
+		os::Printer::log("Bad Display", ELL_ERROR);
+		break;
+	case EGL_BAD_SURFACE:
+		os::Printer::log("Bad Surface", ELL_ERROR);
+		break;
+	case EGL_BAD_MATCH:
+		os::Printer::log("Bad Match", ELL_ERROR);
+		break;
+	case EGL_BAD_PARAMETER:
+		os::Printer::log("Bad Parameter", ELL_ERROR);
+		break;
+	case EGL_BAD_NATIVE_PIXMAP:
+		os::Printer::log("Bad Native Pixmap", ELL_ERROR);
+		break;
+	case EGL_BAD_NATIVE_WINDOW:
+		os::Printer::log("Bad Native Window", ELL_ERROR);
+		break;
+	case EGL_CONTEXT_LOST:
+		os::Printer::log("Context Lost", ELL_ERROR);
+		break;
+	default:
+		break;
+	};
+
+	return true;
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/CEGLManager.h b/irr/src/CEGLManager.h
new file mode 100644
index 000000000..49371e469
--- /dev/null
+++ b/irr/src/CEGLManager.h
@@ -0,0 +1,114 @@
+// Copyright (C) 2013 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
+
+#include <EGL/egl.h>
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+
+namespace irr
+{
+namespace video
+{
+// EGL manager.
+class CEGLManager : public IContextManager
+{
+public:
+	//! Constructor.
+	CEGLManager();
+
+	//! Destructor.
+	virtual ~CEGLManager();
+
+	// Initialize EGL.
+	/* This method initialize EGLand create EGL display, anyway surface and context
+	aren't create. */
+	bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) override;
+
+	// Terminate EGL.
+	/* Terminate EGL context. This method break both existed surface and context. */
+	void terminate() override;
+
+	// Create EGL surface.
+	/* This method create EGL surface. On some platforms eg. Android, we must
+	recreate surface on each resume, because WindowID may change, so existed
+	surface may not be valid. If EGL context already exist, this method
+	automatically activates it. */
+	bool generateSurface() override;
+
+	// Destroy EGL surface.
+	/* This method destroy EGL. On some platforms eg. Android, we should call
+	this method on each pause, because after resume this surface may not be valid.
+	Hovewer this method doesn'r break EGL context. */
+	void destroySurface() override;
+
+	// Create EGL context.
+	/* This method create and activate EGL context. */
+	bool generateContext() override;
+
+	// Destroy EGL context.
+	/* This method destroy EGL context. */
+	void destroyContext() override;
+
+	const SExposedVideoData &getContext() const override;
+
+	bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero) override;
+
+	// Get procedure address.
+	void *getProcAddress(const std::string &procName) override;
+
+	// Swap buffers.
+	bool swapBuffers() override;
+
+protected:
+	enum EConfigStyle
+	{
+		//! Get first result of eglChooseConfigs and if that fails try again by requesting simpler attributes
+		ECS_EGL_CHOOSE_FIRST_LOWER_EXPECTATIONS,
+
+		//! We select our own best fit and avoid using eglChooseConfigs
+		ECS_IRR_CHOOSE,
+	};
+
+	EGLConfig chooseConfig(EConfigStyle confStyle);
+
+	//! Check how close this config is to the parameters we requested
+	//! returns 0 is perfect, larger values are worse and < 0 is unusable.
+	irr::s32 rateConfig(EGLConfig config, EGLint eglOpenGLBIT, bool log = false);
+
+	// Helper to sort EGLConfig's. (because we got no std::pair....)
+	struct SConfigRating
+	{
+		EGLConfig config;
+		irr::s32 rating;
+		bool operator<(const SConfigRating &other) const
+		{
+			return rating < other.rating;
+		}
+	};
+
+private:
+	bool testEGLError();
+
+	NativeWindowType EglWindow;
+	EGLDisplay EglDisplay;
+	EGLSurface EglSurface;
+	EGLContext EglContext;
+
+	EGLConfig EglConfig;
+
+	SIrrlichtCreationParameters Params;
+	SExposedVideoData Data;
+
+	EGLint MajorVersion;
+	EGLint MinorVersion;
+};
+}
+}
+#endif
diff --git a/irr/src/CEmptySceneNode.cpp b/irr/src/CEmptySceneNode.cpp
new file mode 100644
index 000000000..2b965a198
--- /dev/null
+++ b/irr/src/CEmptySceneNode.cpp
@@ -0,0 +1,65 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CEmptySceneNode.h"
+#include "ISceneManager.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CEmptySceneNode::CEmptySceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id) :
+		ISceneNode(parent, mgr, id)
+{
+#ifdef _DEBUG
+	setDebugName("CEmptySceneNode");
+#endif
+
+	setAutomaticCulling(scene::EAC_OFF);
+}
+
+//! pre render event
+void CEmptySceneNode::OnRegisterSceneNode()
+{
+	if (IsVisible)
+		SceneManager->registerNodeForRendering(this);
+
+	ISceneNode::OnRegisterSceneNode();
+}
+
+//! render
+void CEmptySceneNode::render()
+{
+	// do nothing
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CEmptySceneNode::getBoundingBox() const
+{
+	return Box;
+}
+
+//! Creates a clone of this scene node and its children.
+ISceneNode *CEmptySceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CEmptySceneNode *nb = new CEmptySceneNode(newParent,
+			newManager, ID);
+
+	nb->cloneMembers(this, newManager);
+	nb->Box = Box;
+
+	if (newParent)
+		nb->drop();
+	return nb;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CEmptySceneNode.h b/irr/src/CEmptySceneNode.h
new file mode 100644
index 000000000..c89ad59ae
--- /dev/null
+++ b/irr/src/CEmptySceneNode.h
@@ -0,0 +1,40 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneNode.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class CEmptySceneNode : public ISceneNode
+{
+public:
+	//! constructor
+	CEmptySceneNode(ISceneNode *parent, ISceneManager *mgr, s32 id);
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! This method is called just before the rendering process of the whole scene.
+	void OnRegisterSceneNode() override;
+
+	//! does nothing.
+	void render() override;
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_EMPTY; }
+
+	//! Creates a clone of this scene node and its children.
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+private:
+	core::aabbox3d<f32> Box;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CFPSCounter.cpp b/irr/src/CFPSCounter.cpp
new file mode 100644
index 000000000..6717df5c9
--- /dev/null
+++ b/irr/src/CFPSCounter.cpp
@@ -0,0 +1,66 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CFPSCounter.h"
+#include "irrMath.h"
+
+namespace irr
+{
+namespace video
+{
+
+CFPSCounter::CFPSCounter() :
+		FPS(60), Primitive(0), StartTime(0), FramesCounted(0),
+		PrimitivesCounted(0), PrimitiveAverage(0), PrimitiveTotal(0)
+{
+}
+
+//! returns current fps
+s32 CFPSCounter::getFPS() const
+{
+	return FPS;
+}
+
+//! returns current primitive count
+u32 CFPSCounter::getPrimitive() const
+{
+	return Primitive;
+}
+
+//! returns average primitive count of last period
+u32 CFPSCounter::getPrimitiveAverage() const
+{
+	return PrimitiveAverage;
+}
+
+//! returns accumulated primitive count since start
+u32 CFPSCounter::getPrimitiveTotal() const
+{
+	return PrimitiveTotal;
+}
+
+//! to be called every frame
+void CFPSCounter::registerFrame(u32 now, u32 primitivesDrawn)
+{
+	++FramesCounted;
+	PrimitiveTotal += primitivesDrawn;
+	PrimitivesCounted += primitivesDrawn;
+	Primitive = primitivesDrawn;
+
+	const u32 milliseconds = now - StartTime;
+
+	if (milliseconds >= 1500) {
+		const f32 invMilli = core::reciprocal((f32)milliseconds);
+
+		FPS = core::ceil32((1000 * FramesCounted) * invMilli);
+		PrimitiveAverage = core::ceil32((1000 * PrimitivesCounted) * invMilli);
+
+		FramesCounted = 0;
+		PrimitivesCounted = 0;
+		StartTime = now;
+	}
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CFPSCounter.h b/irr/src/CFPSCounter.h
new file mode 100644
index 000000000..e73afb049
--- /dev/null
+++ b/irr/src/CFPSCounter.h
@@ -0,0 +1,46 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+class CFPSCounter
+{
+public:
+	CFPSCounter();
+
+	//! returns current fps
+	s32 getFPS() const;
+
+	//! returns primitive count
+	u32 getPrimitive() const;
+
+	//! returns average primitive count of last period
+	u32 getPrimitiveAverage() const;
+
+	//! returns accumulated primitive count since start
+	u32 getPrimitiveTotal() const;
+
+	//! to be called every frame
+	void registerFrame(u32 now, u32 primitive);
+
+private:
+	s32 FPS;
+	u32 Primitive;
+	u32 StartTime;
+
+	u32 FramesCounted;
+	u32 PrimitivesCounted;
+	u32 PrimitiveAverage;
+	u32 PrimitiveTotal;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CFileList.cpp b/irr/src/CFileList.cpp
new file mode 100644
index 000000000..dde8e75ac
--- /dev/null
+++ b/irr/src/CFileList.cpp
@@ -0,0 +1,155 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CFileList.h"
+#include "irrArray.h"
+#include "coreutil.h"
+
+#include "os.h"
+
+namespace irr
+{
+namespace io
+{
+
+static const io::path emptyFileListEntry;
+
+CFileList::CFileList(const io::path &path, bool ignoreCase, bool ignorePaths) :
+		IgnorePaths(ignorePaths), IgnoreCase(ignoreCase), Path(path)
+{
+#ifdef _DEBUG
+	setDebugName("CFileList");
+#endif
+
+	Path.replace('\\', '/');
+}
+
+CFileList::~CFileList()
+{
+	Files.clear();
+}
+
+u32 CFileList::getFileCount() const
+{
+	return Files.size();
+}
+
+void CFileList::sort()
+{
+	Files.sort();
+}
+
+const io::path &CFileList::getFileName(u32 index) const
+{
+	if (index >= Files.size())
+		return emptyFileListEntry;
+
+	return Files[index].Name;
+}
+
+//! Gets the full name of a file in the list, path included, based on an index.
+const io::path &CFileList::getFullFileName(u32 index) const
+{
+	if (index >= Files.size())
+		return emptyFileListEntry;
+
+	return Files[index].FullName;
+}
+
+//! adds a file or folder
+u32 CFileList::addItem(const io::path &fullPath, u32 offset, u32 size, bool isDirectory, u32 id)
+{
+	SFileListEntry entry;
+	entry.ID = id ? id : Files.size();
+	entry.Offset = offset;
+	entry.Size = size;
+	entry.Name = fullPath;
+	entry.Name.replace('\\', '/');
+	entry.IsDirectory = isDirectory;
+
+	// remove trailing slash
+	if (entry.Name.lastChar() == '/') {
+		entry.IsDirectory = true;
+		entry.Name[entry.Name.size() - 1] = 0;
+		entry.Name.validate();
+	}
+
+	if (IgnoreCase)
+		entry.Name.make_lower();
+
+	entry.FullName = entry.Name;
+
+	core::deletePathFromFilename(entry.Name);
+
+	if (IgnorePaths)
+		entry.FullName = entry.Name;
+
+	// os::Printer::log(Path.c_str(), entry.FullName);
+
+	Files.push_back(entry);
+
+	return Files.size() - 1;
+}
+
+//! Returns the ID of a file in the file list, based on an index.
+u32 CFileList::getID(u32 index) const
+{
+	return index < Files.size() ? Files[index].ID : 0;
+}
+
+bool CFileList::isDirectory(u32 index) const
+{
+	bool ret = false;
+	if (index < Files.size())
+		ret = Files[index].IsDirectory;
+
+	return ret;
+}
+
+//! Returns the size of a file
+u32 CFileList::getFileSize(u32 index) const
+{
+	return index < Files.size() ? Files[index].Size : 0;
+}
+
+u32 CFileList::getFileOffset(u32 index) const
+{
+	return index < Files.size() ? Files[index].Offset : 0;
+}
+
+//! Searches for a file or folder within the list, returns the index
+s32 CFileList::findFile(const io::path &filename, bool isDirectory = false) const
+{
+	SFileListEntry entry;
+	// we only need FullName to be set for the search
+	entry.FullName = filename;
+	entry.IsDirectory = isDirectory;
+
+	// exchange
+	entry.FullName.replace('\\', '/');
+
+	// remove trailing slash
+	if (entry.FullName.lastChar() == '/') {
+		entry.IsDirectory = true;
+		entry.FullName[entry.FullName.size() - 1] = 0;
+		entry.FullName.validate();
+	}
+
+	if (IgnoreCase)
+		entry.FullName.make_lower();
+
+	if (IgnorePaths)
+		core::deletePathFromFilename(entry.FullName);
+
+	return Files.binary_search(entry);
+}
+
+//! Returns the base path of the file list
+const io::path &CFileList::getPath() const
+{
+	return Path;
+}
+
+} // end namespace irr
+} // end namespace io
diff --git a/irr/src/CFileList.h b/irr/src/CFileList.h
new file mode 100644
index 000000000..1af975b22
--- /dev/null
+++ b/irr/src/CFileList.h
@@ -0,0 +1,128 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IFileList.h"
+#include "irrString.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace io
+{
+
+//! An entry in a list of files, can be a folder or a file.
+struct SFileListEntry
+{
+	//! The name of the file
+	/** If this is a file or folder in the virtual filesystem and the archive
+	was created with the ignoreCase flag then the file name will be lower case. */
+	io::path Name;
+
+	//! The name of the file including the path
+	/** If this is a file or folder in the virtual filesystem and the archive was
+	created with the ignoreDirs flag then it will be the same as Name. */
+	io::path FullName;
+
+	//! The size of the file in bytes
+	u32 Size;
+
+	//! The ID of the file in an archive
+	/** This is used to link the FileList entry to extra info held about this
+	file in an archive, which can hold things like data offset and CRC. */
+	u32 ID;
+
+	//! FileOffset inside an archive
+	u32 Offset;
+
+	//! True if this is a folder, false if not.
+	bool IsDirectory;
+
+	//! The == operator is provided so that CFileList can slowly search the list!
+	bool operator==(const struct SFileListEntry &other) const
+	{
+		if (IsDirectory != other.IsDirectory)
+			return false;
+
+		return FullName.equals_ignore_case(other.FullName);
+	}
+
+	//! The < operator is provided so that CFileList can sort and quickly search the list.
+	bool operator<(const struct SFileListEntry &other) const
+	{
+		if (IsDirectory != other.IsDirectory)
+			return IsDirectory;
+
+		return FullName.lower_ignore_case(other.FullName);
+	}
+};
+
+//! Implementation of a file list
+class CFileList : public IFileList
+{
+public:
+	// CFileList methods
+
+	//! Constructor
+	/** \param path The path of this file archive */
+	CFileList(const io::path &path, bool ignoreCase, bool ignorePaths);
+
+	//! Destructor
+	virtual ~CFileList();
+
+	//! Add as a file or folder to the list
+	/** \param fullPath The file name including path, up to the root of the file list.
+	\param isDirectory True if this is a directory rather than a file.
+	\param offset The offset where the file is stored in an archive
+	\param size The size of the file in bytes.
+	\param id The ID of the file in the archive which owns it */
+	u32 addItem(const io::path &fullPath, u32 offset, u32 size, bool isDirectory, u32 id = 0) override;
+
+	//! Sorts the file list. You should call this after adding any items to the file list
+	void sort() override;
+
+	//! Returns the amount of files in the filelist.
+	u32 getFileCount() const override;
+
+	//! Gets the name of a file in the list, based on an index.
+	const io::path &getFileName(u32 index) const override;
+
+	//! Gets the full name of a file in the list, path included, based on an index.
+	const io::path &getFullFileName(u32 index) const override;
+
+	//! Returns the ID of a file in the file list, based on an index.
+	u32 getID(u32 index) const override;
+
+	//! Returns true if the file is a directory
+	bool isDirectory(u32 index) const override;
+
+	//! Returns the size of a file
+	u32 getFileSize(u32 index) const override;
+
+	//! Returns the offset of a file
+	u32 getFileOffset(u32 index) const override;
+
+	//! Searches for a file or folder within the list, returns the index
+	s32 findFile(const io::path &filename, bool isFolder) const override;
+
+	//! Returns the base path of the file list
+	const io::path &getPath() const override;
+
+protected:
+	//! Ignore paths when adding or searching for files
+	bool IgnorePaths;
+
+	//! Ignore case when adding or searching for files
+	bool IgnoreCase;
+
+	//! Path to the file list
+	io::path Path;
+
+	//! List of files
+	core::array<SFileListEntry> Files;
+};
+
+} // end namespace irr
+} // end namespace io
diff --git a/irr/src/CFileSystem.cpp b/irr/src/CFileSystem.cpp
new file mode 100644
index 000000000..bffb703dd
--- /dev/null
+++ b/irr/src/CFileSystem.cpp
@@ -0,0 +1,762 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CFileSystem.h"
+#include "IReadFile.h"
+#include "IWriteFile.h"
+#include "CZipReader.h"
+#include "CFileList.h"
+#include "stdio.h"
+#include "os.h"
+#include "CReadFile.h"
+#include "CMemoryFile.h"
+#include "CLimitReadFile.h"
+#include "CWriteFile.h"
+#include <list>
+
+#if defined(__STRICT_ANSI__)
+#error Compiling with __STRICT_ANSI__ not supported. g++ does set this when compiling with -std=c++11 or -std=c++0x. Use instead -std=gnu++11 or -std=gnu++0x. Or use -U__STRICT_ANSI__ to disable strict ansi.
+#endif
+
+#if defined(_IRR_WINDOWS_API_)
+#include <direct.h> // for _chdir
+#include <io.h>     // for _access
+#include <tchar.h>
+#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#elif defined(_IRR_EMSCRIPTEN_PLATFORM_)
+#include <unistd.h>
+#endif
+
+namespace irr
+{
+namespace io
+{
+
+//! constructor
+CFileSystem::CFileSystem()
+{
+#ifdef _DEBUG
+	setDebugName("CFileSystem");
+#endif
+
+	setFileListSystem(FILESYSTEM_NATIVE);
+	//! reset current working directory
+	getWorkingDirectory();
+
+	ArchiveLoader.push_back(new CArchiveLoaderZIP(this));
+}
+
+//! destructor
+CFileSystem::~CFileSystem()
+{
+	u32 i;
+
+	for (i = 0; i < FileArchives.size(); ++i) {
+		FileArchives[i]->drop();
+	}
+
+	for (i = 0; i < ArchiveLoader.size(); ++i) {
+		ArchiveLoader[i]->drop();
+	}
+}
+
+//! opens a file for read access
+IReadFile *CFileSystem::createAndOpenFile(const io::path &filename)
+{
+	if (filename.empty())
+		return 0;
+
+	IReadFile *file = 0;
+	u32 i;
+
+	for (i = 0; i < FileArchives.size(); ++i) {
+		file = FileArchives[i]->createAndOpenFile(filename);
+		if (file)
+			return file;
+	}
+
+	// Create the file using an absolute path so that it matches
+	// the scheme used by CNullDriver::getTexture().
+	return CReadFile::createReadFile(getAbsolutePath(filename));
+}
+
+//! Creates an IReadFile interface for treating memory like a file.
+IReadFile *CFileSystem::createMemoryReadFile(const void *memory, s32 len,
+		const io::path &fileName, bool deleteMemoryWhenDropped)
+{
+	if (!memory)
+		return 0;
+	else
+		return new CMemoryReadFile(memory, len, fileName, deleteMemoryWhenDropped);
+}
+
+//! Creates an IReadFile interface for reading files inside files
+IReadFile *CFileSystem::createLimitReadFile(const io::path &fileName,
+		IReadFile *alreadyOpenedFile, long pos, long areaSize)
+{
+	if (!alreadyOpenedFile)
+		return 0;
+	else
+		return new CLimitReadFile(alreadyOpenedFile, pos, areaSize, fileName);
+}
+
+//! Creates an IReadFile interface for treating memory like a file.
+IWriteFile *CFileSystem::createMemoryWriteFile(void *memory, s32 len,
+		const io::path &fileName, bool deleteMemoryWhenDropped)
+{
+	if (!memory)
+		return 0;
+	else
+		return new CMemoryWriteFile(memory, len, fileName, deleteMemoryWhenDropped);
+}
+
+//! Opens a file for write access.
+IWriteFile *CFileSystem::createAndWriteFile(const io::path &filename, bool append)
+{
+	return CWriteFile::createWriteFile(filename, append);
+}
+
+//! Adds an external archive loader to the engine.
+void CFileSystem::addArchiveLoader(IArchiveLoader *loader)
+{
+	if (!loader)
+		return;
+
+	loader->grab();
+	ArchiveLoader.push_back(loader);
+}
+
+//! Returns the total number of archive loaders added.
+u32 CFileSystem::getArchiveLoaderCount() const
+{
+	return ArchiveLoader.size();
+}
+
+//! Gets the archive loader by index.
+IArchiveLoader *CFileSystem::getArchiveLoader(u32 index) const
+{
+	if (index < ArchiveLoader.size())
+		return ArchiveLoader[index];
+	else
+		return 0;
+}
+
+//! move the hirarchy of the filesystem. moves sourceIndex relative up or down
+bool CFileSystem::moveFileArchive(u32 sourceIndex, s32 relative)
+{
+	bool r = false;
+	const s32 dest = (s32)sourceIndex + relative;
+	const s32 dir = relative < 0 ? -1 : 1;
+	const s32 sourceEnd = ((s32)FileArchives.size()) - 1;
+	IFileArchive *t;
+
+	for (s32 s = (s32)sourceIndex; s != dest; s += dir) {
+		if (s < 0 || s > sourceEnd || s + dir < 0 || s + dir > sourceEnd)
+			continue;
+
+		t = FileArchives[s + dir];
+		FileArchives[s + dir] = FileArchives[s];
+		FileArchives[s] = t;
+		r = true;
+	}
+	return r;
+}
+
+//! Adds an archive to the file system.
+bool CFileSystem::addFileArchive(const io::path &filename, bool ignoreCase,
+		bool ignorePaths, E_FILE_ARCHIVE_TYPE archiveType,
+		const core::stringc &password,
+		IFileArchive **retArchive)
+{
+	IFileArchive *archive = 0;
+	bool ret = false;
+
+	// see if archive is already added
+
+	s32 i;
+
+	// do we know what type it should be?
+	if (archiveType == EFAT_UNKNOWN) {
+		// try to load archive based on file name
+		for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+			if (ArchiveLoader[i]->isALoadableFileFormat(filename)) {
+				archive = ArchiveLoader[i]->createArchive(filename, ignoreCase, ignorePaths);
+				if (archive)
+					break;
+			}
+		}
+
+		// try to load archive based on content
+		if (!archive) {
+			io::IReadFile *file = createAndOpenFile(filename);
+			if (file) {
+				for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+					file->seek(0);
+					if (ArchiveLoader[i]->isALoadableFileFormat(file)) {
+						file->seek(0);
+						archive = ArchiveLoader[i]->createArchive(file, ignoreCase, ignorePaths);
+						if (archive)
+							break;
+					}
+				}
+				file->drop();
+			}
+		}
+	} else {
+		// try to open archive based on archive loader type
+
+		io::IReadFile *file = 0;
+
+		for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+			if (ArchiveLoader[i]->isALoadableFileFormat(archiveType)) {
+				// attempt to open file
+				if (!file)
+					file = createAndOpenFile(filename);
+
+				// is the file open?
+				if (file) {
+					// attempt to open archive
+					file->seek(0);
+					if (ArchiveLoader[i]->isALoadableFileFormat(file)) {
+						file->seek(0);
+						archive = ArchiveLoader[i]->createArchive(file, ignoreCase, ignorePaths);
+						if (archive)
+							break;
+					}
+				} else {
+					// couldn't open file
+					break;
+				}
+			}
+		}
+
+		// if open, close the file
+		if (file)
+			file->drop();
+	}
+
+	if (archive) {
+		FileArchives.push_back(archive);
+		if (password.size())
+			archive->Password = password;
+		if (retArchive)
+			*retArchive = archive;
+		ret = true;
+	} else {
+		os::Printer::log("Could not create archive for", filename, ELL_ERROR);
+	}
+
+	return ret;
+}
+
+bool CFileSystem::addFileArchive(IReadFile *file, bool ignoreCase,
+		bool ignorePaths, E_FILE_ARCHIVE_TYPE archiveType,
+		const core::stringc &password, IFileArchive **retArchive)
+{
+	if (!file)
+		return false;
+
+	if (file) {
+		IFileArchive *archive = 0;
+		s32 i;
+
+		if (archiveType == EFAT_UNKNOWN) {
+			// try to load archive based on file name
+			for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+				if (ArchiveLoader[i]->isALoadableFileFormat(file->getFileName())) {
+					archive = ArchiveLoader[i]->createArchive(file, ignoreCase, ignorePaths);
+					if (archive)
+						break;
+				}
+			}
+
+			// try to load archive based on content
+			if (!archive) {
+				for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+					file->seek(0);
+					if (ArchiveLoader[i]->isALoadableFileFormat(file)) {
+						file->seek(0);
+						archive = ArchiveLoader[i]->createArchive(file, ignoreCase, ignorePaths);
+						if (archive)
+							break;
+					}
+				}
+			}
+		} else {
+			// try to open archive based on archive loader type
+			for (i = ArchiveLoader.size() - 1; i >= 0; --i) {
+				if (ArchiveLoader[i]->isALoadableFileFormat(archiveType)) {
+					// attempt to open archive
+					file->seek(0);
+					if (ArchiveLoader[i]->isALoadableFileFormat(file)) {
+						file->seek(0);
+						archive = ArchiveLoader[i]->createArchive(file, ignoreCase, ignorePaths);
+						if (archive)
+							break;
+					}
+				}
+			}
+		}
+
+		if (archive) {
+			FileArchives.push_back(archive);
+			if (password.size())
+				archive->Password = password;
+			if (retArchive)
+				*retArchive = archive;
+			return true;
+		} else {
+			os::Printer::log("Could not create archive for", file->getFileName(), ELL_ERROR);
+		}
+	}
+
+	return false;
+}
+
+//! Adds an archive to the file system.
+bool CFileSystem::addFileArchive(IFileArchive *archive)
+{
+	if (archive) {
+		for (u32 i = 0; i < FileArchives.size(); ++i) {
+			if (archive == FileArchives[i]) {
+				return false;
+			}
+		}
+		FileArchives.push_back(archive);
+		archive->grab();
+
+		return true;
+	}
+
+	return false;
+}
+
+//! removes an archive from the file system.
+bool CFileSystem::removeFileArchive(u32 index)
+{
+	bool ret = false;
+	if (index < FileArchives.size()) {
+		FileArchives[index]->drop();
+		FileArchives.erase(index);
+		ret = true;
+	}
+	return ret;
+}
+
+//! removes an archive from the file system.
+bool CFileSystem::removeFileArchive(const io::path &filename)
+{
+	const path absPath = getAbsolutePath(filename);
+	for (u32 i = 0; i < FileArchives.size(); ++i) {
+		if (absPath == FileArchives[i]->getFileList()->getPath())
+			return removeFileArchive(i);
+	}
+	return false;
+}
+
+//! Removes an archive from the file system.
+bool CFileSystem::removeFileArchive(const IFileArchive *archive)
+{
+	for (u32 i = 0; i < FileArchives.size(); ++i) {
+		if (archive == FileArchives[i]) {
+			return removeFileArchive(i);
+		}
+	}
+	return false;
+}
+
+//! gets an archive
+u32 CFileSystem::getFileArchiveCount() const
+{
+	return FileArchives.size();
+}
+
+IFileArchive *CFileSystem::getFileArchive(u32 index)
+{
+	return index < getFileArchiveCount() ? FileArchives[index] : 0;
+}
+
+//! Returns the string of the current working directory
+const io::path &CFileSystem::getWorkingDirectory()
+{
+	EFileSystemType type = FileSystemType;
+
+	if (type != FILESYSTEM_NATIVE) {
+		type = FILESYSTEM_VIRTUAL;
+	} else {
+#if defined(_IRR_WINDOWS_API_)
+		fschar_t tmp[_MAX_PATH];
+		_getcwd(tmp, _MAX_PATH);
+		WorkingDirectory[FILESYSTEM_NATIVE] = tmp;
+		WorkingDirectory[FILESYSTEM_NATIVE].replace('\\', '/');
+#endif
+
+#if (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
+
+		// getting the CWD is rather complex as we do not know the size
+		// so try it until the call was successful
+		// Note that neither the first nor the second parameter may be 0 according to POSIX
+
+		u32 pathSize = 256;
+		char *tmpPath = new char[pathSize];
+		while ((pathSize < (1 << 16)) && !(getcwd(tmpPath, pathSize))) {
+			delete[] tmpPath;
+			pathSize *= 2;
+			tmpPath = new char[pathSize];
+		}
+		if (tmpPath) {
+			WorkingDirectory[FILESYSTEM_NATIVE] = tmpPath;
+			delete[] tmpPath;
+		}
+#endif
+
+		WorkingDirectory[type].validate();
+	}
+
+	return WorkingDirectory[type];
+}
+
+//! Changes the current Working Directory to the given string.
+bool CFileSystem::changeWorkingDirectoryTo(const io::path &newDirectory)
+{
+	bool success = false;
+
+	if (FileSystemType != FILESYSTEM_NATIVE) {
+		WorkingDirectory[FILESYSTEM_VIRTUAL] = newDirectory;
+		// is this empty string constant really intended?
+		flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], _IRR_TEXT(""));
+		success = true;
+	} else {
+		WorkingDirectory[FILESYSTEM_NATIVE] = newDirectory;
+
+#if defined(_MSC_VER)
+		success = (_chdir(newDirectory.c_str()) == 0);
+#else
+		success = (chdir(newDirectory.c_str()) == 0);
+#endif
+	}
+
+	return success;
+}
+
+io::path CFileSystem::getAbsolutePath(const io::path &filename) const
+{
+	if (filename.empty())
+		return filename;
+#if defined(_IRR_WINDOWS_API_)
+	fschar_t *p = 0;
+	fschar_t fpath[_MAX_PATH];
+	p = _fullpath(fpath, filename.c_str(), _MAX_PATH);
+	core::stringc tmp(p);
+	tmp.replace('\\', '/');
+	return tmp;
+#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
+	c8 *p = 0;
+	c8 fpath[4096];
+	fpath[0] = 0;
+	p = realpath(filename.c_str(), fpath);
+	if (!p) {
+		// content in fpath is unclear at this point
+		if (!fpath[0]) { // seems like fpath wasn't altered, use our best guess
+			io::path tmp(filename);
+			return flattenFilename(tmp);
+		} else
+			return io::path(fpath);
+	}
+	if (filename[filename.size() - 1] == '/')
+		return io::path(p) + _IRR_TEXT("/");
+	else
+		return io::path(p);
+#else
+	return io::path(filename);
+#endif
+}
+
+//! returns the directory part of a filename, i.e. all until the first
+//! slash or backslash, excluding it. If no directory path is prefixed, a '.'
+//! is returned.
+io::path CFileSystem::getFileDir(const io::path &filename) const
+{
+	// find last forward or backslash
+	s32 lastSlash = filename.findLast('/');
+	const s32 lastBackSlash = filename.findLast('\\');
+	lastSlash = lastSlash > lastBackSlash ? lastSlash : lastBackSlash;
+
+	if ((u32)lastSlash < filename.size())
+		return filename.subString(0, lastSlash);
+	else
+		return _IRR_TEXT(".");
+}
+
+//! returns the base part of a filename, i.e. all except for the directory
+//! part. If no directory path is prefixed, the full name is returned.
+io::path CFileSystem::getFileBasename(const io::path &filename, bool keepExtension) const
+{
+	// find last forward or backslash
+	s32 lastSlash = filename.findLast('/');
+	const s32 lastBackSlash = filename.findLast('\\');
+	lastSlash = core::max_(lastSlash, lastBackSlash);
+
+	// get number of chars after last dot
+	s32 end = 0;
+	if (!keepExtension) {
+		// take care to search only after last slash to check only for
+		// dots in the filename
+		end = filename.findLast('.');
+		if (end == -1 || end < lastSlash)
+			end = 0;
+		else
+			end = filename.size() - end;
+	}
+
+	if ((u32)lastSlash < filename.size())
+		return filename.subString(lastSlash + 1, filename.size() - lastSlash - 1 - end);
+	else if (end != 0)
+		return filename.subString(0, filename.size() - end);
+	else
+		return filename;
+}
+
+//! flatten a path and file name for example: "/you/me/../." becomes "/you"
+io::path &CFileSystem::flattenFilename(io::path &directory, const io::path &root) const
+{
+	directory.replace('\\', '/');
+	if (directory.lastChar() != '/')
+		directory.append('/');
+
+	io::path dir;
+	io::path subdir;
+
+	s32 lastpos = 0;
+	s32 pos = 0;
+	bool lastWasRealDir = false;
+
+	while ((pos = directory.findNext('/', lastpos)) >= 0) {
+		subdir = directory.subString(lastpos, pos - lastpos + 1);
+
+		if (subdir == _IRR_TEXT("../")) {
+			if (lastWasRealDir) {
+				deletePathFromPath(dir, 2);
+				lastWasRealDir = (dir.size() != 0);
+			} else {
+				dir.append(subdir);
+				lastWasRealDir = false;
+			}
+		} else if (subdir == _IRR_TEXT("/")) {
+			dir = root;
+		} else if (subdir != _IRR_TEXT("./")) {
+			dir.append(subdir);
+			lastWasRealDir = true;
+		}
+
+		lastpos = pos + 1;
+	}
+	directory = dir;
+	return directory;
+}
+
+//! Get the relative filename, relative to the given directory
+path CFileSystem::getRelativeFilename(const path &filename, const path &directory) const
+{
+	if (filename.empty() || directory.empty())
+		return filename;
+
+	io::path path1, file, ext;
+	core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext);
+	io::path path2(getAbsolutePath(directory));
+	std::list<io::path> list1, list2;
+	path1.split(list1, _IRR_TEXT("/\\"), 2);
+	path2.split(list2, _IRR_TEXT("/\\"), 2);
+	std::list<io::path>::const_iterator it1, it2;
+	it1 = list1.begin();
+	it2 = list2.begin();
+
+#if defined(_IRR_WINDOWS_API_)
+	fschar_t partition1 = 0, partition2 = 0;
+	io::path prefix1, prefix2;
+	if (it1 != list1.end())
+		prefix1 = *it1;
+	if (it2 != list2.end())
+		prefix2 = *it2;
+	if (prefix1.size() > 1 && prefix1[1] == _IRR_TEXT(':'))
+		partition1 = core::locale_lower(prefix1[0]);
+	if (prefix2.size() > 1 && prefix2[1] == _IRR_TEXT(':'))
+		partition2 = core::locale_lower(prefix2[0]);
+
+	// must have the same prefix or we can't resolve it to a relative filename
+	if (partition1 != partition2) {
+		return filename;
+	}
+#endif
+
+	for (; it1 != list1.end() && it2 != list2.end()
+#if defined(_IRR_WINDOWS_API_)
+			&& (io::path(*it1).make_lower() == io::path(*it2).make_lower())
+#else
+			&& (*it1 == *it2)
+#endif
+					;) {
+		++it1;
+		++it2;
+	}
+	path1 = _IRR_TEXT("");
+	for (; it2 != list2.end(); ++it2)
+		path1 += _IRR_TEXT("../");
+	while (it1 != list1.end()) {
+		path1 += *it1++;
+		path1 += _IRR_TEXT('/');
+	}
+	path1 += file;
+	if (ext.size()) {
+		path1 += _IRR_TEXT('.');
+		path1 += ext;
+	}
+	return path1;
+}
+
+//! Sets the current file systen type
+EFileSystemType CFileSystem::setFileListSystem(EFileSystemType listType)
+{
+	EFileSystemType current = FileSystemType;
+	FileSystemType = listType;
+	return current;
+}
+
+//! Creates a list of files and directories in the current working directory
+IFileList *CFileSystem::createFileList()
+{
+	CFileList *r = 0;
+	io::path Path = getWorkingDirectory();
+	Path.replace('\\', '/');
+	if (!Path.empty() && Path.lastChar() != '/')
+		Path.append('/');
+
+	//! Construct from native filesystem
+	if (FileSystemType == FILESYSTEM_NATIVE) {
+// --------------------------------------------
+//! Windows version
+#ifdef _IRR_WINDOWS_API_
+
+		r = new CFileList(Path, true, false);
+
+		// intptr_t is optional but supported by MinGW since 2007 or earlier.
+		intptr_t hFile;
+		struct _tfinddata_t c_file;
+		if ((hFile = _tfindfirst(_T("*"), &c_file)) != (intptr_t)(-1L)) {
+			do {
+				r->addItem(Path + c_file.name, 0, c_file.size, (_A_SUBDIR & c_file.attrib) != 0, 0);
+			} while (_tfindnext(hFile, &c_file) == 0);
+
+			_findclose(hFile);
+		}
+
+#endif
+
+// --------------------------------------------
+//! Linux version
+#if (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
+
+		r = new CFileList(Path, false, false);
+
+		r->addItem(Path + _IRR_TEXT(".."), 0, 0, true, 0);
+
+		//! We use the POSIX compliant methods instead of scandir
+		DIR *dirHandle = opendir(Path.c_str());
+		if (dirHandle) {
+			struct dirent *dirEntry;
+			while ((dirEntry = readdir(dirHandle))) {
+				u32 size = 0;
+				bool isDirectory = false;
+
+				if ((strcmp(dirEntry->d_name, ".") == 0) ||
+						(strcmp(dirEntry->d_name, "..") == 0)) {
+					continue;
+				}
+				struct stat buf;
+				if (stat(dirEntry->d_name, &buf) == 0) {
+					size = buf.st_size;
+					isDirectory = S_ISDIR(buf.st_mode);
+				}
+#if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__) && !defined(__HAIKU__)
+				// only available on some systems
+				else {
+					isDirectory = dirEntry->d_type == DT_DIR;
+				}
+#endif
+
+				r->addItem(Path + dirEntry->d_name, 0, size, isDirectory, 0);
+			}
+			closedir(dirHandle);
+		}
+#endif
+	} else {
+		//! create file list for the virtual filesystem
+		r = new CFileList(Path, false, false);
+
+		//! add relative navigation
+		SFileListEntry e2;
+		SFileListEntry e3;
+
+		//! PWD
+		r->addItem(Path + _IRR_TEXT("."), 0, 0, true, 0);
+
+		//! parent
+		r->addItem(Path + _IRR_TEXT(".."), 0, 0, true, 0);
+
+		//! merge archives
+		for (u32 i = 0; i < FileArchives.size(); ++i) {
+			const IFileList *merge = FileArchives[i]->getFileList();
+
+			for (u32 j = 0; j < merge->getFileCount(); ++j) {
+				if (core::isInSameDirectory(Path, merge->getFullFileName(j)) == 0) {
+					r->addItem(merge->getFullFileName(j), merge->getFileOffset(j), merge->getFileSize(j), merge->isDirectory(j), 0);
+				}
+			}
+		}
+	}
+
+	if (r)
+		r->sort();
+	return r;
+}
+
+//! Creates an empty filelist
+IFileList *CFileSystem::createEmptyFileList(const io::path &path, bool ignoreCase, bool ignorePaths)
+{
+	return new CFileList(path, ignoreCase, ignorePaths);
+}
+
+//! determines if a file exists and would be able to be opened.
+bool CFileSystem::existFile(const io::path &filename) const
+{
+	for (u32 i = 0; i < FileArchives.size(); ++i)
+		if (FileArchives[i]->getFileList()->findFile(filename) != -1)
+			return true;
+
+#if defined(_MSC_VER)
+	return (_access(filename.c_str(), 0) != -1);
+#elif defined(F_OK)
+	return (access(filename.c_str(), F_OK) != -1);
+#else
+	return (access(filename.c_str(), 0) != -1);
+#endif
+}
+
+//! creates a filesystem which is able to open files from the ordinary file system,
+//! and out of zipfiles, which are able to be added to the filesystem.
+IFileSystem *createFileSystem()
+{
+	return new CFileSystem();
+}
+
+} // end namespace irr
+} // end namespace io
diff --git a/irr/src/CFileSystem.h b/irr/src/CFileSystem.h
new file mode 100644
index 000000000..18bc7ff3f
--- /dev/null
+++ b/irr/src/CFileSystem.h
@@ -0,0 +1,138 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IFileSystem.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace io
+{
+
+class CZipReader;
+
+/*!
+	FileSystem which uses normal files and one zipfile
+*/
+class CFileSystem : public IFileSystem
+{
+public:
+	//! constructor
+	CFileSystem();
+
+	//! destructor
+	virtual ~CFileSystem();
+
+	//! opens a file for read access
+	IReadFile *createAndOpenFile(const io::path &filename) override;
+
+	//! Creates an IReadFile interface for accessing memory like a file.
+	IReadFile *createMemoryReadFile(const void *memory, s32 len, const io::path &fileName, bool deleteMemoryWhenDropped = false) override;
+
+	//! Creates an IReadFile interface for accessing files inside files
+	IReadFile *createLimitReadFile(const io::path &fileName, IReadFile *alreadyOpenedFile, long pos, long areaSize) override;
+
+	//! Creates an IWriteFile interface for accessing memory like a file.
+	IWriteFile *createMemoryWriteFile(void *memory, s32 len, const io::path &fileName, bool deleteMemoryWhenDropped = false) override;
+
+	//! Opens a file for write access.
+	IWriteFile *createAndWriteFile(const io::path &filename, bool append = false) override;
+
+	//! Adds an archive to the file system.
+	virtual bool addFileArchive(const io::path &filename,
+			bool ignoreCase = true, bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			IFileArchive **retArchive = 0) override;
+
+	//! Adds an archive to the file system.
+	virtual bool addFileArchive(IReadFile *file, bool ignoreCase = true,
+			bool ignorePaths = true,
+			E_FILE_ARCHIVE_TYPE archiveType = EFAT_UNKNOWN,
+			const core::stringc &password = "",
+			IFileArchive **retArchive = 0) override;
+
+	//! Adds an archive to the file system.
+	bool addFileArchive(IFileArchive *archive) override;
+
+	//! move the hirarchy of the filesystem. moves sourceIndex relative up or down
+	bool moveFileArchive(u32 sourceIndex, s32 relative) override;
+
+	//! Adds an external archive loader to the engine.
+	void addArchiveLoader(IArchiveLoader *loader) override;
+
+	//! Returns the total number of archive loaders added.
+	u32 getArchiveLoaderCount() const override;
+
+	//! Gets the archive loader by index.
+	IArchiveLoader *getArchiveLoader(u32 index) const override;
+
+	//! gets the file archive count
+	u32 getFileArchiveCount() const override;
+
+	//! gets an archive
+	IFileArchive *getFileArchive(u32 index) override;
+
+	//! removes an archive from the file system.
+	bool removeFileArchive(u32 index) override;
+
+	//! removes an archive from the file system.
+	bool removeFileArchive(const io::path &filename) override;
+
+	//! Removes an archive from the file system.
+	bool removeFileArchive(const IFileArchive *archive) override;
+
+	//! Returns the string of the current working directory
+	const io::path &getWorkingDirectory() override;
+
+	//! Changes the current Working Directory to the string given.
+	//! The string is operating system dependent. Under Windows it will look
+	//! like this: "drive:\directory\sudirectory\"
+	bool changeWorkingDirectoryTo(const io::path &newDirectory) override;
+
+	//! Converts a relative path to an absolute (unique) path, resolving symbolic links
+	io::path getAbsolutePath(const io::path &filename) const override;
+
+	//! Returns the directory a file is located in.
+	/** \param filename: The file to get the directory from */
+	io::path getFileDir(const io::path &filename) const override;
+
+	//! Returns the base part of a filename, i.e. the name without the directory
+	//! part. If no directory is prefixed, the full name is returned.
+	/** \param filename: The file to get the basename from */
+	io::path getFileBasename(const io::path &filename, bool keepExtension = true) const override;
+
+	//! flatten a path and file name for example: "/you/me/../." becomes "/you"
+	io::path &flattenFilename(io::path &directory, const io::path &root = "/") const override;
+
+	//! Get the relative filename, relative to the given directory
+	path getRelativeFilename(const path &filename, const path &directory) const override;
+
+	EFileSystemType setFileListSystem(EFileSystemType listType) override;
+
+	//! Creates a list of files and directories in the current working directory
+	//! and returns it.
+	IFileList *createFileList() override;
+
+	//! Creates an empty filelist
+	IFileList *createEmptyFileList(const io::path &path, bool ignoreCase, bool ignorePaths) override;
+
+	//! determines if a file exists and would be able to be opened.
+	bool existFile(const io::path &filename) const override;
+
+private:
+	//! Currently used FileSystemType
+	EFileSystemType FileSystemType;
+	//! WorkingDirectory for Native and Virtual filesystems
+	io::path WorkingDirectory[2];
+	//! currently attached ArchiveLoaders
+	core::array<IArchiveLoader *> ArchiveLoader;
+	//! currently attached Archives
+	core::array<IFileArchive *> FileArchives;
+};
+
+} // end namespace irr
+} // end namespace io
diff --git a/irr/src/CGLXManager.cpp b/irr/src/CGLXManager.cpp
new file mode 100644
index 000000000..8593621b7
--- /dev/null
+++ b/irr/src/CGLXManager.cpp
@@ -0,0 +1,401 @@
+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "CGLXManager.h"
+
+#ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
+
+#include "os.h"
+
+#define GL_GLEXT_LEGACY 1
+#define GLX_GLXEXT_LEGACY 1
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glext.h>
+#include <GL/glxext.h>
+
+namespace irr
+{
+namespace video
+{
+
+CGLXManager::CGLXManager(const SIrrlichtCreationParameters &params, const SExposedVideoData &videodata, int screennr) :
+		Params(params), PrimaryContext(videodata), VisualInfo(0), glxFBConfig(0), GlxWin(0)
+{
+#ifdef _DEBUG
+	setDebugName("CGLXManager");
+#endif
+
+	CurrentContext.OpenGLLinux.X11Display = PrimaryContext.OpenGLLinux.X11Display;
+
+	int major, minor;
+	Display *display = (Display *)PrimaryContext.OpenGLLinux.X11Display;
+	const bool isAvailableGLX = glXQueryExtension(display, &major, &minor);
+
+	if (isAvailableGLX && glXQueryVersion(display, &major, &minor)) {
+#if defined(GLX_VERSION_1_3)
+		typedef GLXFBConfig *(*PFNGLXCHOOSEFBCONFIGPROC)(Display *dpy, int screen, const int *attrib_list, int *nelements);
+
+		PFNGLXCHOOSEFBCONFIGPROC glxChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glXGetProcAddress(reinterpret_cast<const GLubyte *>("glXChooseFBConfig"));
+		if (major == 1 && minor > 2 && glxChooseFBConfig) {
+			os::Printer::log("GLX >= 1.3", ELL_DEBUG);
+			// attribute array for the draw buffer
+			int visualAttrBuffer[] = {
+					GLX_RENDER_TYPE,
+					GLX_RGBA_BIT,
+					GLX_RED_SIZE,
+					4,
+					GLX_GREEN_SIZE,
+					4,
+					GLX_BLUE_SIZE,
+					4,
+					GLX_ALPHA_SIZE,
+					Params.WithAlphaChannel ? 1 : 0,
+					GLX_DEPTH_SIZE,
+					Params.ZBufferBits, // 10,11
+					GLX_DOUBLEBUFFER,
+					Params.Doublebuffer ? True : False,
+					GLX_STENCIL_SIZE,
+					Params.Stencilbuffer ? 1 : 0,
+#if defined(GLX_VERSION_1_4) && defined(GLX_SAMPLE_BUFFERS) // we need to check the extension string!
+					GLX_SAMPLE_BUFFERS,
+					1,
+					GLX_SAMPLES,
+					Params.AntiAlias, // 18,19
+#elif defined(GLX_ARB_multisample)
+					GLX_SAMPLE_BUFFERS_ARB,
+					1,
+					GLX_SAMPLES_ARB,
+					Params.AntiAlias, // 18,19
+#elif defined(GLX_SGIS_multisample)
+					GLX_SAMPLE_BUFFERS_SGIS,
+					1,
+					GLX_SAMPLES_SGIS,
+					Params.AntiAlias, // 18,19
+#endif
+					GLX_STEREO,
+					Params.Stereobuffer ? True : False,
+					None,
+				};
+
+			GLXFBConfig *configList = 0;
+			int nitems = 0;
+			if (Params.AntiAlias < 2) {
+				visualAttrBuffer[17] = 0;
+				visualAttrBuffer[19] = 0;
+			}
+			// first round with unchanged values
+			{
+				configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+				if (!configList && Params.AntiAlias) {
+					while (!configList && (visualAttrBuffer[19] > 1)) {
+						visualAttrBuffer[19] -= 1;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+					}
+					if (!configList) {
+						visualAttrBuffer[17] = 0;
+						visualAttrBuffer[19] = 0;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+						if (configList) {
+							os::Printer::log("No FSAA available.", ELL_WARNING);
+							Params.AntiAlias = 0;
+						} else {
+							// reenable multisampling
+							visualAttrBuffer[17] = 1;
+							visualAttrBuffer[19] = Params.AntiAlias;
+						}
+					}
+				}
+			}
+			// Next try with flipped stencil buffer value
+			// If the first round was with stencil flag it's now without
+			// Other way round also makes sense because some configs
+			// only have depth buffer combined with stencil buffer
+			if (!configList) {
+				if (Params.Stencilbuffer)
+					os::Printer::log("No stencilbuffer available, disabling stencil shadows.", ELL_WARNING);
+				Params.Stencilbuffer = !Params.Stencilbuffer;
+				visualAttrBuffer[15] = Params.Stencilbuffer ? 1 : 0;
+
+				configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+				if (!configList && Params.AntiAlias) {
+					while (!configList && (visualAttrBuffer[19] > 1)) {
+						visualAttrBuffer[19] -= 1;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+					}
+					if (!configList) {
+						visualAttrBuffer[17] = 0;
+						visualAttrBuffer[19] = 0;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+						if (configList) {
+							os::Printer::log("No FSAA available.", ELL_WARNING);
+							Params.AntiAlias = 0;
+						} else {
+							// reenable multisampling
+							visualAttrBuffer[17] = 1;
+							visualAttrBuffer[19] = Params.AntiAlias;
+						}
+					}
+				}
+			}
+			// Next try without double buffer
+			if (!configList && Params.Doublebuffer) {
+				os::Printer::log("No doublebuffering available.", ELL_WARNING);
+				Params.Doublebuffer = false;
+				visualAttrBuffer[13] = GLX_DONT_CARE;
+				Params.Stencilbuffer = false;
+				visualAttrBuffer[15] = 0;
+				configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+				if (!configList && Params.AntiAlias) {
+					while (!configList && (visualAttrBuffer[19] > 1)) {
+						visualAttrBuffer[19] -= 1;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+					}
+					if (!configList) {
+						visualAttrBuffer[17] = 0;
+						visualAttrBuffer[19] = 0;
+						configList = glxChooseFBConfig(display, screennr, visualAttrBuffer, &nitems);
+						if (configList) {
+							os::Printer::log("No FSAA available.", ELL_WARNING);
+							Params.AntiAlias = 0;
+						} else {
+							// reenable multisampling
+							visualAttrBuffer[17] = 1;
+							visualAttrBuffer[19] = Params.AntiAlias;
+						}
+					}
+				}
+			}
+			if (configList) {
+				glxFBConfig = configList[0];
+				XFree(configList);
+				typedef XVisualInfo *(*PFNGLXGETVISUALFROMFBCONFIGPROC)(Display *dpy, GLXFBConfig config);
+				PFNGLXGETVISUALFROMFBCONFIGPROC glxGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glXGetProcAddress(reinterpret_cast<const GLubyte *>("glXGetVisualFromFBConfig"));
+				if (glxGetVisualFromFBConfig)
+					VisualInfo = glxGetVisualFromFBConfig(display, (GLXFBConfig)glxFBConfig);
+			}
+		} else
+#endif
+		{
+			// attribute array for the draw buffer
+			int visualAttrBuffer[] = {
+					GLX_RGBA, GLX_USE_GL,
+					GLX_RED_SIZE, 4,
+					GLX_GREEN_SIZE, 4,
+					GLX_BLUE_SIZE, 4,
+					GLX_ALPHA_SIZE, Params.WithAlphaChannel ? 1 : 0,
+					GLX_DEPTH_SIZE, Params.ZBufferBits,
+					GLX_STENCIL_SIZE, Params.Stencilbuffer ? 1 : 0, // 12,13
+					// The following attributes have no flags, but are
+					// either present or not. As a no-op we use
+					// GLX_USE_GL, which is silently ignored by glXChooseVisual
+					Params.Doublebuffer ? GLX_DOUBLEBUFFER : GLX_USE_GL, // 14
+					Params.Stereobuffer ? GLX_STEREO : GLX_USE_GL,       // 15
+					None,
+				};
+
+			VisualInfo = glXChooseVisual(display, screennr, visualAttrBuffer);
+			if (!VisualInfo) {
+				if (Params.Stencilbuffer)
+					os::Printer::log("No stencilbuffer available, disabling.", ELL_WARNING);
+				Params.Stencilbuffer = !Params.Stencilbuffer;
+				visualAttrBuffer[13] = Params.Stencilbuffer ? 1 : 0;
+
+				VisualInfo = glXChooseVisual(display, screennr, visualAttrBuffer);
+				if (!VisualInfo && Params.Doublebuffer) {
+					os::Printer::log("No doublebuffering available.", ELL_WARNING);
+					Params.Doublebuffer = false;
+					visualAttrBuffer[14] = GLX_USE_GL;
+					VisualInfo = glXChooseVisual(display, screennr, visualAttrBuffer);
+				}
+			}
+		}
+	} else
+		os::Printer::log("No GLX support available. OpenGL driver will not work.", ELL_WARNING);
+}
+
+CGLXManager::~CGLXManager()
+{
+}
+
+bool CGLXManager::initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &videodata)
+{
+	// store params
+	Params = params;
+
+	// set display
+	CurrentContext.OpenGLLinux.X11Display = videodata.OpenGLLinux.X11Display;
+
+	// now get new window
+	CurrentContext.OpenGLLinux.X11Window = videodata.OpenGLLinux.X11Window;
+	if (!PrimaryContext.OpenGLLinux.X11Window) {
+		PrimaryContext.OpenGLLinux.X11Window = CurrentContext.OpenGLLinux.X11Window;
+	}
+
+	return true;
+}
+
+void CGLXManager::terminate()
+{
+	memset((void *)&CurrentContext, 0, sizeof(CurrentContext));
+}
+
+bool CGLXManager::generateSurface()
+{
+	if (glxFBConfig) {
+		GlxWin = glXCreateWindow((Display *)CurrentContext.OpenGLLinux.X11Display, (GLXFBConfig)glxFBConfig, CurrentContext.OpenGLLinux.X11Window, NULL);
+		if (!GlxWin) {
+			os::Printer::log("Could not create GLX window.", ELL_WARNING);
+			return false;
+		}
+
+		CurrentContext.OpenGLLinux.GLXWindow = GlxWin;
+	} else {
+		CurrentContext.OpenGLLinux.GLXWindow = CurrentContext.OpenGLLinux.X11Window;
+	}
+	return true;
+}
+
+void CGLXManager::destroySurface()
+{
+	if (GlxWin)
+		glXDestroyWindow((Display *)CurrentContext.OpenGLLinux.X11Display, GlxWin);
+}
+
+#if defined(GLX_ARB_create_context)
+static int IrrIgnoreError(Display *display, XErrorEvent *event)
+{
+	char msg[256];
+	XGetErrorText(display, event->error_code, msg, 256);
+	os::Printer::log("Ignoring an X error", msg, ELL_DEBUG);
+	return 0;
+}
+#endif
+
+bool CGLXManager::generateContext()
+{
+	GLXContext context = 0;
+
+	if (glxFBConfig) {
+		if (GlxWin) {
+#if defined(GLX_ARB_create_context)
+
+			PFNGLXCREATECONTEXTATTRIBSARBPROC glxCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress(reinterpret_cast<const GLubyte *>("glXCreateContextAttribsARB"));
+
+			if (glxCreateContextAttribsARB) {
+				os::Printer::log("GLX with GLX_ARB_create_context", ELL_DEBUG);
+				int contextAttrBuffer[] = {
+						GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+						GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+						// GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+						None};
+				XErrorHandler old = XSetErrorHandler(IrrIgnoreError);
+				context = glxCreateContextAttribsARB((Display *)CurrentContext.OpenGLLinux.X11Display, (GLXFBConfig)glxFBConfig, NULL, True, contextAttrBuffer);
+				XSetErrorHandler(old);
+				// transparently fall back to legacy call
+			}
+			if (!context)
+#endif
+			{
+				// create glx context
+				context = glXCreateNewContext((Display *)CurrentContext.OpenGLLinux.X11Display, (GLXFBConfig)glxFBConfig, GLX_RGBA_TYPE, NULL, True);
+				if (!context) {
+					os::Printer::log("Could not create GLX rendering context.", ELL_WARNING);
+					return false;
+				}
+			}
+		} else {
+			os::Printer::log("GLX window was not properly created.", ELL_WARNING);
+			return false;
+		}
+	} else {
+		context = glXCreateContext((Display *)CurrentContext.OpenGLLinux.X11Display, VisualInfo, NULL, True);
+		if (!context) {
+			os::Printer::log("Could not create GLX rendering context.", ELL_WARNING);
+			return false;
+		}
+	}
+	CurrentContext.OpenGLLinux.X11Context = context;
+	return true;
+}
+
+const SExposedVideoData &CGLXManager::getContext() const
+{
+	return CurrentContext;
+}
+
+bool CGLXManager::activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero)
+{
+	// TODO: handle restorePrimaryOnZero
+
+	if (videoData.OpenGLLinux.X11Window) {
+		if (videoData.OpenGLLinux.X11Display && videoData.OpenGLLinux.X11Context) {
+			if (!glXMakeCurrent((Display *)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.GLXWindow, (GLXContext)videoData.OpenGLLinux.X11Context)) {
+				os::Printer::log("Context activation failed.");
+				return false;
+			} else {
+				CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
+				CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
+				CurrentContext.OpenGLLinux.X11Display = videoData.OpenGLLinux.X11Display;
+			}
+		} else {
+			// in case we only got a window ID, try with the existing values for display and context
+			if (!glXMakeCurrent((Display *)PrimaryContext.OpenGLLinux.X11Display, videoData.OpenGLLinux.GLXWindow, (GLXContext)PrimaryContext.OpenGLLinux.X11Context)) {
+				os::Printer::log("Context activation failed.");
+				return false;
+			} else {
+				CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
+				CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
+				CurrentContext.OpenGLLinux.X11Display = PrimaryContext.OpenGLLinux.X11Display;
+			}
+		}
+	} else if (!restorePrimaryOnZero && !videoData.OpenGLLinux.X11Window && !videoData.OpenGLLinux.X11Display) {
+		if (!glXMakeCurrent((Display *)PrimaryContext.OpenGLLinux.X11Display, None, NULL)) {
+			os::Printer::log("Render Context reset failed.");
+			return false;
+		}
+		CurrentContext.OpenGLLinux.X11Window = 0;
+		CurrentContext.OpenGLLinux.X11Display = 0;
+	}
+	// set back to main context
+	else if (CurrentContext.OpenGLLinux.X11Display != PrimaryContext.OpenGLLinux.X11Display) {
+		if (!glXMakeCurrent((Display *)PrimaryContext.OpenGLLinux.X11Display, PrimaryContext.OpenGLLinux.X11Window, (GLXContext)PrimaryContext.OpenGLLinux.X11Context)) {
+			os::Printer::log("Context activation failed.");
+			return false;
+		} else {
+			CurrentContext = PrimaryContext;
+		}
+	}
+	return true;
+}
+
+void CGLXManager::destroyContext()
+{
+	if (CurrentContext.OpenGLLinux.X11Context) {
+		if (GlxWin) {
+			if (!glXMakeContextCurrent((Display *)CurrentContext.OpenGLLinux.X11Display, None, None, NULL))
+				os::Printer::log("Could not release glx context.", ELL_WARNING);
+		} else {
+			if (!glXMakeCurrent((Display *)CurrentContext.OpenGLLinux.X11Display, None, NULL))
+				os::Printer::log("Could not release glx context.", ELL_WARNING);
+		}
+		glXDestroyContext((Display *)CurrentContext.OpenGLLinux.X11Display, (GLXContext)CurrentContext.OpenGLLinux.X11Context);
+	}
+}
+
+void *CGLXManager::getProcAddress(const std::string &procName)
+{
+	return (void *)glXGetProcAddressARB(reinterpret_cast<const GLubyte *>(procName.c_str()));
+}
+
+bool CGLXManager::swapBuffers()
+{
+	glXSwapBuffers((Display *)CurrentContext.OpenGLLinux.X11Display, CurrentContext.OpenGLLinux.GLXWindow);
+	return true;
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/CGLXManager.h b/irr/src/CGLXManager.h
new file mode 100644
index 000000000..f940d4316
--- /dev/null
+++ b/irr/src/CGLXManager.h
@@ -0,0 +1,76 @@
+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+#include "SColor.h"
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+// we can't include glx.h here, because gl.h has incompatible types with ogl es headers and it
+// cause redefinition errors, thats why we use ugly trick with void* types and casts.
+
+namespace irr
+{
+namespace video
+{
+// GLX manager.
+class CGLXManager : public IContextManager
+{
+public:
+	//! Constructor.
+	CGLXManager(const SIrrlichtCreationParameters &params, const SExposedVideoData &videodata, int screennr);
+
+	//! Destructor
+	~CGLXManager();
+
+	// Initialize
+	bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) override;
+
+	// Terminate
+	void terminate() override;
+
+	// Create surface.
+	bool generateSurface() override;
+
+	// Destroy surface.
+	void destroySurface() override;
+
+	// Create context.
+	bool generateContext() override;
+
+	// Destroy context.
+	void destroyContext() override;
+
+	//! Get current context
+	const SExposedVideoData &getContext() const override;
+
+	//! Change render context, disable old and activate new defined by videoData
+	bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero) override;
+
+	// Get procedure address.
+	void *getProcAddress(const std::string &procName) override;
+
+	// Swap buffers.
+	bool swapBuffers() override;
+
+	XVisualInfo *getVisual() const { return VisualInfo; } // return XVisualInfo
+
+private:
+	SIrrlichtCreationParameters Params;
+	SExposedVideoData PrimaryContext;
+	SExposedVideoData CurrentContext;
+	XVisualInfo *VisualInfo;
+	void *glxFBConfig; // GLXFBConfig
+	XID GlxWin;        // GLXWindow
+};
+}
+}
+
+#endif
diff --git a/irr/src/CGUIButton.cpp b/irr/src/CGUIButton.cpp
new file mode 100644
index 000000000..60bab5f83
--- /dev/null
+++ b/irr/src/CGUIButton.cpp
@@ -0,0 +1,500 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIButton.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIButton::CGUIButton(IGUIEnvironment *environment, IGUIElement *parent,
+		s32 id, core::rect<s32> rectangle, bool noclip) :
+		IGUIButton(environment, parent, id, rectangle),
+		SpriteBank(0), OverrideFont(0),
+		OverrideColorEnabled(false), OverrideColor(video::SColor(101, 255, 255, 255)),
+		ClickTime(0), HoverTime(0), FocusTime(0),
+		ClickShiftState(false), ClickControlState(false),
+		IsPushButton(false), Pressed(false),
+		UseAlphaChannel(false), DrawBorder(true), ScaleImage(false)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIButton");
+#endif
+	setNotClipped(noclip);
+
+	// This element can be tabbed.
+	setTabStop(true);
+	setTabOrder(-1);
+}
+
+//! destructor
+CGUIButton::~CGUIButton()
+{
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+}
+
+//! Sets if the images should be scaled to fit the button
+void CGUIButton::setScaleImage(bool scaleImage)
+{
+	ScaleImage = scaleImage;
+}
+
+//! Returns whether the button scale the used images
+bool CGUIButton::isScalingImage() const
+{
+	return ScaleImage;
+}
+
+//! Sets if the button should use the skin to draw its border
+void CGUIButton::setDrawBorder(bool border)
+{
+	DrawBorder = border;
+}
+
+void CGUIButton::setSpriteBank(IGUISpriteBank *sprites)
+{
+	if (sprites)
+		sprites->grab();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+
+	SpriteBank = sprites;
+}
+
+void CGUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop)
+{
+	ButtonSprites[(u32)state].Index = index;
+	ButtonSprites[(u32)state].Color = color;
+	ButtonSprites[(u32)state].Loop = loop;
+}
+
+//! Get the sprite-index for the given state or -1 when no sprite is set
+s32 CGUIButton::getSpriteIndex(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Index;
+}
+
+//! Get the sprite color for the given state. Color is only used when a sprite is set.
+video::SColor CGUIButton::getSpriteColor(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Color;
+}
+
+//! Returns if the sprite in the given state does loop
+bool CGUIButton::getSpriteLoop(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Loop;
+}
+
+//! called if an event happened.
+bool CGUIButton::OnEvent(const SEvent &event)
+{
+	if (!isEnabled())
+		return IGUIElement::OnEvent(event);
+
+	switch (event.EventType) {
+	case EET_KEY_INPUT_EVENT:
+		if (event.KeyInput.PressedDown &&
+				(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)) {
+			if (!IsPushButton)
+				setPressed(true);
+			else
+				setPressed(!Pressed);
+
+			return true;
+		}
+		if (Pressed && !IsPushButton && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE) {
+			setPressed(false);
+			return true;
+		} else if (!event.KeyInput.PressedDown && Pressed &&
+				   (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)) {
+
+			if (!IsPushButton)
+				setPressed(false);
+
+			if (Parent) {
+				ClickShiftState = event.KeyInput.Shift;
+				ClickControlState = event.KeyInput.Control;
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
+				Parent->OnEvent(newEvent);
+			}
+			return true;
+		}
+		break;
+	case EET_GUI_EVENT:
+		if (event.GUIEvent.Caller == this) {
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST) {
+				if (!IsPushButton)
+					setPressed(false);
+				FocusTime = os::Timer::getTime();
+			} else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED) {
+				FocusTime = os::Timer::getTime();
+			} else if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED || event.GUIEvent.EventType == EGET_ELEMENT_LEFT) {
+				HoverTime = os::Timer::getTime();
+			}
+		}
+		break;
+	case EET_MOUSE_INPUT_EVENT:
+		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+			if (!IsPushButton)
+				setPressed(true);
+
+			return true;
+		} else if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) {
+			bool wasPressed = Pressed;
+
+			if (!AbsoluteClippingRect.isPointInside(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y))) {
+				if (!IsPushButton)
+					setPressed(false);
+				return true;
+			}
+
+			if (!IsPushButton)
+				setPressed(false);
+			else {
+				setPressed(!Pressed);
+			}
+
+			if ((!IsPushButton && wasPressed && Parent) ||
+					(IsPushButton && wasPressed != Pressed)) {
+				ClickShiftState = event.MouseInput.Shift;
+				ClickControlState = event.MouseInput.Control;
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
+				Parent->OnEvent(newEvent);
+			}
+
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+
+	return Parent ? Parent->OnEvent(event) : false;
+}
+
+//! draws the element and its children
+void CGUIButton::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	if (DrawBorder) {
+		if (!Pressed) {
+			skin->draw3DButtonPaneStandard(this, AbsoluteRect, &AbsoluteClippingRect);
+		} else {
+			skin->draw3DButtonPanePressed(this, AbsoluteRect, &AbsoluteClippingRect);
+		}
+	}
+
+	const core::position2di buttonCenter(AbsoluteRect.getCenter());
+
+	EGUI_BUTTON_IMAGE_STATE imageState = getImageState(Pressed);
+	if (ButtonImages[(u32)imageState].Texture) {
+		core::position2d<s32> pos(buttonCenter);
+		core::rect<s32> sourceRect(ButtonImages[(u32)imageState].SourceRect);
+		if (sourceRect.getWidth() == 0 && sourceRect.getHeight() == 0)
+			sourceRect = core::rect<s32>(core::position2di(0, 0), ButtonImages[(u32)imageState].Texture->getOriginalSize());
+
+		pos.X -= sourceRect.getWidth() / 2;
+		pos.Y -= sourceRect.getHeight() / 2;
+
+		if (Pressed) {
+			// Create a pressed-down effect by moving the image when it looks identical to the unpressed state image
+			EGUI_BUTTON_IMAGE_STATE unpressedState = getImageState(false);
+			if (unpressedState == imageState || ButtonImages[(u32)imageState] == ButtonImages[(u32)unpressedState]) {
+				pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X);
+				pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y);
+			}
+		}
+
+		driver->draw2DImage(ButtonImages[(u32)imageState].Texture,
+				ScaleImage ? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
+				sourceRect, &AbsoluteClippingRect,
+				0, UseAlphaChannel);
+	}
+
+	if (SpriteBank) {
+		core::position2di pos(buttonCenter);
+		if (Pressed) {
+			pos.X += skin->getSize(EGDS_BUTTON_PRESSED_SPRITE_OFFSET_X);
+			pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_SPRITE_OFFSET_Y);
+		}
+
+		if (isEnabled()) {
+			// pressed / unpressed animation
+			EGUI_BUTTON_STATE state = Pressed ? EGBS_BUTTON_DOWN : EGBS_BUTTON_UP;
+			drawSprite(state, ClickTime, pos);
+
+			// focused / unfocused animation
+			state = Environment->hasFocus(this) ? EGBS_BUTTON_FOCUSED : EGBS_BUTTON_NOT_FOCUSED;
+			drawSprite(state, FocusTime, pos);
+
+			// mouse over / off animation
+			state = Environment->getHovered() == this ? EGBS_BUTTON_MOUSE_OVER : EGBS_BUTTON_MOUSE_OFF;
+			drawSprite(state, HoverTime, pos);
+		} else {
+			// draw disabled
+			drawSprite(EGBS_BUTTON_DISABLED, 0, pos);
+		}
+	}
+
+	if (Text.size()) {
+		IGUIFont *font = getActiveFont();
+
+		core::rect<s32> rect = AbsoluteRect;
+		if (Pressed) {
+			rect.UpperLeftCorner.X += skin->getSize(EGDS_BUTTON_PRESSED_TEXT_OFFSET_X);
+			rect.UpperLeftCorner.Y += skin->getSize(EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y);
+		}
+
+		if (font)
+			font->draw(Text.c_str(), rect,
+					getActiveColor(),
+					true, true, &AbsoluteClippingRect);
+	}
+
+	IGUIElement::draw();
+}
+
+void CGUIButton::drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di &center)
+{
+	u32 stateIdx = (u32)state;
+	s32 spriteIdx = ButtonSprites[stateIdx].Index;
+	if (spriteIdx == -1)
+		return;
+
+	u32 rectIdx = SpriteBank->getSprites()[spriteIdx].Frames[0].rectNumber;
+	core::rect<s32> srcRect = SpriteBank->getPositions()[rectIdx];
+
+	IGUISkin *skin = Environment->getSkin();
+	s32 scale = std::max(std::floor(skin->getScale()), 1.0f);
+	core::rect<s32> rect(center, srcRect.getSize() * scale);
+	rect -= rect.getSize() / 2;
+
+	const video::SColor colors[] = {
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+	};
+	SpriteBank->draw2DSprite(spriteIdx, rect, &AbsoluteClippingRect, colors,
+			os::Timer::getTime() - startTime, ButtonSprites[stateIdx].Loop);
+}
+
+EGUI_BUTTON_IMAGE_STATE CGUIButton::getImageState(bool pressed) const
+{
+	// figure state we should have
+	EGUI_BUTTON_IMAGE_STATE state = EGBIS_IMAGE_DISABLED;
+	bool focused = Environment->hasFocus(this);
+	bool mouseOver = static_cast<const IGUIElement *>(Environment->getHovered()) == this; // (static cast for Borland)
+	if (isEnabled()) {
+		if (pressed) {
+			if (focused && mouseOver)
+				state = EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER;
+			else if (focused)
+				state = EGBIS_IMAGE_DOWN_FOCUSED;
+			else if (mouseOver)
+				state = EGBIS_IMAGE_DOWN_MOUSEOVER;
+			else
+				state = EGBIS_IMAGE_DOWN;
+		} else // !pressed
+		{
+			if (focused && mouseOver)
+				state = EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER;
+			else if (focused)
+				state = EGBIS_IMAGE_UP_FOCUSED;
+			else if (mouseOver)
+				state = EGBIS_IMAGE_UP_MOUSEOVER;
+			else
+				state = EGBIS_IMAGE_UP;
+		}
+	}
+
+	// find a compatible state that has images
+	while (state != EGBIS_IMAGE_UP && !ButtonImages[(u32)state].Texture) {
+		switch (state) {
+		case EGBIS_IMAGE_UP_FOCUSED:
+			state = EGBIS_IMAGE_UP_MOUSEOVER;
+			break;
+		case EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER:
+			state = EGBIS_IMAGE_UP_FOCUSED;
+			break;
+		case EGBIS_IMAGE_DOWN_MOUSEOVER:
+			state = EGBIS_IMAGE_DOWN;
+			break;
+		case EGBIS_IMAGE_DOWN_FOCUSED:
+			state = EGBIS_IMAGE_DOWN_MOUSEOVER;
+			break;
+		case EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER:
+			state = EGBIS_IMAGE_DOWN_FOCUSED;
+			break;
+		case EGBIS_IMAGE_DISABLED:
+			if (pressed)
+				state = EGBIS_IMAGE_DOWN;
+			else
+				state = EGBIS_IMAGE_UP;
+			break;
+		default:
+			state = EGBIS_IMAGE_UP;
+		}
+	}
+
+	return state;
+}
+
+//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
+void CGUIButton::setOverrideFont(IGUIFont *font)
+{
+	if (OverrideFont == font)
+		return;
+
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	OverrideFont = font;
+
+	if (OverrideFont)
+		OverrideFont->grab();
+}
+
+//! Gets the override font (if any)
+IGUIFont *CGUIButton::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont *CGUIButton::getActiveFont() const
+{
+	if (OverrideFont)
+		return OverrideFont;
+	IGUISkin *skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont(EGDF_BUTTON);
+	return 0;
+}
+
+//! Sets another color for the text.
+void CGUIButton::setOverrideColor(video::SColor color)
+{
+	OverrideColor = color;
+	OverrideColorEnabled = true;
+}
+
+video::SColor CGUIButton::getOverrideColor() const
+{
+	return OverrideColor;
+}
+
+irr::video::SColor CGUIButton::getActiveColor() const
+{
+	if (OverrideColorEnabled)
+		return OverrideColor;
+	IGUISkin *skin = Environment->getSkin();
+	if (skin)
+		return OverrideColorEnabled ? OverrideColor : skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT);
+	return OverrideColor;
+}
+
+void CGUIButton::enableOverrideColor(bool enable)
+{
+	OverrideColorEnabled = enable;
+}
+
+bool CGUIButton::isOverrideColorEnabled() const
+{
+	return OverrideColorEnabled;
+}
+
+void CGUIButton::setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture *image, const core::rect<s32> &sourceRect)
+{
+	if (state >= EGBIS_COUNT)
+		return;
+
+	if (image)
+		image->grab();
+
+	u32 stateIdx = (u32)state;
+	if (ButtonImages[stateIdx].Texture)
+		ButtonImages[stateIdx].Texture->drop();
+
+	ButtonImages[stateIdx].Texture = image;
+	ButtonImages[stateIdx].SourceRect = sourceRect;
+}
+
+//! Sets if the button should behave like a push button. Which means it
+//! can be in two states: Normal or Pressed. With a click on the button,
+//! the user can change the state of the button.
+void CGUIButton::setIsPushButton(bool isPushButton)
+{
+	IsPushButton = isPushButton;
+}
+
+//! Returns if the button is currently pressed
+bool CGUIButton::isPressed() const
+{
+	return Pressed;
+}
+
+//! Sets the pressed state of the button if this is a pushbutton
+void CGUIButton::setPressed(bool pressed)
+{
+	if (Pressed != pressed) {
+		ClickTime = os::Timer::getTime();
+		Pressed = pressed;
+	}
+}
+
+//! Returns whether the button is a push button
+bool CGUIButton::isPushButton() const
+{
+	return IsPushButton;
+}
+
+//! Sets if the alpha channel should be used for drawing images on the button (default is false)
+void CGUIButton::setUseAlphaChannel(bool useAlphaChannel)
+{
+	UseAlphaChannel = useAlphaChannel;
+}
+
+//! Returns if the alpha channel should be used for drawing images on the button
+bool CGUIButton::isAlphaChannelUsed() const
+{
+	return UseAlphaChannel;
+}
+
+bool CGUIButton::isDrawingBorder() const
+{
+	return DrawBorder;
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIButton.h b/irr/src/CGUIButton.h
new file mode 100644
index 000000000..8a1434025
--- /dev/null
+++ b/irr/src/CGUIButton.h
@@ -0,0 +1,237 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIButton.h"
+#include "IGUISpriteBank.h"
+#include "ITexture.h"
+#include "SColor.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUIButton : public IGUIButton
+{
+public:
+	//! constructor
+	CGUIButton(IGUIEnvironment *environment, IGUIElement *parent,
+			s32 id, core::rect<s32> rectangle, bool noclip = false);
+
+	//! destructor
+	virtual ~CGUIButton();
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
+	void setOverrideFont(IGUIFont *font = 0) override;
+
+	//! Gets the override font (if any)
+	IGUIFont *getOverrideFont() const override;
+
+	//! Get the font which is used right now for drawing
+	IGUIFont *getActiveFont() const override;
+
+	//! Sets another color for the button text.
+	void setOverrideColor(video::SColor color) override;
+
+	//! Gets the override color
+	video::SColor getOverrideColor(void) const override;
+
+	//! Gets the currently used text color
+	video::SColor getActiveColor() const override;
+
+	//! Sets if the button text should use the override color or the color in the gui skin.
+	void enableOverrideColor(bool enable) override;
+
+	//! Checks if an override color is enabled
+	bool isOverrideColorEnabled(void) const override;
+
+	//! Sets an image which should be displayed on the button when it is in the given state.
+	void setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture *image = 0, const core::rect<s32> &sourceRect = core::rect<s32>(0, 0, 0, 0)) override;
+
+	//! Sets an image which should be displayed on the button when it is in normal state.
+	void setImage(video::ITexture *image = 0) override
+	{
+		setImage(EGBIS_IMAGE_UP, image);
+	}
+
+	//! Sets an image which should be displayed on the button when it is in normal state.
+	void setImage(video::ITexture *image, const core::rect<s32> &pos) override
+	{
+		setImage(EGBIS_IMAGE_UP, image, pos);
+	}
+
+	//! Sets an image which should be displayed on the button when it is in pressed state.
+	void setPressedImage(video::ITexture *image = 0) override
+	{
+		setImage(EGBIS_IMAGE_DOWN, image);
+	}
+
+	//! Sets an image which should be displayed on the button when it is in pressed state.
+	void setPressedImage(video::ITexture *image, const core::rect<s32> &pos) override
+	{
+		setImage(EGBIS_IMAGE_DOWN, image, pos);
+	}
+
+	//! Sets the sprite bank used by the button
+	void setSpriteBank(IGUISpriteBank *bank = 0) override;
+
+	//! Sets the animated sprite for a specific button state
+	/** \param index: Number of the sprite within the sprite bank, use -1 for no sprite
+	\param state: State of the button to set the sprite for
+	\param index: The sprite number from the current sprite bank
+	\param color: The color of the sprite
+	*/
+	virtual void setSprite(EGUI_BUTTON_STATE state, s32 index,
+			video::SColor color = video::SColor(255, 255, 255, 255),
+			bool loop = false) override;
+
+	//! Get the sprite-index for the given state or -1 when no sprite is set
+	s32 getSpriteIndex(EGUI_BUTTON_STATE state) const override;
+
+	//! Get the sprite color for the given state. Color is only used when a sprite is set.
+	video::SColor getSpriteColor(EGUI_BUTTON_STATE state) const override;
+
+	//! Returns if the sprite in the given state does loop
+	bool getSpriteLoop(EGUI_BUTTON_STATE state) const override;
+
+	//! Sets if the button should behave like a push button. Which means it
+	//! can be in two states: Normal or Pressed. With a click on the button,
+	//! the user can change the state of the button.
+	void setIsPushButton(bool isPushButton = true) override;
+
+	//! Checks whether the button is a push button
+	bool isPushButton() const override;
+
+	//! Sets the pressed state of the button if this is a pushbutton
+	void setPressed(bool pressed = true) override;
+
+	//! Returns if the button is currently pressed
+	bool isPressed() const override;
+
+	//! Sets if the button should use the skin to draw its border
+	void setDrawBorder(bool border = true) override;
+
+	//! Checks if the button face and border are being drawn
+	bool isDrawingBorder() const override;
+
+	//! Sets if the alpha channel should be used for drawing images on the button (default is false)
+	void setUseAlphaChannel(bool useAlphaChannel = true) override;
+
+	//! Checks if the alpha channel should be used for drawing images on the button
+	bool isAlphaChannelUsed() const override;
+
+	//! Sets if the button should scale the button images to fit
+	void setScaleImage(bool scaleImage = true) override;
+
+	//! Checks whether the button scales the used images
+	bool isScalingImage() const override;
+
+	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
+	bool getClickShiftState() const override
+	{
+		return ClickShiftState;
+	}
+
+	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
+	bool getClickControlState() const override
+	{
+		return ClickControlState;
+	}
+
+protected:
+	void drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di &center);
+	EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed) const;
+
+private:
+	struct ButtonSprite
+	{
+		ButtonSprite() :
+				Index(-1), Loop(false)
+		{
+		}
+
+		bool operator==(const ButtonSprite &other) const
+		{
+			return Index == other.Index && Color == other.Color && Loop == other.Loop;
+		}
+
+		s32 Index;
+		video::SColor Color;
+		bool Loop;
+	};
+
+	ButtonSprite ButtonSprites[EGBS_COUNT];
+	IGUISpriteBank *SpriteBank;
+
+	struct ButtonImage
+	{
+		ButtonImage() :
+				Texture(0), SourceRect(core::rect<s32>(0, 0, 0, 0))
+		{
+		}
+
+		ButtonImage(const ButtonImage &other) :
+				Texture(0), SourceRect(core::rect<s32>(0, 0, 0, 0))
+		{
+			*this = other;
+		}
+
+		~ButtonImage()
+		{
+			if (Texture)
+				Texture->drop();
+		}
+
+		ButtonImage &operator=(const ButtonImage &other)
+		{
+			if (this == &other)
+				return *this;
+
+			if (other.Texture)
+				other.Texture->grab();
+			if (Texture)
+				Texture->drop();
+			Texture = other.Texture;
+			SourceRect = other.SourceRect;
+			return *this;
+		}
+
+		bool operator==(const ButtonImage &other) const
+		{
+			return Texture == other.Texture && SourceRect == other.SourceRect;
+		}
+
+		video::ITexture *Texture;
+		core::rect<s32> SourceRect;
+	};
+
+	ButtonImage ButtonImages[EGBIS_COUNT];
+
+	IGUIFont *OverrideFont;
+
+	bool OverrideColorEnabled;
+	video::SColor OverrideColor;
+
+	u32 ClickTime, HoverTime, FocusTime;
+
+	bool ClickShiftState;
+	bool ClickControlState;
+
+	bool IsPushButton;
+	bool Pressed;
+	bool UseAlphaChannel;
+	bool DrawBorder;
+	bool ScaleImage;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUICheckBox.cpp b/irr/src/CGUICheckBox.cpp
new file mode 100644
index 000000000..18dd6856a
--- /dev/null
+++ b/irr/src/CGUICheckBox.cpp
@@ -0,0 +1,198 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUICheckBox.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUICheckBox::CGUICheckBox(bool checked, IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+		IGUICheckBox(environment, parent, id, rectangle), CheckTime(0), Pressed(false), Checked(checked), Border(false), Background(false)
+{
+#ifdef _DEBUG
+	setDebugName("CGUICheckBox");
+#endif
+
+	// this element can be tabbed into
+	setTabStop(true);
+	setTabOrder(-1);
+}
+
+//! called if an event happened.
+bool CGUICheckBox::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+		switch (event.EventType) {
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+					(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)) {
+				Pressed = true;
+				return true;
+			} else if (Pressed && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE) {
+				Pressed = false;
+				return true;
+			} else if (!event.KeyInput.PressedDown && Pressed &&
+					   (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)) {
+				Pressed = false;
+				if (Parent) {
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					Checked = !Checked;
+					newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
+					Parent->OnEvent(newEvent);
+				}
+				return true;
+			}
+			break;
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST) {
+				if (event.GUIEvent.Caller == this)
+					Pressed = false;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+				Pressed = true;
+				CheckTime = os::Timer::getTime();
+				return true;
+			} else if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) {
+				bool wasPressed = Pressed;
+				Pressed = false;
+
+				if (wasPressed && Parent) {
+					if (!AbsoluteClippingRect.isPointInside(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y))) {
+						Pressed = false;
+						return true;
+					}
+
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					Checked = !Checked;
+					newEvent.GUIEvent.EventType = EGET_CHECKBOX_CHANGED;
+					Parent->OnEvent(newEvent);
+				}
+
+				return true;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+//! draws the element and its children
+void CGUICheckBox::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (skin) {
+		video::IVideoDriver *driver = Environment->getVideoDriver();
+		core::rect<s32> frameRect(AbsoluteRect);
+
+		// draw background
+		if (Background) {
+			video::SColor bgColor = skin->getColor(gui::EGDC_3D_FACE);
+			driver->draw2DRectangle(bgColor, frameRect, &AbsoluteClippingRect);
+		}
+
+		// draw the border
+		if (Border) {
+			skin->draw3DSunkenPane(this, 0, true, false, frameRect, &AbsoluteClippingRect);
+			frameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X);
+			frameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X);
+		}
+
+		const s32 height = skin->getSize(EGDS_CHECK_BOX_WIDTH);
+
+		// the rectangle around the "checked" area.
+		core::rect<s32> checkRect(frameRect.UpperLeftCorner.X,
+				((frameRect.getHeight() - height) / 2) + frameRect.UpperLeftCorner.Y,
+				0, 0);
+
+		checkRect.LowerRightCorner.X = checkRect.UpperLeftCorner.X + height;
+		checkRect.LowerRightCorner.Y = checkRect.UpperLeftCorner.Y + height;
+
+		EGUI_DEFAULT_COLOR col = EGDC_GRAY_EDITABLE;
+		if (isEnabled())
+			col = Pressed ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE;
+		skin->draw3DSunkenPane(this, skin->getColor(col),
+				false, true, checkRect, &AbsoluteClippingRect);
+
+		// the checked icon
+		if (Checked) {
+			skin->drawIcon(this, EGDI_CHECK_BOX_CHECKED, checkRect.getCenter(),
+					CheckTime, os::Timer::getTime(), false, &AbsoluteClippingRect);
+		}
+
+		// associated text
+		if (Text.size()) {
+			checkRect = frameRect;
+			checkRect.UpperLeftCorner.X += height + 5;
+
+			IGUIFont *font = skin->getFont();
+			if (font) {
+				font->draw(Text.c_str(), checkRect,
+						skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), false, true, &AbsoluteClippingRect);
+			}
+		}
+	}
+	IGUIElement::draw();
+}
+
+//! set if box is checked
+void CGUICheckBox::setChecked(bool checked)
+{
+	Checked = checked;
+}
+
+//! returns if box is checked
+bool CGUICheckBox::isChecked() const
+{
+	return Checked;
+}
+
+//! Sets whether to draw the background
+void CGUICheckBox::setDrawBackground(bool draw)
+{
+	Background = draw;
+}
+
+//! Checks if background drawing is enabled
+bool CGUICheckBox::isDrawBackgroundEnabled() const
+{
+	return Background;
+}
+
+//! Sets whether to draw the border
+void CGUICheckBox::setDrawBorder(bool draw)
+{
+	Border = draw;
+}
+
+//! Checks if border drawing is enabled
+bool CGUICheckBox::isDrawBorderEnabled() const
+{
+	return Border;
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUICheckBox.h b/irr/src/CGUICheckBox.h
new file mode 100644
index 000000000..2c2a98f04
--- /dev/null
+++ b/irr/src/CGUICheckBox.h
@@ -0,0 +1,55 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUICheckBox.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUICheckBox : public IGUICheckBox
+{
+public:
+	//! constructor
+	CGUICheckBox(bool checked, IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle);
+
+	//! set if box is checked
+	void setChecked(bool checked) override;
+
+	//! returns if box is checked
+	bool isChecked() const override;
+
+	//! Sets whether to draw the background
+	void setDrawBackground(bool draw) override;
+
+	//! Checks if background drawing is enabled
+	/** \return true if background drawing is enabled, false otherwise */
+	bool isDrawBackgroundEnabled() const override;
+
+	//! Sets whether to draw the border
+	void setDrawBorder(bool draw) override;
+
+	//! Checks if border drawing is enabled
+	/** \return true if border drawing is enabled, false otherwise */
+	bool isDrawBorderEnabled() const override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+private:
+	u32 CheckTime;
+	bool Pressed;
+	bool Checked;
+	bool Border;
+	bool Background;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIComboBox.cpp b/irr/src/CGUIComboBox.cpp
new file mode 100644
index 000000000..0088641b5
--- /dev/null
+++ b/irr/src/CGUIComboBox.cpp
@@ -0,0 +1,463 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIComboBox.h"
+
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IGUIFont.h"
+#include "IGUIButton.h"
+#include "CGUIListBox.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIComboBox::CGUIComboBox(IGUIEnvironment *environment, IGUIElement *parent,
+		s32 id, core::rect<s32> rectangle) :
+		IGUIComboBox(environment, parent, id, rectangle),
+		ListButton(nullptr), SelectedText(nullptr), ListBox(nullptr), LastFocus(nullptr),
+		Selected(-1), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER), MaxSelectionRows(5), HasFocus(false),
+		ActiveFont(nullptr)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIComboBox");
+#endif
+
+	IGUISkin *skin = Environment->getSkin();
+
+	ListButton = Environment->addButton(core::recti(0, 0, 1, 1), this, -1, L"");
+	if (skin && skin->getSpriteBank()) {
+		ListButton->setSpriteBank(skin->getSpriteBank());
+		ListButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(EGDC_WINDOW_SYMBOL));
+		ListButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(EGDC_WINDOW_SYMBOL));
+	}
+	ListButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	ListButton->setSubElement(true);
+	ListButton->setTabStop(false);
+
+	SelectedText = Environment->addStaticText(L"", core::recti(0, 0, 1, 1), false, false, this, -1, false);
+	SelectedText->setSubElement(true);
+	SelectedText->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	SelectedText->setTextAlignment(EGUIA_UPPERLEFT, EGUIA_CENTER);
+	if (skin)
+		SelectedText->setOverrideColor(skin->getColor(EGDC_BUTTON_TEXT));
+	SelectedText->enableOverrideColor(true);
+
+	updateListButtonWidth(skin ? skin->getSize(EGDS_SCROLLBAR_SIZE) : 15);
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+}
+
+void CGUIComboBox::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical)
+{
+	HAlign = horizontal;
+	VAlign = vertical;
+	SelectedText->setTextAlignment(horizontal, vertical);
+}
+
+//! Set the maximal number of rows for the selection listbox
+void CGUIComboBox::setMaxSelectionRows(u32 max)
+{
+	MaxSelectionRows = max;
+
+	// force recalculation of open listbox
+	if (ListBox) {
+		openCloseMenu();
+		openCloseMenu();
+	}
+}
+
+//! Get the maximal number of rows for the selection listbox
+u32 CGUIComboBox::getMaxSelectionRows() const
+{
+	return MaxSelectionRows;
+}
+
+//! Returns amount of items in box
+u32 CGUIComboBox::getItemCount() const
+{
+	return Items.size();
+}
+
+//! returns string of an item. the idx may be a value from 0 to itemCount-1
+const wchar_t *CGUIComboBox::getItem(u32 idx) const
+{
+	if (idx >= Items.size())
+		return 0;
+
+	return Items[idx].Name.c_str();
+}
+
+//! returns string of an item. the idx may be a value from 0 to itemCount-1
+u32 CGUIComboBox::getItemData(u32 idx) const
+{
+	if (idx >= Items.size())
+		return 0;
+
+	return Items[idx].Data;
+}
+
+//! Returns index based on item data
+s32 CGUIComboBox::getIndexForItemData(u32 data) const
+{
+	for (u32 i = 0; i < Items.size(); ++i) {
+		if (Items[i].Data == data)
+			return i;
+	}
+	return -1;
+}
+
+//! Removes an item from the combo box.
+void CGUIComboBox::removeItem(u32 idx)
+{
+	if (idx >= Items.size())
+		return;
+
+	if (Selected == (s32)idx)
+		setSelected(-1);
+
+	Items.erase(idx);
+}
+
+//! Returns caption of this element.
+const wchar_t *CGUIComboBox::getText() const
+{
+	return getItem(Selected);
+}
+
+//! adds an item and returns the index of it
+u32 CGUIComboBox::addItem(const wchar_t *text, u32 data)
+{
+	Items.push_back(SComboData(text, data));
+
+	if (Selected == -1)
+		setSelected(0);
+
+	return Items.size() - 1;
+}
+
+//! deletes all items in the combo box
+void CGUIComboBox::clear()
+{
+	Items.clear();
+	setSelected(-1);
+}
+
+//! returns id of selected item. returns -1 if no item is selected.
+s32 CGUIComboBox::getSelected() const
+{
+	return Selected;
+}
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUIComboBox::setSelected(s32 idx)
+{
+	if (idx < -1 || idx >= (s32)Items.size())
+		return;
+
+	Selected = idx;
+	if (Selected == -1)
+		SelectedText->setText(L"");
+	else
+		SelectedText->setText(Items[Selected].Name.c_str());
+}
+
+//! Sets the selected item and emits a change event.
+/** Set this to -1 if no item should be selected */
+void CGUIComboBox::setAndSendSelected(s32 idx)
+{
+	setSelected(idx);
+	sendSelectionChangedEvent();
+}
+
+//! called if an event happened.
+bool CGUIComboBox::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+		switch (event.EventType) {
+
+		case EET_KEY_INPUT_EVENT:
+			if (ListBox && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE) {
+				// hide list box
+				openCloseMenu();
+				return true;
+			} else if (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE) {
+				if (!event.KeyInput.PressedDown) {
+					openCloseMenu();
+				}
+
+				ListButton->setPressed(ListBox == nullptr);
+
+				return true;
+			} else if (event.KeyInput.PressedDown) {
+				s32 oldSelected = Selected;
+				bool absorb = true;
+				switch (event.KeyInput.Key) {
+				case KEY_DOWN:
+					setSelected(Selected + 1);
+					break;
+				case KEY_UP:
+					setSelected(Selected - 1);
+					break;
+				case KEY_HOME:
+				case KEY_PRIOR:
+					setSelected(0);
+					break;
+				case KEY_END:
+				case KEY_NEXT:
+					setSelected((s32)Items.size() - 1);
+					break;
+				default:
+					absorb = false;
+				}
+
+				if (Selected < 0)
+					setSelected(0);
+
+				if (Selected >= (s32)Items.size())
+					setSelected((s32)Items.size() - 1);
+
+				if (Selected != oldSelected) {
+					sendSelectionChangedEvent();
+					return true;
+				}
+
+				if (absorb)
+					return true;
+			}
+			break;
+
+		case EET_GUI_EVENT:
+
+			switch (event.GUIEvent.EventType) {
+			case EGET_ELEMENT_FOCUS_LOST:
+				if (ListBox &&
+						(Environment->hasFocus(ListBox) || ListBox->isMyChild(event.GUIEvent.Caller)) &&
+						event.GUIEvent.Element != this &&
+						!isMyChild(event.GUIEvent.Element) &&
+						!ListBox->isMyChild(event.GUIEvent.Element)) {
+					openCloseMenu();
+				}
+				break;
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == ListButton) {
+					openCloseMenu();
+					return true;
+				}
+				break;
+			case EGET_LISTBOX_SELECTED_AGAIN:
+			case EGET_LISTBOX_CHANGED:
+				if (event.GUIEvent.Caller == ListBox) {
+					setSelected(ListBox->getSelected());
+					if (Selected < 0 || Selected >= (s32)Items.size())
+						setSelected(-1);
+					openCloseMenu();
+
+					sendSelectionChangedEvent();
+				}
+				return true;
+			default:
+				break;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+
+			switch (event.MouseInput.Event) {
+			case EMIE_LMOUSE_PRESSED_DOWN: {
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+				// send to list box
+				if (ListBox && ListBox->isPointInside(p) && ListBox->OnEvent(event))
+					return true;
+
+				return true;
+			}
+			case EMIE_LMOUSE_LEFT_UP: {
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+				// send to list box
+				if (!(ListBox &&
+							ListBox->getAbsolutePosition().isPointInside(p) &&
+							ListBox->OnEvent(event))) {
+					openCloseMenu();
+				}
+				return true;
+			}
+			case EMIE_MOUSE_WHEEL: {
+				// Try scrolling parent first
+				if (IGUIElement::OnEvent(event))
+					return true;
+
+				s32 oldSelected = Selected;
+				setSelected(Selected + ((event.MouseInput.Wheel < 0) ? 1 : -1));
+
+				if (Selected < 0)
+					setSelected(0);
+
+				if (Selected >= (s32)Items.size())
+					setSelected((s32)Items.size() - 1);
+
+				if (Selected != oldSelected) {
+					sendSelectionChangedEvent();
+					return true;
+				}
+
+				return false;
+			}
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+void CGUIComboBox::sendSelectionChangedEvent()
+{
+	if (Parent) {
+		SEvent event;
+
+		event.EventType = EET_GUI_EVENT;
+		event.GUIEvent.Caller = this;
+		event.GUIEvent.Element = nullptr;
+		event.GUIEvent.EventType = EGET_COMBO_BOX_CHANGED;
+		Parent->OnEvent(event);
+	}
+}
+
+void CGUIComboBox::updateListButtonWidth(s32 width)
+{
+	if (ListButton->getRelativePosition().getWidth() != width) {
+		core::rect<s32> r;
+		r.UpperLeftCorner.X = RelativeRect.getWidth() - width - 2;
+		r.LowerRightCorner.X = RelativeRect.getWidth() - 2;
+		r.UpperLeftCorner.Y = 2;
+		r.LowerRightCorner.Y = RelativeRect.getHeight() - 2;
+		ListButton->setRelativePosition(r);
+
+		r.UpperLeftCorner.X = 2;
+		r.UpperLeftCorner.Y = 2;
+		r.LowerRightCorner.X = RelativeRect.getWidth() - (width + 2);
+		r.LowerRightCorner.Y = RelativeRect.getHeight() - 2;
+		SelectedText->setRelativePosition(r);
+	}
+}
+
+//! draws the element and its children
+void CGUIComboBox::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+
+	updateListButtonWidth(skin->getSize(EGDS_SCROLLBAR_SIZE));
+
+	// font changed while the listbox is open?
+	if (ActiveFont != skin->getFont() && ListBox) {
+		// close and re-open to use new font-size
+		openCloseMenu();
+		openCloseMenu();
+	}
+
+	IGUIElement *currentFocus = Environment->getFocus();
+	if (currentFocus != LastFocus) {
+		HasFocus = currentFocus == this || isMyChild(currentFocus);
+		LastFocus = currentFocus;
+	}
+
+	// set colors each time as skin-colors can be changed
+	SelectedText->setBackgroundColor(skin->getColor(EGDC_HIGH_LIGHT));
+	if (isEnabled()) {
+		SelectedText->setDrawBackground(HasFocus);
+		SelectedText->setOverrideColor(skin->getColor(HasFocus ? EGDC_HIGH_LIGHT_TEXT : EGDC_BUTTON_TEXT));
+	} else {
+		SelectedText->setDrawBackground(false);
+		SelectedText->setOverrideColor(skin->getColor(EGDC_GRAY_TEXT));
+	}
+	ListButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(isEnabled() ? EGDC_WINDOW_SYMBOL : EGDC_GRAY_WINDOW_SYMBOL));
+	ListButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_DOWN), skin->getColor(isEnabled() ? EGDC_WINDOW_SYMBOL : EGDC_GRAY_WINDOW_SYMBOL));
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// draw the border
+
+	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT),
+			true, true, frameRect, &AbsoluteClippingRect);
+
+	// draw children
+	IGUIElement::draw();
+}
+
+void CGUIComboBox::openCloseMenu()
+{
+	if (ListBox) {
+		// close list box
+		Environment->setFocus(this);
+		ListBox->remove();
+		ListBox = nullptr;
+	} else {
+		if (Parent) {
+			SEvent event;
+			event.EventType = EET_GUI_EVENT;
+			event.GUIEvent.Caller = this;
+			event.GUIEvent.Element = nullptr;
+			event.GUIEvent.EventType = EGET_LISTBOX_OPENED;
+
+			// Allow to prevent the listbox from opening.
+			if (Parent->OnEvent(event))
+				return;
+
+			Parent->bringToFront(this);
+		}
+
+		IGUISkin *skin = Environment->getSkin();
+		u32 h = Items.size();
+
+		if (h > getMaxSelectionRows())
+			h = getMaxSelectionRows();
+		if (h == 0)
+			h = 1;
+
+		ActiveFont = skin->getFont();
+		if (ActiveFont)
+			h *= (ActiveFont->getDimension(L"A").Height + 4);
+
+		// open list box
+		core::rect<s32> r(0, AbsoluteRect.getHeight(),
+				AbsoluteRect.getWidth(), AbsoluteRect.getHeight() + h);
+
+		ListBox = new CGUIListBox(Environment, this, -1, r, false, true, true);
+		ListBox->setSubElement(true);
+		ListBox->setNotClipped(true);
+		ListBox->drop();
+
+		// ensure that list box is always completely visible
+		if (ListBox->getAbsolutePosition().LowerRightCorner.Y > Environment->getRootGUIElement()->getAbsolutePosition().getHeight())
+			ListBox->setRelativePosition(core::rect<s32>(0, -ListBox->getAbsolutePosition().getHeight(), AbsoluteRect.getWidth(), 0));
+
+		for (s32 i = 0; i < (s32)Items.size(); ++i)
+			ListBox->addItem(Items[i].Name.c_str());
+
+		ListBox->setSelected(Selected);
+
+		// set focus
+		Environment->setFocus(ListBox);
+	}
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIComboBox.h b/irr/src/CGUIComboBox.h
new file mode 100644
index 000000000..77f1eca1a
--- /dev/null
+++ b/irr/src/CGUIComboBox.h
@@ -0,0 +1,104 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIComboBox.h"
+#include "IGUIStaticText.h"
+#include "irrString.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace gui
+{
+class IGUIButton;
+class IGUIListBox;
+
+//! Single line edit box for editing simple text.
+class CGUIComboBox : public IGUIComboBox
+{
+public:
+	//! constructor
+	CGUIComboBox(IGUIEnvironment *environment, IGUIElement *parent,
+			s32 id, core::rect<s32> rectangle);
+
+	//! Returns amount of items in box
+	u32 getItemCount() const override;
+
+	//! returns string of an item. the idx may be a value from 0 to itemCount-1
+	const wchar_t *getItem(u32 idx) const override;
+
+	//! Returns item data of an item. the idx may be a value from 0 to itemCount-1
+	u32 getItemData(u32 idx) const override;
+
+	//! Returns index based on item data
+	s32 getIndexForItemData(u32 data) const override;
+
+	//! adds an item and returns the index of it
+	u32 addItem(const wchar_t *text, u32 data) override;
+
+	//! Removes an item from the combo box.
+	void removeItem(u32 id) override;
+
+	//! deletes all items in the combo box
+	void clear() override;
+
+	//! returns the text of the currently selected item
+	const wchar_t *getText() const override;
+
+	//! returns id of selected item. returns -1 if no item is selected.
+	s32 getSelected() const override;
+
+	//! sets the selected item. Set this to -1 if no item should be selected
+	void setSelected(s32 idx) override;
+
+	//! Sets the selected item and emits a change event.
+	/** Set this to -1 if no item should be selected */
+	void setAndSendSelected(s32 idx) override;
+
+	//! sets the text alignment of the text part
+	void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) override;
+
+	//! Set the maximal number of rows for the selection listbox
+	void setMaxSelectionRows(u32 max) override;
+
+	//! Get the maximal number of rows for the selection listbox
+	u32 getMaxSelectionRows() const override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+private:
+	void openCloseMenu();
+	void sendSelectionChangedEvent();
+	void updateListButtonWidth(s32 width);
+
+	IGUIButton *ListButton;
+	IGUIStaticText *SelectedText;
+	IGUIListBox *ListBox;
+	IGUIElement *LastFocus;
+
+	struct SComboData
+	{
+		SComboData(const wchar_t *text, u32 data) :
+				Name(text), Data(data) {}
+
+		core::stringw Name;
+		u32 Data;
+	};
+	core::array<SComboData> Items;
+
+	s32 Selected;
+	EGUI_ALIGNMENT HAlign, VAlign;
+	u32 MaxSelectionRows;
+	bool HasFocus;
+	IGUIFont *ActiveFont;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIEditBox.cpp b/irr/src/CGUIEditBox.cpp
new file mode 100644
index 000000000..8d03caf4a
--- /dev/null
+++ b/irr/src/CGUIEditBox.cpp
@@ -0,0 +1,1495 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIEditBox.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IGUIFont.h"
+#include "IVideoDriver.h"
+#include "rect.h"
+#include "os.h"
+#include "Keycodes.h"
+
+/*
+	todo:
+	optional scrollbars
+	ctrl+left/right to select word
+	double click/ctrl click: word select + drag to select whole words, triple click to select line
+	optional? dragging selected text
+	numerical
+*/
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIEditBox::CGUIEditBox(const wchar_t *text, bool border,
+		IGUIEnvironment *environment, IGUIElement *parent, s32 id,
+		const core::rect<s32> &rectangle) :
+		IGUIEditBox(environment, parent, id, rectangle),
+		OverwriteMode(false), MouseMarking(false),
+		Border(border), Background(true), OverrideColorEnabled(false), MarkBegin(0), MarkEnd(0),
+		OverrideColor(video::SColor(101, 255, 255, 255)), OverrideFont(0), LastBreakFont(0),
+		Operator(0), BlinkStartTime(0), CursorBlinkTime(350), CursorChar(L"_"), CursorPos(0), HScrollPos(0), VScrollPos(0), Max(0),
+		WordWrap(false), MultiLine(false), AutoScroll(true), PasswordBox(false),
+		PasswordChar(L'*'), HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_CENTER),
+		CurrentTextRect(0, 0, 1, 1), FrameRect(rectangle)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIEditBox");
+#endif
+
+	Text = text;
+
+	if (Environment)
+		Operator = Environment->getOSOperator();
+
+	if (Operator)
+		Operator->grab();
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+
+	calculateFrameRect();
+	breakText();
+
+	calculateScrollPos();
+}
+
+//! destructor
+CGUIEditBox::~CGUIEditBox()
+{
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	if (Operator)
+		Operator->drop();
+}
+
+//! Sets another skin independent font.
+void CGUIEditBox::setOverrideFont(IGUIFont *font)
+{
+	if (OverrideFont == font)
+		return;
+
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	OverrideFont = font;
+
+	if (OverrideFont)
+		OverrideFont->grab();
+
+	breakText();
+}
+
+//! Gets the override font (if any)
+IGUIFont *CGUIEditBox::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont *CGUIEditBox::getActiveFont() const
+{
+	if (OverrideFont)
+		return OverrideFont;
+	IGUISkin *skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
+
+//! Sets another color for the text.
+void CGUIEditBox::setOverrideColor(video::SColor color)
+{
+	OverrideColor = color;
+	OverrideColorEnabled = true;
+}
+
+video::SColor CGUIEditBox::getOverrideColor() const
+{
+	return OverrideColor;
+}
+
+//! Turns the border on or off
+void CGUIEditBox::setDrawBorder(bool border)
+{
+	Border = border;
+}
+
+//! Checks if border drawing is enabled
+bool CGUIEditBox::isDrawBorderEnabled() const
+{
+	return Border;
+}
+
+//! Sets whether to draw the background
+void CGUIEditBox::setDrawBackground(bool draw)
+{
+	Background = draw;
+}
+
+//! Checks if background drawing is enabled
+bool CGUIEditBox::isDrawBackgroundEnabled() const
+{
+	return Background;
+}
+
+//! Sets if the text should use the override color or the color in the gui skin.
+void CGUIEditBox::enableOverrideColor(bool enable)
+{
+	OverrideColorEnabled = enable;
+}
+
+bool CGUIEditBox::isOverrideColorEnabled() const
+{
+	return OverrideColorEnabled;
+}
+
+//! Enables or disables word wrap
+void CGUIEditBox::setWordWrap(bool enable)
+{
+	WordWrap = enable;
+	breakText();
+}
+
+void CGUIEditBox::updateAbsolutePosition()
+{
+	core::rect<s32> oldAbsoluteRect(AbsoluteRect);
+	IGUIElement::updateAbsolutePosition();
+	if (oldAbsoluteRect != AbsoluteRect) {
+		calculateFrameRect();
+		breakText();
+		calculateScrollPos();
+	}
+}
+
+//! Checks if word wrap is enabled
+bool CGUIEditBox::isWordWrapEnabled() const
+{
+	return WordWrap;
+}
+
+//! Enables or disables newlines.
+void CGUIEditBox::setMultiLine(bool enable)
+{
+	MultiLine = enable;
+	breakText();
+}
+
+//! Checks if multi line editing is enabled
+bool CGUIEditBox::isMultiLineEnabled() const
+{
+	return MultiLine;
+}
+
+void CGUIEditBox::setPasswordBox(bool passwordBox, wchar_t passwordChar)
+{
+	PasswordBox = passwordBox;
+	if (PasswordBox) {
+		PasswordChar = passwordChar;
+		setMultiLine(false);
+		setWordWrap(false);
+		BrokenText.clear();
+	}
+}
+
+bool CGUIEditBox::isPasswordBox() const
+{
+	return PasswordBox;
+}
+
+//! Sets text justification
+void CGUIEditBox::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical)
+{
+	HAlign = horizontal;
+	VAlign = vertical;
+}
+
+//! called if an event happened.
+bool CGUIEditBox::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+
+		switch (event.EventType) {
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST) {
+				if (event.GUIEvent.Caller == this) {
+					MouseMarking = false;
+					setTextMarkers(0, 0);
+				}
+			}
+			break;
+		case EET_KEY_INPUT_EVENT:
+			if (processKey(event))
+				return true;
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			if (processMouse(event))
+				return true;
+			break;
+		case EET_STRING_INPUT_EVENT:
+			inputString(*event.StringInput.Str);
+			return true;
+			break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+bool CGUIEditBox::processKey(const SEvent &event)
+{
+	if (!event.KeyInput.PressedDown)
+		return false;
+
+	bool textChanged = false;
+	s32 newMarkBegin = MarkBegin;
+	s32 newMarkEnd = MarkEnd;
+
+	// control shortcut handling
+
+	if (event.KeyInput.Control) {
+		// german backlash '\' entered with control + '?'
+		if (event.KeyInput.Char == '\\') {
+			inputChar(event.KeyInput.Char);
+			return true;
+		}
+
+		switch (event.KeyInput.Key) {
+		case KEY_KEY_A:
+			// select all
+			newMarkBegin = 0;
+			newMarkEnd = Text.size();
+			break;
+		case KEY_KEY_C:
+			// copy to clipboard
+			if (!PasswordBox && Operator && MarkBegin != MarkEnd) {
+				const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+				core::stringc s;
+				wStringToUTF8(s, Text.subString(realmbgn, realmend - realmbgn));
+				Operator->copyToClipboard(s.c_str());
+			}
+			break;
+		case KEY_KEY_X:
+			// cut to the clipboard
+			if (!PasswordBox && Operator && MarkBegin != MarkEnd) {
+				const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+				// copy
+				core::stringc sc;
+				wStringToUTF8(sc, Text.subString(realmbgn, realmend - realmbgn));
+				Operator->copyToClipboard(sc.c_str());
+
+				if (isEnabled()) {
+					// delete
+					core::stringw s;
+					s = Text.subString(0, realmbgn);
+					s.append(Text.subString(realmend, Text.size() - realmend));
+					Text = s;
+
+					CursorPos = realmbgn;
+					newMarkBegin = 0;
+					newMarkEnd = 0;
+					textChanged = true;
+				}
+			}
+			break;
+		case KEY_KEY_V:
+			if (!isEnabled())
+				break;
+
+			// paste from the clipboard
+			if (Operator) {
+				const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+				// add the string
+				const c8 *p = Operator->getTextFromClipboard();
+				if (p) {
+					irr::core::stringw widep;
+					core::utf8ToWString(widep, p);
+
+					if (MarkBegin == MarkEnd) {
+						// insert text
+						core::stringw s = Text.subString(0, CursorPos);
+						s.append(widep);
+						s.append(Text.subString(CursorPos, Text.size() - CursorPos));
+
+						if (!Max || s.size() <= Max) { // thx to Fish FH for fix
+							Text = s;
+							s = widep;
+							CursorPos += s.size();
+						}
+					} else {
+						// replace text
+
+						core::stringw s = Text.subString(0, realmbgn);
+						s.append(widep);
+						s.append(Text.subString(realmend, Text.size() - realmend));
+
+						if (!Max || s.size() <= Max) { // thx to Fish FH for fix
+							Text = s;
+							s = widep;
+							CursorPos = realmbgn + s.size();
+						}
+					}
+				}
+
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+				textChanged = true;
+			}
+			break;
+		case KEY_HOME:
+			// move/highlight to start of text
+			if (event.KeyInput.Shift) {
+				newMarkEnd = CursorPos;
+				newMarkBegin = 0;
+				CursorPos = 0;
+			} else {
+				CursorPos = 0;
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+			break;
+		case KEY_END:
+			// move/highlight to end of text
+			if (event.KeyInput.Shift) {
+				newMarkBegin = CursorPos;
+				newMarkEnd = Text.size();
+				CursorPos = 0;
+			} else {
+				CursorPos = Text.size();
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+			break;
+		default:
+			return false;
+		}
+	}
+	// Some special keys - but only handle them if KeyInput.Char is null as on some systems (X11) they might have same key-code as ansi-keys otherwise
+	else if (event.KeyInput.Char == 0) {
+		switch (event.KeyInput.Key) {
+		case KEY_END: {
+			s32 p = Text.size();
+			if (WordWrap || MultiLine) {
+				p = getLineFromPos(CursorPos);
+				p = BrokenTextPositions[p] + (s32)BrokenText[p].size();
+				if (p > 0 && (Text[p - 1] == L'\r' || Text[p - 1] == L'\n'))
+					p -= 1;
+			}
+
+			if (event.KeyInput.Shift) {
+				if (MarkBegin == MarkEnd)
+					newMarkBegin = CursorPos;
+
+				newMarkEnd = p;
+			} else {
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+			CursorPos = p;
+			BlinkStartTime = os::Timer::getTime();
+		} break;
+		case KEY_HOME: {
+
+			s32 p = 0;
+			if (WordWrap || MultiLine) {
+				p = getLineFromPos(CursorPos);
+				p = BrokenTextPositions[p];
+			}
+
+			if (event.KeyInput.Shift) {
+				if (MarkBegin == MarkEnd)
+					newMarkBegin = CursorPos;
+				newMarkEnd = p;
+			} else {
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+			CursorPos = p;
+			BlinkStartTime = os::Timer::getTime();
+		} break;
+		case KEY_LEFT:
+
+			if (event.KeyInput.Shift) {
+				if (CursorPos > 0) {
+					if (MarkBegin == MarkEnd)
+						newMarkBegin = CursorPos;
+
+					newMarkEnd = CursorPos - 1;
+				}
+			} else {
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+
+			if (CursorPos > 0)
+				CursorPos--;
+			BlinkStartTime = os::Timer::getTime();
+			break;
+
+		case KEY_RIGHT:
+			if (event.KeyInput.Shift) {
+				if (Text.size() > (u32)CursorPos) {
+					if (MarkBegin == MarkEnd)
+						newMarkBegin = CursorPos;
+
+					newMarkEnd = CursorPos + 1;
+				}
+			} else {
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+			}
+
+			if (Text.size() > (u32)CursorPos)
+				CursorPos++;
+			BlinkStartTime = os::Timer::getTime();
+			break;
+		case KEY_UP:
+			if (MultiLine || (WordWrap && BrokenText.size() > 1)) {
+				s32 lineNo = getLineFromPos(CursorPos);
+				s32 mb = (MarkBegin == MarkEnd) ? CursorPos : (MarkBegin > MarkEnd ? MarkBegin : MarkEnd);
+				if (lineNo > 0) {
+					s32 cp = CursorPos - BrokenTextPositions[lineNo];
+					if ((s32)BrokenText[lineNo - 1].size() < cp)
+						CursorPos = BrokenTextPositions[lineNo - 1] + core::max_((u32)1, BrokenText[lineNo - 1].size()) - 1;
+					else
+						CursorPos = BrokenTextPositions[lineNo - 1] + cp;
+				}
+
+				if (event.KeyInput.Shift) {
+					newMarkBegin = mb;
+					newMarkEnd = CursorPos;
+				} else {
+					newMarkBegin = 0;
+					newMarkEnd = 0;
+				}
+
+			} else {
+				return false;
+			}
+			break;
+		case KEY_DOWN:
+			if (MultiLine || (WordWrap && BrokenText.size() > 1)) {
+				s32 lineNo = getLineFromPos(CursorPos);
+				s32 mb = (MarkBegin == MarkEnd) ? CursorPos : (MarkBegin < MarkEnd ? MarkBegin : MarkEnd);
+				if (lineNo < (s32)BrokenText.size() - 1) {
+					s32 cp = CursorPos - BrokenTextPositions[lineNo];
+					if ((s32)BrokenText[lineNo + 1].size() < cp)
+						CursorPos = BrokenTextPositions[lineNo + 1] + core::max_((u32)1, BrokenText[lineNo + 1].size()) - 1;
+					else
+						CursorPos = BrokenTextPositions[lineNo + 1] + cp;
+				}
+
+				if (event.KeyInput.Shift) {
+					newMarkBegin = mb;
+					newMarkEnd = CursorPos;
+				} else {
+					newMarkBegin = 0;
+					newMarkEnd = 0;
+				}
+
+			} else {
+				return false;
+			}
+			break;
+		case KEY_INSERT:
+			if (!isEnabled())
+				break;
+
+			OverwriteMode = !OverwriteMode;
+			break;
+		case KEY_DELETE:
+			if (!isEnabled())
+				break;
+
+			if (keyDelete()) {
+				BlinkStartTime = os::Timer::getTime();
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+				textChanged = true;
+			}
+			break;
+		default:
+			return false;
+		}
+	} else {
+		// default keyboard handling
+		switch (event.KeyInput.Key) {
+		case KEY_RETURN:
+			if (MultiLine) {
+				inputChar(L'\n');
+			} else {
+				calculateScrollPos();
+				sendGuiEvent(EGET_EDITBOX_ENTER);
+			}
+			return true;
+
+		case KEY_BACK:
+			if (!isEnabled())
+				break;
+
+			if (Text.size()) {
+				core::stringw s;
+
+				if (MarkBegin != MarkEnd) {
+					// delete marked text
+					const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+					const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+					s = Text.subString(0, realmbgn);
+					s.append(Text.subString(realmend, Text.size() - realmend));
+					Text = s;
+
+					CursorPos = realmbgn;
+				} else {
+					// delete text behind cursor
+					if (CursorPos > 0)
+						s = Text.subString(0, CursorPos - 1);
+					else
+						s = L"";
+					s.append(Text.subString(CursorPos, Text.size() - CursorPos));
+					Text = s;
+					--CursorPos;
+				}
+
+				if (CursorPos < 0)
+					CursorPos = 0;
+				BlinkStartTime = os::Timer::getTime();
+				newMarkBegin = 0;
+				newMarkEnd = 0;
+				textChanged = true;
+			}
+			break;
+
+		case KEY_DELETE:
+
+			// At least on X11 we get a char with 127 when the delete key is pressed.
+			// We get no char when the delete key on numkeys is pressed with numlock off (handled in the other case calling keyDelete as Char is then 0).
+			// We get a keykode != 127 when delete key on numlock is pressed with numlock on.
+			if (event.KeyInput.Char == 127) {
+				if (!isEnabled())
+					break;
+
+				if (keyDelete()) {
+					BlinkStartTime = os::Timer::getTime();
+					newMarkBegin = 0;
+					newMarkEnd = 0;
+					textChanged = true;
+				}
+				break;
+			} else {
+				inputChar(event.KeyInput.Char);
+				return true;
+			}
+
+		case KEY_ESCAPE:
+		case KEY_TAB:
+		case KEY_SHIFT:
+		case KEY_F1:
+		case KEY_F2:
+		case KEY_F3:
+		case KEY_F4:
+		case KEY_F5:
+		case KEY_F6:
+		case KEY_F7:
+		case KEY_F8:
+		case KEY_F9:
+		case KEY_F10:
+		case KEY_F11:
+		case KEY_F12:
+		case KEY_F13:
+		case KEY_F14:
+		case KEY_F15:
+		case KEY_F16:
+		case KEY_F17:
+		case KEY_F18:
+		case KEY_F19:
+		case KEY_F20:
+		case KEY_F21:
+		case KEY_F22:
+		case KEY_F23:
+		case KEY_F24:
+			// ignore these keys
+			return false;
+
+		default:
+			inputChar(event.KeyInput.Char);
+			return true;
+		}
+	}
+
+	// Set new text markers
+	setTextMarkers(newMarkBegin, newMarkEnd);
+
+	// break the text if it has changed
+	if (textChanged) {
+		breakText();
+		calculateScrollPos();
+		sendGuiEvent(EGET_EDITBOX_CHANGED);
+	} else {
+		calculateScrollPos();
+	}
+
+	return true;
+}
+
+bool CGUIEditBox::keyDelete()
+{
+	if (Text.size() != 0) {
+		core::stringw s;
+
+		if (MarkBegin != MarkEnd) {
+			// delete marked text
+			const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+			const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+			s = Text.subString(0, realmbgn);
+			s.append(Text.subString(realmend, Text.size() - realmend));
+			Text = s;
+
+			CursorPos = realmbgn;
+		} else {
+			// delete text before cursor
+			s = Text.subString(0, CursorPos);
+			s.append(Text.subString(CursorPos + 1, Text.size() - CursorPos - 1));
+			Text = s;
+		}
+
+		if (CursorPos > (s32)Text.size())
+			CursorPos = (s32)Text.size();
+
+		return true;
+	}
+
+	return false;
+}
+
+//! draws the element and its children
+void CGUIEditBox::draw()
+{
+	if (!IsVisible)
+		return;
+
+	const bool focus = Environment->hasFocus(this);
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+
+	EGUI_DEFAULT_COLOR bgCol = EGDC_GRAY_EDITABLE;
+	if (isEnabled())
+		bgCol = focus ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE;
+
+	if (!Border && Background) {
+		skin->draw2DRectangle(this, skin->getColor(bgCol), AbsoluteRect, &AbsoluteClippingRect);
+	}
+
+	if (Border) {
+		// draw the border
+		skin->draw3DSunkenPane(this, skin->getColor(bgCol), false, Background, AbsoluteRect, &AbsoluteClippingRect);
+
+		calculateFrameRect();
+	}
+
+	core::rect<s32> localClipRect = FrameRect;
+	localClipRect.clipAgainst(AbsoluteClippingRect);
+
+	// draw the text
+
+	IGUIFont *font = getActiveFont();
+
+	s32 cursorLine = 0;
+	s32 charcursorpos = 0;
+
+	if (font) {
+		if (LastBreakFont != font) {
+			breakText();
+		}
+
+		// calculate cursor pos
+
+		core::stringw *txtLine = &Text;
+		s32 startPos = 0;
+
+		core::stringw s, s2;
+
+		// get mark position
+		const bool ml = (!PasswordBox && (WordWrap || MultiLine));
+		const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+		const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+		const s32 hlineStart = ml ? getLineFromPos(realmbgn) : 0;
+		const s32 hlineCount = ml ? getLineFromPos(realmend) - hlineStart + 1 : 1;
+		const s32 lineCount = ml ? BrokenText.size() : 1;
+
+		// Save the override color information.
+		// Then, alter it if the edit box is disabled.
+		const bool prevOver = OverrideColorEnabled;
+		const video::SColor prevColor = OverrideColor;
+
+		if (Text.size()) {
+			if (!isEnabled() && !OverrideColorEnabled) {
+				OverrideColorEnabled = true;
+				OverrideColor = skin->getColor(EGDC_GRAY_TEXT);
+			}
+
+			for (s32 i = 0; i < lineCount; ++i) {
+				setTextRect(i);
+
+				// clipping test - don't draw anything outside the visible area
+				core::rect<s32> c = localClipRect;
+				c.clipAgainst(CurrentTextRect);
+				if (!c.isValid())
+					continue;
+
+				// get current line
+				if (PasswordBox) {
+					if (BrokenText.size() != 1) {
+						BrokenText.clear();
+						BrokenText.push_back(core::stringw());
+					}
+					if (BrokenText[0].size() != Text.size()) {
+						BrokenText[0] = Text;
+						for (u32 q = 0; q < Text.size(); ++q) {
+							BrokenText[0][q] = PasswordChar;
+						}
+					}
+					txtLine = &BrokenText[0];
+					startPos = 0;
+				} else {
+					txtLine = ml ? &BrokenText[i] : &Text;
+					startPos = ml ? BrokenTextPositions[i] : 0;
+				}
+
+				// draw normal text
+				font->draw(txtLine->c_str(), CurrentTextRect,
+						OverrideColorEnabled ? OverrideColor : skin->getColor(EGDC_BUTTON_TEXT),
+						false, true, &localClipRect);
+
+				// draw mark and marked text
+				if (focus && MarkBegin != MarkEnd && i >= hlineStart && i < hlineStart + hlineCount) {
+
+					s32 mbegin = 0, mend = 0;
+					s32 lineStartPos = 0, lineEndPos = txtLine->size();
+
+					if (i == hlineStart) {
+						// highlight start is on this line
+						s = txtLine->subString(0, realmbgn - startPos);
+						mbegin = font->getDimension(s.c_str()).Width;
+
+						// deal with kerning
+						mbegin += font->getKerningWidth(
+								&((*txtLine)[realmbgn - startPos]),
+								realmbgn - startPos > 0 ? &((*txtLine)[realmbgn - startPos - 1]) : 0);
+
+						lineStartPos = realmbgn - startPos;
+					}
+					if (i == hlineStart + hlineCount - 1) {
+						// highlight end is on this line
+						s2 = txtLine->subString(0, realmend - startPos);
+						mend = font->getDimension(s2.c_str()).Width;
+						lineEndPos = (s32)s2.size();
+					} else
+						mend = font->getDimension(txtLine->c_str()).Width;
+
+					CurrentTextRect.UpperLeftCorner.X += mbegin;
+					CurrentTextRect.LowerRightCorner.X = CurrentTextRect.UpperLeftCorner.X + mend - mbegin;
+
+					// draw mark
+					skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), CurrentTextRect, &localClipRect);
+
+					// draw marked text
+					s = txtLine->subString(lineStartPos, lineEndPos - lineStartPos);
+
+					if (s.size())
+						font->draw(s.c_str(), CurrentTextRect,
+								OverrideColorEnabled ? OverrideColor : skin->getColor(EGDC_HIGH_LIGHT_TEXT),
+								false, true, &localClipRect);
+				}
+			}
+
+			// Return the override color information to its previous settings.
+			OverrideColorEnabled = prevOver;
+			OverrideColor = prevColor;
+		}
+
+		// draw cursor
+		if (isEnabled()) {
+			if (WordWrap || MultiLine) {
+				cursorLine = getLineFromPos(CursorPos);
+				txtLine = &BrokenText[cursorLine];
+				startPos = BrokenTextPositions[cursorLine];
+			}
+			s = txtLine->subString(0, CursorPos - startPos);
+			charcursorpos = font->getDimension(s.c_str()).Width +
+							font->getKerningWidth(CursorChar.c_str(), CursorPos - startPos > 0 ? &((*txtLine)[CursorPos - startPos - 1]) : 0);
+
+			if (focus && (CursorBlinkTime == 0 || (os::Timer::getTime() - BlinkStartTime) % (2 * CursorBlinkTime) < CursorBlinkTime)) {
+				setTextRect(cursorLine);
+				CurrentTextRect.UpperLeftCorner.X += charcursorpos;
+
+				if (OverwriteMode) {
+					core::stringw character = Text.subString(CursorPos, 1);
+					s32 mend = font->getDimension(character.c_str()).Width;
+					// Make sure the cursor box has at least some width to it
+					if (mend <= 0)
+						mend = font->getDimension(CursorChar.c_str()).Width;
+					CurrentTextRect.LowerRightCorner.X = CurrentTextRect.UpperLeftCorner.X + mend;
+					skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), CurrentTextRect, &localClipRect);
+					font->draw(character.c_str(), CurrentTextRect,
+							OverrideColorEnabled ? OverrideColor : skin->getColor(EGDC_HIGH_LIGHT_TEXT),
+							false, true, &localClipRect);
+				} else {
+					font->draw(CursorChar, CurrentTextRect,
+							OverrideColorEnabled ? OverrideColor : skin->getColor(EGDC_BUTTON_TEXT),
+							false, true, &localClipRect);
+				}
+			}
+		}
+	}
+
+	// draw children
+	IGUIElement::draw();
+}
+
+//! Sets the new caption of this element.
+void CGUIEditBox::setText(const wchar_t *text)
+{
+	Text = text;
+	if (u32(CursorPos) > Text.size())
+		CursorPos = Text.size();
+	HScrollPos = 0;
+	breakText();
+}
+
+//! Enables or disables automatic scrolling with cursor position
+//! \param enable: If set to true, the text will move around with the cursor position
+void CGUIEditBox::setAutoScroll(bool enable)
+{
+	AutoScroll = enable;
+}
+
+//! Checks to see if automatic scrolling is enabled
+//! \return true if automatic scrolling is enabled, false if not
+bool CGUIEditBox::isAutoScrollEnabled() const
+{
+	return AutoScroll;
+}
+
+//! Gets the area of the text in the edit box
+//! \return Returns the size in pixels of the text
+core::dimension2du CGUIEditBox::getTextDimension()
+{
+	core::rect<s32> ret;
+
+	setTextRect(0);
+	ret = CurrentTextRect;
+
+	for (u32 i = 1; i < BrokenText.size(); ++i) {
+		setTextRect(i);
+		ret.addInternalPoint(CurrentTextRect.UpperLeftCorner);
+		ret.addInternalPoint(CurrentTextRect.LowerRightCorner);
+	}
+
+	return core::dimension2du(ret.getSize());
+}
+
+//! Sets the maximum amount of characters which may be entered in the box.
+//! \param max: Maximum amount of characters. If 0, the character amount is
+//! infinity.
+void CGUIEditBox::setMax(u32 max)
+{
+	Max = max;
+
+	if (Text.size() > Max && Max != 0)
+		Text = Text.subString(0, Max);
+}
+
+//! Returns maximum amount of characters, previously set by setMax();
+u32 CGUIEditBox::getMax() const
+{
+	return Max;
+}
+
+//! Set the character used for the cursor.
+/** By default it's "_" */
+void CGUIEditBox::setCursorChar(const wchar_t cursorChar)
+{
+	CursorChar[0] = cursorChar;
+}
+
+//! Get the character used for the cursor.
+wchar_t CGUIEditBox::getCursorChar() const
+{
+	return CursorChar[0];
+}
+
+//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
+void CGUIEditBox::setCursorBlinkTime(irr::u32 timeMs)
+{
+	CursorBlinkTime = timeMs;
+}
+
+//! Get the cursor blinktime
+irr::u32 CGUIEditBox::getCursorBlinkTime() const
+{
+	return CursorBlinkTime;
+}
+
+bool CGUIEditBox::processMouse(const SEvent &event)
+{
+	switch (event.MouseInput.Event) {
+	case irr::EMIE_LMOUSE_LEFT_UP:
+		if (Environment->hasFocus(this)) {
+			CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
+			if (MouseMarking) {
+				setTextMarkers(MarkBegin, CursorPos);
+			}
+			MouseMarking = false;
+			calculateScrollPos();
+			return true;
+		}
+		break;
+	case irr::EMIE_MOUSE_MOVED: {
+		if (MouseMarking) {
+			CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
+			setTextMarkers(MarkBegin, CursorPos);
+			calculateScrollPos();
+			return true;
+		}
+	} break;
+	case EMIE_LMOUSE_PRESSED_DOWN:
+		if (!Environment->hasFocus(this)) { // can happen when events are manually send to the element
+			BlinkStartTime = os::Timer::getTime();
+			MouseMarking = true;
+			CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
+			setTextMarkers(CursorPos, CursorPos);
+			calculateScrollPos();
+			return true;
+		} else {
+			if (!AbsoluteClippingRect.isPointInside(
+						core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y))) {
+				return false;
+			} else {
+				// move cursor
+				CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
+
+				s32 newMarkBegin = MarkBegin;
+				if (!MouseMarking)
+					newMarkBegin = CursorPos;
+
+				MouseMarking = true;
+				setTextMarkers(newMarkBegin, CursorPos);
+				calculateScrollPos();
+				return true;
+			}
+		}
+	case EMIE_MMOUSE_PRESSED_DOWN: {
+		if (!AbsoluteClippingRect.isPointInside(core::position2d<s32>(
+					event.MouseInput.X, event.MouseInput.Y)))
+			return false;
+
+		if (!Environment->hasFocus(this)) {
+			BlinkStartTime = os::Timer::getTime();
+		}
+
+		// move cursor and disable marking
+		CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
+		MouseMarking = false;
+		setTextMarkers(CursorPos, CursorPos);
+
+		// paste from the primary selection
+		inputString([&] {
+			irr::core::stringw inserted_text;
+			if (!Operator)
+				return inserted_text;
+			const c8 *inserted_text_utf8 = Operator->getTextFromPrimarySelection();
+			if (!inserted_text_utf8)
+				return inserted_text;
+			core::utf8ToWString(inserted_text, inserted_text_utf8);
+			return inserted_text;
+		}());
+
+		return true;
+	}
+	default:
+		break;
+	}
+
+	return false;
+}
+
+s32 CGUIEditBox::getCursorPos(s32 x, s32 y)
+{
+	IGUIFont *font = getActiveFont();
+
+	const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1;
+
+	core::stringw *txtLine = 0;
+	s32 startPos = 0;
+	x += 3;
+
+	for (u32 i = 0; i < lineCount; ++i) {
+		setTextRect(i);
+		if (i == 0 && y < CurrentTextRect.UpperLeftCorner.Y)
+			y = CurrentTextRect.UpperLeftCorner.Y;
+		if (i == lineCount - 1 && y > CurrentTextRect.LowerRightCorner.Y)
+			y = CurrentTextRect.LowerRightCorner.Y;
+
+		// is it inside this region?
+		if (y >= CurrentTextRect.UpperLeftCorner.Y && y <= CurrentTextRect.LowerRightCorner.Y) {
+			// we've found the clicked line
+			txtLine = (WordWrap || MultiLine) ? &BrokenText[i] : &Text;
+			startPos = (WordWrap || MultiLine) ? BrokenTextPositions[i] : 0;
+			break;
+		}
+	}
+
+	if (x < CurrentTextRect.UpperLeftCorner.X)
+		x = CurrentTextRect.UpperLeftCorner.X;
+
+	if (!txtLine)
+		return 0;
+
+	s32 idx = font->getCharacterFromPos(txtLine->c_str(), x - CurrentTextRect.UpperLeftCorner.X);
+
+	// click was on or left of the line
+	if (idx != -1)
+		return idx + startPos;
+
+	// click was off the right edge of the line, go to end.
+	return txtLine->size() + startPos;
+}
+
+//! Breaks the single text line.
+void CGUIEditBox::breakText()
+{
+	if ((!WordWrap && !MultiLine))
+		return;
+
+	BrokenText.clear(); // need to reallocate :/
+	BrokenTextPositions.set_used(0);
+
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return;
+
+	LastBreakFont = font;
+
+	core::stringw line;
+	core::stringw word;
+	core::stringw whitespace;
+	s32 lastLineStart = 0;
+	s32 size = Text.size();
+	s32 length = 0;
+	s32 elWidth = RelativeRect.getWidth() - 6;
+	wchar_t c;
+
+	for (s32 i = 0; i < size; ++i) {
+		c = Text[i];
+		bool lineBreak = false;
+
+		if (c == L'\r') { // Mac or Windows breaks
+			lineBreak = true;
+			c = 0;
+			if (Text[i + 1] == L'\n') { // Windows breaks
+				// TODO: I (Michael) think that we shouldn't change the text given by the user for whatever reason.
+				// Instead rework the cursor positioning to be able to handle this (but not in stable release
+				// branch as users might already expect this behavior).
+				Text.erase(i + 1);
+				--size;
+				if (CursorPos > i)
+					--CursorPos;
+			}
+		} else if (c == L'\n') { // Unix breaks
+			lineBreak = true;
+			c = 0;
+		}
+
+		// don't break if we're not a multi-line edit box
+		if (!MultiLine)
+			lineBreak = false;
+
+		if (c == L' ' || c == 0 || i == (size - 1)) {
+			// here comes the next whitespace, look if
+			// we can break the last word to the next line
+			// We also break whitespace, otherwise cursor would vanish beside the right border.
+			s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+			s32 worldlgth = font->getDimension(word.c_str()).Width;
+
+			if (WordWrap && length + worldlgth + whitelgth > elWidth && line.size() > 0) {
+				// break to next line
+				length = worldlgth;
+				BrokenText.push_back(line);
+				BrokenTextPositions.push_back(lastLineStart);
+				lastLineStart = i - (s32)word.size();
+				line = word;
+			} else {
+				// add word to line
+				line += whitespace;
+				line += word;
+				length += whitelgth + worldlgth;
+			}
+
+			word = L"";
+			whitespace = L"";
+
+			if (c)
+				whitespace += c;
+
+			// compute line break
+			if (lineBreak) {
+				line += whitespace;
+				line += word;
+				BrokenText.push_back(line);
+				BrokenTextPositions.push_back(lastLineStart);
+				lastLineStart = i + 1;
+				line = L"";
+				word = L"";
+				whitespace = L"";
+				length = 0;
+			}
+		} else {
+			// yippee this is a word..
+			word += c;
+		}
+	}
+
+	line += whitespace;
+	line += word;
+	BrokenText.push_back(line);
+	BrokenTextPositions.push_back(lastLineStart);
+}
+
+// TODO: that function does interpret VAlign according to line-index (indexed line is placed on top-center-bottom)
+// but HAlign according to line-width (pixels) and not by row.
+// Intuitively I suppose HAlign handling is better as VScrollPos should handle the line-scrolling.
+// But please no one change this without also rewriting (and this time fucking testing!!!) autoscrolling (I noticed this when fixing the old autoscrolling).
+void CGUIEditBox::setTextRect(s32 line)
+{
+	if (line < 0)
+		return;
+
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return;
+
+	core::dimension2du d;
+
+	// get text dimension
+	const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1;
+	if (WordWrap || MultiLine) {
+		d = font->getDimension(BrokenText[line].c_str());
+	} else {
+		d = font->getDimension(Text.c_str());
+		d.Height = AbsoluteRect.getHeight();
+	}
+	d.Height += font->getKerningHeight();
+
+	// justification
+	switch (HAlign) {
+	case EGUIA_CENTER:
+		// align to h centre
+		CurrentTextRect.UpperLeftCorner.X = (FrameRect.getWidth() / 2) - (d.Width / 2);
+		CurrentTextRect.LowerRightCorner.X = (FrameRect.getWidth() / 2) + (d.Width / 2);
+		break;
+	case EGUIA_LOWERRIGHT:
+		// align to right edge
+		CurrentTextRect.UpperLeftCorner.X = FrameRect.getWidth() - d.Width;
+		CurrentTextRect.LowerRightCorner.X = FrameRect.getWidth();
+		break;
+	default:
+		// align to left edge
+		CurrentTextRect.UpperLeftCorner.X = 0;
+		CurrentTextRect.LowerRightCorner.X = d.Width;
+	}
+
+	switch (VAlign) {
+	case EGUIA_CENTER:
+		// align to v centre
+		CurrentTextRect.UpperLeftCorner.Y =
+				(FrameRect.getHeight() / 2) - (lineCount * d.Height) / 2 + d.Height * line;
+		break;
+	case EGUIA_LOWERRIGHT:
+		// align to bottom edge
+		CurrentTextRect.UpperLeftCorner.Y =
+				FrameRect.getHeight() - lineCount * d.Height + d.Height * line;
+		break;
+	default:
+		// align to top edge
+		CurrentTextRect.UpperLeftCorner.Y = d.Height * line;
+		break;
+	}
+
+	CurrentTextRect.UpperLeftCorner.X -= HScrollPos;
+	CurrentTextRect.LowerRightCorner.X -= HScrollPos;
+	CurrentTextRect.UpperLeftCorner.Y -= VScrollPos;
+	CurrentTextRect.LowerRightCorner.Y = CurrentTextRect.UpperLeftCorner.Y + d.Height;
+
+	CurrentTextRect += FrameRect.UpperLeftCorner;
+}
+
+s32 CGUIEditBox::getLineFromPos(s32 pos)
+{
+	if (!WordWrap && !MultiLine)
+		return 0;
+
+	s32 i = 0;
+	while (i < (s32)BrokenTextPositions.size()) {
+		if (BrokenTextPositions[i] > pos)
+			return i - 1;
+		++i;
+	}
+	return (s32)BrokenTextPositions.size() - 1;
+}
+
+void CGUIEditBox::inputChar(wchar_t c)
+{
+	if (c == 0)
+		return;
+	core::stringw s(&c, 1);
+	inputString(s);
+}
+
+void CGUIEditBox::inputString(const core::stringw &str)
+{
+	if (!isEnabled())
+		return;
+
+	core::stringw s;
+	u32 len = str.size();
+
+	if (MarkBegin != MarkEnd) {
+		// replace marked text
+		const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+		const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+		s = Text.subString(0, realmbgn);
+		s.append(str);
+		s.append(Text.subString(realmend, Text.size() - realmend));
+		Text = s;
+		CursorPos = realmbgn + len;
+	} else if (OverwriteMode) {
+		// check to see if we are at the end of the text
+		if ((u32)CursorPos + len < Text.size()) {
+			bool isEOL = false;
+			s32 EOLPos;
+			for (u32 i = CursorPos; i < CursorPos + len && i < Max; i++) {
+				if (Text[i] == L'\n' || Text[i] == L'\r') {
+					isEOL = true;
+					EOLPos = i;
+					break;
+				}
+			}
+			if (!isEOL || Text.size() + len <= Max || Max == 0) {
+				s = Text.subString(0, CursorPos);
+				s.append(str);
+				if (isEOL) {
+					// just keep appending to the current line
+					// This follows the behavior of other gui libraries behaviors
+					s.append(Text.subString(EOLPos, Text.size() - EOLPos));
+				} else {
+					// replace the next character
+					s.append(Text.subString(CursorPos + len, Text.size() - CursorPos - len));
+				}
+				Text = s;
+				CursorPos += len;
+			}
+		} else if (Text.size() + len <= Max || Max == 0) {
+			// add new character because we are at the end of the string
+			s = Text.subString(0, CursorPos);
+			s.append(str);
+			s.append(Text.subString(CursorPos + len, Text.size() - CursorPos - len));
+			Text = s;
+			CursorPos += len;
+		}
+	} else if (Text.size() + len <= Max || Max == 0) {
+		// add new character
+		s = Text.subString(0, CursorPos);
+		s.append(str);
+		s.append(Text.subString(CursorPos, Text.size() - CursorPos));
+		Text = s;
+		CursorPos += len;
+	}
+
+	BlinkStartTime = os::Timer::getTime();
+	setTextMarkers(0, 0);
+
+	breakText();
+	calculateScrollPos();
+	sendGuiEvent(EGET_EDITBOX_CHANGED);
+}
+
+// calculate autoscroll
+void CGUIEditBox::calculateScrollPos()
+{
+	if (!AutoScroll)
+		return;
+
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return;
+
+	s32 cursLine = getLineFromPos(CursorPos);
+	if (cursLine < 0)
+		return;
+	setTextRect(cursLine);
+	const bool hasBrokenText = MultiLine || WordWrap;
+
+	// Check horizonal scrolling
+	// NOTE: Calculations different to vertical scrolling because setTextRect interprets VAlign relative to line but HAlign not relative to row
+	{
+		// get cursor position
+		// get cursor area
+		irr::u32 cursorWidth = font->getDimension(CursorChar.c_str()).Width;
+		core::stringw *txtLine = hasBrokenText ? &BrokenText[cursLine] : &Text;
+		s32 cPos = hasBrokenText ? CursorPos - BrokenTextPositions[cursLine] : CursorPos; // column
+		s32 cStart = font->getDimension(txtLine->subString(0, cPos).c_str()).Width;       // pixels from text-start
+		s32 cEnd = cStart + cursorWidth;
+		s32 txtWidth = font->getDimension(txtLine->c_str()).Width;
+
+		if (txtWidth < FrameRect.getWidth()) {
+			// TODO: Needs a clean left and right gap removal depending on HAlign, similar to vertical scrolling tests for top/bottom.
+			// This check just fixes the case where it was most noticable (text smaller than clipping area).
+
+			HScrollPos = 0;
+			setTextRect(cursLine);
+		}
+
+		if (CurrentTextRect.UpperLeftCorner.X + cStart < FrameRect.UpperLeftCorner.X) {
+			// cursor to the left of the clipping area
+			HScrollPos -= FrameRect.UpperLeftCorner.X - (CurrentTextRect.UpperLeftCorner.X + cStart);
+			setTextRect(cursLine);
+
+			// TODO: should show more characters to the left when we're scrolling left
+			//	and the cursor reaches the border.
+		} else if (CurrentTextRect.UpperLeftCorner.X + cEnd > FrameRect.LowerRightCorner.X) {
+			// cursor to the right of the clipping area
+			HScrollPos += (CurrentTextRect.UpperLeftCorner.X + cEnd) - FrameRect.LowerRightCorner.X;
+			setTextRect(cursLine);
+		}
+	}
+
+	// calculate vertical scrolling
+	if (hasBrokenText) {
+		irr::u32 lineHeight = font->getDimension(L"A").Height + font->getKerningHeight();
+		// only up to 1 line fits?
+		if (lineHeight >= (irr::u32)FrameRect.getHeight()) {
+			VScrollPos = 0;
+			setTextRect(cursLine);
+			s32 unscrolledPos = CurrentTextRect.UpperLeftCorner.Y;
+			s32 pivot = FrameRect.UpperLeftCorner.Y;
+			switch (VAlign) {
+			case EGUIA_CENTER:
+				pivot += FrameRect.getHeight() / 2;
+				unscrolledPos += lineHeight / 2;
+				break;
+			case EGUIA_LOWERRIGHT:
+				pivot += FrameRect.getHeight();
+				unscrolledPos += lineHeight;
+				break;
+			default:
+				break;
+			}
+			VScrollPos = unscrolledPos - pivot;
+			setTextRect(cursLine);
+		} else {
+			// First 2 checks are necessary when people delete lines
+			setTextRect(0);
+			if (CurrentTextRect.UpperLeftCorner.Y > FrameRect.UpperLeftCorner.Y && VAlign != EGUIA_LOWERRIGHT) {
+				// first line is leaving a gap on top
+				VScrollPos = 0;
+			} else if (VAlign != EGUIA_UPPERLEFT) {
+				u32 lastLine = BrokenTextPositions.empty() ? 0 : BrokenTextPositions.size() - 1;
+				setTextRect(lastLine);
+				if (CurrentTextRect.LowerRightCorner.Y < FrameRect.LowerRightCorner.Y) {
+					// last line is leaving a gap on bottom
+					VScrollPos -= FrameRect.LowerRightCorner.Y - CurrentTextRect.LowerRightCorner.Y;
+				}
+			}
+
+			setTextRect(cursLine);
+			if (CurrentTextRect.UpperLeftCorner.Y < FrameRect.UpperLeftCorner.Y) {
+				// text above valid area
+				VScrollPos -= FrameRect.UpperLeftCorner.Y - CurrentTextRect.UpperLeftCorner.Y;
+				setTextRect(cursLine);
+			} else if (CurrentTextRect.LowerRightCorner.Y > FrameRect.LowerRightCorner.Y) {
+				// text below valid area
+				VScrollPos += CurrentTextRect.LowerRightCorner.Y - FrameRect.LowerRightCorner.Y;
+				setTextRect(cursLine);
+			}
+		}
+	}
+}
+
+void CGUIEditBox::calculateFrameRect()
+{
+	FrameRect = AbsoluteRect;
+	IGUISkin *skin = 0;
+	if (Environment)
+		skin = Environment->getSkin();
+	if (Border && skin) {
+		FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X) + 1;
+		FrameRect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y) + 1;
+		FrameRect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X) + 1;
+		FrameRect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y) + 1;
+	}
+}
+
+//! set text markers
+void CGUIEditBox::setTextMarkers(s32 begin, s32 end)
+{
+	if (begin != MarkBegin || end != MarkEnd) {
+		MarkBegin = begin;
+		MarkEnd = end;
+
+		if (!PasswordBox && Operator && MarkBegin != MarkEnd) {
+			// copy to primary selection
+			const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
+			const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
+
+			core::stringc s;
+			wStringToUTF8(s, Text.subString(realmbgn, realmend - realmbgn));
+			Operator->copyToPrimarySelection(s.c_str());
+		}
+
+		sendGuiEvent(EGET_EDITBOX_MARKING_CHANGED);
+	}
+}
+
+//! send some gui event to parent
+void CGUIEditBox::sendGuiEvent(EGUI_EVENT_TYPE type)
+{
+	if (Parent) {
+		SEvent e;
+		e.EventType = EET_GUI_EVENT;
+		e.GUIEvent.Caller = this;
+		e.GUIEvent.Element = 0;
+		e.GUIEvent.EventType = type;
+
+		Parent->OnEvent(e);
+	}
+}
+
+//! Returns whether the element takes input from the IME
+bool CGUIEditBox::acceptsIME()
+{
+	return isEnabled();
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIEditBox.h b/irr/src/CGUIEditBox.h
new file mode 100644
index 000000000..35ab5f73e
--- /dev/null
+++ b/irr/src/CGUIEditBox.h
@@ -0,0 +1,196 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIEditBox.h"
+#include "irrArray.h"
+#include "IOSOperator.h"
+
+namespace irr
+{
+namespace gui
+{
+class CGUIEditBox : public IGUIEditBox
+{
+public:
+	//! constructor
+	CGUIEditBox(const wchar_t *text, bool border, IGUIEnvironment *environment,
+			IGUIElement *parent, s32 id, const core::rect<s32> &rectangle);
+
+	//! destructor
+	virtual ~CGUIEditBox();
+
+	//! Sets another skin independent font.
+	void setOverrideFont(IGUIFont *font = 0) override;
+
+	//! Gets the override font (if any)
+	/** \return The override font (may be 0) */
+	IGUIFont *getOverrideFont() const override;
+
+	//! Get the font which is used right now for drawing
+	/** Currently this is the override font when one is set and the
+	font of the active skin otherwise */
+	IGUIFont *getActiveFont() const override;
+
+	//! Sets another color for the text.
+	void setOverrideColor(video::SColor color) override;
+
+	//! Gets the override color
+	video::SColor getOverrideColor() const override;
+
+	//! Sets if the text should use the override color or the
+	//! color in the gui skin.
+	void enableOverrideColor(bool enable) override;
+
+	//! Checks if an override color is enabled
+	/** \return true if the override color is enabled, false otherwise */
+	bool isOverrideColorEnabled(void) const override;
+
+	//! Sets whether to draw the background
+	void setDrawBackground(bool draw) override;
+
+	//! Checks if background drawing is enabled
+	bool isDrawBackgroundEnabled() const override;
+
+	//! Turns the border on or off
+	void setDrawBorder(bool border) override;
+
+	//! Checks if border drawing is enabled
+	bool isDrawBorderEnabled() const override;
+
+	//! Enables or disables word wrap for using the edit box as multiline text editor.
+	void setWordWrap(bool enable) override;
+
+	//! Checks if word wrap is enabled
+	//! \return true if word wrap is enabled, false otherwise
+	bool isWordWrapEnabled() const override;
+
+	//! Enables or disables newlines.
+	/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
+	instead a newline character will be inserted. */
+	void setMultiLine(bool enable) override;
+
+	//! Checks if multi line editing is enabled
+	//! \return true if mult-line is enabled, false otherwise
+	bool isMultiLineEnabled() const override;
+
+	//! Enables or disables automatic scrolling with cursor position
+	//! \param enable: If set to true, the text will move around with the cursor position
+	void setAutoScroll(bool enable) override;
+
+	//! Checks to see if automatic scrolling is enabled
+	//! \return true if automatic scrolling is enabled, false if not
+	bool isAutoScrollEnabled() const override;
+
+	//! Gets the size area of the text in the edit box
+	//! \return Returns the size in pixels of the text
+	core::dimension2du getTextDimension() override;
+
+	//! Sets text justification
+	void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! Sets the new caption of this element.
+	void setText(const wchar_t *text) override;
+
+	//! Sets the maximum amount of characters which may be entered in the box.
+	//! \param max: Maximum amount of characters. If 0, the character amount is
+	//! infinity.
+	void setMax(u32 max) override;
+
+	//! Returns maximum amount of characters, previously set by setMax();
+	u32 getMax() const override;
+
+	//! Set the character used for the cursor.
+	/** By default it's "_" */
+	void setCursorChar(const wchar_t cursorChar) override;
+
+	//! Get the character used for the cursor.
+	wchar_t getCursorChar() const override;
+
+	//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
+	//** \param timeMs Blinktime in milliseconds. When set to 0 the cursor is constantly on without blinking */
+	void setCursorBlinkTime(irr::u32 timeMs) override;
+
+	//! Get the cursor blinktime
+	irr::u32 getCursorBlinkTime() const override;
+
+	//! Sets whether the edit box is a password box. Setting this to true will
+	/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
+	\param passwordBox: true to enable password, false to disable
+	\param passwordChar: the character that is displayed instead of letters */
+	void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*') override;
+
+	//! Returns true if the edit box is currently a password box.
+	bool isPasswordBox() const override;
+
+	//! Updates the absolute position, splits text if required
+	void updateAbsolutePosition() override;
+
+	//! Returns whether the element takes input from the IME
+	bool acceptsIME() override;
+
+protected:
+	//! Breaks the single text line.
+	void breakText();
+	//! sets the area of the given line
+	void setTextRect(s32 line);
+	//! returns the line number that the cursor is on
+	s32 getLineFromPos(s32 pos);
+	//! adds a letter to the edit box
+	void inputChar(wchar_t c);
+	//! adds a string to the edit box
+	void inputString(const core::stringw &str);
+	//! calculates the current scroll position
+	void calculateScrollPos();
+	//! calculated the FrameRect
+	void calculateFrameRect();
+	//! send some gui event to parent
+	void sendGuiEvent(EGUI_EVENT_TYPE type);
+	//! set text markers
+	void setTextMarkers(s32 begin, s32 end);
+	//! delete current selection or next char
+	bool keyDelete();
+
+	bool processKey(const SEvent &event);
+	bool processMouse(const SEvent &event);
+	s32 getCursorPos(s32 x, s32 y);
+
+	bool OverwriteMode;
+	bool MouseMarking;
+	bool Border;
+	bool Background;
+	bool OverrideColorEnabled;
+	s32 MarkBegin;
+	s32 MarkEnd;
+
+	video::SColor OverrideColor;
+	gui::IGUIFont *OverrideFont, *LastBreakFont;
+	IOSOperator *Operator;
+
+	u32 BlinkStartTime;
+	irr::u32 CursorBlinkTime;
+	core::stringw CursorChar; // IGUIFont::draw needs stringw instead of wchar_t
+	s32 CursorPos;
+	s32 HScrollPos, VScrollPos; // scroll position in characters
+	u32 Max;
+
+	bool WordWrap, MultiLine, AutoScroll, PasswordBox;
+	wchar_t PasswordChar;
+	EGUI_ALIGNMENT HAlign, VAlign;
+
+	core::array<core::stringw> BrokenText;
+	core::array<s32> BrokenTextPositions;
+
+	core::rect<s32> CurrentTextRect, FrameRect; // temporary values
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIEnvironment.cpp b/irr/src/CGUIEnvironment.cpp
new file mode 100644
index 000000000..80115ab11
--- /dev/null
+++ b/irr/src/CGUIEnvironment.cpp
@@ -0,0 +1,999 @@
+
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIEnvironment.h"
+
+#include "IVideoDriver.h"
+
+#include "CGUISkin.h"
+#include "CGUIButton.h"
+#include "CGUIScrollBar.h"
+#include "CGUIFont.h"
+#include "CGUISpriteBank.h"
+#include "CGUIImage.h"
+#include "CGUICheckBox.h"
+#include "CGUIListBox.h"
+#include "CGUIImageList.h"
+#include "CGUIFileOpenDialog.h"
+#include "CGUIStaticText.h"
+#include "CGUIEditBox.h"
+#include "CGUITabControl.h"
+#include "CGUIComboBox.h"
+
+#include "IWriteFile.h"
+#ifdef IRR_ENABLE_BUILTIN_FONT
+#include "BuiltInFont.h"
+#endif
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+const io::path CGUIEnvironment::DefaultFontName = "#DefaultFont";
+
+//! constructor
+CGUIEnvironment::CGUIEnvironment(io::IFileSystem *fs, video::IVideoDriver *driver, IOSOperator *op) :
+		IGUIElement(EGUIET_ROOT, 0, 0, 0, core::rect<s32>(driver ? core::dimension2d<s32>(driver->getScreenSize()) : core::dimension2d<s32>(0, 0))),
+		Driver(driver), Hovered(0), HoveredNoSubelement(0), Focus(0), LastHoveredMousePos(0, 0), CurrentSkin(0),
+		FileSystem(fs), UserReceiver(0), Operator(op), FocusFlags(EFF_SET_ON_LMOUSE_DOWN | EFF_SET_ON_TAB)
+{
+	if (Driver)
+		Driver->grab();
+
+	if (FileSystem)
+		FileSystem->grab();
+
+	if (Operator)
+		Operator->grab();
+
+#ifdef _DEBUG
+	IGUIEnvironment::setDebugName("CGUIEnvironment");
+#endif
+
+	loadBuiltInFont();
+
+	IGUISkin *skin = createSkin(gui::EGST_WINDOWS_METALLIC);
+	setSkin(skin);
+	skin->drop();
+
+	// set tooltip default
+	ToolTip.LastTime = 0;
+	ToolTip.EnterTime = 0;
+	ToolTip.LaunchTime = 1000;
+	ToolTip.RelaunchTime = 500;
+	ToolTip.Element = 0;
+
+	// environment is root tab group
+	Environment = this;
+	setTabGroup(true);
+}
+
+//! destructor
+CGUIEnvironment::~CGUIEnvironment()
+{
+	clearDeletionQueue();
+
+	if (HoveredNoSubelement && HoveredNoSubelement != this) {
+		HoveredNoSubelement->drop();
+		HoveredNoSubelement = 0;
+	}
+
+	if (Hovered && Hovered != this) {
+		Hovered->drop();
+		Hovered = 0;
+	}
+
+	if (Focus) {
+		Focus->drop();
+		Focus = 0;
+	}
+
+	if (ToolTip.Element) {
+		ToolTip.Element->drop();
+		ToolTip.Element = 0;
+	}
+
+	// drop skin
+	if (CurrentSkin) {
+		CurrentSkin->drop();
+		CurrentSkin = 0;
+	}
+
+	u32 i;
+
+	// delete all sprite banks
+	for (i = 0; i < Banks.size(); ++i)
+		if (Banks[i].Bank)
+			Banks[i].Bank->drop();
+
+	// delete all fonts
+	for (i = 0; i < Fonts.size(); ++i)
+		Fonts[i].Font->drop();
+
+	if (Operator) {
+		Operator->drop();
+		Operator = 0;
+	}
+
+	if (FileSystem) {
+		FileSystem->drop();
+		FileSystem = 0;
+	}
+
+	if (Driver) {
+		Driver->drop();
+		Driver = 0;
+	}
+}
+
+void CGUIEnvironment::loadBuiltInFont()
+{
+#ifdef IRR_ENABLE_BUILTIN_FONT
+	io::IReadFile *file = FileSystem->createMemoryReadFile(BuiltInFontData,
+			BuiltInFontDataSize, DefaultFontName, false);
+
+	CGUIFont *font = new CGUIFont(this, DefaultFontName);
+	if (!font->load(file)) {
+		os::Printer::log("Error: Could not load built-in Font.", ELL_ERROR);
+		font->drop();
+		file->drop();
+		return;
+	}
+
+	SFont f;
+	f.NamedPath.setPath(DefaultFontName);
+	f.Font = font;
+	Fonts.push_back(f);
+
+	file->drop();
+#endif
+}
+
+//! draws all gui elements
+void CGUIEnvironment::drawAll(bool useScreenSize)
+{
+	if (useScreenSize && Driver) {
+		core::dimension2d<s32> dim(Driver->getScreenSize());
+		if (AbsoluteRect.LowerRightCorner.X != dim.Width ||
+				AbsoluteRect.UpperLeftCorner.X != 0 ||
+				AbsoluteRect.LowerRightCorner.Y != dim.Height ||
+				AbsoluteRect.UpperLeftCorner.Y != 0) {
+			setRelativePosition(core::recti(0, 0, dim.Width, dim.Height));
+		}
+	}
+
+	// make sure tooltip is always on top
+	if (ToolTip.Element)
+		bringToFront(ToolTip.Element);
+
+	draw();
+	OnPostRender(os::Timer::getTime());
+
+	clearDeletionQueue();
+}
+
+//! sets the focus to an element
+bool CGUIEnvironment::setFocus(IGUIElement *element)
+{
+	if (Focus == element) {
+		return false;
+	}
+
+	// GUI Environment should just reset the focus to 0
+	if (element == this)
+		element = 0;
+
+	// stop element from being deleted
+	if (element)
+		element->grab();
+
+	// focus may change or be removed in this call
+	IGUIElement *currentFocus = 0;
+	if (Focus) {
+		currentFocus = Focus;
+		currentFocus->grab();
+		SEvent e;
+		e.EventType = EET_GUI_EVENT;
+		e.GUIEvent.Caller = Focus;
+		e.GUIEvent.Element = element;
+		e.GUIEvent.EventType = EGET_ELEMENT_FOCUS_LOST;
+		if (Focus->OnEvent(e)) {
+			if (element)
+				element->drop();
+			currentFocus->drop();
+			return false;
+		}
+		currentFocus->drop();
+		currentFocus = 0;
+	}
+
+	if (element) {
+		currentFocus = Focus;
+		if (currentFocus)
+			currentFocus->grab();
+
+		// send focused event
+		SEvent e;
+		e.EventType = EET_GUI_EVENT;
+		e.GUIEvent.Caller = element;
+		e.GUIEvent.Element = Focus;
+		e.GUIEvent.EventType = EGET_ELEMENT_FOCUSED;
+		if (element->OnEvent(e)) {
+			if (element)
+				element->drop();
+			if (currentFocus)
+				currentFocus->drop();
+			return false;
+		}
+	}
+
+	if (currentFocus)
+		currentFocus->drop();
+
+	if (Focus)
+		Focus->drop();
+
+	// element is the new focus so it doesn't have to be dropped
+	Focus = element;
+
+	return true;
+}
+
+//! returns the element with the focus
+IGUIElement *CGUIEnvironment::getFocus() const
+{
+	return Focus;
+}
+
+//! returns the element last known to be under the mouse cursor
+IGUIElement *CGUIEnvironment::getHovered() const
+{
+	return Hovered;
+}
+
+//! removes the focus from an element
+bool CGUIEnvironment::removeFocus(IGUIElement *element)
+{
+	if (Focus && Focus == element) {
+		SEvent e;
+		e.EventType = EET_GUI_EVENT;
+		e.GUIEvent.Caller = Focus;
+		e.GUIEvent.Element = 0;
+		e.GUIEvent.EventType = EGET_ELEMENT_FOCUS_LOST;
+		if (Focus->OnEvent(e)) {
+			return false;
+		}
+	}
+	if (Focus) {
+		Focus->drop();
+		Focus = 0;
+	}
+
+	return true;
+}
+
+//! Returns whether the element has focus
+bool CGUIEnvironment::hasFocus(const IGUIElement *element, bool checkSubElements) const
+{
+	if (element == Focus)
+		return true;
+
+	if (!checkSubElements || !element)
+		return false;
+
+	IGUIElement *f = Focus;
+	while (f && f->isSubElement()) {
+		f = f->getParent();
+		if (f == element)
+			return true;
+	}
+	return false;
+}
+
+//! returns the current video driver
+video::IVideoDriver *CGUIEnvironment::getVideoDriver() const
+{
+	return Driver;
+}
+
+//! returns the current file system
+io::IFileSystem *CGUIEnvironment::getFileSystem() const
+{
+	return FileSystem;
+}
+
+//! returns a pointer to the OS operator
+IOSOperator *CGUIEnvironment::getOSOperator() const
+{
+	return Operator;
+}
+
+//! clear all GUI elements
+void CGUIEnvironment::clear()
+{
+	// Remove the focus
+	if (Focus) {
+		Focus->drop();
+		Focus = 0;
+	}
+
+	if (Hovered && Hovered != this) {
+		Hovered->drop();
+		Hovered = 0;
+	}
+	if (HoveredNoSubelement && HoveredNoSubelement != this) {
+		HoveredNoSubelement->drop();
+		HoveredNoSubelement = 0;
+	}
+
+	getRootGUIElement()->removeAllChildren();
+}
+
+//! called by ui if an event happened.
+bool CGUIEnvironment::OnEvent(const SEvent &event)
+{
+
+	bool ret = false;
+	if (UserReceiver && (event.EventType != EET_MOUSE_INPUT_EVENT) && (event.EventType != EET_KEY_INPUT_EVENT) && (event.EventType != EET_GUI_EVENT || event.GUIEvent.Caller != this)) {
+		ret = UserReceiver->OnEvent(event);
+	}
+
+	return ret;
+}
+
+//
+void CGUIEnvironment::OnPostRender(u32 time)
+{
+	// launch tooltip
+	if (ToolTip.Element == 0 &&
+			HoveredNoSubelement && HoveredNoSubelement != this &&
+			(time - ToolTip.EnterTime >= ToolTip.LaunchTime || (time - ToolTip.LastTime >= ToolTip.RelaunchTime && time - ToolTip.LastTime < ToolTip.LaunchTime)) &&
+			HoveredNoSubelement->getToolTipText().size() &&
+			getSkin() &&
+			getSkin()->getFont(EGDF_TOOLTIP)) {
+		core::rect<s32> pos;
+
+		pos.UpperLeftCorner = LastHoveredMousePos;
+		core::dimension2du dim = getSkin()->getFont(EGDF_TOOLTIP)->getDimension(HoveredNoSubelement->getToolTipText().c_str());
+		dim.Width += getSkin()->getSize(EGDS_TEXT_DISTANCE_X) * 2;
+		dim.Height += getSkin()->getSize(EGDS_TEXT_DISTANCE_Y) * 2;
+
+		pos.UpperLeftCorner.Y -= dim.Height + 1;
+		pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + dim.Height - 1;
+		pos.LowerRightCorner.X = pos.UpperLeftCorner.X + dim.Width;
+
+		pos.constrainTo(getAbsolutePosition());
+
+		ToolTip.Element = addStaticText(HoveredNoSubelement->getToolTipText().c_str(), pos, true, true, this, -1, true);
+		ToolTip.Element->setOverrideColor(getSkin()->getColor(EGDC_TOOLTIP));
+		ToolTip.Element->setBackgroundColor(getSkin()->getColor(EGDC_TOOLTIP_BACKGROUND));
+		ToolTip.Element->setOverrideFont(getSkin()->getFont(EGDF_TOOLTIP));
+		ToolTip.Element->setSubElement(true);
+		ToolTip.Element->grab();
+
+		s32 textHeight = ToolTip.Element->getTextHeight();
+		pos = ToolTip.Element->getRelativePosition();
+		pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + textHeight;
+		ToolTip.Element->setRelativePosition(pos);
+	}
+
+	if (ToolTip.Element && ToolTip.Element->isVisible()) { // (isVisible() check only because we might use visibility for ToolTip one day)
+		ToolTip.LastTime = time;
+
+		// got invisible or removed in the meantime?
+		if (!HoveredNoSubelement ||
+				!HoveredNoSubelement->isVisible() ||
+				!HoveredNoSubelement->getParent()) // got invisible or removed in the meantime?
+		{
+			ToolTip.Element->remove();
+			ToolTip.Element->drop();
+			ToolTip.Element = 0;
+		}
+	}
+
+	IGUIElement::OnPostRender(time);
+}
+
+void CGUIEnvironment::addToDeletionQueue(IGUIElement *element)
+{
+	if (!element)
+		return;
+
+	element->grab();
+	DeletionQueue.push_back(element);
+}
+
+void CGUIEnvironment::clearDeletionQueue()
+{
+	if (DeletionQueue.empty())
+		return;
+
+	for (u32 i = 0; i < DeletionQueue.size(); ++i) {
+		DeletionQueue[i]->remove();
+		DeletionQueue[i]->drop();
+	}
+
+	DeletionQueue.clear();
+}
+
+//
+void CGUIEnvironment::updateHoveredElement(core::position2d<s32> mousePos)
+{
+	IGUIElement *lastHovered = Hovered;
+	IGUIElement *lastHoveredNoSubelement = HoveredNoSubelement;
+	LastHoveredMousePos = mousePos;
+
+	Hovered = getElementFromPoint(mousePos);
+
+	if (ToolTip.Element && Hovered == ToolTip.Element) {
+		// When the mouse is over the ToolTip we remove that so it will be re-created at a new position.
+		// Note that ToolTip.EnterTime does not get changed here, so it will be re-created at once.
+		ToolTip.Element->remove();
+		ToolTip.Element->drop();
+		ToolTip.Element = 0;
+
+		// Get the real Hovered
+		Hovered = getElementFromPoint(mousePos);
+	}
+
+	// for tooltips we want the element itself and not some of it's subelements
+	HoveredNoSubelement = Hovered;
+	while (HoveredNoSubelement && HoveredNoSubelement->isSubElement()) {
+		HoveredNoSubelement = HoveredNoSubelement->getParent();
+	}
+
+	if (Hovered && Hovered != this)
+		Hovered->grab();
+	if (HoveredNoSubelement && HoveredNoSubelement != this)
+		HoveredNoSubelement->grab();
+
+	if (Hovered != lastHovered) {
+		SEvent event;
+		event.EventType = EET_GUI_EVENT;
+
+		if (lastHovered) {
+			event.GUIEvent.Caller = lastHovered;
+			event.GUIEvent.Element = 0;
+			event.GUIEvent.EventType = EGET_ELEMENT_LEFT;
+			lastHovered->OnEvent(event);
+		}
+
+		if (Hovered) {
+			event.GUIEvent.Caller = Hovered;
+			event.GUIEvent.Element = Hovered;
+			event.GUIEvent.EventType = EGET_ELEMENT_HOVERED;
+			Hovered->OnEvent(event);
+		}
+	}
+
+	if (lastHoveredNoSubelement != HoveredNoSubelement) {
+		if (ToolTip.Element) {
+			ToolTip.Element->remove();
+			ToolTip.Element->drop();
+			ToolTip.Element = 0;
+		}
+
+		if (HoveredNoSubelement) {
+			u32 now = os::Timer::getTime();
+			ToolTip.EnterTime = now;
+		}
+	}
+
+	if (lastHovered && lastHovered != this)
+		lastHovered->drop();
+	if (lastHoveredNoSubelement && lastHoveredNoSubelement != this)
+		lastHoveredNoSubelement->drop();
+}
+
+//! This sets a new event receiver for gui events. Usually you do not have to
+//! use this method, it is used by the internal engine.
+void CGUIEnvironment::setUserEventReceiver(IEventReceiver *evr)
+{
+	UserReceiver = evr;
+}
+
+//! posts an input event to the environment
+bool CGUIEnvironment::postEventFromUser(const SEvent &event)
+{
+	switch (event.EventType) {
+	case EET_GUI_EVENT: {
+		// hey, why is the user sending gui events..?
+	}
+
+	break;
+	case EET_MOUSE_INPUT_EVENT:
+
+		updateHoveredElement(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
+
+		if (Hovered != Focus) {
+			IGUIElement *focusCandidate = Hovered;
+
+			// Only allow enabled elements to be focused (unless EFF_CAN_FOCUS_DISABLED is set)
+			if (Hovered && !Hovered->isEnabled() && !(FocusFlags & EFF_CAN_FOCUS_DISABLED))
+				focusCandidate = NULL; // we still remove focus from the active element
+
+			// Please don't merge this into a single if clause, it's easier to debug the way it is
+			if (FocusFlags & EFF_SET_ON_LMOUSE_DOWN &&
+					event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+				setFocus(focusCandidate);
+			} else if (FocusFlags & EFF_SET_ON_RMOUSE_DOWN &&
+					   event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) {
+				setFocus(focusCandidate);
+			} else if (FocusFlags & EFF_SET_ON_MOUSE_OVER &&
+					   event.MouseInput.Event == EMIE_MOUSE_MOVED) {
+				setFocus(focusCandidate);
+			}
+		}
+
+		// sending input to focus
+		if (Focus && Focus->OnEvent(event))
+			return true;
+
+		// focus could have died in last call
+		if (!Focus && Hovered) {
+			return Hovered->OnEvent(event);
+		}
+
+		break;
+	case EET_KEY_INPUT_EVENT: {
+		if (Focus && Focus->OnEvent(event))
+			return true;
+
+		// For keys we handle the event before changing focus to give elements the chance for catching the TAB
+		// Send focus changing event
+		// CAREFUL when changing - there's an identical check in CGUIModalScreen::OnEvent
+		if (FocusFlags & EFF_SET_ON_TAB &&
+				event.KeyInput.PressedDown &&
+				event.KeyInput.Key == KEY_TAB) {
+			IGUIElement *next = getNextElement(event.KeyInput.Shift, event.KeyInput.Control);
+			if (next && next != Focus) {
+				if (setFocus(next))
+					return true;
+			}
+		}
+	} break;
+	case EET_STRING_INPUT_EVENT:
+		if (Focus && Focus->OnEvent(event))
+			return true;
+		break;
+	default:
+		break;
+	} // end switch
+
+	return false;
+}
+
+//! returns the current gui skin
+IGUISkin *CGUIEnvironment::getSkin() const
+{
+	return CurrentSkin;
+}
+
+//! Sets a new GUI Skin
+void CGUIEnvironment::setSkin(IGUISkin *skin)
+{
+	if (CurrentSkin == skin)
+		return;
+
+	if (CurrentSkin)
+		CurrentSkin->drop();
+
+	CurrentSkin = skin;
+
+	if (CurrentSkin)
+		CurrentSkin->grab();
+}
+
+//! Creates a new GUI Skin based on a template.
+/** \return Returns a pointer to the created skin.
+If you no longer need the skin, you should call IGUISkin::drop().
+See IReferenceCounted::drop() for more information. */
+IGUISkin *CGUIEnvironment::createSkin(EGUI_SKIN_TYPE type)
+{
+	IGUISkin *skin = new CGUISkin(type, Driver);
+
+	IGUIFont *builtinfont = getBuiltInFont();
+	IGUIFontBitmap *bitfont = 0;
+	if (builtinfont && builtinfont->getType() == EGFT_BITMAP)
+		bitfont = (IGUIFontBitmap *)builtinfont;
+
+	IGUISpriteBank *bank = 0;
+	skin->setFont(builtinfont);
+
+	if (bitfont)
+		bank = bitfont->getSpriteBank();
+
+	skin->setSpriteBank(bank);
+
+	return skin;
+}
+
+//! adds a button. The returned pointer must not be dropped.
+IGUIButton *CGUIEnvironment::addButton(const core::rect<s32> &rectangle, IGUIElement *parent, s32 id, const wchar_t *text, const wchar_t *tooltiptext)
+{
+	IGUIButton *button = new CGUIButton(this, parent ? parent : this, id, rectangle);
+	if (text)
+		button->setText(text);
+
+	if (tooltiptext)
+		button->setToolTipText(tooltiptext);
+
+	button->drop();
+	return button;
+}
+
+//! adds a scrollbar. The returned pointer must not be dropped.
+IGUIScrollBar *CGUIEnvironment::addScrollBar(bool horizontal, const core::rect<s32> &rectangle, IGUIElement *parent, s32 id)
+{
+	IGUIScrollBar *bar = new CGUIScrollBar(horizontal, this, parent ? parent : this, id, rectangle);
+	bar->drop();
+	return bar;
+}
+
+//! Adds an image element.
+IGUIImage *CGUIEnvironment::addImage(video::ITexture *image, core::position2d<s32> pos,
+		bool useAlphaChannel, IGUIElement *parent, s32 id, const wchar_t *text)
+{
+	core::dimension2d<s32> sz(0, 0);
+	if (image)
+		sz = core::dimension2d<s32>(image->getOriginalSize());
+
+	IGUIImage *img = new CGUIImage(this, parent ? parent : this,
+			id, core::rect<s32>(pos, sz));
+
+	if (text)
+		img->setText(text);
+
+	if (useAlphaChannel)
+		img->setUseAlphaChannel(true);
+
+	if (image)
+		img->setImage(image);
+
+	img->drop();
+	return img;
+}
+
+//! adds an image. The returned pointer must not be dropped.
+IGUIImage *CGUIEnvironment::addImage(const core::rect<s32> &rectangle, IGUIElement *parent, s32 id, const wchar_t *text, bool useAlphaChannel)
+{
+	IGUIImage *img = new CGUIImage(this, parent ? parent : this,
+			id, rectangle);
+
+	if (text)
+		img->setText(text);
+
+	if (useAlphaChannel)
+		img->setUseAlphaChannel(true);
+
+	img->drop();
+	return img;
+}
+
+//! adds a checkbox
+IGUICheckBox *CGUIEnvironment::addCheckBox(bool checked, const core::rect<s32> &rectangle, IGUIElement *parent, s32 id, const wchar_t *text)
+{
+	IGUICheckBox *b = new CGUICheckBox(checked, this,
+			parent ? parent : this, id, rectangle);
+
+	if (text)
+		b->setText(text);
+
+	b->drop();
+	return b;
+}
+
+//! adds a list box
+IGUIListBox *CGUIEnvironment::addListBox(const core::rect<s32> &rectangle,
+		IGUIElement *parent, s32 id, bool drawBackground)
+{
+	IGUIListBox *b = new CGUIListBox(this, parent ? parent : this, id, rectangle,
+			true, drawBackground, false);
+
+	if (CurrentSkin && CurrentSkin->getSpriteBank()) {
+		b->setSpriteBank(CurrentSkin->getSpriteBank());
+	} else if (getBuiltInFont() && getBuiltInFont()->getType() == EGFT_BITMAP) {
+		b->setSpriteBank(((IGUIFontBitmap *)getBuiltInFont())->getSpriteBank());
+	}
+
+	b->drop();
+	return b;
+}
+
+//! adds a file open dialog. The returned pointer must not be dropped.
+IGUIFileOpenDialog *CGUIEnvironment::addFileOpenDialog(const wchar_t *title,
+		bool modal, IGUIElement *parent, s32 id,
+		bool restoreCWD, io::path::char_type *startDir)
+{
+	parent = parent ? parent : this;
+
+	if (modal)
+		return nullptr;
+
+	IGUIFileOpenDialog *d = new CGUIFileOpenDialog(title, this, parent, id,
+			restoreCWD, startDir);
+	d->drop();
+
+	return d;
+}
+
+//! adds a static text. The returned pointer must not be dropped.
+IGUIStaticText *CGUIEnvironment::addStaticText(const wchar_t *text,
+		const core::rect<s32> &rectangle,
+		bool border, bool wordWrap,
+		IGUIElement *parent, s32 id, bool background)
+{
+	IGUIStaticText *d = new CGUIStaticText(text, border, this,
+			parent ? parent : this, id, rectangle, background);
+
+	d->setWordWrap(wordWrap);
+	d->drop();
+
+	return d;
+}
+
+//! Adds an edit box. The returned pointer must not be dropped.
+IGUIEditBox *CGUIEnvironment::addEditBox(const wchar_t *text,
+		const core::rect<s32> &rectangle, bool border,
+		IGUIElement *parent, s32 id)
+{
+	IGUIEditBox *d = new CGUIEditBox(text, border, this,
+			parent ? parent : this, id, rectangle);
+
+	d->drop();
+	return d;
+}
+
+//! Adds a tab control to the environment.
+IGUITabControl *CGUIEnvironment::addTabControl(const core::rect<s32> &rectangle,
+		IGUIElement *parent, bool fillbackground, bool border, s32 id)
+{
+	IGUITabControl *t = new CGUITabControl(this, parent ? parent : this,
+			rectangle, fillbackground, border, id);
+	t->drop();
+	return t;
+}
+
+//! Adds tab to the environment.
+IGUITab *CGUIEnvironment::addTab(const core::rect<s32> &rectangle,
+		IGUIElement *parent, s32 id)
+{
+	IGUITab *t = new CGUITab(this, parent ? parent : this,
+			rectangle, id);
+	t->drop();
+	return t;
+}
+
+//! Adds a combo box to the environment.
+IGUIComboBox *CGUIEnvironment::addComboBox(const core::rect<s32> &rectangle,
+		IGUIElement *parent, s32 id)
+{
+	IGUIComboBox *t = new CGUIComboBox(this, parent ? parent : this,
+			id, rectangle);
+	t->drop();
+	return t;
+}
+
+//! returns the font
+IGUIFont *CGUIEnvironment::getFont(const io::path &filename)
+{
+	// search existing font
+
+	SFont f;
+	f.NamedPath.setPath(filename);
+
+	s32 index = Fonts.binary_search(f);
+	if (index != -1)
+		return Fonts[index].Font;
+
+	// font doesn't exist, attempt to load it
+
+	// does the file exist?
+
+	if (!FileSystem->existFile(filename)) {
+		os::Printer::log("Could not load font because the file does not exist", f.NamedPath.getPath(), ELL_ERROR);
+		return 0;
+	}
+
+	IGUIFont *ifont = 0;
+#if 0
+		{
+			CGUIFont* font = new CGUIFont(this, filename);
+			ifont = (IGUIFont*)font;
+
+			// load the font
+			io::path directory;
+			core::splitFilename(filename, &directory);
+			if (!font->load(xml, directory))
+			{
+				font->drop();
+				font  = 0;
+				ifont = 0;
+			}
+		}
+#endif
+
+	if (!ifont) {
+
+		CGUIFont *font = new CGUIFont(this, f.NamedPath.getPath());
+		ifont = (IGUIFont *)font;
+		if (!font->load(f.NamedPath.getPath())) {
+			font->drop();
+			return 0;
+		}
+	}
+
+	// add to fonts.
+
+	f.Font = ifont;
+	Fonts.push_back(f);
+
+	return ifont;
+}
+
+//! add an externally loaded font
+IGUIFont *CGUIEnvironment::addFont(const io::path &name, IGUIFont *font)
+{
+	if (font) {
+		SFont f;
+		f.NamedPath.setPath(name);
+		s32 index = Fonts.binary_search(f);
+		if (index != -1)
+			return Fonts[index].Font;
+		f.Font = font;
+		Fonts.push_back(f);
+		font->grab();
+	}
+	return font;
+}
+
+//! remove loaded font
+void CGUIEnvironment::removeFont(IGUIFont *font)
+{
+	if (!font)
+		return;
+	for (u32 i = 0; i < Fonts.size(); ++i) {
+		if (Fonts[i].Font == font) {
+			Fonts[i].Font->drop();
+			Fonts.erase(i);
+			return;
+		}
+	}
+}
+
+//! returns default font
+IGUIFont *CGUIEnvironment::getBuiltInFont() const
+{
+	if (Fonts.empty())
+		return 0;
+
+	return Fonts[0].Font;
+}
+
+IGUISpriteBank *CGUIEnvironment::getSpriteBank(const io::path &filename)
+{
+	// search for the file name
+
+	SSpriteBank b;
+	b.NamedPath.setPath(filename);
+
+	s32 index = Banks.binary_search(b);
+	if (index != -1)
+		return Banks[index].Bank;
+
+	// we don't have this sprite bank, we should load it
+	if (!FileSystem->existFile(b.NamedPath.getPath())) {
+		if (filename != DefaultFontName) {
+			os::Printer::log("Could not load sprite bank because the file does not exist", b.NamedPath.getPath(), ELL_DEBUG);
+		}
+		return 0;
+	}
+
+	// todo: load it!
+
+	return 0;
+}
+
+IGUISpriteBank *CGUIEnvironment::addEmptySpriteBank(const io::path &name)
+{
+	// no duplicate names allowed
+
+	SSpriteBank b;
+	b.NamedPath.setPath(name);
+
+	const s32 index = Banks.binary_search(b);
+	if (index != -1)
+		return 0;
+
+	// create a new sprite bank
+
+	b.Bank = new CGUISpriteBank(this);
+	Banks.push_back(b);
+
+	return b.Bank;
+}
+
+//! Creates the image list from the given texture.
+IGUIImageList *CGUIEnvironment::createImageList(video::ITexture *texture,
+		core::dimension2d<s32> imageSize, bool useAlphaChannel)
+{
+	CGUIImageList *imageList = new CGUIImageList(Driver);
+	if (!imageList->createImageList(texture, imageSize, useAlphaChannel)) {
+		imageList->drop();
+		return 0;
+	}
+
+	return imageList;
+}
+
+//! Returns the root gui element.
+IGUIElement *CGUIEnvironment::getRootGUIElement()
+{
+	return this;
+}
+
+//! Returns the next element in the tab group starting at the focused element
+IGUIElement *CGUIEnvironment::getNextElement(bool reverse, bool group)
+{
+	// start the search at the root of the current tab group
+	IGUIElement *startPos = Focus ? Focus->getTabGroup() : 0;
+	s32 startOrder = -1;
+
+	// if we're searching for a group
+	if (group && startPos) {
+		startOrder = startPos->getTabOrder();
+	} else if (!group && Focus && !Focus->isTabGroup()) {
+		startOrder = Focus->getTabOrder();
+		if (startOrder == -1) {
+			// this element is not part of the tab cycle,
+			// but its parent might be...
+			IGUIElement *el = Focus;
+			while (el && el->getParent() && startOrder == -1) {
+				el = el->getParent();
+				startOrder = el->getTabOrder();
+			}
+		}
+	}
+
+	if (group || !startPos)
+		startPos = this; // start at the root
+
+	// find the element
+	IGUIElement *closest = 0;
+	IGUIElement *first = 0;
+	startPos->getNextElement(startOrder, reverse, group, first, closest, false, (FocusFlags & EFF_CAN_FOCUS_DISABLED) != 0);
+
+	if (closest)
+		return closest; // we found an element
+	else if (first)
+		return first; // go to the end or the start
+	else if (group)
+		return this; // no group found? root group
+	else
+		return 0;
+}
+
+void CGUIEnvironment::setFocusBehavior(u32 flags)
+{
+	FocusFlags = flags;
+}
+
+u32 CGUIEnvironment::getFocusBehavior() const
+{
+	return FocusFlags;
+}
+
+//! creates an GUI Environment
+IGUIEnvironment *createGUIEnvironment(io::IFileSystem *fs,
+		video::IVideoDriver *Driver,
+		IOSOperator *op)
+{
+	return new CGUIEnvironment(fs, Driver, op);
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIEnvironment.h b/irr/src/CGUIEnvironment.h
new file mode 100644
index 000000000..b03c6f0d3
--- /dev/null
+++ b/irr/src/CGUIEnvironment.h
@@ -0,0 +1,226 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIEnvironment.h"
+#include "IGUIElement.h"
+#include "irrArray.h"
+#include "IFileSystem.h"
+#include "IOSOperator.h"
+
+namespace irr
+{
+
+namespace gui
+{
+
+class CGUIEnvironment : public IGUIEnvironment, public IGUIElement
+{
+public:
+	//! constructor
+	CGUIEnvironment(io::IFileSystem *fs, video::IVideoDriver *driver, IOSOperator *op);
+
+	//! destructor
+	virtual ~CGUIEnvironment();
+
+	//! draws all gui elements
+	void drawAll(bool useScreenSize) override;
+
+	//! returns the current video driver
+	video::IVideoDriver *getVideoDriver() const override;
+
+	//! returns pointer to the filesystem
+	io::IFileSystem *getFileSystem() const override;
+
+	//! returns a pointer to the OS operator
+	IOSOperator *getOSOperator() const override;
+
+	//! posts an input event to the environment
+	bool postEventFromUser(const SEvent &event) override;
+
+	//! This sets a new event receiver for gui events. Usually you do not have to
+	//! use this method, it is used by the internal engine.
+	void setUserEventReceiver(IEventReceiver *evr) override;
+
+	//! removes all elements from the environment
+	void clear() override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! returns the current gui skin
+	IGUISkin *getSkin() const override;
+
+	//! Sets a new GUI Skin
+	void setSkin(IGUISkin *skin) override;
+
+	//! Creates a new GUI Skin based on a template.
+	/** \return Returns a pointer to the created skin.
+	If you no longer need the skin, you should call IGUISkin::drop().
+	See IReferenceCounted::drop() for more information. */
+	IGUISkin *createSkin(EGUI_SKIN_TYPE type) override;
+
+	//! Creates the image list from the given texture.
+	virtual IGUIImageList *createImageList(video::ITexture *texture,
+			core::dimension2d<s32> imageSize, bool useAlphaChannel) override;
+
+	//! returns the font
+	IGUIFont *getFont(const io::path &filename) override;
+
+	//! add an externally loaded font
+	IGUIFont *addFont(const io::path &name, IGUIFont *font) override;
+
+	//! remove loaded font
+	void removeFont(IGUIFont *font) override;
+
+	//! returns default font
+	IGUIFont *getBuiltInFont() const override;
+
+	//! returns the sprite bank
+	IGUISpriteBank *getSpriteBank(const io::path &filename) override;
+
+	//! returns the sprite bank
+	IGUISpriteBank *addEmptySpriteBank(const io::path &name) override;
+
+	//! adds an button. The returned pointer must not be dropped.
+	IGUIButton *addButton(const core::rect<s32> &rectangle, IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, const wchar_t *tooltiptext = 0) override;
+
+	//! adds a scrollbar. The returned pointer must not be dropped.
+	virtual IGUIScrollBar *addScrollBar(bool horizontal, const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) override;
+
+	//! Adds an image element.
+	virtual IGUIImage *addImage(video::ITexture *image, core::position2d<s32> pos,
+			bool useAlphaChannel = true, IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) override;
+
+	//! adds an image. The returned pointer must not be dropped.
+	virtual IGUIImage *addImage(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0, bool useAlphaChannel = true) override;
+
+	//! adds a checkbox
+	virtual IGUICheckBox *addCheckBox(bool checked, const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, const wchar_t *text = 0) override;
+
+	//! adds a list box
+	virtual IGUIListBox *addListBox(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1, bool drawBackground = false) override;
+
+	//! Adds a file open dialog.
+	virtual IGUIFileOpenDialog *addFileOpenDialog(const wchar_t *title = 0,
+			bool modal = true, IGUIElement *parent = 0, s32 id = -1,
+			bool restoreCWD = false, io::path::char_type *startDir = 0) override;
+
+	//! adds a static text. The returned pointer must not be dropped.
+	virtual IGUIStaticText *addStaticText(const wchar_t *text, const core::rect<s32> &rectangle,
+			bool border = false, bool wordWrap = true, IGUIElement *parent = 0, s32 id = -1, bool drawBackground = false) override;
+
+	//! Adds an edit box. The returned pointer must not be dropped.
+	virtual IGUIEditBox *addEditBox(const wchar_t *text, const core::rect<s32> &rectangle,
+			bool border = false, IGUIElement *parent = 0, s32 id = -1) override;
+
+	//! Adds a tab control to the environment.
+	virtual IGUITabControl *addTabControl(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, bool fillbackground = false, bool border = true, s32 id = -1) override;
+
+	//! Adds tab to the environment.
+	virtual IGUITab *addTab(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) override;
+
+	//! Adds a combo box to the environment.
+	virtual IGUIComboBox *addComboBox(const core::rect<s32> &rectangle,
+			IGUIElement *parent = 0, s32 id = -1) override;
+
+	//! sets the focus to an element
+	bool setFocus(IGUIElement *element) override;
+
+	//! removes the focus from an element
+	bool removeFocus(IGUIElement *element) override;
+
+	//! Returns if the element has focus
+	bool hasFocus(const IGUIElement *element, bool checkSubElements = false) const override;
+
+	//! Returns the element with the focus
+	IGUIElement *getFocus() const override;
+
+	//! Returns the element last known to be under the mouse
+	IGUIElement *getHovered() const override;
+
+	//! Returns the root gui element.
+	IGUIElement *getRootGUIElement() override;
+
+	void OnPostRender(u32 time) override;
+
+	//! Find the next element which would be selected when pressing the tab-key
+	IGUIElement *getNextElement(bool reverse = false, bool group = false) override;
+
+	//! Set the way the gui will handle focus changes
+	void setFocusBehavior(u32 flags) override;
+
+	//! Get the way the gui does handle focus changes
+	u32 getFocusBehavior() const override;
+
+	//! Adds a IGUIElement to deletion queue.
+	void addToDeletionQueue(IGUIElement *element) override;
+
+private:
+	//! clears the deletion queue
+	void clearDeletionQueue();
+
+	void updateHoveredElement(core::position2d<s32> mousePos);
+
+	void loadBuiltInFont();
+
+	struct SFont
+	{
+		io::SNamedPath NamedPath;
+		IGUIFont *Font;
+
+		bool operator<(const SFont &other) const
+		{
+			return (NamedPath < other.NamedPath);
+		}
+	};
+
+	struct SSpriteBank
+	{
+		io::SNamedPath NamedPath;
+		IGUISpriteBank *Bank;
+
+		bool operator<(const SSpriteBank &other) const
+		{
+			return (NamedPath < other.NamedPath);
+		}
+	};
+
+	struct SToolTip
+	{
+		IGUIStaticText *Element;
+		u32 LastTime;
+		u32 EnterTime;
+		u32 LaunchTime;
+		u32 RelaunchTime;
+	};
+
+	SToolTip ToolTip;
+
+	core::array<SFont> Fonts;
+	core::array<SSpriteBank> Banks;
+	video::IVideoDriver *Driver;
+	IGUIElement *Hovered;
+	IGUIElement *HoveredNoSubelement; // subelements replaced by their parent, so you only have 'real' elements here
+	IGUIElement *Focus;
+	core::position2d<s32> LastHoveredMousePos;
+	IGUISkin *CurrentSkin;
+	io::IFileSystem *FileSystem;
+	IEventReceiver *UserReceiver;
+	IOSOperator *Operator;
+	u32 FocusFlags;
+	core::array<IGUIElement *> DeletionQueue;
+
+	static const io::path DefaultFontName;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIFileOpenDialog.cpp b/irr/src/CGUIFileOpenDialog.cpp
new file mode 100644
index 000000000..1e669b255
--- /dev/null
+++ b/irr/src/CGUIFileOpenDialog.cpp
@@ -0,0 +1,372 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIFileOpenDialog.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIButton.h"
+#include "IGUIStaticText.h"
+#include "IGUIFont.h"
+#include "IGUIFontBitmap.h"
+#include "IFileList.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+const s32 FOD_WIDTH = 350;
+const s32 FOD_HEIGHT = 250;
+
+//! constructor
+CGUIFileOpenDialog::CGUIFileOpenDialog(const wchar_t *title,
+		IGUIEnvironment *environment, IGUIElement *parent, s32 id,
+		bool restoreCWD, io::path::char_type *startDir) :
+		IGUIFileOpenDialog(environment, parent, id,
+				core::rect<s32>((parent->getAbsolutePosition().getWidth() - FOD_WIDTH) / 2,
+						(parent->getAbsolutePosition().getHeight() - FOD_HEIGHT) / 2,
+						(parent->getAbsolutePosition().getWidth() - FOD_WIDTH) / 2 + FOD_WIDTH,
+						(parent->getAbsolutePosition().getHeight() - FOD_HEIGHT) / 2 + FOD_HEIGHT)),
+		FileNameText(0), FileList(0), Dragging(false)
+{
+#ifdef _DEBUG
+	IGUIElement::setDebugName("CGUIFileOpenDialog");
+#endif
+
+	Text = title;
+
+	FileSystem = Environment ? Environment->getFileSystem() : 0;
+
+	if (FileSystem) {
+		FileSystem->grab();
+
+		if (restoreCWD)
+			RestoreDirectory = FileSystem->getWorkingDirectory();
+		if (startDir) {
+			StartDirectory = startDir;
+			FileSystem->changeWorkingDirectoryTo(startDir);
+		}
+	} else
+		return;
+
+	IGUISpriteBank *sprites = 0;
+	video::SColor color(255, 255, 255, 255);
+	IGUISkin *skin = Environment->getSkin();
+	if (skin) {
+		sprites = skin->getSpriteBank();
+		color = skin->getColor(EGDC_WINDOW_SYMBOL);
+	}
+
+	const s32 buttonw = skin ? skin->getSize(EGDS_WINDOW_BUTTON_WIDTH) : 2;
+	const s32 posx = RelativeRect.getWidth() - buttonw - 4;
+
+	CloseButton = Environment->addButton(core::rect<s32>(posx, 3, posx + buttonw, 3 + buttonw), this, -1,
+			L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close");
+	CloseButton->setSubElement(true);
+	CloseButton->setTabStop(false);
+	if (sprites && skin) {
+		CloseButton->setSpriteBank(sprites);
+		CloseButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_WINDOW_CLOSE), color);
+		CloseButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_WINDOW_CLOSE), color);
+	}
+	CloseButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	CloseButton->grab();
+
+	OKButton = Environment->addButton(
+			core::rect<s32>(RelativeRect.getWidth() - 80, 30, RelativeRect.getWidth() - 10, 50),
+			this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_OK) : L"OK");
+	OKButton->setSubElement(true);
+	OKButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	OKButton->grab();
+
+	CancelButton = Environment->addButton(
+			core::rect<s32>(RelativeRect.getWidth() - 80, 55, RelativeRect.getWidth() - 10, 75),
+			this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_CANCEL) : L"Cancel");
+	CancelButton->setSubElement(true);
+	CancelButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	CancelButton->grab();
+
+	FileBox = Environment->addListBox(core::rect<s32>(10, 55, RelativeRect.getWidth() - 90, 230), this, -1, true);
+	FileBox->setSubElement(true);
+	FileBox->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	FileBox->grab();
+
+	FileNameText = Environment->addEditBox(0, core::rect<s32>(10, 30, RelativeRect.getWidth() - 90, 50), true, this);
+	FileNameText->setSubElement(true);
+	FileNameText->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	FileNameText->grab();
+
+	setTabGroup(true);
+
+	fillListBox();
+}
+
+//! destructor
+CGUIFileOpenDialog::~CGUIFileOpenDialog()
+{
+	if (CloseButton)
+		CloseButton->drop();
+
+	if (OKButton)
+		OKButton->drop();
+
+	if (CancelButton)
+		CancelButton->drop();
+
+	if (FileBox)
+		FileBox->drop();
+
+	if (FileNameText)
+		FileNameText->drop();
+
+	if (FileSystem) {
+		// revert to original CWD if path was set in constructor
+		if (RestoreDirectory.size())
+			FileSystem->changeWorkingDirectoryTo(RestoreDirectory);
+		FileSystem->drop();
+	}
+
+	if (FileList)
+		FileList->drop();
+}
+
+//! returns the filename of the selected file. Returns NULL, if no file was selected.
+const wchar_t *CGUIFileOpenDialog::getFileName() const
+{
+	return FileNameW.c_str();
+}
+
+const io::path &CGUIFileOpenDialog::getFileNameP() const
+{
+	return FileName;
+}
+
+//! Returns the directory of the selected file. Returns NULL, if no directory was selected.
+const io::path &CGUIFileOpenDialog::getDirectoryName() const
+{
+	return FileDirectoryFlat;
+}
+
+const wchar_t *CGUIFileOpenDialog::getDirectoryNameW() const
+{
+	return FileDirectoryFlatW.c_str();
+}
+
+void CGUIFileOpenDialog::setFileName(const irr::io::path &name)
+{
+	FileName = name;
+	pathToStringW(FileNameW, FileName);
+}
+
+void CGUIFileOpenDialog::setDirectoryName(const irr::io::path &name)
+{
+	FileDirectory = name;
+	FileDirectoryFlat = name;
+	FileSystem->flattenFilename(FileDirectoryFlat);
+	pathToStringW(FileDirectoryFlatW, FileDirectoryFlat);
+}
+
+//! called if an event happened.
+bool CGUIFileOpenDialog::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+		switch (event.EventType) {
+		case EET_GUI_EVENT:
+			switch (event.GUIEvent.EventType) {
+			case EGET_ELEMENT_FOCUS_LOST:
+				Dragging = false;
+				break;
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == CloseButton ||
+						event.GUIEvent.Caller == CancelButton) {
+					sendCancelEvent();
+					remove();
+					return true;
+				} else if (event.GUIEvent.Caller == OKButton) {
+					if (FileDirectory != L"") {
+						sendSelectedEvent(EGET_DIRECTORY_SELECTED);
+					}
+					if (FileName != L"") {
+						sendSelectedEvent(EGET_FILE_SELECTED);
+						remove();
+						return true;
+					}
+				}
+				break;
+
+			case EGET_LISTBOX_CHANGED: {
+				s32 selected = FileBox->getSelected();
+				if (FileList && FileSystem) {
+					if (FileList->isDirectory(selected)) {
+						setFileName("");
+						setDirectoryName(FileList->getFullFileName(selected));
+					} else {
+						setDirectoryName("");
+						setFileName(FileList->getFullFileName(selected));
+					}
+					return true;
+				}
+			} break;
+
+			case EGET_LISTBOX_SELECTED_AGAIN: {
+				const s32 selected = FileBox->getSelected();
+				if (FileList && FileSystem) {
+					if (FileList->isDirectory(selected)) {
+						setDirectoryName(FileList->getFullFileName(selected));
+						FileSystem->changeWorkingDirectoryTo(FileDirectory);
+						fillListBox();
+						setFileName("");
+					} else {
+						setFileName(FileList->getFullFileName(selected));
+					}
+					return true;
+				}
+			} break;
+			case EGET_EDITBOX_ENTER:
+				if (event.GUIEvent.Caller == FileNameText) {
+					io::path dir(FileNameText->getText());
+					if (FileSystem->changeWorkingDirectoryTo(dir)) {
+						fillListBox();
+						setFileName("");
+					}
+					return true;
+				}
+				break;
+			default:
+				break;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			switch (event.MouseInput.Event) {
+			case EMIE_MOUSE_WHEEL:
+				return FileBox->OnEvent(event);
+			case EMIE_LMOUSE_PRESSED_DOWN:
+				DragStart.X = event.MouseInput.X;
+				DragStart.Y = event.MouseInput.Y;
+				Dragging = true;
+				return true;
+			case EMIE_LMOUSE_LEFT_UP:
+				Dragging = false;
+				return true;
+			case EMIE_MOUSE_MOVED:
+
+				if (!event.MouseInput.isLeftPressed())
+					Dragging = false;
+
+				if (Dragging) {
+					// gui window should not be dragged outside its parent
+					if (Parent)
+						if (event.MouseInput.X < Parent->getAbsolutePosition().UpperLeftCorner.X + 1 ||
+								event.MouseInput.Y < Parent->getAbsolutePosition().UpperLeftCorner.Y + 1 ||
+								event.MouseInput.X > Parent->getAbsolutePosition().LowerRightCorner.X - 1 ||
+								event.MouseInput.Y > Parent->getAbsolutePosition().LowerRightCorner.Y - 1)
+
+							return true;
+
+					move(core::position2d<s32>(event.MouseInput.X - DragStart.X, event.MouseInput.Y - DragStart.Y));
+					DragStart.X = event.MouseInput.X;
+					DragStart.Y = event.MouseInput.Y;
+					return true;
+				}
+				break;
+			default:
+				break;
+			}
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+//! draws the element and its children
+void CGUIFileOpenDialog::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+
+	core::rect<s32> rect = AbsoluteRect;
+
+	rect = skin->draw3DWindowBackground(this, true, skin->getColor(EGDC_ACTIVE_BORDER),
+			rect, &AbsoluteClippingRect);
+
+	if (Text.size()) {
+		rect.UpperLeftCorner.X += 2;
+		rect.LowerRightCorner.X -= skin->getSize(EGDS_WINDOW_BUTTON_WIDTH) + 5;
+
+		IGUIFont *font = skin->getFont(EGDF_WINDOW);
+		if (font)
+			font->draw(Text.c_str(), rect,
+					skin->getColor(EGDC_ACTIVE_CAPTION),
+					false, true, &AbsoluteClippingRect);
+	}
+
+	IGUIElement::draw();
+}
+
+void CGUIFileOpenDialog::pathToStringW(irr::core::stringw &result, const irr::io::path &p)
+{
+	core::multibyteToWString(result, p);
+}
+
+//! fills the listbox with files.
+void CGUIFileOpenDialog::fillListBox()
+{
+	IGUISkin *skin = Environment->getSkin();
+
+	if (!FileSystem || !FileBox || !skin)
+		return;
+
+	if (FileList)
+		FileList->drop();
+
+	FileBox->clear();
+
+	FileList = FileSystem->createFileList();
+	core::stringw s;
+
+	if (FileList) {
+		for (u32 i = 0; i < FileList->getFileCount(); ++i) {
+			pathToStringW(s, FileList->getFileName(i));
+			FileBox->addItem(s.c_str(), skin->getIcon(FileList->isDirectory(i) ? EGDI_DIRECTORY : EGDI_FILE));
+		}
+	}
+
+	if (FileNameText) {
+		setDirectoryName(FileSystem->getWorkingDirectory());
+		pathToStringW(s, FileDirectory);
+		FileNameText->setText(s.c_str());
+	}
+}
+
+//! sends the event that the file has been selected.
+void CGUIFileOpenDialog::sendSelectedEvent(EGUI_EVENT_TYPE type)
+{
+	SEvent event;
+	event.EventType = EET_GUI_EVENT;
+	event.GUIEvent.Caller = this;
+	event.GUIEvent.Element = 0;
+	event.GUIEvent.EventType = type;
+	Parent->OnEvent(event);
+}
+
+//! sends the event that the file choose process has been cancelled
+void CGUIFileOpenDialog::sendCancelEvent()
+{
+	SEvent event;
+	event.EventType = EET_GUI_EVENT;
+	event.GUIEvent.Caller = this;
+	event.GUIEvent.Element = 0;
+	event.GUIEvent.EventType = EGET_FILE_CHOOSE_DIALOG_CANCELLED;
+	Parent->OnEvent(event);
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIFileOpenDialog.h b/irr/src/CGUIFileOpenDialog.h
new file mode 100644
index 000000000..133509233
--- /dev/null
+++ b/irr/src/CGUIFileOpenDialog.h
@@ -0,0 +1,84 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIFileOpenDialog.h"
+#include "IGUIButton.h"
+#include "IGUIListBox.h"
+#include "IGUIEditBox.h"
+#include "IFileSystem.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUIFileOpenDialog : public IGUIFileOpenDialog
+{
+public:
+	//! constructor
+	CGUIFileOpenDialog(const wchar_t *title, IGUIEnvironment *environment,
+			IGUIElement *parent, s32 id, bool restoreCWD = false,
+			io::path::char_type *startDir = 0);
+
+	//! destructor
+	virtual ~CGUIFileOpenDialog();
+
+	//! returns the filename of the selected file. Returns NULL, if no file was selected.
+	const wchar_t *getFileName() const override;
+
+	//! Returns the filename of the selected file. Is empty if no file was selected.
+	const io::path &getFileNameP() const override;
+
+	//! Returns the directory of the selected file. Returns NULL, if no directory was selected.
+	const io::path &getDirectoryName() const override;
+
+	//! Returns the directory of the selected file converted to wide characters. Returns NULL if no directory was selected.
+	const wchar_t *getDirectoryNameW() const override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+protected:
+	void setFileName(const irr::io::path &name);
+	void setDirectoryName(const irr::io::path &name);
+
+	//! Ensure filenames are converted correct depending on wide-char settings
+	void pathToStringW(irr::core::stringw &result, const irr::io::path &p);
+
+	//! fills the listbox with files.
+	void fillListBox();
+
+	//! sends the event that the file has been selected.
+	void sendSelectedEvent(EGUI_EVENT_TYPE type);
+
+	//! sends the event that the file choose process has been canceld
+	void sendCancelEvent();
+
+	core::position2d<s32> DragStart;
+	io::path FileName;
+	core::stringw FileNameW;
+	io::path FileDirectory;
+	io::path FileDirectoryFlat;
+	core::stringw FileDirectoryFlatW;
+	io::path RestoreDirectory;
+	io::path StartDirectory;
+
+	IGUIButton *CloseButton;
+	IGUIButton *OKButton;
+	IGUIButton *CancelButton;
+	IGUIListBox *FileBox;
+	IGUIEditBox *FileNameText;
+	IGUIElement *EventParent;
+	io::IFileSystem *FileSystem;
+	io::IFileList *FileList;
+	bool Dragging;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIFont.cpp b/irr/src/CGUIFont.cpp
new file mode 100644
index 000000000..4d85702f5
--- /dev/null
+++ b/irr/src/CGUIFont.cpp
@@ -0,0 +1,548 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIFont.h"
+
+#include "os.h"
+#include "coreutil.h"
+#include "IGUIEnvironment.h"
+#include "IReadFile.h"
+#include "IVideoDriver.h"
+#include "IGUISpriteBank.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIFont::CGUIFont(IGUIEnvironment *env, const io::path &filename) :
+		Driver(0), SpriteBank(0), Environment(env), WrongCharacter(0),
+		MaxHeight(0), GlobalKerningWidth(0), GlobalKerningHeight(0)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIFont");
+#endif
+
+	if (Environment) {
+		// don't grab environment, to avoid circular references
+		Driver = Environment->getVideoDriver();
+
+		SpriteBank = Environment->getSpriteBank(filename);
+		if (!SpriteBank) // could be default-font which has no file
+			SpriteBank = Environment->addEmptySpriteBank(filename);
+		if (SpriteBank)
+			SpriteBank->grab();
+	}
+
+	if (Driver)
+		Driver->grab();
+
+	setInvisibleCharacters(L" ");
+}
+
+//! destructor
+CGUIFont::~CGUIFont()
+{
+	if (Driver)
+		Driver->drop();
+
+	if (SpriteBank) {
+		SpriteBank->drop();
+		// TODO: spritebank still exists in gui-environment and should be removed here when it's
+		// reference-count is 1. Just can't do that from here at the moment.
+		// But spritebank would not be able to drop textures anyway because those are in texture-cache
+		// where they can't be removed unless materials start reference-couting 'em.
+	}
+}
+
+#if 0
+//! loads a font file from xml
+bool CGUIFont::load(io::IXMLReader* xml, const io::path& directory)
+{
+	if (!SpriteBank)
+		return false;
+
+	SpriteBank->clear();
+
+	while (xml->read())
+	{
+		if (io::EXN_ELEMENT == xml->getNodeType())
+		{
+			if (core::stringw(L"Texture") == xml->getNodeName())
+			{
+				// add a texture
+				core::stringc fn = xml->getAttributeValue(L"filename");
+				u32 i = (u32)xml->getAttributeValueAsInt(L"index");
+				core::stringw alpha = xml->getAttributeValue(L"hasAlpha");
+
+				while (i+1 > SpriteBank->getTextureCount())
+					SpriteBank->addTexture(0);
+
+				bool flags[3];
+				pushTextureCreationFlags(flags);
+
+				// load texture
+				io::path textureFullName = core::mergeFilename(directory, fn);
+				SpriteBank->setTexture(i, Driver->getTexture(textureFullName));
+
+				popTextureCreationFlags(flags);
+
+				// couldn't load texture, abort.
+				if (!SpriteBank->getTexture(i))
+				{
+					os::Printer::log("Unable to load all textures in the font, aborting", ELL_ERROR);
+					return false;
+				}
+				else
+				{
+					// colorkey texture rather than alpha channel?
+					if (alpha == core::stringw("false"))
+						Driver->makeColorKeyTexture(SpriteBank->getTexture(i), core::position2di(0,0));
+				}
+			}
+			else if (core::stringw(L"c") == xml->getNodeName())
+			{
+				// adding a character to this font
+				SFontArea a;
+				SGUISpriteFrame f;
+				SGUISprite s;
+				core::rect<s32> rectangle;
+
+				a.underhang     = xml->getAttributeValueAsInt(L"u");
+				a.overhang      = xml->getAttributeValueAsInt(L"o");
+				a.spriteno      = SpriteBank->getSprites().size();
+				s32 texno       = xml->getAttributeValueAsInt(L"i");
+
+				// parse rectangle
+				core::stringc rectstr   = xml->getAttributeValue(L"r");
+				wchar_t ch      = xml->getAttributeValue(L"c")[0];
+
+				const c8 *c = rectstr.c_str();
+				s32 val;
+				val = 0;
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
+					c++;
+				}
+				rectangle.UpperLeftCorner.X = val;
+				while (*c == L' ' || *c == L',') c++;
+
+				val = 0;
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
+					c++;
+				}
+				rectangle.UpperLeftCorner.Y = val;
+				while (*c == L' ' || *c == L',') c++;
+
+				val = 0;
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
+					c++;
+				}
+				rectangle.LowerRightCorner.X = val;
+				while (*c == L' ' || *c == L',') c++;
+
+				val = 0;
+				while (*c >= '0' && *c <= '9')
+				{
+					val *= 10;
+					val += *c - '0';
+					c++;
+				}
+				rectangle.LowerRightCorner.Y = val;
+
+				CharacterMap.emplace(ch, Areas.size());
+
+				// make frame
+				f.rectNumber = SpriteBank->getPositions().size();
+				f.textureNumber = texno;
+
+				// add frame to sprite
+				s.Frames.push_back(f);
+				s.frameTime = 0;
+
+				// add rectangle to sprite bank
+				SpriteBank->getPositions().push_back(rectangle);
+				a.width = rectangle.getWidth();
+
+				// add sprite to sprite bank
+				SpriteBank->getSprites().push_back(s);
+
+				// add character to font
+				Areas.push_back(a);
+			}
+		}
+	}
+
+	// set bad character
+	WrongCharacter = getAreaFromCharacter(L' ');
+
+	setMaxHeight();
+
+	return true;
+}
+#endif
+
+void CGUIFont::setMaxHeight()
+{
+	if (!SpriteBank)
+		return;
+
+	MaxHeight = 0;
+
+	core::array<core::rect<s32>> &p = SpriteBank->getPositions();
+
+	for (u32 i = 0; i < p.size(); ++i) {
+		const s32 t = p[i].getHeight();
+		if (t > MaxHeight)
+			MaxHeight = t;
+	}
+}
+
+void CGUIFont::pushTextureCreationFlags(bool (&flags)[3])
+{
+	flags[0] = Driver->getTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2);
+	flags[1] = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+	flags[2] = Driver->getTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY);
+
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2, true);
+	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, true);
+}
+
+void CGUIFont::popTextureCreationFlags(const bool (&flags)[3])
+{
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2, flags[0]);
+	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, flags[1]);
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, flags[2]);
+}
+
+//! loads a font file, native file needed, for texture parsing
+bool CGUIFont::load(io::IReadFile *file)
+{
+	if (!Driver)
+		return false;
+
+	return loadTexture(Driver->createImageFromFile(file),
+			file->getFileName());
+}
+
+//! loads a font file, native file needed, for texture parsing
+bool CGUIFont::load(const io::path &filename)
+{
+	if (!Driver)
+		return false;
+
+	return loadTexture(Driver->createImageFromFile(filename),
+			filename);
+}
+
+//! load & prepare font from ITexture
+bool CGUIFont::loadTexture(video::IImage *image, const io::path &name)
+{
+	if (!image || !SpriteBank)
+		return false;
+
+	s32 lowerRightPositions = 0;
+
+	video::IImage *tmpImage = image;
+	bool deleteTmpImage = false;
+	switch (image->getColorFormat()) {
+	case video::ECF_R5G6B5:
+		tmpImage = Driver->createImage(video::ECF_A1R5G5B5, image->getDimension());
+		image->copyTo(tmpImage);
+		deleteTmpImage = true;
+		break;
+	case video::ECF_A1R5G5B5:
+	case video::ECF_A8R8G8B8:
+		break;
+	case video::ECF_R8G8B8:
+		tmpImage = Driver->createImage(video::ECF_A8R8G8B8, image->getDimension());
+		image->copyTo(tmpImage);
+		deleteTmpImage = true;
+		break;
+	default:
+		os::Printer::log("Unknown texture format provided for CGUIFont::loadTexture", ELL_ERROR);
+		return false;
+	}
+	readPositions(tmpImage, lowerRightPositions);
+
+	WrongCharacter = getAreaFromCharacter(L' ');
+
+	// output warnings
+	if (!lowerRightPositions || !SpriteBank->getSprites().size())
+		os::Printer::log("Either no upper or lower corner pixels in the font file. If this font was made using the new font tool, please load the XML file instead. If not, the font may be corrupted.", ELL_ERROR);
+	else if (lowerRightPositions != (s32)SpriteBank->getPositions().size())
+		os::Printer::log("The amount of upper corner pixels and the lower corner pixels is not equal, font file may be corrupted.", ELL_ERROR);
+
+	bool ret = (!SpriteBank->getSprites().empty() && lowerRightPositions);
+
+	if (ret) {
+		bool flags[3];
+		pushTextureCreationFlags(flags);
+
+		SpriteBank->addTexture(Driver->addTexture(name, tmpImage));
+
+		popTextureCreationFlags(flags);
+	}
+	if (deleteTmpImage)
+		tmpImage->drop();
+	image->drop();
+
+	setMaxHeight();
+
+	return ret;
+}
+
+void CGUIFont::readPositions(video::IImage *image, s32 &lowerRightPositions)
+{
+	if (!SpriteBank)
+		return;
+
+	const core::dimension2d<u32> size = image->getDimension();
+
+	video::SColor colorTopLeft = image->getPixel(0, 0);
+	colorTopLeft.setAlpha(255);
+	image->setPixel(0, 0, colorTopLeft);
+	video::SColor colorLowerRight = image->getPixel(1, 0);
+	video::SColor colorBackGround = image->getPixel(2, 0);
+	video::SColor colorBackGroundTransparent = 0;
+
+	image->setPixel(1, 0, colorBackGround);
+
+	// start parsing
+
+	core::position2d<s32> pos(0, 0);
+	for (pos.Y = 0; pos.Y < (s32)size.Height; ++pos.Y) {
+		for (pos.X = 0; pos.X < (s32)size.Width; ++pos.X) {
+			const video::SColor c = image->getPixel(pos.X, pos.Y);
+			if (c == colorTopLeft) {
+				image->setPixel(pos.X, pos.Y, colorBackGroundTransparent);
+				SpriteBank->getPositions().push_back(core::rect<s32>(pos, pos));
+			} else if (c == colorLowerRight) {
+				// too many lower right points
+				if (SpriteBank->getPositions().size() <= (u32)lowerRightPositions) {
+					lowerRightPositions = 0;
+					return;
+				}
+
+				image->setPixel(pos.X, pos.Y, colorBackGroundTransparent);
+				SpriteBank->getPositions()[lowerRightPositions].LowerRightCorner = pos;
+				// add frame to sprite bank
+				SGUISpriteFrame f;
+				f.rectNumber = lowerRightPositions;
+				f.textureNumber = 0;
+				SGUISprite s;
+				s.Frames.push_back(f);
+				s.frameTime = 0;
+				SpriteBank->getSprites().push_back(s);
+				// add character to font
+				SFontArea a;
+				a.overhang = 0;
+				a.underhang = 0;
+				a.spriteno = lowerRightPositions;
+				a.width = SpriteBank->getPositions()[lowerRightPositions].getWidth();
+				Areas.push_back(a);
+				// map letter to character
+				wchar_t ch = (wchar_t)(lowerRightPositions + 32);
+				CharacterMap[ch] = lowerRightPositions;
+
+				++lowerRightPositions;
+			} else if (c == colorBackGround)
+				image->setPixel(pos.X, pos.Y, colorBackGroundTransparent);
+		}
+	}
+}
+
+//! set an Pixel Offset on Drawing ( scale position on width )
+void CGUIFont::setKerningWidth(s32 kerning)
+{
+	GlobalKerningWidth = kerning;
+}
+
+//! set an Pixel Offset on Drawing ( scale position on width )
+s32 CGUIFont::getKerningWidth(const wchar_t *thisLetter, const wchar_t *previousLetter) const
+{
+	s32 ret = GlobalKerningWidth;
+
+	if (thisLetter) {
+		ret += Areas[getAreaFromCharacter(*thisLetter)].overhang;
+
+		if (previousLetter) {
+			ret += Areas[getAreaFromCharacter(*previousLetter)].underhang;
+		}
+	}
+
+	return ret;
+}
+
+//! set an Pixel Offset on Drawing ( scale position on height )
+void CGUIFont::setKerningHeight(s32 kerning)
+{
+	GlobalKerningHeight = kerning;
+}
+
+//! set an Pixel Offset on Drawing ( scale position on height )
+s32 CGUIFont::getKerningHeight() const
+{
+	return GlobalKerningHeight;
+}
+
+//! returns the sprite number from a given character
+u32 CGUIFont::getSpriteNoFromChar(const wchar_t *c) const
+{
+	return Areas[getAreaFromCharacter(*c)].spriteno;
+}
+
+s32 CGUIFont::getAreaFromCharacter(const wchar_t c) const
+{
+	auto n = CharacterMap.find(c);
+	if (n != CharacterMap.end())
+		return n->second;
+	else
+		return WrongCharacter;
+}
+
+void CGUIFont::setInvisibleCharacters(const wchar_t *s)
+{
+	Invisible = s;
+}
+
+//! returns the dimension of text
+core::dimension2d<u32> CGUIFont::getDimension(const wchar_t *text) const
+{
+	core::dimension2d<u32> dim(0, 0);
+	core::dimension2d<u32> thisLine(0, MaxHeight);
+
+	for (const wchar_t *p = text; *p; ++p) {
+		bool lineBreak = false;
+		if (*p == L'\r') { // Mac or Windows breaks
+			lineBreak = true;
+			if (p[1] == L'\n') // Windows breaks
+				++p;
+		} else if (*p == L'\n') { // Unix breaks
+			lineBreak = true;
+		}
+		if (lineBreak) {
+			dim.Height += thisLine.Height;
+			if (dim.Width < thisLine.Width)
+				dim.Width = thisLine.Width;
+			thisLine.Width = 0;
+			continue;
+		}
+
+		const SFontArea &area = Areas[getAreaFromCharacter(*p)];
+
+		thisLine.Width += area.underhang;
+		thisLine.Width += area.width + area.overhang + GlobalKerningWidth;
+	}
+
+	dim.Height += thisLine.Height;
+	if (dim.Width < thisLine.Width)
+		dim.Width = thisLine.Width;
+
+	return dim;
+}
+
+//! draws some text and clips it to the specified rectangle if wanted
+void CGUIFont::draw(const core::stringw &text, const core::rect<s32> &position,
+		video::SColor color,
+		bool hcenter, bool vcenter, const core::rect<s32> *clip)
+{
+	if (!Driver || !SpriteBank)
+		return;
+
+	core::dimension2d<s32> textDimension; // NOTE: don't make this u32 or the >> later on can fail when the dimension width is < position width
+	core::position2d<s32> offset = position.UpperLeftCorner;
+
+	if (hcenter || vcenter || clip)
+		textDimension = getDimension(text.c_str());
+
+	if (hcenter)
+		offset.X += (position.getWidth() - textDimension.Width) >> 1;
+
+	if (vcenter)
+		offset.Y += (position.getHeight() - textDimension.Height) >> 1;
+
+	if (clip) {
+		core::rect<s32> clippedRect(offset, textDimension);
+		clippedRect.clipAgainst(*clip);
+		if (!clippedRect.isValid())
+			return;
+	}
+
+	core::array<u32> indices(text.size());
+	core::array<core::position2di> offsets(text.size());
+
+	for (u32 i = 0; i < text.size(); i++) {
+		wchar_t c = text[i];
+
+		bool lineBreak = false;
+		if (c == L'\r') { // Mac or Windows breaks
+			lineBreak = true;
+			if (text[i + 1] == L'\n') // Windows breaks
+				c = text[++i];
+		} else if (c == L'\n') { // Unix breaks
+			lineBreak = true;
+		}
+
+		if (lineBreak) {
+			offset.Y += MaxHeight;
+			offset.X = position.UpperLeftCorner.X;
+
+			if (hcenter) {
+				offset.X += (position.getWidth() - textDimension.Width) >> 1;
+			}
+			continue;
+		}
+
+		SFontArea &area = Areas[getAreaFromCharacter(c)];
+
+		offset.X += area.underhang;
+		if (Invisible.findFirst(c) < 0) {
+			indices.push_back(area.spriteno);
+			offsets.push_back(offset);
+		}
+
+		offset.X += area.width + area.overhang + GlobalKerningWidth;
+	}
+
+	SpriteBank->draw2DSpriteBatch(indices, offsets, clip, color);
+}
+
+//! Calculates the index of the character in the text which is on a specific position.
+s32 CGUIFont::getCharacterFromPos(const wchar_t *text, s32 pixel_x) const
+{
+	s32 x = 0;
+	s32 idx = 0;
+
+	while (text[idx]) {
+		const SFontArea &a = Areas[getAreaFromCharacter(text[idx])];
+
+		x += a.width + a.overhang + a.underhang + GlobalKerningWidth;
+
+		if (x >= pixel_x)
+			return idx;
+
+		++idx;
+	}
+
+	return -1;
+}
+
+IGUISpriteBank *CGUIFont::getSpriteBank() const
+{
+	return SpriteBank;
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIFont.h b/irr/src/CGUIFont.h
new file mode 100644
index 000000000..2f383a5f7
--- /dev/null
+++ b/irr/src/CGUIFont.h
@@ -0,0 +1,107 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIFontBitmap.h"
+#include "irrString.h"
+#include "IReadFile.h"
+#include "irrArray.h"
+#include <map>
+
+namespace irr
+{
+
+namespace video
+{
+class IVideoDriver;
+class IImage;
+}
+
+namespace gui
+{
+
+class IGUIEnvironment;
+
+class CGUIFont : public IGUIFontBitmap
+{
+public:
+	//! constructor
+	CGUIFont(IGUIEnvironment *env, const io::path &filename);
+
+	//! destructor
+	virtual ~CGUIFont();
+
+	//! loads a font from a texture file
+	bool load(const io::path &filename);
+
+	//! loads a font from a texture file
+	bool load(io::IReadFile *file);
+
+	//! draws an text and clips it to the specified rectangle if wanted
+	virtual void draw(const core::stringw &text, const core::rect<s32> &position,
+			video::SColor color, bool hcenter = false,
+			bool vcenter = false, const core::rect<s32> *clip = 0) override;
+
+	//! returns the dimension of a text
+	core::dimension2d<u32> getDimension(const wchar_t *text) const override;
+
+	//! Calculates the index of the character in the text which is on a specific position.
+	s32 getCharacterFromPos(const wchar_t *text, s32 pixel_x) const override;
+
+	//! Returns the type of this font
+	EGUI_FONT_TYPE getType() const override { return EGFT_BITMAP; }
+
+	//! set an Pixel Offset on Drawing ( scale position on width )
+	void setKerningWidth(s32 kerning) override;
+	void setKerningHeight(s32 kerning) override;
+
+	//! set an Pixel Offset on Drawing ( scale position on width )
+	s32 getKerningWidth(const wchar_t *thisLetter = 0, const wchar_t *previousLetter = 0) const override;
+	s32 getKerningHeight() const override;
+
+	//! gets the sprite bank
+	IGUISpriteBank *getSpriteBank() const override;
+
+	//! returns the sprite number from a given character
+	u32 getSpriteNoFromChar(const wchar_t *c) const override;
+
+	void setInvisibleCharacters(const wchar_t *s) override;
+
+private:
+	struct SFontArea
+	{
+		SFontArea() :
+				underhang(0), overhang(0), width(0), spriteno(0) {}
+		s32 underhang;
+		s32 overhang;
+		s32 width;
+		u32 spriteno;
+	};
+
+	//! load & prepare font from ITexture
+	bool loadTexture(video::IImage *image, const io::path &name);
+
+	void readPositions(video::IImage *texture, s32 &lowerRightPositions);
+
+	s32 getAreaFromCharacter(const wchar_t c) const;
+	void setMaxHeight();
+
+	void pushTextureCreationFlags(bool (&flags)[3]);
+	void popTextureCreationFlags(const bool (&flags)[3]);
+
+	core::array<SFontArea> Areas;
+	std::map<wchar_t, s32> CharacterMap;
+	video::IVideoDriver *Driver;
+	IGUISpriteBank *SpriteBank;
+	IGUIEnvironment *Environment;
+	u32 WrongCharacter;
+	s32 MaxHeight;
+	s32 GlobalKerningWidth, GlobalKerningHeight;
+
+	core::stringw Invisible;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIImage.cpp b/irr/src/CGUIImage.cpp
new file mode 100644
index 000000000..5f7bb8e26
--- /dev/null
+++ b/irr/src/CGUIImage.cpp
@@ -0,0 +1,164 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIImage.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIImage::CGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle) :
+		IGUIImage(environment, parent, id, rectangle), Texture(0), Color(255, 255, 255, 255),
+		UseAlphaChannel(false), ScaleImage(false), DrawBounds(0.f, 0.f, 1.f, 1.f), DrawBackground(true)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIImage");
+#endif
+}
+
+//! destructor
+CGUIImage::~CGUIImage()
+{
+	if (Texture)
+		Texture->drop();
+}
+
+//! sets an image
+void CGUIImage::setImage(video::ITexture *image)
+{
+	if (image == Texture)
+		return;
+
+	if (Texture)
+		Texture->drop();
+
+	Texture = image;
+
+	if (Texture)
+		Texture->grab();
+}
+
+//! Gets the image texture
+video::ITexture *CGUIImage::getImage() const
+{
+	return Texture;
+}
+
+//! sets the color of the image
+void CGUIImage::setColor(video::SColor color)
+{
+	Color = color;
+}
+
+//! Gets the color of the image
+video::SColor CGUIImage::getColor() const
+{
+	return Color;
+}
+
+//! draws the element and its children
+void CGUIImage::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	if (Texture) {
+		core::rect<s32> sourceRect(SourceRect);
+		if (sourceRect.getWidth() == 0 || sourceRect.getHeight() == 0) {
+			sourceRect = core::rect<s32>(core::dimension2di(Texture->getOriginalSize()));
+		}
+
+		if (ScaleImage) {
+			const video::SColor Colors[] = {Color, Color, Color, Color};
+
+			core::rect<s32> clippingRect(AbsoluteClippingRect);
+			checkBounds(clippingRect);
+
+			driver->draw2DImage(Texture, AbsoluteRect, sourceRect,
+					&clippingRect, Colors, UseAlphaChannel);
+		} else {
+			core::rect<s32> clippingRect(AbsoluteRect.UpperLeftCorner, sourceRect.getSize());
+			checkBounds(clippingRect);
+			clippingRect.clipAgainst(AbsoluteClippingRect);
+
+			driver->draw2DImage(Texture, AbsoluteRect.UpperLeftCorner, sourceRect,
+					&clippingRect, Color, UseAlphaChannel);
+		}
+	} else if (DrawBackground) {
+		core::rect<s32> clippingRect(AbsoluteClippingRect);
+		checkBounds(clippingRect);
+
+		skin->draw2DRectangle(this, skin->getColor(EGDC_3D_DARK_SHADOW), AbsoluteRect, &clippingRect);
+	}
+
+	IGUIElement::draw();
+}
+
+//! sets if the image should use its alpha channel to draw itself
+void CGUIImage::setUseAlphaChannel(bool use)
+{
+	UseAlphaChannel = use;
+}
+
+//! sets if the image should use its alpha channel to draw itself
+void CGUIImage::setScaleImage(bool scale)
+{
+	ScaleImage = scale;
+}
+
+//! Returns true if the image is scaled to fit, false if not
+bool CGUIImage::isImageScaled() const
+{
+	return ScaleImage;
+}
+
+//! Returns true if the image is using the alpha channel, false if not
+bool CGUIImage::isAlphaChannelUsed() const
+{
+	return UseAlphaChannel;
+}
+
+//! Sets the source rectangle of the image. By default the full image is used.
+void CGUIImage::setSourceRect(const core::rect<s32> &sourceRect)
+{
+	SourceRect = sourceRect;
+}
+
+//! Returns the customized source rectangle of the image to be used.
+core::rect<s32> CGUIImage::getSourceRect() const
+{
+	return SourceRect;
+}
+
+//! Restrict target drawing-area.
+void CGUIImage::setDrawBounds(const core::rect<f32> &drawBoundUVs)
+{
+	DrawBounds = drawBoundUVs;
+	DrawBounds.UpperLeftCorner.X = core::clamp(DrawBounds.UpperLeftCorner.X, 0.f, 1.f);
+	DrawBounds.UpperLeftCorner.Y = core::clamp(DrawBounds.UpperLeftCorner.Y, 0.f, 1.f);
+	DrawBounds.LowerRightCorner.X = core::clamp(DrawBounds.LowerRightCorner.X, 0.f, 1.f);
+	DrawBounds.LowerRightCorner.X = core::clamp(DrawBounds.LowerRightCorner.X, 0.f, 1.f);
+	if (DrawBounds.UpperLeftCorner.X > DrawBounds.LowerRightCorner.X)
+		DrawBounds.UpperLeftCorner.X = DrawBounds.LowerRightCorner.X;
+	if (DrawBounds.UpperLeftCorner.Y > DrawBounds.LowerRightCorner.Y)
+		DrawBounds.UpperLeftCorner.Y = DrawBounds.LowerRightCorner.Y;
+}
+
+//! Get target drawing-area restrictions.
+core::rect<f32> CGUIImage::getDrawBounds() const
+{
+	return DrawBounds;
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIImage.h b/irr/src/CGUIImage.h
new file mode 100644
index 000000000..967ac40ea
--- /dev/null
+++ b/irr/src/CGUIImage.h
@@ -0,0 +1,97 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIImage.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUIImage : public IGUIImage
+{
+public:
+	//! constructor
+	CGUIImage(IGUIEnvironment *environment, IGUIElement *parent, s32 id, core::rect<s32> rectangle);
+
+	//! destructor
+	virtual ~CGUIImage();
+
+	//! sets an image
+	void setImage(video::ITexture *image) override;
+
+	//! Gets the image texture
+	video::ITexture *getImage() const override;
+
+	//! sets the color of the image
+	void setColor(video::SColor color) override;
+
+	//! sets if the image should scale to fit the element
+	void setScaleImage(bool scale) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! sets if the image should use its alpha channel to draw itself
+	void setUseAlphaChannel(bool use) override;
+
+	//! Gets the color of the image
+	video::SColor getColor() const override;
+
+	//! Returns true if the image is scaled to fit, false if not
+	bool isImageScaled() const override;
+
+	//! Returns true if the image is using the alpha channel, false if not
+	bool isAlphaChannelUsed() const override;
+
+	//! Sets the source rectangle of the image. By default the full image is used.
+	void setSourceRect(const core::rect<s32> &sourceRect) override;
+
+	//! Returns the customized source rectangle of the image to be used.
+	core::rect<s32> getSourceRect() const override;
+
+	//! Restrict drawing-area.
+	void setDrawBounds(const core::rect<f32> &drawBoundUVs) override;
+
+	//! Get drawing-area restrictions.
+	core::rect<f32> getDrawBounds() const override;
+
+	//! Sets whether to draw a background color (EGDC_3D_DARK_SHADOW) when no texture is set
+	void setDrawBackground(bool draw) override
+	{
+		DrawBackground = draw;
+	}
+
+	//! Checks if a background is drawn when no texture is set
+	bool isDrawBackgroundEnabled() const override
+	{
+		return DrawBackground;
+	}
+
+protected:
+	void checkBounds(core::rect<s32> &rect)
+	{
+		f32 clipWidth = (f32)rect.getWidth();
+		f32 clipHeight = (f32)rect.getHeight();
+
+		rect.UpperLeftCorner.X += core::round32(DrawBounds.UpperLeftCorner.X * clipWidth);
+		rect.UpperLeftCorner.Y += core::round32(DrawBounds.UpperLeftCorner.Y * clipHeight);
+		rect.LowerRightCorner.X -= core::round32((1.f - DrawBounds.LowerRightCorner.X) * clipWidth);
+		rect.LowerRightCorner.Y -= core::round32((1.f - DrawBounds.LowerRightCorner.Y) * clipHeight);
+	}
+
+private:
+	video::ITexture *Texture;
+	video::SColor Color;
+	bool UseAlphaChannel;
+	bool ScaleImage;
+	core::rect<s32> SourceRect;
+	core::rect<f32> DrawBounds;
+	bool DrawBackground;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIImageList.cpp b/irr/src/CGUIImageList.cpp
new file mode 100644
index 000000000..3bd30d913
--- /dev/null
+++ b/irr/src/CGUIImageList.cpp
@@ -0,0 +1,84 @@
+// This file is part of the "Irrlicht Engine".
+// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
+// modified by Thomas Alten
+
+#include "CGUIImageList.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIImageList::CGUIImageList(video::IVideoDriver *driver) :
+		Driver(driver),
+		Texture(0),
+		ImageCount(0),
+		ImageSize(0, 0),
+		ImagesPerRow(0),
+		UseAlphaChannel(false)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIImageList");
+#endif
+
+	if (Driver) {
+		Driver->grab();
+	}
+}
+
+//! destructor
+CGUIImageList::~CGUIImageList()
+{
+	if (Driver) {
+		Driver->drop();
+	}
+
+	if (Texture) {
+		Texture->drop();
+	}
+}
+
+//! Creates the image list from texture.
+bool CGUIImageList::createImageList(video::ITexture *texture,
+		core::dimension2d<s32> imageSize,
+		bool useAlphaChannel)
+{
+	if (!texture) {
+		return false;
+	}
+
+	Texture = texture;
+	Texture->grab();
+
+	ImageSize = imageSize;
+
+	ImagesPerRow = Texture->getSize().Width / ImageSize.Width;
+	ImageCount = ImagesPerRow * Texture->getSize().Height / ImageSize.Height;
+
+	UseAlphaChannel = useAlphaChannel;
+
+	return true;
+}
+
+//! Draws an image and clips it to the specified rectangle if wanted
+void CGUIImageList::draw(s32 index, const core::position2d<s32> &destPos,
+		const core::rect<s32> *clip /*= 0*/)
+{
+	core::rect<s32> sourceRect;
+
+	if (!Driver || index < 0 || index >= ImageCount) {
+		return;
+	}
+
+	sourceRect.UpperLeftCorner.X = (index % ImagesPerRow) * ImageSize.Width;
+	sourceRect.UpperLeftCorner.Y = (index / ImagesPerRow) * ImageSize.Height;
+	sourceRect.LowerRightCorner.X = sourceRect.UpperLeftCorner.X + ImageSize.Width;
+	sourceRect.LowerRightCorner.Y = sourceRect.UpperLeftCorner.Y + ImageSize.Height;
+
+	Driver->draw2DImage(Texture, destPos, sourceRect, clip,
+			video::SColor(255, 255, 255, 255), UseAlphaChannel);
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIImageList.h b/irr/src/CGUIImageList.h
new file mode 100644
index 000000000..afde14e0a
--- /dev/null
+++ b/irr/src/CGUIImageList.h
@@ -0,0 +1,65 @@
+// This file is part of the "Irrlicht Engine".
+// written by Reinhard Ostermeier, reinhard@nospam.r-ostermeier.de
+
+#pragma once
+
+#include "IGUIImageList.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUIImageList : public IGUIImageList
+{
+public:
+	//! constructor
+	CGUIImageList(video::IVideoDriver *Driver);
+
+	//! destructor
+	virtual ~CGUIImageList();
+
+	//! Creates the image list from texture.
+	//! \param texture: The texture to use
+	//! \param imageSize: Size of a single image
+	//! \param useAlphaChannel: true if the alpha channel from the texture should be used
+	//! \return
+	//! true if the image list was created
+	bool createImageList(video::ITexture *texture,
+			core::dimension2d<s32> imageSize,
+			bool useAlphaChannel);
+
+	//! Draws an image and clips it to the specified rectangle if wanted
+	//! \param index: Index of the image
+	//! \param destPos: Position of the image to draw
+	//! \param clip: Optional pointer to a rectangle against which the text will be clipped.
+	//! If the pointer is null, no clipping will be done.
+	virtual void draw(s32 index, const core::position2d<s32> &destPos,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Returns the count of Images in the list.
+	//! \return Returns the count of Images in the list.
+	s32 getImageCount() const override
+	{
+		return ImageCount;
+	}
+
+	//! Returns the size of the images in the list.
+	//! \return Returns the size of the images in the list.
+	core::dimension2d<s32> getImageSize() const override
+	{
+		return ImageSize;
+	}
+
+private:
+	video::IVideoDriver *Driver;
+	video::ITexture *Texture;
+	s32 ImageCount;
+	core::dimension2d<s32> ImageSize;
+	s32 ImagesPerRow;
+	bool UseAlphaChannel;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIListBox.cpp b/irr/src/CGUIListBox.cpp
new file mode 100644
index 000000000..78cb96ecf
--- /dev/null
+++ b/irr/src/CGUIListBox.cpp
@@ -0,0 +1,745 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIListBox.h"
+
+#include "CGUIListBox.h"
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "IGUISpriteBank.h"
+#include "CGUIScrollBar.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIListBox::CGUIListBox(IGUIEnvironment *environment, IGUIElement *parent,
+		s32 id, core::rect<s32> rectangle, bool clip,
+		bool drawBack, bool moveOverSelect) :
+		IGUIListBox(environment, parent, id, rectangle),
+		Selected(-1),
+		ItemHeight(0), ItemHeightOverride(0),
+		TotalItemHeight(0), ItemsIconWidth(0), Font(0), IconBank(0),
+		ScrollBar(0), selectTime(0), LastKeyTime(0), Selecting(false), DrawBack(drawBack),
+		MoveOverSelect(moveOverSelect), AutoScroll(true), HighlightWhenNotFocused(true)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIListBox");
+#endif
+
+	IGUISkin *skin = Environment->getSkin();
+
+	ScrollBar = new CGUIScrollBar(false, Environment, this, -1,
+			core::recti(0, 0, 1, 1),
+			!clip);
+	ScrollBar->setSubElement(true);
+	ScrollBar->setTabStop(false);
+	ScrollBar->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	ScrollBar->setVisible(false);
+	ScrollBar->setPos(0);
+
+	updateScrollBarSize(skin->getSize(EGDS_SCROLLBAR_SIZE));
+
+	setNotClipped(!clip);
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+
+	updateAbsolutePosition();
+}
+
+//! destructor
+CGUIListBox::~CGUIListBox()
+{
+	if (ScrollBar)
+		ScrollBar->drop();
+
+	if (Font)
+		Font->drop();
+
+	if (IconBank)
+		IconBank->drop();
+}
+
+//! returns amount of list items
+u32 CGUIListBox::getItemCount() const
+{
+	return Items.size();
+}
+
+//! returns string of a list item. the may be a value from 0 to itemCount-1
+const wchar_t *CGUIListBox::getListItem(u32 id) const
+{
+	if (id >= Items.size())
+		return 0;
+
+	return Items[id].Text.c_str();
+}
+
+//! Returns the icon of an item
+s32 CGUIListBox::getIcon(u32 id) const
+{
+	if (id >= Items.size())
+		return -1;
+
+	return Items[id].Icon;
+}
+
+//! adds a list item, returns id of item
+u32 CGUIListBox::addItem(const wchar_t *text)
+{
+	return addItem(text, -1);
+}
+
+//! adds a list item, returns id of item
+void CGUIListBox::removeItem(u32 id)
+{
+	if (id >= Items.size())
+		return;
+
+	if ((u32)Selected == id) {
+		Selected = -1;
+	} else if ((u32)Selected > id) {
+		Selected -= 1;
+		selectTime = os::Timer::getTime();
+	}
+
+	Items.erase(id);
+
+	recalculateItemHeight();
+}
+
+s32 CGUIListBox::getItemAt(s32 xpos, s32 ypos) const
+{
+	if (xpos < AbsoluteRect.UpperLeftCorner.X || xpos >= AbsoluteRect.LowerRightCorner.X || ypos < AbsoluteRect.UpperLeftCorner.Y || ypos >= AbsoluteRect.LowerRightCorner.Y)
+		return -1;
+
+	if (ItemHeight == 0)
+		return -1;
+
+	s32 item = ((ypos - AbsoluteRect.UpperLeftCorner.Y - 1) + ScrollBar->getPos()) / ItemHeight;
+	if (item < 0 || item >= (s32)Items.size())
+		return -1;
+
+	return item;
+}
+
+//! clears the list
+void CGUIListBox::clear()
+{
+	Items.clear();
+	ItemsIconWidth = 0;
+	Selected = -1;
+
+	ScrollBar->setPos(0);
+
+	recalculateItemHeight();
+}
+
+void CGUIListBox::recalculateItemHeight()
+{
+	IGUISkin *skin = Environment->getSkin();
+
+	if (Font != skin->getFont()) {
+		if (Font)
+			Font->drop();
+
+		Font = skin->getFont();
+		if (0 == ItemHeightOverride)
+			ItemHeight = 0;
+
+		if (Font) {
+			if (0 == ItemHeightOverride)
+				ItemHeight = Font->getDimension(L"A").Height + 4;
+
+			Font->grab();
+		}
+	}
+
+	TotalItemHeight = ItemHeight * Items.size();
+	ScrollBar->setMax(core::max_(0, TotalItemHeight - AbsoluteRect.getHeight()));
+	s32 minItemHeight = ItemHeight > 0 ? ItemHeight : 1;
+	ScrollBar->setSmallStep(minItemHeight);
+	ScrollBar->setLargeStep(2 * minItemHeight);
+
+	if (TotalItemHeight <= AbsoluteRect.getHeight())
+		ScrollBar->setVisible(false);
+	else
+		ScrollBar->setVisible(true);
+}
+
+//! returns id of selected item. returns -1 if no item is selected.
+s32 CGUIListBox::getSelected() const
+{
+	return Selected;
+}
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUIListBox::setSelected(s32 id)
+{
+	if ((u32)id >= Items.size())
+		Selected = -1;
+	else
+		Selected = id;
+
+	selectTime = os::Timer::getTime();
+
+	recalculateScrollPos();
+}
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUIListBox::setSelected(const wchar_t *item)
+{
+	s32 index = -1;
+
+	if (item) {
+		for (index = 0; index < (s32)Items.size(); ++index) {
+			if (Items[index].Text == item)
+				break;
+		}
+	}
+	setSelected(index);
+}
+
+//! called if an event happened.
+bool CGUIListBox::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+		switch (event.EventType) {
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+					(event.KeyInput.Key == KEY_DOWN ||
+							event.KeyInput.Key == KEY_UP ||
+							event.KeyInput.Key == KEY_HOME ||
+							event.KeyInput.Key == KEY_END ||
+							event.KeyInput.Key == KEY_NEXT ||
+							event.KeyInput.Key == KEY_PRIOR)) {
+				s32 oldSelected = Selected;
+				switch (event.KeyInput.Key) {
+				case KEY_DOWN:
+					Selected += 1;
+					break;
+				case KEY_UP:
+					Selected -= 1;
+					break;
+				case KEY_HOME:
+					Selected = 0;
+					break;
+				case KEY_END:
+					Selected = (s32)Items.size() - 1;
+					break;
+				case KEY_NEXT:
+					Selected += AbsoluteRect.getHeight() / ItemHeight;
+					break;
+				case KEY_PRIOR:
+					Selected -= AbsoluteRect.getHeight() / ItemHeight;
+					break;
+				default:
+					break;
+				}
+				if (Selected < 0)
+					Selected = 0;
+				if (Selected >= (s32)Items.size())
+					Selected = Items.size() - 1; // will set Selected to -1 for empty listboxes which is correct
+
+				recalculateScrollPos();
+
+				// post the news
+
+				if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect) {
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+					Parent->OnEvent(e);
+				}
+
+				return true;
+			} else if (!event.KeyInput.PressedDown && (event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE)) {
+				if (Parent) {
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
+					Parent->OnEvent(e);
+				}
+				return true;
+			} else if (event.KeyInput.Key == KEY_TAB) {
+				return false;
+			} else if (event.KeyInput.PressedDown && event.KeyInput.Char) {
+				// change selection based on text as it is typed.
+				u32 now = os::Timer::getTime();
+
+				if (now - LastKeyTime < 500) {
+					// add to key buffer if it isn't a key repeat
+					if (!(KeyBuffer.size() == 1 && KeyBuffer[0] == event.KeyInput.Char)) {
+						KeyBuffer += L" ";
+						KeyBuffer[KeyBuffer.size() - 1] = event.KeyInput.Char;
+					}
+				} else {
+					KeyBuffer = L" ";
+					KeyBuffer[0] = event.KeyInput.Char;
+				}
+				LastKeyTime = now;
+
+				// find the selected item, starting at the current selection
+				s32 start = Selected;
+				// dont change selection if the key buffer matches the current item
+				if (Selected > -1 && KeyBuffer.size() > 1) {
+					if (Items[Selected].Text.size() >= KeyBuffer.size() &&
+							KeyBuffer.equals_ignore_case(Items[Selected].Text.subString(0, KeyBuffer.size())))
+						return true;
+				}
+
+				s32 current;
+				for (current = start + 1; current < (s32)Items.size(); ++current) {
+					if (Items[current].Text.size() >= KeyBuffer.size()) {
+						if (KeyBuffer.equals_ignore_case(Items[current].Text.subString(0, KeyBuffer.size()))) {
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect) {
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+				for (current = 0; current <= start; ++current) {
+					if (Items[current].Text.size() >= KeyBuffer.size()) {
+						if (KeyBuffer.equals_ignore_case(Items[current].Text.subString(0, KeyBuffer.size()))) {
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect) {
+								Selected = current;
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+
+				return true;
+			}
+			break;
+
+		case EET_GUI_EVENT:
+			switch (event.GUIEvent.EventType) {
+			case gui::EGET_SCROLL_BAR_CHANGED:
+				if (event.GUIEvent.Caller == ScrollBar)
+					return true;
+				break;
+			case gui::EGET_ELEMENT_FOCUS_LOST: {
+				if (event.GUIEvent.Caller == this)
+					Selecting = false;
+			}
+			default:
+				break;
+			}
+			break;
+
+		case EET_MOUSE_INPUT_EVENT: {
+			core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+			switch (event.MouseInput.Event) {
+			case EMIE_MOUSE_WHEEL:
+				ScrollBar->setPos(ScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1) * -ItemHeight / 2);
+				return true;
+
+			case EMIE_LMOUSE_PRESSED_DOWN: {
+				Selecting = true;
+				return true;
+			}
+
+			case EMIE_LMOUSE_LEFT_UP: {
+				Selecting = false;
+
+				if (isPointInside(p))
+					selectNew(event.MouseInput.Y);
+
+				return true;
+			}
+
+			case EMIE_MOUSE_MOVED:
+				if (Selecting || MoveOverSelect) {
+					if (isPointInside(p)) {
+						selectNew(event.MouseInput.Y, true);
+						return true;
+					}
+				}
+			default:
+				break;
+			}
+		} break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+void CGUIListBox::selectNew(s32 ypos, bool onlyHover)
+{
+	u32 now = os::Timer::getTime();
+	s32 oldSelected = Selected;
+
+	Selected = getItemAt(AbsoluteRect.UpperLeftCorner.X, ypos);
+	if (Selected < 0 && !Items.empty())
+		Selected = 0;
+
+	recalculateScrollPos();
+
+	gui::EGUI_EVENT_TYPE eventType = (Selected == oldSelected && now < selectTime + 500) ? EGET_LISTBOX_SELECTED_AGAIN : EGET_LISTBOX_CHANGED;
+	selectTime = now;
+	// post the news
+	if (Parent && !onlyHover) {
+		SEvent event;
+		event.EventType = EET_GUI_EVENT;
+		event.GUIEvent.Caller = this;
+		event.GUIEvent.Element = 0;
+		event.GUIEvent.EventType = eventType;
+		Parent->OnEvent(event);
+	}
+}
+
+//! Update the position and size of the listbox, and update the scrollbar
+void CGUIListBox::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+
+	recalculateItemHeight();
+}
+
+//! draws the element and its children
+void CGUIListBox::draw()
+{
+	if (!IsVisible)
+		return;
+
+	recalculateItemHeight(); // if the font changed
+
+	IGUISkin *skin = Environment->getSkin();
+	updateScrollBarSize(skin->getSize(EGDS_SCROLLBAR_SIZE));
+
+	core::rect<s32> *clipRect = 0;
+
+	// draw background
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// draw items
+
+	core::rect<s32> clientClip(AbsoluteRect);
+	clientClip.UpperLeftCorner.Y += 1;
+	clientClip.UpperLeftCorner.X += 1;
+	if (ScrollBar->isVisible())
+		clientClip.LowerRightCorner.X -= ScrollBar->getRelativePosition().getWidth();
+	clientClip.LowerRightCorner.Y -= 1;
+	clientClip.clipAgainst(AbsoluteClippingRect);
+
+	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT), true,
+			DrawBack, frameRect, &AbsoluteClippingRect);
+
+	if (clipRect)
+		clientClip.clipAgainst(*clipRect);
+
+	frameRect = AbsoluteRect;
+	frameRect.UpperLeftCorner.X += 1;
+	if (ScrollBar->isVisible())
+		frameRect.LowerRightCorner.X -= ScrollBar->getRelativePosition().getWidth();
+
+	frameRect.LowerRightCorner.Y = AbsoluteRect.UpperLeftCorner.Y + ItemHeight;
+
+	frameRect.UpperLeftCorner.Y -= ScrollBar->getPos();
+	frameRect.LowerRightCorner.Y -= ScrollBar->getPos();
+
+	bool hl = (HighlightWhenNotFocused || Environment->hasFocus(this) || Environment->hasFocus(ScrollBar));
+
+	for (s32 i = 0; i < (s32)Items.size(); ++i) {
+		if (frameRect.LowerRightCorner.Y >= AbsoluteRect.UpperLeftCorner.Y &&
+				frameRect.UpperLeftCorner.Y <= AbsoluteRect.LowerRightCorner.Y) {
+			if (i == Selected && hl)
+				skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), frameRect, &clientClip);
+
+			core::rect<s32> textRect = frameRect;
+			textRect.UpperLeftCorner.X += 3;
+
+			if (Font) {
+				if (IconBank && (Items[i].Icon > -1)) {
+					core::position2di iconPos = textRect.UpperLeftCorner;
+					iconPos.Y += textRect.getHeight() / 2;
+					iconPos.X += ItemsIconWidth / 2;
+
+					if (i == Selected && hl) {
+						IconBank->draw2DSprite((u32)Items[i].Icon, iconPos, &clientClip,
+								hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ? getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
+								selectTime, os::Timer::getTime(), false, true);
+					} else {
+						IconBank->draw2DSprite((u32)Items[i].Icon, iconPos, &clientClip,
+								hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
+								0, (i == Selected) ? os::Timer::getTime() : 0, false, true);
+					}
+				}
+
+				textRect.UpperLeftCorner.X += ItemsIconWidth + 3;
+
+				if (i == Selected && hl) {
+					Font->draw(Items[i].Text.c_str(), textRect,
+							hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ? getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
+							false, true, &clientClip);
+				} else {
+					Font->draw(Items[i].Text.c_str(), textRect,
+							hasItemOverrideColor(i, EGUI_LBC_TEXT) ? getItemOverrideColor(i, EGUI_LBC_TEXT) : getItemDefaultColor(EGUI_LBC_TEXT),
+							false, true, &clientClip);
+				}
+
+				textRect.UpperLeftCorner.X -= ItemsIconWidth + 3;
+			}
+		}
+
+		frameRect.UpperLeftCorner.Y += ItemHeight;
+		frameRect.LowerRightCorner.Y += ItemHeight;
+	}
+
+	IGUIElement::draw();
+}
+
+//! adds an list item with an icon
+u32 CGUIListBox::addItem(const wchar_t *text, s32 icon)
+{
+	ListItem i;
+	i.Text = text;
+	i.Icon = icon;
+
+	Items.push_back(i);
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+
+	return Items.size() - 1;
+}
+
+void CGUIListBox::setSpriteBank(IGUISpriteBank *bank)
+{
+	if (bank == IconBank)
+		return;
+	if (IconBank)
+		IconBank->drop();
+
+	IconBank = bank;
+	if (IconBank)
+		IconBank->grab();
+}
+
+void CGUIListBox::recalculateScrollPos()
+{
+	if (!AutoScroll)
+		return;
+
+	const s32 selPos = (getSelected() == -1 ? TotalItemHeight : getSelected() * ItemHeight) - ScrollBar->getPos();
+
+	if (selPos < 0) {
+		ScrollBar->setPos(ScrollBar->getPos() + selPos);
+	} else if (selPos > AbsoluteRect.getHeight() - ItemHeight) {
+		ScrollBar->setPos(ScrollBar->getPos() + selPos - AbsoluteRect.getHeight() + ItemHeight);
+	}
+}
+
+void CGUIListBox::updateScrollBarSize(s32 size)
+{
+	if (size != ScrollBar->getRelativePosition().getWidth()) {
+		core::recti r(RelativeRect.getWidth() - size, 0, RelativeRect.getWidth(), RelativeRect.getHeight());
+		ScrollBar->setRelativePosition(r);
+	}
+}
+
+void CGUIListBox::setAutoScrollEnabled(bool scroll)
+{
+	AutoScroll = scroll;
+}
+
+bool CGUIListBox::isAutoScrollEnabled() const
+{
+	return AutoScroll;
+}
+
+bool CGUIListBox::getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc &useColorLabel, core::stringc &colorLabel) const
+{
+	switch (colorType) {
+	case EGUI_LBC_TEXT:
+		useColorLabel = "UseColText";
+		colorLabel = "ColText";
+		break;
+	case EGUI_LBC_TEXT_HIGHLIGHT:
+		useColorLabel = "UseColTextHl";
+		colorLabel = "ColTextHl";
+		break;
+	case EGUI_LBC_ICON:
+		useColorLabel = "UseColIcon";
+		colorLabel = "ColIcon";
+		break;
+	case EGUI_LBC_ICON_HIGHLIGHT:
+		useColorLabel = "UseColIconHl";
+		colorLabel = "ColIconHl";
+		break;
+	default:
+		return false;
+	}
+	return true;
+}
+
+void CGUIListBox::recalculateItemWidth(s32 icon)
+{
+	if (IconBank && icon > -1 &&
+			IconBank->getSprites().size() > (u32)icon &&
+			IconBank->getSprites()[(u32)icon].Frames.size()) {
+		u32 rno = IconBank->getSprites()[(u32)icon].Frames[0].rectNumber;
+		if (IconBank->getPositions().size() > rno) {
+			const s32 w = IconBank->getPositions()[rno].getWidth();
+			if (w > ItemsIconWidth)
+				ItemsIconWidth = w;
+		}
+	}
+}
+
+void CGUIListBox::setItem(u32 index, const wchar_t *text, s32 icon)
+{
+	if (index >= Items.size())
+		return;
+
+	Items[index].Text = text;
+	Items[index].Icon = icon;
+
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+}
+
+//! Insert the item at the given index
+//! Return the index on success or -1 on failure.
+s32 CGUIListBox::insertItem(u32 index, const wchar_t *text, s32 icon)
+{
+	ListItem i;
+	i.Text = text;
+	i.Icon = icon;
+
+	Items.insert(i, index);
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+
+	return index;
+}
+
+void CGUIListBox::swapItems(u32 index1, u32 index2)
+{
+	if (index1 >= Items.size() || index2 >= Items.size())
+		return;
+
+	ListItem dummmy = Items[index1];
+	Items[index1] = Items[index2];
+	Items[index2] = dummmy;
+}
+
+void CGUIListBox::setItemOverrideColor(u32 index, video::SColor color)
+{
+	for (u32 c = 0; c < EGUI_LBC_COUNT; ++c) {
+		Items[index].OverrideColors[c].Use = true;
+		Items[index].OverrideColors[c].Color = color;
+	}
+}
+
+void CGUIListBox::setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color)
+{
+	if (index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT)
+		return;
+
+	Items[index].OverrideColors[colorType].Use = true;
+	Items[index].OverrideColors[colorType].Color = color;
+}
+
+void CGUIListBox::clearItemOverrideColor(u32 index)
+{
+	for (u32 c = 0; c < (u32)EGUI_LBC_COUNT; ++c) {
+		Items[index].OverrideColors[c].Use = false;
+	}
+}
+
+void CGUIListBox::clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType)
+{
+	if (index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT)
+		return;
+
+	Items[index].OverrideColors[colorType].Use = false;
+}
+
+bool CGUIListBox::hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if (index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT)
+		return false;
+
+	return Items[index].OverrideColors[colorType].Use;
+}
+
+video::SColor CGUIListBox::getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if ((u32)index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT)
+		return video::SColor();
+
+	return Items[index].OverrideColors[colorType].Color;
+}
+
+video::SColor CGUIListBox::getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const
+{
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return video::SColor();
+
+	switch (colorType) {
+	case EGUI_LBC_TEXT:
+		return skin->getColor(EGDC_BUTTON_TEXT);
+	case EGUI_LBC_TEXT_HIGHLIGHT:
+		return skin->getColor(EGDC_HIGH_LIGHT_TEXT);
+	case EGUI_LBC_ICON:
+		return skin->getColor(EGDC_ICON);
+	case EGUI_LBC_ICON_HIGHLIGHT:
+		return skin->getColor(EGDC_ICON_HIGH_LIGHT);
+	default:
+		return video::SColor();
+	}
+}
+
+//! set global itemHeight
+void CGUIListBox::setItemHeight(s32 height)
+{
+	ItemHeight = height;
+	ItemHeightOverride = 1;
+}
+
+//! Sets whether to draw the background
+void CGUIListBox::setDrawBackground(bool draw)
+{
+	DrawBack = draw;
+}
+
+//! Access the vertical scrollbar
+IGUIScrollBar *CGUIListBox::getVerticalScrollBar() const
+{
+	return ScrollBar;
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIListBox.h b/irr/src/CGUIListBox.h
new file mode 100644
index 000000000..ea1eaebd0
--- /dev/null
+++ b/irr/src/CGUIListBox.h
@@ -0,0 +1,173 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIListBox.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class IGUIFont;
+class IGUIScrollBar;
+
+class CGUIListBox : public IGUIListBox
+{
+public:
+	//! constructor
+	CGUIListBox(IGUIEnvironment *environment, IGUIElement *parent,
+			s32 id, core::rect<s32> rectangle, bool clip = true,
+			bool drawBack = false, bool moveOverSelect = false);
+
+	//! destructor
+	virtual ~CGUIListBox();
+
+	//! returns amount of list items
+	u32 getItemCount() const override;
+
+	//! returns string of a list item. the id may be a value from 0 to itemCount-1
+	const wchar_t *getListItem(u32 id) const override;
+
+	//! adds an list item, returns id of item
+	u32 addItem(const wchar_t *text) override;
+
+	//! clears the list
+	void clear() override;
+
+	//! returns id of selected item. returns -1 if no item is selected.
+	s32 getSelected() const override;
+
+	//! sets the selected item. Set this to -1 if no item should be selected
+	void setSelected(s32 id) override;
+
+	//! sets the selected item. Set this to -1 if no item should be selected
+	void setSelected(const wchar_t *item) override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! adds an list item with an icon
+	//! \param text Text of list entry
+	//! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+	//! \return
+	//! returns the id of the new created item
+	u32 addItem(const wchar_t *text, s32 icon) override;
+
+	//! Returns the icon of an item
+	s32 getIcon(u32 id) const override;
+
+	//! removes an item from the list
+	void removeItem(u32 id) override;
+
+	//! get the the id of the item at the given absolute coordinates
+	s32 getItemAt(s32 xpos, s32 ypos) const override;
+
+	//! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
+	//! the built-in-font by default. A sprite can be displayed in front of every list item.
+	//! An icon is an index within the icon sprite bank. Several default icons are available in the
+	//! skin through getIcon
+	void setSpriteBank(IGUISpriteBank *bank) override;
+
+	//! set whether the listbox should scroll to newly selected items
+	void setAutoScrollEnabled(bool scroll) override;
+
+	//! returns true if automatic scrolling is enabled, false if not.
+	bool isAutoScrollEnabled() const override;
+
+	//! Update the position and size of the listbox, and update the scrollbar
+	void updateAbsolutePosition() override;
+
+	//! set all item colors at given index to color
+	void setItemOverrideColor(u32 index, video::SColor color) override;
+
+	//! set all item colors of specified type at given index to color
+	void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color) override;
+
+	//! clear all item colors at index
+	void clearItemOverrideColor(u32 index) override;
+
+	//! clear item color at index for given colortype
+	void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) override;
+
+	//! has the item at index its color overwritten?
+	bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const override;
+
+	//! return the overwrite color at given item index.
+	video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const override;
+
+	//! return the default color which is used for the given colorType
+	video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const override;
+
+	//! set the item at the given index
+	void setItem(u32 index, const wchar_t *text, s32 icon) override;
+
+	//! Insert the item at the given index
+	//! Return the index on success or -1 on failure.
+	s32 insertItem(u32 index, const wchar_t *text, s32 icon) override;
+
+	//! Swap the items at the given indices
+	void swapItems(u32 index1, u32 index2) override;
+
+	//! set global itemHeight
+	void setItemHeight(s32 height) override;
+
+	//! Sets whether to draw the background
+	void setDrawBackground(bool draw) override;
+
+	//! Access the vertical scrollbar
+	IGUIScrollBar *getVerticalScrollBar() const override;
+
+private:
+	struct ListItem
+	{
+		core::stringw Text;
+		s32 Icon = -1;
+
+		// A multicolor extension
+		struct ListItemOverrideColor
+		{
+			bool Use = false;
+			video::SColor Color;
+		};
+		ListItemOverrideColor OverrideColors[EGUI_LBC_COUNT]{};
+	};
+
+	void recalculateItemHeight();
+	void selectNew(s32 ypos, bool onlyHover = false);
+	void recalculateScrollPos();
+	void updateScrollBarSize(s32 size);
+
+	// extracted that function to avoid copy&paste code
+	void recalculateItemWidth(s32 icon);
+
+	// get labels used for serialization
+	bool getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc &useColorLabel, core::stringc &colorLabel) const;
+
+	core::array<ListItem> Items;
+	s32 Selected;
+	s32 ItemHeight;
+	s32 ItemHeightOverride;
+	s32 TotalItemHeight;
+	s32 ItemsIconWidth;
+	gui::IGUIFont *Font;
+	gui::IGUISpriteBank *IconBank;
+	gui::IGUIScrollBar *ScrollBar;
+	u32 selectTime;
+	u32 LastKeyTime;
+	core::stringw KeyBuffer;
+	bool Selecting;
+	bool DrawBack;
+	bool MoveOverSelect;
+	bool AutoScroll;
+	bool HighlightWhenNotFocused;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIScrollBar.cpp b/irr/src/CGUIScrollBar.cpp
new file mode 100644
index 000000000..f9ebad09e
--- /dev/null
+++ b/irr/src/CGUIScrollBar.cpp
@@ -0,0 +1,463 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIScrollBar.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "CGUIButton.h"
+#include "IGUIFont.h"
+#include "IGUIFontBitmap.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIScrollBar::CGUIScrollBar(bool horizontal, IGUIEnvironment *environment,
+		IGUIElement *parent, s32 id,
+		core::rect<s32> rectangle, bool noclip) :
+		IGUIScrollBar(environment, parent, id, rectangle),
+		UpButton(0),
+		DownButton(0), Dragging(false), Horizontal(horizontal),
+		DraggedBySlider(false), TrayClick(false), Pos(0), DrawPos(0),
+		DrawHeight(0), Min(0), Max(100), SmallStep(10), LargeStep(50), DesiredPos(0),
+		LastChange(0)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIScrollBar");
+#endif
+
+	refreshControls();
+
+	setNotClipped(noclip);
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+
+	setPos(0);
+}
+
+//! destructor
+CGUIScrollBar::~CGUIScrollBar()
+{
+	if (UpButton)
+		UpButton->drop();
+
+	if (DownButton)
+		DownButton->drop();
+}
+
+//! called if an event happened.
+bool CGUIScrollBar::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+
+		switch (event.EventType) {
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown) {
+				const s32 oldPos = Pos;
+				bool absorb = true;
+				switch (event.KeyInput.Key) {
+				case KEY_LEFT:
+				case KEY_UP:
+					setPos(Pos - SmallStep);
+					break;
+				case KEY_RIGHT:
+				case KEY_DOWN:
+					setPos(Pos + SmallStep);
+					break;
+				case KEY_HOME:
+					setPos(Min);
+					break;
+				case KEY_PRIOR:
+					setPos(Pos - LargeStep);
+					break;
+				case KEY_END:
+					setPos(Max);
+					break;
+				case KEY_NEXT:
+					setPos(Pos + LargeStep);
+					break;
+				default:
+					absorb = false;
+				}
+
+				if (Pos != oldPos) {
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+					Parent->OnEvent(newEvent);
+				}
+				if (absorb)
+					return true;
+			}
+			break;
+		case EET_GUI_EVENT:
+			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED) {
+				if (event.GUIEvent.Caller == UpButton)
+					setPos(Pos - SmallStep);
+				else if (event.GUIEvent.Caller == DownButton)
+					setPos(Pos + SmallStep);
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+				Parent->OnEvent(newEvent);
+
+				return true;
+			} else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST) {
+				if (event.GUIEvent.Caller == this)
+					Dragging = false;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT: {
+			const core::position2di p(event.MouseInput.X, event.MouseInput.Y);
+			bool isInside = isPointInside(p);
+			switch (event.MouseInput.Event) {
+			case EMIE_MOUSE_WHEEL:
+				if (Environment->hasFocus(this)) {
+					// thanks to a bug report by REAPER
+					// thanks to tommi by tommi for another bugfix
+					// everybody needs a little thanking. hallo niko!;-)
+					setPos(getPos() +
+							((event.MouseInput.Wheel < 0 ? -1 : 1) * SmallStep * (Horizontal ? 1 : -1)));
+
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+					Parent->OnEvent(newEvent);
+					return true;
+				}
+				break;
+			case EMIE_LMOUSE_PRESSED_DOWN: {
+				if (isInside) {
+					Dragging = true;
+					DraggedBySlider = SliderRect.isPointInside(p);
+					TrayClick = !DraggedBySlider;
+					DesiredPos = getPosFromMousePos(p);
+					return true;
+				}
+				break;
+			}
+			case EMIE_LMOUSE_LEFT_UP:
+			case EMIE_MOUSE_MOVED: {
+				if (!event.MouseInput.isLeftPressed())
+					Dragging = false;
+
+				if (!Dragging) {
+					if (event.MouseInput.Event == EMIE_MOUSE_MOVED)
+						break;
+					return isInside;
+				}
+
+				if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
+					Dragging = false;
+
+				const s32 newPos = getPosFromMousePos(p);
+				const s32 oldPos = Pos;
+
+				if (!DraggedBySlider) {
+					if (isInside) {
+						DraggedBySlider = SliderRect.isPointInside(p);
+						TrayClick = !DraggedBySlider;
+					}
+
+					if (DraggedBySlider) {
+						setPos(newPos);
+					} else {
+						TrayClick = false;
+						if (event.MouseInput.Event == EMIE_MOUSE_MOVED)
+							return isInside;
+					}
+				}
+
+				if (DraggedBySlider) {
+					setPos(newPos);
+				} else {
+					DesiredPos = newPos;
+				}
+
+				if (Pos != oldPos && Parent) {
+					SEvent newEvent;
+					newEvent.EventType = EET_GUI_EVENT;
+					newEvent.GUIEvent.Caller = this;
+					newEvent.GUIEvent.Element = 0;
+					newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+					Parent->OnEvent(newEvent);
+				}
+				return isInside;
+			} break;
+
+			default:
+				break;
+			}
+		} break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+void CGUIScrollBar::OnPostRender(u32 timeMs)
+{
+	if (Dragging && !DraggedBySlider && TrayClick && timeMs > LastChange + 200) {
+		LastChange = timeMs;
+
+		const s32 oldPos = Pos;
+
+		if (DesiredPos >= Pos + LargeStep)
+			setPos(Pos + LargeStep);
+		else if (DesiredPos <= Pos - LargeStep)
+			setPos(Pos - LargeStep);
+		else if (DesiredPos >= Pos - LargeStep && DesiredPos <= Pos + LargeStep)
+			setPos(DesiredPos);
+
+		if (Pos != oldPos && Parent) {
+			SEvent newEvent;
+			newEvent.EventType = EET_GUI_EVENT;
+			newEvent.GUIEvent.Caller = this;
+			newEvent.GUIEvent.Element = 0;
+			newEvent.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+			Parent->OnEvent(newEvent);
+		}
+	}
+}
+
+//! draws the element and its children
+void CGUIScrollBar::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+
+	video::SColor iconColor = skin->getColor(isEnabled() ? EGDC_WINDOW_SYMBOL : EGDC_GRAY_WINDOW_SYMBOL);
+	if (iconColor != CurrentIconColor) {
+		refreshControls();
+	}
+
+	SliderRect = AbsoluteRect;
+
+	// draws the background
+	skin->draw2DRectangle(this, skin->getColor(EGDC_SCROLLBAR), SliderRect, &AbsoluteClippingRect);
+
+	if (core::isnotzero(range())) {
+		// recalculate slider rectangle
+		if (Horizontal) {
+			SliderRect.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X + DrawPos + RelativeRect.getHeight() - DrawHeight / 2;
+			SliderRect.LowerRightCorner.X = SliderRect.UpperLeftCorner.X + DrawHeight;
+		} else {
+			SliderRect.UpperLeftCorner.Y = AbsoluteRect.UpperLeftCorner.Y + DrawPos + RelativeRect.getWidth() - DrawHeight / 2;
+			SliderRect.LowerRightCorner.Y = SliderRect.UpperLeftCorner.Y + DrawHeight;
+		}
+
+		skin->draw3DButtonPaneStandard(this, SliderRect, &AbsoluteClippingRect);
+	}
+
+	// draw buttons
+	IGUIElement::draw();
+}
+
+void CGUIScrollBar::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+	// todo: properly resize
+	refreshControls();
+	setPos(Pos);
+}
+
+//!
+s32 CGUIScrollBar::getPosFromMousePos(const core::position2di &pos) const
+{
+	f32 w, p;
+	if (Horizontal) {
+		w = RelativeRect.getWidth() - f32(RelativeRect.getHeight()) * 3.0f;
+		p = pos.X - AbsoluteRect.UpperLeftCorner.X - RelativeRect.getHeight() * 1.5f;
+	} else {
+		w = RelativeRect.getHeight() - f32(RelativeRect.getWidth()) * 3.0f;
+		p = pos.Y - AbsoluteRect.UpperLeftCorner.Y - RelativeRect.getWidth() * 1.5f;
+	}
+	return (s32)(p / w * range()) + Min;
+}
+
+//! sets the position of the scrollbar
+void CGUIScrollBar::setPos(s32 pos)
+{
+	Pos = core::s32_clamp(pos, Min, Max);
+
+	if (core::isnotzero(range())) {
+		if (Horizontal) {
+			f32 f = (RelativeRect.getWidth() - ((f32)RelativeRect.getHeight() * 3.0f)) / range();
+			DrawPos = (s32)(((Pos - Min) * f) + ((f32)RelativeRect.getHeight() * 0.5f));
+			DrawHeight = RelativeRect.getHeight();
+		} else {
+			f32 f = (RelativeRect.getHeight() - ((f32)RelativeRect.getWidth() * 3.0f)) / range();
+
+			DrawPos = (s32)(((Pos - Min) * f) + ((f32)RelativeRect.getWidth() * 0.5f));
+			DrawHeight = RelativeRect.getWidth();
+		}
+	}
+}
+
+//! gets the small step value
+s32 CGUIScrollBar::getSmallStep() const
+{
+	return SmallStep;
+}
+
+//! sets the small step value
+void CGUIScrollBar::setSmallStep(s32 step)
+{
+	if (step > 0)
+		SmallStep = step;
+	else
+		SmallStep = 10;
+}
+
+//! gets the small step value
+s32 CGUIScrollBar::getLargeStep() const
+{
+	return LargeStep;
+}
+
+//! sets the small step value
+void CGUIScrollBar::setLargeStep(s32 step)
+{
+	if (step > 0)
+		LargeStep = step;
+	else
+		LargeStep = 50;
+}
+
+//! gets the maximum value of the scrollbar.
+s32 CGUIScrollBar::getMax() const
+{
+	return Max;
+}
+
+//! sets the maximum value of the scrollbar.
+void CGUIScrollBar::setMax(s32 max)
+{
+	Max = max;
+	if (Min > Max)
+		Min = Max;
+
+	bool enable = core::isnotzero(range());
+	UpButton->setEnabled(enable);
+	DownButton->setEnabled(enable);
+	setPos(Pos);
+}
+
+//! gets the minimum value of the scrollbar.
+s32 CGUIScrollBar::getMin() const
+{
+	return Min;
+}
+
+//! sets the minimum value of the scrollbar.
+void CGUIScrollBar::setMin(s32 min)
+{
+	Min = min;
+	if (Max < Min)
+		Max = Min;
+
+	bool enable = core::isnotzero(range());
+	UpButton->setEnabled(enable);
+	DownButton->setEnabled(enable);
+	setPos(Pos);
+}
+
+//! gets the current position of the scrollbar
+s32 CGUIScrollBar::getPos() const
+{
+	return Pos;
+}
+
+//! refreshes the position and text on child buttons
+void CGUIScrollBar::refreshControls()
+{
+	CurrentIconColor = video::SColor(255, 255, 255, 255);
+
+	IGUISkin *skin = Environment->getSkin();
+	IGUISpriteBank *sprites = 0;
+
+	if (skin) {
+		sprites = skin->getSpriteBank();
+		CurrentIconColor = skin->getColor(isEnabled() ? EGDC_WINDOW_SYMBOL : EGDC_GRAY_WINDOW_SYMBOL);
+	}
+
+	if (Horizontal) {
+		const s32 h = RelativeRect.getHeight();
+		const s32 w = (h < RelativeRect.getWidth() / 2) ? h : RelativeRect.getWidth() / 2;
+		if (!UpButton) {
+			UpButton = new CGUIButton(Environment, this, -1, core::rect<s32>(0, 0, w, h), NoClip);
+			UpButton->setSubElement(true);
+			UpButton->setTabStop(false);
+		}
+		if (sprites) {
+			UpButton->setSpriteBank(sprites);
+			UpButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_LEFT), CurrentIconColor);
+			UpButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_LEFT), CurrentIconColor);
+		}
+		UpButton->setRelativePosition(core::rect<s32>(0, 0, w, h));
+		UpButton->setAlignment(EGUIA_UPPERLEFT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+		if (!DownButton) {
+			DownButton = new CGUIButton(Environment, this, -1, core::rect<s32>(RelativeRect.getWidth() - w, 0, RelativeRect.getWidth(), h), NoClip);
+			DownButton->setSubElement(true);
+			DownButton->setTabStop(false);
+		}
+		if (sprites) {
+			DownButton->setSpriteBank(sprites);
+			DownButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_RIGHT), CurrentIconColor);
+			DownButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_RIGHT), CurrentIconColor);
+		}
+		DownButton->setRelativePosition(core::rect<s32>(RelativeRect.getWidth() - w, 0, RelativeRect.getWidth(), h));
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	} else {
+		const s32 w = RelativeRect.getWidth();
+		const s32 h = (w < RelativeRect.getHeight() / 2) ? w : RelativeRect.getHeight() / 2;
+		if (!UpButton) {
+			UpButton = new CGUIButton(Environment, this, -1, core::rect<s32>(0, 0, w, h), NoClip);
+			UpButton->setSubElement(true);
+			UpButton->setTabStop(false);
+		}
+		if (sprites) {
+			UpButton->setSpriteBank(sprites);
+			UpButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_UP), CurrentIconColor);
+			UpButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_UP), CurrentIconColor);
+		}
+		UpButton->setRelativePosition(core::rect<s32>(0, 0, w, h));
+		UpButton->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		if (!DownButton) {
+			DownButton = new CGUIButton(Environment, this, -1, core::rect<s32>(0, RelativeRect.getHeight() - h, w, RelativeRect.getHeight()), NoClip);
+			DownButton->setSubElement(true);
+			DownButton->setTabStop(false);
+		}
+		if (sprites) {
+			DownButton->setSpriteBank(sprites);
+			DownButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_DOWN), CurrentIconColor);
+			DownButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_DOWN), CurrentIconColor);
+		}
+		DownButton->setRelativePosition(core::rect<s32>(0, RelativeRect.getHeight() - h, w, RelativeRect.getHeight()));
+		DownButton->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
+	}
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIScrollBar.h b/irr/src/CGUIScrollBar.h
new file mode 100644
index 000000000..82c5c5c26
--- /dev/null
+++ b/irr/src/CGUIScrollBar.h
@@ -0,0 +1,95 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIScrollBar.h"
+#include "IGUIButton.h"
+
+namespace irr
+{
+namespace gui
+{
+
+class CGUIScrollBar : public IGUIScrollBar
+{
+public:
+	//! constructor
+	CGUIScrollBar(bool horizontal, IGUIEnvironment *environment,
+			IGUIElement *parent, s32 id, core::rect<s32> rectangle,
+			bool noclip = false);
+
+	//! destructor
+	virtual ~CGUIScrollBar();
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	void OnPostRender(u32 timeMs) override;
+
+	//! gets the maximum value of the scrollbar.
+	s32 getMax() const override;
+
+	//! sets the maximum value of the scrollbar.
+	void setMax(s32 max) override;
+
+	//! gets the minimum value of the scrollbar.
+	s32 getMin() const override;
+
+	//! sets the minimum value of the scrollbar.
+	void setMin(s32 min) override;
+
+	//! gets the small step value
+	s32 getSmallStep() const override;
+
+	//! sets the small step value
+	void setSmallStep(s32 step) override;
+
+	//! gets the large step value
+	s32 getLargeStep() const override;
+
+	//! sets the large step value
+	void setLargeStep(s32 step) override;
+
+	//! gets the current position of the scrollbar
+	s32 getPos() const override;
+
+	//! sets the position of the scrollbar
+	void setPos(s32 pos) override;
+
+	//! updates the rectangle
+	void updateAbsolutePosition() override;
+
+private:
+	void refreshControls();
+	s32 getPosFromMousePos(const core::position2di &p) const;
+
+	IGUIButton *UpButton;
+	IGUIButton *DownButton;
+
+	core::rect<s32> SliderRect;
+
+	bool Dragging;
+	bool Horizontal;
+	bool DraggedBySlider;
+	bool TrayClick;
+	s32 Pos;
+	s32 DrawPos;
+	s32 DrawHeight;
+	s32 Min;
+	s32 Max;
+	s32 SmallStep;
+	s32 LargeStep;
+	s32 DesiredPos;
+	u32 LastChange;
+	video::SColor CurrentIconColor;
+
+	f32 range() const { return (f32)(Max - Min); }
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUISkin.cpp b/irr/src/CGUISkin.cpp
new file mode 100644
index 000000000..84ceaeabf
--- /dev/null
+++ b/irr/src/CGUISkin.cpp
@@ -0,0 +1,891 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUISkin.h"
+
+#include "IGUIFont.h"
+#include "IGUISpriteBank.h"
+#include "IGUIElement.h"
+#include "IVideoDriver.h"
+#include "IAttributes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver *driver) :
+		SpriteBank(0), Driver(driver), Type(type)
+{
+#ifdef _DEBUG
+	setDebugName("CGUISkin");
+#endif
+
+	if ((Type == EGST_WINDOWS_CLASSIC) || (Type == EGST_WINDOWS_METALLIC)) {
+		Colors[EGDC_3D_DARK_SHADOW] = video::SColor(101, 50, 50, 50);
+		Colors[EGDC_3D_SHADOW] = video::SColor(101, 130, 130, 130);
+		Colors[EGDC_3D_FACE] = video::SColor(101, 210, 210, 210);
+		Colors[EGDC_3D_HIGH_LIGHT] = video::SColor(101, 255, 255, 255);
+		Colors[EGDC_3D_LIGHT] = video::SColor(101, 210, 210, 210);
+		Colors[EGDC_ACTIVE_BORDER] = video::SColor(101, 16, 14, 115);
+		Colors[EGDC_ACTIVE_CAPTION] = video::SColor(255, 255, 255, 255);
+		Colors[EGDC_APP_WORKSPACE] = video::SColor(101, 100, 100, 100);
+		Colors[EGDC_BUTTON_TEXT] = video::SColor(240, 10, 10, 10);
+		Colors[EGDC_GRAY_TEXT] = video::SColor(240, 130, 130, 130);
+		Colors[EGDC_HIGH_LIGHT] = video::SColor(101, 8, 36, 107);
+		Colors[EGDC_HIGH_LIGHT_TEXT] = video::SColor(240, 255, 255, 255);
+		Colors[EGDC_INACTIVE_BORDER] = video::SColor(101, 165, 165, 165);
+		Colors[EGDC_INACTIVE_CAPTION] = video::SColor(255, 30, 30, 30);
+		Colors[EGDC_TOOLTIP] = video::SColor(200, 0, 0, 0);
+		Colors[EGDC_TOOLTIP_BACKGROUND] = video::SColor(200, 255, 255, 225);
+		Colors[EGDC_SCROLLBAR] = video::SColor(101, 230, 230, 230);
+		Colors[EGDC_WINDOW] = video::SColor(101, 255, 255, 255);
+		Colors[EGDC_WINDOW_SYMBOL] = video::SColor(200, 10, 10, 10);
+		Colors[EGDC_ICON] = video::SColor(200, 255, 255, 255);
+		Colors[EGDC_ICON_HIGH_LIGHT] = video::SColor(200, 8, 36, 107);
+		Colors[EGDC_GRAY_WINDOW_SYMBOL] = video::SColor(240, 100, 100, 100);
+		Colors[EGDC_EDITABLE] = video::SColor(255, 255, 255, 255);
+		Colors[EGDC_GRAY_EDITABLE] = video::SColor(255, 120, 120, 120);
+		Colors[EGDC_FOCUSED_EDITABLE] = video::SColor(255, 240, 240, 255);
+
+		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
+		Sizes[EGDS_MENU_HEIGHT] = 30;
+		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
+		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
+		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
+		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
+		Sizes[EGDS_BUTTON_WIDTH] = 80;
+		Sizes[EGDS_BUTTON_HEIGHT] = 30;
+
+		Sizes[EGDS_TEXT_DISTANCE_X] = 2;
+		Sizes[EGDS_TEXT_DISTANCE_Y] = 0;
+
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 2;
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 0;
+	} else {
+		// 0x80a6a8af
+		Colors[EGDC_3D_DARK_SHADOW] = 0x60767982;
+		// Colors[EGDC_3D_FACE]			=	0xc0c9ccd4;		// tab background
+		Colors[EGDC_3D_FACE] = 0xc0cbd2d9;   // tab background
+		Colors[EGDC_3D_SHADOW] = 0x50e4e8f1; // tab background, and left-top highlight
+		Colors[EGDC_3D_HIGH_LIGHT] = 0x40c7ccdc;
+		Colors[EGDC_3D_LIGHT] = 0x802e313a;
+		Colors[EGDC_ACTIVE_BORDER] = 0x80404040; // window title
+		Colors[EGDC_ACTIVE_CAPTION] = 0xffd0d0d0;
+		Colors[EGDC_APP_WORKSPACE] = 0xc0646464; // unused
+		Colors[EGDC_BUTTON_TEXT] = 0xd0161616;
+		Colors[EGDC_GRAY_TEXT] = 0x3c141414;
+		Colors[EGDC_HIGH_LIGHT] = 0x6c606060;
+		Colors[EGDC_HIGH_LIGHT_TEXT] = 0xd0e0e0e0;
+		Colors[EGDC_INACTIVE_BORDER] = 0xf0a5a5a5;
+		Colors[EGDC_INACTIVE_CAPTION] = 0xffd2d2d2;
+		Colors[EGDC_TOOLTIP] = 0xf00f2033;
+		Colors[EGDC_TOOLTIP_BACKGROUND] = 0xc0cbd2d9;
+		Colors[EGDC_SCROLLBAR] = 0xf0e0e0e0;
+		Colors[EGDC_WINDOW] = 0xf0f0f0f0;
+		Colors[EGDC_WINDOW_SYMBOL] = 0xd0161616;
+		Colors[EGDC_ICON] = 0xd0161616;
+		Colors[EGDC_ICON_HIGH_LIGHT] = 0xd0606060;
+		Colors[EGDC_GRAY_WINDOW_SYMBOL] = 0x3c101010;
+		Colors[EGDC_EDITABLE] = 0xf0ffffff;
+		Colors[EGDC_GRAY_EDITABLE] = 0xf0cccccc;
+		Colors[EGDC_FOCUSED_EDITABLE] = 0xf0fffff0;
+
+		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
+		Sizes[EGDS_MENU_HEIGHT] = 48;
+		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
+		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
+		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
+		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
+		Sizes[EGDS_BUTTON_WIDTH] = 80;
+		Sizes[EGDS_BUTTON_HEIGHT] = 30;
+
+		Sizes[EGDS_TEXT_DISTANCE_X] = 3;
+		Sizes[EGDS_TEXT_DISTANCE_Y] = 2;
+
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 3;
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 2;
+	}
+
+	Sizes[EGDS_MESSAGE_BOX_GAP_SPACE] = 15;
+	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH] = 0;
+	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH] = 500;
+	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT] = 0;
+	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT] = 99999;
+
+	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X] = 1;
+	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y] = 1;
+	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_X] = 0;
+	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y] = 2;
+	Sizes[EGDS_BUTTON_PRESSED_SPRITE_OFFSET_X] = 0;
+	Sizes[EGDS_BUTTON_PRESSED_SPRITE_OFFSET_Y] = 0;
+
+	Texts[EGDT_MSG_BOX_OK] = L"OK";
+	Texts[EGDT_MSG_BOX_CANCEL] = L"Cancel";
+	Texts[EGDT_MSG_BOX_YES] = L"Yes";
+	Texts[EGDT_MSG_BOX_NO] = L"No";
+	Texts[EGDT_WINDOW_CLOSE] = L"Close";
+	Texts[EGDT_WINDOW_RESTORE] = L"Restore";
+	Texts[EGDT_WINDOW_MINIMIZE] = L"Minimize";
+	Texts[EGDT_WINDOW_MAXIMIZE] = L"Maximize";
+
+	Icons[EGDI_WINDOW_MAXIMIZE] = 225;
+	Icons[EGDI_WINDOW_RESTORE] = 226;
+	Icons[EGDI_WINDOW_CLOSE] = 227;
+	Icons[EGDI_WINDOW_MINIMIZE] = 228;
+	Icons[EGDI_CURSOR_UP] = 229;
+	Icons[EGDI_CURSOR_DOWN] = 230;
+	Icons[EGDI_CURSOR_LEFT] = 231;
+	Icons[EGDI_CURSOR_RIGHT] = 232;
+	Icons[EGDI_MENU_MORE] = 232;
+	Icons[EGDI_CHECK_BOX_CHECKED] = 233;
+	Icons[EGDI_DROP_DOWN] = 234;
+	Icons[EGDI_SMALL_CURSOR_UP] = 235;
+	Icons[EGDI_SMALL_CURSOR_DOWN] = 236;
+	Icons[EGDI_RADIO_BUTTON_CHECKED] = 237;
+	Icons[EGDI_MORE_LEFT] = 238;
+	Icons[EGDI_MORE_RIGHT] = 239;
+	Icons[EGDI_MORE_UP] = 240;
+	Icons[EGDI_MORE_DOWN] = 241;
+	Icons[EGDI_WINDOW_RESIZE] = 242;
+	Icons[EGDI_EXPAND] = 243;
+	Icons[EGDI_COLLAPSE] = 244;
+
+	Icons[EGDI_FILE] = 245;
+	Icons[EGDI_DIRECTORY] = 246;
+
+	for (u32 i = 0; i < EGDF_COUNT; ++i)
+		Fonts[i] = 0;
+
+	UseGradient = (Type == EGST_WINDOWS_METALLIC) || (Type == EGST_BURNING_SKIN);
+}
+
+//! destructor
+CGUISkin::~CGUISkin()
+{
+	for (u32 i = 0; i < EGDF_COUNT; ++i) {
+		if (Fonts[i])
+			Fonts[i]->drop();
+	}
+
+	if (SpriteBank)
+		SpriteBank->drop();
+}
+
+//! returns default color
+video::SColor CGUISkin::getColor(EGUI_DEFAULT_COLOR color) const
+{
+	if ((u32)color < EGDC_COUNT)
+		return Colors[color];
+	else
+		return video::SColor();
+}
+
+//! sets a default color
+void CGUISkin::setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor)
+{
+	if ((u32)which < EGDC_COUNT)
+		Colors[which] = newColor;
+}
+
+//! returns size for the given size type
+s32 CGUISkin::getSize(EGUI_DEFAULT_SIZE size) const
+{
+	if ((u32)size < EGDS_COUNT)
+		return Sizes[size];
+	else
+		return 0;
+}
+
+//! sets a default size
+void CGUISkin::setSize(EGUI_DEFAULT_SIZE which, s32 size)
+{
+	if ((u32)which < EGDS_COUNT)
+		Sizes[which] = size;
+}
+
+//! returns the default font
+IGUIFont *CGUISkin::getFont(EGUI_DEFAULT_FONT which) const
+{
+	if (((u32)which < EGDF_COUNT) && Fonts[which])
+		return Fonts[which];
+	else
+		return Fonts[EGDF_DEFAULT];
+}
+
+//! sets a default font
+void CGUISkin::setFont(IGUIFont *font, EGUI_DEFAULT_FONT which)
+{
+	if ((u32)which >= EGDF_COUNT)
+		return;
+
+	if (font) {
+		font->grab();
+		if (Fonts[which])
+			Fonts[which]->drop();
+
+		Fonts[which] = font;
+	}
+}
+
+//! gets the sprite bank stored
+IGUISpriteBank *CGUISkin::getSpriteBank() const
+{
+	return SpriteBank;
+}
+
+//! set a new sprite bank or remove one by passing 0
+void CGUISkin::setSpriteBank(IGUISpriteBank *bank)
+{
+	if (bank)
+		bank->grab();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+
+	SpriteBank = bank;
+}
+
+//! Returns a default icon
+u32 CGUISkin::getIcon(EGUI_DEFAULT_ICON icon) const
+{
+	if ((u32)icon < EGDI_COUNT)
+		return Icons[icon];
+	else
+		return 0;
+}
+
+//! Sets a default icon
+void CGUISkin::setIcon(EGUI_DEFAULT_ICON icon, u32 index)
+{
+	if ((u32)icon < EGDI_COUNT)
+		Icons[icon] = index;
+}
+
+//! Returns a default text. For example for Message box button captions:
+//! "OK", "Cancel", "Yes", "No" and so on.
+const wchar_t *CGUISkin::getDefaultText(EGUI_DEFAULT_TEXT text) const
+{
+	if ((u32)text < EGDT_COUNT)
+		return Texts[text].c_str();
+	else
+		return Texts[0].c_str();
+}
+
+//! Sets a default text. For example for Message box button captions:
+//! "OK", "Cancel", "Yes", "No" and so on.
+void CGUISkin::setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t *newText)
+{
+	if ((u32)which < EGDT_COUNT)
+		Texts[which] = newText;
+}
+
+//! draws a standard 3d button pane
+/**	Used for drawing for example buttons in normal state.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param rect: Defining area where to draw.
+\param clip: Clip area.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly. */
+void CGUISkin::draw3DButtonPaneStandard(IGUIElement *element,
+		const core::rect<s32> &r,
+		const core::rect<s32> *clip)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> rect = r;
+
+	if (Type == EGST_BURNING_SKIN) {
+		rect.UpperLeftCorner.X -= 1;
+		rect.UpperLeftCorner.Y -= 1;
+		rect.LowerRightCorner.X += 1;
+		rect.LowerRightCorner.Y += 1;
+		draw3DSunkenPane(element,
+				getColor(EGDC_WINDOW).getInterpolated(0xFFFFFFFF, 0.9f), false, true, rect, clip);
+		return;
+	}
+
+	Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+
+	if (!UseGradient) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), rect, clip);
+	} else {
+		const video::SColor c1 = getColor(EGDC_3D_FACE);
+		const video::SColor c2 = c1.getInterpolated(getColor(EGDC_3D_DARK_SHADOW), 0.4f);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+
+//! draws a pressed 3d button pane
+/**	Used for drawing for example buttons in pressed state.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param rect: Defining area where to draw.
+\param clip: Clip area.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly. */
+void CGUISkin::draw3DButtonPanePressed(IGUIElement *element,
+		const core::rect<s32> &r,
+		const core::rect<s32> *clip)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> rect = r;
+	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+
+	if (!UseGradient) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), rect, clip);
+	} else {
+		const video::SColor c1 = getColor(EGDC_3D_FACE);
+		const video::SColor c2 = c1.getInterpolated(getColor(EGDC_3D_DARK_SHADOW), 0.4f);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+
+//! draws a sunken 3d pane
+/** Used for drawing the background of edit, combo or check boxes.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param bgcolor: Background color.
+\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+deep into the ground.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+void CGUISkin::draw3DSunkenPane(IGUIElement *element, video::SColor bgcolor,
+		bool flat, bool fillBackGround,
+		const core::rect<s32> &r,
+		const core::rect<s32> *clip)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> rect = r;
+
+	if (fillBackGround)
+		Driver->draw2DRectangle(bgcolor, rect, clip);
+
+	if (flat) {
+		// draw flat sunken pane
+
+		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip); // top
+
+		++rect.UpperLeftCorner.Y;
+		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip); // left
+
+		rect = r;
+		++rect.UpperLeftCorner.Y;
+		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip); // right
+
+		rect = r;
+		++rect.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip); // bottom
+	} else {
+		// draw deep sunken pane
+		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip); // top
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		++rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+		rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y + 1;
+		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip); // left
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		++rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+		rect = r;
+		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+		++rect.UpperLeftCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip); // right
+		--rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_LIGHT), rect, clip);
+
+		rect = r;
+		++rect.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip); // bottom
+		++rect.UpperLeftCorner.X;
+		--rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(getColor(EGDC_3D_LIGHT), rect, clip);
+	}
+}
+
+//! draws a window background
+// return where to draw title bar text.
+core::rect<s32> CGUISkin::draw3DWindowBackground(IGUIElement *element,
+		bool drawTitleBar, video::SColor titleBarColor,
+		const core::rect<s32> &r,
+		const core::rect<s32> *clip,
+		core::rect<s32> *checkClientArea)
+{
+	if (!Driver) {
+		if (checkClientArea) {
+			*checkClientArea = r;
+		}
+		return r;
+	}
+
+	core::rect<s32> rect = r;
+
+	// top border
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+	}
+
+	// left border
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+	}
+
+	// right border dark outer line
+	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+	}
+
+	// right border bright innner line
+	rect.UpperLeftCorner.X -= 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.Y -= 1;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+	}
+
+	// bottom border dark outer line
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+	}
+
+	// bottom border bright inner line
+	rect.UpperLeftCorner.X += 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	if (!checkClientArea) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+	}
+
+	// client area for background
+	rect = r;
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y -= 2;
+	if (checkClientArea) {
+		*checkClientArea = rect;
+	}
+
+	if (!checkClientArea) {
+		if (!UseGradient) {
+			Driver->draw2DRectangle(getColor(EGDC_3D_FACE), rect, clip);
+		} else if (Type == EGST_BURNING_SKIN) {
+			const video::SColor c1 = getColor(EGDC_WINDOW).getInterpolated(0xFFFFFFFF, 0.9f);
+			const video::SColor c2 = getColor(EGDC_WINDOW).getInterpolated(0xFFFFFFFF, 0.8f);
+
+			Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+		} else {
+			const video::SColor c2 = getColor(EGDC_3D_SHADOW);
+			const video::SColor c1 = getColor(EGDC_3D_FACE);
+			Driver->draw2DRectangle(rect, c1, c1, c1, c2, clip);
+		}
+	}
+
+	// title bar
+	rect = r;
+	rect.UpperLeftCorner.X += 2;
+	rect.UpperLeftCorner.Y += 2;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + getSize(EGDS_WINDOW_BUTTON_WIDTH) + 2;
+
+	if (drawTitleBar) {
+		if (checkClientArea) {
+			(*checkClientArea).UpperLeftCorner.Y = rect.LowerRightCorner.Y;
+		} else {
+			// draw title bar
+			// if (!UseGradient)
+			//	Driver->draw2DRectangle(titleBarColor, rect, clip);
+			// else
+			if (Type == EGST_BURNING_SKIN) {
+				const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(), 255, 255, 255), 0.8f);
+				Driver->draw2DRectangle(rect, titleBarColor, titleBarColor, c, c, clip);
+			} else {
+				const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(), 0, 0, 0), 0.2f);
+				Driver->draw2DRectangle(rect, titleBarColor, c, titleBarColor, c, clip);
+			}
+		}
+	}
+
+	return rect;
+}
+
+//! draws a standard 3d menu pane
+/**	Used for drawing for menus and context menus.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+void CGUISkin::draw3DMenuPane(IGUIElement *element,
+		const core::rect<s32> &r, const core::rect<s32> *clip)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> rect = r;
+
+	if (Type == EGST_BURNING_SKIN) {
+		rect.UpperLeftCorner.Y -= 3;
+		draw3DButtonPaneStandard(element, rect, clip);
+		return;
+	}
+
+	// in this skin, this is exactly what non pressed buttons look like,
+	// so we could simply call
+	// draw3DButtonPaneStandard(element, rect, clip);
+	// here.
+	// but if the skin is transparent, this doesn't look that nice. So
+	// We draw it a little bit better, with some more draw2DRectangle calls,
+	// but there aren't that much menus visible anyway.
+
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), rect, clip);
+
+	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+	rect.UpperLeftCorner.X -= 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+
+	rect = r;
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y -= 2;
+
+	if (!UseGradient)
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), rect, clip);
+	else {
+		const video::SColor c1 = getColor(EGDC_3D_FACE);
+		const video::SColor c2 = getColor(EGDC_3D_SHADOW);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+
+//! draws a standard 3d tool bar
+/**	Used for drawing for toolbars and menus.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+void CGUISkin::draw3DToolBar(IGUIElement *element,
+		const core::rect<s32> &r,
+		const core::rect<s32> *clip)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> rect = r;
+
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), rect, clip);
+
+	rect = r;
+	rect.LowerRightCorner.Y -= 1;
+
+	if (!UseGradient) {
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), rect, clip);
+	} else if (Type == EGST_BURNING_SKIN) {
+		const video::SColor c1 = 0xF0000000 | getColor(EGDC_3D_FACE).color;
+		const video::SColor c2 = 0xF0000000 | getColor(EGDC_3D_SHADOW).color;
+
+		rect.LowerRightCorner.Y += 1;
+		Driver->draw2DRectangle(rect, c1, c2, c1, c2, clip);
+	} else {
+		const video::SColor c1 = getColor(EGDC_3D_FACE);
+		const video::SColor c2 = getColor(EGDC_3D_SHADOW);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+
+//! draws a tab button
+/**	Used for drawing for tab buttons on top of tabs.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param active: Specifies if the tab is currently active.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+void CGUISkin::draw3DTabButton(IGUIElement *element, bool active,
+		const core::rect<s32> &frameRect, const core::rect<s32> *clip, EGUI_ALIGNMENT alignment)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> tr = frameRect;
+
+	if (alignment == EGUIA_UPPERLEFT) {
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		tr.LowerRightCorner.X -= 2;
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
+
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), tr, clip);
+	} else {
+		tr.LowerRightCorner.X -= 2;
+		tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y -= 1;
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
+
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		// tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(getColor(EGDC_3D_DARK_SHADOW), tr, clip);
+	}
+}
+
+//! draws a tab control body
+/**	\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param border: Specifies if the border should be drawn.
+\param background: Specifies if the background should be drawn.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+void CGUISkin::draw3DTabBody(IGUIElement *element, bool border, bool background,
+		const core::rect<s32> &rect, const core::rect<s32> *clip, s32 tabHeight, EGUI_ALIGNMENT alignment)
+{
+	if (!Driver)
+		return;
+
+	core::rect<s32> tr = rect;
+
+	if (tabHeight == -1)
+		tabHeight = getSize(gui::EGDS_BUTTON_HEIGHT);
+
+	// draw border.
+	if (border) {
+		if (alignment == EGUIA_UPPERLEFT) {
+			// draw left hightlight
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+			// draw lower shadow
+			tr = rect;
+			tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+		} else {
+			// draw left hightlight
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_SHADOW), tr, clip);
+
+			// draw lower shadow
+			tr = rect;
+			tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+			Driver->draw2DRectangle(getColor(EGDC_3D_HIGH_LIGHT), tr, clip);
+		}
+	}
+
+	if (background) {
+		if (alignment == EGUIA_UPPERLEFT) {
+			tr = rect;
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X -= 1;
+			tr.UpperLeftCorner.X += 1;
+			tr.LowerRightCorner.Y -= 1;
+		} else {
+			tr = rect;
+			tr.UpperLeftCorner.X += 1;
+			tr.UpperLeftCorner.Y -= 1;
+			tr.LowerRightCorner.X -= 1;
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			// tr.UpperLeftCorner.X += 1;
+		}
+
+		if (!UseGradient)
+			Driver->draw2DRectangle(getColor(EGDC_3D_FACE), tr, clip);
+		else {
+			video::SColor c1 = getColor(EGDC_3D_FACE);
+			video::SColor c2 = getColor(EGDC_3D_SHADOW);
+			Driver->draw2DRectangle(tr, c1, c1, c2, c2, clip);
+		}
+	}
+}
+
+//! draws an icon, usually from the skin's sprite bank
+/**	\param parent: Pointer to the element which wishes to draw this icon.
+This parameter is usually not used by IGUISkin, but can be used for example
+by more complex implementations to find out how to draw the part exactly.
+\param icon: Specifies the icon to be drawn.
+\param position: The position to draw the icon
+\param starttime: The time at the start of the animation
+\param currenttime: The present time, used to calculate the frame number
+\param loop: Whether the animation should loop or not
+\param clip: Clip area.	*/
+void CGUISkin::drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon,
+		const core::position2di position,
+		u32 starttime, u32 currenttime,
+		bool loop, const core::rect<s32> *clip)
+{
+	if (!SpriteBank)
+		return;
+
+	bool gray = element && !element->isEnabled();
+	SpriteBank->draw2DSprite(Icons[icon], position, clip,
+			Colors[gray ? EGDC_GRAY_WINDOW_SYMBOL : EGDC_WINDOW_SYMBOL], starttime, currenttime, loop, true);
+}
+
+EGUI_SKIN_TYPE CGUISkin::getType() const
+{
+	return Type;
+}
+
+//! draws a 2d rectangle.
+void CGUISkin::draw2DRectangle(IGUIElement *element,
+		const video::SColor &color, const core::rect<s32> &pos,
+		const core::rect<s32> *clip)
+{
+	Driver->draw2DRectangle(color, pos, clip);
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUISkin.h b/irr/src/CGUISkin.h
new file mode 100644
index 000000000..68eae1c73
--- /dev/null
+++ b/irr/src/CGUISkin.h
@@ -0,0 +1,233 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUISkin.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace video
+{
+class IVideoDriver;
+}
+namespace gui
+{
+
+class CGUISkin : public IGUISkin
+{
+public:
+	CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver *driver);
+
+	//! destructor
+	virtual ~CGUISkin();
+
+	//! returns display density scaling factor
+	virtual float getScale() const override { return Scale; }
+
+	//! sets display density scaling factor
+	virtual void setScale(float scale) override { Scale = scale; }
+
+	//! returns default color
+	video::SColor getColor(EGUI_DEFAULT_COLOR color) const override;
+
+	//! sets a default color
+	void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor) override;
+
+	//! returns size for the given size type
+	s32 getSize(EGUI_DEFAULT_SIZE size) const override;
+
+	//! sets a default size
+	void setSize(EGUI_DEFAULT_SIZE which, s32 size) override;
+
+	//! returns the default font
+	IGUIFont *getFont(EGUI_DEFAULT_FONT which = EGDF_DEFAULT) const override;
+
+	//! sets a default font
+	void setFont(IGUIFont *font, EGUI_DEFAULT_FONT which = EGDF_DEFAULT) override;
+
+	//! sets the sprite bank used for drawing icons
+	void setSpriteBank(IGUISpriteBank *bank) override;
+
+	//! gets the sprite bank used for drawing icons
+	IGUISpriteBank *getSpriteBank() const override;
+
+	//! Returns a default icon
+	/** Returns the sprite index within the sprite bank */
+	u32 getIcon(EGUI_DEFAULT_ICON icon) const override;
+
+	//! Sets a default icon
+	/** Sets the sprite index used for drawing icons like arrows,
+	close buttons and ticks in checkboxes
+	\param icon: Enum specifying which icon to change
+	\param index: The sprite index used to draw this icon */
+	void setIcon(EGUI_DEFAULT_ICON icon, u32 index) override;
+
+	//! Returns a default text.
+	/** For example for Message box button captions:
+	"OK", "Cancel", "Yes", "No" and so on. */
+	const wchar_t *getDefaultText(EGUI_DEFAULT_TEXT text) const override;
+
+	//! Sets a default text.
+	/** For example for Message box button captions:
+	"OK", "Cancel", "Yes", "No" and so on. */
+	void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t *newText) override;
+
+	//! draws a standard 3d button pane
+	/** Used for drawing for example buttons in normal state.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly. */
+	virtual void draw3DButtonPaneStandard(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) override;
+
+	//! draws a pressed 3d button pane
+	/** Used for drawing for example buttons in pressed state.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly. */
+	virtual void draw3DButtonPanePressed(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) override;
+
+	//! draws a sunken 3d pane
+	/** Used for drawing the background of edit, combo or check boxes.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param bgcolor: Background color.
+	\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+	deep into the ground.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.	*/
+	virtual void draw3DSunkenPane(IGUIElement *element,
+			video::SColor bgcolor, bool flat,
+			bool fillBackGround,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) override;
+
+	//! draws a window background
+	/** Used for drawing the background of dialogs and windows.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param titleBarColor: Title color.
+	\param drawTitleBar: True to enable title drawing.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.
+	\param checkClientArea: When set to non-null the function will not draw anything,
+	but will instead return the clientArea which can be used for drawing by the calling window.
+	That is the area without borders and without titlebar.
+	\return Returns rect where it would be good to draw title bar text. This will
+	work even when checkClientArea is set to a non-null value.*/
+	virtual core::rect<s32> draw3DWindowBackground(IGUIElement *element,
+			bool drawTitleBar, video::SColor titleBarColor,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip,
+			core::rect<s32> *checkClientArea) override;
+
+	//! draws a standard 3d menu pane
+	/** Used for drawing for menus and context menus.
+	It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+	EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.	*/
+	virtual void draw3DMenuPane(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) override;
+
+	//! draws a standard 3d tool bar
+	/** Used for drawing for toolbars and menus.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.	*/
+	virtual void draw3DToolBar(IGUIElement *element,
+			const core::rect<s32> &rect,
+			const core::rect<s32> *clip = 0) override;
+
+	//! draws a tab button
+	/** Used for drawing for tab buttons on top of tabs.
+	\param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param active: Specifies if the tab is currently active.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.	*/
+	virtual void draw3DTabButton(IGUIElement *element, bool active,
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0,
+			EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override;
+
+	//! draws a tab control body
+	/** \param element: Pointer to the element which wishes to draw this. This parameter
+	is usually not used by ISkin, but can be used for example by more complex
+	implementations to find out how to draw the part exactly.
+	\param border: Specifies if the border should be drawn.
+	\param background: Specifies if the background should be drawn.
+	\param rect: Defining area where to draw.
+	\param clip: Clip area.	*/
+	virtual void draw3DTabBody(IGUIElement *element, bool border, bool background,
+			const core::rect<s32> &rect, const core::rect<s32> *clip = 0, s32 tabHeight = -1,
+			EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override;
+
+	//! draws an icon, usually from the skin's sprite bank
+	/** \param element: Pointer to the element which wishes to draw this icon.
+	This parameter is usually not used by IGUISkin, but can be used for example
+	by more complex implementations to find out how to draw the part exactly.
+	\param icon: Specifies the icon to be drawn.
+	\param position: The position to draw the icon
+	\param starttime: The time at the start of the animation
+	\param currenttime: The present time, used to calculate the frame number
+	\param loop: Whether the animation should loop or not
+	\param clip: Clip area.	*/
+	virtual void drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon,
+			const core::position2di position,
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = false, const core::rect<s32> *clip = 0) override;
+
+	//! draws a 2d rectangle.
+	/** \param element: Pointer to the element which wishes to draw this icon.
+	This parameter is usually not used by IGUISkin, but can be used for example
+	by more complex implementations to find out how to draw the part exactly.
+	\param color: Color of the rectangle to draw. The alpha component specifies how
+	transparent the rectangle will be.
+	\param pos: Position of the rectangle.
+	\param clip: Pointer to rectangle against which the rectangle will be clipped.
+	If the pointer is null, no clipping will be performed. */
+	virtual void draw2DRectangle(IGUIElement *element, const video::SColor &color,
+			const core::rect<s32> &pos, const core::rect<s32> *clip = 0) override;
+
+	//! get the type of this skin
+	EGUI_SKIN_TYPE getType() const override;
+
+private:
+	float Scale = 1.0f;
+	video::SColor Colors[EGDC_COUNT];
+	s32 Sizes[EGDS_COUNT];
+	u32 Icons[EGDI_COUNT];
+	IGUIFont *Fonts[EGDF_COUNT];
+	IGUISpriteBank *SpriteBank;
+	core::stringw Texts[EGDT_COUNT];
+	video::IVideoDriver *Driver;
+	bool UseGradient;
+
+	EGUI_SKIN_TYPE Type;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUISpriteBank.cpp b/irr/src/CGUISpriteBank.cpp
new file mode 100644
index 000000000..fe0c087b8
--- /dev/null
+++ b/irr/src/CGUISpriteBank.cpp
@@ -0,0 +1,246 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUISpriteBank.h"
+
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "ITexture.h"
+
+namespace irr
+{
+namespace gui
+{
+
+CGUISpriteBank::CGUISpriteBank(IGUIEnvironment *env) :
+		Environment(env), Driver(0)
+{
+#ifdef _DEBUG
+	setDebugName("CGUISpriteBank");
+#endif
+
+	if (Environment) {
+		Driver = Environment->getVideoDriver();
+		if (Driver)
+			Driver->grab();
+	}
+}
+
+CGUISpriteBank::~CGUISpriteBank()
+{
+	clear();
+
+	// drop video driver
+	if (Driver)
+		Driver->drop();
+}
+
+core::array<core::rect<s32>> &CGUISpriteBank::getPositions()
+{
+	return Rectangles;
+}
+
+core::array<SGUISprite> &CGUISpriteBank::getSprites()
+{
+	return Sprites;
+}
+
+u32 CGUISpriteBank::getTextureCount() const
+{
+	return Textures.size();
+}
+
+video::ITexture *CGUISpriteBank::getTexture(u32 index) const
+{
+	if (index < Textures.size())
+		return Textures[index];
+	else
+		return 0;
+}
+
+void CGUISpriteBank::addTexture(video::ITexture *texture)
+{
+	if (texture)
+		texture->grab();
+
+	Textures.push_back(texture);
+}
+
+void CGUISpriteBank::setTexture(u32 index, video::ITexture *texture)
+{
+	while (index >= Textures.size())
+		Textures.push_back(0);
+
+	if (texture)
+		texture->grab();
+
+	if (Textures[index])
+		Textures[index]->drop();
+
+	Textures[index] = texture;
+}
+
+//! clear everything
+void CGUISpriteBank::clear()
+{
+	// drop textures
+	for (u32 i = 0; i < Textures.size(); ++i) {
+		if (Textures[i])
+			Textures[i]->drop();
+	}
+	Textures.clear();
+	Sprites.clear();
+	Rectangles.clear();
+}
+
+//! Add the texture and use it for a single non-animated sprite.
+s32 CGUISpriteBank::addTextureAsSprite(video::ITexture *texture)
+{
+	if (!texture)
+		return -1;
+
+	addTexture(texture);
+	u32 textureIndex = getTextureCount() - 1;
+
+	u32 rectangleIndex = Rectangles.size();
+	Rectangles.push_back(core::rect<s32>(0, 0, texture->getOriginalSize().Width, texture->getOriginalSize().Height));
+
+	SGUISprite sprite;
+	sprite.frameTime = 0;
+
+	SGUISpriteFrame frame;
+	frame.textureNumber = textureIndex;
+	frame.rectNumber = rectangleIndex;
+	sprite.Frames.push_back(frame);
+
+	Sprites.push_back(sprite);
+
+	return Sprites.size() - 1;
+}
+
+// get FrameNr for time. return true on exisiting frame
+inline bool CGUISpriteBank::getFrameNr(u32 &frame, u32 index, u32 time, bool loop) const
+{
+	frame = 0;
+	if (index >= Sprites.size())
+		return false;
+
+	const SGUISprite &sprite = Sprites[index];
+	const u32 frameSize = sprite.Frames.size();
+	if (frameSize < 1)
+		return false;
+
+	if (sprite.frameTime) {
+		u32 f = (time / sprite.frameTime);
+		if (loop)
+			frame = f % frameSize;
+		else
+			frame = (f >= frameSize) ? frameSize - 1 : f;
+	}
+	return true;
+}
+
+//! draws a sprite in 2d with scale and color
+void CGUISpriteBank::draw2DSprite(u32 index, const core::position2di &pos,
+		const core::rect<s32> *clip, const video::SColor &color,
+		u32 starttime, u32 currenttime, bool loop, bool center)
+{
+	u32 frame = 0;
+	if (!getFrameNr(frame, index, currenttime - starttime, loop))
+		return;
+
+	const video::ITexture *tex = getTexture(Sprites[index].Frames[frame].textureNumber);
+	if (!tex)
+		return;
+
+	const u32 rn = Sprites[index].Frames[frame].rectNumber;
+	if (rn >= Rectangles.size())
+		return;
+
+	const core::rect<s32> &r = Rectangles[rn];
+	core::position2di p(pos);
+	if (center) {
+		p -= r.getSize() / 2;
+	}
+	Driver->draw2DImage(tex, p, r, clip, color, true);
+}
+
+void CGUISpriteBank::draw2DSprite(u32 index, const core::rect<s32> &destRect,
+		const core::rect<s32> *clip, const video::SColor *const colors,
+		u32 timeTicks, bool loop)
+{
+	u32 frame = 0;
+	if (!getFrameNr(frame, index, timeTicks, loop))
+		return;
+
+	const video::ITexture *tex = getTexture(Sprites[index].Frames[frame].textureNumber);
+	if (!tex)
+		return;
+
+	const u32 rn = Sprites[index].Frames[frame].rectNumber;
+	if (rn >= Rectangles.size())
+		return;
+
+	Driver->draw2DImage(tex, destRect, Rectangles[rn], clip, colors, true);
+}
+
+void CGUISpriteBank::draw2DSpriteBatch(const core::array<u32> &indices,
+		const core::array<core::position2di> &pos,
+		const core::rect<s32> *clip,
+		const video::SColor &color,
+		u32 starttime, u32 currenttime,
+		bool loop, bool center)
+{
+	const irr::u32 drawCount = core::min_<u32>(indices.size(), pos.size());
+
+	if (!getTextureCount())
+		return;
+	core::array<SDrawBatch> drawBatches(getTextureCount());
+	for (u32 i = 0; i < Textures.size(); ++i) {
+		drawBatches.push_back(SDrawBatch());
+		drawBatches[i].positions.reallocate(drawCount);
+		drawBatches[i].sourceRects.reallocate(drawCount);
+	}
+
+	for (u32 i = 0; i < drawCount; ++i) {
+		const u32 index = indices[i];
+
+		// work out frame number
+		u32 frame = 0;
+		if (!getFrameNr(frame, index, currenttime - starttime, loop))
+			return;
+
+		const u32 texNum = Sprites[index].Frames[frame].textureNumber;
+		if (texNum >= drawBatches.size()) {
+			continue;
+		}
+		SDrawBatch &currentBatch = drawBatches[texNum];
+
+		const u32 rn = Sprites[index].Frames[frame].rectNumber;
+		if (rn >= Rectangles.size())
+			return;
+
+		const core::rect<s32> &r = Rectangles[rn];
+
+		if (center) {
+			core::position2di p = pos[i];
+			p -= r.getSize() / 2;
+
+			currentBatch.positions.push_back(p);
+			currentBatch.sourceRects.push_back(r);
+		} else {
+			currentBatch.positions.push_back(pos[i]);
+			currentBatch.sourceRects.push_back(r);
+		}
+	}
+
+	for (u32 i = 0; i < drawBatches.size(); i++) {
+		if (!drawBatches[i].positions.empty() && !drawBatches[i].sourceRects.empty())
+			Driver->draw2DImageBatch(getTexture(i), drawBatches[i].positions,
+					drawBatches[i].sourceRects, clip, color, true);
+	}
+}
+
+} // namespace gui
+} // namespace irr
diff --git a/irr/src/CGUISpriteBank.h b/irr/src/CGUISpriteBank.h
new file mode 100644
index 000000000..f46ca8b15
--- /dev/null
+++ b/irr/src/CGUISpriteBank.h
@@ -0,0 +1,81 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUISpriteBank.h"
+
+namespace irr
+{
+
+namespace video
+{
+class IVideoDriver;
+class ITexture;
+}
+
+namespace gui
+{
+
+class IGUIEnvironment;
+
+//! Sprite bank interface.
+class CGUISpriteBank : public IGUISpriteBank
+{
+public:
+	CGUISpriteBank(IGUIEnvironment *env);
+	virtual ~CGUISpriteBank();
+
+	core::array<core::rect<s32>> &getPositions() override;
+	core::array<SGUISprite> &getSprites() override;
+
+	u32 getTextureCount() const override;
+	video::ITexture *getTexture(u32 index) const override;
+	void addTexture(video::ITexture *texture) override;
+	void setTexture(u32 index, video::ITexture *texture) override;
+
+	//! Add the texture and use it for a single non-animated sprite.
+	s32 addTextureAsSprite(video::ITexture *texture) override;
+
+	//! clears sprites, rectangles and textures
+	void clear() override;
+
+	//! Draws a sprite in 2d with position and color
+	virtual void draw2DSprite(u32 index, const core::position2di &pos, const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0, bool loop = true, bool center = false) override;
+
+	//! Draws a sprite in 2d with destination rectangle and colors
+	virtual void draw2DSprite(u32 index, const core::rect<s32> &destRect,
+			const core::rect<s32> *clip = 0,
+			const video::SColor *const colors = 0,
+			u32 timeTicks = 0,
+			bool loop = true) override;
+
+	//! Draws a sprite batch in 2d using an array of positions and a color
+	virtual void draw2DSpriteBatch(const core::array<u32> &indices, const core::array<core::position2di> &pos,
+			const core::rect<s32> *clip = 0,
+			const video::SColor &color = video::SColor(255, 255, 255, 255),
+			u32 starttime = 0, u32 currenttime = 0,
+			bool loop = true, bool center = false) override;
+
+protected:
+	bool getFrameNr(u32 &frameNr, u32 index, u32 time, bool loop) const;
+
+	struct SDrawBatch
+	{
+		core::array<core::position2di> positions;
+		core::array<core::recti> sourceRects;
+		u32 textureNumber;
+	};
+
+	core::array<SGUISprite> Sprites;
+	core::array<core::rect<s32>> Rectangles;
+	core::array<video::ITexture *> Textures;
+	IGUIEnvironment *Environment;
+	video::IVideoDriver *Driver;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIStaticText.cpp b/irr/src/CGUIStaticText.cpp
new file mode 100644
index 000000000..035847583
--- /dev/null
+++ b/irr/src/CGUIStaticText.cpp
@@ -0,0 +1,511 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIStaticText.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IGUIFont.h"
+#include "IVideoDriver.h"
+#include "rect.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIStaticText::CGUIStaticText(const wchar_t *text, bool border,
+		IGUIEnvironment *environment, IGUIElement *parent,
+		s32 id, const core::rect<s32> &rectangle,
+		bool background) :
+		IGUIStaticText(environment, parent, id, rectangle),
+		HAlign(EGUIA_UPPERLEFT), VAlign(EGUIA_UPPERLEFT),
+		Border(border), OverrideColorEnabled(false), OverrideBGColorEnabled(false), WordWrap(false), Background(background),
+		RestrainTextInside(true), RightToLeft(false),
+		OverrideColor(video::SColor(101, 255, 255, 255)), BGColor(video::SColor(101, 210, 210, 210)),
+		OverrideFont(0), LastBreakFont(0)
+{
+#ifdef _DEBUG
+	setDebugName("CGUIStaticText");
+#endif
+
+	Text = text;
+	if (environment && environment->getSkin()) {
+		BGColor = environment->getSkin()->getColor(gui::EGDC_3D_FACE);
+	}
+}
+
+//! destructor
+CGUIStaticText::~CGUIStaticText()
+{
+	if (OverrideFont)
+		OverrideFont->drop();
+}
+
+//! draws the element and its children
+void CGUIStaticText::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// draw background
+
+	if (Background) {
+		if (!OverrideBGColorEnabled) // skin-colors can change
+			BGColor = skin->getColor(gui::EGDC_3D_FACE);
+
+		driver->draw2DRectangle(BGColor, frameRect, &AbsoluteClippingRect);
+	}
+
+	// draw the border
+
+	if (Border) {
+		skin->draw3DSunkenPane(this, 0, true, false, frameRect, &AbsoluteClippingRect);
+		frameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X);
+	}
+
+	// draw the text
+	if (Text.size()) {
+		IGUIFont *font = getActiveFont();
+
+		if (font) {
+			if (!WordWrap) {
+				if (VAlign == EGUIA_LOWERRIGHT) {
+					frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y -
+												  font->getDimension(L"A").Height - font->getKerningHeight();
+				}
+				if (HAlign == EGUIA_LOWERRIGHT) {
+					frameRect.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
+												  font->getDimension(Text.c_str()).Width;
+				}
+
+				font->draw(Text.c_str(), frameRect,
+						getActiveColor(),
+						HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
+			} else {
+				if (font != LastBreakFont)
+					breakText();
+
+				core::rect<s32> r = frameRect;
+				s32 height = font->getDimension(L"A").Height + font->getKerningHeight();
+				s32 totalHeight = height * BrokenText.size();
+				if (VAlign == EGUIA_CENTER) {
+					r.UpperLeftCorner.Y = r.getCenter().Y - (totalHeight / 2);
+				} else if (VAlign == EGUIA_LOWERRIGHT) {
+					r.UpperLeftCorner.Y = r.LowerRightCorner.Y - totalHeight;
+				}
+
+				for (u32 i = 0; i < BrokenText.size(); ++i) {
+					if (HAlign == EGUIA_LOWERRIGHT) {
+						r.UpperLeftCorner.X = frameRect.LowerRightCorner.X -
+											  font->getDimension(BrokenText[i].c_str()).Width;
+					}
+
+					font->draw(BrokenText[i].c_str(), r,
+							getActiveColor(),
+							HAlign == EGUIA_CENTER, false, (RestrainTextInside ? &AbsoluteClippingRect : NULL));
+
+					r.LowerRightCorner.Y += height;
+					r.UpperLeftCorner.Y += height;
+				}
+			}
+		}
+	}
+
+	IGUIElement::draw();
+}
+
+//! Sets another skin independent font.
+void CGUIStaticText::setOverrideFont(IGUIFont *font)
+{
+	if (OverrideFont == font)
+		return;
+
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	OverrideFont = font;
+
+	if (OverrideFont)
+		OverrideFont->grab();
+
+	breakText();
+}
+
+//! Gets the override font (if any)
+IGUIFont *CGUIStaticText::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont *CGUIStaticText::getActiveFont() const
+{
+	if (OverrideFont)
+		return OverrideFont;
+	IGUISkin *skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont();
+	return 0;
+}
+
+//! Sets another color for the text.
+void CGUIStaticText::setOverrideColor(video::SColor color)
+{
+	OverrideColor = color;
+	OverrideColorEnabled = true;
+}
+
+//! Sets another color for the text.
+void CGUIStaticText::setBackgroundColor(video::SColor color)
+{
+	BGColor = color;
+	OverrideBGColorEnabled = true;
+	Background = true;
+}
+
+//! Sets whether to draw the background
+void CGUIStaticText::setDrawBackground(bool draw)
+{
+	Background = draw;
+}
+
+//! Gets the background color
+video::SColor CGUIStaticText::getBackgroundColor() const
+{
+	return BGColor;
+}
+
+//! Checks if background drawing is enabled
+bool CGUIStaticText::isDrawBackgroundEnabled() const
+{
+	return Background;
+}
+
+//! Sets whether to draw the border
+void CGUIStaticText::setDrawBorder(bool draw)
+{
+	Border = draw;
+}
+
+//! Checks if border drawing is enabled
+bool CGUIStaticText::isDrawBorderEnabled() const
+{
+	return Border;
+}
+
+void CGUIStaticText::setTextRestrainedInside(bool restrainTextInside)
+{
+	RestrainTextInside = restrainTextInside;
+}
+
+bool CGUIStaticText::isTextRestrainedInside() const
+{
+	return RestrainTextInside;
+}
+
+void CGUIStaticText::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical)
+{
+	HAlign = horizontal;
+	VAlign = vertical;
+}
+
+video::SColor CGUIStaticText::getOverrideColor() const
+{
+	return OverrideColor;
+}
+
+irr::video::SColor CGUIStaticText::getActiveColor() const
+{
+	if (OverrideColorEnabled)
+		return OverrideColor;
+	IGUISkin *skin = Environment->getSkin();
+	if (skin)
+		return OverrideColorEnabled ? OverrideColor : skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT);
+	return OverrideColor;
+}
+
+//! Sets if the static text should use the override color or the
+//! color in the gui skin.
+void CGUIStaticText::enableOverrideColor(bool enable)
+{
+	OverrideColorEnabled = enable;
+}
+
+bool CGUIStaticText::isOverrideColorEnabled() const
+{
+	return OverrideColorEnabled;
+}
+
+//! Enables or disables word wrap for using the static text as
+//! multiline text control.
+void CGUIStaticText::setWordWrap(bool enable)
+{
+	WordWrap = enable;
+	breakText();
+}
+
+bool CGUIStaticText::isWordWrapEnabled() const
+{
+	return WordWrap;
+}
+
+void CGUIStaticText::setRightToLeft(bool rtl)
+{
+	if (RightToLeft != rtl) {
+		RightToLeft = rtl;
+		breakText();
+	}
+}
+
+bool CGUIStaticText::isRightToLeft() const
+{
+	return RightToLeft;
+}
+
+//! Breaks the single text line.
+void CGUIStaticText::breakText()
+{
+	if (!WordWrap)
+		return;
+
+	BrokenText.clear();
+
+	IGUISkin *skin = Environment->getSkin();
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return;
+
+	LastBreakFont = font;
+
+	core::stringw line;
+	core::stringw word;
+	core::stringw whitespace;
+	s32 size = Text.size();
+	s32 length = 0;
+	s32 elWidth = RelativeRect.getWidth();
+	if (Border)
+		elWidth -= 2 * skin->getSize(EGDS_TEXT_DISTANCE_X);
+	wchar_t c;
+
+	// We have to deal with right-to-left and left-to-right differently
+	// However, most parts of the following code is the same, it's just
+	// some order and boundaries which change.
+	if (!RightToLeft) {
+		// regular (left-to-right)
+		for (s32 i = 0; i < size; ++i) {
+			c = Text[i];
+			bool lineBreak = false;
+
+			if (c == L'\r') { // Mac or Windows breaks
+				lineBreak = true;
+				if (Text[i + 1] == L'\n') { // Windows breaks
+					Text.erase(i + 1);
+					--size;
+				}
+				c = '\0';
+			} else if (c == L'\n') { // Unix breaks
+				lineBreak = true;
+				c = '\0';
+			}
+
+			bool isWhitespace = (c == L' ' || c == 0);
+			if (!isWhitespace) {
+				// part of a word
+				word += c;
+			}
+
+			if (isWhitespace || i == (size - 1)) {
+				if (word.size()) {
+					// here comes the next whitespace, look if
+					// we must break the last word to the next line.
+					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+					const s32 wordlgth = font->getDimension(word.c_str()).Width;
+
+					if (wordlgth > elWidth) {
+						// This word is too long to fit in the available space, look for
+						// the Unicode Soft HYphen (SHY / 00AD) character for a place to
+						// break the word at
+						int where = word.findFirst(wchar_t(0x00AD));
+						if (where != -1) {
+							core::stringw first = word.subString(0, where);
+							core::stringw second = word.subString(where, word.size() - where);
+							BrokenText.push_back(line + first + L"-");
+							const s32 secondLength = font->getDimension(second.c_str()).Width;
+
+							length = secondLength;
+							line = second;
+						} else {
+							// No soft hyphen found, so there's nothing more we can do
+							// break to next line
+							if (length)
+								BrokenText.push_back(line);
+							length = wordlgth;
+							line = word;
+						}
+					} else if (length && (length + wordlgth + whitelgth > elWidth)) {
+						// break to next line
+						BrokenText.push_back(line);
+						length = wordlgth;
+						line = word;
+					} else {
+						// add word to line
+						line += whitespace;
+						line += word;
+						length += whitelgth + wordlgth;
+					}
+
+					word = L"";
+					whitespace = L"";
+				}
+
+				if (isWhitespace) {
+					whitespace += c;
+				}
+
+				// compute line break
+				if (lineBreak) {
+					line += whitespace;
+					line += word;
+					BrokenText.push_back(line);
+					line = L"";
+					word = L"";
+					whitespace = L"";
+					length = 0;
+				}
+			}
+		}
+
+		line += whitespace;
+		line += word;
+		BrokenText.push_back(line);
+	} else {
+		// right-to-left
+		for (s32 i = size; i >= 0; --i) {
+			c = Text[i];
+			bool lineBreak = false;
+
+			if (c == L'\r') { // Mac or Windows breaks
+				lineBreak = true;
+				if ((i > 0) && Text[i - 1] == L'\n') { // Windows breaks
+					Text.erase(i - 1);
+					--size;
+				}
+				c = '\0';
+			} else if (c == L'\n') { // Unix breaks
+				lineBreak = true;
+				c = '\0';
+			}
+
+			if (c == L' ' || c == 0 || i == 0) {
+				if (word.size()) {
+					// here comes the next whitespace, look if
+					// we must break the last word to the next line.
+					const s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
+					const s32 wordlgth = font->getDimension(word.c_str()).Width;
+
+					if (length && (length + wordlgth + whitelgth > elWidth)) {
+						// break to next line
+						BrokenText.push_back(line);
+						length = wordlgth;
+						line = word;
+					} else {
+						// add word to line
+						line = whitespace + line;
+						line = word + line;
+						length += whitelgth + wordlgth;
+					}
+
+					word = L"";
+					whitespace = L"";
+				}
+
+				if (c != 0)
+					whitespace = core::stringw(&c, 1) + whitespace;
+
+				// compute line break
+				if (lineBreak) {
+					line = whitespace + line;
+					line = word + line;
+					BrokenText.push_back(line);
+					line = L"";
+					word = L"";
+					whitespace = L"";
+					length = 0;
+				}
+			} else {
+				// yippee this is a word..
+				word = core::stringw(&c, 1) + word;
+			}
+		}
+
+		line = whitespace + line;
+		line = word + line;
+		BrokenText.push_back(line);
+	}
+}
+
+//! Sets the new caption of this element.
+void CGUIStaticText::setText(const wchar_t *text)
+{
+	IGUIElement::setText(text);
+	breakText();
+}
+
+void CGUIStaticText::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+	breakText();
+}
+
+//! Returns the height of the text in pixels when it is drawn.
+s32 CGUIStaticText::getTextHeight() const
+{
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return 0;
+
+	if (WordWrap) {
+		s32 height = font->getDimension(L"A").Height + font->getKerningHeight();
+		return height * BrokenText.size();
+	} else {
+		// TODO: Text can have multiple lines which are not in BrokenText
+		// This is likely not correct. But as I have no time for further
+		// investigation I just fix it for now by return the true height here.
+		return font->getDimension(Text.c_str()).Height;
+	}
+}
+
+s32 CGUIStaticText::getTextWidth() const
+{
+	IGUIFont *font = getActiveFont();
+	if (!font)
+		return 0;
+
+	if (WordWrap) {
+		s32 widest = 0;
+
+		for (u32 line = 0; line < BrokenText.size(); ++line) {
+			s32 width = font->getDimension(BrokenText[line].c_str()).Width;
+
+			if (width > widest)
+				widest = width;
+		}
+
+		return widest;
+	} else {
+		return font->getDimension(Text.c_str()).Width;
+	}
+}
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUIStaticText.h b/irr/src/CGUIStaticText.h
new file mode 100644
index 000000000..c127769f8
--- /dev/null
+++ b/irr/src/CGUIStaticText.h
@@ -0,0 +1,131 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUIStaticText.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace gui
+{
+class CGUIStaticText : public IGUIStaticText
+{
+public:
+	//! constructor
+	CGUIStaticText(const wchar_t *text, bool border, IGUIEnvironment *environment,
+			IGUIElement *parent, s32 id, const core::rect<s32> &rectangle,
+			bool background = false);
+
+	//! destructor
+	virtual ~CGUIStaticText();
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! Sets another skin independent font.
+	void setOverrideFont(IGUIFont *font = 0) override;
+
+	//! Gets the override font (if any)
+	IGUIFont *getOverrideFont() const override;
+
+	//! Get the font which is used right now for drawing
+	IGUIFont *getActiveFont() const override;
+
+	//! Sets another color for the text.
+	void setOverrideColor(video::SColor color) override;
+
+	//! Sets another color for the background.
+	void setBackgroundColor(video::SColor color) override;
+
+	//! Sets whether to draw the background
+	void setDrawBackground(bool draw) override;
+
+	//! Gets the background color
+	video::SColor getBackgroundColor() const override;
+
+	//! Checks if background drawing is enabled
+	bool isDrawBackgroundEnabled() const override;
+
+	//! Sets whether to draw the border
+	void setDrawBorder(bool draw) override;
+
+	//! Checks if border drawing is enabled
+	bool isDrawBorderEnabled() const override;
+
+	//! Sets alignment mode for text
+	void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) override;
+
+	//! Gets the override color
+	video::SColor getOverrideColor() const override;
+
+	//! Gets the currently used text color
+	video::SColor getActiveColor() const override;
+
+	//! Sets if the static text should use the override color or the
+	//! color in the gui skin.
+	void enableOverrideColor(bool enable) override;
+
+	//! Checks if an override color is enabled
+	bool isOverrideColorEnabled() const override;
+
+	//! Set whether the text in this label should be clipped if it goes outside bounds
+	void setTextRestrainedInside(bool restrainedInside) override;
+
+	//! Checks if the text in this label should be clipped if it goes outside bounds
+	bool isTextRestrainedInside() const override;
+
+	//! Enables or disables word wrap for using the static text as
+	//! multiline text control.
+	void setWordWrap(bool enable) override;
+
+	//! Checks if word wrap is enabled
+	bool isWordWrapEnabled() const override;
+
+	//! Sets the new caption of this element.
+	void setText(const wchar_t *text) override;
+
+	//! Returns the height of the text in pixels when it is drawn.
+	s32 getTextHeight() const override;
+
+	//! Returns the width of the current text, in the current font
+	s32 getTextWidth() const override;
+
+	//! Updates the absolute position, splits text if word wrap is enabled
+	void updateAbsolutePosition() override;
+
+	//! Set whether the string should be interpreted as right-to-left (RTL) text
+	/** \note This component does not implement the Unicode bidi standard, the
+	text of the component should be already RTL if you call this. The
+	main difference when RTL is enabled is that the linebreaks for multiline
+	elements are performed starting from the end.
+	*/
+	void setRightToLeft(bool rtl) override;
+
+	//! Checks if the text should be interpreted as right-to-left text
+	bool isRightToLeft() const override;
+
+private:
+	//! Breaks the single text line.
+	void breakText();
+
+	EGUI_ALIGNMENT HAlign, VAlign;
+	bool Border;
+	bool OverrideColorEnabled;
+	bool OverrideBGColorEnabled;
+	bool WordWrap;
+	bool Background;
+	bool RestrainTextInside;
+	bool RightToLeft;
+
+	video::SColor OverrideColor, BGColor;
+	gui::IGUIFont *OverrideFont;
+	gui::IGUIFont *LastBreakFont; // stored because: if skin changes, line break must be recalculated.
+
+	core::array<core::stringw> BrokenText;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CGUITabControl.cpp b/irr/src/CGUITabControl.cpp
new file mode 100644
index 000000000..3e02773db
--- /dev/null
+++ b/irr/src/CGUITabControl.cpp
@@ -0,0 +1,934 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUITabControl.h"
+
+#include "CGUIButton.h"
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IGUIFont.h"
+#include "IVideoDriver.h"
+#include "rect.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+// ------------------------------------------------------------------
+// Tab
+// ------------------------------------------------------------------
+
+//! constructor
+CGUITab::CGUITab(IGUIEnvironment *environment,
+		IGUIElement *parent, const core::rect<s32> &rectangle,
+		s32 id) :
+		IGUITab(environment, parent, id, rectangle),
+		BackColor(0, 0, 0, 0), OverrideTextColorEnabled(false), TextColor(255, 0, 0, 0),
+		DrawBackground(false)
+{
+#ifdef _DEBUG
+	setDebugName("CGUITab");
+#endif
+
+	const IGUISkin *const skin = environment->getSkin();
+	if (skin)
+		TextColor = skin->getColor(EGDC_BUTTON_TEXT);
+}
+
+//! draws the element and its children
+void CGUITab::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+
+	if (skin && DrawBackground)
+		skin->draw2DRectangle(this, BackColor, AbsoluteRect, &AbsoluteClippingRect);
+
+	IGUIElement::draw();
+}
+
+//! sets if the tab should draw its background
+void CGUITab::setDrawBackground(bool draw)
+{
+	DrawBackground = draw;
+}
+
+//! sets the color of the background, if it should be drawn.
+void CGUITab::setBackgroundColor(video::SColor c)
+{
+	BackColor = c;
+}
+
+//! sets the color of the text
+void CGUITab::setTextColor(video::SColor c)
+{
+	OverrideTextColorEnabled = true;
+	TextColor = c;
+}
+
+video::SColor CGUITab::getTextColor() const
+{
+	if (OverrideTextColorEnabled)
+		return TextColor;
+	else
+		return Environment->getSkin()->getColor(EGDC_BUTTON_TEXT);
+}
+
+//! returns true if the tab is drawing its background, false if not
+bool CGUITab::isDrawingBackground() const
+{
+	return DrawBackground;
+}
+
+//! returns the color of the background
+video::SColor CGUITab::getBackgroundColor() const
+{
+	return BackColor;
+}
+
+// ------------------------------------------------------------------
+// Tabcontrol
+// ------------------------------------------------------------------
+
+//! constructor
+CGUITabControl::CGUITabControl(IGUIEnvironment *environment,
+		IGUIElement *parent, const core::rect<s32> &rectangle,
+		bool fillbackground, bool border, s32 id) :
+		IGUITabControl(environment, parent, id, rectangle),
+		ActiveTabIndex(-1),
+		Border(border), FillBackground(fillbackground), ScrollControl(false), TabHeight(0), VerticalAlignment(EGUIA_UPPERLEFT),
+		UpButton(0), DownButton(0), TabMaxWidth(0), CurrentScrollTabIndex(0), TabExtraWidth(20)
+{
+#ifdef _DEBUG
+	setDebugName("CGUITabControl");
+#endif
+
+	IGUISkin *skin = Environment->getSkin();
+	IGUISpriteBank *sprites = 0;
+
+	TabHeight = 32;
+
+	if (skin) {
+		sprites = skin->getSpriteBank();
+		TabHeight = skin->getSize(gui::EGDS_BUTTON_HEIGHT) + 2;
+	}
+
+	UpButton = Environment->addButton(core::rect<s32>(0, 0, 10, 10), this);
+
+	if (UpButton) {
+		UpButton->setSpriteBank(sprites);
+		UpButton->setVisible(false);
+		UpButton->setSubElement(true);
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		UpButton->setOverrideFont(Environment->getBuiltInFont());
+		UpButton->grab();
+	}
+
+	DownButton = Environment->addButton(core::rect<s32>(0, 0, 10, 10), this);
+
+	if (DownButton) {
+		DownButton->setSpriteBank(sprites);
+		DownButton->setVisible(false);
+		DownButton->setSubElement(true);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		DownButton->setOverrideFont(Environment->getBuiltInFont());
+		DownButton->grab();
+	}
+
+	setTabVerticalAlignment(EGUIA_UPPERLEFT);
+	refreshSprites();
+}
+
+//! destructor
+CGUITabControl::~CGUITabControl()
+{
+	for (u32 i = 0; i < Tabs.size(); ++i) {
+		if (Tabs[i])
+			Tabs[i]->drop();
+	}
+
+	if (UpButton)
+		UpButton->drop();
+
+	if (DownButton)
+		DownButton->drop();
+}
+
+void CGUITabControl::refreshSprites()
+{
+	video::SColor color(255, 255, 255, 255);
+	IGUISkin *skin = Environment->getSkin();
+	if (skin) {
+		color = skin->getColor(isEnabled() ? EGDC_WINDOW_SYMBOL : EGDC_GRAY_WINDOW_SYMBOL);
+
+		if (UpButton) {
+			UpButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_LEFT), color);
+			UpButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_LEFT), color);
+		}
+
+		if (DownButton) {
+			DownButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_CURSOR_RIGHT), color);
+			DownButton->setSprite(EGBS_BUTTON_DOWN, skin->getIcon(EGDI_CURSOR_RIGHT), color);
+		}
+	}
+}
+
+//! Adds a tab
+IGUITab *CGUITabControl::addTab(const wchar_t *caption, s32 id)
+{
+	CGUITab *tab = new CGUITab(Environment, this, calcTabPos(), id);
+
+	tab->setText(caption);
+	tab->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	tab->setVisible(false);
+	Tabs.push_back(tab); // no grab as new already creates a reference
+
+	if (ActiveTabIndex == -1) {
+		ActiveTabIndex = Tabs.size() - 1;
+		tab->setVisible(true);
+	}
+
+	recalculateScrollBar();
+
+	return tab;
+}
+
+//! adds a tab which has been created elsewhere
+s32 CGUITabControl::addTab(IGUITab *tab)
+{
+	return insertTab(Tabs.size(), tab, false);
+}
+
+//! Insert the tab at the given index
+IGUITab *CGUITabControl::insertTab(s32 idx, const wchar_t *caption, s32 id)
+{
+	if (idx < 0 || idx > (s32)Tabs.size()) // idx == Tabs.size() is indeed OK here as core::array can handle that
+		return NULL;
+
+	CGUITab *tab = new CGUITab(Environment, this, calcTabPos(), id);
+
+	tab->setText(caption);
+	tab->setAlignment(EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	tab->setVisible(false);
+	Tabs.insert(tab, (u32)idx);
+
+	if (ActiveTabIndex == -1) {
+		ActiveTabIndex = (u32)idx;
+		tab->setVisible(true);
+	} else if (idx <= ActiveTabIndex) {
+		++ActiveTabIndex;
+		setVisibleTab(ActiveTabIndex);
+	}
+
+	recalculateScrollBar();
+
+	return tab;
+}
+
+s32 CGUITabControl::insertTab(s32 idx, IGUITab *tab, bool serializationMode)
+{
+	if (!tab)
+		return -1;
+	if (idx > (s32)Tabs.size() && !serializationMode) // idx == Tabs.size() is indeed OK here as core::array can handle that
+		return -1;
+	// Not allowing to add same tab twice as it would make things complicated (serialization or setting active visible)
+	if (getTabIndex(tab) >= 0)
+		return -1;
+
+	if (idx < 0)
+		idx = (s32)Tabs.size();
+
+	if (tab->getParent() != this)
+		this->addChildToEnd(tab);
+
+	tab->setVisible(false);
+
+	tab->grab();
+
+	if (serializationMode) {
+		while (idx >= (s32)Tabs.size()) {
+			Tabs.push_back(0);
+		}
+		Tabs[idx] = tab;
+
+		if (idx == ActiveTabIndex) { // in serialization that can happen for any index
+			setVisibleTab(ActiveTabIndex);
+			tab->setVisible(true);
+		}
+	} else {
+		Tabs.insert(tab, (u32)idx);
+
+		if (ActiveTabIndex == -1) {
+			ActiveTabIndex = idx;
+			setVisibleTab(ActiveTabIndex);
+		} else if (idx <= ActiveTabIndex) {
+			++ActiveTabIndex;
+			setVisibleTab(ActiveTabIndex);
+		}
+	}
+
+	recalculateScrollBar();
+
+	return idx;
+}
+
+//! Removes a child.
+void CGUITabControl::removeChild(IGUIElement *child)
+{
+	s32 idx = getTabIndex(child);
+	if (idx >= 0)
+		removeTabButNotChild(idx);
+
+	// remove real element
+	IGUIElement::removeChild(child);
+
+	recalculateScrollBar();
+}
+
+//! Removes a tab from the tabcontrol
+void CGUITabControl::removeTab(s32 idx)
+{
+	if (idx < 0 || idx >= (s32)Tabs.size())
+		return;
+
+	removeChild(Tabs[(u32)idx]);
+}
+
+void CGUITabControl::removeTabButNotChild(s32 idx)
+{
+	if (idx < 0 || idx >= (s32)Tabs.size())
+		return;
+
+	Tabs[(u32)idx]->drop();
+	Tabs.erase((u32)idx);
+
+	if (idx < ActiveTabIndex) {
+		--ActiveTabIndex;
+		setVisibleTab(ActiveTabIndex);
+	} else if (idx == ActiveTabIndex) {
+		if ((u32)idx == Tabs.size())
+			--ActiveTabIndex;
+		setVisibleTab(ActiveTabIndex);
+	}
+}
+
+//! Clears the tabcontrol removing all tabs
+void CGUITabControl::clear()
+{
+	for (u32 i = 0; i < Tabs.size(); ++i) {
+		if (Tabs[i]) {
+			IGUIElement::removeChild(Tabs[i]);
+			Tabs[i]->drop();
+		}
+	}
+	Tabs.clear();
+
+	recalculateScrollBar();
+}
+
+//! Returns amount of tabs in the tabcontrol
+s32 CGUITabControl::getTabCount() const
+{
+	return Tabs.size();
+}
+
+//! Returns a tab based on zero based index
+IGUITab *CGUITabControl::getTab(s32 idx) const
+{
+	if (idx < 0 || (u32)idx >= Tabs.size())
+		return 0;
+
+	return Tabs[idx];
+}
+
+//! called if an event happened.
+bool CGUITabControl::OnEvent(const SEvent &event)
+{
+	if (isEnabled()) {
+		switch (event.EventType) {
+		case EET_GUI_EVENT:
+			switch (event.GUIEvent.EventType) {
+			case EGET_BUTTON_CLICKED:
+				if (event.GUIEvent.Caller == UpButton) {
+					scrollLeft();
+					return true;
+				} else if (event.GUIEvent.Caller == DownButton) {
+					scrollRight();
+					return true;
+				}
+
+				break;
+			default:
+				break;
+			}
+			break;
+		case EET_MOUSE_INPUT_EVENT:
+			switch (event.MouseInput.Event) {
+			// case EMIE_LMOUSE_PRESSED_DOWN:
+			//	// todo: dragging tabs around
+			//	return true;
+			case EMIE_LMOUSE_LEFT_UP: {
+				s32 idx = getTabAt(event.MouseInput.X, event.MouseInput.Y);
+				if (idx >= 0) {
+					setActiveTab(idx);
+					return true;
+				}
+				break;
+			}
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+void CGUITabControl::scrollLeft()
+{
+	if (CurrentScrollTabIndex > 0)
+		--CurrentScrollTabIndex;
+	recalculateScrollBar();
+}
+
+void CGUITabControl::scrollRight()
+{
+	if (CurrentScrollTabIndex < (s32)(Tabs.size()) - 1) {
+		if (needScrollControl(CurrentScrollTabIndex, true))
+			++CurrentScrollTabIndex;
+	}
+	recalculateScrollBar();
+}
+
+s32 CGUITabControl::calcTabWidth(IGUIFont *font, const wchar_t *text) const
+{
+	if (!font)
+		return 0;
+
+	s32 len = font->getDimension(text).Width + TabExtraWidth;
+	if (TabMaxWidth > 0 && len > TabMaxWidth)
+		len = TabMaxWidth;
+
+	return len;
+}
+
+bool CGUITabControl::needScrollControl(s32 startIndex, bool withScrollControl, s32 *pos_rightmost)
+{
+	if (startIndex < 0)
+		startIndex = 0;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return false;
+
+	IGUIFont *font = skin->getFont();
+
+	if (Tabs.empty())
+		return false;
+
+	if (!font)
+		return false;
+
+	s32 pos = AbsoluteRect.UpperLeftCorner.X + 2;
+	const s32 pos_right = withScrollControl ? UpButton->getAbsolutePosition().UpperLeftCorner.X - 2 : AbsoluteRect.LowerRightCorner.X;
+
+	for (s32 i = startIndex; i < (s32)Tabs.size(); ++i) {
+		// get Text
+		const wchar_t *text = 0;
+		if (Tabs[i]) {
+			text = Tabs[i]->getText();
+
+			// get text length
+			s32 len = calcTabWidth(font, text); // always without withScrollControl here or len would be shortened
+			pos += len;
+		}
+
+		if (pos > pos_right)
+			return true;
+	}
+
+	if (pos_rightmost)
+		*pos_rightmost = pos;
+	return false;
+}
+
+s32 CGUITabControl::calculateScrollIndexFromActive()
+{
+	if (!ScrollControl || Tabs.empty())
+		return 0;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return false;
+
+	IGUIFont *font = skin->getFont();
+	if (!font)
+		return false;
+
+	const s32 pos_left = AbsoluteRect.UpperLeftCorner.X + 2;
+	const s32 pos_right = UpButton->getAbsolutePosition().UpperLeftCorner.X - 2;
+
+	// Move from center to the left border left until it is reached
+	s32 pos_cl = (pos_left + pos_right) / 2;
+	s32 i = ActiveTabIndex;
+	for (; i > 0; --i) {
+		if (!Tabs[i])
+			continue;
+
+		s32 len = calcTabWidth(font, Tabs[i]->getText());
+		if (i == ActiveTabIndex)
+			len /= 2;
+		if (pos_cl - len < pos_left)
+			break;
+
+		pos_cl -= len;
+	}
+	if (i == 0)
+		return i;
+
+	// Is scrolling to right still possible?
+	s32 pos_rr = 0;
+	if (needScrollControl(i, true, &pos_rr))
+		return i; // Yes? -> OK
+
+	// No? -> Decrease "i" more. Append tabs until scrolling becomes necessary
+	for (--i; i > 0; --i) {
+		if (!Tabs[i])
+			continue;
+
+		pos_rr += calcTabWidth(font, Tabs[i]->getText());
+		if (pos_rr > pos_right)
+			break;
+	}
+	return i + 1;
+}
+
+core::rect<s32> CGUITabControl::calcTabPos()
+{
+	core::rect<s32> r;
+	r.UpperLeftCorner.X = 0;
+	r.LowerRightCorner.X = AbsoluteRect.getWidth();
+	if (Border) {
+		++r.UpperLeftCorner.X;
+		--r.LowerRightCorner.X;
+	}
+
+	if (VerticalAlignment == EGUIA_UPPERLEFT) {
+		r.UpperLeftCorner.Y = TabHeight + 2;
+		r.LowerRightCorner.Y = AbsoluteRect.getHeight() - 1;
+		if (Border) {
+			--r.LowerRightCorner.Y;
+		}
+	} else {
+		r.UpperLeftCorner.Y = 0;
+		r.LowerRightCorner.Y = AbsoluteRect.getHeight() - (TabHeight + 2);
+		if (Border) {
+			++r.UpperLeftCorner.Y;
+		}
+	}
+
+	return r;
+}
+
+//! draws the element and its children
+void CGUITabControl::draw()
+{
+	if (!IsVisible)
+		return;
+
+	IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+
+	IGUIFont *font = skin->getFont();
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// some empty background as placeholder when there are no tabs
+	if (Tabs.empty())
+		driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), frameRect, &AbsoluteClippingRect);
+
+	if (!font)
+		return;
+
+	// tab button bar can be above or below the tabs
+	if (VerticalAlignment == EGUIA_UPPERLEFT) {
+		frameRect.UpperLeftCorner.Y += 2;
+		frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + TabHeight;
+	} else {
+		frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - TabHeight - 1;
+		frameRect.LowerRightCorner.Y -= 2;
+	}
+
+	core::rect<s32> tr;
+	s32 pos = frameRect.UpperLeftCorner.X + 2;
+
+	bool needLeftScroll = CurrentScrollTabIndex > 0;
+	bool needRightScroll = false;
+
+	// left and right pos of the active tab
+	s32 left = 0;
+	s32 right = 0;
+
+	// const wchar_t* activetext = 0;
+	IGUITab *activeTab = 0;
+
+	// Draw all tab-buttons except the active one
+	for (u32 i = CurrentScrollTabIndex; i < Tabs.size() && !needRightScroll; ++i) {
+		// get Text
+		const wchar_t *text = 0;
+		if (Tabs[i])
+			text = Tabs[i]->getText();
+
+		// get text length
+		s32 len = calcTabWidth(font, text);
+		if (ScrollControl) {
+			s32 space = UpButton->getAbsolutePosition().UpperLeftCorner.X - 2 - pos;
+			if (space < len) {
+				needRightScroll = true;
+				len = space;
+			}
+		}
+
+		frameRect.LowerRightCorner.X += len;
+		frameRect.UpperLeftCorner.X = pos;
+		frameRect.LowerRightCorner.X = frameRect.UpperLeftCorner.X + len;
+
+		pos += len;
+
+		if ((s32)i == ActiveTabIndex) {
+			// for active button just remember values
+			left = frameRect.UpperLeftCorner.X;
+			right = frameRect.LowerRightCorner.X;
+			// activetext = text;
+			activeTab = Tabs[i];
+		} else {
+			skin->draw3DTabButton(this, false, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
+			// draw text
+			core::rect<s32> textClipRect(frameRect); // TODO: exact size depends on borders in draw3DTabButton which we don't get with current interface
+			textClipRect.clipAgainst(AbsoluteClippingRect);
+			font->draw(text, frameRect, Tabs[i]->getTextColor(),
+					true, true, &textClipRect);
+		}
+	}
+
+	// Draw active tab button
+	// Drawn later than other buttons because it draw over the buttons before/after it.
+	if (left != 0 && right != 0 && activeTab != 0) {
+		// draw upper highlight frame
+		if (VerticalAlignment == EGUIA_UPPERLEFT) {
+			frameRect.UpperLeftCorner.X = left - 2;
+			frameRect.LowerRightCorner.X = right + 2;
+			frameRect.UpperLeftCorner.Y -= 2;
+
+			skin->draw3DTabButton(this, true, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
+			// draw text
+			core::rect<s32> textClipRect(frameRect); // TODO: exact size depends on borders in draw3DTabButton which we don't get with current interface
+			textClipRect.clipAgainst(AbsoluteClippingRect);
+			font->draw(activeTab->getText(), frameRect, activeTab->getTextColor(),
+					true, true, &textClipRect);
+
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = left - 1;
+			tr.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.LowerRightCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = right;
+			tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+		} else {
+			frameRect.UpperLeftCorner.X = left - 2;
+			frameRect.LowerRightCorner.X = right + 2;
+			frameRect.LowerRightCorner.Y += 2;
+
+			skin->draw3DTabButton(this, true, frameRect, &AbsoluteClippingRect, VerticalAlignment);
+
+			// draw text
+			font->draw(activeTab->getText(), frameRect, activeTab->getTextColor(),
+					true, true, &frameRect);
+
+			tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+			tr.LowerRightCorner.X = left - 1;
+			tr.UpperLeftCorner.Y = frameRect.UpperLeftCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+
+			tr.UpperLeftCorner.X = right;
+			tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+		}
+	} else {
+		// No active tab
+		// Draw a line separating button bar from tab area
+		tr.UpperLeftCorner.X = AbsoluteRect.UpperLeftCorner.X;
+		tr.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X;
+		tr.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - 1;
+		tr.LowerRightCorner.Y = frameRect.LowerRightCorner.Y;
+
+		if (VerticalAlignment == EGUIA_UPPERLEFT) {
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_HIGH_LIGHT), tr, &AbsoluteClippingRect);
+		} else {
+			tr.UpperLeftCorner.Y = frameRect.UpperLeftCorner.Y - 1;
+			tr.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y;
+			driver->draw2DRectangle(skin->getColor(EGDC_3D_DARK_SHADOW), tr, &AbsoluteClippingRect);
+		}
+	}
+
+	// drawing some border and background for the tab-area.
+	skin->draw3DTabBody(this, Border, FillBackground, AbsoluteRect, &AbsoluteClippingRect, TabHeight, VerticalAlignment);
+
+	// enable scrollcontrols on need
+	if (UpButton)
+		UpButton->setEnabled(needLeftScroll);
+	if (DownButton)
+		DownButton->setEnabled(needRightScroll);
+	refreshSprites();
+
+	IGUIElement::draw();
+}
+
+//! Set the height of the tabs
+void CGUITabControl::setTabHeight(s32 height)
+{
+	if (height < 0)
+		height = 0;
+
+	TabHeight = height;
+
+	recalculateScrollButtonPlacement();
+	recalculateScrollBar();
+}
+
+//! Get the height of the tabs
+s32 CGUITabControl::getTabHeight() const
+{
+	return TabHeight;
+}
+
+//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
+void CGUITabControl::setTabMaxWidth(s32 width)
+{
+	TabMaxWidth = width;
+}
+
+//! get the maximal width of a tab
+s32 CGUITabControl::getTabMaxWidth() const
+{
+	return TabMaxWidth;
+}
+
+//! Set the extra width added to tabs on each side of the text
+void CGUITabControl::setTabExtraWidth(s32 extraWidth)
+{
+	if (extraWidth < 0)
+		extraWidth = 0;
+
+	TabExtraWidth = extraWidth;
+
+	recalculateScrollBar();
+}
+
+//! Get the extra width added to tabs on each side of the text
+s32 CGUITabControl::getTabExtraWidth() const
+{
+	return TabExtraWidth;
+}
+
+void CGUITabControl::recalculateScrollBar()
+{
+	// Down: to right, Up: to left
+	if (!UpButton || !DownButton)
+		return;
+
+	ScrollControl = needScrollControl() || CurrentScrollTabIndex > 0;
+
+	if (ScrollControl) {
+		UpButton->setVisible(true);
+		DownButton->setVisible(true);
+	} else {
+		UpButton->setVisible(false);
+		DownButton->setVisible(false);
+	}
+
+	bringToFront(UpButton);
+	bringToFront(DownButton);
+}
+
+//! Set the alignment of the tabs
+void CGUITabControl::setTabVerticalAlignment(EGUI_ALIGNMENT alignment)
+{
+	VerticalAlignment = alignment;
+
+	recalculateScrollButtonPlacement();
+	recalculateScrollBar();
+
+	core::rect<s32> r(calcTabPos());
+	for (u32 i = 0; i < Tabs.size(); ++i) {
+		Tabs[i]->setRelativePosition(r);
+	}
+}
+
+void CGUITabControl::recalculateScrollButtonPlacement()
+{
+	IGUISkin *skin = Environment->getSkin();
+	s32 ButtonSize = 16;
+	s32 ButtonHeight = TabHeight - 2;
+	if (ButtonHeight < 0)
+		ButtonHeight = TabHeight;
+	if (skin) {
+		ButtonSize = skin->getSize(EGDS_WINDOW_BUTTON_WIDTH);
+		if (ButtonSize > TabHeight)
+			ButtonSize = TabHeight;
+	}
+
+	s32 ButtonX = RelativeRect.getWidth() - (s32)(2.5f * (f32)ButtonSize) - 1;
+	s32 ButtonY = 0;
+
+	if (VerticalAlignment == EGUIA_UPPERLEFT) {
+		ButtonY = 2 + (TabHeight / 2) - (ButtonHeight / 2);
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT);
+	} else {
+		ButtonY = RelativeRect.getHeight() - (TabHeight / 2) - (ButtonHeight / 2) - 2;
+		UpButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
+		DownButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT);
+	}
+
+	UpButton->setRelativePosition(core::rect<s32>(ButtonX, ButtonY, ButtonX + ButtonSize, ButtonY + ButtonHeight));
+	ButtonX += ButtonSize + 1;
+	DownButton->setRelativePosition(core::rect<s32>(ButtonX, ButtonY, ButtonX + ButtonSize, ButtonY + ButtonHeight));
+}
+
+//! Get the alignment of the tabs
+EGUI_ALIGNMENT CGUITabControl::getTabVerticalAlignment() const
+{
+	return VerticalAlignment;
+}
+
+s32 CGUITabControl::getTabAt(s32 xpos, s32 ypos) const
+{
+	core::position2di p(xpos, ypos);
+	IGUISkin *skin = Environment->getSkin();
+	IGUIFont *font = skin->getFont();
+
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	if (VerticalAlignment == EGUIA_UPPERLEFT) {
+		frameRect.UpperLeftCorner.Y += 2;
+		frameRect.LowerRightCorner.Y = frameRect.UpperLeftCorner.Y + TabHeight;
+	} else {
+		frameRect.UpperLeftCorner.Y = frameRect.LowerRightCorner.Y - TabHeight;
+	}
+
+	s32 pos = frameRect.UpperLeftCorner.X + 2;
+
+	if (!frameRect.isPointInside(p))
+		return -1;
+
+	bool abort = false;
+	for (s32 i = CurrentScrollTabIndex; i < (s32)Tabs.size() && !abort; ++i) {
+		// get Text
+		const wchar_t *text = 0;
+		if (Tabs[i])
+			text = Tabs[i]->getText();
+
+		// get text length
+		s32 len = calcTabWidth(font, text);
+		if (ScrollControl) {
+			// TODO: merge this with draw() ?
+			s32 space = UpButton->getAbsolutePosition().UpperLeftCorner.X - 2 - pos;
+			if (space < len) {
+				abort = true;
+				len = space;
+			}
+		}
+
+		frameRect.UpperLeftCorner.X = pos;
+		frameRect.LowerRightCorner.X = frameRect.UpperLeftCorner.X + len;
+
+		pos += len;
+
+		if (frameRect.isPointInside(p)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+//! Returns which tab is currently active
+s32 CGUITabControl::getActiveTab() const
+{
+	return ActiveTabIndex;
+}
+
+//! Brings a tab to front.
+bool CGUITabControl::setActiveTab(s32 idx)
+{
+	if ((u32)idx >= Tabs.size())
+		return false;
+
+	bool changed = (ActiveTabIndex != idx);
+
+	ActiveTabIndex = idx;
+
+	setVisibleTab(ActiveTabIndex);
+
+	if (changed && Parent) {
+		SEvent event;
+		event.EventType = EET_GUI_EVENT;
+		event.GUIEvent.Caller = this;
+		event.GUIEvent.Element = 0;
+		event.GUIEvent.EventType = EGET_TAB_CHANGED;
+		Parent->OnEvent(event);
+	}
+
+	if (ScrollControl) {
+		CurrentScrollTabIndex = calculateScrollIndexFromActive();
+		recalculateScrollBar();
+	}
+
+	return true;
+}
+
+void CGUITabControl::setVisibleTab(s32 idx)
+{
+	for (u32 i = 0; i < Tabs.size(); ++i)
+		if (Tabs[i])
+			Tabs[i]->setVisible((s32)i == idx);
+}
+
+bool CGUITabControl::setActiveTab(IGUITab *tab)
+{
+	return setActiveTab(getTabIndex(tab));
+}
+
+s32 CGUITabControl::getTabIndex(const IGUIElement *tab) const
+{
+	for (u32 i = 0; i < Tabs.size(); ++i)
+		if (Tabs[i] == tab)
+			return (s32)i;
+
+	return -1;
+}
+
+//! Update the position of the element, decides scroll button status
+void CGUITabControl::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+	recalculateScrollBar();
+}
+
+} // end namespace irr
+} // end namespace gui
diff --git a/irr/src/CGUITabControl.h b/irr/src/CGUITabControl.h
new file mode 100644
index 000000000..5c167c2a3
--- /dev/null
+++ b/irr/src/CGUITabControl.h
@@ -0,0 +1,175 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IGUITabControl.h"
+#include "irrArray.h"
+#include "IGUISkin.h"
+
+namespace irr
+{
+namespace gui
+{
+class CGUITabControl;
+class IGUIButton;
+
+// A tab, onto which other gui elements could be added.
+class CGUITab : public IGUITab
+{
+public:
+	//! constructor
+	CGUITab(IGUIEnvironment *environment,
+			IGUIElement *parent, const core::rect<s32> &rectangle,
+			s32 id);
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! sets if the tab should draw its background
+	void setDrawBackground(bool draw = true) override;
+
+	//! sets the color of the background, if it should be drawn.
+	void setBackgroundColor(video::SColor c) override;
+
+	//! sets the color of the text
+	void setTextColor(video::SColor c) override;
+
+	//! returns true if the tab is drawing its background, false if not
+	bool isDrawingBackground() const override;
+
+	//! returns the color of the background
+	video::SColor getBackgroundColor() const override;
+
+	video::SColor getTextColor() const override;
+
+private:
+	video::SColor BackColor;
+	bool OverrideTextColorEnabled;
+	video::SColor TextColor;
+	bool DrawBackground;
+};
+
+//! A standard tab control
+class CGUITabControl : public IGUITabControl
+{
+public:
+	//! destructor
+	CGUITabControl(IGUIEnvironment *environment,
+			IGUIElement *parent, const core::rect<s32> &rectangle,
+			bool fillbackground = true, bool border = true, s32 id = -1);
+
+	//! destructor
+	virtual ~CGUITabControl();
+
+	//! Adds a tab
+	IGUITab *addTab(const wchar_t *caption, s32 id = -1) override;
+
+	//! Adds an existing tab
+	s32 addTab(IGUITab *tab) override;
+
+	//! Insert the tab at the given index
+	IGUITab *insertTab(s32 idx, const wchar_t *caption, s32 id = -1) override;
+
+	//! Insert an existing tab
+	/** Note that it will also add the tab as a child of this TabControl.
+	\return Index of added tab (should be same as the one passed) or -1 for failure*/
+	s32 insertTab(s32 idx, IGUITab *tab, bool serializationMode) override;
+
+	//! Removes a tab from the tabcontrol
+	void removeTab(s32 idx) override;
+
+	//! Clears the tabcontrol removing all tabs
+	void clear() override;
+
+	//! Returns amount of tabs in the tabcontrol
+	s32 getTabCount() const override;
+
+	//! Returns a tab based on zero based index
+	IGUITab *getTab(s32 idx) const override;
+
+	//! Brings a tab to front.
+	bool setActiveTab(s32 idx) override;
+
+	//! Brings a tab to front.
+	bool setActiveTab(IGUITab *tab) override;
+
+	//! For given given tab find it's zero-based index (or -1 for not found)
+	s32 getTabIndex(const IGUIElement *tab) const override;
+
+	//! Returns which tab is currently active
+	s32 getActiveTab() const override;
+
+	//! get the the id of the tab at the given absolute coordinates
+	s32 getTabAt(s32 xpos, s32 ypos) const override;
+
+	//! called if an event happened.
+	bool OnEvent(const SEvent &event) override;
+
+	//! draws the element and its children
+	void draw() override;
+
+	//! Removes a child.
+	void removeChild(IGUIElement *child) override;
+
+	//! Set the height of the tabs
+	void setTabHeight(s32 height) override;
+
+	//! Get the height of the tabs
+	s32 getTabHeight() const override;
+
+	//! set the maximal width of a tab. Per default width is 0 which means "no width restriction".
+	void setTabMaxWidth(s32 width) override;
+
+	//! get the maximal width of a tab
+	s32 getTabMaxWidth() const override;
+
+	//! Set the alignment of the tabs
+	//! note: EGUIA_CENTER is not an option
+	void setTabVerticalAlignment(gui::EGUI_ALIGNMENT alignment) override;
+
+	//! Get the alignment of the tabs
+	gui::EGUI_ALIGNMENT getTabVerticalAlignment() const override;
+
+	//! Set the extra width added to tabs on each side of the text
+	void setTabExtraWidth(s32 extraWidth) override;
+
+	//! Get the extra width added to tabs on each side of the text
+	s32 getTabExtraWidth() const override;
+
+	//! Update the position of the element, decides scroll button status
+	void updateAbsolutePosition() override;
+
+private:
+	void scrollLeft();
+	void scrollRight();
+	//! Indicates whether the tabs overflow in X direction
+	bool needScrollControl(s32 startIndex = 0, bool withScrollControl = false, s32 *pos_rightmost = nullptr);
+	//! Left index calculation based on the selected tab
+	s32 calculateScrollIndexFromActive();
+	s32 calcTabWidth(IGUIFont *font, const wchar_t *text) const;
+	core::rect<s32> calcTabPos();
+	void setVisibleTab(s32 idx);
+	void removeTabButNotChild(s32 idx);
+
+	void recalculateScrollButtonPlacement();
+	void recalculateScrollBar();
+	void refreshSprites();
+
+	core::array<IGUITab *> Tabs;
+	s32 ActiveTabIndex;
+	bool Border;
+	bool FillBackground;
+	bool ScrollControl;
+	s32 TabHeight;
+	gui::EGUI_ALIGNMENT VerticalAlignment;
+	IGUIButton *UpButton;
+	IGUIButton *DownButton;
+	s32 TabMaxWidth;
+	s32 CurrentScrollTabIndex;
+	s32 TabExtraWidth;
+};
+
+} // end namespace gui
+} // end namespace irr
diff --git a/irr/src/CImage.cpp b/irr/src/CImage.cpp
new file mode 100644
index 000000000..209590174
--- /dev/null
+++ b/irr/src/CImage.cpp
@@ -0,0 +1,373 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt / Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImage.h"
+#include "irrString.h"
+#include "CColorConverter.h"
+#include "CBlit.h"
+#include "os.h"
+#include "SoftwareDriver2_helper.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Constructor from raw data
+CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size, void *data,
+		bool ownForeignMemory, bool deleteMemory) :
+		IImage(format, size, deleteMemory)
+{
+	if (ownForeignMemory) {
+		Data = (u8 *)data;
+	} else {
+		const u32 dataSize = getDataSizeFromFormat(Format, Size.Width, Size.Height);
+		const u32 allocSize = align_next(dataSize, 16);
+
+		// allocate as u32 to ensure enough alignment when casted
+		Data = reinterpret_cast<u8 *>(new u32[allocSize / 4]);
+		memcpy(Data, data, dataSize);
+		DeleteMemory = true;
+	}
+}
+
+//! Constructor of empty image
+CImage::CImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size) :
+		IImage(format, size, true)
+{
+	const u32 dataSize = getDataSizeFromFormat(Format, Size.Width, Size.Height);
+	const u32 allocSize = align_next(dataSize, 16);
+
+	Data = reinterpret_cast<u8 *>(new u32[allocSize / 4]);
+	DeleteMemory = true;
+}
+
+//! sets a pixel
+void CImage::setPixel(u32 x, u32 y, const SColor &color, bool blend)
+{
+	if (x >= Size.Width || y >= Size.Height)
+		return;
+
+	switch (Format) {
+	case ECF_A1R5G5B5: {
+		u16 *dest = (u16 *)(Data + (y * Pitch) + (x << 1));
+		*dest = video::A8R8G8B8toA1R5G5B5(color.color);
+	} break;
+
+	case ECF_R5G6B5: {
+		u16 *dest = (u16 *)(Data + (y * Pitch) + (x << 1));
+		*dest = video::A8R8G8B8toR5G6B5(color.color);
+	} break;
+
+	case ECF_R8G8B8: {
+		u8 *dest = Data + (y * Pitch) + (x * 3);
+		dest[0] = (u8)color.getRed();
+		dest[1] = (u8)color.getGreen();
+		dest[2] = (u8)color.getBlue();
+	} break;
+
+	case ECF_A8R8G8B8: {
+		u32 *dest = (u32 *)(Data + (y * Pitch) + (x << 2));
+		*dest = blend ? PixelBlend32(*dest, color.color) : color.color;
+	} break;
+
+	case ECF_UNKNOWN:
+		os::Printer::log("IImage::setPixel unknown format.", ELL_WARNING);
+		return;
+
+	default:
+		break;
+	}
+}
+
+//! returns a pixel
+SColor CImage::getPixel(u32 x, u32 y) const
+{
+	if (x >= Size.Width || y >= Size.Height)
+		return SColor(0);
+
+	switch (Format) {
+	case ECF_A1R5G5B5:
+		return A1R5G5B5toA8R8G8B8(((u16 *)Data)[y * Size.Width + x]);
+	case ECF_R5G6B5:
+		return R5G6B5toA8R8G8B8(((u16 *)Data)[y * Size.Width + x]);
+	case ECF_A8R8G8B8:
+		return ((u32 *)Data)[y * Size.Width + x];
+	case ECF_R8G8B8: {
+		u8 *p = Data + (y * 3) * Size.Width + (x * 3);
+		return SColor(255, p[0], p[1], p[2]);
+	}
+
+	case ECF_UNKNOWN:
+		os::Printer::log("IImage::getPixel unknown format.", ELL_WARNING);
+		break;
+
+	default:
+		break;
+	}
+
+	return SColor(0);
+}
+
+//! copies this surface into another at given position
+void CImage::copyTo(IImage *target, const core::position2d<s32> &pos)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyTo method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	if (!Blit(BLITTER_TEXTURE, target, 0, &pos, this, 0, 0) && target && pos.X == 0 && pos.Y == 0 &&
+			CColorConverter::canConvertFormat(Format, target->getColorFormat())) {
+		// No fast blitting, but copyToScaling uses other color conversions and might work
+		irr::core::dimension2du dim(target->getDimension());
+		copyToScaling(target->getData(), dim.Width, dim.Height, target->getColorFormat(), target->getPitch());
+	}
+}
+
+//! copies this surface partially into another at given position
+void CImage::copyTo(IImage *target, const core::position2d<s32> &pos, const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyTo method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	Blit(BLITTER_TEXTURE, target, clipRect, &pos, this, &sourceRect, 0);
+}
+
+//! copies this surface into another, using the alpha mask, a cliprect and a color to add with
+void CImage::copyToWithAlpha(IImage *target, const core::position2d<s32> &pos, const core::rect<s32> &sourceRect, const SColor &color, const core::rect<s32> *clipRect, bool combineAlpha)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyToWithAlpha method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	eBlitter op = combineAlpha ? BLITTER_TEXTURE_COMBINE_ALPHA : color.color == 0xFFFFFFFF ? BLITTER_TEXTURE_ALPHA_BLEND
+																						   : BLITTER_TEXTURE_ALPHA_COLOR_BLEND;
+	Blit(op, target, clipRect, &pos, this, &sourceRect, color.color);
+}
+
+//! copies this surface into another, if it has the exact same size and format.
+bool CImage::copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch) const
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyToNoScaling method doesn't work with compressed images.", ELL_WARNING);
+		return false;
+	}
+
+	if (!target || !width || !height || !Size.Width || !Size.Height)
+		return false;
+
+	const u32 bpp = getBitsPerPixelFromFormat(format) / 8;
+	if (0 == pitch)
+		pitch = width * bpp;
+
+	if (!(Format == format && Size.Width == width && Size.Height == height))
+		return false;
+
+	if (pitch == Pitch) {
+		memcpy(target, Data, (size_t)height * pitch);
+	} else {
+		u8 *tgtpos = (u8 *)target;
+		u8 *srcpos = Data;
+		const u32 bwidth = width * bpp;
+		const u32 rest = pitch - bwidth;
+		for (u32 y = 0; y < height; ++y) {
+			// copy scanline
+			memcpy(tgtpos, srcpos, bwidth);
+			// clear pitch
+			memset(tgtpos + bwidth, 0, rest);
+			tgtpos += pitch;
+			srcpos += Pitch;
+		}
+	}
+
+	return true;
+}
+
+//! copies this surface into another, scaling it to the target image size
+// note: this is very very slow.
+void CImage::copyToScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyToScaling method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	if (!target || !width || !height || !Size.Width || !Size.Height)
+		return;
+
+	const u32 bpp = getBitsPerPixelFromFormat(format) / 8;
+	if (0 == pitch)
+		pitch = width * bpp;
+
+	if (copyToNoScaling(target, width, height, format, pitch))
+		return;
+
+	// NOTE: Scaling is coded to keep the border pixels intact.
+	// Alternatively we could for example work with first pixel being taken at half step-size.
+	// Then we have one more step here and it would be:
+	//     sourceXStep = (f32)(Size.Width-1) / (f32)(width);
+	//     And sx would start at 0.5f + sourceXStep / 2.f;
+	//     Similar for y.
+	// As scaling is done without any antialiasing it doesn't matter too much which outermost pixels we use and keeping
+	// border pixels intact is probably mostly better (with AA the other solution would be more correct).
+	// This is however unnecessary (and unexpected) for scaling to integer multiples, so don't do it there.
+	f32 sourceXStep, sourceYStep;
+	f32 sourceXStart = 0.f, sourceYStart = 0.f;
+	if (width % Size.Width == 0)
+		sourceXStep = (f32)(Size.Width) / (f32)(width);
+	else {
+		sourceXStep = width > 1 ? (f32)(Size.Width - 1) / (f32)(width - 1) : 0.f;
+		sourceXStart = 0.5f; // for rounding to nearest pixel
+	}
+	if (height % Size.Height == 0)
+		sourceYStep = (f32)(Size.Height) / (f32)(height);
+	else {
+		sourceYStep = height > 1 ? (f32)(Size.Height - 1) / (f32)(height - 1) : 0.f;
+		sourceYStart = 0.5f; // for rounding to nearest pixel
+	}
+
+	s32 yval = 0, syval = 0;
+	f32 sy = sourceYStart;
+	for (u32 y = 0; y < height; ++y) {
+		f32 sx = sourceXStart;
+		for (u32 x = 0; x < width; ++x) {
+			CColorConverter::convert_viaFormat(Data + syval + ((s32)sx) * BytesPerPixel, Format, 1, ((u8 *)target) + yval + (x * bpp), format);
+			sx += sourceXStep;
+		}
+		sy += sourceYStep;
+		syval = (s32)(sy)*Pitch;
+		yval += pitch;
+	}
+}
+
+//! copies this surface into another, scaling it to the target image size
+// note: this is very very slow.
+void CImage::copyToScaling(IImage *target)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyToScaling method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	if (!target)
+		return;
+
+	const core::dimension2d<u32> &targetSize = target->getDimension();
+
+	if (targetSize == Size) {
+		copyTo(target);
+		return;
+	}
+
+	copyToScaling(target->getData(), targetSize.Width, targetSize.Height, target->getColorFormat());
+}
+
+//! copies this surface into another, scaling it to fit it.
+void CImage::copyToScalingBoxFilter(IImage *target, s32 bias, bool blend)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::copyToScalingBoxFilter method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	const core::dimension2d<u32> destSize = target->getDimension();
+
+	const f32 sourceXStep = (f32)Size.Width / (f32)destSize.Width;
+	const f32 sourceYStep = (f32)Size.Height / (f32)destSize.Height;
+
+	s32 fx = core::ceil32(sourceXStep);
+	s32 fy = core::ceil32(sourceYStep);
+	f32 sx;
+	f32 sy;
+
+	sy = 0.f;
+	for (u32 y = 0; y != destSize.Height; ++y) {
+		sx = 0.f;
+		for (u32 x = 0; x != destSize.Width; ++x) {
+			target->setPixel(x, y,
+					getPixelBox(core::floor32(sx), core::floor32(sy), fx, fy, bias), blend);
+			sx += sourceXStep;
+		}
+		sy += sourceYStep;
+	}
+}
+
+//! fills the surface with given color
+void CImage::fill(const SColor &color)
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::fill method doesn't work with compressed images.", ELL_WARNING);
+		return;
+	}
+
+	u32 c;
+
+	switch (Format) {
+	case ECF_A1R5G5B5:
+		c = color.toA1R5G5B5();
+		c |= c << 16;
+		break;
+	case ECF_R5G6B5:
+		c = video::A8R8G8B8toR5G6B5(color.color);
+		c |= c << 16;
+		break;
+	case ECF_A8R8G8B8:
+		c = color.color;
+		break;
+	case ECF_R8G8B8: {
+		u8 rgb[3];
+		CColorConverter::convert_A8R8G8B8toR8G8B8(&color, 1, rgb);
+		const u32 size = getImageDataSizeInBytes();
+		for (u32 i = 0; i < size; i += 3) {
+			memcpy(Data + i, rgb, 3);
+		}
+		return;
+	} break;
+	default:
+		// TODO: Handle other formats
+		return;
+	}
+	memset32(Data, c, getImageDataSizeInBytes());
+}
+
+//! get a filtered pixel
+inline SColor CImage::getPixelBox(s32 x, s32 y, s32 fx, s32 fy, s32 bias) const
+{
+	if (IImage::isCompressedFormat(Format)) {
+		os::Printer::log("IImage::getPixelBox method doesn't work with compressed images.", ELL_WARNING);
+		return SColor(0);
+	}
+
+	SColor c;
+	s32 a = 0, r = 0, g = 0, b = 0;
+
+	for (s32 dx = 0; dx != fx; ++dx) {
+		for (s32 dy = 0; dy != fy; ++dy) {
+			c = getPixel(core::s32_min(x + dx, Size.Width - 1),
+					core::s32_min(y + dy, Size.Height - 1));
+
+			a += c.getAlpha();
+			r += c.getRed();
+			g += c.getGreen();
+			b += c.getBlue();
+		}
+	}
+
+	s32 sdiv = s32_log2_s32(fx * fy);
+
+	a = core::s32_clamp((a >> sdiv) + bias, 0, 255);
+	r = core::s32_clamp((r >> sdiv) + bias, 0, 255);
+	g = core::s32_clamp((g >> sdiv) + bias, 0, 255);
+	b = core::s32_clamp((b >> sdiv) + bias, 0, 255);
+
+	c.set(a, r, g, b);
+	return c;
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImage.h b/irr/src/CImage.h
new file mode 100644
index 000000000..955f85705
--- /dev/null
+++ b/irr/src/CImage.h
@@ -0,0 +1,74 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImage.h"
+#include "rect.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! check sanity of image dimensions to prevent issues later, for use by CImageLoaders
+inline bool checkImageDimensions(u32 width, u32 height)
+{
+	// 4 * 23000 * 23000 is just under S32_MAX
+	return width <= 23000 && height <= 23000;
+}
+
+//! IImage implementation with a lot of special image operations for
+//! 16 bit A1R5G5B5/32 Bit A8R8G8B8 images, which are used by the SoftwareDevice.
+class CImage : public IImage
+{
+public:
+	//! constructor from raw image data
+	/** \param useForeignMemory: If true, the image will use the data pointer
+	directly and own it from now on, which means it will also try to delete [] the
+	data when the image will be destructed. If false, the memory will by copied. */
+	CImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size, void *data,
+			bool ownForeignMemory = true, bool deleteMemory = true);
+
+	//! constructor for empty image
+	CImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size);
+
+	//! returns a pixel
+	SColor getPixel(u32 x, u32 y) const override;
+
+	//! sets a pixel
+	void setPixel(u32 x, u32 y, const SColor &color, bool blend = false) override;
+
+	//! copies this surface into another, if it has the exact same size and format.
+	bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch = 0) const override;
+
+	//! copies this surface into another, scaling it to fit.
+	void copyToScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch = 0) override;
+
+	//! copies this surface into another, scaling it to fit.
+	void copyToScaling(IImage *target) override;
+
+	//! copies this surface into another
+	void copyTo(IImage *target, const core::position2d<s32> &pos = core::position2d<s32>(0, 0)) override;
+
+	//! copies this surface into another
+	void copyTo(IImage *target, const core::position2d<s32> &pos, const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0) override;
+
+	//! copies this surface into another, using the alpha mask, an cliprect and a color to add with
+	virtual void copyToWithAlpha(IImage *target, const core::position2d<s32> &pos,
+			const core::rect<s32> &sourceRect, const SColor &color,
+			const core::rect<s32> *clipRect = 0, bool combineAlpha = false) override;
+
+	//! copies this surface into another, scaling it to fit, applying a box filter
+	void copyToScalingBoxFilter(IImage *target, s32 bias = 0, bool blend = false) override;
+
+	//! fills the surface with given color
+	void fill(const SColor &color) override;
+
+private:
+	inline SColor getPixelBox(s32 x, s32 y, s32 fx, s32 fy, s32 bias) const;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderBMP.cpp b/irr/src/CImageLoaderBMP.cpp
new file mode 100644
index 000000000..301edb2fe
--- /dev/null
+++ b/irr/src/CImageLoaderBMP.cpp
@@ -0,0 +1,402 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageLoaderBMP.h"
+
+#include "IReadFile.h"
+#include "SColor.h"
+#include "CColorConverter.h"
+#include "CImage.h"
+#include "os.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! constructor
+CImageLoaderBMP::CImageLoaderBMP()
+{
+#ifdef _DEBUG
+	setDebugName("CImageLoaderBMP");
+#endif
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".tga")
+bool CImageLoaderBMP::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "bmp");
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+bool CImageLoaderBMP::isALoadableFileFormat(io::IReadFile *file) const
+{
+	u16 headerID;
+	file->read(&headerID, sizeof(u16));
+#ifdef __BIG_ENDIAN__
+	headerID = os::Byteswap::byteswap(headerID);
+#endif
+	return headerID == 0x4d42;
+}
+
+// UB-safe overflow check
+static inline bool overflowCheck(const void *base, size_t offset, const void *end)
+{
+	auto baseI = reinterpret_cast<uintptr_t>(base),
+		 endI = reinterpret_cast<uintptr_t>(end);
+	return baseI > endI || offset >= (endI - baseI);
+}
+// check whether &p[0] to &p[_off - 1] can be accessed
+#define CHECKP(_off)                                \
+	if ((_off) < 0 || overflowCheck(p, _off, pEnd)) \
+	goto exit
+// same for d
+#define CHECKD(_off)                                   \
+	if ((_off) < 0 || overflowCheck(d, _off, destEnd)) \
+	goto exit
+
+void CImageLoaderBMP::decompress8BitRLE(u8 *&bmpData, s32 size, s32 width, s32 height, s32 pitch) const
+{
+	u8 *p = bmpData;
+	const u8 *pEnd = bmpData + size;
+	u8 *newBmp = new u8[(width + pitch) * height];
+	u8 *d = newBmp;
+	const u8 *destEnd = newBmp + (width + pitch) * height;
+	s32 line = 0;
+
+	while (p < pEnd && d < destEnd) {
+		if (*p == 0) {
+			++p;
+			CHECKP(1);
+
+			switch (*p) {
+			case 0: // end of line
+				++p;
+				++line;
+				d = newBmp + (line * (width + pitch));
+				break;
+			case 1: // end of bmp
+				goto exit;
+			case 2:
+				++p;
+				CHECKP(2);
+				d += (u8)*p;
+				++p; // delta
+				d += ((u8)*p) * (width + pitch);
+				++p;
+				break;
+			default: {
+				// absolute mode
+				s32 count = (u8)*p;
+				++p;
+				s32 readAdditional = ((2 - (count % 2)) % 2);
+
+				CHECKP(count);
+				CHECKD(count);
+				for (s32 i = 0; i < count; ++i) {
+					*d = *p;
+					++p;
+					++d;
+				}
+
+				CHECKP(readAdditional);
+				for (s32 i = 0; i < readAdditional; ++i)
+					++p;
+			}
+			}
+		} else {
+			s32 count = (u8)*p;
+			++p;
+			CHECKP(1);
+			u8 color = *p;
+			++p;
+			CHECKD(count);
+			for (s32 i = 0; i < count; ++i) {
+				*d = color;
+				++d;
+			}
+		}
+	}
+
+exit:
+	delete[] bmpData;
+	bmpData = newBmp;
+}
+
+// how many bytes will be touched given the current state of decompress4BitRLE
+static inline u32 shiftedCount(s32 count, s32 shift)
+{
+	_IRR_DEBUG_BREAK_IF(count < 0)
+	u32 ret = count / 2;
+	if (shift == 0 || count % 2 == 1)
+		++ret;
+	return ret;
+}
+
+void CImageLoaderBMP::decompress4BitRLE(u8 *&bmpData, s32 size, s32 width, s32 height, s32 pitch) const
+{
+	const s32 lineWidth = (width + 1) / 2 + pitch;
+	u8 *p = bmpData;
+	const u8 *pEnd = bmpData + size;
+	u8 *newBmp = new u8[lineWidth * height];
+	u8 *d = newBmp;
+	const u8 *destEnd = newBmp + lineWidth * height;
+	s32 line = 0;
+	s32 shift = 4;
+
+	while (p < pEnd && d < destEnd) {
+		if (*p == 0) {
+			++p;
+			CHECKP(1);
+
+			switch (*p) {
+			case 0: // end of line
+				++p;
+				++line;
+				d = newBmp + (line * lineWidth);
+				shift = 4;
+				break;
+			case 1: // end of bmp
+				goto exit;
+			case 2: {
+				++p;
+				CHECKP(2);
+				s32 x = (u8)*p;
+				++p;
+				s32 y = (u8)*p;
+				++p;
+				d += x / 2 + y * lineWidth;
+				shift = x % 2 == 0 ? 4 : 0;
+			} break;
+			default: {
+				// absolute mode
+				s32 count = (u8)*p;
+				++p;
+				s32 readAdditional = ((2 - ((count) % 2)) % 2);
+				s32 readShift = 4;
+
+				CHECKP(shiftedCount(count, readShift));
+				CHECKD(shiftedCount(count, shift));
+				for (s32 i = 0; i < count; ++i) {
+					s32 color = (((u8)*p) >> readShift) & 0x0f;
+					readShift -= 4;
+					if (readShift < 0) {
+						++*p; // <- bug?
+						readShift = 4;
+					}
+
+					u8 mask = 0x0f << shift;
+					*d = (*d & (~mask)) | ((color << shift) & mask);
+
+					shift -= 4;
+					if (shift < 0) {
+						shift = 4;
+						++d;
+					}
+				}
+
+				CHECKP(readAdditional);
+				for (s32 i = 0; i < readAdditional; ++i)
+					++p;
+			}
+			}
+		} else {
+			s32 count = (u8)*p;
+			++p;
+			CHECKP(1);
+			s32 color1 = (u8)*p;
+			color1 = color1 & 0x0f;
+			s32 color2 = (u8)*p;
+			color2 = (color2 >> 4) & 0x0f;
+			++p;
+
+			CHECKD(shiftedCount(count, shift));
+			for (s32 i = 0; i < count; ++i) {
+				u8 mask = 0x0f << shift;
+				u8 toSet = (shift == 0 ? color1 : color2) << shift;
+				*d = (*d & (~mask)) | (toSet & mask);
+
+				shift -= 4;
+				if (shift < 0) {
+					shift = 4;
+					++d;
+				}
+			}
+		}
+	}
+
+exit:
+	delete[] bmpData;
+	bmpData = newBmp;
+}
+
+#undef CHECKOFF
+#undef CHECKP
+#undef CHECKD
+
+//! creates a surface from the file
+IImage *CImageLoaderBMP::loadImage(io::IReadFile *file) const
+{
+	SBMPHeader header;
+
+	file->read(&header, sizeof(header));
+
+#ifdef __BIG_ENDIAN__
+	header.Id = os::Byteswap::byteswap(header.Id);
+	header.FileSize = os::Byteswap::byteswap(header.FileSize);
+	header.BitmapDataOffset = os::Byteswap::byteswap(header.BitmapDataOffset);
+	header.BitmapHeaderSize = os::Byteswap::byteswap(header.BitmapHeaderSize);
+	header.Width = os::Byteswap::byteswap(header.Width);
+	header.Height = os::Byteswap::byteswap(header.Height);
+	header.Planes = os::Byteswap::byteswap(header.Planes);
+	header.BPP = os::Byteswap::byteswap(header.BPP);
+	header.Compression = os::Byteswap::byteswap(header.Compression);
+	header.BitmapDataSize = os::Byteswap::byteswap(header.BitmapDataSize);
+	header.PixelPerMeterX = os::Byteswap::byteswap(header.PixelPerMeterX);
+	header.PixelPerMeterY = os::Byteswap::byteswap(header.PixelPerMeterY);
+	header.Colors = os::Byteswap::byteswap(header.Colors);
+	header.ImportantColors = os::Byteswap::byteswap(header.ImportantColors);
+#endif
+
+	s32 pitch = 0;
+
+	//! return if the header is false
+
+	if (header.Id != 0x4d42)
+		return 0;
+
+	if (header.Compression > 2) { // we'll only handle RLE-Compression
+		os::Printer::log("Compression mode not supported.", ELL_ERROR);
+		return 0;
+	}
+
+	if (header.BPP > 32 || !checkImageDimensions(header.Width, header.Height)) {
+		os::Printer::log("Rejecting BMP with unreasonable size or BPP.", ELL_ERROR);
+		return 0;
+	}
+
+	// adjust bitmap data size to dword boundary
+	header.BitmapDataSize += (4 - (header.BitmapDataSize % 4)) % 4;
+
+	// read palette
+
+	long pos = file->getPos();
+	constexpr s32 paletteAllocSize = 256;
+	s32 paletteSize = (header.BitmapDataOffset - pos) / 4;
+	paletteSize = core::clamp(paletteSize, 0, paletteAllocSize);
+
+	s32 *paletteData = 0;
+	if (paletteSize) {
+		// always allocate an 8-bit palette to ensure enough space
+		paletteData = new s32[paletteAllocSize];
+		memset(paletteData, 0, paletteAllocSize * sizeof(s32));
+		file->read(paletteData, paletteSize * sizeof(s32));
+#ifdef __BIG_ENDIAN__
+		for (s32 i = 0; i < paletteSize; ++i)
+			paletteData[i] = os::Byteswap::byteswap(paletteData[i]);
+#endif
+	}
+
+	// read image data
+
+	if (!header.BitmapDataSize) {
+		// okay, lets guess the size
+		// some tools simply don't set it
+		header.BitmapDataSize = static_cast<u32>(file->getSize()) - header.BitmapDataOffset;
+	}
+
+	file->seek(header.BitmapDataOffset);
+
+	s32 widthInBytes;
+	{
+		f32 t = (header.Width) * (header.BPP / 8.0f);
+		widthInBytes = (s32)t;
+		t -= widthInBytes;
+		if (t != 0.0f)
+			++widthInBytes;
+	}
+
+	const s32 lineSize = widthInBytes + ((4 - (widthInBytes % 4))) % 4;
+	pitch = lineSize - widthInBytes;
+
+	u8 *bmpData = new u8[header.BitmapDataSize];
+	file->read(bmpData, header.BitmapDataSize);
+
+	// decompress data if needed
+	switch (header.Compression) {
+	case 1: // 8 bit rle
+		decompress8BitRLE(bmpData, header.BitmapDataSize, header.Width, header.Height, pitch);
+		header.BitmapDataSize = (header.Width + pitch) * header.Height;
+		break;
+	case 2: // 4 bit rle
+		decompress4BitRLE(bmpData, header.BitmapDataSize, header.Width, header.Height, pitch);
+		header.BitmapDataSize = ((header.Width + 1) / 2 + pitch) * header.Height;
+		break;
+	}
+
+	if (header.BitmapDataSize < lineSize * header.Height) {
+		os::Printer::log("Bitmap data is cut off.", ELL_ERROR);
+
+		delete[] paletteData;
+		delete[] bmpData;
+		return 0;
+	}
+
+	// create surface
+	core::dimension2d<u32> dim;
+	dim.Width = header.Width;
+	dim.Height = header.Height;
+
+	IImage *image = 0;
+	switch (header.BPP) {
+	case 1:
+		image = new CImage(ECF_A1R5G5B5, dim);
+		if (image)
+			CColorConverter::convert1BitTo16Bit(bmpData, (s16 *)image->getData(), header.Width, header.Height, pitch, true);
+		break;
+	case 4:
+		image = new CImage(ECF_A1R5G5B5, dim);
+		if (image)
+			CColorConverter::convert4BitTo16Bit(bmpData, (s16 *)image->getData(), header.Width, header.Height, paletteData, pitch, true);
+		break;
+	case 8:
+		image = new CImage(ECF_A1R5G5B5, dim);
+		if (image)
+			CColorConverter::convert8BitTo16Bit(bmpData, (s16 *)image->getData(), header.Width, header.Height, paletteData, pitch, true);
+		break;
+	case 16:
+		image = new CImage(ECF_A1R5G5B5, dim);
+		if (image)
+			CColorConverter::convert16BitTo16Bit((s16 *)bmpData, (s16 *)image->getData(), header.Width, header.Height, pitch, true);
+		break;
+	case 24:
+		image = new CImage(ECF_R8G8B8, dim);
+		if (image)
+			CColorConverter::convert24BitTo24Bit(bmpData, (u8 *)image->getData(), header.Width, header.Height, pitch, true, true);
+		break;
+	case 32: // thx to Reinhard Ostermeier
+		image = new CImage(ECF_A8R8G8B8, dim);
+		if (image)
+			CColorConverter::convert32BitTo32Bit((s32 *)bmpData, (s32 *)image->getData(), header.Width, header.Height, pitch, true);
+		break;
+	};
+
+	// clean up
+
+	delete[] paletteData;
+	delete[] bmpData;
+
+	return image;
+}
+
+//! creates a loader which is able to load windows bitmaps
+IImageLoader *createImageLoaderBMP()
+{
+	return new CImageLoaderBMP;
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderBMP.h b/irr/src/CImageLoaderBMP.h
new file mode 100644
index 000000000..e7ef8ed2b
--- /dev/null
+++ b/irr/src/CImageLoaderBMP.h
@@ -0,0 +1,81 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImageLoader.h"
+
+namespace irr
+{
+namespace video
+{
+
+// byte-align structures
+#include "irrpack.h"
+
+struct SBMPHeader
+{
+	u16 Id; //	BM - Windows 3.1x, 95, NT, 98, 2000, ME, XP
+			//	BA - OS/2 Bitmap Array
+			//	CI - OS/2 Color Icon
+			//	CP - OS/2 Color Pointer
+			//	IC - OS/2 Icon
+			//	PT - OS/2 Pointer
+	u32 FileSize;
+	u32 Reserved;
+	u32 BitmapDataOffset;
+	u32 BitmapHeaderSize; // should be 28h for windows bitmaps or
+						  // 0Ch for OS/2 1.x or F0h for OS/2 2.x
+	u32 Width;
+	u32 Height;
+	u16 Planes;
+	u16 BPP; // 1: Monochrome bitmap
+			 // 4: 16 color bitmap
+			 // 8: 256 color bitmap
+			 // 16: 16bit (high color) bitmap
+			 // 24: 24bit (true color) bitmap
+			 // 32: 32bit (true color) bitmap
+
+	u32 Compression; // 0: none (Also identified by BI_RGB)
+					 // 1: RLE 8-bit / pixel (Also identified by BI_RLE4)
+					 // 2: RLE 4-bit / pixel (Also identified by BI_RLE8)
+					 // 3: Bitfields  (Also identified by BI_BITFIELDS)
+
+	u32 BitmapDataSize; // Size of the bitmap data in bytes. This number must be rounded to the next 4 byte boundary.
+	u32 PixelPerMeterX;
+	u32 PixelPerMeterY;
+	u32 Colors;
+	u32 ImportantColors;
+} PACK_STRUCT;
+
+// Default alignment
+#include "irrunpack.h"
+
+/*!
+	Surface Loader for Windows bitmaps
+*/
+class CImageLoaderBMP : public IImageLoader
+{
+public:
+	//! constructor
+	CImageLoaderBMP();
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".tga")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! returns true if the file maybe is able to be loaded by this class
+	bool isALoadableFileFormat(io::IReadFile *file) const override;
+
+	//! creates a surface from the file
+	IImage *loadImage(io::IReadFile *file) const override;
+
+private:
+	void decompress8BitRLE(u8 *&BmpData, s32 size, s32 width, s32 height, s32 pitch) const;
+
+	void decompress4BitRLE(u8 *&BmpData, s32 size, s32 width, s32 height, s32 pitch) const;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderJPG.cpp b/irr/src/CImageLoaderJPG.cpp
new file mode 100644
index 000000000..e64c458e7
--- /dev/null
+++ b/irr/src/CImageLoaderJPG.cpp
@@ -0,0 +1,263 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageLoaderJPG.h"
+
+#include "IReadFile.h"
+#include "CImage.h"
+#include "os.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! constructor
+CImageLoaderJPG::CImageLoaderJPG()
+{
+#ifdef _DEBUG
+	setDebugName("CImageLoaderJPG");
+#endif
+}
+
+//! destructor
+CImageLoaderJPG::~CImageLoaderJPG()
+{
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".tga")
+bool CImageLoaderJPG::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "jpg", "jpeg");
+}
+
+// struct for handling jpeg errors
+struct irr_jpeg_error_mgr
+{
+	// public jpeg error fields
+	struct jpeg_error_mgr pub;
+
+	// for longjmp, to return to caller on a fatal error
+	jmp_buf setjmp_buffer;
+
+	// for having access to the filename when printing the error messages
+	core::stringc *filename;
+};
+
+void CImageLoaderJPG::init_source(j_decompress_ptr cinfo)
+{
+	// DO NOTHING
+}
+
+boolean CImageLoaderJPG::fill_input_buffer(j_decompress_ptr cinfo)
+{
+	// DO NOTHING
+	return TRUE;
+}
+
+void CImageLoaderJPG::skip_input_data(j_decompress_ptr cinfo, long count)
+{
+	jpeg_source_mgr *src = cinfo->src;
+	if (count > 0) {
+		src->bytes_in_buffer -= count;
+		src->next_input_byte += count;
+	}
+}
+
+void CImageLoaderJPG::term_source(j_decompress_ptr cinfo)
+{
+	// DO NOTHING
+}
+
+void CImageLoaderJPG::error_exit(j_common_ptr cinfo)
+{
+	// unfortunately we need to use a goto rather than throwing an exception
+	// as gcc crashes under linux crashes when using throw from within
+	// extern c code
+
+	// Always display the message
+	(*cinfo->err->output_message)(cinfo);
+
+	// cinfo->err really points to a irr_error_mgr struct
+	irr_jpeg_error_mgr *myerr = (irr_jpeg_error_mgr *)cinfo->err;
+
+	longjmp(myerr->setjmp_buffer, 1);
+}
+
+void CImageLoaderJPG::output_message(j_common_ptr cinfo)
+{
+	// display the error message.
+	c8 temp1[JMSG_LENGTH_MAX];
+	(*cinfo->err->format_message)(cinfo, temp1);
+	core::stringc errMsg("JPEG FATAL ERROR in ");
+
+	irr_jpeg_error_mgr *myerr = (irr_jpeg_error_mgr *)cinfo->err;
+	errMsg += *myerr->filename;
+	os::Printer::log(errMsg.c_str(), temp1, ELL_ERROR);
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+bool CImageLoaderJPG::isALoadableFileFormat(io::IReadFile *file) const
+{
+	if (!(file && file->seek(0)))
+		return false;
+	unsigned char header[3];
+	size_t headerLen = file->read(header, sizeof(header));
+	return headerLen >= 3 && !memcmp(header, "\xFF\xD8\xFF", 3);
+}
+
+//! creates a surface from the file
+IImage *CImageLoaderJPG::loadImage(io::IReadFile *file) const
+{
+	if (!file)
+		return 0;
+
+	core::stringc filename = file->getFileName();
+
+	u8 **rowPtr = 0;
+	u8 *input = new u8[file->getSize()];
+	file->read(input, file->getSize());
+
+	// allocate and initialize JPEG decompression object
+	struct jpeg_decompress_struct cinfo;
+	struct irr_jpeg_error_mgr jerr;
+
+	// We have to set up the error handler first, in case the initialization
+	// step fails.  (Unlikely, but it could happen if you are out of memory.)
+	// This routine fills in the contents of struct jerr, and returns jerr's
+	// address which we place into the link field in cinfo.
+
+	cinfo.err = jpeg_std_error(&jerr.pub);
+	cinfo.err->error_exit = error_exit;
+	cinfo.err->output_message = output_message;
+	jerr.filename = &filename;
+
+	// compatibility fudge:
+	// we need to use setjmp/longjmp for error handling as gcc-linux
+	// crashes when throwing within external c code
+	if (setjmp(jerr.setjmp_buffer)) {
+		// If we get here, the JPEG code has signaled an error.
+		// We need to clean up the JPEG object and return.
+
+		jpeg_destroy_decompress(&cinfo);
+
+		delete[] input;
+		delete[] rowPtr;
+
+		// return null pointer
+		return 0;
+	}
+
+	// Now we can initialize the JPEG decompression object.
+	jpeg_create_decompress(&cinfo);
+
+	// specify data source
+	jpeg_source_mgr jsrc;
+
+	// Set up data pointer
+	jsrc.bytes_in_buffer = file->getSize();
+	jsrc.next_input_byte = (JOCTET *)input;
+	cinfo.src = &jsrc;
+
+	jsrc.init_source = init_source;
+	jsrc.fill_input_buffer = fill_input_buffer;
+	jsrc.skip_input_data = skip_input_data;
+	jsrc.resync_to_restart = jpeg_resync_to_restart;
+	jsrc.term_source = term_source;
+
+	// Decodes JPG input from whatever source
+	// Does everything AFTER jpeg_create_decompress
+	// and BEFORE jpeg_destroy_decompress
+	// Caller is responsible for arranging these + setting up cinfo
+
+	// read file parameters with jpeg_read_header()
+	jpeg_read_header(&cinfo, TRUE);
+
+	bool useCMYK = false;
+	if (cinfo.jpeg_color_space == JCS_CMYK) {
+		cinfo.out_color_space = JCS_CMYK;
+		cinfo.out_color_components = 4;
+		useCMYK = true;
+	} else {
+		cinfo.out_color_space = JCS_RGB;
+		cinfo.out_color_components = 3;
+	}
+	cinfo.output_gamma = 2.2;
+	cinfo.do_fancy_upsampling = FALSE;
+
+	// reject unreasonable sizes
+	if (!checkImageDimensions(cinfo.image_width, cinfo.image_height))
+		longjmp(jerr.setjmp_buffer, 1);
+
+	// Start decompressor
+	jpeg_start_decompress(&cinfo);
+
+	// Get image data
+	u32 rowspan = cinfo.image_width * cinfo.out_color_components;
+	u32 width = cinfo.image_width;
+	u32 height = cinfo.image_height;
+
+	// Allocate memory for buffer
+	u8 *output = new u8[rowspan * height];
+
+	// Here we use the library's state variable cinfo.output_scanline as the
+	// loop counter, so that we don't have to keep track ourselves.
+	// Create array of row pointers for lib
+	rowPtr = new u8 *[height];
+
+	for (u32 i = 0; i < height; i++)
+		rowPtr[i] = &output[i * rowspan];
+
+	u32 rowsRead = 0;
+
+	while (cinfo.output_scanline < cinfo.output_height)
+		rowsRead += jpeg_read_scanlines(&cinfo, &rowPtr[rowsRead], cinfo.output_height - rowsRead);
+
+	delete[] rowPtr;
+	// Finish decompression
+
+	jpeg_finish_decompress(&cinfo);
+
+	// Release JPEG decompression object
+	// This is an important step since it will release a good deal of memory.
+	jpeg_destroy_decompress(&cinfo);
+
+	// convert image
+	IImage *image = 0;
+	if (useCMYK) {
+		image = new CImage(ECF_R8G8B8,
+				core::dimension2d<u32>(width, height));
+		const u32 size = 3 * width * height;
+		u8 *data = (u8 *)image->getData();
+		if (data) {
+			for (u32 i = 0, j = 0; i < size; i += 3, j += 4) {
+				// Also works without K, but has more contrast with K multiplied in
+				//				data[i+0] = output[j+2];
+				//				data[i+1] = output[j+1];
+				//				data[i+2] = output[j+0];
+				data[i + 0] = (char)(output[j + 2] * (output[j + 3] / 255.f));
+				data[i + 1] = (char)(output[j + 1] * (output[j + 3] / 255.f));
+				data[i + 2] = (char)(output[j + 0] * (output[j + 3] / 255.f));
+			}
+		}
+		delete[] output;
+	} else
+		image = new CImage(ECF_R8G8B8,
+				core::dimension2d<u32>(width, height), output);
+
+	delete[] input;
+
+	return image;
+}
+
+//! creates a loader which is able to load jpeg images
+IImageLoader *createImageLoaderJPG()
+{
+	return new CImageLoaderJPG();
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderJPG.h b/irr/src/CImageLoaderJPG.h
new file mode 100644
index 000000000..921a46a25
--- /dev/null
+++ b/irr/src/CImageLoaderJPG.h
@@ -0,0 +1,87 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImageLoader.h"
+
+#include <cstdio>    // required for jpeglib.h
+#include <jpeglib.h> // use system lib
+#include <setjmp.h>
+
+namespace irr
+{
+namespace video
+{
+
+//! Surface Loader for JPG images
+class CImageLoaderJPG : public IImageLoader
+{
+public:
+	//! constructor
+	CImageLoaderJPG();
+
+	//! destructor
+	virtual ~CImageLoaderJPG();
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".tga")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! returns true if the file maybe is able to be loaded by this class
+	bool isALoadableFileFormat(io::IReadFile *file) const override;
+
+	//! creates a surface from the file
+	IImage *loadImage(io::IReadFile *file) const override;
+
+private:
+	// several methods used via function pointers by jpeglib
+
+	/* Receives control for a fatal error. Information sufficient to
+	generate the error message has been stored in cinfo->err; call
+	output_message to display it. Control must NOT return to the caller;
+	generally this routine will exit() or longjmp() somewhere.
+	Typically you would override this routine to get rid of the exit()
+	default behavior. Note that if you continue processing, you should
+	clean up the JPEG object with jpeg_abort() or jpeg_destroy().
+	*/
+	static void error_exit(j_common_ptr cinfo);
+
+	/* output error messages via Irrlicht logger. */
+	static void output_message(j_common_ptr cinfo);
+
+	/* Initialize source. This is called by jpeg_read_header() before any
+	data is actually read. Unlike init_destination(), it may leave
+	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
+	will occur immediately). */
+	static void init_source(j_decompress_ptr cinfo);
+
+	/* This is called whenever bytes_in_buffer has reached zero and more
+	data is wanted. In typical applications, it should read fresh data
+	into the buffer (ignoring the current state of next_input_byte and
+	bytes_in_buffer), reset the pointer & count to the start of the
+	buffer, and return TRUE indicating that the buffer has been reloaded.
+	It is not necessary to fill the buffer entirely, only to obtain at
+	least one more byte. bytes_in_buffer MUST be set to a positive value
+	if TRUE is returned. A FALSE return should only be used when I/O
+	suspension is desired (this mode is discussed in the next section). */
+	static boolean fill_input_buffer(j_decompress_ptr cinfo);
+
+	/* Skip num_bytes worth of data. The buffer pointer and count should
+	be advanced over num_bytes input bytes, refilling the buffer as
+	needed. This is used to skip over a potentially large amount of
+	uninteresting data (such as an APPn marker). In some applications
+	it may be possible to optimize away the reading of the skipped data,
+	but it's not clear that being smart is worth much trouble; large
+	skips are uncommon. bytes_in_buffer may be zero on return.
+	A zero or negative skip count should be treated as a no-op. */
+	static void skip_input_data(j_decompress_ptr cinfo, long num_bytes);
+
+	/* Terminate source --- called by jpeg_finish_decompress() after all
+	data has been read. Often a no-op. */
+	static void term_source(j_decompress_ptr cinfo);
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderPNG.cpp b/irr/src/CImageLoaderPNG.cpp
new file mode 100644
index 000000000..69a283890
--- /dev/null
+++ b/irr/src/CImageLoaderPNG.cpp
@@ -0,0 +1,254 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageLoaderPNG.h"
+
+#include <png.h> // use system lib png
+
+#include "CImage.h"
+#include "CReadFile.h"
+#include "os.h"
+
+namespace irr
+{
+namespace video
+{
+
+// PNG function for error handling
+static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+{
+	io::IReadFile *file = reinterpret_cast<io::IReadFile *>(png_get_error_ptr(png_ptr));
+	std::string logmsg = std::string("PNG fatal error for ")
+			+ file->getFileName().c_str() + ": " + msg;
+	os::Printer::log(logmsg.c_str(), ELL_ERROR);
+	longjmp(png_jmpbuf(png_ptr), 1);
+}
+
+// PNG function for warning handling
+static void png_cpexcept_warn(png_structp png_ptr, png_const_charp msg)
+{
+	io::IReadFile *file = reinterpret_cast<io::IReadFile *>(png_get_error_ptr(png_ptr));
+	std::string logmsg = std::string("PNG warning for ")
+			+ file->getFileName().c_str() + ": " + msg;
+	os::Printer::log(logmsg.c_str(), ELL_WARNING);
+}
+
+// PNG function for file reading
+void PNGAPI user_read_data_fcn(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+	png_size_t check;
+
+	// changed by zola {
+	io::IReadFile *file = (io::IReadFile *)png_get_io_ptr(png_ptr);
+	check = (png_size_t)file->read((void *)data, length);
+	// }
+
+	if (check != length)
+		png_error(png_ptr, "Read Error");
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".tga")
+bool CImageLoaderPng::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "png");
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+bool CImageLoaderPng::isALoadableFileFormat(io::IReadFile *file) const
+{
+	if (!file)
+		return false;
+
+	png_byte buffer[8];
+	// Read the first few bytes of the PNG file
+	if (file->read(buffer, 8) != 8)
+		return false;
+
+	// Check if it really is a PNG file
+	return !png_sig_cmp(buffer, 0, 8);
+}
+
+// load in the image data
+IImage *CImageLoaderPng::loadImage(io::IReadFile *file) const
+{
+	if (!file)
+		return 0;
+
+	// Used to point to image rows
+	u8 **RowPointers = 0;
+
+	png_byte buffer[8];
+	// Read the first few bytes of the PNG file
+	if (file->read(buffer, 8) != 8) {
+		os::Printer::log("LOAD PNG: can't read file (filesize < 8)", file->getFileName(), ELL_ERROR);
+		return 0;
+	}
+
+	// Check if it really is a PNG file
+	if (png_sig_cmp(buffer, 0, 8)) {
+		os::Printer::log("LOAD PNG: not really a png (wrong signature)", file->getFileName(), ELL_ERROR);
+		return 0;
+	}
+
+	// Allocate the png read struct
+	png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+			file, (png_error_ptr)png_cpexcept_error, (png_error_ptr)png_cpexcept_warn);
+	if (!png_ptr) {
+		os::Printer::log("LOAD PNG: Internal PNG create read struct failure", file->getFileName(), ELL_ERROR);
+		return 0;
+	}
+
+	// Allocate the png info struct
+	png_infop info_ptr = png_create_info_struct(png_ptr);
+	if (!info_ptr) {
+		os::Printer::log("LOAD PNG: Internal PNG create info struct failure", file->getFileName(), ELL_ERROR);
+		png_destroy_read_struct(&png_ptr, NULL, NULL);
+		return 0;
+	}
+
+	// for proper error handling
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+		delete[] RowPointers;
+		return 0;
+	}
+
+	// changed by zola so we don't need to have public FILE pointers
+	png_set_read_fn(png_ptr, file, user_read_data_fcn);
+
+	png_set_sig_bytes(png_ptr, 8); // Tell png that we read the signature
+
+	png_read_info(png_ptr, info_ptr); // Read the info section of the png file
+
+	u32 Width;
+	u32 Height;
+	s32 BitDepth;
+	s32 ColorType;
+	{
+		// Use temporary variables to avoid passing cast pointers
+		png_uint_32 w, h;
+		// Extract info
+		png_get_IHDR(png_ptr, info_ptr,
+				&w, &h,
+				&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width = w;
+		Height = h;
+	}
+
+	if (!checkImageDimensions(Width, Height))
+		png_cpexcept_error(png_ptr, "Unreasonable size");
+
+	// Convert palette color to true color
+	if (ColorType == PNG_COLOR_TYPE_PALETTE)
+		png_set_palette_to_rgb(png_ptr);
+
+	// Convert low bit colors to 8 bit colors
+	if (BitDepth < 8) {
+		if (ColorType == PNG_COLOR_TYPE_GRAY || ColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
+			png_set_expand_gray_1_2_4_to_8(png_ptr);
+		else
+			png_set_packing(png_ptr);
+	}
+
+	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+		png_set_tRNS_to_alpha(png_ptr);
+
+	// Convert high bit colors to 8 bit colors
+	if (BitDepth == 16)
+		png_set_strip_16(png_ptr);
+
+	// Convert gray color to true color
+	if (ColorType == PNG_COLOR_TYPE_GRAY || ColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
+		png_set_gray_to_rgb(png_ptr);
+
+	int intent;
+	const double screen_gamma = 2.2;
+
+	if (png_get_sRGB(png_ptr, info_ptr, &intent))
+		png_set_gamma(png_ptr, screen_gamma, 0.45455);
+	else {
+		double image_gamma;
+		if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+			png_set_gamma(png_ptr, screen_gamma, image_gamma);
+		else
+			png_set_gamma(png_ptr, screen_gamma, 0.45455);
+	}
+
+	// Update the changes in between, as we need to get the new color type
+	// for proper processing of the RGBA type
+	png_read_update_info(png_ptr, info_ptr);
+	{
+		// Use temporary variables to avoid passing cast pointers
+		png_uint_32 w, h;
+		// Extract info
+		png_get_IHDR(png_ptr, info_ptr,
+				&w, &h,
+				&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width = w;
+		Height = h;
+	}
+
+	// Convert RGBA to BGRA
+	if (ColorType == PNG_COLOR_TYPE_RGB_ALPHA) {
+#ifdef __BIG_ENDIAN__
+		png_set_swap_alpha(png_ptr);
+#else
+		png_set_bgr(png_ptr);
+#endif
+	}
+
+	// Create the image structure to be filled by png data
+	video::IImage *image = 0;
+	if (ColorType == PNG_COLOR_TYPE_RGB_ALPHA)
+		image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(Width, Height));
+	else
+		image = new CImage(ECF_R8G8B8, core::dimension2d<u32>(Width, Height));
+	if (!image) {
+		os::Printer::log("LOAD PNG: Internal PNG create image struct failure", file->getFileName(), ELL_ERROR);
+		png_destroy_read_struct(&png_ptr, NULL, NULL);
+		return 0;
+	}
+
+	// Create array of pointers to rows in image data
+	RowPointers = new png_bytep[Height];
+	if (!RowPointers) {
+		os::Printer::log("LOAD PNG: Internal PNG create row pointers failure", file->getFileName(), ELL_ERROR);
+		png_destroy_read_struct(&png_ptr, NULL, NULL);
+		delete image;
+		return 0;
+	}
+
+	// Fill array of pointers to rows in image data
+	unsigned char *data = (unsigned char *)image->getData();
+	for (u32 i = 0; i < Height; ++i) {
+		RowPointers[i] = data;
+		data += image->getPitch();
+	}
+
+	// for proper error handling
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+		delete[] RowPointers;
+		delete image;
+		return 0;
+	}
+
+	// Read data using the library function that handles all transformations including interlacing
+	png_read_image(png_ptr, RowPointers);
+
+	png_read_end(png_ptr, NULL);
+	delete[] RowPointers;
+	png_destroy_read_struct(&png_ptr, &info_ptr, 0); // Clean up memory
+
+	return image;
+}
+
+IImageLoader *createImageLoaderPNG()
+{
+	return new CImageLoaderPng();
+}
+
+} // end namespace irr
+} // end namespace video
diff --git a/irr/src/CImageLoaderPNG.h b/irr/src/CImageLoaderPNG.h
new file mode 100644
index 000000000..f878320ba
--- /dev/null
+++ b/irr/src/CImageLoaderPNG.h
@@ -0,0 +1,34 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// this file was created by rt (www.tomkorp.com), based on ttk's png-reader
+// i wanted to be able to read in PNG images with irrlicht :)
+// why?  lossless compression with 8-bit alpha channel!
+
+#pragma once
+
+#include "IImageLoader.h"
+
+namespace irr
+{
+namespace video
+{
+
+//!  Surface Loader for PNG files
+class CImageLoaderPng : public IImageLoader
+{
+public:
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".png")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! returns true if the file maybe is able to be loaded by this class
+	bool isALoadableFileFormat(io::IReadFile *file) const override;
+
+	//! creates a surface from the file
+	IImage *loadImage(io::IReadFile *file) const override;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderTGA.cpp b/irr/src/CImageLoaderTGA.cpp
new file mode 100644
index 000000000..5b7cc6143
--- /dev/null
+++ b/irr/src/CImageLoaderTGA.cpp
@@ -0,0 +1,246 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageLoaderTGA.h"
+
+#include "IReadFile.h"
+#include "os.h"
+#include "CColorConverter.h"
+#include "CImage.h"
+#include "irrString.h"
+
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
+namespace irr
+{
+namespace video
+{
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".tga")
+bool CImageLoaderTGA::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "tga");
+}
+
+//! loads a compressed tga.
+u8 *CImageLoaderTGA::loadCompressedImage(io::IReadFile *file, const STGAHeader &header) const
+{
+	// This was written and sent in by Jon Pry, thank you very much!
+	// I only changed the formatting a little bit.
+
+	const u32 bytesPerPixel = header.PixelDepth / 8;
+	const u32 imageSize = header.ImageHeight * header.ImageWidth * bytesPerPixel;
+	u8 *data = new u8[imageSize];
+	u32 currentByte = 0;
+
+	while (currentByte < imageSize) {
+		u8 chunkheader = 0;
+		file->read(&chunkheader, sizeof(u8)); // Read The Chunk's Header
+
+		if (chunkheader < 128) { // If The Chunk Is A 'RAW' Chunk
+			chunkheader++; // Add 1 To The Value To Get Total Number Of Raw Pixels
+
+			const u32 bytesToRead = bytesPerPixel * chunkheader;
+			if (currentByte + bytesToRead <= imageSize) {
+				file->read(&data[currentByte], bytesToRead);
+				currentByte += bytesToRead;
+			} else {
+				os::Printer::log("Compressed TGA file RAW chunk tries writing beyond buffer", file->getFileName(), ELL_WARNING);
+				break;
+			}
+		} else {
+			// thnx to neojzs for some fixes with this code
+
+			// If It's An RLE Header
+			chunkheader -= 127; // Subtract 127 To Get Rid Of The ID Bit
+
+			u32 dataOffset = currentByte;
+			if (dataOffset + bytesPerPixel < imageSize) {
+				file->read(&data[dataOffset], bytesPerPixel);
+				currentByte += bytesPerPixel;
+			} else {
+				os::Printer::log("Compressed TGA file RLE headertries writing beyond buffer", file->getFileName(), ELL_WARNING);
+				break;
+			}
+
+			for (u32 counter = 1; counter < chunkheader; counter++) {
+				if (currentByte + bytesPerPixel <= imageSize) {
+					for (u32 elementCounter = 0; elementCounter < bytesPerPixel; elementCounter++) {
+						data[currentByte + elementCounter] = data[dataOffset + elementCounter];
+					}
+				}
+
+				currentByte += bytesPerPixel;
+			}
+		}
+	}
+
+	return data;
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+bool CImageLoaderTGA::isALoadableFileFormat(io::IReadFile *file) const
+{
+	if (!file)
+		return false;
+
+	STGAFooter footer;
+	memset(&footer, 0, sizeof(STGAFooter));
+	file->seek(file->getSize() - sizeof(STGAFooter));
+	file->read(&footer, sizeof(STGAFooter));
+	return (!strcmp(footer.Signature, "TRUEVISION-XFILE.")); // very old tgas are refused.
+}
+
+//! creates a surface from the file
+IImage *CImageLoaderTGA::loadImage(io::IReadFile *file) const
+{
+	STGAHeader header;
+	u32 *palette = 0;
+
+	file->read(&header, sizeof(STGAHeader));
+
+#ifdef __BIG_ENDIAN__
+	header.ColorMapLength = os::Byteswap::byteswap(header.ColorMapLength);
+	header.ImageWidth = os::Byteswap::byteswap(header.ImageWidth);
+	header.ImageHeight = os::Byteswap::byteswap(header.ImageHeight);
+#endif
+
+	if (!checkImageDimensions(header.ImageWidth, header.ImageHeight)) {
+		os::Printer::log("Image dimensions too large in file", file->getFileName(), ELL_ERROR);
+		return 0;
+	}
+
+	// skip image identification field
+	if (header.IdLength)
+		file->seek(header.IdLength, true);
+
+	if (header.ColorMapType) {
+		// Create 32 bit palette
+		// `core::max_()` is not used here because it takes its inputs as references. Since `header` is packed, use the macro `MAX()` instead:
+		const irr::u16 paletteSize = MAX((u16)256u, header.ColorMapLength); // ColorMapLength can lie, but so far we only use palette for 8-bit, so ensure it has 256 entries
+		palette = new u32[paletteSize];
+
+		if (paletteSize > header.ColorMapLength) {
+			// To catch images using palette colors with invalid indices
+			const irr::u32 errorCol = irr::video::SColor(255, 255, 0, 205).color; // bright magenta
+			for (irr::u16 i = header.ColorMapLength; i < paletteSize; ++i)
+				palette[i] = errorCol;
+		}
+
+		// read color map
+		u8 *colorMap = new u8[header.ColorMapEntrySize / 8 * header.ColorMapLength];
+		file->read(colorMap, header.ColorMapEntrySize / 8 * header.ColorMapLength);
+
+		// convert to 32-bit palette
+		switch (header.ColorMapEntrySize) {
+		case 16:
+			CColorConverter::convert_A1R5G5B5toA8R8G8B8(colorMap, header.ColorMapLength, palette);
+			break;
+		case 24:
+			CColorConverter::convert_B8G8R8toA8R8G8B8(colorMap, header.ColorMapLength, palette);
+			break;
+		case 32:
+			CColorConverter::convert_B8G8R8A8toA8R8G8B8(colorMap, header.ColorMapLength, palette);
+			break;
+		}
+		delete[] colorMap;
+	}
+
+	// read image
+
+	u8 *data = 0;
+
+	if (header.ImageType == 1 ||     // Uncompressed, color-mapped images.
+			header.ImageType == 2 || // Uncompressed, RGB images
+			header.ImageType == 3    // Uncompressed, black and white images
+	) {
+		const s32 imageSize = header.ImageHeight * header.ImageWidth * (header.PixelDepth / 8);
+		data = new u8[imageSize];
+		file->read(data, imageSize);
+	} else if (header.ImageType == 10) {
+		// Runlength encoded RGB images
+		data = loadCompressedImage(file, header);
+	} else {
+		os::Printer::log("Unsupported TGA file type", file->getFileName(), ELL_ERROR);
+		delete[] palette;
+		return 0;
+	}
+
+	IImage *image = 0;
+
+	switch (header.PixelDepth) {
+	case 8: {
+		if (header.ImageType == 3) { // grey image
+			image = new CImage(ECF_R8G8B8,
+					core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+			if (image)
+				CColorConverter::convert8BitTo24Bit((u8 *)data,
+						(u8 *)image->getData(),
+						header.ImageWidth, header.ImageHeight,
+						0, 0, (header.ImageDescriptor & 0x20) == 0);
+		} else {
+			switch (header.ColorMapEntrySize) {
+			case 16:
+				image = new CImage(ECF_A1R5G5B5, core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+				if (image)
+					CColorConverter::convert8BitTo16Bit((u8 *)data,
+							(s16 *)image->getData(),
+							header.ImageWidth, header.ImageHeight,
+							(s32 *)palette, 0,
+							(header.ImageDescriptor & 0x20) == 0);
+				break;
+			// Note: 24 bit with palette would need a 24 bit palette, too lazy doing that now (textures will prefer 32-bit later anyway)
+			default:
+				image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+				if (image)
+					CColorConverter::convert8BitTo32Bit((u8 *)data,
+							(u8 *)image->getData(),
+							header.ImageWidth, header.ImageHeight,
+							(u8 *)palette, 0,
+							(header.ImageDescriptor & 0x20) == 0);
+				break;
+			}
+		}
+	} break;
+	case 16:
+		image = new CImage(ECF_A1R5G5B5,
+				core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+		if (image)
+			CColorConverter::convert16BitTo16Bit((s16 *)data,
+					(s16 *)image->getData(), header.ImageWidth, header.ImageHeight, 0, (header.ImageDescriptor & 0x20) == 0);
+		break;
+	case 24:
+		image = new CImage(ECF_R8G8B8,
+				core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+		if (image)
+			CColorConverter::convert24BitTo24Bit(
+					(u8 *)data, (u8 *)image->getData(), header.ImageWidth, header.ImageHeight, 0, (header.ImageDescriptor & 0x20) == 0, true);
+		break;
+	case 32:
+		image = new CImage(ECF_A8R8G8B8,
+				core::dimension2d<u32>(header.ImageWidth, header.ImageHeight));
+		if (image)
+			CColorConverter::convert32BitTo32Bit((s32 *)data,
+					(s32 *)image->getData(), header.ImageWidth, header.ImageHeight, 0, (header.ImageDescriptor & 0x20) == 0);
+		break;
+	default:
+		os::Printer::log("Unsupported TGA format", file->getFileName(), ELL_ERROR);
+		break;
+	}
+
+	delete[] data;
+	delete[] palette;
+
+	return image;
+}
+
+//! creates a loader which is able to load tgas
+IImageLoader *createImageLoaderTGA()
+{
+	return new CImageLoaderTGA();
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageLoaderTGA.h b/irr/src/CImageLoaderTGA.h
new file mode 100644
index 000000000..18930da3d
--- /dev/null
+++ b/irr/src/CImageLoaderTGA.h
@@ -0,0 +1,66 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImageLoader.h"
+
+namespace irr
+{
+namespace video
+{
+
+// byte-align structures
+#include "irrpack.h"
+
+// these structs are also used in the TGA writer
+struct STGAHeader
+{
+	u8 IdLength;
+	u8 ColorMapType;
+	u8 ImageType;
+	u8 FirstEntryIndex[2];
+	u16 ColorMapLength;
+	u8 ColorMapEntrySize;
+	u8 XOrigin[2];
+	u8 YOrigin[2];
+	u16 ImageWidth;
+	u16 ImageHeight;
+	u8 PixelDepth;
+	u8 ImageDescriptor;
+} PACK_STRUCT;
+
+struct STGAFooter
+{
+	u32 ExtensionOffset;
+	u32 DeveloperOffset;
+	c8 Signature[18];
+} PACK_STRUCT;
+
+// Default alignment
+#include "irrunpack.h"
+
+/*!
+	Surface Loader for targa images
+*/
+class CImageLoaderTGA : public IImageLoader
+{
+public:
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".tga")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! returns true if the file maybe is able to be loaded by this class
+	bool isALoadableFileFormat(io::IReadFile *file) const override;
+
+	//! creates a surface from the file
+	IImage *loadImage(io::IReadFile *file) const override;
+
+private:
+	//! loads a compressed tga. Was written and sent in by Jon Pry, thank you very much!
+	u8 *loadCompressedImage(io::IReadFile *file, const STGAHeader &header) const;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/CImageWriterJPG.cpp b/irr/src/CImageWriterJPG.cpp
new file mode 100644
index 000000000..574e46041
--- /dev/null
+++ b/irr/src/CImageWriterJPG.cpp
@@ -0,0 +1,195 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageWriterJPG.h"
+
+#include "CColorConverter.h"
+#include "IWriteFile.h"
+#include "CImage.h"
+#include "irrString.h"
+#include "os.h"
+
+#include <cstdio> // required for jpeglib.h
+extern "C" {
+#include <jpeglib.h>
+#include <jerror.h>
+}
+
+namespace irr
+{
+namespace video
+{
+
+// The writer uses a 4k buffer and flushes to disk each time it's filled
+#define OUTPUT_BUF_SIZE 4096
+typedef struct
+{
+	struct jpeg_destination_mgr pub; /* public fields */
+
+	io::IWriteFile *file;           /* target file */
+	JOCTET buffer[OUTPUT_BUF_SIZE]; /* image buffer */
+} mem_destination_mgr;
+
+typedef mem_destination_mgr *mem_dest_ptr;
+
+// init
+static void jpeg_init_destination(j_compress_ptr cinfo)
+{
+	mem_dest_ptr dest = (mem_dest_ptr)cinfo->dest;
+	dest->pub.next_output_byte = dest->buffer;
+	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+}
+
+// flush to disk and reset buffer
+static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo)
+{
+	mem_dest_ptr dest = (mem_dest_ptr)cinfo->dest;
+
+	// for now just exit upon file error
+	if (dest->file->write(dest->buffer, OUTPUT_BUF_SIZE) != OUTPUT_BUF_SIZE)
+		ERREXIT(cinfo, JERR_FILE_WRITE);
+
+	dest->pub.next_output_byte = dest->buffer;
+	dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+
+	return TRUE;
+}
+
+static void jpeg_term_destination(j_compress_ptr cinfo)
+{
+	mem_dest_ptr dest = (mem_dest_ptr)cinfo->dest;
+	const size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+	// for now just exit upon file error
+	if (dest->file->write(dest->buffer, datacount) != datacount)
+		ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+// set up buffer data
+static void jpeg_file_dest(j_compress_ptr cinfo, io::IWriteFile *file)
+{
+	if (cinfo->dest == NULL) { /* first time for this JPEG object? */
+		cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr)cinfo,
+				JPOOL_PERMANENT,
+				sizeof(mem_destination_mgr));
+	}
+
+	mem_dest_ptr dest = (mem_dest_ptr)cinfo->dest; /* for casting */
+
+	/* Initialize method pointers */
+	dest->pub.init_destination = jpeg_init_destination;
+	dest->pub.empty_output_buffer = jpeg_empty_output_buffer;
+	dest->pub.term_destination = jpeg_term_destination;
+
+	/* Initialize private member */
+	dest->file = file;
+}
+
+/* write_JPEG_memory: store JPEG compressed image into memory.
+ */
+static bool writeJPEGFile(io::IWriteFile *file, IImage *image, u32 quality)
+{
+	void (*format)(const void *, s32, void *) = 0;
+	switch (image->getColorFormat()) {
+	case ECF_R8G8B8:
+		format = CColorConverter::convert_R8G8B8toR8G8B8;
+		break;
+	case ECF_A8R8G8B8:
+		format = CColorConverter::convert_A8R8G8B8toR8G8B8;
+		break;
+	case ECF_A1R5G5B5:
+		format = CColorConverter::convert_A1R5G5B5toB8G8R8;
+		break;
+	case ECF_R5G6B5:
+		format = CColorConverter::convert_R5G6B5toR8G8B8;
+		break;
+	default:
+		os::Printer::log("writeJPEGFile does not support image format", ColorFormatNames[image->getColorFormat()], ELL_WARNING);
+		break;
+	}
+
+	// couldn't find a color converter
+	if (0 == format)
+		return false;
+
+	const core::dimension2du dim = image->getDimension();
+
+	struct jpeg_compress_struct cinfo;
+	struct jpeg_error_mgr jerr;
+	cinfo.err = jpeg_std_error(&jerr);
+
+	jpeg_create_compress(&cinfo);
+	jpeg_file_dest(&cinfo, file);
+	cinfo.image_width = dim.Width;
+	cinfo.image_height = dim.Height;
+	cinfo.input_components = 3;
+	cinfo.in_color_space = JCS_RGB;
+
+	jpeg_set_defaults(&cinfo);
+
+	if (0 == quality)
+		quality = 75;
+
+	jpeg_set_quality(&cinfo, quality, TRUE);
+	jpeg_start_compress(&cinfo, TRUE);
+
+	u8 *dest = new u8[dim.Width * 3];
+
+	if (dest) {
+		const u32 pitch = image->getPitch();
+		JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
+		row_pointer[0] = dest;
+
+		u8 *src = (u8 *)image->getData();
+
+		while (cinfo.next_scanline < cinfo.image_height) {
+			// convert next line
+			format(src, dim.Width, dest);
+			src += pitch;
+			jpeg_write_scanlines(&cinfo, row_pointer, 1);
+		}
+
+		delete[] dest;
+
+		/* Step 6: Finish compression */
+		jpeg_finish_compress(&cinfo);
+	}
+
+	/* Step 7: Destroy */
+	jpeg_destroy_compress(&cinfo);
+
+	return (dest != 0);
+}
+
+} // namespace video
+} // namespace irr
+
+namespace irr
+{
+namespace video
+{
+
+IImageWriter *createImageWriterJPG()
+{
+	return new CImageWriterJPG;
+}
+
+CImageWriterJPG::CImageWriterJPG()
+{
+#ifdef _DEBUG
+	setDebugName("CImageWriterJPG");
+#endif
+}
+
+bool CImageWriterJPG::isAWriteableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "jpg", "jpeg");
+}
+
+bool CImageWriterJPG::writeImage(io::IWriteFile *file, IImage *image, u32 quality) const
+{
+	return writeJPEGFile(file, image, quality);
+}
+
+} // namespace video
+} // namespace irr
diff --git a/irr/src/CImageWriterJPG.h b/irr/src/CImageWriterJPG.h
new file mode 100644
index 000000000..1d8dde53f
--- /dev/null
+++ b/irr/src/CImageWriterJPG.h
@@ -0,0 +1,28 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImageWriter.h"
+
+namespace irr
+{
+namespace video
+{
+
+class CImageWriterJPG : public IImageWriter
+{
+public:
+	//! constructor
+	CImageWriterJPG();
+
+	//! return true if this writer can write a file with the given extension
+	bool isAWriteableFileExtension(const io::path &filename) const override;
+
+	//! write image to file
+	bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const override;
+};
+
+}
+}
diff --git a/irr/src/CImageWriterPNG.cpp b/irr/src/CImageWriterPNG.cpp
new file mode 100644
index 000000000..7bd3065c6
--- /dev/null
+++ b/irr/src/CImageWriterPNG.cpp
@@ -0,0 +1,196 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CImageWriterPNG.h"
+
+#include "CImageLoaderPNG.h"
+#include "CColorConverter.h"
+#include "IWriteFile.h"
+#include "irrString.h"
+#include "os.h" // for logging
+
+#include <png.h> // use system lib png
+
+namespace irr
+{
+namespace video
+{
+
+IImageWriter *createImageWriterPNG()
+{
+	return new CImageWriterPNG;
+}
+
+// PNG function for error handling
+static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+{
+	io::IWriteFile *file = reinterpret_cast<io::IWriteFile *>(png_get_error_ptr(png_ptr));
+	std::string logmsg = std::string("PNG fatal error for ")
+			+ file->getFileName().c_str() + ": " + msg;
+	os::Printer::log(logmsg.c_str(), ELL_ERROR);
+	longjmp(png_jmpbuf(png_ptr), 1);
+}
+
+// PNG function for warning handling
+static void png_cpexcept_warning(png_structp png_ptr, png_const_charp msg)
+{
+	io::IWriteFile *file = reinterpret_cast<io::IWriteFile *>(png_get_error_ptr(png_ptr));
+	std::string logmsg = std::string("PNG warning for ")
+			+ file->getFileName().c_str() + ": " + msg;
+	os::Printer::log(logmsg.c_str(), ELL_WARNING);
+}
+
+// PNG function for file writing
+void PNGAPI user_write_data_fcn(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+	png_size_t check;
+
+	io::IWriteFile *file = (io::IWriteFile *)png_get_io_ptr(png_ptr);
+	check = (png_size_t)file->write((const void *)data, length);
+
+	if (check != length)
+		png_error(png_ptr, "Write Error");
+}
+
+CImageWriterPNG::CImageWriterPNG()
+{
+#ifdef _DEBUG
+	setDebugName("CImageWriterPNG");
+#endif
+}
+
+bool CImageWriterPNG::isAWriteableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "png");
+}
+
+bool CImageWriterPNG::writeImage(io::IWriteFile *file, IImage *image, u32 param) const
+{
+	if (!file || !image)
+		return false;
+
+	// Allocate the png write struct
+	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+			file, (png_error_ptr)png_cpexcept_error, (png_error_ptr)png_cpexcept_warning);
+	if (!png_ptr) {
+		os::Printer::log("PNGWriter: Internal PNG create write struct failure", file->getFileName(), ELL_ERROR);
+		return false;
+	}
+
+	// Allocate the png info struct
+	png_infop info_ptr = png_create_info_struct(png_ptr);
+	if (!info_ptr) {
+		os::Printer::log("PNGWriter: Internal PNG create info struct failure", file->getFileName(), ELL_ERROR);
+		png_destroy_write_struct(&png_ptr, NULL);
+		return false;
+	}
+
+	// for proper error handling
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		return false;
+	}
+
+	png_set_write_fn(png_ptr, file, user_write_data_fcn, NULL);
+
+	// Set info
+	switch (image->getColorFormat()) {
+	case ECF_A8R8G8B8:
+	case ECF_A1R5G5B5:
+		png_set_IHDR(png_ptr, info_ptr,
+				image->getDimension().Width, image->getDimension().Height,
+				8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+				PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+		break;
+	default:
+		png_set_IHDR(png_ptr, info_ptr,
+				image->getDimension().Width, image->getDimension().Height,
+				8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+				PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	}
+
+	s32 lineWidth = image->getDimension().Width;
+	switch (image->getColorFormat()) {
+	case ECF_R8G8B8:
+	case ECF_R5G6B5:
+		lineWidth *= 3;
+		break;
+	case ECF_A8R8G8B8:
+	case ECF_A1R5G5B5:
+		lineWidth *= 4;
+		break;
+	// TODO: Error handling in case of unsupported color format
+	default:
+		break;
+	}
+	u8 *tmpImage = new u8[image->getDimension().Height * lineWidth];
+	if (!tmpImage) {
+		os::Printer::log("PNGWriter: Internal PNG create image failure", file->getFileName(), ELL_ERROR);
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		return false;
+	}
+
+	u8 *data = (u8 *)image->getData();
+	switch (image->getColorFormat()) {
+	case ECF_R8G8B8:
+		CColorConverter::convert_R8G8B8toR8G8B8(data, image->getDimension().Height * image->getDimension().Width, tmpImage);
+		break;
+	case ECF_A8R8G8B8:
+		CColorConverter::convert_A8R8G8B8toA8R8G8B8(data, image->getDimension().Height * image->getDimension().Width, tmpImage);
+		break;
+	case ECF_R5G6B5:
+		CColorConverter::convert_R5G6B5toR8G8B8(data, image->getDimension().Height * image->getDimension().Width, tmpImage);
+		break;
+	case ECF_A1R5G5B5:
+		CColorConverter::convert_A1R5G5B5toA8R8G8B8(data, image->getDimension().Height * image->getDimension().Width, tmpImage);
+		break;
+		// TODO: Error handling in case of unsupported color format
+	default:
+		os::Printer::log("CImageWriterPNG does not support image format", ColorFormatNames[image->getColorFormat()], ELL_WARNING);
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		delete[] tmpImage;
+		return false;
+	}
+
+	// Create array of pointers to rows in image data
+
+	// Used to point to image rows
+	u8 **RowPointers = new png_bytep[image->getDimension().Height];
+	if (!RowPointers) {
+		os::Printer::log("PNGWriter: Internal PNG create row pointers failure", file->getFileName(), ELL_ERROR);
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		delete[] tmpImage;
+		return false;
+	}
+
+	data = tmpImage;
+	// Fill array of pointers to rows in image data
+	for (u32 i = 0; i < image->getDimension().Height; ++i) {
+		RowPointers[i] = data;
+		data += lineWidth;
+	}
+	// for proper error handling
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		delete[] RowPointers;
+		delete[] tmpImage;
+		return false;
+	}
+
+	png_set_rows(png_ptr, info_ptr, RowPointers);
+
+	if (image->getColorFormat() == ECF_A8R8G8B8 || image->getColorFormat() == ECF_A1R5G5B5)
+		png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, NULL);
+	else {
+		png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+	}
+
+	delete[] RowPointers;
+	delete[] tmpImage;
+	png_destroy_write_struct(&png_ptr, &info_ptr);
+	return true;
+}
+
+} // namespace video
+} // namespace irr
diff --git a/irr/src/CImageWriterPNG.h b/irr/src/CImageWriterPNG.h
new file mode 100644
index 000000000..b0f7348ee
--- /dev/null
+++ b/irr/src/CImageWriterPNG.h
@@ -0,0 +1,28 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IImageWriter.h"
+
+namespace irr
+{
+namespace video
+{
+
+class CImageWriterPNG : public IImageWriter
+{
+public:
+	//! constructor
+	CImageWriterPNG();
+
+	//! return true if this writer can write a file with the given extension
+	bool isAWriteableFileExtension(const io::path &filename) const override;
+
+	//! write image to file
+	bool writeImage(io::IWriteFile *file, IImage *image, u32 param) const override;
+};
+
+} // namespace video
+} // namespace irr
diff --git a/irr/src/CIrrDeviceLinux.cpp b/irr/src/CIrrDeviceLinux.cpp
new file mode 100644
index 000000000..71eb0f260
--- /dev/null
+++ b/irr/src/CIrrDeviceLinux.cpp
@@ -0,0 +1,2244 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CIrrDeviceLinux.h"
+
+#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
+
+#include <cstdio>
+#include <cstdlib>
+#include <sys/utsname.h>
+#include <ctime>
+#include <clocale>
+#include "IEventReceiver.h"
+#include "ISceneManager.h"
+#include "IGUIElement.h"
+#include "IGUIEnvironment.h"
+#include "os.h"
+#include "CTimer.h"
+#include "irrString.h"
+#include "Keycodes.h"
+#include "COSOperator.h"
+#include "CColorConverter.h"
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IGUISpriteBank.h"
+#include "IImageLoader.h"
+#include "IFileSystem.h"
+#include <X11/XKBlib.h>
+#include <X11/Xatom.h>
+
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+#include <X11/extensions/XInput2.h>
+#endif
+
+#if defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
+#include "CEGLManager.h"
+#endif
+
+#if defined(_IRR_COMPILE_WITH_OPENGL_)
+#include "CGLXManager.h"
+#endif
+
+#ifdef _IRR_LINUX_XCURSOR_
+#include <X11/Xcursor/Xcursor.h>
+#endif
+
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifdef __FreeBSD__
+#include <sys/joystick.h>
+#else
+
+// linux/joystick.h includes linux/input.h, which #defines values for various KEY_FOO keys.
+// These override the irr::KEY_FOO equivalents, which stops key handling from working.
+// As a workaround, defining _INPUT_H stops linux/input.h from being included; it
+// doesn't actually seem to be necessary except to pull in sys/ioctl.h.
+#define _INPUT_H
+#include <sys/ioctl.h> // Would normally be included in linux/input.h
+#include <linux/joystick.h>
+#undef _INPUT_H
+#endif
+
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+namespace irr
+{
+namespace video
+{
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+IVideoDriver *createOpenGLDriver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+IVideoDriver *createOGLES1Driver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+IVideoDriver *createOGLES2Driver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_WEBGL1_
+IVideoDriver *createWebGL1Driver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+}
+} // end namespace irr
+
+namespace
+{
+Atom X_ATOM_CLIPBOARD;
+Atom X_ATOM_TARGETS;
+Atom X_ATOM_UTF8_STRING;
+Atom X_ATOM_UTF8_MIME_TYPE;
+Atom X_ATOM_TEXT;
+Atom X_ATOM_NETWM_MAXIMIZE_VERT;
+Atom X_ATOM_NETWM_MAXIMIZE_HORZ;
+Atom X_ATOM_NETWM_STATE;
+Atom X_ATOM_NETWM_STATE_FULLSCREEN;
+
+Atom X_ATOM_WM_DELETE_WINDOW;
+
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+int XI_EXTENSIONS_OPCODE;
+#endif
+}
+
+namespace irr
+{
+//! constructor
+CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters &param) :
+		CIrrDeviceStub(param),
+#ifdef _IRR_COMPILE_WITH_X11_
+		XDisplay(0), VisualInfo(0), Screennr(0), XWindow(0), StdHints(0),
+		XInputMethod(0), XInputContext(0),
+		HasNetWM(false),
+#endif
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+		currentTouchedCount(0),
+#endif
+		Width(param.WindowSize.Width), Height(param.WindowSize.Height),
+		WindowHasFocus(false), WindowMinimized(false), WindowMaximized(param.WindowMaximized),
+		ExternalWindow(false), AutorepeatSupport(0)
+{
+#ifdef _DEBUG
+	setDebugName("CIrrDeviceLinux");
+#endif
+
+	// print version, distribution etc.
+	// thx to LynxLuna for pointing me to the uname function
+	core::stringc linuxversion;
+	struct utsname LinuxInfo;
+	uname(&LinuxInfo);
+
+	linuxversion += LinuxInfo.sysname;
+	linuxversion += " ";
+	linuxversion += LinuxInfo.release;
+	linuxversion += " ";
+	linuxversion += LinuxInfo.version;
+	linuxversion += " ";
+	linuxversion += LinuxInfo.machine;
+
+	Operator = new COSOperator(linuxversion, this);
+	os::Printer::log(linuxversion.c_str(), ELL_INFORMATION);
+
+	// create keymap
+	createKeyMap();
+
+	// initialize X11 thread safety
+	// libX11 1.8+ has this on by default
+	// without it, multi-threaded GL drivers may crash
+	XInitThreads();
+
+	// create window
+	if (CreationParams.DriverType != video::EDT_NULL) {
+		// create the window, only if we do not use the null device
+		if (!createWindow())
+			return;
+		if (param.WindowResizable < 2)
+			setResizable(param.WindowResizable == 1 ? true : false);
+#ifdef _IRR_COMPILE_WITH_X11_
+		createInputContext();
+#endif
+	}
+
+	// create cursor control
+	CursorControl = new CCursorControl(this, CreationParams.DriverType == video::EDT_NULL);
+
+	// create driver
+	createDriver();
+
+	if (!VideoDriver)
+		return;
+
+	createGUIAndScene();
+
+	if (param.WindowMaximized)
+		maximizeWindow();
+
+	setupTopLevelXorgWindow();
+}
+
+//! destructor
+CIrrDeviceLinux::~CIrrDeviceLinux()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (StdHints)
+		XFree(StdHints);
+	// Disable cursor (it is drop'ed in stub)
+	if (CursorControl) {
+		CursorControl->setVisible(false);
+		static_cast<CCursorControl *>(CursorControl)->clearCursors();
+	}
+
+	// Must free OpenGL textures etc before destroying context, so can't wait for stub destructor
+	if (GUIEnvironment) {
+		GUIEnvironment->drop();
+		GUIEnvironment = NULL;
+	}
+	if (SceneManager) {
+		SceneManager->drop();
+		SceneManager = NULL;
+	}
+	if (VideoDriver) {
+		VideoDriver->drop();
+		VideoDriver = NULL;
+	}
+
+	destroyInputContext();
+
+	if (XDisplay) {
+		if (ContextManager) {
+			ContextManager->destroyContext();
+			ContextManager->destroySurface();
+		}
+
+		if (!ExternalWindow) {
+			XDestroyWindow(XDisplay, XWindow);
+			XCloseDisplay(XDisplay);
+		}
+	}
+	if (VisualInfo)
+		XFree(VisualInfo);
+
+#endif // #ifdef _IRR_COMPILE_WITH_X11_
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	for (u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		if (ActiveJoysticks[joystick].fd >= 0) {
+			close(ActiveJoysticks[joystick].fd);
+		}
+	}
+#endif
+}
+
+#if defined(_IRR_COMPILE_WITH_X11_) && defined(_DEBUG)
+int IrrPrintXError(Display *display, XErrorEvent *event)
+{
+	char msg[256];
+	char msg2[256];
+
+	snprintf_irr(msg, 256, "%d", event->request_code);
+	XGetErrorDatabaseText(display, "XRequest", msg, "unknown", msg2, 256);
+	XGetErrorText(display, event->error_code, msg, 256);
+	os::Printer::log("X Error", msg, ELL_WARNING);
+	os::Printer::log("From call ", msg2, ELL_WARNING);
+	return 0;
+}
+#endif
+
+bool CIrrDeviceLinux::switchToFullscreen()
+{
+	if (!CreationParams.Fullscreen)
+		return true;
+
+	if (!HasNetWM) {
+		os::Printer::log("NetWM support is required to allow Irrlicht to switch "
+						 "to fullscreen mode. Running in windowed mode instead.",
+				ELL_WARNING);
+		CreationParams.Fullscreen = false;
+		return false;
+	}
+
+	XEvent ev = {0};
+
+	ev.type = ClientMessage;
+	ev.xclient.window = XWindow;
+	ev.xclient.message_type = X_ATOM_NETWM_STATE;
+	ev.xclient.format = 32;
+	ev.xclient.data.l[0] = 1; // _NET_WM_STATE_ADD
+	ev.xclient.data.l[1] = X_ATOM_NETWM_STATE_FULLSCREEN;
+
+	XSendEvent(XDisplay, DefaultRootWindow(XDisplay), false,
+			SubstructureNotifyMask | SubstructureRedirectMask, &ev);
+
+	return true;
+}
+
+void CIrrDeviceLinux::setupTopLevelXorgWindow()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (CreationParams.DriverType == video::EDT_NULL)
+		return; // no display and window
+
+	os::Printer::log("Configuring X11-specific top level window properties", ELL_DEBUG);
+
+	// Set application name and class hints. For now name and class are the same.
+	// Note: SDL uses the executable name here (i.e. "minetest").
+	XClassHint *classhint = XAllocClassHint();
+	classhint->res_name = const_cast<char *>("Minetest");
+	classhint->res_class = const_cast<char *>("Minetest");
+
+	XSetClassHint(XDisplay, XWindow, classhint);
+	XFree(classhint);
+
+	// FIXME: In the future WMNormalHints should be set ... e.g see the
+	// gtk/gdk code (gdk/x11/gdksurface-x11.c) for the setup_top_level
+	// method. But for now (as it would require some significant changes)
+	// leave the code as is.
+
+	// The following is borrowed from the above gdk source for setting top
+	// level windows. The source indicates and the Xlib docs suggest that
+	// this will set the WM_CLIENT_MACHINE and WM_LOCAL_NAME. This will not
+	// set the WM_CLIENT_MACHINE to a Fully Qualified Domain Name (FQDN) which is
+	// required by the Extended Window Manager Hints (EWMH) spec when setting
+	// the _NET_WM_PID (see further down) but running Minetest in an env
+	// where the window manager is on another machine from Minetest (therefore
+	// making the PID useless) is not expected to be a problem. Further
+	// more, using gtk/gdk as the model it would seem that not using a FQDN is
+	// not an issue for modern Xorg window managers.
+
+	os::Printer::log("Setting Xorg window manager Properties", ELL_DEBUG);
+
+	XSetWMProperties(XDisplay, XWindow, NULL, NULL, NULL, 0, NULL, NULL, NULL);
+
+	// Set the _NET_WM_PID window property according to the EWMH spec. _NET_WM_PID
+	// (in conjunction with WM_CLIENT_MACHINE) can be used by window managers to
+	// force a shutdown of an application if it doesn't respond to the destroy
+	// window message.
+
+	os::Printer::log("Setting Xorg _NET_WM_PID extended window manager property", ELL_DEBUG);
+
+	Atom NET_WM_PID = XInternAtom(XDisplay, "_NET_WM_PID", false);
+
+	long pid = static_cast<long>(getpid());
+
+	XChangeProperty(XDisplay, XWindow, NET_WM_PID,
+			XA_CARDINAL, 32, PropModeReplace,
+			reinterpret_cast<unsigned char *>(&pid), 1);
+
+	// Set the WM_CLIENT_LEADER window property here. Minetest has only one
+	// window and that window will always be the leader.
+
+	os::Printer::log("Setting Xorg WM_CLIENT_LEADER property", ELL_DEBUG);
+
+	Atom WM_CLIENT_LEADER = XInternAtom(XDisplay, "WM_CLIENT_LEADER", false);
+
+	XChangeProperty(XDisplay, XWindow, WM_CLIENT_LEADER,
+			XA_WINDOW, 32, PropModeReplace,
+			reinterpret_cast<unsigned char *>(&XWindow), 1);
+#endif
+}
+
+#if defined(_IRR_COMPILE_WITH_X11_)
+void IrrPrintXGrabError(int grabResult, const c8 *grabCommand)
+{
+	if (grabResult == GrabSuccess) {
+		//		os::Printer::log(grabCommand, "GrabSuccess", ELL_INFORMATION);
+		return;
+	}
+
+	switch (grabResult) {
+	case AlreadyGrabbed:
+		os::Printer::log(grabCommand, "AlreadyGrabbed", ELL_WARNING);
+		break;
+	case GrabNotViewable:
+		os::Printer::log(grabCommand, "GrabNotViewable", ELL_WARNING);
+		break;
+	case GrabFrozen:
+		os::Printer::log(grabCommand, "GrabFrozen", ELL_WARNING);
+		break;
+	case GrabInvalidTime:
+		os::Printer::log(grabCommand, "GrabInvalidTime", ELL_WARNING);
+		break;
+	default:
+		os::Printer::log(grabCommand, "grab failed with unknown problem", ELL_WARNING);
+		break;
+	}
+}
+#endif
+
+bool CIrrDeviceLinux::createWindow()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+#ifdef _DEBUG
+	os::Printer::log("Creating X window...", ELL_INFORMATION);
+	XSetErrorHandler(IrrPrintXError);
+#endif
+
+	XDisplay = XOpenDisplay(0);
+	if (!XDisplay) {
+		os::Printer::log("Error: Need running XServer to start Irrlicht Engine.", ELL_ERROR);
+		if (XDisplayName(0)[0])
+			os::Printer::log("Could not open display", XDisplayName(0), ELL_ERROR);
+		else
+			os::Printer::log("Could not open display, set DISPLAY variable", ELL_ERROR);
+		return false;
+	}
+
+	Screennr = DefaultScreen(XDisplay);
+
+	initXAtoms();
+
+	// check netwm support
+	Atom WMCheck = XInternAtom(XDisplay, "_NET_SUPPORTING_WM_CHECK", True);
+	if (WMCheck != None)
+		HasNetWM = true;
+
+#if defined(_IRR_COMPILE_WITH_OPENGL_)
+	// don't use the XVisual with OpenGL, because it ignores all requested
+	// properties of the CreationParams
+	if (CreationParams.DriverType == video::EDT_OPENGL) {
+		video::SExposedVideoData data;
+		data.OpenGLLinux.X11Display = XDisplay;
+		ContextManager = new video::CGLXManager(CreationParams, data, Screennr);
+		VisualInfo = ((video::CGLXManager *)ContextManager)->getVisual();
+	}
+#endif
+
+	if (!VisualInfo) {
+		// create visual with standard X methods
+		os::Printer::log("Using plain X visual");
+		XVisualInfo visTempl; // Template to hold requested values
+		int visNumber;        // Return value of available visuals
+
+		visTempl.screen = Screennr;
+		// ARGB visuals should be avoided for usual applications
+		visTempl.depth = CreationParams.WithAlphaChannel ? 32 : 24;
+		while ((!VisualInfo) && (visTempl.depth >= 16)) {
+			VisualInfo = XGetVisualInfo(XDisplay, VisualScreenMask | VisualDepthMask,
+					&visTempl, &visNumber);
+			visTempl.depth -= 8;
+		}
+	}
+
+	if (!VisualInfo) {
+		os::Printer::log("Fatal error, could not get visual.", ELL_ERROR);
+		XCloseDisplay(XDisplay);
+		XDisplay = 0;
+		return false;
+	}
+#ifdef _DEBUG
+	else
+		os::Printer::log("Visual chosen", core::stringc(static_cast<u32>(VisualInfo->visualid)).c_str(), ELL_DEBUG);
+#endif
+
+	// create color map
+	Colormap colormap;
+	colormap = XCreateColormap(XDisplay,
+			RootWindow(XDisplay, VisualInfo->screen),
+			VisualInfo->visual, AllocNone);
+
+	WndAttributes.colormap = colormap;
+	WndAttributes.border_pixel = 0;
+	WndAttributes.event_mask = StructureNotifyMask | FocusChangeMask | ExposureMask;
+	WndAttributes.event_mask |= PointerMotionMask |
+								ButtonPressMask | KeyPressMask |
+								ButtonReleaseMask | KeyReleaseMask;
+
+	if (!CreationParams.WindowId) {
+		int x = 0;
+		int y = 0;
+
+		if (!CreationParams.Fullscreen) {
+			if (CreationParams.WindowPosition.X > 0)
+				x = CreationParams.WindowPosition.X;
+			if (CreationParams.WindowPosition.Y > 0)
+				y = CreationParams.WindowPosition.Y;
+		}
+
+		// create new Window
+		// Remove window manager decoration in fullscreen
+		XWindow = XCreateWindow(XDisplay,
+				RootWindow(XDisplay, VisualInfo->screen),
+				x, y, Width, Height, 0, VisualInfo->depth,
+				InputOutput, VisualInfo->visual,
+				CWBorderPixel | CWColormap | CWEventMask,
+				&WndAttributes);
+
+		XMapRaised(XDisplay, XWindow);
+		CreationParams.WindowId = (void *)XWindow;
+		X_ATOM_WM_DELETE_WINDOW = XInternAtom(XDisplay, "WM_DELETE_WINDOW", True);
+		XSetWMProtocols(XDisplay, XWindow, &X_ATOM_WM_DELETE_WINDOW, 1);
+
+		if (CreationParams.Fullscreen) {
+			// Don't try to set window position
+		} else if (CreationParams.WindowPosition.X >= 0 || CreationParams.WindowPosition.Y >= 0) { // default is -1, -1
+			// Window managers are free to ignore positions above, so give it another shot
+			XMoveWindow(XDisplay, XWindow, x, y);
+		}
+	} else {
+		// attach external window
+		XWindow = (Window)CreationParams.WindowId;
+		{
+			// Note: This might be further improved by using a InputOnly window instead of InputOutput.
+			// I think then it should be possible to render into the given parent window instead of
+			// creating a child-window.
+			// Also... this does possibly leak.
+			Window child_window = XCreateWindow(XDisplay,
+					XWindow,
+					0, 0, Width, Height, 0, VisualInfo->depth,
+					InputOutput, VisualInfo->visual,
+					CWBorderPixel | CWColormap | CWEventMask,
+					&WndAttributes);
+
+			// do not forget to map new window
+			XMapWindow(XDisplay, child_window);
+
+			// overwrite device window id
+			XWindow = child_window;
+		}
+		XWindowAttributes wa;
+		XGetWindowAttributes(XDisplay, XWindow, &wa);
+		CreationParams.WindowSize.Width = wa.width;
+		CreationParams.WindowSize.Height = wa.height;
+		CreationParams.Fullscreen = false;
+		ExternalWindow = true;
+	}
+
+	switchToFullscreen();
+
+	WindowMinimized = false;
+	XkbSetDetectableAutoRepeat(XDisplay, True, &AutorepeatSupport);
+
+	Window tmp;
+	u32 borderWidth;
+	int x, y;
+	unsigned int bits;
+
+	XGetGeometry(XDisplay, XWindow, &tmp, &x, &y, &Width, &Height, &borderWidth, &bits);
+	CreationParams.Bits = bits;
+	CreationParams.WindowSize.Width = Width;
+	CreationParams.WindowSize.Height = Height;
+
+	StdHints = XAllocSizeHints();
+	long num;
+	XGetWMNormalHints(XDisplay, XWindow, StdHints, &num);
+
+	initXInput2();
+
+#endif // #ifdef _IRR_COMPILE_WITH_X11_
+	return true;
+}
+
+//! create the driver
+void CIrrDeviceLinux::createDriver()
+{
+	switch (CreationParams.DriverType) {
+#ifdef _IRR_COMPILE_WITH_X11_
+	case video::EDT_OPENGL:
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+	{
+		video::SExposedVideoData data;
+		data.OpenGLLinux.X11Window = XWindow;
+		data.OpenGLLinux.X11Display = XDisplay;
+
+		ContextManager->initialize(CreationParams, data);
+
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, ContextManager);
+	}
+#else
+		os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
+#endif
+	break;
+	case video::EDT_OGLES1:
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+	{
+		video::SExposedVideoData data;
+		data.OpenGLLinux.X11Window = XWindow;
+		data.OpenGLLinux.X11Display = XDisplay;
+
+		ContextManager = new video::CEGLManager();
+		ContextManager->initialize(CreationParams, data);
+
+		VideoDriver = video::createOGLES1Driver(CreationParams, FileSystem, ContextManager);
+	}
+#else
+		os::Printer::log("No OpenGL-ES1 support compiled in.", ELL_ERROR);
+#endif
+	break;
+	case video::EDT_OGLES2:
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+	{
+		video::SExposedVideoData data;
+		data.OpenGLLinux.X11Window = XWindow;
+		data.OpenGLLinux.X11Display = XDisplay;
+
+		ContextManager = new video::CEGLManager();
+		ContextManager->initialize(CreationParams, data);
+
+		VideoDriver = video::createOGLES2Driver(CreationParams, FileSystem, ContextManager);
+	}
+#else
+		os::Printer::log("No OpenGL-ES2 support compiled in.", ELL_ERROR);
+#endif
+	break;
+	case video::EDT_WEBGL1:
+#ifdef _IRR_COMPILE_WITH_WEBGL1_
+	{
+		video::SExposedVideoData data;
+		data.OpenGLLinux.X11Window = XWindow;
+		data.OpenGLLinux.X11Display = XDisplay;
+
+		ContextManager = new video::CEGLManager();
+		ContextManager->initialize(CreationParams, data);
+
+		VideoDriver = video::createWebGL1Driver(CreationParams, FileSystem, ContextManager);
+	}
+#else
+		os::Printer::log("No WebGL1 support compiled in.", ELL_ERROR);
+#endif
+	break;
+	case video::EDT_NULL:
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+		break;
+	default:
+		os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
+		break;
+#else
+	case video::EDT_NULL:
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+		break;
+	default:
+		os::Printer::log("No X11 support compiled in. Only Null driver available.", ELL_ERROR);
+		break;
+#endif
+	}
+}
+
+#ifdef _IRR_COMPILE_WITH_X11_
+bool CIrrDeviceLinux::createInputContext()
+{
+	// One one side it would be nicer to let users do that - on the other hand
+	// not setting the environment locale will not work when using i18n X11 functions.
+	// So users would have to call it always or their input is broken badly.
+	// We can restore immediately - so won't mess with anything in users apps.
+	core::stringc oldLocale(setlocale(LC_CTYPE, NULL));
+	setlocale(LC_CTYPE, ""); // use environment locale
+
+	if (!XSupportsLocale()) {
+		os::Printer::log("Locale not supported. Falling back to non-i18n input.", ELL_WARNING);
+		setlocale(LC_CTYPE, oldLocale.c_str());
+		return false;
+	}
+
+	// Load XMODIFIERS (e.g. for IMEs)
+	if (!XSetLocaleModifiers("")) {
+		setlocale(LC_CTYPE, oldLocale.c_str());
+		os::Printer::log("XSetLocaleModifiers failed. Falling back to non-i18n input.", ELL_WARNING);
+		return false;
+	}
+
+	XInputMethod = XOpenIM(XDisplay, NULL, NULL, NULL);
+	if (!XInputMethod) {
+		setlocale(LC_CTYPE, oldLocale.c_str());
+		os::Printer::log("XOpenIM failed to create an input method. Falling back to non-i18n input.", ELL_WARNING);
+		return false;
+	}
+
+	XIMStyles *im_supported_styles;
+	XGetIMValues(XInputMethod, XNQueryInputStyle, &im_supported_styles, (char *)NULL);
+	XIMStyle bestStyle = 0;
+	XIMStyle supportedStyle = XIMPreeditNothing | XIMStatusNothing;
+	for (int i = 0; i < im_supported_styles->count_styles; ++i) {
+		XIMStyle style = im_supported_styles->supported_styles[i];
+		if ((style & supportedStyle) == style) /* if we can handle it */
+		{
+			bestStyle = style;
+			break;
+		}
+	}
+	XFree(im_supported_styles);
+
+	if (!bestStyle) {
+		XDestroyIC(XInputContext);
+		XInputContext = 0;
+
+		os::Printer::log("XInputMethod has no input style we can use. Falling back to non-i18n input.", ELL_WARNING);
+		setlocale(LC_CTYPE, oldLocale.c_str());
+		return false;
+	}
+
+	XInputContext = XCreateIC(XInputMethod,
+			XNInputStyle, bestStyle,
+			XNClientWindow, XWindow,
+			(char *)NULL);
+	if (!XInputContext) {
+		os::Printer::log("XInputContext failed to create an input context. Falling back to non-i18n input.", ELL_WARNING);
+		setlocale(LC_CTYPE, oldLocale.c_str());
+		return false;
+	}
+	XSetICFocus(XInputContext);
+	setlocale(LC_CTYPE, oldLocale.c_str());
+	return true;
+}
+
+void CIrrDeviceLinux::destroyInputContext()
+{
+	if (XInputContext) {
+		XUnsetICFocus(XInputContext);
+		XDestroyIC(XInputContext);
+		XInputContext = 0;
+	}
+	if (XInputMethod) {
+		XCloseIM(XInputMethod);
+		XInputMethod = 0;
+	}
+}
+
+EKEY_CODE CIrrDeviceLinux::getKeyCode(XEvent &event)
+{
+	EKEY_CODE keyCode = (EKEY_CODE)0;
+
+	SKeyMap mp;
+	mp.X11Key = XkbKeycodeToKeysym(XDisplay, event.xkey.keycode, 0, 0);
+	const s32 idx = KeyMap.binary_search(mp);
+	if (idx != -1) {
+		keyCode = (EKEY_CODE)KeyMap[idx].Win32Key;
+	}
+	if (keyCode == 0) {
+		keyCode = KEY_UNKNOWN;
+		if (!mp.X11Key) {
+			os::Printer::log("No such X11Key, event keycode", core::stringc(event.xkey.keycode).c_str(), ELL_INFORMATION);
+		} else if (idx == -1) {
+			os::Printer::log("EKEY_CODE not found, X11 keycode", core::stringc(mp.X11Key).c_str(), ELL_INFORMATION);
+		} else {
+			os::Printer::log("EKEY_CODE is 0, X11 keycode", core::stringc(mp.X11Key).c_str(), ELL_INFORMATION);
+		}
+	}
+	return keyCode;
+}
+#endif
+
+//! runs the device. Returns false if device wants to be deleted
+bool CIrrDeviceLinux::run()
+{
+	os::Timer::tick();
+
+#ifdef _IRR_COMPILE_WITH_X11_
+
+	if (CursorControl)
+		static_cast<CCursorControl *>(CursorControl)->update();
+
+	if ((CreationParams.DriverType != video::EDT_NULL) && XDisplay) {
+		SEvent irrevent;
+		irrevent.MouseInput.ButtonStates = 0xffffffff;
+
+		while (XPending(XDisplay) > 0 && !Close) {
+			XEvent event;
+			XNextEvent(XDisplay, &event);
+			if (XFilterEvent(&event, None))
+				continue;
+
+			switch (event.type) {
+			case ConfigureNotify:
+				// check for changed window size
+				if ((event.xconfigure.width != (int)Width) ||
+						(event.xconfigure.height != (int)Height)) {
+					Width = event.xconfigure.width;
+					Height = event.xconfigure.height;
+
+					if (VideoDriver)
+						VideoDriver->OnResize(core::dimension2d<u32>(Width, Height));
+				}
+				break;
+
+			case MapNotify:
+				WindowMinimized = false;
+				break;
+
+			case UnmapNotify:
+				WindowMinimized = true;
+				break;
+
+			case FocusIn:
+				WindowHasFocus = true;
+				break;
+
+			case FocusOut:
+				WindowHasFocus = false;
+				break;
+
+			case MotionNotify:
+				irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+				irrevent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+				irrevent.MouseInput.X = event.xbutton.x;
+				irrevent.MouseInput.Y = event.xbutton.y;
+				irrevent.MouseInput.Control = (event.xkey.state & ControlMask) != 0;
+				irrevent.MouseInput.Shift = (event.xkey.state & ShiftMask) != 0;
+
+				// mouse button states
+				irrevent.MouseInput.ButtonStates = (event.xbutton.state & Button1Mask) ? irr::EMBSM_LEFT : 0;
+				irrevent.MouseInput.ButtonStates |= (event.xbutton.state & Button3Mask) ? irr::EMBSM_RIGHT : 0;
+				irrevent.MouseInput.ButtonStates |= (event.xbutton.state & Button2Mask) ? irr::EMBSM_MIDDLE : 0;
+
+				postEventFromUser(irrevent);
+				break;
+
+			case ButtonPress:
+			case ButtonRelease:
+
+				irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+				irrevent.MouseInput.X = event.xbutton.x;
+				irrevent.MouseInput.Y = event.xbutton.y;
+				irrevent.MouseInput.Control = (event.xkey.state & ControlMask) != 0;
+				irrevent.MouseInput.Shift = (event.xkey.state & ShiftMask) != 0;
+
+				// mouse button states
+				// This sets the state which the buttons had _prior_ to the event.
+				// So unlike on Windows the button which just got changed has still the old state here.
+				// We handle that below by flipping the corresponding bit later.
+				irrevent.MouseInput.ButtonStates = (event.xbutton.state & Button1Mask) ? irr::EMBSM_LEFT : 0;
+				irrevent.MouseInput.ButtonStates |= (event.xbutton.state & Button3Mask) ? irr::EMBSM_RIGHT : 0;
+				irrevent.MouseInput.ButtonStates |= (event.xbutton.state & Button2Mask) ? irr::EMBSM_MIDDLE : 0;
+
+				irrevent.MouseInput.Event = irr::EMIE_COUNT;
+
+				switch (event.xbutton.button) {
+				case Button1:
+					irrevent.MouseInput.Event =
+							(event.type == ButtonPress) ? irr::EMIE_LMOUSE_PRESSED_DOWN : irr::EMIE_LMOUSE_LEFT_UP;
+					irrevent.MouseInput.ButtonStates ^= irr::EMBSM_LEFT;
+					break;
+
+				case Button3:
+					irrevent.MouseInput.Event =
+							(event.type == ButtonPress) ? irr::EMIE_RMOUSE_PRESSED_DOWN : irr::EMIE_RMOUSE_LEFT_UP;
+					irrevent.MouseInput.ButtonStates ^= irr::EMBSM_RIGHT;
+					break;
+
+				case Button2:
+					irrevent.MouseInput.Event =
+							(event.type == ButtonPress) ? irr::EMIE_MMOUSE_PRESSED_DOWN : irr::EMIE_MMOUSE_LEFT_UP;
+					irrevent.MouseInput.ButtonStates ^= irr::EMBSM_MIDDLE;
+					break;
+
+				case Button4:
+					if (event.type == ButtonPress) {
+						irrevent.MouseInput.Event = EMIE_MOUSE_WHEEL;
+						irrevent.MouseInput.Wheel = 1.0f;
+					}
+					break;
+
+				case Button5:
+					if (event.type == ButtonPress) {
+						irrevent.MouseInput.Event = EMIE_MOUSE_WHEEL;
+						irrevent.MouseInput.Wheel = -1.0f;
+					}
+					break;
+				}
+
+				if (irrevent.MouseInput.Event != irr::EMIE_COUNT) {
+					postEventFromUser(irrevent);
+
+					if (irrevent.MouseInput.Event >= EMIE_LMOUSE_PRESSED_DOWN && irrevent.MouseInput.Event <= EMIE_MMOUSE_PRESSED_DOWN) {
+						u32 clicks = checkSuccessiveClicks(irrevent.MouseInput.X, irrevent.MouseInput.Y, irrevent.MouseInput.Event);
+						if (clicks == 2) {
+							irrevent.MouseInput.Event = (EMOUSE_INPUT_EVENT)(EMIE_LMOUSE_DOUBLE_CLICK + irrevent.MouseInput.Event - EMIE_LMOUSE_PRESSED_DOWN);
+							postEventFromUser(irrevent);
+						} else if (clicks == 3) {
+							irrevent.MouseInput.Event = (EMOUSE_INPUT_EVENT)(EMIE_LMOUSE_TRIPLE_CLICK + irrevent.MouseInput.Event - EMIE_LMOUSE_PRESSED_DOWN);
+							postEventFromUser(irrevent);
+						}
+					}
+				}
+				break;
+
+			case MappingNotify:
+				XRefreshKeyboardMapping(&event.xmapping);
+				break;
+
+			case KeyRelease:
+				if (0 == AutorepeatSupport && (XPending(XDisplay) > 0)) {
+					// check for Autorepeat manually
+					// We'll do the same as Windows does: Only send KeyPressed
+					// So every KeyRelease is a real release
+					XEvent next_event;
+					XPeekEvent(event.xkey.display, &next_event);
+					if ((next_event.type == KeyPress) &&
+							(next_event.xkey.keycode == event.xkey.keycode) &&
+							(next_event.xkey.time - event.xkey.time) < 2) // usually same time, but on some systems a difference of 1 is possible
+					{
+						// Ignore the key release event
+						break;
+					}
+				}
+
+				irrevent.EventType = irr::EET_KEY_INPUT_EVENT;
+				irrevent.KeyInput.PressedDown = false;
+				irrevent.KeyInput.Char = 0; // on release that's undefined
+				irrevent.KeyInput.Control = (event.xkey.state & ControlMask) != 0;
+				irrevent.KeyInput.Shift = (event.xkey.state & ShiftMask) != 0;
+				irrevent.KeyInput.Key = getKeyCode(event);
+
+				postEventFromUser(irrevent);
+				break;
+
+			case KeyPress: {
+				SKeyMap mp;
+				if (XInputContext) {
+					wchar_t buf[64] = {0};
+					Status status;
+					int strLen = XwcLookupString(XInputContext, &event.xkey, buf, sizeof(buf) / sizeof(wchar_t) - 1, &mp.X11Key, &status);
+					if (status == XBufferOverflow) {
+						os::Printer::log("XwcLookupString needs a larger buffer", ELL_INFORMATION);
+					}
+					if (strLen > 0 && (status == XLookupChars || status == XLookupBoth)) {
+						if (strLen > 1) {
+							// Multiple characters: send string event
+							irrevent.EventType = irr::EET_STRING_INPUT_EVENT;
+							irrevent.StringInput.Str = new core::stringw(buf);
+							postEventFromUser(irrevent);
+							delete irrevent.StringInput.Str;
+							irrevent.StringInput.Str = NULL;
+							break;
+						} else {
+							irrevent.KeyInput.Char = buf[0];
+						}
+					} else {
+#if 0 // Most of those are fine - but useful to have the info when debugging Irrlicht itself.
+							if ( status == XLookupNone )
+								os::Printer::log("XLookupNone", ELL_INFORMATION);
+							else if ( status ==  XLookupKeySym )
+								// Getting this also when user did not set setlocale(LC_ALL, ""); and using an unknown locale
+								// XSupportsLocale doesn't seem to catch that unfortunately - any other ideas to catch it are welcome.
+								os::Printer::log("XLookupKeySym", ELL_INFORMATION);
+							else if ( status ==  XBufferOverflow )
+								os::Printer::log("XBufferOverflow", ELL_INFORMATION);
+							else if ( strLen == 0 )
+								os::Printer::log("no string", ELL_INFORMATION);
+#endif
+						irrevent.KeyInput.Char = 0;
+					}
+				} else // Old version without InputContext. Does not support i18n, but good to have as fallback.
+				{
+					union
+					{
+						char buf[8];
+						wchar_t wbuf[2];
+					} tmp = {{0}};
+					XLookupString(&event.xkey, tmp.buf, sizeof(tmp.buf), &mp.X11Key, NULL);
+					irrevent.KeyInput.Char = tmp.wbuf[0];
+				}
+
+				irrevent.EventType = irr::EET_KEY_INPUT_EVENT;
+				irrevent.KeyInput.PressedDown = true;
+				irrevent.KeyInput.Control = (event.xkey.state & ControlMask) != 0;
+				irrevent.KeyInput.Shift = (event.xkey.state & ShiftMask) != 0;
+				irrevent.KeyInput.Key = getKeyCode(event);
+				postEventFromUser(irrevent);
+			} break;
+
+			case ClientMessage: {
+				if (static_cast<Atom>(event.xclient.data.l[0]) == X_ATOM_WM_DELETE_WINDOW && X_ATOM_WM_DELETE_WINDOW != None) {
+					os::Printer::log("Quit message received.", ELL_INFORMATION);
+					Close = true;
+				} else {
+					// we assume it's a user message
+					irrevent.EventType = irr::EET_USER_EVENT;
+					irrevent.UserEvent.UserData1 = static_cast<size_t>(event.xclient.data.l[0]);
+					irrevent.UserEvent.UserData2 = static_cast<size_t>(event.xclient.data.l[1]);
+					postEventFromUser(irrevent);
+				}
+			} break;
+
+			case SelectionRequest: {
+				XSelectionRequestEvent *req = &(event.xselectionrequest);
+
+				auto send_response = [this, req](Atom property) {
+					XEvent response;
+					response.xselection.type = SelectionNotify;
+					response.xselection.display = req->display;
+					response.xselection.requestor = req->requestor;
+					response.xselection.selection = req->selection;
+					response.xselection.target = req->target;
+					response.xselection.property = property;
+					response.xselection.time = req->time;
+					XSendEvent(XDisplay, req->requestor, 0, 0, &response);
+					XFlush(XDisplay);
+				};
+				auto send_response_refuse = [&send_response] {
+					send_response(None);
+				};
+
+				// sets the required property to data of type type and
+				// sends the according response
+				auto set_property_and_notify = [this, req, &send_response](Atom type, int format, const void *data, u32 data_size) {
+					XChangeProperty(XDisplay,
+							req->requestor,
+							req->property,
+							type,
+							format,
+							PropModeReplace,
+							(const unsigned char *)data,
+							data_size);
+					send_response(req->property);
+				};
+
+				if ((req->selection != X_ATOM_CLIPBOARD &&
+							req->selection != XA_PRIMARY) ||
+						req->owner != XWindow) {
+					// we are not the owner, refuse request
+					send_response_refuse();
+					break;
+				}
+				const core::stringc &text_buffer = req->selection == X_ATOM_CLIPBOARD ? Clipboard : PrimarySelection;
+
+				// for debugging:
+				//~ {
+				//~ char *target_name = XGetAtomName(XDisplay, req->target);
+				//~ fprintf(stderr, "CIrrDeviceLinux::run: target: %s (=%ld)\n",
+				//~ target_name, req->target);
+				//~ XFree(target_name);
+				//~ }
+
+				if (req->property == None) {
+					// req is from obsolete client, use target as property name
+					// and X_ATOM_UTF8_STRING as type
+					// Note: this was not tested and might be incorrect
+					os::Printer::log("CIrrDeviceLinux::run: SelectionRequest from obsolete client",
+							ELL_WARNING);
+					XChangeProperty(XDisplay,
+							req->requestor,
+							req->target, X_ATOM_UTF8_STRING,
+							8, // format = 8-bit
+							PropModeReplace,
+							(unsigned char *)text_buffer.c_str(),
+							text_buffer.size());
+					send_response(req->target);
+					break;
+				}
+
+				if (req->target == X_ATOM_TARGETS) {
+					Atom data[] = {
+							X_ATOM_TARGETS,
+							X_ATOM_TEXT,
+							X_ATOM_UTF8_STRING,
+							X_ATOM_UTF8_MIME_TYPE};
+					set_property_and_notify(
+							XA_ATOM,
+							32, // Atom is long, we need to set 32 for longs
+							&data,
+							sizeof(data) / sizeof(*data));
+
+				} else if (req->target == X_ATOM_TEXT ||
+						   req->target == X_ATOM_UTF8_STRING ||
+						   req->target == X_ATOM_UTF8_MIME_TYPE) {
+					set_property_and_notify(
+							X_ATOM_UTF8_STRING,
+							8,
+							text_buffer.c_str(),
+							text_buffer.size());
+
+				} else {
+					// refuse the request
+					send_response_refuse();
+				}
+			} break;
+
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+			case GenericEvent: {
+				XGenericEventCookie *cookie = &event.xcookie;
+				if (XGetEventData(XDisplay, cookie) && cookie->extension == XI_EXTENSIONS_OPCODE && XI_EXTENSIONS_OPCODE && (cookie->evtype == XI_TouchUpdate || cookie->evtype == XI_TouchBegin || cookie->evtype == XI_TouchEnd)) {
+					XIDeviceEvent *de = (XIDeviceEvent *)cookie->data;
+
+					irrevent.EventType = EET_TOUCH_INPUT_EVENT;
+
+					irrevent.TouchInput.Event = cookie->evtype == XI_TouchUpdate ? ETIE_MOVED : (cookie->evtype == XI_TouchBegin ? ETIE_PRESSED_DOWN : ETIE_LEFT_UP);
+
+					irrevent.TouchInput.ID = de->detail;
+					irrevent.TouchInput.X = de->event_x;
+					irrevent.TouchInput.Y = de->event_y;
+
+					if (irrevent.TouchInput.Event == ETIE_PRESSED_DOWN) {
+						currentTouchedCount++;
+					}
+					irrevent.TouchInput.touchedCount = currentTouchedCount;
+					if (currentTouchedCount > 0 && irrevent.TouchInput.Event == ETIE_LEFT_UP) {
+						currentTouchedCount--;
+					}
+
+					postEventFromUser(irrevent);
+				}
+			} break;
+#endif
+
+			default:
+				break;
+			} // end switch
+
+			// Update IME information
+			if (XInputContext && GUIEnvironment) {
+				gui::IGUIElement *elem = GUIEnvironment->getFocus();
+				if (elem && elem->acceptsIME()) {
+					core::rect<s32> r = elem->getAbsolutePosition();
+					XPoint p;
+					p.x = (short)r.UpperLeftCorner.X;
+					p.y = (short)r.LowerRightCorner.Y;
+					XSetICFocus(XInputContext);
+					XVaNestedList l = XVaCreateNestedList(0, XNSpotLocation, &p, NULL);
+					XSetICValues(XInputContext, XNPreeditAttributes, l, NULL);
+					XFree(l);
+				} else {
+					XUnsetICFocus(XInputContext);
+				}
+			}
+
+		} // end while
+	}
+#endif //_IRR_COMPILE_WITH_X11_
+
+	if (!Close)
+		pollJoysticks();
+
+	return !Close;
+}
+
+//! Pause the current process for the minimum time allowed only to allow other processes to execute
+void CIrrDeviceLinux::yield()
+{
+	struct timespec ts = {0, 1};
+	nanosleep(&ts, NULL);
+}
+
+//! Pause execution and let other processes to run for a specified amount of time.
+void CIrrDeviceLinux::sleep(u32 timeMs, bool pauseTimer = false)
+{
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
+
+	struct timespec ts;
+	ts.tv_sec = (time_t)(timeMs / 1000);
+	ts.tv_nsec = (long)(timeMs % 1000) * 1000000;
+
+	if (pauseTimer && !wasStopped)
+		Timer->stop();
+
+	nanosleep(&ts, NULL);
+
+	if (pauseTimer && !wasStopped)
+		Timer->start();
+}
+
+//! sets the caption of the window
+void CIrrDeviceLinux::setWindowCaption(const wchar_t *text)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (CreationParams.DriverType == video::EDT_NULL)
+		return;
+
+	XTextProperty txt;
+	if (Success == XwcTextListToTextProperty(XDisplay, const_cast<wchar_t **>(&text),
+						   1, XStdICCTextStyle, &txt)) {
+		XSetWMName(XDisplay, XWindow, &txt);
+		XSetWMIconName(XDisplay, XWindow, &txt);
+		XFree(txt.value);
+	}
+#endif
+}
+
+//! Sets the window icon.
+bool CIrrDeviceLinux::setWindowIcon(const video::IImage *img)
+{
+	if (CreationParams.DriverType == video::EDT_NULL)
+		return false; // no display and window
+
+	u32 height = img->getDimension().Height;
+	u32 width = img->getDimension().Width;
+
+	size_t icon_buffer_len = 2 + height * width;
+	long *icon_buffer = new long[icon_buffer_len];
+
+	icon_buffer[0] = width;
+	icon_buffer[1] = height;
+
+	for (u32 x = 0; x < width; x++) {
+		for (u32 y = 0; y < height; y++) {
+			video::SColor col = img->getPixel(x, y);
+			long pixel_val = 0;
+			pixel_val |= (u8)col.getAlpha() << 24;
+			pixel_val |= (u8)col.getRed() << 16;
+			pixel_val |= (u8)col.getGreen() << 8;
+			pixel_val |= (u8)col.getBlue();
+			icon_buffer[2 + x + y * width] = pixel_val;
+		}
+	}
+
+	if (XDisplay == NULL) {
+		os::Printer::log("Could not find x11 display for setting its icon.", ELL_ERROR);
+		delete[] icon_buffer;
+		return false;
+	}
+
+	Atom net_wm_icon = XInternAtom(XDisplay, "_NET_WM_ICON", False);
+	Atom cardinal = XInternAtom(XDisplay, "CARDINAL", False);
+	XChangeProperty(XDisplay, XWindow, net_wm_icon, cardinal, 32, PropModeReplace,
+			(const unsigned char *)icon_buffer, icon_buffer_len);
+
+	delete[] icon_buffer;
+
+	return true;
+}
+
+//! notifies the device that it should close itself
+void CIrrDeviceLinux::closeDevice()
+{
+	Close = true;
+}
+
+//! returns if window is active. if not, nothing need to be drawn
+bool CIrrDeviceLinux::isWindowActive() const
+{
+	return (WindowHasFocus && !WindowMinimized);
+}
+
+//! returns if window has focus.
+bool CIrrDeviceLinux::isWindowFocused() const
+{
+	return WindowHasFocus;
+}
+
+//! returns if window is minimized.
+bool CIrrDeviceLinux::isWindowMinimized() const
+{
+	return WindowMinimized;
+}
+
+//! returns last state from maximizeWindow() and restoreWindow()
+bool CIrrDeviceLinux::isWindowMaximized() const
+{
+	return WindowMaximized;
+}
+
+//! returns color format of the window.
+video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (VisualInfo && (VisualInfo->depth != 16))
+		return video::ECF_R8G8B8;
+	else
+#endif
+		return video::ECF_R5G6B5;
+}
+
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceLinux::setResizable(bool resize)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (CreationParams.DriverType == video::EDT_NULL || CreationParams.Fullscreen)
+		return;
+
+	if (!resize) {
+		// Must be heap memory because data size depends on X Server
+		XSizeHints *hints = XAllocSizeHints();
+		hints->flags = PSize | PMinSize | PMaxSize;
+		hints->min_width = hints->max_width = hints->base_width = Width;
+		hints->min_height = hints->max_height = hints->base_height = Height;
+		XSetWMNormalHints(XDisplay, XWindow, hints);
+		XFree(hints);
+	} else {
+		XSetWMNormalHints(XDisplay, XWindow, StdHints);
+	}
+	XFlush(XDisplay);
+#endif // #ifdef _IRR_COMPILE_WITH_X11_
+}
+
+//! Resize the render window.
+void CIrrDeviceLinux::setWindowSize(const irr::core::dimension2d<u32> &size)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (CreationParams.DriverType == video::EDT_NULL || CreationParams.Fullscreen)
+		return;
+
+	XWindowChanges values;
+	values.width = size.Width;
+	values.height = size.Height;
+	XConfigureWindow(XDisplay, XWindow, CWWidth | CWHeight, &values);
+	XFlush(XDisplay);
+#endif // #ifdef _IRR_COMPILE_WITH_X11_
+}
+
+//! Minimize window
+void CIrrDeviceLinux::minimizeWindow()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	XIconifyWindow(XDisplay, XWindow, Screennr);
+#endif
+}
+
+//! Maximize window
+void CIrrDeviceLinux::maximizeWindow()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	// Maximize is not implemented in bare X, it's a WM construct.
+	if (HasNetWM) {
+		XEvent ev = {0};
+
+		ev.type = ClientMessage;
+		ev.xclient.window = XWindow;
+		ev.xclient.message_type = X_ATOM_NETWM_STATE;
+		ev.xclient.format = 32;
+		ev.xclient.data.l[0] = 1; // _NET_WM_STATE_ADD
+		ev.xclient.data.l[1] = X_ATOM_NETWM_MAXIMIZE_VERT;
+		ev.xclient.data.l[2] = X_ATOM_NETWM_MAXIMIZE_HORZ;
+
+		XSendEvent(XDisplay, DefaultRootWindow(XDisplay), false,
+				SubstructureNotifyMask | SubstructureRedirectMask, &ev);
+	}
+
+	XMapWindow(XDisplay, XWindow);
+
+	WindowMaximized = true;
+#endif
+}
+
+//! Restore original window size
+void CIrrDeviceLinux::restoreWindow()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	// Maximize is not implemented in bare X, it's a WM construct.
+	if (HasNetWM) {
+		XEvent ev = {0};
+
+		ev.type = ClientMessage;
+		ev.xclient.window = XWindow;
+		ev.xclient.message_type = X_ATOM_NETWM_STATE;
+		ev.xclient.format = 32;
+		ev.xclient.data.l[0] = 0; // _NET_WM_STATE_REMOVE
+		ev.xclient.data.l[1] = X_ATOM_NETWM_MAXIMIZE_VERT;
+		ev.xclient.data.l[2] = X_ATOM_NETWM_MAXIMIZE_HORZ;
+
+		XSendEvent(XDisplay, DefaultRootWindow(XDisplay), false,
+				SubstructureNotifyMask | SubstructureRedirectMask, &ev);
+	}
+
+	XMapWindow(XDisplay, XWindow);
+
+	WindowMaximized = false;
+#endif
+}
+
+core::position2di CIrrDeviceLinux::getWindowPosition()
+{
+	int wx = 0, wy = 0;
+#ifdef _IRR_COMPILE_WITH_X11_
+	Window child;
+	XTranslateCoordinates(XDisplay, XWindow, DefaultRootWindow(XDisplay), 0, 0, &wx, &wy, &child);
+#endif
+	return core::position2di(wx, wy);
+}
+
+void CIrrDeviceLinux::createKeyMap()
+{
+	// I don't know if this is the best method  to create
+	// the lookuptable, but I'll leave it like that until
+	// I find a better version.
+	// Search for missing numbers in keysymdef.h
+
+#ifdef _IRR_COMPILE_WITH_X11_
+	KeyMap.reallocate(190);
+	KeyMap.push_back(SKeyMap(XK_BackSpace, KEY_BACK));
+	KeyMap.push_back(SKeyMap(XK_Tab, KEY_TAB));
+	KeyMap.push_back(SKeyMap(XK_ISO_Left_Tab, KEY_TAB));
+	KeyMap.push_back(SKeyMap(XK_Linefeed, 0)); // ???
+	KeyMap.push_back(SKeyMap(XK_Clear, KEY_CLEAR));
+	KeyMap.push_back(SKeyMap(XK_Return, KEY_RETURN));
+	KeyMap.push_back(SKeyMap(XK_Pause, KEY_PAUSE));
+	KeyMap.push_back(SKeyMap(XK_Scroll_Lock, KEY_SCROLL));
+	KeyMap.push_back(SKeyMap(XK_Sys_Req, 0)); // ???
+	KeyMap.push_back(SKeyMap(XK_Escape, KEY_ESCAPE));
+	KeyMap.push_back(SKeyMap(XK_Insert, KEY_INSERT));
+	KeyMap.push_back(SKeyMap(XK_Delete, KEY_DELETE));
+	KeyMap.push_back(SKeyMap(XK_Home, KEY_HOME));
+	KeyMap.push_back(SKeyMap(XK_Left, KEY_LEFT));
+	KeyMap.push_back(SKeyMap(XK_Up, KEY_UP));
+	KeyMap.push_back(SKeyMap(XK_Right, KEY_RIGHT));
+	KeyMap.push_back(SKeyMap(XK_Down, KEY_DOWN));
+	KeyMap.push_back(SKeyMap(XK_Prior, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(XK_Page_Up, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(XK_Next, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(XK_Page_Down, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(XK_End, KEY_END));
+	KeyMap.push_back(SKeyMap(XK_Begin, KEY_NUMPAD5));
+	KeyMap.push_back(SKeyMap(XK_Num_Lock, KEY_NUMLOCK));
+	KeyMap.push_back(SKeyMap(XK_KP_Space, KEY_SPACE));
+	KeyMap.push_back(SKeyMap(XK_KP_Tab, KEY_TAB));
+	KeyMap.push_back(SKeyMap(XK_KP_Enter, KEY_RETURN));
+	KeyMap.push_back(SKeyMap(XK_KP_F1, KEY_F1));
+	KeyMap.push_back(SKeyMap(XK_KP_F2, KEY_F2));
+	KeyMap.push_back(SKeyMap(XK_KP_F3, KEY_F3));
+	KeyMap.push_back(SKeyMap(XK_KP_F4, KEY_F4));
+	KeyMap.push_back(SKeyMap(XK_KP_Home, KEY_HOME));
+	KeyMap.push_back(SKeyMap(XK_KP_Left, KEY_LEFT));
+	KeyMap.push_back(SKeyMap(XK_KP_Up, KEY_UP));
+	KeyMap.push_back(SKeyMap(XK_KP_Right, KEY_RIGHT));
+	KeyMap.push_back(SKeyMap(XK_KP_Down, KEY_DOWN));
+	KeyMap.push_back(SKeyMap(XK_Print, KEY_PRINT));
+	KeyMap.push_back(SKeyMap(XK_KP_Prior, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(XK_KP_Page_Up, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(XK_KP_Next, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(XK_KP_Page_Down, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(XK_KP_End, KEY_END));
+	KeyMap.push_back(SKeyMap(XK_KP_Begin, KEY_NUMPAD5));
+	KeyMap.push_back(SKeyMap(XK_KP_Insert, KEY_INSERT));
+	KeyMap.push_back(SKeyMap(XK_KP_Delete, KEY_DELETE));
+	KeyMap.push_back(SKeyMap(XK_KP_Equal, 0)); // ???
+	KeyMap.push_back(SKeyMap(XK_KP_Multiply, KEY_MULTIPLY));
+	KeyMap.push_back(SKeyMap(XK_KP_Add, KEY_ADD));
+	KeyMap.push_back(SKeyMap(XK_KP_Separator, KEY_SEPARATOR));
+	KeyMap.push_back(SKeyMap(XK_KP_Subtract, KEY_SUBTRACT));
+	KeyMap.push_back(SKeyMap(XK_KP_Decimal, KEY_DECIMAL));
+	KeyMap.push_back(SKeyMap(XK_KP_Divide, KEY_DIVIDE));
+	KeyMap.push_back(SKeyMap(XK_KP_0, KEY_NUMPAD0));
+	KeyMap.push_back(SKeyMap(XK_KP_1, KEY_NUMPAD1));
+	KeyMap.push_back(SKeyMap(XK_KP_2, KEY_NUMPAD2));
+	KeyMap.push_back(SKeyMap(XK_KP_3, KEY_NUMPAD3));
+	KeyMap.push_back(SKeyMap(XK_KP_4, KEY_NUMPAD4));
+	KeyMap.push_back(SKeyMap(XK_KP_5, KEY_NUMPAD5));
+	KeyMap.push_back(SKeyMap(XK_KP_6, KEY_NUMPAD6));
+	KeyMap.push_back(SKeyMap(XK_KP_7, KEY_NUMPAD7));
+	KeyMap.push_back(SKeyMap(XK_KP_8, KEY_NUMPAD8));
+	KeyMap.push_back(SKeyMap(XK_KP_9, KEY_NUMPAD9));
+	KeyMap.push_back(SKeyMap(XK_F1, KEY_F1));
+	KeyMap.push_back(SKeyMap(XK_F2, KEY_F2));
+	KeyMap.push_back(SKeyMap(XK_F3, KEY_F3));
+	KeyMap.push_back(SKeyMap(XK_F4, KEY_F4));
+	KeyMap.push_back(SKeyMap(XK_F5, KEY_F5));
+	KeyMap.push_back(SKeyMap(XK_F6, KEY_F6));
+	KeyMap.push_back(SKeyMap(XK_F7, KEY_F7));
+	KeyMap.push_back(SKeyMap(XK_F8, KEY_F8));
+	KeyMap.push_back(SKeyMap(XK_F9, KEY_F9));
+	KeyMap.push_back(SKeyMap(XK_F10, KEY_F10));
+	KeyMap.push_back(SKeyMap(XK_F11, KEY_F11));
+	KeyMap.push_back(SKeyMap(XK_F12, KEY_F12));
+	KeyMap.push_back(SKeyMap(XK_Shift_L, KEY_LSHIFT));
+	KeyMap.push_back(SKeyMap(XK_Shift_R, KEY_RSHIFT));
+	KeyMap.push_back(SKeyMap(XK_Control_L, KEY_LCONTROL));
+	KeyMap.push_back(SKeyMap(XK_Control_R, KEY_RCONTROL));
+	KeyMap.push_back(SKeyMap(XK_Caps_Lock, KEY_CAPITAL));
+	KeyMap.push_back(SKeyMap(XK_Shift_Lock, KEY_CAPITAL));
+	KeyMap.push_back(SKeyMap(XK_Meta_L, KEY_LWIN));
+	KeyMap.push_back(SKeyMap(XK_Meta_R, KEY_RWIN));
+	KeyMap.push_back(SKeyMap(XK_Alt_L, KEY_LMENU));
+	KeyMap.push_back(SKeyMap(XK_Alt_R, KEY_RMENU));
+	KeyMap.push_back(SKeyMap(XK_ISO_Level3_Shift, KEY_RMENU));
+	KeyMap.push_back(SKeyMap(XK_Menu, KEY_MENU));
+	KeyMap.push_back(SKeyMap(XK_space, KEY_SPACE));
+	KeyMap.push_back(SKeyMap(XK_exclam, 0));   //?
+	KeyMap.push_back(SKeyMap(XK_quotedbl, 0)); //?
+	KeyMap.push_back(SKeyMap(XK_section, 0));  //?
+	KeyMap.push_back(SKeyMap(XK_numbersign, KEY_OEM_2));
+	KeyMap.push_back(SKeyMap(XK_dollar, 0));    //?
+	KeyMap.push_back(SKeyMap(XK_percent, 0));   //?
+	KeyMap.push_back(SKeyMap(XK_ampersand, 0)); //?
+	KeyMap.push_back(SKeyMap(XK_apostrophe, KEY_OEM_7));
+	KeyMap.push_back(SKeyMap(XK_parenleft, 0));       //?
+	KeyMap.push_back(SKeyMap(XK_parenright, 0));      //?
+	KeyMap.push_back(SKeyMap(XK_asterisk, 0));        //?
+	KeyMap.push_back(SKeyMap(XK_plus, KEY_PLUS));     //?
+	KeyMap.push_back(SKeyMap(XK_comma, KEY_COMMA));   //?
+	KeyMap.push_back(SKeyMap(XK_minus, KEY_MINUS));   //?
+	KeyMap.push_back(SKeyMap(XK_period, KEY_PERIOD)); //?
+	KeyMap.push_back(SKeyMap(XK_slash, KEY_OEM_2));   //?
+	KeyMap.push_back(SKeyMap(XK_0, KEY_KEY_0));
+	KeyMap.push_back(SKeyMap(XK_1, KEY_KEY_1));
+	KeyMap.push_back(SKeyMap(XK_2, KEY_KEY_2));
+	KeyMap.push_back(SKeyMap(XK_3, KEY_KEY_3));
+	KeyMap.push_back(SKeyMap(XK_4, KEY_KEY_4));
+	KeyMap.push_back(SKeyMap(XK_5, KEY_KEY_5));
+	KeyMap.push_back(SKeyMap(XK_6, KEY_KEY_6));
+	KeyMap.push_back(SKeyMap(XK_7, KEY_KEY_7));
+	KeyMap.push_back(SKeyMap(XK_8, KEY_KEY_8));
+	KeyMap.push_back(SKeyMap(XK_9, KEY_KEY_9));
+	KeyMap.push_back(SKeyMap(XK_colon, 0)); //?
+	KeyMap.push_back(SKeyMap(XK_semicolon, KEY_OEM_1));
+	KeyMap.push_back(SKeyMap(XK_less, KEY_OEM_102));
+	KeyMap.push_back(SKeyMap(XK_equal, KEY_PLUS));
+	KeyMap.push_back(SKeyMap(XK_greater, 0));    //?
+	KeyMap.push_back(SKeyMap(XK_question, 0));   //?
+	KeyMap.push_back(SKeyMap(XK_at, KEY_KEY_2)); //?
+	KeyMap.push_back(SKeyMap(XK_mu, 0));         //?
+	KeyMap.push_back(SKeyMap(XK_EuroSign, 0));   //?
+	KeyMap.push_back(SKeyMap(XK_A, KEY_KEY_A));
+	KeyMap.push_back(SKeyMap(XK_B, KEY_KEY_B));
+	KeyMap.push_back(SKeyMap(XK_C, KEY_KEY_C));
+	KeyMap.push_back(SKeyMap(XK_D, KEY_KEY_D));
+	KeyMap.push_back(SKeyMap(XK_E, KEY_KEY_E));
+	KeyMap.push_back(SKeyMap(XK_F, KEY_KEY_F));
+	KeyMap.push_back(SKeyMap(XK_G, KEY_KEY_G));
+	KeyMap.push_back(SKeyMap(XK_H, KEY_KEY_H));
+	KeyMap.push_back(SKeyMap(XK_I, KEY_KEY_I));
+	KeyMap.push_back(SKeyMap(XK_J, KEY_KEY_J));
+	KeyMap.push_back(SKeyMap(XK_K, KEY_KEY_K));
+	KeyMap.push_back(SKeyMap(XK_L, KEY_KEY_L));
+	KeyMap.push_back(SKeyMap(XK_M, KEY_KEY_M));
+	KeyMap.push_back(SKeyMap(XK_N, KEY_KEY_N));
+	KeyMap.push_back(SKeyMap(XK_O, KEY_KEY_O));
+	KeyMap.push_back(SKeyMap(XK_P, KEY_KEY_P));
+	KeyMap.push_back(SKeyMap(XK_Q, KEY_KEY_Q));
+	KeyMap.push_back(SKeyMap(XK_R, KEY_KEY_R));
+	KeyMap.push_back(SKeyMap(XK_S, KEY_KEY_S));
+	KeyMap.push_back(SKeyMap(XK_T, KEY_KEY_T));
+	KeyMap.push_back(SKeyMap(XK_U, KEY_KEY_U));
+	KeyMap.push_back(SKeyMap(XK_V, KEY_KEY_V));
+	KeyMap.push_back(SKeyMap(XK_W, KEY_KEY_W));
+	KeyMap.push_back(SKeyMap(XK_X, KEY_KEY_X));
+	KeyMap.push_back(SKeyMap(XK_Y, KEY_KEY_Y));
+	KeyMap.push_back(SKeyMap(XK_Z, KEY_KEY_Z));
+	KeyMap.push_back(SKeyMap(XK_bracketleft, KEY_OEM_4));
+	KeyMap.push_back(SKeyMap(XK_backslash, KEY_OEM_5));
+	KeyMap.push_back(SKeyMap(XK_bracketright, KEY_OEM_6));
+	KeyMap.push_back(SKeyMap(XK_asciicircum, KEY_OEM_5));
+	KeyMap.push_back(SKeyMap(XK_dead_circumflex, KEY_OEM_5));
+	KeyMap.push_back(SKeyMap(XK_degree, 0));             //?
+	KeyMap.push_back(SKeyMap(XK_underscore, KEY_MINUS)); //?
+	KeyMap.push_back(SKeyMap(XK_grave, KEY_OEM_3));
+	KeyMap.push_back(SKeyMap(XK_dead_grave, KEY_OEM_3));
+	KeyMap.push_back(SKeyMap(XK_acute, KEY_OEM_6));
+	KeyMap.push_back(SKeyMap(XK_dead_acute, KEY_OEM_6));
+	KeyMap.push_back(SKeyMap(XK_a, KEY_KEY_A));
+	KeyMap.push_back(SKeyMap(XK_b, KEY_KEY_B));
+	KeyMap.push_back(SKeyMap(XK_c, KEY_KEY_C));
+	KeyMap.push_back(SKeyMap(XK_d, KEY_KEY_D));
+	KeyMap.push_back(SKeyMap(XK_e, KEY_KEY_E));
+	KeyMap.push_back(SKeyMap(XK_f, KEY_KEY_F));
+	KeyMap.push_back(SKeyMap(XK_g, KEY_KEY_G));
+	KeyMap.push_back(SKeyMap(XK_h, KEY_KEY_H));
+	KeyMap.push_back(SKeyMap(XK_i, KEY_KEY_I));
+	KeyMap.push_back(SKeyMap(XK_j, KEY_KEY_J));
+	KeyMap.push_back(SKeyMap(XK_k, KEY_KEY_K));
+	KeyMap.push_back(SKeyMap(XK_l, KEY_KEY_L));
+	KeyMap.push_back(SKeyMap(XK_m, KEY_KEY_M));
+	KeyMap.push_back(SKeyMap(XK_n, KEY_KEY_N));
+	KeyMap.push_back(SKeyMap(XK_o, KEY_KEY_O));
+	KeyMap.push_back(SKeyMap(XK_p, KEY_KEY_P));
+	KeyMap.push_back(SKeyMap(XK_q, KEY_KEY_Q));
+	KeyMap.push_back(SKeyMap(XK_r, KEY_KEY_R));
+	KeyMap.push_back(SKeyMap(XK_s, KEY_KEY_S));
+	KeyMap.push_back(SKeyMap(XK_t, KEY_KEY_T));
+	KeyMap.push_back(SKeyMap(XK_u, KEY_KEY_U));
+	KeyMap.push_back(SKeyMap(XK_v, KEY_KEY_V));
+	KeyMap.push_back(SKeyMap(XK_w, KEY_KEY_W));
+	KeyMap.push_back(SKeyMap(XK_x, KEY_KEY_X));
+	KeyMap.push_back(SKeyMap(XK_y, KEY_KEY_Y));
+	KeyMap.push_back(SKeyMap(XK_z, KEY_KEY_Z));
+	KeyMap.push_back(SKeyMap(XK_ssharp, KEY_OEM_4));
+	KeyMap.push_back(SKeyMap(XK_adiaeresis, KEY_OEM_7));
+	KeyMap.push_back(SKeyMap(XK_odiaeresis, KEY_OEM_3));
+	KeyMap.push_back(SKeyMap(XK_udiaeresis, KEY_OEM_1));
+	KeyMap.push_back(SKeyMap(XK_Super_L, KEY_LWIN));
+	KeyMap.push_back(SKeyMap(XK_Super_R, KEY_RWIN));
+
+	KeyMap.sort();
+#endif
+}
+
+bool CIrrDeviceLinux::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+
+	joystickInfo.clear();
+
+	u32 joystick;
+	for (joystick = 0; joystick < 32; ++joystick) {
+		// The joystick device could be here...
+		core::stringc devName = "/dev/js";
+		devName += joystick;
+
+		SJoystickInfo returnInfo;
+		JoystickInfo info;
+
+		info.fd = open(devName.c_str(), O_RDONLY);
+		if (-1 == info.fd) {
+			// ...but Ubuntu and possibly other distros
+			// create the devices in /dev/input
+			devName = "/dev/input/js";
+			devName += joystick;
+			info.fd = open(devName.c_str(), O_RDONLY);
+			if (-1 == info.fd) {
+				// and BSD here
+				devName = "/dev/joy";
+				devName += joystick;
+				info.fd = open(devName.c_str(), O_RDONLY);
+			}
+		}
+
+		if (-1 == info.fd)
+			continue;
+
+#ifdef __FreeBSD__
+		info.axes = 2;
+		info.buttons = 2;
+#else
+		ioctl(info.fd, JSIOCGAXES, &(info.axes));
+		ioctl(info.fd, JSIOCGBUTTONS, &(info.buttons));
+		fcntl(info.fd, F_SETFL, O_NONBLOCK);
+#endif
+
+		(void)memset(&info.persistentData, 0, sizeof(info.persistentData));
+		info.persistentData.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+		info.persistentData.JoystickEvent.Joystick = ActiveJoysticks.size();
+
+		// There's no obvious way to determine which (if any) axes represent a POV
+		// hat, so we'll just set it to "not used" and forget about it.
+		info.persistentData.JoystickEvent.POV = 65535;
+
+		ActiveJoysticks.push_back(info);
+
+		returnInfo.Joystick = joystick;
+		returnInfo.PovHat = SJoystickInfo::POV_HAT_UNKNOWN;
+		returnInfo.Axes = info.axes;
+		returnInfo.Buttons = info.buttons;
+
+#ifndef __FreeBSD__
+		char name[80];
+		ioctl(info.fd, JSIOCGNAME(80), name);
+		returnInfo.Name = name;
+#endif
+
+		joystickInfo.push_back(returnInfo);
+	}
+
+	for (joystick = 0; joystick < joystickInfo.size(); ++joystick) {
+		char logString[256];
+		snprintf_irr(logString, sizeof(logString), "Found joystick %d, %d axes, %d buttons '%s'",
+				joystick, joystickInfo[joystick].Axes,
+				joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+#else
+	return false;
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+void CIrrDeviceLinux::pollJoysticks()
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	if (0 == ActiveJoysticks.size())
+		return;
+
+	for (u32 j = 0; j < ActiveJoysticks.size(); ++j) {
+		JoystickInfo &info = ActiveJoysticks[j];
+
+#ifdef __FreeBSD__
+		struct joystick js;
+		if (read(info.fd, &js, sizeof(js)) == sizeof(js)) {
+			info.persistentData.JoystickEvent.ButtonStates = js.b1 | (js.b2 << 1); /* should be a two-bit field */
+			info.persistentData.JoystickEvent.Axis[0] = js.x;                      /* X axis */
+			info.persistentData.JoystickEvent.Axis[1] = js.y;                      /* Y axis */
+		}
+#else
+		struct js_event event;
+		while (sizeof(event) == read(info.fd, &event, sizeof(event))) {
+			switch (event.type & ~JS_EVENT_INIT) {
+			case JS_EVENT_BUTTON:
+				if (event.value)
+					info.persistentData.JoystickEvent.ButtonStates |= (1 << event.number);
+				else
+					info.persistentData.JoystickEvent.ButtonStates &= ~(1 << event.number);
+				break;
+
+			case JS_EVENT_AXIS:
+				if (event.number < SEvent::SJoystickEvent::NUMBER_OF_AXES)
+					info.persistentData.JoystickEvent.Axis[event.number] = event.value;
+				break;
+
+			default:
+				break;
+			}
+		}
+#endif
+
+		// Send an irrlicht joystick event once per ::run() even if no new data were received.
+		(void)postEventFromUser(info.persistentData);
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+#if defined(_IRR_COMPILE_WITH_X11_)
+//! gets text from the clipboard
+//! \return Returns 0 if no string is in there, otherwise utf-8 text.
+const c8 *CIrrDeviceLinux::getTextFromSelection(Atom selection, core::stringc &text_buffer) const
+{
+	Window ownerWindow = XGetSelectionOwner(XDisplay, selection);
+	if (ownerWindow == XWindow) {
+		return text_buffer.c_str();
+	}
+
+	text_buffer = "";
+
+	if (ownerWindow == None) {
+		return text_buffer.c_str();
+	}
+
+	// delete the property to be set beforehand
+	XDeleteProperty(XDisplay, XWindow, XA_PRIMARY);
+
+	XConvertSelection(XDisplay, selection, X_ATOM_UTF8_STRING, XA_PRIMARY,
+			XWindow, CurrentTime);
+	XFlush(XDisplay);
+
+	// wait for event via a blocking call
+	XEvent event_ret;
+	std::pair<Window, Atom> args(XWindow, selection);
+	XIfEvent(
+			XDisplay, &event_ret, [](Display *_display, XEvent *event, XPointer arg) {
+				auto p = reinterpret_cast<std::pair<Window, Atom> *>(arg);
+				return (Bool)(event->type == SelectionNotify &&
+							  event->xselection.requestor == p->first &&
+							  event->xselection.selection == p->second &&
+							  event->xselection.target == X_ATOM_UTF8_STRING);
+			},
+			(XPointer)&args);
+
+	_IRR_DEBUG_BREAK_IF(!(event_ret.type == SelectionNotify &&
+						  event_ret.xselection.requestor == XWindow &&
+						  event_ret.xselection.selection == selection &&
+						  event_ret.xselection.target == X_ATOM_UTF8_STRING));
+
+	Atom property_set = event_ret.xselection.property;
+	if (event_ret.xselection.property == None) {
+		// request failed => empty string
+		return text_buffer.c_str();
+	}
+
+	// check for data
+	Atom type;
+	int format;
+	unsigned long numItems, bytesLeft, dummy;
+	unsigned char *data = nullptr;
+	XGetWindowProperty(XDisplay, XWindow,
+			property_set,    // property name
+			0,               // offset
+			0,               // length (we only check for data, so 0)
+			0,               // Delete 0==false
+			AnyPropertyType, // AnyPropertyType or property identifier
+			&type,           // return type
+			&format,         // return format
+			&numItems,       // number items
+			&bytesLeft,      // remaining bytes for partial reads
+			&data);          // data
+	if (data) {
+		XFree(data);
+		data = nullptr;
+	}
+
+	// for debugging:
+	//~ {
+	//~ char *type_name = XGetAtomName(XDisplay, type);
+	//~ fprintf(stderr, "CIrrDeviceLinux::getTextFromSelection: actual type: %s (=%ld)\n",
+	//~ type_name, type);
+	//~ XFree(type_name);
+	//~ }
+
+	if (type != X_ATOM_UTF8_STRING && type != X_ATOM_UTF8_MIME_TYPE) {
+		os::Printer::log("CIrrDeviceLinux::getTextFromSelection: did not get utf-8 string",
+				ELL_WARNING);
+		return text_buffer.c_str();
+	}
+
+	if (bytesLeft > 0) {
+		// there is some data to get
+		int result = XGetWindowProperty(XDisplay, XWindow, property_set, 0,
+				bytesLeft, 0, AnyPropertyType, &type, &format,
+				&numItems, &dummy, &data);
+		if (result == Success)
+			text_buffer = (irr::c8 *)data;
+		XFree(data);
+	}
+
+	// delete the property again, to inform the owner about the successful transfer
+	XDeleteProperty(XDisplay, XWindow, property_set);
+
+	return text_buffer.c_str();
+}
+#endif
+
+//! gets text from the clipboard
+//! \return Returns 0 if no string is in there, otherwise utf-8 text.
+const c8 *CIrrDeviceLinux::getTextFromClipboard() const
+{
+#if defined(_IRR_COMPILE_WITH_X11_)
+	return getTextFromSelection(X_ATOM_CLIPBOARD, Clipboard);
+#else
+	return nullptr;
+#endif
+}
+
+//! gets text from the primary selection
+//! \return Returns 0 if no string is in there, otherwise utf-8 text.
+const c8 *CIrrDeviceLinux::getTextFromPrimarySelection() const
+{
+#if defined(_IRR_COMPILE_WITH_X11_)
+	return getTextFromSelection(XA_PRIMARY, PrimarySelection);
+#else
+	return nullptr;
+#endif
+}
+
+#if defined(_IRR_COMPILE_WITH_X11_)
+bool CIrrDeviceLinux::becomeSelectionOwner(Atom selection) const
+{
+	XSetSelectionOwner(XDisplay, selection, XWindow, CurrentTime);
+	XFlush(XDisplay);
+	Window owner = XGetSelectionOwner(XDisplay, selection);
+	return owner == XWindow;
+}
+#endif
+
+//! copies text to the clipboard
+void CIrrDeviceLinux::copyToClipboard(const c8 *text) const
+{
+#if defined(_IRR_COMPILE_WITH_X11_)
+	// Actually there is no clipboard on X but applications just say they own the clipboard and return text when asked.
+	// Which btw. also means that on X you lose clipboard content when closing applications.
+	Clipboard = text;
+	if (!becomeSelectionOwner(X_ATOM_CLIPBOARD)) {
+		os::Printer::log("CIrrDeviceLinux::copyToClipboard: failed to set owner", ELL_WARNING);
+	}
+#endif
+}
+
+//! copies text to the primary selection
+void CIrrDeviceLinux::copyToPrimarySelection(const c8 *text) const
+{
+#if defined(_IRR_COMPILE_WITH_X11_)
+	PrimarySelection = text;
+	if (!becomeSelectionOwner(XA_PRIMARY)) {
+		os::Printer::log("CIrrDeviceLinux::copyToPrimarySelection: failed to set owner", ELL_WARNING);
+	}
+#endif
+}
+
+#ifdef _IRR_COMPILE_WITH_X11_
+// return true if the passed event has the type passed in parameter arg
+Bool PredicateIsEventType(Display *display, XEvent *event, XPointer arg)
+{
+	if (event && event->type == *(int *)arg) {
+		//		os::Printer::log("remove event", core::stringc((int)arg).c_str(), ELL_INFORMATION);
+		return True;
+	}
+	return False;
+}
+#endif //_IRR_COMPILE_WITH_X11_
+
+//! Remove all messages pending in the system message loop
+void CIrrDeviceLinux::clearSystemMessages()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (CreationParams.DriverType != video::EDT_NULL) {
+		XEvent event;
+		int usrArg = ButtonPress;
+		while (XCheckIfEvent(XDisplay, &event, PredicateIsEventType, XPointer(&usrArg)) == True) {
+		}
+		usrArg = ButtonRelease;
+		while (XCheckIfEvent(XDisplay, &event, PredicateIsEventType, XPointer(&usrArg)) == True) {
+		}
+		usrArg = MotionNotify;
+		while (XCheckIfEvent(XDisplay, &event, PredicateIsEventType, XPointer(&usrArg)) == True) {
+		}
+		usrArg = KeyRelease;
+		while (XCheckIfEvent(XDisplay, &event, PredicateIsEventType, XPointer(&usrArg)) == True) {
+		}
+		usrArg = KeyPress;
+		while (XCheckIfEvent(XDisplay, &event, PredicateIsEventType, XPointer(&usrArg)) == True) {
+		}
+	}
+#endif //_IRR_COMPILE_WITH_X11_
+}
+
+//! Get the display density in dots per inch.
+float CIrrDeviceLinux::getDisplayDensity() const
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (XDisplay != NULL) {
+		/* try x direct */
+		int dh = DisplayHeight(XDisplay, 0);
+		int dw = DisplayWidth(XDisplay, 0);
+		int dh_mm = DisplayHeightMM(XDisplay, 0);
+		int dw_mm = DisplayWidthMM(XDisplay, 0);
+
+		if (dh_mm != 0 && dw_mm != 0) {
+			float dpi_height = floor(dh / (dh_mm * 0.039370) + 0.5);
+			float dpi_width = floor(dw / (dw_mm * 0.039370) + 0.5);
+			return std::max(dpi_height, dpi_width);
+		}
+	}
+#endif //_IRR_COMPILE_WITH_X11_
+
+	return 0.0f;
+}
+
+void CIrrDeviceLinux::initXAtoms()
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	X_ATOM_CLIPBOARD = XInternAtom(XDisplay, "CLIPBOARD", False);
+	X_ATOM_TARGETS = XInternAtom(XDisplay, "TARGETS", False);
+	X_ATOM_UTF8_STRING = XInternAtom(XDisplay, "UTF8_STRING", False);
+	X_ATOM_UTF8_MIME_TYPE = XInternAtom(XDisplay, "text/plain;charset=utf-8", False);
+	X_ATOM_TEXT = XInternAtom(XDisplay, "TEXT", False);
+	X_ATOM_NETWM_MAXIMIZE_VERT = XInternAtom(XDisplay, "_NET_WM_STATE_MAXIMIZED_VERT", true);
+	X_ATOM_NETWM_MAXIMIZE_HORZ = XInternAtom(XDisplay, "_NET_WM_STATE_MAXIMIZED_HORZ", true);
+	X_ATOM_NETWM_STATE = XInternAtom(XDisplay, "_NET_WM_STATE", true);
+	X_ATOM_NETWM_STATE_FULLSCREEN = XInternAtom(XDisplay, "_NET_WM_STATE_FULLSCREEN", True);
+#endif
+}
+
+void CIrrDeviceLinux::initXInput2()
+{
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+	int ev = 0;
+	int err = 0;
+	if (!XQueryExtension(XDisplay, "XInputExtension", &XI_EXTENSIONS_OPCODE, &ev, &err)) {
+		os::Printer::log("X Input extension not available.", ELL_WARNING);
+		return;
+	}
+
+	int major = 2;
+	int minor = 3;
+	int rc = XIQueryVersion(XDisplay, &major, &minor);
+	if (rc != Success) {
+		os::Printer::log("No XI2 support.", ELL_WARNING);
+		return;
+	}
+
+	// So far we only use XInput2 for touch events.
+	// So we enable those and disable all other events for now.
+	XIEventMask eventMask;
+	unsigned char mask[XIMaskLen(XI_TouchEnd)];
+	memset(mask, 0, sizeof(mask));
+	eventMask.deviceid = XIAllMasterDevices;
+	eventMask.mask_len = sizeof(mask);
+	eventMask.mask = mask;
+	XISetMask(eventMask.mask, XI_TouchBegin);
+	XISetMask(eventMask.mask, XI_TouchUpdate);
+	XISetMask(eventMask.mask, XI_TouchEnd);
+
+	XISelectEvents(XDisplay, XWindow, &eventMask, 1);
+#endif
+}
+
+#ifdef _IRR_COMPILE_WITH_X11_
+
+Cursor CIrrDeviceLinux::TextureToMonochromeCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot)
+{
+	XImage *sourceImage = XCreateImage(XDisplay, VisualInfo->visual,
+			1,       // depth,
+			ZPixmap, // XYBitmap (depth=1), ZPixmap(depth=x)
+			0, 0, sourceRect.getWidth(), sourceRect.getHeight(),
+			32, // bitmap_pad,
+			0   // bytes_per_line (0 means continuous in memory)
+	);
+	sourceImage->data = new char[sourceImage->height * sourceImage->bytes_per_line];
+	XImage *maskImage = XCreateImage(XDisplay, VisualInfo->visual,
+			1, // depth,
+			ZPixmap,
+			0, 0, sourceRect.getWidth(), sourceRect.getHeight(),
+			32, // bitmap_pad,
+			0   // bytes_per_line
+	);
+	maskImage->data = new char[maskImage->height * maskImage->bytes_per_line];
+
+	// write texture into XImage
+	video::ECOLOR_FORMAT format = tex->getColorFormat();
+	u32 bytesPerPixel = video::IImage::getBitsPerPixelFromFormat(format) / 8;
+	u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
+	u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
+	const u8 *data = (const u8 *)tex->lock(video::ETLM_READ_ONLY, 0);
+	data += sourceRect.UpperLeftCorner.Y * tex->getPitch();
+	for (s32 y = 0; y < sourceRect.getHeight(); ++y) {
+		data += bytesLeftGap;
+		for (s32 x = 0; x < sourceRect.getWidth(); ++x) {
+			video::SColor pixelCol;
+			pixelCol.setData((const void *)data, format);
+			data += bytesPerPixel;
+
+			if (pixelCol.getAlpha() == 0) { // transparent
+				XPutPixel(maskImage, x, y, 0);
+				XPutPixel(sourceImage, x, y, 0);
+			} else // color
+			{
+				if (pixelCol.getAverage() >= 127)
+					XPutPixel(sourceImage, x, y, 1);
+				else
+					XPutPixel(sourceImage, x, y, 0);
+				XPutPixel(maskImage, x, y, 1);
+			}
+		}
+		data += bytesRightGap;
+	}
+	tex->unlock();
+
+	Pixmap sourcePixmap = XCreatePixmap(XDisplay, XWindow, sourceImage->width, sourceImage->height, sourceImage->depth);
+	Pixmap maskPixmap = XCreatePixmap(XDisplay, XWindow, maskImage->width, maskImage->height, maskImage->depth);
+
+	XGCValues values;
+	values.foreground = 1;
+	values.background = 1;
+	GC gc = XCreateGC(XDisplay, sourcePixmap, GCForeground | GCBackground, &values);
+
+	XPutImage(XDisplay, sourcePixmap, gc, sourceImage, 0, 0, 0, 0, sourceImage->width, sourceImage->height);
+	XPutImage(XDisplay, maskPixmap, gc, maskImage, 0, 0, 0, 0, maskImage->width, maskImage->height);
+
+	XFreeGC(XDisplay, gc);
+	XDestroyImage(sourceImage);
+	XDestroyImage(maskImage);
+
+	Cursor cursorResult = 0;
+	XColor foreground, background;
+	foreground.red = 65535;
+	foreground.green = 65535;
+	foreground.blue = 65535;
+	foreground.flags = DoRed | DoGreen | DoBlue;
+	background.red = 0;
+	background.green = 0;
+	background.blue = 0;
+	background.flags = DoRed | DoGreen | DoBlue;
+
+	cursorResult = XCreatePixmapCursor(XDisplay, sourcePixmap, maskPixmap, &foreground, &background, hotspot.X, hotspot.Y);
+
+	XFreePixmap(XDisplay, sourcePixmap);
+	XFreePixmap(XDisplay, maskPixmap);
+
+	return cursorResult;
+}
+
+#ifdef _IRR_LINUX_XCURSOR_
+Cursor CIrrDeviceLinux::TextureToARGBCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot)
+{
+	XcursorImage *image = XcursorImageCreate(sourceRect.getWidth(), sourceRect.getHeight());
+	image->xhot = hotspot.X;
+	image->yhot = hotspot.Y;
+
+	// write texture into XcursorImage
+	video::ECOLOR_FORMAT format = tex->getColorFormat();
+	u32 bytesPerPixel = video::IImage::getBitsPerPixelFromFormat(format) / 8;
+	u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
+	u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
+	XcursorPixel *target = image->pixels;
+	const u8 *data = (const u8 *)tex->lock(video::ETLM_READ_ONLY, 0);
+	data += sourceRect.UpperLeftCorner.Y * tex->getPitch();
+	for (s32 y = 0; y < sourceRect.getHeight(); ++y) {
+		data += bytesLeftGap;
+		for (s32 x = 0; x < sourceRect.getWidth(); ++x) {
+			video::SColor pixelCol;
+			pixelCol.setData((const void *)data, format);
+			data += bytesPerPixel;
+
+			*target = (XcursorPixel)pixelCol.color;
+			++target;
+		}
+		data += bytesRightGap;
+	}
+	tex->unlock();
+
+	Cursor cursorResult = XcursorImageLoadCursor(XDisplay, image);
+
+	XcursorImageDestroy(image);
+
+	return cursorResult;
+}
+#endif // #ifdef _IRR_LINUX_XCURSOR_
+
+Cursor CIrrDeviceLinux::TextureToCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot)
+{
+#ifdef _IRR_LINUX_XCURSOR_
+	return TextureToARGBCursor(tex, sourceRect, hotspot);
+#else
+	return TextureToMonochromeCursor(tex, sourceRect, hotspot);
+#endif
+}
+#endif // _IRR_COMPILE_WITH_X11_
+
+CIrrDeviceLinux::CCursorControl::CCursorControl(CIrrDeviceLinux *dev, bool null) :
+		Device(dev)
+#ifdef _IRR_COMPILE_WITH_X11_
+		,
+		PlatformBehavior(gui::ECPB_NONE), LastQuery(0)
+#ifdef _IRR_LINUX_X11_XINPUT2_
+		,
+		DeviceId(0)
+#endif
+#endif
+		,
+		IsVisible(true), Null(null), UseReferenceRect(false), ActiveIcon(gui::ECI_NORMAL), ActiveIconStartTime(0)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (!Null) {
+#ifdef _IRR_LINUX_X11_XINPUT2_
+		// XIWarpPointer is entirely broken on multi-head setups (see also [1]),
+		// but behaves better in other cases so we can't just disable it outright.
+		// [1] https://developer.blender.org/rB165caafb99c6846e53d11c4e966990aaffc06cea
+		if (XScreenCount(Device->XDisplay) > 1) {
+			os::Printer::log("Detected classic multi-head setup, not using XIWarpPointer");
+		} else {
+			XIGetClientPointer(Device->XDisplay, Device->XWindow, &DeviceId);
+		}
+#endif
+
+		XGCValues values;
+		unsigned long valuemask = 0;
+
+		XColor fg, bg;
+
+		// this code, for making the cursor invisible was sent in by
+		// Sirshane, thank your very much!
+
+		Pixmap invisBitmap = XCreatePixmap(Device->XDisplay, Device->XWindow, 32, 32, 1);
+		Pixmap maskBitmap = XCreatePixmap(Device->XDisplay, Device->XWindow, 32, 32, 1);
+		Colormap screen_colormap = DefaultColormap(Device->XDisplay, DefaultScreen(Device->XDisplay));
+		XAllocNamedColor(Device->XDisplay, screen_colormap, "black", &fg, &fg);
+		XAllocNamedColor(Device->XDisplay, screen_colormap, "white", &bg, &bg);
+
+		GC gc = XCreateGC(Device->XDisplay, invisBitmap, valuemask, &values);
+
+		XSetForeground(Device->XDisplay, gc, BlackPixel(Device->XDisplay, DefaultScreen(Device->XDisplay)));
+		XFillRectangle(Device->XDisplay, invisBitmap, gc, 0, 0, 32, 32);
+		XFillRectangle(Device->XDisplay, maskBitmap, gc, 0, 0, 32, 32);
+
+		InvisCursor = XCreatePixmapCursor(Device->XDisplay, invisBitmap, maskBitmap, &fg, &bg, 1, 1);
+		XFreeGC(Device->XDisplay, gc);
+		XFreePixmap(Device->XDisplay, invisBitmap);
+		XFreePixmap(Device->XDisplay, maskBitmap);
+
+		initCursors();
+	}
+#endif
+}
+
+CIrrDeviceLinux::CCursorControl::~CCursorControl()
+{
+	// Do not clearCursors here as the display is already closed
+	// TODO (cutealien): dropping cursorcontrol earlier might work, not sure about reason why that's done in stub currently.
+}
+
+#ifdef _IRR_COMPILE_WITH_X11_
+void CIrrDeviceLinux::CCursorControl::clearCursors()
+{
+	if (!Null)
+		XFreeCursor(Device->XDisplay, InvisCursor);
+	for (u32 i = 0; i < Cursors.size(); ++i) {
+		for (u32 f = 0; f < Cursors[i].Frames.size(); ++f) {
+			XFreeCursor(Device->XDisplay, Cursors[i].Frames[f].IconHW);
+		}
+	}
+}
+
+void CIrrDeviceLinux::CCursorControl::initCursors()
+{
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_left_arrow))); //  (or XC_arrow?)
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_crosshair)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_hand2))); // (or XC_hand1? )
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_question_arrow)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_xterm)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_X_cursor))); //  (or XC_pirate?)
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_watch)));    // (or XC_clock?)
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_fleur)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_right_corner))); // NESW not available in X11
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_left_corner)));  // NWSE not available in X11
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_v_double_arrow)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_h_double_arrow)));
+	Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_up_arrow))); // (or XC_center_ptr?)
+}
+
+void CIrrDeviceLinux::CCursorControl::update()
+{
+	if ((u32)ActiveIcon < Cursors.size() && !Cursors[ActiveIcon].Frames.empty() && Cursors[ActiveIcon].FrameTime) {
+		// update animated cursors. This could also be done by X11 in case someone wants to figure that out (this way was just easier to implement)
+		u32 now = Device->getTimer()->getRealTime();
+		u32 frame = ((now - ActiveIconStartTime) / Cursors[ActiveIcon].FrameTime) % Cursors[ActiveIcon].Frames.size();
+		XDefineCursor(Device->XDisplay, Device->XWindow, Cursors[ActiveIcon].Frames[frame].IconHW);
+	}
+}
+#endif
+
+//! Sets the active cursor icon
+void CIrrDeviceLinux::CCursorControl::setActiveIcon(gui::ECURSOR_ICON iconId)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (iconId >= (s32)Cursors.size())
+		return;
+
+	if (Cursors[iconId].Frames.size())
+		XDefineCursor(Device->XDisplay, Device->XWindow, Cursors[iconId].Frames[0].IconHW);
+
+	ActiveIconStartTime = Device->getTimer()->getRealTime();
+	ActiveIcon = iconId;
+#endif
+}
+
+//! Add a custom sprite as cursor icon.
+gui::ECURSOR_ICON CIrrDeviceLinux::CCursorControl::addIcon(const gui::SCursorSprite &icon)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (icon.SpriteId >= 0) {
+		CursorX11 cX11;
+		cX11.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+		for (u32 i = 0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i) {
+			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+			Cursor cursor = Device->TextureToCursor(icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+			cX11.Frames.push_back(CursorFrameX11(cursor));
+		}
+
+		Cursors.push_back(cX11);
+
+		return (gui::ECURSOR_ICON)(Cursors.size() - 1);
+	}
+#endif
+	return gui::ECI_NORMAL;
+}
+
+//! replace the given cursor icon.
+void CIrrDeviceLinux::CCursorControl::changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite &icon)
+{
+#ifdef _IRR_COMPILE_WITH_X11_
+	if (iconId >= (s32)Cursors.size())
+		return;
+
+	for (u32 i = 0; i < Cursors[iconId].Frames.size(); ++i)
+		XFreeCursor(Device->XDisplay, Cursors[iconId].Frames[i].IconHW);
+
+	if (icon.SpriteId >= 0) {
+		CursorX11 cX11;
+		cX11.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+		for (u32 i = 0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i) {
+			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+			Cursor cursor = Device->TextureToCursor(icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+			cX11.Frames.push_back(CursorFrameX11(cursor));
+		}
+
+		Cursors[iconId] = cX11;
+	}
+#endif
+}
+
+irr::core::dimension2di CIrrDeviceLinux::CCursorControl::getSupportedIconSize() const
+{
+	// this returns the closest match that is smaller or same size, so we just pass a value which should be large enough for cursors
+	unsigned int width = 0, height = 0;
+#ifdef _IRR_COMPILE_WITH_X11_
+	XQueryBestCursor(Device->XDisplay, Device->XWindow, 64, 64, &width, &height);
+#endif
+	return core::dimension2di(width, height);
+}
+
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_X11_DEVICE_
diff --git a/irr/src/CIrrDeviceLinux.h b/irr/src/CIrrDeviceLinux.h
new file mode 100644
index 000000000..4aac1cf6c
--- /dev/null
+++ b/irr/src/CIrrDeviceLinux.h
@@ -0,0 +1,469 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
+
+#include "CIrrDeviceStub.h"
+#include "IrrlichtDevice.h"
+#include "ICursorControl.h"
+#include "os.h"
+
+#ifdef _IRR_COMPILE_WITH_X11_
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+#ifdef _IRR_LINUX_X11_XINPUT2_
+#include <X11/extensions/XInput2.h>
+#endif
+
+#else
+#define KeySym s32
+#endif
+
+namespace irr
+{
+
+class CIrrDeviceLinux : public CIrrDeviceStub
+{
+public:
+	//! constructor
+	CIrrDeviceLinux(const SIrrlichtCreationParameters &param);
+
+	//! destructor
+	virtual ~CIrrDeviceLinux();
+
+	//! runs the device. Returns false if device wants to be deleted
+	bool run() override;
+
+	//! Cause the device to temporarily pause execution and let other processes to run
+	// This should bring down processor usage without major performance loss for Irrlicht
+	void yield() override;
+
+	//! Pause execution and let other processes to run for a specified amount of time.
+	void sleep(u32 timeMs, bool pauseTimer) override;
+
+	//! sets the caption of the window
+	void setWindowCaption(const wchar_t *text) override;
+
+	//! Sets the window icon.
+	bool setWindowIcon(const video::IImage *img) override;
+
+	//! returns if window is active. if not, nothing need to be drawn
+	bool isWindowActive() const override;
+
+	//! returns if window has focus.
+	bool isWindowFocused() const override;
+
+	//! returns if window is minimized.
+	bool isWindowMinimized() const override;
+
+	//! returns last state from maximizeWindow() and restoreWindow()
+	bool isWindowMaximized() const override;
+
+	//! returns color format of the window.
+	video::ECOLOR_FORMAT getColorFormat() const override;
+
+	//! notifies the device that it should close itself
+	void closeDevice() override;
+
+	//! Sets if the window should be resizable in windowed mode.
+	void setResizable(bool resize = false) override;
+
+	//! Resize the render window.
+	void setWindowSize(const irr::core::dimension2d<u32> &size) override;
+
+	//! Minimizes the window.
+	void minimizeWindow() override;
+
+	//! Maximizes the window.
+	void maximizeWindow() override;
+
+	//! Restores the window size.
+	void restoreWindow() override;
+
+	//! Get the position of this window on screen
+	core::position2di getWindowPosition() override;
+
+	//! Activate any joysticks, and generate events for them.
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) override;
+
+	//! gets text from the clipboard
+	//! \return Returns 0 if no string is in there, otherwise utf-8 text.
+	virtual const c8 *getTextFromClipboard() const;
+
+	//! gets text from the primary selection
+	//! \return Returns 0 if no string is in there, otherwise utf-8 text.
+	virtual const c8 *getTextFromPrimarySelection() const;
+
+	//! copies text to the clipboard
+	//! This sets the clipboard selection and _not_ the primary selection.
+	//! @param text The text in utf-8
+	virtual void copyToClipboard(const c8 *text) const;
+
+	//! copies text to the primary selection
+	//! This sets the primary selection which you have on X on the middle mouse button.
+	//! @param text The text in utf-8
+	virtual void copyToPrimarySelection(const c8 *text) const;
+
+	//! Remove all messages pending in the system message loop
+	void clearSystemMessages() override;
+
+	//! Get the device type
+	E_DEVICE_TYPE getType() const override
+	{
+		return EIDT_X11;
+	}
+
+	//! Get the display density in dots per inch.
+	float getDisplayDensity() const override;
+
+#ifdef _IRR_COMPILE_WITH_X11_
+	// convert an Irrlicht texture to a X11 cursor
+	Cursor TextureToCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot);
+	Cursor TextureToMonochromeCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot);
+#ifdef _IRR_LINUX_XCURSOR_
+	Cursor TextureToARGBCursor(irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot);
+#endif
+#endif
+
+private:
+	//! create the driver
+	void createDriver();
+
+	bool createWindow();
+
+	void createKeyMap();
+
+	void pollJoysticks();
+
+	void initXAtoms();
+
+	void initXInput2();
+
+	bool switchToFullscreen();
+
+	void setupTopLevelXorgWindow();
+
+#ifdef _IRR_COMPILE_WITH_X11_
+	bool createInputContext();
+	void destroyInputContext();
+	EKEY_CODE getKeyCode(XEvent &event);
+
+	const c8 *getTextFromSelection(Atom selection, core::stringc &text_buffer) const;
+	bool becomeSelectionOwner(Atom selection) const;
+#endif
+
+	//! Implementation of the linux cursor control
+	class CCursorControl : public gui::ICursorControl
+	{
+	public:
+		CCursorControl(CIrrDeviceLinux *dev, bool null);
+
+		~CCursorControl();
+
+		//! Changes the visible state of the mouse cursor.
+		void setVisible(bool visible) override
+		{
+			if (visible == IsVisible)
+				return;
+			IsVisible = visible;
+#ifdef _IRR_COMPILE_WITH_X11_
+			if (!Null) {
+				if (!IsVisible)
+					XDefineCursor(Device->XDisplay, Device->XWindow, InvisCursor);
+				else
+					XUndefineCursor(Device->XDisplay, Device->XWindow);
+			}
+#endif
+		}
+
+		//! Returns if the cursor is currently visible.
+		bool isVisible() const override
+		{
+			return IsVisible;
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<f32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(f32 x, f32 y) override
+		{
+			setPosition((s32)(x * Device->Width), (s32)(y * Device->Height));
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<s32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(s32 x, s32 y) override
+		{
+#ifdef _IRR_COMPILE_WITH_X11_
+
+			if (!Null) {
+				if (UseReferenceRect) {
+// NOTE: XIWarpPointer works when X11 has set a coordinate transformation matrix for the mouse unlike XWarpPointer
+// which runs into a bug mentioned here: https://gitlab.freedesktop.org/xorg/xserver/-/issues/600
+// So also workaround for Irrlicht bug #450
+#ifdef _IRR_LINUX_X11_XINPUT2_
+					if (DeviceId != 0) {
+						XIWarpPointer(Device->XDisplay,
+								DeviceId,
+								None,
+								Device->XWindow, 0, 0,
+								Device->Width,
+								Device->Height,
+								ReferenceRect.UpperLeftCorner.X + x,
+								ReferenceRect.UpperLeftCorner.Y + y);
+					} else
+#endif
+					{
+						XWarpPointer(Device->XDisplay,
+								None,
+								Device->XWindow, 0, 0,
+								Device->Width,
+								Device->Height,
+								ReferenceRect.UpperLeftCorner.X + x,
+								ReferenceRect.UpperLeftCorner.Y + y);
+					}
+				} else {
+#ifdef _IRR_LINUX_X11_XINPUT2_
+					if (DeviceId != 0) {
+						XIWarpPointer(Device->XDisplay,
+								DeviceId,
+								None,
+								Device->XWindow, 0, 0,
+								Device->Width,
+								Device->Height, x, y);
+					} else
+#endif
+					{
+						XWarpPointer(Device->XDisplay,
+								None,
+								Device->XWindow, 0, 0,
+								Device->Width,
+								Device->Height, x, y);
+					}
+				}
+				XFlush(Device->XDisplay);
+			}
+#endif
+			CursorPos.X = x;
+			CursorPos.Y = y;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		const core::position2d<s32> &getPosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateCursorPos();
+			return CursorPos;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		core::position2d<f32> getRelativePosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateCursorPos();
+
+			if (!UseReferenceRect) {
+				return core::position2d<f32>(CursorPos.X / (f32)Device->Width,
+						CursorPos.Y / (f32)Device->Height);
+			}
+
+			return core::position2d<f32>(CursorPos.X / (f32)ReferenceRect.getWidth(),
+					CursorPos.Y / (f32)ReferenceRect.getHeight());
+		}
+
+		void setReferenceRect(core::rect<s32> *rect = 0) override
+		{
+			if (rect) {
+				ReferenceRect = *rect;
+				UseReferenceRect = true;
+
+				// prevent division through zero and uneven sizes
+
+				if (!ReferenceRect.getHeight() || ReferenceRect.getHeight() % 2)
+					ReferenceRect.LowerRightCorner.Y += 1;
+
+				if (!ReferenceRect.getWidth() || ReferenceRect.getWidth() % 2)
+					ReferenceRect.LowerRightCorner.X += 1;
+			} else
+				UseReferenceRect = false;
+		}
+
+		//! Sets the active cursor icon
+		void setActiveIcon(gui::ECURSOR_ICON iconId) override;
+
+		//! Gets the currently active icon
+		gui::ECURSOR_ICON getActiveIcon() const override
+		{
+			return ActiveIcon;
+		}
+
+		//! Add a custom sprite as cursor icon.
+		gui::ECURSOR_ICON addIcon(const gui::SCursorSprite &icon) override;
+
+		//! replace the given cursor icon.
+		void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite &icon) override;
+
+		//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+		core::dimension2di getSupportedIconSize() const override;
+
+#ifdef _IRR_COMPILE_WITH_X11_
+		//! Set platform specific behavior flags.
+		void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) override { PlatformBehavior = behavior; }
+
+		//! Return platform specific behavior.
+		gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const override { return PlatformBehavior; }
+
+		void update();
+		void clearCursors();
+#endif
+	private:
+		void updateCursorPos()
+		{
+#ifdef _IRR_COMPILE_WITH_X11_
+			if (Null)
+				return;
+
+			if (PlatformBehavior & gui::ECPB_X11_CACHE_UPDATES && !os::Timer::isStopped()) {
+				u32 now = os::Timer::getTime();
+				if (now <= LastQuery)
+					return;
+				LastQuery = now;
+			}
+
+			Window tmp;
+			int itmp1, itmp2;
+			unsigned int maskreturn;
+			XQueryPointer(Device->XDisplay, Device->XWindow,
+					&tmp, &tmp,
+					&itmp1, &itmp2,
+					&CursorPos.X, &CursorPos.Y, &maskreturn);
+#endif
+		}
+
+		CIrrDeviceLinux *Device;
+		core::position2d<s32> CursorPos;
+		core::rect<s32> ReferenceRect;
+#ifdef _IRR_COMPILE_WITH_X11_
+		gui::ECURSOR_PLATFORM_BEHAVIOR PlatformBehavior;
+		u32 LastQuery;
+		Cursor InvisCursor;
+
+#ifdef _IRR_LINUX_X11_XINPUT2_
+		int DeviceId;
+#endif
+
+		struct CursorFrameX11
+		{
+			CursorFrameX11() :
+					IconHW(0) {}
+			CursorFrameX11(Cursor icon) :
+					IconHW(icon) {}
+
+			Cursor IconHW; // hardware cursor
+		};
+
+		struct CursorX11
+		{
+			CursorX11() {}
+			explicit CursorX11(Cursor iconHw, u32 frameTime = 0) :
+					FrameTime(frameTime)
+			{
+				Frames.push_back(CursorFrameX11(iconHw));
+			}
+			core::array<CursorFrameX11> Frames;
+			u32 FrameTime;
+		};
+
+		core::array<CursorX11> Cursors;
+
+		void initCursors();
+#endif
+		bool IsVisible;
+		bool Null;
+		bool UseReferenceRect;
+		gui::ECURSOR_ICON ActiveIcon;
+		u32 ActiveIconStartTime;
+	};
+
+	friend class CCursorControl;
+
+#ifdef _IRR_COMPILE_WITH_X11_
+	friend class COpenGLDriver;
+
+	Display *XDisplay;
+	XVisualInfo *VisualInfo;
+	int Screennr;
+	Window XWindow;
+	XSetWindowAttributes WndAttributes;
+	XSizeHints *StdHints;
+	XIM XInputMethod;
+	XIC XInputContext;
+	bool HasNetWM;
+	// text is utf-8
+	mutable core::stringc Clipboard;
+	mutable core::stringc PrimarySelection;
+#endif
+#if defined(_IRR_LINUX_X11_XINPUT2_)
+	int currentTouchedCount;
+#endif
+	u32 Width, Height;
+	bool WindowHasFocus;
+	bool WindowMinimized;
+	bool WindowMaximized;
+	bool ExternalWindow;
+	int AutorepeatSupport;
+
+	struct SKeyMap
+	{
+		SKeyMap() {}
+		SKeyMap(s32 x11, s32 win32) :
+				X11Key(x11), Win32Key(win32)
+		{
+		}
+
+		KeySym X11Key;
+		s32 Win32Key;
+
+		bool operator<(const SKeyMap &o) const
+		{
+			return X11Key < o.X11Key;
+		}
+	};
+
+	core::array<SKeyMap> KeyMap;
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	struct JoystickInfo
+	{
+		int fd;
+		int axes;
+		int buttons;
+
+		SEvent persistentData;
+
+		JoystickInfo() :
+				fd(-1), axes(0), buttons(0) {}
+	};
+	core::array<JoystickInfo> ActiveJoysticks;
+#endif
+};
+
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_X11_DEVICE_
diff --git a/irr/src/CIrrDeviceOSX.h b/irr/src/CIrrDeviceOSX.h
new file mode 100644
index 000000000..f4f159aa2
--- /dev/null
+++ b/irr/src/CIrrDeviceOSX.h
@@ -0,0 +1,238 @@
+// Copyright (C) 2005-2006 Etienne Petitjean
+// Copyright (C) 2007-2012 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+
+#include "CIrrDeviceStub.h"
+#include "IrrlichtDevice.h"
+#include "IGUIEnvironment.h"
+#include "ICursorControl.h"
+
+#import <AppKit/NSWindow.h>
+#import <AppKit/NSBitmapImageRep.h>
+
+#include <map>
+
+namespace irr
+{
+class CIrrDeviceMacOSX;
+}
+
+@interface CIrrDelegateOSX : NSObject <NSApplicationDelegate, NSWindowDelegate>
+
+- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device;
+- (void)terminate:(id)sender;
+- (BOOL)isQuit;
+
+@end
+
+namespace irr
+{
+class CIrrDeviceMacOSX : public CIrrDeviceStub
+{
+public:
+	//! constructor
+	CIrrDeviceMacOSX(const SIrrlichtCreationParameters &params);
+
+	//! destructor
+	virtual ~CIrrDeviceMacOSX();
+
+	//! runs the device. Returns false if device wants to be deleted
+	bool run() override;
+
+	//! Cause the device to temporarily pause execution and let other processes to run
+	// This should bring down processor usage without major performance loss for Irrlicht
+	void yield() override;
+
+	//! Pause execution and let other processes to run for a specified amount of time.
+	void sleep(u32 timeMs, bool pauseTimer) override;
+
+	//! sets the caption of the window
+	void setWindowCaption(const wchar_t *text) override;
+
+	//! returns if window is active. if not, nothing need to be drawn
+	bool isWindowActive() const override;
+
+	//! Checks if the Irrlicht window has focus
+	bool isWindowFocused() const override;
+
+	//! Checks if the Irrlicht window is minimized
+	bool isWindowMinimized() const override;
+
+	//! notifies the device that it should close itself
+	void closeDevice() override;
+
+	//! Sets if the window should be resizable in windowed mode.
+	void setResizable(bool resize) override;
+
+	//! Returns true if the window is resizable, false if not
+	virtual bool isResizable() const;
+
+	//! Minimizes the window if possible
+	void minimizeWindow() override;
+
+	//! Maximizes the window if possible.
+	void maximizeWindow() override;
+
+	//! Restore the window to normal size if possible.
+	void restoreWindow() override;
+
+	//! Get the position of this window on screen
+	core::position2di getWindowPosition() override;
+
+	//! Activate any joysticks, and generate events for them.
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) override;
+
+	//! Get the device type
+	E_DEVICE_TYPE getType() const override
+	{
+		return EIDT_OSX;
+	}
+
+	void setMouseLocation(int x, int y);
+	void setResize(int width, int height);
+	void setCursorVisible(bool visible);
+	void setWindow(NSWindow *window);
+
+private:
+	//! create the driver
+	void createDriver();
+
+	//! Implementation of the macos x cursor control
+	class CCursorControl : public gui::ICursorControl
+	{
+	public:
+		CCursorControl(const core::dimension2d<u32> &wsize, CIrrDeviceMacOSX *device) :
+				WindowSize(wsize), InvWindowSize(0.0f, 0.0f), Device(device), IsVisible(true), UseReferenceRect(false)
+		{
+			CursorPos.X = CursorPos.Y = 0;
+			if (WindowSize.Width != 0)
+				InvWindowSize.Width = 1.0f / WindowSize.Width;
+			if (WindowSize.Height != 0)
+				InvWindowSize.Height = 1.0f / WindowSize.Height;
+		}
+
+		//! Changes the visible state of the mouse cursor.
+		void setVisible(bool visible) override
+		{
+			IsVisible = visible;
+			Device->setCursorVisible(visible);
+		}
+
+		//! Returns if the cursor is currently visible.
+		bool isVisible() const override
+		{
+			return IsVisible;
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<f32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(f32 x, f32 y) override
+		{
+			setPosition((s32)(x * WindowSize.Width), (s32)(y * WindowSize.Height));
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<s32> &pos) override
+		{
+			if (CursorPos.X != pos.X || CursorPos.Y != pos.Y)
+				setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(s32 x, s32 y) override
+		{
+			if (UseReferenceRect) {
+				Device->setMouseLocation(ReferenceRect.UpperLeftCorner.X + x, ReferenceRect.UpperLeftCorner.Y + y);
+			} else {
+				Device->setMouseLocation(x, y);
+			}
+		}
+
+		//! Returns the current position of the mouse cursor.
+		const core::position2d<s32> &getPosition(bool updateCursor) override
+		{
+			return CursorPos;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		core::position2d<f32> getRelativePosition(bool updateCursor) override
+		{
+			if (!UseReferenceRect) {
+				return core::position2d<f32>(CursorPos.X * InvWindowSize.Width,
+						CursorPos.Y * InvWindowSize.Height);
+			}
+
+			return core::position2d<f32>(CursorPos.X / (f32)ReferenceRect.getWidth(),
+					CursorPos.Y / (f32)ReferenceRect.getHeight());
+		}
+
+		//! Sets an absolute reference rect for calculating the cursor position.
+		void setReferenceRect(core::rect<s32> *rect = 0) override
+		{
+			if (rect) {
+				ReferenceRect = *rect;
+				UseReferenceRect = true;
+
+				// prevent division through zero and uneven sizes
+
+				if (!ReferenceRect.getHeight() || ReferenceRect.getHeight() % 2)
+					ReferenceRect.LowerRightCorner.Y += 1;
+
+				if (!ReferenceRect.getWidth() || ReferenceRect.getWidth() % 2)
+					ReferenceRect.LowerRightCorner.X += 1;
+			} else
+				UseReferenceRect = false;
+		}
+
+		//! Updates the internal cursor position
+		void updateInternalCursorPosition(int x, int y)
+		{
+			CursorPos.X = x;
+			CursorPos.Y = y;
+		}
+
+	private:
+		core::position2d<s32> CursorPos;
+		core::dimension2d<s32> WindowSize;
+		core::dimension2d<float> InvWindowSize;
+		core::rect<s32> ReferenceRect;
+		CIrrDeviceMacOSX *Device;
+		bool IsVisible;
+		bool UseReferenceRect;
+	};
+
+	bool createWindow();
+	void initKeycodes();
+	void storeMouseLocation();
+	void postMouseEvent(void *event, irr::SEvent &ievent);
+	void postKeyEvent(void *event, irr::SEvent &ievent, bool pressed);
+	void pollJoysticks();
+
+	NSWindow *Window;
+	CGDirectDisplayID Display;
+	std::map<int, int> KeyCodes;
+	int DeviceWidth;
+	int DeviceHeight;
+	int ScreenWidth;
+	int ScreenHeight;
+	u32 MouseButtonStates;
+	bool IsFullscreen;
+	bool IsActive;
+	bool IsShiftDown;
+	bool IsControlDown;
+	bool IsResizable;
+};
+
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
diff --git a/irr/src/CIrrDeviceOSX.mm b/irr/src/CIrrDeviceOSX.mm
new file mode 100644
index 000000000..67c0ce05c
--- /dev/null
+++ b/irr/src/CIrrDeviceOSX.mm
@@ -0,0 +1,1472 @@
+// Copyright (C) 2005-2006 Etienne Petitjean
+// Copyright (C) 2007-2012 Christian Stehno
+// Copyright (C) 2013-2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+
+#import <Cocoa/Cocoa.h>
+#import <OpenGL/gl.h>
+
+#include "CIrrDeviceOSX.h"
+
+#include "IEventReceiver.h"
+#include "os.h"
+#include "CTimer.h"
+#include "irrString.h"
+#include "Keycodes.h"
+#include <stdio.h>
+#include <sys/utsname.h>
+#include "COSOperator.h"
+#include "CColorConverter.h"
+#include "irrlicht.h"
+#include <algorithm>
+
+#include <wchar.h>
+#include <time.h>
+
+#include "CNSOGLManager.h"
+
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+#include <IOKit/IOKitLib.h>
+#include <IOKit/IOCFPlugIn.h>
+#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
+#include <IOKit/hid/IOHIDLib.h>
+#include <IOKit/hid/IOHIDKeys.h>
+
+struct JoystickComponent
+{
+	IOHIDElementCookie cookie; // unique value which identifies element, will NOT change
+	long min;                  // reported min value possible
+	long max;                  // reported max value possible
+
+	long minRead; // min read value
+	long maxRead; // max read value
+
+	JoystickComponent() :
+			min(0), minRead(0), max(0), maxRead(0)
+	{
+	}
+};
+
+struct JoystickInfo
+{
+	irr::core::array<JoystickComponent> axisComp;
+	irr::core::array<JoystickComponent> buttonComp;
+	irr::core::array<JoystickComponent> hatComp;
+
+	int hats;
+	int axes;
+	int buttons;
+	int numActiveJoysticks;
+
+	irr::SEvent persistentData;
+
+	IOHIDDeviceInterface **interface;
+	bool removed;
+	char joystickName[256];
+	long usage;     // usage page from IOUSBHID Parser.h which defines general usage
+	long usagePage; // usage within above page from IOUSBHID Parser.h which defines specific usage
+
+	JoystickInfo() :
+			hats(0), axes(0), buttons(0), interface(0), removed(false), usage(0), usagePage(0), numActiveJoysticks(0)
+	{
+		interface = NULL;
+		memset(joystickName, '\0', 256);
+		axisComp.clear();
+		buttonComp.clear();
+		hatComp.clear();
+
+		persistentData.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+		persistentData.JoystickEvent.POV = 65535;
+		persistentData.JoystickEvent.ButtonStates = 0;
+	}
+};
+irr::core::array<JoystickInfo> ActiveJoysticks;
+
+// helper functions for init joystick
+static IOReturn closeJoystickDevice(JoystickInfo *joyInfo)
+{
+	IOReturn result = kIOReturnSuccess;
+	if (joyInfo && joyInfo->interface) {
+		/* close the interface */
+		result = (*(joyInfo->interface))->close(joyInfo->interface);
+		if (kIOReturnNotOpen == result) {
+			/* do nothing as device was not opened, thus can't be closed */
+		} else if (kIOReturnSuccess != result)
+			irr::os::Printer::log("IOHIDDeviceInterface failed to close", irr::ELL_ERROR);
+		/* release the interface */
+		result = (*(joyInfo->interface))->Release(joyInfo->interface);
+		if (kIOReturnSuccess != result)
+			irr::os::Printer::log("IOHIDDeviceInterface failed to release", irr::ELL_ERROR);
+		joyInfo->interface = NULL;
+	}
+	return result;
+}
+
+static void addComponentInfo(CFTypeRef refElement, JoystickComponent *pComponent, int numActiveJoysticks)
+{
+	long number;
+	CFTypeRef refType;
+
+	refType = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementCookieKey));
+	if (refType && CFNumberGetValue((CFNumberRef)refType, kCFNumberLongType, &number))
+		pComponent->cookie = (IOHIDElementCookie)number;
+	refType = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementMinKey));
+	if (refType && CFNumberGetValue((CFNumberRef)refType, kCFNumberLongType, &number))
+		pComponent->minRead = pComponent->min = number;
+	refType = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementMaxKey));
+	if (refType && CFNumberGetValue((CFNumberRef)refType, kCFNumberLongType, &number))
+		pComponent->maxRead = pComponent->max = number;
+}
+
+static void getJoystickComponentArrayHandler(const void *value, void *parameter);
+
+static void addJoystickComponent(CFTypeRef refElement, JoystickInfo *joyInfo)
+{
+	long elementType, usagePage, usage;
+	CFTypeRef refElementType = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementTypeKey));
+	CFTypeRef refUsagePage = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementUsagePageKey));
+	CFTypeRef refUsage = CFDictionaryGetValue((CFDictionaryRef)refElement, CFSTR(kIOHIDElementUsageKey));
+
+	if ((refElementType) && (CFNumberGetValue((CFNumberRef)refElementType, kCFNumberLongType, &elementType))) {
+		/* look at types of interest */
+		if ((elementType == kIOHIDElementTypeInput_Misc) || (elementType == kIOHIDElementTypeInput_Button) ||
+				(elementType == kIOHIDElementTypeInput_Axis)) {
+			if (refUsagePage && CFNumberGetValue((CFNumberRef)refUsagePage, kCFNumberLongType, &usagePage) &&
+					refUsage && CFNumberGetValue((CFNumberRef)refUsage, kCFNumberLongType, &usage)) {
+				switch (usagePage) /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
+				{
+				case kHIDPage_GenericDesktop: {
+					switch (usage) /* look at usage to determine function */
+					{
+					case kHIDUsage_GD_X:
+					case kHIDUsage_GD_Y:
+					case kHIDUsage_GD_Z:
+					case kHIDUsage_GD_Rx:
+					case kHIDUsage_GD_Ry:
+					case kHIDUsage_GD_Rz:
+					case kHIDUsage_GD_Slider:
+					case kHIDUsage_GD_Dial:
+					case kHIDUsage_GD_Wheel: {
+						joyInfo->axes++;
+						JoystickComponent newComponent;
+						addComponentInfo(refElement, &newComponent, joyInfo->numActiveJoysticks);
+						joyInfo->axisComp.push_back(newComponent);
+					} break;
+					case kHIDUsage_GD_Hatswitch: {
+						joyInfo->hats++;
+						JoystickComponent newComponent;
+						addComponentInfo(refElement, &newComponent, joyInfo->numActiveJoysticks);
+						joyInfo->hatComp.push_back(newComponent);
+					} break;
+					}
+				} break;
+				case kHIDPage_Button: {
+					joyInfo->buttons++;
+					JoystickComponent newComponent;
+					addComponentInfo(refElement, &newComponent, joyInfo->numActiveJoysticks);
+					joyInfo->buttonComp.push_back(newComponent);
+				} break;
+				default:
+					break;
+				}
+			}
+		} else if (kIOHIDElementTypeCollection == elementType) {
+			// get elements
+			CFTypeRef refElementTop = CFDictionaryGetValue((CFMutableDictionaryRef)refElement, CFSTR(kIOHIDElementKey));
+			if (refElementTop) {
+				CFTypeID type = CFGetTypeID(refElementTop);
+				if (type == CFArrayGetTypeID()) {
+					CFRange range = {0, CFArrayGetCount((CFArrayRef)refElementTop)};
+					CFArrayApplyFunction((CFArrayRef)refElementTop, range, getJoystickComponentArrayHandler, joyInfo);
+				}
+			}
+		}
+	}
+}
+
+static void getJoystickComponentArrayHandler(const void *value, void *parameter)
+{
+	if (CFGetTypeID(value) == CFDictionaryGetTypeID())
+		addJoystickComponent((CFTypeRef)value, (JoystickInfo *)parameter);
+}
+
+static void joystickTopLevelElementHandler(const void *value, void *parameter)
+{
+	CFTypeRef refCF = 0;
+	if (CFGetTypeID(value) != CFDictionaryGetTypeID())
+		return;
+	refCF = CFDictionaryGetValue((CFDictionaryRef)value, CFSTR(kIOHIDElementUsagePageKey));
+	if (!CFNumberGetValue((CFNumberRef)refCF, kCFNumberLongType, &((JoystickInfo *)parameter)->usagePage))
+		irr::os::Printer::log("CFNumberGetValue error retrieving JoystickInfo->usagePage", irr::ELL_ERROR);
+	refCF = CFDictionaryGetValue((CFDictionaryRef)value, CFSTR(kIOHIDElementUsageKey));
+	if (!CFNumberGetValue((CFNumberRef)refCF, kCFNumberLongType, &((JoystickInfo *)parameter)->usage))
+		irr::os::Printer::log("CFNumberGetValue error retrieving JoystickInfo->usage", irr::ELL_ERROR);
+}
+
+static void getJoystickDeviceInfo(io_object_t hidDevice, CFMutableDictionaryRef hidProperties, JoystickInfo *joyInfo)
+{
+	CFMutableDictionaryRef usbProperties = 0;
+	io_registry_entry_t parent1, parent2;
+
+	/* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
+	 * get dictionary for usb properties: step up two levels and get CF dictionary for USB properties
+	 */
+	if ((KERN_SUCCESS == IORegistryEntryGetParentEntry(hidDevice, kIOServicePlane, &parent1)) &&
+			(KERN_SUCCESS == IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2)) &&
+			(KERN_SUCCESS == IORegistryEntryCreateCFProperties(parent2, &usbProperties, kCFAllocatorDefault, kNilOptions))) {
+		if (usbProperties) {
+			CFTypeRef refCF = 0;
+			/* get device info
+			 * try hid dictionary first, if fail then go to usb dictionary
+			 */
+
+			/* get joystickName name */
+			refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
+			if (!refCF)
+				refCF = CFDictionaryGetValue(usbProperties, CFSTR("USB Product Name"));
+			if (refCF) {
+				if (!CFStringGetCString((CFStringRef)refCF, joyInfo->joystickName, 256, CFStringGetSystemEncoding()))
+					irr::os::Printer::log("CFStringGetCString error getting joyInfo->joystickName", irr::ELL_ERROR);
+			}
+
+			/* get usage page and usage */
+			refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDPrimaryUsagePageKey));
+			if (refCF) {
+				if (!CFNumberGetValue((CFNumberRef)refCF, kCFNumberLongType, &joyInfo->usagePage))
+					irr::os::Printer::log("CFNumberGetValue error getting joyInfo->usagePage", irr::ELL_ERROR);
+				refCF = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDPrimaryUsageKey));
+				if (refCF)
+					if (!CFNumberGetValue((CFNumberRef)refCF, kCFNumberLongType, &joyInfo->usage))
+						irr::os::Printer::log("CFNumberGetValue error getting joyInfo->usage", irr::ELL_ERROR);
+			}
+
+			if (NULL == refCF) /* get top level element HID usage page or usage */
+			{
+				/* use top level element instead */
+				CFTypeRef refCFTopElement = 0;
+				refCFTopElement = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDElementKey));
+				{
+					/* refCFTopElement points to an array of element dictionaries */
+					CFRange range = {0, CFArrayGetCount((CFArrayRef)refCFTopElement)};
+					CFArrayApplyFunction((CFArrayRef)refCFTopElement, range, joystickTopLevelElementHandler, joyInfo);
+				}
+			}
+
+			CFRelease(usbProperties);
+		} else
+			irr::os::Printer::log("IORegistryEntryCreateCFProperties failed to create usbProperties", irr::ELL_ERROR);
+
+		if (kIOReturnSuccess != IOObjectRelease(parent2))
+			irr::os::Printer::log("IOObjectRelease failed to release parent2", irr::ELL_ERROR);
+		if (kIOReturnSuccess != IOObjectRelease(parent1))
+			irr::os::Printer::log("IOObjectRelease failed to release parent1", irr::ELL_ERROR);
+	}
+}
+
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+// Contents from Events.h from Carbon/HIToolbox but we need it with Cocoa too
+// and for some reason no Cocoa equivalent of these constants seems provided.
+// So I'm doing like everyone else and using copy-and-paste.
+
+/*
+ *  Summary:
+ *	Virtual keycodes
+ *
+ *  Discussion:
+ *	These constants are the virtual keycodes defined originally in
+ *	Inside Mac Volume V, pg. V-191. They identify physical keys on a
+ *	keyboard. Those constants with "ANSI" in the name are labeled
+ *	according to the key position on an ANSI-standard US keyboard.
+ *	For example, kVK_ANSI_A indicates the virtual keycode for the key
+ *	with the letter 'A' in the US keyboard layout. Other keyboard
+ *	layouts may have the 'A' key label on a different physical key;
+ *	in this case, pressing 'A' will generate a different virtual
+ *	keycode.
+ */
+enum
+{
+	kVK_ANSI_A = 0x00,
+	kVK_ANSI_S = 0x01,
+	kVK_ANSI_D = 0x02,
+	kVK_ANSI_F = 0x03,
+	kVK_ANSI_H = 0x04,
+	kVK_ANSI_G = 0x05,
+	kVK_ANSI_Z = 0x06,
+	kVK_ANSI_X = 0x07,
+	kVK_ANSI_C = 0x08,
+	kVK_ANSI_V = 0x09,
+	kVK_ANSI_B = 0x0B,
+	kVK_ANSI_Q = 0x0C,
+	kVK_ANSI_W = 0x0D,
+	kVK_ANSI_E = 0x0E,
+	kVK_ANSI_R = 0x0F,
+	kVK_ANSI_Y = 0x10,
+	kVK_ANSI_T = 0x11,
+	kVK_ANSI_1 = 0x12,
+	kVK_ANSI_2 = 0x13,
+	kVK_ANSI_3 = 0x14,
+	kVK_ANSI_4 = 0x15,
+	kVK_ANSI_6 = 0x16,
+	kVK_ANSI_5 = 0x17,
+	kVK_ANSI_Equal = 0x18,
+	kVK_ANSI_9 = 0x19,
+	kVK_ANSI_7 = 0x1A,
+	kVK_ANSI_Minus = 0x1B,
+	kVK_ANSI_8 = 0x1C,
+	kVK_ANSI_0 = 0x1D,
+	kVK_ANSI_RightBracket = 0x1E,
+	kVK_ANSI_O = 0x1F,
+	kVK_ANSI_U = 0x20,
+	kVK_ANSI_LeftBracket = 0x21,
+	kVK_ANSI_I = 0x22,
+	kVK_ANSI_P = 0x23,
+	kVK_ANSI_L = 0x25,
+	kVK_ANSI_J = 0x26,
+	kVK_ANSI_Quote = 0x27,
+	kVK_ANSI_K = 0x28,
+	kVK_ANSI_Semicolon = 0x29,
+	kVK_ANSI_Backslash = 0x2A,
+	kVK_ANSI_Comma = 0x2B,
+	kVK_ANSI_Slash = 0x2C,
+	kVK_ANSI_N = 0x2D,
+	kVK_ANSI_M = 0x2E,
+	kVK_ANSI_Period = 0x2F,
+	kVK_ANSI_Grave = 0x32,
+	kVK_ANSI_KeypadDecimal = 0x41,
+	kVK_ANSI_KeypadMultiply = 0x43,
+	kVK_ANSI_KeypadPlus = 0x45,
+	kVK_ANSI_KeypadClear = 0x47,
+	kVK_ANSI_KeypadDivide = 0x4B,
+	kVK_ANSI_KeypadEnter = 0x4C,
+	kVK_ANSI_KeypadMinus = 0x4E,
+	kVK_ANSI_KeypadEquals = 0x51,
+	kVK_ANSI_Keypad0 = 0x52,
+	kVK_ANSI_Keypad1 = 0x53,
+	kVK_ANSI_Keypad2 = 0x54,
+	kVK_ANSI_Keypad3 = 0x55,
+	kVK_ANSI_Keypad4 = 0x56,
+	kVK_ANSI_Keypad5 = 0x57,
+	kVK_ANSI_Keypad6 = 0x58,
+	kVK_ANSI_Keypad7 = 0x59,
+	kVK_ANSI_Keypad8 = 0x5B,
+	kVK_ANSI_Keypad9 = 0x5C
+};
+
+/* keycodes for keys that are independent of keyboard layout*/
+enum
+{
+	kVK_Return = 0x24,
+	kVK_Tab = 0x30,
+	kVK_Space = 0x31,
+	kVK_Delete = 0x33,
+	kVK_Escape = 0x35,
+	kVK_Command = 0x37,
+	kVK_Shift = 0x38,
+	kVK_CapsLock = 0x39,
+	kVK_Option = 0x3A,
+	kVK_Control = 0x3B,
+	kVK_RightShift = 0x3C,
+	kVK_RightOption = 0x3D,
+	kVK_RightControl = 0x3E,
+	kVK_Function = 0x3F,
+	kVK_F17 = 0x40,
+	kVK_VolumeUp = 0x48,
+	kVK_VolumeDown = 0x49,
+	kVK_Mute = 0x4A,
+	kVK_F18 = 0x4F,
+	kVK_F19 = 0x50,
+	kVK_F20 = 0x5A,
+	kVK_F5 = 0x60,
+	kVK_F6 = 0x61,
+	kVK_F7 = 0x62,
+	kVK_F3 = 0x63,
+	kVK_F8 = 0x64,
+	kVK_F9 = 0x65,
+	kVK_F11 = 0x67,
+	kVK_F13 = 0x69,
+	kVK_F16 = 0x6A,
+	kVK_F14 = 0x6B,
+	kVK_F10 = 0x6D,
+	kVK_F12 = 0x6F,
+	kVK_F15 = 0x71,
+	kVK_Help = 0x72,
+	kVK_Home = 0x73,
+	kVK_PageUp = 0x74,
+	kVK_ForwardDelete = 0x75,
+	kVK_F4 = 0x76,
+	kVK_End = 0x77,
+	kVK_F2 = 0x78,
+	kVK_PageDown = 0x79,
+	kVK_F1 = 0x7A,
+	kVK_LeftArrow = 0x7B,
+	kVK_RightArrow = 0x7C,
+	kVK_DownArrow = 0x7D,
+	kVK_UpArrow = 0x7E
+};
+
+//------------------------------------------------------------------------------------------
+Boolean GetDictionaryBoolean(CFDictionaryRef theDict, const void *key)
+{
+	// get a boolean from the dictionary
+	Boolean value = false;
+	CFBooleanRef boolRef;
+	boolRef = (CFBooleanRef)CFDictionaryGetValue(theDict, key);
+	if (boolRef != NULL)
+		value = CFBooleanGetValue(boolRef);
+	return value;
+}
+//------------------------------------------------------------------------------------------
+long GetDictionaryLong(CFDictionaryRef theDict, const void *key)
+{
+	// get a long from the dictionary
+	long value = 0;
+	CFNumberRef numRef;
+	numRef = (CFNumberRef)CFDictionaryGetValue(theDict, key);
+	if (numRef != NULL)
+		CFNumberGetValue(numRef, kCFNumberLongType, &value);
+	return value;
+}
+
+namespace irr
+{
+namespace video
+{
+IVideoDriver *createOpenGLDriver(const SIrrlichtCreationParameters &param, io::IFileSystem *io, IContextManager *contextManager);
+}
+} // end namespace irr
+
+static bool firstLaunch = true;
+
+@implementation CIrrDelegateOSX {
+	irr::CIrrDeviceMacOSX *Device;
+	bool Quit;
+}
+
+- (id)initWithDevice:(irr::CIrrDeviceMacOSX *)device
+{
+	self = [super init];
+
+	if (self)
+		Device = device;
+
+	Quit = false;
+
+	return (self);
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+	Quit = false;
+}
+
+- (void)orderFrontStandardAboutPanel:(id)sender
+{
+	[NSApp orderFrontStandardAboutPanel:sender];
+}
+
+- (void)unhideAllApplications:(id)sender
+{
+	[NSApp unhideAllApplications:sender];
+}
+
+- (void)hide:(id)sender
+{
+	[NSApp hide:sender];
+}
+
+- (void)hideOtherApplications:(id)sender
+{
+	[NSApp hideOtherApplications:sender];
+}
+
+- (void)terminate:(id)sender
+{
+	Quit = true;
+}
+
+- (void)windowWillClose:(id)sender
+{
+	Device->setWindow(nil);
+	Quit = true;
+}
+
+- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
+{
+	if (Device->isResizable())
+		return proposedFrameSize;
+	else
+		return [window frame].size;
+}
+
+- (void)windowDidResize:(NSNotification *)aNotification
+{
+	NSWindow *window;
+	NSRect frame;
+
+	window = [aNotification object];
+	frame = [window frame];
+	Device->setResize((int)frame.size.width, (int)frame.size.height);
+}
+
+- (BOOL)isQuit
+{
+	return (Quit);
+}
+
+@end
+
+namespace irr
+{
+//! constructor
+CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters &param) :
+		CIrrDeviceStub(param), Window(NULL), Display(NULL),
+		DeviceWidth(0), DeviceHeight(0),
+		ScreenWidth(0), ScreenHeight(0), MouseButtonStates(0),
+		IsActive(true), IsFullscreen(false), IsShiftDown(false), IsControlDown(false), IsResizable(false)
+{
+	struct utsname name;
+
+#ifdef _DEBUG
+	setDebugName("CIrrDeviceMacOSX");
+#endif
+
+	if (firstLaunch) {
+		firstLaunch = false;
+
+		if (!CreationParams.WindowId) {
+			[[NSAutoreleasePool alloc] init];
+			[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
+			[[NSApplication sharedApplication] setDelegate:[[[CIrrDelegateOSX alloc] initWithDevice:this] autorelease]];
+
+			// Create menu
+
+			NSString *bundleName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
+			if (bundleName == nil)
+				bundleName = @"Irrlicht";
+
+			NSMenu *mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
+			NSMenu *menu = [[[NSMenu alloc] initWithTitle:bundleName] autorelease];
+			NSMenuItem *menuItem = [mainMenu addItemWithTitle:bundleName action:nil keyEquivalent:@""];
+			[mainMenu setSubmenu:menu forItem:menuItem];
+			menuItem = [menu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+			[menuItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+
+			[NSApp setMainMenu:mainMenu];
+
+			[NSApp finishLaunching];
+		}
+
+		NSString *path = [[NSBundle mainBundle] bundlePath];
+		if (path != nil) {
+			path = [path stringByAppendingString:@"/Contents/Resources"];
+			chdir([path fileSystemRepresentation]);
+			[path release];
+		}
+	}
+
+	uname(&name);
+	Operator = new COSOperator(name.version);
+	os::Printer::log(name.version, ELL_INFORMATION);
+
+	initKeycodes();
+
+	bool success = true;
+
+	if (CreationParams.DriverType != video::EDT_NULL)
+		success = createWindow();
+
+	// in case of failure, one can check VideoDriver for initialization
+	if (!success)
+		return;
+
+	setResizable(false);
+	CursorControl = new CCursorControl(CreationParams.WindowSize, this);
+
+	createDriver();
+	createGUIAndScene();
+}
+
+CIrrDeviceMacOSX::~CIrrDeviceMacOSX()
+{
+	[NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
+	closeDevice();
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	for (u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		if (ActiveJoysticks[joystick].interface)
+			closeJoystickDevice(&ActiveJoysticks[joystick]);
+	}
+#endif
+}
+
+void CIrrDeviceMacOSX::closeDevice()
+{
+	if (Window != nil) {
+		[Window setIsVisible:FALSE];
+		[Window setReleasedWhenClosed:TRUE];
+		[Window release];
+		Window = nil;
+	}
+
+	IsFullscreen = false;
+	IsActive = false;
+}
+
+bool CIrrDeviceMacOSX::createWindow()
+{
+	CGDisplayErr error;
+	bool result = false;
+	Display = CGMainDisplayID();
+
+	CGRect displayRect;
+	CGDisplayModeRef displaymode, olddisplaymode;
+
+	ScreenWidth = (int)CGDisplayPixelsWide(Display);
+	ScreenHeight = (int)CGDisplayPixelsHigh(Display);
+
+	const NSBackingStoreType type = (CreationParams.DriverType == video::EDT_OPENGL) ? NSBackingStoreBuffered : NSBackingStoreNonretained;
+
+	// TODO: fullscreen
+	// if (!CreationParams.Fullscreen)
+	{
+		if (!CreationParams.WindowId) { // create another window when WindowId is null
+			int x = (CreationParams.WindowPosition.X > 0) ? CreationParams.WindowPosition.X : 0;
+			int y = (CreationParams.WindowPosition.Y > 0) ? CreationParams.WindowPosition.Y : 0;
+
+			if (CreationParams.WindowPosition.Y > -1) {
+				int screenHeight = [[[NSScreen screens] objectAtIndex:0] frame].size.height;
+				y = screenHeight - y - CreationParams.WindowSize.Height;
+			}
+
+			Window = [[NSWindow alloc] initWithContentRect:NSMakeRect(x, y, CreationParams.WindowSize.Width, CreationParams.WindowSize.Height) styleMask:NSTitledWindowMask + NSClosableWindowMask + NSResizableWindowMask backing:type defer:FALSE];
+
+			if (CreationParams.WindowPosition.X == -1 && CreationParams.WindowPosition.Y == -1)
+				[Window center];
+		}
+
+		DeviceWidth = CreationParams.WindowSize.Width;
+		DeviceHeight = CreationParams.WindowSize.Height;
+
+		result = true;
+	}
+
+	if (result) {
+		if (Window) {
+			[Window setDelegate:(CIrrDelegateOSX *)[NSApp delegate]];
+			[Window setAcceptsMouseMovedEvents:TRUE];
+			[Window setIsVisible:TRUE];
+			[Window makeKeyAndOrderFront:nil];
+		}
+	}
+
+	return result;
+}
+
+void CIrrDeviceMacOSX::setResize(int width, int height)
+{
+	// set new window size
+	DeviceWidth = width;
+	DeviceHeight = height;
+
+#if defined(_IRR_COMPILE_WITH_OPENGL_)
+	// update the size of the opengl rendering context
+	if (CreationParams.DriverType == video::EDT_OPENGL) {
+		NSOpenGLContext *Context = (NSOpenGLContext *)ContextManager->getContext().OpenGLOSX.Context;
+
+		if (Context)
+			[Context update];
+	}
+#endif
+
+	// resize the driver to the inner pane size
+	if (Window) {
+		NSRect driverFrame = [Window contentRectForFrameRect:[Window frame]];
+		getVideoDriver()->OnResize(core::dimension2d<u32>((s32)driverFrame.size.width, (s32)driverFrame.size.height));
+		DeviceWidth = (s32)driverFrame.size.width;
+		DeviceHeight = (s32)driverFrame.size.height;
+	} else
+		getVideoDriver()->OnResize(core::dimension2d<u32>((s32)width, (s32)height));
+}
+
+void CIrrDeviceMacOSX::createDriver()
+{
+	switch (CreationParams.DriverType) {
+	case video::EDT_OPENGL:
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+	{
+		video::SExposedVideoData data;
+		data.OpenGLOSX.Window = Window;
+		ContextManager = new video::CNSOGLManager();
+		ContextManager->initialize(CreationParams, data);
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, ContextManager);
+		if (!VideoDriver) {
+			os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
+		}
+
+		if (Window) {
+			[[Window contentView] setWantsBestResolutionOpenGLSurface:NO];
+			[(NSOpenGLContext *)ContextManager->getContext().OpenGLOSX.Context setView:[Window contentView]];
+		} else {
+			[(NSView *)CreationParams.WindowId setWantsBestResolutionOpenGLSurface:NO];
+			[(NSOpenGLContext *)ContextManager->getContext().OpenGLOSX.Context setView:(NSView *)CreationParams.WindowId];
+		}
+	}
+#else
+		os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
+#endif
+	break;
+
+	case video::EDT_OGLES1:
+	case video::EDT_OGLES2:
+		os::Printer::log("This driver is not available in OSX. Try OpenGL or Software renderer.", ELL_ERROR);
+		break;
+
+	case video::EDT_NULL:
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+		break;
+
+	default:
+		os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
+		break;
+	}
+}
+
+bool CIrrDeviceMacOSX::run()
+{
+	NSAutoreleasePool *Pool = [[NSAutoreleasePool alloc] init];
+
+	NSEvent *event;
+	irr::SEvent ievent;
+
+	os::Timer::tick();
+	storeMouseLocation();
+
+	event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+	if (event != nil) {
+		bzero(&ievent, sizeof(ievent));
+
+		switch ([(NSEvent *)event type]) {
+		case NSKeyDown:
+			postKeyEvent(event, ievent, true);
+			break;
+
+		case NSKeyUp:
+			postKeyEvent(event, ievent, false);
+			break;
+
+		case NSFlagsChanged:
+			ievent.EventType = irr::EET_KEY_INPUT_EVENT;
+			ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
+			ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
+
+			if (IsShiftDown != ievent.KeyInput.Shift) {
+				ievent.KeyInput.Char = irr::KEY_SHIFT;
+				ievent.KeyInput.Key = irr::KEY_SHIFT;
+				ievent.KeyInput.PressedDown = ievent.KeyInput.Shift;
+
+				IsShiftDown = ievent.KeyInput.Shift;
+
+				postEventFromUser(ievent);
+			}
+
+			if (IsControlDown != ievent.KeyInput.Control) {
+				ievent.KeyInput.Char = irr::KEY_CONTROL;
+				ievent.KeyInput.Key = irr::KEY_CONTROL;
+				ievent.KeyInput.PressedDown = ievent.KeyInput.Control;
+
+				IsControlDown = ievent.KeyInput.Control;
+
+				postEventFromUser(ievent);
+			}
+
+			[NSApp sendEvent:event];
+			break;
+
+		case NSLeftMouseDown:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_LMOUSE_PRESSED_DOWN;
+			MouseButtonStates |= irr::EMBSM_LEFT;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSLeftMouseUp:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			MouseButtonStates &= !irr::EMBSM_LEFT;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			ievent.MouseInput.Event = irr::EMIE_LMOUSE_LEFT_UP;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSOtherMouseDown:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_MMOUSE_PRESSED_DOWN;
+			MouseButtonStates |= irr::EMBSM_MIDDLE;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSOtherMouseUp:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			MouseButtonStates &= !irr::EMBSM_MIDDLE;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			ievent.MouseInput.Event = irr::EMIE_MMOUSE_LEFT_UP;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSMouseMoved:
+		case NSLeftMouseDragged:
+		case NSRightMouseDragged:
+		case NSOtherMouseDragged:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSRightMouseDown:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_RMOUSE_PRESSED_DOWN;
+			MouseButtonStates |= irr::EMBSM_RIGHT;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSRightMouseUp:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_RMOUSE_LEFT_UP;
+			MouseButtonStates &= !irr::EMBSM_RIGHT;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		case NSScrollWheel:
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_MOUSE_WHEEL;
+			ievent.MouseInput.Wheel = [(NSEvent *)event deltaY];
+			if (ievent.MouseInput.Wheel < 1.0f)
+				ievent.MouseInput.Wheel *= 10.0f;
+			else
+				ievent.MouseInput.Wheel *= 5.0f;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postMouseEvent(event, ievent);
+			break;
+
+		default:
+			[NSApp sendEvent:event];
+			break;
+		}
+	}
+
+	pollJoysticks();
+
+	[Pool release];
+
+	return (![[NSApp delegate] isQuit] && IsActive);
+}
+
+//! Pause the current process for the minimum time allowed only to allow other processes to execute
+void CIrrDeviceMacOSX::yield()
+{
+	struct timespec ts = {0, 0};
+	nanosleep(&ts, NULL);
+}
+
+//! Pause execution and let other processes to run for a specified amount of time.
+void CIrrDeviceMacOSX::sleep(u32 timeMs, bool pauseTimer = false)
+{
+	bool wasStopped = Timer ? Timer->isStopped() : true;
+
+	struct timespec ts;
+	ts.tv_sec = (time_t)(timeMs / 1000);
+	ts.tv_nsec = (long)(timeMs % 1000) * 1000000;
+
+	if (pauseTimer && !wasStopped)
+		Timer->stop();
+
+	nanosleep(&ts, NULL);
+
+	if (pauseTimer && !wasStopped)
+		Timer->start();
+}
+
+void CIrrDeviceMacOSX::setWindowCaption(const wchar_t *text)
+{
+	if (Window != NULL) {
+		if (text) {
+			size_t numBytes = wcslen(text) * sizeof(wchar_t);
+
+#ifdef __BIG_ENDIAN__
+			NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32BigEndianStringEncoding : NSUTF16BigEndianStringEncoding;
+#else
+			NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32LittleEndianStringEncoding : NSUTF16LittleEndianStringEncoding;
+#endif
+			NSString *name = [[NSString alloc] initWithBytes:text length:numBytes encoding:encode];
+			if (name) {
+				[Window setTitle:name];
+				[name release];
+			}
+		} else {
+			[Window setTitle:@""];
+		}
+	}
+}
+
+bool CIrrDeviceMacOSX::isWindowActive() const
+{
+	return (IsActive);
+}
+
+bool CIrrDeviceMacOSX::isWindowFocused() const
+{
+	if (Window != NULL)
+		return [Window isKeyWindow];
+	return false;
+}
+
+bool CIrrDeviceMacOSX::isWindowMinimized() const
+{
+	if (Window != NULL)
+		return [Window isMiniaturized];
+	return false;
+}
+
+void CIrrDeviceMacOSX::postKeyEvent(void *event, irr::SEvent &ievent, bool pressed)
+{
+	NSString *str;
+	std::map<int, int>::const_iterator iter;
+	unsigned int c, mkey, mchar;
+	const unsigned char *cStr;
+	BOOL skipCommand;
+
+	str = [(NSEvent *)event characters];
+	if ((str != nil) && ([str length] > 0)) {
+		mkey = mchar = 0;
+		skipCommand = false;
+		c = [str characterAtIndex:0];
+		mchar = c;
+
+		iter = KeyCodes.find([(NSEvent *)event keyCode]);
+		if (iter != KeyCodes.end())
+			mkey = (*iter).second;
+		else if ((iter = KeyCodes.find(c)) != KeyCodes.end())
+			mkey = (*iter).second;
+		else {
+			// workaround for period character
+			if (c == 0x2E) {
+				mkey = irr::KEY_PERIOD;
+				mchar = '.';
+			} else {
+				cStr = (unsigned char *)[str cStringUsingEncoding:NSWindowsCP1252StringEncoding];
+				if (cStr != NULL && strlen((char *)cStr) > 0) {
+					mchar = cStr[0];
+					mkey = toupper(mchar);
+					if ([(NSEvent *)event modifierFlags] & NSCommandKeyMask) {
+						if (mkey == 'C' || mkey == 'V' || mkey == 'X') {
+							mchar = 0;
+							skipCommand = true;
+						}
+					}
+				}
+			}
+		}
+
+		ievent.EventType = irr::EET_KEY_INPUT_EVENT;
+		ievent.KeyInput.Key = (irr::EKEY_CODE)mkey;
+		ievent.KeyInput.PressedDown = pressed;
+		ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
+		ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
+		ievent.KeyInput.Char = mchar;
+
+		if (skipCommand)
+			ievent.KeyInput.Control = true;
+		else if ([(NSEvent *)event modifierFlags] & NSCommandKeyMask)
+			[NSApp sendEvent:(NSEvent *)event];
+
+		postEventFromUser(ievent);
+	}
+}
+
+void CIrrDeviceMacOSX::postMouseEvent(void *event, irr::SEvent &ievent)
+{
+	bool post = true;
+
+	if (Window != NULL) {
+		ievent.MouseInput.X = (int)[(NSEvent *)event locationInWindow].x;
+		ievent.MouseInput.Y = DeviceHeight - (int)[(NSEvent *)event locationInWindow].y;
+
+		if (ievent.MouseInput.Y < 0)
+			post = false;
+	} else {
+		CGEventRef ourEvent = CGEventCreate(NULL);
+		CGPoint point = CGEventGetLocation(ourEvent);
+		CFRelease(ourEvent);
+
+		ievent.MouseInput.X = (int)point.x;
+		ievent.MouseInput.Y = (int)point.y;
+
+		if (ievent.MouseInput.Y < 0)
+			post = false;
+	}
+
+	if (post) {
+		ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
+		ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
+
+		postEventFromUser(ievent);
+	}
+
+	[NSApp sendEvent:(NSEvent *)event];
+}
+
+void CIrrDeviceMacOSX::storeMouseLocation()
+{
+	int x, y;
+
+	if (Window != NULL) {
+		NSPoint p;
+		p = [NSEvent mouseLocation];
+		p = [Window convertScreenToBase:p];
+		x = (int)p.x;
+		y = DeviceHeight - (int)p.y;
+	} else {
+		// Do we still need this?
+		CGEventRef ourEvent = CGEventCreate(NULL);
+		CGPoint point = CGEventGetLocation(ourEvent);
+		CFRelease(ourEvent);
+
+		x = (int)point.x;
+		y = (int)point.y;
+
+		const core::position2di &curr = ((CCursorControl *)CursorControl)->getPosition(true);
+		if (curr.X != x || curr.Y != y) {
+			irr::SEvent ievent;
+			ievent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			ievent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+			ievent.MouseInput.X = x;
+			ievent.MouseInput.Y = y;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
+			postEventFromUser(ievent);
+		}
+	}
+
+	((CCursorControl *)CursorControl)->updateInternalCursorPosition(x, y);
+}
+
+void CIrrDeviceMacOSX::setMouseLocation(int x, int y)
+{
+	NSPoint p;
+	CGPoint c;
+
+	if (Window != NULL) {
+		// Irrlicht window exists
+		p.x = (float)x;
+		p.y = (float)(DeviceHeight - y);
+		p = [Window convertBaseToScreen:p];
+		p.y = ScreenHeight - p.y;
+	} else {
+		p.x = (float)x;
+		p.y = (float)y + (ScreenHeight - DeviceHeight);
+	}
+
+	c.x = p.x;
+	c.y = p.y;
+
+	CGWarpMouseCursorPosition(c);
+	CGAssociateMouseAndMouseCursorPosition(YES);
+}
+
+void CIrrDeviceMacOSX::setCursorVisible(bool visible)
+{
+	if (visible)
+		CGDisplayShowCursor(CGMainDisplayID());
+	else
+		CGDisplayHideCursor(CGMainDisplayID());
+}
+
+void CIrrDeviceMacOSX::setWindow(NSWindow *window)
+{
+	Window = window;
+}
+
+void CIrrDeviceMacOSX::initKeycodes()
+{
+	KeyCodes[kVK_UpArrow] = irr::KEY_UP;
+	KeyCodes[kVK_DownArrow] = irr::KEY_DOWN;
+	KeyCodes[kVK_LeftArrow] = irr::KEY_LEFT;
+	KeyCodes[kVK_RightArrow] = irr::KEY_RIGHT;
+	KeyCodes[kVK_F1] = irr::KEY_F1;
+	KeyCodes[kVK_F2] = irr::KEY_F2;
+	KeyCodes[kVK_F3] = irr::KEY_F3;
+	KeyCodes[kVK_F4] = irr::KEY_F4;
+	KeyCodes[kVK_F5] = irr::KEY_F5;
+	KeyCodes[kVK_F6] = irr::KEY_F6;
+	KeyCodes[kVK_F7] = irr::KEY_F7;
+	KeyCodes[kVK_F8] = irr::KEY_F8;
+	KeyCodes[kVK_F9] = irr::KEY_F9;
+	KeyCodes[kVK_F10] = irr::KEY_F10;
+	KeyCodes[kVK_F11] = irr::KEY_F11;
+	KeyCodes[kVK_F12] = irr::KEY_F12;
+	KeyCodes[kVK_F13] = irr::KEY_F13;
+	KeyCodes[kVK_F14] = irr::KEY_F14;
+	KeyCodes[kVK_F15] = irr::KEY_F15;
+	KeyCodes[kVK_F16] = irr::KEY_F16;
+	KeyCodes[kVK_F17] = irr::KEY_F17;
+	KeyCodes[kVK_F18] = irr::KEY_F18;
+	KeyCodes[kVK_F19] = irr::KEY_F19;
+	KeyCodes[kVK_F20] = irr::KEY_F20;
+	KeyCodes[kVK_Home] = irr::KEY_HOME;
+	KeyCodes[kVK_End] = irr::KEY_END;
+	KeyCodes[NSInsertFunctionKey] = irr::KEY_INSERT;
+	KeyCodes[kVK_ForwardDelete] = irr::KEY_DELETE;
+	KeyCodes[kVK_Help] = irr::KEY_HELP;
+	KeyCodes[NSSelectFunctionKey] = irr::KEY_SELECT;
+	KeyCodes[NSPrintFunctionKey] = irr::KEY_PRINT;
+	KeyCodes[NSExecuteFunctionKey] = irr::KEY_EXECUT;
+	KeyCodes[NSPrintScreenFunctionKey] = irr::KEY_SNAPSHOT;
+	KeyCodes[NSPauseFunctionKey] = irr::KEY_PAUSE;
+	KeyCodes[NSScrollLockFunctionKey] = irr::KEY_SCROLL;
+	KeyCodes[kVK_Delete] = irr::KEY_BACK;
+	KeyCodes[kVK_Tab] = irr::KEY_TAB;
+	KeyCodes[kVK_Return] = irr::KEY_RETURN;
+	KeyCodes[kVK_Escape] = irr::KEY_ESCAPE;
+	KeyCodes[kVK_Control] = irr::KEY_CONTROL;
+	KeyCodes[kVK_RightControl] = irr::KEY_RCONTROL;
+	KeyCodes[kVK_Command] = irr::KEY_MENU;
+	KeyCodes[kVK_Shift] = irr::KEY_SHIFT;
+	KeyCodes[kVK_RightShift] = irr::KEY_RSHIFT;
+	KeyCodes[kVK_Space] = irr::KEY_SPACE;
+
+	KeyCodes[kVK_ANSI_A] = irr::KEY_KEY_A;
+	KeyCodes[kVK_ANSI_B] = irr::KEY_KEY_B;
+	KeyCodes[kVK_ANSI_C] = irr::KEY_KEY_C;
+	KeyCodes[kVK_ANSI_D] = irr::KEY_KEY_D;
+	KeyCodes[kVK_ANSI_E] = irr::KEY_KEY_E;
+	KeyCodes[kVK_ANSI_F] = irr::KEY_KEY_F;
+	KeyCodes[kVK_ANSI_G] = irr::KEY_KEY_G;
+	KeyCodes[kVK_ANSI_H] = irr::KEY_KEY_H;
+	KeyCodes[kVK_ANSI_I] = irr::KEY_KEY_I;
+	KeyCodes[kVK_ANSI_J] = irr::KEY_KEY_J;
+	KeyCodes[kVK_ANSI_K] = irr::KEY_KEY_K;
+	KeyCodes[kVK_ANSI_L] = irr::KEY_KEY_L;
+	KeyCodes[kVK_ANSI_M] = irr::KEY_KEY_M;
+	KeyCodes[kVK_ANSI_N] = irr::KEY_KEY_N;
+	KeyCodes[kVK_ANSI_O] = irr::KEY_KEY_O;
+	KeyCodes[kVK_ANSI_P] = irr::KEY_KEY_P;
+	KeyCodes[kVK_ANSI_Q] = irr::KEY_KEY_Q;
+	KeyCodes[kVK_ANSI_R] = irr::KEY_KEY_R;
+	KeyCodes[kVK_ANSI_S] = irr::KEY_KEY_S;
+	KeyCodes[kVK_ANSI_T] = irr::KEY_KEY_T;
+	KeyCodes[kVK_ANSI_U] = irr::KEY_KEY_U;
+	KeyCodes[kVK_ANSI_V] = irr::KEY_KEY_V;
+	KeyCodes[kVK_ANSI_W] = irr::KEY_KEY_W;
+	KeyCodes[kVK_ANSI_X] = irr::KEY_KEY_X;
+	KeyCodes[kVK_ANSI_X] = irr::KEY_KEY_X;
+	KeyCodes[kVK_ANSI_Y] = irr::KEY_KEY_Y;
+	KeyCodes[kVK_ANSI_Z] = irr::KEY_KEY_Z;
+
+	KeyCodes[kVK_ANSI_0] = irr::KEY_KEY_0;
+	KeyCodes[kVK_ANSI_1] = irr::KEY_KEY_1;
+	KeyCodes[kVK_ANSI_2] = irr::KEY_KEY_2;
+	KeyCodes[kVK_ANSI_3] = irr::KEY_KEY_3;
+	KeyCodes[kVK_ANSI_4] = irr::KEY_KEY_4;
+	KeyCodes[kVK_ANSI_5] = irr::KEY_KEY_5;
+	KeyCodes[kVK_ANSI_6] = irr::KEY_KEY_6;
+	KeyCodes[kVK_ANSI_7] = irr::KEY_KEY_7;
+	KeyCodes[kVK_ANSI_8] = irr::KEY_KEY_8;
+	KeyCodes[kVK_ANSI_9] = irr::KEY_KEY_9;
+
+	KeyCodes[kVK_ANSI_Slash] = irr::KEY_DIVIDE;
+	KeyCodes[kVK_ANSI_Comma] = irr::KEY_COMMA;
+	KeyCodes[kVK_ANSI_Period] = irr::KEY_PERIOD;
+	KeyCodes[kVK_PageUp] = irr::KEY_PRIOR;
+	KeyCodes[kVK_PageDown] = irr::KEY_NEXT;
+
+	KeyCodes[kVK_ANSI_Keypad0] = irr::KEY_NUMPAD0;
+	KeyCodes[kVK_ANSI_Keypad1] = irr::KEY_NUMPAD1;
+	KeyCodes[kVK_ANSI_Keypad2] = irr::KEY_NUMPAD2;
+	KeyCodes[kVK_ANSI_Keypad3] = irr::KEY_NUMPAD3;
+	KeyCodes[kVK_ANSI_Keypad4] = irr::KEY_NUMPAD4;
+	KeyCodes[kVK_ANSI_Keypad5] = irr::KEY_NUMPAD5;
+	KeyCodes[kVK_ANSI_Keypad6] = irr::KEY_NUMPAD6;
+	KeyCodes[kVK_ANSI_Keypad7] = irr::KEY_NUMPAD7;
+	KeyCodes[kVK_ANSI_Keypad8] = irr::KEY_NUMPAD8;
+	KeyCodes[kVK_ANSI_Keypad9] = irr::KEY_NUMPAD9;
+
+	KeyCodes[kVK_ANSI_KeypadDecimal] = irr::KEY_DECIMAL;
+	KeyCodes[kVK_ANSI_KeypadMultiply] = irr::KEY_MULTIPLY;
+	KeyCodes[kVK_ANSI_KeypadPlus] = irr::KEY_PLUS;
+	KeyCodes[kVK_ANSI_KeypadClear] = irr::KEY_OEM_CLEAR;
+	KeyCodes[kVK_ANSI_KeypadDivide] = irr::KEY_DIVIDE;
+	KeyCodes[kVK_ANSI_KeypadEnter] = irr::KEY_RETURN;
+	KeyCodes[kVK_ANSI_KeypadMinus] = irr::KEY_SUBTRACT;
+
+	KeyCodes[kVK_ANSI_LeftBracket] = irr::KEY_OEM_4;
+	KeyCodes[kVK_ANSI_Backslash] = irr::KEY_OEM_5;
+	KeyCodes[kVK_ANSI_RightBracket] = irr::KEY_OEM_6;
+}
+
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceMacOSX::setResizable(bool resize)
+{
+	IsResizable = resize;
+#if 0
+	if (resize)
+		[Window setStyleMask:NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask];
+	else
+		[Window setStyleMask:NSTitledWindowMask|NSClosableWindowMask];
+#endif
+}
+
+bool CIrrDeviceMacOSX::isResizable() const
+{
+	return IsResizable;
+}
+
+void CIrrDeviceMacOSX::minimizeWindow()
+{
+	if (Window != NULL)
+		[Window miniaturize:[NSApp self]];
+}
+
+//! Maximizes the window if possible.
+void CIrrDeviceMacOSX::maximizeWindow()
+{
+	// todo: implement
+}
+
+//! get the window to normal size if possible.
+void CIrrDeviceMacOSX::restoreWindow()
+{
+	[Window deminiaturize:[NSApp self]];
+}
+
+//! Get the position of this window on screen
+core::position2di CIrrDeviceMacOSX::getWindowPosition()
+{
+	NSRect rect = [Window frame];
+	int screenHeight = [[[NSScreen screens] objectAtIndex:0] frame].size.height;
+	return core::position2di(rect.origin.x, screenHeight - rect.origin.y - rect.size.height);
+}
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+static void joystickRemovalCallback(void *target,
+		IOReturn result, void *refcon, void *sender)
+{
+	JoystickInfo *joy = (JoystickInfo *)refcon;
+	joy->removed = 1;
+}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+bool CIrrDeviceMacOSX::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	ActiveJoysticks.clear();
+	joystickInfo.clear();
+
+	io_object_t hidObject = 0;
+	io_iterator_t hidIterator = 0;
+	IOReturn result = kIOReturnSuccess;
+	mach_port_t masterPort = 0;
+	CFMutableDictionaryRef hidDictionaryRef = NULL;
+
+	result = IOMasterPort(bootstrap_port, &masterPort);
+	if (kIOReturnSuccess != result) {
+		os::Printer::log("initialiseJoysticks IOMasterPort failed", ELL_ERROR);
+		return false;
+	}
+
+	hidDictionaryRef = IOServiceMatching(kIOHIDDeviceKey);
+	if (!hidDictionaryRef) {
+		os::Printer::log("initialiseJoysticks IOServiceMatching failed", ELL_ERROR);
+		return false;
+	}
+	result = IOServiceGetMatchingServices(masterPort, hidDictionaryRef, &hidIterator);
+
+	if (kIOReturnSuccess != result) {
+		os::Printer::log("initialiseJoysticks IOServiceGetMatchingServices failed", ELL_ERROR);
+		return false;
+	}
+
+	// no joysticks just return
+	if (!hidIterator)
+		return false;
+
+	u32 jindex = 0u;
+	while ((hidObject = IOIteratorNext(hidIterator))) {
+		JoystickInfo info;
+
+		// get dictionary for HID properties
+		CFMutableDictionaryRef hidProperties = 0;
+
+		kern_return_t kern_result = IORegistryEntryCreateCFProperties(hidObject, &hidProperties, kCFAllocatorDefault, kNilOptions);
+		if ((kern_result == KERN_SUCCESS) && hidProperties) {
+			HRESULT plugInResult = S_OK;
+			SInt32 score = 0;
+			IOCFPlugInInterface **ppPlugInInterface = NULL;
+			result = IOCreatePlugInInterfaceForService(hidObject, kIOHIDDeviceUserClientTypeID,
+					kIOCFPlugInInterfaceID, &ppPlugInInterface, &score);
+			if (kIOReturnSuccess == result) {
+				plugInResult = (*ppPlugInInterface)->QueryInterface(ppPlugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (void **)&(info.interface));
+				if (plugInResult != S_OK)
+					os::Printer::log("initialiseJoysticks query HID class device interface failed", ELL_ERROR);
+				(*ppPlugInInterface)->Release(ppPlugInInterface);
+			} else
+				continue;
+
+			if (info.interface != NULL) {
+				result = (*(info.interface))->open(info.interface, 0);
+				if (result == kIOReturnSuccess) {
+					(*(info.interface))->setRemovalCallback(info.interface, joystickRemovalCallback, &info, &info);
+					getJoystickDeviceInfo(hidObject, hidProperties, &info);
+
+					// get elements
+					CFTypeRef refElementTop = CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDElementKey));
+					if (refElementTop) {
+						CFTypeID type = CFGetTypeID(refElementTop);
+						if (type == CFArrayGetTypeID()) {
+							CFRange range = {0, CFArrayGetCount((CFArrayRef)refElementTop)};
+							info.numActiveJoysticks = ActiveJoysticks.size();
+							CFArrayApplyFunction((CFArrayRef)refElementTop, range, getJoystickComponentArrayHandler, &info);
+						}
+					}
+				} else {
+					CFRelease(hidProperties);
+					os::Printer::log("initialiseJoysticks Open interface failed", ELL_ERROR);
+					continue;
+				}
+
+				CFRelease(hidProperties);
+
+				result = IOObjectRelease(hidObject);
+
+				if ((info.usagePage != kHIDPage_GenericDesktop) ||
+						((info.usage != kHIDUsage_GD_Joystick &&
+								info.usage != kHIDUsage_GD_GamePad &&
+								info.usage != kHIDUsage_GD_MultiAxisController))) {
+					closeJoystickDevice(&info);
+					continue;
+				}
+
+				for (u32 i = 0; i < 6; ++i)
+					info.persistentData.JoystickEvent.Axis[i] = 0;
+
+				ActiveJoysticks.push_back(info);
+
+				SJoystickInfo returnInfo;
+				returnInfo.Joystick = jindex;
+				returnInfo.Axes = info.axes;
+				// returnInfo.Hats = info.hats;
+				returnInfo.Buttons = info.buttons;
+				returnInfo.Name = info.joystickName;
+				returnInfo.PovHat = SJoystickInfo::POV_HAT_UNKNOWN;
+				++jindex;
+
+				// if (info.hatComp.size())
+				//	returnInfo.PovHat = SJoystickInfo::POV_HAT_PRESENT;
+				// else
+				//	returnInfo.PovHat = SJoystickInfo::POV_HAT_ABSENT;
+
+				joystickInfo.push_back(returnInfo);
+			}
+
+		} else {
+			continue;
+		}
+	}
+	result = IOObjectRelease(hidIterator);
+
+	return true;
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
+}
+
+void CIrrDeviceMacOSX::pollJoysticks()
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	if (0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	for (joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		if (ActiveJoysticks[joystick].removed)
+			continue;
+
+		bool found = false;
+		ActiveJoysticks[joystick].persistentData.JoystickEvent.Joystick = joystick;
+
+		if (ActiveJoysticks[joystick].interface) {
+			for (u32 n = 0; n < ActiveJoysticks[joystick].axisComp.size(); n++) {
+				IOReturn result = kIOReturnSuccess;
+				IOHIDEventStruct hidEvent;
+				hidEvent.value = 0;
+				result = (*(ActiveJoysticks[joystick].interface))->getElementValue(ActiveJoysticks[joystick].interface, ActiveJoysticks[joystick].axisComp[n].cookie, &hidEvent);
+				if (kIOReturnSuccess == result) {
+					const f32 min = -32768.0f;
+					const f32 max = 32767.0f;
+					const f32 deviceScale = max - min;
+					const f32 readScale = (f32)ActiveJoysticks[joystick].axisComp[n].maxRead - (f32)ActiveJoysticks[joystick].axisComp[n].minRead;
+
+					if (hidEvent.value < ActiveJoysticks[joystick].axisComp[n].minRead)
+						ActiveJoysticks[joystick].axisComp[n].minRead = hidEvent.value;
+					if (hidEvent.value > ActiveJoysticks[joystick].axisComp[n].maxRead)
+						ActiveJoysticks[joystick].axisComp[n].maxRead = hidEvent.value;
+
+					if (readScale != 0.0f)
+						hidEvent.value = (int)(((f32)((f32)hidEvent.value - (f32)ActiveJoysticks[joystick].axisComp[n].minRead) * deviceScale / readScale) + min);
+
+					if (ActiveJoysticks[joystick].persistentData.JoystickEvent.Axis[n] != (s16)hidEvent.value)
+						found = true;
+					ActiveJoysticks[joystick].persistentData.JoystickEvent.Axis[n] = (s16)hidEvent.value;
+				}
+			} // axis check
+
+			for (u32 n = 0; n < ActiveJoysticks[joystick].buttonComp.size(); n++) {
+				IOReturn result = kIOReturnSuccess;
+				IOHIDEventStruct hidEvent;
+				hidEvent.value = 0;
+				result = (*(ActiveJoysticks[joystick].interface))->getElementValue(ActiveJoysticks[joystick].interface, ActiveJoysticks[joystick].buttonComp[n].cookie, &hidEvent);
+				if (kIOReturnSuccess == result) {
+					if (hidEvent.value && !((ActiveJoysticks[joystick].persistentData.JoystickEvent.ButtonStates & (1 << n)) ? true : false))
+						found = true;
+					else if (!hidEvent.value && ((ActiveJoysticks[joystick].persistentData.JoystickEvent.ButtonStates & (1 << n)) ? true : false))
+						found = true;
+
+					if (hidEvent.value)
+						ActiveJoysticks[joystick].persistentData.JoystickEvent.ButtonStates |= (1 << n);
+					else
+						ActiveJoysticks[joystick].persistentData.JoystickEvent.ButtonStates &= ~(1 << n);
+				}
+			} // button check
+			// still ToDo..will be done soon :)
+			/*
+						for (u32 n = 0; n < ActiveJoysticks[joystick].hatComp.size(); n++)
+						{
+							IOReturn result = kIOReturnSuccess;
+							IOHIDEventStruct hidEvent;
+							hidEvent.value = 0;
+							result = (*(ActiveJoysticks[joystick].interface))->getElementValue(ActiveJoysticks[joystick].interface, ActiveJoysticks[joystick].hatComp[n].cookie, &hidEvent);
+							if (kIOReturnSuccess == result)
+							{
+								if (ActiveJoysticks[joystick].persistentData.JoystickEvent.POV != hidEvent.value)
+									found = true;
+								ActiveJoysticks[joystick].persistentData.JoystickEvent.POV = hidEvent.value;
+							}
+						}//hat check
+			*/
+		}
+
+		if (found)
+			postEventFromUser(ActiveJoysticks[joystick].persistentData);
+	}
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
diff --git a/irr/src/CIrrDeviceSDL.cpp b/irr/src/CIrrDeviceSDL.cpp
new file mode 100644
index 000000000..71573a803
--- /dev/null
+++ b/irr/src/CIrrDeviceSDL.cpp
@@ -0,0 +1,1499 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+
+#include "CIrrDeviceSDL.h"
+#include "IEventReceiver.h"
+#include "IGUIElement.h"
+#include "IGUIEnvironment.h"
+#include "IImageLoader.h"
+#include "IFileSystem.h"
+#include "os.h"
+#include "CTimer.h"
+#include "irrString.h"
+#include "Keycodes.h"
+#include "COSOperator.h"
+#include <cstdio>
+#include <cstdlib>
+#include "SIrrCreationParameters.h"
+#include <SDL_video.h>
+
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+#include <emscripten.h>
+#endif
+
+#include "CSDLManager.h"
+
+static int SDLDeviceInstances = 0;
+
+namespace irr
+{
+namespace video
+{
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+IVideoDriver *createOpenGLDriver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#else
+static IVideoDriver *createOpenGLDriver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("No OpenGL support compiled in.", ELL_ERROR);
+	return nullptr;
+}
+#endif
+
+#ifdef ENABLE_OPENGL3
+IVideoDriver *createOpenGL3Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#else
+static IVideoDriver *createOpenGL3Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("No OpenGL 3 support compiled in.", ELL_ERROR);
+	return nullptr;
+}
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+IVideoDriver *createOGLES2Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#else
+static IVideoDriver *createOGLES2Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("No OpenGL ES 2 support compiled in.", ELL_ERROR);
+	return nullptr;
+}
+#endif
+
+#ifdef _IRR_COMPILE_WITH_WEBGL1_
+IVideoDriver *createWebGL1Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#else
+static IVideoDriver *createWebGL1Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("No WebGL 1 support compiled in.", ELL_ERROR);
+	return nullptr;
+}
+#endif
+} // end namespace video
+
+} // end namespace irr
+
+namespace irr
+{
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+EM_BOOL CIrrDeviceSDL::MouseUpDownCallback(int eventType, const EmscriptenMouseEvent *event, void *userData)
+{
+	// We need this callback so far only because otherwise "emscripten_request_pointerlock" calls will
+	// fail as their request are infinitely deferred.
+	// Not exactly certain why, maybe SDL does catch those mouse-events otherwise and not pass them on.
+	return EM_FALSE;
+}
+
+EM_BOOL CIrrDeviceSDL::MouseEnterCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
+{
+	CIrrDeviceSDL *This = static_cast<CIrrDeviceSDL *>(userData);
+
+	SEvent irrevent;
+
+	irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+	irrevent.MouseInput.Event = irr::EMIE_MOUSE_ENTER_CANVAS;
+	This->MouseX = irrevent.MouseInput.X = mouseEvent->canvasX;
+	This->MouseY = irrevent.MouseInput.Y = mouseEvent->canvasY;
+	This->MouseXRel = mouseEvent->movementX; // should be 0 I guess? Or can it enter while pointer is locked()?
+	This->MouseYRel = mouseEvent->movementY;
+	irrevent.MouseInput.ButtonStates = This->MouseButtonStates; // TODO: not correct, but couldn't figure out the bitset of mouseEvent->buttons yet.
+	irrevent.MouseInput.Shift = mouseEvent->shiftKey;
+	irrevent.MouseInput.Control = mouseEvent->ctrlKey;
+
+	This->postEventFromUser(irrevent);
+
+	return EM_FALSE;
+}
+
+EM_BOOL CIrrDeviceSDL::MouseLeaveCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
+{
+	CIrrDeviceSDL *This = static_cast<CIrrDeviceSDL *>(userData);
+
+	SEvent irrevent;
+
+	irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+	irrevent.MouseInput.Event = irr::EMIE_MOUSE_LEAVE_CANVAS;
+	This->MouseX = irrevent.MouseInput.X = mouseEvent->canvasX;
+	This->MouseY = irrevent.MouseInput.Y = mouseEvent->canvasY;
+	This->MouseXRel = mouseEvent->movementX; // should be 0 I guess? Or can it enter while pointer is locked()?
+	This->MouseYRel = mouseEvent->movementY;
+	irrevent.MouseInput.ButtonStates = This->MouseButtonStates; // TODO: not correct, but couldn't figure out the bitset of mouseEvent->buttons yet.
+	irrevent.MouseInput.Shift = mouseEvent->shiftKey;
+	irrevent.MouseInput.Control = mouseEvent->ctrlKey;
+
+	This->postEventFromUser(irrevent);
+
+	return EM_FALSE;
+}
+#endif
+
+bool CIrrDeviceSDL::keyIsKnownSpecial(EKEY_CODE irrlichtKey)
+{
+	switch (irrlichtKey) {
+	// keys which are known to have safe special character interpretation
+	// could need changes over time (removals and additions!)
+	case KEY_RETURN:
+	case KEY_PAUSE:
+	case KEY_ESCAPE:
+	case KEY_PRIOR:
+	case KEY_NEXT:
+	case KEY_HOME:
+	case KEY_END:
+	case KEY_LEFT:
+	case KEY_UP:
+	case KEY_RIGHT:
+	case KEY_DOWN:
+	case KEY_TAB:
+	case KEY_PRINT:
+	case KEY_SNAPSHOT:
+	case KEY_INSERT:
+	case KEY_BACK:
+	case KEY_DELETE:
+	case KEY_HELP:
+	case KEY_APPS:
+	case KEY_SLEEP:
+	case KEY_F1:
+	case KEY_F2:
+	case KEY_F3:
+	case KEY_F4:
+	case KEY_F5:
+	case KEY_F6:
+	case KEY_F7:
+	case KEY_F8:
+	case KEY_F9:
+	case KEY_F10:
+	case KEY_F11:
+	case KEY_F12:
+	case KEY_F13:
+	case KEY_F14:
+	case KEY_F15:
+	case KEY_F16:
+	case KEY_F17:
+	case KEY_F18:
+	case KEY_F19:
+	case KEY_F20:
+	case KEY_F21:
+	case KEY_F22:
+	case KEY_F23:
+	case KEY_F24:
+	case KEY_NUMLOCK:
+	case KEY_SCROLL:
+	case KEY_LCONTROL:
+	case KEY_RCONTROL:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+int CIrrDeviceSDL::findCharToPassToIrrlicht(uint32_t sdlKey, EKEY_CODE irrlichtKey, bool numlock)
+{
+	switch (irrlichtKey) {
+	// special cases that always return a char regardless of how the SDL keycode
+	// looks
+	case KEY_RETURN:
+	case KEY_ESCAPE:
+		return (int)irrlichtKey;
+
+	// This is necessary for keys on the numpad because they don't use the same
+	// keycodes as their non-numpad versions (whose keycodes correspond to chars),
+	// but have their own SDL keycodes and their own Irrlicht keycodes (which
+	// don't correspond to chars).
+	case KEY_MULTIPLY:
+		return '*';
+	case KEY_ADD:
+		return '+';
+	case KEY_SUBTRACT:
+		return '-';
+	case KEY_DIVIDE:
+		return '/';
+
+	default:
+		break;
+	}
+
+	if (numlock) {
+		// Number keys on the numpad are also affected, but we only want them
+		// to produce number chars when numlock is enabled.
+		switch (irrlichtKey) {
+		case KEY_NUMPAD0:
+			return '0';
+		case KEY_NUMPAD1:
+			return '1';
+		case KEY_NUMPAD2:
+			return '2';
+		case KEY_NUMPAD3:
+			return '3';
+		case KEY_NUMPAD4:
+			return '4';
+		case KEY_NUMPAD5:
+			return '5';
+		case KEY_NUMPAD6:
+			return '6';
+		case KEY_NUMPAD7:
+			return '7';
+		case KEY_NUMPAD8:
+			return '8';
+		case KEY_NUMPAD9:
+			return '9';
+		default:
+			break;
+		}
+	}
+
+	// SDL in-place ORs values with no character representation with 1<<30
+	// https://wiki.libsdl.org/SDL2/SDLKeycodeLookup
+	// This also affects the numpad keys btw.
+	if (sdlKey & (1 << 30))
+		return 0;
+
+	switch (irrlichtKey) {
+	case KEY_PRIOR:
+	case KEY_NEXT:
+	case KEY_HOME:
+	case KEY_END:
+	case KEY_LEFT:
+	case KEY_UP:
+	case KEY_RIGHT:
+	case KEY_DOWN:
+	case KEY_NUMLOCK:
+		return 0;
+	default:
+		return sdlKey;
+	}
+}
+
+void CIrrDeviceSDL::resetReceiveTextInputEvents()
+{
+	gui::IGUIElement *elem = GUIEnvironment->getFocus();
+	if (elem && elem->acceptsIME()) {
+		// IBus seems to have an issue where dead keys and compose keys do not
+		// work (specifically, the individual characters in the sequence are
+		// sent as text input events instead of the result) when
+		// SDL_StartTextInput() is called on the same input box.
+		core::rect<s32> pos = elem->getAbsolutePosition();
+		if (!SDL_IsTextInputActive() || lastElemPos != pos) {
+			lastElemPos = pos;
+			SDL_Rect rect;
+			rect.x = pos.UpperLeftCorner.X;
+			rect.y = pos.UpperLeftCorner.Y;
+			rect.w = pos.getWidth();
+			rect.h = pos.getHeight();
+			SDL_SetTextInputRect(&rect);
+			SDL_StartTextInput();
+		}
+	} else {
+		SDL_StopTextInput();
+	}
+}
+
+//! constructor
+CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters &param) :
+		CIrrDeviceStub(param),
+		Window((SDL_Window *)param.WindowId),
+		MouseX(0), MouseY(0), MouseXRel(0), MouseYRel(0), MouseButtonStates(0),
+		Width(param.WindowSize.Width), Height(param.WindowSize.Height),
+		Resizable(param.WindowResizable == 1 ? true : false), CurrentTouchCount(0),
+		IsInBackground(false)
+{
+#ifdef _DEBUG
+	setDebugName("CIrrDeviceSDL");
+#endif
+
+	if (++SDLDeviceInstances == 1) {
+#ifdef __ANDROID__
+		// Blocking on pause causes problems with multiplayer.
+		// See https://github.com/minetest/minetest/issues/10842.
+		SDL_SetHint(SDL_HINT_ANDROID_BLOCK_ON_PAUSE, "0");
+		SDL_SetHint(SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO, "0");
+
+		SDL_SetHint(SDL_HINT_ANDROID_TRAP_BACK_BUTTON, "1");
+
+		// Minetest does its own screen keyboard handling.
+		SDL_SetHint(SDL_HINT_ENABLE_SCREEN_KEYBOARD, "0");
+#endif
+
+		// Minetest has its own signal handler
+		SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1");
+
+		// Disabling the compositor is not a good idea in windowed mode.
+		// See https://github.com/minetest/minetest/issues/14596
+		SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+		// These are not interesting for our use
+		SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+		SDL_SetHint(SDL_HINT_TV_REMOTE_AS_JOYSTICK, "0");
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 24, 0)
+		// highdpi support on Windows
+		SDL_SetHint(SDL_HINT_WINDOWS_DPI_SCALING, "1");
+#endif
+
+		// Minetest has its own code to synthesize mouse events from touch events,
+		// so we prevent SDL from doing it.
+		SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
+		SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
+
+#if defined(SDL_HINT_APP_NAME)
+		SDL_SetHint(SDL_HINT_APP_NAME, "Minetest");
+#endif
+
+		u32 flags = SDL_INIT_TIMER | SDL_INIT_EVENTS;
+		if (CreationParams.DriverType != video::EDT_NULL)
+			flags |= SDL_INIT_VIDEO;
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+		flags |= SDL_INIT_JOYSTICK;
+#endif
+		if (SDL_Init(flags) < 0) {
+			os::Printer::log("Unable to initialize SDL", SDL_GetError(), ELL_ERROR);
+			Close = true;
+		} else {
+			os::Printer::log("SDL initialized", ELL_INFORMATION);
+		}
+	}
+
+	// create keymap
+	createKeyMap();
+
+	// create window
+	if (CreationParams.DriverType != video::EDT_NULL) {
+		if (!createWindow()) {
+			Close = true;
+			return;
+		}
+	}
+
+	SDL_VERSION(&Info.version);
+
+#ifndef _IRR_EMSCRIPTEN_PLATFORM_
+	SDL_GetWindowWMInfo(Window, &Info);
+#endif //_IRR_EMSCRIPTEN_PLATFORM_
+	core::stringc sdlversion = "SDL Version ";
+	sdlversion += Info.version.major;
+	sdlversion += ".";
+	sdlversion += Info.version.minor;
+	sdlversion += ".";
+	sdlversion += Info.version.patch;
+
+	Operator = new COSOperator(sdlversion);
+	if (SDLDeviceInstances == 1) {
+		os::Printer::log(sdlversion.c_str(), ELL_INFORMATION);
+	}
+
+	// create cursor control
+	CursorControl = new CCursorControl(this);
+
+	// create driver
+	createDriver();
+
+	if (VideoDriver) {
+		createGUIAndScene();
+		VideoDriver->OnResize(core::dimension2d<u32>(Width, Height));
+	}
+}
+
+//! destructor
+CIrrDeviceSDL::~CIrrDeviceSDL()
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	const u32 numJoysticks = Joysticks.size();
+	for (u32 i = 0; i < numJoysticks; ++i)
+		SDL_JoystickClose(Joysticks[i]);
+#endif
+	if (Window && Context) {
+		SDL_GL_MakeCurrent(Window, NULL);
+		SDL_GL_DeleteContext(Context);
+	}
+	if (Window) {
+		SDL_DestroyWindow(Window);
+	}
+
+	if (--SDLDeviceInstances == 0) {
+		SDL_Quit();
+		os::Printer::log("Quit SDL", ELL_INFORMATION);
+	}
+}
+
+void CIrrDeviceSDL::logAttributes()
+{
+	core::stringc sdl_attr("SDL attribs:");
+	int value = 0;
+	if (SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" r:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" g:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" b:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_ALPHA_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" a:") + core::stringc(value);
+
+	if (SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" depth:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &value) == 0)
+		sdl_attr += core::stringc(" stencil:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &value) == 0)
+		sdl_attr += core::stringc(" doublebuf:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value) == 0)
+		sdl_attr += core::stringc(" aa:") + core::stringc(value);
+	if (SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value) == 0)
+		sdl_attr += core::stringc(" aa-samples:") + core::stringc(value);
+
+	os::Printer::log(sdl_attr.c_str());
+}
+
+bool CIrrDeviceSDL::createWindow()
+{
+	if (Close)
+		return false;
+
+	if (createWindowWithContext())
+		return true;
+
+	if (CreationParams.DriverDebug) {
+		CreationParams.DriverDebug = false;
+		if (createWindowWithContext()) {
+			os::Printer::log("DriverDebug reduced due to lack of support!");
+			// Turn it back on because the GL driver can maybe still do something useful.
+			CreationParams.DriverDebug = true;
+			return true;
+		}
+	}
+
+	while (CreationParams.AntiAlias > 0) {
+		CreationParams.AntiAlias--;
+		if (createWindowWithContext()) {
+			os::Printer::log("AntiAlias reduced/disabled due to lack of support!");
+			return true;
+		}
+	}
+
+	if (CreationParams.WithAlphaChannel) {
+		CreationParams.WithAlphaChannel = false;
+		if (createWindowWithContext()) {
+			os::Printer::log("WithAlphaChannel disabled due to lack of support!");
+			return true;
+		}
+	}
+
+	if (CreationParams.Stencilbuffer) {
+		CreationParams.Stencilbuffer = false;
+		if (createWindowWithContext()) {
+			os::Printer::log("Stencilbuffer disabled due to lack of support!");
+			return true;
+		}
+	}
+
+	while (CreationParams.ZBufferBits > 16) {
+		CreationParams.ZBufferBits -= 8;
+		if (createWindowWithContext()) {
+			os::Printer::log("ZBufferBits reduced due to lack of support!");
+			return true;
+		}
+	}
+
+	while (CreationParams.Bits > 16) {
+		CreationParams.Bits -= 8;
+		if (createWindowWithContext()) {
+			os::Printer::log("Bits reduced due to lack of support!");
+			return true;
+		}
+	}
+
+	if (CreationParams.Stereobuffer) {
+		CreationParams.Stereobuffer = false;
+		if (createWindowWithContext()) {
+			os::Printer::log("Stereobuffer disabled due to lack of support!");
+			return true;
+		}
+	}
+
+	if (CreationParams.Doublebuffer) {
+		// Try single buffer
+		CreationParams.Doublebuffer = false;
+		if (createWindowWithContext()) {
+			os::Printer::log("Doublebuffer disabled due to lack of support!");
+			return true;
+		}
+	}
+
+	os::Printer::log("Could not create window and context!", ELL_ERROR);
+	return false;
+}
+
+bool CIrrDeviceSDL::createWindowWithContext()
+{
+	u32 SDL_Flags = 0;
+	SDL_Flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+
+	SDL_Flags |= getFullscreenFlag(CreationParams.Fullscreen);
+	if (Resizable)
+		SDL_Flags |= SDL_WINDOW_RESIZABLE;
+	if (CreationParams.WindowMaximized)
+		SDL_Flags |= SDL_WINDOW_MAXIMIZED;
+	SDL_Flags |= SDL_WINDOW_OPENGL;
+
+	SDL_GL_ResetAttributes();
+
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+	if (Width != 0 || Height != 0)
+		emscripten_set_canvas_size(Width, Height);
+	else {
+		int w, h, fs;
+		emscripten_get_canvas_size(&w, &h, &fs);
+		Width = w;
+		Height = h;
+	}
+
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, CreationParams.WithAlphaChannel ? 8 : 0);
+
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, CreationParams.ZBufferBits);
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, CreationParams.Stencilbuffer ? 8 : 0);
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, CreationParams.Doublebuffer ? 1 : 0);
+
+	if (CreationParams.AntiAlias > 1) {
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, CreationParams.AntiAlias);
+	} else {
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
+	}
+
+	SDL_CreateWindowAndRenderer(0, 0, SDL_Flags, &Window, &Renderer); // 0,0 will use the canvas size
+
+	logAttributes();
+
+	// "#canvas" is for the opengl context
+	emscripten_set_mousedown_callback("#canvas", (void *)this, true, MouseUpDownCallback);
+	emscripten_set_mouseup_callback("#canvas", (void *)this, true, MouseUpDownCallback);
+	emscripten_set_mouseenter_callback("#canvas", (void *)this, false, MouseEnterCallback);
+	emscripten_set_mouseleave_callback("#canvas", (void *)this, false, MouseLeaveCallback);
+
+	return true;
+#else // !_IRR_EMSCRIPTEN_PLATFORM_
+	switch (CreationParams.DriverType) {
+	case video::EDT_OPENGL:
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+		break;
+	case video::EDT_OPENGL3:
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
+		break;
+	case video::EDT_OGLES1:
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+		break;
+	case video::EDT_OGLES2:
+	case video::EDT_WEBGL1:
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+		break;
+	default:;
+	}
+
+	if (CreationParams.DriverDebug) {
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG | SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG);
+	}
+
+	if (CreationParams.Bits == 16) {
+		SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+		SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, CreationParams.WithAlphaChannel ? 1 : 0);
+	} else {
+		SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+		SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, CreationParams.WithAlphaChannel ? 8 : 0);
+	}
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, CreationParams.ZBufferBits);
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, CreationParams.Doublebuffer);
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, CreationParams.Stencilbuffer ? 8 : 0);
+	SDL_GL_SetAttribute(SDL_GL_STEREO, CreationParams.Stereobuffer);
+	if (CreationParams.AntiAlias > 1) {
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, CreationParams.AntiAlias);
+	} else {
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
+	}
+
+	Window = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, Width, Height, SDL_Flags);
+	if (!Window) {
+		os::Printer::log("Could not create window", SDL_GetError(), ELL_WARNING);
+		return false;
+	}
+
+	Context = SDL_GL_CreateContext(Window);
+	if (!Context) {
+		os::Printer::log("Could not create context", SDL_GetError(), ELL_WARNING);
+		SDL_DestroyWindow(Window);
+		Window = nullptr;
+		return false;
+	}
+
+	updateSizeAndScale();
+	if (ScaleX != 1.0f || ScaleY != 1.0f) {
+		// The given window size is in pixels, not in screen coordinates.
+		// We can only do the conversion now since we didn't know the scale before.
+		SDL_SetWindowSize(Window,
+				static_cast<int>(CreationParams.WindowSize.Width / ScaleX),
+				static_cast<int>(CreationParams.WindowSize.Height / ScaleY));
+		// Re-center, otherwise large, non-maximized windows go offscreen.
+		SDL_SetWindowPosition(Window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
+		updateSizeAndScale();
+	}
+
+	return true;
+#endif // !_IRR_EMSCRIPTEN_PLATFORM_
+}
+
+//! create the driver
+void CIrrDeviceSDL::createDriver()
+{
+	if (CreationParams.DriverType == video::EDT_NULL) {
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+		return;
+	}
+
+	ContextManager = new video::CSDLManager(this);
+	switch (CreationParams.DriverType) {
+	case video::EDT_OPENGL:
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, ContextManager);
+		break;
+	case video::EDT_OPENGL3:
+		VideoDriver = video::createOpenGL3Driver(CreationParams, FileSystem, ContextManager);
+		break;
+	case video::EDT_OGLES2:
+		VideoDriver = video::createOGLES2Driver(CreationParams, FileSystem, ContextManager);
+		break;
+	case video::EDT_WEBGL1:
+		VideoDriver = video::createWebGL1Driver(CreationParams, FileSystem, ContextManager);
+		break;
+	default:;
+	}
+	if (!VideoDriver)
+		os::Printer::log("Could not create video driver", ELL_ERROR);
+}
+
+static int wrap_PollEvent(SDL_Event *ev)
+{
+	u32 t0 = os::Timer::getRealTime();
+	int ret = SDL_PollEvent(ev);
+	u32 d = os::Timer::getRealTime() - t0;
+	if (d >= 5) {
+		auto msg = std::string("SDL_PollEvent took too long: ") + std::to_string(d) + "ms";
+		// 50ms delay => more than three missed frames (at 60fps)
+		os::Printer::log(msg.c_str(), d >= 50 ? ELL_WARNING : ELL_INFORMATION);
+	}
+	return ret;
+}
+
+//! runs the device. Returns false if device wants to be deleted
+bool CIrrDeviceSDL::run()
+{
+	os::Timer::tick();
+
+	SEvent irrevent;
+	SDL_Event SDL_event;
+
+	while (!Close && wrap_PollEvent(&SDL_event)) {
+		// os::Printer::log("event: ", core::stringc((int)SDL_event.type).c_str(),   ELL_INFORMATION);	// just for debugging
+		memset(&irrevent, 0, sizeof(irrevent));
+
+		switch (SDL_event.type) {
+		case SDL_MOUSEMOTION: {
+			SDL_Keymod keymod = SDL_GetModState();
+
+			irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			irrevent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+			MouseX = irrevent.MouseInput.X =
+				static_cast<s32>(SDL_event.motion.x * ScaleX);
+			MouseY = irrevent.MouseInput.Y =
+				static_cast<s32>(SDL_event.motion.y * ScaleY);
+			MouseXRel = static_cast<s32>(SDL_event.motion.xrel * ScaleX);
+			MouseYRel = static_cast<s32>(SDL_event.motion.yrel * ScaleY);
+			irrevent.MouseInput.ButtonStates = MouseButtonStates;
+			irrevent.MouseInput.Shift = (keymod & KMOD_SHIFT) != 0;
+			irrevent.MouseInput.Control = (keymod & KMOD_CTRL) != 0;
+
+			postEventFromUser(irrevent);
+			break;
+		}
+		case SDL_MOUSEWHEEL: {
+			SDL_Keymod keymod = SDL_GetModState();
+
+			irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			irrevent.MouseInput.Event = irr::EMIE_MOUSE_WHEEL;
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+			irrevent.MouseInput.Wheel = SDL_event.wheel.preciseY;
+#else
+			irrevent.MouseInput.Wheel = SDL_event.wheel.y;
+#endif
+			irrevent.MouseInput.ButtonStates = MouseButtonStates;
+			irrevent.MouseInput.Shift = (keymod & KMOD_SHIFT) != 0;
+			irrevent.MouseInput.Control = (keymod & KMOD_CTRL) != 0;
+			irrevent.MouseInput.X = MouseX;
+			irrevent.MouseInput.Y = MouseY;
+
+			postEventFromUser(irrevent);
+			break;
+		}
+		case SDL_MOUSEBUTTONDOWN:
+		case SDL_MOUSEBUTTONUP: {
+			SDL_Keymod keymod = SDL_GetModState();
+
+			irrevent.EventType = irr::EET_MOUSE_INPUT_EVENT;
+			irrevent.MouseInput.X = static_cast<s32>(SDL_event.button.x * ScaleX);
+			irrevent.MouseInput.Y = static_cast<s32>(SDL_event.button.y * ScaleY);
+			irrevent.MouseInput.Shift = (keymod & KMOD_SHIFT) != 0;
+			irrevent.MouseInput.Control = (keymod & KMOD_CTRL) != 0;
+
+			irrevent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
+
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+			// Handle mouselocking in emscripten in Windowed mode.
+			// In fullscreen SDL will handle it.
+			// The behavior we want windowed is - when the canvas was clicked then
+			// we will lock the mouse-pointer if it should be invisible.
+			// For security reasons this will be delayed until the next mouse-up event.
+			// We do not pass on this event as we don't want the activation click to do anything.
+			if (SDL_event.type == SDL_MOUSEBUTTONDOWN && !isFullscreen()) {
+				EmscriptenPointerlockChangeEvent pointerlockStatus; // let's hope that test is not expensive ...
+				if (emscripten_get_pointerlock_status(&pointerlockStatus) == EMSCRIPTEN_RESULT_SUCCESS) {
+					if (CursorControl->isVisible() && pointerlockStatus.isActive) {
+						emscripten_exit_pointerlock();
+						return !Close;
+					} else if (!CursorControl->isVisible() && !pointerlockStatus.isActive) {
+						emscripten_request_pointerlock(0, true);
+						return !Close;
+					}
+				}
+			}
+#endif
+
+			auto button = SDL_event.button.button;
+#ifdef __ANDROID__
+			// Android likes to send the right mouse button as the back button.
+			// According to some web searches I did, this is probably
+			// vendor/device-specific.
+			// Since a working right mouse button is very important for
+			// Minetest, we have this little hack.
+			if (button == SDL_BUTTON_X2)
+				button = SDL_BUTTON_RIGHT;
+#endif
+			switch (button) {
+			case SDL_BUTTON_LEFT:
+				if (SDL_event.type == SDL_MOUSEBUTTONDOWN) {
+					irrevent.MouseInput.Event = irr::EMIE_LMOUSE_PRESSED_DOWN;
+					MouseButtonStates |= irr::EMBSM_LEFT;
+				} else {
+					irrevent.MouseInput.Event = irr::EMIE_LMOUSE_LEFT_UP;
+					MouseButtonStates &= ~irr::EMBSM_LEFT;
+				}
+				break;
+
+			case SDL_BUTTON_RIGHT:
+				if (SDL_event.type == SDL_MOUSEBUTTONDOWN) {
+					irrevent.MouseInput.Event = irr::EMIE_RMOUSE_PRESSED_DOWN;
+					MouseButtonStates |= irr::EMBSM_RIGHT;
+				} else {
+					irrevent.MouseInput.Event = irr::EMIE_RMOUSE_LEFT_UP;
+					MouseButtonStates &= ~irr::EMBSM_RIGHT;
+				}
+				break;
+
+			case SDL_BUTTON_MIDDLE:
+				if (SDL_event.type == SDL_MOUSEBUTTONDOWN) {
+					irrevent.MouseInput.Event = irr::EMIE_MMOUSE_PRESSED_DOWN;
+					MouseButtonStates |= irr::EMBSM_MIDDLE;
+				} else {
+					irrevent.MouseInput.Event = irr::EMIE_MMOUSE_LEFT_UP;
+					MouseButtonStates &= ~irr::EMBSM_MIDDLE;
+				}
+				break;
+			}
+
+			irrevent.MouseInput.ButtonStates = MouseButtonStates;
+
+			if (irrevent.MouseInput.Event != irr::EMIE_MOUSE_MOVED) {
+				postEventFromUser(irrevent);
+
+				if (irrevent.MouseInput.Event >= EMIE_LMOUSE_PRESSED_DOWN && irrevent.MouseInput.Event <= EMIE_MMOUSE_PRESSED_DOWN) {
+					u32 clicks = checkSuccessiveClicks(irrevent.MouseInput.X, irrevent.MouseInput.Y, irrevent.MouseInput.Event);
+					if (clicks == 2) {
+						irrevent.MouseInput.Event = (EMOUSE_INPUT_EVENT)(EMIE_LMOUSE_DOUBLE_CLICK + irrevent.MouseInput.Event - EMIE_LMOUSE_PRESSED_DOWN);
+						postEventFromUser(irrevent);
+					} else if (clicks == 3) {
+						irrevent.MouseInput.Event = (EMOUSE_INPUT_EVENT)(EMIE_LMOUSE_TRIPLE_CLICK + irrevent.MouseInput.Event - EMIE_LMOUSE_PRESSED_DOWN);
+						postEventFromUser(irrevent);
+					}
+				}
+			}
+			break;
+		}
+
+		case SDL_TEXTINPUT: {
+			irrevent.EventType = irr::EET_STRING_INPUT_EVENT;
+			irrevent.StringInput.Str = new core::stringw();
+			irr::core::utf8ToWString(*irrevent.StringInput.Str, SDL_event.text.text);
+			postEventFromUser(irrevent);
+			delete irrevent.StringInput.Str;
+			irrevent.StringInput.Str = NULL;
+		} break;
+
+		case SDL_KEYDOWN:
+		case SDL_KEYUP: {
+			SKeyMap mp;
+			mp.SDLKey = SDL_event.key.keysym.sym;
+			s32 idx = KeyMap.binary_search(mp);
+
+			EKEY_CODE key;
+			if (idx == -1)
+				key = (EKEY_CODE)0;
+			else
+				key = (EKEY_CODE)KeyMap[idx].Win32Key;
+
+			if (key == (EKEY_CODE)0)
+				os::Printer::log("keycode not mapped", core::stringc(mp.SDLKey), ELL_DEBUG);
+
+			// Make sure to only input special characters if something is in focus, as SDL_TEXTINPUT handles normal unicode already
+			if (SDL_IsTextInputActive() && !keyIsKnownSpecial(key) && (SDL_event.key.keysym.mod & KMOD_CTRL) == 0)
+				break;
+
+			irrevent.EventType = irr::EET_KEY_INPUT_EVENT;
+			irrevent.KeyInput.Key = key;
+			irrevent.KeyInput.PressedDown = (SDL_event.type == SDL_KEYDOWN);
+			irrevent.KeyInput.Shift = (SDL_event.key.keysym.mod & KMOD_SHIFT) != 0;
+			irrevent.KeyInput.Control = (SDL_event.key.keysym.mod & KMOD_CTRL) != 0;
+			irrevent.KeyInput.Char = findCharToPassToIrrlicht(mp.SDLKey, key,
+					(SDL_event.key.keysym.mod & KMOD_NUM) != 0);
+			postEventFromUser(irrevent);
+		} break;
+
+		case SDL_QUIT:
+			Close = true;
+			break;
+
+		case SDL_WINDOWEVENT:
+			switch (SDL_event.window.event) {
+			case SDL_WINDOWEVENT_RESIZED:
+			case SDL_WINDOWEVENT_SIZE_CHANGED:
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+			case SDL_WINDOWEVENT_DISPLAY_CHANGED:
+#endif
+				u32 old_w = Width, old_h = Height;
+				f32 old_scale_x = ScaleX, old_scale_y = ScaleY;
+				updateSizeAndScale();
+				if (old_w != Width || old_h != Height) {
+					if (VideoDriver)
+						VideoDriver->OnResize(core::dimension2d<u32>(Width, Height));
+				}
+				if (old_scale_x != ScaleX || old_scale_y != ScaleY) {
+					irrevent.EventType = EET_APPLICATION_EVENT;
+					irrevent.ApplicationEvent.EventType = EAET_DPI_CHANGED;
+					postEventFromUser(irrevent);
+				}
+				break;
+			}
+			break;
+
+		case SDL_USEREVENT:
+			irrevent.EventType = irr::EET_USER_EVENT;
+			irrevent.UserEvent.UserData1 = reinterpret_cast<uintptr_t>(SDL_event.user.data1);
+			irrevent.UserEvent.UserData2 = reinterpret_cast<uintptr_t>(SDL_event.user.data2);
+
+			postEventFromUser(irrevent);
+			break;
+
+		case SDL_FINGERDOWN:
+			irrevent.EventType = EET_TOUCH_INPUT_EVENT;
+			irrevent.TouchInput.Event = ETIE_PRESSED_DOWN;
+			irrevent.TouchInput.ID = SDL_event.tfinger.fingerId;
+			irrevent.TouchInput.X = static_cast<s32>(SDL_event.tfinger.x * Width);
+			irrevent.TouchInput.Y = static_cast<s32>(SDL_event.tfinger.y * Height);
+			CurrentTouchCount++;
+			irrevent.TouchInput.touchedCount = CurrentTouchCount;
+
+			postEventFromUser(irrevent);
+			break;
+
+		case SDL_FINGERMOTION:
+			irrevent.EventType = EET_TOUCH_INPUT_EVENT;
+			irrevent.TouchInput.Event = ETIE_MOVED;
+			irrevent.TouchInput.ID = SDL_event.tfinger.fingerId;
+			irrevent.TouchInput.X = static_cast<s32>(SDL_event.tfinger.x * Width);
+			irrevent.TouchInput.Y = static_cast<s32>(SDL_event.tfinger.y * Height);
+			irrevent.TouchInput.touchedCount = CurrentTouchCount;
+
+			postEventFromUser(irrevent);
+			break;
+
+		case SDL_FINGERUP:
+			irrevent.EventType = EET_TOUCH_INPUT_EVENT;
+			irrevent.TouchInput.Event = ETIE_LEFT_UP;
+			irrevent.TouchInput.ID = SDL_event.tfinger.fingerId;
+			irrevent.TouchInput.X = static_cast<s32>(SDL_event.tfinger.x * Width);
+			irrevent.TouchInput.Y = static_cast<s32>(SDL_event.tfinger.y * Height);
+			// To match Android behavior, still count the pointer that was
+			// just released.
+			irrevent.TouchInput.touchedCount = CurrentTouchCount;
+			if (CurrentTouchCount > 0) {
+				CurrentTouchCount--;
+			}
+
+			postEventFromUser(irrevent);
+			break;
+
+		// Contrary to what the SDL documentation says, SDL_APP_WILLENTERBACKGROUND
+		// and SDL_APP_WILLENTERFOREGROUND are actually sent in onStop/onStart,
+		// not onPause/onResume, on recent Android versions. This can be verified
+		// by testing or by looking at the org.libsdl.app.SDLActivity Java code.
+		// -> This means we can use them to implement isWindowVisible().
+
+		case SDL_APP_WILLENTERBACKGROUND:
+			IsInBackground = true;
+			break;
+
+		case SDL_APP_WILLENTERFOREGROUND:
+			IsInBackground = false;
+			break;
+
+		case SDL_RENDER_TARGETS_RESET:
+			os::Printer::log("Received SDL_RENDER_TARGETS_RESET. Rendering is probably broken.", ELL_ERROR);
+			break;
+
+		case SDL_RENDER_DEVICE_RESET:
+			os::Printer::log("Received SDL_RENDER_DEVICE_RESET. Rendering is probably broken.", ELL_ERROR);
+			break;
+
+		default:
+			break;
+		} // end switch
+		resetReceiveTextInputEvents();
+	} // end while
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	// TODO: Check if the multiple open/close calls are too expensive, then
+	// open/close in the constructor/destructor instead
+
+	// update joystick states manually
+	SDL_JoystickUpdate();
+	// we'll always send joystick input events...
+	SEvent joyevent;
+	joyevent.EventType = EET_JOYSTICK_INPUT_EVENT;
+	for (u32 i = 0; i < Joysticks.size(); ++i) {
+		SDL_Joystick *joystick = Joysticks[i];
+		if (joystick) {
+			int j;
+			// query all buttons
+			const int numButtons = core::min_(SDL_JoystickNumButtons(joystick), 32);
+			joyevent.JoystickEvent.ButtonStates = 0;
+			for (j = 0; j < numButtons; ++j)
+				joyevent.JoystickEvent.ButtonStates |= (SDL_JoystickGetButton(joystick, j) << j);
+
+			// query all axes, already in correct range
+			const int numAxes = core::min_(SDL_JoystickNumAxes(joystick), (int)SEvent::SJoystickEvent::NUMBER_OF_AXES);
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] = 0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] = 0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] = 0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] = 0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] = 0;
+			joyevent.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] = 0;
+			for (j = 0; j < numAxes; ++j)
+				joyevent.JoystickEvent.Axis[j] = SDL_JoystickGetAxis(joystick, j);
+
+			// we can only query one hat, SDL only supports 8 directions
+			if (SDL_JoystickNumHats(joystick) > 0) {
+				switch (SDL_JoystickGetHat(joystick, 0)) {
+				case SDL_HAT_UP:
+					joyevent.JoystickEvent.POV = 0;
+					break;
+				case SDL_HAT_RIGHTUP:
+					joyevent.JoystickEvent.POV = 4500;
+					break;
+				case SDL_HAT_RIGHT:
+					joyevent.JoystickEvent.POV = 9000;
+					break;
+				case SDL_HAT_RIGHTDOWN:
+					joyevent.JoystickEvent.POV = 13500;
+					break;
+				case SDL_HAT_DOWN:
+					joyevent.JoystickEvent.POV = 18000;
+					break;
+				case SDL_HAT_LEFTDOWN:
+					joyevent.JoystickEvent.POV = 22500;
+					break;
+				case SDL_HAT_LEFT:
+					joyevent.JoystickEvent.POV = 27000;
+					break;
+				case SDL_HAT_LEFTUP:
+					joyevent.JoystickEvent.POV = 31500;
+					break;
+				case SDL_HAT_CENTERED:
+				default:
+					joyevent.JoystickEvent.POV = 65535;
+					break;
+				}
+			} else {
+				joyevent.JoystickEvent.POV = 65535;
+			}
+
+			// we map the number directly
+			joyevent.JoystickEvent.Joystick = static_cast<u8>(i);
+			// now post the event
+			postEventFromUser(joyevent);
+			// and close the joystick
+		}
+	}
+#endif
+	return !Close;
+}
+
+//! Activate any joysticks, and generate events for them.
+bool CIrrDeviceSDL::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	joystickInfo.clear();
+
+	// we can name up to 256 different joysticks
+	const int numJoysticks = core::min_(SDL_NumJoysticks(), 256);
+	Joysticks.reallocate(numJoysticks);
+	joystickInfo.reallocate(numJoysticks);
+
+	int joystick = 0;
+	for (; joystick < numJoysticks; ++joystick) {
+		Joysticks.push_back(SDL_JoystickOpen(joystick));
+		SJoystickInfo info;
+
+		info.Joystick = joystick;
+		info.Axes = SDL_JoystickNumAxes(Joysticks[joystick]);
+		info.Buttons = SDL_JoystickNumButtons(Joysticks[joystick]);
+		info.Name = SDL_JoystickName(Joysticks[joystick]);
+		info.PovHat = (SDL_JoystickNumHats(Joysticks[joystick]) > 0)
+							  ? SJoystickInfo::POV_HAT_PRESENT
+							  : SJoystickInfo::POV_HAT_ABSENT;
+
+		joystickInfo.push_back(info);
+	}
+
+	for (joystick = 0; joystick < (int)joystickInfo.size(); ++joystick) {
+		char logString[256];
+		snprintf_irr(logString, sizeof(logString), "Found joystick %d, %d axes, %d buttons '%s'",
+				joystick, joystickInfo[joystick].Axes,
+				joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	return false;
+}
+
+void CIrrDeviceSDL::updateSizeAndScale()
+{
+	int window_w, window_h;
+	SDL_GetWindowSize(Window, &window_w, &window_h);
+
+	int drawable_w, drawable_h;
+	SDL_GL_GetDrawableSize(Window, &drawable_w, &drawable_h);
+
+	ScaleX = (float)drawable_w / (float)window_w;
+	ScaleY = (float)drawable_h / (float)window_h;
+
+	Width = drawable_w;
+	Height = drawable_h;
+}
+
+//! Get the display density in dots per inch.
+float CIrrDeviceSDL::getDisplayDensity() const
+{
+	// assume 96 dpi
+	return std::max(ScaleX * 96.0f, ScaleY * 96.0f);
+}
+
+void CIrrDeviceSDL::SwapWindow()
+{
+	SDL_GL_SwapWindow(Window);
+}
+
+//! pause execution temporarily
+void CIrrDeviceSDL::yield()
+{
+	SDL_Delay(0);
+}
+
+//! pause execution for a specified time
+void CIrrDeviceSDL::sleep(u32 timeMs, bool pauseTimer)
+{
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
+	if (pauseTimer && !wasStopped)
+		Timer->stop();
+
+	SDL_Delay(timeMs);
+
+	if (pauseTimer && !wasStopped)
+		Timer->start();
+}
+
+//! sets the caption of the window
+void CIrrDeviceSDL::setWindowCaption(const wchar_t *text)
+{
+	core::stringc textc;
+	core::wStringToUTF8(textc, text);
+	SDL_SetWindowTitle(Window, textc.c_str());
+}
+
+//! Sets the window icon.
+bool CIrrDeviceSDL::setWindowIcon(const video::IImage *img)
+{
+	if (!Window)
+		return false;
+
+	u32 height = img->getDimension().Height;
+	u32 width = img->getDimension().Width;
+
+	SDL_Surface *surface = SDL_CreateRGBSurface(0, width, height, 32,
+			0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
+
+	if (!surface) {
+		os::Printer::log("Failed to create SDL suface", ELL_ERROR);
+		return false;
+	}
+
+	SDL_LockSurface(surface);
+	bool succ = img->copyToNoScaling(surface->pixels, width, height, video::ECF_A8R8G8B8, surface->pitch);
+	SDL_UnlockSurface(surface);
+
+	if (!succ) {
+		os::Printer::log("Could not copy icon image. Is the format not ECF_A8R8G8B8?", ELL_ERROR);
+		SDL_FreeSurface(surface);
+		return false;
+	}
+
+	SDL_SetWindowIcon(Window, surface);
+
+	SDL_FreeSurface(surface);
+
+	return true;
+}
+
+//! notifies the device that it should close itself
+void CIrrDeviceSDL::closeDevice()
+{
+	Close = true;
+}
+
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceSDL::setResizable(bool resize)
+{
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+	os::Printer::log("Resizable not available on the web.", ELL_WARNING);
+	return;
+#else  // !_IRR_EMSCRIPTEN_PLATFORM_
+	if (resize != Resizable) {
+		if (Window) {
+			SDL_SetWindowResizable(Window, (SDL_bool)resize);
+		}
+		Resizable = resize;
+	}
+#endif // !_IRR_EMSCRIPTEN_PLATFORM_
+}
+
+//! Minimizes window if possible
+void CIrrDeviceSDL::minimizeWindow()
+{
+	if (Window)
+		SDL_MinimizeWindow(Window);
+}
+
+//! Maximize window
+void CIrrDeviceSDL::maximizeWindow()
+{
+	if (Window)
+		SDL_MaximizeWindow(Window);
+}
+
+//! Get the position of this window on screen
+core::position2di CIrrDeviceSDL::getWindowPosition()
+{
+	return core::position2di(-1, -1);
+}
+
+//! Restore original window size
+void CIrrDeviceSDL::restoreWindow()
+{
+	if (Window)
+		SDL_RestoreWindow(Window);
+}
+
+bool CIrrDeviceSDL::isWindowMaximized() const
+{
+	return Window && (SDL_GetWindowFlags(Window) & SDL_WINDOW_MAXIMIZED) != 0;
+}
+
+bool CIrrDeviceSDL::isFullscreen() const
+{
+	if (!Window)
+		return false;
+	u32 flags = SDL_GetWindowFlags(Window);
+	return (flags & SDL_WINDOW_FULLSCREEN) != 0 ||
+			(flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
+}
+
+u32 CIrrDeviceSDL::getFullscreenFlag(bool fullscreen)
+{
+	if (!fullscreen)
+		return 0;
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+	return SDL_WINDOW_FULLSCREEN;
+#else
+	return SDL_WINDOW_FULLSCREEN_DESKTOP;
+#endif
+}
+
+bool CIrrDeviceSDL::setFullscreen(bool fullscreen)
+{
+	if (!Window)
+		return false;
+	// The SDL wiki says that this may trigger SDL_RENDER_TARGETS_RESET, but
+	// looking at the SDL source, this only happens with D3D, so it's not
+	// relevant to us.
+	bool success = SDL_SetWindowFullscreen(Window, getFullscreenFlag(fullscreen)) == 0;
+	if (!success)
+		os::Printer::log("SDL_SetWindowFullscreen failed", SDL_GetError(), ELL_ERROR);
+	return success;
+}
+
+bool CIrrDeviceSDL::isWindowVisible() const
+{
+	return !IsInBackground;
+}
+
+//! returns if window is active. if not, nothing need to be drawn
+bool CIrrDeviceSDL::isWindowActive() const
+{
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+	// Hidden test only does something in some browsers (when tab in background or window is minimized)
+	// In other browsers code automatically doesn't seem to be called anymore.
+	EmscriptenVisibilityChangeEvent emVisibility;
+	if (emscripten_get_visibility_status(&emVisibility) == EMSCRIPTEN_RESULT_SUCCESS) {
+		if (emVisibility.hidden)
+			return false;
+	}
+#endif
+	const u32 windowFlags = SDL_GetWindowFlags(Window);
+	return windowFlags & SDL_WINDOW_SHOWN && windowFlags & SDL_WINDOW_INPUT_FOCUS;
+}
+
+//! returns if window has focus.
+bool CIrrDeviceSDL::isWindowFocused() const
+{
+	return Window && (SDL_GetWindowFlags(Window) & SDL_WINDOW_INPUT_FOCUS) != 0;
+}
+
+//! returns if window is minimized.
+bool CIrrDeviceSDL::isWindowMinimized() const
+{
+	return Window && (SDL_GetWindowFlags(Window) & SDL_WINDOW_MINIMIZED) != 0;
+}
+
+//! returns color format of the window.
+video::ECOLOR_FORMAT CIrrDeviceSDL::getColorFormat() const
+{
+	if (Window) {
+		SDL_Surface *surface = SDL_GetWindowSurface(Window);
+		if (surface->format->BitsPerPixel == 16) {
+			if (surface->format->Amask != 0)
+				return video::ECF_A1R5G5B5;
+			else
+				return video::ECF_R5G6B5;
+		} else {
+			if (surface->format->Amask != 0)
+				return video::ECF_A8R8G8B8;
+			else
+				return video::ECF_R8G8B8;
+		}
+	} else
+		return CIrrDeviceStub::getColorFormat();
+}
+
+void CIrrDeviceSDL::createKeyMap()
+{
+	// I don't know if this is the best method  to create
+	// the lookuptable, but I'll leave it like that until
+	// I find a better version.
+
+	KeyMap.reallocate(105);
+
+	// buttons missing
+
+	// Android back button = ESC
+	KeyMap.push_back(SKeyMap(SDLK_AC_BACK, KEY_ESCAPE));
+
+	KeyMap.push_back(SKeyMap(SDLK_BACKSPACE, KEY_BACK));
+	KeyMap.push_back(SKeyMap(SDLK_TAB, KEY_TAB));
+	KeyMap.push_back(SKeyMap(SDLK_CLEAR, KEY_CLEAR));
+	KeyMap.push_back(SKeyMap(SDLK_RETURN, KEY_RETURN));
+
+	// combined modifiers missing
+
+	KeyMap.push_back(SKeyMap(SDLK_PAUSE, KEY_PAUSE));
+	KeyMap.push_back(SKeyMap(SDLK_CAPSLOCK, KEY_CAPITAL));
+
+	// asian letter keys missing
+
+	KeyMap.push_back(SKeyMap(SDLK_ESCAPE, KEY_ESCAPE));
+
+	// asian letter keys missing
+
+	KeyMap.push_back(SKeyMap(SDLK_SPACE, KEY_SPACE));
+	KeyMap.push_back(SKeyMap(SDLK_PAGEUP, KEY_PRIOR));
+	KeyMap.push_back(SKeyMap(SDLK_PAGEDOWN, KEY_NEXT));
+	KeyMap.push_back(SKeyMap(SDLK_END, KEY_END));
+	KeyMap.push_back(SKeyMap(SDLK_HOME, KEY_HOME));
+	KeyMap.push_back(SKeyMap(SDLK_LEFT, KEY_LEFT));
+	KeyMap.push_back(SKeyMap(SDLK_UP, KEY_UP));
+	KeyMap.push_back(SKeyMap(SDLK_RIGHT, KEY_RIGHT));
+	KeyMap.push_back(SKeyMap(SDLK_DOWN, KEY_DOWN));
+
+	// select missing
+	KeyMap.push_back(SKeyMap(SDLK_PRINTSCREEN, KEY_PRINT));
+	// execute missing
+	KeyMap.push_back(SKeyMap(SDLK_PRINTSCREEN, KEY_SNAPSHOT));
+
+	KeyMap.push_back(SKeyMap(SDLK_INSERT, KEY_INSERT));
+	KeyMap.push_back(SKeyMap(SDLK_DELETE, KEY_DELETE));
+	KeyMap.push_back(SKeyMap(SDLK_HELP, KEY_HELP));
+
+	KeyMap.push_back(SKeyMap(SDLK_0, KEY_KEY_0));
+	KeyMap.push_back(SKeyMap(SDLK_1, KEY_KEY_1));
+	KeyMap.push_back(SKeyMap(SDLK_2, KEY_KEY_2));
+	KeyMap.push_back(SKeyMap(SDLK_3, KEY_KEY_3));
+	KeyMap.push_back(SKeyMap(SDLK_4, KEY_KEY_4));
+	KeyMap.push_back(SKeyMap(SDLK_5, KEY_KEY_5));
+	KeyMap.push_back(SKeyMap(SDLK_6, KEY_KEY_6));
+	KeyMap.push_back(SKeyMap(SDLK_7, KEY_KEY_7));
+	KeyMap.push_back(SKeyMap(SDLK_8, KEY_KEY_8));
+	KeyMap.push_back(SKeyMap(SDLK_9, KEY_KEY_9));
+
+	KeyMap.push_back(SKeyMap(SDLK_a, KEY_KEY_A));
+	KeyMap.push_back(SKeyMap(SDLK_b, KEY_KEY_B));
+	KeyMap.push_back(SKeyMap(SDLK_c, KEY_KEY_C));
+	KeyMap.push_back(SKeyMap(SDLK_d, KEY_KEY_D));
+	KeyMap.push_back(SKeyMap(SDLK_e, KEY_KEY_E));
+	KeyMap.push_back(SKeyMap(SDLK_f, KEY_KEY_F));
+	KeyMap.push_back(SKeyMap(SDLK_g, KEY_KEY_G));
+	KeyMap.push_back(SKeyMap(SDLK_h, KEY_KEY_H));
+	KeyMap.push_back(SKeyMap(SDLK_i, KEY_KEY_I));
+	KeyMap.push_back(SKeyMap(SDLK_j, KEY_KEY_J));
+	KeyMap.push_back(SKeyMap(SDLK_k, KEY_KEY_K));
+	KeyMap.push_back(SKeyMap(SDLK_l, KEY_KEY_L));
+	KeyMap.push_back(SKeyMap(SDLK_m, KEY_KEY_M));
+	KeyMap.push_back(SKeyMap(SDLK_n, KEY_KEY_N));
+	KeyMap.push_back(SKeyMap(SDLK_o, KEY_KEY_O));
+	KeyMap.push_back(SKeyMap(SDLK_p, KEY_KEY_P));
+	KeyMap.push_back(SKeyMap(SDLK_q, KEY_KEY_Q));
+	KeyMap.push_back(SKeyMap(SDLK_r, KEY_KEY_R));
+	KeyMap.push_back(SKeyMap(SDLK_s, KEY_KEY_S));
+	KeyMap.push_back(SKeyMap(SDLK_t, KEY_KEY_T));
+	KeyMap.push_back(SKeyMap(SDLK_u, KEY_KEY_U));
+	KeyMap.push_back(SKeyMap(SDLK_v, KEY_KEY_V));
+	KeyMap.push_back(SKeyMap(SDLK_w, KEY_KEY_W));
+	KeyMap.push_back(SKeyMap(SDLK_x, KEY_KEY_X));
+	KeyMap.push_back(SKeyMap(SDLK_y, KEY_KEY_Y));
+	KeyMap.push_back(SKeyMap(SDLK_z, KEY_KEY_Z));
+
+	KeyMap.push_back(SKeyMap(SDLK_LGUI, KEY_LWIN));
+	KeyMap.push_back(SKeyMap(SDLK_RGUI, KEY_RWIN));
+	// apps missing
+	KeyMap.push_back(SKeyMap(SDLK_POWER, KEY_SLEEP)); //??
+
+	KeyMap.push_back(SKeyMap(SDLK_KP_0, KEY_NUMPAD0));
+	KeyMap.push_back(SKeyMap(SDLK_KP_1, KEY_NUMPAD1));
+	KeyMap.push_back(SKeyMap(SDLK_KP_2, KEY_NUMPAD2));
+	KeyMap.push_back(SKeyMap(SDLK_KP_3, KEY_NUMPAD3));
+	KeyMap.push_back(SKeyMap(SDLK_KP_4, KEY_NUMPAD4));
+	KeyMap.push_back(SKeyMap(SDLK_KP_5, KEY_NUMPAD5));
+	KeyMap.push_back(SKeyMap(SDLK_KP_6, KEY_NUMPAD6));
+	KeyMap.push_back(SKeyMap(SDLK_KP_7, KEY_NUMPAD7));
+	KeyMap.push_back(SKeyMap(SDLK_KP_8, KEY_NUMPAD8));
+	KeyMap.push_back(SKeyMap(SDLK_KP_9, KEY_NUMPAD9));
+	KeyMap.push_back(SKeyMap(SDLK_KP_MULTIPLY, KEY_MULTIPLY));
+	KeyMap.push_back(SKeyMap(SDLK_KP_PLUS, KEY_ADD));
+	KeyMap.push_back(SKeyMap(SDLK_KP_ENTER, KEY_RETURN));
+	KeyMap.push_back(SKeyMap(SDLK_KP_MINUS, KEY_SUBTRACT));
+	KeyMap.push_back(SKeyMap(SDLK_KP_PERIOD, KEY_DECIMAL));
+	KeyMap.push_back(SKeyMap(SDLK_KP_DIVIDE, KEY_DIVIDE));
+
+	KeyMap.push_back(SKeyMap(SDLK_F1, KEY_F1));
+	KeyMap.push_back(SKeyMap(SDLK_F2, KEY_F2));
+	KeyMap.push_back(SKeyMap(SDLK_F3, KEY_F3));
+	KeyMap.push_back(SKeyMap(SDLK_F4, KEY_F4));
+	KeyMap.push_back(SKeyMap(SDLK_F5, KEY_F5));
+	KeyMap.push_back(SKeyMap(SDLK_F6, KEY_F6));
+	KeyMap.push_back(SKeyMap(SDLK_F7, KEY_F7));
+	KeyMap.push_back(SKeyMap(SDLK_F8, KEY_F8));
+	KeyMap.push_back(SKeyMap(SDLK_F9, KEY_F9));
+	KeyMap.push_back(SKeyMap(SDLK_F10, KEY_F10));
+	KeyMap.push_back(SKeyMap(SDLK_F11, KEY_F11));
+	KeyMap.push_back(SKeyMap(SDLK_F12, KEY_F12));
+	KeyMap.push_back(SKeyMap(SDLK_F13, KEY_F13));
+	KeyMap.push_back(SKeyMap(SDLK_F14, KEY_F14));
+	KeyMap.push_back(SKeyMap(SDLK_F15, KEY_F15));
+	// no higher F-keys
+
+	KeyMap.push_back(SKeyMap(SDLK_NUMLOCKCLEAR, KEY_NUMLOCK));
+	KeyMap.push_back(SKeyMap(SDLK_SCROLLLOCK, KEY_SCROLL));
+	KeyMap.push_back(SKeyMap(SDLK_LSHIFT, KEY_LSHIFT));
+	KeyMap.push_back(SKeyMap(SDLK_RSHIFT, KEY_RSHIFT));
+	KeyMap.push_back(SKeyMap(SDLK_LCTRL, KEY_LCONTROL));
+	KeyMap.push_back(SKeyMap(SDLK_RCTRL, KEY_RCONTROL));
+	KeyMap.push_back(SKeyMap(SDLK_LALT, KEY_LMENU));
+	KeyMap.push_back(SKeyMap(SDLK_RALT, KEY_RMENU));
+
+	KeyMap.push_back(SKeyMap(SDLK_PLUS, KEY_PLUS));
+	KeyMap.push_back(SKeyMap(SDLK_COMMA, KEY_COMMA));
+	KeyMap.push_back(SKeyMap(SDLK_MINUS, KEY_MINUS));
+	KeyMap.push_back(SKeyMap(SDLK_PERIOD, KEY_PERIOD));
+
+	// some special keys missing
+
+	KeyMap.sort();
+}
+
+void CIrrDeviceSDL::CCursorControl::initCursors()
+{
+	Cursors.reserve(gui::ECI_COUNT);
+
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW));     // ECI_NORMAL
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_CROSSHAIR)); // ECI_CROSS
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND));      // ECI_HAND
+	Cursors.emplace_back(nullptr);                                             // ECI_HELP
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM));     // ECI_IBEAM
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO));        // ECI_NO
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT));      // ECI_WAIT
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL));   // ECI_SIZEALL
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW));  // ECI_SIZENESW
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE));  // ECI_SIZENWSE
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS));    // ECI_SIZENS
+	Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE));    // ECI_SIZEWE
+	Cursors.emplace_back(nullptr);                                             // ECI_UP
+}
+
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_SDL_DEVICE_
diff --git a/irr/src/CIrrDeviceSDL.h b/irr/src/CIrrDeviceSDL.h
new file mode 100644
index 000000000..f881bba5c
--- /dev/null
+++ b/irr/src/CIrrDeviceSDL.h
@@ -0,0 +1,340 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+// This device code is based on the original SDL device implementation
+// contributed by Shane Parker (sirshane).
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+
+#include "IrrlichtDevice.h"
+#include "CIrrDeviceStub.h"
+#include "ICursorControl.h"
+
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+#include <emscripten/html5.h>
+#endif
+
+#include <SDL.h>
+// DirectFB is removed in SDL3, thou distribution as Alpine currently ships SDL2
+// with enabled DirectFB, but requiring another fix at a top of SDL2.
+// We don't need DirectFB in Irrlicht/Minetest, so simply disable it here to prevent issues.
+#undef SDL_VIDEO_DRIVER_DIRECTFB
+#include <SDL_syswm.h>
+
+#include <memory>
+
+namespace irr
+{
+
+class CIrrDeviceSDL : public CIrrDeviceStub
+{
+public:
+	//! constructor
+	CIrrDeviceSDL(const SIrrlichtCreationParameters &param);
+
+	//! destructor
+	virtual ~CIrrDeviceSDL();
+
+	//! runs the device. Returns false if device wants to be deleted
+	bool run() override;
+
+	//! pause execution temporarily
+	void yield() override;
+
+	//! pause execution for a specified time
+	void sleep(u32 timeMs, bool pauseTimer) override;
+
+	//! sets the caption of the window
+	void setWindowCaption(const wchar_t *text) override;
+
+	//! Sets the window icon.
+	bool setWindowIcon(const video::IImage *img) override;
+
+	//! returns if window is active. if not, nothing need to be drawn
+	bool isWindowActive() const override;
+
+	//! returns if window has focus.
+	bool isWindowFocused() const override;
+
+	//! returns if window is minimized.
+	bool isWindowMinimized() const override;
+
+	//! returns color format of the window.
+	video::ECOLOR_FORMAT getColorFormat() const override;
+
+	//! notifies the device that it should close itself
+	void closeDevice() override;
+
+	//! Sets if the window should be resizable in windowed mode.
+	void setResizable(bool resize = false) override;
+
+	//! Minimizes the window.
+	void minimizeWindow() override;
+
+	//! Maximizes the window.
+	void maximizeWindow() override;
+
+	//! Restores the window size.
+	void restoreWindow() override;
+
+	//! Checks if the window is maximized.
+	bool isWindowMaximized() const override;
+
+	//! Checks if the Irrlicht window is running in fullscreen mode
+	/** \return True if window is fullscreen. */
+	bool isFullscreen() const override;
+
+	//! Enables or disables fullscreen mode.
+	/** \return True on success. */
+	bool setFullscreen(bool fullscreen) override;
+
+	//! Checks if the window could possibly be visible.
+	bool isWindowVisible() const override;
+
+	//! Get the position of this window on screen
+	core::position2di getWindowPosition() override;
+
+	//! Activate any joysticks, and generate events for them.
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) override;
+
+	//! Get the device type
+	E_DEVICE_TYPE getType() const override
+	{
+		return EIDT_SDL;
+	}
+
+	//! Get the display density in dots per inch.
+	float getDisplayDensity() const override;
+
+	void SwapWindow();
+
+	//! Implementation of the linux cursor control
+	class CCursorControl : public gui::ICursorControl
+	{
+	public:
+		CCursorControl(CIrrDeviceSDL *dev) :
+				Device(dev), IsVisible(true)
+		{
+			initCursors();
+		}
+
+		//! Changes the visible state of the mouse cursor.
+		void setVisible(bool visible) override
+		{
+			IsVisible = visible;
+			if (visible)
+				SDL_ShowCursor(SDL_ENABLE);
+			else {
+				SDL_ShowCursor(SDL_DISABLE);
+			}
+		}
+
+		//! Returns if the cursor is currently visible.
+		bool isVisible() const override
+		{
+			return IsVisible;
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<f32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(f32 x, f32 y) override
+		{
+			setPosition((s32)(x * Device->Width), (s32)(y * Device->Height));
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<s32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(s32 x, s32 y) override
+		{
+			SDL_WarpMouseInWindow(Device->Window,
+					static_cast<int>(x / Device->ScaleX),
+					static_cast<int>(y / Device->ScaleY));
+
+			if (SDL_GetRelativeMouseMode()) {
+				// There won't be an event for this warp (details on libsdl-org/SDL/issues/6034)
+				Device->MouseX = x;
+				Device->MouseY = y;
+			}
+		}
+
+		//! Returns the current position of the mouse cursor.
+		const core::position2d<s32> &getPosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateCursorPos();
+			return CursorPos;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		core::position2d<f32> getRelativePosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateCursorPos();
+			return core::position2d<f32>(CursorPos.X / (f32)Device->Width,
+					CursorPos.Y / (f32)Device->Height);
+		}
+
+		void setReferenceRect(core::rect<s32> *rect = 0) override
+		{
+		}
+
+		virtual void setRelativeMode(bool relative) _IRR_OVERRIDE_
+		{
+			// Only change it when necessary, as it flushes mouse motion when enabled
+			if (relative != static_cast<bool>(SDL_GetRelativeMouseMode())) {
+				if (relative)
+					SDL_SetRelativeMouseMode(SDL_TRUE);
+				else
+					SDL_SetRelativeMouseMode(SDL_FALSE);
+			}
+		}
+
+		void setActiveIcon(gui::ECURSOR_ICON iconId) override
+		{
+			ActiveIcon = iconId;
+			if (iconId > Cursors.size() || !Cursors[iconId]) {
+				iconId = gui::ECI_NORMAL;
+				if (iconId > Cursors.size() || !Cursors[iconId])
+					return;
+			}
+			SDL_SetCursor(Cursors[iconId].get());
+		}
+
+		gui::ECURSOR_ICON getActiveIcon() const override
+		{
+			return ActiveIcon;
+		}
+
+	private:
+		void updateCursorPos()
+		{
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+			EmscriptenPointerlockChangeEvent pointerlockStatus; // let's hope that test is not expensive ...
+			if (emscripten_get_pointerlock_status(&pointerlockStatus) == EMSCRIPTEN_RESULT_SUCCESS) {
+				if (pointerlockStatus.isActive) {
+					CursorPos.X += Device->MouseXRel;
+					CursorPos.Y += Device->MouseYRel;
+					Device->MouseXRel = 0;
+					Device->MouseYRel = 0;
+				} else {
+					CursorPos.X = Device->MouseX;
+					CursorPos.Y = Device->MouseY;
+				}
+			}
+#else
+			CursorPos.X = Device->MouseX;
+			CursorPos.Y = Device->MouseY;
+
+			if (CursorPos.X < 0)
+				CursorPos.X = 0;
+			if (CursorPos.X > (s32)Device->Width)
+				CursorPos.X = Device->Width;
+			if (CursorPos.Y < 0)
+				CursorPos.Y = 0;
+			if (CursorPos.Y > (s32)Device->Height)
+				CursorPos.Y = Device->Height;
+#endif
+		}
+
+		void initCursors();
+
+		CIrrDeviceSDL *Device;
+		core::position2d<s32> CursorPos;
+		bool IsVisible;
+
+		struct CursorDeleter
+		{
+			void operator()(SDL_Cursor *ptr)
+			{
+				if (ptr)
+					SDL_FreeCursor(ptr);
+			}
+		};
+		std::vector<std::unique_ptr<SDL_Cursor, CursorDeleter>> Cursors;
+		gui::ECURSOR_ICON ActiveIcon = gui::ECURSOR_ICON::ECI_NORMAL;
+	};
+
+private:
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_
+	static EM_BOOL MouseUpDownCallback(int eventType, const EmscriptenMouseEvent *event, void *userData);
+	static EM_BOOL MouseEnterCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
+	static EM_BOOL MouseLeaveCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
+
+#endif
+	// Check if a key is a known special character with no side effects on text boxes.
+	static bool keyIsKnownSpecial(EKEY_CODE irrlichtKey);
+
+	// Return the Char that should be sent to Irrlicht for the given key (either the one passed in or 0).
+	static int findCharToPassToIrrlicht(uint32_t sdlKey, EKEY_CODE irrlichtKey, bool numlock);
+
+	// Check if a text box is in focus. Enable or disable SDL_TEXTINPUT events only if in focus.
+	void resetReceiveTextInputEvents();
+
+	//! create the driver
+	void createDriver();
+
+	bool createWindow();
+	bool createWindowWithContext();
+
+	void createKeyMap();
+
+	void logAttributes();
+	SDL_GLContext Context;
+	SDL_Window *Window;
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	core::array<SDL_Joystick *> Joysticks;
+#endif
+
+	s32 MouseX, MouseY;
+	s32 MouseXRel, MouseYRel;
+	u32 MouseButtonStates;
+
+	u32 Width, Height;
+	f32 ScaleX = 1.0f, ScaleY = 1.0f;
+	void updateSizeAndScale();
+
+	bool Resizable;
+
+	static u32 getFullscreenFlag(bool fullscreen);
+
+	core::rect<s32> lastElemPos;
+
+	struct SKeyMap
+	{
+		SKeyMap() {}
+		SKeyMap(s32 x11, s32 win32) :
+				SDLKey(x11), Win32Key(win32)
+		{
+		}
+
+		s32 SDLKey;
+		s32 Win32Key;
+
+		bool operator<(const SKeyMap &o) const
+		{
+			return SDLKey < o.SDLKey;
+		}
+	};
+
+	core::array<SKeyMap> KeyMap;
+	SDL_SysWMinfo Info;
+
+	s32 CurrentTouchCount;
+	bool IsInBackground;
+};
+
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_SDL_DEVICE_
diff --git a/irr/src/CIrrDeviceStub.cpp b/irr/src/CIrrDeviceStub.cpp
new file mode 100644
index 000000000..1ff120d10
--- /dev/null
+++ b/irr/src/CIrrDeviceStub.cpp
@@ -0,0 +1,346 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CIrrDeviceStub.h"
+#include "ISceneManager.h"
+#include "IEventReceiver.h"
+#include "IFileSystem.h"
+#include "IGUIElement.h"
+#include "IGUIEnvironment.h"
+#include "os.h"
+#include "CTimer.h"
+#include "CLogger.h"
+#include "irrString.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_SDK_VERSION
+
+namespace irr
+{
+//! constructor
+CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters &params) :
+		IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0),
+		Timer(0), CursorControl(0), UserReceiver(params.EventReceiver),
+		Logger(0), Operator(0), FileSystem(0),
+		InputReceivingSceneManager(0), ContextManager(0),
+		CreationParams(params), Close(false)
+{
+	Timer = new CTimer();
+	if (os::Printer::Logger) {
+		os::Printer::Logger->grab();
+		Logger = (CLogger *)os::Printer::Logger;
+		Logger->setReceiver(UserReceiver);
+	} else {
+		Logger = new CLogger(UserReceiver);
+		os::Printer::Logger = Logger;
+	}
+	Logger->setLogLevel(CreationParams.LoggingLevel);
+
+	os::Printer::Logger = Logger;
+
+	FileSystem = io::createFileSystem();
+}
+
+CIrrDeviceStub::~CIrrDeviceStub()
+{
+	if (GUIEnvironment)
+		GUIEnvironment->drop();
+
+	if (SceneManager)
+		SceneManager->drop();
+
+	if (VideoDriver)
+		VideoDriver->drop();
+
+	if (ContextManager)
+		ContextManager->drop();
+
+	if (FileSystem)
+		FileSystem->drop();
+
+	if (InputReceivingSceneManager)
+		InputReceivingSceneManager->drop();
+
+	if (CursorControl)
+		CursorControl->drop();
+
+	if (Operator)
+		Operator->drop();
+
+	CursorControl = 0;
+
+	if (Timer)
+		Timer->drop();
+
+	if (Logger->drop())
+		os::Printer::Logger = 0;
+}
+
+void CIrrDeviceStub::createGUIAndScene()
+{
+	// create gui environment
+	GUIEnvironment = gui::createGUIEnvironment(FileSystem, VideoDriver, Operator);
+
+	// create Scene manager
+	SceneManager = scene::createSceneManager(VideoDriver, CursorControl);
+
+	setEventReceiver(UserReceiver);
+}
+
+//! returns the video driver
+video::IVideoDriver *CIrrDeviceStub::getVideoDriver()
+{
+	return VideoDriver;
+}
+
+//! return file system
+io::IFileSystem *CIrrDeviceStub::getFileSystem()
+{
+	return FileSystem;
+}
+
+//! returns the gui environment
+gui::IGUIEnvironment *CIrrDeviceStub::getGUIEnvironment()
+{
+	return GUIEnvironment;
+}
+
+//! returns the scene manager
+scene::ISceneManager *CIrrDeviceStub::getSceneManager()
+{
+	return SceneManager;
+}
+
+//! \return Returns a pointer to the ITimer object. With it the
+//! current Time can be received.
+ITimer *CIrrDeviceStub::getTimer()
+{
+	return Timer;
+}
+
+//! Sets the window icon.
+bool CIrrDeviceStub::setWindowIcon(const video::IImage *img)
+{
+	return false;
+}
+
+//! \return Returns a pointer to the mouse cursor control interface.
+gui::ICursorControl *CIrrDeviceStub::getCursorControl()
+{
+	return CursorControl;
+}
+
+//! return the context manager
+video::IContextManager *CIrrDeviceStub::getContextManager()
+{
+	return ContextManager;
+}
+
+//! Compares to the last call of this function to return double and triple clicks.
+u32 CIrrDeviceStub::checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent)
+{
+	const s32 MAX_MOUSEMOVE = 3;
+
+	irr::u32 clickTime = getTimer()->getRealTime();
+
+	if ((clickTime - MouseMultiClicks.LastClickTime) < MouseMultiClicks.DoubleClickTime && core::abs_(MouseMultiClicks.LastClick.X - mouseX) <= MAX_MOUSEMOVE && core::abs_(MouseMultiClicks.LastClick.Y - mouseY) <= MAX_MOUSEMOVE && MouseMultiClicks.CountSuccessiveClicks < 3 && MouseMultiClicks.LastMouseInputEvent == inputEvent) {
+		++MouseMultiClicks.CountSuccessiveClicks;
+	} else {
+		MouseMultiClicks.CountSuccessiveClicks = 1;
+	}
+
+	MouseMultiClicks.LastMouseInputEvent = inputEvent;
+	MouseMultiClicks.LastClickTime = clickTime;
+	MouseMultiClicks.LastClick.X = mouseX;
+	MouseMultiClicks.LastClick.Y = mouseY;
+
+	return MouseMultiClicks.CountSuccessiveClicks;
+}
+
+//! send the event to the right receiver
+bool CIrrDeviceStub::postEventFromUser(const SEvent &event)
+{
+	bool absorbed = false;
+
+	if (UserReceiver)
+		absorbed = UserReceiver->OnEvent(event);
+
+	if (!absorbed && GUIEnvironment)
+		absorbed = GUIEnvironment->postEventFromUser(event);
+
+	scene::ISceneManager *inputReceiver = InputReceivingSceneManager;
+	if (!inputReceiver)
+		inputReceiver = SceneManager;
+
+	if (!absorbed && inputReceiver)
+		absorbed = inputReceiver->postEventFromUser(event);
+
+	return absorbed;
+}
+
+//! Sets a new event receiver to receive events
+void CIrrDeviceStub::setEventReceiver(IEventReceiver *receiver)
+{
+	UserReceiver = receiver;
+	Logger->setReceiver(receiver);
+	if (GUIEnvironment)
+		GUIEnvironment->setUserEventReceiver(receiver);
+}
+
+//! Returns poinhter to the current event receiver. Returns 0 if there is none.
+IEventReceiver *CIrrDeviceStub::getEventReceiver()
+{
+	return UserReceiver;
+}
+
+//! \return Returns a pointer to the logger.
+ILogger *CIrrDeviceStub::getLogger()
+{
+	return Logger;
+}
+
+//! Returns the operation system opertator object.
+IOSOperator *CIrrDeviceStub::getOSOperator()
+{
+	return Operator;
+}
+
+//! Sets the input receiving scene manager.
+void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager *sceneManager)
+{
+	if (sceneManager)
+		sceneManager->grab();
+	if (InputReceivingSceneManager)
+		InputReceivingSceneManager->drop();
+
+	InputReceivingSceneManager = sceneManager;
+}
+
+//! Checks if the window is maximized.
+bool CIrrDeviceStub::isWindowMaximized() const
+{
+	return false;
+}
+
+//! Checks if the window is running in fullscreen mode
+bool CIrrDeviceStub::isFullscreen() const
+{
+	return CreationParams.Fullscreen;
+}
+
+//! returns color format
+video::ECOLOR_FORMAT CIrrDeviceStub::getColorFormat() const
+{
+	return video::ECF_R5G6B5;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::activateAccelerometer(float updateInterval)
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::deactivateAccelerometer()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isAccelerometerActive()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isAccelerometerAvailable()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::activateGyroscope(float updateInterval)
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::deactivateGyroscope()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isGyroscopeActive()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isGyroscopeAvailable()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::activateDeviceMotion(float updateInterval)
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::deactivateDeviceMotion()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isDeviceMotionActive()
+{
+	return false;
+}
+
+//! No-op in this implementation
+bool CIrrDeviceStub::isDeviceMotionAvailable()
+{
+	return false;
+}
+
+//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior.
+void CIrrDeviceStub::setDoubleClickTime(u32 timeMs)
+{
+	MouseMultiClicks.DoubleClickTime = timeMs;
+}
+
+//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
+u32 CIrrDeviceStub::getDoubleClickTime() const
+{
+	return MouseMultiClicks.DoubleClickTime;
+}
+
+//! Remove all messages pending in the system message loop
+void CIrrDeviceStub::clearSystemMessages()
+{
+}
+
+//! Get the display density in dots per inch.
+float CIrrDeviceStub::getDisplayDensity() const
+{
+	return 0.0f;
+}
+
+//! Checks whether the input device should take input from the IME
+bool CIrrDeviceStub::acceptsIME()
+{
+	if (!GUIEnvironment)
+		return false;
+	gui::IGUIElement *elem = GUIEnvironment->getFocus();
+	return elem && elem->acceptsIME();
+}
+
+} // end namespace irr
diff --git a/irr/src/CIrrDeviceStub.h b/irr/src/CIrrDeviceStub.h
new file mode 100644
index 000000000..9a1966f01
--- /dev/null
+++ b/irr/src/CIrrDeviceStub.h
@@ -0,0 +1,198 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IrrlichtDevice.h"
+#include "SIrrCreationParameters.h"
+#include "IContextManager.h"
+
+namespace irr
+{
+// lots of prototypes:
+class ILogger;
+class CLogger;
+
+namespace gui
+{
+class IGUIEnvironment;
+IGUIEnvironment *createGUIEnvironment(io::IFileSystem *fs,
+		video::IVideoDriver *Driver, IOSOperator *op);
+}
+
+namespace scene
+{
+ISceneManager *createSceneManager(video::IVideoDriver *driver, gui::ICursorControl *cc);
+}
+
+namespace io
+{
+IFileSystem *createFileSystem();
+}
+
+namespace video
+{
+IVideoDriver *createNullDriver(io::IFileSystem *io, const core::dimension2d<u32> &screenSize);
+}
+
+//! Stub for an Irrlicht Device implementation
+class CIrrDeviceStub : public IrrlichtDevice
+{
+public:
+	//! constructor
+	CIrrDeviceStub(const SIrrlichtCreationParameters &param);
+
+	//! destructor
+	virtual ~CIrrDeviceStub();
+
+	//! returns the video driver
+	video::IVideoDriver *getVideoDriver() override;
+
+	//! return file system
+	io::IFileSystem *getFileSystem() override;
+
+	//! returns the gui environment
+	gui::IGUIEnvironment *getGUIEnvironment() override;
+
+	//! returns the scene manager
+	scene::ISceneManager *getSceneManager() override;
+
+	//! \return Returns a pointer to the mouse cursor control interface.
+	gui::ICursorControl *getCursorControl() override;
+
+	//! return the context manager
+	video::IContextManager *getContextManager() override;
+
+	//! Returns a pointer to the ITimer object. With it the current Time can be received.
+	ITimer *getTimer() override;
+
+	//! Sets the window icon.
+	bool setWindowIcon(const video::IImage *img) override;
+
+	//! send the event to the right receiver
+	bool postEventFromUser(const SEvent &event) override;
+
+	//! Sets a new event receiver to receive events
+	void setEventReceiver(IEventReceiver *receiver) override;
+
+	//! Returns pointer to the current event receiver. Returns 0 if there is none.
+	IEventReceiver *getEventReceiver() override;
+
+	//! Sets the input receiving scene manager.
+	/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
+	void setInputReceivingSceneManager(scene::ISceneManager *sceneManager) override;
+
+	//! Returns a pointer to the logger.
+	ILogger *getLogger() override;
+
+	//! Returns the operation system opertator object.
+	IOSOperator *getOSOperator() override;
+
+	//! Checks if the window is maximized.
+	bool isWindowMaximized() const override;
+
+	//! Checks if the window is running in fullscreen mode.
+	bool isFullscreen() const override;
+
+	//! get color format of the current window
+	video::ECOLOR_FORMAT getColorFormat() const override;
+
+	//! Activate any joysticks, and generate events for them.
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) override;
+
+	//! Activate accelerometer.
+	bool activateAccelerometer(float updateInterval = 0.016666f) override;
+
+	//! Deactivate accelerometer.
+	bool deactivateAccelerometer() override;
+
+	//! Is accelerometer active.
+	bool isAccelerometerActive() override;
+
+	//! Is accelerometer available.
+	bool isAccelerometerAvailable() override;
+
+	//! Activate gyroscope.
+	bool activateGyroscope(float updateInterval = 0.016666f) override;
+
+	//! Deactivate gyroscope.
+	bool deactivateGyroscope() override;
+
+	//! Is gyroscope active.
+	bool isGyroscopeActive() override;
+
+	//! Is gyroscope available.
+	bool isGyroscopeAvailable() override;
+
+	//! Activate device motion.
+	bool activateDeviceMotion(float updateInterval = 0.016666f) override;
+
+	//! Deactivate device motion.
+	bool deactivateDeviceMotion() override;
+
+	//! Is device motion active.
+	bool isDeviceMotionActive() override;
+
+	//! Is device motion available.
+	bool isDeviceMotionAvailable() override;
+
+	//! Set the maximal elapsed time between 2 clicks to generate doubleclicks for the mouse. It also affects tripleclick behavior.
+	//! When set to 0 no double- and tripleclicks will be generated.
+	void setDoubleClickTime(u32 timeMs) override;
+
+	//! Get the maximal elapsed time between 2 clicks to generate double- and tripleclicks for the mouse.
+	u32 getDoubleClickTime() const override;
+
+	//! Remove all messages pending in the system message loop
+	void clearSystemMessages() override;
+
+	//! Get the display density in dots per inch.
+	float getDisplayDensity() const override;
+
+	//! Resize the render window.
+	void setWindowSize(const irr::core::dimension2d<u32> &size) override {}
+
+protected:
+	void createGUIAndScene();
+
+	//! Compares to the last call of this function to return double and triple clicks.
+	/** Needed for win32 device event handling
+	\return Returns only 1,2 or 3. A 4th click will start with 1 again.
+	*/
+	virtual u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent);
+
+	//! Checks whether the input device should take input from the IME
+	bool acceptsIME();
+
+	video::IVideoDriver *VideoDriver;
+	gui::IGUIEnvironment *GUIEnvironment;
+	scene::ISceneManager *SceneManager;
+	ITimer *Timer;
+	gui::ICursorControl *CursorControl;
+	IEventReceiver *UserReceiver;
+	CLogger *Logger;
+	IOSOperator *Operator;
+	io::IFileSystem *FileSystem;
+	scene::ISceneManager *InputReceivingSceneManager;
+
+	struct SMouseMultiClicks
+	{
+		SMouseMultiClicks() :
+				DoubleClickTime(500), CountSuccessiveClicks(0), LastClickTime(0), LastMouseInputEvent(EMIE_COUNT)
+		{
+		}
+
+		u32 DoubleClickTime;
+		u32 CountSuccessiveClicks;
+		u32 LastClickTime;
+		core::position2di LastClick;
+		EMOUSE_INPUT_EVENT LastMouseInputEvent;
+	};
+	SMouseMultiClicks MouseMultiClicks;
+	video::IContextManager *ContextManager;
+	SIrrlichtCreationParameters CreationParams;
+	bool Close;
+};
+
+} // end namespace irr
diff --git a/irr/src/CIrrDeviceWin32.cpp b/irr/src/CIrrDeviceWin32.cpp
new file mode 100644
index 000000000..c2876fcce
--- /dev/null
+++ b/irr/src/CIrrDeviceWin32.cpp
@@ -0,0 +1,1474 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
+
+#if defined(__STRICT_ANSI__)
+#error Compiling with __STRICT_ANSI__ not supported. g++ does set this when compiling with -std=c++11 or -std=c++0x. Use instead -std=gnu++11 or -std=gnu++0x. Or use -U__STRICT_ANSI__ to disable strict ansi.
+#endif
+
+#include "CIrrDeviceWin32.h"
+#include "IEventReceiver.h"
+#include "os.h"
+
+#include "CTimer.h"
+#include "irrString.h"
+#include "COSOperator.h"
+#include "dimension2d.h"
+#include "IGUISpriteBank.h"
+#include <winuser.h>
+#include "SExposedVideoData.h"
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+#include <mmsystem.h>
+#include <regstr.h>
+#ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#endif
+#endif
+
+#if defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
+#include "CEGLManager.h"
+#endif
+
+#if defined(_IRR_COMPILE_WITH_OPENGL_)
+#include "CWGLManager.h"
+#endif
+
+namespace irr
+{
+namespace video
+{
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+IVideoDriver *createOpenGLDriver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+IVideoDriver *createOGLES1Driver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+IVideoDriver *createOGLES2Driver(const irr::SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+#endif
+}
+} // end namespace irr
+
+namespace irr
+{
+struct SJoystickWin32Control
+{
+	CIrrDeviceWin32 *Device;
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
+	IDirectInput8 *DirectInputDevice;
+#endif
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+	struct JoystickInfo
+	{
+		u32 Index;
+#ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
+		core::stringc Name;
+		GUID guid;
+		LPDIRECTINPUTDEVICE8 lpdijoy;
+		DIDEVCAPS devcaps;
+		u8 axisValid[8];
+#else
+		JOYCAPS Caps;
+#endif
+	};
+	core::array<JoystickInfo> ActiveJoysticks;
+#endif
+
+	SJoystickWin32Control(CIrrDeviceWin32 *dev);
+	~SJoystickWin32Control();
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
+	static BOOL CALLBACK EnumJoysticks(LPCDIDEVICEINSTANCE lpddi, LPVOID cp);
+	void directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi);
+#endif
+
+	void pollJoysticks();
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo);
+	irr::core::stringc findJoystickName(int index, const JOYCAPS &caps) const;
+};
+
+SJoystickWin32Control::SJoystickWin32Control(CIrrDeviceWin32 *dev) :
+		Device(dev)
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
+	DirectInputDevice = 0;
+	if (DI_OK != (DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&DirectInputDevice, NULL))) {
+		os::Printer::log("Could not create DirectInput8 Object", ELL_WARNING);
+		return;
+	}
+#endif
+}
+
+SJoystickWin32Control::~SJoystickWin32Control()
+{
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
+	for (u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		LPDIRECTINPUTDEVICE8 dev = ActiveJoysticks[joystick].lpdijoy;
+		if (dev) {
+			dev->Unacquire();
+			dev->Release();
+		}
+	}
+
+	if (DirectInputDevice)
+		DirectInputDevice->Release();
+#endif
+}
+
+#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) && defined(_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_)
+BOOL CALLBACK SJoystickWin32Control::EnumJoysticks(LPCDIDEVICEINSTANCE lpddi, LPVOID cp)
+{
+	SJoystickWin32Control *p = (SJoystickWin32Control *)cp;
+	p->directInputAddJoystick(lpddi);
+	return DIENUM_CONTINUE;
+}
+void SJoystickWin32Control::directInputAddJoystick(LPCDIDEVICEINSTANCE lpddi)
+{
+	// Get the GUID of the joystuck
+	const GUID guid = lpddi->guidInstance;
+
+	JoystickInfo activeJoystick;
+	activeJoystick.Index = ActiveJoysticks.size();
+	activeJoystick.guid = guid;
+	activeJoystick.Name = lpddi->tszProductName;
+	if (FAILED(DirectInputDevice->CreateDevice(guid, &activeJoystick.lpdijoy, NULL))) {
+		os::Printer::log("Could not create DirectInput device", ELL_WARNING);
+		return;
+	}
+
+	activeJoystick.devcaps.dwSize = sizeof(activeJoystick.devcaps);
+	if (FAILED(activeJoystick.lpdijoy->GetCapabilities(&activeJoystick.devcaps))) {
+		os::Printer::log("Could not create DirectInput device", ELL_WARNING);
+		return;
+	}
+
+	if (FAILED(activeJoystick.lpdijoy->SetCooperativeLevel(Device->HWnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE))) {
+		os::Printer::log("Could not set DirectInput device cooperative level", ELL_WARNING);
+		return;
+	}
+
+	if (FAILED(activeJoystick.lpdijoy->SetDataFormat(&c_dfDIJoystick2))) {
+		os::Printer::log("Could not set DirectInput device data format", ELL_WARNING);
+		return;
+	}
+
+	if (FAILED(activeJoystick.lpdijoy->Acquire())) {
+		os::Printer::log("Could not set DirectInput cooperative level", ELL_WARNING);
+		return;
+	}
+
+	DIJOYSTATE2 info;
+	if (FAILED(activeJoystick.lpdijoy->GetDeviceState(sizeof(info), &info))) {
+		os::Printer::log("Could not read DirectInput device state", ELL_WARNING);
+		return;
+	}
+
+	ZeroMemory(activeJoystick.axisValid, sizeof(activeJoystick.axisValid));
+	activeJoystick.axisValid[0] = (info.lX != 0) ? 1 : 0;
+	activeJoystick.axisValid[1] = (info.lY != 0) ? 1 : 0;
+	activeJoystick.axisValid[2] = (info.lZ != 0) ? 1 : 0;
+	activeJoystick.axisValid[3] = (info.lRx != 0) ? 1 : 0;
+	activeJoystick.axisValid[4] = (info.lRy != 0) ? 1 : 0;
+	activeJoystick.axisValid[5] = (info.lRz != 0) ? 1 : 0;
+
+	int caxis = 0;
+	for (u8 i = 0; i < 6; i++) {
+		if (activeJoystick.axisValid[i])
+			caxis++;
+	}
+
+	for (u8 i = 0; i < (activeJoystick.devcaps.dwAxes) - caxis; i++) {
+		if (i + caxis < 8)
+			activeJoystick.axisValid[i + caxis] = 1;
+	}
+
+	ActiveJoysticks.push_back(activeJoystick);
+}
+#endif
+
+void SJoystickWin32Control::pollJoysticks()
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
+	if (0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	DIJOYSTATE2 info;
+
+	for (joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		// needs to be reset for each joystick
+		// request ALL values and POV as continuous if possible
+
+		const DIDEVCAPS &caps = ActiveJoysticks[joystick].devcaps;
+		// if no POV is available don't ask for POV values
+
+		if (!FAILED(ActiveJoysticks[joystick].lpdijoy->GetDeviceState(sizeof(info), &info))) {
+			SEvent event;
+
+			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+			event.JoystickEvent.Joystick = (u8)joystick;
+
+			event.JoystickEvent.POV = (u16)info.rgdwPOV[0];
+			// set to undefined if no POV value was returned or the value
+			// is out of range
+			if ((caps.dwPOVs == 0) || (event.JoystickEvent.POV > 35900))
+				event.JoystickEvent.POV = 65535;
+
+			for (int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+				event.JoystickEvent.Axis[axis] = 0;
+
+			u16 dxAxis = 0;
+			u16 irrAxis = 0;
+
+			while (dxAxis < 6 && irrAxis < caps.dwAxes) {
+				bool axisFound = 0;
+				s32 axisValue = 0;
+
+				switch (dxAxis) {
+				case 0:
+					axisValue = info.lX;
+					break;
+				case 1:
+					axisValue = info.lY;
+					break;
+				case 2:
+					axisValue = info.lZ;
+					break;
+				case 3:
+					axisValue = info.lRx;
+					break;
+				case 4:
+					axisValue = info.lRy;
+					break;
+				case 5:
+					axisValue = info.lRz;
+					break;
+				case 6:
+					axisValue = info.rglSlider[0];
+					break;
+				case 7:
+					axisValue = info.rglSlider[1];
+					break;
+				default:
+					break;
+				}
+
+				if (ActiveJoysticks[joystick].axisValid[dxAxis] > 0)
+					axisFound = 1;
+
+				if (axisFound) {
+					s32 val = axisValue - 32768;
+
+					if (val < -32767)
+						val = -32767;
+					if (val > 32767)
+						val = 32767;
+					event.JoystickEvent.Axis[irrAxis] = (s16)(val);
+					irrAxis++;
+				}
+
+				dxAxis++;
+			}
+
+			u32 buttons = 0;
+			BYTE *bytebuttons = info.rgbButtons;
+			for (u16 i = 0; i < 32; i++) {
+				if (bytebuttons[i] > 0) {
+					buttons |= (1 << i);
+				}
+			}
+			event.JoystickEvent.ButtonStates = buttons;
+
+			(void)Device->postEventFromUser(event);
+		}
+	}
+#else
+	if (0 == ActiveJoysticks.size())
+		return;
+
+	u32 joystick;
+	JOYINFOEX info;
+
+	for (joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		// needs to be reset for each joystick
+		// request ALL values and POV as continuous if possible
+		info.dwSize = sizeof(info);
+		info.dwFlags = JOY_RETURNALL | JOY_RETURNPOVCTS;
+		const JOYCAPS &caps = ActiveJoysticks[joystick].Caps;
+		// if no POV is available don't ask for POV values
+		if (!(caps.wCaps & JOYCAPS_HASPOV))
+			info.dwFlags &= ~(JOY_RETURNPOV | JOY_RETURNPOVCTS);
+		if (JOYERR_NOERROR == joyGetPosEx(ActiveJoysticks[joystick].Index, &info)) {
+			SEvent event;
+
+			event.EventType = irr::EET_JOYSTICK_INPUT_EVENT;
+			event.JoystickEvent.Joystick = (u8)joystick;
+
+			event.JoystickEvent.POV = (u16)info.dwPOV;
+			// set to undefined if no POV value was returned or the value
+			// is out of range
+			if (!(info.dwFlags & JOY_RETURNPOV) || (event.JoystickEvent.POV > 35900))
+				event.JoystickEvent.POV = 65535;
+
+			for (int axis = 0; axis < SEvent::SJoystickEvent::NUMBER_OF_AXES; ++axis)
+				event.JoystickEvent.Axis[axis] = 0;
+
+			event.JoystickEvent.ButtonStates = info.dwButtons;
+
+			switch (caps.wNumAxes) {
+			default:
+			case 6:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_V] =
+						(s16)((65535 * (info.dwVpos - caps.wVmin)) / (caps.wVmax - caps.wVmin) - 32768);
+
+			case 5:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_U] =
+						(s16)((65535 * (info.dwUpos - caps.wUmin)) / (caps.wUmax - caps.wUmin) - 32768);
+
+			case 4:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_R] =
+						(s16)((65535 * (info.dwRpos - caps.wRmin)) / (caps.wRmax - caps.wRmin) - 32768);
+
+			case 3:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Z] =
+						(s16)((65535 * (info.dwZpos - caps.wZmin)) / (caps.wZmax - caps.wZmin) - 32768);
+
+			case 2:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_Y] =
+						(s16)((65535 * (info.dwYpos - caps.wYmin)) / (caps.wYmax - caps.wYmin) - 32768);
+
+			case 1:
+				event.JoystickEvent.Axis[SEvent::SJoystickEvent::AXIS_X] =
+						(s16)((65535 * (info.dwXpos - caps.wXmin)) / (caps.wXmax - caps.wXmin) - 32768);
+			}
+
+			(void)Device->postEventFromUser(event);
+		}
+	}
+#endif
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+
+/** This function is ported from SDL and released under zlib-license:
+ * Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org> */
+irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYCAPS &caps) const
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+
+	// As a default use the name given in the joystick structure.
+	// It is always the same name, independent of joystick.
+	irr::core::stringc result(caps.szPname);
+
+	core::stringc key = core::stringc(REGSTR_PATH_JOYCONFIG) + "\\" + caps.szRegKey + "\\" + REGSTR_KEY_JOYCURR;
+	HKEY hTopKey = HKEY_LOCAL_MACHINE;
+	HKEY hKey;
+	long regresult = RegOpenKeyExA(hTopKey, key.c_str(), 0, KEY_READ, &hKey);
+	if (regresult != ERROR_SUCCESS) {
+		hTopKey = HKEY_CURRENT_USER;
+		regresult = RegOpenKeyExA(hTopKey, key.c_str(), 0, KEY_READ, &hKey);
+	}
+	if (regresult != ERROR_SUCCESS)
+		return result;
+
+	/* find the registry key name for the joystick's properties */
+	char regname[256];
+	DWORD regsize = sizeof(regname);
+	core::stringc regvalue = core::stringc("Joystick") + core::stringc(index + 1) + REGSTR_VAL_JOYOEMNAME;
+	regresult = RegQueryValueExA(hKey, regvalue.c_str(), 0, 0, (LPBYTE)regname, &regsize);
+	RegCloseKey(hKey);
+	if (regresult != ERROR_SUCCESS)
+		return result;
+
+	/* open that registry key */
+	core::stringc regkey = core::stringc(REGSTR_PATH_JOYOEM) + "\\" + regname;
+	regresult = RegOpenKeyExA(hTopKey, regkey.c_str(), 0, KEY_READ, &hKey);
+	if (regresult != ERROR_SUCCESS)
+		return result;
+
+	/* find the size for the OEM name text */
+	regsize = sizeof(regvalue);
+	regresult = RegQueryValueEx(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0,
+			NULL, &regsize);
+	if (regresult == ERROR_SUCCESS) {
+		char *name;
+		/* allocate enough memory for the OEM name text ... */
+		name = new char[regsize];
+		if (name) {
+			/* ... and read it from the registry */
+			regresult = RegQueryValueEx(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0,
+					(LPBYTE)name, &regsize);
+			result = name;
+		}
+		delete[] name;
+	}
+	RegCloseKey(hKey);
+
+	return result;
+#endif
+	return "";
+}
+
+bool SJoystickWin32Control::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+#if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+	joystickInfo.clear();
+	ActiveJoysticks.clear();
+#ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
+	if (!DirectInputDevice || (DirectInputDevice->EnumDevices(DI8DEVCLASS_GAMECTRL, SJoystickWin32Control::EnumJoysticks, this, DIEDFL_ATTACHEDONLY))) {
+		os::Printer::log("Could not enum DirectInput8 controllers", ELL_WARNING);
+		return false;
+	}
+
+	for (u32 joystick = 0; joystick < ActiveJoysticks.size(); ++joystick) {
+		JoystickInfo &activeJoystick = ActiveJoysticks[joystick];
+		SJoystickInfo info;
+		info.Axes = activeJoystick.devcaps.dwAxes;
+		info.Buttons = activeJoystick.devcaps.dwButtons;
+		info.Name = activeJoystick.Name;
+		info.PovHat = (activeJoystick.devcaps.dwPOVs != 0)
+							  ? SJoystickInfo::POV_HAT_PRESENT
+							  : SJoystickInfo::POV_HAT_ABSENT;
+		joystickInfo.push_back(info);
+	}
+	return true;
+#else
+	const u32 numberOfJoysticks = ::joyGetNumDevs();
+	JOYINFOEX info;
+	info.dwSize = sizeof(info);
+	info.dwFlags = JOY_RETURNALL;
+
+	JoystickInfo activeJoystick;
+	SJoystickInfo returnInfo;
+
+	joystickInfo.reallocate(numberOfJoysticks);
+	ActiveJoysticks.reallocate(numberOfJoysticks);
+
+	u32 joystick = 0;
+	for (; joystick < numberOfJoysticks; ++joystick) {
+		if (JOYERR_NOERROR == joyGetPosEx(joystick, &info) &&
+				JOYERR_NOERROR == joyGetDevCaps(joystick,
+										  &activeJoystick.Caps,
+										  sizeof(activeJoystick.Caps))) {
+			activeJoystick.Index = joystick;
+			ActiveJoysticks.push_back(activeJoystick);
+
+			returnInfo.Joystick = (u8)joystick;
+			returnInfo.Axes = activeJoystick.Caps.wNumAxes;
+			returnInfo.Buttons = activeJoystick.Caps.wNumButtons;
+			returnInfo.Name = findJoystickName(joystick, activeJoystick.Caps);
+			returnInfo.PovHat = ((activeJoystick.Caps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV)
+										? SJoystickInfo::POV_HAT_PRESENT
+										: SJoystickInfo::POV_HAT_ABSENT;
+
+			joystickInfo.push_back(returnInfo);
+		}
+	}
+
+	for (joystick = 0; joystick < joystickInfo.size(); ++joystick) {
+		char logString[256];
+		snprintf_irr(logString, sizeof(logString), "Found joystick %d, %d axes, %d buttons '%s'",
+				joystick, joystickInfo[joystick].Axes,
+				joystickInfo[joystick].Buttons, joystickInfo[joystick].Name.c_str());
+		os::Printer::log(logString, ELL_INFORMATION);
+	}
+
+	return true;
+#endif
+#else
+	return false;
+#endif // _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+}
+} // end namespace irr
+
+namespace
+{
+struct SEnvMapper
+{
+	HWND hWnd;
+	irr::CIrrDeviceWin32 *irrDev;
+};
+// NOTE: This is global. We can have more than one Irrlicht Device at same time.
+irr::core::array<SEnvMapper> EnvMap;
+
+HKL KEYBOARD_INPUT_HKL = 0;
+}
+
+irr::CIrrDeviceWin32 *getDeviceFromHWnd(HWND hWnd)
+{
+	const irr::u32 end = EnvMap.size();
+	for (irr::u32 i = 0; i < end; ++i) {
+		const SEnvMapper &env = EnvMap[i];
+		if (env.hWnd == hWnd)
+			return env.irrDev;
+	}
+
+	return 0;
+}
+
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+#ifndef WHEEL_DELTA
+#define WHEEL_DELTA 120
+#endif
+
+	irr::CIrrDeviceWin32 *dev = 0;
+	irr::SEvent event;
+
+	static irr::s32 ClickCount = 0;
+	if (GetCapture() != hWnd && ClickCount > 0)
+		ClickCount = 0;
+
+	struct messageMap
+	{
+		irr::s32 group;
+		UINT winMessage;
+		irr::s32 irrMessage;
+	};
+
+	static messageMap mouseMap[] = {
+			{0, WM_LBUTTONDOWN, irr::EMIE_LMOUSE_PRESSED_DOWN},
+			{1, WM_LBUTTONUP, irr::EMIE_LMOUSE_LEFT_UP},
+			{0, WM_RBUTTONDOWN, irr::EMIE_RMOUSE_PRESSED_DOWN},
+			{1, WM_RBUTTONUP, irr::EMIE_RMOUSE_LEFT_UP},
+			{0, WM_MBUTTONDOWN, irr::EMIE_MMOUSE_PRESSED_DOWN},
+			{1, WM_MBUTTONUP, irr::EMIE_MMOUSE_LEFT_UP},
+			{2, WM_MOUSEMOVE, irr::EMIE_MOUSE_MOVED},
+			{3, WM_MOUSEWHEEL, irr::EMIE_MOUSE_WHEEL},
+			{-1, 0, 0},
+		};
+
+	// handle grouped events
+	messageMap *m = mouseMap;
+	while (m->group >= 0 && m->winMessage != message)
+		m += 1;
+
+	if (m->group >= 0) {
+		if (m->group == 0) { // down
+			ClickCount++;
+			SetCapture(hWnd);
+		} else if (m->group == 1) { // up
+			ClickCount--;
+			if (ClickCount < 1) {
+				ClickCount = 0;
+				ReleaseCapture();
+			}
+		}
+
+		event.EventType = irr::EET_MOUSE_INPUT_EVENT;
+		event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)m->irrMessage;
+		event.MouseInput.X = (short)LOWORD(lParam);
+		event.MouseInput.Y = (short)HIWORD(lParam);
+		event.MouseInput.Shift = ((LOWORD(wParam) & MK_SHIFT) != 0);
+		event.MouseInput.Control = ((LOWORD(wParam) & MK_CONTROL) != 0);
+		// left and right mouse buttons
+		event.MouseInput.ButtonStates = wParam & (MK_LBUTTON | MK_RBUTTON);
+		// middle and extra buttons
+		if (wParam & MK_MBUTTON)
+			event.MouseInput.ButtonStates |= irr::EMBSM_MIDDLE;
+		if (wParam & MK_XBUTTON1)
+			event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA1;
+		if (wParam & MK_XBUTTON2)
+			event.MouseInput.ButtonStates |= irr::EMBSM_EXTRA2;
+		event.MouseInput.Wheel = 0.f;
+
+		// wheel
+		if (m->group == 3) {
+			POINT p; // fixed by jox
+			p.x = 0;
+			p.y = 0;
+			ClientToScreen(hWnd, &p);
+			event.MouseInput.X -= p.x;
+			event.MouseInput.Y -= p.y;
+			event.MouseInput.Wheel = ((irr::f32)((short)HIWORD(wParam))) / (irr::f32)WHEEL_DELTA;
+		}
+
+		dev = getDeviceFromHWnd(hWnd);
+		if (dev) {
+			dev->postEventFromUser(event);
+
+			if (event.MouseInput.Event >= irr::EMIE_LMOUSE_PRESSED_DOWN && event.MouseInput.Event <= irr::EMIE_MMOUSE_PRESSED_DOWN) {
+				irr::u32 clicks = dev->checkSuccessiveClicks(event.MouseInput.X, event.MouseInput.Y, event.MouseInput.Event);
+				if (clicks == 2) {
+					event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_DOUBLE_CLICK + event.MouseInput.Event - irr::EMIE_LMOUSE_PRESSED_DOWN);
+					dev->postEventFromUser(event);
+				} else if (clicks == 3) {
+					event.MouseInput.Event = (irr::EMOUSE_INPUT_EVENT)(irr::EMIE_LMOUSE_TRIPLE_CLICK + event.MouseInput.Event - irr::EMIE_LMOUSE_PRESSED_DOWN);
+					dev->postEventFromUser(event);
+				}
+			}
+		}
+		return 0;
+	}
+
+	switch (message) {
+	case WM_PAINT: {
+		PAINTSTRUCT ps;
+		BeginPaint(hWnd, &ps);
+		EndPaint(hWnd, &ps);
+	}
+		return 0;
+
+	case WM_ERASEBKGND:
+		return 0;
+
+	case WM_SYSKEYDOWN:
+	case WM_SYSKEYUP:
+	case WM_KEYDOWN:
+	case WM_KEYUP: {
+		BYTE allKeys[256];
+
+		event.EventType = irr::EET_KEY_INPUT_EVENT;
+		event.KeyInput.Key = (irr::EKEY_CODE)wParam;
+		event.KeyInput.PressedDown = (message == WM_KEYDOWN || message == WM_SYSKEYDOWN);
+
+		if (event.KeyInput.Key == irr::KEY_SHIFT) {
+			event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey(((lParam >> 16) & 255), MAPVK_VSC_TO_VK_EX);
+		}
+		if (event.KeyInput.Key == irr::KEY_CONTROL) {
+			event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey(((lParam >> 16) & 255), MAPVK_VSC_TO_VK_EX);
+			// some keyboards will just return LEFT for both - left and right keys. So also check extend bit.
+			if (lParam & 0x1000000)
+				event.KeyInput.Key = irr::KEY_RCONTROL;
+		}
+		if (event.KeyInput.Key == irr::KEY_MENU) {
+			event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey(((lParam >> 16) & 255), MAPVK_VSC_TO_VK_EX);
+			if (lParam & 0x1000000)
+				event.KeyInput.Key = irr::KEY_RMENU;
+		}
+
+		GetKeyboardState(allKeys);
+
+		event.KeyInput.Shift = ((allKeys[VK_SHIFT] & 0x80) != 0);
+		event.KeyInput.Control = ((allKeys[VK_CONTROL] & 0x80) != 0);
+
+		// Handle unicode and deadkeys
+		WCHAR keyChars[2];
+		UINT scanCode = HIWORD(lParam);
+		int conversionResult = ToUnicodeEx(static_cast<UINT>(wParam), scanCode, allKeys, keyChars, 2, 0, KEYBOARD_INPUT_HKL);
+		if (conversionResult == 1)
+			event.KeyInput.Char = keyChars[0];
+		else
+			event.KeyInput.Char = 0;
+
+		// allow composing characters like '@' with Alt Gr on non-US keyboards
+		if ((allKeys[VK_MENU] & 0x80) != 0)
+			event.KeyInput.Control = 0;
+
+		dev = getDeviceFromHWnd(hWnd);
+		if (dev)
+			dev->postEventFromUser(event);
+
+		if (message == WM_SYSKEYDOWN || message == WM_SYSKEYUP)
+			return DefWindowProcW(hWnd, message, wParam, lParam);
+		else
+			return 0;
+	}
+
+	case WM_SIZE: {
+		// resize
+		dev = getDeviceFromHWnd(hWnd);
+		if (dev)
+			dev->OnResized();
+	}
+		return 0;
+
+	case WM_DESTROY:
+		PostQuitMessage(0);
+		return 0;
+
+	case WM_SYSCOMMAND:
+		// prevent screensaver or monitor powersave mode from starting
+		if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
+				(wParam & 0xFFF0) == SC_MONITORPOWER ||
+				(wParam & 0xFFF0) == SC_KEYMENU)
+			return 0;
+
+		break;
+
+	case WM_USER:
+		event.EventType = irr::EET_USER_EVENT;
+		event.UserEvent.UserData1 = static_cast<size_t>(wParam);
+		event.UserEvent.UserData2 = static_cast<size_t>(lParam);
+		dev = getDeviceFromHWnd(hWnd);
+
+		if (dev)
+			dev->postEventFromUser(event);
+
+		return 0;
+
+	case WM_SETCURSOR:
+		// because Windows forgot about that in the meantime
+		dev = getDeviceFromHWnd(hWnd);
+		if (dev) {
+			dev->getCursorControl()->setActiveIcon(dev->getCursorControl()->getActiveIcon());
+			dev->getCursorControl()->setVisible(dev->getCursorControl()->isVisible());
+		}
+		break;
+
+	case WM_INPUTLANGCHANGE:
+		// get the new codepage used for keyboard input
+		KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
+		return 0;
+	}
+	return DefWindowProcW(hWnd, message, wParam, lParam);
+}
+
+namespace irr
+{
+
+//! constructor
+CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters &params) :
+		CIrrDeviceStub(params), HWnd(0), Resized(false),
+		ExternalWindow(false), Win32CursorControl(0), JoyControl(0),
+		WindowMaximized(params.WindowMaximized)
+{
+#ifdef _DEBUG
+	setDebugName("CIrrDeviceWin32");
+#endif
+
+	// get windows version and create OS operator
+	core::stringc winversion;
+	getWindowsVersion(winversion);
+	Operator = new COSOperator(winversion);
+	os::Printer::log(winversion.c_str(), ELL_INFORMATION);
+
+	// get handle to exe file
+	HINSTANCE hInstance = GetModuleHandle(0);
+
+	// create the window if we need to and we do not use the null device
+	if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL) {
+		const wchar_t *ClassName = L"CIrrDeviceWin32";
+
+		// Register Class
+		WNDCLASSEXW wcex;
+		wcex.cbSize = sizeof(WNDCLASSEXW);
+		wcex.style = CS_HREDRAW | CS_VREDRAW;
+		wcex.lpfnWndProc = WndProc;
+		wcex.cbClsExtra = 0;
+		wcex.cbWndExtra = 0;
+		wcex.hInstance = hInstance;
+		wcex.hIcon = NULL;
+		wcex.hCursor = 0; // LoadCursor(NULL, IDC_ARROW);
+		wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+		wcex.lpszMenuName = 0;
+		wcex.lpszClassName = ClassName;
+		wcex.hIconSm = 0;
+
+		RegisterClassExW(&wcex);
+
+		// calculate client size
+
+		RECT clientSize;
+		clientSize.top = 0;
+		clientSize.left = 0;
+		clientSize.right = CreationParams.WindowSize.Width;
+		clientSize.bottom = CreationParams.WindowSize.Height;
+
+		DWORD style = getWindowStyle(CreationParams.Fullscreen, CreationParams.WindowResizable > 0 ? true : false);
+		AdjustWindowRect(&clientSize, style, FALSE);
+
+		const s32 realWidth = clientSize.right - clientSize.left;
+		const s32 realHeight = clientSize.bottom - clientSize.top;
+
+		s32 windowLeft = (CreationParams.WindowPosition.X == -1 ? (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2 : CreationParams.WindowPosition.X);
+		s32 windowTop = (CreationParams.WindowPosition.Y == -1 ? (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2 : CreationParams.WindowPosition.Y);
+
+		if (windowLeft < 0)
+			windowLeft = 0;
+		if (windowTop < 0)
+			windowTop = 0; // make sure window menus are in screen on creation
+
+		if (CreationParams.Fullscreen) {
+			windowLeft = 0;
+			windowTop = 0;
+		}
+
+		// create window
+		HWnd = CreateWindowW(ClassName, L"", style, windowLeft, windowTop,
+				realWidth, realHeight, NULL, NULL, hInstance, NULL);
+		if (!HWnd) {
+			os::Printer::log("Window could not be created.", ELL_ERROR);
+		}
+
+		CreationParams.WindowId = HWnd;
+		//		CreationParams.WindowSize.Width = realWidth;
+		//		CreationParams.WindowSize.Height = realHeight;
+
+		ShowWindow(HWnd, SW_SHOWNORMAL);
+		UpdateWindow(HWnd);
+
+		// fix ugly ATI driver bugs. Thanks to ariaci
+		MoveWindow(HWnd, windowLeft, windowTop, realWidth, realHeight, TRUE);
+
+		// make sure everything gets updated to the real sizes
+		Resized = true;
+	} else if (CreationParams.WindowId) {
+		// attach external window
+		HWnd = static_cast<HWND>(CreationParams.WindowId);
+		RECT r;
+		GetWindowRect(HWnd, &r);
+		CreationParams.WindowSize.Width = r.right - r.left;
+		CreationParams.WindowSize.Height = r.bottom - r.top;
+		CreationParams.Fullscreen = false;
+		ExternalWindow = true;
+	}
+
+	// create cursor control
+
+	Win32CursorControl = new CCursorControl(this, CreationParams.WindowSize, HWnd, CreationParams.Fullscreen);
+	CursorControl = Win32CursorControl;
+	JoyControl = new SJoystickWin32Control(this);
+
+	// initialize doubleclicks with system values
+	MouseMultiClicks.DoubleClickTime = GetDoubleClickTime();
+
+	// create driver
+
+	createDriver();
+
+	if (VideoDriver)
+		createGUIAndScene();
+
+	// register environment
+
+	SEnvMapper em;
+	em.irrDev = this;
+	em.hWnd = HWnd;
+	EnvMap.push_back(em);
+
+	// set this as active window
+	if (!ExternalWindow) {
+		SetActiveWindow(HWnd);
+		SetForegroundWindow(HWnd);
+	}
+
+	KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
+
+	// inform driver about the window size etc.
+	resizeIfNecessary();
+
+	if (params.WindowMaximized)
+		maximizeWindow();
+}
+
+//! destructor
+CIrrDeviceWin32::~CIrrDeviceWin32()
+{
+	delete JoyControl;
+
+	// unregister environment
+	for (u32 i = 0; i < EnvMap.size(); ++i) {
+		if (EnvMap[i].hWnd == HWnd) {
+			EnvMap.erase(i);
+			break;
+		}
+	}
+}
+
+//! create the driver
+void CIrrDeviceWin32::createDriver()
+{
+	switch (CreationParams.DriverType) {
+	case video::EDT_OPENGL:
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+		switchToFullScreen();
+
+		ContextManager = new video::CWGLManager();
+		ContextManager->initialize(CreationParams, video::SExposedVideoData(HWnd));
+
+		VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, ContextManager);
+
+		if (!VideoDriver)
+			os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
+#else
+		os::Printer::log("OpenGL driver was not compiled in.", ELL_ERROR);
+#endif
+		break;
+	case video::EDT_OGLES1:
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+		switchToFullScreen();
+
+		ContextManager = new video::CEGLManager();
+		ContextManager->initialize(CreationParams, video::SExposedVideoData(HWnd));
+
+		VideoDriver = video::createOGLES1Driver(CreationParams, FileSystem, ContextManager);
+
+		if (!VideoDriver)
+			os::Printer::log("Could not create OpenGL-ES1 driver.", ELL_ERROR);
+#else
+		os::Printer::log("OpenGL-ES1 driver was not compiled in.", ELL_ERROR);
+#endif
+		break;
+	case video::EDT_OGLES2:
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+		switchToFullScreen();
+
+		ContextManager = new video::CEGLManager();
+		ContextManager->initialize(CreationParams, video::SExposedVideoData(HWnd));
+
+		VideoDriver = video::createOGLES2Driver(CreationParams, FileSystem, ContextManager);
+
+		if (!VideoDriver)
+			os::Printer::log("Could not create OpenGL-ES2 driver.", ELL_ERROR);
+#else
+		os::Printer::log("OpenGL-ES2 driver was not compiled in.", ELL_ERROR);
+#endif
+		break;
+	case video::EDT_WEBGL1:
+		os::Printer::log("WebGL1 driver not supported on Win32 device.", ELL_ERROR);
+		break;
+	case video::EDT_NULL:
+		VideoDriver = video::createNullDriver(FileSystem, CreationParams.WindowSize);
+		break;
+	default:
+		os::Printer::log("Unable to create video driver of unknown type.", ELL_ERROR);
+		break;
+	}
+}
+
+//! runs the device. Returns false if device wants to be deleted
+bool CIrrDeviceWin32::run()
+{
+	os::Timer::tick();
+
+	static_cast<CCursorControl *>(CursorControl)->update();
+
+	handleSystemMessages();
+
+	if (!Close)
+		resizeIfNecessary();
+
+	if (!Close && JoyControl)
+		JoyControl->pollJoysticks();
+
+	return !Close;
+}
+
+//! Pause the current process for the minimum time allowed only to allow other processes to execute
+void CIrrDeviceWin32::yield()
+{
+	Sleep(0);
+}
+
+//! Pause execution and let other processes to run for a specified amount of time.
+void CIrrDeviceWin32::sleep(u32 timeMs, bool pauseTimer)
+{
+	const bool wasStopped = Timer ? Timer->isStopped() : true;
+	if (pauseTimer && !wasStopped)
+		Timer->stop();
+
+	Sleep(timeMs);
+
+	if (pauseTimer && !wasStopped)
+		Timer->start();
+}
+
+void CIrrDeviceWin32::resizeIfNecessary()
+{
+	if (!Resized || !getVideoDriver())
+		return;
+
+	RECT r;
+	GetClientRect(HWnd, &r);
+
+	char tmp[255];
+
+	if (r.right < 2 || r.bottom < 2) {
+		snprintf_irr(tmp, sizeof(tmp), "Ignoring resize operation to (%ld %ld)", r.right, r.bottom);
+		os::Printer::log(tmp);
+	} else {
+		snprintf_irr(tmp, sizeof(tmp), "Resizing window (%ld %ld)", r.right, r.bottom);
+		os::Printer::log(tmp);
+
+		getVideoDriver()->OnResize(irr::core::dimension2du((u32)r.right, (u32)r.bottom));
+		getWin32CursorControl()->OnResize(getVideoDriver()->getScreenSize());
+	}
+
+	Resized = false;
+}
+
+DWORD CIrrDeviceWin32::getWindowStyle(bool fullscreen, bool resizable) const
+{
+	if (fullscreen)
+		return WS_POPUP;
+
+	if (resizable)
+		return WS_THICKFRAME | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+
+	return WS_BORDER | WS_SYSMENU | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+}
+
+//! sets the caption of the window
+void CIrrDeviceWin32::setWindowCaption(const wchar_t *text)
+{
+	// We use SendMessage instead of SetText to ensure proper
+	// function even in cases where the HWND was created in a different thread
+	DWORD_PTR dwResult;
+	SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
+			reinterpret_cast<LPARAM>(text),
+			SMTO_ABORTIFHUNG, 2000, &dwResult);
+}
+
+//! Sets the window icon.
+bool CIrrDeviceWin32::setWindowIcon(const video::IImage *img)
+{
+	// Ignore the img, instead load the ICON from resource file
+	// (This is minetest-specific!)
+	const HICON hicon = LoadIcon(GetModuleHandle(NULL),
+			MAKEINTRESOURCE(130) // The ID of the ICON defined in
+								 // winresource.rc
+	);
+
+	if (hicon) {
+		SendMessage(HWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon));
+		SendMessage(HWnd, WM_SETICON, ICON_SMALL,
+				reinterpret_cast<LPARAM>(hicon));
+		return true;
+	}
+	return false;
+}
+
+//! notifies the device that it should close itself
+void CIrrDeviceWin32::closeDevice()
+{
+	if (!ExternalWindow) {
+		MSG msg;
+		PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
+		PostQuitMessage(0);
+		PeekMessage(&msg, NULL, WM_QUIT, WM_QUIT, PM_REMOVE);
+		DestroyWindow(HWnd);
+		const wchar_t *ClassName = L"CIrrDeviceWin32";
+		HINSTANCE hInstance = GetModuleHandle(0);
+		UnregisterClassW(ClassName, hInstance);
+	}
+	Close = true;
+}
+
+//! returns if window is active. if not, nothing needs to be drawn
+bool CIrrDeviceWin32::isWindowActive() const
+{
+	return (GetActiveWindow() == HWnd);
+}
+
+//! returns if window has focus
+bool CIrrDeviceWin32::isWindowFocused() const
+{
+	bool ret = (GetFocus() == HWnd);
+	return ret;
+}
+
+//! returns if window is minimized
+bool CIrrDeviceWin32::isWindowMinimized() const
+{
+	WINDOWPLACEMENT plc;
+	plc.length = sizeof(WINDOWPLACEMENT);
+	bool ret = false;
+	if (GetWindowPlacement(HWnd, &plc))
+		ret = plc.showCmd == SW_SHOWMINIMIZED;
+	return ret;
+}
+
+//! returns last state from maximizeWindow() and restoreWindow()
+bool CIrrDeviceWin32::isWindowMaximized() const
+{
+	return WindowMaximized;
+}
+
+//! switches to fullscreen
+bool CIrrDeviceWin32::switchToFullScreen()
+{
+	if (!CreationParams.Fullscreen)
+		return true;
+
+	// No border, title bar, etc. is already set up through getWindowStyle()
+	// We only set the window size to match the monitor.
+
+	MONITORINFO mi;
+	mi.cbSize = sizeof(mi);
+	if (GetMonitorInfo(MonitorFromWindow(HWnd, MONITOR_DEFAULTTOPRIMARY), &mi)) {
+		UINT flags = SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_FRAMECHANGED;
+		SetWindowPos(HWnd, HWND_TOP, mi.rcMonitor.left, mi.rcMonitor.top,
+				mi.rcMonitor.right - mi.rcMonitor.left,
+				mi.rcMonitor.bottom - mi.rcMonitor.top, flags);
+	} else {
+		CreationParams.Fullscreen = false;
+	}
+
+	return CreationParams.Fullscreen;
+}
+
+//! returns the win32 cursor control
+CIrrDeviceWin32::CCursorControl *CIrrDeviceWin32::getWin32CursorControl()
+{
+	return Win32CursorControl;
+}
+
+void CIrrDeviceWin32::getWindowsVersion(core::stringc &out)
+{
+	OSVERSIONINFO osvi;
+
+	ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
+	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	GetVersionEx(&osvi);
+
+	char tmp[255];
+	snprintf(tmp, sizeof(tmp), "Microsoft Windows %lu.%lu %s", osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.szCSDVersion);
+	out.append(tmp);
+}
+
+//! Notifies the device, that it has been resized
+void CIrrDeviceWin32::OnResized()
+{
+	Resized = true;
+}
+
+//! Resize the render window.
+void CIrrDeviceWin32::setWindowSize(const irr::core::dimension2d<u32> &size)
+{
+	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
+		return;
+
+	// get size of the window for the give size of the client area
+	DWORD style = static_cast<DWORD>(GetWindowLongPtr(HWnd, GWL_STYLE));
+	DWORD exStyle = static_cast<DWORD>(GetWindowLongPtr(HWnd, GWL_EXSTYLE));
+	RECT clientSize;
+	clientSize.top = 0;
+	clientSize.left = 0;
+	clientSize.right = size.Width;
+	clientSize.bottom = size.Height;
+	AdjustWindowRectEx(&clientSize, style, false, exStyle);
+	const s32 realWidth = clientSize.right - clientSize.left;
+	const s32 realHeight = clientSize.bottom - clientSize.top;
+
+	UINT flags = SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER;
+	SetWindowPos(HWnd, HWND_TOP, 0, 0, realWidth, realHeight, flags);
+}
+
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceWin32::setResizable(bool resize)
+{
+	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
+		return;
+
+	LONG_PTR style = (LONG_PTR)getWindowStyle(false, resize);
+	if (!SetWindowLongPtr(HWnd, GWL_STYLE, style))
+		os::Printer::log("Could not change window style.");
+
+	RECT clientSize;
+	clientSize.top = 0;
+	clientSize.left = 0;
+	clientSize.right = getVideoDriver()->getScreenSize().Width;
+	clientSize.bottom = getVideoDriver()->getScreenSize().Height;
+
+	AdjustWindowRect(&clientSize, static_cast<DWORD>(style), FALSE);
+
+	const s32 realWidth = clientSize.right - clientSize.left;
+	const s32 realHeight = clientSize.bottom - clientSize.top;
+
+	const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+	const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+
+	SetWindowPos(HWnd, HWND_TOP, windowLeft, windowTop, realWidth, realHeight,
+			SWP_FRAMECHANGED | SWP_NOMOVE | SWP_SHOWWINDOW);
+
+	static_cast<CCursorControl *>(CursorControl)->updateBorderSize(CreationParams.Fullscreen, resize);
+}
+
+//! Minimizes the window.
+void CIrrDeviceWin32::minimizeWindow()
+{
+	WINDOWPLACEMENT wndpl;
+	wndpl.length = sizeof(WINDOWPLACEMENT);
+	GetWindowPlacement(HWnd, &wndpl);
+	wndpl.showCmd = SW_SHOWMINNOACTIVE;
+	SetWindowPlacement(HWnd, &wndpl);
+}
+
+//! Maximizes the window.
+void CIrrDeviceWin32::maximizeWindow()
+{
+	WINDOWPLACEMENT wndpl;
+	wndpl.length = sizeof(WINDOWPLACEMENT);
+	GetWindowPlacement(HWnd, &wndpl);
+	wndpl.showCmd = SW_SHOWMAXIMIZED;
+	SetWindowPlacement(HWnd, &wndpl);
+
+	WindowMaximized = true;
+}
+
+//! Restores the window to its original size.
+void CIrrDeviceWin32::restoreWindow()
+{
+	WINDOWPLACEMENT wndpl;
+	wndpl.length = sizeof(WINDOWPLACEMENT);
+	GetWindowPlacement(HWnd, &wndpl);
+	wndpl.showCmd = SW_SHOWNORMAL;
+	SetWindowPlacement(HWnd, &wndpl);
+
+	WindowMaximized = false;
+}
+
+core::position2di CIrrDeviceWin32::getWindowPosition()
+{
+	WINDOWPLACEMENT wndpl;
+	wndpl.length = sizeof(WINDOWPLACEMENT);
+	if (GetWindowPlacement(HWnd, &wndpl)) {
+		return core::position2di((int)wndpl.rcNormalPosition.left,
+				(int)wndpl.rcNormalPosition.top);
+	} else {
+		// No reason for this to happen
+		os::Printer::log("Failed to retrieve window location", ELL_ERROR);
+		return core::position2di(-1, -1);
+	}
+}
+
+bool CIrrDeviceWin32::activateJoysticks(core::array<SJoystickInfo> &joystickInfo)
+{
+	if (JoyControl)
+		return JoyControl->activateJoysticks(joystickInfo);
+	else
+		return false;
+}
+
+//! Process system events
+void CIrrDeviceWin32::handleSystemMessages()
+{
+	MSG msg;
+
+	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+		if (ExternalWindow && msg.hwnd == HWnd) {
+			if (msg.hwnd == HWnd) {
+				WndProc(HWnd, msg.message, msg.wParam, msg.lParam);
+			} else {
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
+		} else {
+			// No message translation because we don't use WM_CHAR and it would conflict with our
+			// deadkey handling.
+			DispatchMessage(&msg);
+		}
+
+		if (msg.message == WM_QUIT)
+			Close = true;
+	}
+}
+
+//! Remove all messages pending in the system message loop
+void CIrrDeviceWin32::clearSystemMessages()
+{
+	MSG msg;
+	while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) {
+	}
+	while (PeekMessage(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE)) {
+	}
+}
+
+//! Get the display density in dots per inch.
+float CIrrDeviceWin32::getDisplayDensity() const
+{
+	HDC hdc = GetDC(HWnd);
+	float dpi = GetDeviceCaps(hdc, LOGPIXELSX);
+	ReleaseDC(HWnd, hdc);
+	return dpi;
+}
+
+// Convert an Irrlicht texture to a Windows cursor
+// Based on http://www.codeguru.com/cpp/w-p/win32/cursors/article.php/c4529/
+HCURSOR CIrrDeviceWin32::TextureToCursor(HWND hwnd, irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot)
+{
+	//
+	// create the bitmaps needed for cursors from the texture
+
+	HDC dc = GetDC(hwnd);
+	HDC andDc = CreateCompatibleDC(dc);
+	HDC xorDc = CreateCompatibleDC(dc);
+	HBITMAP andBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
+	HBITMAP xorBitmap = CreateCompatibleBitmap(dc, sourceRect.getWidth(), sourceRect.getHeight());
+
+	HBITMAP oldAndBitmap = (HBITMAP)SelectObject(andDc, andBitmap);
+	HBITMAP oldXorBitmap = (HBITMAP)SelectObject(xorDc, xorBitmap);
+
+	video::ECOLOR_FORMAT format = tex->getColorFormat();
+	u32 bytesPerPixel = video::IImage::getBitsPerPixelFromFormat(format) / 8;
+	u32 bytesLeftGap = sourceRect.UpperLeftCorner.X * bytesPerPixel;
+	u32 bytesRightGap = tex->getPitch() - sourceRect.LowerRightCorner.X * bytesPerPixel;
+	const u8 *data = (const u8 *)tex->lock(video::ETLM_READ_ONLY, 0);
+	data += sourceRect.UpperLeftCorner.Y * tex->getPitch();
+	for (s32 y = 0; y < sourceRect.getHeight(); ++y) {
+		data += bytesLeftGap;
+		for (s32 x = 0; x < sourceRect.getWidth(); ++x) {
+			video::SColor pixelCol;
+			pixelCol.setData((const void *)data, format);
+			data += bytesPerPixel;
+
+			if (pixelCol.getAlpha() == 0) { // transparent
+				SetPixel(andDc, x, y, RGB(255, 255, 255));
+				SetPixel(xorDc, x, y, RGB(0, 0, 0));
+			} else // color
+			{
+				SetPixel(andDc, x, y, RGB(0, 0, 0));
+				SetPixel(xorDc, x, y, RGB(pixelCol.getRed(), pixelCol.getGreen(), pixelCol.getBlue()));
+			}
+		}
+		data += bytesRightGap;
+	}
+	tex->unlock();
+
+	SelectObject(andDc, oldAndBitmap);
+	SelectObject(xorDc, oldXorBitmap);
+
+	DeleteDC(xorDc);
+	DeleteDC(andDc);
+
+	ReleaseDC(hwnd, dc);
+
+	// create the cursor
+
+	ICONINFO iconinfo;
+	iconinfo.fIcon = false; // type is cursor not icon
+	iconinfo.xHotspot = hotspot.X;
+	iconinfo.yHotspot = hotspot.Y;
+	iconinfo.hbmMask = andBitmap;
+	iconinfo.hbmColor = xorBitmap;
+
+	HCURSOR cursor = CreateIconIndirect(&iconinfo);
+
+	DeleteObject(andBitmap);
+	DeleteObject(xorBitmap);
+
+	return cursor;
+}
+
+CIrrDeviceWin32::CCursorControl::CCursorControl(CIrrDeviceWin32 *device, const core::dimension2d<u32> &wsize, HWND hwnd, bool fullscreen) :
+		Device(device), WindowSize(wsize), InvWindowSize(0.0f, 0.0f),
+		HWnd(hwnd), BorderX(0), BorderY(0),
+		UseReferenceRect(false), IsVisible(true), ActiveIcon(gui::ECI_NORMAL), ActiveIconStartTime(0)
+{
+	if (WindowSize.Width != 0)
+		InvWindowSize.Width = 1.0f / WindowSize.Width;
+
+	if (WindowSize.Height != 0)
+		InvWindowSize.Height = 1.0f / WindowSize.Height;
+
+	updateBorderSize(fullscreen, false);
+	initCursors();
+}
+
+CIrrDeviceWin32::CCursorControl::~CCursorControl()
+{
+	for (u32 i = 0; i < Cursors.size(); ++i) {
+		for (u32 f = 0; f < Cursors[i].Frames.size(); ++f) {
+			DestroyCursor(Cursors[i].Frames[f].IconHW);
+		}
+	}
+}
+
+void CIrrDeviceWin32::CCursorControl::initCursors()
+{
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_ARROW)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_CROSS)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_HAND)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_HELP)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_IBEAM)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_NO)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_WAIT)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_SIZEALL)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_SIZENESW)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_SIZENWSE)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_SIZENS)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_SIZEWE)));
+	Cursors.push_back(CursorW32(LoadCursor(NULL, IDC_UPARROW)));
+}
+
+void CIrrDeviceWin32::CCursorControl::update()
+{
+	if (!Cursors[ActiveIcon].Frames.empty() && Cursors[ActiveIcon].FrameTime) {
+		// update animated cursors. This could also be done by X11 in case someone wants to figure that out (this way was just easier to implement)
+		u32 now = Device->getTimer()->getRealTime();
+		u32 frame = ((now - ActiveIconStartTime) / Cursors[ActiveIcon].FrameTime) % Cursors[ActiveIcon].Frames.size();
+		SetCursor(Cursors[ActiveIcon].Frames[frame].IconHW);
+	}
+}
+
+//! Sets the active cursor icon
+void CIrrDeviceWin32::CCursorControl::setActiveIcon(gui::ECURSOR_ICON iconId)
+{
+	if (iconId >= (s32)Cursors.size())
+		return;
+
+	ActiveIcon = iconId;
+	ActiveIconStartTime = Device->getTimer()->getRealTime();
+	if (Cursors[ActiveIcon].Frames.size())
+		SetCursor(Cursors[ActiveIcon].Frames[0].IconHW);
+}
+
+//! Add a custom sprite as cursor icon.
+gui::ECURSOR_ICON CIrrDeviceWin32::CCursorControl::addIcon(const gui::SCursorSprite &icon)
+{
+	if (icon.SpriteId >= 0) {
+		CursorW32 cW32;
+		cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+
+		for (u32 i = 0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i) {
+			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+
+			HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+			cW32.Frames.push_back(CursorFrameW32(hc));
+		}
+
+		Cursors.push_back(cW32);
+		return (gui::ECURSOR_ICON)(Cursors.size() - 1);
+	}
+	return gui::ECI_NORMAL;
+}
+
+//! replace the given cursor icon.
+void CIrrDeviceWin32::CCursorControl::changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite &icon)
+{
+	if (iconId >= (s32)Cursors.size())
+		return;
+
+	for (u32 i = 0; i < Cursors[iconId].Frames.size(); ++i)
+		DestroyCursor(Cursors[iconId].Frames[i].IconHW);
+
+	if (icon.SpriteId >= 0) {
+		CursorW32 cW32;
+		cW32.FrameTime = icon.SpriteBank->getSprites()[icon.SpriteId].frameTime;
+		for (u32 i = 0; i < icon.SpriteBank->getSprites()[icon.SpriteId].Frames.size(); ++i) {
+			irr::u32 texId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].textureNumber;
+			irr::u32 rectId = icon.SpriteBank->getSprites()[icon.SpriteId].Frames[i].rectNumber;
+			irr::core::rect<s32> rectIcon = icon.SpriteBank->getPositions()[rectId];
+
+			HCURSOR hc = Device->TextureToCursor(HWnd, icon.SpriteBank->getTexture(texId), rectIcon, icon.HotSpot);
+			cW32.Frames.push_back(CursorFrameW32(hc));
+		}
+
+		Cursors[iconId] = cW32;
+	}
+}
+
+//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+core::dimension2di CIrrDeviceWin32::CCursorControl::getSupportedIconSize() const
+{
+	core::dimension2di result;
+
+	result.Width = GetSystemMetrics(SM_CXCURSOR);
+	result.Height = GetSystemMetrics(SM_CYCURSOR);
+
+	return result;
+}
+
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
diff --git a/irr/src/CIrrDeviceWin32.h b/irr/src/CIrrDeviceWin32.h
new file mode 100644
index 000000000..8a4c14276
--- /dev/null
+++ b/irr/src/CIrrDeviceWin32.h
@@ -0,0 +1,405 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
+
+#include "CIrrDeviceStub.h"
+#include "IrrlichtDevice.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h> // For JOYCAPS
+#include <windowsx.h>
+#if !defined(GET_X_LPARAM)
+#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
+#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
+#endif
+
+namespace irr
+{
+struct SJoystickWin32Control;
+
+class CIrrDeviceWin32 : public CIrrDeviceStub
+{
+	friend struct SJoystickWin32Control;
+
+public:
+	//! constructor
+	CIrrDeviceWin32(const SIrrlichtCreationParameters &params);
+
+	//! destructor
+	virtual ~CIrrDeviceWin32();
+
+	//! runs the device. Returns false if device wants to be deleted
+	bool run() override;
+
+	//! Cause the device to temporarily pause execution and let other processes to run
+	// This should bring down processor usage without major performance loss for Irrlicht
+	void yield() override;
+
+	//! Pause execution and let other processes to run for a specified amount of time.
+	void sleep(u32 timeMs, bool pauseTimer) override;
+
+	//! sets the caption of the window
+	void setWindowCaption(const wchar_t *text) override;
+
+	//! Sets the window icon.
+	bool setWindowIcon(const video::IImage *img) override;
+
+	//! returns if window is active. if not, nothing need to be drawn
+	bool isWindowActive() const override;
+
+	//! returns if window has focus
+	bool isWindowFocused() const override;
+
+	//! returns if window is minimized
+	bool isWindowMinimized() const override;
+
+	//! returns last state from maximizeWindow() and restoreWindow()
+	bool isWindowMaximized() const override;
+
+	//! notifies the device that it should close itself
+	void closeDevice() override;
+
+	//! Notifies the device, that it has been resized
+	/** Must be publis as it is called from free function (event handler) */
+	void OnResized();
+
+	//! Sets if the window should be resizable in windowed mode.
+	void setResizable(bool resize = false) override;
+
+	//! Resize the render window.
+	void setWindowSize(const irr::core::dimension2d<u32> &size) override;
+
+	//! Minimizes the window.
+	void minimizeWindow() override;
+
+	//! Maximizes the window.
+	void maximizeWindow() override;
+
+	//! Restores the window size.
+	void restoreWindow() override;
+
+	//! Get the position of the window on screen
+	core::position2di getWindowPosition() override;
+
+	//! Activate any joysticks, and generate events for them.
+	bool activateJoysticks(core::array<SJoystickInfo> &joystickInfo) override;
+
+	//! Remove all messages pending in the system message loop
+	void clearSystemMessages() override;
+
+	//! Get the device type
+	E_DEVICE_TYPE getType() const override
+	{
+		return EIDT_WIN32;
+	}
+
+	//! Get the display density in dots per inch.
+	float getDisplayDensity() const override;
+
+	//! Compares to the last call of this function to return double and triple clicks.
+	//! \return Returns only 1,2 or 3. A 4th click will start with 1 again.
+	u32 checkSuccessiveClicks(s32 mouseX, s32 mouseY, EMOUSE_INPUT_EVENT inputEvent) override
+	{
+		// we just have to make it public
+		return CIrrDeviceStub::checkSuccessiveClicks(mouseX, mouseY, inputEvent);
+	}
+
+	//! Switch to fullscreen
+	bool switchToFullScreen();
+
+	// convert an Irrlicht texture to a windows cursor
+	HCURSOR TextureToCursor(HWND hwnd, irr::video::ITexture *tex, const core::rect<s32> &sourceRect, const core::position2d<s32> &hotspot);
+
+	//! Implementation of the win32 cursor control
+	class CCursorControl : public gui::ICursorControl
+	{
+	public:
+		CCursorControl(CIrrDeviceWin32 *device, const core::dimension2d<u32> &wsize, HWND hwnd, bool fullscreen);
+		~CCursorControl();
+
+		//! Changes the visible state of the mouse cursor.
+		void setVisible(bool visible) override
+		{
+			CURSORINFO info;
+			info.cbSize = sizeof(CURSORINFO);
+			BOOL gotCursorInfo = GetCursorInfo(&info);
+			while (gotCursorInfo) {
+#ifdef CURSOR_SUPPRESSED
+				// Since Windows 8 the cursor can be suppressed by a touch interface
+				if (visible && info.flags == CURSOR_SUPPRESSED) {
+					break;
+				}
+#endif
+				if ((visible && info.flags == CURSOR_SHOWING) || // visible
+						(!visible && info.flags == 0))           // hidden
+				{
+					break;
+				}
+				// this only increases an internal
+				// display counter in windows, so it
+				// might have to be called some more
+				const int showResult = ShowCursor(visible);
+				// if result has correct sign we can
+				// stop here as well
+				if ((!visible && showResult < 0) ||
+						(visible && showResult >= 0))
+					break;
+				// yes, it really must be set each time
+				info.cbSize = sizeof(CURSORINFO);
+				gotCursorInfo = GetCursorInfo(&info);
+
+#ifdef CURSOR_SUPPRESSED
+				// Not sure if a cursor which we tried to hide still can be suppressed.
+				// I have no touch-display for testing this and MSDN doesn't describe it.
+				// But adding this check shouldn't hurt and might prevent an endless loop.
+				if (!visible && info.flags == CURSOR_SUPPRESSED) {
+					break;
+				}
+#endif
+			}
+			IsVisible = visible;
+		}
+
+		//! Returns if the cursor is currently visible.
+		bool isVisible() const override
+		{
+			return IsVisible;
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<f32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(f32 x, f32 y) override
+		{
+			if (!UseReferenceRect)
+				setPosition(core::round32(x * WindowSize.Width), core::round32(y * WindowSize.Height));
+			else
+				setPosition(core::round32(x * ReferenceRect.getWidth()), core::round32(y * ReferenceRect.getHeight()));
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(const core::position2d<s32> &pos) override
+		{
+			setPosition(pos.X, pos.Y);
+		}
+
+		//! Sets the new position of the cursor.
+		void setPosition(s32 x, s32 y) override
+		{
+			if (UseReferenceRect) {
+				SetCursorPos(ReferenceRect.UpperLeftCorner.X + x,
+						ReferenceRect.UpperLeftCorner.Y + y);
+			} else {
+				RECT rect;
+				if (GetWindowRect(HWnd, &rect))
+					SetCursorPos(x + rect.left + BorderX, y + rect.top + BorderY);
+			}
+
+			CursorPos.X = x;
+			CursorPos.Y = y;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		const core::position2d<s32> &getPosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateInternalCursorPosition();
+			return CursorPos;
+		}
+
+		//! Returns the current position of the mouse cursor.
+		core::position2d<f32> getRelativePosition(bool updateCursor) override
+		{
+			if (updateCursor)
+				updateInternalCursorPosition();
+
+			if (!UseReferenceRect) {
+				return core::position2d<f32>(CursorPos.X * InvWindowSize.Width,
+						CursorPos.Y * InvWindowSize.Height);
+			}
+
+			return core::position2d<f32>(CursorPos.X / (f32)ReferenceRect.getWidth(),
+					CursorPos.Y / (f32)ReferenceRect.getHeight());
+		}
+
+		//! Sets an absolute reference rect for calculating the cursor position.
+		void setReferenceRect(core::rect<s32> *rect = 0) override
+		{
+			if (rect) {
+				ReferenceRect = *rect;
+				UseReferenceRect = true;
+
+				// prevent division through zero and uneven sizes
+
+				if (!ReferenceRect.getHeight() || ReferenceRect.getHeight() % 2)
+					ReferenceRect.LowerRightCorner.Y += 1;
+
+				if (!ReferenceRect.getWidth() || ReferenceRect.getWidth() % 2)
+					ReferenceRect.LowerRightCorner.X += 1;
+			} else
+				UseReferenceRect = false;
+		}
+
+		/** Used to notify the cursor that the window was resized. */
+		void OnResize(const core::dimension2d<u32> &size)
+		{
+			WindowSize = size;
+			if (size.Width != 0)
+				InvWindowSize.Width = 1.0f / size.Width;
+			else
+				InvWindowSize.Width = 0.f;
+
+			if (size.Height != 0)
+				InvWindowSize.Height = 1.0f / size.Height;
+			else
+				InvWindowSize.Height = 0.f;
+		}
+
+		/** Used to notify the cursor that the window resizable settings changed. */
+		void updateBorderSize(bool fullscreen, bool resizable)
+		{
+			if (!fullscreen) {
+				s32 paddingBorder = 0;
+#ifdef SM_CXPADDEDBORDER
+				paddingBorder = GetSystemMetrics(SM_CXPADDEDBORDER);
+#endif
+
+				if (resizable) {
+					BorderX = GetSystemMetrics(SM_CXSIZEFRAME) + paddingBorder;
+					BorderY = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYSIZEFRAME) + paddingBorder;
+				} else {
+					BorderX = GetSystemMetrics(SM_CXDLGFRAME) + paddingBorder;
+					BorderY = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYDLGFRAME) + paddingBorder;
+				}
+			} else {
+				BorderX = BorderY = 0;
+			}
+		}
+
+		//! Sets the active cursor icon
+		void setActiveIcon(gui::ECURSOR_ICON iconId) override;
+
+		//! Gets the currently active icon
+		gui::ECURSOR_ICON getActiveIcon() const override
+		{
+			return ActiveIcon;
+		}
+
+		//! Add a custom sprite as cursor icon.
+		gui::ECURSOR_ICON addIcon(const gui::SCursorSprite &icon) override;
+
+		//! replace the given cursor icon.
+		void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite &icon) override;
+
+		//! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work.
+		core::dimension2di getSupportedIconSize() const override;
+
+		void update();
+
+	private:
+		//! Updates the internal cursor position
+		void updateInternalCursorPosition()
+		{
+			POINT p;
+			if (!GetCursorPos(&p)) {
+				DWORD xy = GetMessagePos();
+				p.x = GET_X_LPARAM(xy);
+				p.y = GET_Y_LPARAM(xy);
+			}
+
+			if (UseReferenceRect) {
+				CursorPos.X = p.x - ReferenceRect.UpperLeftCorner.X;
+				CursorPos.Y = p.y - ReferenceRect.UpperLeftCorner.Y;
+			} else {
+				RECT rect;
+				if (GetWindowRect(HWnd, &rect)) {
+					CursorPos.X = p.x - rect.left - BorderX;
+					CursorPos.Y = p.y - rect.top - BorderY;
+				} else {
+					// window seems not to be existent, so set cursor to
+					// a negative value
+					CursorPos.X = -1;
+					CursorPos.Y = -1;
+				}
+			}
+		}
+
+		CIrrDeviceWin32 *Device;
+		core::position2d<s32> CursorPos;
+		core::dimension2d<u32> WindowSize;
+		core::dimension2d<f32> InvWindowSize;
+		HWND HWnd;
+
+		s32 BorderX, BorderY;
+		core::rect<s32> ReferenceRect;
+		bool UseReferenceRect;
+		bool IsVisible;
+
+		struct CursorFrameW32
+		{
+			CursorFrameW32() :
+					IconHW(0) {}
+			CursorFrameW32(HCURSOR icon) :
+					IconHW(icon) {}
+
+			HCURSOR IconHW; // hardware cursor
+		};
+
+		struct CursorW32
+		{
+			CursorW32() {}
+			explicit CursorW32(HCURSOR iconHw, u32 frameTime = 0) :
+					FrameTime(frameTime)
+			{
+				Frames.push_back(CursorFrameW32(iconHw));
+			}
+			core::array<CursorFrameW32> Frames;
+			u32 FrameTime;
+		};
+
+		core::array<CursorW32> Cursors;
+		gui::ECURSOR_ICON ActiveIcon;
+		u32 ActiveIconStartTime;
+
+		void initCursors();
+	};
+
+	//! returns the win32 cursor control
+	CCursorControl *getWin32CursorControl();
+
+private:
+	//! create the driver
+	void createDriver();
+
+	//! Process system events
+	void handleSystemMessages();
+
+	void getWindowsVersion(core::stringc &version);
+
+	void resizeIfNecessary();
+
+	DWORD getWindowStyle(bool fullscreen, bool resizable) const;
+
+	HWND HWnd;
+
+	bool Resized;
+	bool ExternalWindow;
+	CCursorControl *Win32CursorControl;
+
+	SJoystickWin32Control *JoyControl;
+
+	bool WindowMaximized;
+};
+
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_WINDOWS_DEVICE_
diff --git a/irr/src/CLimitReadFile.cpp b/irr/src/CLimitReadFile.cpp
new file mode 100644
index 000000000..de9bf9ec3
--- /dev/null
+++ b/irr/src/CLimitReadFile.cpp
@@ -0,0 +1,115 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CLimitReadFile.h"
+#include "irrMath.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace io
+{
+
+CLimitReadFile::CLimitReadFile(IReadFile *alreadyOpenedFile, long pos,
+		long areaSize, const io::path &name) :
+		Filename(name),
+		AreaStart(0), AreaEnd(0), Pos(0),
+		File(alreadyOpenedFile)
+{
+#ifdef _DEBUG
+	setDebugName("CLimitReadFile");
+#endif
+
+	if (File) {
+		File->grab();
+		AreaStart = pos;
+		AreaEnd = AreaStart + areaSize;
+	}
+}
+
+CLimitReadFile::~CLimitReadFile()
+{
+	if (File)
+		File->drop();
+}
+
+//! returns how much was read
+size_t CLimitReadFile::read(void *buffer, size_t sizeToRead)
+{
+	if (0 == File)
+		return 0;
+
+#if 1
+	long r = AreaStart + Pos;
+	long toRead = core::min_(AreaEnd, r + (long)sizeToRead) - core::max_(AreaStart, r);
+	if (toRead < 0)
+		return 0;
+	File->seek(r);
+	r = (long)File->read(buffer, toRead);
+	Pos += r;
+	return r;
+#else
+	const long pos = File->getPos();
+
+	if (pos >= AreaEnd)
+		return 0;
+
+	if (pos + (long)sizeToRead >= AreaEnd)
+		sizeToRead = AreaEnd - pos;
+
+	return File->read(buffer, sizeToRead);
+#endif
+}
+
+//! changes position in file, returns true if successful
+bool CLimitReadFile::seek(long finalPos, bool relativeMovement)
+{
+#if 1
+	Pos = core::s32_clamp(finalPos + (relativeMovement ? Pos : 0), 0, AreaEnd - AreaStart);
+	return true;
+#else
+	const long pos = File->getPos();
+
+	if (relativeMovement) {
+		if (pos + finalPos > AreaEnd)
+			finalPos = AreaEnd - pos;
+	} else {
+		finalPos += AreaStart;
+		if (finalPos > AreaEnd)
+			return false;
+	}
+
+	return File->seek(finalPos, relativeMovement);
+#endif
+}
+
+//! returns size of file
+long CLimitReadFile::getSize() const
+{
+	return AreaEnd - AreaStart;
+}
+
+//! returns where in the file we are.
+long CLimitReadFile::getPos() const
+{
+#if 1
+	return Pos;
+#else
+	return File->getPos() - AreaStart;
+#endif
+}
+
+//! returns name of file
+const io::path &CLimitReadFile::getFileName() const
+{
+	return Filename;
+}
+
+IReadFile *createLimitReadFile(const io::path &fileName, IReadFile *alreadyOpenedFile, long pos, long areaSize)
+{
+	return new CLimitReadFile(alreadyOpenedFile, pos, areaSize, fileName);
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CLimitReadFile.h b/irr/src/CLimitReadFile.h
new file mode 100644
index 000000000..1594135e6
--- /dev/null
+++ b/irr/src/CLimitReadFile.h
@@ -0,0 +1,62 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReadFile.h"
+#include "irrString.h"
+
+namespace irr
+{
+class CUnicodeConverter;
+
+namespace io
+{
+
+/*! this is a read file, which is limited to some boundaries,
+	so that it may only start from a certain file position
+	and may only read until a certain file position.
+	This can be useful, for example for reading uncompressed files
+	in an archive (zip, tar).
+!*/
+class CLimitReadFile : public IReadFile
+{
+public:
+	CLimitReadFile(IReadFile *alreadyOpenedFile, long pos, long areaSize, const io::path &name);
+
+	virtual ~CLimitReadFile();
+
+	//! returns how much was read
+	size_t read(void *buffer, size_t sizeToRead) override;
+
+	//! changes position in file, returns true if successful
+	//! if relativeMovement==true, the pos is changed relative to current pos,
+	//! otherwise from begin of file
+	bool seek(long finalPos, bool relativeMovement = false) override;
+
+	//! returns size of file
+	long getSize() const override;
+
+	//! returns where in the file we are.
+	long getPos() const override;
+
+	//! returns name of file
+	const io::path &getFileName() const override;
+
+	//! Get the type of the class implementing this interface
+	EREAD_FILE_TYPE getType() const override
+	{
+		return ERFT_LIMIT_READ_FILE;
+	}
+
+private:
+	io::path Filename;
+	long AreaStart;
+	long AreaEnd;
+	long Pos;
+	IReadFile *File;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CLogger.cpp b/irr/src/CLogger.cpp
new file mode 100644
index 000000000..70d06b36a
--- /dev/null
+++ b/irr/src/CLogger.cpp
@@ -0,0 +1,66 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CLogger.h"
+
+namespace irr
+{
+
+CLogger::CLogger(IEventReceiver *r) :
+		LogLevel(ELL_INFORMATION), Receiver(r)
+{
+#ifdef _DEBUG
+	setDebugName("CLogger");
+#endif
+}
+
+//! Returns the current set log level.
+ELOG_LEVEL CLogger::getLogLevel() const
+{
+	return LogLevel;
+}
+
+//! Sets a new log level.
+void CLogger::setLogLevel(ELOG_LEVEL ll)
+{
+	LogLevel = ll;
+}
+
+//! Prints out a text into the log
+void CLogger::log(const c8 *text, ELOG_LEVEL ll)
+{
+	if (ll < LogLevel)
+		return;
+
+	if (Receiver) {
+		SEvent event;
+		event.EventType = EET_LOG_TEXT_EVENT;
+		event.LogEvent.Text = text;
+		event.LogEvent.Level = ll;
+		if (Receiver->OnEvent(event))
+			return;
+	}
+
+	os::Printer::print(text);
+}
+
+//! Prints out a text into the log
+void CLogger::log(const c8 *text, const c8 *hint, ELOG_LEVEL ll)
+{
+	if (ll < LogLevel)
+		return;
+
+	core::stringc s = text;
+	s += ": ";
+	s += hint;
+	log(s.c_str(), ll);
+}
+
+//! Sets a new event receiver
+void CLogger::setReceiver(IEventReceiver *r)
+{
+	Receiver = r;
+}
+
+} // end namespace irr
diff --git a/irr/src/CLogger.h b/irr/src/CLogger.h
new file mode 100644
index 000000000..e9cfae8fc
--- /dev/null
+++ b/irr/src/CLogger.h
@@ -0,0 +1,41 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ILogger.h"
+#include "os.h"
+#include "irrString.h"
+#include "IEventReceiver.h"
+
+namespace irr
+{
+
+//! Class for logging messages, warnings and errors to stdout
+class CLogger : public ILogger
+{
+public:
+	CLogger(IEventReceiver *r);
+
+	//! Returns the current set log level.
+	ELOG_LEVEL getLogLevel() const override;
+
+	//! Sets a new log level.	void setLogLevel(ELOG_LEVEL ll) override;
+	void setLogLevel(ELOG_LEVEL ll) override;
+
+	//! Prints out a text into the log
+	void log(const c8 *text, ELOG_LEVEL ll = ELL_INFORMATION) override;
+
+	//! Prints out a text into the log
+	void log(const c8 *text, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION) override;
+
+	//! Sets a new event receiver
+	void setReceiver(IEventReceiver *r);
+
+private:
+	ELOG_LEVEL LogLevel;
+	IEventReceiver *Receiver;
+};
+
+} // end namespace
diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt
new file mode 100644
index 000000000..15a752c38
--- /dev/null
+++ b/irr/src/CMakeLists.txt
@@ -0,0 +1,530 @@
+# When enabling SDL2 by default on macOS, don't forget to change
+# "NSHighResolutionCapable" to true in "Info.plist".
+if(ANDROID)
+	set(DEFAULT_SDL2 ON)
+endif()
+
+option(USE_SDL2 "Use the SDL2 backend" ${DEFAULT_SDL2})
+
+# Compiler flags
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	add_definitions(-D_DEBUG)
+endif()
+set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
+	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+	set(CMAKE_CXX_FLAGS_DEBUG "-g")
+
+	add_compile_options(-Wall -pipe -fno-exceptions)
+
+	# Enable SSE for floating point math on 32-bit x86 by default
+	# reasoning see minetest issue #11810 and https://gcc.gnu.org/wiki/FloatingPointMath
+	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+		include(CheckCXXSourceCompiles)
+		check_cxx_source_compiles("#ifndef __i686__\n#error\n#endif\nint main(){}" IS_I686)
+		if(IS_I686)
+			message(STATUS "Detected Intel x86: using SSE instead of x87 FPU")
+			add_compile_options(-mfpmath=sse -msse)
+		endif()
+	endif()
+
+elseif(MSVC)
+	string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " msvcrt.lib") # ???? fuck off
+
+	add_compile_options(/Zl)
+
+	# Enable SSE for floating point math on 32-bit x86 by default
+	# reasoning see minetest issue #11810 and https://gcc.gnu.org/wiki/FloatingPointMath
+	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+		add_compile_options(/arch:SSE)
+	endif()
+endif()
+
+# Platform-independent configuration (hard-coded currently)
+add_definitions(
+	-DIRR_ENABLE_BUILTIN_FONT
+)
+
+# Platform-specific configuration
+
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+	set(SOLARIS TRUE)
+endif()
+
+# Device
+
+if(WIN32)
+	add_definitions(-D_IRR_WINDOWS_ -D_IRR_WINDOWS_API_)
+	set(DEVICE "WINDOWS")
+elseif(APPLE)
+	add_definitions(-D_IRR_OSX_PLATFORM_)
+	set(DEVICE "OSX")
+elseif(ANDROID)
+	add_definitions(-D_IRR_ANDROID_PLATFORM_)
+	if(NOT USE_SDL2)
+		message(FATAL_ERROR "The Android build requires SDL2")
+	endif()
+elseif(EMSCRIPTEN)
+	add_definitions(-D_IRR_EMSCRIPTEN_PLATFORM_ -D_IRR_COMPILE_WITH_EGL_MANAGER_)
+	set(LINUX_PLATFORM TRUE)
+	set(DEVICE "SDL")
+elseif(SOLARIS)
+	add_definitions(-D_IRR_SOLARIS_PLATFORM_ -D_IRR_POSIX_API_)
+	set(DEVICE "X11")
+else()
+	add_definitions(-D_IRR_POSIX_API_)
+	set(LINUX_PLATFORM TRUE)
+	set(DEVICE "X11")
+endif()
+
+if(LINUX_PLATFORM)
+	add_definitions(-D_IRR_LINUX_PLATFORM_)
+endif()
+
+if(USE_SDL2)
+	set(DEVICE "SDL")
+elseif(DEVICE STREQUAL "SDL")
+	message(FATAL_ERROR "SDL was used but not enabled?!")
+endif()
+
+add_definitions("-D_IRR_COMPILE_WITH_${DEVICE}_DEVICE_")
+
+# X11
+
+if(DEVICE STREQUAL "X11")
+	option(USE_X11 "Use X11" TRUE)
+else()
+	set(USE_X11 FALSE)
+endif()
+
+if(LINUX_PLATFORM AND USE_X11)
+	option(USE_XINPUT2 "Use XInput2" TRUE)
+	option(USE_XCURSOR "Use XCursor" FALSE)
+else()
+	set(USE_XINPUT2 FALSE)
+	set(USE_XCURSOR FALSE)
+endif()
+
+# Joystick
+
+if(NOT (BSD OR SOLARIS OR EMSCRIPTEN))
+	add_definitions(-D_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+endif()
+
+# OpenGL
+
+if(USE_SDL2)
+	if(NOT ANDROID)
+		set(DEFAULT_OPENGL3 TRUE)
+	endif()
+	option(ENABLE_OPENGL3 "Enable OpenGL 3+" ${DEFAULT_OPENGL3})
+else()
+	set(ENABLE_OPENGL3 FALSE)
+endif()
+
+if(ANDROID OR EMSCRIPTEN)
+	set(ENABLE_OPENGL FALSE)
+else()
+	option(ENABLE_OPENGL "Enable OpenGL" TRUE)
+endif()
+
+if(USE_SDL2 OR EMSCRIPTEN OR APPLE)
+	set(ENABLE_GLES1 FALSE)
+else()
+	option(ENABLE_GLES1 "Enable OpenGL ES" FALSE)
+endif()
+
+if(APPLE)
+	set(ENABLE_GLES2 FALSE)
+	set(ENABLE_WEBGL1 FALSE)
+else()
+	if(ANDROID OR EMSCRIPTEN)
+		set(DEFAULT_GLES2 TRUE)
+	endif()
+	if(EMSCRIPTEN)
+		set(DEFAULT_WEBGL1 TRUE)
+	endif()
+	option(ENABLE_GLES2 "Enable OpenGL ES 2+" ${DEFAULT_GLES2})
+	#option(ENABLE_WEBGL1 "Enable WebGL (requires GLES2)" ${DEFAULT_WEBGL1})
+	set(ENABLE_WEBGL1 FALSE) # not working currently
+	if(ENABLE_WEBGL1)
+		set(ENABLE_GLES2 TRUE)
+	endif()
+endif()
+
+if(ENABLE_OPENGL)
+	add_definitions(-D_IRR_COMPILE_WITH_OPENGL_)
+	set(OPENGL_DIRECT_LINK TRUE) # driver relies on this
+	if(DEVICE STREQUAL "WINDOWS")
+		add_definitions(-D_IRR_COMPILE_WITH_WGL_MANAGER_)
+	elseif(DEVICE STREQUAL "X11")
+		add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_)
+	elseif(DEVICE STREQUAL "OSX")
+		add_definitions(-D_IRR_COMPILE_WITH_NSOGL_MANAGER_)
+	endif()
+endif()
+
+if(ENABLE_OPENGL3)
+	if (NOT USE_SDL2)
+		message(FATAL_ERROR "OpenGL 3 driver requires SDL2")
+	endif()
+endif()
+
+if(ENABLE_GLES1)
+	add_definitions(-D_IRR_COMPILE_WITH_OGLES1_)
+	set(OPENGLES_DIRECT_LINK TRUE)
+	if(DEVICE MATCHES "^(WINDOWS|X11)$")
+		add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
+	endif()
+endif()
+
+if(ENABLE_GLES2)
+	add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
+	if(DEVICE MATCHES "^(WINDOWS|X11)$" OR EMSCRIPTEN)
+		add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
+	endif()
+endif()
+
+if(ENABLE_WEBGL1)
+	add_definitions(-D_IRR_COMPILE_WITH_WEBGL1_)
+endif()
+
+# Misc
+
+include(TestBigEndian)
+TEST_BIG_ENDIAN(BIG_ENDIAN)
+if(BIG_ENDIAN)
+	add_definitions(-D__BIG_ENDIAN__)
+endif()
+
+# Configuration report
+
+message(STATUS "Device: ${DEVICE}")
+message(STATUS "OpenGL: ${ENABLE_OPENGL}")
+message(STATUS "OpenGL 3: ${ENABLE_OPENGL3}")
+message(STATUS "OpenGL ES: ${ENABLE_GLES1}")
+if (ENABLE_GLES2)
+	message(STATUS "OpenGL ES 2: ON (unified)")
+else()
+	message(STATUS "OpenGL ES 2: OFF")
+endif()
+#message(STATUS "WebGL: ${ENABLE_WEBGL1}")
+
+# Required libs
+
+include(CheckCXXSourceCompiles)
+
+find_package(ZLIB REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(PNG REQUIRED)
+
+if(ENABLE_GLES1)
+	# only tested on Android, probably works on Linux (is this needed anywhere else?)
+	find_library(OPENGLES_LIBRARY NAMES GLESv1_CM REQUIRED)
+	find_library(EGL_LIBRARY NAMES EGL REQUIRED)
+
+	message(STATUS "Found OpenGLES: ${OPENGLES_LIBRARY}")
+endif()
+if(ENABLE_GLES2)
+	find_package(OpenGLES2 REQUIRED)
+endif()
+if(ENABLE_OPENGL)
+	find_package(OpenGL REQUIRED)
+endif()
+if(USE_SDL2)
+	if(NOT ANDROID)
+		find_package(SDL2 REQUIRED)
+	else()
+		# provided by MinetestAndroidLibs.cmake
+	endif()
+	message(STATUS "Found SDL2: ${SDL2_LIBRARIES}")
+
+	# unfortunately older SDL does not provide its version to cmake, so check header.
+	set(CMAKE_REQUIRED_INCLUDES ${SDL2_INCLUDE_DIRS})
+	unset(CHECK_SDL_VERSION CACHE)
+	check_cxx_source_compiles("#include <SDL_version.h>\n\
+#if !SDL_VERSION_ATLEAST(2, 0, 10)\n\
+#error\n\
+#endif\n\
+int main() {}" CHECK_SDL_VERSION)
+	if(NOT CHECK_SDL_VERSION)
+		message(FATAL_ERROR "SDL2 is too old, required is at least 2.0.10!")
+	endif()
+
+	# ...no target either.
+	if(NOT TARGET SDL2::SDL2)
+		add_library(SDL2::SDL2 SHARED IMPORTED)
+		set_target_properties(SDL2::SDL2 PROPERTIES
+			IMPORTED_LOCATION "${SDL2_LIBRARIES}")
+	endif()
+endif()
+
+# More special config
+
+if(ENABLE_OPENGL AND DEVICE STREQUAL "SDL")
+	# The legacy GL driver requires some symbols from GL 4.5 to compile,
+	# which SDL only provides since 2.26.0 (Nov 2022).
+	# We have a fallback in case this isn't satisfied so test for it.
+	set(CMAKE_REQUIRED_INCLUDES ${SDL2_INCLUDE_DIRS})
+	unset(CHECK_GL_VERSION_4_5 CACHE)
+	check_cxx_source_compiles("#include <SDL_opengl.h>\n\
+#ifndef GL_VERSION_4_5\n\
+#error\n\
+#endif\n\
+int main() {}" CHECK_GL_VERSION_4_5)
+	if(CHECK_GL_VERSION_4_5)
+		add_definitions(-DIRR_PREFER_SDL_GL_HEADER)
+	endif()
+endif()
+
+# Platform-specific libs
+
+if(ANDROID)
+	enable_language(C)
+elseif(APPLE)
+	find_library(COCOA_LIB Cocoa REQUIRED)
+	find_library(IOKIT_LIB IOKit REQUIRED)
+
+	add_definitions(-DGL_SILENCE_DEPRECATION)
+elseif(NOT USE_SDL2)
+	# Unix probably
+	find_package(X11 REQUIRED)
+	if(USE_XINPUT2 AND NOT X11_Xi_FOUND)
+		message(FATAL_ERROR "XInput not found")
+	endif()
+endif()
+
+set(link_includes
+	"${PROJECT_SOURCE_DIR}/include"
+	"${CMAKE_CURRENT_SOURCE_DIR}"
+
+	"${ZLIB_INCLUDE_DIR}"
+	"${JPEG_INCLUDE_DIR}"
+	"${PNG_INCLUDE_DIR}"
+	"$<$<BOOL:${USE_SDL2}>:${SDL2_INCLUDE_DIRS}>"
+
+	${OPENGL_INCLUDE_DIR}
+	${OPENGLES2_INCLUDE_DIR}
+	${EGL_INCLUDE_DIR}
+
+	"$<$<BOOL:${USE_X11}>:${X11_INCLUDE_DIR}>"
+)
+
+# Source files
+
+set(IRRMESHLOADER
+	CB3DMeshFileLoader.cpp
+	COBJMeshFileLoader.cpp
+	CXMeshFileLoader.cpp
+)
+
+add_library(IRRMESHOBJ OBJECT
+	CSkinnedMesh.cpp
+	CBoneSceneNode.cpp
+	CMeshSceneNode.cpp
+	CAnimatedMeshSceneNode.cpp
+	${IRRMESHLOADER}
+)
+
+add_library(IRROBJ OBJECT
+	CBillboardSceneNode.cpp
+	CCameraSceneNode.cpp
+	CDummyTransformationSceneNode.cpp
+	CEmptySceneNode.cpp
+	CMeshManipulator.cpp
+	CSceneCollisionManager.cpp
+	CSceneManager.cpp
+	CMeshCache.cpp
+)
+
+set(IRRDRVROBJ
+	CNullDriver.cpp
+	CGLXManager.cpp
+	CWGLManager.cpp
+	CEGLManager.cpp
+	CSDLManager.cpp
+	mt_opengl_loader.cpp
+)
+
+# the two legacy drivers
+
+if(ENABLE_OPENGL)
+	set(IRRDRVROBJ
+		${IRRDRVROBJ}
+		COpenGLCacheHandler.cpp
+		COpenGLDriver.cpp
+		COpenGLSLMaterialRenderer.cpp
+		COpenGLExtensionHandler.cpp
+	)
+endif()
+
+if(ENABLE_GLES1)
+	set(IRRDRVROBJ
+		${IRRDRVROBJ}
+		COGLESDriver.cpp
+		COGLESExtensionHandler.cpp
+	)
+endif()
+
+# the unified drivers
+
+if(ENABLE_OPENGL3 OR ENABLE_GLES2)
+	set(IRRDRVROBJ
+		${IRRDRVROBJ}
+		OpenGL/Driver.cpp
+		OpenGL/ExtensionHandler.cpp
+		OpenGL/FixedPipelineRenderer.cpp
+		OpenGL/MaterialRenderer.cpp
+		OpenGL/Renderer2D.cpp
+	)
+endif()
+
+if(ENABLE_OPENGL3)
+	set(IRRDRVROBJ
+		${IRRDRVROBJ}
+		OpenGL3/Driver.cpp
+	)
+endif()
+
+if(ENABLE_GLES2)
+	set(IRRDRVROBJ
+		${IRRDRVROBJ}
+		OpenGLES2/Driver.cpp
+	)
+endif()
+
+set(IRRIMAGEOBJ
+	CColorConverter.cpp
+	CImage.cpp
+	CImageLoaderBMP.cpp
+	CImageLoaderJPG.cpp
+	CImageLoaderPNG.cpp
+	CImageLoaderTGA.cpp
+	CImageWriterJPG.cpp
+	CImageWriterPNG.cpp
+)
+
+add_library(IRRVIDEOOBJ OBJECT
+	CFPSCounter.cpp
+	${IRRDRVROBJ}
+	${IRRIMAGEOBJ}
+)
+
+add_library(IRRIOOBJ OBJECT
+	CFileList.cpp
+	CFileSystem.cpp
+	CLimitReadFile.cpp
+	CMemoryFile.cpp
+	CReadFile.cpp
+	CWriteFile.cpp
+	CZipReader.cpp
+	CAttributes.cpp
+)
+
+add_library(IRROTHEROBJ OBJECT
+	CIrrDeviceSDL.cpp
+	CIrrDeviceLinux.cpp
+	CIrrDeviceStub.cpp
+	CIrrDeviceWin32.cpp
+	CLogger.cpp
+	COSOperator.cpp
+	Irrlicht.cpp
+	os.cpp
+)
+
+if(ENABLE_OPENGL3)
+	target_compile_definitions(IRROTHEROBJ PRIVATE ENABLE_OPENGL3)
+endif()
+
+if(APPLE)
+	# Build all IRROTHEROBJ sources as objc++, including the .cpp's
+	set_target_properties(IRROTHEROBJ PROPERTIES COMPILE_OPTIONS "-xobjective-c++")
+	target_sources(IRROTHEROBJ PRIVATE
+		CIrrDeviceOSX.mm
+		CNSOGLManager.mm
+	)
+endif()
+
+if(USE_X11)
+	target_compile_definitions(IRROTHEROBJ PRIVATE _IRR_COMPILE_WITH_X11_)
+endif()
+
+if(USE_XINPUT2)
+	target_compile_definitions(IRROTHEROBJ PRIVATE _IRR_LINUX_X11_XINPUT2_)
+endif()
+
+if(USE_XCURSOR)
+	target_compile_definitions(IRROTHEROBJ PRIVATE _IRR_LINUX_XCURSOR_)
+endif()
+
+add_library(IRRGUIOBJ OBJECT
+	CGUIButton.cpp
+	CGUICheckBox.cpp
+	CGUIComboBox.cpp
+	CGUIEditBox.cpp
+	CGUIEnvironment.cpp
+	CGUIFileOpenDialog.cpp
+	CGUIFont.cpp
+	CGUIImage.cpp
+	CGUIListBox.cpp
+	CGUIScrollBar.cpp
+	CGUISkin.cpp
+	CGUIStaticText.cpp
+	CGUITabControl.cpp
+	CGUISpriteBank.cpp
+	CGUIImageList.cpp
+)
+
+# Library
+
+add_library(IrrlichtMt STATIC)
+foreach(object_lib
+	IRRMESHOBJ IRROBJ IRRVIDEOOBJ
+	IRRIOOBJ IRROTHEROBJ IRRGUIOBJ)
+	# Set include directories for object library compilation
+	target_include_directories(${object_lib} PRIVATE ${link_includes})
+	# Add objects from object library to main library
+	target_sources(IrrlichtMt PRIVATE $<TARGET_OBJECTS:${object_lib}>)
+endforeach()
+
+# Alias target provides add_submodule compatibility
+add_library(IrrlichtMt::IrrlichtMt ALIAS IrrlichtMt)
+
+target_include_directories(IrrlichtMt
+	PUBLIC
+		"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>"
+		"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+	PRIVATE
+		${link_includes}
+)
+
+# this needs to be here and not in a variable (like link_includes) due to issues
+# with the generator expressions on at least CMake 3.22, but not 3.28 or later
+target_link_libraries(IrrlichtMt PRIVATE
+	${ZLIB_LIBRARY}
+	${JPEG_LIBRARY}
+	${PNG_LIBRARY}
+	"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
+
+	"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
+	"$<$<BOOL:${OPENGLES_DIRECT_LINK}>:${OPENGLES_LIBRARY}>"
+	${EGL_LIBRARY}
+
+	# incl. transitive SDL2 dependencies for static linking
+	"$<$<PLATFORM_ID:Android>:-landroid -llog -lGLESv2 -lGLESv1_CM -lOpenSLES>"
+	${COCOA_LIB}
+	${IOKIT_LIB}
+	"$<$<PLATFORM_ID:Windows>:gdi32>"
+	"$<$<PLATFORM_ID:Windows>:winmm>"
+	"$<$<BOOL:${USE_X11}>:${X11_X11_LIB}>"
+	"$<$<BOOL:${USE_X11}>:${X11_Xi_LIB}>"
+)
+
+if(WIN32)
+	target_compile_definitions(IrrlichtMt INTERFACE _IRR_WINDOWS_API_) # used in _IRR_DEBUG_BREAK_IF definition in a public header
+endif()
+if(APPLE OR ANDROID OR EMSCRIPTEN)
+	target_compile_definitions(IrrlichtMt PUBLIC IRR_MOBILE_PATHS)
+endif()
diff --git a/irr/src/CMemoryFile.cpp b/irr/src/CMemoryFile.cpp
new file mode 100644
index 000000000..6d7906b91
--- /dev/null
+++ b/irr/src/CMemoryFile.cpp
@@ -0,0 +1,165 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CMemoryFile.h"
+#include "irrString.h"
+
+namespace irr
+{
+namespace io
+{
+
+CMemoryReadFile::CMemoryReadFile(const void *memory, long len, const io::path &fileName, bool d) :
+		Buffer(memory), Len(len), Pos(0), Filename(fileName), deleteMemoryWhenDropped(d)
+{
+#ifdef _DEBUG
+	setDebugName("CMemoryReadFile");
+#endif
+}
+
+CMemoryReadFile::~CMemoryReadFile()
+{
+	if (deleteMemoryWhenDropped)
+		delete[] (c8 *)Buffer;
+}
+
+//! returns how much was read
+size_t CMemoryReadFile::read(void *buffer, size_t sizeToRead)
+{
+	long amount = static_cast<long>(sizeToRead);
+	if (Pos + amount > Len)
+		amount -= Pos + amount - Len;
+
+	if (amount <= 0)
+		return 0;
+
+	c8 *p = (c8 *)Buffer;
+	memcpy(buffer, p + Pos, amount);
+
+	Pos += amount;
+
+	return static_cast<size_t>(amount);
+}
+
+//! changes position in file, returns true if successful
+//! if relativeMovement==true, the pos is changed relative to current pos,
+//! otherwise from begin of file
+bool CMemoryReadFile::seek(long finalPos, bool relativeMovement)
+{
+	if (relativeMovement) {
+		if (Pos + finalPos < 0 || Pos + finalPos > Len)
+			return false;
+
+		Pos += finalPos;
+	} else {
+		if (finalPos < 0 || finalPos > Len)
+			return false;
+
+		Pos = finalPos;
+	}
+
+	return true;
+}
+
+//! returns size of file
+long CMemoryReadFile::getSize() const
+{
+	return Len;
+}
+
+//! returns where in the file we are.
+long CMemoryReadFile::getPos() const
+{
+	return Pos;
+}
+
+//! returns name of file
+const io::path &CMemoryReadFile::getFileName() const
+{
+	return Filename;
+}
+
+CMemoryWriteFile::CMemoryWriteFile(void *memory, long len, const io::path &fileName, bool d) :
+		Buffer(memory), Len(len), Pos(0), Filename(fileName), deleteMemoryWhenDropped(d)
+{
+#ifdef _DEBUG
+	setDebugName("CMemoryWriteFile");
+#endif
+}
+
+CMemoryWriteFile::~CMemoryWriteFile()
+{
+	if (deleteMemoryWhenDropped)
+		delete[] (c8 *)Buffer;
+}
+
+//! returns how much was written
+size_t CMemoryWriteFile::write(const void *buffer, size_t sizeToWrite)
+{
+	long amount = (long)sizeToWrite;
+	if (Pos + amount > Len)
+		amount -= Pos + amount - Len;
+
+	if (amount <= 0)
+		return 0;
+
+	c8 *p = (c8 *)Buffer;
+	memcpy(p + Pos, buffer, amount);
+
+	Pos += amount;
+
+	return (size_t)amount;
+}
+
+//! changes position in file, returns true if successful
+//! if relativeMovement==true, the pos is changed relative to current pos,
+//! otherwise from begin of file
+bool CMemoryWriteFile::seek(long finalPos, bool relativeMovement)
+{
+	if (relativeMovement) {
+		if (Pos + finalPos < 0 || Pos + finalPos > Len)
+			return false;
+
+		Pos += finalPos;
+	} else {
+		if (finalPos < 0 || finalPos > Len)
+			return false;
+
+		Pos = finalPos;
+	}
+
+	return true;
+}
+
+//! returns where in the file we are.
+long CMemoryWriteFile::getPos() const
+{
+	return Pos;
+}
+
+//! returns name of file
+const io::path &CMemoryWriteFile::getFileName() const
+{
+	return Filename;
+}
+
+bool CMemoryWriteFile::flush()
+{
+	return true; // no buffering, so nothing to do
+}
+
+IReadFile *createMemoryReadFile(const void *memory, long size, const io::path &fileName, bool deleteMemoryWhenDropped)
+{
+	CMemoryReadFile *file = new CMemoryReadFile(memory, size, fileName, deleteMemoryWhenDropped);
+	return file;
+}
+
+IWriteFile *createMemoryWriteFile(void *memory, long size, const io::path &fileName, bool deleteMemoryWhenDropped)
+{
+	CMemoryWriteFile *file = new CMemoryWriteFile(memory, size, fileName, deleteMemoryWhenDropped);
+	return file;
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CMemoryFile.h b/irr/src/CMemoryFile.h
new file mode 100644
index 000000000..3ce0e8460
--- /dev/null
+++ b/irr/src/CMemoryFile.h
@@ -0,0 +1,99 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMemoryReadFile.h"
+#include "IWriteFile.h"
+#include "irrString.h"
+
+namespace irr
+{
+
+namespace io
+{
+
+/*!
+	Class for reading from memory.
+*/
+class CMemoryReadFile : public IMemoryReadFile
+{
+public:
+	//! Constructor
+	CMemoryReadFile(const void *memory, long len, const io::path &fileName, bool deleteMemoryWhenDropped);
+
+	//! Destructor
+	virtual ~CMemoryReadFile();
+
+	//! returns how much was read
+	size_t read(void *buffer, size_t sizeToRead) override;
+
+	//! changes position in file, returns true if successful
+	bool seek(long finalPos, bool relativeMovement = false) override;
+
+	//! returns size of file
+	long getSize() const override;
+
+	//! returns where in the file we are.
+	long getPos() const override;
+
+	//! returns name of file
+	const io::path &getFileName() const override;
+
+	//! Get the type of the class implementing this interface
+	EREAD_FILE_TYPE getType() const override
+	{
+		return ERFT_MEMORY_READ_FILE;
+	}
+
+	//! Get direct access to internal buffer
+	const void *getBuffer() const override
+	{
+		return Buffer;
+	}
+
+private:
+	const void *Buffer;
+	long Len;
+	long Pos;
+	io::path Filename;
+	bool deleteMemoryWhenDropped;
+};
+
+/*!
+	Class for writing to memory.
+*/
+class CMemoryWriteFile : public IWriteFile
+{
+public:
+	//! Constructor
+	CMemoryWriteFile(void *memory, long len, const io::path &fileName, bool deleteMemoryWhenDropped);
+
+	//! Destructor
+	virtual ~CMemoryWriteFile();
+
+	//! returns how much was written
+	size_t write(const void *buffer, size_t sizeToWrite) override;
+
+	//! changes position in file, returns true if successful
+	bool seek(long finalPos, bool relativeMovement = false) override;
+
+	//! returns where in the file we are.
+	long getPos() const override;
+
+	//! returns name of file
+	const io::path &getFileName() const override;
+
+	bool flush() override;
+
+private:
+	void *Buffer;
+	long Len;
+	long Pos;
+	io::path Filename;
+	bool deleteMemoryWhenDropped;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CMeshCache.cpp b/irr/src/CMeshCache.cpp
new file mode 100644
index 000000000..4f7e1203c
--- /dev/null
+++ b/irr/src/CMeshCache.cpp
@@ -0,0 +1,156 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CMeshCache.h"
+#include "IAnimatedMesh.h"
+#include "IMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+
+static const io::SNamedPath emptyNamedPath;
+
+CMeshCache::~CMeshCache()
+{
+	clear();
+}
+
+//! adds a mesh to the list
+void CMeshCache::addMesh(const io::path &filename, IAnimatedMesh *mesh)
+{
+	mesh->grab();
+
+	MeshEntry e(filename);
+	e.Mesh = mesh;
+
+	Meshes.push_back(e);
+}
+
+//! Removes a mesh from the cache.
+void CMeshCache::removeMesh(const IMesh *const mesh)
+{
+	if (!mesh)
+		return;
+	for (u32 i = 0; i < Meshes.size(); ++i) {
+		if (Meshes[i].Mesh == mesh || (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh)) {
+			Meshes[i].Mesh->drop();
+			Meshes.erase(i);
+			return;
+		}
+	}
+}
+
+//! Returns amount of loaded meshes
+u32 CMeshCache::getMeshCount() const
+{
+	return Meshes.size();
+}
+
+//! Returns current number of the mesh
+s32 CMeshCache::getMeshIndex(const IMesh *const mesh) const
+{
+	for (u32 i = 0; i < Meshes.size(); ++i) {
+		if (Meshes[i].Mesh == mesh || (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh))
+			return (s32)i;
+	}
+
+	return -1;
+}
+
+//! Returns a mesh based on its index number
+IAnimatedMesh *CMeshCache::getMeshByIndex(u32 number)
+{
+	if (number >= Meshes.size())
+		return 0;
+
+	return Meshes[number].Mesh;
+}
+
+//! Returns a mesh based on its name.
+IAnimatedMesh *CMeshCache::getMeshByName(const io::path &name)
+{
+	MeshEntry e(name);
+	s32 id = Meshes.binary_search(e);
+	return (id != -1) ? Meshes[id].Mesh : 0;
+}
+
+//! Get the name of a loaded mesh, based on its index.
+const io::SNamedPath &CMeshCache::getMeshName(u32 index) const
+{
+	if (index >= Meshes.size())
+		return emptyNamedPath;
+
+	return Meshes[index].NamedPath;
+}
+
+//! Get the name of a loaded mesh, if there is any.
+const io::SNamedPath &CMeshCache::getMeshName(const IMesh *const mesh) const
+{
+	if (!mesh)
+		return emptyNamedPath;
+
+	for (u32 i = 0; i < Meshes.size(); ++i) {
+		if (Meshes[i].Mesh == mesh || (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh))
+			return Meshes[i].NamedPath;
+	}
+
+	return emptyNamedPath;
+}
+
+//! Renames a loaded mesh.
+bool CMeshCache::renameMesh(u32 index, const io::path &name)
+{
+	if (index >= Meshes.size())
+		return false;
+
+	Meshes[index].NamedPath.setPath(name);
+	Meshes.sort();
+	return true;
+}
+
+//! Renames a loaded mesh.
+bool CMeshCache::renameMesh(const IMesh *const mesh, const io::path &name)
+{
+	for (u32 i = 0; i < Meshes.size(); ++i) {
+		if (Meshes[i].Mesh == mesh || (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh)) {
+			Meshes[i].NamedPath.setPath(name);
+			Meshes.sort();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+//! returns if a mesh already was loaded
+bool CMeshCache::isMeshLoaded(const io::path &name)
+{
+	return getMeshByName(name) != 0;
+}
+
+//! Clears the whole mesh cache, removing all meshes.
+void CMeshCache::clear()
+{
+	for (u32 i = 0; i < Meshes.size(); ++i)
+		Meshes[i].Mesh->drop();
+
+	Meshes.clear();
+}
+
+//! Clears all meshes that are held in the mesh cache but not used anywhere else.
+void CMeshCache::clearUnusedMeshes()
+{
+	for (u32 i = 0; i < Meshes.size(); ++i) {
+		if (Meshes[i].Mesh->getReferenceCount() == 1) {
+			Meshes[i].Mesh->drop();
+			Meshes.erase(i);
+			--i;
+		}
+	}
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CMeshCache.h b/irr/src/CMeshCache.h
new file mode 100644
index 000000000..1c2b52686
--- /dev/null
+++ b/irr/src/CMeshCache.h
@@ -0,0 +1,116 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMeshCache.h"
+#include "irrArray.h"
+
+namespace irr
+{
+
+namespace scene
+{
+class CMeshCache : public IMeshCache
+{
+public:
+	virtual ~CMeshCache();
+
+	//! Adds a mesh to the internal list of loaded meshes.
+	/** Usually, ISceneManager::getMesh() is called to load a mesh from file.
+	That method searches the list of loaded meshes if a mesh has already been loaded and
+	returns a pointer to if	it is in that list and already in memory. Otherwise it loads
+	the mesh. With IMeshCache::addMesh(), it is possible to pretend that a mesh already
+	has been loaded. This method can be used for example by mesh loaders who need to
+	load more than one mesh with one call. They can add additional meshes with this
+	method to the scene manager. The COLLADA loader for example uses this method.
+	\param filename: Filename of the mesh. When called ISceneManager::getMesh() with this
+	parameter, the method will return the mesh parameter given with this method.
+	\param mesh: Pointer to a mesh which will now be referenced by this name. */
+	void addMesh(const io::path &filename, IAnimatedMesh *mesh) override;
+
+	//! Removes a mesh from the cache.
+	/** After loading a mesh with getMesh(), the mesh can be removed from the cache
+	using this method, freeing a lot of memory. */
+	void removeMesh(const IMesh *const mesh) override;
+
+	//! Returns amount of loaded meshes in the cache.
+	/** You can load new meshes into the cache using getMesh() and addMesh().
+	If you ever need to access the internal mesh cache, you can do this using
+	removeMesh(), getMeshNumber(), getMeshByIndex() and getMeshFilename() */
+	u32 getMeshCount() const override;
+
+	//! Returns current index number of the mesh, and -1 if it is not in the cache.
+	s32 getMeshIndex(const IMesh *const mesh) const override;
+
+	//! Returns a mesh based on its index number.
+	/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
+	Note that this number is only valid until a new mesh is loaded or removed *
+	\return Returns pointer to the mesh or 0 if there is none with this number. */
+	IAnimatedMesh *getMeshByIndex(u32 index) override;
+
+	//! Returns a mesh based on its name.
+	/** \param name Name of the mesh. Usually a filename.
+	\return Pointer to the mesh or 0 if there is none with this number. */
+	IAnimatedMesh *getMeshByName(const io::path &name) override;
+
+	//! Get the name of a loaded mesh, based on its index.
+	/** \param index: Index of the mesh, number between 0 and getMeshCount()-1.
+	\return The name if mesh was found and has a name, else	the path is empty. */
+	const io::SNamedPath &getMeshName(u32 index) const override;
+
+	//! Get the name of a loaded mesh, if there is any.
+	/** \param mesh Pointer to mesh to query.
+	\return The name if mesh was found and has a name, else	the path is empty. */
+	const io::SNamedPath &getMeshName(const IMesh *const mesh) const override;
+
+	//! Renames a loaded mesh.
+	/** Note that renaming meshes might change the ordering of the
+	meshes, and so the index of the meshes as returned by
+	getMeshIndex() or taken by some methods will change.
+	\param index The index of the mesh in the cache.
+	\param name New name for the mesh.
+	\return True if mesh was renamed. */
+	bool renameMesh(u32 index, const io::path &name) override;
+
+	//! Renames a loaded mesh.
+	/** Note that renaming meshes might change the ordering of the
+	meshes, and so the index of the meshes as returned by
+	getMeshIndex() or taken by some methods will change.
+	\param mesh Mesh to be renamed.
+	\param name New name for the mesh.
+	\return True if mesh was renamed. */
+	bool renameMesh(const IMesh *const mesh, const io::path &name) override;
+
+	//! returns if a mesh already was loaded
+	bool isMeshLoaded(const io::path &name) override;
+
+	//! Clears the whole mesh cache, removing all meshes.
+	void clear() override;
+
+	//! Clears all meshes that are held in the mesh cache but not used anywhere else.
+	void clearUnusedMeshes() override;
+
+protected:
+	struct MeshEntry
+	{
+		MeshEntry(const io::path &name) :
+				NamedPath(name)
+		{
+		}
+		io::SNamedPath NamedPath;
+		IAnimatedMesh *Mesh;
+
+		bool operator<(const MeshEntry &other) const
+		{
+			return (NamedPath < other.NamedPath);
+		}
+	};
+
+	//! loaded meshes
+	core::array<MeshEntry> Meshes;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CMeshManipulator.cpp b/irr/src/CMeshManipulator.cpp
new file mode 100644
index 000000000..3309fea3f
--- /dev/null
+++ b/irr/src/CMeshManipulator.cpp
@@ -0,0 +1,218 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CMeshManipulator.h"
+#include "ISkinnedMesh.h"
+#include "SMesh.h"
+#include "CMeshBuffer.h"
+#include "SAnimatedMesh.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+static inline core::vector3df getAngleWeight(const core::vector3df &v1,
+		const core::vector3df &v2,
+		const core::vector3df &v3)
+{
+	// Calculate this triangle's weight for each of its three vertices
+	// start by calculating the lengths of its sides
+	const f32 a = v2.getDistanceFromSQ(v3);
+	const f32 asqrt = sqrtf(a);
+	const f32 b = v1.getDistanceFromSQ(v3);
+	const f32 bsqrt = sqrtf(b);
+	const f32 c = v1.getDistanceFromSQ(v2);
+	const f32 csqrt = sqrtf(c);
+
+	// use them to find the angle at each vertex
+	return core::vector3df(
+			acosf((b + c - a) / (2.f * bsqrt * csqrt)),
+			acosf((-b + c + a) / (2.f * asqrt * csqrt)),
+			acosf((b - c + a) / (2.f * bsqrt * asqrt)));
+}
+
+namespace
+{
+template <typename T>
+void recalculateNormalsT(IMeshBuffer *buffer, bool smooth, bool angleWeighted)
+{
+	const u32 vtxcnt = buffer->getVertexCount();
+	const u32 idxcnt = buffer->getIndexCount();
+	const T *idx = reinterpret_cast<T *>(buffer->getIndices());
+
+	if (!smooth) {
+		for (u32 i = 0; i < idxcnt; i += 3) {
+			const core::vector3df &v1 = buffer->getPosition(idx[i + 0]);
+			const core::vector3df &v2 = buffer->getPosition(idx[i + 1]);
+			const core::vector3df &v3 = buffer->getPosition(idx[i + 2]);
+			const core::vector3df normal = core::plane3d<f32>(v1, v2, v3).Normal;
+			buffer->getNormal(idx[i + 0]) = normal;
+			buffer->getNormal(idx[i + 1]) = normal;
+			buffer->getNormal(idx[i + 2]) = normal;
+		}
+	} else {
+		u32 i;
+
+		for (i = 0; i != vtxcnt; ++i)
+			buffer->getNormal(i).set(0.f, 0.f, 0.f);
+
+		for (i = 0; i < idxcnt; i += 3) {
+			const core::vector3df &v1 = buffer->getPosition(idx[i + 0]);
+			const core::vector3df &v2 = buffer->getPosition(idx[i + 1]);
+			const core::vector3df &v3 = buffer->getPosition(idx[i + 2]);
+			const core::vector3df normal = core::plane3d<f32>(v1, v2, v3).Normal;
+
+			core::vector3df weight(1.f, 1.f, 1.f);
+			if (angleWeighted)
+				weight = irr::scene::getAngleWeight(v1, v2, v3); // writing irr::scene:: necessary for borland
+
+			buffer->getNormal(idx[i + 0]) += weight.X * normal;
+			buffer->getNormal(idx[i + 1]) += weight.Y * normal;
+			buffer->getNormal(idx[i + 2]) += weight.Z * normal;
+		}
+
+		for (i = 0; i != vtxcnt; ++i)
+			buffer->getNormal(i).normalize();
+	}
+}
+}
+
+//! Recalculates all normals of the mesh buffer.
+/** \param buffer: Mesh buffer on which the operation is performed. */
+void CMeshManipulator::recalculateNormals(IMeshBuffer *buffer, bool smooth, bool angleWeighted) const
+{
+	if (!buffer)
+		return;
+
+	if (buffer->getIndexType() == video::EIT_16BIT)
+		recalculateNormalsT<u16>(buffer, smooth, angleWeighted);
+	else
+		recalculateNormalsT<u32>(buffer, smooth, angleWeighted);
+}
+
+//! Recalculates all normals of the mesh.
+//! \param mesh: Mesh on which the operation is performed.
+void CMeshManipulator::recalculateNormals(scene::IMesh *mesh, bool smooth, bool angleWeighted) const
+{
+	if (!mesh)
+		return;
+
+	if (mesh->getMeshType() == EAMT_SKINNED) {
+		ISkinnedMesh *smesh = (ISkinnedMesh *)mesh;
+		smesh->resetAnimation();
+	}
+
+	const u32 bcount = mesh->getMeshBufferCount();
+	for (u32 b = 0; b < bcount; ++b)
+		recalculateNormals(mesh->getMeshBuffer(b), smooth, angleWeighted);
+
+	if (mesh->getMeshType() == EAMT_SKINNED) {
+		ISkinnedMesh *smesh = (ISkinnedMesh *)mesh;
+		smesh->refreshJointCache();
+	}
+}
+
+//! Clones a static IMesh into a modifyable SMesh.
+// not yet 32bit
+SMesh *CMeshManipulator::createMeshCopy(scene::IMesh *mesh) const
+{
+	if (!mesh)
+		return 0;
+
+	SMesh *clone = new SMesh();
+
+	const u32 meshBufferCount = mesh->getMeshBufferCount();
+
+	for (u32 b = 0; b < meshBufferCount; ++b) {
+		const IMeshBuffer *const mb = mesh->getMeshBuffer(b);
+		switch (mb->getVertexType()) {
+		case video::EVT_STANDARD: {
+			SMeshBuffer *buffer = new SMeshBuffer();
+			buffer->Material = mb->getMaterial();
+			const u32 vcount = mb->getVertexCount();
+			buffer->Vertices.reallocate(vcount);
+			video::S3DVertex *vertices = (video::S3DVertex *)mb->getVertices();
+			for (u32 i = 0; i < vcount; ++i)
+				buffer->Vertices.push_back(vertices[i]);
+			const u32 icount = mb->getIndexCount();
+			buffer->Indices.reallocate(icount);
+			const u16 *indices = mb->getIndices();
+			for (u32 i = 0; i < icount; ++i)
+				buffer->Indices.push_back(indices[i]);
+			clone->addMeshBuffer(buffer);
+			buffer->drop();
+		} break;
+		case video::EVT_2TCOORDS: {
+			SMeshBufferLightMap *buffer = new SMeshBufferLightMap();
+			buffer->Material = mb->getMaterial();
+			const u32 vcount = mb->getVertexCount();
+			buffer->Vertices.reallocate(vcount);
+			video::S3DVertex2TCoords *vertices = (video::S3DVertex2TCoords *)mb->getVertices();
+			for (u32 i = 0; i < vcount; ++i)
+				buffer->Vertices.push_back(vertices[i]);
+			const u32 icount = mb->getIndexCount();
+			buffer->Indices.reallocate(icount);
+			const u16 *indices = mb->getIndices();
+			for (u32 i = 0; i < icount; ++i)
+				buffer->Indices.push_back(indices[i]);
+			clone->addMeshBuffer(buffer);
+			buffer->drop();
+		} break;
+		case video::EVT_TANGENTS: {
+			SMeshBufferTangents *buffer = new SMeshBufferTangents();
+			buffer->Material = mb->getMaterial();
+			const u32 vcount = mb->getVertexCount();
+			buffer->Vertices.reallocate(vcount);
+			video::S3DVertexTangents *vertices = (video::S3DVertexTangents *)mb->getVertices();
+			for (u32 i = 0; i < vcount; ++i)
+				buffer->Vertices.push_back(vertices[i]);
+			const u32 icount = mb->getIndexCount();
+			buffer->Indices.reallocate(icount);
+			const u16 *indices = mb->getIndices();
+			for (u32 i = 0; i < icount; ++i)
+				buffer->Indices.push_back(indices[i]);
+			clone->addMeshBuffer(buffer);
+			buffer->drop();
+		} break;
+		} // end switch
+
+	} // end for all mesh buffers
+
+	clone->BoundingBox = mesh->getBoundingBox();
+	return clone;
+}
+
+//! Returns amount of polygons in mesh.
+s32 CMeshManipulator::getPolyCount(scene::IMesh *mesh) const
+{
+	if (!mesh)
+		return 0;
+
+	s32 trianglecount = 0;
+
+	for (u32 g = 0; g < mesh->getMeshBufferCount(); ++g)
+		trianglecount += mesh->getMeshBuffer(g)->getIndexCount() / 3;
+
+	return trianglecount;
+}
+
+//! Returns amount of polygons in mesh.
+s32 CMeshManipulator::getPolyCount(scene::IAnimatedMesh *mesh) const
+{
+	if (mesh && mesh->getFrameCount() != 0)
+		return getPolyCount(mesh->getMesh(0));
+
+	return 0;
+}
+
+//! create a new AnimatedMesh and adds the mesh to it
+IAnimatedMesh *CMeshManipulator::createAnimatedMesh(scene::IMesh *mesh, scene::E_ANIMATED_MESH_TYPE type) const
+{
+	return new SAnimatedMesh(mesh, type);
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CMeshManipulator.h b/irr/src/CMeshManipulator.h
new file mode 100644
index 000000000..0377d6a3a
--- /dev/null
+++ b/irr/src/CMeshManipulator.h
@@ -0,0 +1,46 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMeshManipulator.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! An interface for easy manipulation of meshes.
+/** Scale, set alpha value, flip surfaces, and so on. This exists for fixing
+problems with wrong imported or exported meshes quickly after loading. It is
+not intended for doing mesh modifications and/or animations during runtime.
+*/
+class CMeshManipulator : public IMeshManipulator
+{
+public:
+	//! Recalculates all normals of the mesh.
+	/** \param mesh: Mesh on which the operation is performed.
+	\param smooth: Whether to use smoothed normals. */
+	void recalculateNormals(scene::IMesh *mesh, bool smooth = false, bool angleWeighted = false) const override;
+
+	//! Recalculates all normals of the mesh buffer.
+	/** \param buffer: Mesh buffer on which the operation is performed.
+	\param smooth: Whether to use smoothed normals. */
+	void recalculateNormals(IMeshBuffer *buffer, bool smooth = false, bool angleWeighted = false) const override;
+
+	//! Clones a static IMesh into a modifiable SMesh.
+	SMesh *createMeshCopy(scene::IMesh *mesh) const override;
+
+	//! Returns amount of polygons in mesh.
+	s32 getPolyCount(scene::IMesh *mesh) const override;
+
+	//! Returns amount of polygons in mesh.
+	s32 getPolyCount(scene::IAnimatedMesh *mesh) const override;
+
+	//! create a new AnimatedMesh and adds the mesh to it
+	IAnimatedMesh *createAnimatedMesh(scene::IMesh *mesh, scene::E_ANIMATED_MESH_TYPE type) const override;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CMeshSceneNode.cpp b/irr/src/CMeshSceneNode.cpp
new file mode 100644
index 000000000..7ff6cad55
--- /dev/null
+++ b/irr/src/CMeshSceneNode.cpp
@@ -0,0 +1,262 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CMeshSceneNode.h"
+#include "IVideoDriver.h"
+#include "ISceneManager.h"
+#include "S3DVertex.h"
+#include "ICameraSceneNode.h"
+#include "IMeshCache.h"
+#include "IAnimatedMesh.h"
+#include "IMaterialRenderer.h"
+#include "IFileSystem.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CMeshSceneNode::CMeshSceneNode(IMesh *mesh, ISceneNode *parent, ISceneManager *mgr, s32 id,
+		const core::vector3df &position, const core::vector3df &rotation,
+		const core::vector3df &scale) :
+		IMeshSceneNode(parent, mgr, id, position, rotation, scale),
+		Mesh(0),
+		PassCount(0), ReadOnlyMaterials(false)
+{
+#ifdef _DEBUG
+	setDebugName("CMeshSceneNode");
+#endif
+
+	setMesh(mesh);
+}
+
+//! destructor
+CMeshSceneNode::~CMeshSceneNode()
+{
+	if (Mesh)
+		Mesh->drop();
+}
+
+//! frame
+void CMeshSceneNode::OnRegisterSceneNode()
+{
+	if (IsVisible && Mesh) {
+		// because this node supports rendering of mixed mode meshes consisting of
+		// transparent and solid material at the same time, we need to go through all
+		// materials, check of what type they are and register this node for the right
+		// render pass according to that.
+
+		video::IVideoDriver *driver = SceneManager->getVideoDriver();
+
+		PassCount = 0;
+		int transparentCount = 0;
+		int solidCount = 0;
+
+		// count transparent and solid materials in this scene node
+		const u32 numMaterials = ReadOnlyMaterials ? Mesh->getMeshBufferCount() : Materials.size();
+		for (u32 i = 0; i < numMaterials; ++i) {
+			const video::SMaterial &material = ReadOnlyMaterials ? Mesh->getMeshBuffer(i)->getMaterial() : Materials[i];
+
+			if (driver->needsTransparentRenderPass(material))
+				++transparentCount;
+			else
+				++solidCount;
+
+			if (solidCount && transparentCount)
+				break;
+		}
+
+		// register according to material types counted
+
+		if (solidCount)
+			SceneManager->registerNodeForRendering(this, scene::ESNRP_SOLID);
+
+		if (transparentCount)
+			SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT);
+
+		ISceneNode::OnRegisterSceneNode();
+	}
+}
+
+//! renders the node.
+void CMeshSceneNode::render()
+{
+	video::IVideoDriver *driver = SceneManager->getVideoDriver();
+
+	if (!Mesh || !driver)
+		return;
+
+	const bool isTransparentPass =
+			SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT;
+
+	++PassCount;
+
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+	Box = Mesh->getBoundingBox();
+
+	for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i) {
+		scene::IMeshBuffer *mb = Mesh->getMeshBuffer(i);
+		if (mb) {
+			const video::SMaterial &material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
+
+			const bool transparent = driver->needsTransparentRenderPass(material);
+
+			// only render transparent buffer if this is the transparent render pass
+			// and solid only in solid pass
+			if (transparent == isTransparentPass) {
+				driver->setMaterial(material);
+				driver->drawMeshBuffer(mb);
+			}
+		}
+	}
+
+	// for debug purposes only:
+	if (DebugDataVisible && PassCount == 1) {
+		video::SMaterial m;
+		m.Lighting = false;
+		m.AntiAliasing = 0;
+		driver->setMaterial(m);
+
+		if (DebugDataVisible & scene::EDS_BBOX) {
+			driver->draw3DBox(Box, video::SColor(255, 255, 255, 255));
+		}
+		if (DebugDataVisible & scene::EDS_BBOX_BUFFERS) {
+			for (u32 g = 0; g < Mesh->getMeshBufferCount(); ++g) {
+				driver->draw3DBox(
+						Mesh->getMeshBuffer(g)->getBoundingBox(),
+						video::SColor(255, 190, 128, 128));
+			}
+		}
+
+		if (DebugDataVisible & scene::EDS_NORMALS) {
+			// draw normals
+			const f32 debugNormalLength = 1.f;
+			const video::SColor debugNormalColor = video::SColor(255, 34, 221, 221);
+			const u32 count = Mesh->getMeshBufferCount();
+
+			for (u32 i = 0; i != count; ++i) {
+				driver->drawMeshBufferNormals(Mesh->getMeshBuffer(i), debugNormalLength, debugNormalColor);
+			}
+		}
+
+		// show mesh
+		if (DebugDataVisible & scene::EDS_MESH_WIRE_OVERLAY) {
+			m.Wireframe = true;
+			driver->setMaterial(m);
+
+			for (u32 g = 0; g < Mesh->getMeshBufferCount(); ++g) {
+				driver->drawMeshBuffer(Mesh->getMeshBuffer(g));
+			}
+		}
+	}
+}
+
+//! Removes a child from this scene node.
+//! Implemented here, to be able to remove the shadow properly, if there is one,
+//! or to remove attached childs.
+bool CMeshSceneNode::removeChild(ISceneNode *child)
+{
+	return ISceneNode::removeChild(child);
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CMeshSceneNode::getBoundingBox() const
+{
+	return Mesh ? Mesh->getBoundingBox() : Box;
+}
+
+//! returns the material based on the zero based index i. To get the amount
+//! of materials used by this scene node, use getMaterialCount().
+//! This function is needed for inserting the node into the scene hierarchy on a
+//! optimal position for minimizing renderstate changes, but can also be used
+//! to directly modify the material of a scene node.
+video::SMaterial &CMeshSceneNode::getMaterial(u32 i)
+{
+	if (Mesh && ReadOnlyMaterials && i < Mesh->getMeshBufferCount()) {
+		ReadOnlyMaterial = Mesh->getMeshBuffer(i)->getMaterial();
+		return ReadOnlyMaterial;
+	}
+
+	if (i >= Materials.size())
+		return ISceneNode::getMaterial(i);
+
+	return Materials[i];
+}
+
+//! returns amount of materials used by this scene node.
+u32 CMeshSceneNode::getMaterialCount() const
+{
+	if (Mesh && ReadOnlyMaterials)
+		return Mesh->getMeshBufferCount();
+
+	return Materials.size();
+}
+
+//! Sets a new mesh
+void CMeshSceneNode::setMesh(IMesh *mesh)
+{
+	if (mesh) {
+		mesh->grab();
+		if (Mesh)
+			Mesh->drop();
+
+		Mesh = mesh;
+		copyMaterials();
+	}
+}
+
+void CMeshSceneNode::copyMaterials()
+{
+	Materials.clear();
+
+	if (Mesh) {
+		video::SMaterial mat;
+
+		for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i) {
+			IMeshBuffer *mb = Mesh->getMeshBuffer(i);
+			if (mb)
+				mat = mb->getMaterial();
+
+			Materials.push_back(mat);
+		}
+	}
+}
+
+//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
+referencing this mesh to change too. */
+void CMeshSceneNode::setReadOnlyMaterials(bool readonly)
+{
+	ReadOnlyMaterials = readonly;
+}
+
+//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+bool CMeshSceneNode::isReadOnlyMaterials() const
+{
+	return ReadOnlyMaterials;
+}
+
+//! Creates a clone of this scene node and its children.
+ISceneNode *CMeshSceneNode::clone(ISceneNode *newParent, ISceneManager *newManager)
+{
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
+
+	CMeshSceneNode *nb = new CMeshSceneNode(Mesh, newParent,
+			newManager, ID, RelativeTranslation, RelativeRotation, RelativeScale);
+
+	nb->cloneMembers(this, newManager);
+	nb->ReadOnlyMaterials = ReadOnlyMaterials;
+	nb->Materials = Materials;
+
+	if (newParent)
+		nb->drop();
+	return nb;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CMeshSceneNode.h b/irr/src/CMeshSceneNode.h
new file mode 100644
index 000000000..a00928748
--- /dev/null
+++ b/irr/src/CMeshSceneNode.h
@@ -0,0 +1,85 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMeshSceneNode.h"
+#include "IMesh.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class CMeshSceneNode : public IMeshSceneNode
+{
+public:
+	//! constructor
+	CMeshSceneNode(IMesh *mesh, ISceneNode *parent, ISceneManager *mgr, s32 id,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f));
+
+	//! destructor
+	virtual ~CMeshSceneNode();
+
+	//! frame
+	void OnRegisterSceneNode() override;
+
+	//! renders the node.
+	void render() override;
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! returns the material based on the zero based index i. To get the amount
+	//! of materials used by this scene node, use getMaterialCount().
+	//! This function is needed for inserting the node into the scene hierarchy on a
+	//! optimal position for minimizing renderstate changes, but can also be used
+	//! to directly modify the material of a scene node.
+	video::SMaterial &getMaterial(u32 i) override;
+
+	//! returns amount of materials used by this scene node.
+	u32 getMaterialCount() const override;
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_MESH; }
+
+	//! Sets a new mesh
+	void setMesh(IMesh *mesh) override;
+
+	//! Returns the current mesh
+	IMesh *getMesh(void) override { return Mesh; }
+
+	//! Sets if the scene node should not copy the materials of the mesh but use them in a read only style.
+	/* In this way it is possible to change the materials a mesh causing all mesh scene nodes
+	referencing this mesh to change too. */
+	void setReadOnlyMaterials(bool readonly) override;
+
+	//! Returns if the scene node should not copy the materials of the mesh but use them in a read only style
+	bool isReadOnlyMaterials() const override;
+
+	//! Creates a clone of this scene node and its children.
+	ISceneNode *clone(ISceneNode *newParent = 0, ISceneManager *newManager = 0) override;
+
+	//! Removes a child from this scene node.
+	//! Implemented here, to be able to remove the shadow properly, if there is one,
+	//! or to remove attached child.
+	bool removeChild(ISceneNode *child) override;
+
+protected:
+	void copyMaterials();
+
+	core::array<video::SMaterial> Materials;
+	core::aabbox3d<f32> Box;
+	video::SMaterial ReadOnlyMaterial;
+
+	IMesh *Mesh;
+
+	s32 PassCount;
+	bool ReadOnlyMaterials;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CNSOGLManager.h b/irr/src/CNSOGLManager.h
new file mode 100644
index 000000000..cdbb221b3
--- /dev/null
+++ b/irr/src/CNSOGLManager.h
@@ -0,0 +1,70 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_NSOGL_MANAGER_
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+#include "SColor.h"
+
+#import <AppKit/NSOpenGL.h>
+
+namespace irr
+{
+namespace video
+{
+// NSOpenGL manager.
+class CNSOGLManager : public IContextManager
+{
+public:
+	//! Constructor.
+	CNSOGLManager();
+
+	//! Destructor
+	~CNSOGLManager();
+
+	// Initialize
+	bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) override;
+
+	// Terminate
+	void terminate() override;
+
+	// Create surface.
+	bool generateSurface() override;
+
+	// Destroy surface.
+	void destroySurface() override;
+
+	// Create context.
+	bool generateContext() override;
+
+	// Destroy EGL context.
+	void destroyContext() override;
+
+	//! Get current context
+	const SExposedVideoData &getContext() const;
+
+	//! Change render context, disable old and activate new defined by videoData
+	bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero) override;
+
+	// Get procedure address.
+	void *getProcAddress(const std::string &procName) override;
+
+	// Swap buffers.
+	bool swapBuffers() override;
+
+private:
+	SIrrlichtCreationParameters Params;
+	SExposedVideoData PrimaryContext;
+	SExposedVideoData CurrentContext;
+
+	NSOpenGLPixelFormat *PixelFormat;
+};
+}
+}
+
+#endif
diff --git a/irr/src/CNSOGLManager.mm b/irr/src/CNSOGLManager.mm
new file mode 100644
index 000000000..c1e543e53
--- /dev/null
+++ b/irr/src/CNSOGLManager.mm
@@ -0,0 +1,234 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "CNSOGLManager.h"
+
+#ifdef _IRR_COMPILE_WITH_NSOGL_MANAGER_
+
+#include <mach-o/dyld.h>
+#include "os.h"
+
+namespace irr
+{
+namespace video
+{
+
+CNSOGLManager::CNSOGLManager() :
+		PrimaryContext(SExposedVideoData(0)), PixelFormat(nil)
+{
+#ifdef _DEBUG
+	setDebugName("CNSOGLManager");
+#endif
+}
+
+CNSOGLManager::~CNSOGLManager()
+{
+}
+
+bool CNSOGLManager::initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &videodata)
+{
+	Params = params;
+
+	return true;
+}
+
+void CNSOGLManager::terminate()
+{
+}
+
+bool CNSOGLManager::generateSurface()
+{
+	if (Params.DriverType == video::EDT_OPENGL) {
+		int alphaSize = Params.WithAlphaChannel ? 4 : 0;
+		int depthSize = Params.ZBufferBits;
+
+		if (Params.WithAlphaChannel && Params.Bits == 32)
+			alphaSize = 8;
+
+		NSOpenGLPixelFormatAttribute Attribs[] = {
+				NSOpenGLPFANoRecovery,
+				NSOpenGLPFAAccelerated,
+				NSOpenGLPFADoubleBuffer,
+				NSOpenGLPFADepthSize, static_cast<NSOpenGLPixelFormatAttribute>(depthSize),
+				NSOpenGLPFAColorSize, Params.Bits,
+				NSOpenGLPFAAlphaSize, static_cast<NSOpenGLPixelFormatAttribute>(alphaSize),
+				NSOpenGLPFASampleBuffers, 1,
+				NSOpenGLPFASamples, Params.AntiAlias,
+				NSOpenGLPFAStencilSize, static_cast<NSOpenGLPixelFormatAttribute>(Params.Stencilbuffer ? 1 : 0),
+				// NSOpenGLPFAFullScreen,
+				0,
+			};
+
+		u32 Steps = 6;
+
+		// Choose the best pixel format.
+		do {
+			switch (Steps) {
+			case 6: // decrease step.
+				--Steps;
+				break;
+			case 5: // samples
+				if (Attribs[12] > 2)
+					--Attribs[12];
+				else {
+					Attribs[10] = 0;
+					Attribs[12] = 0;
+					--Steps;
+				}
+				break;
+			case 4: // alpha
+				if (Attribs[8]) {
+					Attribs[8] = 0;
+
+					if (Params.AntiAlias) {
+						Attribs[10] = 1;
+						Attribs[12] = Params.AntiAlias;
+						Steps = 5;
+					}
+				} else
+					--Steps;
+				break;
+			case 3: // stencil
+				if (Attribs[14]) {
+					Attribs[14] = 0;
+
+					if (Params.AntiAlias) {
+						Attribs[10] = 1;
+						Attribs[12] = Params.AntiAlias;
+						Steps = 5;
+					}
+				} else
+					--Steps;
+				break;
+			case 2: // depth size
+				if (Attribs[4] > 16) {
+					Attribs[4] = Attribs[4] - 8;
+				} else
+					--Steps;
+				break;
+			case 1: // buffer size
+				if (Attribs[6] > 16) {
+					Attribs[6] = Attribs[6] - 8;
+				} else
+					--Steps;
+				break;
+			default:
+				os::Printer::log("Could not get pixel format.");
+				return false;
+			}
+
+			PixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:Attribs];
+		} while (PixelFormat == nil);
+
+		if (Params.AntiAlias && !Attribs[10])
+			os::Printer::log("No multisampling.");
+
+		if (Params.WithAlphaChannel && !Attribs[8])
+			os::Printer::log("No alpha.");
+
+		if (Params.Stencilbuffer && !Attribs[14])
+			os::Printer::log("No stencil buffer.");
+
+		if (Params.ZBufferBits > Attribs[4])
+			os::Printer::log("No full depth buffer.");
+
+		if (Params.Bits > Attribs[6])
+			os::Printer::log("No full color buffer.");
+	}
+
+	return true;
+}
+
+void CNSOGLManager::destroySurface()
+{
+	[PixelFormat release];
+	PixelFormat = nil;
+}
+
+bool CNSOGLManager::generateContext()
+{
+	NSOpenGLContext *Context = [[NSOpenGLContext alloc] initWithFormat:PixelFormat shareContext:nil];
+
+	GLint Vsync = Params.Vsync ? 1 : 0;
+	[Context setValues:&Vsync forParameter:NSOpenGLCPSwapInterval];
+
+	if (Context == nil) {
+		os::Printer::log("Could not create OpenGL context.", ELL_ERROR);
+		return false;
+	}
+
+	// set exposed data
+	CurrentContext.OpenGLOSX.Context = Context;
+
+	if (!PrimaryContext.OpenGLOSX.Context)
+		PrimaryContext.OpenGLOSX.Context = CurrentContext.OpenGLOSX.Context;
+
+	return true;
+}
+
+const SExposedVideoData &CNSOGLManager::getContext() const
+{
+	return CurrentContext;
+}
+
+bool CNSOGLManager::activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero)
+{
+	// TODO: handle restorePrimaryOnZero
+	if (videoData.OpenGLOSX.Context) {
+		if ((NSOpenGLContext *)videoData.OpenGLOSX.Context != [NSOpenGLContext currentContext]) {
+			[(NSOpenGLContext *)videoData.OpenGLOSX.Context makeCurrentContext];
+
+			CurrentContext = videoData;
+		}
+	}
+	// set back to main context
+	else {
+		if ((NSOpenGLContext *)PrimaryContext.OpenGLOSX.Context != [NSOpenGLContext currentContext]) {
+			[(NSOpenGLContext *)PrimaryContext.OpenGLOSX.Context makeCurrentContext];
+
+			CurrentContext = PrimaryContext;
+		}
+	}
+
+	return true;
+}
+
+void CNSOGLManager::destroyContext()
+{
+	if (CurrentContext.OpenGLOSX.Context) {
+		if (PrimaryContext.OpenGLOSX.Context == CurrentContext.OpenGLOSX.Context)
+			PrimaryContext.OpenGLOSX.Context = nil;
+
+		[(NSOpenGLContext *)CurrentContext.OpenGLOSX.Context makeCurrentContext];
+		[(NSOpenGLContext *)CurrentContext.OpenGLOSX.Context clearDrawable];
+		[(NSOpenGLContext *)CurrentContext.OpenGLOSX.Context release];
+		[NSOpenGLContext clearCurrentContext];
+
+		CurrentContext.OpenGLOSX.Context = nil;
+	}
+}
+
+// It appears that there is no separate GL proc address getter on OSX.
+// https://developer.apple.com/library/archive/documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_entrypts/opengl_entrypts.html
+void *CNSOGLManager::getProcAddress(const std::string &procName)
+{
+	NSSymbol symbol = NULL;
+	// Allocate a buffer for the name, an underscore prefix, and a cstring terminator.
+	std::string mangledName = "_" + procName;
+	if (NSIsSymbolNameDefined(mangledName.c_str()))
+		symbol = NSLookupAndBindSymbol(mangledName.c_str());
+	return symbol ? NSAddressOfSymbol(symbol) : NULL;
+}
+
+bool CNSOGLManager::swapBuffers()
+{
+	[(NSOpenGLContext *)CurrentContext.OpenGLOSX.Context flushBuffer];
+
+	return true;
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/CNullDriver.cpp b/irr/src/CNullDriver.cpp
new file mode 100644
index 000000000..92450e5d7
--- /dev/null
+++ b/irr/src/CNullDriver.cpp
@@ -0,0 +1,1780 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CNullDriver.h"
+#include "os.h"
+#include "CImage.h"
+#include "CAttributes.h"
+#include "IReadFile.h"
+#include "IWriteFile.h"
+#include "IImageLoader.h"
+#include "IImageWriter.h"
+#include "IMaterialRenderer.h"
+#include "IAnimatedMeshSceneNode.h"
+#include "CMeshManipulator.h"
+#include "CColorConverter.h"
+#include "IReferenceCounted.h"
+#include "IRenderTarget.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! creates a loader which is able to load windows bitmaps
+IImageLoader *createImageLoaderBMP();
+
+//! creates a loader which is able to load jpeg images
+IImageLoader *createImageLoaderJPG();
+
+//! creates a loader which is able to load targa images
+IImageLoader *createImageLoaderTGA();
+
+//! creates a loader which is able to load png images
+IImageLoader *createImageLoaderPNG();
+
+//! creates a writer which is able to save jpg images
+IImageWriter *createImageWriterJPG();
+
+//! creates a writer which is able to save png images
+IImageWriter *createImageWriterPNG();
+
+namespace
+{
+//! no-op material renderer
+class CDummyMaterialRenderer : public IMaterialRenderer
+{
+public:
+	CDummyMaterialRenderer() {}
+};
+}
+
+//! constructor
+CNullDriver::CNullDriver(io::IFileSystem *io, const core::dimension2d<u32> &screenSize) :
+		SharedRenderTarget(0), CurrentRenderTarget(0), CurrentRenderTargetSize(0, 0), FileSystem(io), MeshManipulator(0),
+		ViewPort(0, 0, 0, 0), ScreenSize(screenSize), PrimitivesDrawn(0), MinVertexCountForVBO(500),
+		TextureCreationFlags(0), OverrideMaterial2DEnabled(false), AllowZWriteOnTransparent(false)
+{
+#ifdef _DEBUG
+	setDebugName("CNullDriver");
+#endif
+
+	DriverAttributes = new io::CAttributes();
+	DriverAttributes->addInt("MaxTextures", MATERIAL_MAX_TEXTURES);
+	DriverAttributes->addInt("MaxSupportedTextures", MATERIAL_MAX_TEXTURES);
+	DriverAttributes->addInt("MaxAnisotropy", 1);
+	//	DriverAttributes->addInt("MaxUserClipPlanes", 0);
+	//	DriverAttributes->addInt("MaxAuxBuffers", 0);
+	DriverAttributes->addInt("MaxMultipleRenderTargets", 1);
+	DriverAttributes->addInt("MaxIndices", -1);
+	DriverAttributes->addInt("MaxTextureSize", -1);
+	//	DriverAttributes->addInt("MaxGeometryVerticesOut", 0);
+	//	DriverAttributes->addFloat("MaxTextureLODBias", 0.f);
+	DriverAttributes->addInt("Version", 1);
+	//	DriverAttributes->addInt("ShaderLanguageVersion", 0);
+	//	DriverAttributes->addInt("AntiAlias", 0);
+
+	setFog();
+
+	setTextureCreationFlag(ETCF_ALWAYS_32_BIT, true);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, true);
+	setTextureCreationFlag(ETCF_AUTO_GENERATE_MIP_MAPS, true);
+	setTextureCreationFlag(ETCF_ALLOW_MEMORY_COPY, true);
+
+	ViewPort = core::rect<s32>(core::position2d<s32>(0, 0), core::dimension2di(screenSize));
+
+	// create manipulator
+	MeshManipulator = new scene::CMeshManipulator();
+
+	if (FileSystem)
+		FileSystem->grab();
+
+	// create surface loaders and writers
+	SurfaceLoader.push_back(video::createImageLoaderTGA());
+	SurfaceLoader.push_back(video::createImageLoaderPNG());
+	SurfaceLoader.push_back(video::createImageLoaderJPG());
+	SurfaceLoader.push_back(video::createImageLoaderBMP());
+
+	SurfaceWriter.push_back(video::createImageWriterJPG());
+	SurfaceWriter.push_back(video::createImageWriterPNG());
+
+	// set ExposedData to 0
+	memset((void *)&ExposedData, 0, sizeof(ExposedData));
+	for (u32 i = 0; i < video::EVDF_COUNT; ++i)
+		FeatureEnabled[i] = true;
+
+	InitMaterial2D.AntiAliasing = video::EAAM_OFF;
+	InitMaterial2D.Lighting = false;
+	InitMaterial2D.ZWriteEnable = video::EZW_OFF;
+	InitMaterial2D.ZBuffer = video::ECFN_DISABLED;
+	InitMaterial2D.UseMipMaps = false;
+	InitMaterial2D.forEachTexture([](auto &tex) {
+		// Using ETMINF_LINEAR_MIPMAP_NEAREST (bilinear) for 2D graphics looks
+		// much better and doesn't have any downsides (e.g. regarding pixel art).
+		tex.MinFilter = video::ETMINF_LINEAR_MIPMAP_NEAREST;
+		tex.MagFilter = video::ETMAGF_NEAREST;
+		tex.TextureWrapU = video::ETC_REPEAT;
+		tex.TextureWrapV = video::ETC_REPEAT;
+		tex.TextureWrapW = video::ETC_REPEAT;
+	});
+	OverrideMaterial2D = InitMaterial2D;
+}
+
+//! destructor
+CNullDriver::~CNullDriver()
+{
+	if (DriverAttributes)
+		DriverAttributes->drop();
+
+	if (FileSystem)
+		FileSystem->drop();
+
+	if (MeshManipulator)
+		MeshManipulator->drop();
+
+	removeAllRenderTargets();
+
+	deleteAllTextures();
+
+	u32 i;
+	for (i = 0; i < SurfaceLoader.size(); ++i)
+		SurfaceLoader[i]->drop();
+
+	for (i = 0; i < SurfaceWriter.size(); ++i)
+		SurfaceWriter[i]->drop();
+
+	// delete material renderers
+	deleteMaterialRenders();
+
+	// delete hardware mesh buffers
+	removeAllHardwareBuffers();
+}
+
+//! Adds an external surface loader to the engine.
+void CNullDriver::addExternalImageLoader(IImageLoader *loader)
+{
+	if (!loader)
+		return;
+
+	loader->grab();
+	SurfaceLoader.push_back(loader);
+}
+
+//! Adds an external surface writer to the engine.
+void CNullDriver::addExternalImageWriter(IImageWriter *writer)
+{
+	if (!writer)
+		return;
+
+	writer->grab();
+	SurfaceWriter.push_back(writer);
+}
+
+//! Retrieve the number of image loaders
+u32 CNullDriver::getImageLoaderCount() const
+{
+	return SurfaceLoader.size();
+}
+
+//! Retrieve the given image loader
+IImageLoader *CNullDriver::getImageLoader(u32 n)
+{
+	if (n < SurfaceLoader.size())
+		return SurfaceLoader[n];
+	return 0;
+}
+
+//! Retrieve the number of image writers
+u32 CNullDriver::getImageWriterCount() const
+{
+	return SurfaceWriter.size();
+}
+
+//! Retrieve the given image writer
+IImageWriter *CNullDriver::getImageWriter(u32 n)
+{
+	if (n < SurfaceWriter.size())
+		return SurfaceWriter[n];
+	return 0;
+}
+
+//! deletes all textures
+void CNullDriver::deleteAllTextures()
+{
+	// we need to remove previously set textures which might otherwise be kept in the
+	// last set material member. Could be optimized to reduce state changes.
+	setMaterial(SMaterial());
+
+	// reset render targets.
+
+	for (u32 i = 0; i < RenderTargets.size(); ++i)
+		RenderTargets[i]->setTexture(0, 0);
+
+	// remove textures.
+
+	for (u32 i = 0; i < Textures.size(); ++i)
+		Textures[i].Surface->drop();
+
+	Textures.clear();
+
+	SharedDepthTextures.clear();
+}
+
+bool CNullDriver::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil, const SExposedVideoData &videoData, core::rect<s32> *sourceRect)
+{
+	PrimitivesDrawn = 0;
+	return true;
+}
+
+bool CNullDriver::endScene()
+{
+	FPSCounter.registerFrame(os::Timer::getRealTime(), PrimitivesDrawn);
+	updateAllHardwareBuffers();
+	updateAllOcclusionQueries();
+	return true;
+}
+
+//! Disable a feature of the driver.
+void CNullDriver::disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag)
+{
+	FeatureEnabled[feature] = !flag;
+}
+
+//! queries the features of the driver, returns true if feature is available
+bool CNullDriver::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
+{
+	return false;
+}
+
+//! Get attributes of the actual video driver
+const io::IAttributes &CNullDriver::getDriverAttributes() const
+{
+	return *DriverAttributes;
+}
+
+//! sets transformation
+void CNullDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat)
+{
+}
+
+//! Returns the transformation set by setTransform
+const core::matrix4 &CNullDriver::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return TransformationMatrix;
+}
+
+//! sets a material
+void CNullDriver::setMaterial(const SMaterial &material)
+{
+}
+
+//! Removes a texture from the texture cache and deletes it, freeing lot of
+//! memory.
+void CNullDriver::removeTexture(ITexture *texture)
+{
+	if (!texture)
+		return;
+	SSurface s;
+	s.Surface = texture;
+
+	s32 last;
+	s32 first = Textures.binary_search_multi(s, last);
+	if (first == -1)
+		return;
+	for (u32 i = first; i <= (u32)last; i++) {
+		if (Textures[i].Surface == texture) {
+			texture->drop();
+			Textures.erase(i);
+			return;
+		}
+	}
+}
+
+//! Removes all texture from the texture cache and deletes them, freeing lot of
+//! memory.
+void CNullDriver::removeAllTextures()
+{
+	setMaterial(SMaterial());
+	deleteAllTextures();
+}
+
+//! Returns amount of textures currently loaded
+u32 CNullDriver::getTextureCount() const
+{
+	return Textures.size();
+}
+
+ITexture *CNullDriver::addTexture(const core::dimension2d<u32> &size, const io::path &name, ECOLOR_FORMAT format)
+{
+	if (0 == name.size()) {
+		os::Printer::log("Could not create ITexture, texture needs to have a non-empty name.", ELL_WARNING);
+		return 0;
+	}
+
+	IImage *image = new CImage(format, size);
+	ITexture *t = 0;
+
+	if (checkImage(image)) {
+		t = createDeviceDependentTexture(name, image);
+	}
+
+	image->drop();
+
+	if (t) {
+		addTexture(t);
+		t->drop();
+	}
+
+	return t;
+}
+
+ITexture *CNullDriver::addTexture(const io::path &name, IImage *image)
+{
+	if (0 == name.size()) {
+		os::Printer::log("Could not create ITexture, texture needs to have a non-empty name.", ELL_WARNING);
+		return 0;
+	}
+
+	if (!image)
+		return 0;
+
+	ITexture *t = 0;
+
+	if (checkImage(image)) {
+		t = createDeviceDependentTexture(name, image);
+	}
+
+	if (t) {
+		addTexture(t);
+		t->drop();
+	}
+
+	return t;
+}
+
+ITexture *CNullDriver::addTextureCubemap(const io::path &name, IImage *imagePosX, IImage *imageNegX, IImage *imagePosY,
+		IImage *imageNegY, IImage *imagePosZ, IImage *imageNegZ)
+{
+	if (0 == name.size() || !imagePosX || !imageNegX || !imagePosY || !imageNegY || !imagePosZ || !imageNegZ)
+		return 0;
+
+	ITexture *t = 0;
+
+	core::array<IImage *> imageArray(6);
+	imageArray.push_back(imagePosX);
+	imageArray.push_back(imageNegX);
+	imageArray.push_back(imagePosY);
+	imageArray.push_back(imageNegY);
+	imageArray.push_back(imagePosZ);
+	imageArray.push_back(imageNegZ);
+
+	if (checkImage(imageArray)) {
+		t = createDeviceDependentTextureCubemap(name, imageArray);
+	}
+
+	if (t) {
+		addTexture(t);
+		t->drop();
+	}
+
+	return t;
+}
+
+ITexture *CNullDriver::addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format)
+{
+	if (0 == sideLen)
+		return 0;
+
+	if (0 == name.size()) {
+		os::Printer::log("Could not create ITexture, texture needs to have a non-empty name.", ELL_WARNING);
+		return 0;
+	}
+
+	core::array<IImage *> imageArray(6);
+	for (int i = 0; i < 6; ++i)
+		imageArray.push_back(new CImage(format, core::dimension2du(sideLen, sideLen)));
+
+	ITexture *t = 0;
+	if (checkImage(imageArray)) {
+		t = createDeviceDependentTextureCubemap(name, imageArray);
+
+		if (t) {
+			addTexture(t);
+			t->drop();
+		}
+	}
+
+	for (int i = 0; i < 6; ++i)
+		imageArray[i]->drop();
+
+	return t;
+}
+
+//! loads a Texture
+ITexture *CNullDriver::getTexture(const io::path &filename)
+{
+	// Identify textures by their absolute filenames if possible.
+	const io::path absolutePath = FileSystem->getAbsolutePath(filename);
+
+	ITexture *texture = findTexture(absolutePath);
+	if (texture) {
+		texture->updateSource(ETS_FROM_CACHE);
+		return texture;
+	}
+
+	// Then try the raw filename, which might be in an Archive
+	texture = findTexture(filename);
+	if (texture) {
+		texture->updateSource(ETS_FROM_CACHE);
+		return texture;
+	}
+
+	// Now try to open the file using the complete path.
+	io::IReadFile *file = FileSystem->createAndOpenFile(absolutePath);
+
+	if (!file) {
+		// Try to open it using the raw filename.
+		file = FileSystem->createAndOpenFile(filename);
+	}
+
+	if (file) {
+		// Re-check name for actual archive names
+		texture = findTexture(file->getFileName());
+		if (texture) {
+			texture->updateSource(ETS_FROM_CACHE);
+			file->drop();
+			return texture;
+		}
+
+		texture = loadTextureFromFile(file);
+		file->drop();
+
+		if (texture) {
+			texture->updateSource(ETS_FROM_FILE);
+			addTexture(texture);
+			texture->drop(); // drop it because we created it, one grab too much
+		} else
+			os::Printer::log("Could not load texture", filename, ELL_ERROR);
+		return texture;
+	} else {
+		os::Printer::log("Could not open file of texture", filename, ELL_WARNING);
+		return 0;
+	}
+}
+
+//! loads a Texture
+ITexture *CNullDriver::getTexture(io::IReadFile *file)
+{
+	ITexture *texture = 0;
+
+	if (file) {
+		texture = findTexture(file->getFileName());
+
+		if (texture) {
+			texture->updateSource(ETS_FROM_CACHE);
+			return texture;
+		}
+
+		texture = loadTextureFromFile(file);
+
+		if (texture) {
+			texture->updateSource(ETS_FROM_FILE);
+			addTexture(texture);
+			texture->drop(); // drop it because we created it, one grab too much
+		}
+
+		if (!texture)
+			os::Printer::log("Could not load texture", file->getFileName(), ELL_WARNING);
+	}
+
+	return texture;
+}
+
+//! opens the file and loads it into the surface
+video::ITexture *CNullDriver::loadTextureFromFile(io::IReadFile *file, const io::path &hashName)
+{
+	ITexture *texture = nullptr;
+
+	IImage *image = createImageFromFile(file);
+	if (!image)
+		return nullptr;
+
+	if (checkImage(image)) {
+		texture = createDeviceDependentTexture(hashName.size() ? hashName : file->getFileName(), image);
+		if (texture)
+			os::Printer::log("Loaded texture", file->getFileName(), ELL_DEBUG);
+	}
+
+	image->drop();
+
+	return texture;
+}
+
+//! adds a surface, not loaded or created by the Irrlicht Engine
+void CNullDriver::addTexture(video::ITexture *texture)
+{
+	if (texture) {
+		SSurface s;
+		s.Surface = texture;
+		texture->grab();
+
+		Textures.push_back(s);
+
+		// the new texture is now at the end of the texture list. when searching for
+		// the next new texture, the texture array will be sorted and the index of this texture
+		// will be changed.
+	}
+}
+
+//! looks if the image is already loaded
+video::ITexture *CNullDriver::findTexture(const io::path &filename)
+{
+	SSurface s;
+	SDummyTexture dummy(filename, ETT_2D);
+	s.Surface = &dummy;
+
+	s32 index = Textures.binary_search(s);
+	if (index != -1)
+		return Textures[index].Surface;
+
+	return 0;
+}
+
+ITexture *CNullDriver::createDeviceDependentTexture(const io::path &name, IImage *image)
+{
+	SDummyTexture *dummy = new SDummyTexture(name, ETT_2D);
+	dummy->setSize(image->getDimension());
+	return dummy;
+}
+
+ITexture *CNullDriver::createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image)
+{
+	return new SDummyTexture(name, ETT_CUBEMAP);
+}
+
+bool CNullDriver::setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil)
+{
+	return false;
+}
+
+bool CNullDriver::setRenderTarget(ITexture *texture, u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil)
+{
+	if (texture) {
+		// create render target if require.
+		if (!SharedRenderTarget)
+			SharedRenderTarget = addRenderTarget();
+
+		ITexture *depthTexture = 0;
+
+		// try to find available depth texture with require size.
+		for (u32 i = 0; i < SharedDepthTextures.size(); ++i) {
+			if (SharedDepthTextures[i]->getSize() == texture->getSize()) {
+				depthTexture = SharedDepthTextures[i];
+
+				break;
+			}
+		}
+
+		// create depth texture if require.
+		if (!depthTexture) {
+			depthTexture = addRenderTargetTexture(texture->getSize(), "IRR_DEPTH_STENCIL", video::ECF_D24S8);
+			SharedDepthTextures.push_back(depthTexture);
+		}
+
+		SharedRenderTarget->setTexture(texture, depthTexture);
+
+		return setRenderTargetEx(SharedRenderTarget, clearFlag, clearColor, clearDepth, clearStencil);
+	} else {
+		return setRenderTargetEx(0, clearFlag, clearColor, clearDepth, clearStencil);
+	}
+}
+
+//! sets a viewport
+void CNullDriver::setViewPort(const core::rect<s32> &area)
+{
+}
+
+//! gets the area of the current viewport
+const core::rect<s32> &CNullDriver::getViewPort() const
+{
+	return ViewPort;
+}
+
+//! draws a vertex primitive list
+void CNullDriver::drawVertexPrimitiveList(const void *vertices, u32 vertexCount, const void *indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if ((iType == EIT_16BIT) && (vertexCount > 65536))
+		os::Printer::log("Too many vertices for 16bit index type, render artifacts may occur.");
+	PrimitivesDrawn += primitiveCount;
+}
+
+//! draws a vertex primitive list in 2d
+void CNullDriver::draw2DVertexPrimitiveList(const void *vertices, u32 vertexCount, const void *indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if ((iType == EIT_16BIT) && (vertexCount > 65536))
+		os::Printer::log("Too many vertices for 16bit index type, render artifacts may occur.");
+	PrimitivesDrawn += primitiveCount;
+}
+
+//! Draws a 3d line.
+void CNullDriver::draw3DLine(const core::vector3df &start,
+		const core::vector3df &end, SColor color)
+{
+}
+
+//! Draws a 3d axis aligned box.
+void CNullDriver::draw3DBox(const core::aabbox3d<f32> &box, SColor color)
+{
+	core::vector3df edges[8];
+	box.getEdges(edges);
+
+	// TODO: optimize into one big drawIndexPrimitive call.
+
+	draw3DLine(edges[5], edges[1], color);
+	draw3DLine(edges[1], edges[3], color);
+	draw3DLine(edges[3], edges[7], color);
+	draw3DLine(edges[7], edges[5], color);
+	draw3DLine(edges[0], edges[2], color);
+	draw3DLine(edges[2], edges[6], color);
+	draw3DLine(edges[6], edges[4], color);
+	draw3DLine(edges[4], edges[0], color);
+	draw3DLine(edges[1], edges[0], color);
+	draw3DLine(edges[3], edges[2], color);
+	draw3DLine(edges[7], edges[6], color);
+	draw3DLine(edges[5], edges[4], color);
+}
+
+//! draws an 2d image
+void CNullDriver::draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos, bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	draw2DImage(texture, destPos, core::rect<s32>(core::position2d<s32>(0, 0), core::dimension2di(texture->getOriginalSize())),
+			0,
+			SColor(255, 255, 255, 255),
+			useAlphaChannelOfTexture);
+}
+
+//! draws a set of 2d images, using a color and the alpha channel of the
+//! texture if desired.
+void CNullDriver::draw2DImageBatch(const video::ITexture *texture,
+		const core::array<core::position2d<s32>> &positions,
+		const core::array<core::rect<s32>> &sourceRects,
+		const core::rect<s32> *clipRect,
+		SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	const irr::u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
+
+	for (u32 i = 0; i < drawCount; ++i) {
+		draw2DImage(texture, positions[i], sourceRects[i],
+				clipRect, color, useAlphaChannelOfTexture);
+	}
+}
+
+//! Draws a part of the texture into the rectangle.
+void CNullDriver::draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect,
+		const video::SColor *const colors, bool useAlphaChannelOfTexture)
+{
+	if (destRect.isValid())
+		draw2DImage(texture, core::position2d<s32>(destRect.UpperLeftCorner),
+				sourceRect, clipRect, colors ? colors[0] : video::SColor(0xffffffff),
+				useAlphaChannelOfTexture);
+}
+
+//! Draws a 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+void CNullDriver::draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+		const core::rect<s32> &sourceRect,
+		const core::rect<s32> *clipRect, SColor color,
+		bool useAlphaChannelOfTexture)
+{
+}
+
+//! Draw a 2d rectangle
+void CNullDriver::draw2DRectangle(SColor color, const core::rect<s32> &pos, const core::rect<s32> *clip)
+{
+	draw2DRectangle(pos, color, color, color, color, clip);
+}
+
+//! Draws a 2d rectangle with a gradient.
+void CNullDriver::draw2DRectangle(const core::rect<s32> &pos,
+		SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+		const core::rect<s32> *clip)
+{
+}
+
+//! Draws a 2d line.
+void CNullDriver::draw2DLine(const core::position2d<s32> &start,
+		const core::position2d<s32> &end, SColor color)
+{
+}
+
+//! returns color format
+ECOLOR_FORMAT CNullDriver::getColorFormat() const
+{
+	return ECF_R5G6B5;
+}
+
+//! returns screen size
+const core::dimension2d<u32> &CNullDriver::getScreenSize() const
+{
+	return ScreenSize;
+}
+
+//! get current render target
+IRenderTarget *CNullDriver::getCurrentRenderTarget() const
+{
+	return CurrentRenderTarget;
+}
+
+const core::dimension2d<u32> &CNullDriver::getCurrentRenderTargetSize() const
+{
+	if (CurrentRenderTargetSize.Width == 0)
+		return ScreenSize;
+	else
+		return CurrentRenderTargetSize;
+}
+
+// returns current frames per second value
+s32 CNullDriver::getFPS() const
+{
+	return FPSCounter.getFPS();
+}
+
+//! returns amount of primitives (mostly triangles) were drawn in the last frame.
+//! very useful method for statistics.
+u32 CNullDriver::getPrimitiveCountDrawn(u32 param) const
+{
+	return (0 == param) ? FPSCounter.getPrimitive() : (1 == param) ? FPSCounter.getPrimitiveAverage()
+																   : FPSCounter.getPrimitiveTotal();
+}
+
+//! Sets the dynamic ambient light color. The default color is
+//! (0,0,0,0) which means it is dark.
+//! \param color: New color of the ambient light.
+void CNullDriver::setAmbientLight(const SColorf &color)
+{
+	AmbientLight = color;
+}
+
+const SColorf &CNullDriver::getAmbientLight() const
+{
+	return AmbientLight;
+}
+
+//! \return Returns the name of the video driver. Example: In case of the DIRECT3D8
+//! driver, it would return "Direct3D8".
+
+const char *CNullDriver::getName() const
+{
+	return "Irrlicht NullDevice";
+}
+
+//! Creates a boolean alpha channel of the texture based of an color key.
+void CNullDriver::makeColorKeyTexture(video::ITexture *texture,
+		video::SColor color) const
+{
+	if (!texture)
+		return;
+
+	if (texture->getColorFormat() != ECF_A1R5G5B5 &&
+			texture->getColorFormat() != ECF_A8R8G8B8) {
+		os::Printer::log("Error: Unsupported texture color format for making color key channel.", ELL_ERROR);
+		return;
+	}
+
+	if (texture->getColorFormat() == ECF_A1R5G5B5) {
+		u16 *p = (u16 *)texture->lock();
+
+		if (!p) {
+			os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR);
+			return;
+		}
+
+		const core::dimension2d<u32> dim = texture->getSize();
+		const u32 pitch = texture->getPitch() / 2;
+
+		// color with alpha disabled (i.e. fully transparent)
+		const u16 refZeroAlpha = (0x7fff & color.toA1R5G5B5());
+
+		const u32 pixels = pitch * dim.Height;
+
+		for (u32 pixel = 0; pixel < pixels; ++pixel) {
+			// If the color matches the reference color, ignoring alphas,
+			// set the alpha to zero.
+			if (((*p) & 0x7fff) == refZeroAlpha)
+				(*p) = refZeroAlpha;
+
+			++p;
+		}
+
+		texture->unlock();
+	} else {
+		u32 *p = (u32 *)texture->lock();
+
+		if (!p) {
+			os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR);
+			return;
+		}
+
+		core::dimension2d<u32> dim = texture->getSize();
+		u32 pitch = texture->getPitch() / 4;
+
+		// color with alpha disabled (fully transparent)
+		const u32 refZeroAlpha = 0x00ffffff & color.color;
+
+		const u32 pixels = pitch * dim.Height;
+		for (u32 pixel = 0; pixel < pixels; ++pixel) {
+			// If the color matches the reference color, ignoring alphas,
+			// set the alpha to zero.
+			if (((*p) & 0x00ffffff) == refZeroAlpha)
+				(*p) = refZeroAlpha;
+
+			++p;
+		}
+
+		texture->unlock();
+	}
+	texture->regenerateMipMapLevels();
+}
+
+//! Creates an boolean alpha channel of the texture based of an color key position.
+void CNullDriver::makeColorKeyTexture(video::ITexture *texture,
+		core::position2d<s32> colorKeyPixelPos) const
+{
+	if (!texture)
+		return;
+
+	if (texture->getColorFormat() != ECF_A1R5G5B5 &&
+			texture->getColorFormat() != ECF_A8R8G8B8) {
+		os::Printer::log("Error: Unsupported texture color format for making color key channel.", ELL_ERROR);
+		return;
+	}
+
+	SColor colorKey;
+
+	if (texture->getColorFormat() == ECF_A1R5G5B5) {
+		u16 *p = (u16 *)texture->lock(ETLM_READ_ONLY);
+
+		if (!p) {
+			os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR);
+			return;
+		}
+
+		u32 pitch = texture->getPitch() / 2;
+
+		const u16 key16Bit = 0x7fff & p[colorKeyPixelPos.Y * pitch + colorKeyPixelPos.X];
+
+		colorKey = video::A1R5G5B5toA8R8G8B8(key16Bit);
+	} else {
+		u32 *p = (u32 *)texture->lock(ETLM_READ_ONLY);
+
+		if (!p) {
+			os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR);
+			return;
+		}
+
+		u32 pitch = texture->getPitch() / 4;
+		colorKey = 0x00ffffff & p[colorKeyPixelPos.Y * pitch + colorKeyPixelPos.X];
+	}
+
+	texture->unlock();
+	makeColorKeyTexture(texture, colorKey);
+}
+
+//! Returns the maximum amount of primitives (mostly vertices) which
+//! the device is able to render with one drawIndexedTriangleList
+//! call.
+u32 CNullDriver::getMaximalPrimitiveCount() const
+{
+	return 0xFFFFFFFF;
+}
+
+//! checks triangle count and print warning if wrong
+bool CNullDriver::checkPrimitiveCount(u32 prmCount) const
+{
+	const u32 m = getMaximalPrimitiveCount();
+
+	if (prmCount > m) {
+		char tmp[128];
+		snprintf_irr(tmp, sizeof(tmp), "Could not draw triangles, too many primitives(%u), maximum is %u.", prmCount, m);
+		os::Printer::log(tmp, ELL_ERROR);
+		return false;
+	}
+
+	return true;
+}
+
+bool CNullDriver::checkImage(IImage *image) const
+{
+	return true;
+}
+
+bool CNullDriver::checkImage(const core::array<IImage *> &image) const
+{
+	if (!image.size())
+		return false;
+
+	ECOLOR_FORMAT lastFormat = image[0]->getColorFormat();
+	core::dimension2d<u32> lastSize = image[0]->getDimension();
+
+	for (u32 i = 0; i < image.size(); ++i) {
+		ECOLOR_FORMAT format = image[i]->getColorFormat();
+		core::dimension2d<u32> size = image[i]->getDimension();
+
+		if (!checkImage(image[i]))
+			return false;
+
+		if (format != lastFormat || size != lastSize)
+			return false;
+	}
+	return true;
+}
+
+//! Enables or disables a texture creation flag.
+void CNullDriver::setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled)
+{
+	if (enabled && ((flag == ETCF_ALWAYS_16_BIT) || (flag == ETCF_ALWAYS_32_BIT) || (flag == ETCF_OPTIMIZED_FOR_QUALITY) || (flag == ETCF_OPTIMIZED_FOR_SPEED))) {
+		// disable other formats
+		setTextureCreationFlag(ETCF_ALWAYS_16_BIT, false);
+		setTextureCreationFlag(ETCF_ALWAYS_32_BIT, false);
+		setTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY, false);
+		setTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED, false);
+	}
+
+	// set flag
+	TextureCreationFlags = (TextureCreationFlags & (~flag)) |
+						   ((((u32)!enabled) - 1) & flag);
+}
+
+//! Returns if a texture creation flag is enabled or disabled.
+bool CNullDriver::getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const
+{
+	return (TextureCreationFlags & flag) != 0;
+}
+
+IImage *CNullDriver::createImageFromFile(const io::path &filename)
+{
+	if (!filename.size())
+		return nullptr;
+
+	io::IReadFile *file = FileSystem->createAndOpenFile(filename);
+	if (!file) {
+		os::Printer::log("Could not open file of image", filename, ELL_WARNING);
+		return nullptr;
+	}
+
+	IImage *image = createImageFromFile(file);
+	file->drop();
+	return image;
+}
+
+IImage *CNullDriver::createImageFromFile(io::IReadFile *file)
+{
+	if (!file)
+		return nullptr;
+
+	// try to load file based on file extension
+	for (int i = SurfaceLoader.size() - 1; i >= 0; --i) {
+		if (!SurfaceLoader[i]->isALoadableFileExtension(file->getFileName()))
+			continue;
+
+		file->seek(0); // reset file position which might have changed due to previous loadImage calls
+		// avoid warnings if extension is wrong
+		if (!SurfaceLoader[i]->isALoadableFileFormat(file))
+			continue;
+
+		file->seek(0);
+		if (IImage *image = SurfaceLoader[i]->loadImage(file))
+			return image;
+	}
+
+	// try to load file based on what is in it
+	for (int i = SurfaceLoader.size() - 1; i >= 0; --i) {
+		if (SurfaceLoader[i]->isALoadableFileExtension(file->getFileName()))
+			continue;  // extension was tried above already
+		file->seek(0); // dito
+		if (!SurfaceLoader[i]->isALoadableFileFormat(file))
+			continue;
+
+		file->seek(0);
+		if (IImage *image = SurfaceLoader[i]->loadImage(file))
+			return image;
+	}
+
+	return nullptr;
+}
+
+//! Writes the provided image to disk file
+bool CNullDriver::writeImageToFile(IImage *image, const io::path &filename, u32 param)
+{
+	io::IWriteFile *file = FileSystem->createAndWriteFile(filename);
+	if (!file)
+		return false;
+
+	bool result = writeImageToFile(image, file, param);
+	file->drop();
+
+	return result;
+}
+
+//! Writes the provided image to a file.
+bool CNullDriver::writeImageToFile(IImage *image, io::IWriteFile *file, u32 param)
+{
+	if (!file)
+		return false;
+
+	for (s32 i = SurfaceWriter.size() - 1; i >= 0; --i) {
+		if (SurfaceWriter[i]->isAWriteableFileExtension(file->getFileName())) {
+			bool written = SurfaceWriter[i]->writeImage(file, image, param);
+			if (written)
+				return true;
+		}
+	}
+	return false; // failed to write
+}
+
+//! Creates a software image from a byte array.
+IImage *CNullDriver::createImageFromData(ECOLOR_FORMAT format,
+		const core::dimension2d<u32> &size, void *data, bool ownForeignMemory,
+		bool deleteMemory)
+{
+	return new CImage(format, size, data, ownForeignMemory, deleteMemory);
+}
+
+//! Creates an empty software image.
+IImage *CNullDriver::createImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size)
+{
+	return new CImage(format, size);
+}
+
+//! Creates a software image from part of a texture.
+IImage *CNullDriver::createImage(ITexture *texture, const core::position2d<s32> &pos, const core::dimension2d<u32> &size)
+{
+	if ((pos == core::position2di(0, 0)) && (size == texture->getSize())) {
+		void *data = texture->lock(ETLM_READ_ONLY);
+		if (!data)
+			return 0;
+		IImage *image = new CImage(texture->getColorFormat(), size, data, false, false);
+		texture->unlock();
+		return image;
+	} else {
+		// make sure to avoid buffer overruns
+		// make the vector a separate variable for g++ 3.x
+		const core::vector2d<u32> leftUpper(core::clamp(static_cast<u32>(pos.X), 0u, texture->getSize().Width),
+				core::clamp(static_cast<u32>(pos.Y), 0u, texture->getSize().Height));
+		const core::rect<u32> clamped(leftUpper,
+				core::dimension2du(core::clamp(static_cast<u32>(size.Width), 0u, texture->getSize().Width),
+						core::clamp(static_cast<u32>(size.Height), 0u, texture->getSize().Height)));
+		if (!clamped.isValid())
+			return 0;
+		u8 *src = static_cast<u8 *>(texture->lock(ETLM_READ_ONLY));
+		if (!src)
+			return 0;
+		IImage *image = new CImage(texture->getColorFormat(), clamped.getSize());
+		u8 *dst = static_cast<u8 *>(image->getData());
+		src += clamped.UpperLeftCorner.Y * texture->getPitch() + image->getBytesPerPixel() * clamped.UpperLeftCorner.X;
+		for (u32 i = 0; i < clamped.getHeight(); ++i) {
+			video::CColorConverter::convert_viaFormat(src, texture->getColorFormat(), clamped.getWidth(), dst, image->getColorFormat());
+			src += texture->getPitch();
+			dst += image->getPitch();
+		}
+		texture->unlock();
+		return image;
+	}
+}
+
+//! Sets the fog mode.
+void CNullDriver::setFog(SColor color, E_FOG_TYPE fogType, f32 start, f32 end,
+		f32 density, bool pixelFog, bool rangeFog)
+{
+	FogColor = color;
+	FogType = fogType;
+	FogStart = start;
+	FogEnd = end;
+	FogDensity = density;
+	PixelFog = pixelFog;
+	RangeFog = rangeFog;
+}
+
+//! Gets the fog mode.
+void CNullDriver::getFog(SColor &color, E_FOG_TYPE &fogType, f32 &start, f32 &end,
+		f32 &density, bool &pixelFog, bool &rangeFog)
+{
+	color = FogColor;
+	fogType = FogType;
+	start = FogStart;
+	end = FogEnd;
+	density = FogDensity;
+	pixelFog = PixelFog;
+	rangeFog = RangeFog;
+}
+
+//! Draws a mesh buffer
+void CNullDriver::drawMeshBuffer(const scene::IMeshBuffer *mb)
+{
+	if (!mb)
+		return;
+
+	// IVertexBuffer and IIndexBuffer later
+	SHWBufferLink *HWBuffer = getBufferLink(mb);
+
+	if (HWBuffer)
+		drawHardwareBuffer(HWBuffer);
+	else
+		drawVertexPrimitiveList(mb->getVertices(), mb->getVertexCount(), mb->getIndices(), mb->getPrimitiveCount(), mb->getVertexType(), mb->getPrimitiveType(), mb->getIndexType());
+}
+
+//! Draws the normals of a mesh buffer
+void CNullDriver::drawMeshBufferNormals(const scene::IMeshBuffer *mb, f32 length, SColor color)
+{
+	const u32 count = mb->getVertexCount();
+	const bool normalize = mb->getMaterial().NormalizeNormals;
+
+	for (u32 i = 0; i < count; ++i) {
+		core::vector3df normalizedNormal = mb->getNormal(i);
+		if (normalize)
+			normalizedNormal.normalize();
+
+		const core::vector3df &pos = mb->getPosition(i);
+		draw3DLine(pos, pos + (normalizedNormal * length), color);
+	}
+}
+
+CNullDriver::SHWBufferLink *CNullDriver::getBufferLink(const scene::IMeshBuffer *mb)
+{
+	if (!mb || !isHardwareBufferRecommend(mb))
+		return 0;
+
+	// search for hardware links
+	SHWBufferLink *HWBuffer = reinterpret_cast<SHWBufferLink *>(mb->getHWBuffer());
+	if (HWBuffer)
+		return HWBuffer;
+
+	return createHardwareBuffer(mb); // no hardware links, and mesh wants one, create it
+}
+
+//! Update all hardware buffers, remove unused ones
+void CNullDriver::updateAllHardwareBuffers()
+{
+	auto it = HWBufferList.begin();
+	while (it != HWBufferList.end()) {
+		SHWBufferLink *Link = *it;
+		++it;
+
+		if (!Link->MeshBuffer || Link->MeshBuffer->getReferenceCount() == 1)
+			deleteHardwareBuffer(Link);
+	}
+}
+
+void CNullDriver::deleteHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return;
+	HWBufferList.erase(HWBuffer->listPosition);
+	delete HWBuffer;
+}
+
+//! Remove hardware buffer
+void CNullDriver::removeHardwareBuffer(const scene::IMeshBuffer *mb)
+{
+	if (!mb)
+		return;
+	SHWBufferLink *HWBuffer = reinterpret_cast<SHWBufferLink *>(mb->getHWBuffer());
+	if (HWBuffer)
+		deleteHardwareBuffer(HWBuffer);
+}
+
+//! Remove all hardware buffers
+void CNullDriver::removeAllHardwareBuffers()
+{
+	while (!HWBufferList.empty())
+		deleteHardwareBuffer(HWBufferList.front());
+}
+
+bool CNullDriver::isHardwareBufferRecommend(const scene::IMeshBuffer *mb)
+{
+	if (!mb || (mb->getHardwareMappingHint_Index() == scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex() == scene::EHM_NEVER))
+		return false;
+
+	if (mb->getVertexCount() < MinVertexCountForVBO)
+		return false;
+
+	return true;
+}
+
+//! Create occlusion query.
+/** Use node for identification and mesh for occlusion test. */
+void CNullDriver::addOcclusionQuery(scene::ISceneNode *node, const scene::IMesh *mesh)
+{
+	if (!node)
+		return;
+	if (!mesh) {
+		if ((node->getType() != scene::ESNT_MESH) && (node->getType() != scene::ESNT_ANIMATED_MESH))
+			return;
+		else if (node->getType() == scene::ESNT_MESH)
+			mesh = static_cast<scene::IMeshSceneNode *>(node)->getMesh();
+		else
+			mesh = static_cast<scene::IAnimatedMeshSceneNode *>(node)->getMesh()->getMesh(0);
+		if (!mesh)
+			return;
+	}
+
+	// search for query
+	s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1) {
+		if (OcclusionQueries[index].Mesh != mesh) {
+			OcclusionQueries[index].Mesh->drop();
+			OcclusionQueries[index].Mesh = mesh;
+			mesh->grab();
+		}
+	} else {
+		OcclusionQueries.push_back(SOccQuery(node, mesh));
+		node->setAutomaticCulling(node->getAutomaticCulling() | scene::EAC_OCC_QUERY);
+	}
+}
+
+//! Remove occlusion query.
+void CNullDriver::removeOcclusionQuery(scene::ISceneNode *node)
+{
+	// search for query
+	s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1) {
+		node->setAutomaticCulling(node->getAutomaticCulling() & ~scene::EAC_OCC_QUERY);
+		OcclusionQueries.erase(index);
+	}
+}
+
+//! Remove all occlusion queries.
+void CNullDriver::removeAllOcclusionQueries()
+{
+	for (s32 i = OcclusionQueries.size() - 1; i >= 0; --i) {
+		removeOcclusionQuery(OcclusionQueries[i].Node);
+	}
+}
+
+//! Run occlusion query. Draws mesh stored in query.
+/** If the mesh shall be rendered visible, use
+flag to enable the proper material setting. */
+void CNullDriver::runOcclusionQuery(scene::ISceneNode *node, bool visible)
+{
+	if (!node)
+		return;
+	s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index == -1)
+		return;
+	OcclusionQueries[index].Run = 0;
+	if (!visible) {
+		SMaterial mat;
+		mat.Lighting = false;
+		mat.AntiAliasing = 0;
+		mat.ColorMask = ECP_NONE;
+		mat.GouraudShading = false;
+		mat.ZWriteEnable = EZW_OFF;
+		setMaterial(mat);
+	}
+	setTransform(video::ETS_WORLD, node->getAbsoluteTransformation());
+	const scene::IMesh *mesh = OcclusionQueries[index].Mesh;
+	for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
+		if (visible)
+			setMaterial(mesh->getMeshBuffer(i)->getMaterial());
+		drawMeshBuffer(mesh->getMeshBuffer(i));
+	}
+}
+
+//! Run all occlusion queries. Draws all meshes stored in queries.
+/** If the meshes shall not be rendered visible, use
+overrideMaterial to disable the color and depth buffer. */
+void CNullDriver::runAllOcclusionQueries(bool visible)
+{
+	for (u32 i = 0; i < OcclusionQueries.size(); ++i)
+		runOcclusionQuery(OcclusionQueries[i].Node, visible);
+}
+
+//! Update occlusion query. Retrieves results from GPU.
+/** If the query shall not block, set the flag to false.
+Update might not occur in this case, though */
+void CNullDriver::updateOcclusionQuery(scene::ISceneNode *node, bool block)
+{
+}
+
+//! Update all occlusion queries. Retrieves results from GPU.
+/** If the query shall not block, set the flag to false.
+Update might not occur in this case, though */
+void CNullDriver::updateAllOcclusionQueries(bool block)
+{
+	for (u32 i = 0; i < OcclusionQueries.size(); ++i) {
+		if (OcclusionQueries[i].Run == u32(~0))
+			continue;
+		updateOcclusionQuery(OcclusionQueries[i].Node, block);
+		++OcclusionQueries[i].Run;
+		if (OcclusionQueries[i].Run > 1000)
+			removeOcclusionQuery(OcclusionQueries[i].Node);
+	}
+}
+
+//! Return query result.
+/** Return value is the number of visible pixels/fragments.
+The value is a safe approximation, i.e. can be larger then the
+actual value of pixels. */
+u32 CNullDriver::getOcclusionQueryResult(scene::ISceneNode *node) const
+{
+	return ~0;
+}
+
+//! Create render target.
+IRenderTarget *CNullDriver::addRenderTarget()
+{
+	return 0;
+}
+
+//! Remove render target.
+void CNullDriver::removeRenderTarget(IRenderTarget *renderTarget)
+{
+	if (!renderTarget)
+		return;
+
+	for (u32 i = 0; i < RenderTargets.size(); ++i) {
+		if (RenderTargets[i] == renderTarget) {
+			RenderTargets[i]->drop();
+			RenderTargets.erase(i);
+
+			return;
+		}
+	}
+}
+
+//! Remove all render targets.
+void CNullDriver::removeAllRenderTargets()
+{
+	for (u32 i = 0; i < RenderTargets.size(); ++i)
+		RenderTargets[i]->drop();
+
+	RenderTargets.clear();
+
+	SharedRenderTarget = 0;
+}
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void CNullDriver::OnResize(const core::dimension2d<u32> &size)
+{
+	if (ViewPort.getWidth() == (s32)ScreenSize.Width &&
+			ViewPort.getHeight() == (s32)ScreenSize.Height)
+		ViewPort = core::rect<s32>(core::position2d<s32>(0, 0),
+				core::dimension2di(size));
+
+	ScreenSize = size;
+}
+
+// adds a material renderer and drops it afterwards. To be used for internal creation
+s32 CNullDriver::addAndDropMaterialRenderer(IMaterialRenderer *m)
+{
+	s32 i = addMaterialRenderer(m);
+
+	if (m)
+		m->drop();
+
+	return i;
+}
+
+//! Adds a new material renderer to the video device.
+s32 CNullDriver::addMaterialRenderer(IMaterialRenderer *renderer, const char *name)
+{
+	if (!renderer)
+		return -1;
+
+	SMaterialRenderer r;
+	r.Renderer = renderer;
+	r.Name = name;
+
+	if (name == 0 && MaterialRenderers.size() < numBuiltInMaterials) {
+		// set name of built in renderer so that we don't have to implement name
+		// setting in all available renderers.
+		r.Name = sBuiltInMaterialTypeNames[MaterialRenderers.size()];
+	}
+
+	MaterialRenderers.push_back(r);
+	renderer->grab();
+
+	return MaterialRenderers.size() - 1;
+}
+
+//! Sets the name of a material renderer.
+void CNullDriver::setMaterialRendererName(u32 idx, const char *name)
+{
+	if (idx < numBuiltInMaterials || idx >= MaterialRenderers.size())
+		return;
+
+	MaterialRenderers[idx].Name = name;
+}
+
+void CNullDriver::swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames)
+{
+	if (idx1 < MaterialRenderers.size() && idx2 < MaterialRenderers.size()) {
+		irr::core::swap(MaterialRenderers[idx1].Renderer, MaterialRenderers[idx2].Renderer);
+		if (swapNames)
+			irr::core::swap(MaterialRenderers[idx1].Name, MaterialRenderers[idx2].Name);
+	}
+}
+
+//! Returns driver and operating system specific data about the IVideoDriver.
+const SExposedVideoData &CNullDriver::getExposedVideoData()
+{
+	return ExposedData;
+}
+
+//! Returns type of video driver
+E_DRIVER_TYPE CNullDriver::getDriverType() const
+{
+	return EDT_NULL;
+}
+
+//! deletes all material renderers
+void CNullDriver::deleteMaterialRenders()
+{
+	// delete material renderers
+	for (u32 i = 0; i < MaterialRenderers.size(); ++i)
+		if (MaterialRenderers[i].Renderer)
+			MaterialRenderers[i].Renderer->drop();
+
+	MaterialRenderers.clear();
+}
+
+//! Returns pointer to material renderer or null
+IMaterialRenderer *CNullDriver::getMaterialRenderer(u32 idx) const
+{
+	if (idx < MaterialRenderers.size())
+		return MaterialRenderers[idx].Renderer;
+	else
+		return 0;
+}
+
+//! Returns amount of currently available material renderers.
+u32 CNullDriver::getMaterialRendererCount() const
+{
+	return MaterialRenderers.size();
+}
+
+//! Returns name of the material renderer
+const char *CNullDriver::getMaterialRendererName(u32 idx) const
+{
+	if (idx < MaterialRenderers.size())
+		return MaterialRenderers[idx].Name.c_str();
+
+	return 0;
+}
+
+//! Returns pointer to the IGPUProgrammingServices interface.
+IGPUProgrammingServices *CNullDriver::getGPUProgrammingServices()
+{
+	return this;
+}
+
+//! Adds a new material renderer to the VideoDriver, based on a high level shading language.
+s32 CNullDriver::addHighLevelShaderMaterial(
+		const c8 *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8 *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const c8 *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	os::Printer::log("High level shader materials not available (yet) in this driver, sorry");
+	return -1;
+}
+
+s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
+		const io::path &vertexShaderProgramFileName,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const io::path &pixelShaderProgramFileName,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const io::path &geometryShaderProgramFileName,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	io::IReadFile *vsfile = 0;
+	io::IReadFile *psfile = 0;
+	io::IReadFile *gsfile = 0;
+
+	if (vertexShaderProgramFileName.size()) {
+		vsfile = FileSystem->createAndOpenFile(vertexShaderProgramFileName);
+		if (!vsfile) {
+			os::Printer::log("Could not open vertex shader program file",
+					vertexShaderProgramFileName, ELL_WARNING);
+		}
+	}
+
+	if (pixelShaderProgramFileName.size()) {
+		psfile = FileSystem->createAndOpenFile(pixelShaderProgramFileName);
+		if (!psfile) {
+			os::Printer::log("Could not open pixel shader program file",
+					pixelShaderProgramFileName, ELL_WARNING);
+		}
+	}
+
+	if (geometryShaderProgramFileName.size()) {
+		gsfile = FileSystem->createAndOpenFile(geometryShaderProgramFileName);
+		if (!gsfile) {
+			os::Printer::log("Could not open geometry shader program file",
+					geometryShaderProgramFileName, ELL_WARNING);
+		}
+	}
+
+	s32 result = addHighLevelShaderMaterialFromFiles(
+			vsfile, vertexShaderEntryPointName, vsCompileTarget,
+			psfile, pixelShaderEntryPointName, psCompileTarget,
+			gsfile, geometryShaderEntryPointName, gsCompileTarget,
+			inType, outType, verticesOut,
+			callback, baseMaterial, userData);
+
+	if (psfile)
+		psfile->drop();
+
+	if (vsfile)
+		vsfile->drop();
+
+	if (gsfile)
+		gsfile->drop();
+
+	return result;
+}
+
+s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
+		io::IReadFile *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		io::IReadFile *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		io::IReadFile *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	c8 *vs = 0;
+	c8 *ps = 0;
+	c8 *gs = 0;
+
+	if (vertexShaderProgram) {
+		const long size = vertexShaderProgram->getSize();
+		if (size) {
+			vs = new c8[size + 1];
+			vertexShaderProgram->read(vs, size);
+			vs[size] = 0;
+		}
+	}
+
+	if (pixelShaderProgram) {
+		const long size = pixelShaderProgram->getSize();
+		if (size) {
+			// if both handles are the same we must reset the file
+			if (pixelShaderProgram == vertexShaderProgram)
+				pixelShaderProgram->seek(0);
+			ps = new c8[size + 1];
+			pixelShaderProgram->read(ps, size);
+			ps[size] = 0;
+		}
+	}
+
+	if (geometryShaderProgram) {
+		const long size = geometryShaderProgram->getSize();
+		if (size) {
+			// if both handles are the same we must reset the file
+			if ((geometryShaderProgram == vertexShaderProgram) ||
+					(geometryShaderProgram == pixelShaderProgram))
+				geometryShaderProgram->seek(0);
+			gs = new c8[size + 1];
+			geometryShaderProgram->read(gs, size);
+			gs[size] = 0;
+		}
+	}
+
+	s32 result = this->addHighLevelShaderMaterial(
+			vs, vertexShaderEntryPointName, vsCompileTarget,
+			ps, pixelShaderEntryPointName, psCompileTarget,
+			gs, geometryShaderEntryPointName, gsCompileTarget,
+			inType, outType, verticesOut,
+			callback, baseMaterial, userData);
+
+	delete[] vs;
+	delete[] ps;
+	delete[] gs;
+
+	return result;
+}
+
+void CNullDriver::deleteShaderMaterial(s32 material)
+{
+	const u32 idx = (u32)material;
+	if (idx < numBuiltInMaterials || idx >= MaterialRenderers.size())
+		return;
+
+	// if this is the last material we can drop it without consequence
+	if (idx == MaterialRenderers.size() - 1) {
+		if (MaterialRenderers[idx].Renderer)
+			MaterialRenderers[idx].Renderer->drop();
+		MaterialRenderers.erase(idx);
+		return;
+	}
+	// otherwise replace with a dummy renderer, we have to preserve the IDs
+	auto &ref = MaterialRenderers[idx];
+	if (ref.Renderer)
+		ref.Renderer->drop();
+	ref.Renderer = new CDummyMaterialRenderer();
+	ref.Name.clear();
+}
+
+//! Creates a render target texture.
+ITexture *CNullDriver::addRenderTargetTexture(const core::dimension2d<u32> &size,
+		const io::path &name, const ECOLOR_FORMAT format)
+{
+	return 0;
+}
+
+ITexture *CNullDriver::addRenderTargetTextureCubemap(const irr::u32 sideLen,
+		const io::path &name, const ECOLOR_FORMAT format)
+{
+	return 0;
+}
+
+void CNullDriver::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
+{
+}
+
+//! Returns a pointer to the mesh manipulator.
+scene::IMeshManipulator *CNullDriver::getMeshManipulator()
+{
+	return MeshManipulator;
+}
+
+//! Returns an image created from the last rendered frame.
+IImage *CNullDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
+{
+	return 0;
+}
+
+// prints renderer version
+void CNullDriver::printVersion()
+{
+	core::stringc namePrint = "Using renderer: ";
+	namePrint += getName();
+	os::Printer::log(namePrint.c_str(), ELL_INFORMATION);
+}
+
+//! creates a video driver
+IVideoDriver *createNullDriver(io::IFileSystem *io, const core::dimension2d<u32> &screenSize)
+{
+	CNullDriver *nullDriver = new CNullDriver(io, screenSize);
+
+	// create empty material renderers
+	for (u32 i = 0; sBuiltInMaterialTypeNames[i]; ++i) {
+		IMaterialRenderer *imr = new IMaterialRenderer();
+		nullDriver->addMaterialRenderer(imr);
+		imr->drop();
+	}
+
+	return nullDriver;
+}
+
+//! Set/unset a clipping plane.
+//! There are at least 6 clipping planes available for the user to set at will.
+//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
+//! \param plane: The plane itself.
+//! \param enable: If true, enable the clipping plane else disable it.
+bool CNullDriver::setClipPlane(u32 index, const core::plane3df &plane, bool enable)
+{
+	return false;
+}
+
+//! Enable/disable a clipping plane.
+void CNullDriver::enableClipPlane(u32 index, bool enable)
+{
+	// not necessary
+}
+
+void CNullDriver::setMinHardwareBufferVertexCount(u32 count)
+{
+	MinVertexCountForVBO = count;
+}
+
+SOverrideMaterial &CNullDriver::getOverrideMaterial()
+{
+	return OverrideMaterial;
+}
+
+//! Get the 2d override material for altering its values
+SMaterial &CNullDriver::getMaterial2D()
+{
+	return OverrideMaterial2D;
+}
+
+//! Enable the 2d override material
+void CNullDriver::enableMaterial2D(bool enable)
+{
+	OverrideMaterial2DEnabled = enable;
+}
+
+core::dimension2du CNullDriver::getMaxTextureSize() const
+{
+	return core::dimension2du(0x10000, 0x10000); // maybe large enough
+}
+
+bool CNullDriver::needsTransparentRenderPass(const irr::video::SMaterial &material) const
+{
+	// TODO: I suspect it would be nice if the material had an enum for further control.
+	//		Especially it probably makes sense to allow disabling transparent render pass as soon as material.ZWriteEnable is on.
+	//      But then we might want an enum for the renderpass in material instead of just a transparency flag in material - and that's more work.
+	//      Or we could at least set return false when material.ZWriteEnable is EZW_ON? Still considering that...
+	//		Be careful - this function is deeply connected to getWriteZBuffer as transparent render passes are usually about rendering with
+	//      zwrite disabled and getWriteZBuffer calls this function.
+
+	video::IMaterialRenderer *rnd = getMaterialRenderer(material.MaterialType);
+	// TODO: I suspect IMaterialRenderer::isTransparent also often could use SMaterial as parameter
+	//       We could for example then get rid of IsTransparent function in SMaterial and move that to the software material renderer.
+	if (rnd && rnd->isTransparent())
+		return true;
+
+	return false;
+}
+
+//! Color conversion convenience function
+/** Convert an image (as array of pixels) from source to destination
+array, thereby converting the color format. The pixel size is
+determined by the color formats.
+\param sP Pointer to source
+\param sF Color format of source
+\param sN Number of pixels to convert, both array must be large enough
+\param dP Pointer to destination
+\param dF Color format of destination
+*/
+void CNullDriver::convertColor(const void *sP, ECOLOR_FORMAT sF, s32 sN,
+		void *dP, ECOLOR_FORMAT dF) const
+{
+	video::CColorConverter::convert_viaFormat(sP, sF, sN, dP, dF);
+}
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/CNullDriver.h b/irr/src/CNullDriver.h
new file mode 100644
index 000000000..d47212c0f
--- /dev/null
+++ b/irr/src/CNullDriver.h
@@ -0,0 +1,742 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IVideoDriver.h"
+#include "IFileSystem.h"
+#include "IGPUProgrammingServices.h"
+#include "irrArray.h"
+#include "irrString.h"
+#include "IAttributes.h"
+#include "IMesh.h"
+#include "IMeshBuffer.h"
+#include "IMeshSceneNode.h"
+#include "CFPSCounter.h"
+#include "S3DVertex.h"
+#include "SVertexIndex.h"
+#include "SExposedVideoData.h"
+#include <list>
+
+namespace irr
+{
+namespace io
+{
+class IWriteFile;
+class IReadFile;
+} // end namespace io
+namespace video
+{
+class IImageLoader;
+class IImageWriter;
+
+class CNullDriver : public IVideoDriver, public IGPUProgrammingServices
+{
+public:
+	//! constructor
+	CNullDriver(io::IFileSystem *io, const core::dimension2d<u32> &screenSize);
+
+	//! destructor
+	virtual ~CNullDriver();
+
+	virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), f32 clearDepth = 1.f, u8 clearStencil = 0,
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0) override;
+
+	bool endScene() override;
+
+	//! Disable a feature of the driver.
+	void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag = true) override;
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const override;
+
+	//! Get attributes of the actual video driver
+	const io::IAttributes &getDriverAttributes() const override;
+
+	//! sets transformation
+	void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat) override;
+
+	//! Retrieve the number of image loaders
+	u32 getImageLoaderCount() const override;
+
+	//! Retrieve the given image loader
+	IImageLoader *getImageLoader(u32 n) override;
+
+	//! Retrieve the number of image writers
+	u32 getImageWriterCount() const override;
+
+	//! Retrieve the given image writer
+	IImageWriter *getImageWriter(u32 n) override;
+
+	//! sets a material
+	void setMaterial(const SMaterial &material) override;
+
+	//! loads a Texture
+	ITexture *getTexture(const io::path &filename) override;
+
+	//! loads a Texture
+	ITexture *getTexture(io::IReadFile *file) override;
+
+	//! Returns amount of textures currently loaded
+	u32 getTextureCount() const override;
+
+	ITexture *addTexture(const core::dimension2d<u32> &size, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) override;
+
+	ITexture *addTexture(const io::path &name, IImage *image) override;
+
+	virtual ITexture *addTextureCubemap(const io::path &name, IImage *imagePosX, IImage *imageNegX, IImage *imagePosY,
+			IImage *imageNegY, IImage *imagePosZ, IImage *imageNegZ) override;
+
+	ITexture *addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) override;
+
+	virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) override;
+
+	virtual bool setRenderTarget(ITexture *texture, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) override;
+
+	//! sets a viewport
+	void setViewPort(const core::rect<s32> &area) override;
+
+	//! gets the area of the current viewport
+	const core::rect<s32> &getViewPort() const override;
+
+	//! draws a vertex primitive list
+	virtual void drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType = EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType = scene::EPT_TRIANGLES,
+			E_INDEX_TYPE iType = EIT_16BIT) override;
+
+	//! draws a vertex primitive list in 2d
+	virtual void draw2DVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType = EVT_STANDARD, scene::E_PRIMITIVE_TYPE pType = scene::EPT_TRIANGLES,
+			E_INDEX_TYPE iType = EIT_16BIT) override;
+
+	//! Draws a 3d line.
+	virtual void draw3DLine(const core::vector3df &start,
+			const core::vector3df &end, SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Draws a 3d axis aligned box.
+	virtual void draw3DBox(const core::aabbox3d<f32> &box,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! draws an 2d image
+	void draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos, bool useAlphaChannelOfTexture) override;
+
+	//! Draws a set of 2d images, using a color and the alpha channel of the texture.
+	/** All drawings are clipped against clipRect (if != 0).
+	The subtextures are defined by the array of sourceRects and are
+	positioned using the array of positions.
+	\param texture Texture to be drawn.
+	\param pos Array of upper left 2d destinations where the images
+	will be drawn.
+	\param sourceRects Source rectangles of the image.
+	\param clipRect Pointer to rectangle on the screen where the
+	images are clipped to.
+	If this pointer is 0 then the image is not clipped.
+	\param color Color with which the image is drawn.
+	Note that the alpha component is used. If alpha is other than
+	255, the image will be transparent.
+	\param useAlphaChannelOfTexture: If true, the alpha channel of
+	the texture is used to draw the image. */
+	virtual void draw2DImageBatch(const video::ITexture *texture,
+			const core::array<core::position2d<s32>> &positions,
+			const core::array<core::rect<s32>> &sourceRects,
+			const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255),
+			bool useAlphaChannelOfTexture = false) override;
+
+	//! Draws a 2d image, using a color (if color is other then Color(255,255,255,255)) and the alpha channel of the texture if wanted.
+	virtual void draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255), bool useAlphaChannelOfTexture = false) override;
+
+	//! Draws a part of the texture into the rectangle.
+	virtual void draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			const video::SColor *const colors = 0, bool useAlphaChannelOfTexture = false) override;
+
+	//! Draws a 2d rectangle
+	void draw2DRectangle(SColor color, const core::rect<s32> &pos, const core::rect<s32> *clip = 0) override;
+
+	//! Draws a 2d rectangle with a gradient.
+	virtual void draw2DRectangle(const core::rect<s32> &pos,
+			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws a 2d line.
+	virtual void draw2DLine(const core::position2d<s32> &start,
+			const core::position2d<s32> &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	virtual void setFog(SColor color = SColor(0, 255, 255, 255),
+			E_FOG_TYPE fogType = EFT_FOG_LINEAR,
+			f32 start = 50.0f, f32 end = 100.0f, f32 density = 0.01f,
+			bool pixelFog = false, bool rangeFog = false) override;
+
+	virtual void getFog(SColor &color, E_FOG_TYPE &fogType,
+			f32 &start, f32 &end, f32 &density,
+			bool &pixelFog, bool &rangeFog) override;
+
+	//! get color format of the current color buffer
+	ECOLOR_FORMAT getColorFormat() const override;
+
+	//! get screen size
+	const core::dimension2d<u32> &getScreenSize() const override;
+
+	//! get current render target
+	IRenderTarget *getCurrentRenderTarget() const;
+
+	//! get render target size
+	const core::dimension2d<u32> &getCurrentRenderTargetSize() const override;
+
+	// get current frames per second value
+	s32 getFPS() const override;
+
+	//! returns amount of primitives (mostly triangles) were drawn in the last frame.
+	//! very useful method for statistics.
+	u32 getPrimitiveCountDrawn(u32 param = 0) const override;
+
+	//! \return Returns the name of the video driver. Example: In case of the DIRECT3D8
+	//! driver, it would return "Direct3D8.1".
+	const char *getName() const override;
+
+	//! Sets the dynamic ambient light color. The default color is
+	//! (0,0,0,0) which means it is dark.
+	//! \param color: New color of the ambient light.
+	void setAmbientLight(const SColorf &color) override;
+
+	//! Get the global ambient light currently used by the driver
+	const SColorf &getAmbientLight() const override;
+
+	//! Adds an external image loader to the engine.
+	void addExternalImageLoader(IImageLoader *loader) override;
+
+	//! Adds an external image writer to the engine.
+	void addExternalImageWriter(IImageWriter *writer) override;
+
+	//! Removes a texture from the texture cache and deletes it, freeing lot of
+	//! memory.
+	void removeTexture(ITexture *texture) override;
+
+	//! Removes all texture from the texture cache and deletes them, freeing lot of
+	//! memory.
+	void removeAllTextures() override;
+
+	//! Creates a render target texture.
+	virtual ITexture *addRenderTargetTexture(const core::dimension2d<u32> &size,
+			const io::path &name, const ECOLOR_FORMAT format = ECF_UNKNOWN) override;
+
+	//! Creates a render target texture for a cubemap
+	ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+			const io::path &name, const ECOLOR_FORMAT format) override;
+
+	//! Creates an 1bit alpha channel of the texture based of an color key.
+	void makeColorKeyTexture(video::ITexture *texture, video::SColor color) const override;
+
+	//! Creates an 1bit alpha channel of the texture based of an color key position.
+	virtual void makeColorKeyTexture(video::ITexture *texture,
+			core::position2d<s32> colorKeyPixelPos) const override;
+
+	//! Returns the maximum amount of primitives (mostly vertices) which
+	//! the device is able to render with one drawIndexedTriangleList
+	//! call.
+	u32 getMaximalPrimitiveCount() const override;
+
+	//! Enables or disables a texture creation flag.
+	void setTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag, bool enabled) override;
+
+	//! Returns if a texture creation flag is enabled or disabled.
+	bool getTextureCreationFlag(E_TEXTURE_CREATION_FLAG flag) const override;
+
+	IImage *createImageFromFile(const io::path &filename) override;
+
+	IImage *createImageFromFile(io::IReadFile *file) override;
+
+	//! Creates a software image from a byte array.
+	/** \param useForeignMemory: If true, the image will use the data pointer
+	directly and own it from now on, which means it will also try to delete [] the
+	data when the image will be destructed. If false, the memory will by copied. */
+	virtual IImage *createImageFromData(ECOLOR_FORMAT format,
+			const core::dimension2d<u32> &size, void *data, bool ownForeignMemory = false,
+			bool deleteMemory = true) override;
+
+	//! Creates an empty software image.
+	IImage *createImage(ECOLOR_FORMAT format, const core::dimension2d<u32> &size) override;
+
+	//! Creates a software image from part of a texture.
+	virtual IImage *createImage(ITexture *texture,
+			const core::position2d<s32> &pos,
+			const core::dimension2d<u32> &size) override;
+
+	//! Draws a mesh buffer
+	void drawMeshBuffer(const scene::IMeshBuffer *mb) override;
+
+	//! Draws the normals of a mesh buffer
+	virtual void drawMeshBufferNormals(const scene::IMeshBuffer *mb, f32 length = 10.f,
+			SColor color = 0xffffffff) override;
+
+	//! Check if the driver supports creating textures with the given color format
+	bool queryTextureFormat(ECOLOR_FORMAT format) const override
+	{
+		return false;
+	}
+
+protected:
+	struct SHWBufferLink
+	{
+		SHWBufferLink(const scene::IMeshBuffer *_MeshBuffer) :
+				MeshBuffer(_MeshBuffer),
+				ChangedID_Vertex(0), ChangedID_Index(0),
+				Mapped_Vertex(scene::EHM_NEVER), Mapped_Index(scene::EHM_NEVER)
+		{
+			if (MeshBuffer) {
+				MeshBuffer->grab();
+				MeshBuffer->setHWBuffer(reinterpret_cast<void *>(this));
+			}
+		}
+
+		virtual ~SHWBufferLink()
+		{
+			if (MeshBuffer) {
+				MeshBuffer->setHWBuffer(NULL);
+				MeshBuffer->drop();
+			}
+		}
+
+		const scene::IMeshBuffer *MeshBuffer;
+		u32 ChangedID_Vertex;
+		u32 ChangedID_Index;
+		scene::E_HARDWARE_MAPPING Mapped_Vertex;
+		scene::E_HARDWARE_MAPPING Mapped_Index;
+		std::list<SHWBufferLink *>::iterator listPosition;
+	};
+
+	//! Gets hardware buffer link from a meshbuffer (may create or update buffer)
+	virtual SHWBufferLink *getBufferLink(const scene::IMeshBuffer *mb);
+
+	//! updates hardware buffer if needed  (only some drivers can)
+	virtual bool updateHardwareBuffer(SHWBufferLink *HWBuffer) { return false; }
+
+	//! Draw hardware buffer (only some drivers can)
+	virtual void drawHardwareBuffer(SHWBufferLink *HWBuffer) {}
+
+	//! Delete hardware buffer
+	virtual void deleteHardwareBuffer(SHWBufferLink *HWBuffer);
+
+	//! Create hardware buffer from mesh (only some drivers can)
+	virtual SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer *mb) { return 0; }
+
+public:
+	//! Remove hardware buffer
+	void removeHardwareBuffer(const scene::IMeshBuffer *mb) override;
+
+	//! Remove all hardware buffers
+	void removeAllHardwareBuffers() override;
+
+	//! Update all hardware buffers, remove unused ones
+	virtual void updateAllHardwareBuffers();
+
+	//! is vbo recommended on this mesh?
+	virtual bool isHardwareBufferRecommend(const scene::IMeshBuffer *mb);
+
+	//! Create occlusion query.
+	/** Use node for identification and mesh for occlusion test. */
+	virtual void addOcclusionQuery(scene::ISceneNode *node,
+			const scene::IMesh *mesh = 0) override;
+
+	//! Remove occlusion query.
+	void removeOcclusionQuery(scene::ISceneNode *node) override;
+
+	//! Remove all occlusion queries.
+	void removeAllOcclusionQueries() override;
+
+	//! Run occlusion query. Draws mesh stored in query.
+	/** If the mesh shall not be rendered visible, use
+	overrideMaterial to disable the color and depth buffer. */
+	void runOcclusionQuery(scene::ISceneNode *node, bool visible = false) override;
+
+	//! Run all occlusion queries. Draws all meshes stored in queries.
+	/** If the meshes shall not be rendered visible, use
+	overrideMaterial to disable the color and depth buffer. */
+	void runAllOcclusionQueries(bool visible = false) override;
+
+	//! Update occlusion query. Retrieves results from GPU.
+	/** If the query shall not block, set the flag to false.
+	Update might not occur in this case, though */
+	void updateOcclusionQuery(scene::ISceneNode *node, bool block = true) override;
+
+	//! Update all occlusion queries. Retrieves results from GPU.
+	/** If the query shall not block, set the flag to false.
+	Update might not occur in this case, though */
+	void updateAllOcclusionQueries(bool block = true) override;
+
+	//! Return query result.
+	/** Return value is the number of visible pixels/fragments.
+	The value is a safe approximation, i.e. can be larger than the
+	actual value of pixels. */
+	u32 getOcclusionQueryResult(scene::ISceneNode *node) const override;
+
+	//! Create render target.
+	IRenderTarget *addRenderTarget() override;
+
+	//! Remove render target.
+	void removeRenderTarget(IRenderTarget *renderTarget) override;
+
+	//! Remove all render targets.
+	void removeAllRenderTargets() override;
+
+	//! Only used by the engine internally.
+	/** Used to notify the driver that the window was resized. */
+	void OnResize(const core::dimension2d<u32> &size) override;
+
+	//! Adds a new material renderer to the video device.
+	virtual s32 addMaterialRenderer(IMaterialRenderer *renderer,
+			const char *name = 0) override;
+
+	//! Returns driver and operating system specific data about the IVideoDriver.
+	const SExposedVideoData &getExposedVideoData() override;
+
+	//! Returns type of video driver
+	E_DRIVER_TYPE getDriverType() const override;
+
+	//! Returns the transformation set by setTransform
+	const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override;
+
+	//! Returns pointer to the IGPUProgrammingServices interface.
+	IGPUProgrammingServices *getGPUProgrammingServices() override;
+
+	//! Returns pointer to material renderer or null
+	IMaterialRenderer *getMaterialRenderer(u32 idx) const override;
+
+	//! Returns amount of currently available material renderers.
+	u32 getMaterialRendererCount() const override;
+
+	//! Returns name of the material renderer
+	const char *getMaterialRendererName(u32 idx) const override;
+
+	//! Adds a new material renderer to the VideoDriver, based on a high level shading language.
+	virtual s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = 0,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = 0,
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			const c8 *geometryShaderProgram = 0,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) override;
+
+	virtual s32 addHighLevelShaderMaterialFromFiles(
+			const io::path &vertexShaderProgramFile,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const io::path &pixelShaderProgramFile = "",
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			const io::path &geometryShaderProgramFileName = "",
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) override;
+
+	virtual s32 addHighLevelShaderMaterialFromFiles(
+			io::IReadFile *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = "main",
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			io::IReadFile *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = "main",
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			io::IReadFile *geometryShaderProgram = 0,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) override;
+
+	virtual void deleteShaderMaterial(s32 material) override;
+
+	//! Returns a pointer to the mesh manipulator.
+	scene::IMeshManipulator *getMeshManipulator() override;
+
+	void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) override;
+
+	//! Returns an image created from the last rendered frame.
+	IImage *createScreenShot(video::ECOLOR_FORMAT format = video::ECF_UNKNOWN, video::E_RENDER_TARGET target = video::ERT_FRAME_BUFFER) override;
+
+	//! Writes the provided image to disk file
+	bool writeImageToFile(IImage *image, const io::path &filename, u32 param = 0) override;
+
+	//! Writes the provided image to a file.
+	bool writeImageToFile(IImage *image, io::IWriteFile *file, u32 param = 0) override;
+
+	//! Sets the name of a material renderer.
+	void setMaterialRendererName(u32 idx, const char *name) override;
+
+	//! Swap the material renderers used for certain id's
+	void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override;
+
+	//! looks if the image is already loaded
+	video::ITexture *findTexture(const io::path &filename) override;
+
+	//! Set/unset a clipping plane.
+	//! There are at least 6 clipping planes available for the user to set at will.
+	//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
+	//! \param plane: The plane itself.
+	//! \param enable: If true, enable the clipping plane else disable it.
+	bool setClipPlane(u32 index, const core::plane3df &plane, bool enable = false) override;
+
+	//! Enable/disable a clipping plane.
+	//! There are at least 6 clipping planes available for the user to set at will.
+	//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
+	//! \param enable: If true, enable the clipping plane else disable it.
+	void enableClipPlane(u32 index, bool enable) override;
+
+	//! Returns the graphics card vendor name.
+	core::stringc getVendorInfo() override { return "Not available on this driver."; }
+
+	//! Set the minimum number of vertices for which a hw buffer will be created
+	/** \param count Number of vertices to set as minimum. */
+	void setMinHardwareBufferVertexCount(u32 count) override;
+
+	//! Get the global Material, which might override local materials.
+	/** Depending on the enable flags, values from this Material
+	are used to override those of local materials of some
+	meshbuffer being rendered. */
+	SOverrideMaterial &getOverrideMaterial() override;
+
+	//! Get the 2d override material for altering its values
+	SMaterial &getMaterial2D() override;
+
+	//! Enable the 2d override material
+	void enableMaterial2D(bool enable = true) override;
+
+	//! Only used by the engine internally.
+	void setAllowZWriteOnTransparent(bool flag) override
+	{
+		AllowZWriteOnTransparent = flag;
+	}
+
+	//! Returns the maximum texture size supported.
+	core::dimension2du getMaxTextureSize() const override;
+
+	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
+	bool needsTransparentRenderPass(const irr::video::SMaterial &material) const override;
+
+	//! Color conversion convenience function
+	/** Convert an image (as array of pixels) from source to destination
+	array, thereby converting the color format. The pixel size is
+	determined by the color formats.
+	\param sP Pointer to source
+	\param sF Color format of source
+	\param sN Number of pixels to convert, both array must be large enough
+	\param dP Pointer to destination
+	\param dF Color format of destination
+	*/
+	virtual void convertColor(const void *sP, ECOLOR_FORMAT sF, s32 sN,
+			void *dP, ECOLOR_FORMAT dF) const override;
+
+	bool checkDriverReset() override { return false; }
+
+protected:
+	//! deletes all textures
+	void deleteAllTextures();
+
+	//! opens the file and loads it into the surface
+	ITexture *loadTextureFromFile(io::IReadFile *file, const io::path &hashName = "");
+
+	//! adds a surface, not loaded or created by the Irrlicht Engine
+	void addTexture(ITexture *surface);
+
+	virtual ITexture *createDeviceDependentTexture(const io::path &name, IImage *image);
+
+	virtual ITexture *createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image);
+
+	//! checks triangle count and print warning if wrong
+	bool checkPrimitiveCount(u32 prmcnt) const;
+
+	bool checkImage(IImage *image) const;
+
+	bool checkImage(const core::array<IImage *> &image) const;
+
+	// adds a material renderer and drops it afterwards. To be used for internal creation
+	s32 addAndDropMaterialRenderer(IMaterialRenderer *m);
+
+	//! deletes all material renderers
+	void deleteMaterialRenders();
+
+	// prints renderer version
+	void printVersion();
+
+	inline bool getWriteZBuffer(const SMaterial &material) const
+	{
+		switch (material.ZWriteEnable) {
+		case video::EZW_OFF:
+			return false;
+		case video::EZW_AUTO:
+			return AllowZWriteOnTransparent || !needsTransparentRenderPass(material);
+		case video::EZW_ON:
+			return true;
+		}
+		return true; // never should get here, but some compilers don't know and complain
+	}
+
+	struct SSurface
+	{
+		video::ITexture *Surface;
+
+		bool operator<(const SSurface &other) const
+		{
+			return Surface->getName() < other.Surface->getName();
+		}
+	};
+
+	struct SMaterialRenderer
+	{
+		core::stringc Name;
+		IMaterialRenderer *Renderer;
+	};
+
+	struct SDummyTexture : public ITexture
+	{
+		SDummyTexture(const io::path &name, E_TEXTURE_TYPE type) :
+				ITexture(name, type){};
+
+		void setSize(const core::dimension2d<u32> &size) { Size = OriginalSize = size; }
+
+		void *lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel = 0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) override { return 0; }
+		void unlock() override {}
+		void regenerateMipMapLevels(void *data = 0, u32 layer = 0) override {}
+	};
+	core::array<SSurface> Textures;
+
+	struct SOccQuery
+	{
+		SOccQuery(scene::ISceneNode *node, const scene::IMesh *mesh = 0) :
+				Node(node), Mesh(mesh), PID(0), Result(0xffffffff), Run(0xffffffff)
+		{
+			if (Node)
+				Node->grab();
+			if (Mesh)
+				Mesh->grab();
+		}
+
+		SOccQuery(const SOccQuery &other) :
+				Node(other.Node), Mesh(other.Mesh), PID(other.PID), Result(other.Result), Run(other.Run)
+		{
+			if (Node)
+				Node->grab();
+			if (Mesh)
+				Mesh->grab();
+		}
+
+		~SOccQuery()
+		{
+			if (Node)
+				Node->drop();
+			if (Mesh)
+				Mesh->drop();
+		}
+
+		SOccQuery &operator=(const SOccQuery &other)
+		{
+			Node = other.Node;
+			Mesh = other.Mesh;
+			PID = other.PID;
+			Result = other.Result;
+			Run = other.Run;
+			if (Node)
+				Node->grab();
+			if (Mesh)
+				Mesh->grab();
+			return *this;
+		}
+
+		bool operator==(const SOccQuery &other) const
+		{
+			return other.Node == Node;
+		}
+
+		scene::ISceneNode *Node;
+		const scene::IMesh *Mesh;
+		union
+		{
+			void *PID;
+			unsigned int UID;
+		};
+		u32 Result;
+		u32 Run;
+	};
+	core::array<SOccQuery> OcclusionQueries;
+
+	core::array<IRenderTarget *> RenderTargets;
+
+	// Shared objects used with simplified IVideoDriver::setRenderTarget method with ITexture* param.
+	IRenderTarget *SharedRenderTarget;
+	core::array<ITexture *> SharedDepthTextures;
+
+	IRenderTarget *CurrentRenderTarget;
+	core::dimension2d<u32> CurrentRenderTargetSize;
+
+	core::array<video::IImageLoader *> SurfaceLoader;
+	core::array<video::IImageWriter *> SurfaceWriter;
+	core::array<SMaterialRenderer> MaterialRenderers;
+
+	std::list<SHWBufferLink *> HWBufferList;
+
+	io::IFileSystem *FileSystem;
+
+	//! mesh manipulator
+	scene::IMeshManipulator *MeshManipulator;
+
+	core::rect<s32> ViewPort;
+	core::dimension2d<u32> ScreenSize;
+	core::matrix4 TransformationMatrix;
+
+	CFPSCounter FPSCounter;
+
+	u32 PrimitivesDrawn;
+	u32 MinVertexCountForVBO;
+
+	u32 TextureCreationFlags;
+
+	f32 FogStart;
+	f32 FogEnd;
+	f32 FogDensity;
+	SColor FogColor;
+	SExposedVideoData ExposedData;
+
+	io::IAttributes *DriverAttributes;
+
+	SOverrideMaterial OverrideMaterial;
+	SMaterial OverrideMaterial2D;
+	SMaterial InitMaterial2D;
+	bool OverrideMaterial2DEnabled;
+
+	E_FOG_TYPE FogType;
+	bool PixelFog;
+	bool RangeFog;
+	bool AllowZWriteOnTransparent;
+
+	bool FeatureEnabled[video::EVDF_COUNT];
+
+	SColorf AmbientLight;
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/COBJMeshFileLoader.cpp b/irr/src/COBJMeshFileLoader.cpp
new file mode 100644
index 000000000..4c5a5328d
--- /dev/null
+++ b/irr/src/COBJMeshFileLoader.cpp
@@ -0,0 +1,549 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "COBJMeshFileLoader.h"
+#include "IMeshManipulator.h"
+#include "IVideoDriver.h"
+#include "SMesh.h"
+#include "SMeshBuffer.h"
+#include "SAnimatedMesh.h"
+#include "IReadFile.h"
+#include "IAttributes.h"
+#include "fast_atof.h"
+#include "coreutil.h"
+#include "os.h"
+
+namespace irr
+{
+namespace scene
+{
+
+#ifdef _DEBUG
+#define _IRR_DEBUG_OBJ_LOADER_
+#endif
+
+//! Constructor
+COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager *smgr) :
+		SceneManager(smgr)
+{
+#ifdef _DEBUG
+	setDebugName("COBJMeshFileLoader");
+#endif
+}
+
+//! destructor
+COBJMeshFileLoader::~COBJMeshFileLoader()
+{
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".bsp")
+bool COBJMeshFileLoader::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "obj");
+}
+
+//! creates/loads an animated mesh from the file.
+//! \return Pointer to the created mesh. Returns 0 if loading failed.
+//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+//! See IReferenceCounted::drop() for more information.
+IAnimatedMesh *COBJMeshFileLoader::createMesh(io::IReadFile *file)
+{
+	if (!file)
+		return 0;
+
+	const long filesize = file->getSize();
+	if (!filesize)
+		return 0;
+
+	const u32 WORD_BUFFER_LENGTH = 512;
+
+	core::array<core::vector3df> vertexBuffer(1000);
+	core::array<core::vector3df> normalsBuffer(1000);
+	core::array<core::vector2df> textureCoordBuffer(1000);
+
+	SObjMtl *currMtl = new SObjMtl();
+	Materials.push_back(currMtl);
+	u32 smoothingGroup = 0;
+
+	const io::path fullName = file->getFileName();
+
+	c8 *buf = new c8[filesize + 1]; // plus null-terminator
+	memset(buf, 0, filesize + 1);
+	file->read((void *)buf, filesize);
+	const c8 *const bufEnd = buf + filesize;
+
+	// Process obj information
+	const c8 *bufPtr = buf;
+	core::stringc grpName, mtlName;
+	bool mtlChanged = false;
+	bool useGroups = !SceneManager->getParameters()->getAttributeAsBool(OBJ_LOADER_IGNORE_GROUPS);
+	bool useMaterials = !SceneManager->getParameters()->getAttributeAsBool(OBJ_LOADER_IGNORE_MATERIAL_FILES);
+	[[maybe_unused]] irr::u32 lineNr = 1; // only counts non-empty lines, still useful in debugging to locate errors
+	core::array<int> faceCorners;
+	faceCorners.reallocate(32); // should be large enough
+	const core::stringc TAG_OFF = "off";
+	irr::u32 degeneratedFaces = 0;
+
+	while (bufPtr != bufEnd) {
+		switch (bufPtr[0]) {
+		case 'm': // mtllib (material)
+		{
+			if (useMaterials) {
+				c8 name[WORD_BUFFER_LENGTH];
+				bufPtr = goAndCopyNextWord(name, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+				os::Printer::log("Ignoring material file", name);
+#endif
+			}
+		} break;
+
+		case 'v': // v, vn, vt
+			switch (bufPtr[1]) {
+			case ' ': // vertex
+			{
+				core::vector3df vec;
+				bufPtr = readVec3(bufPtr, vec, bufEnd);
+				vertexBuffer.push_back(vec);
+			} break;
+
+			case 'n': // normal
+			{
+				core::vector3df vec;
+				bufPtr = readVec3(bufPtr, vec, bufEnd);
+				normalsBuffer.push_back(vec);
+			} break;
+
+			case 't': // texcoord
+			{
+				core::vector2df vec;
+				bufPtr = readUV(bufPtr, vec, bufEnd);
+				textureCoordBuffer.push_back(vec);
+			} break;
+			}
+			break;
+
+		case 'g': // group name
+		{
+			c8 grp[WORD_BUFFER_LENGTH];
+			bufPtr = goAndCopyNextWord(grp, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+			os::Printer::log("Loaded group start", grp, ELL_DEBUG);
+#endif
+			if (useGroups) {
+				if (0 != grp[0])
+					grpName = grp;
+				else
+					grpName = "default";
+			}
+			mtlChanged = true;
+		} break;
+
+		case 's': // smoothing can be a group or off (equiv. to 0)
+		{
+			c8 smooth[WORD_BUFFER_LENGTH];
+			bufPtr = goAndCopyNextWord(smooth, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+			os::Printer::log("Loaded smoothing group start", smooth, ELL_DEBUG);
+#endif
+			if (TAG_OFF == smooth)
+				smoothingGroup = 0;
+			else
+				smoothingGroup = core::strtoul10(smooth);
+
+			(void)smoothingGroup; // disable unused variable warnings
+		} break;
+
+		case 'u': // usemtl
+			// get name of material
+			{
+				c8 matName[WORD_BUFFER_LENGTH];
+				bufPtr = goAndCopyNextWord(matName, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+#ifdef _IRR_DEBUG_OBJ_LOADER_
+				os::Printer::log("Loaded material start", matName, ELL_DEBUG);
+#endif
+				mtlName = matName;
+				mtlChanged = true;
+			}
+			break;
+
+		case 'f': // face
+		{
+			c8 vertexWord[WORD_BUFFER_LENGTH]; // for retrieving vertex data
+			video::S3DVertex v;
+			// Assign vertex color from currently active material's diffuse color
+			if (mtlChanged) {
+				// retrieve the material
+				SObjMtl *useMtl = findMtl(mtlName, grpName);
+				// only change material if we found it
+				if (useMtl)
+					currMtl = useMtl;
+				mtlChanged = false;
+			}
+			if (currMtl)
+				v.Color = currMtl->Meshbuffer->Material.DiffuseColor;
+
+			// get all vertices data in this face (current line of obj file)
+			const core::stringc wordBuffer = copyLine(bufPtr, bufEnd);
+			const c8 *linePtr = wordBuffer.c_str();
+			const c8 *const endPtr = linePtr + wordBuffer.size();
+
+			faceCorners.set_used(0); // fast clear
+
+			// read in all vertices
+			linePtr = goNextWord(linePtr, endPtr);
+			while (0 != linePtr[0]) {
+				// Array to communicate with retrieveVertexIndices()
+				// sends the buffer sizes and gets the actual indices
+				// if index not set returns -1
+				s32 Idx[3];
+				Idx[0] = Idx[1] = Idx[2] = -1;
+
+				// read in next vertex's data
+				u32 wlength = copyWord(vertexWord, linePtr, WORD_BUFFER_LENGTH, endPtr);
+				// this function will also convert obj's 1-based index to c++'s 0-based index
+				retrieveVertexIndices(vertexWord, Idx, vertexWord + wlength + 1, vertexBuffer.size(), textureCoordBuffer.size(), normalsBuffer.size());
+				if (Idx[0] >= 0 && Idx[0] < (irr::s32)vertexBuffer.size())
+					v.Pos = vertexBuffer[Idx[0]];
+				else {
+					os::Printer::log("Invalid vertex index in this line", wordBuffer.c_str(), ELL_ERROR);
+					delete[] buf;
+					cleanUp();
+					return 0;
+				}
+				if (Idx[1] >= 0 && Idx[1] < (irr::s32)textureCoordBuffer.size())
+					v.TCoords = textureCoordBuffer[Idx[1]];
+				else
+					v.TCoords.set(0.0f, 0.0f);
+				if (Idx[2] >= 0 && Idx[2] < (irr::s32)normalsBuffer.size())
+					v.Normal = normalsBuffer[Idx[2]];
+				else {
+					v.Normal.set(0.0f, 0.0f, 0.0f);
+					currMtl->RecalculateNormals = true;
+				}
+
+				int vertLocation;
+				auto n = currMtl->VertMap.find(v);
+				if (n != currMtl->VertMap.end()) {
+					vertLocation = n->second;
+				} else {
+					currMtl->Meshbuffer->Vertices.push_back(v);
+					vertLocation = currMtl->Meshbuffer->Vertices.size() - 1;
+					currMtl->VertMap.emplace(v, vertLocation);
+				}
+
+				faceCorners.push_back(vertLocation);
+
+				// go to next vertex
+				linePtr = goNextWord(linePtr, endPtr);
+			}
+
+			if (faceCorners.size() < 3) {
+				os::Printer::log("Too few vertices in this line", wordBuffer.c_str(), ELL_ERROR);
+				delete[] buf;
+				cleanUp();
+				return 0;
+			}
+
+			// triangulate the face
+			const int c = faceCorners[0];
+			for (u32 i = 1; i < faceCorners.size() - 1; ++i) {
+				// Add a triangle
+				const int a = faceCorners[i + 1];
+				const int b = faceCorners[i];
+				if (a != b && a != c && b != c) { // ignore degenerated faces. We can get them when we merge vertices above in the VertMap.
+					currMtl->Meshbuffer->Indices.push_back(a);
+					currMtl->Meshbuffer->Indices.push_back(b);
+					currMtl->Meshbuffer->Indices.push_back(c);
+				} else {
+					++degeneratedFaces;
+				}
+			}
+		} break;
+
+		case '#': // comment
+		default:
+			break;
+		} // end switch(bufPtr[0])
+		// eat up rest of line
+		bufPtr = goNextLine(bufPtr, bufEnd);
+		++lineNr;
+	} // end while(bufPtr && (bufPtr-buf<filesize))
+
+	if (degeneratedFaces > 0) {
+		irr::core::stringc log(degeneratedFaces);
+		log += " degenerated faces removed in ";
+		log += irr::core::stringc(fullName);
+		os::Printer::log(log.c_str(), ELL_INFORMATION);
+	}
+
+	SMesh *mesh = new SMesh();
+
+	// Combine all the groups (meshbuffers) into the mesh
+	for (u32 m = 0; m < Materials.size(); ++m) {
+		if (Materials[m]->Meshbuffer->getIndexCount() > 0) {
+			Materials[m]->Meshbuffer->recalculateBoundingBox();
+			if (Materials[m]->RecalculateNormals)
+				SceneManager->getMeshManipulator()->recalculateNormals(Materials[m]->Meshbuffer);
+			mesh->addMeshBuffer(Materials[m]->Meshbuffer);
+		}
+	}
+
+	// Create the Animated mesh if there's anything in the mesh
+	SAnimatedMesh *animMesh = 0;
+	if (0 != mesh->getMeshBufferCount()) {
+		mesh->recalculateBoundingBox();
+		animMesh = new SAnimatedMesh();
+		animMesh->Type = EAMT_OBJ;
+		animMesh->addMesh(mesh);
+		animMesh->recalculateBoundingBox();
+	}
+
+	// Clean up the allocate obj file contents
+	delete[] buf;
+	// more cleaning up
+	cleanUp();
+	mesh->drop();
+
+	return animMesh;
+}
+
+//! Read RGB color
+const c8 *COBJMeshFileLoader::readColor(const c8 *bufPtr, video::SColor &color, const c8 *const bufEnd)
+{
+	const u32 COLOR_BUFFER_LENGTH = 16;
+	c8 colStr[COLOR_BUFFER_LENGTH];
+
+	bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+	color.setRed((u32)core::round32(core::fast_atof(colStr) * 255.f));
+	bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+	color.setGreen((u32)core::round32(core::fast_atof(colStr) * 255.f));
+	bufPtr = goAndCopyNextWord(colStr, bufPtr, COLOR_BUFFER_LENGTH, bufEnd);
+	color.setBlue((u32)core::round32(core::fast_atof(colStr) * 255.f));
+	return bufPtr;
+}
+
+//! Read 3d vector of floats
+const c8 *COBJMeshFileLoader::readVec3(const c8 *bufPtr, core::vector3df &vec, const c8 *const bufEnd)
+{
+	const u32 WORD_BUFFER_LENGTH = 256;
+	c8 wordBuffer[WORD_BUFFER_LENGTH];
+
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.X = -core::fast_atof(wordBuffer); // change handedness
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.Y = core::fast_atof(wordBuffer);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.Z = core::fast_atof(wordBuffer);
+	return bufPtr;
+}
+
+//! Read 2d vector of floats
+const c8 *COBJMeshFileLoader::readUV(const c8 *bufPtr, core::vector2df &vec, const c8 *const bufEnd)
+{
+	const u32 WORD_BUFFER_LENGTH = 256;
+	c8 wordBuffer[WORD_BUFFER_LENGTH];
+
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.X = core::fast_atof(wordBuffer);
+	bufPtr = goAndCopyNextWord(wordBuffer, bufPtr, WORD_BUFFER_LENGTH, bufEnd);
+	vec.Y = 1 - core::fast_atof(wordBuffer); // change handedness
+	return bufPtr;
+}
+
+//! Read boolean value represented as 'on' or 'off'
+const c8 *COBJMeshFileLoader::readBool(const c8 *bufPtr, bool &tf, const c8 *const bufEnd)
+{
+	const u32 BUFFER_LENGTH = 8;
+	c8 tfStr[BUFFER_LENGTH];
+
+	bufPtr = goAndCopyNextWord(tfStr, bufPtr, BUFFER_LENGTH, bufEnd);
+	tf = strcmp(tfStr, "off") != 0;
+	return bufPtr;
+}
+
+COBJMeshFileLoader::SObjMtl *COBJMeshFileLoader::findMtl(const core::stringc &mtlName, const core::stringc &grpName)
+{
+	COBJMeshFileLoader::SObjMtl *defMaterial = 0;
+	// search existing Materials for best match
+	// exact match does return immediately, only name match means a new group
+	for (u32 i = 0; i < Materials.size(); ++i) {
+		if (Materials[i]->Name == mtlName) {
+			if (Materials[i]->Group == grpName)
+				return Materials[i];
+			else
+				defMaterial = Materials[i];
+		}
+	}
+	// we found a partial match
+	if (defMaterial) {
+		Materials.push_back(new SObjMtl(*defMaterial));
+		Materials.getLast()->Group = grpName;
+		return Materials.getLast();
+	}
+	// we found a new group for a non-existent material
+	else if (grpName.size()) {
+		Materials.push_back(new SObjMtl(*Materials[0]));
+		Materials.getLast()->Group = grpName;
+		return Materials.getLast();
+	}
+	return 0;
+}
+
+//! skip space characters and stop on first non-space
+const c8 *COBJMeshFileLoader::goFirstWord(const c8 *buf, const c8 *const bufEnd, bool acrossNewlines)
+{
+	// skip space characters
+	if (acrossNewlines)
+		while ((buf != bufEnd) && core::isspace(*buf))
+			++buf;
+	else
+		while ((buf != bufEnd) && core::isspace(*buf) && (*buf != '\n'))
+			++buf;
+
+	return buf;
+}
+
+//! skip current word and stop at beginning of next one
+const c8 *COBJMeshFileLoader::goNextWord(const c8 *buf, const c8 *const bufEnd, bool acrossNewlines)
+{
+	// skip current word
+	while ((buf != bufEnd) && !core::isspace(*buf))
+		++buf;
+
+	return goFirstWord(buf, bufEnd, acrossNewlines);
+}
+
+//! Read until line break is reached and stop at the next non-space character
+const c8 *COBJMeshFileLoader::goNextLine(const c8 *buf, const c8 *const bufEnd)
+{
+	// look for newline characters
+	while (buf != bufEnd) {
+		// found it, so leave
+		if (*buf == '\n' || *buf == '\r')
+			break;
+		++buf;
+	}
+	return goFirstWord(buf, bufEnd);
+}
+
+u32 COBJMeshFileLoader::copyWord(c8 *outBuf, const c8 *const inBuf, u32 outBufLength, const c8 *const bufEnd)
+{
+	if (!outBufLength)
+		return 0;
+	if (!inBuf) {
+		*outBuf = 0;
+		return 0;
+	}
+
+	u32 i = 0;
+	while (inBuf[i]) {
+		if (core::isspace(inBuf[i]) || &(inBuf[i]) == bufEnd)
+			break;
+		++i;
+	}
+
+	u32 length = core::min_(i, outBufLength - 1);
+	for (u32 j = 0; j < length; ++j)
+		outBuf[j] = inBuf[j];
+
+	outBuf[length] = 0;
+	return length;
+}
+
+core::stringc COBJMeshFileLoader::copyLine(const c8 *inBuf, const c8 *bufEnd)
+{
+	if (!inBuf)
+		return core::stringc();
+
+	const c8 *ptr = inBuf;
+	while (ptr < bufEnd) {
+		if (*ptr == '\n' || *ptr == '\r')
+			break;
+		++ptr;
+	}
+	// we must avoid the +1 in case the array is used up
+	return core::stringc(inBuf, (u32)(ptr - inBuf + ((ptr < bufEnd) ? 1 : 0)));
+}
+
+const c8 *COBJMeshFileLoader::goAndCopyNextWord(c8 *outBuf, const c8 *inBuf, u32 outBufLength, const c8 *bufEnd)
+{
+	inBuf = goNextWord(inBuf, bufEnd, false);
+	copyWord(outBuf, inBuf, outBufLength, bufEnd);
+	return inBuf;
+}
+
+bool COBJMeshFileLoader::retrieveVertexIndices(c8 *vertexData, s32 *idx, const c8 *bufEnd, u32 vbsize, u32 vtsize, u32 vnsize)
+{
+	const u32 BUFFER_LENGTH = 16;
+	c8 word[BUFFER_LENGTH];
+	const c8 *p = goFirstWord(vertexData, bufEnd);
+	u32 idxType = 0; // 0 = posIdx, 1 = texcoordIdx, 2 = normalIdx
+
+	u32 i = 0;
+	while (p != bufEnd) {
+		if (i >= BUFFER_LENGTH) {
+			return false;
+		}
+		if ((core::isdigit(*p)) || (*p == '-')) {
+			// build up the number
+			word[i++] = *p;
+		} else if (*p == '/' || *p == ' ' || *p == '\0') {
+			// number is completed. Convert and store it
+			word[i] = '\0';
+			// if no number was found index will become 0 and later on -1 by decrement
+			idx[idxType] = core::strtol10(word);
+			if (idx[idxType] < 0) {
+				switch (idxType) {
+				case 0:
+					idx[idxType] += vbsize;
+					break;
+				case 1:
+					idx[idxType] += vtsize;
+					break;
+				case 2:
+					idx[idxType] += vnsize;
+					break;
+				}
+			} else
+				idx[idxType] -= 1;
+
+			// reset the word
+			word[0] = '\0';
+			i = 0;
+
+			// go to the next kind of index type
+			if (*p == '/') {
+				if (++idxType > 2) {
+					// error checking, shouldn't reach here unless file is wrong
+					idxType = 0;
+				}
+			} else {
+				// set all missing values to disable (=-1)
+				while (++idxType < 3)
+					idx[idxType] = -1;
+				++p;
+				break; // while
+			}
+		}
+
+		// go to the next char
+		++p;
+	}
+
+	return true;
+}
+
+void COBJMeshFileLoader::cleanUp()
+{
+	for (u32 i = 0; i < Materials.size(); ++i) {
+		Materials[i]->Meshbuffer->drop();
+		delete Materials[i];
+	}
+
+	Materials.clear();
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/COBJMeshFileLoader.h b/irr/src/COBJMeshFileLoader.h
new file mode 100644
index 000000000..63e768e4f
--- /dev/null
+++ b/irr/src/COBJMeshFileLoader.h
@@ -0,0 +1,109 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <map>
+#include "IMeshLoader.h"
+#include "ISceneManager.h"
+#include "irrString.h"
+#include "SMeshBuffer.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! Meshloader capable of loading obj meshes.
+class COBJMeshFileLoader : public IMeshLoader
+{
+public:
+	//! Constructor
+	COBJMeshFileLoader(scene::ISceneManager *smgr);
+
+	//! destructor
+	virtual ~COBJMeshFileLoader();
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".obj")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! creates/loads an animated mesh from the file.
+	//! \return Pointer to the created mesh. Returns 0 if loading failed.
+	//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+	//! See IReferenceCounted::drop() for more information.
+	IAnimatedMesh *createMesh(io::IReadFile *file) override;
+
+private:
+	struct SObjMtl
+	{
+		SObjMtl() :
+				Meshbuffer(0), Bumpiness(1.0f), Illumination(0),
+				RecalculateNormals(false)
+		{
+			Meshbuffer = new SMeshBuffer();
+			Meshbuffer->Material.Shininess = 0.0f;
+			Meshbuffer->Material.AmbientColor = video::SColorf(0.2f, 0.2f, 0.2f, 1.0f).toSColor();
+			Meshbuffer->Material.DiffuseColor = video::SColorf(0.8f, 0.8f, 0.8f, 1.0f).toSColor();
+			Meshbuffer->Material.SpecularColor = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f).toSColor();
+		}
+
+		SObjMtl(const SObjMtl &o) :
+				Name(o.Name), Group(o.Group),
+				Bumpiness(o.Bumpiness), Illumination(o.Illumination),
+				RecalculateNormals(false)
+		{
+			Meshbuffer = new SMeshBuffer();
+			Meshbuffer->Material = o.Meshbuffer->Material;
+		}
+
+		std::map<video::S3DVertex, int> VertMap;
+		scene::SMeshBuffer *Meshbuffer;
+		core::stringc Name;
+		core::stringc Group;
+		f32 Bumpiness;
+		c8 Illumination;
+		bool RecalculateNormals;
+	};
+
+	// returns a pointer to the first printable character available in the buffer
+	const c8 *goFirstWord(const c8 *buf, const c8 *const bufEnd, bool acrossNewlines = true);
+	// returns a pointer to the first printable character after the first non-printable
+	const c8 *goNextWord(const c8 *buf, const c8 *const bufEnd, bool acrossNewlines = true);
+	// returns a pointer to the next printable character after the first line break
+	const c8 *goNextLine(const c8 *buf, const c8 *const bufEnd);
+	// copies the current word from the inBuf to the outBuf
+	u32 copyWord(c8 *outBuf, const c8 *inBuf, u32 outBufLength, const c8 *const pBufEnd);
+	// copies the current line from the inBuf to the outBuf
+	core::stringc copyLine(const c8 *inBuf, const c8 *const bufEnd);
+
+	// combination of goNextWord followed by copyWord
+	const c8 *goAndCopyNextWord(c8 *outBuf, const c8 *inBuf, u32 outBufLength, const c8 *const pBufEnd);
+
+	//! Find and return the material with the given name
+	SObjMtl *findMtl(const core::stringc &mtlName, const core::stringc &grpName);
+
+	//! Read RGB color
+	const c8 *readColor(const c8 *bufPtr, video::SColor &color, const c8 *const pBufEnd);
+	//! Read 3d vector of floats
+	const c8 *readVec3(const c8 *bufPtr, core::vector3df &vec, const c8 *const pBufEnd);
+	//! Read 2d vector of floats
+	const c8 *readUV(const c8 *bufPtr, core::vector2df &vec, const c8 *const pBufEnd);
+	//! Read boolean value represented as 'on' or 'off'
+	const c8 *readBool(const c8 *bufPtr, bool &tf, const c8 *const bufEnd);
+
+	// reads and convert to integer the vertex indices in a line of obj file's face statement
+	// -1 for the index if it doesn't exist
+	// indices are changed to 0-based index instead of 1-based from the obj file
+	bool retrieveVertexIndices(c8 *vertexData, s32 *idx, const c8 *bufEnd, u32 vbsize, u32 vtsize, u32 vnsize);
+
+	void cleanUp();
+
+	scene::ISceneManager *SceneManager;
+
+	core::array<SObjMtl *> Materials;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/COGLESCommon.h b/irr/src/COGLESCommon.h
new file mode 100644
index 000000000..1d439546a
--- /dev/null
+++ b/irr/src/COGLESCommon.h
@@ -0,0 +1,122 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#if defined(_IRR_COMPILE_WITH_IOS_DEVICE_)
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#elif defined(_IRR_OGLES1_USE_KHRONOS_API_HEADERS_)
+#include <khronos-api/GLES/gl.h>
+#include <EGL/eglplatform.h>
+typedef char GLchar;
+#else // or only when defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) ?
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <EGL/eglplatform.h>
+#endif
+
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1;
+#endif
+
+// Blending definitions.
+
+#if defined(GL_OES_blend_subtract)
+#define GL_FUNC_ADD GL_FUNC_ADD_OES
+#else
+#define GL_FUNC_ADD 0
+#endif
+
+// FBO definitions.
+
+#ifdef GL_OES_framebuffer_object
+#define GL_NONE 0 // iOS has missing definition of GL_NONE_OES
+#define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
+#define GL_DEPTH_COMPONENT16 GL_DEPTH_COMPONENT16_OES
+#define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES
+#define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
+#define GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_OES
+#define GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 1
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 2
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES
+#define GL_FRAMEBUFFER_UNSUPPORTED GL_FRAMEBUFFER_UNSUPPORTED_OES
+#else
+#define GL_NONE 0
+#define GL_FRAMEBUFFER 0
+#define GL_DEPTH_COMPONENT16 0
+#define GL_COLOR_ATTACHMENT0 0
+#define GL_DEPTH_ATTACHMENT 0
+#define GL_STENCIL_ATTACHMENT 0
+#define GL_FRAMEBUFFER_COMPLETE 0
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 1
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 2
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 3
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS 4
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 5
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 6
+#define GL_FRAMEBUFFER_UNSUPPORTED 7
+#endif
+
+#define GL_DEPTH_COMPONENT 0x1902
+
+// Texture definitions.
+
+#ifdef GL_OES_texture_cube_map
+#define GL_TEXTURE_CUBE_MAP GL_TEXTURE_CUBE_MAP_OES
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES
+#else
+#define GL_TEXTURE_CUBE_MAP 0
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0
+#endif
+
+// to check if this header is in the current compile unit (different GL implementation used different "GLCommon" headers in Irrlicht
+#define IRR_COMPILE_GLES_COMMON
+
+// macro used with COGLES1Driver
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
+
+namespace irr
+{
+namespace video
+{
+
+// Forward declarations.
+
+class COpenGLCoreFeature;
+
+template <class TOpenGLDriver>
+class COpenGLCoreTexture;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreRenderTarget;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreCacheHandler;
+
+class COGLES1Driver;
+typedef COpenGLCoreTexture<COGLES1Driver> COGLES1Texture;
+typedef COpenGLCoreRenderTarget<COGLES1Driver, COGLES1Texture> COGLES1RenderTarget;
+typedef COpenGLCoreCacheHandler<COGLES1Driver, COGLES1Texture> COGLES1CacheHandler;
+
+}
+}
+
+#endif
diff --git a/irr/src/COGLESCoreExtensionHandler.h b/irr/src/COGLESCoreExtensionHandler.h
new file mode 100644
index 000000000..4c691aaf9
--- /dev/null
+++ b/irr/src/COGLESCoreExtensionHandler.h
@@ -0,0 +1,189 @@
+// Copyright (C) 2017 Michael Zeilfelder
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+// Can be included from different ES versions
+// (this is also the reason why this file is header-only as correct OGL ES headers have to be included first)
+
+#include "irrMath.h"
+#include "COpenGLCoreFeature.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COGLESCoreExtensionHandler
+{
+public:
+	// Enums used internally to check for ES extensions quickly.
+	// We buffer all extensions on start once in an array.
+	// All OpenGL ES versions share the same extensions (WebGL adds it's own extensions on top of ES2)
+	enum EOGLESFeatures
+	{
+		// If you update this enum also update the corresponding OGLESFeatureStrings string-array
+		IRR_GL_APPLE_texture_2D_limited_npot,
+		IRR_GL_APPLE_texture_format_BGRA8888,
+		IRR_GL_EXT_blend_minmax,
+		IRR_GL_EXT_read_format_bgra,
+		IRR_GL_EXT_texture_filter_anisotropic,
+		IRR_GL_EXT_texture_format_BGRA8888,
+		IRR_GL_EXT_texture_lod_bias,
+		IRR_GL_EXT_texture_rg,
+		IRR_GL_IMG_read_format,
+		IRR_GL_IMG_texture_format_BGRA8888,
+		IRR_GL_IMG_user_clip_plane,
+		IRR_GL_OES_blend_func_separate,
+		IRR_GL_OES_blend_subtract,
+		IRR_GL_OES_depth_texture,
+		IRR_GL_OES_depth24,
+		IRR_GL_OES_depth32,
+		IRR_GL_OES_element_index_uint,
+		IRR_GL_OES_framebuffer_object,
+		IRR_GL_OES_packed_depth_stencil,
+		IRR_GL_OES_point_size_array,
+		IRR_GL_OES_point_sprite,
+		IRR_GL_OES_read_format,
+		IRR_GL_OES_stencil_wrap,
+		IRR_GL_OES_texture_float,
+		IRR_GL_OES_texture_half_float,
+		IRR_GL_OES_texture_mirrored_repeat,
+		IRR_GL_OES_texture_npot,
+
+		IRR_OGLES_Feature_Count
+	};
+
+	COGLESCoreExtensionHandler() :
+			Version(0), MaxAnisotropy(1), MaxIndices(0xffff),
+			MaxTextureSize(1), MaxTextureLODBias(0.f), StencilBuffer(false)
+	{
+		for (u32 i = 0; i < IRR_OGLES_Feature_Count; ++i)
+			FeatureAvailable[i] = false;
+
+		DimAliasedLine[0] = 1.f;
+		DimAliasedLine[1] = 1.f;
+		DimAliasedPoint[0] = 1.f;
+		DimAliasedPoint[1] = 1.f;
+	}
+
+	virtual ~COGLESCoreExtensionHandler() {}
+
+	const COpenGLCoreFeature &getFeature() const
+	{
+		return Feature;
+	}
+
+	void dump() const
+	{
+		for (u32 i = 0; i < IRR_OGLES_Feature_Count; ++i)
+			os::Printer::log(getFeatureString(i), FeatureAvailable[i] ? " true" : " false");
+	}
+
+	bool queryGLESFeature(EOGLESFeatures feature) const
+	{
+		return FeatureAvailable[feature];
+	}
+
+protected:
+	const char *getFeatureString(size_t index) const
+	{
+		// One for each EOGLESFeatures
+		static const char *const OGLESFeatureStrings[IRR_OGLES_Feature_Count] = {
+				"GL_APPLE_texture_2D_limited_npot",
+				"GL_APPLE_texture_format_BGRA8888",
+				"GL_EXT_blend_minmax",
+				"GL_EXT_read_format_bgra",
+				"GL_EXT_texture_filter_anisotropic",
+				"GL_EXT_texture_format_BGRA8888",
+				"GL_EXT_texture_lod_bias",
+				"GL_EXT_texture_rg",
+				"GL_IMG_read_format",
+				"GL_IMG_texture_format_BGRA8888",
+				"GL_IMG_user_clip_plane",
+				"GL_OES_blend_func_separate",
+				"GL_OES_blend_subtract",
+				"GL_OES_depth_texture",
+				"GL_OES_depth24",
+				"GL_OES_depth32",
+				"GL_OES_element_index_uint",
+				"GL_OES_framebuffer_object",
+				"GL_OES_packed_depth_stencil",
+				"GL_OES_point_size_array",
+				"GL_OES_point_sprite",
+				"GL_OES_read_format",
+				"GL_OES_stencil_wrap",
+				"GL_OES_texture_float",
+				"GL_OES_texture_half_float",
+				"GL_OES_texture_mirrored_repeat",
+				"GL_OES_texture_npot",
+			};
+
+		return OGLESFeatureStrings[index];
+	}
+
+	void getGLVersion()
+	{
+		Version = 0;
+		s32 multiplier = 100;
+
+		core::stringc version(glGetString(GL_VERSION));
+
+		for (u32 i = 0; i < version.size(); ++i) {
+			if (version[i] >= '0' && version[i] <= '9') {
+				if (multiplier > 1) {
+					Version += static_cast<u16>(core::floor32(atof(&(version[i]))) * multiplier);
+					multiplier /= 10;
+				} else {
+					break;
+				}
+			}
+		}
+	}
+
+	void getGLExtensions()
+	{
+		core::stringc extensions = glGetString(GL_EXTENSIONS);
+		os::Printer::log(extensions.c_str());
+
+		const u32 size = extensions.size() + 1;
+		c8 *str = new c8[size];
+		strncpy(str, extensions.c_str(), extensions.size());
+		str[extensions.size()] = ' ';
+		c8 *p = str;
+
+		for (u32 i = 0; i < size; ++i) {
+			if (str[i] == ' ') {
+				str[i] = 0;
+				if (*p)
+					for (size_t j = 0; j < IRR_OGLES_Feature_Count; ++j) {
+						if (!strcmp(getFeatureString(j), p)) {
+							FeatureAvailable[j] = true;
+							break;
+						}
+					}
+
+				p = p + strlen(p) + 1;
+			}
+		}
+
+		delete[] str;
+	}
+
+	COpenGLCoreFeature Feature;
+
+	u16 Version;
+	u8 MaxAnisotropy;
+	u32 MaxIndices;
+	u32 MaxTextureSize;
+	f32 MaxTextureLODBias;
+	//! Minimal and maximal supported thickness for lines without smoothing
+	float DimAliasedLine[2];
+	//! Minimal and maximal supported thickness for points without smoothing
+	float DimAliasedPoint[2];
+	bool StencilBuffer;
+	bool FeatureAvailable[IRR_OGLES_Feature_Count];
+};
+}
+}
diff --git a/irr/src/COGLESDriver.cpp b/irr/src/COGLESDriver.cpp
new file mode 100644
index 000000000..524aedd50
--- /dev/null
+++ b/irr/src/COGLESDriver.cpp
@@ -0,0 +1,2397 @@
+// Copyright (C) 2002-2008 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "COGLESDriver.h"
+#include <cassert>
+#include "CNullDriver.h"
+#include "IContextManager.h"
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreRenderTarget.h"
+#include "COpenGLCoreCacheHandler.h"
+
+#include "COGLESMaterialRenderer.h"
+
+#include "EVertexAttributes.h"
+#include "CImage.h"
+#include "os.h"
+
+namespace irr
+{
+namespace video
+{
+
+COGLES1Driver::COGLES1Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager) :
+		CNullDriver(io, params.WindowSize), COGLES1ExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE),
+		ResetRenderStates(true), Transformation3DChanged(true), AntiAlias(params.AntiAlias),
+		ColorFormat(ECF_R8G8B8), Params(params), ContextManager(contextManager)
+{
+#ifdef _DEBUG
+	setDebugName("COGLESDriver");
+#endif
+
+	core::dimension2d<u32> windowSize(0, 0);
+
+	if (!ContextManager)
+		return;
+
+	ContextManager->grab();
+	ContextManager->generateSurface();
+	ContextManager->generateContext();
+	ExposedData = ContextManager->getContext();
+	ContextManager->activateContext(ExposedData, false);
+
+	windowSize = params.WindowSize;
+
+	genericDriverInit(windowSize, params.Stencilbuffer);
+}
+
+COGLES1Driver::~COGLES1Driver()
+{
+	deleteMaterialRenders();
+
+	CacheHandler->getTextureCache().clear();
+
+	removeAllRenderTargets();
+	deleteAllTextures();
+	removeAllOcclusionQueries();
+	removeAllHardwareBuffers();
+
+	delete CacheHandler;
+
+	if (ContextManager) {
+		ContextManager->destroyContext();
+		ContextManager->destroySurface();
+		ContextManager->terminate();
+		ContextManager->drop();
+	}
+}
+
+// -----------------------------------------------------------------------
+// METHODS
+// -----------------------------------------------------------------------
+
+bool COGLES1Driver::genericDriverInit(const core::dimension2d<u32> &screenSize, bool stencilBuffer)
+{
+	Name = glGetString(GL_VERSION);
+	printVersion();
+
+	// print renderer information
+	VendorName = glGetString(GL_VENDOR);
+	os::Printer::log(VendorName.c_str(), ELL_INFORMATION);
+
+	// load extensions
+	initExtensions();
+
+	// reset cache handler
+	delete CacheHandler;
+	CacheHandler = new COGLES1CacheHandler(this);
+
+	StencilBuffer = stencilBuffer;
+
+	DriverAttributes->setAttribute("MaxTextures", (s32)Feature.MaxTextureUnits);
+	DriverAttributes->setAttribute("MaxSupportedTextures", (s32)Feature.MaxTextureUnits);
+	DriverAttributes->setAttribute("MaxAnisotropy", MaxAnisotropy);
+	DriverAttributes->setAttribute("MaxIndices", (s32)MaxIndices);
+	DriverAttributes->setAttribute("MaxTextureSize", (s32)MaxTextureSize);
+	DriverAttributes->setAttribute("MaxTextureLODBias", MaxTextureLODBias);
+	DriverAttributes->setAttribute("Version", Version);
+	DriverAttributes->setAttribute("AntiAlias", AntiAlias);
+
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+	UserClipPlane.reallocate(MaxUserClipPlanes);
+	UserClipPlaneEnabled.resize(MaxUserClipPlanes);
+
+	for (s32 i = 0; i < MaxUserClipPlanes; ++i) {
+		UserClipPlane.push_back(core::plane3df());
+		UserClipPlaneEnabled[i] = false;
+	}
+
+	for (s32 i = 0; i < ETS_COUNT; ++i)
+		setTransform(static_cast<E_TRANSFORMATION_STATE>(i), core::IdentityMatrix);
+
+	setAmbientLight(SColorf(0.0f, 0.0f, 0.0f, 0.0f));
+	glClearDepthf(1.0f);
+
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glHint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
+	glDepthFunc(GL_LEQUAL);
+	glFrontFace(GL_CW);
+	glAlphaFunc(GL_GREATER, 0.f);
+
+	// create material renderers
+	createMaterialRenderers();
+
+	// set the renderstates
+	setRenderStates3DMode();
+
+	// set fog mode
+	setFog(FogColor, FogType, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
+
+	// create matrix for flipping textures
+	TextureFlipMatrix.buildTextureTransform(0.0f, core::vector2df(0, 0), core::vector2df(0, 1.0f), core::vector2df(1.0f, -1.0f));
+
+	// We need to reset once more at the beginning of the first rendering.
+	// This fixes problems with intermediate changes to the material during texture load.
+	ResetRenderStates = true;
+
+	testGLError(__LINE__);
+
+	return true;
+}
+
+void COGLES1Driver::createMaterialRenderers()
+{
+	addAndDropMaterialRenderer(new COGLES1MaterialRenderer_SOLID(this));
+	addAndDropMaterialRenderer(new COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(this));
+	addAndDropMaterialRenderer(new COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(this));
+	addAndDropMaterialRenderer(new COGLES1MaterialRenderer_TRANSPARENT_VERTEX_ALPHA(this));
+	addAndDropMaterialRenderer(new COGLES1MaterialRenderer_ONETEXTURE_BLEND(this));
+}
+
+bool COGLES1Driver::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil, const SExposedVideoData &videoData, core::rect<s32> *sourceRect)
+{
+	CNullDriver::beginScene(clearFlag, clearColor, clearDepth, clearStencil, videoData, sourceRect);
+
+	if (ContextManager)
+		ContextManager->activateContext(videoData, true);
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+bool COGLES1Driver::endScene()
+{
+	CNullDriver::endScene();
+
+	glFlush();
+
+	if (ContextManager)
+		return ContextManager->swapBuffers();
+
+	return false;
+}
+
+//! Returns the transformation set by setTransform
+const core::matrix4 &COGLES1Driver::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return Matrices[state];
+}
+
+//! sets transformation
+void COGLES1Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat)
+{
+	Matrices[state] = mat;
+	Transformation3DChanged = true;
+
+	switch (state) {
+	case ETS_VIEW:
+	case ETS_WORLD: {
+		// OGLES1 only has a model matrix, view and world is not existent. so lets fake these two.
+		glMatrixMode(GL_MODELVIEW);
+		glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
+		// we have to update the clip planes to the latest view matrix
+		for (u32 i = 0; i < MaxUserClipPlanes; ++i)
+			if (UserClipPlaneEnabled[i])
+				uploadClipPlane(i);
+	} break;
+	case ETS_PROJECTION: {
+		GLfloat glmat[16];
+		getGLMatrix(glmat, mat);
+		// flip z to compensate OGLES1s right-hand coordinate system
+		glmat[12] *= -1.0f;
+		glMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(glmat);
+	} break;
+	default:
+		break;
+	}
+}
+
+bool COGLES1Driver::updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const u32 vertexCount = mb->getVertexCount();
+	const E_VERTEX_TYPE vType = mb->getVertexType();
+	const u32 vertexSize = getVertexPitchFromType(vType);
+
+	// buffer vertex data, and convert colours...
+	core::array<c8> buffer(vertexSize * vertexCount);
+	buffer.set_used(vertexSize * vertexCount);
+	memcpy(buffer.pointer(), vertices, vertexSize * vertexCount);
+
+	// in order to convert the colors into opengl format (RGBA)
+	switch (vType) {
+	case EVT_STANDARD: {
+		S3DVertex *pb = reinterpret_cast<S3DVertex *>(buffer.pointer());
+		const S3DVertex *po = static_cast<const S3DVertex *>(vertices);
+		for (u32 i = 0; i < vertexCount; i++) {
+			po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color.color));
+		}
+	} break;
+	case EVT_2TCOORDS: {
+		S3DVertex2TCoords *pb = reinterpret_cast<S3DVertex2TCoords *>(buffer.pointer());
+		const S3DVertex2TCoords *po = static_cast<const S3DVertex2TCoords *>(vertices);
+		for (u32 i = 0; i < vertexCount; i++) {
+			po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color.color));
+		}
+	} break;
+	case EVT_TANGENTS: {
+		S3DVertexTangents *pb = reinterpret_cast<S3DVertexTangents *>(buffer.pointer());
+		const S3DVertexTangents *po = static_cast<const S3DVertexTangents *>(vertices);
+		for (u32 i = 0; i < vertexCount; i++) {
+			po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color.color));
+		}
+	} break;
+	default: {
+		return false;
+	}
+	}
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_verticesID) {
+		glGenBuffers(1, &HWBuffer->vbo_verticesID);
+		if (!HWBuffer->vbo_verticesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_verticesSize < vertexCount * vertexSize) {
+		newBuffer = true;
+	}
+
+	glBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		glBufferSubData(GL_ARRAY_BUFFER, 0, vertexCount * vertexSize, buffer.const_pointer());
+	else {
+		HWBuffer->vbo_verticesSize = vertexCount * vertexSize;
+
+		if (HWBuffer->Mapped_Vertex == scene::EHM_STATIC)
+			glBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, buffer.const_pointer(), GL_STATIC_DRAW);
+		else
+			glBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, buffer.const_pointer(), GL_DYNAMIC_DRAW);
+	}
+
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	return (!testGLError(__LINE__));
+}
+
+bool COGLES1Driver::updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+
+	const void *indices = mb->getIndices();
+	u32 indexCount = mb->getIndexCount();
+
+	GLenum indexSize;
+	switch (mb->getIndexType()) {
+	case (EIT_16BIT): {
+		indexSize = sizeof(u16);
+		break;
+	}
+	case (EIT_32BIT): {
+		indexSize = sizeof(u32);
+		break;
+	}
+	default: {
+		return false;
+	}
+	}
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_indicesID) {
+		glGenBuffers(1, &HWBuffer->vbo_indicesID);
+		if (!HWBuffer->vbo_indicesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_indicesSize < indexCount * indexSize) {
+		newBuffer = true;
+	}
+
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indexCount * indexSize, indices);
+	else {
+		HWBuffer->vbo_indicesSize = indexCount * indexSize;
+
+		if (HWBuffer->Mapped_Index == scene::EHM_STATIC)
+			glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_STATIC_DRAW);
+		else
+			glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_DYNAMIC_DRAW);
+	}
+
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	return (!testGLError(__LINE__));
+}
+
+//! updates hardware buffer if needed
+bool COGLES1Driver::updateHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex() || !static_cast<SHWBufferLink_opengl *>(HWBuffer)->vbo_verticesID) {
+
+			HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+
+			if (!updateVertexHardwareBuffer(static_cast<SHWBufferLink_opengl *>(HWBuffer)))
+				return false;
+		}
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index() || !((SHWBufferLink_opengl *)HWBuffer)->vbo_indicesID) {
+
+			HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+
+			if (!updateIndexHardwareBuffer(static_cast<SHWBufferLink_opengl *>(HWBuffer)))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+//! Create hardware buffer from meshbuffer
+COGLES1Driver::SHWBufferLink *COGLES1Driver::createHardwareBuffer(const scene::IMeshBuffer *mb)
+{
+	if (!mb || (mb->getHardwareMappingHint_Index() == scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex() == scene::EHM_NEVER))
+		return 0;
+
+	SHWBufferLink_opengl *HWBuffer = new SHWBufferLink_opengl(mb);
+
+	// add to map
+	HWBuffer->listPosition = HWBufferList.insert(HWBufferList.end(), HWBuffer);
+
+	HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+	HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+	HWBuffer->Mapped_Vertex = mb->getHardwareMappingHint_Vertex();
+	HWBuffer->Mapped_Index = mb->getHardwareMappingHint_Index();
+	HWBuffer->vbo_verticesID = 0;
+	HWBuffer->vbo_indicesID = 0;
+	HWBuffer->vbo_verticesSize = 0;
+	HWBuffer->vbo_indicesSize = 0;
+
+	if (!updateHardwareBuffer(HWBuffer)) {
+		deleteHardwareBuffer(HWBuffer);
+		return 0;
+	}
+
+	return HWBuffer;
+}
+
+void COGLES1Driver::deleteHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	SHWBufferLink_opengl *HWBuffer = static_cast<SHWBufferLink_opengl *>(_HWBuffer);
+	if (HWBuffer->vbo_verticesID) {
+		glDeleteBuffers(1, &HWBuffer->vbo_verticesID);
+		HWBuffer->vbo_verticesID = 0;
+	}
+	if (HWBuffer->vbo_indicesID) {
+		glDeleteBuffers(1, &HWBuffer->vbo_indicesID);
+		HWBuffer->vbo_indicesID = 0;
+	}
+
+	CNullDriver::deleteHardwareBuffer(_HWBuffer);
+}
+
+//! Draw hardware buffer
+void COGLES1Driver::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	SHWBufferLink_opengl *HWBuffer = static_cast<SHWBufferLink_opengl *>(_HWBuffer);
+
+	updateHardwareBuffer(HWBuffer); // check if update is needed
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const void *indexList = mb->getIndices();
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		glBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+		vertices = 0;
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+		indexList = 0;
+	}
+
+	drawVertexPrimitiveList(vertices, mb->getVertexCount(), indexList,
+			mb->getPrimitiveCount(), mb->getVertexType(),
+			mb->getPrimitiveType(), mb->getIndexType());
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER)
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+}
+
+IRenderTarget *COGLES1Driver::addRenderTarget()
+{
+	COGLES1RenderTarget *renderTarget = new COGLES1RenderTarget(this);
+	RenderTargets.push_back(renderTarget);
+
+	return renderTarget;
+}
+
+// small helper function to create vertex buffer object adress offsets
+static inline u8 *buffer_offset(const long offset)
+{
+	return ((u8 *)0 + offset);
+}
+
+//! draws a vertex primitive list
+void COGLES1Driver::drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+		const void *indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if (!checkPrimitiveCount(primitiveCount))
+		return;
+
+	setRenderStates3DMode();
+
+	drawVertexPrimitiveList2d3d(vertices, vertexCount, (const u16 *)indexList, primitiveCount, vType, pType, iType);
+}
+
+void COGLES1Driver::drawVertexPrimitiveList2d3d(const void *vertices, u32 vertexCount,
+		const void *indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType, bool threed)
+{
+	if (!primitiveCount || !vertexCount)
+		return;
+
+	if (!threed && !checkPrimitiveCount(primitiveCount))
+		return;
+
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
+
+	if (vertices) {
+		// convert colors to gl color format.
+		vertexCount *= 4; // reused as color component count
+		ColorBuffer.set_used(vertexCount);
+		u32 i;
+
+		switch (vType) {
+		case EVT_STANDARD: {
+			const S3DVertex *p = static_cast<const S3DVertex *>(vertices);
+			for (i = 0; i < vertexCount; i += 4) {
+				p->Color.toOpenGLColor(&ColorBuffer[i]);
+				++p;
+			}
+		} break;
+		case EVT_2TCOORDS: {
+			const S3DVertex2TCoords *p = static_cast<const S3DVertex2TCoords *>(vertices);
+			for (i = 0; i < vertexCount; i += 4) {
+				p->Color.toOpenGLColor(&ColorBuffer[i]);
+				++p;
+			}
+		} break;
+		case EVT_TANGENTS: {
+			const S3DVertexTangents *p = static_cast<const S3DVertexTangents *>(vertices);
+			for (i = 0; i < vertexCount; i += 4) {
+				p->Color.toOpenGLColor(&ColorBuffer[i]);
+				++p;
+			}
+		} break;
+		}
+	}
+
+	// draw everything
+	glClientActiveTexture(GL_TEXTURE0);
+	glEnableClientState(GL_COLOR_ARRAY);
+	glEnableClientState(GL_VERTEX_ARRAY);
+	if ((pType != scene::EPT_POINTS) && (pType != scene::EPT_POINT_SPRITES))
+		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+#ifdef GL_OES_point_size_array
+	else if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_point_size_array] && (Material.Thickness == 0.0f))
+		glEnableClientState(GL_POINT_SIZE_ARRAY_OES);
+#endif
+	if (threed && (pType != scene::EPT_POINTS) && (pType != scene::EPT_POINT_SPRITES))
+		glEnableClientState(GL_NORMAL_ARRAY);
+
+	if (vertices)
+		glColorPointer(4, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+
+	switch (vType) {
+	case EVT_STANDARD:
+		if (vertices) {
+			if (threed)
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			glVertexPointer((threed ? 3 : 2), GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex), buffer_offset(12));
+			glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertex), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), 0);
+		}
+
+		if (Feature.MaxTextureUnits > 0 && CacheHandler->getTextureCache().get(1)) {
+			glClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+		}
+		break;
+	case EVT_2TCOORDS:
+		if (vertices) {
+			if (threed)
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords);
+			glVertexPointer((threed ? 3 : 2), GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(12));
+			glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(0));
+		}
+
+		if (Feature.MaxTextureUnits > 0) {
+			glClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords2);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(36));
+		}
+		break;
+	case EVT_TANGENTS:
+		if (vertices) {
+			if (threed)
+				glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].TCoords);
+			glVertexPointer((threed ? 3 : 2), GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(12));
+			glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(0));
+		}
+
+		if (Feature.MaxTextureUnits > 0) {
+			glClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Tangent);
+			else
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(36));
+
+			glClientActiveTexture(GL_TEXTURE0 + 2);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Binormal);
+			else
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(48));
+		}
+		break;
+	}
+
+	GLenum indexSize = 0;
+
+	switch (iType) {
+	case (EIT_16BIT): {
+		indexSize = GL_UNSIGNED_SHORT;
+		break;
+	}
+	case (EIT_32BIT): {
+#ifdef GL_OES_element_index_uint
+#ifndef GL_UNSIGNED_INT
+#define GL_UNSIGNED_INT 0x1405
+#endif
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_element_index_uint])
+			indexSize = GL_UNSIGNED_INT;
+		else
+#endif
+			indexSize = GL_UNSIGNED_SHORT;
+		break;
+	}
+	}
+
+	switch (pType) {
+	case scene::EPT_POINTS:
+	case scene::EPT_POINT_SPRITES: {
+#ifdef GL_OES_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_point_sprite])
+			glEnable(GL_POINT_SPRITE_OES);
+#endif
+		// if ==0 we use the point size array
+		if (Material.Thickness != 0.f) {
+			float quadratic[] = {0.0f, 0.0f, 10.01f};
+			glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, quadratic);
+			float maxParticleSize = 1.0f;
+			glGetFloatv(GL_POINT_SIZE_MAX, &maxParticleSize);
+			//				maxParticleSize=maxParticleSize<Material.Thickness?maxParticleSize:Material.Thickness;
+			//				extGlPointParameterf(GL_POINT_SIZE_MAX,maxParticleSize);
+			//				extGlPointParameterf(GL_POINT_SIZE_MIN,Material.Thickness);
+			glPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE, 60.0f);
+			glPointSize(Material.Thickness);
+		}
+#ifdef GL_OES_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_point_sprite])
+			glTexEnvf(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_TRUE);
+#endif
+		glDrawArrays(GL_POINTS, 0, primitiveCount);
+#ifdef GL_OES_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_point_sprite]) {
+			glDisable(GL_POINT_SPRITE_OES);
+			glTexEnvf(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_FALSE);
+		}
+#endif
+	} break;
+	case scene::EPT_LINE_STRIP:
+		glDrawElements(GL_LINE_STRIP, primitiveCount + 1, indexSize, indexList);
+		break;
+	case scene::EPT_LINE_LOOP:
+		glDrawElements(GL_LINE_LOOP, primitiveCount, indexSize, indexList);
+		break;
+	case scene::EPT_LINES:
+		glDrawElements(GL_LINES, primitiveCount * 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_STRIP:
+		glDrawElements(GL_TRIANGLE_STRIP, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_FAN:
+		glDrawElements(GL_TRIANGLE_FAN, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLES:
+		glDrawElements((LastMaterial.Wireframe) ? GL_LINES : (LastMaterial.PointCloud) ? GL_POINTS
+																					   : GL_TRIANGLES,
+				primitiveCount * 3, indexSize, indexList);
+		break;
+	}
+
+	if (Feature.MaxTextureUnits > 0) {
+		if (vType == EVT_TANGENTS) {
+			glClientActiveTexture(GL_TEXTURE0 + 2);
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		if ((vType != EVT_STANDARD) || CacheHandler->getTextureCache().get(1)) {
+			glClientActiveTexture(GL_TEXTURE0 + 1);
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		glClientActiveTexture(GL_TEXTURE0);
+	}
+
+#ifdef GL_OES_point_size_array
+	if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_point_size_array] && (Material.Thickness == 0.0f))
+		glDisableClientState(GL_POINT_SIZE_ARRAY_OES);
+#endif
+
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+//! draws a 2d image, using a color and the alpha channel of the texture
+void COGLES1Driver::draw2DImage(const video::ITexture *texture,
+		const core::position2d<s32> &pos,
+		const core::rect<s32> &sourceRect,
+		const core::rect<s32> *clipRect, SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	if (!sourceRect.isValid())
+		return;
+
+	core::position2d<s32> targetPos(pos);
+	core::position2d<s32> sourcePos(sourceRect.UpperLeftCorner);
+	core::dimension2d<s32> sourceSize(sourceRect.getSize());
+	if (clipRect) {
+		if (targetPos.X < clipRect->UpperLeftCorner.X) {
+			sourceSize.Width += targetPos.X - clipRect->UpperLeftCorner.X;
+			if (sourceSize.Width <= 0)
+				return;
+
+			sourcePos.X -= targetPos.X - clipRect->UpperLeftCorner.X;
+			targetPos.X = clipRect->UpperLeftCorner.X;
+		}
+
+		if (targetPos.X + sourceSize.Width > clipRect->LowerRightCorner.X) {
+			sourceSize.Width -= (targetPos.X + sourceSize.Width) - clipRect->LowerRightCorner.X;
+			if (sourceSize.Width <= 0)
+				return;
+		}
+
+		if (targetPos.Y < clipRect->UpperLeftCorner.Y) {
+			sourceSize.Height += targetPos.Y - clipRect->UpperLeftCorner.Y;
+			if (sourceSize.Height <= 0)
+				return;
+
+			sourcePos.Y -= targetPos.Y - clipRect->UpperLeftCorner.Y;
+			targetPos.Y = clipRect->UpperLeftCorner.Y;
+		}
+
+		if (targetPos.Y + sourceSize.Height > clipRect->LowerRightCorner.Y) {
+			sourceSize.Height -= (targetPos.Y + sourceSize.Height) - clipRect->LowerRightCorner.Y;
+			if (sourceSize.Height <= 0)
+				return;
+		}
+	}
+
+	// clip these coordinates
+
+	if (targetPos.X < 0) {
+		sourceSize.Width += targetPos.X;
+		if (sourceSize.Width <= 0)
+			return;
+
+		sourcePos.X -= targetPos.X;
+		targetPos.X = 0;
+	}
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	if (targetPos.X + sourceSize.Width > (s32)renderTargetSize.Width) {
+		sourceSize.Width -= (targetPos.X + sourceSize.Width) - renderTargetSize.Width;
+		if (sourceSize.Width <= 0)
+			return;
+	}
+
+	if (targetPos.Y < 0) {
+		sourceSize.Height += targetPos.Y;
+		if (sourceSize.Height <= 0)
+			return;
+
+		sourcePos.Y -= targetPos.Y;
+		targetPos.Y = 0;
+	}
+
+	if (targetPos.Y + sourceSize.Height > (s32)renderTargetSize.Height) {
+		sourceSize.Height -= (targetPos.Y + sourceSize.Height) - renderTargetSize.Height;
+		if (sourceSize.Height <= 0)
+			return;
+	}
+
+	// ok, we've clipped everything.
+	// now draw it.
+
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
+	const core::dimension2d<u32> &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourcePos.X * invW,
+			(isRTT ? (sourcePos.Y + sourceSize.Height) : sourcePos.Y) * invH,
+			(sourcePos.X + sourceSize.Width) * invW,
+			(isRTT ? sourcePos.Y : (sourcePos.Y + sourceSize.Height)) * invH);
+
+	const core::rect<s32> poss(targetPos, sourceSize);
+
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+
+	setRenderStates2DMode(color.getAlpha() < 255, true, useAlphaChannelOfTexture);
+
+	u16 indices[] = {0, 1, 2, 3};
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex((f32)poss.UpperLeftCorner.X, (f32)poss.UpperLeftCorner.Y, 0, 0, 0, 1, color, tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[1] = S3DVertex((f32)poss.LowerRightCorner.X, (f32)poss.UpperLeftCorner.Y, 0, 0, 0, 1, color, tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[2] = S3DVertex((f32)poss.LowerRightCorner.X, (f32)poss.LowerRightCorner.Y, 0, 0, 0, 1, color, tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vertices[3] = S3DVertex((f32)poss.UpperLeftCorner.X, (f32)poss.LowerRightCorner.Y, 0, 0, 0, 1, color, tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	drawVertexPrimitiveList2d3d(vertices, 4, indices, 2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT, false);
+}
+
+//! The same, but with a four element array of colors, one for each vertex
+void COGLES1Driver::draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect,
+		const video::SColor *const colors, bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
+	const core::dimension2du &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourceRect.UpperLeftCorner.X * invW,
+			(isRTT ? sourceRect.LowerRightCorner.Y : sourceRect.UpperLeftCorner.Y) * invH,
+			sourceRect.LowerRightCorner.X * invW,
+			(isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH);
+
+	const video::SColor temp[4] = {
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+		};
+
+	const video::SColor *const useColor = colors ? colors : temp;
+
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+
+	setRenderStates2DMode(useColor[0].getAlpha() < 255 || useColor[1].getAlpha() < 255 ||
+								  useColor[2].getAlpha() < 255 || useColor[3].getAlpha() < 255,
+			true, useAlphaChannelOfTexture);
+
+	if (clipRect) {
+		if (!clipRect->isValid())
+			return;
+
+		glEnable(GL_SCISSOR_TEST);
+		const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+		glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
+				clipRect->getWidth(), clipRect->getHeight());
+	}
+
+	u16 indices[] = {0, 1, 2, 3};
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex((f32)destRect.UpperLeftCorner.X, (f32)destRect.UpperLeftCorner.Y, 0, 0, 0, 1, useColor[0], tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[1] = S3DVertex((f32)destRect.LowerRightCorner.X, (f32)destRect.UpperLeftCorner.Y, 0, 0, 0, 1, useColor[3], tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[2] = S3DVertex((f32)destRect.LowerRightCorner.X, (f32)destRect.LowerRightCorner.Y, 0, 0, 0, 1, useColor[2], tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vertices[3] = S3DVertex((f32)destRect.UpperLeftCorner.X, (f32)destRect.LowerRightCorner.Y, 0, 0, 0, 1, useColor[1], tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+	drawVertexPrimitiveList2d3d(vertices, 4, indices, 2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT, false);
+
+	if (clipRect)
+		glDisable(GL_SCISSOR_TEST);
+}
+
+void COGLES1Driver::draw2DImage(const video::ITexture *texture, u32 layer, bool flip)
+{
+	if (!texture || !CacheHandler->getTextureCache().set(0, texture))
+		return;
+
+	setRenderStates2DMode(false, true, true);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	Transformation3DChanged = true;
+
+	u16 indices[] = {0, 1, 2, 3};
+	S3DVertex vertices[4];
+
+	vertices[0].Pos = core::vector3df(-1.f, 1.f, 0.f);
+	vertices[1].Pos = core::vector3df(1.f, 1.f, 0.f);
+	vertices[2].Pos = core::vector3df(1.f, -1.f, 0.f);
+	vertices[3].Pos = core::vector3df(-1.f, -1.f, 0.f);
+
+	f32 modificator = (flip) ? 1.f : 0.f;
+
+	vertices[0].TCoords = core::vector2df(0.f, 0.f + modificator);
+	vertices[1].TCoords = core::vector2df(1.f, 0.f + modificator);
+	vertices[2].TCoords = core::vector2df(1.f, 1.f - modificator);
+	vertices[3].TCoords = core::vector2df(0.f, 1.f - modificator);
+
+	vertices[0].Color = 0xFFFFFFFF;
+	vertices[1].Color = 0xFFFFFFFF;
+	vertices[2].Color = 0xFFFFFFFF;
+	vertices[3].Color = 0xFFFFFFFF;
+
+	drawVertexPrimitiveList2d3d(vertices, 4, indices, 2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT, false);
+}
+
+//! draws a set of 2d images, using a color and the alpha channel of the texture if desired.
+void COGLES1Driver::draw2DImageBatch(const video::ITexture *texture,
+		const core::array<core::position2d<s32>> &positions,
+		const core::array<core::rect<s32>> &sourceRects,
+		const core::rect<s32> *clipRect,
+		SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	const u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
+	if (!drawCount)
+		return;
+
+	const core::dimension2d<u32> &ss = texture->getOriginalSize();
+	if (!ss.Width || !ss.Height)
+		return;
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+
+	setRenderStates2DMode(color.getAlpha() < 255, true, useAlphaChannelOfTexture);
+
+	core::array<S3DVertex> vertices;
+	core::array<u16> quadIndices;
+	vertices.reallocate(drawCount * 4);
+	quadIndices.reallocate(drawCount * 6);
+
+	for (u32 i = 0; i < drawCount; ++i) {
+		if (!sourceRects[i].isValid())
+			continue;
+
+		core::position2d<s32> targetPos(positions[i]);
+		core::position2d<s32> sourcePos(sourceRects[i].UpperLeftCorner);
+		// This needs to be signed as it may go negative.
+		core::dimension2d<s32> sourceSize(sourceRects[i].getSize());
+		if (clipRect) {
+			if (targetPos.X < clipRect->UpperLeftCorner.X) {
+				sourceSize.Width += targetPos.X - clipRect->UpperLeftCorner.X;
+				if (sourceSize.Width <= 0)
+					continue;
+
+				sourcePos.X -= targetPos.X - clipRect->UpperLeftCorner.X;
+				targetPos.X = clipRect->UpperLeftCorner.X;
+			}
+
+			if (targetPos.X + sourceSize.Width > clipRect->LowerRightCorner.X) {
+				sourceSize.Width -= (targetPos.X + sourceSize.Width) - clipRect->LowerRightCorner.X;
+				if (sourceSize.Width <= 0)
+					continue;
+			}
+
+			if (targetPos.Y < clipRect->UpperLeftCorner.Y) {
+				sourceSize.Height += targetPos.Y - clipRect->UpperLeftCorner.Y;
+				if (sourceSize.Height <= 0)
+					continue;
+
+				sourcePos.Y -= targetPos.Y - clipRect->UpperLeftCorner.Y;
+				targetPos.Y = clipRect->UpperLeftCorner.Y;
+			}
+
+			if (targetPos.Y + sourceSize.Height > clipRect->LowerRightCorner.Y) {
+				sourceSize.Height -= (targetPos.Y + sourceSize.Height) - clipRect->LowerRightCorner.Y;
+				if (sourceSize.Height <= 0)
+					continue;
+			}
+		}
+
+		// clip these coordinates
+
+		if (targetPos.X < 0) {
+			sourceSize.Width += targetPos.X;
+			if (sourceSize.Width <= 0)
+				continue;
+
+			sourcePos.X -= targetPos.X;
+			targetPos.X = 0;
+		}
+
+		if (targetPos.X + sourceSize.Width > (s32)renderTargetSize.Width) {
+			sourceSize.Width -= (targetPos.X + sourceSize.Width) - renderTargetSize.Width;
+			if (sourceSize.Width <= 0)
+				continue;
+		}
+
+		if (targetPos.Y < 0) {
+			sourceSize.Height += targetPos.Y;
+			if (sourceSize.Height <= 0)
+				continue;
+
+			sourcePos.Y -= targetPos.Y;
+			targetPos.Y = 0;
+		}
+
+		if (targetPos.Y + sourceSize.Height > (s32)renderTargetSize.Height) {
+			sourceSize.Height -= (targetPos.Y + sourceSize.Height) - renderTargetSize.Height;
+			if (sourceSize.Height <= 0)
+				continue;
+		}
+
+		// ok, we've clipped everything.
+
+		const core::rect<f32> tcoords(
+				sourcePos.X * invW,
+				sourcePos.Y * invH,
+				(sourcePos.X + sourceSize.Width) * invW,
+				(sourcePos.Y + sourceSize.Height) * invH);
+
+		const core::rect<s32> poss(targetPos, sourceSize);
+
+		const u32 vstart = vertices.size();
+
+		vertices.push_back(S3DVertex((f32)poss.UpperLeftCorner.X, (f32)poss.UpperLeftCorner.Y, 0, 0, 0, 1, color, tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y));
+		vertices.push_back(S3DVertex((f32)poss.LowerRightCorner.X, (f32)poss.UpperLeftCorner.Y, 0, 0, 0, 1, color, tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y));
+		vertices.push_back(S3DVertex((f32)poss.LowerRightCorner.X, (f32)poss.LowerRightCorner.Y, 0, 0, 0, 1, color, tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y));
+		vertices.push_back(S3DVertex((f32)poss.UpperLeftCorner.X, (f32)poss.LowerRightCorner.Y, 0, 0, 0, 1, color, tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y));
+
+		quadIndices.push_back(vstart);
+		quadIndices.push_back(vstart + 1);
+		quadIndices.push_back(vstart + 2);
+		quadIndices.push_back(vstart);
+		quadIndices.push_back(vstart + 2);
+		quadIndices.push_back(vstart + 3);
+	}
+	if (vertices.size())
+		drawVertexPrimitiveList2d3d(vertices.pointer(), vertices.size(),
+				quadIndices.pointer(), vertices.size() / 2,
+				video::EVT_STANDARD, scene::EPT_TRIANGLES,
+				EIT_16BIT, false);
+}
+
+//! draw a 2d rectangle
+void COGLES1Driver::draw2DRectangle(SColor color, const core::rect<s32> &position,
+		const core::rect<s32> *clip)
+{
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	u16 indices[] = {0, 1, 2, 3};
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex((f32)pos.UpperLeftCorner.X, (f32)pos.UpperLeftCorner.Y, 0, 0, 0, 1, color, 0, 0);
+	vertices[1] = S3DVertex((f32)pos.LowerRightCorner.X, (f32)pos.UpperLeftCorner.Y, 0, 0, 0, 1, color, 0, 0);
+	vertices[2] = S3DVertex((f32)pos.LowerRightCorner.X, (f32)pos.LowerRightCorner.Y, 0, 0, 0, 1, color, 0, 0);
+	vertices[3] = S3DVertex((f32)pos.UpperLeftCorner.X, (f32)pos.LowerRightCorner.Y, 0, 0, 0, 1, color, 0, 0);
+	drawVertexPrimitiveList2d3d(vertices, 4, indices, 2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT, false);
+}
+
+//! draw an 2d rectangle
+void COGLES1Driver::draw2DRectangle(const core::rect<s32> &position,
+		SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+		const core::rect<s32> *clip)
+{
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	setRenderStates2DMode(colorLeftUp.getAlpha() < 255 ||
+								  colorRightUp.getAlpha() < 255 ||
+								  colorLeftDown.getAlpha() < 255 ||
+								  colorRightDown.getAlpha() < 255,
+			false, false);
+
+	u16 indices[] = {0, 1, 2, 3};
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex((f32)pos.UpperLeftCorner.X, (f32)pos.UpperLeftCorner.Y, 0, 0, 0, 1, colorLeftUp, 0, 0);
+	vertices[1] = S3DVertex((f32)pos.LowerRightCorner.X, (f32)pos.UpperLeftCorner.Y, 0, 0, 0, 1, colorRightUp, 0, 0);
+	vertices[2] = S3DVertex((f32)pos.LowerRightCorner.X, (f32)pos.LowerRightCorner.Y, 0, 0, 0, 1, colorRightDown, 0, 0);
+	vertices[3] = S3DVertex((f32)pos.UpperLeftCorner.X, (f32)pos.LowerRightCorner.Y, 0, 0, 0, 1, colorLeftDown, 0, 0);
+	drawVertexPrimitiveList2d3d(vertices, 4, indices, 2, video::EVT_STANDARD, scene::EPT_TRIANGLE_FAN, EIT_16BIT, false);
+}
+
+//! Draws a 2d line.
+void COGLES1Driver::draw2DLine(const core::position2d<s32> &start,
+		const core::position2d<s32> &end,
+		SColor color)
+{
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+	u16 indices[] = {0, 1};
+	S3DVertex vertices[2];
+	vertices[0] = S3DVertex((f32)start.X, (f32)start.Y, 0, 0, 0, 1, color, 0, 0);
+	vertices[1] = S3DVertex((f32)end.X, (f32)end.Y, 0, 0, 0, 1, color, 1, 1);
+	drawVertexPrimitiveList2d3d(vertices, 2, indices, 1, video::EVT_STANDARD, scene::EPT_LINES, EIT_16BIT, false);
+}
+
+//! creates a matrix in supplied GLfloat array to pass to OGLES1
+inline void COGLES1Driver::getGLMatrix(GLfloat gl_matrix[16], const core::matrix4 &m)
+{
+	memcpy(gl_matrix, m.pointer(), 16 * sizeof(f32));
+}
+
+//! creates a opengltexturematrix from a D3D style texture matrix
+inline void COGLES1Driver::getGLTextureMatrix(GLfloat *o, const core::matrix4 &m)
+{
+	o[0] = m[0];
+	o[1] = m[1];
+	o[2] = 0.f;
+	o[3] = 0.f;
+
+	o[4] = m[4];
+	o[5] = m[5];
+	o[6] = 0.f;
+	o[7] = 0.f;
+
+	o[8] = 0.f;
+	o[9] = 0.f;
+	o[10] = 1.f;
+	o[11] = 0.f;
+
+	o[12] = m[8];
+	o[13] = m[9];
+	o[14] = 0.f;
+	o[15] = 1.f;
+}
+
+ITexture *COGLES1Driver::createDeviceDependentTexture(const io::path &name, IImage *image)
+{
+	core::array<IImage *> imageArray(1);
+	imageArray.push_back(image);
+
+	COGLES1Texture *texture = new COGLES1Texture(name, imageArray, ETT_2D, this);
+
+	return texture;
+}
+
+ITexture *COGLES1Driver::createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image)
+{
+	COGLES1Texture *texture = new COGLES1Texture(name, image, ETT_CUBEMAP, this);
+
+	return texture;
+}
+
+//! Sets a material. All 3d drawing functions draw geometry now using this material.
+void COGLES1Driver::setMaterial(const SMaterial &material)
+{
+	Material = material;
+	OverrideMaterial.apply(Material);
+
+	for (u32 i = 0; i < Feature.MaxTextureUnits; ++i)
+		setTransform((E_TRANSFORMATION_STATE)(ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
+}
+
+//! prints error if an error happened.
+bool COGLES1Driver::testGLError(int code)
+{
+	if (!Params.DriverDebug)
+		return false;
+
+	GLenum g = glGetError();
+	switch (g) {
+	case GL_NO_ERROR:
+		return false;
+	case GL_INVALID_ENUM:
+		os::Printer::log("GL_INVALID_ENUM", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_INVALID_VALUE:
+		os::Printer::log("GL_INVALID_VALUE", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_INVALID_OPERATION:
+		os::Printer::log("GL_INVALID_OPERATION", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_STACK_OVERFLOW:
+		os::Printer::log("GL_STACK_OVERFLOW", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_STACK_UNDERFLOW:
+		os::Printer::log("GL_STACK_UNDERFLOW", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_OUT_OF_MEMORY:
+		os::Printer::log("GL_OUT_OF_MEMORY", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	};
+	return true;
+}
+
+//! sets the needed renderstates
+void COGLES1Driver::setRenderStates3DMode()
+{
+	if (CurrentRenderMode != ERM_3D) {
+		// Reset Texture Stages
+		CacheHandler->setBlend(false);
+		glDisable(GL_ALPHA_TEST);
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		// switch back the matrices
+		glMatrixMode(GL_MODELVIEW);
+		glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
+
+		GLfloat glmat[16];
+		getGLMatrix(glmat, Matrices[ETS_PROJECTION]);
+		glmat[12] *= -1.0f;
+		glMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(glmat);
+
+		ResetRenderStates = true;
+	}
+
+	if (ResetRenderStates || LastMaterial != Material) {
+		// unset old material
+
+		if (LastMaterial.MaterialType != Material.MaterialType &&
+				static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+
+		// set new material.
+		if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[Material.MaterialType].Renderer->OnSetMaterial(
+					Material, LastMaterial, ResetRenderStates, this);
+
+		LastMaterial = Material;
+		CacheHandler->correctCacheMaterial(LastMaterial);
+		ResetRenderStates = false;
+	}
+
+	if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+		MaterialRenderers[Material.MaterialType].Renderer->OnRender(this, video::EVT_STANDARD);
+
+	CurrentRenderMode = ERM_3D;
+}
+
+GLint COGLES1Driver::getTextureWrapMode(u8 clamp) const
+{
+	switch (clamp) {
+	case ETC_CLAMP:
+		//	return GL_CLAMP; not supported in ogl-es
+		return GL_CLAMP_TO_EDGE;
+		break;
+	case ETC_CLAMP_TO_EDGE:
+		return GL_CLAMP_TO_EDGE;
+		break;
+	case ETC_CLAMP_TO_BORDER:
+		//	return GL_CLAMP_TO_BORDER; not supported in ogl-es
+		return GL_CLAMP_TO_EDGE;
+		break;
+	case ETC_MIRROR:
+#ifdef GL_OES_texture_mirrored_repeat
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_texture_mirrored_repeat])
+			return GL_MIRRORED_REPEAT_OES;
+		else
+#endif
+			return GL_REPEAT;
+		break;
+	// the next three are not yet supported at all
+	case ETC_MIRROR_CLAMP:
+	case ETC_MIRROR_CLAMP_TO_EDGE:
+	case ETC_MIRROR_CLAMP_TO_BORDER:
+#ifdef GL_OES_texture_mirrored_repeat
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_texture_mirrored_repeat])
+			return GL_MIRRORED_REPEAT_OES;
+		else
+#endif
+			return GL_CLAMP_TO_EDGE;
+		break;
+	case ETC_REPEAT:
+	default:
+		return GL_REPEAT;
+		break;
+	}
+}
+
+//! Can be called by an IMaterialRenderer to make its work easier.
+void COGLES1Driver::setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial,
+		bool resetAllRenderStates)
+{
+	if (resetAllRenderStates ||
+			lastmaterial.ColorMaterial != material.ColorMaterial) {
+		// we only have diffuse_and_ambient in ogl-es
+		if (material.ColorMaterial == ECM_DIFFUSE_AND_AMBIENT)
+			glEnable(GL_COLOR_MATERIAL);
+		else
+			glDisable(GL_COLOR_MATERIAL);
+	}
+
+	if (resetAllRenderStates ||
+			lastmaterial.AmbientColor != material.AmbientColor ||
+			lastmaterial.DiffuseColor != material.DiffuseColor ||
+			lastmaterial.EmissiveColor != material.EmissiveColor ||
+			lastmaterial.ColorMaterial != material.ColorMaterial) {
+		GLfloat color[4];
+
+		const f32 inv = 1.0f / 255.0f;
+
+		if ((material.ColorMaterial != video::ECM_AMBIENT) &&
+				(material.ColorMaterial != video::ECM_DIFFUSE_AND_AMBIENT)) {
+			color[0] = material.AmbientColor.getRed() * inv;
+			color[1] = material.AmbientColor.getGreen() * inv;
+			color[2] = material.AmbientColor.getBlue() * inv;
+			color[3] = material.AmbientColor.getAlpha() * inv;
+			glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, color);
+		}
+
+		if ((material.ColorMaterial != video::ECM_DIFFUSE) &&
+				(material.ColorMaterial != video::ECM_DIFFUSE_AND_AMBIENT)) {
+			color[0] = material.DiffuseColor.getRed() * inv;
+			color[1] = material.DiffuseColor.getGreen() * inv;
+			color[2] = material.DiffuseColor.getBlue() * inv;
+			color[3] = material.DiffuseColor.getAlpha() * inv;
+			glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, color);
+		}
+
+		if (material.ColorMaterial != video::ECM_EMISSIVE) {
+			color[0] = material.EmissiveColor.getRed() * inv;
+			color[1] = material.EmissiveColor.getGreen() * inv;
+			color[2] = material.EmissiveColor.getBlue() * inv;
+			color[3] = material.EmissiveColor.getAlpha() * inv;
+			glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, color);
+		}
+	}
+
+	if (resetAllRenderStates ||
+			lastmaterial.SpecularColor != material.SpecularColor ||
+			lastmaterial.Shininess != material.Shininess) {
+		GLfloat color[] = {0.f, 0.f, 0.f, 1.f};
+		const f32 inv = 1.0f / 255.0f;
+
+		// disable Specular colors if no shininess is set
+		if ((material.Shininess != 0.0f) &&
+				(material.ColorMaterial != video::ECM_SPECULAR)) {
+#ifdef GL_EXT_separate_specular_color
+			if (FeatureAvailable[IRR_EXT_separate_specular_color])
+				glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+#endif
+			glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, material.Shininess);
+			color[0] = material.SpecularColor.getRed() * inv;
+			color[1] = material.SpecularColor.getGreen() * inv;
+			color[2] = material.SpecularColor.getBlue() * inv;
+			color[3] = material.SpecularColor.getAlpha() * inv;
+			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color);
+		}
+#ifdef GL_EXT_separate_specular_color
+		else if (FeatureAvailable[IRR_EXT_separate_specular_color])
+			glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR);
+#endif
+	}
+
+	// TODO ogl-es
+	// fillmode
+	//	if (resetAllRenderStates || (lastmaterial.Wireframe != material.Wireframe) || (lastmaterial.PointCloud != material.PointCloud))
+	//		glPolygonMode(GL_FRONT_AND_BACK, material.Wireframe ? GL_LINE : material.PointCloud? GL_POINT : GL_FILL);
+
+	// shademode
+	if (resetAllRenderStates || (lastmaterial.GouraudShading != material.GouraudShading)) {
+		if (material.GouraudShading)
+			glShadeModel(GL_SMOOTH);
+		else
+			glShadeModel(GL_FLAT);
+	}
+
+	// lighting
+	if (resetAllRenderStates || (lastmaterial.Lighting != material.Lighting)) {
+		if (material.Lighting)
+			glEnable(GL_LIGHTING);
+		else
+			glDisable(GL_LIGHTING);
+	}
+
+	// zbuffer
+	if (resetAllRenderStates || lastmaterial.ZBuffer != material.ZBuffer) {
+		switch (material.ZBuffer) {
+		case ECFN_DISABLED:
+			glDisable(GL_DEPTH_TEST);
+			break;
+		case ECFN_LESSEQUAL:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_LEQUAL);
+			break;
+		case ECFN_EQUAL:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_EQUAL);
+			break;
+		case ECFN_LESS:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_LESS);
+			break;
+		case ECFN_NOTEQUAL:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_NOTEQUAL);
+			break;
+		case ECFN_GREATEREQUAL:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_GEQUAL);
+			break;
+		case ECFN_GREATER:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_GREATER);
+			break;
+		case ECFN_ALWAYS:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_ALWAYS);
+			break;
+		case ECFN_NEVER:
+			glEnable(GL_DEPTH_TEST);
+			glDepthFunc(GL_NEVER);
+			break;
+		}
+	}
+
+	// zwrite
+	if (getWriteZBuffer(material)) {
+		glDepthMask(GL_TRUE);
+	} else {
+		glDepthMask(GL_FALSE);
+	}
+
+	// back face culling
+	if (resetAllRenderStates || (lastmaterial.FrontfaceCulling != material.FrontfaceCulling) || (lastmaterial.BackfaceCulling != material.BackfaceCulling)) {
+		if ((material.FrontfaceCulling) && (material.BackfaceCulling)) {
+			glCullFace(GL_FRONT_AND_BACK);
+			glEnable(GL_CULL_FACE);
+		} else if (material.BackfaceCulling) {
+			glCullFace(GL_BACK);
+			glEnable(GL_CULL_FACE);
+		} else if (material.FrontfaceCulling) {
+			glCullFace(GL_FRONT);
+			glEnable(GL_CULL_FACE);
+		} else
+			glDisable(GL_CULL_FACE);
+	}
+
+	// fog
+	if (resetAllRenderStates || lastmaterial.FogEnable != material.FogEnable) {
+		if (material.FogEnable)
+			glEnable(GL_FOG);
+		else
+			glDisable(GL_FOG);
+	}
+
+	// normalization
+	if (resetAllRenderStates || lastmaterial.NormalizeNormals != material.NormalizeNormals) {
+		if (material.NormalizeNormals)
+			glEnable(GL_NORMALIZE);
+		else
+			glDisable(GL_NORMALIZE);
+	}
+
+	// Color Mask
+	if (resetAllRenderStates || lastmaterial.ColorMask != material.ColorMask) {
+		glColorMask(
+				(material.ColorMask & ECP_RED) ? GL_TRUE : GL_FALSE,
+				(material.ColorMask & ECP_GREEN) ? GL_TRUE : GL_FALSE,
+				(material.ColorMask & ECP_BLUE) ? GL_TRUE : GL_FALSE,
+				(material.ColorMask & ECP_ALPHA) ? GL_TRUE : GL_FALSE);
+	}
+
+	// Blend Equation
+	if (material.BlendOperation == EBO_NONE)
+		CacheHandler->setBlend(false);
+	else {
+		CacheHandler->setBlend(true);
+
+		if (queryFeature(EVDF_BLEND_OPERATIONS)) {
+			switch (material.BlendOperation) {
+			case EBO_ADD:
+#if defined(GL_OES_blend_subtract)
+				CacheHandler->setBlendEquation(GL_FUNC_ADD_OES);
+#endif
+				break;
+			case EBO_SUBTRACT:
+#if defined(GL_OES_blend_subtract)
+				CacheHandler->setBlendEquation(GL_FUNC_SUBTRACT_OES);
+#endif
+				break;
+			case EBO_REVSUBTRACT:
+#if defined(GL_OES_blend_subtract)
+				CacheHandler->setBlendEquation(GL_FUNC_REVERSE_SUBTRACT_OES);
+#endif
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	// Blend Factor
+	if (IR(material.BlendFactor) & 0xFFFFFFFF // TODO: why the & 0xFFFFFFFF?
+			&& material.MaterialType != EMT_ONETEXTURE_BLEND) {
+		E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR dstRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR srcAlphaFact = EBF_ZERO;
+		E_BLEND_FACTOR dstAlphaFact = EBF_ZERO;
+		E_MODULATE_FUNC modulo = EMFN_MODULATE_1X;
+		u32 alphaSource = 0;
+
+		unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulo, alphaSource, material.BlendFactor);
+
+		if (queryFeature(EVDF_BLEND_SEPARATE)) {
+			CacheHandler->setBlendFuncSeparate(getGLBlend(srcRGBFact), getGLBlend(dstRGBFact),
+					getGLBlend(srcAlphaFact), getGLBlend(dstAlphaFact));
+		} else {
+			CacheHandler->setBlendFunc(getGLBlend(srcRGBFact), getGLBlend(dstRGBFact));
+		}
+	}
+
+	// TODO: Polygon Offset. Not sure if it was left out deliberately or if it won't work with this driver.
+
+	// thickness
+	if (resetAllRenderStates || lastmaterial.Thickness != material.Thickness) {
+		if (AntiAlias) {
+			//			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1]));
+			// we don't use point smoothing
+			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1]));
+		} else {
+			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1]));
+			glLineWidth(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedLine[0], DimAliasedLine[1]));
+		}
+	}
+
+	// Anti aliasing
+	if (resetAllRenderStates || lastmaterial.AntiAliasing != material.AntiAliasing) {
+		if (material.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+		else if (lastmaterial.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+
+		if ((AntiAlias >= 2) && (material.AntiAliasing & (EAAM_SIMPLE | EAAM_QUALITY)))
+			glEnable(GL_MULTISAMPLE);
+		else
+			glDisable(GL_MULTISAMPLE);
+	}
+
+	// Texture parameters
+	setTextureRenderStates(material, resetAllRenderStates);
+}
+
+//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+void COGLES1Driver::setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates)
+{
+	// Set textures to TU/TIU and apply filters to them
+
+	for (s32 i = Feature.MaxTextureUnits - 1; i >= 0; --i) {
+		CacheHandler->getTextureCache().set(i, material.TextureLayers[i].Texture);
+
+		const COGLES1Texture *tmpTexture = CacheHandler->getTextureCache().get(i);
+
+		if (!tmpTexture)
+			continue;
+
+		GLenum tmpTextureType = tmpTexture->getOpenGLTextureType();
+
+		CacheHandler->setActiveTexture(GL_TEXTURE0 + i);
+
+		{
+			const bool isRTT = tmpTexture->isRenderTarget();
+
+			glMatrixMode(GL_TEXTURE);
+
+			if (!isRTT && Matrices[ETS_TEXTURE_0 + i].isIdentity())
+				glLoadIdentity();
+			else {
+				GLfloat glmat[16];
+				if (isRTT)
+					getGLTextureMatrix(glmat, Matrices[ETS_TEXTURE_0 + i] * TextureFlipMatrix);
+				else
+					getGLTextureMatrix(glmat, Matrices[ETS_TEXTURE_0 + i]);
+				glLoadMatrixf(glmat);
+			}
+		}
+
+		COGLES1Texture::SStatesCache &statesCache = tmpTexture->getStatesCache();
+
+		if (resetAllRenderstates)
+			statesCache.IsCached = false;
+
+#if defined(GL_EXT_texture_lod_bias)
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_texture_lod_bias]) {
+			if (material.TextureLayers[i].LODBias) {
+				const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
+				glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
+			} else
+				glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
+		}
+#endif
+
+		if (!statesCache.IsCached || material.TextureLayers[i].MagFilter != statesCache.MagFilter) {
+			E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter;
+			glTexParameteri(tmpTextureType, GL_TEXTURE_MAG_FILTER,
+					magFilter == ETMAGF_NEAREST ? GL_NEAREST : (assert(magFilter == ETMAGF_LINEAR), GL_LINEAR));
+
+			statesCache.MagFilter = magFilter;
+		}
+
+		if (material.UseMipMaps && tmpTexture->hasMipMaps()) {
+			if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter ||
+					!statesCache.MipMapStatus) {
+				E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+				glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER,
+						minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST
+																						 : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR       ? GL_NEAREST_MIPMAP_LINEAR
+																																		   : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR));
+
+				statesCache.MinFilter = minFilter;
+				statesCache.MipMapStatus = true;
+			}
+		} else {
+			if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter ||
+					statesCache.MipMapStatus) {
+				E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+				glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER,
+						(minFilter == ETMINF_NEAREST_MIPMAP_NEAREST || minFilter == ETMINF_NEAREST_MIPMAP_LINEAR) ? GL_NEAREST : (assert(minFilter == ETMINF_LINEAR_MIPMAP_NEAREST || minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR));
+
+				statesCache.MinFilter = minFilter;
+				statesCache.MipMapStatus = false;
+			}
+		}
+
+#ifdef GL_EXT_texture_filter_anisotropic
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_texture_filter_anisotropic] &&
+				(!statesCache.IsCached || material.TextureLayers[i].AnisotropicFilter != statesCache.AnisotropicFilter)) {
+			glTexParameteri(tmpTextureType, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+					material.TextureLayers[i].AnisotropicFilter > 1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1);
+
+			statesCache.AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter;
+		}
+#endif
+
+		if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapU != statesCache.WrapU) {
+			glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU));
+			statesCache.WrapU = material.TextureLayers[i].TextureWrapU;
+		}
+
+		if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapV != statesCache.WrapV) {
+			glTexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV));
+			statesCache.WrapV = material.TextureLayers[i].TextureWrapV;
+		}
+
+		statesCache.IsCached = true;
+	}
+
+	// be sure to leave in texture stage 0
+	CacheHandler->setActiveTexture(GL_TEXTURE0);
+}
+
+//! sets the needed renderstates
+void COGLES1Driver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
+{
+	if (CurrentRenderMode != ERM_2D || Transformation3DChanged) {
+		// unset last 3d material
+		if (CurrentRenderMode == ERM_3D) {
+			if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+				MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+		}
+		if (Transformation3DChanged) {
+			glMatrixMode(GL_PROJECTION);
+
+			const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+			core::matrix4 m(core::matrix4::EM4CONST_NOTHING);
+			m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-(s32)(renderTargetSize.Height)), -1.0f, 1.0f);
+			m.setTranslation(core::vector3df(-1, 1, 0));
+			glLoadMatrixf(m.pointer());
+
+			glMatrixMode(GL_MODELVIEW);
+			glLoadIdentity();
+
+			Transformation3DChanged = false;
+		}
+	}
+
+	Material = (OverrideMaterial2DEnabled) ? OverrideMaterial2D : InitMaterial2D;
+	Material.Lighting = false;
+	Material.TextureLayers[0].Texture = (texture) ? const_cast<COGLES1Texture *>(CacheHandler->getTextureCache().get(0)) : 0;
+	setTransform(ETS_TEXTURE_0, core::IdentityMatrix);
+
+	setBasicRenderStates(Material, LastMaterial, false);
+
+	LastMaterial = Material;
+	CacheHandler->correctCacheMaterial(LastMaterial);
+
+	// no alphaChannel without texture
+	alphaChannel &= texture;
+
+	if (alphaChannel || alpha) {
+		CacheHandler->setBlend(true);
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		CacheHandler->setBlendEquation(GL_FUNC_ADD);
+		glEnable(GL_ALPHA_TEST);
+		glAlphaFunc(GL_GREATER, 0.f);
+	} else {
+		CacheHandler->setBlend(false);
+		glDisable(GL_ALPHA_TEST);
+	}
+
+	if (texture) {
+		// Due to the transformation change, the previous line would call a reset each frame
+		// but we can safely reset the variable as it was false before
+		Transformation3DChanged = false;
+
+		if (alphaChannel) {
+			// if alpha and alpha texture just modulate, otherwise use only the alpha channel
+			if (alpha) {
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			} else {
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
+				// rgb always modulates
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
+			}
+		} else {
+			if (alpha) {
+				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PRIMARY_COLOR);
+				// rgb always modulates
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
+			} else {
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			}
+		}
+	}
+
+	CurrentRenderMode = ERM_2D;
+}
+
+//! \return Returns the name of the video driver.
+const char *COGLES1Driver::getName() const
+{
+	return Name.c_str();
+}
+
+//! Sets the dynamic ambient light color.
+void COGLES1Driver::setAmbientLight(const SColorf &color)
+{
+	CNullDriver::setAmbientLight(color);
+	GLfloat data[4] = {color.r, color.g, color.b, color.a};
+	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, data);
+}
+
+// this code was sent in by Oliver Klems, thank you
+void COGLES1Driver::setViewPort(const core::rect<s32> &area)
+{
+	core::rect<s32> vp = area;
+	core::rect<s32> rendert(0, 0, getCurrentRenderTargetSize().Width, getCurrentRenderTargetSize().Height);
+	vp.clipAgainst(rendert);
+
+	if (vp.getHeight() > 0 && vp.getWidth() > 0)
+		CacheHandler->setViewport(vp.UpperLeftCorner.X, getCurrentRenderTargetSize().Height - vp.UpperLeftCorner.Y - vp.getHeight(), vp.getWidth(), vp.getHeight());
+
+	ViewPort = vp;
+}
+
+void COGLES1Driver::setViewPortRaw(u32 width, u32 height)
+{
+	CacheHandler->setViewport(0, 0, width, height);
+	ViewPort = core::recti(0, 0, width, height);
+}
+
+//! Sets the fog mode.
+void COGLES1Driver::setFog(SColor c, E_FOG_TYPE fogType, f32 start,
+		f32 end, f32 density, bool pixelFog, bool rangeFog)
+{
+	CNullDriver::setFog(c, fogType, start, end, density, pixelFog, rangeFog);
+
+	glFogf(GL_FOG_MODE, GLfloat((fogType == EFT_FOG_LINEAR) ? GL_LINEAR : (fogType == EFT_FOG_EXP) ? GL_EXP
+																								   : GL_EXP2));
+
+#ifdef GL_EXT_fog_coord
+	if (FeatureAvailable[IRR_EXT_fog_coord])
+		glFogi(GL_FOG_COORDINATE_SOURCE, GL_FRAGMENT_DEPTH);
+#endif
+
+	if (fogType == EFT_FOG_LINEAR) {
+		glFogf(GL_FOG_START, start);
+		glFogf(GL_FOG_END, end);
+	} else
+		glFogf(GL_FOG_DENSITY, density);
+
+	if (pixelFog)
+		glHint(GL_FOG_HINT, GL_NICEST);
+	else
+		glHint(GL_FOG_HINT, GL_FASTEST);
+
+	SColorf color(c);
+	GLfloat data[4] = {color.r, color.g, color.b, color.a};
+	glFogfv(GL_FOG_COLOR, data);
+}
+
+//! Draws a 3d line.
+void COGLES1Driver::draw3DLine(const core::vector3df &start,
+		const core::vector3df &end, SColor color)
+{
+	setRenderStates3DMode();
+
+	u16 indices[] = {0, 1};
+	S3DVertex vertices[2];
+	vertices[0] = S3DVertex(start.X, start.Y, start.Z, 0, 0, 1, color, 0, 0);
+	vertices[1] = S3DVertex(end.X, end.Y, end.Z, 0, 0, 1, color, 0, 0);
+	drawVertexPrimitiveList2d3d(vertices, 2, indices, 1, video::EVT_STANDARD, scene::EPT_LINES);
+}
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void COGLES1Driver::OnResize(const core::dimension2d<u32> &size)
+{
+	CNullDriver::OnResize(size);
+	CacheHandler->setViewport(0, 0, size.Width, size.Height);
+	Transformation3DChanged = true;
+}
+
+//! Returns type of video driver
+E_DRIVER_TYPE COGLES1Driver::getDriverType() const
+{
+	return EDT_OGLES1;
+}
+
+//! returns color format
+ECOLOR_FORMAT COGLES1Driver::getColorFormat() const
+{
+	return ColorFormat;
+}
+
+//! Get a vertex shader constant index.
+s32 COGLES1Driver::getVertexShaderConstantID(const c8 *name)
+{
+	return getPixelShaderConstantID(name);
+}
+
+//! Get a pixel shader constant index.
+s32 COGLES1Driver::getPixelShaderConstantID(const c8 *name)
+{
+	os::Printer::log("Error: Please use IMaterialRendererServices from IShaderConstantSetCallBack::OnSetConstants not VideoDriver->getPixelShaderConstantID().");
+	return -1;
+}
+
+//! Sets a constant for the vertex shader based on an index.
+bool COGLES1Driver::setVertexShaderConstant(s32 index, const f32 *floats, int count)
+{
+	// pass this along, as in GLSL the same routine is used for both vertex and fragment shaders
+	return setPixelShaderConstant(index, floats, count);
+}
+
+//! Int interface for the above.
+bool COGLES1Driver::setVertexShaderConstant(s32 index, const s32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+bool COGLES1Driver::setVertexShaderConstant(s32 index, const u32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+//! Sets a constant for the pixel shader based on an index.
+bool COGLES1Driver::setPixelShaderConstant(s32 index, const f32 *floats, int count)
+{
+	os::Printer::log("Error: Please use IMaterialRendererServices from IShaderConstantSetCallBack::OnSetConstants not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Int interface for the above.
+bool COGLES1Driver::setPixelShaderConstant(s32 index, const s32 *ints, int count)
+{
+	os::Printer::log("Error: Please use IMaterialRendererServices from IShaderConstantSetCallBack::OnSetConstants not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+bool COGLES1Driver::setPixelShaderConstant(s32 index, const u32 *ints, int count)
+{
+	os::Printer::log("Error: Please use IMaterialRendererServices from IShaderConstantSetCallBack::OnSetConstants not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
+s32 COGLES1Driver::addHighLevelShaderMaterial(
+		const c8 *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8 *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const c8 *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType,
+		scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	os::Printer::log("No shader support.");
+	return -1;
+}
+
+//! Returns a pointer to the IVideoDriver interface. (Implementation for
+//! IMaterialRendererServices)
+IVideoDriver *COGLES1Driver::getVideoDriver()
+{
+	return this;
+}
+
+//! Returns pointer to the IGPUProgrammingServices interface.
+IGPUProgrammingServices *COGLES1Driver::getGPUProgrammingServices()
+{
+	return this;
+}
+
+ITexture *COGLES1Driver::addRenderTargetTexture(const core::dimension2d<u32> &size,
+		const io::path &name, const ECOLOR_FORMAT format)
+{
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	core::dimension2du destSize(size);
+
+	if (!supportForFBO) {
+		destSize = core::dimension2d<u32>(core::min_(size.Width, ScreenSize.Width), core::min_(size.Height, ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size == size.getOptimalSize()), false, false);
+	}
+
+	COGLES1Texture *renderTargetTexture = new COGLES1Texture(name, destSize, ETT_2D, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+ITexture *COGLES1Driver::addRenderTargetTextureCubemap(const irr::u32 sideLen, const io::path &name, const ECOLOR_FORMAT format)
+{
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	const core::dimension2d<u32> size(sideLen, sideLen);
+	core::dimension2du destSize(size);
+
+	if (!supportForFBO) {
+		destSize = core::dimension2d<u32>(core::min_(size.Width, ScreenSize.Width), core::min_(size.Height, ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size == size.getOptimalSize()), false, false);
+	}
+
+	COGLES1Texture *renderTargetTexture = new COGLES1Texture(name, destSize, ETT_CUBEMAP, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+//! Returns the maximum amount of primitives
+u32 COGLES1Driver::getMaximalPrimitiveCount() const
+{
+	return 65535;
+}
+
+bool COGLES1Driver::setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil)
+{
+	if (target && target->getDriverType() != EDT_OGLES1) {
+		os::Printer::log("Fatal Error: Tried to set a render target not owned by OpenGL driver.", ELL_ERROR);
+		return false;
+	}
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	core::dimension2d<u32> destRenderTargetSize(0, 0);
+
+	if (target) {
+		COGLES1RenderTarget *renderTarget = static_cast<COGLES1RenderTarget *>(target);
+
+		if (supportForFBO) {
+			CacheHandler->setFBO(renderTarget->getBufferID());
+			renderTarget->update();
+		}
+
+		destRenderTargetSize = renderTarget->getSize();
+
+		setViewPortRaw(destRenderTargetSize.Width, destRenderTargetSize.Height);
+	} else {
+		if (supportForFBO)
+			CacheHandler->setFBO(0);
+		else {
+			COGLES1RenderTarget *prevRenderTarget = static_cast<COGLES1RenderTarget *>(CurrentRenderTarget);
+			COGLES1Texture *renderTargetTexture = static_cast<COGLES1Texture *>(prevRenderTarget->getTexture());
+
+			if (renderTargetTexture) {
+				const COGLES1Texture *prevTexture = CacheHandler->getTextureCache().get(0);
+
+				CacheHandler->getTextureCache().set(0, renderTargetTexture);
+
+				const core::dimension2d<u32> size = renderTargetTexture->getSize();
+				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, size.Width, size.Height);
+
+				CacheHandler->getTextureCache().set(0, prevTexture);
+			}
+		}
+
+		destRenderTargetSize = core::dimension2d<u32>(0, 0);
+
+		setViewPortRaw(ScreenSize.Width, ScreenSize.Height);
+	}
+
+	if (CurrentRenderTargetSize != destRenderTargetSize) {
+		CurrentRenderTargetSize = destRenderTargetSize;
+
+		Transformation3DChanged = true;
+	}
+
+	CurrentRenderTarget = target;
+
+	if (!supportForFBO) {
+		clearFlag |= ECBF_COLOR;
+		clearFlag |= ECBF_DEPTH;
+	}
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+void COGLES1Driver::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
+{
+	GLbitfield mask = 0;
+
+	if (flag & ECBF_COLOR) {
+		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
+		const f32 inv = 1.0f / 255.0f;
+		glClearColor(color.getRed() * inv, color.getGreen() * inv,
+				color.getBlue() * inv, color.getAlpha() * inv);
+
+		mask |= GL_COLOR_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_DEPTH) {
+		glDepthMask(GL_TRUE);
+		glClearDepthf(depth);
+		mask |= GL_DEPTH_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_STENCIL) {
+		glClearStencil(stencil);
+		mask |= GL_STENCIL_BUFFER_BIT;
+	}
+
+	if (mask)
+		glClear(mask);
+}
+
+//! Returns an image created from the last rendered frame.
+// We want to read the front buffer to get the latest render finished.
+// This is not possible under ogl-es, though, so one has to call this method
+// outside of the render loop only.
+IImage *COGLES1Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
+{
+	if (target == video::ERT_MULTI_RENDER_TEXTURES || target == video::ERT_RENDER_TEXTURE || target == video::ERT_STEREO_BOTH_BUFFERS)
+		return 0;
+	GLint internalformat = GL_RGBA;
+	GLint type = GL_UNSIGNED_BYTE;
+	if (false && (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_IMG_read_format] || FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_read_format] || FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_EXT_read_format_bgra])) {
+#ifdef GL_IMPLEMENTATION_COLOR_READ_TYPE_OES
+		glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, &internalformat);
+		glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, &type);
+#endif
+		// there are formats we don't support ATM
+		if (GL_UNSIGNED_SHORT_4_4_4_4 == type)
+			type = GL_UNSIGNED_SHORT_5_5_5_1;
+#ifdef GL_EXT_read_format_bgra
+		else if (GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT == type)
+			type = GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT;
+#endif
+	}
+
+	IImage *newImage = 0;
+	if ((GL_RGBA == internalformat)
+#ifdef GL_EXT_read_format_bgra
+			|| (GL_BGRA_EXT == internalformat)
+#endif
+	) {
+		if (GL_UNSIGNED_BYTE == type)
+			newImage = new CImage(ECF_A8R8G8B8, ScreenSize);
+		else
+			newImage = new CImage(ECF_A1R5G5B5, ScreenSize);
+	} else {
+		if (GL_UNSIGNED_BYTE == type)
+			newImage = new CImage(ECF_R8G8B8, ScreenSize);
+		else
+			newImage = new CImage(ECF_R5G6B5, ScreenSize);
+	}
+
+	u8 *pixels = static_cast<u8 *>(newImage->getData());
+	if (!pixels) {
+		newImage->drop();
+		return 0;
+	}
+
+	glReadPixels(0, 0, ScreenSize.Width, ScreenSize.Height, internalformat, type, pixels);
+
+	// opengl images are horizontally flipped, so we have to fix that here.
+	const s32 pitch = newImage->getPitch();
+	u8 *p2 = pixels + (ScreenSize.Height - 1) * pitch;
+	u8 *tmpBuffer = new u8[pitch];
+	for (u32 i = 0; i < ScreenSize.Height; i += 2) {
+		memcpy(tmpBuffer, pixels, pitch);
+		memcpy(pixels, p2, pitch);
+		memcpy(p2, tmpBuffer, pitch);
+		pixels += pitch;
+		p2 -= pitch;
+	}
+	delete[] tmpBuffer;
+
+	if (testGLError(__LINE__)) {
+		newImage->drop();
+		return 0;
+	}
+
+	return newImage;
+}
+
+void COGLES1Driver::removeTexture(ITexture *texture)
+{
+	CacheHandler->getTextureCache().remove(texture);
+	CNullDriver::removeTexture(texture);
+}
+
+//! Set/unset a clipping plane.
+bool COGLES1Driver::setClipPlane(u32 index, const core::plane3df &plane, bool enable)
+{
+	if (index >= MaxUserClipPlanes)
+		return false;
+
+	UserClipPlane[index] = plane;
+	enableClipPlane(index, enable);
+	return true;
+}
+
+void COGLES1Driver::uploadClipPlane(u32 index)
+{
+	// opengl needs an array of doubles for the plane equation
+	float clip_plane[4];
+	clip_plane[0] = UserClipPlane[index].Normal.X;
+	clip_plane[1] = UserClipPlane[index].Normal.Y;
+	clip_plane[2] = UserClipPlane[index].Normal.Z;
+	clip_plane[3] = UserClipPlane[index].D;
+	glClipPlanef(GL_CLIP_PLANE0 + index, clip_plane);
+}
+
+//! Enable/disable a clipping plane.
+void COGLES1Driver::enableClipPlane(u32 index, bool enable)
+{
+	if (index >= MaxUserClipPlanes)
+		return;
+	if (enable) {
+		if (!UserClipPlaneEnabled[index]) {
+			uploadClipPlane(index);
+			glEnable(GL_CLIP_PLANE0 + index);
+		}
+	} else
+		glDisable(GL_CLIP_PLANE0 + index);
+
+	UserClipPlaneEnabled[index] = enable;
+}
+
+core::dimension2du COGLES1Driver::getMaxTextureSize() const
+{
+	return core::dimension2du(MaxTextureSize, MaxTextureSize);
+}
+
+GLenum COGLES1Driver::getGLBlend(E_BLEND_FACTOR factor) const
+{
+	static GLenum const blendTable[] = {
+			GL_ZERO,
+			GL_ONE,
+			GL_DST_COLOR,
+			GL_ONE_MINUS_DST_COLOR,
+			GL_SRC_COLOR,
+			GL_ONE_MINUS_SRC_COLOR,
+			GL_SRC_ALPHA,
+			GL_ONE_MINUS_SRC_ALPHA,
+			GL_DST_ALPHA,
+			GL_ONE_MINUS_DST_ALPHA,
+			GL_SRC_ALPHA_SATURATE,
+		};
+
+	return blendTable[factor];
+}
+
+GLenum COGLES1Driver::getZBufferBits() const
+{
+	GLenum bits = 0;
+
+	switch (Params.ZBufferBits) {
+	case 24:
+#if defined(GL_OES_depth24)
+		if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_depth24))
+			bits = GL_DEPTH_COMPONENT24_OES;
+		else
+#endif
+			bits = GL_DEPTH_COMPONENT16;
+		break;
+	case 32:
+#if defined(GL_OES_depth32)
+		if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_depth32))
+			bits = GL_DEPTH_COMPONENT32_OES;
+		else
+#endif
+			bits = GL_DEPTH_COMPONENT16;
+		break;
+	default:
+		bits = GL_DEPTH_COMPONENT16;
+		break;
+	}
+
+	return bits;
+}
+
+bool COGLES1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+		GLenum &pixelType, void (**converter)(const void *, s32, void *)) const
+{
+	bool supported = false;
+	internalFormat = GL_RGBA;
+	pixelFormat = GL_RGBA;
+	pixelType = GL_UNSIGNED_BYTE;
+	*converter = 0;
+
+	switch (format) {
+	case ECF_A1R5G5B5:
+		supported = true;
+		internalFormat = GL_RGBA;
+		pixelFormat = GL_RGBA;
+		pixelType = GL_UNSIGNED_SHORT_5_5_5_1;
+		*converter = CColorConverter::convert_A1R5G5B5toR5G5B5A1;
+		break;
+	case ECF_R5G6B5:
+		supported = true;
+		internalFormat = GL_RGB;
+		pixelFormat = GL_RGB;
+		pixelType = GL_UNSIGNED_SHORT_5_6_5;
+		break;
+	case ECF_R8G8B8:
+		supported = true;
+		internalFormat = GL_RGB;
+		pixelFormat = GL_RGB;
+		pixelType = GL_UNSIGNED_BYTE;
+		break;
+	case ECF_A8R8G8B8:
+		supported = true;
+		if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_IMG_texture_format_BGRA8888) ||
+				queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_EXT_texture_format_BGRA8888) ||
+				queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_APPLE_texture_format_BGRA8888)) {
+			internalFormat = GL_BGRA;
+			pixelFormat = GL_BGRA;
+		} else {
+			internalFormat = GL_RGBA;
+			pixelFormat = GL_RGBA;
+			*converter = CColorConverter::convert_A8R8G8B8toA8B8G8R8;
+		}
+		pixelType = GL_UNSIGNED_BYTE;
+		break;
+	case ECF_D16:
+		supported = true;
+		internalFormat = GL_DEPTH_COMPONENT16;
+		pixelFormat = GL_DEPTH_COMPONENT;
+		pixelType = GL_UNSIGNED_SHORT;
+		break;
+	case ECF_D32:
+#if defined(GL_OES_depth32)
+		if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_depth32)) {
+			supported = true;
+			internalFormat = GL_DEPTH_COMPONENT32_OES;
+			pixelFormat = GL_DEPTH_COMPONENT;
+			pixelType = GL_UNSIGNED_INT;
+		}
+#endif
+		break;
+	case ECF_D24S8:
+#ifdef GL_OES_packed_depth_stencil
+		if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_packed_depth_stencil)) {
+			supported = true;
+			internalFormat = GL_DEPTH24_STENCIL8_OES;
+			pixelFormat = GL_DEPTH_STENCIL_OES;
+			pixelType = GL_UNSIGNED_INT_24_8_OES;
+		}
+#endif
+		break;
+	case ECF_R8:
+		break;
+	case ECF_R8G8:
+		break;
+	case ECF_R16:
+		break;
+	case ECF_R16G16:
+		break;
+	case ECF_R16F:
+		break;
+	case ECF_G16R16F:
+		break;
+	case ECF_A16B16G16R16F:
+		break;
+	case ECF_R32F:
+		break;
+	case ECF_G32R32F:
+		break;
+	case ECF_A32B32G32R32F:
+		break;
+	default:
+		break;
+	}
+
+#ifdef _IRR_IOS_PLATFORM_
+	if (internalFormat == GL_BGRA)
+		internalFormat = GL_RGBA;
+#endif
+
+	return supported;
+}
+
+bool COGLES1Driver::queryTextureFormat(ECOLOR_FORMAT format) const
+{
+	GLint dummyInternalFormat;
+	GLenum dummyPixelFormat;
+	GLenum dummyPixelType;
+	void (*dummyConverter)(const void *, s32, void *);
+	return getColorFormatParameters(format, dummyInternalFormat, dummyPixelFormat, dummyPixelType, &dummyConverter);
+}
+
+bool COGLES1Driver::needsTransparentRenderPass(const irr::video::SMaterial &material) const
+{
+	return CNullDriver::needsTransparentRenderPass(material) || material.isAlphaBlendOperation();
+}
+
+COGLES1CacheHandler *COGLES1Driver::getCacheHandler() const
+{
+	return CacheHandler;
+}
+
+} // end namespace
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_OGLES1_
+
+namespace irr
+{
+namespace video
+{
+
+#ifndef _IRR_COMPILE_WITH_OGLES1_
+class IVideoDriver;
+class IContextManager;
+#endif
+
+IVideoDriver *createOGLES1Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+	return new COGLES1Driver(params, io, contextManager);
+#else
+	return 0;
+#endif //  _IRR_COMPILE_WITH_OGLES1_
+}
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/COGLESDriver.h b/irr/src/COGLESDriver.h
new file mode 100644
index 000000000..29e0d94f1
--- /dev/null
+++ b/irr/src/COGLESDriver.h
@@ -0,0 +1,327 @@
+// Copyright (C) 2002-20014 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include "SIrrCreationParameters.h"
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#include "CNullDriver.h"
+#include "IMaterialRendererServices.h"
+#include "EDriverFeatures.h"
+#include "fast_atof.h"
+#include "COGLESExtensionHandler.h"
+#include "IContextManager.h"
+
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
+
+namespace irr
+{
+namespace video
+{
+
+class COGLES1Driver : public CNullDriver, public IMaterialRendererServices, public COGLES1ExtensionHandler
+{
+	friend class COpenGLCoreTexture<COGLES1Driver>;
+
+public:
+	//! constructor
+	COGLES1Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+
+	//! destructor
+	virtual ~COGLES1Driver();
+
+	virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), f32 clearDepth = 1.f, u8 clearStencil = 0,
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0) override;
+
+	bool endScene() override;
+
+	//! sets transformation
+	void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat) override;
+
+	struct SHWBufferLink_opengl : public SHWBufferLink
+	{
+		SHWBufferLink_opengl(const scene::IMeshBuffer *_MeshBuffer) :
+				SHWBufferLink(_MeshBuffer), vbo_verticesID(0), vbo_indicesID(0) {}
+
+		GLuint vbo_verticesID; // tmp
+		GLuint vbo_indicesID;  // tmp
+
+		GLuint vbo_verticesSize; // tmp
+		GLuint vbo_indicesSize;  // tmp
+	};
+
+	bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+	bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+
+	//! updates hardware buffer if needed
+	bool updateHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Create hardware buffer from mesh
+	SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer *mb) override;
+
+	//! Delete hardware buffer (only some drivers can)
+	void deleteHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Draw hardware buffer
+	void drawHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	IRenderTarget *addRenderTarget() override;
+
+	//! draws a vertex primitive list
+	virtual void drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) override;
+
+	void drawVertexPrimitiveList2d3d(const void *vertices, u32 vertexCount, const void *indexList, u32 primitiveCount, E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType = EIT_16BIT, bool threed = true);
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const override
+	{
+		//			return FeatureEnabled[feature] && COGLES1ExtensionHandler::queryFeature(feature);
+		return COGLES1ExtensionHandler::queryFeature(feature);
+	}
+
+	//! Sets a material.
+	void setMaterial(const SMaterial &material) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255), bool useAlphaChannelOfTexture = false) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			const video::SColor *const colors = 0, bool useAlphaChannelOfTexture = false) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, u32 layer, bool flip);
+
+	//! draws a set of 2d images, using a color and the alpha channel of the texture if desired.
+	virtual void draw2DImageBatch(const video::ITexture *texture,
+			const core::array<core::position2d<s32>> &positions,
+			const core::array<core::rect<s32>> &sourceRects,
+			const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255),
+			bool useAlphaChannelOfTexture = false) override;
+
+	//! draw an 2d rectangle
+	virtual void draw2DRectangle(SColor color, const core::rect<s32> &pos,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws an 2d rectangle with a gradient.
+	virtual void draw2DRectangle(const core::rect<s32> &pos,
+			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws a 2d line.
+	virtual void draw2DLine(const core::position2d<s32> &start,
+			const core::position2d<s32> &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Draws a 3d line.
+	virtual void draw3DLine(const core::vector3df &start,
+			const core::vector3df &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Returns the name of the video driver.
+	const char *getName() const override;
+
+	//! Sets the dynamic ambient light color.
+	void setAmbientLight(const SColorf &color) override;
+
+	//! sets a viewport
+	void setViewPort(const core::rect<s32> &area) override;
+
+	//! Sets the fog mode.
+	virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
+			f32 end, f32 density, bool pixelFog, bool rangeFog) override;
+
+	//! Only used internally by the engine
+	void OnResize(const core::dimension2d<u32> &size) override;
+
+	//! Returns type of video driver
+	E_DRIVER_TYPE getDriverType() const override;
+
+	//! get color format of the current color buffer
+	ECOLOR_FORMAT getColorFormat() const override;
+
+	//! Returns the transformation set by setTransform
+	const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override;
+
+	//! Can be called by an IMaterialRenderer to make its work easier.
+	virtual void setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial,
+			bool resetAllRenderstates) override;
+
+	//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+	virtual void setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates);
+
+	//! Get a vertex shader constant index.
+	s32 getVertexShaderConstantID(const c8 *name) override;
+
+	//! Get a pixel shader constant index.
+	s32 getPixelShaderConstantID(const c8 *name) override;
+
+	//! Sets a constant for the vertex shader based on an index.
+	bool setVertexShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setVertexShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setVertexShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! Sets a constant for the pixel shader based on an index.
+	bool setPixelShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setPixelShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setPixelShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! Adds a new material renderer to the VideoDriver
+	virtual s32 addHighLevelShaderMaterial(const c8 *vertexShaderProgram, const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget, const c8 *pixelShaderProgram, const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget, const c8 *geometryShaderProgram, const c8 *geometryShaderEntryPointName,
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget, scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+			u32 verticesOut, IShaderConstantSetCallBack *callback, E_MATERIAL_TYPE baseMaterial,
+			s32 userData) override;
+
+	//! Returns pointer to the IGPUProgrammingServices interface.
+	IGPUProgrammingServices *getGPUProgrammingServices() override;
+
+	//! Returns a pointer to the IVideoDriver interface.
+	IVideoDriver *getVideoDriver() override;
+
+	//! Returns the maximum amount of primitives
+	u32 getMaximalPrimitiveCount() const override;
+
+	virtual ITexture *addRenderTargetTexture(const core::dimension2d<u32> &size,
+			const io::path &name, const ECOLOR_FORMAT format = ECF_UNKNOWN) override;
+
+	//! Creates a render target texture for a cubemap
+	ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+			const io::path &name, const ECOLOR_FORMAT format) override;
+
+	virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) override;
+
+	void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) override;
+
+	//! Returns an image created from the last rendered frame.
+	IImage *createScreenShot(video::ECOLOR_FORMAT format = video::ECF_UNKNOWN, video::E_RENDER_TARGET target = video::ERT_FRAME_BUFFER) override;
+
+	//! checks if an OpenGL error has happened and prints it (+ some internal code which is usually the line number)
+	bool testGLError(int code = 0);
+
+	//! Set/unset a clipping plane.
+	bool setClipPlane(u32 index, const core::plane3df &plane, bool enable = false) override;
+
+	//! Enable/disable a clipping plane.
+	void enableClipPlane(u32 index, bool enable) override;
+
+	//! Returns the graphics card vendor name.
+	core::stringc getVendorInfo() override
+	{
+		return VendorName;
+	}
+
+	//! Get the maximal texture size for this driver
+	core::dimension2du getMaxTextureSize() const override;
+
+	void removeTexture(ITexture *texture) override;
+
+	//! Check if the driver supports creating textures with the given color format
+	bool queryTextureFormat(ECOLOR_FORMAT format) const override;
+
+	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
+	bool needsTransparentRenderPass(const irr::video::SMaterial &material) const override;
+
+	//! Convert E_BLEND_FACTOR to OpenGL equivalent
+	GLenum getGLBlend(E_BLEND_FACTOR factor) const;
+
+	//! Get ZBuffer bits.
+	GLenum getZBufferBits() const;
+
+	bool getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+			GLenum &pixelType, void (**converter)(const void *, s32, void *)) const;
+
+	COGLES1CacheHandler *getCacheHandler() const;
+
+private:
+	void uploadClipPlane(u32 index);
+
+	//! inits the opengl-es driver
+	bool genericDriverInit(const core::dimension2d<u32> &screenSize, bool stencilBuffer);
+
+	ITexture *createDeviceDependentTexture(const io::path &name, IImage *image) override;
+
+	ITexture *createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image) override;
+
+	//! creates a transposed matrix in supplied GLfloat array to pass to OGLES1
+	inline void getGLMatrix(GLfloat gl_matrix[16], const core::matrix4 &m);
+	inline void getGLTextureMatrix(GLfloat gl_matrix[16], const core::matrix4 &m);
+
+	//! Set GL pipeline to desired texture wrap modes of the material
+	void setWrapMode(const SMaterial &material);
+
+	//! Get OpenGL wrap enum from Irrlicht enum
+	GLint getTextureWrapMode(u8 clamp) const;
+
+	//! sets the needed renderstates
+	void setRenderStates3DMode();
+
+	//! sets the needed renderstates
+	void setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel);
+
+	void createMaterialRenderers();
+
+	//! Assign a hardware light to the specified requested light, if any
+	//! free hardware lights exist.
+	//! \param[in] lightIndex: the index of the requesting light
+	void assignHardwareLight(u32 lightIndex);
+
+	//! Same as `CacheHandler->setViewport`, but also sets `ViewPort`
+	virtual void setViewPortRaw(u32 width, u32 height);
+
+	COGLES1CacheHandler *CacheHandler;
+
+	core::stringc Name;
+	core::matrix4 Matrices[ETS_COUNT];
+	core::array<u8> ColorBuffer;
+
+	//! enumeration for rendering modes such as 2d and 3d for minimizing the switching of renderStates.
+	enum E_RENDER_MODE
+	{
+		ERM_NONE = 0, // no render state has been set yet.
+		ERM_2D,       // 2d drawing rendermode
+		ERM_3D        // 3d rendering mode
+	};
+
+	E_RENDER_MODE CurrentRenderMode;
+	//! bool to make all renderstates reset if set to true.
+	bool ResetRenderStates;
+	bool Transformation3DChanged;
+	u8 AntiAlias;
+
+	SMaterial Material, LastMaterial;
+	core::array<core::plane3df> UserClipPlane;
+	std::vector<bool> UserClipPlaneEnabled;
+
+	core::stringc VendorName;
+
+	core::matrix4 TextureFlipMatrix;
+
+	//! Color buffer format
+	ECOLOR_FORMAT ColorFormat;
+
+	SIrrlichtCreationParameters Params;
+
+	IContextManager *ContextManager;
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_OGLES1_
diff --git a/irr/src/COGLESExtensionHandler.cpp b/irr/src/COGLESExtensionHandler.cpp
new file mode 100644
index 000000000..82f8e9261
--- /dev/null
+++ b/irr/src/COGLESExtensionHandler.cpp
@@ -0,0 +1,94 @@
+// Copyright (C) 2008 Christian Stehno
+// Heavily based on the OpenGL driver implemented by Nikolaus Gebhardt
+// 2017 modified by Michael Zeilfelder (unifying extension handlers)
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "COGLESExtensionHandler.h"
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#include "irrString.h"
+#include "SMaterial.h"
+#include "fast_atof.h"
+
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
+#include <EGL/egl.h>
+#else
+#include <GLES/egl.h>
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+COGLES1ExtensionHandler::COGLES1ExtensionHandler() :
+		COGLESCoreExtensionHandler(),
+		MaxUserClipPlanes(0), MaxLights(0), pGlBlendEquationOES(0), pGlBlendFuncSeparateOES(0),
+		pGlBindFramebufferOES(0), pGlDeleteFramebuffersOES(0),
+		pGlGenFramebuffersOES(0), pGlCheckFramebufferStatusOES(0),
+		pGlFramebufferTexture2DOES(0), pGlGenerateMipmapOES(0)
+{
+}
+
+void COGLES1ExtensionHandler::initExtensions()
+{
+	getGLVersion();
+
+	if (Version >= 100)
+		os::Printer::log("OpenGL ES driver version is 1.1.", ELL_INFORMATION);
+	else
+		os::Printer::log("OpenGL ES driver version is 1.0.", ELL_WARNING);
+
+	getGLExtensions();
+
+	GLint val = 0;
+
+	if (Version > 100 || FeatureAvailable[IRR_GL_IMG_user_clip_plane]) {
+		glGetIntegerv(GL_MAX_CLIP_PLANES, &val);
+		MaxUserClipPlanes = static_cast<u8>(val);
+	}
+
+	glGetIntegerv(GL_MAX_LIGHTS, &val);
+	MaxLights = static_cast<u8>(val);
+
+	glGetIntegerv(GL_MAX_TEXTURE_UNITS, &val);
+	Feature.MaxTextureUnits = static_cast<u8>(val);
+
+#ifdef GL_EXT_texture_filter_anisotropic
+	if (FeatureAvailable[IRR_GL_EXT_texture_filter_anisotropic]) {
+		glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &val);
+		MaxAnisotropy = static_cast<u8>(val);
+	}
+#endif
+#ifdef GL_MAX_ELEMENTS_INDICES
+	glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &val);
+	MaxIndices = val;
+#endif
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &val);
+	MaxTextureSize = static_cast<u32>(val);
+#ifdef GL_EXT_texture_lod_bias
+	if (FeatureAvailable[IRR_GL_EXT_texture_lod_bias])
+		glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS_EXT, &MaxTextureLODBias);
+#endif
+	glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, DimAliasedLine);
+	glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, DimAliasedPoint);
+
+	Feature.MaxTextureUnits = core::min_(Feature.MaxTextureUnits, static_cast<u8>(MATERIAL_MAX_TEXTURES));
+	Feature.ColorAttachment = 1;
+
+	pGlBlendEquationOES = (PFNGLBLENDEQUATIONOESPROC)eglGetProcAddress("glBlendEquationOES");
+	pGlBlendFuncSeparateOES = (PFNGLBLENDFUNCSEPARATEOESPROC)eglGetProcAddress("glBlendFuncSeparateOES");
+	pGlBindFramebufferOES = (PFNGLBINDFRAMEBUFFEROESPROC)eglGetProcAddress("glBindFramebufferOES");
+	pGlDeleteFramebuffersOES = (PFNGLDELETEFRAMEBUFFERSOESPROC)eglGetProcAddress("glDeleteFramebuffersOES");
+	pGlGenFramebuffersOES = (PFNGLGENFRAMEBUFFERSOESPROC)eglGetProcAddress("glGenFramebuffersOES");
+	pGlCheckFramebufferStatusOES = (PFNGLCHECKFRAMEBUFFERSTATUSOESPROC)eglGetProcAddress("glCheckFramebufferStatusOES");
+	pGlFramebufferTexture2DOES = (PFNGLFRAMEBUFFERTEXTURE2DOESPROC)eglGetProcAddress("glFramebufferTexture2DOES");
+	pGlGenerateMipmapOES = (PFNGLGENERATEMIPMAPOESPROC)eglGetProcAddress("glGenerateMipmapOES");
+}
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_OGLES2_
diff --git a/irr/src/COGLESExtensionHandler.h b/irr/src/COGLESExtensionHandler.h
new file mode 100644
index 000000000..d9e1ac4bc
--- /dev/null
+++ b/irr/src/COGLESExtensionHandler.h
@@ -0,0 +1,190 @@
+// Copyright (C) 2008 Christian Stehno
+// Heavily based on the OpenGL driver implemented by Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#include "EDriverFeatures.h"
+#include "irrTypes.h"
+#include "os.h"
+
+#include "COGLESCommon.h"
+
+#include "COGLESCoreExtensionHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COGLES1ExtensionHandler : public COGLESCoreExtensionHandler
+{
+public:
+	COGLES1ExtensionHandler();
+
+	void initExtensions();
+
+	bool queryFeature(video::E_VIDEO_DRIVER_FEATURE feature) const
+	{
+		switch (feature) {
+		case EVDF_RENDER_TO_TARGET:
+		case EVDF_HARDWARE_TL:
+		case EVDF_MULTITEXTURE:
+		case EVDF_BILINEAR_FILTER:
+		case EVDF_MIP_MAP:
+		case EVDF_TEXTURE_NSQUARE:
+		case EVDF_STENCIL_BUFFER:
+		case EVDF_ALPHA_TO_COVERAGE:
+		case EVDF_COLOR_MASK:
+		case EVDF_POLYGON_OFFSET:
+		case EVDF_TEXTURE_MATRIX:
+			return true;
+		case EVDF_TEXTURE_NPOT:
+			return FeatureAvailable[IRR_GL_APPLE_texture_2D_limited_npot] || FeatureAvailable[IRR_GL_OES_texture_npot];
+		case EVDF_MIP_MAP_AUTO_UPDATE:
+			return Version > 100;
+		case EVDF_BLEND_OPERATIONS:
+			return FeatureAvailable[IRR_GL_OES_blend_subtract];
+		case EVDF_BLEND_SEPARATE:
+			return FeatureAvailable[IRR_GL_OES_blend_func_separate];
+		case EVDF_FRAMEBUFFER_OBJECT:
+			return FeatureAvailable[IRR_GL_OES_framebuffer_object];
+		case EVDF_VERTEX_BUFFER_OBJECT:
+			return Version > 100;
+		default:
+			return true;
+		};
+	}
+
+	inline void irrGlActiveTexture(GLenum texture)
+	{
+		glActiveTexture(texture);
+	}
+
+	inline void irrGlCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border,
+			GLsizei imageSize, const void *data)
+	{
+		glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+	}
+
+	inline void irrGlCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
+			GLenum format, GLsizei imageSize, const void *data)
+	{
+		glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+	}
+
+	inline void irrGlUseProgram(GLuint prog)
+	{
+	}
+
+	inline void irrGlBindFramebuffer(GLenum target, GLuint framebuffer)
+	{
+		if (pGlBindFramebufferOES)
+			pGlBindFramebufferOES(target, framebuffer);
+	}
+
+	inline void irrGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
+	{
+		if (pGlDeleteFramebuffersOES)
+			pGlDeleteFramebuffersOES(n, framebuffers);
+	}
+
+	inline void irrGlGenFramebuffers(GLsizei n, GLuint *framebuffers)
+	{
+		if (pGlGenFramebuffersOES)
+			pGlGenFramebuffersOES(n, framebuffers);
+	}
+
+	inline GLenum irrGlCheckFramebufferStatus(GLenum target)
+	{
+		if (pGlCheckFramebufferStatusOES)
+			return pGlCheckFramebufferStatusOES(target);
+		else
+			return 0;
+	}
+
+	inline void irrGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+	{
+		if (pGlFramebufferTexture2DOES)
+			pGlFramebufferTexture2DOES(target, attachment, textarget, texture, level);
+	}
+
+	inline void irrGlGenerateMipmap(GLenum target)
+	{
+		if (pGlGenerateMipmapOES)
+			pGlGenerateMipmapOES(target);
+	}
+
+	inline void irrGlActiveStencilFace(GLenum face)
+	{
+	}
+
+	inline void irrGlDrawBuffer(GLenum mode)
+	{
+	}
+
+	inline void irrGlDrawBuffers(GLsizei n, const GLenum *bufs)
+	{
+	}
+
+	inline void irrGlBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+	{
+		if (pGlBlendFuncSeparateOES)
+			pGlBlendFuncSeparateOES(srcRGB, dstRGB, srcAlpha, dstAlpha);
+	}
+
+	inline void irrGlBlendEquation(GLenum mode)
+	{
+		if (pGlBlendEquationOES)
+			pGlBlendEquationOES(mode);
+	}
+
+	inline void irrGlEnableIndexed(GLenum target, GLuint index)
+	{
+	}
+
+	inline void irrGlDisableIndexed(GLenum target, GLuint index)
+	{
+	}
+
+	inline void irrGlColorMaskIndexed(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+	{
+	}
+
+	inline void irrGlBlendFuncIndexed(GLuint buf, GLenum src, GLenum dst)
+	{
+	}
+
+	inline void irrGlBlendFuncSeparateIndexed(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+	{
+	}
+
+	inline void irrGlBlendEquationIndexed(GLuint buf, GLenum mode)
+	{
+	}
+
+	inline void irrGlBlendEquationSeparateIndexed(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+	{
+	}
+
+protected:
+	u8 MaxUserClipPlanes;
+	u8 MaxLights;
+
+	PFNGLBLENDEQUATIONOESPROC pGlBlendEquationOES;
+	PFNGLBLENDFUNCSEPARATEOESPROC pGlBlendFuncSeparateOES;
+	PFNGLBINDFRAMEBUFFEROESPROC pGlBindFramebufferOES;
+	PFNGLDELETEFRAMEBUFFERSOESPROC pGlDeleteFramebuffersOES;
+	PFNGLGENFRAMEBUFFERSOESPROC pGlGenFramebuffersOES;
+	PFNGLCHECKFRAMEBUFFERSTATUSOESPROC pGlCheckFramebufferStatusOES;
+	PFNGLFRAMEBUFFERTEXTURE2DOESPROC pGlFramebufferTexture2DOES;
+	PFNGLGENERATEMIPMAPOESPROC pGlGenerateMipmapOES;
+};
+
+}
+}
+
+#endif
diff --git a/irr/src/COGLESMaterialRenderer.h b/irr/src/COGLESMaterialRenderer.h
new file mode 100644
index 000000000..69d1b81ff
--- /dev/null
+++ b/irr/src/COGLESMaterialRenderer.h
@@ -0,0 +1,286 @@
+// Copyright (C) 2002-2008 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+
+#include "COGLESDriver.h"
+#include "IMaterialRenderer.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Base class for all internal OGLES1 material renderers
+class COGLES1MaterialRenderer : public IMaterialRenderer
+{
+public:
+	//! Constructor
+	COGLES1MaterialRenderer(video::COGLES1Driver *driver) :
+			Driver(driver)
+	{
+	}
+
+protected:
+	video::COGLES1Driver *Driver;
+};
+
+//! Solid material renderer
+class COGLES1MaterialRenderer_SOLID : public COGLES1MaterialRenderer
+{
+public:
+	COGLES1MaterialRenderer_SOLID(video::COGLES1Driver *d) :
+			COGLES1MaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services)
+	{
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (resetAllRenderstates || (material.MaterialType != lastMaterial.MaterialType)) {
+			// thanks to Murphy, the following line removed some
+			// bugs with several OGLES1 implementations.
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+	}
+};
+
+//! Generic Texture Blend
+class COGLES1MaterialRenderer_ONETEXTURE_BLEND : public COGLES1MaterialRenderer
+{
+public:
+	COGLES1MaterialRenderer_ONETEXTURE_BLEND(video::COGLES1Driver *d) :
+			COGLES1MaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services)
+	{
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		//		if (material.MaterialType != lastMaterial.MaterialType ||
+		//			material.MaterialTypeParam != lastMaterial.MaterialTypeParam ||
+		//			resetAllRenderstates)
+		{
+			E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact;
+			E_MODULATE_FUNC modulate;
+			u32 alphaSource;
+			unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulate, alphaSource, material.MaterialTypeParam);
+
+			Driver->getCacheHandler()->setBlend(true);
+
+			if (Driver->queryFeature(EVDF_BLEND_SEPARATE)) {
+				Driver->getCacheHandler()->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
+						Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
+			} else {
+				Driver->getCacheHandler()->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
+			}
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, (f32)modulate);
+
+			glEnable(GL_ALPHA_TEST);
+			glAlphaFunc(GL_GREATER, 0.f);
+
+			if (textureBlendFunc_hasAlpha(srcRGBFact) || textureBlendFunc_hasAlpha(dstRGBFact) ||
+					textureBlendFunc_hasAlpha(srcAlphaFact) || textureBlendFunc_hasAlpha(dstAlphaFact)) {
+				glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
+
+				glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
+			}
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, 1.f);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
+
+		Driver->getCacheHandler()->setBlend(false);
+		glDisable(GL_ALPHA_TEST);
+	}
+
+	//! Returns if the material is transparent.
+	/** Is not always transparent, but mostly. */
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+
+private:
+	u32 getGLBlend(E_BLEND_FACTOR factor) const
+	{
+		u32 r = 0;
+		switch (factor) {
+		case EBF_ZERO:
+			r = GL_ZERO;
+			break;
+		case EBF_ONE:
+			r = GL_ONE;
+			break;
+		case EBF_DST_COLOR:
+			r = GL_DST_COLOR;
+			break;
+		case EBF_ONE_MINUS_DST_COLOR:
+			r = GL_ONE_MINUS_DST_COLOR;
+			break;
+		case EBF_SRC_COLOR:
+			r = GL_SRC_COLOR;
+			break;
+		case EBF_ONE_MINUS_SRC_COLOR:
+			r = GL_ONE_MINUS_SRC_COLOR;
+			break;
+		case EBF_SRC_ALPHA:
+			r = GL_SRC_ALPHA;
+			break;
+		case EBF_ONE_MINUS_SRC_ALPHA:
+			r = GL_ONE_MINUS_SRC_ALPHA;
+			break;
+		case EBF_DST_ALPHA:
+			r = GL_DST_ALPHA;
+			break;
+		case EBF_ONE_MINUS_DST_ALPHA:
+			r = GL_ONE_MINUS_DST_ALPHA;
+			break;
+		case EBF_SRC_ALPHA_SATURATE:
+			r = GL_SRC_ALPHA_SATURATE;
+			break;
+		}
+		return r;
+	}
+};
+
+//! Transparent vertex alpha material renderer
+class COGLES1MaterialRenderer_TRANSPARENT_VERTEX_ALPHA : public COGLES1MaterialRenderer
+{
+public:
+	COGLES1MaterialRenderer_TRANSPARENT_VERTEX_ALPHA(video::COGLES1Driver *d) :
+			COGLES1MaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services)
+	{
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		Driver->getCacheHandler()->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+		Driver->getCacheHandler()->setBlend(true);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) {
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PRIMARY_COLOR);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PRIMARY_COLOR);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_TEXTURE);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		// default values
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_PREVIOUS);
+		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
+
+		Driver->getCacheHandler()->setBlend(false);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+//! Transparent alpha channel material renderer
+class COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL : public COGLES1MaterialRenderer
+{
+public:
+	COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(video::COGLES1Driver *d) :
+			COGLES1MaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services)
+	{
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		Driver->getCacheHandler()->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		Driver->getCacheHandler()->setBlend(true);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates || material.MaterialTypeParam != lastMaterial.MaterialTypeParam) {
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
+
+			glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
+			glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE);
+
+			glEnable(GL_ALPHA_TEST);
+
+			glAlphaFunc(GL_GREATER, material.MaterialTypeParam);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_ALPHA_TEST);
+		Driver->getCacheHandler()->setBlend(false);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return true;
+	}
+};
+
+//! Transparent alpha channel material renderer
+class COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF : public COGLES1MaterialRenderer
+{
+public:
+	COGLES1MaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(video::COGLES1Driver *d) :
+			COGLES1MaterialRenderer(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services)
+	{
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) {
+			glEnable(GL_ALPHA_TEST);
+			glAlphaFunc(GL_GREATER, 0.5f);
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		}
+	}
+
+	virtual void OnUnsetMaterial()
+	{
+		glDisable(GL_ALPHA_TEST);
+	}
+
+	//! Returns if the material is transparent.
+	virtual bool isTransparent() const
+	{
+		return false; // this material is not really transparent because it does no blending.
+	}
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif
diff --git a/irr/src/COSOperator.cpp b/irr/src/COSOperator.cpp
new file mode 100644
index 000000000..d53223916
--- /dev/null
+++ b/irr/src/COSOperator.cpp
@@ -0,0 +1,253 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "COSOperator.h"
+
+#ifdef _IRR_WINDOWS_API_
+#include <windows.h>
+#else
+#include <cstring>
+#include <unistd.h>
+#ifndef _IRR_ANDROID_PLATFORM_
+#include <sys/types.h>
+#ifdef _IRR_OSX_PLATFORM_
+#include <sys/sysctl.h>
+#endif
+#endif
+#endif
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#include <SDL_clipboard.h>
+#include <SDL_version.h>
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+#include "CIrrDeviceLinux.h"
+#endif
+#if defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+#import <Cocoa/Cocoa.h>
+#endif
+
+#include "fast_atof.h"
+
+namespace irr
+{
+
+#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+// constructor  linux
+COSOperator::COSOperator(const core::stringc &osVersion, CIrrDeviceLinux *device) :
+		OperatingSystem(osVersion), IrrDeviceLinux(device)
+{
+}
+#endif
+
+// constructor
+COSOperator::COSOperator(const core::stringc &osVersion) :
+		OperatingSystem(osVersion)
+{
+#ifdef _DEBUG
+	setDebugName("COSOperator");
+#endif
+}
+
+COSOperator::~COSOperator()
+{
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+	SDL_free(ClipboardSelectionText);
+	SDL_free(PrimarySelectionText);
+#endif
+}
+
+//! returns the current operating system version as string.
+const core::stringc &COSOperator::getOperatingSystemVersion() const
+{
+	return OperatingSystem;
+}
+
+//! copies text to the clipboard
+void COSOperator::copyToClipboard(const c8 *text) const
+{
+	if (strlen(text) == 0)
+		return;
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	SDL_SetClipboardText(text);
+
+#elif defined(_IRR_WINDOWS_API_)
+	if (!OpenClipboard(NULL) || text == 0)
+		return;
+
+	EmptyClipboard();
+
+	core::stringw tempbuffer;
+	core::utf8ToWString(tempbuffer, text);
+	const u32 size = (tempbuffer.size() + 1) * sizeof(wchar_t);
+
+	HGLOBAL clipbuffer;
+	void *buffer;
+
+	clipbuffer = GlobalAlloc(GMEM_MOVEABLE, size);
+	buffer = GlobalLock(clipbuffer);
+
+	memcpy(buffer, tempbuffer.c_str(), size);
+
+	GlobalUnlock(clipbuffer);
+	SetClipboardData(CF_UNICODETEXT, clipbuffer);
+	CloseClipboard();
+
+#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+	NSString *str = nil;
+	NSPasteboard *board = nil;
+
+	if ((text != NULL) && (strlen(text) > 0)) {
+		str = [NSString stringWithCString:text encoding:NSUTF8StringEncoding];
+		board = [NSPasteboard generalPasteboard];
+		[board declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:NSApp];
+		[board setString:str forType:NSStringPboardType];
+	}
+
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	if (IrrDeviceLinux)
+		IrrDeviceLinux->copyToClipboard(text);
+#endif
+}
+
+//! copies text to the primary selection
+void COSOperator::copyToPrimarySelection(const c8 *text) const
+{
+	if (strlen(text) == 0)
+		return;
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#if SDL_VERSION_ATLEAST(2, 25, 0)
+	SDL_SetPrimarySelectionText(text);
+#endif
+
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	if (IrrDeviceLinux)
+		IrrDeviceLinux->copyToPrimarySelection(text);
+#endif
+}
+
+//! gets text from the clipboard
+const c8 *COSOperator::getTextFromClipboard() const
+{
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	SDL_free(ClipboardSelectionText);
+	ClipboardSelectionText = SDL_GetClipboardText();
+	return ClipboardSelectionText;
+
+#elif defined(_IRR_WINDOWS_API_)
+	if (!OpenClipboard(NULL))
+		return 0;
+
+	HANDLE hData = GetClipboardData(CF_UNICODETEXT);
+	if (hData == NULL) // Probably not in Unicode text format
+		return 0;
+
+	wchar_t *buffer = (wchar_t *)GlobalLock(hData);
+
+	core::wStringToUTF8(ClipboardBuf, buffer);
+
+	GlobalUnlock(hData);
+	CloseClipboard();
+
+	return ClipboardBuf.c_str();
+
+#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+	NSString *str = nil;
+	NSPasteboard *board = nil;
+	char *result = 0;
+
+	board = [NSPasteboard generalPasteboard];
+	str = [board stringForType:NSStringPboardType];
+
+	if (str != nil)
+		result = (char *)[str cStringUsingEncoding:NSUTF8StringEncoding];
+
+	return (result);
+
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	if (IrrDeviceLinux)
+		return IrrDeviceLinux->getTextFromClipboard();
+	return 0;
+
+#else
+
+	return 0;
+#endif
+}
+
+//! gets text from the primary selection
+const c8 *COSOperator::getTextFromPrimarySelection() const
+{
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#if SDL_VERSION_ATLEAST(2, 25, 0)
+	SDL_free(PrimarySelectionText);
+	PrimarySelectionText = SDL_GetPrimarySelectionText();
+	return PrimarySelectionText;
+#endif
+	return 0;
+
+#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	if (IrrDeviceLinux)
+		return IrrDeviceLinux->getTextFromPrimarySelection();
+	return 0;
+
+#else
+
+	return 0;
+#endif
+}
+
+bool COSOperator::getSystemMemory(u32 *Total, u32 *Avail) const
+{
+#if defined(_IRR_WINDOWS_API_)
+
+	MEMORYSTATUSEX MemoryStatusEx;
+	MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX);
+
+	// cannot fail
+	GlobalMemoryStatusEx(&MemoryStatusEx);
+
+	if (Total)
+		*Total = (u32)(MemoryStatusEx.ullTotalPhys >> 10);
+	if (Avail)
+		*Avail = (u32)(MemoryStatusEx.ullAvailPhys >> 10);
+	return true;
+
+#elif defined(_IRR_POSIX_API_) && defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
+	long ps = sysconf(_SC_PAGESIZE);
+	long pp = sysconf(_SC_PHYS_PAGES);
+	long ap = sysconf(_SC_AVPHYS_PAGES);
+
+	if (ps == -1 || (Total && pp == -1) || (Avail && ap == -1))
+		return false;
+
+	if (Total)
+		*Total = (u32)((pp >> 10) * ps);
+	if (Avail)
+		*Avail = (u32)((ap >> 10) * ps);
+	return true;
+#elif defined(_IRR_OSX_PLATFORM_)
+	int mib[2];
+	int64_t physical_memory;
+	size_t length;
+
+	// Get the Physical memory size
+	mib[0] = CTL_HW;
+	mib[1] = HW_MEMSIZE;
+	length = sizeof(int64_t);
+	sysctl(mib, 2, &physical_memory, &length, NULL, 0);
+
+	if (Total)
+		*Total = (u32)(physical_memory >> 10);
+	if (Avail)
+		*Avail = (u32)(physical_memory >> 10); // we don't know better
+	return true;
+#else
+	// TODO: implement for others
+	return false;
+#endif
+}
+
+} // end namespace
diff --git a/irr/src/COSOperator.h b/irr/src/COSOperator.h
new file mode 100644
index 000000000..c1059bffc
--- /dev/null
+++ b/irr/src/COSOperator.h
@@ -0,0 +1,74 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IOSOperator.h"
+
+namespace irr
+{
+
+class CIrrDeviceLinux;
+
+//! The OSOperator provides OS-specific methods and information.
+class COSOperator : public IOSOperator
+{
+public:
+	// constructor
+#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	COSOperator(const core::stringc &osversion, CIrrDeviceLinux *device);
+#endif
+	COSOperator(const core::stringc &osversion);
+
+	~COSOperator();
+
+	COSOperator(const COSOperator &) = delete;
+	COSOperator &operator=(const COSOperator &) = delete;
+
+	//! Get the current OS version as string.
+	const core::stringc &getOperatingSystemVersion() const override;
+
+	//! Copies text to the clipboard
+	//! \param text: text in utf-8
+	void copyToClipboard(const c8 *text) const override;
+
+	//! Copies text to the primary selection
+	//! This is a no-op on some platforms.
+	//! \param text: text in utf-8
+	void copyToPrimarySelection(const c8 *text) const override;
+
+	//! Get text from the clipboard
+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
+	const c8 *getTextFromClipboard() const override;
+
+	//! Get text from the primary selection
+	//! This is a no-op on some platforms.
+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.
+	const c8 *getTextFromPrimarySelection() const override;
+
+	//! Get the total and available system RAM
+	/** \param totalBytes: will contain the total system memory in Kilobytes (1024 B)
+	\param availableBytes: will contain the available memory in Kilobytes (1024 B)
+	\return True if successful, false if not */
+	bool getSystemMemory(u32 *Total, u32 *Avail) const override;
+
+private:
+	core::stringc OperatingSystem;
+
+#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	CIrrDeviceLinux *IrrDeviceLinux;
+#endif
+
+#ifdef _IRR_WINDOWS_API_
+	mutable core::stringc ClipboardBuf;
+#endif
+
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+	// These need to be freed with SDL_free
+	mutable char *ClipboardSelectionText = nullptr;
+	mutable char *PrimarySelectionText = nullptr;
+#endif
+};
+
+} // end namespace
diff --git a/irr/src/COpenGLCacheHandler.cpp b/irr/src/COpenGLCacheHandler.cpp
new file mode 100644
index 000000000..577967c56
--- /dev/null
+++ b/irr/src/COpenGLCacheHandler.cpp
@@ -0,0 +1,123 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "COpenGLCacheHandler.h"
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "COpenGLDriver.h"
+
+namespace irr
+{
+namespace video
+{
+
+/* COpenGLCacheHandler */
+
+COpenGLCacheHandler::COpenGLCacheHandler(COpenGLDriver *driver) :
+		COpenGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false),
+		MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0), ClientStateVertex(false),
+		ClientStateNormal(false), ClientStateColor(false), ClientStateTexCoord0(false)
+{
+	// Initial OpenGL values from specification.
+
+	glAlphaFunc(AlphaMode, AlphaRef);
+	glDisable(GL_ALPHA_TEST);
+
+	glMatrixMode(MatrixMode);
+
+	Driver->irrGlClientActiveTexture(ClientActiveTexture);
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_NORMAL_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+COpenGLCacheHandler::~COpenGLCacheHandler()
+{
+}
+
+void COpenGLCacheHandler::setAlphaFunc(GLenum mode, GLclampf ref)
+{
+	if (AlphaMode != mode || AlphaRef != ref) {
+		glAlphaFunc(mode, ref);
+
+		AlphaMode = mode;
+		AlphaRef = ref;
+	}
+}
+
+void COpenGLCacheHandler::setAlphaTest(bool enable)
+{
+	if (AlphaTest != enable) {
+		if (enable)
+			glEnable(GL_ALPHA_TEST);
+		else
+			glDisable(GL_ALPHA_TEST);
+		AlphaTest = enable;
+	}
+}
+
+void COpenGLCacheHandler::setClientState(bool vertex, bool normal, bool color, bool texCoord0)
+{
+	if (ClientStateVertex != vertex) {
+		if (vertex)
+			glEnableClientState(GL_VERTEX_ARRAY);
+		else
+			glDisableClientState(GL_VERTEX_ARRAY);
+
+		ClientStateVertex = vertex;
+	}
+
+	if (ClientStateNormal != normal) {
+		if (normal)
+			glEnableClientState(GL_NORMAL_ARRAY);
+		else
+			glDisableClientState(GL_NORMAL_ARRAY);
+
+		ClientStateNormal = normal;
+	}
+
+	if (ClientStateColor != color) {
+		if (color)
+			glEnableClientState(GL_COLOR_ARRAY);
+		else
+			glDisableClientState(GL_COLOR_ARRAY);
+
+		ClientStateColor = color;
+	}
+
+	if (ClientStateTexCoord0 != texCoord0) {
+		setClientActiveTexture(GL_TEXTURE0_ARB);
+
+		if (texCoord0)
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		else
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+		ClientStateTexCoord0 = texCoord0;
+	}
+}
+
+void COpenGLCacheHandler::setMatrixMode(GLenum mode)
+{
+	if (MatrixMode != mode) {
+		glMatrixMode(mode);
+		MatrixMode = mode;
+	}
+}
+
+void COpenGLCacheHandler::setClientActiveTexture(GLenum texture)
+{
+	if (ClientActiveTexture != texture) {
+		Driver->irrGlClientActiveTexture(texture);
+		ClientActiveTexture = texture;
+	}
+}
+
+} // end namespace
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_OPENGL_
diff --git a/irr/src/COpenGLCacheHandler.h b/irr/src/COpenGLCacheHandler.h
new file mode 100644
index 000000000..968e452d7
--- /dev/null
+++ b/irr/src/COpenGLCacheHandler.h
@@ -0,0 +1,62 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "COpenGLCommon.h"
+
+#include "COpenGLCoreFeature.h"
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreCacheHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGLCacheHandler : public COpenGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>
+{
+public:
+	COpenGLCacheHandler(COpenGLDriver *driver);
+	virtual ~COpenGLCacheHandler();
+
+	// Alpha calls.
+
+	void setAlphaFunc(GLenum mode, GLclampf ref);
+
+	void setAlphaTest(bool enable);
+
+	// Client state calls.
+
+	void setClientState(bool vertex, bool normal, bool color, bool texCoord0);
+
+	// Matrix calls.
+
+	void setMatrixMode(GLenum mode);
+
+	// Texture calls.
+
+	void setClientActiveTexture(GLenum texture);
+
+protected:
+	GLenum AlphaMode;
+	GLclampf AlphaRef;
+	bool AlphaTest;
+
+	GLenum MatrixMode;
+
+	GLenum ClientActiveTexture;
+
+	bool ClientStateVertex;
+	bool ClientStateNormal;
+	bool ClientStateColor;
+	bool ClientStateTexCoord0;
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_OPENGL_
diff --git a/irr/src/COpenGLCommon.h b/irr/src/COpenGLCommon.h
new file mode 100644
index 000000000..99bd69e11
--- /dev/null
+++ b/irr/src/COpenGLCommon.h
@@ -0,0 +1,51 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(IRR_PREFER_SDL_GL_HEADER)
+#include <SDL_video.h>
+#include <SDL_opengl.h>
+#else
+#include "vendor/gl.h"
+#endif
+
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT
+
+// To check if this header is in the current compile unit (different GL driver implementations use different "GLCommon" headers in Irrlicht)
+#define IRR_COMPILE_GL_COMMON
+
+// macro used with COpenGLDriver
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__LINE__)
+
+namespace irr
+{
+namespace video
+{
+
+// Forward declarations.
+
+class COpenGLCoreFeature;
+
+template <class TOpenGLDriver>
+class COpenGLCoreTexture;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreRenderTarget;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreCacheHandler;
+
+class COpenGLDriver;
+typedef COpenGLCoreTexture<COpenGLDriver> COpenGLTexture;
+typedef COpenGLCoreRenderTarget<COpenGLDriver, COpenGLTexture> COpenGLRenderTarget;
+class COpenGLCacheHandler;
+
+}
+}
+
+#endif
diff --git a/irr/src/COpenGLCoreCacheHandler.h b/irr/src/COpenGLCoreCacheHandler.h
new file mode 100644
index 000000000..ae3661313
--- /dev/null
+++ b/irr/src/COpenGLCoreCacheHandler.h
@@ -0,0 +1,595 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "SMaterial.h"
+#include "ITexture.h"
+
+#include "mt_opengl.h"
+
+namespace irr
+{
+namespace video
+{
+
+enum ESetTextureActive
+{
+	EST_ACTIVE_ALWAYS,   // texture unit always active after set call
+	EST_ACTIVE_ON_CHANGE // texture unit only active after call when texture changed in cache
+};
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreCacheHandler
+{
+	class STextureCache
+	{
+	public:
+		STextureCache(COpenGLCoreCacheHandler &cacheHandler, E_DRIVER_TYPE driverType, u32 textureCount) :
+				CacheHandler(cacheHandler), DriverType(driverType), TextureCount(textureCount)
+		{
+			for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+				Texture[i] = 0;
+			}
+		}
+
+		~STextureCache()
+		{
+			clear();
+		}
+
+		const TOpenGLTexture *operator[](int index) const
+		{
+			if (static_cast<u32>(index) < MATERIAL_MAX_TEXTURES)
+				return Texture[static_cast<u32>(index)];
+
+			return 0;
+		}
+
+		const TOpenGLTexture *get(u32 index) const
+		{
+			if (index < MATERIAL_MAX_TEXTURES)
+				return Texture[index];
+
+			return 0;
+		}
+
+		bool set(u32 index, const ITexture *texture, ESetTextureActive esa = EST_ACTIVE_ALWAYS)
+		{
+			bool status = false;
+
+			E_DRIVER_TYPE type = DriverType;
+
+			if (index < MATERIAL_MAX_TEXTURES && index < TextureCount) {
+				if (esa == EST_ACTIVE_ALWAYS)
+					CacheHandler.setActiveTexture(GL_TEXTURE0 + index);
+
+				const TOpenGLTexture *prevTexture = Texture[index];
+
+				if (texture != prevTexture) {
+					if (esa == EST_ACTIVE_ON_CHANGE)
+						CacheHandler.setActiveTexture(GL_TEXTURE0 + index);
+
+					if (texture) {
+						type = texture->getDriverType();
+
+						if (type == DriverType) {
+							texture->grab();
+
+							const TOpenGLTexture *curTexture = static_cast<const TOpenGLTexture *>(texture);
+							const GLenum curTextureType = curTexture->getOpenGLTextureType();
+							const GLenum prevTextureType = (prevTexture) ? prevTexture->getOpenGLTextureType() : curTextureType;
+
+							if (curTextureType != prevTextureType) {
+								GL.BindTexture(prevTextureType, 0);
+
+#if (defined(IRR_COMPILE_GL_COMMON) || defined(IRR_COMPILE_GLES_COMMON))
+								GL.Disable(prevTextureType);
+								GL.Enable(curTextureType);
+#endif
+							}
+#if (defined(IRR_COMPILE_GL_COMMON) || defined(IRR_COMPILE_GLES_COMMON))
+							else if (!prevTexture)
+								GL.Enable(curTextureType);
+#endif
+
+							GL.BindTexture(curTextureType, static_cast<const TOpenGLTexture *>(texture)->getOpenGLTextureName());
+						} else {
+							texture = 0;
+
+							os::Printer::log("Fatal Error: Tried to set a texture not owned by this driver.", ELL_ERROR);
+							os::Printer::log("Texture type", irr::core::stringc((int)type), ELL_ERROR);
+							os::Printer::log("Driver (or cache handler) type", irr::core::stringc((int)DriverType), ELL_ERROR);
+						}
+					}
+
+					if (!texture && prevTexture) {
+						const GLenum prevTextureType = prevTexture->getOpenGLTextureType();
+
+						GL.BindTexture(prevTextureType, 0);
+
+#if (defined(IRR_COMPILE_GL_COMMON) || defined(IRR_COMPILE_GLES_COMMON))
+						GL.Disable(prevTextureType);
+#endif
+					}
+
+					Texture[index] = static_cast<const TOpenGLTexture *>(texture);
+
+					if (prevTexture)
+						prevTexture->drop();
+				}
+
+				status = true;
+			}
+
+			return (status && type == DriverType);
+		}
+
+		void remove(ITexture *texture)
+		{
+			if (!texture)
+				return;
+
+			for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+				if (Texture[i] == texture) {
+					Texture[i] = 0;
+
+					texture->drop();
+				}
+			}
+		}
+
+		void clear()
+		{
+			for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+				if (Texture[i]) {
+					const TOpenGLTexture *prevTexture = Texture[i];
+
+					Texture[i] = 0;
+
+					prevTexture->drop();
+				}
+			}
+		}
+
+	private:
+		COpenGLCoreCacheHandler &CacheHandler;
+
+		E_DRIVER_TYPE DriverType;
+
+		const TOpenGLTexture *Texture[MATERIAL_MAX_TEXTURES];
+		u32 TextureCount;
+	};
+
+public:
+	COpenGLCoreCacheHandler(TOpenGLDriver *driver) :
+			Driver(driver),
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4355) // Warning: "'this' : used in base member initializer list. ". It's OK, we don't use the reference in STextureCache constructor.
+#endif
+			TextureCache(STextureCache(*this, driver->getDriverType(), driver->getFeature().MaxTextureUnits)),
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+			FrameBufferCount(0), BlendEquation(0), BlendSourceRGB(0),
+			BlendDestinationRGB(0), BlendSourceAlpha(0), BlendDestinationAlpha(0), Blend(0), BlendEquationInvalid(false), BlendFuncInvalid(false), BlendInvalid(false),
+			ColorMask(0), ColorMaskInvalid(false), CullFaceMode(GL_BACK), CullFace(false), DepthFunc(GL_LESS), DepthMask(true), DepthTest(false), FrameBufferID(0),
+			ProgramID(0), ActiveTexture(GL_TEXTURE0), ViewportX(0), ViewportY(0)
+	{
+		const COpenGLCoreFeature &feature = Driver->getFeature();
+
+		FrameBufferCount = core::max_(static_cast<GLuint>(1), static_cast<GLuint>(feature.MultipleRenderTarget));
+
+		BlendEquation = new GLenum[FrameBufferCount];
+		BlendSourceRGB = new GLenum[FrameBufferCount];
+		BlendDestinationRGB = new GLenum[FrameBufferCount];
+		BlendSourceAlpha = new GLenum[FrameBufferCount];
+		BlendDestinationAlpha = new GLenum[FrameBufferCount];
+		Blend = new bool[FrameBufferCount];
+		ColorMask = new u8[FrameBufferCount];
+
+		// Initial OpenGL values from specification.
+
+		if (feature.BlendOperation) {
+			Driver->irrGlBlendEquation(GL_FUNC_ADD);
+		}
+
+		for (u32 i = 0; i < FrameBufferCount; ++i) {
+			BlendEquation[i] = GL_FUNC_ADD;
+
+			BlendSourceRGB[i] = GL_ONE;
+			BlendDestinationRGB[i] = GL_ZERO;
+			BlendSourceAlpha[i] = GL_ONE;
+			BlendDestinationAlpha[i] = GL_ZERO;
+
+			Blend[i] = false;
+			ColorMask[i] = ECP_ALL;
+		}
+
+		GL.BlendFunc(GL_ONE, GL_ZERO);
+		GL.Disable(GL_BLEND);
+
+		GL.ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
+		GL.CullFace(CullFaceMode);
+		GL.Disable(GL_CULL_FACE);
+
+		GL.DepthFunc(DepthFunc);
+		GL.DepthMask(GL_TRUE);
+		GL.Disable(GL_DEPTH_TEST);
+
+		Driver->irrGlActiveTexture(ActiveTexture);
+
+#if (defined(IRR_COMPILE_GL_COMMON) || defined(IRR_COMPILE_GLES_COMMON))
+		GL.Disable(GL_TEXTURE_2D);
+#endif
+
+		const core::dimension2d<u32> ScreenSize = Driver->getScreenSize();
+		ViewportWidth = ScreenSize.Width;
+		ViewportHeight = ScreenSize.Height;
+		GL.Viewport(ViewportX, ViewportY, ViewportWidth, ViewportHeight);
+	}
+
+	virtual ~COpenGLCoreCacheHandler()
+	{
+		delete[] BlendEquation;
+		delete[] BlendSourceRGB;
+		delete[] BlendDestinationRGB;
+		delete[] BlendSourceAlpha;
+		delete[] BlendDestinationAlpha;
+		delete[] Blend;
+
+		delete[] ColorMask;
+	}
+
+	E_DRIVER_TYPE getDriverType() const
+	{
+		return Driver->getDriverType();
+	}
+
+	STextureCache &getTextureCache()
+	{
+		return TextureCache;
+	}
+
+	// Blending calls.
+
+	void setBlendEquation(GLenum mode)
+	{
+		if (BlendEquation[0] != mode || BlendEquationInvalid) {
+			Driver->irrGlBlendEquation(mode);
+
+			for (GLuint i = 0; i < FrameBufferCount; ++i)
+				BlendEquation[i] = mode;
+
+			BlendEquationInvalid = false;
+		}
+	}
+
+	void setBlendEquationIndexed(GLuint index, GLenum mode)
+	{
+		if (index < FrameBufferCount && BlendEquation[index] != mode) {
+			Driver->irrGlBlendEquationIndexed(index, mode);
+
+			BlendEquation[index] = mode;
+			BlendEquationInvalid = true;
+		}
+	}
+
+	void setBlendFunc(GLenum source, GLenum destination)
+	{
+		if (BlendSourceRGB[0] != source || BlendDestinationRGB[0] != destination ||
+				BlendSourceAlpha[0] != source || BlendDestinationAlpha[0] != destination ||
+				BlendFuncInvalid) {
+			GL.BlendFunc(source, destination);
+
+			for (GLuint i = 0; i < FrameBufferCount; ++i) {
+				BlendSourceRGB[i] = source;
+				BlendDestinationRGB[i] = destination;
+				BlendSourceAlpha[i] = source;
+				BlendDestinationAlpha[i] = destination;
+			}
+
+			BlendFuncInvalid = false;
+		}
+	}
+
+	void setBlendFuncSeparate(GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha)
+	{
+		if (sourceRGB != sourceAlpha || destinationRGB != destinationAlpha) {
+			if (BlendSourceRGB[0] != sourceRGB || BlendDestinationRGB[0] != destinationRGB ||
+					BlendSourceAlpha[0] != sourceAlpha || BlendDestinationAlpha[0] != destinationAlpha ||
+					BlendFuncInvalid) {
+				Driver->irrGlBlendFuncSeparate(sourceRGB, destinationRGB, sourceAlpha, destinationAlpha);
+
+				for (GLuint i = 0; i < FrameBufferCount; ++i) {
+					BlendSourceRGB[i] = sourceRGB;
+					BlendDestinationRGB[i] = destinationRGB;
+					BlendSourceAlpha[i] = sourceAlpha;
+					BlendDestinationAlpha[i] = destinationAlpha;
+				}
+
+				BlendFuncInvalid = false;
+			}
+		} else {
+			setBlendFunc(sourceRGB, destinationRGB);
+		}
+	}
+
+	void setBlendFuncIndexed(GLuint index, GLenum source, GLenum destination)
+	{
+		if (index < FrameBufferCount && (BlendSourceRGB[index] != source || BlendDestinationRGB[index] != destination ||
+												BlendSourceAlpha[index] != source || BlendDestinationAlpha[index] != destination)) {
+			Driver->irrGlBlendFuncIndexed(index, source, destination);
+
+			BlendSourceRGB[index] = source;
+			BlendDestinationRGB[index] = destination;
+			BlendSourceAlpha[index] = source;
+			BlendDestinationAlpha[index] = destination;
+			BlendFuncInvalid = true;
+		}
+	}
+
+	void setBlendFuncSeparateIndexed(GLuint index, GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha)
+	{
+		if (sourceRGB != sourceAlpha || destinationRGB != destinationAlpha) {
+			if (index < FrameBufferCount && (BlendSourceRGB[index] != sourceRGB || BlendDestinationRGB[index] != destinationRGB ||
+													BlendSourceAlpha[index] != sourceAlpha || BlendDestinationAlpha[index] != destinationAlpha)) {
+				Driver->irrGlBlendFuncSeparateIndexed(index, sourceRGB, destinationRGB, sourceAlpha, destinationAlpha);
+
+				BlendSourceRGB[index] = sourceRGB;
+				BlendDestinationRGB[index] = destinationRGB;
+				BlendSourceAlpha[index] = sourceAlpha;
+				BlendDestinationAlpha[index] = destinationAlpha;
+				BlendFuncInvalid = true;
+			}
+		} else {
+			setBlendFuncIndexed(index, sourceRGB, destinationRGB);
+		}
+	}
+
+	void setBlend(bool enable)
+	{
+		if (Blend[0] != enable || BlendInvalid) {
+			if (enable)
+				GL.Enable(GL_BLEND);
+			else
+				GL.Disable(GL_BLEND);
+
+			for (GLuint i = 0; i < FrameBufferCount; ++i)
+				Blend[i] = enable;
+
+			BlendInvalid = false;
+		}
+	}
+
+	void setBlendIndexed(GLuint index, bool enable)
+	{
+		if (index < FrameBufferCount && Blend[index] != enable) {
+			if (enable)
+				Driver->irrGlEnableIndexed(GL_BLEND, index);
+			else
+				Driver->irrGlDisableIndexed(GL_BLEND, index);
+
+			Blend[index] = enable;
+			BlendInvalid = true;
+		}
+	}
+
+	// Color Mask.
+
+	void getColorMask(u8 &mask)
+	{
+		mask = ColorMask[0];
+	}
+
+	void setColorMask(u8 mask)
+	{
+		if (ColorMask[0] != mask || ColorMaskInvalid) {
+			GL.ColorMask((mask & ECP_RED) ? GL_TRUE : GL_FALSE, (mask & ECP_GREEN) ? GL_TRUE : GL_FALSE, (mask & ECP_BLUE) ? GL_TRUE : GL_FALSE, (mask & ECP_ALPHA) ? GL_TRUE : GL_FALSE);
+
+			for (GLuint i = 0; i < FrameBufferCount; ++i)
+				ColorMask[i] = mask;
+
+			ColorMaskInvalid = false;
+		}
+	}
+
+	void setColorMaskIndexed(GLuint index, u8 mask)
+	{
+		if (index < FrameBufferCount && ColorMask[index] != mask) {
+			Driver->irrGlColorMaskIndexed(index, (mask & ECP_RED) ? GL_TRUE : GL_FALSE, (mask & ECP_GREEN) ? GL_TRUE : GL_FALSE, (mask & ECP_BLUE) ? GL_TRUE : GL_FALSE, (mask & ECP_ALPHA) ? GL_TRUE : GL_FALSE);
+
+			ColorMask[index] = mask;
+			ColorMaskInvalid = true;
+		}
+	}
+
+	// Cull face calls.
+
+	void setCullFaceFunc(GLenum mode)
+	{
+		if (CullFaceMode != mode) {
+			GL.CullFace(mode);
+			CullFaceMode = mode;
+		}
+	}
+
+	void setCullFace(bool enable)
+	{
+		if (CullFace != enable) {
+			if (enable)
+				GL.Enable(GL_CULL_FACE);
+			else
+				GL.Disable(GL_CULL_FACE);
+
+			CullFace = enable;
+		}
+	}
+
+	// Depth calls.
+
+	void setDepthFunc(GLenum mode)
+	{
+		if (DepthFunc != mode) {
+			GL.DepthFunc(mode);
+			DepthFunc = mode;
+		}
+	}
+
+	void getDepthMask(bool &depth)
+	{
+		depth = DepthMask;
+	}
+
+	void setDepthMask(bool enable)
+	{
+		if (DepthMask != enable) {
+			if (enable)
+				GL.DepthMask(GL_TRUE);
+			else
+				GL.DepthMask(GL_FALSE);
+
+			DepthMask = enable;
+		}
+	}
+
+	void getDepthTest(bool &enable)
+	{
+		enable = DepthTest;
+	}
+
+	void setDepthTest(bool enable)
+	{
+		if (DepthTest != enable) {
+			if (enable)
+				GL.Enable(GL_DEPTH_TEST);
+			else
+				GL.Disable(GL_DEPTH_TEST);
+
+			DepthTest = enable;
+		}
+	}
+
+	// FBO calls.
+
+	void getFBO(GLuint &frameBufferID) const
+	{
+		frameBufferID = FrameBufferID;
+	}
+
+	void setFBO(GLuint frameBufferID)
+	{
+		if (FrameBufferID != frameBufferID) {
+			Driver->irrGlBindFramebuffer(GL_FRAMEBUFFER, frameBufferID);
+			FrameBufferID = frameBufferID;
+		}
+	}
+
+	// Shaders calls.
+
+	void getProgram(GLuint &programID) const
+	{
+		programID = ProgramID;
+	}
+
+	void setProgram(GLuint programID)
+	{
+		if (ProgramID != programID) {
+			Driver->irrGlUseProgram(programID);
+			ProgramID = programID;
+		}
+	}
+
+	// Texture calls.
+
+	void getActiveTexture(GLenum &texture) const
+	{
+		texture = ActiveTexture;
+	}
+
+	void setActiveTexture(GLenum texture)
+	{
+		if (ActiveTexture != texture) {
+			Driver->irrGlActiveTexture(texture);
+			ActiveTexture = texture;
+		}
+	}
+
+	// Viewport calls.
+
+	void getViewport(GLint &viewportX, GLint &viewportY, GLsizei &viewportWidth, GLsizei &viewportHeight) const
+	{
+		viewportX = ViewportX;
+		viewportY = ViewportY;
+		viewportWidth = ViewportWidth;
+		viewportHeight = ViewportHeight;
+	}
+
+	void setViewport(GLint viewportX, GLint viewportY, GLsizei viewportWidth, GLsizei viewportHeight)
+	{
+		if (ViewportX != viewportX || ViewportY != viewportY || ViewportWidth != viewportWidth || ViewportHeight != viewportHeight) {
+			GL.Viewport(viewportX, viewportY, viewportWidth, viewportHeight);
+			ViewportX = viewportX;
+			ViewportY = viewportY;
+			ViewportWidth = viewportWidth;
+			ViewportHeight = viewportHeight;
+		}
+	}
+
+	//! Compare material to current cache and update it when there are differences
+	// Some material renderers do change the cache beyond the original material settings
+	// This corrects the material to represent the current cache state again.
+	void correctCacheMaterial(irr::video::SMaterial &material)
+	{
+		// Fix textures which got removed
+		for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i) {
+			if (material.TextureLayers[i].Texture && !TextureCache[i]) {
+				material.TextureLayers[i].Texture = 0;
+			}
+		}
+	}
+
+protected:
+	TOpenGLDriver *Driver;
+
+	STextureCache TextureCache;
+
+	GLuint FrameBufferCount;
+
+	GLenum *BlendEquation;
+	GLenum *BlendSourceRGB;
+	GLenum *BlendDestinationRGB;
+	GLenum *BlendSourceAlpha;
+	GLenum *BlendDestinationAlpha;
+	bool *Blend;
+	bool BlendEquationInvalid;
+	bool BlendFuncInvalid;
+	bool BlendInvalid;
+
+	u8 *ColorMask;
+	bool ColorMaskInvalid;
+
+	GLenum CullFaceMode;
+	bool CullFace;
+
+	GLenum DepthFunc;
+	bool DepthMask;
+	bool DepthTest;
+
+	GLuint FrameBufferID;
+
+	GLuint ProgramID;
+
+	GLenum ActiveTexture;
+
+	GLint ViewportX;
+	GLint ViewportY;
+	GLsizei ViewportWidth;
+	GLsizei ViewportHeight;
+};
+
+}
+}
diff --git a/irr/src/COpenGLCoreFeature.h b/irr/src/COpenGLCoreFeature.h
new file mode 100644
index 000000000..dc3d40e04
--- /dev/null
+++ b/irr/src/COpenGLCoreFeature.h
@@ -0,0 +1,34 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGLCoreFeature
+{
+public:
+	COpenGLCoreFeature() :
+			BlendOperation(false), ColorAttachment(0), MultipleRenderTarget(0), MaxTextureUnits(1)
+	{
+	}
+
+	virtual ~COpenGLCoreFeature()
+	{
+	}
+
+	bool BlendOperation;
+
+	u8 ColorAttachment;
+	u8 MultipleRenderTarget;
+	u8 MaxTextureUnits;
+};
+
+}
+}
diff --git a/irr/src/COpenGLCoreRenderTarget.h b/irr/src/COpenGLCoreRenderTarget.h
new file mode 100644
index 000000000..6bfc98cc0
--- /dev/null
+++ b/irr/src/COpenGLCoreRenderTarget.h
@@ -0,0 +1,347 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IRenderTarget.h"
+
+#ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT
+#endif
+
+#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT
+#endif
+
+namespace irr
+{
+namespace video
+{
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreRenderTarget : public IRenderTarget
+{
+public:
+	COpenGLCoreRenderTarget(TOpenGLDriver *driver) :
+			AssignedDepth(false), AssignedStencil(false), RequestTextureUpdate(false), RequestDepthStencilUpdate(false),
+			BufferID(0), ColorAttachment(0), MultipleRenderTarget(0), Driver(driver)
+	{
+#ifdef _DEBUG
+		setDebugName("COpenGLCoreRenderTarget");
+#endif
+
+		DriverType = Driver->getDriverType();
+
+		Size = Driver->getScreenSize();
+
+		ColorAttachment = Driver->getFeature().ColorAttachment;
+		MultipleRenderTarget = Driver->getFeature().MultipleRenderTarget;
+
+		if (ColorAttachment > 0)
+			Driver->irrGlGenFramebuffers(1, &BufferID);
+
+		AssignedTextures.set_used(static_cast<u32>(ColorAttachment));
+
+		for (u32 i = 0; i < AssignedTextures.size(); ++i)
+			AssignedTextures[i] = GL_NONE;
+	}
+
+	virtual ~COpenGLCoreRenderTarget()
+	{
+		if (ColorAttachment > 0 && BufferID != 0)
+			Driver->irrGlDeleteFramebuffers(1, &BufferID);
+
+		for (u32 i = 0; i < Textures.size(); ++i) {
+			if (Textures[i])
+				Textures[i]->drop();
+		}
+
+		if (DepthStencil)
+			DepthStencil->drop();
+	}
+
+	void setTextures(ITexture *const *textures, u32 numTextures, ITexture *depthStencil, const E_CUBE_SURFACE *cubeSurfaces, u32 numCubeSurfaces) override
+	{
+		bool needSizeUpdate = false;
+
+		// Set color attachments.
+		if (!Textures.equals(textures, numTextures) || !CubeSurfaces.equals(cubeSurfaces, numCubeSurfaces)) {
+			needSizeUpdate = true;
+
+			core::array<ITexture *> prevTextures(Textures);
+
+			if (numTextures > static_cast<u32>(ColorAttachment)) {
+				core::stringc message = "This GPU supports up to ";
+				message += static_cast<u32>(ColorAttachment);
+				message += " textures per render target.";
+
+				os::Printer::log(message.c_str(), ELL_WARNING);
+			}
+
+			Textures.set_used(core::min_(numTextures, static_cast<u32>(ColorAttachment)));
+
+			for (u32 i = 0; i < Textures.size(); ++i) {
+				TOpenGLTexture *currentTexture = (textures[i] && textures[i]->getDriverType() == DriverType) ? static_cast<TOpenGLTexture *>(textures[i]) : 0;
+
+				GLuint textureID = 0;
+
+				if (currentTexture) {
+					textureID = currentTexture->getOpenGLTextureName();
+				}
+
+				if (textureID != 0) {
+					Textures[i] = textures[i];
+					Textures[i]->grab();
+				} else {
+					Textures[i] = 0;
+				}
+			}
+
+			for (u32 i = 0; i < prevTextures.size(); ++i) {
+				if (prevTextures[i])
+					prevTextures[i]->drop();
+			}
+
+			RequestTextureUpdate = true;
+		}
+
+		if (!CubeSurfaces.equals(cubeSurfaces, numCubeSurfaces)) {
+			CubeSurfaces.set_data(cubeSurfaces, numCubeSurfaces);
+			RequestTextureUpdate = true;
+		}
+
+		// Set depth and stencil attachments.
+		if (DepthStencil != depthStencil) {
+			if (DepthStencil) {
+				DepthStencil->drop();
+				DepthStencil = 0;
+			}
+
+			needSizeUpdate = true;
+			TOpenGLTexture *currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<TOpenGLTexture *>(depthStencil) : 0;
+
+			if (currentTexture) {
+				if (currentTexture->getType() == ETT_2D) {
+					GLuint textureID = currentTexture->getOpenGLTextureName();
+
+					const ECOLOR_FORMAT textureFormat = (textureID != 0) ? depthStencil->getColorFormat() : ECF_UNKNOWN;
+					if (IImage::isDepthFormat(textureFormat)) {
+						DepthStencil = depthStencil;
+						DepthStencil->grab();
+					} else {
+						os::Printer::log("Ignoring depth/stencil texture without depth color format.", ELL_WARNING);
+					}
+				} else {
+					os::Printer::log("This driver doesn't support depth/stencil to cubemaps.", ELL_WARNING);
+				}
+			}
+
+			RequestDepthStencilUpdate = true;
+		}
+
+		if (needSizeUpdate) {
+			// Set size required for a viewport.
+
+			ITexture *firstTexture = getTexture();
+
+			if (firstTexture)
+				Size = firstTexture->getSize();
+			else {
+				if (DepthStencil)
+					Size = DepthStencil->getSize();
+				else
+					Size = Driver->getScreenSize();
+			}
+		}
+	}
+
+	void update()
+	{
+		if (RequestTextureUpdate || RequestDepthStencilUpdate) {
+			// Set color attachments.
+
+			if (RequestTextureUpdate) {
+				// Set new color textures.
+
+				const u32 textureSize = core::min_(Textures.size(), AssignedTextures.size());
+
+				for (u32 i = 0; i < textureSize; ++i) {
+					TOpenGLTexture *currentTexture = static_cast<TOpenGLTexture *>(Textures[i]);
+					GLuint textureID = currentTexture ? currentTexture->getOpenGLTextureName() : 0;
+
+					if (textureID != 0) {
+						AssignedTextures[i] = GL_COLOR_ATTACHMENT0 + i;
+						GLenum textarget = currentTexture->getType() == ETT_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_POSITIVE_X + (int)CubeSurfaces[i];
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, AssignedTextures[i], textarget, textureID, 0);
+						TEST_GL_ERROR(Driver);
+					} else if (AssignedTextures[i] != GL_NONE) {
+						AssignedTextures[i] = GL_NONE;
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, AssignedTextures[i], GL_TEXTURE_2D, 0, 0);
+
+						os::Printer::log("Error: Could not set render target.", ELL_ERROR);
+					}
+				}
+
+				// Reset other render target channels.
+
+				for (u32 i = textureSize; i < AssignedTextures.size(); ++i) {
+					if (AssignedTextures[i] != GL_NONE) {
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, AssignedTextures[i], GL_TEXTURE_2D, 0, 0);
+						AssignedTextures[i] = GL_NONE;
+					}
+				}
+
+				RequestTextureUpdate = false;
+			}
+
+			// Set depth and stencil attachments.
+
+			if (RequestDepthStencilUpdate) {
+				const ECOLOR_FORMAT textureFormat = (DepthStencil) ? DepthStencil->getColorFormat() : ECF_UNKNOWN;
+
+				if (IImage::isDepthFormat(textureFormat)) {
+					GLuint textureID = static_cast<TOpenGLTexture *>(DepthStencil)->getOpenGLTextureName();
+
+#ifdef _IRR_EMSCRIPTEN_PLATFORM_ // The WEBGL_depth_texture extension does not allow attaching stencil+depth separate.
+					if (textureFormat == ECF_D24S8) {
+						GLenum attachment = 0x821A; // GL_DEPTH_STENCIL_ATTACHMENT
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, textureID, 0);
+						AssignedStencil = true;
+					} else {
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, textureID, 0);
+						AssignedStencil = false;
+					}
+#else
+					Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, textureID, 0);
+
+					if (textureFormat == ECF_D24S8) {
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, textureID, 0);
+
+						AssignedStencil = true;
+					} else {
+						if (AssignedStencil)
+							Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+
+						AssignedStencil = false;
+					}
+#endif
+					AssignedDepth = true;
+				} else {
+					if (AssignedDepth)
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+
+					if (AssignedStencil)
+						Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+
+					AssignedDepth = false;
+					AssignedStencil = false;
+				}
+				TEST_GL_ERROR(Driver);
+
+				RequestDepthStencilUpdate = false;
+			}
+
+			// Configure drawing operation.
+
+			if (ColorAttachment > 0 && BufferID != 0) {
+				const u32 textureSize = Textures.size();
+
+				if (textureSize == 0)
+					Driver->irrGlDrawBuffer(GL_NONE);
+				else if (textureSize == 1 || MultipleRenderTarget == 0)
+					Driver->irrGlDrawBuffer(GL_COLOR_ATTACHMENT0);
+				else {
+					const u32 bufferCount = core::min_(MultipleRenderTarget, core::min_(textureSize, AssignedTextures.size()));
+
+					Driver->irrGlDrawBuffers(bufferCount, AssignedTextures.pointer());
+				}
+
+				TEST_GL_ERROR(Driver);
+			}
+
+#ifdef _DEBUG
+			checkFBO(Driver);
+#endif
+		}
+	}
+
+	GLuint getBufferID() const
+	{
+		return BufferID;
+	}
+
+	const core::dimension2d<u32> &getSize() const
+	{
+		return Size;
+	}
+
+	ITexture *getTexture() const
+	{
+		for (u32 i = 0; i < Textures.size(); ++i) {
+			if (Textures[i])
+				return Textures[i];
+		}
+
+		return 0;
+	}
+
+protected:
+	bool checkFBO(TOpenGLDriver *driver)
+	{
+		if (ColorAttachment == 0)
+			return true;
+
+		GLenum status = driver->irrGlCheckFramebufferStatus(GL_FRAMEBUFFER);
+
+		switch (status) {
+		case GL_FRAMEBUFFER_COMPLETE:
+			return true;
+		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+			os::Printer::log("FBO has invalid read buffer", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+			os::Printer::log("FBO has invalid draw buffer", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+			os::Printer::log("FBO has one or several incomplete image attachments", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
+			os::Printer::log("FBO has one or several image attachments with different internal formats", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+			os::Printer::log("FBO has one or several image attachments with different dimensions", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+			os::Printer::log("FBO missing an image attachment", ELL_ERROR);
+			break;
+		case GL_FRAMEBUFFER_UNSUPPORTED:
+			os::Printer::log("FBO format unsupported", ELL_ERROR);
+			break;
+		default:
+			os::Printer::log("FBO error", ELL_ERROR);
+			break;
+		}
+
+		return false;
+	}
+
+	core::array<GLenum> AssignedTextures;
+	bool AssignedDepth;
+	bool AssignedStencil;
+
+	bool RequestTextureUpdate;
+	bool RequestDepthStencilUpdate;
+
+	GLuint BufferID;
+
+	core::dimension2d<u32> Size;
+
+	u32 ColorAttachment;
+	u32 MultipleRenderTarget;
+
+	TOpenGLDriver *Driver;
+};
+
+}
+}
diff --git a/irr/src/COpenGLCoreTexture.h b/irr/src/COpenGLCoreTexture.h
new file mode 100644
index 000000000..79a855cc1
--- /dev/null
+++ b/irr/src/COpenGLCoreTexture.h
@@ -0,0 +1,633 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrArray.h"
+#include "SMaterialLayer.h"
+#include "ITexture.h"
+#include "EDriverFeatures.h"
+#include "os.h"
+#include "CImage.h"
+#include "CColorConverter.h"
+
+#include "mt_opengl.h"
+
+namespace irr
+{
+namespace video
+{
+
+template <class TOpenGLDriver>
+class COpenGLCoreTexture : public ITexture
+{
+public:
+	struct SStatesCache
+	{
+		SStatesCache() :
+				WrapU(ETC_REPEAT), WrapV(ETC_REPEAT), WrapW(ETC_REPEAT),
+				LODBias(0), AnisotropicFilter(0), MinFilter(video::ETMINF_NEAREST_MIPMAP_NEAREST),
+				MagFilter(video::ETMAGF_NEAREST), MipMapStatus(false), IsCached(false)
+		{
+		}
+
+		u8 WrapU;
+		u8 WrapV;
+		u8 WrapW;
+		s8 LODBias;
+		u8 AnisotropicFilter;
+		video::E_TEXTURE_MIN_FILTER MinFilter;
+		video::E_TEXTURE_MAG_FILTER MagFilter;
+		bool MipMapStatus;
+		bool IsCached;
+	};
+
+	COpenGLCoreTexture(const io::path &name, const core::array<IImage *> &images, E_TEXTURE_TYPE type, TOpenGLDriver *driver) :
+			ITexture(name, type), Driver(driver), TextureType(GL_TEXTURE_2D),
+			TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLayer(0),
+			KeepImage(false), MipLevelStored(0), LegacyAutoGenerateMipMaps(false)
+	{
+		_IRR_DEBUG_BREAK_IF(images.size() == 0)
+
+		DriverType = Driver->getDriverType();
+		TextureType = TextureTypeIrrToGL(Type);
+		HasMipMaps = Driver->getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+		KeepImage = Driver->getTextureCreationFlag(ETCF_ALLOW_MEMORY_COPY);
+
+		getImageValues(images[0]);
+		if (!InternalFormat)
+			return;
+
+#ifdef _DEBUG
+		char lbuf[128];
+		snprintf_irr(lbuf, sizeof(lbuf),
+			"COpenGLCoreTexture: Type = %d Size = %dx%d (%dx%d) ColorFormat = %d (%d)%s -> %#06x %#06x %#06x%s",
+			(int)Type, Size.Width, Size.Height, OriginalSize.Width, OriginalSize.Height,
+			(int)ColorFormat, (int)OriginalColorFormat,
+			HasMipMaps ? " +Mip" : "",
+			InternalFormat, PixelFormat, PixelType, Converter ? " (c)" : ""
+		);
+		os::Printer::log(lbuf, ELL_DEBUG);
+#endif
+
+		const core::array<IImage *> *tmpImages = &images;
+
+		if (KeepImage || OriginalSize != Size || OriginalColorFormat != ColorFormat) {
+			Images.set_used(images.size());
+
+			for (u32 i = 0; i < images.size(); ++i) {
+				Images[i] = Driver->createImage(ColorFormat, Size);
+
+				if (images[i]->getDimension() == Size)
+					images[i]->copyTo(Images[i]);
+				else
+					images[i]->copyToScaling(Images[i]);
+
+				if (images[i]->getMipMapsData()) {
+					if (OriginalSize == Size && OriginalColorFormat == ColorFormat) {
+						Images[i]->setMipMapsData(images[i]->getMipMapsData(), false);
+					} else {
+						// TODO: handle at least mipmap with changing color format
+						os::Printer::log("COpenGLCoreTexture: Can't handle format changes for mipmap data. Mipmap data dropped", ELL_WARNING);
+					}
+				}
+			}
+
+			tmpImages = &Images;
+		}
+
+		GL.GenTextures(1, &TextureName);
+
+		const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		Driver->getCacheHandler()->getTextureCache().set(0, this);
+
+		GL.TexParameteri(TextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		GL.TexParameteri(TextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+#ifdef GL_GENERATE_MIPMAP_HINT
+		if (HasMipMaps) {
+			if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))
+				GL.Hint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
+			else if (Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_QUALITY))
+				GL.Hint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
+			else
+				GL.Hint(GL_GENERATE_MIPMAP_HINT, GL_DONT_CARE);
+		}
+#endif
+
+		TEST_GL_ERROR(Driver);
+
+		for (u32 i = 0; i < (*tmpImages).size(); ++i)
+			uploadTexture(true, i, 0, (*tmpImages)[i]->getData());
+
+		if (HasMipMaps && !LegacyAutoGenerateMipMaps) {
+			// Create mipmaps (either from image mipmaps or generate them)
+			for (u32 i = 0; i < (*tmpImages).size(); ++i) {
+				void *mipmapsData = (*tmpImages)[i]->getMipMapsData();
+				regenerateMipMapLevels(mipmapsData, i);
+			}
+		}
+
+		if (!KeepImage) {
+			for (u32 i = 0; i < Images.size(); ++i)
+				Images[i]->drop();
+
+			Images.clear();
+		}
+
+		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+
+		TEST_GL_ERROR(Driver);
+	}
+
+	COpenGLCoreTexture(const io::path &name, const core::dimension2d<u32> &size, E_TEXTURE_TYPE type, ECOLOR_FORMAT format, TOpenGLDriver *driver) :
+			ITexture(name, type),
+			Driver(driver), TextureType(GL_TEXTURE_2D),
+			TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLayer(0), KeepImage(false),
+			MipLevelStored(0), LegacyAutoGenerateMipMaps(false)
+	{
+		DriverType = Driver->getDriverType();
+		TextureType = TextureTypeIrrToGL(Type);
+		HasMipMaps = false;
+		IsRenderTarget = true;
+
+		OriginalColorFormat = format;
+
+		if (ECF_UNKNOWN == OriginalColorFormat)
+			ColorFormat = getBestColorFormat(Driver->getColorFormat());
+		else
+			ColorFormat = OriginalColorFormat;
+
+		OriginalSize = size;
+		Size = OriginalSize;
+
+		Pitch = Size.Width * IImage::getBitsPerPixelFromFormat(ColorFormat) / 8;
+
+		if (!Driver->getColorFormatParameters(ColorFormat, InternalFormat, PixelFormat, PixelType, &Converter)) {
+			os::Printer::log("COpenGLCoreTexture: Color format is not supported", ColorFormatNames[ColorFormat < ECF_UNKNOWN ? ColorFormat : ECF_UNKNOWN], ELL_ERROR);
+			return;
+		}
+
+#ifdef _DEBUG
+		char lbuf[100];
+		snprintf_irr(lbuf, sizeof(lbuf),
+			"COpenGLCoreTexture: RTT Type = %d Size = %dx%d ColorFormat = %d -> %#06x %#06x %#06x%s",
+			(int)Type, Size.Width, Size.Height, (int)ColorFormat,
+			InternalFormat, PixelFormat, PixelType, Converter ? " (c)" : ""
+		);
+		os::Printer::log(lbuf, ELL_DEBUG);
+#endif
+
+		GL.GenTextures(1, &TextureName);
+
+		const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		Driver->getCacheHandler()->getTextureCache().set(0, this);
+
+		GL.TexParameteri(TextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		GL.TexParameteri(TextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		GL.TexParameteri(TextureType, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		GL.TexParameteri(TextureType, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+#if defined(GL_VERSION_1_2)
+		GL.TexParameteri(TextureType, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+#endif
+
+		StatesCache.WrapU = ETC_CLAMP_TO_EDGE;
+		StatesCache.WrapV = ETC_CLAMP_TO_EDGE;
+		StatesCache.WrapW = ETC_CLAMP_TO_EDGE;
+
+		switch (Type) {
+		case ETT_2D:
+			GL.TexImage2D(GL_TEXTURE_2D, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			break;
+		case ETT_CUBEMAP:
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			GL.TexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, InternalFormat, Size.Width, Size.Height, 0, PixelFormat, PixelType, 0);
+			break;
+		}
+
+		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+		if (TEST_GL_ERROR(Driver)) {
+			char msg[256];
+			snprintf_irr(msg, 256, "COpenGLCoreTexture: InternalFormat:0x%04x PixelFormat:0x%04x", (int)InternalFormat, (int)PixelFormat);
+			os::Printer::log(msg, ELL_ERROR);
+		}
+	}
+
+	virtual ~COpenGLCoreTexture()
+	{
+		if (TextureName)
+			GL.DeleteTextures(1, &TextureName);
+
+		if (LockImage)
+			LockImage->drop();
+
+		for (u32 i = 0; i < Images.size(); ++i)
+			Images[i]->drop();
+	}
+
+	void *lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel = 0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) override
+	{
+		if (LockImage)
+			return getLockImageData(MipLevelStored);
+
+		if (IImage::isCompressedFormat(ColorFormat))
+			return 0;
+
+		LockReadOnly |= (mode == ETLM_READ_ONLY);
+		LockLayer = layer;
+		MipLevelStored = mipmapLevel;
+
+		if (KeepImage) {
+			_IRR_DEBUG_BREAK_IF(LockLayer > Images.size())
+
+			if (mipmapLevel == 0 || (Images[LockLayer] && Images[LockLayer]->getMipMapsData(mipmapLevel))) {
+				LockImage = Images[LockLayer];
+				LockImage->grab();
+			}
+		}
+
+		if (!LockImage) {
+			core::dimension2d<u32> lockImageSize(IImage::getMipMapsSize(Size, MipLevelStored));
+
+			// note: we save mipmap data also in the image because IImage doesn't allow saving single mipmap levels to the mipmap data
+			LockImage = Driver->createImage(ColorFormat, lockImageSize);
+
+			if (LockImage && mode != ETLM_WRITE_ONLY) {
+				bool passed = true;
+
+#ifdef IRR_COMPILE_GL_COMMON
+				IImage *tmpImage = LockImage; // not sure yet if the size required by glGetTexImage is always correct, if not we might have to allocate a different tmpImage and convert colors later on.
+
+				Driver->getCacheHandler()->getTextureCache().set(0, this);
+				TEST_GL_ERROR(Driver);
+
+				GLenum tmpTextureType = TextureType;
+
+				if (tmpTextureType == GL_TEXTURE_CUBE_MAP) {
+					_IRR_DEBUG_BREAK_IF(layer > 5)
+
+					tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
+				}
+
+				GL.GetTexImage(tmpTextureType, MipLevelStored, PixelFormat, PixelType, tmpImage->getData());
+				TEST_GL_ERROR(Driver);
+
+				if (IsRenderTarget && lockFlags == ETLF_FLIP_Y_UP_RTT) {
+					const s32 pitch = tmpImage->getPitch();
+
+					u8 *srcA = static_cast<u8 *>(tmpImage->getData());
+					u8 *srcB = srcA + (tmpImage->getDimension().Height - 1) * pitch;
+
+					u8 *tmpBuffer = new u8[pitch];
+
+					for (u32 i = 0; i < tmpImage->getDimension().Height; i += 2) {
+						memcpy(tmpBuffer, srcA, pitch);
+						memcpy(srcA, srcB, pitch);
+						memcpy(srcB, tmpBuffer, pitch);
+						srcA += pitch;
+						srcB -= pitch;
+					}
+
+					delete[] tmpBuffer;
+				}
+#elif (defined(IRR_COMPILE_GLES2_COMMON) || defined(IRR_COMPILE_GLES_COMMON))
+				// TODO: on ES2 we can likely also work with glCopyTexImage2D instead of rendering which should be faster.
+				COpenGLCoreTexture *tmpTexture = new COpenGLCoreTexture("OGL_CORE_LOCK_TEXTURE", Size, ETT_2D, ColorFormat, Driver);
+
+				GLuint tmpFBO = 0;
+				Driver->irrGlGenFramebuffers(1, &tmpFBO);
+
+				GLint prevViewportX = 0;
+				GLint prevViewportY = 0;
+				GLsizei prevViewportWidth = 0;
+				GLsizei prevViewportHeight = 0;
+				Driver->getCacheHandler()->getViewport(prevViewportX, prevViewportY, prevViewportWidth, prevViewportHeight);
+				Driver->getCacheHandler()->setViewport(0, 0, Size.Width, Size.Height);
+
+				GLuint prevFBO = 0;
+				Driver->getCacheHandler()->getFBO(prevFBO);
+				Driver->getCacheHandler()->setFBO(tmpFBO);
+
+				Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tmpTexture->getOpenGLTextureName(), 0);
+
+				GL.Clear(GL_COLOR_BUFFER_BIT);
+
+				Driver->draw2DImage(this, layer, true);
+
+				IImage *tmpImage = Driver->createImage(ECF_A8R8G8B8, Size);
+				GL.ReadPixels(0, 0, Size.Width, Size.Height, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->getData());
+
+				Driver->getCacheHandler()->setFBO(prevFBO);
+				Driver->getCacheHandler()->setViewport(prevViewportX, prevViewportY, prevViewportWidth, prevViewportHeight);
+
+				Driver->irrGlDeleteFramebuffers(1, &tmpFBO);
+				delete tmpTexture;
+
+				void *src = tmpImage->getData();
+				void *dest = LockImage->getData();
+
+				switch (ColorFormat) {
+				case ECF_A1R5G5B5:
+					CColorConverter::convert_A8R8G8B8toA1B5G5R5(src, tmpImage->getDimension().getArea(), dest);
+					break;
+				case ECF_R5G6B5:
+					CColorConverter::convert_A8R8G8B8toR5G6B5(src, tmpImage->getDimension().getArea(), dest);
+					break;
+				case ECF_R8G8B8:
+					CColorConverter::convert_A8R8G8B8toB8G8R8(src, tmpImage->getDimension().getArea(), dest);
+					break;
+				case ECF_A8R8G8B8:
+					CColorConverter::convert_A8R8G8B8toA8B8G8R8(src, tmpImage->getDimension().getArea(), dest);
+					break;
+				default:
+					passed = false;
+					break;
+				}
+				tmpImage->drop();
+#endif
+
+				if (!passed) {
+					LockImage->drop();
+					LockImage = 0;
+				}
+			}
+
+			TEST_GL_ERROR(Driver);
+		}
+
+		return (LockImage) ? getLockImageData(MipLevelStored) : 0;
+	}
+
+	void unlock() override
+	{
+		if (!LockImage)
+			return;
+
+		if (!LockReadOnly) {
+			const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+			Driver->getCacheHandler()->getTextureCache().set(0, this);
+
+			uploadTexture(false, LockLayer, MipLevelStored, getLockImageData(MipLevelStored));
+
+			Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+		}
+
+		LockImage->drop();
+
+		LockReadOnly = false;
+		LockImage = 0;
+		LockLayer = 0;
+	}
+
+	void regenerateMipMapLevels(void *data = 0, u32 layer = 0) override
+	{
+		if (!HasMipMaps || LegacyAutoGenerateMipMaps || (Size.Width <= 1 && Size.Height <= 1))
+			return;
+
+		const COpenGLCoreTexture *prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		Driver->getCacheHandler()->getTextureCache().set(0, this);
+
+		if (data) {
+			u32 width = Size.Width;
+			u32 height = Size.Height;
+			u8 *tmpData = static_cast<u8 *>(data);
+			u32 dataSize = 0;
+			u32 level = 0;
+
+			do {
+				if (width > 1)
+					width >>= 1;
+
+				if (height > 1)
+					height >>= 1;
+
+				dataSize = IImage::getDataSizeFromFormat(ColorFormat, width, height);
+				++level;
+
+				uploadTexture(true, layer, level, tmpData);
+
+				tmpData += dataSize;
+			} while (width != 1 || height != 1);
+		} else {
+			Driver->irrGlGenerateMipmap(TextureType);
+			TEST_GL_ERROR(Driver);
+		}
+
+		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+	}
+
+	GLenum getOpenGLTextureType() const
+	{
+		return TextureType;
+	}
+
+	GLuint getOpenGLTextureName() const
+	{
+		return TextureName;
+	}
+
+	SStatesCache &getStatesCache() const
+	{
+		return StatesCache;
+	}
+
+protected:
+	void *getLockImageData(irr::u32 miplevel) const
+	{
+		if (KeepImage && MipLevelStored > 0 && LockImage->getMipMapsData(MipLevelStored)) {
+			return LockImage->getMipMapsData(MipLevelStored);
+		}
+		return LockImage->getData();
+	}
+
+	ECOLOR_FORMAT getBestColorFormat(ECOLOR_FORMAT format)
+	{
+		// We only try for to adapt "simple" formats
+		ECOLOR_FORMAT destFormat = (format <= ECF_A8R8G8B8) ? ECF_A8R8G8B8 : format;
+
+		switch (format) {
+		case ECF_A1R5G5B5:
+			if (!Driver->getTextureCreationFlag(ETCF_ALWAYS_32_BIT))
+				destFormat = ECF_A1R5G5B5;
+			break;
+		case ECF_R5G6B5:
+			if (!Driver->getTextureCreationFlag(ETCF_ALWAYS_32_BIT))
+				destFormat = ECF_R5G6B5;
+			break;
+		case ECF_A8R8G8B8:
+			if (Driver->getTextureCreationFlag(ETCF_ALWAYS_16_BIT) ||
+					Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))
+				destFormat = ECF_A1R5G5B5;
+			break;
+		case ECF_R8G8B8:
+			// Note: Using ECF_A8R8G8B8 even when ETCF_ALWAYS_32_BIT is not set as 24 bit textures fail with too many cards
+			if (Driver->getTextureCreationFlag(ETCF_ALWAYS_16_BIT) || Driver->getTextureCreationFlag(ETCF_OPTIMIZED_FOR_SPEED))
+				destFormat = ECF_A1R5G5B5;
+		default:
+			break;
+		}
+
+		if (Driver->getTextureCreationFlag(ETCF_NO_ALPHA_CHANNEL)) {
+			switch (destFormat) {
+			case ECF_A1R5G5B5:
+				destFormat = ECF_R5G6B5;
+				break;
+			case ECF_A8R8G8B8:
+				destFormat = ECF_R8G8B8;
+				break;
+			default:
+				break;
+			}
+		}
+
+		return destFormat;
+	}
+
+	void getImageValues(const IImage *image)
+	{
+		OriginalColorFormat = image->getColorFormat();
+		ColorFormat = getBestColorFormat(OriginalColorFormat);
+
+		if (!Driver->getColorFormatParameters(ColorFormat, InternalFormat, PixelFormat, PixelType, &Converter)) {
+			os::Printer::log("getImageValues: Color format is not supported", ColorFormatNames[ColorFormat < ECF_UNKNOWN ? ColorFormat : ECF_UNKNOWN], ELL_ERROR);
+			InternalFormat = 0;
+			return;
+		}
+
+		if (IImage::isCompressedFormat(image->getColorFormat())) {
+			KeepImage = false;
+		}
+
+		OriginalSize = image->getDimension();
+		Size = OriginalSize;
+
+		if (Size.Width == 0 || Size.Height == 0) {
+			os::Printer::log("Invalid size of image for texture.", ELL_ERROR);
+			return;
+		}
+
+		const f32 ratio = (f32)Size.Width / (f32)Size.Height;
+
+		if ((Size.Width > Driver->MaxTextureSize) && (ratio >= 1.f)) {
+			Size.Width = Driver->MaxTextureSize;
+			Size.Height = (u32)(Driver->MaxTextureSize / ratio);
+		} else if (Size.Height > Driver->MaxTextureSize) {
+			Size.Height = Driver->MaxTextureSize;
+			Size.Width = (u32)(Driver->MaxTextureSize * ratio);
+		}
+
+		bool needSquare = (!Driver->queryFeature(EVDF_TEXTURE_NSQUARE) || Type == ETT_CUBEMAP);
+
+		Size = Size.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT), needSquare, true, Driver->MaxTextureSize);
+
+		Pitch = Size.Width * IImage::getBitsPerPixelFromFormat(ColorFormat) / 8;
+	}
+
+	void uploadTexture(bool initTexture, u32 layer, u32 level, void *data)
+	{
+		if (!data)
+			return;
+
+		u32 width = Size.Width >> level;
+		u32 height = Size.Height >> level;
+		if (width < 1)
+			width = 1;
+		if (height < 1)
+			height = 1;
+
+		GLenum tmpTextureType = TextureType;
+
+		if (tmpTextureType == GL_TEXTURE_CUBE_MAP) {
+			_IRR_DEBUG_BREAK_IF(layer > 5)
+
+			tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
+		}
+
+		if (!IImage::isCompressedFormat(ColorFormat)) {
+			CImage *tmpImage = 0;
+			void *tmpData = data;
+
+			if (Converter) {
+				const core::dimension2d<u32> tmpImageSize(width, height);
+
+				tmpImage = new CImage(ColorFormat, tmpImageSize);
+				tmpData = tmpImage->getData();
+
+				Converter(data, tmpImageSize.getArea(), tmpData);
+			}
+
+			switch (TextureType) {
+			case GL_TEXTURE_2D:
+			case GL_TEXTURE_CUBE_MAP:
+				if (initTexture)
+					GL.TexImage2D(tmpTextureType, level, InternalFormat, width, height, 0, PixelFormat, PixelType, tmpData);
+				else
+					GL.TexSubImage2D(tmpTextureType, level, 0, 0, width, height, PixelFormat, PixelType, tmpData);
+				TEST_GL_ERROR(Driver);
+				break;
+			default:
+				break;
+			}
+
+			delete tmpImage;
+		} else {
+			u32 dataSize = IImage::getDataSizeFromFormat(ColorFormat, width, height);
+
+			switch (TextureType) {
+			case GL_TEXTURE_2D:
+			case GL_TEXTURE_CUBE_MAP:
+				if (initTexture)
+					Driver->irrGlCompressedTexImage2D(tmpTextureType, level, InternalFormat, width, height, 0, dataSize, data);
+				else
+					Driver->irrGlCompressedTexSubImage2D(tmpTextureType, level, 0, 0, width, height, PixelFormat, dataSize, data);
+				TEST_GL_ERROR(Driver);
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	GLenum TextureTypeIrrToGL(E_TEXTURE_TYPE type) const
+	{
+		switch (type) {
+		case ETT_2D:
+			return GL_TEXTURE_2D;
+		case ETT_CUBEMAP:
+			return GL_TEXTURE_CUBE_MAP;
+		}
+
+		os::Printer::log("COpenGLCoreTexture::TextureTypeIrrToGL unknown texture type", ELL_WARNING);
+		return GL_TEXTURE_2D;
+	}
+
+	TOpenGLDriver *Driver;
+
+	GLenum TextureType;
+	GLuint TextureName;
+	GLint InternalFormat;
+	GLenum PixelFormat;
+	GLenum PixelType;
+	void (*Converter)(const void *, s32, void *);
+
+	bool LockReadOnly;
+	IImage *LockImage;
+	u32 LockLayer;
+
+	bool KeepImage;
+	core::array<IImage *> Images;
+
+	u8 MipLevelStored;
+	bool LegacyAutoGenerateMipMaps;
+
+	mutable SStatesCache StatesCache;
+};
+
+}
+}
diff --git a/irr/src/COpenGLDriver.cpp b/irr/src/COpenGLDriver.cpp
new file mode 100644
index 000000000..1ad66aef9
--- /dev/null
+++ b/irr/src/COpenGLDriver.cpp
@@ -0,0 +1,3412 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "COpenGLDriver.h"
+#include <cassert>
+#include "CNullDriver.h"
+#include "IContextManager.h"
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "os.h"
+
+#include "COpenGLCacheHandler.h"
+#include "COpenGLMaterialRenderer.h"
+#include "COpenGLSLMaterialRenderer.h"
+
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreRenderTarget.h"
+
+#include "mt_opengl.h"
+
+namespace irr
+{
+namespace video
+{
+
+// Statics variables
+const u16 COpenGLDriver::Quad2DIndices[4] = {0, 1, 2, 3};
+
+COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager) :
+		CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE), ResetRenderStates(true),
+		Transformation3DChanged(true), AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE), Params(params),
+		ContextManager(contextManager)
+{
+#ifdef _DEBUG
+	setDebugName("COpenGLDriver");
+#endif
+}
+
+bool COpenGLDriver::initDriver()
+{
+	ContextManager->generateSurface();
+	ContextManager->generateContext();
+	ExposedData = ContextManager->getContext();
+	ContextManager->activateContext(ExposedData, false);
+	GL.LoadAllProcedures(ContextManager);
+
+	genericDriverInit();
+
+#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+	extGlSwapInterval(Params.Vsync ? 1 : 0);
+#endif
+
+	return true;
+}
+
+//! destructor
+COpenGLDriver::~COpenGLDriver()
+{
+	deleteMaterialRenders();
+
+	CacheHandler->getTextureCache().clear();
+	// I get a blue screen on my laptop, when I do not delete the
+	// textures manually before releasing the dc. Oh how I love this.
+	removeAllRenderTargets();
+	deleteAllTextures();
+	removeAllOcclusionQueries();
+	removeAllHardwareBuffers();
+
+	delete CacheHandler;
+
+	if (ContextManager) {
+		ContextManager->destroyContext();
+		ContextManager->destroySurface();
+		ContextManager->terminate();
+		ContextManager->drop();
+	}
+}
+
+// -----------------------------------------------------------------------
+// METHODS
+// -----------------------------------------------------------------------
+
+bool COpenGLDriver::genericDriverInit()
+{
+	if (ContextManager)
+		ContextManager->grab();
+
+	Name = "OpenGL ";
+	Name.append(glGetString(GL_VERSION));
+	s32 pos = Name.findNext(' ', 7);
+	if (pos != -1)
+		Name = Name.subString(0, pos);
+	printVersion();
+
+	// print renderer information
+	const GLubyte *renderer = glGetString(GL_RENDERER);
+	const GLubyte *vendor = glGetString(GL_VENDOR);
+	if (renderer && vendor) {
+		os::Printer::log(reinterpret_cast<const c8 *>(renderer), reinterpret_cast<const c8 *>(vendor), ELL_INFORMATION);
+		VendorName = reinterpret_cast<const c8 *>(vendor);
+	}
+
+	u32 i;
+
+	// load extensions
+	initExtensions(ContextManager, Params.Stencilbuffer);
+
+	// reset cache handler
+	delete CacheHandler;
+	CacheHandler = new COpenGLCacheHandler(this);
+
+	if (queryFeature(EVDF_ARB_GLSL)) {
+		char buf[32];
+		const u32 maj = ShaderLanguageVersion / 100;
+		snprintf_irr(buf, 32, "%u.%u", maj, ShaderLanguageVersion - maj * 100);
+		os::Printer::log("GLSL version", buf, ELL_INFORMATION);
+	} else
+		os::Printer::log("GLSL not available.", ELL_INFORMATION);
+	DriverAttributes->setAttribute("MaxTextures", (s32)Feature.MaxTextureUnits);
+	DriverAttributes->setAttribute("MaxSupportedTextures", (s32)Feature.MaxTextureUnits);
+	DriverAttributes->setAttribute("MaxLights", MaxLights);
+	DriverAttributes->setAttribute("MaxAnisotropy", MaxAnisotropy);
+	DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes);
+	DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers);
+	DriverAttributes->setAttribute("MaxMultipleRenderTargets", (s32)Feature.MultipleRenderTarget);
+	DriverAttributes->setAttribute("MaxIndices", (s32)MaxIndices);
+	DriverAttributes->setAttribute("MaxTextureSize", (s32)MaxTextureSize);
+	DriverAttributes->setAttribute("MaxGeometryVerticesOut", (s32)MaxGeometryVerticesOut);
+	DriverAttributes->setAttribute("MaxTextureLODBias", MaxTextureLODBias);
+	DriverAttributes->setAttribute("Version", Version);
+	DriverAttributes->setAttribute("ShaderLanguageVersion", ShaderLanguageVersion);
+	DriverAttributes->setAttribute("AntiAlias", AntiAlias);
+
+	glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+	UserClipPlanes.reallocate(MaxUserClipPlanes);
+	for (i = 0; i < MaxUserClipPlanes; ++i)
+		UserClipPlanes.push_back(SUserClipPlane());
+
+	for (i = 0; i < ETS_COUNT; ++i)
+		setTransform(static_cast<E_TRANSFORMATION_STATE>(i), core::IdentityMatrix);
+
+	setAmbientLight(SColorf(0.0f, 0.0f, 0.0f, 0.0f));
+#ifdef GL_EXT_separate_specular_color
+	if (FeatureAvailable[IRR_EXT_separate_specular_color])
+		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+#endif
+	glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
+
+	// This is a fast replacement for NORMALIZE_NORMALS
+	//	if ((Version>101) || FeatureAvailable[IRR_EXT_rescale_normal])
+	//		glEnable(GL_RESCALE_NORMAL_EXT);
+
+	glClearDepth(1.0);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+	glFrontFace(GL_CW);
+	// adjust flat coloring scheme to DirectX version
+#if defined(GL_ARB_provoking_vertex) || defined(GL_EXT_provoking_vertex)
+	extGlProvokingVertex(GL_FIRST_VERTEX_CONVENTION_EXT);
+#endif
+
+	// Create built-in 2D quad for 2D rendering (both quads and lines).
+	Quad2DVertices[0] = S3DVertex(core::vector3df(-1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255, 255, 255, 255), core::vector2df(0.0f, 1.0f));
+	Quad2DVertices[1] = S3DVertex(core::vector3df(1.0f, 1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255, 255, 255, 255), core::vector2df(1.0f, 1.0f));
+	Quad2DVertices[2] = S3DVertex(core::vector3df(1.0f, -1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255, 255, 255, 255), core::vector2df(1.0f, 0.0f));
+	Quad2DVertices[3] = S3DVertex(core::vector3df(-1.0f, -1.0f, 0.0f), core::vector3df(0.0f, 0.0f, 0.0f), SColor(255, 255, 255, 255), core::vector2df(0.0f, 0.0f));
+
+	// create material renderers
+	createMaterialRenderers();
+
+	// set the renderstates
+	setRenderStates3DMode();
+
+	// set fog mode
+	setFog(FogColor, FogType, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
+
+	// create matrix for flipping textures
+	TextureFlipMatrix.buildTextureTransform(0.0f, core::vector2df(0, 0), core::vector2df(0, 1.0f), core::vector2df(1.0f, -1.0f));
+
+	// We need to reset once more at the beginning of the first rendering.
+	// This fixes problems with intermediate changes to the material during texture load.
+	ResetRenderStates = true;
+
+	return true;
+}
+
+void COpenGLDriver::createMaterialRenderers()
+{
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_SOLID(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(this));
+	addAndDropMaterialRenderer(new COpenGLMaterialRenderer_ONETEXTURE_BLEND(this));
+}
+
+bool COpenGLDriver::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil, const SExposedVideoData &videoData, core::rect<s32> *sourceRect)
+{
+	CNullDriver::beginScene(clearFlag, clearColor, clearDepth, clearStencil, videoData, sourceRect);
+
+	if (ContextManager)
+		ContextManager->activateContext(videoData, true);
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+bool COpenGLDriver::endScene()
+{
+	CNullDriver::endScene();
+
+	glFlush();
+
+	bool status = false;
+
+	if (ContextManager)
+		status = ContextManager->swapBuffers();
+
+	// todo: console device present
+
+	return status;
+}
+
+//! Returns the transformation set by setTransform
+const core::matrix4 &COpenGLDriver::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return Matrices[state];
+}
+
+//! sets transformation
+void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat)
+{
+	Matrices[state] = mat;
+	Transformation3DChanged = true;
+
+	switch (state) {
+	case ETS_VIEW:
+	case ETS_WORLD: {
+		// OpenGL only has a model matrix, view and world is not existent. so lets fake these two.
+		CacheHandler->setMatrixMode(GL_MODELVIEW);
+
+		// first load the viewing transformation for user clip planes
+		glLoadMatrixf((Matrices[ETS_VIEW]).pointer());
+
+		// we have to update the clip planes to the latest view matrix
+		for (u32 i = 0; i < MaxUserClipPlanes; ++i)
+			if (UserClipPlanes[i].Enabled)
+				uploadClipPlane(i);
+
+		// now the real model-view matrix
+		glMultMatrixf(Matrices[ETS_WORLD].pointer());
+	} break;
+	case ETS_PROJECTION: {
+		CacheHandler->setMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(mat.pointer());
+	} break;
+	default:
+		break;
+	}
+}
+
+bool COpenGLDriver::updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (!FeatureAvailable[IRR_ARB_vertex_buffer_object])
+		return false;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const u32 vertexCount = mb->getVertexCount();
+	const E_VERTEX_TYPE vType = mb->getVertexType();
+	const u32 vertexSize = getVertexPitchFromType(vType);
+
+	const c8 *vbuf = static_cast<const c8 *>(vertices);
+	core::array<c8> buffer;
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra]) {
+		// buffer vertex data, and convert colors...
+		buffer.set_used(vertexSize * vertexCount);
+		memcpy(buffer.pointer(), vertices, vertexSize * vertexCount);
+		vbuf = buffer.const_pointer();
+
+		// in order to convert the colors into opengl format (RGBA)
+		switch (vType) {
+		case EVT_STANDARD: {
+			S3DVertex *pb = reinterpret_cast<S3DVertex *>(buffer.pointer());
+			const S3DVertex *po = static_cast<const S3DVertex *>(vertices);
+			for (u32 i = 0; i < vertexCount; i++) {
+				po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color));
+			}
+		} break;
+		case EVT_2TCOORDS: {
+			S3DVertex2TCoords *pb = reinterpret_cast<S3DVertex2TCoords *>(buffer.pointer());
+			const S3DVertex2TCoords *po = static_cast<const S3DVertex2TCoords *>(vertices);
+			for (u32 i = 0; i < vertexCount; i++) {
+				po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color));
+			}
+		} break;
+		case EVT_TANGENTS: {
+			S3DVertexTangents *pb = reinterpret_cast<S3DVertexTangents *>(buffer.pointer());
+			const S3DVertexTangents *po = static_cast<const S3DVertexTangents *>(vertices);
+			for (u32 i = 0; i < vertexCount; i++) {
+				po[i].Color.toOpenGLColor((u8 *)&(pb[i].Color));
+			}
+		} break;
+		default: {
+			return false;
+		}
+		}
+	}
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_verticesID) {
+		extGlGenBuffers(1, &HWBuffer->vbo_verticesID);
+		if (!HWBuffer->vbo_verticesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_verticesSize < vertexCount * vertexSize) {
+		newBuffer = true;
+	}
+
+	extGlBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		extGlBufferSubData(GL_ARRAY_BUFFER, 0, vertexCount * vertexSize, vbuf);
+	else {
+		HWBuffer->vbo_verticesSize = vertexCount * vertexSize;
+
+		if (HWBuffer->Mapped_Vertex == scene::EHM_STATIC)
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, vbuf, GL_STATIC_DRAW);
+		else if (HWBuffer->Mapped_Vertex == scene::EHM_DYNAMIC)
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, vbuf, GL_DYNAMIC_DRAW);
+		else // scene::EHM_STREAM
+			extGlBufferData(GL_ARRAY_BUFFER, vertexCount * vertexSize, vbuf, GL_STREAM_DRAW);
+	}
+
+	extGlBindBuffer(GL_ARRAY_BUFFER, 0);
+
+	return (!testGLError(__LINE__));
+#else
+	return false;
+#endif
+}
+
+bool COpenGLDriver::updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (!FeatureAvailable[IRR_ARB_vertex_buffer_object])
+		return false;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+
+	const void *indices = mb->getIndices();
+	u32 indexCount = mb->getIndexCount();
+
+	GLenum indexSize;
+	switch (mb->getIndexType()) {
+	case EIT_16BIT: {
+		indexSize = sizeof(u16);
+		break;
+	}
+	case EIT_32BIT: {
+		indexSize = sizeof(u32);
+		break;
+	}
+	default: {
+		return false;
+	}
+	}
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_indicesID) {
+		extGlGenBuffers(1, &HWBuffer->vbo_indicesID);
+		if (!HWBuffer->vbo_indicesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_indicesSize < indexCount * indexSize) {
+		newBuffer = true;
+	}
+
+	extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		extGlBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indexCount * indexSize, indices);
+	else {
+		HWBuffer->vbo_indicesSize = indexCount * indexSize;
+
+		if (HWBuffer->Mapped_Index == scene::EHM_STATIC)
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_STATIC_DRAW);
+		else if (HWBuffer->Mapped_Index == scene::EHM_DYNAMIC)
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_DYNAMIC_DRAW);
+		else // scene::EHM_STREAM
+			extGlBufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, GL_STREAM_DRAW);
+	}
+
+	extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	return (!testGLError(__LINE__));
+#else
+	return false;
+#endif
+}
+
+//! updates hardware buffer if needed
+bool COpenGLDriver::updateHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex() || !((SHWBufferLink_opengl *)HWBuffer)->vbo_verticesID) {
+
+			HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+
+			if (!updateVertexHardwareBuffer((SHWBufferLink_opengl *)HWBuffer))
+				return false;
+		}
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index() || !((SHWBufferLink_opengl *)HWBuffer)->vbo_indicesID) {
+
+			HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+
+			if (!updateIndexHardwareBuffer((SHWBufferLink_opengl *)HWBuffer))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+//! Create hardware buffer from meshbuffer
+COpenGLDriver::SHWBufferLink *COpenGLDriver::createHardwareBuffer(const scene::IMeshBuffer *mb)
+{
+#if defined(GL_ARB_vertex_buffer_object)
+	if (!mb || (mb->getHardwareMappingHint_Index() == scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex() == scene::EHM_NEVER))
+		return 0;
+
+	SHWBufferLink_opengl *HWBuffer = new SHWBufferLink_opengl(mb);
+
+	// add to map
+	HWBuffer->listPosition = HWBufferList.insert(HWBufferList.end(), HWBuffer);
+
+	HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+	HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+	HWBuffer->Mapped_Vertex = mb->getHardwareMappingHint_Vertex();
+	HWBuffer->Mapped_Index = mb->getHardwareMappingHint_Index();
+	HWBuffer->vbo_verticesID = 0;
+	HWBuffer->vbo_indicesID = 0;
+	HWBuffer->vbo_verticesSize = 0;
+	HWBuffer->vbo_indicesSize = 0;
+
+	if (!updateHardwareBuffer(HWBuffer)) {
+		deleteHardwareBuffer(HWBuffer);
+		return 0;
+	}
+
+	return HWBuffer;
+#else
+	return 0;
+#endif
+}
+
+void COpenGLDriver::deleteHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+#if defined(GL_ARB_vertex_buffer_object)
+	SHWBufferLink_opengl *HWBuffer = (SHWBufferLink_opengl *)_HWBuffer;
+	if (HWBuffer->vbo_verticesID) {
+		extGlDeleteBuffers(1, &HWBuffer->vbo_verticesID);
+		HWBuffer->vbo_verticesID = 0;
+	}
+	if (HWBuffer->vbo_indicesID) {
+		extGlDeleteBuffers(1, &HWBuffer->vbo_indicesID);
+		HWBuffer->vbo_indicesID = 0;
+	}
+#endif
+
+	CNullDriver::deleteHardwareBuffer(_HWBuffer);
+}
+
+//! Draw hardware buffer
+void COpenGLDriver::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	updateHardwareBuffer(_HWBuffer); // check if update is needed
+
+#if defined(GL_ARB_vertex_buffer_object)
+	SHWBufferLink_opengl *HWBuffer = (SHWBufferLink_opengl *)_HWBuffer;
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const void *indexList = mb->getIndices();
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		extGlBindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+		vertices = 0;
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+		indexList = 0;
+	}
+
+	drawVertexPrimitiveList(vertices, mb->getVertexCount(), indexList, mb->getPrimitiveCount(), mb->getVertexType(), mb->getPrimitiveType(), mb->getIndexType());
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER)
+		extGlBindBuffer(GL_ARRAY_BUFFER, 0);
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER)
+		extGlBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+#endif
+}
+
+//! Create occlusion query.
+/** Use node for identification and mesh for occlusion test. */
+void COpenGLDriver::addOcclusionQuery(scene::ISceneNode *node,
+		const scene::IMesh *mesh)
+{
+	if (!queryFeature(EVDF_OCCLUSION_QUERY))
+		return;
+
+	CNullDriver::addOcclusionQuery(node, mesh);
+	const s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if ((index != -1) && (OcclusionQueries[index].UID == 0))
+		extGlGenQueries(1, reinterpret_cast<GLuint *>(&OcclusionQueries[index].UID));
+}
+
+//! Remove occlusion query.
+void COpenGLDriver::removeOcclusionQuery(scene::ISceneNode *node)
+{
+	const s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1) {
+		if (OcclusionQueries[index].UID != 0)
+			extGlDeleteQueries(1, reinterpret_cast<GLuint *>(&OcclusionQueries[index].UID));
+		CNullDriver::removeOcclusionQuery(node);
+	}
+}
+
+//! Run occlusion query. Draws mesh stored in query.
+/** If the mesh shall not be rendered visible, use
+overrideMaterial to disable the color and depth buffer. */
+void COpenGLDriver::runOcclusionQuery(scene::ISceneNode *node, bool visible)
+{
+	if (!node)
+		return;
+
+	const s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1) {
+		if (OcclusionQueries[index].UID)
+			extGlBeginQuery(
+#ifdef GL_ARB_occlusion_query
+					GL_SAMPLES_PASSED_ARB,
+#else
+					0,
+#endif
+					OcclusionQueries[index].UID);
+		CNullDriver::runOcclusionQuery(node, visible);
+		if (OcclusionQueries[index].UID)
+			extGlEndQuery(
+#ifdef GL_ARB_occlusion_query
+					GL_SAMPLES_PASSED_ARB);
+#else
+					0);
+#endif
+		testGLError(__LINE__);
+	}
+}
+
+//! Update occlusion query. Retrieves results from GPU.
+/** If the query shall not block, set the flag to false.
+Update might not occur in this case, though */
+void COpenGLDriver::updateOcclusionQuery(scene::ISceneNode *node, bool block)
+{
+	const s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1) {
+		// not yet started
+		if (OcclusionQueries[index].Run == u32(~0))
+			return;
+		GLint available = block ? GL_TRUE : GL_FALSE;
+		if (!block) {
+			extGlGetQueryObjectiv(OcclusionQueries[index].UID,
+#ifdef GL_ARB_occlusion_query
+					GL_QUERY_RESULT_AVAILABLE_ARB,
+#elif defined(GL_NV_occlusion_query)
+					GL_PIXEL_COUNT_AVAILABLE_NV,
+#else
+					0,
+#endif
+					&available);
+			testGLError(__LINE__);
+		}
+		if (available == GL_TRUE) {
+			extGlGetQueryObjectiv(OcclusionQueries[index].UID,
+#ifdef GL_ARB_occlusion_query
+					GL_QUERY_RESULT_ARB,
+#elif defined(GL_NV_occlusion_query)
+					GL_PIXEL_COUNT_NV,
+#else
+					0,
+#endif
+					&available);
+			if (queryFeature(EVDF_OCCLUSION_QUERY))
+				OcclusionQueries[index].Result = available;
+		}
+		testGLError(__LINE__);
+	}
+}
+
+//! Return query result.
+/** Return value is the number of visible pixels/fragments.
+The value is a safe approximation, i.e. can be larger than the
+actual value of pixels. */
+u32 COpenGLDriver::getOcclusionQueryResult(scene::ISceneNode *node) const
+{
+	const s32 index = OcclusionQueries.linear_search(SOccQuery(node));
+	if (index != -1)
+		return OcclusionQueries[index].Result;
+	else
+		return ~0;
+}
+
+//! Create render target.
+IRenderTarget *COpenGLDriver::addRenderTarget()
+{
+	COpenGLRenderTarget *renderTarget = new COpenGLRenderTarget(this);
+	RenderTargets.push_back(renderTarget);
+
+	return renderTarget;
+}
+
+// small helper function to create vertex buffer object address offsets
+static inline const GLvoid *buffer_offset(const size_t offset)
+{
+	return (const GLvoid *)offset;
+}
+
+//! draws a vertex primitive list
+void COpenGLDriver::drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+		const void *indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if (!primitiveCount || !vertexCount)
+		return;
+
+	if (!checkPrimitiveCount(primitiveCount))
+		return;
+
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
+
+	if (vertices && !FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(vertices, vertexCount, vType);
+
+	// draw everything
+	setRenderStates3DMode();
+
+	if ((pType != scene::EPT_POINTS) && (pType != scene::EPT_POINT_SPRITES))
+		CacheHandler->setClientState(true, true, true, true);
+	else
+		CacheHandler->setClientState(true, false, true, false);
+
+// due to missing defines in OSX headers, we have to be more specific with this check
+// #if defined(GL_ARB_vertex_array_bgra) || defined(GL_EXT_vertex_array_bgra)
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (vertices) {
+		if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) {
+			switch (vType) {
+			case EVT_STANDARD:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Color);
+				break;
+			case EVT_2TCOORDS:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Color);
+				break;
+			case EVT_TANGENTS:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Color);
+				break;
+			}
+		} else {
+			// avoid passing broken pointer to OpenGL
+			_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+		}
+	}
+
+	switch (vType) {
+	case EVT_STANDARD:
+		if (vertices) {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex), buffer_offset(12));
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), 0);
+		}
+
+		if (Feature.MaxTextureUnits > 0 && CacheHandler->getTextureCache()[1]) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+		}
+		break;
+	case EVT_2TCOORDS:
+		if (vertices) {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords);
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(12));
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(0));
+		}
+
+		if (Feature.MaxTextureUnits > 0) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords2);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(36));
+		}
+		break;
+	case EVT_TANGENTS:
+		if (vertices) {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Normal);
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].TCoords);
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Pos);
+		} else {
+			glNormalPointer(GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(12));
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(28));
+			glVertexPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(0));
+		}
+
+		if (Feature.MaxTextureUnits > 0) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Tangent);
+			else
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(36));
+
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 2);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Binormal);
+			else
+				glTexCoordPointer(3, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(48));
+		}
+		break;
+	}
+
+	renderArray(indexList, primitiveCount, pType, iType);
+
+	if (Feature.MaxTextureUnits > 0) {
+		if (vType == EVT_TANGENTS) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 2);
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		if ((vType != EVT_STANDARD) || CacheHandler->getTextureCache()[1]) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		CacheHandler->setClientActiveTexture(GL_TEXTURE0);
+	}
+}
+
+void COpenGLDriver::getColorBuffer(const void *vertices, u32 vertexCount, E_VERTEX_TYPE vType)
+{
+	// convert colors to gl color format.
+	vertexCount *= 4; // reused as color component count
+	ColorBuffer.set_used(vertexCount);
+	u32 i;
+
+	switch (vType) {
+	case EVT_STANDARD: {
+		const S3DVertex *p = static_cast<const S3DVertex *>(vertices);
+		for (i = 0; i < vertexCount; i += 4) {
+			p->Color.toOpenGLColor(&ColorBuffer[i]);
+			++p;
+		}
+	} break;
+	case EVT_2TCOORDS: {
+		const S3DVertex2TCoords *p = static_cast<const S3DVertex2TCoords *>(vertices);
+		for (i = 0; i < vertexCount; i += 4) {
+			p->Color.toOpenGLColor(&ColorBuffer[i]);
+			++p;
+		}
+	} break;
+	case EVT_TANGENTS: {
+		const S3DVertexTangents *p = static_cast<const S3DVertexTangents *>(vertices);
+		for (i = 0; i < vertexCount; i += 4) {
+			p->Color.toOpenGLColor(&ColorBuffer[i]);
+			++p;
+		}
+	} break;
+	}
+}
+
+void COpenGLDriver::renderArray(const void *indexList, u32 primitiveCount,
+		scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	GLenum indexSize = 0;
+
+	switch (iType) {
+	case EIT_16BIT: {
+		indexSize = GL_UNSIGNED_SHORT;
+		break;
+	}
+	case EIT_32BIT: {
+		indexSize = GL_UNSIGNED_INT;
+		break;
+	}
+	}
+
+	switch (pType) {
+	case scene::EPT_POINTS:
+	case scene::EPT_POINT_SPRITES: {
+#ifdef GL_ARB_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[IRR_ARB_point_sprite])
+			glEnable(GL_POINT_SPRITE_ARB);
+#endif
+
+		// prepare size and attenuation (where supported)
+		GLfloat particleSize = Material.Thickness;
+		//			if (AntiAlias)
+		//				particleSize=core::clamp(particleSize, DimSmoothedPoint[0], DimSmoothedPoint[1]);
+		//			else
+		particleSize = core::clamp(particleSize, DimAliasedPoint[0], DimAliasedPoint[1]);
+#if defined(GL_VERSION_1_4) || defined(GL_ARB_point_parameters) || defined(GL_EXT_point_parameters) || defined(GL_SGIS_point_parameters)
+		const float att[] = {1.0f, 1.0f, 0.0f};
+#if defined(GL_VERSION_1_4)
+		extGlPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, att);
+		//			extGlPointParameterf(GL_POINT_SIZE_MIN,1.f);
+		extGlPointParameterf(GL_POINT_SIZE_MAX, particleSize);
+		extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE, 1.0f);
+#elif defined(GL_ARB_point_parameters)
+		extGlPointParameterfv(GL_POINT_DISTANCE_ATTENUATION_ARB, att);
+		//			extGlPointParameterf(GL_POINT_SIZE_MIN_ARB,1.f);
+		extGlPointParameterf(GL_POINT_SIZE_MAX_ARB, particleSize);
+		extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0f);
+#elif defined(GL_EXT_point_parameters)
+		extGlPointParameterfv(GL_DISTANCE_ATTENUATION_EXT, att);
+		//			extGlPointParameterf(GL_POINT_SIZE_MIN_EXT,1.f);
+		extGlPointParameterf(GL_POINT_SIZE_MAX_EXT, particleSize);
+		extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT, 1.0f);
+#elif defined(GL_SGIS_point_parameters)
+		extGlPointParameterfv(GL_DISTANCE_ATTENUATION_SGIS, att);
+		//			extGlPointParameterf(GL_POINT_SIZE_MIN_SGIS,1.f);
+		extGlPointParameterf(GL_POINT_SIZE_MAX_SGIS, particleSize);
+		extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_SGIS, 1.0f);
+#endif
+#endif
+		glPointSize(particleSize);
+
+#ifdef GL_ARB_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[IRR_ARB_point_sprite]) {
+			CacheHandler->setActiveTexture(GL_TEXTURE0_ARB);
+			glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE, GL_TRUE);
+		}
+#endif
+		glDrawArrays(GL_POINTS, 0, primitiveCount);
+#ifdef GL_ARB_point_sprite
+		if (pType == scene::EPT_POINT_SPRITES && FeatureAvailable[IRR_ARB_point_sprite]) {
+			glDisable(GL_POINT_SPRITE_ARB);
+
+			CacheHandler->setActiveTexture(GL_TEXTURE0_ARB);
+			glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE, GL_FALSE);
+		}
+#endif
+	} break;
+	case scene::EPT_LINE_STRIP:
+		glDrawElements(GL_LINE_STRIP, primitiveCount + 1, indexSize, indexList);
+		break;
+	case scene::EPT_LINE_LOOP:
+		glDrawElements(GL_LINE_LOOP, primitiveCount, indexSize, indexList);
+		break;
+	case scene::EPT_LINES:
+		glDrawElements(GL_LINES, primitiveCount * 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_STRIP:
+		glDrawElements(GL_TRIANGLE_STRIP, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_FAN:
+		glDrawElements(GL_TRIANGLE_FAN, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLES:
+		glDrawElements(GL_TRIANGLES, primitiveCount * 3, indexSize, indexList);
+		break;
+	}
+}
+
+//! draws a vertex primitive list in 2d
+void COpenGLDriver::draw2DVertexPrimitiveList(const void *vertices, u32 vertexCount,
+		const void *indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if (!primitiveCount || !vertexCount)
+		return;
+
+	if (!checkPrimitiveCount(primitiveCount))
+		return;
+
+	CNullDriver::draw2DVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
+
+	if (vertices && !FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(vertices, vertexCount, vType);
+
+	// draw everything
+	CacheHandler->getTextureCache().set(0, Material.getTexture(0));
+	if (Material.MaterialType == EMT_ONETEXTURE_BLEND) {
+		E_BLEND_FACTOR srcFact;
+		E_BLEND_FACTOR dstFact;
+		E_MODULATE_FUNC modulo;
+		u32 alphaSource;
+		unpack_textureBlendFunc(srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
+		setRenderStates2DMode(alphaSource & video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource & video::EAS_TEXTURE) != 0);
+	} else
+		setRenderStates2DMode(Material.MaterialType == EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType == EMT_TRANSPARENT_ALPHA_CHANNEL);
+
+	if ((pType != scene::EPT_POINTS) && (pType != scene::EPT_POINT_SPRITES))
+		CacheHandler->setClientState(true, false, true, true);
+	else
+		CacheHandler->setClientState(true, false, true, false);
+
+// due to missing defines in OSX headers, we have to be more specific with this check
+// #if defined(GL_ARB_vertex_array_bgra) || defined(GL_EXT_vertex_array_bgra)
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (vertices) {
+		if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) {
+			switch (vType) {
+			case EVT_STANDARD:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Color);
+				break;
+			case EVT_2TCOORDS:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Color);
+				break;
+			case EVT_TANGENTS:
+				glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Color);
+				break;
+			}
+		} else {
+			// avoid passing broken pointer to OpenGL
+			_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+		}
+	}
+
+	switch (vType) {
+	case EVT_STANDARD:
+		if (vertices) {
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].Pos);
+		} else {
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), 0);
+		}
+
+		if (Feature.MaxTextureUnits > 0 && CacheHandler->getTextureCache()[1]) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(vertices))[0].TCoords);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), buffer_offset(28));
+		}
+		break;
+	case EVT_2TCOORDS:
+		if (vertices) {
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords);
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].Pos);
+		} else {
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex2TCoords), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(28));
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(0));
+		}
+
+		if (Feature.MaxTextureUnits > 0) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if (vertices)
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), &(static_cast<const S3DVertex2TCoords *>(vertices))[0].TCoords2);
+			else
+				glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex2TCoords), buffer_offset(36));
+		}
+		break;
+	case EVT_TANGENTS:
+		if (vertices) {
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].TCoords);
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), &(static_cast<const S3DVertexTangents *>(vertices))[0].Pos);
+		} else {
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertexTangents), buffer_offset(24));
+			glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(28));
+			glVertexPointer(2, GL_FLOAT, sizeof(S3DVertexTangents), buffer_offset(0));
+		}
+
+		break;
+	}
+
+	renderArray(indexList, primitiveCount, pType, iType);
+
+	if (Feature.MaxTextureUnits > 0) {
+		if ((vType != EVT_STANDARD) || CacheHandler->getTextureCache()[1]) {
+			CacheHandler->setClientActiveTexture(GL_TEXTURE0 + 1);
+			glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		CacheHandler->setClientActiveTexture(GL_TEXTURE0);
+	}
+}
+
+void COpenGLDriver::draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect, SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	if (!sourceRect.isValid())
+		return;
+
+	// clip these coordinates
+	core::rect<s32> targetRect(destPos, sourceRect.getSize());
+	if (clipRect) {
+		targetRect.clipAgainst(*clipRect);
+		if (targetRect.getWidth() < 0 || targetRect.getHeight() < 0)
+			return;
+	}
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+	targetRect.clipAgainst(core::rect<s32>(0, 0, (s32)renderTargetSize.Width, (s32)renderTargetSize.Height));
+	if (targetRect.getWidth() < 0 || targetRect.getHeight() < 0)
+		return;
+
+	// ok, we've clipped everything.
+	// now draw it.
+	const core::dimension2d<s32> sourceSize(targetRect.getSize());
+	const core::position2d<s32> sourcePos(sourceRect.UpperLeftCorner + (targetRect.UpperLeftCorner - destPos));
+
+	const core::dimension2d<u32> &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourcePos.X * invW,
+			sourcePos.Y * invH,
+			(sourcePos.X + sourceSize.Width) * invW,
+			(sourcePos.Y + sourceSize.Height) * invH);
+
+	disableTextures(1);
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+	setRenderStates2DMode(color.getAlpha() < 255, true, useAlphaChannelOfTexture);
+
+	Quad2DVertices[0].Color = color;
+	Quad2DVertices[1].Color = color;
+	Quad2DVertices[2].Color = color;
+	Quad2DVertices[3].Color = color;
+
+	Quad2DVertices[0].Pos = core::vector3df((f32)targetRect.UpperLeftCorner.X, (f32)targetRect.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[1].Pos = core::vector3df((f32)targetRect.LowerRightCorner.X, (f32)targetRect.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[2].Pos = core::vector3df((f32)targetRect.LowerRightCorner.X, (f32)targetRect.LowerRightCorner.Y, 0.0f);
+	Quad2DVertices[3].Pos = core::vector3df((f32)targetRect.UpperLeftCorner.X, (f32)targetRect.LowerRightCorner.Y, 0.0f);
+
+	Quad2DVertices[0].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	Quad2DVertices[1].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	Quad2DVertices[2].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	Quad2DVertices[3].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(Quad2DVertices, 4, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, true);
+
+	glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].TCoords);
+	glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, Quad2DIndices);
+}
+
+void COpenGLDriver::draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect,
+		const video::SColor *const colors, bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	const core::dimension2d<u32> &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourceRect.UpperLeftCorner.X * invW,
+			sourceRect.UpperLeftCorner.Y * invH,
+			sourceRect.LowerRightCorner.X * invW,
+			sourceRect.LowerRightCorner.Y * invH);
+
+	const video::SColor temp[4] = {
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+		};
+
+	const video::SColor *const useColor = colors ? colors : temp;
+
+	disableTextures(1);
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+	setRenderStates2DMode(useColor[0].getAlpha() < 255 || useColor[1].getAlpha() < 255 ||
+								  useColor[2].getAlpha() < 255 || useColor[3].getAlpha() < 255,
+			true, useAlphaChannelOfTexture);
+
+	if (clipRect) {
+		if (!clipRect->isValid())
+			return;
+
+		glEnable(GL_SCISSOR_TEST);
+		const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+		glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
+				clipRect->getWidth(), clipRect->getHeight());
+	}
+
+	Quad2DVertices[0].Color = useColor[0];
+	Quad2DVertices[1].Color = useColor[3];
+	Quad2DVertices[2].Color = useColor[2];
+	Quad2DVertices[3].Color = useColor[1];
+
+	Quad2DVertices[0].Pos = core::vector3df((f32)destRect.UpperLeftCorner.X, (f32)destRect.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[1].Pos = core::vector3df((f32)destRect.LowerRightCorner.X, (f32)destRect.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[2].Pos = core::vector3df((f32)destRect.LowerRightCorner.X, (f32)destRect.LowerRightCorner.Y, 0.0f);
+	Quad2DVertices[3].Pos = core::vector3df((f32)destRect.UpperLeftCorner.X, (f32)destRect.LowerRightCorner.Y, 0.0f);
+
+	Quad2DVertices[0].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	Quad2DVertices[1].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	Quad2DVertices[2].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	Quad2DVertices[3].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(Quad2DVertices, 4, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, true);
+
+	glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].TCoords);
+	glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, Quad2DIndices);
+
+	if (clipRect)
+		glDisable(GL_SCISSOR_TEST);
+}
+
+void COpenGLDriver::draw2DImage(const video::ITexture *texture, u32 layer, bool flip)
+{
+	if (!texture || !CacheHandler->getTextureCache().set(0, texture))
+		return;
+
+	disableTextures(1);
+
+	setRenderStates2DMode(false, true, true);
+
+	CacheHandler->setMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	CacheHandler->setMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	Transformation3DChanged = true;
+
+	CacheHandler->setClientState(true, false, false, true);
+
+	const core::vector3df positionData[4] = {
+			core::vector3df(-1.f, 1.f, 0.f),
+			core::vector3df(1.f, 1.f, 0.f),
+			core::vector3df(1.f, -1.f, 0.f),
+			core::vector3df(-1.f, -1.f, 0.f)};
+
+	glVertexPointer(2, GL_FLOAT, sizeof(core::vector3df), positionData);
+
+	if (texture && texture->getType() == ETT_CUBEMAP) {
+		const core::vector3df texcoordCubeData[6][4] = {
+
+				// GL_TEXTURE_CUBE_MAP_POSITIVE_X
+				{
+						core::vector3df(1.f, 1.f, 1.f),
+						core::vector3df(1.f, 1.f, -1.f),
+						core::vector3df(1.f, -1.f, -1.f),
+						core::vector3df(1.f, -1.f, 1.f)},
+
+				// GL_TEXTURE_CUBE_MAP_NEGATIVE_X
+				{
+						core::vector3df(-1.f, 1.f, -1.f),
+						core::vector3df(-1.f, 1.f, 1.f),
+						core::vector3df(-1.f, -1.f, 1.f),
+						core::vector3df(-1.f, -1.f, -1.f)},
+
+				// GL_TEXTURE_CUBE_MAP_POSITIVE_Y
+				{
+						core::vector3df(-1.f, 1.f, -1.f),
+						core::vector3df(1.f, 1.f, -1.f),
+						core::vector3df(1.f, 1.f, 1.f),
+						core::vector3df(-1.f, 1.f, 1.f)},
+
+				// GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
+				{
+						core::vector3df(-1.f, -1.f, 1.f),
+						core::vector3df(-1.f, -1.f, -1.f),
+						core::vector3df(1.f, -1.f, -1.f),
+						core::vector3df(1.f, -1.f, 1.f)},
+
+				// GL_TEXTURE_CUBE_MAP_POSITIVE_Z
+				{
+						core::vector3df(-1.f, 1.f, 1.f),
+						core::vector3df(-1.f, -1.f, 1.f),
+						core::vector3df(1.f, -1.f, 1.f),
+						core::vector3df(1.f, 1.f, 1.f)},
+
+				// GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+				{
+						core::vector3df(1.f, 1.f, -1.f),
+						core::vector3df(-1.f, 1.f, -1.f),
+						core::vector3df(-1.f, -1.f, -1.f),
+						core::vector3df(1.f, -1.f, -1.f)}};
+
+		const core::vector3df texcoordData[4] = {
+				texcoordCubeData[layer][(flip) ? 3 : 0],
+				texcoordCubeData[layer][(flip) ? 2 : 1],
+				texcoordCubeData[layer][(flip) ? 1 : 2],
+				texcoordCubeData[layer][(flip) ? 0 : 3]};
+
+		glTexCoordPointer(3, GL_FLOAT, sizeof(core::vector3df), texcoordData);
+	} else {
+		f32 modificator = (flip) ? 1.f : 0.f;
+
+		core::vector2df texcoordData[4] = {
+				core::vector2df(0.f, 0.f + modificator),
+				core::vector2df(1.f, 0.f + modificator),
+				core::vector2df(1.f, 1.f - modificator),
+				core::vector2df(0.f, 1.f - modificator)};
+
+		glTexCoordPointer(2, GL_FLOAT, sizeof(core::vector2df), texcoordData);
+	}
+
+	glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, Quad2DIndices);
+}
+
+//! draws a set of 2d images, using a color and the alpha channel of the
+//! texture if desired.
+void COpenGLDriver::draw2DImageBatch(const video::ITexture *texture,
+		const core::array<core::position2d<s32>> &positions,
+		const core::array<core::rect<s32>> &sourceRects,
+		const core::rect<s32> *clipRect,
+		SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	const u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
+
+	const core::dimension2d<u32> &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	disableTextures(1);
+	if (!CacheHandler->getTextureCache().set(0, texture))
+		return;
+	setRenderStates2DMode(color.getAlpha() < 255, true, useAlphaChannelOfTexture);
+
+	Quad2DVertices[0].Color = color;
+	Quad2DVertices[1].Color = color;
+	Quad2DVertices[2].Color = color;
+	Quad2DVertices[3].Color = color;
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(Quad2DVertices, 4, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, true);
+
+	glTexCoordPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].TCoords);
+	glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	for (u32 i = 0; i < drawCount; ++i) {
+		if (!sourceRects[i].isValid())
+			continue;
+
+		core::position2d<s32> targetPos(positions[i]);
+		core::position2d<s32> sourcePos(sourceRects[i].UpperLeftCorner);
+		// This needs to be signed as it may go negative.
+		core::dimension2d<s32> sourceSize(sourceRects[i].getSize());
+		if (clipRect) {
+			if (targetPos.X < clipRect->UpperLeftCorner.X) {
+				sourceSize.Width += targetPos.X - clipRect->UpperLeftCorner.X;
+				if (sourceSize.Width <= 0)
+					continue;
+
+				sourcePos.X -= targetPos.X - clipRect->UpperLeftCorner.X;
+				targetPos.X = clipRect->UpperLeftCorner.X;
+			}
+
+			if (targetPos.X + sourceSize.Width > clipRect->LowerRightCorner.X) {
+				sourceSize.Width -= (targetPos.X + sourceSize.Width) - clipRect->LowerRightCorner.X;
+				if (sourceSize.Width <= 0)
+					continue;
+			}
+
+			if (targetPos.Y < clipRect->UpperLeftCorner.Y) {
+				sourceSize.Height += targetPos.Y - clipRect->UpperLeftCorner.Y;
+				if (sourceSize.Height <= 0)
+					continue;
+
+				sourcePos.Y -= targetPos.Y - clipRect->UpperLeftCorner.Y;
+				targetPos.Y = clipRect->UpperLeftCorner.Y;
+			}
+
+			if (targetPos.Y + sourceSize.Height > clipRect->LowerRightCorner.Y) {
+				sourceSize.Height -= (targetPos.Y + sourceSize.Height) - clipRect->LowerRightCorner.Y;
+				if (sourceSize.Height <= 0)
+					continue;
+			}
+		}
+
+		// clip these coordinates
+
+		if (targetPos.X < 0) {
+			sourceSize.Width += targetPos.X;
+			if (sourceSize.Width <= 0)
+				continue;
+
+			sourcePos.X -= targetPos.X;
+			targetPos.X = 0;
+		}
+
+		if (targetPos.X + sourceSize.Width > (s32)renderTargetSize.Width) {
+			sourceSize.Width -= (targetPos.X + sourceSize.Width) - renderTargetSize.Width;
+			if (sourceSize.Width <= 0)
+				continue;
+		}
+
+		if (targetPos.Y < 0) {
+			sourceSize.Height += targetPos.Y;
+			if (sourceSize.Height <= 0)
+				continue;
+
+			sourcePos.Y -= targetPos.Y;
+			targetPos.Y = 0;
+		}
+
+		if (targetPos.Y + sourceSize.Height > (s32)renderTargetSize.Height) {
+			sourceSize.Height -= (targetPos.Y + sourceSize.Height) - renderTargetSize.Height;
+			if (sourceSize.Height <= 0)
+				continue;
+		}
+
+		// ok, we've clipped everything.
+		// now draw it.
+
+		const core::rect<f32> tcoords(
+				sourcePos.X * invW,
+				sourcePos.Y * invH,
+				(sourcePos.X + sourceSize.Width) * invW,
+				(sourcePos.Y + sourceSize.Height) * invH);
+
+		const core::rect<s32> poss(targetPos, sourceSize);
+
+		Quad2DVertices[0].Pos = core::vector3df((f32)poss.UpperLeftCorner.X, (f32)poss.UpperLeftCorner.Y, 0.0f);
+		Quad2DVertices[1].Pos = core::vector3df((f32)poss.LowerRightCorner.X, (f32)poss.UpperLeftCorner.Y, 0.0f);
+		Quad2DVertices[2].Pos = core::vector3df((f32)poss.LowerRightCorner.X, (f32)poss.LowerRightCorner.Y, 0.0f);
+		Quad2DVertices[3].Pos = core::vector3df((f32)poss.UpperLeftCorner.X, (f32)poss.LowerRightCorner.Y, 0.0f);
+
+		Quad2DVertices[0].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+		Quad2DVertices[1].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+		Quad2DVertices[2].TCoords = core::vector2df(tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+		Quad2DVertices[3].TCoords = core::vector2df(tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+
+		glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, Quad2DIndices);
+	}
+}
+
+//! draw a 2d rectangle
+void COpenGLDriver::draw2DRectangle(SColor color, const core::rect<s32> &position,
+		const core::rect<s32> *clip)
+{
+	disableTextures();
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	glColor4ub(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
+	glRectf(GLfloat(pos.UpperLeftCorner.X), GLfloat(pos.UpperLeftCorner.Y),
+			GLfloat(pos.LowerRightCorner.X), GLfloat(pos.LowerRightCorner.Y));
+}
+
+//! draw an 2d rectangle
+void COpenGLDriver::draw2DRectangle(const core::rect<s32> &position,
+		SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+		const core::rect<s32> *clip)
+{
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	disableTextures();
+
+	setRenderStates2DMode(colorLeftUp.getAlpha() < 255 ||
+								  colorRightUp.getAlpha() < 255 ||
+								  colorLeftDown.getAlpha() < 255 ||
+								  colorRightDown.getAlpha() < 255,
+			false, false);
+
+	Quad2DVertices[0].Color = colorLeftUp;
+	Quad2DVertices[1].Color = colorRightUp;
+	Quad2DVertices[2].Color = colorRightDown;
+	Quad2DVertices[3].Color = colorLeftDown;
+
+	Quad2DVertices[0].Pos = core::vector3df((f32)pos.UpperLeftCorner.X, (f32)pos.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[1].Pos = core::vector3df((f32)pos.LowerRightCorner.X, (f32)pos.UpperLeftCorner.Y, 0.0f);
+	Quad2DVertices[2].Pos = core::vector3df((f32)pos.LowerRightCorner.X, (f32)pos.LowerRightCorner.Y, 0.0f);
+	Quad2DVertices[3].Pos = core::vector3df((f32)pos.UpperLeftCorner.X, (f32)pos.LowerRightCorner.Y, 0.0f);
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(Quad2DVertices, 4, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, false);
+
+	glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_SHORT, Quad2DIndices);
+}
+
+//! Draws a 2d line.
+void COpenGLDriver::draw2DLine(const core::position2d<s32> &start,
+		const core::position2d<s32> &end, SColor color)
+{
+	{
+		disableTextures();
+		setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+		Quad2DVertices[0].Color = color;
+		Quad2DVertices[1].Color = color;
+
+		Quad2DVertices[0].Pos = core::vector3df((f32)start.X, (f32)start.Y, 0.0f);
+		Quad2DVertices[1].Pos = core::vector3df((f32)end.X, (f32)end.Y, 0.0f);
+
+		if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+			getColorBuffer(Quad2DVertices, 2, EVT_STANDARD);
+
+		CacheHandler->setClientState(true, false, true, false);
+
+		glVertexPointer(2, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+		const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+		const GLint colorSize = 4;
+#endif
+		if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+		else {
+			_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+			glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+		}
+
+		glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Quad2DIndices);
+
+		// Draw sometimes non-drawn first & last pixel (search for "diamond exit rule")
+		// HACK this messes with alpha blending
+		glDrawArrays(GL_POINTS, 0, 1);
+		glDrawArrays(GL_POINTS, 1, 1);
+	}
+}
+
+//! disables all textures beginning with the optional fromStage parameter. Otherwise all texture stages are disabled.
+//! Returns whether disabling was successful or not.
+bool COpenGLDriver::disableTextures(u32 fromStage)
+{
+	bool result = true;
+	for (u32 i = fromStage; i < Feature.MaxTextureUnits; ++i) {
+		result &= CacheHandler->getTextureCache().set(i, 0, EST_ACTIVE_ON_CHANGE);
+	}
+	return result;
+}
+
+//! creates a matrix in supplied GLfloat array to pass to OpenGL
+inline void COpenGLDriver::getGLMatrix(GLfloat gl_matrix[16], const core::matrix4 &m)
+{
+	memcpy(gl_matrix, m.pointer(), 16 * sizeof(f32));
+}
+
+//! creates a opengltexturematrix from a D3D style texture matrix
+inline void COpenGLDriver::getGLTextureMatrix(GLfloat *o, const core::matrix4 &m)
+{
+	o[0] = m[0];
+	o[1] = m[1];
+	o[2] = 0.f;
+	o[3] = 0.f;
+
+	o[4] = m[4];
+	o[5] = m[5];
+	o[6] = 0.f;
+	o[7] = 0.f;
+
+	o[8] = 0.f;
+	o[9] = 0.f;
+	o[10] = 1.f;
+	o[11] = 0.f;
+
+	o[12] = m[8];
+	o[13] = m[9];
+	o[14] = 0.f;
+	o[15] = 1.f;
+}
+
+ITexture *COpenGLDriver::createDeviceDependentTexture(const io::path &name, IImage *image)
+{
+	core::array<IImage *> imageArray(1);
+	imageArray.push_back(image);
+
+	COpenGLTexture *texture = new COpenGLTexture(name, imageArray, ETT_2D, this);
+
+	return texture;
+}
+
+ITexture *COpenGLDriver::createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image)
+{
+	COpenGLTexture *texture = new COpenGLTexture(name, image, ETT_CUBEMAP, this);
+
+	return texture;
+}
+
+void COpenGLDriver::disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag)
+{
+	CNullDriver::disableFeature(feature, flag);
+
+	if (feature == EVDF_TEXTURE_CUBEMAP_SEAMLESS) {
+		if (queryFeature(feature))
+			glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+		else if (COpenGLExtensionHandler::queryFeature(feature))
+			glDisable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+	}
+}
+
+//! Sets a material. All 3d drawing functions draw geometry now using this material.
+void COpenGLDriver::setMaterial(const SMaterial &material)
+{
+	Material = material;
+	OverrideMaterial.apply(Material);
+
+	for (u32 i = 0; i < Feature.MaxTextureUnits; ++i) {
+		const ITexture *texture = Material.getTexture(i);
+		CacheHandler->getTextureCache().set(i, texture, EST_ACTIVE_ON_CHANGE);
+		if (texture) {
+			setTransform((E_TRANSFORMATION_STATE)(ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
+		}
+	}
+}
+
+//! prints error if an error happened.
+bool COpenGLDriver::testGLError(int code)
+{
+	if (!Params.DriverDebug)
+		return false;
+
+	GLenum g = glGetError();
+	switch (g) {
+	case GL_NO_ERROR:
+		return false;
+	case GL_INVALID_ENUM:
+		os::Printer::log("GL_INVALID_ENUM", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_INVALID_VALUE:
+		os::Printer::log("GL_INVALID_VALUE", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_INVALID_OPERATION:
+		os::Printer::log("GL_INVALID_OPERATION", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_STACK_OVERFLOW:
+		os::Printer::log("GL_STACK_OVERFLOW", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_STACK_UNDERFLOW:
+		os::Printer::log("GL_STACK_UNDERFLOW", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_OUT_OF_MEMORY:
+		os::Printer::log("GL_OUT_OF_MEMORY", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+	case GL_TABLE_TOO_LARGE:
+		os::Printer::log("GL_TABLE_TOO_LARGE", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+#if defined(GL_EXT_framebuffer_object)
+	case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+		os::Printer::log("GL_INVALID_FRAMEBUFFER_OPERATION", core::stringc(code).c_str(), ELL_ERROR);
+		break;
+#endif
+	};
+	return true;
+}
+
+//! sets the needed renderstates
+void COpenGLDriver::setRenderStates3DMode()
+{
+	if (CurrentRenderMode != ERM_3D) {
+		// Reset Texture Stages
+		CacheHandler->setBlend(false);
+		CacheHandler->setAlphaTest(false);
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		CacheHandler->setActiveTexture(GL_TEXTURE0_ARB);
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+		// switch back the matrices
+		CacheHandler->setMatrixMode(GL_MODELVIEW);
+		glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
+
+		CacheHandler->setMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(Matrices[ETS_PROJECTION].pointer());
+
+		ResetRenderStates = true;
+#ifdef GL_EXT_clip_volume_hint
+		if (FeatureAvailable[IRR_EXT_clip_volume_hint])
+			glHint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT, GL_NICEST);
+#endif
+	}
+
+	if (ResetRenderStates || LastMaterial != Material) {
+		// unset old material
+
+		if (LastMaterial.MaterialType != Material.MaterialType &&
+				static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+
+		// set new material.
+		if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[Material.MaterialType].Renderer->OnSetMaterial(
+					Material, LastMaterial, ResetRenderStates, this);
+
+		LastMaterial = Material;
+		CacheHandler->correctCacheMaterial(LastMaterial);
+		ResetRenderStates = false;
+	}
+
+	if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+		MaterialRenderers[Material.MaterialType].Renderer->OnRender(this, video::EVT_STANDARD);
+
+	CurrentRenderMode = ERM_3D;
+}
+
+//! Get native wrap mode value
+GLint COpenGLDriver::getTextureWrapMode(const u8 clamp)
+{
+	GLint mode = GL_REPEAT;
+	switch (clamp) {
+	case ETC_REPEAT:
+		mode = GL_REPEAT;
+		break;
+	case ETC_CLAMP:
+		mode = GL_CLAMP;
+		break;
+	case ETC_CLAMP_TO_EDGE:
+#ifdef GL_VERSION_1_2
+		if (Version > 101)
+			mode = GL_CLAMP_TO_EDGE;
+		else
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+				if (FeatureAvailable[IRR_SGIS_texture_edge_clamp])
+			mode = GL_CLAMP_TO_EDGE_SGIS;
+		else
+#endif
+			// fallback
+			mode = GL_CLAMP;
+		break;
+	case ETC_CLAMP_TO_BORDER:
+#ifdef GL_VERSION_1_3
+		if (Version > 102)
+			mode = GL_CLAMP_TO_BORDER;
+		else
+#endif
+#ifdef GL_ARB_texture_border_clamp
+				if (FeatureAvailable[IRR_ARB_texture_border_clamp])
+			mode = GL_CLAMP_TO_BORDER_ARB;
+		else
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+				if (FeatureAvailable[IRR_SGIS_texture_border_clamp])
+			mode = GL_CLAMP_TO_BORDER_SGIS;
+		else
+#endif
+			// fallback
+			mode = GL_CLAMP;
+		break;
+	case ETC_MIRROR:
+#ifdef GL_VERSION_1_4
+		if (Version > 103)
+			mode = GL_MIRRORED_REPEAT;
+		else
+#endif
+#ifdef GL_ARB_texture_border_clamp
+				if (FeatureAvailable[IRR_ARB_texture_mirrored_repeat])
+			mode = GL_MIRRORED_REPEAT_ARB;
+		else
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+				if (FeatureAvailable[IRR_IBM_texture_mirrored_repeat])
+			mode = GL_MIRRORED_REPEAT_IBM;
+		else
+#endif
+			mode = GL_REPEAT;
+		break;
+	case ETC_MIRROR_CLAMP:
+#ifdef GL_EXT_texture_mirror_clamp
+		if (FeatureAvailable[IRR_EXT_texture_mirror_clamp])
+			mode = GL_MIRROR_CLAMP_EXT;
+		else
+#endif
+#if defined(GL_ATI_texture_mirror_once)
+				if (FeatureAvailable[IRR_ATI_texture_mirror_once])
+			mode = GL_MIRROR_CLAMP_ATI;
+		else
+#endif
+			mode = GL_CLAMP;
+		break;
+	case ETC_MIRROR_CLAMP_TO_EDGE:
+#ifdef GL_EXT_texture_mirror_clamp
+		if (FeatureAvailable[IRR_EXT_texture_mirror_clamp])
+			mode = GL_MIRROR_CLAMP_TO_EDGE_EXT;
+		else
+#endif
+#if defined(GL_ATI_texture_mirror_once)
+				if (FeatureAvailable[IRR_ATI_texture_mirror_once])
+			mode = GL_MIRROR_CLAMP_TO_EDGE_ATI;
+		else
+#endif
+			mode = GL_CLAMP;
+		break;
+	case ETC_MIRROR_CLAMP_TO_BORDER:
+#ifdef GL_EXT_texture_mirror_clamp
+		if (FeatureAvailable[IRR_EXT_texture_mirror_clamp])
+			mode = GL_MIRROR_CLAMP_TO_BORDER_EXT;
+		else
+#endif
+			mode = GL_CLAMP;
+		break;
+	}
+	return mode;
+}
+
+//! Can be called by an IMaterialRenderer to make its work easier.
+void COpenGLDriver::setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial,
+		bool resetAllRenderStates)
+{
+	// Fixed pipeline isn't important for shader based materials
+
+	E_OPENGL_FIXED_PIPELINE_STATE tempState = FixedPipelineState;
+
+	if (resetAllRenderStates || tempState == EOFPS_ENABLE || tempState == EOFPS_DISABLE_TO_ENABLE) {
+		// material colors
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.ColorMaterial != material.ColorMaterial) {
+			switch (material.ColorMaterial) {
+			case ECM_NONE:
+				glDisable(GL_COLOR_MATERIAL);
+				break;
+			case ECM_DIFFUSE:
+				glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+				break;
+			case ECM_AMBIENT:
+				glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT);
+				break;
+			case ECM_EMISSIVE:
+				glColorMaterial(GL_FRONT_AND_BACK, GL_EMISSION);
+				break;
+			case ECM_SPECULAR:
+				glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
+				break;
+			case ECM_DIFFUSE_AND_AMBIENT:
+				glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+				break;
+			}
+			if (material.ColorMaterial != ECM_NONE)
+				glEnable(GL_COLOR_MATERIAL);
+		}
+
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.AmbientColor != material.AmbientColor ||
+				lastmaterial.DiffuseColor != material.DiffuseColor ||
+				lastmaterial.EmissiveColor != material.EmissiveColor ||
+				lastmaterial.ColorMaterial != material.ColorMaterial) {
+			GLfloat color[4];
+
+			const f32 inv = 1.0f / 255.0f;
+
+			if ((material.ColorMaterial != video::ECM_AMBIENT) &&
+					(material.ColorMaterial != video::ECM_DIFFUSE_AND_AMBIENT)) {
+				color[0] = material.AmbientColor.getRed() * inv;
+				color[1] = material.AmbientColor.getGreen() * inv;
+				color[2] = material.AmbientColor.getBlue() * inv;
+				color[3] = material.AmbientColor.getAlpha() * inv;
+				glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, color);
+			}
+
+			if ((material.ColorMaterial != video::ECM_DIFFUSE) &&
+					(material.ColorMaterial != video::ECM_DIFFUSE_AND_AMBIENT)) {
+				color[0] = material.DiffuseColor.getRed() * inv;
+				color[1] = material.DiffuseColor.getGreen() * inv;
+				color[2] = material.DiffuseColor.getBlue() * inv;
+				color[3] = material.DiffuseColor.getAlpha() * inv;
+				glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, color);
+			}
+
+			if (material.ColorMaterial != video::ECM_EMISSIVE) {
+				color[0] = material.EmissiveColor.getRed() * inv;
+				color[1] = material.EmissiveColor.getGreen() * inv;
+				color[2] = material.EmissiveColor.getBlue() * inv;
+				color[3] = material.EmissiveColor.getAlpha() * inv;
+				glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, color);
+			}
+		}
+
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.SpecularColor != material.SpecularColor ||
+				lastmaterial.Shininess != material.Shininess ||
+				lastmaterial.ColorMaterial != material.ColorMaterial) {
+			GLfloat color[4] = {0.f, 0.f, 0.f, 1.f};
+			const f32 inv = 1.0f / 255.0f;
+
+			glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, material.Shininess);
+			// disable Specular colors if no shininess is set
+			if ((material.Shininess != 0.0f) &&
+					(material.ColorMaterial != video::ECM_SPECULAR)) {
+#ifdef GL_EXT_separate_specular_color
+				if (FeatureAvailable[IRR_EXT_separate_specular_color])
+					glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+#endif
+				color[0] = material.SpecularColor.getRed() * inv;
+				color[1] = material.SpecularColor.getGreen() * inv;
+				color[2] = material.SpecularColor.getBlue() * inv;
+				color[3] = material.SpecularColor.getAlpha() * inv;
+			}
+#ifdef GL_EXT_separate_specular_color
+			else if (FeatureAvailable[IRR_EXT_separate_specular_color])
+				glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR);
+#endif
+			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color);
+		}
+
+		// shademode
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.GouraudShading != material.GouraudShading) {
+			if (material.GouraudShading)
+				glShadeModel(GL_SMOOTH);
+			else
+				glShadeModel(GL_FLAT);
+		}
+
+		// lighting
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.Lighting != material.Lighting) {
+			if (material.Lighting)
+				glEnable(GL_LIGHTING);
+			else
+				glDisable(GL_LIGHTING);
+		}
+
+		// fog
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.FogEnable != material.FogEnable) {
+			if (material.FogEnable)
+				glEnable(GL_FOG);
+			else
+				glDisable(GL_FOG);
+		}
+
+		// normalization
+		if (resetAllRenderStates || tempState == EOFPS_DISABLE_TO_ENABLE ||
+				lastmaterial.NormalizeNormals != material.NormalizeNormals) {
+			if (material.NormalizeNormals)
+				glEnable(GL_NORMALIZE);
+			else
+				glDisable(GL_NORMALIZE);
+		}
+
+		// Set fixed pipeline as active.
+		tempState = EOFPS_ENABLE;
+	} else if (tempState == EOFPS_ENABLE_TO_DISABLE) {
+		glDisable(GL_COLOR_MATERIAL);
+		glDisable(GL_LIGHTING);
+		glDisable(GL_FOG);
+		glDisable(GL_NORMALIZE);
+
+		// Set programmable pipeline as active.
+		tempState = EOFPS_DISABLE;
+	}
+
+	// tempState == EOFPS_DISABLE - driver doesn't calls functions related to fixed pipeline.
+
+	// fillmode - fixed pipeline call, but it emulate GL_LINES behaviour in rendering, so it stay here.
+	if (resetAllRenderStates || (lastmaterial.Wireframe != material.Wireframe) || (lastmaterial.PointCloud != material.PointCloud))
+		glPolygonMode(GL_FRONT_AND_BACK, material.Wireframe ? GL_LINE : material.PointCloud ? GL_POINT
+																							: GL_FILL);
+
+	// ZBuffer
+	switch (material.ZBuffer) {
+	case ECFN_DISABLED:
+		CacheHandler->setDepthTest(false);
+		break;
+	case ECFN_LESSEQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_LEQUAL);
+		break;
+	case ECFN_EQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_EQUAL);
+		break;
+	case ECFN_LESS:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_LESS);
+		break;
+	case ECFN_NOTEQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_NOTEQUAL);
+		break;
+	case ECFN_GREATEREQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_GEQUAL);
+		break;
+	case ECFN_GREATER:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_GREATER);
+		break;
+	case ECFN_ALWAYS:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_ALWAYS);
+		break;
+	case ECFN_NEVER:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_NEVER);
+		break;
+	default:
+		break;
+	}
+
+	// ZWrite
+	if (getWriteZBuffer(material)) {
+		CacheHandler->setDepthMask(true);
+	} else {
+		CacheHandler->setDepthMask(false);
+	}
+
+	// Back face culling
+	if ((material.FrontfaceCulling) && (material.BackfaceCulling)) {
+		CacheHandler->setCullFaceFunc(GL_FRONT_AND_BACK);
+		CacheHandler->setCullFace(true);
+	} else if (material.BackfaceCulling) {
+		CacheHandler->setCullFaceFunc(GL_BACK);
+		CacheHandler->setCullFace(true);
+	} else if (material.FrontfaceCulling) {
+		CacheHandler->setCullFaceFunc(GL_FRONT);
+		CacheHandler->setCullFace(true);
+	} else {
+		CacheHandler->setCullFace(false);
+	}
+
+	// Color Mask
+	CacheHandler->setColorMask(material.ColorMask);
+
+	// Blend Equation
+	if (material.BlendOperation == EBO_NONE)
+		CacheHandler->setBlend(false);
+	else {
+		CacheHandler->setBlend(true);
+
+#if defined(GL_EXT_blend_subtract) || defined(GL_EXT_blend_minmax) || defined(GL_EXT_blend_logic_op) || defined(GL_VERSION_1_4)
+		if (queryFeature(EVDF_BLEND_OPERATIONS)) {
+			switch (material.BlendOperation) {
+			case EBO_SUBTRACT:
+#if defined(GL_VERSION_1_4)
+				CacheHandler->setBlendEquation(GL_FUNC_SUBTRACT);
+#elif defined(GL_EXT_blend_subtract)
+				CacheHandler->setBlendEquation(GL_FUNC_SUBTRACT_EXT);
+#endif
+				break;
+			case EBO_REVSUBTRACT:
+#if defined(GL_VERSION_1_4)
+				CacheHandler->setBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+#elif defined(GL_EXT_blend_subtract)
+				CacheHandler->setBlendEquation(GL_FUNC_REVERSE_SUBTRACT_EXT);
+#endif
+				break;
+			case EBO_MIN:
+#if defined(GL_VERSION_1_4)
+				CacheHandler->setBlendEquation(GL_MIN);
+#elif defined(GL_EXT_blend_minmax)
+				CacheHandler->setBlendEquation(GL_MIN_EXT);
+#endif
+				break;
+			case EBO_MAX:
+#if defined(GL_VERSION_1_4)
+				CacheHandler->setBlendEquation(GL_MAX);
+#elif defined(GL_EXT_blend_minmax)
+				CacheHandler->setBlendEquation(GL_MAX_EXT);
+#endif
+				break;
+			case EBO_MIN_FACTOR:
+#if defined(GL_AMD_blend_minmax_factor)
+				if (FeatureAvailable[IRR_AMD_blend_minmax_factor])
+					CacheHandler->setBlendEquation(GL_FACTOR_MIN_AMD);
+#endif
+					// fallback in case of missing extension
+#if defined(GL_VERSION_1_4)
+#if defined(GL_AMD_blend_minmax_factor)
+				else
+#endif
+					CacheHandler->setBlendEquation(GL_MIN);
+#endif
+				break;
+			case EBO_MAX_FACTOR:
+#if defined(GL_AMD_blend_minmax_factor)
+				if (FeatureAvailable[IRR_AMD_blend_minmax_factor])
+					CacheHandler->setBlendEquation(GL_FACTOR_MAX_AMD);
+#endif
+					// fallback in case of missing extension
+#if defined(GL_VERSION_1_4)
+#if defined(GL_AMD_blend_minmax_factor)
+				else
+#endif
+					CacheHandler->setBlendEquation(GL_MAX);
+#endif
+				break;
+			case EBO_MIN_ALPHA:
+#if defined(GL_SGIX_blend_alpha_minmax)
+				if (FeatureAvailable[IRR_SGIX_blend_alpha_minmax])
+					CacheHandler->setBlendEquation(GL_ALPHA_MIN_SGIX);
+				// fallback in case of missing extension
+				else if (FeatureAvailable[IRR_EXT_blend_minmax])
+					CacheHandler->setBlendEquation(GL_MIN_EXT);
+#endif
+				break;
+			case EBO_MAX_ALPHA:
+#if defined(GL_SGIX_blend_alpha_minmax)
+				if (FeatureAvailable[IRR_SGIX_blend_alpha_minmax])
+					CacheHandler->setBlendEquation(GL_ALPHA_MAX_SGIX);
+				// fallback in case of missing extension
+				else if (FeatureAvailable[IRR_EXT_blend_minmax])
+					CacheHandler->setBlendEquation(GL_MAX_EXT);
+#endif
+				break;
+			default:
+#if defined(GL_VERSION_1_4)
+				CacheHandler->setBlendEquation(GL_FUNC_ADD);
+#elif defined(GL_EXT_blend_subtract) || defined(GL_EXT_blend_minmax) || defined(GL_EXT_blend_logic_op)
+				CacheHandler->setBlendEquation(GL_FUNC_ADD_EXT);
+#endif
+				break;
+			}
+		}
+#endif
+	}
+
+	// Blend Factor
+	if (IR(material.BlendFactor) & 0xFFFFFFFF // TODO: why the & 0xFFFFFFFF?
+			&& material.MaterialType != EMT_ONETEXTURE_BLEND) {
+		E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR dstRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR srcAlphaFact = EBF_ZERO;
+		E_BLEND_FACTOR dstAlphaFact = EBF_ZERO;
+		E_MODULATE_FUNC modulo = EMFN_MODULATE_1X;
+		u32 alphaSource = 0;
+
+		unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulo, alphaSource, material.BlendFactor);
+
+		if (queryFeature(EVDF_BLEND_SEPARATE)) {
+			CacheHandler->setBlendFuncSeparate(getGLBlend(srcRGBFact), getGLBlend(dstRGBFact),
+					getGLBlend(srcAlphaFact), getGLBlend(dstAlphaFact));
+		} else {
+			CacheHandler->setBlendFunc(getGLBlend(srcRGBFact), getGLBlend(dstRGBFact));
+		}
+	}
+
+	// Polygon Offset
+	if (queryFeature(EVDF_POLYGON_OFFSET) && (resetAllRenderStates ||
+													 lastmaterial.PolygonOffsetSlopeScale != material.PolygonOffsetSlopeScale ||
+													 lastmaterial.PolygonOffsetDepthBias != material.PolygonOffsetDepthBias)) {
+		glDisable(lastmaterial.Wireframe ? GL_POLYGON_OFFSET_LINE : lastmaterial.PointCloud ? GL_POLYGON_OFFSET_POINT
+																							: GL_POLYGON_OFFSET_FILL);
+		if (material.PolygonOffsetSlopeScale || material.PolygonOffsetDepthBias) {
+			glEnable(material.Wireframe ? GL_POLYGON_OFFSET_LINE : material.PointCloud ? GL_POLYGON_OFFSET_POINT
+																					   : GL_POLYGON_OFFSET_FILL);
+
+			glPolygonOffset(material.PolygonOffsetSlopeScale, material.PolygonOffsetDepthBias);
+		} else {
+			glPolygonOffset(0.0f, 0.f);
+		}
+	}
+
+	// thickness
+	if (resetAllRenderStates || lastmaterial.Thickness != material.Thickness) {
+		if (AntiAlias) {
+			//			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1]));
+			// we don't use point smoothing
+			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1]));
+			glLineWidth(core::clamp(static_cast<GLfloat>(material.Thickness), DimSmoothedLine[0], DimSmoothedLine[1]));
+		} else {
+			glPointSize(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1]));
+			glLineWidth(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedLine[0], DimAliasedLine[1]));
+		}
+	}
+
+	// Anti aliasing
+	if ((resetAllRenderStates || lastmaterial.AntiAliasing != material.AntiAliasing) && FeatureAvailable[IRR_ARB_multisample]) {
+		if (material.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+		else if (lastmaterial.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+
+		if ((AntiAlias >= 2) && (material.AntiAliasing & (EAAM_SIMPLE | EAAM_QUALITY))) {
+			glEnable(GL_MULTISAMPLE_ARB);
+#ifdef GL_NV_multisample_filter_hint
+			if (FeatureAvailable[IRR_NV_multisample_filter_hint]) {
+				if ((material.AntiAliasing & EAAM_QUALITY) == EAAM_QUALITY)
+					glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
+				else
+					glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_FASTEST);
+			}
+#endif
+		} else
+			glDisable(GL_MULTISAMPLE_ARB);
+	}
+
+	// Texture parameters
+	setTextureRenderStates(material, resetAllRenderStates);
+
+	// set current fixed pipeline state
+	FixedPipelineState = tempState;
+}
+
+//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+void COpenGLDriver::setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates)
+{
+	// Set textures to TU/TIU and apply filters to them
+
+	for (s32 i = Feature.MaxTextureUnits - 1; i >= 0; --i) {
+		bool fixedPipeline = false;
+
+		if (FixedPipelineState == EOFPS_ENABLE || FixedPipelineState == EOFPS_DISABLE_TO_ENABLE)
+			fixedPipeline = true;
+
+		const COpenGLTexture *tmpTexture = CacheHandler->getTextureCache().get(i);
+
+		if (tmpTexture) {
+			CacheHandler->setActiveTexture(GL_TEXTURE0 + i);
+
+			// Minetest uses the first texture matrix even with the programmable pipeline
+			if (fixedPipeline || i == 0) {
+				const bool isRTT = tmpTexture->isRenderTarget();
+
+				CacheHandler->setMatrixMode(GL_TEXTURE);
+
+				if (!isRTT && Matrices[ETS_TEXTURE_0 + i].isIdentity())
+					glLoadIdentity();
+				else {
+					GLfloat glmat[16];
+					if (isRTT)
+						getGLTextureMatrix(glmat, Matrices[ETS_TEXTURE_0 + i] * TextureFlipMatrix);
+					else
+						getGLTextureMatrix(glmat, Matrices[ETS_TEXTURE_0 + i]);
+					glLoadMatrixf(glmat);
+				}
+			}
+
+			const GLenum tmpType = tmpTexture->getOpenGLTextureType();
+
+			COpenGLTexture::SStatesCache &statesCache = tmpTexture->getStatesCache();
+
+			if (resetAllRenderstates)
+				statesCache.IsCached = false;
+
+#ifdef GL_VERSION_2_1
+			if (Version >= 201) {
+				if (!statesCache.IsCached || material.TextureLayers[i].LODBias != statesCache.LODBias) {
+					if (material.TextureLayers[i].LODBias) {
+						const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
+						glTexParameterf(tmpType, GL_TEXTURE_LOD_BIAS, tmp);
+					} else
+						glTexParameterf(tmpType, GL_TEXTURE_LOD_BIAS, 0.f);
+
+					statesCache.LODBias = material.TextureLayers[i].LODBias;
+				}
+			} else if (FeatureAvailable[IRR_EXT_texture_lod_bias]) {
+				if (material.TextureLayers[i].LODBias) {
+					const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
+					glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
+				} else
+					glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
+			}
+#elif defined(GL_EXT_texture_lod_bias)
+			if (FeatureAvailable[IRR_EXT_texture_lod_bias]) {
+				if (material.TextureLayers[i].LODBias) {
+					const float tmp = core::clamp(material.TextureLayers[i].LODBias * 0.125f, -MaxTextureLODBias, MaxTextureLODBias);
+					glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmp);
+				} else
+					glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.f);
+			}
+#endif
+
+			if (!statesCache.IsCached || material.TextureLayers[i].MagFilter != statesCache.MagFilter) {
+				E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter;
+				glTexParameteri(tmpType, GL_TEXTURE_MAG_FILTER,
+						magFilter == ETMAGF_NEAREST ? GL_NEAREST : (assert(magFilter == ETMAGF_LINEAR), GL_LINEAR));
+
+				statesCache.MagFilter = magFilter;
+			}
+
+			if (material.UseMipMaps && tmpTexture->hasMipMaps()) {
+				if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter ||
+						!statesCache.MipMapStatus) {
+					E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+					glTexParameteri(tmpType, GL_TEXTURE_MIN_FILTER,
+							minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST
+																							 : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR       ? GL_NEAREST_MIPMAP_LINEAR
+																																			   : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR));
+
+					statesCache.MinFilter = minFilter;
+					statesCache.MipMapStatus = true;
+				}
+			} else {
+				if (!statesCache.IsCached || material.TextureLayers[i].MinFilter != statesCache.MinFilter ||
+						statesCache.MipMapStatus) {
+					E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+					glTexParameteri(tmpType, GL_TEXTURE_MIN_FILTER,
+							(minFilter == ETMINF_NEAREST_MIPMAP_NEAREST || minFilter == ETMINF_NEAREST_MIPMAP_LINEAR) ? GL_NEAREST : (assert(minFilter == ETMINF_LINEAR_MIPMAP_NEAREST || minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR));
+
+					statesCache.MinFilter = minFilter;
+					statesCache.MipMapStatus = false;
+				}
+			}
+
+#ifdef GL_EXT_texture_filter_anisotropic
+			if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic] &&
+					(!statesCache.IsCached || material.TextureLayers[i].AnisotropicFilter != statesCache.AnisotropicFilter)) {
+				glTexParameteri(tmpType, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+						material.TextureLayers[i].AnisotropicFilter > 1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1);
+
+				statesCache.AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter;
+			}
+#endif
+
+			if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapU != statesCache.WrapU) {
+				glTexParameteri(tmpType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU));
+				statesCache.WrapU = material.TextureLayers[i].TextureWrapU;
+			}
+
+			if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapV != statesCache.WrapV) {
+				glTexParameteri(tmpType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV));
+				statesCache.WrapV = material.TextureLayers[i].TextureWrapV;
+			}
+
+			if (!statesCache.IsCached || material.TextureLayers[i].TextureWrapW != statesCache.WrapW) {
+				glTexParameteri(tmpType, GL_TEXTURE_WRAP_R, getTextureWrapMode(material.TextureLayers[i].TextureWrapW));
+				statesCache.WrapW = material.TextureLayers[i].TextureWrapW;
+			}
+
+			statesCache.IsCached = true;
+		}
+	}
+}
+
+//! Enable the 2d override material
+void COpenGLDriver::enableMaterial2D(bool enable)
+{
+	if (!enable)
+		CurrentRenderMode = ERM_NONE;
+	CNullDriver::enableMaterial2D(enable);
+}
+
+//! sets the needed renderstates
+void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
+{
+	// 2d methods uses fixed pipeline
+	if (FixedPipelineState == COpenGLDriver::EOFPS_DISABLE)
+		FixedPipelineState = COpenGLDriver::EOFPS_DISABLE_TO_ENABLE;
+	else
+		FixedPipelineState = COpenGLDriver::EOFPS_ENABLE;
+
+	bool resetAllRenderStates = false;
+
+	if (CurrentRenderMode != ERM_2D || Transformation3DChanged) {
+		// unset last 3d material
+		if (CurrentRenderMode == ERM_3D) {
+			if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+				MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+		}
+
+		if (Transformation3DChanged) {
+			CacheHandler->setMatrixMode(GL_PROJECTION);
+
+			const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+			core::matrix4 m(core::matrix4::EM4CONST_NOTHING);
+			m.buildProjectionMatrixOrthoLH(f32(renderTargetSize.Width), f32(-(s32)(renderTargetSize.Height)), -1.0f, 1.0f);
+			m.setTranslation(core::vector3df(-1, 1, 0));
+			glLoadMatrixf(m.pointer());
+
+			CacheHandler->setMatrixMode(GL_MODELVIEW);
+			glLoadIdentity();
+			glTranslatef(0.375f, 0.375f, 0.0f);
+
+			Transformation3DChanged = false;
+		}
+
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		CacheHandler->setBlendEquation(GL_FUNC_ADD);
+
+#ifdef GL_EXT_clip_volume_hint
+		if (FeatureAvailable[IRR_EXT_clip_volume_hint])
+			glHint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT, GL_FASTEST);
+#endif
+
+		resetAllRenderStates = true;
+	}
+
+	SMaterial currentMaterial = (!OverrideMaterial2DEnabled) ? InitMaterial2D : OverrideMaterial2D;
+	currentMaterial.Lighting = false;
+
+	if (texture) {
+		setTransform(ETS_TEXTURE_0, core::IdentityMatrix);
+
+		// Due to the transformation change, the previous line would call a reset each frame
+		// but we can safely reset the variable as it was false before
+		Transformation3DChanged = false;
+	} else {
+		CacheHandler->getTextureCache().set(0, 0);
+	}
+
+	setBasicRenderStates(currentMaterial, LastMaterial, resetAllRenderStates);
+
+	LastMaterial = currentMaterial;
+	CacheHandler->correctCacheMaterial(LastMaterial);
+
+	// no alphaChannel without texture
+	alphaChannel &= texture;
+
+	if (alphaChannel || alpha) {
+		CacheHandler->setBlend(true);
+		CacheHandler->setAlphaTest(true);
+		CacheHandler->setAlphaFunc(GL_GREATER, 0.f);
+	} else {
+		CacheHandler->setBlend(false);
+		CacheHandler->setAlphaTest(false);
+	}
+
+	if (texture) {
+		CacheHandler->setActiveTexture(GL_TEXTURE0_ARB);
+
+		if (alphaChannel) {
+			// if alpha and alpha texture just modulate, otherwise use only the alpha channel
+			if (alpha) {
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			} else {
+#if defined(GL_ARB_texture_env_combine) || defined(GL_EXT_texture_env_combine)
+				if (FeatureAvailable[IRR_ARB_texture_env_combine] || FeatureAvailable[IRR_EXT_texture_env_combine]) {
+#ifdef GL_ARB_texture_env_combine
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);
+					// rgb always modulates
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PRIMARY_COLOR_ARB);
+#else
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+					// rgb always modulates
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
+#endif
+				} else
+#endif
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			}
+		} else {
+			if (alpha) {
+#if defined(GL_ARB_texture_env_combine) || defined(GL_EXT_texture_env_combine)
+				if (FeatureAvailable[IRR_ARB_texture_env_combine] || FeatureAvailable[IRR_EXT_texture_env_combine]) {
+#ifdef GL_ARB_texture_env_combine
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_PRIMARY_COLOR_ARB);
+					// rgb always modulates
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PRIMARY_COLOR_ARB);
+#else
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+					// rgb always modulates
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PRIMARY_COLOR_EXT);
+#endif
+				} else
+#endif
+					glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			} else {
+				glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+			}
+		}
+	}
+
+	CurrentRenderMode = ERM_2D;
+}
+
+//! \return Returns the name of the video driver.
+const char *COpenGLDriver::getName() const
+{
+	return Name.c_str();
+}
+
+//! Sets the dynamic ambient light color. The default color is
+//! (0,0,0,0) which means it is dark.
+//! \param color: New color of the ambient light.
+void COpenGLDriver::setAmbientLight(const SColorf &color)
+{
+	CNullDriver::setAmbientLight(color);
+	GLfloat data[4] = {color.r, color.g, color.b, color.a};
+	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, data);
+}
+
+// this code was sent in by Oliver Klems, thank you! (I modified the glViewport
+// method just a bit.
+void COpenGLDriver::setViewPort(const core::rect<s32> &area)
+{
+	core::rect<s32> vp = area;
+	core::rect<s32> rendert(0, 0, getCurrentRenderTargetSize().Width, getCurrentRenderTargetSize().Height);
+	vp.clipAgainst(rendert);
+
+	if (vp.getHeight() > 0 && vp.getWidth() > 0)
+		CacheHandler->setViewport(vp.UpperLeftCorner.X, getCurrentRenderTargetSize().Height - vp.UpperLeftCorner.Y - vp.getHeight(), vp.getWidth(), vp.getHeight());
+
+	ViewPort = vp;
+}
+
+void COpenGLDriver::setViewPortRaw(u32 width, u32 height)
+{
+	CacheHandler->setViewport(0, 0, width, height);
+	ViewPort = core::recti(0, 0, width, height);
+}
+
+//! Sets the fog mode.
+void COpenGLDriver::setFog(SColor c, E_FOG_TYPE fogType, f32 start,
+		f32 end, f32 density, bool pixelFog, bool rangeFog)
+{
+	CNullDriver::setFog(c, fogType, start, end, density, pixelFog, rangeFog);
+
+	glFogf(GL_FOG_MODE, GLfloat((fogType == EFT_FOG_LINEAR) ? GL_LINEAR : (fogType == EFT_FOG_EXP) ? GL_EXP
+																								   : GL_EXP2));
+
+#ifdef GL_EXT_fog_coord
+	if (FeatureAvailable[IRR_EXT_fog_coord])
+		glFogi(GL_FOG_COORDINATE_SOURCE, GL_FRAGMENT_DEPTH);
+#endif
+#ifdef GL_NV_fog_distance
+	if (FeatureAvailable[IRR_NV_fog_distance]) {
+		if (rangeFog)
+			glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV);
+		else
+			glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV);
+	}
+#endif
+
+	if (fogType == EFT_FOG_LINEAR) {
+		glFogf(GL_FOG_START, start);
+		glFogf(GL_FOG_END, end);
+	} else
+		glFogf(GL_FOG_DENSITY, density);
+
+	if (pixelFog)
+		glHint(GL_FOG_HINT, GL_NICEST);
+	else
+		glHint(GL_FOG_HINT, GL_FASTEST);
+
+	SColorf color(c);
+	GLfloat data[4] = {color.r, color.g, color.b, color.a};
+	glFogfv(GL_FOG_COLOR, data);
+}
+
+//! Draws a 3d box.
+void COpenGLDriver::draw3DBox(const core::aabbox3d<f32> &box, SColor color)
+{
+	core::vector3df edges[8];
+	box.getEdges(edges);
+
+	setRenderStates3DMode();
+
+	video::S3DVertex v[24];
+
+	for (u32 i = 0; i < 24; i++)
+		v[i].Color = color;
+
+	v[0].Pos = edges[5];
+	v[1].Pos = edges[1];
+	v[2].Pos = edges[1];
+	v[3].Pos = edges[3];
+	v[4].Pos = edges[3];
+	v[5].Pos = edges[7];
+	v[6].Pos = edges[7];
+	v[7].Pos = edges[5];
+	v[8].Pos = edges[0];
+	v[9].Pos = edges[2];
+	v[10].Pos = edges[2];
+	v[11].Pos = edges[6];
+	v[12].Pos = edges[6];
+	v[13].Pos = edges[4];
+	v[14].Pos = edges[4];
+	v[15].Pos = edges[0];
+	v[16].Pos = edges[1];
+	v[17].Pos = edges[0];
+	v[18].Pos = edges[3];
+	v[19].Pos = edges[2];
+	v[20].Pos = edges[7];
+	v[21].Pos = edges[6];
+	v[22].Pos = edges[5];
+	v[23].Pos = edges[4];
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(v, 24, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, false);
+
+	glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(v))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(v))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	glDrawArrays(GL_LINES, 0, 24);
+}
+
+//! Draws a 3d line.
+void COpenGLDriver::draw3DLine(const core::vector3df &start,
+		const core::vector3df &end, SColor color)
+{
+	setRenderStates3DMode();
+
+	Quad2DVertices[0].Color = color;
+	Quad2DVertices[1].Color = color;
+
+	Quad2DVertices[0].Pos = core::vector3df((f32)start.X, (f32)start.Y, (f32)start.Z);
+	Quad2DVertices[1].Pos = core::vector3df((f32)end.X, (f32)end.Y, (f32)end.Z);
+
+	if (!FeatureAvailable[IRR_ARB_vertex_array_bgra] && !FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		getColorBuffer(Quad2DVertices, 2, EVT_STANDARD);
+
+	CacheHandler->setClientState(true, false, true, false);
+
+	glVertexPointer(3, GL_FLOAT, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Pos);
+
+#ifdef GL_BGRA
+	const GLint colorSize = (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra]) ? GL_BGRA : 4;
+#else
+	const GLint colorSize = 4;
+#endif
+	if (FeatureAvailable[IRR_ARB_vertex_array_bgra] || FeatureAvailable[IRR_EXT_vertex_array_bgra])
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, sizeof(S3DVertex), &(static_cast<const S3DVertex *>(Quad2DVertices))[0].Color);
+	else {
+		_IRR_DEBUG_BREAK_IF(ColorBuffer.size() == 0);
+		glColorPointer(colorSize, GL_UNSIGNED_BYTE, 0, &ColorBuffer[0]);
+	}
+
+	glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, Quad2DIndices);
+}
+
+//! Removes a texture from the texture cache and deletes it, freeing lot of memory.
+void COpenGLDriver::removeTexture(ITexture *texture)
+{
+	CacheHandler->getTextureCache().remove(texture);
+	CNullDriver::removeTexture(texture);
+}
+
+//! Check if the driver supports creating textures with the given color format
+bool COpenGLDriver::queryTextureFormat(ECOLOR_FORMAT format) const
+{
+	GLint dummyInternalFormat;
+	GLenum dummyPixelFormat;
+	GLenum dummyPixelType;
+	void (*dummyConverter)(const void *, s32, void *);
+	return getColorFormatParameters(format, dummyInternalFormat, dummyPixelFormat, dummyPixelType, &dummyConverter);
+}
+
+bool COpenGLDriver::needsTransparentRenderPass(const irr::video::SMaterial &material) const
+{
+	return CNullDriver::needsTransparentRenderPass(material) || material.isAlphaBlendOperation();
+}
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void COpenGLDriver::OnResize(const core::dimension2d<u32> &size)
+{
+	CNullDriver::OnResize(size);
+	CacheHandler->setViewport(0, 0, size.Width, size.Height);
+	Transformation3DChanged = true;
+}
+
+//! Returns type of video driver
+E_DRIVER_TYPE COpenGLDriver::getDriverType() const
+{
+	return EDT_OPENGL;
+}
+
+//! returns color format
+ECOLOR_FORMAT COpenGLDriver::getColorFormat() const
+{
+	return ColorFormat;
+}
+
+//! Get a vertex shader constant index.
+s32 COpenGLDriver::getVertexShaderConstantID(const c8 *name)
+{
+	return getPixelShaderConstantID(name);
+}
+
+//! Get a pixel shader constant index.
+s32 COpenGLDriver::getPixelShaderConstantID(const c8 *name)
+{
+	os::Printer::log("Error: Please call services->getPixelShaderConstantID(), not VideoDriver->getPixelShaderConstantID().");
+	return -1;
+}
+
+//! Sets a constant for the vertex shader based on an index.
+bool COpenGLDriver::setVertexShaderConstant(s32 index, const f32 *floats, int count)
+{
+	// pass this along, as in GLSL the same routine is used for both vertex and fragment shaders
+	return setPixelShaderConstant(index, floats, count);
+}
+
+//! Int interface for the above.
+bool COpenGLDriver::setVertexShaderConstant(s32 index, const s32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+//! Uint interface for the above.
+bool COpenGLDriver::setVertexShaderConstant(s32 index, const u32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+//! Sets a constant for the pixel shader based on an index.
+bool COpenGLDriver::setPixelShaderConstant(s32 index, const f32 *floats, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Int interface for the above.
+bool COpenGLDriver::setPixelShaderConstant(s32 index, const s32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+bool COpenGLDriver::setPixelShaderConstant(s32 index, const u32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
+s32 COpenGLDriver::addHighLevelShaderMaterial(
+		const c8 *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8 *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const c8 *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType,
+		scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	s32 nr = -1;
+
+	COpenGLSLMaterialRenderer *r = new COpenGLSLMaterialRenderer(
+			this, nr,
+			vertexShaderProgram, vertexShaderEntryPointName, vsCompileTarget,
+			pixelShaderProgram, pixelShaderEntryPointName, psCompileTarget,
+			geometryShaderProgram, geometryShaderEntryPointName, gsCompileTarget,
+			inType, outType, verticesOut,
+			callback, baseMaterial, userData);
+
+	r->drop();
+
+	return nr;
+}
+
+//! Returns a pointer to the IVideoDriver interface. (Implementation for
+//! IMaterialRendererServices)
+IVideoDriver *COpenGLDriver::getVideoDriver()
+{
+	return this;
+}
+
+ITexture *COpenGLDriver::addRenderTargetTexture(const core::dimension2d<u32> &size,
+		const io::path &name, const ECOLOR_FORMAT format)
+{
+	if (IImage::isCompressedFormat(format))
+		return 0;
+
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	core::dimension2du destSize(size);
+
+	if (!supportForFBO) {
+		destSize = core::dimension2d<u32>(core::min_(size.Width, ScreenSize.Width), core::min_(size.Height, ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size == size.getOptimalSize()), false, false);
+	}
+
+	COpenGLTexture *renderTargetTexture = new COpenGLTexture(name, destSize, ETT_2D, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+//! Creates a render target texture for a cubemap
+ITexture *COpenGLDriver::addRenderTargetTextureCubemap(const irr::u32 sideLen, const io::path &name, const ECOLOR_FORMAT format)
+{
+	if (IImage::isCompressedFormat(format))
+		return 0;
+
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	const core::dimension2d<u32> size(sideLen, sideLen);
+	core::dimension2du destSize(size);
+
+	if (!supportForFBO) {
+		destSize = core::dimension2d<u32>(core::min_(size.Width, ScreenSize.Width), core::min_(size.Height, ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size == size.getOptimalSize()), false, false);
+	}
+
+	COpenGLTexture *renderTargetTexture = new COpenGLTexture(name, destSize, ETT_CUBEMAP, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+//! Returns the maximum amount of primitives (mostly vertices) which
+//! the device is able to render with one drawIndexedTriangleList
+//! call.
+u32 COpenGLDriver::getMaximalPrimitiveCount() const
+{
+	return 0x7fffffff;
+}
+
+bool COpenGLDriver::setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil)
+{
+	if (target && target->getDriverType() != EDT_OPENGL) {
+		os::Printer::log("Fatal Error: Tried to set a render target not owned by this driver.", ELL_ERROR);
+		return false;
+	}
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	core::dimension2d<u32> destRenderTargetSize(0, 0);
+
+	if (target) {
+		COpenGLRenderTarget *renderTarget = static_cast<COpenGLRenderTarget *>(target);
+
+		if (supportForFBO) {
+			CacheHandler->setFBO(renderTarget->getBufferID());
+			renderTarget->update();
+		}
+
+		destRenderTargetSize = renderTarget->getSize();
+
+		setViewPortRaw(destRenderTargetSize.Width, destRenderTargetSize.Height);
+	} else {
+		if (supportForFBO)
+			CacheHandler->setFBO(0);
+		else {
+			COpenGLRenderTarget *prevRenderTarget = static_cast<COpenGLRenderTarget *>(CurrentRenderTarget);
+			COpenGLTexture *renderTargetTexture = static_cast<COpenGLTexture *>(prevRenderTarget->getTexture());
+
+			if (renderTargetTexture) {
+				const COpenGLTexture *prevTexture = CacheHandler->getTextureCache()[0];
+
+				CacheHandler->getTextureCache().set(0, renderTargetTexture);
+
+				const core::dimension2d<u32> size = renderTargetTexture->getSize();
+				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, size.Width, size.Height);
+
+				CacheHandler->getTextureCache().set(0, prevTexture);
+			}
+		}
+
+		destRenderTargetSize = core::dimension2d<u32>(0, 0);
+
+		setViewPortRaw(ScreenSize.Width, ScreenSize.Height);
+	}
+
+	if (CurrentRenderTargetSize != destRenderTargetSize) {
+		CurrentRenderTargetSize = destRenderTargetSize;
+
+		Transformation3DChanged = true;
+	}
+
+	CurrentRenderTarget = target;
+
+	if (!supportForFBO) {
+		clearFlag |= ECBF_COLOR;
+		clearFlag |= ECBF_DEPTH;
+	}
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+void COpenGLDriver::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
+{
+	GLbitfield mask = 0;
+	u8 colorMask = 0;
+	bool depthMask = false;
+
+	CacheHandler->getColorMask(colorMask);
+	CacheHandler->getDepthMask(depthMask);
+
+	if (flag & ECBF_COLOR) {
+		CacheHandler->setColorMask(ECP_ALL);
+
+		const f32 inv = 1.0f / 255.0f;
+		glClearColor(color.getRed() * inv, color.getGreen() * inv,
+				color.getBlue() * inv, color.getAlpha() * inv);
+
+		mask |= GL_COLOR_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_DEPTH) {
+		CacheHandler->setDepthMask(true);
+		glClearDepth(depth);
+		mask |= GL_DEPTH_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_STENCIL) {
+		glClearStencil(stencil);
+		mask |= GL_STENCIL_BUFFER_BIT;
+	}
+
+	if (mask)
+		glClear(mask);
+
+	CacheHandler->setColorMask(colorMask);
+	CacheHandler->setDepthMask(depthMask);
+}
+
+//! Returns an image created from the last rendered frame.
+IImage *COpenGLDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
+{
+	if (target != video::ERT_FRAME_BUFFER)
+		return 0;
+
+	if (format == video::ECF_UNKNOWN)
+		format = getColorFormat();
+
+	// TODO: Maybe we could support more formats (floating point and some of those beyond ECF_R8), didn't really try yet
+	if (IImage::isCompressedFormat(format) || IImage::isDepthFormat(format) || IImage::isFloatingPointFormat(format) || format >= ECF_R8)
+		return 0;
+
+		// allows to read pixels in top-to-bottom order
+#ifdef GL_MESA_pack_invert
+	if (FeatureAvailable[IRR_MESA_pack_invert])
+		glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+#endif
+
+	GLenum fmt;
+	GLenum type;
+
+	switch (format) {
+	case ECF_A1R5G5B5:
+		fmt = GL_BGRA;
+		type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+		break;
+	case ECF_R5G6B5:
+		fmt = GL_RGB;
+		type = GL_UNSIGNED_SHORT_5_6_5;
+		break;
+	case ECF_R8G8B8:
+		fmt = GL_RGB;
+		type = GL_UNSIGNED_BYTE;
+		break;
+	case ECF_A8R8G8B8:
+		fmt = GL_BGRA;
+		if (Version > 101)
+			type = GL_UNSIGNED_INT_8_8_8_8_REV;
+		else
+			type = GL_UNSIGNED_BYTE;
+		break;
+	default:
+		fmt = GL_BGRA;
+		type = GL_UNSIGNED_BYTE;
+		break;
+	}
+	IImage *newImage = createImage(format, ScreenSize);
+
+	u8 *pixels = 0;
+	if (newImage)
+		pixels = static_cast<u8 *>(newImage->getData());
+	if (pixels) {
+		glReadBuffer(Params.Doublebuffer ? GL_BACK : GL_FRONT);
+		glReadPixels(0, 0, ScreenSize.Width, ScreenSize.Height, fmt, type, pixels);
+		testGLError(__LINE__);
+		glReadBuffer(GL_BACK);
+	}
+
+#ifdef GL_MESA_pack_invert
+	if (FeatureAvailable[IRR_MESA_pack_invert])
+		glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE);
+	else
+#endif
+			if (pixels && newImage) {
+		// opengl images are horizontally flipped, so we have to fix that here.
+		const s32 pitch = newImage->getPitch();
+		u8 *p2 = pixels + (ScreenSize.Height - 1) * pitch;
+		u8 *tmpBuffer = new u8[pitch];
+		for (u32 i = 0; i < ScreenSize.Height; i += 2) {
+			memcpy(tmpBuffer, pixels, pitch);
+			//			for (u32 j=0; j<pitch; ++j)
+			//			{
+			//				pixels[j]=(u8)(p2[j]*255.f);
+			//			}
+			memcpy(pixels, p2, pitch);
+			//			for (u32 j=0; j<pitch; ++j)
+			//			{
+			//				p2[j]=(u8)(tmpBuffer[j]*255.f);
+			//			}
+			memcpy(p2, tmpBuffer, pitch);
+			pixels += pitch;
+			p2 -= pitch;
+		}
+		delete[] tmpBuffer;
+	}
+
+	if (newImage) {
+		if (testGLError(__LINE__) || !pixels) {
+			os::Printer::log("createScreenShot failed", ELL_ERROR);
+			newImage->drop();
+			return 0;
+		}
+	}
+	return newImage;
+}
+
+//! Set/unset a clipping plane.
+bool COpenGLDriver::setClipPlane(u32 index, const core::plane3df &plane, bool enable)
+{
+	if (index >= MaxUserClipPlanes)
+		return false;
+
+	UserClipPlanes[index].Plane = plane;
+	enableClipPlane(index, enable);
+	return true;
+}
+
+void COpenGLDriver::uploadClipPlane(u32 index)
+{
+	// opengl needs an array of doubles for the plane equation
+	GLdouble clip_plane[4];
+	clip_plane[0] = UserClipPlanes[index].Plane.Normal.X;
+	clip_plane[1] = UserClipPlanes[index].Plane.Normal.Y;
+	clip_plane[2] = UserClipPlanes[index].Plane.Normal.Z;
+	clip_plane[3] = UserClipPlanes[index].Plane.D;
+	glClipPlane(GL_CLIP_PLANE0 + index, clip_plane);
+}
+
+//! Enable/disable a clipping plane.
+void COpenGLDriver::enableClipPlane(u32 index, bool enable)
+{
+	if (index >= MaxUserClipPlanes)
+		return;
+	if (enable) {
+		if (!UserClipPlanes[index].Enabled) {
+			uploadClipPlane(index);
+			glEnable(GL_CLIP_PLANE0 + index);
+		}
+	} else
+		glDisable(GL_CLIP_PLANE0 + index);
+
+	UserClipPlanes[index].Enabled = enable;
+}
+
+core::dimension2du COpenGLDriver::getMaxTextureSize() const
+{
+	return core::dimension2du(MaxTextureSize, MaxTextureSize);
+}
+
+//! Convert E_PRIMITIVE_TYPE to OpenGL equivalent
+GLenum COpenGLDriver::primitiveTypeToGL(scene::E_PRIMITIVE_TYPE type) const
+{
+	switch (type) {
+	case scene::EPT_POINTS:
+		return GL_POINTS;
+	case scene::EPT_LINE_STRIP:
+		return GL_LINE_STRIP;
+	case scene::EPT_LINE_LOOP:
+		return GL_LINE_LOOP;
+	case scene::EPT_LINES:
+		return GL_LINES;
+	case scene::EPT_TRIANGLE_STRIP:
+		return GL_TRIANGLE_STRIP;
+	case scene::EPT_TRIANGLE_FAN:
+		return GL_TRIANGLE_FAN;
+	case scene::EPT_TRIANGLES:
+		return GL_TRIANGLES;
+	case scene::EPT_POINT_SPRITES:
+#ifdef GL_ARB_point_sprite
+		return GL_POINT_SPRITE_ARB;
+#else
+		return GL_POINTS;
+#endif
+	}
+	return GL_TRIANGLES;
+}
+
+GLenum COpenGLDriver::getGLBlend(E_BLEND_FACTOR factor) const
+{
+	GLenum r = 0;
+	switch (factor) {
+	case EBF_ZERO:
+		r = GL_ZERO;
+		break;
+	case EBF_ONE:
+		r = GL_ONE;
+		break;
+	case EBF_DST_COLOR:
+		r = GL_DST_COLOR;
+		break;
+	case EBF_ONE_MINUS_DST_COLOR:
+		r = GL_ONE_MINUS_DST_COLOR;
+		break;
+	case EBF_SRC_COLOR:
+		r = GL_SRC_COLOR;
+		break;
+	case EBF_ONE_MINUS_SRC_COLOR:
+		r = GL_ONE_MINUS_SRC_COLOR;
+		break;
+	case EBF_SRC_ALPHA:
+		r = GL_SRC_ALPHA;
+		break;
+	case EBF_ONE_MINUS_SRC_ALPHA:
+		r = GL_ONE_MINUS_SRC_ALPHA;
+		break;
+	case EBF_DST_ALPHA:
+		r = GL_DST_ALPHA;
+		break;
+	case EBF_ONE_MINUS_DST_ALPHA:
+		r = GL_ONE_MINUS_DST_ALPHA;
+		break;
+	case EBF_SRC_ALPHA_SATURATE:
+		r = GL_SRC_ALPHA_SATURATE;
+		break;
+	}
+	return r;
+}
+
+GLenum COpenGLDriver::getZBufferBits() const
+{
+	GLenum bits = 0;
+	switch (Params.ZBufferBits) {
+	case 16:
+		bits = GL_DEPTH_COMPONENT16;
+		break;
+	case 24:
+		bits = GL_DEPTH_COMPONENT24;
+		break;
+	case 32:
+		bits = GL_DEPTH_COMPONENT32;
+		break;
+	default:
+		bits = GL_DEPTH_COMPONENT;
+		break;
+	}
+	return bits;
+}
+
+bool COpenGLDriver::getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+		GLenum &pixelType, void (**converter)(const void *, s32, void *)) const
+{
+	// NOTE: Converter variable not used here, but don't remove, it's used in the OGL-ES drivers.
+
+	bool supported = false;
+	internalFormat = GL_RGBA;
+	pixelFormat = GL_RGBA;
+	pixelType = GL_UNSIGNED_BYTE;
+
+	switch (format) {
+	case ECF_A1R5G5B5:
+		supported = true;
+		internalFormat = GL_RGBA;
+		pixelFormat = GL_BGRA_EXT;
+		pixelType = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+		break;
+	case ECF_R5G6B5:
+		supported = true;
+		internalFormat = GL_RGB;
+		pixelFormat = GL_RGB;
+		pixelType = GL_UNSIGNED_SHORT_5_6_5;
+		break;
+	case ECF_R8G8B8:
+		supported = true;
+		internalFormat = GL_RGB;
+		pixelFormat = GL_RGB;
+		pixelType = GL_UNSIGNED_BYTE;
+		break;
+	case ECF_A8R8G8B8:
+		supported = true;
+		internalFormat = GL_RGBA;
+		pixelFormat = GL_BGRA_EXT;
+		if (Version > 101)
+			pixelType = GL_UNSIGNED_INT_8_8_8_8_REV;
+		break;
+	case ECF_D16:
+		supported = true;
+		internalFormat = GL_DEPTH_COMPONENT16;
+		pixelFormat = GL_DEPTH_COMPONENT;
+		pixelType = GL_UNSIGNED_SHORT;
+		break;
+	case ECF_D32:
+		supported = true;
+		internalFormat = GL_DEPTH_COMPONENT32;
+		pixelFormat = GL_DEPTH_COMPONENT;
+		pixelType = GL_UNSIGNED_INT;
+		break;
+	case ECF_D24S8:
+#ifdef GL_VERSION_3_0
+		if (Version >= 300) {
+			supported = true;
+			internalFormat = GL_DEPTH_STENCIL;
+			pixelFormat = GL_DEPTH_STENCIL;
+			pixelType = GL_UNSIGNED_INT_24_8;
+		} else
+#endif
+#ifdef GL_EXT_packed_depth_stencil
+				if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_EXT_packed_depth_stencil)) {
+			supported = true;
+			internalFormat = GL_DEPTH_STENCIL_EXT;
+			pixelFormat = GL_DEPTH_STENCIL_EXT;
+			pixelType = GL_UNSIGNED_INT_24_8_EXT;
+		}
+#endif
+		break;
+	case ECF_R8:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_R8;
+			pixelFormat = GL_RED;
+			pixelType = GL_UNSIGNED_BYTE;
+		}
+		break;
+	case ECF_R8G8:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_RG8;
+			pixelFormat = GL_RG;
+			pixelType = GL_UNSIGNED_BYTE;
+		}
+		break;
+	case ECF_R16:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_R16;
+			pixelFormat = GL_RED;
+			pixelType = GL_UNSIGNED_SHORT;
+		}
+		break;
+	case ECF_R16G16:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_RG16;
+			pixelFormat = GL_RG;
+			pixelType = GL_UNSIGNED_SHORT;
+		}
+		break;
+	case ECF_R16F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_R16F;
+			pixelFormat = GL_RED;
+#ifdef GL_ARB_half_float_pixel
+			if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_half_float_pixel))
+				pixelType = GL_HALF_FLOAT_ARB;
+			else
+#endif
+				pixelType = GL_FLOAT;
+		}
+		break;
+	case ECF_G16R16F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_RG16F;
+			pixelFormat = GL_RG;
+#ifdef GL_ARB_half_float_pixel
+			if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_half_float_pixel))
+				pixelType = GL_HALF_FLOAT_ARB;
+			else
+#endif
+				pixelType = GL_FLOAT;
+		}
+		break;
+	case ECF_A16B16G16R16F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_float)) {
+			supported = true;
+			internalFormat = GL_RGBA16F_ARB;
+			pixelFormat = GL_RGBA;
+#ifdef GL_ARB_half_float_pixel
+			if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_half_float_pixel))
+				pixelType = GL_HALF_FLOAT_ARB;
+			else
+#endif
+				pixelType = GL_FLOAT;
+		}
+		break;
+	case ECF_R32F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_R32F;
+			pixelFormat = GL_RED;
+			pixelType = GL_FLOAT;
+		}
+		break;
+	case ECF_G32R32F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_rg)) {
+			supported = true;
+			internalFormat = GL_RG32F;
+			pixelFormat = GL_RG;
+			pixelType = GL_FLOAT;
+		}
+		break;
+	case ECF_A32B32G32R32F:
+		if (queryOpenGLFeature(COpenGLExtensionHandler::IRR_ARB_texture_float)) {
+			supported = true;
+			internalFormat = GL_RGBA32F_ARB;
+			pixelFormat = GL_RGBA;
+			pixelType = GL_FLOAT;
+		}
+		break;
+	default:
+		break;
+	}
+
+	return supported;
+}
+
+COpenGLDriver::E_OPENGL_FIXED_PIPELINE_STATE COpenGLDriver::getFixedPipelineState() const
+{
+	return FixedPipelineState;
+}
+
+void COpenGLDriver::setFixedPipelineState(COpenGLDriver::E_OPENGL_FIXED_PIPELINE_STATE state)
+{
+	FixedPipelineState = state;
+}
+
+const SMaterial &COpenGLDriver::getCurrentMaterial() const
+{
+	return Material;
+}
+
+COpenGLCacheHandler *COpenGLDriver::getCacheHandler() const
+{
+	return CacheHandler;
+}
+
+} // end namespace
+} // end namespace
+
+#endif // _IRR_COMPILE_WITH_OPENGL_
+
+namespace irr
+{
+namespace video
+{
+
+IVideoDriver *createOpenGLDriver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+	COpenGLDriver *ogl = new COpenGLDriver(params, io, contextManager);
+
+	if (!ogl->initDriver()) {
+		ogl->drop();
+		ogl = 0;
+	}
+
+	return ogl;
+#else
+	return 0;
+#endif
+}
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/COpenGLDriver.h b/irr/src/COpenGLDriver.h
new file mode 100644
index 000000000..6fe8ac37d
--- /dev/null
+++ b/irr/src/COpenGLDriver.h
@@ -0,0 +1,437 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include "SIrrCreationParameters.h"
+
+namespace irr
+{
+class CIrrDeviceWin32;
+class CIrrDeviceLinux;
+class CIrrDeviceSDL;
+class CIrrDeviceMacOSX;
+}
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "IMaterialRendererServices.h"
+#include "CNullDriver.h"
+
+#include "COpenGLExtensionHandler.h"
+#include "IContextManager.h"
+
+namespace irr
+{
+
+namespace video
+{
+class IContextManager;
+
+class COpenGLDriver : public CNullDriver, public IMaterialRendererServices, public COpenGLExtensionHandler
+{
+public:
+	// Information about state of fixed pipeline activity.
+	enum E_OPENGL_FIXED_PIPELINE_STATE
+	{
+		EOFPS_ENABLE = 0,        // fixed pipeline.
+		EOFPS_DISABLE,           // programmable pipeline.
+		EOFPS_ENABLE_TO_DISABLE, // switch from fixed to programmable pipeline.
+		EOFPS_DISABLE_TO_ENABLE  // switch from programmable to fixed pipeline.
+	};
+
+	COpenGLDriver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+
+	bool initDriver();
+
+	//! destructor
+	virtual ~COpenGLDriver();
+
+	virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), f32 clearDepth = 1.f, u8 clearStencil = 0,
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0) override;
+
+	bool endScene() override;
+
+	//! sets transformation
+	void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat) override;
+
+	struct SHWBufferLink_opengl : public SHWBufferLink
+	{
+		SHWBufferLink_opengl(const scene::IMeshBuffer *_MeshBuffer) :
+				SHWBufferLink(_MeshBuffer), vbo_verticesID(0), vbo_indicesID(0) {}
+
+		GLuint vbo_verticesID; // tmp
+		GLuint vbo_indicesID;  // tmp
+
+		GLuint vbo_verticesSize; // tmp
+		GLuint vbo_indicesSize;  // tmp
+	};
+
+	//! updates hardware buffer if needed
+	bool updateHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Create hardware buffer from mesh
+	SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer *mb) override;
+
+	//! Delete hardware buffer (only some drivers can)
+	void deleteHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Draw hardware buffer
+	void drawHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Create occlusion query.
+	/** Use node for identification and mesh for occlusion test. */
+	virtual void addOcclusionQuery(scene::ISceneNode *node,
+			const scene::IMesh *mesh = 0) override;
+
+	//! Remove occlusion query.
+	void removeOcclusionQuery(scene::ISceneNode *node) override;
+
+	//! Run occlusion query. Draws mesh stored in query.
+	/** If the mesh shall not be rendered visible, use
+	overrideMaterial to disable the color and depth buffer. */
+	void runOcclusionQuery(scene::ISceneNode *node, bool visible = false) override;
+
+	//! Update occlusion query. Retrieves results from GPU.
+	/** If the query shall not block, set the flag to false.
+	Update might not occur in this case, though */
+	void updateOcclusionQuery(scene::ISceneNode *node, bool block = true) override;
+
+	//! Return query result.
+	/** Return value is the number of visible pixels/fragments.
+	The value is a safe approximation, i.e. can be larger then the
+	actual value of pixels. */
+	u32 getOcclusionQueryResult(scene::ISceneNode *node) const override;
+
+	//! Create render target.
+	IRenderTarget *addRenderTarget() override;
+
+	//! draws a vertex primitive list
+	virtual void drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) override;
+
+	//! draws a vertex primitive list in 2d
+	virtual void draw2DVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) override;
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const override
+	{
+		return FeatureEnabled[feature] && COpenGLExtensionHandler::queryFeature(feature);
+	}
+
+	//! Disable a feature of the driver.
+	void disableFeature(E_VIDEO_DRIVER_FEATURE feature, bool flag = true) override;
+
+	//! Sets a material. All 3d drawing functions draw geometry now
+	//! using this material.
+	//! \param material: Material to be used from now on.
+	void setMaterial(const SMaterial &material) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255), bool useAlphaChannelOfTexture = false) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			const video::SColor *const colors = 0, bool useAlphaChannelOfTexture = false) override;
+
+	// Explicitly bring in base class methods, otherwise
+	// this overload would hide them.
+	using CNullDriver::draw2DImage;
+	virtual void draw2DImage(const video::ITexture *texture, u32 layer, bool flip);
+
+	//! draws a set of 2d images, using a color and the alpha channel of the
+	//! texture if desired.
+	void draw2DImageBatch(const video::ITexture *texture,
+			const core::array<core::position2d<s32>> &positions,
+			const core::array<core::rect<s32>> &sourceRects,
+			const core::rect<s32> *clipRect,
+			SColor color,
+			bool useAlphaChannelOfTexture) override;
+
+	//! draw an 2d rectangle
+	virtual void draw2DRectangle(SColor color, const core::rect<s32> &pos,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws an 2d rectangle with a gradient.
+	virtual void draw2DRectangle(const core::rect<s32> &pos,
+			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws a 2d line.
+	virtual void draw2DLine(const core::position2d<s32> &start,
+			const core::position2d<s32> &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Draws a 3d box
+	void draw3DBox(const core::aabbox3d<f32> &box, SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Draws a 3d line.
+	virtual void draw3DLine(const core::vector3df &start,
+			const core::vector3df &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! \return Returns the name of the video driver. Example: In case of the Direct3D8
+	//! driver, it would return "Direct3D8.1".
+	const char *getName() const override;
+
+	//! Sets the dynamic ambient light color. The default color is
+	//! (0,0,0,0) which means it is dark.
+	//! \param color: New color of the ambient light.
+	void setAmbientLight(const SColorf &color) override;
+
+	//! sets a viewport
+	void setViewPort(const core::rect<s32> &area) override;
+
+	//! Sets the fog mode.
+	virtual void setFog(SColor color, E_FOG_TYPE fogType, f32 start,
+			f32 end, f32 density, bool pixelFog, bool rangeFog) override;
+
+	//! Only used by the internal engine. Used to notify the driver that
+	//! the window was resized.
+	void OnResize(const core::dimension2d<u32> &size) override;
+
+	//! Returns type of video driver
+	E_DRIVER_TYPE getDriverType() const override;
+
+	//! get color format of the current color buffer
+	ECOLOR_FORMAT getColorFormat() const override;
+
+	//! Returns the transformation set by setTransform
+	const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override;
+
+	//! Can be called by an IMaterialRenderer to make its work easier.
+	virtual void setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial,
+			bool resetAllRenderstates) override;
+
+	//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+	virtual void setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates);
+
+	//! Get a vertex shader constant index.
+	s32 getVertexShaderConstantID(const c8 *name) override;
+
+	//! Get a pixel shader constant index.
+	s32 getPixelShaderConstantID(const c8 *name) override;
+
+	//! Sets a constant for the vertex shader based on an index.
+	bool setVertexShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setVertexShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setVertexShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! Sets a constant for the pixel shader based on an index.
+	bool setPixelShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setPixelShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setPixelShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! disables all textures beginning with the optional fromStage parameter. Otherwise all texture stages are disabled.
+	//! Returns whether disabling was successful or not.
+	bool disableTextures(u32 fromStage = 0);
+
+	//! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
+	virtual s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName,
+			E_VERTEX_SHADER_TYPE vsCompileTarget,
+			const c8 *pixelShaderProgram,
+			const c8 *pixelShaderEntryPointName,
+			E_PIXEL_SHADER_TYPE psCompileTarget,
+			const c8 *geometryShaderProgram,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) override;
+
+	//! Returns a pointer to the IVideoDriver interface. (Implementation for
+	//! IMaterialRendererServices)
+	IVideoDriver *getVideoDriver() override;
+
+	//! Returns the maximum amount of primitives (mostly vertices) which
+	//! the device is able to render with one drawIndexedTriangleList
+	//! call.
+	u32 getMaximalPrimitiveCount() const override;
+
+	virtual ITexture *addRenderTargetTexture(const core::dimension2d<u32> &size,
+			const io::path &name, const ECOLOR_FORMAT format = ECF_UNKNOWN) override;
+
+	//! Creates a render target texture for a cubemap
+	ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+			const io::path &name, const ECOLOR_FORMAT format) override;
+
+	virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) override;
+
+	void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) override;
+
+	//! Returns an image created from the last rendered frame.
+	IImage *createScreenShot(video::ECOLOR_FORMAT format = video::ECF_UNKNOWN, video::E_RENDER_TARGET target = video::ERT_FRAME_BUFFER) override;
+
+	//! checks if an OpenGL error has happened and prints it (+ some internal code which is usually the line number)
+	//! for performance reasons only available in debug mode
+	bool testGLError(int code = 0);
+
+	//! Set/unset a clipping plane.
+	//! There are at least 6 clipping planes available for the user to set at will.
+	//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
+	//! \param plane: The plane itself.
+	//! \param enable: If true, enable the clipping plane else disable it.
+	bool setClipPlane(u32 index, const core::plane3df &plane, bool enable = false) override;
+
+	//! Enable/disable a clipping plane.
+	//! There are at least 6 clipping planes available for the user to set at will.
+	//! \param index: The plane index. Must be between 0 and MaxUserClipPlanes.
+	//! \param enable: If true, enable the clipping plane else disable it.
+	void enableClipPlane(u32 index, bool enable) override;
+
+	//! Enable the 2d override material
+	void enableMaterial2D(bool enable = true) override;
+
+	//! Returns the graphics card vendor name.
+	core::stringc getVendorInfo() override { return VendorName; }
+
+	//! Returns the maximum texture size supported.
+	core::dimension2du getMaxTextureSize() const override;
+
+	//! Removes a texture from the texture cache and deletes it, freeing lot of memory.
+	void removeTexture(ITexture *texture) override;
+
+	//! Check if the driver supports creating textures with the given color format
+	bool queryTextureFormat(ECOLOR_FORMAT format) const override;
+
+	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
+	bool needsTransparentRenderPass(const irr::video::SMaterial &material) const override;
+
+	//! Convert E_PRIMITIVE_TYPE to OpenGL equivalent
+	GLenum primitiveTypeToGL(scene::E_PRIMITIVE_TYPE type) const;
+
+	//! Convert E_BLEND_FACTOR to OpenGL equivalent
+	GLenum getGLBlend(E_BLEND_FACTOR factor) const;
+
+	//! Get ZBuffer bits.
+	GLenum getZBufferBits() const;
+
+	bool getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+			GLenum &pixelType, void (**converter)(const void *, s32, void *)) const;
+
+	//! Return info about fixed pipeline state.
+	E_OPENGL_FIXED_PIPELINE_STATE getFixedPipelineState() const;
+
+	//! Set info about fixed pipeline state.
+	void setFixedPipelineState(E_OPENGL_FIXED_PIPELINE_STATE state);
+
+	//! Get current material.
+	const SMaterial &getCurrentMaterial() const;
+
+	COpenGLCacheHandler *getCacheHandler() const;
+
+private:
+	bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+	bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+
+	void uploadClipPlane(u32 index);
+
+	//! inits the parts of the open gl driver used on all platforms
+	bool genericDriverInit();
+
+	ITexture *createDeviceDependentTexture(const io::path &name, IImage *image) override;
+
+	ITexture *createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image) override;
+
+	//! creates a transposed matrix in supplied GLfloat array to pass to OpenGL
+	inline void getGLMatrix(GLfloat gl_matrix[16], const core::matrix4 &m);
+	inline void getGLTextureMatrix(GLfloat gl_matrix[16], const core::matrix4 &m);
+
+	//! get native wrap mode value
+	GLint getTextureWrapMode(const u8 clamp);
+
+	//! sets the needed renderstates
+	void setRenderStates3DMode();
+
+	//! sets the needed renderstates
+	void setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel);
+
+	void createMaterialRenderers();
+
+	//! Assign a hardware light to the specified requested light, if any
+	//! free hardware lights exist.
+	//! \param[in] lightIndex: the index of the requesting light
+	void assignHardwareLight(u32 lightIndex);
+
+	//! helper function for render setup.
+	void getColorBuffer(const void *vertices, u32 vertexCount, E_VERTEX_TYPE vType);
+
+	//! helper function doing the actual rendering.
+	void renderArray(const void *indexList, u32 primitiveCount,
+			scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
+
+	//! Same as `CacheHandler->setViewport`, but also sets `ViewPort`
+	virtual void setViewPortRaw(u32 width, u32 height);
+
+	COpenGLCacheHandler *CacheHandler;
+
+	core::stringc Name;
+	core::matrix4 Matrices[ETS_COUNT];
+	core::array<u8> ColorBuffer;
+
+	//! enumeration for rendering modes such as 2d and 3d for minimizing the switching of renderStates.
+	enum E_RENDER_MODE
+	{
+		ERM_NONE = 0, // no render state has been set yet.
+		ERM_2D,       // 2d drawing rendermode
+		ERM_3D        // 3d rendering mode
+	};
+
+	E_RENDER_MODE CurrentRenderMode;
+	//! bool to make all renderstates reset if set to true.
+	bool ResetRenderStates;
+	bool Transformation3DChanged;
+	u8 AntiAlias;
+
+	SMaterial Material, LastMaterial;
+
+	struct SUserClipPlane
+	{
+		SUserClipPlane() :
+				Enabled(false) {}
+		core::plane3df Plane;
+		bool Enabled;
+	};
+	core::array<SUserClipPlane> UserClipPlanes;
+
+	core::stringc VendorName;
+
+	core::matrix4 TextureFlipMatrix;
+
+	//! Color buffer format
+	ECOLOR_FORMAT ColorFormat;
+
+	E_OPENGL_FIXED_PIPELINE_STATE FixedPipelineState;
+
+	SIrrlichtCreationParameters Params;
+
+	//! Built-in 2D quad for 2D rendering.
+	S3DVertex Quad2DVertices[4];
+	static const u16 Quad2DIndices[4];
+
+	IContextManager *ContextManager;
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif // _IRR_COMPILE_WITH_OPENGL_
diff --git a/irr/src/COpenGLExtensionHandler.cpp b/irr/src/COpenGLExtensionHandler.cpp
new file mode 100644
index 000000000..d5aade126
--- /dev/null
+++ b/irr/src/COpenGLExtensionHandler.cpp
@@ -0,0 +1,626 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "COpenGLExtensionHandler.h"
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "irrString.h"
+#include "SMaterial.h"
+#include "fast_atof.h"
+#include "IContextManager.h"
+
+namespace irr
+{
+namespace video
+{
+
+bool COpenGLExtensionHandler::needsDSAFramebufferHack = true;
+
+COpenGLExtensionHandler::COpenGLExtensionHandler() :
+		StencilBuffer(false), TextureCompressionExtension(false), MaxLights(1),
+		MaxAnisotropy(1), MaxUserClipPlanes(0), MaxAuxBuffers(0), MaxIndices(65535),
+		MaxTextureSize(1), MaxGeometryVerticesOut(0),
+		MaxTextureLODBias(0.f), Version(0), ShaderLanguageVersion(0),
+		OcclusionQuerySupport(false), IsAtiRadeonX(false), pGlActiveTexture(0), pGlActiveTextureARB(0), pGlClientActiveTextureARB(0),
+		pGlGenProgramsARB(0), pGlGenProgramsNV(0),
+		pGlBindProgramARB(0), pGlBindProgramNV(0),
+		pGlDeleteProgramsARB(0), pGlDeleteProgramsNV(0),
+		pGlProgramStringARB(0), pGlLoadProgramNV(0),
+		pGlProgramLocalParameter4fvARB(0),
+		pGlCreateShaderObjectARB(0), pGlShaderSourceARB(0),
+		pGlCompileShaderARB(0), pGlCreateProgramObjectARB(0), pGlAttachObjectARB(0),
+		pGlLinkProgramARB(0), pGlUseProgramObjectARB(0), pGlDeleteObjectARB(0),
+		pGlCreateProgram(0), pGlUseProgram(0),
+		pGlDeleteProgram(0), pGlDeleteShader(0),
+		pGlGetAttachedObjectsARB(0), pGlGetAttachedShaders(0),
+		pGlCreateShader(0), pGlShaderSource(0), pGlCompileShader(0),
+		pGlAttachShader(0), pGlLinkProgram(0),
+		pGlGetInfoLogARB(0), pGlGetShaderInfoLog(0), pGlGetProgramInfoLog(0),
+		pGlGetObjectParameterivARB(0), pGlGetShaderiv(0), pGlGetProgramiv(0),
+		pGlGetUniformLocationARB(0), pGlGetUniformLocation(0),
+		pGlUniform1fvARB(0), pGlUniform2fvARB(0), pGlUniform3fvARB(0), pGlUniform4fvARB(0),
+		pGlUniform1ivARB(0), pGlUniform2ivARB(0), pGlUniform3ivARB(0), pGlUniform4ivARB(0),
+		pGlUniform1uiv(0), pGlUniform2uiv(0), pGlUniform3uiv(0), pGlUniform4uiv(0),
+		pGlUniformMatrix2fvARB(0), pGlUniformMatrix2x3fv(0), pGlUniformMatrix2x4fv(0),
+		pGlUniformMatrix3x2fv(0), pGlUniformMatrix3fvARB(0), pGlUniformMatrix3x4fv(0),
+		pGlUniformMatrix4x2fv(0), pGlUniformMatrix4x3fv(0), pGlUniformMatrix4fvARB(0),
+		pGlGetActiveUniformARB(0), pGlGetActiveUniform(0),
+		pGlPointParameterfARB(0), pGlPointParameterfvARB(0),
+		pGlStencilFuncSeparate(0), pGlStencilOpSeparate(0),
+		pGlStencilFuncSeparateATI(0), pGlStencilOpSeparateATI(0),
+		pGlCompressedTexImage2D(0), pGlCompressedTexSubImage2D(0),
+		// ARB framebuffer object
+		pGlBindFramebuffer(0), pGlDeleteFramebuffers(0), pGlGenFramebuffers(0),
+		pGlCheckFramebufferStatus(0), pGlFramebufferTexture2D(0),
+		pGlBindRenderbuffer(0), pGlDeleteRenderbuffers(0), pGlGenRenderbuffers(0),
+		pGlRenderbufferStorage(0), pGlFramebufferRenderbuffer(0), pGlGenerateMipmap(0),
+		// EXT framebuffer object
+		pGlBindFramebufferEXT(0), pGlDeleteFramebuffersEXT(0), pGlGenFramebuffersEXT(0),
+		pGlCheckFramebufferStatusEXT(0), pGlFramebufferTexture2DEXT(0),
+		pGlBindRenderbufferEXT(0), pGlDeleteRenderbuffersEXT(0), pGlGenRenderbuffersEXT(0),
+		pGlRenderbufferStorageEXT(0), pGlFramebufferRenderbufferEXT(0), pGlGenerateMipmapEXT(0),
+		pGlActiveStencilFaceEXT(0),
+		// MRTs
+		pGlDrawBuffersARB(0), pGlDrawBuffersATI(0),
+		pGlGenBuffersARB(0), pGlBindBufferARB(0), pGlBufferDataARB(0), pGlDeleteBuffersARB(0),
+		pGlBufferSubDataARB(0), pGlGetBufferSubDataARB(0), pGlMapBufferARB(0), pGlUnmapBufferARB(0),
+		pGlIsBufferARB(0), pGlGetBufferParameterivARB(0), pGlGetBufferPointervARB(0),
+		pGlProvokingVertexARB(0), pGlProvokingVertexEXT(0),
+		pGlProgramParameteriARB(0), pGlProgramParameteriEXT(0),
+		pGlGenQueriesARB(0), pGlDeleteQueriesARB(0), pGlIsQueryARB(0),
+		pGlBeginQueryARB(0), pGlEndQueryARB(0), pGlGetQueryivARB(0),
+		pGlGetQueryObjectivARB(0), pGlGetQueryObjectuivARB(0),
+		pGlGenOcclusionQueriesNV(0), pGlDeleteOcclusionQueriesNV(0),
+		pGlIsOcclusionQueryNV(0), pGlBeginOcclusionQueryNV(0),
+		pGlEndOcclusionQueryNV(0), pGlGetOcclusionQueryivNV(0),
+		pGlGetOcclusionQueryuivNV(0),
+		// Blend
+		pGlBlendFuncSeparateEXT(0), pGlBlendFuncSeparate(0),
+		pGlBlendEquationEXT(0), pGlBlendEquation(0), pGlBlendEquationSeparateEXT(0), pGlBlendEquationSeparate(0),
+		// Indexed
+		pGlEnableIndexedEXT(0), pGlDisableIndexedEXT(0),
+		pGlColorMaskIndexedEXT(0),
+		pGlBlendFuncIndexedAMD(0), pGlBlendFunciARB(0), pGlBlendFuncSeparateIndexedAMD(0), pGlBlendFuncSeparateiARB(0),
+		pGlBlendEquationIndexedAMD(0), pGlBlendEquationiARB(0), pGlBlendEquationSeparateIndexedAMD(0), pGlBlendEquationSeparateiARB(0),
+		// DSA
+		pGlTextureStorage2D(0), pGlTextureStorage3D(0), pGlTextureSubImage2D(0), pGlGetTextureImage(0), pGlNamedFramebufferTexture(0),
+		pGlTextureParameteri(0), pGlTextureParameterf(0), pGlTextureParameteriv(0), pGlTextureParameterfv(0),
+		pGlCreateTextures(0), pGlCreateFramebuffers(0), pGlBindTextures(0), pGlGenerateTextureMipmap(0),
+		// DSA with EXT or functions to simulate it
+		pGlTextureStorage2DEXT(0), pGlTexStorage2D(0), pGlTextureStorage3DEXT(0), pGlTexStorage3D(0), pGlTextureSubImage2DEXT(0), pGlGetTextureImageEXT(0),
+		pGlNamedFramebufferTextureEXT(0), pGlFramebufferTexture(0), pGlGenerateTextureMipmapEXT(0)
+#if defined(GLX_SGI_swap_control)
+		,
+		pGlxSwapIntervalSGI(0)
+#endif
+#if defined(GLX_EXT_swap_control)
+		,
+		pGlxSwapIntervalEXT(0)
+#endif
+#if defined(WGL_EXT_swap_control)
+		,
+		pWglSwapIntervalEXT(0)
+#endif
+#if defined(GLX_MESA_swap_control)
+		,
+		pGlxSwapIntervalMESA(0)
+#endif
+{
+	for (u32 i = 0; i < IRR_OpenGL_Feature_Count; ++i)
+		FeatureAvailable[i] = false;
+	DimAliasedLine[0] = 1.f;
+	DimAliasedLine[1] = 1.f;
+	DimAliasedPoint[0] = 1.f;
+	DimAliasedPoint[1] = 1.f;
+	DimSmoothedLine[0] = 1.f;
+	DimSmoothedLine[1] = 1.f;
+	DimSmoothedPoint[0] = 1.f;
+	DimSmoothedPoint[1] = 1.f;
+}
+
+void COpenGLExtensionHandler::dump(ELOG_LEVEL logLevel) const
+{
+	for (u32 i = 0; i < IRR_OpenGL_Feature_Count; ++i)
+		os::Printer::log(OpenGLFeatureStrings[i], FeatureAvailable[i] ? " true" : " false", logLevel);
+}
+
+void COpenGLExtensionHandler::initExtensions(video::IContextManager *cmgr, bool stencilBuffer)
+{
+	const f32 ogl_ver = core::fast_atof(reinterpret_cast<const c8 *>(glGetString(GL_VERSION)));
+	Version = static_cast<u16>(core::floor32(ogl_ver) * 100 + core::round32(core::fract(ogl_ver) * 10.0f));
+	if (Version >= 102)
+		os::Printer::log("OpenGL driver version is 1.2 or better.", ELL_INFORMATION);
+	else
+		os::Printer::log("OpenGL driver version is not 1.2 or better.", ELL_WARNING);
+
+	{
+		const char *t = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
+		size_t len = 0;
+		c8 *str = 0;
+		if (t) {
+			len = strlen(t);
+			str = new c8[len + 1];
+		}
+		c8 *p = str;
+
+		for (size_t i = 0; i < len; ++i) {
+			str[i] = static_cast<char>(t[i]);
+
+			if (str[i] == ' ') {
+				str[i] = 0;
+				for (u32 j = 0; j < IRR_OpenGL_Feature_Count; ++j) {
+					if (!strcmp(OpenGLFeatureStrings[j], p)) {
+						FeatureAvailable[j] = true;
+						break;
+					}
+				}
+
+				p = p + strlen(p) + 1;
+			}
+		}
+
+		delete[] str;
+	}
+
+	TextureCompressionExtension = FeatureAvailable[IRR_ARB_texture_compression];
+	StencilBuffer = stencilBuffer;
+
+	const char *renderer = (const char *)glGetString(GL_RENDERER);
+	if (renderer) {
+		IsAtiRadeonX = (strncmp(renderer, "ATI RADEON X", 12) == 0) || (strncmp(renderer, "ATI MOBILITY RADEON X", 21) == 0);
+	}
+
+#define IRR_OGL_LOAD_EXTENSION(x) cmgr->getProcAddress(x)
+
+	// get multitexturing function pointers
+	pGlActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)IRR_OGL_LOAD_EXTENSION("glActiveTextureARB");
+	pGlClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)IRR_OGL_LOAD_EXTENSION("glClientActiveTextureARB");
+
+	// get fragment and vertex program function pointers
+	pGlGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)IRR_OGL_LOAD_EXTENSION("glGenProgramsARB");
+	pGlGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)IRR_OGL_LOAD_EXTENSION("glGenProgramsNV");
+	pGlBindProgramARB = (PFNGLBINDPROGRAMARBPROC)IRR_OGL_LOAD_EXTENSION("glBindProgramARB");
+	pGlBindProgramNV = (PFNGLBINDPROGRAMNVPROC)IRR_OGL_LOAD_EXTENSION("glBindProgramNV");
+	pGlProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)IRR_OGL_LOAD_EXTENSION("glProgramStringARB");
+	pGlLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)IRR_OGL_LOAD_EXTENSION("glLoadProgramNV");
+	pGlDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgramsARB");
+	pGlDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgramsNV");
+	pGlProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)IRR_OGL_LOAD_EXTENSION("glProgramLocalParameter4fvARB");
+	pGlCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)IRR_OGL_LOAD_EXTENSION("glCreateShaderObjectARB");
+	pGlCreateShader = (PFNGLCREATESHADERPROC)IRR_OGL_LOAD_EXTENSION("glCreateShader");
+	pGlShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)IRR_OGL_LOAD_EXTENSION("glShaderSourceARB");
+	pGlShaderSource = (PFNGLSHADERSOURCEPROC)IRR_OGL_LOAD_EXTENSION("glShaderSource");
+	pGlCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)IRR_OGL_LOAD_EXTENSION("glCompileShaderARB");
+	pGlCompileShader = (PFNGLCOMPILESHADERPROC)IRR_OGL_LOAD_EXTENSION("glCompileShader");
+	pGlCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)IRR_OGL_LOAD_EXTENSION("glCreateProgramObjectARB");
+	pGlCreateProgram = (PFNGLCREATEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glCreateProgram");
+	pGlAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)IRR_OGL_LOAD_EXTENSION("glAttachObjectARB");
+	pGlAttachShader = (PFNGLATTACHSHADERPROC)IRR_OGL_LOAD_EXTENSION("glAttachShader");
+	pGlLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)IRR_OGL_LOAD_EXTENSION("glLinkProgramARB");
+	pGlLinkProgram = (PFNGLLINKPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glLinkProgram");
+	pGlUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)IRR_OGL_LOAD_EXTENSION("glUseProgramObjectARB");
+	pGlUseProgram = (PFNGLUSEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glUseProgram");
+	pGlDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)IRR_OGL_LOAD_EXTENSION("glDeleteObjectARB");
+	pGlDeleteProgram = (PFNGLDELETEPROGRAMPROC)IRR_OGL_LOAD_EXTENSION("glDeleteProgram");
+	pGlDeleteShader = (PFNGLDELETESHADERPROC)IRR_OGL_LOAD_EXTENSION("glDeleteShader");
+	pGlGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)IRR_OGL_LOAD_EXTENSION("glGetAttachedShaders");
+	pGlGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)IRR_OGL_LOAD_EXTENSION("glGetAttachedObjectsARB");
+	pGlGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)IRR_OGL_LOAD_EXTENSION("glGetInfoLogARB");
+	pGlGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)IRR_OGL_LOAD_EXTENSION("glGetShaderInfoLog");
+	pGlGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)IRR_OGL_LOAD_EXTENSION("glGetProgramInfoLog");
+	pGlGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetObjectParameterivARB");
+	pGlGetShaderiv = (PFNGLGETSHADERIVPROC)IRR_OGL_LOAD_EXTENSION("glGetShaderiv");
+	pGlGetProgramiv = (PFNGLGETPROGRAMIVPROC)IRR_OGL_LOAD_EXTENSION("glGetProgramiv");
+	pGlGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformLocationARB");
+	pGlGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)IRR_OGL_LOAD_EXTENSION("glGetUniformLocation");
+	pGlUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform1fvARB");
+	pGlUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform2fvARB");
+	pGlUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform3fvARB");
+	pGlUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform4fvARB");
+	pGlUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform1ivARB");
+	pGlUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform2ivARB");
+	pGlUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform3ivARB");
+	pGlUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniform4ivARB");
+	pGlUniform1uiv = (PFNGLUNIFORM1UIVPROC)IRR_OGL_LOAD_EXTENSION("glUniform1uiv");
+	pGlUniform2uiv = (PFNGLUNIFORM2UIVPROC)IRR_OGL_LOAD_EXTENSION("glUniform2uiv");
+	pGlUniform3uiv = (PFNGLUNIFORM3UIVPROC)IRR_OGL_LOAD_EXTENSION("glUniform3uiv");
+	pGlUniform4uiv = (PFNGLUNIFORM4UIVPROC)IRR_OGL_LOAD_EXTENSION("glUniform4uiv");
+	pGlUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix2fvARB");
+	pGlUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix2x3fv");
+	pGlUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix2x4fv");
+	pGlUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix3x2fv");
+	pGlUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix3fvARB");
+	pGlUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix3x4fv");
+	pGlUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4x2fv");
+	pGlUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4x3fv");
+	pGlUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformMatrix4fvARB");
+	pGlGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)IRR_OGL_LOAD_EXTENSION("glGetActiveUniformARB");
+	pGlGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)IRR_OGL_LOAD_EXTENSION("glGetActiveUniform");
+
+	// get point parameter extension
+	pGlPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)IRR_OGL_LOAD_EXTENSION("glPointParameterfARB");
+	pGlPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)IRR_OGL_LOAD_EXTENSION("glPointParameterfvARB");
+
+	// get stencil extension
+	pGlStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)IRR_OGL_LOAD_EXTENSION("glStencilFuncSeparate");
+	pGlStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)IRR_OGL_LOAD_EXTENSION("glStencilOpSeparate");
+	pGlStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)IRR_OGL_LOAD_EXTENSION("glStencilFuncSeparateATI");
+	pGlStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)IRR_OGL_LOAD_EXTENSION("glStencilOpSeparateATI");
+
+	// compressed textures
+	pGlCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glCompressedTexImage2D");
+	pGlCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glCompressedTexSubImage2D");
+
+	// ARB FrameBufferObjects
+	pGlBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glBindFramebuffer");
+	pGlDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteFramebuffers");
+	pGlGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glGenFramebuffers");
+	pGlCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)IRR_OGL_LOAD_EXTENSION("glCheckFramebufferStatus");
+	pGlFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferTexture2D");
+	pGlBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glBindRenderbuffer");
+	pGlDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteRenderbuffers");
+	pGlGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glGenRenderbuffers");
+	pGlRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)IRR_OGL_LOAD_EXTENSION("glRenderbufferStorage");
+	pGlFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferRenderbuffer");
+	pGlGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)IRR_OGL_LOAD_EXTENSION("glGenerateMipmap");
+
+	// EXT FrameBufferObjects
+	pGlBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)IRR_OGL_LOAD_EXTENSION("glBindFramebufferEXT");
+	pGlDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)IRR_OGL_LOAD_EXTENSION("glDeleteFramebuffersEXT");
+	pGlGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)IRR_OGL_LOAD_EXTENSION("glGenFramebuffersEXT");
+	pGlCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)IRR_OGL_LOAD_EXTENSION("glCheckFramebufferStatusEXT");
+	pGlFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferTexture2DEXT");
+	pGlBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)IRR_OGL_LOAD_EXTENSION("glBindRenderbufferEXT");
+	pGlDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)IRR_OGL_LOAD_EXTENSION("glDeleteRenderbuffersEXT");
+	pGlGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)IRR_OGL_LOAD_EXTENSION("glGenRenderbuffersEXT");
+	pGlRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)IRR_OGL_LOAD_EXTENSION("glRenderbufferStorageEXT");
+	pGlFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferRenderbufferEXT");
+	pGlGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)IRR_OGL_LOAD_EXTENSION("glGenerateMipmapEXT");
+	pGlDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)IRR_OGL_LOAD_EXTENSION("glDrawBuffersARB");
+	pGlDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)IRR_OGL_LOAD_EXTENSION("glDrawBuffersATI");
+
+	// get vertex buffer extension
+	pGlGenBuffersARB = (PFNGLGENBUFFERSARBPROC)IRR_OGL_LOAD_EXTENSION("glGenBuffersARB");
+	pGlBindBufferARB = (PFNGLBINDBUFFERARBPROC)IRR_OGL_LOAD_EXTENSION("glBindBufferARB");
+	pGlBufferDataARB = (PFNGLBUFFERDATAARBPROC)IRR_OGL_LOAD_EXTENSION("glBufferDataARB");
+	pGlDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)IRR_OGL_LOAD_EXTENSION("glDeleteBuffersARB");
+	pGlBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)IRR_OGL_LOAD_EXTENSION("glBufferSubDataARB");
+	pGlGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)IRR_OGL_LOAD_EXTENSION("glGetBufferSubDataARB");
+	pGlMapBufferARB = (PFNGLMAPBUFFERARBPROC)IRR_OGL_LOAD_EXTENSION("glMapBufferARB");
+	pGlUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)IRR_OGL_LOAD_EXTENSION("glUnmapBufferARB");
+	pGlIsBufferARB = (PFNGLISBUFFERARBPROC)IRR_OGL_LOAD_EXTENSION("glIsBufferARB");
+	pGlGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetBufferParameterivARB");
+	pGlGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetBufferPointervARB");
+	pGlProvokingVertexARB = (PFNGLPROVOKINGVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glProvokingVertex");
+	pGlProvokingVertexEXT = (PFNGLPROVOKINGVERTEXEXTPROC)IRR_OGL_LOAD_EXTENSION("glProvokingVertexEXT");
+	pGlProgramParameteriARB = (PFNGLPROGRAMPARAMETERIARBPROC)IRR_OGL_LOAD_EXTENSION("glProgramParameteriARB");
+	pGlProgramParameteriEXT = (PFNGLPROGRAMPARAMETERIEXTPROC)IRR_OGL_LOAD_EXTENSION("glProgramParameteriEXT");
+
+	// occlusion query
+	pGlGenQueriesARB = (PFNGLGENQUERIESARBPROC)IRR_OGL_LOAD_EXTENSION("glGenQueriesARB");
+	pGlDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)IRR_OGL_LOAD_EXTENSION("glDeleteQueriesARB");
+	pGlIsQueryARB = (PFNGLISQUERYARBPROC)IRR_OGL_LOAD_EXTENSION("glIsQueryARB");
+	pGlBeginQueryARB = (PFNGLBEGINQUERYARBPROC)IRR_OGL_LOAD_EXTENSION("glBeginQueryARB");
+	pGlEndQueryARB = (PFNGLENDQUERYARBPROC)IRR_OGL_LOAD_EXTENSION("glEndQueryARB");
+	pGlGetQueryivARB = (PFNGLGETQUERYIVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetQueryivARB");
+	pGlGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetQueryObjectivARB");
+	pGlGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)IRR_OGL_LOAD_EXTENSION("glGetQueryObjectuivARB");
+	pGlGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)IRR_OGL_LOAD_EXTENSION("glGenOcclusionQueriesNV");
+	pGlDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)IRR_OGL_LOAD_EXTENSION("glDeleteOcclusionQueriesNV");
+	pGlIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)IRR_OGL_LOAD_EXTENSION("glIsOcclusionQueryNV");
+	pGlBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)IRR_OGL_LOAD_EXTENSION("glBeginOcclusionQueryNV");
+	pGlEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)IRR_OGL_LOAD_EXTENSION("glEndOcclusionQueryNV");
+	pGlGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)IRR_OGL_LOAD_EXTENSION("glGetOcclusionQueryivNV");
+	pGlGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)IRR_OGL_LOAD_EXTENSION("glGetOcclusionQueryuivNV");
+
+	// blend
+	pGlBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)IRR_OGL_LOAD_EXTENSION("glBlendFuncSeparateEXT");
+	pGlBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)IRR_OGL_LOAD_EXTENSION("glBlendFuncSeparate");
+	pGlBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationEXT");
+	pGlBlendEquation = (PFNGLBLENDEQUATIONPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquation");
+	pGlBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationSeparateEXT");
+	pGlBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationSeparate");
+
+	// indexed
+	pGlEnableIndexedEXT = (PFNGLENABLEINDEXEDEXTPROC)IRR_OGL_LOAD_EXTENSION("glEnableIndexedEXT");
+	pGlDisableIndexedEXT = (PFNGLDISABLEINDEXEDEXTPROC)IRR_OGL_LOAD_EXTENSION("glDisableIndexedEXT");
+	pGlColorMaskIndexedEXT = (PFNGLCOLORMASKINDEXEDEXTPROC)IRR_OGL_LOAD_EXTENSION("glColorMaskIndexedEXT");
+	pGlBlendFuncIndexedAMD = (PFNGLBLENDFUNCINDEXEDAMDPROC)IRR_OGL_LOAD_EXTENSION("glBlendFuncIndexedAMD");
+	pGlBlendFunciARB = (PFNGLBLENDFUNCIPROC)IRR_OGL_LOAD_EXTENSION("glBlendFunciARB");
+	pGlBlendFuncSeparateIndexedAMD = (PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC)IRR_OGL_LOAD_EXTENSION("glBlendFuncSeparateIndexedAMD");
+	pGlBlendFuncSeparateiARB = (PFNGLBLENDFUNCSEPARATEIPROC)IRR_OGL_LOAD_EXTENSION("glBlendFuncSeparateiARB");
+	pGlBlendEquationIndexedAMD = (PFNGLBLENDEQUATIONINDEXEDAMDPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationIndexedAMD");
+	pGlBlendEquationiARB = (PFNGLBLENDEQUATIONIPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationiARB");
+	pGlBlendEquationSeparateIndexedAMD = (PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationSeparateIndexedAMD");
+	pGlBlendEquationSeparateiARB = (PFNGLBLENDEQUATIONSEPARATEIPROC)IRR_OGL_LOAD_EXTENSION("glBlendEquationSeparateiARB");
+
+	pGlTextureStorage2D = (PFNGLTEXTURESTORAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glTextureStorage2D");
+	pGlTextureStorage3D = (PFNGLTEXTURESTORAGE3DPROC)IRR_OGL_LOAD_EXTENSION("glTextureStorage3D");
+	pGlTextureSubImage2D = (PFNGLTEXTURESUBIMAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glTextureSubImage2D");
+	pGlGetTextureImage = (PFNGLGETTEXTUREIMAGEPROC)IRR_OGL_LOAD_EXTENSION("glGetTextureImage");
+	pGlNamedFramebufferTexture = (PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glNamedFramebufferTexture");
+	pGlTextureParameteri = (PFNGLTEXTUREPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glTextureParameteri");
+	pGlTextureParameterf = (PFNGLTEXTUREPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glTextureParameterf");
+	pGlTextureParameteriv = (PFNGLTEXTUREPARAMETERIVPROC)IRR_OGL_LOAD_EXTENSION("glTextureParameteriv");
+	pGlTextureParameterfv = (PFNGLTEXTUREPARAMETERFVPROC)IRR_OGL_LOAD_EXTENSION("glTextureParameterfv");
+
+	pGlCreateTextures = (PFNGLCREATETEXTURESPROC)IRR_OGL_LOAD_EXTENSION("glCreateTextures");
+	pGlCreateFramebuffers = (PFNGLCREATEFRAMEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glCreateFramebuffers");
+	pGlBindTextures = (PFNGLBINDTEXTURESPROC)IRR_OGL_LOAD_EXTENSION("glBindTextures");
+	pGlGenerateTextureMipmap = (PFNGLGENERATETEXTUREMIPMAPPROC)IRR_OGL_LOAD_EXTENSION("glGenerateTextureMipmap");
+	//==============================
+	pGlTextureStorage2DEXT = (PFNGLTEXTURESTORAGE2DEXTPROC)IRR_OGL_LOAD_EXTENSION("glTextureStorage2DEXT");
+	pGlTexStorage2D = (PFNGLTEXSTORAGE2DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage2D");
+	pGlTextureStorage3DEXT = (PFNGLTEXTURESTORAGE3DEXTPROC)IRR_OGL_LOAD_EXTENSION("glTextureStorage3DEXT");
+	pGlTexStorage3D = (PFNGLTEXSTORAGE3DPROC)IRR_OGL_LOAD_EXTENSION("glTexStorage3D");
+	pGlTextureSubImage2DEXT = (PFNGLTEXTURESUBIMAGE2DEXTPROC)IRR_OGL_LOAD_EXTENSION("glTextureSubImage2DEXT");
+	pGlGetTextureImageEXT = (PFNGLGETTEXTUREIMAGEEXTPROC)IRR_OGL_LOAD_EXTENSION("glGetTextureImageEXT");
+	pGlNamedFramebufferTextureEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC)IRR_OGL_LOAD_EXTENSION("glNamedFramebufferTextureEXT");
+	pGlFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glFramebufferTexture");
+	pGlActiveTexture = (PFNGLACTIVETEXTUREPROC)IRR_OGL_LOAD_EXTENSION("glActiveTexture");
+	pGlGenerateTextureMipmapEXT = (PFNGLGENERATETEXTUREMIPMAPEXTPROC)IRR_OGL_LOAD_EXTENSION("glGenerateTextureMipmapEXT");
+
+// get vsync extension
+#if defined(WGL_EXT_swap_control) && !defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	pWglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)IRR_OGL_LOAD_EXTENSION("wglSwapIntervalEXT");
+#endif
+#if defined(GLX_SGI_swap_control) && !defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	pGlxSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)IRR_OGL_LOAD_EXTENSION("glXSwapIntervalSGI");
+#endif
+#if defined(GLX_EXT_swap_control) && !defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	pGlxSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)IRR_OGL_LOAD_EXTENSION("glXSwapIntervalEXT");
+#endif
+#if defined(GLX_MESA_swap_control) && !defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+	pGlxSwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)IRR_OGL_LOAD_EXTENSION("glXSwapIntervalMESA");
+#endif
+
+	GLint num = 0;
+	// set some properties
+#if defined(GL_ARB_multitexture) || defined(GL_VERSION_1_3)
+	if (Version > 102 || FeatureAvailable[IRR_ARB_multitexture]) {
+#if defined(GL_MAX_TEXTURE_UNITS)
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS, &num);
+#elif defined(GL_MAX_TEXTURE_UNITS_ARB)
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &num);
+#endif
+		Feature.MaxTextureUnits = static_cast<u8>(num); // MULTITEXTURING (fixed function pipeline texture units)
+	}
+#endif
+#if defined(GL_ARB_vertex_shader) || defined(GL_VERSION_2_0)
+	if (Version >= 200 || FeatureAvailable[IRR_ARB_vertex_shader]) {
+		num = 0;
+#if defined(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS)
+		glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &num);
+#elif defined(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB)
+		glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &num);
+#endif
+		Feature.MaxTextureUnits = core::max_(Feature.MaxTextureUnits, static_cast<u8>(num));
+	}
+#endif
+	glGetIntegerv(GL_MAX_LIGHTS, &num);
+	MaxLights = static_cast<u8>(num);
+#ifdef GL_EXT_texture_filter_anisotropic
+	if (FeatureAvailable[IRR_EXT_texture_filter_anisotropic]) {
+		glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &num);
+		MaxAnisotropy = static_cast<u8>(num);
+	}
+#endif
+#ifdef GL_VERSION_1_2
+	if (Version > 101) {
+		glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &num);
+		MaxIndices = num;
+	}
+#endif
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &num);
+	MaxTextureSize = static_cast<u32>(num);
+	if (queryFeature(EVDF_GEOMETRY_SHADER)) {
+#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4)
+		glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &num);
+		MaxGeometryVerticesOut = static_cast<u32>(num);
+#elif defined(GL_NV_geometry_program4)
+		extGlGetProgramiv(GEOMETRY_PROGRAM_NV, GL_MAX_PROGRAM_OUTPUT_VERTICES_NV, &num);
+		MaxGeometryVerticesOut = static_cast<u32>(num);
+#endif
+	}
+#ifdef GL_EXT_texture_lod_bias
+	if (FeatureAvailable[IRR_EXT_texture_lod_bias])
+		glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS_EXT, &MaxTextureLODBias);
+#endif
+	glGetIntegerv(GL_MAX_CLIP_PLANES, &num);
+	MaxUserClipPlanes = static_cast<u8>(num);
+	glGetIntegerv(GL_AUX_BUFFERS, &num);
+	MaxAuxBuffers = static_cast<u8>(num);
+#ifdef GL_ARB_draw_buffers
+	if (FeatureAvailable[IRR_ARB_draw_buffers]) {
+		glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
+		Feature.MultipleRenderTarget = static_cast<u8>(num);
+	}
+#endif
+#if defined(GL_ATI_draw_buffers)
+#ifdef GL_ARB_draw_buffers
+	else
+#endif
+			if (FeatureAvailable[IRR_ATI_draw_buffers]) {
+		glGetIntegerv(GL_MAX_DRAW_BUFFERS_ATI, &num);
+		Feature.MultipleRenderTarget = static_cast<u8>(num);
+	}
+#endif
+#ifdef GL_ARB_framebuffer_object
+	if (FeatureAvailable[IRR_ARB_framebuffer_object]) {
+		glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &num);
+		Feature.ColorAttachment = static_cast<u8>(num);
+	}
+#endif
+#if defined(GL_EXT_framebuffer_object)
+#ifdef GL_ARB_framebuffer_object
+	else
+#endif
+			if (FeatureAvailable[IRR_EXT_framebuffer_object]) {
+		glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &num);
+		Feature.ColorAttachment = static_cast<u8>(num);
+	}
+#endif
+
+	glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, DimAliasedLine);
+	glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, DimAliasedPoint);
+	glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, DimSmoothedLine);
+	glGetFloatv(GL_SMOOTH_POINT_SIZE_RANGE, DimSmoothedPoint);
+#if defined(GL_ARB_shading_language_100) || defined(GL_VERSION_2_0)
+	if (FeatureAvailable[IRR_ARB_shading_language_100] || Version >= 200) {
+		glGetError(); // clean error buffer
+#ifdef GL_SHADING_LANGUAGE_VERSION
+		const GLubyte *shaderVersion = glGetString(GL_SHADING_LANGUAGE_VERSION);
+#else
+		const GLubyte *shaderVersion = glGetString(GL_SHADING_LANGUAGE_VERSION_ARB);
+#endif
+		if (glGetError() == GL_INVALID_ENUM)
+			ShaderLanguageVersion = 100;
+		else {
+			const f32 sl_ver = core::fast_atof(reinterpret_cast<const c8 *>(shaderVersion));
+			ShaderLanguageVersion = static_cast<u16>(core::floor32(sl_ver) * 100 + core::round32(core::fract(sl_ver) * 10.0f));
+		}
+	}
+#endif
+
+	if (!pGlActiveTextureARB || !pGlClientActiveTextureARB) {
+		Feature.MaxTextureUnits = 1;
+		os::Printer::log("Failed to load OpenGL's multitexture extension, proceeding without.", ELL_WARNING);
+	} else
+		Feature.MaxTextureUnits = core::min_(Feature.MaxTextureUnits, static_cast<u8>(MATERIAL_MAX_TEXTURES));
+
+#ifdef GL_ARB_occlusion_query
+	if (FeatureAvailable[IRR_ARB_occlusion_query]) {
+		extGlGetQueryiv(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB,
+				&num);
+		OcclusionQuerySupport = (num > 0);
+	} else
+#endif
+#ifdef GL_NV_occlusion_query
+			if (FeatureAvailable[IRR_NV_occlusion_query]) {
+		glGetIntegerv(GL_PIXEL_COUNTER_BITS_NV, &num);
+		OcclusionQuerySupport = (num > 0);
+	} else
+#endif
+		OcclusionQuerySupport = false;
+
+	Feature.BlendOperation = (Version >= 104) ||
+							 FeatureAvailable[IRR_EXT_blend_minmax] ||
+							 FeatureAvailable[IRR_EXT_blend_subtract] ||
+							 FeatureAvailable[IRR_EXT_blend_logic_op];
+
+#ifdef _DEBUG
+	if (FeatureAvailable[IRR_NVX_gpu_memory_info]) {
+		// undocumented flags, so use the RAW values
+		GLint val;
+		glGetIntegerv(0x9047, &val);
+		os::Printer::log("Dedicated video memory (kB)", core::stringc(val));
+		glGetIntegerv(0x9048, &val);
+		os::Printer::log("Total video memory (kB)", core::stringc(val));
+		glGetIntegerv(0x9049, &val);
+		os::Printer::log("Available video memory (kB)", core::stringc(val));
+	}
+#ifdef GL_ATI_meminfo
+	if (FeatureAvailable[IRR_ATI_meminfo]) {
+		GLint val[4];
+		glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, val);
+		os::Printer::log("Free texture memory (kB)", core::stringc(val[0]));
+		glGetIntegerv(GL_VBO_FREE_MEMORY_ATI, val);
+		os::Printer::log("Free VBO memory (kB)", core::stringc(val[0]));
+		glGetIntegerv(GL_RENDERBUFFER_FREE_MEMORY_ATI, val);
+		os::Printer::log("Free render buffer memory (kB)", core::stringc(val[0]));
+	}
+#endif
+
+	if (queryFeature(EVDF_TEXTURE_CUBEMAP_SEAMLESS))
+		glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+
+#endif
+}
+
+const COpenGLCoreFeature &COpenGLExtensionHandler::getFeature() const
+{
+	return Feature;
+}
+
+bool COpenGLExtensionHandler::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
+{
+	switch (feature) {
+	case EVDF_RENDER_TO_TARGET:
+		return true;
+	case EVDF_HARDWARE_TL:
+		return true; // we cannot tell other things
+	case EVDF_MULTITEXTURE:
+		return Feature.MaxTextureUnits > 1;
+	case EVDF_BILINEAR_FILTER:
+		return true;
+	case EVDF_MIP_MAP:
+		return true;
+	case EVDF_MIP_MAP_AUTO_UPDATE:
+		return !IsAtiRadeonX && (FeatureAvailable[IRR_SGIS_generate_mipmap] || FeatureAvailable[IRR_EXT_framebuffer_object] || FeatureAvailable[IRR_ARB_framebuffer_object]);
+	case EVDF_STENCIL_BUFFER:
+		return StencilBuffer;
+	case EVDF_VERTEX_SHADER_1_1:
+	case EVDF_ARB_VERTEX_PROGRAM_1:
+		return FeatureAvailable[IRR_ARB_vertex_program] || FeatureAvailable[IRR_NV_vertex_program1_1];
+	case EVDF_PIXEL_SHADER_1_1:
+	case EVDF_PIXEL_SHADER_1_2:
+	case EVDF_ARB_FRAGMENT_PROGRAM_1:
+		return FeatureAvailable[IRR_ARB_fragment_program] || FeatureAvailable[IRR_NV_fragment_program];
+	case EVDF_PIXEL_SHADER_2_0:
+	case EVDF_VERTEX_SHADER_2_0:
+	case EVDF_ARB_GLSL:
+		return (FeatureAvailable[IRR_ARB_shading_language_100] || Version >= 200);
+	case EVDF_TEXTURE_NSQUARE:
+		return true; // non-square is always supported
+	case EVDF_TEXTURE_NPOT:
+		// Some ATI cards seem to have only SW support in OpenGL 2.0
+		// drivers if the extension is not exposed, so we skip this
+		// extra test for now!
+		// return (FeatureAvailable[IRR_ARB_texture_non_power_of_two]||Version>=200);
+		return (FeatureAvailable[IRR_ARB_texture_non_power_of_two]);
+	case EVDF_FRAMEBUFFER_OBJECT:
+		return FeatureAvailable[IRR_EXT_framebuffer_object] || FeatureAvailable[IRR_ARB_framebuffer_object];
+	case EVDF_VERTEX_BUFFER_OBJECT:
+		return FeatureAvailable[IRR_ARB_vertex_buffer_object];
+	case EVDF_COLOR_MASK:
+		return true;
+	case EVDF_ALPHA_TO_COVERAGE:
+		return FeatureAvailable[IRR_ARB_multisample];
+	case EVDF_GEOMETRY_SHADER:
+		return FeatureAvailable[IRR_ARB_geometry_shader4] || FeatureAvailable[IRR_EXT_geometry_shader4] || FeatureAvailable[IRR_NV_geometry_program4] || FeatureAvailable[IRR_NV_geometry_shader4];
+	case EVDF_MULTIPLE_RENDER_TARGETS:
+		return FeatureAvailable[IRR_ARB_draw_buffers] || FeatureAvailable[IRR_ATI_draw_buffers];
+	case EVDF_MRT_BLEND:
+	case EVDF_MRT_COLOR_MASK:
+		return FeatureAvailable[IRR_EXT_draw_buffers2];
+	case EVDF_MRT_BLEND_FUNC:
+		return FeatureAvailable[IRR_ARB_draw_buffers_blend] || FeatureAvailable[IRR_AMD_draw_buffers_blend];
+	case EVDF_OCCLUSION_QUERY:
+		return FeatureAvailable[IRR_ARB_occlusion_query] && OcclusionQuerySupport;
+	case EVDF_POLYGON_OFFSET:
+		// both features supported with OpenGL 1.1
+		return Version >= 101;
+	case EVDF_BLEND_OPERATIONS:
+		return Feature.BlendOperation;
+	case EVDF_BLEND_SEPARATE:
+		return (Version >= 104) || FeatureAvailable[IRR_EXT_blend_func_separate];
+	case EVDF_TEXTURE_MATRIX:
+		return true;
+	case EVDF_TEXTURE_CUBEMAP:
+		return (Version >= 103) || FeatureAvailable[IRR_ARB_texture_cube_map] || FeatureAvailable[IRR_EXT_texture_cube_map];
+	case EVDF_TEXTURE_CUBEMAP_SEAMLESS:
+		return FeatureAvailable[IRR_ARB_seamless_cube_map];
+	case EVDF_DEPTH_CLAMP:
+		return FeatureAvailable[IRR_NV_depth_clamp] || FeatureAvailable[IRR_ARB_depth_clamp];
+
+	default:
+		return false;
+	};
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/COpenGLExtensionHandler.h b/irr/src/COpenGLExtensionHandler.h
new file mode 100644
index 000000000..ada1c9a3a
--- /dev/null
+++ b/irr/src/COpenGLExtensionHandler.h
@@ -0,0 +1,2616 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "EDriverFeatures.h"
+#include "irrTypes.h"
+#include "os.h"
+
+#include "COpenGLCommon.h"
+
+#include "COpenGLCoreFeature.h"
+
+namespace irr
+{
+namespace video
+{
+
+class IContextManager;
+
+static const char *const OpenGLFeatureStrings[] = {
+		"GL_3DFX_multisample",
+		"GL_3DFX_tbuffer",
+		"GL_3DFX_texture_compression_FXT1",
+		"GL_AMD_blend_minmax_factor",
+		"GL_AMD_conservative_depth",
+		"GL_AMD_debug_output",
+		"GL_AMD_depth_clamp_separate",
+		"GL_AMD_draw_buffers_blend",
+		"GL_AMD_interleaved_elements",
+		"GL_AMD_multi_draw_indirect",
+		"GL_AMD_name_gen_delete",
+		"GL_AMD_performance_monitor",
+		"GL_AMD_pinned_memory",
+		"GL_AMD_query_buffer_object",
+		"GL_AMD_sample_positions",
+		"GL_AMD_seamless_cubemap_per_texture",
+		"GL_AMD_shader_atomic_counter_ops",
+		"GL_AMD_shader_stencil_export",
+		"GL_AMD_shader_trinary_minmax",
+		"GL_AMD_sparse_texture",
+		"GL_AMD_stencil_operation_extended",
+		"GL_AMD_texture_texture4",
+		"GL_AMD_transform_feedback3_lines_triangles",
+		"GL_AMD_vertex_shader_layer",
+		"GL_AMD_vertex_shader_tessellator",
+		"GL_AMD_vertex_shader_viewport_index",
+		"GL_APPLE_aux_depth_stencil",
+		"GL_APPLE_client_storage",
+		"GL_APPLE_element_array",
+		"GL_APPLE_fence",
+		"GL_APPLE_float_pixels",
+		"GL_APPLE_flush_buffer_range",
+		"GL_APPLE_object_purgeable",
+		"GL_APPLE_rgb_422",
+		"GL_APPLE_row_bytes",
+		"GL_APPLE_specular_vector",
+		"GL_APPLE_texture_range",
+		"GL_APPLE_transform_hint",
+		"GL_APPLE_vertex_array_object",
+		"GL_APPLE_vertex_array_range",
+		"GL_APPLE_vertex_program_evaluators",
+		"GL_APPLE_ycbcr_422",
+		"GL_ARB_arrays_of_arrays",
+		"GL_ARB_base_instance",
+		"GL_ARB_bindless_texture",
+		"GL_ARB_blend_func_extended",
+		"GL_ARB_buffer_storage",
+		"GL_ARB_cl_event",
+		"GL_ARB_clear_buffer_object",
+		"GL_ARB_clear_texture",
+		"GL_ARB_color_buffer_float",
+		"GL_ARB_compatibility",
+		"GL_ARB_compressed_texture_pixel_storage",
+		"GL_ARB_compute_shader",
+		"GL_ARB_compute_variable_group_size",
+		"GL_ARB_conservative_depth",
+		"GL_ARB_copy_buffer",
+		"GL_ARB_copy_image",
+		"GL_ARB_debug_output",
+		"GL_ARB_depth_buffer_float",
+		"GL_ARB_depth_clamp",
+		"GL_ARB_depth_texture",
+		"GL_ARB_direct_state_access",
+		"GL_ARB_draw_buffers",
+		"GL_ARB_draw_buffers_blend",
+		"GL_ARB_draw_elements_base_vertex",
+		"GL_ARB_draw_indirect",
+		"GL_ARB_draw_instanced",
+		"GL_ARB_ES2_compatibility",
+		"GL_ARB_ES3_compatibility",
+		"GL_ARB_enhanced_layouts",
+		"GL_ARB_explicit_attrib_location",
+		"GL_ARB_explicit_uniform_location",
+		"GL_ARB_fragment_coord_conventions",
+		"GL_ARB_fragment_layer_viewport",
+		"GL_ARB_fragment_program",
+		"GL_ARB_fragment_program_shadow",
+		"GL_ARB_fragment_shader",
+		"GL_ARB_framebuffer_no_attachments",
+		"GL_ARB_framebuffer_object",
+		"GL_ARB_framebuffer_sRGB",
+		"GL_ARB_geometry_shader4",
+		"GL_ARB_get_program_binary",
+		"GL_ARB_gpu_shader5",
+		"GL_ARB_gpu_shader_fp64",
+		"GL_ARB_half_float_pixel",
+		"GL_ARB_half_float_vertex",
+		"GL_ARB_imaging",
+		"GL_ARB_indirect_parameters",
+		"GL_ARB_instanced_arrays",
+		"GL_ARB_internalformat_query",
+		"GL_ARB_internalformat_query2",
+		"GL_ARB_invalidate_subdata",
+		"GL_ARB_map_buffer_alignment",
+		"GL_ARB_map_buffer_range",
+		"GL_ARB_matrix_palette",
+		"GL_ARB_multi_bind",
+		"GL_ARB_multi_draw_indirect",
+		"GL_ARB_multisample",
+		"GL_ARB_multitexture",
+		"GL_ARB_occlusion_query",
+		"GL_ARB_occlusion_query2",
+		"GL_ARB_pixel_buffer_object",
+		"GL_ARB_point_parameters",
+		"GL_ARB_point_sprite",
+		"GL_ARB_program_interface_query",
+		"GL_ARB_provoking_vertex",
+		"GL_ARB_query_buffer_object",
+		"GL_ARB_robust_buffer_access_behavior",
+		"GL_ARB_robustness",
+		"GL_ARB_robustness_isolation",
+		"GL_ARB_sample_shading",
+		"GL_ARB_sampler_objects",
+		"GL_ARB_seamless_cube_map",
+		"GL_ARB_seamless_cubemap_per_texture",
+		"GL_ARB_separate_shader_objects",
+		"GL_ARB_shader_atomic_counters",
+		"GL_ARB_shader_bit_encoding",
+		"GL_ARB_shader_draw_parameters",
+		"GL_ARB_shader_group_vote",
+		"GL_ARB_shader_image_load_store",
+		"GL_ARB_shader_image_size",
+		"GL_ARB_shader_objects",
+		"GL_ARB_shader_precision",
+		"GL_ARB_shader_stencil_export",
+		"GL_ARB_shader_storage_buffer_object",
+		"GL_ARB_shader_subroutine",
+		"GL_ARB_shader_texture_lod",
+		"GL_ARB_shading_language_100",
+		"GL_ARB_shading_language_420pack",
+		"GL_ARB_shading_language_include",
+		"GL_ARB_shading_language_packing",
+		"GL_ARB_shadow",
+		"GL_ARB_shadow_ambient",
+		"GL_ARB_sparse_texture",
+		"GL_ARB_stencil_texturing",
+		"GL_ARB_sync",
+		"GL_ARB_tessellation_shader",
+		"GL_ARB_texture_border_clamp",
+		"GL_ARB_texture_buffer_object",
+		"GL_ARB_texture_buffer_object_rgb32",
+		"GL_ARB_texture_buffer_range",
+		"GL_ARB_texture_compression",
+		"GL_ARB_texture_compression_bptc",
+		"GL_ARB_texture_compression_rgtc",
+		"GL_ARB_texture_cube_map",
+		"GL_ARB_texture_cube_map_array",
+		"GL_ARB_texture_env_add",
+		"GL_ARB_texture_env_combine",
+		"GL_ARB_texture_env_crossbar",
+		"GL_ARB_texture_env_dot3",
+		"GL_ARB_texture_float",
+		"GL_ARB_texture_gather",
+		"GL_ARB_texture_mirror_clamp_to_edge",
+		"GL_ARB_texture_mirrored_repeat",
+		"GL_ARB_texture_multisample",
+		"GL_ARB_texture_non_power_of_two",
+		"GL_ARB_texture_query_levels",
+		"GL_ARB_texture_query_lod",
+		"GL_ARB_texture_rectangle",
+		"GL_ARB_texture_rg",
+		"GL_ARB_texture_rgb10_a2ui",
+		"GL_ARB_texture_stencil8",
+		"GL_ARB_texture_storage",
+		"GL_ARB_texture_storage_multisample",
+		"GL_ARB_texture_swizzle",
+		"GL_ARB_texture_view",
+		"GL_ARB_timer_query",
+		"GL_ARB_transform_feedback2",
+		"GL_ARB_transform_feedback3",
+		"GL_ARB_transform_feedback_instanced",
+		"GL_ARB_transpose_matrix",
+		"GL_ARB_uniform_buffer_object",
+		"GL_ARB_vertex_array_bgra",
+		"GL_ARB_vertex_array_object",
+		"GL_ARB_vertex_attrib_64bit",
+		"GL_ARB_vertex_attrib_binding",
+		"GL_ARB_vertex_blend",
+		"GL_ARB_vertex_buffer_object",
+		"GL_ARB_vertex_program",
+		"GL_ARB_vertex_shader",
+		"GL_ARB_vertex_type_10f_11f_11f_rev",
+		"GL_ARB_vertex_type_2_10_10_10_rev",
+		"GL_ARB_viewport_array",
+		"GL_ARB_window_pos",
+		"GL_ATI_draw_buffers",
+		"GL_ATI_element_array",
+		"GL_ATI_envmap_bumpmap",
+		"GL_ATI_fragment_shader",
+		"GL_ATI_map_object_buffer",
+		"GL_ATI_meminfo",
+		"GL_ATI_pixel_format_float",
+		"GL_ATI_pn_triangles",
+		"GL_ATI_separate_stencil",
+		"GL_ATI_text_fragment_shader",
+		"GL_ATI_texture_env_combine3",
+		"GL_ATI_texture_float",
+		"GL_ATI_texture_mirror_once",
+		"GL_ATI_vertex_array_object",
+		"GL_ATI_vertex_attrib_array_object",
+		"GL_ATI_vertex_streams",
+		"GL_EXT_422_pixels",
+		"GL_EXT_abgr",
+		"GL_EXT_bgra",
+		"GL_EXT_bindable_uniform",
+		"GL_EXT_blend_color",
+		"GL_EXT_blend_equation_separate",
+		"GL_EXT_blend_func_separate",
+		"GL_EXT_blend_logic_op",
+		"GL_EXT_blend_minmax",
+		"GL_EXT_blend_subtract",
+		"GL_EXT_clip_volume_hint",
+		"GL_EXT_cmyka",
+		"GL_EXT_color_subtable",
+		"GL_EXT_compiled_vertex_array",
+		"GL_EXT_convolution",
+		"GL_EXT_coordinate_frame",
+		"GL_EXT_copy_texture",
+		"GL_EXT_cull_vertex",
+		"GL_EXT_debug_label",
+		"GL_EXT_debug_marker",
+		"GL_EXT_depth_bounds_test",
+		"GL_EXT_direct_state_access",
+		"GL_EXT_draw_buffers2",
+		"GL_EXT_draw_instanced",
+		"GL_EXT_draw_range_elements",
+		"GL_EXT_fog_coord",
+		"GL_EXT_framebuffer_blit",
+		"GL_EXT_framebuffer_multisample",
+		"GL_EXT_framebuffer_multisample_blit_scaled",
+		"GL_EXT_framebuffer_object",
+		"GL_EXT_framebuffer_sRGB",
+		"GL_EXT_geometry_shader4",
+		"GL_EXT_gpu_program_parameters",
+		"GL_EXT_gpu_shader4",
+		"GL_EXT_histogram",
+		"GL_EXT_index_array_formats",
+		"GL_EXT_index_func",
+		"GL_EXT_index_material",
+		"GL_EXT_index_texture",
+		"GL_EXT_light_texture",
+		"GL_EXT_misc_attribute",
+		"GL_EXT_multi_draw_arrays",
+		"GL_EXT_multisample",
+		"GL_EXT_packed_depth_stencil",
+		"GL_EXT_packed_float",
+		"GL_EXT_packed_pixels",
+		"GL_EXT_paletted_texture",
+		"GL_EXT_pixel_buffer_object",
+		"GL_EXT_pixel_transform",
+		"GL_EXT_pixel_transform_color_table",
+		"GL_EXT_point_parameters",
+		"GL_EXT_polygon_offset",
+		"GL_EXT_provoking_vertex",
+		"GL_EXT_rescale_normal",
+		"GL_EXT_secondary_color",
+		"GL_EXT_separate_shader_objects",
+		"GL_EXT_separate_specular_color",
+		"GL_EXT_shader_image_load_store",
+		"GL_EXT_shader_integer_mix",
+		"GL_EXT_shadow_funcs",
+		"GL_EXT_shared_texture_palette",
+		"GL_EXT_stencil_clear_tag",
+		"GL_EXT_stencil_two_side",
+		"GL_EXT_stencil_wrap",
+		"GL_EXT_subtexture",
+		"GL_EXT_texture",
+		"GL_EXT_texture3D",
+		"GL_EXT_texture_array",
+		"GL_EXT_texture_buffer_object",
+		"GL_EXT_texture_compression_latc",
+		"GL_EXT_texture_compression_rgtc",
+		"GL_EXT_texture_compression_s3tc",
+		"GL_EXT_texture_cube_map",
+		"GL_EXT_texture_env_add",
+		"GL_EXT_texture_env_combine",
+		"GL_EXT_texture_env_dot3",
+		"GL_EXT_texture_filter_anisotropic",
+		"GL_EXT_texture_integer",
+		"GL_EXT_texture_lod_bias",
+		"GL_EXT_texture_mirror_clamp",
+		"GL_EXT_texture_object",
+		"GL_EXT_texture_perturb_normal",
+		"GL_EXT_texture_shared_exponent",
+		"GL_EXT_texture_snorm",
+		"GL_EXT_texture_sRGB",
+		"GL_EXT_texture_sRGB_decode",
+		"GL_EXT_texture_swizzle",
+		"GL_EXT_timer_query",
+		"GL_EXT_transform_feedback",
+		"GL_EXT_vertex_array",
+		"GL_EXT_vertex_array_bgra",
+		"GL_EXT_vertex_attrib_64bit",
+		"GL_EXT_vertex_shader",
+		"GL_EXT_vertex_weighting",
+		"GL_EXT_x11_sync_object",
+		"GL_GREMEDY_frame_terminator",
+		"GL_GREMEDY_string_marker",
+		"GL_HP_convolution_border_modes",
+		"GL_HP_image_transform",
+		"GL_HP_occlusion_test",
+		"GL_HP_texture_lighting",
+		"GL_IBM_cull_vertex",
+		"GL_IBM_multimode_draw_arrays",
+		"GL_IBM_rasterpos_clip",
+		"GL_IBM_static_data",
+		"GL_IBM_texture_mirrored_repeat",
+		"GL_IBM_vertex_array_lists",
+		"GL_INGR_blend_func_separate",
+		"GL_INGR_color_clamp",
+		"GL_INGR_interlace_read",
+		"GL_INGR_palette_buffer",
+		"GL_INTEL_map_texture",
+		"GL_INTEL_parallel_arrays",
+		"GL_INTEL_texture_scissor",
+		"GL_KHR_debug",
+		"GL_KHR_texture_compression_astc_hdr",
+		"GL_KHR_texture_compression_astc_ldr",
+		"GL_MESA_pack_invert",
+		"GL_MESA_resize_buffers",
+		"GL_MESA_window_pos",
+		"GL_MESAX_texture_stack",
+		"GL_MESA_ycbcr_texture",
+		"GL_NVX_conditional_render",
+		"GL_NV_bindless_multi_draw_indirect",
+		"GL_NV_bindless_texture",
+		"GL_NV_blend_equation_advanced",
+		"GL_NV_blend_equation_advanced_coherent",
+		"GL_NV_blend_square",
+		"GL_NV_compute_program5",
+		"GL_NV_conditional_render",
+		"GL_NV_copy_depth_to_color",
+		"GL_NV_copy_image",
+		"GL_NV_deep_texture3D",
+		"GL_NV_depth_buffer_float",
+		"GL_NV_depth_clamp",
+		"GL_NV_draw_texture",
+		"GL_NV_evaluators",
+		"GL_NV_explicit_multisample",
+		"GL_NV_fence",
+		"GL_NV_float_buffer",
+		"GL_NV_fog_distance",
+		"GL_NV_fragment_program",
+		"GL_NV_fragment_program2",
+		"GL_NV_fragment_program4",
+		"GL_NV_fragment_program_option",
+		"GL_NV_framebuffer_multisample_coverage",
+		"GL_NV_geometry_program4",
+		"GL_NV_geometry_shader4",
+		"GL_NV_gpu_program4",
+		"GL_NV_gpu_program5",
+		"GL_NV_gpu_program5_mem_extended",
+		"GL_NV_gpu_shader5",
+		"GL_NV_half_float",
+		"GL_NV_light_max_exponent",
+		"GL_NV_multisample_coverage",
+		"GL_NV_multisample_filter_hint",
+		"GL_NV_occlusion_query",
+		"GL_NV_packed_depth_stencil",
+		"GL_NV_parameter_buffer_object",
+		"GL_NV_parameter_buffer_object2",
+		"GL_NV_path_rendering",
+		"GL_NV_pixel_data_range",
+		"GL_NV_point_sprite",
+		"GL_NV_present_video",
+		"GL_NV_primitive_restart",
+		"GL_NV_register_combiners",
+		"GL_NV_register_combiners2",
+		"GL_NV_shader_atomic_counters",
+		"GL_NV_shader_atomic_float",
+		"GL_NV_shader_buffer_load",
+		"GL_NV_shader_buffer_store",
+		"GL_NV_shader_storage_buffer_object",
+		"GL_NV_tessellation_program5",
+		"GL_NV_texgen_emboss",
+		"GL_NV_texgen_reflection",
+		"GL_NV_texture_barrier",
+		"GL_NV_texture_compression_vtc",
+		"GL_NV_texture_env_combine4",
+		"GL_NV_texture_expand_normal",
+		"GL_NV_texture_multisample",
+		"GL_NV_texture_rectangle",
+		"GL_NV_texture_shader",
+		"GL_NV_texture_shader2",
+		"GL_NV_texture_shader3",
+		"GL_NV_transform_feedback",
+		"GL_NV_transform_feedback2",
+		"GL_NV_vdpau_interop",
+		"GL_NV_vertex_array_range",
+		"GL_NV_vertex_array_range2",
+		"GL_NV_vertex_attrib_integer_64bit",
+		"GL_NV_vertex_buffer_unified_memory",
+		"GL_NV_vertex_program",
+		"GL_NV_vertex_program1_1",
+		"GL_NV_vertex_program2",
+		"GL_NV_vertex_program2_option",
+		"GL_NV_vertex_program3",
+		"GL_NV_vertex_program4",
+		"GL_NV_video_capture",
+		"GL_OES_byte_coordinates",
+		"GL_OES_compressed_paletted_texture",
+		"GL_OES_fixed_point",
+		"GL_OES_query_matrix",
+		"GL_OES_read_format",
+		"GL_OES_single_precision",
+		"GL_OML_interlace",
+		"GL_OML_resample",
+		"GL_OML_subsample",
+		"GL_PGI_misc_hints",
+		"GL_PGI_vertex_hints",
+		"GL_REND_screen_coordinates",
+		"GL_S3_s3tc",
+		"GL_SGI_color_matrix",
+		"GL_SGI_color_table",
+		"GL_SGI_texture_color_table",
+		"GL_SGIS_detail_texture",
+		"GL_SGIS_fog_function",
+		"GL_SGIS_generate_mipmap",
+		"GL_SGIS_multisample",
+		"GL_SGIS_pixel_texture",
+		"GL_SGIS_point_line_texgen",
+		"GL_SGIS_point_parameters",
+		"GL_SGIS_sharpen_texture",
+		"GL_SGIS_texture4D",
+		"GL_SGIS_texture_border_clamp",
+		"GL_SGIS_texture_color_mask",
+		"GL_SGIS_texture_edge_clamp",
+		"GL_SGIS_texture_filter4",
+		"GL_SGIS_texture_lod",
+		"GL_SGIS_texture_select",
+		"GL_SGIX_async",
+		"GL_SGIX_async_histogram",
+		"GL_SGIX_async_pixel",
+		"GL_SGIX_blend_alpha_minmax",
+		"GL_SGIX_calligraphic_fragment",
+		"GL_SGIX_clipmap",
+		"GL_SGIX_convolution_accuracy",
+		"GL_SGIX_depth_pass_instrument",
+		"GL_SGIX_depth_texture",
+		"GL_SGIX_flush_raster",
+		"GL_SGIX_fog_offset",
+		"GL_SGIX_fog_scale",
+		"GL_SGIX_fragment_lighting",
+		"GL_SGIX_framezoom",
+		"GL_SGIX_igloo_interface",
+		"GL_SGIX_instruments",
+		"GL_SGIX_interlace",
+		"GL_SGIX_ir_instrument1",
+		"GL_SGIX_list_priority",
+		"GL_SGIX_pixel_texture",
+		"GL_SGIX_pixel_tiles",
+		"GL_SGIX_polynomial_ffd",
+		"GL_SGIX_reference_plane",
+		"GL_SGIX_resample",
+		"GL_SGIX_scalebias_hint",
+		"GL_SGIX_shadow",
+		"GL_SGIX_shadow_ambient",
+		"GL_SGIX_sprite",
+		"GL_SGIX_subsample",
+		"GL_SGIX_tag_sample_buffer",
+		"GL_SGIX_texture_add_env",
+		"GL_SGIX_texture_coordinate_clamp",
+		"GL_SGIX_texture_lod_bias",
+		"GL_SGIX_texture_multi_buffer",
+		"GL_SGIX_texture_scale_bias",
+		"GL_SGIX_vertex_preclip",
+		"GL_SGIX_ycrcb",
+		"GL_SGIX_ycrcba",
+		"GL_SGIX_ycrcb_subsample",
+		"GL_SUN_convolution_border_modes",
+		"GL_SUN_global_alpha",
+		"GL_SUN_mesh_array",
+		"GL_SUN_slice_accum",
+		"GL_SUN_triangle_list",
+		"GL_SUN_vertex",
+		"GL_SUNX_constant_data",
+		"GL_WIN_phong_shading",
+		"GL_WIN_specular_fog",
+		// unofficial stuff
+		"GL_NVX_gpu_memory_info"};
+
+class COpenGLExtensionHandler
+{
+public:
+	enum EOpenGLFeatures
+	{
+		IRR_3DFX_multisample = 0,
+		IRR_3DFX_tbuffer,
+		IRR_3DFX_texture_compression_FXT1,
+		IRR_AMD_blend_minmax_factor,
+		IRR_AMD_conservative_depth,
+		IRR_AMD_debug_output,
+		IRR_AMD_depth_clamp_separate,
+		IRR_AMD_draw_buffers_blend,
+		IRR_AMD_interleaved_elements,
+		IRR_AMD_multi_draw_indirect,
+		IRR_AMD_name_gen_delete,
+		IRR_AMD_performance_monitor,
+		IRR_AMD_pinned_memory,
+		IRR_AMD_query_buffer_object,
+		IRR_AMD_sample_positions,
+		IRR_AMD_seamless_cubemap_per_texture,
+		IRR_AMD_shader_atomic_counter_ops,
+		IRR_AMD_shader_stencil_export,
+		IRR_AMD_shader_trinary_minmax,
+		IRR_AMD_sparse_texture,
+		IRR_AMD_stencil_operation_extended,
+		IRR_AMD_texture_texture4,
+		IRR_AMD_transform_feedback3_lines_triangles,
+		IRR_AMD_vertex_shader_layer,
+		IRR_AMD_vertex_shader_tessellator,
+		IRR_AMD_vertex_shader_viewport_index,
+		IRR_APPLE_aux_depth_stencil,
+		IRR_APPLE_client_storage,
+		IRR_APPLE_element_array,
+		IRR_APPLE_fence,
+		IRR_APPLE_float_pixels,
+		IRR_APPLE_flush_buffer_range,
+		IRR_APPLE_object_purgeable,
+		IRR_APPLE_rgb_422,
+		IRR_APPLE_row_bytes,
+		IRR_APPLE_specular_vector,
+		IRR_APPLE_texture_range,
+		IRR_APPLE_transform_hint,
+		IRR_APPLE_vertex_array_object,
+		IRR_APPLE_vertex_array_range,
+		IRR_APPLE_vertex_program_evaluators,
+		IRR_APPLE_ycbcr_422,
+		IRR_ARB_arrays_of_arrays,
+		IRR_ARB_base_instance,
+		IRR_ARB_bindless_texture,
+		IRR_ARB_blend_func_extended,
+		IRR_ARB_buffer_storage,
+		IRR_ARB_cl_event,
+		IRR_ARB_clear_buffer_object,
+		IRR_ARB_clear_texture,
+		IRR_ARB_color_buffer_float,
+		IRR_ARB_compatibility,
+		IRR_ARB_compressed_texture_pixel_storage,
+		IRR_ARB_compute_shader,
+		IRR_ARB_compute_variable_group_size,
+		IRR_ARB_conservative_depth,
+		IRR_ARB_copy_buffer,
+		IRR_ARB_copy_image,
+		IRR_ARB_debug_output,
+		IRR_ARB_depth_buffer_float,
+		IRR_ARB_depth_clamp,
+		IRR_ARB_depth_texture,
+		IRR_ARB_direct_state_access,
+		IRR_ARB_draw_buffers,
+		IRR_ARB_draw_buffers_blend,
+		IRR_ARB_draw_elements_base_vertex,
+		IRR_ARB_draw_indirect,
+		IRR_ARB_draw_instanced,
+		IRR_ARB_ES2_compatibility,
+		IRR_ARB_ES3_compatibility,
+		IRR_ARB_enhanced_layouts,
+		IRR_ARB_explicit_attrib_location,
+		IRR_ARB_explicit_uniform_location,
+		IRR_ARB_fragment_coord_conventions,
+		IRR_ARB_fragment_layer_viewport,
+		IRR_ARB_fragment_program,
+		IRR_ARB_fragment_program_shadow,
+		IRR_ARB_fragment_shader,
+		IRR_ARB_framebuffer_no_attachments,
+		IRR_ARB_framebuffer_object,
+		IRR_ARB_framebuffer_sRGB,
+		IRR_ARB_geometry_shader4,
+		IRR_ARB_get_program_binary,
+		IRR_ARB_gpu_shader5,
+		IRR_ARB_gpu_shader_fp64,
+		IRR_ARB_half_float_pixel,
+		IRR_ARB_half_float_vertex,
+		IRR_ARB_imaging,
+		IRR_ARB_indirect_parameters,
+		IRR_ARB_instanced_arrays,
+		IRR_ARB_internalformat_query,
+		IRR_ARB_internalformat_query2,
+		IRR_ARB_invalidate_subdata,
+		IRR_ARB_map_buffer_alignment,
+		IRR_ARB_map_buffer_range,
+		IRR_ARB_matrix_palette,
+		IRR_ARB_multi_bind,
+		IRR_ARB_multi_draw_indirect,
+		IRR_ARB_multisample,
+		IRR_ARB_multitexture,
+		IRR_ARB_occlusion_query,
+		IRR_ARB_occlusion_query2,
+		IRR_ARB_pixel_buffer_object,
+		IRR_ARB_point_parameters,
+		IRR_ARB_point_sprite,
+		IRR_ARB_program_interface_query,
+		IRR_ARB_provoking_vertex,
+		IRR_ARB_query_buffer_object,
+		IRR_ARB_robust_buffer_access_behavior,
+		IRR_ARB_robustness,
+		IRR_ARB_robustness_isolation,
+		IRR_ARB_sample_shading,
+		IRR_ARB_sampler_objects,
+		IRR_ARB_seamless_cube_map,
+		IRR_ARB_seamless_cubemap_per_texture,
+		IRR_ARB_separate_shader_objects,
+		IRR_ARB_shader_atomic_counters,
+		IRR_ARB_shader_bit_encoding,
+		IRR_ARB_shader_draw_parameters,
+		IRR_ARB_shader_group_vote,
+		IRR_ARB_shader_image_load_store,
+		IRR_ARB_shader_image_size,
+		IRR_ARB_shader_objects,
+		IRR_ARB_shader_precision,
+		IRR_ARB_shader_stencil_export,
+		IRR_ARB_shader_storage_buffer_object,
+		IRR_ARB_shader_subroutine,
+		IRR_ARB_shader_texture_lod,
+		IRR_ARB_shading_language_100,
+		IRR_ARB_shading_language_420pack,
+		IRR_ARB_shading_language_include,
+		IRR_ARB_shading_language_packing,
+		IRR_ARB_shadow,
+		IRR_ARB_shadow_ambient,
+		IRR_ARB_sparse_texture,
+		IRR_ARB_stencil_texturing,
+		IRR_ARB_sync,
+		IRR_ARB_tessellation_shader,
+		IRR_ARB_texture_border_clamp,
+		IRR_ARB_texture_buffer_object,
+		IRR_ARB_texture_buffer_object_rgb32,
+		IRR_ARB_texture_buffer_range,
+		IRR_ARB_texture_compression,
+		IRR_ARB_texture_compression_bptc,
+		IRR_ARB_texture_compression_rgtc,
+		IRR_ARB_texture_cube_map,
+		IRR_ARB_texture_cube_map_array,
+		IRR_ARB_texture_env_add,
+		IRR_ARB_texture_env_combine,
+		IRR_ARB_texture_env_crossbar,
+		IRR_ARB_texture_env_dot3,
+		IRR_ARB_texture_float,
+		IRR_ARB_texture_gather,
+		IRR_ARB_texture_mirror_clamp_to_edge,
+		IRR_ARB_texture_mirrored_repeat,
+		IRR_ARB_texture_multisample,
+		IRR_ARB_texture_non_power_of_two,
+		IRR_ARB_texture_query_levels,
+		IRR_ARB_texture_query_lod,
+		IRR_ARB_texture_rectangle,
+		IRR_ARB_texture_rg,
+		IRR_ARB_texture_rgb10_a2ui,
+		IRR_ARB_texture_stencil8,
+		IRR_ARB_texture_storage,
+		IRR_ARB_texture_storage_multisample,
+		IRR_ARB_texture_swizzle,
+		IRR_ARB_texture_view,
+		IRR_ARB_timer_query,
+		IRR_ARB_transform_feedback2,
+		IRR_ARB_transform_feedback3,
+		IRR_ARB_transform_feedback_instanced,
+		IRR_ARB_transpose_matrix,
+		IRR_ARB_uniform_buffer_object,
+		IRR_ARB_vertex_array_bgra,
+		IRR_ARB_vertex_array_object,
+		IRR_ARB_vertex_attrib_64bit,
+		IRR_ARB_vertex_attrib_binding,
+		IRR_ARB_vertex_blend,
+		IRR_ARB_vertex_buffer_object,
+		IRR_ARB_vertex_program,
+		IRR_ARB_vertex_shader,
+		IRR_ARB_vertex_type_10f_11f_11f_rev,
+		IRR_ARB_vertex_type_2_10_10_10_rev,
+		IRR_ARB_viewport_array,
+		IRR_ARB_window_pos,
+		IRR_ATI_draw_buffers,
+		IRR_ATI_element_array,
+		IRR_ATI_envmap_bumpmap,
+		IRR_ATI_fragment_shader,
+		IRR_ATI_map_object_buffer,
+		IRR_ATI_meminfo,
+		IRR_ATI_pixel_format_float,
+		IRR_ATI_pn_triangles,
+		IRR_ATI_separate_stencil,
+		IRR_ATI_text_fragment_shader,
+		IRR_ATI_texture_env_combine3,
+		IRR_ATI_texture_float,
+		IRR_ATI_texture_mirror_once,
+		IRR_ATI_vertex_array_object,
+		IRR_ATI_vertex_attrib_array_object,
+		IRR_ATI_vertex_streams,
+		IRR_EXT_422_pixels,
+		IRR_EXT_abgr,
+		IRR_EXT_bgra,
+		IRR_EXT_bindable_uniform,
+		IRR_EXT_blend_color,
+		IRR_EXT_blend_equation_separate,
+		IRR_EXT_blend_func_separate,
+		IRR_EXT_blend_logic_op,
+		IRR_EXT_blend_minmax,
+		IRR_EXT_blend_subtract,
+		IRR_EXT_clip_volume_hint,
+		IRR_EXT_cmyka,
+		IRR_EXT_color_subtable,
+		IRR_EXT_compiled_vertex_array,
+		IRR_EXT_convolution,
+		IRR_EXT_coordinate_frame,
+		IRR_EXT_copy_texture,
+		IRR_EXT_cull_vertex,
+		IRR_EXT_debug_label,
+		IRR_EXT_debug_marker,
+		IRR_EXT_depth_bounds_test,
+		IRR_EXT_direct_state_access,
+		IRR_EXT_draw_buffers2,
+		IRR_EXT_draw_instanced,
+		IRR_EXT_draw_range_elements,
+		IRR_EXT_fog_coord,
+		IRR_EXT_framebuffer_blit,
+		IRR_EXT_framebuffer_multisample,
+		IRR_EXT_framebuffer_multisample_blit_scaled,
+		IRR_EXT_framebuffer_object,
+		IRR_EXT_framebuffer_sRGB,
+		IRR_EXT_geometry_shader4,
+		IRR_EXT_gpu_program_parameters,
+		IRR_EXT_gpu_shader4,
+		IRR_EXT_histogram,
+		IRR_EXT_index_array_formats,
+		IRR_EXT_index_func,
+		IRR_EXT_index_material,
+		IRR_EXT_index_texture,
+		IRR_EXT_light_texture,
+		IRR_EXT_misc_attribute,
+		IRR_EXT_multi_draw_arrays,
+		IRR_EXT_multisample,
+		IRR_EXT_packed_depth_stencil,
+		IRR_EXT_packed_float,
+		IRR_EXT_packed_pixels,
+		IRR_EXT_paletted_texture,
+		IRR_EXT_pixel_buffer_object,
+		IRR_EXT_pixel_transform,
+		IRR_EXT_pixel_transform_color_table,
+		IRR_EXT_point_parameters,
+		IRR_EXT_polygon_offset,
+		IRR_EXT_provoking_vertex,
+		IRR_EXT_rescale_normal,
+		IRR_EXT_secondary_color,
+		IRR_EXT_separate_shader_objects,
+		IRR_EXT_separate_specular_color,
+		IRR_EXT_shader_image_load_store,
+		IRR_EXT_shader_integer_mix,
+		IRR_EXT_shadow_funcs,
+		IRR_EXT_shared_texture_palette,
+		IRR_EXT_stencil_clear_tag,
+		IRR_EXT_stencil_two_side,
+		IRR_EXT_stencil_wrap,
+		IRR_EXT_subtexture,
+		IRR_EXT_texture,
+		IRR_EXT_texture3D,
+		IRR_EXT_texture_array,
+		IRR_EXT_texture_buffer_object,
+		IRR_EXT_texture_compression_latc,
+		IRR_EXT_texture_compression_rgtc,
+		IRR_EXT_texture_compression_s3tc,
+		IRR_EXT_texture_cube_map,
+		IRR_EXT_texture_env_add,
+		IRR_EXT_texture_env_combine,
+		IRR_EXT_texture_env_dot3,
+		IRR_EXT_texture_filter_anisotropic,
+		IRR_EXT_texture_integer,
+		IRR_EXT_texture_lod_bias,
+		IRR_EXT_texture_mirror_clamp,
+		IRR_EXT_texture_object,
+		IRR_EXT_texture_perturb_normal,
+		IRR_EXT_texture_shared_exponent,
+		IRR_EXT_texture_snorm,
+		IRR_EXT_texture_sRGB,
+		IRR_EXT_texture_sRGB_decode,
+		IRR_EXT_texture_swizzle,
+		IRR_EXT_timer_query,
+		IRR_EXT_transform_feedback,
+		IRR_EXT_vertex_array,
+		IRR_EXT_vertex_array_bgra,
+		IRR_EXT_vertex_attrib_64bit,
+		IRR_EXT_vertex_shader,
+		IRR_EXT_vertex_weighting,
+		IRR_EXT_x11_sync_object,
+		IRR_GREMEDY_frame_terminator,
+		IRR_GREMEDY_string_marker,
+		IRR_HP_convolution_border_modes,
+		IRR_HP_image_transform,
+		IRR_HP_occlusion_test,
+		IRR_HP_texture_lighting,
+		IRR_IBM_cull_vertex,
+		IRR_IBM_multimode_draw_arrays,
+		IRR_IBM_rasterpos_clip,
+		IRR_IBM_static_data,
+		IRR_IBM_texture_mirrored_repeat,
+		IRR_IBM_vertex_array_lists,
+		IRR_INGR_blend_func_separate,
+		IRR_INGR_color_clamp,
+		IRR_INGR_interlace_read,
+		IRR_INGR_palette_buffer,
+		IRR_INTEL_map_texture,
+		IRR_INTEL_parallel_arrays,
+		IRR_INTEL_texture_scissor,
+		IRR_KHR_debug,
+		IRR_KHR_texture_compression_astc_hdr,
+		IRR_KHR_texture_compression_astc_ldr,
+		IRR_MESA_pack_invert,
+		IRR_MESA_resize_buffers,
+		IRR_MESA_window_pos,
+		IRR_MESAX_texture_stack,
+		IRR_MESA_ycbcr_texture,
+		IRR_NVX_conditional_render,
+		IRR_NV_bindless_multi_draw_indirect,
+		IRR_NV_bindless_texture,
+		IRR_NV_blend_equation_advanced,
+		IRR_NV_blend_equation_advanced_coherent,
+		IRR_NV_blend_square,
+		IRR_NV_compute_program5,
+		IRR_NV_conditional_render,
+		IRR_NV_copy_depth_to_color,
+		IRR_NV_copy_image,
+		IRR_NV_deep_texture3D,
+		IRR_NV_depth_buffer_float,
+		IRR_NV_depth_clamp,
+		IRR_NV_draw_texture,
+		IRR_NV_evaluators,
+		IRR_NV_explicit_multisample,
+		IRR_NV_fence,
+		IRR_NV_float_buffer,
+		IRR_NV_fog_distance,
+		IRR_NV_fragment_program,
+		IRR_NV_fragment_program2,
+		IRR_NV_fragment_program4,
+		IRR_NV_fragment_program_option,
+		IRR_NV_framebuffer_multisample_coverage,
+		IRR_NV_geometry_program4,
+		IRR_NV_geometry_shader4,
+		IRR_NV_gpu_program4,
+		IRR_NV_gpu_program5,
+		IRR_NV_gpu_program5_mem_extended,
+		IRR_NV_gpu_shader5,
+		IRR_NV_half_float,
+		IRR_NV_light_max_exponent,
+		IRR_NV_multisample_coverage,
+		IRR_NV_multisample_filter_hint,
+		IRR_NV_occlusion_query,
+		IRR_NV_packed_depth_stencil,
+		IRR_NV_parameter_buffer_object,
+		IRR_NV_parameter_buffer_object2,
+		IRR_NV_path_rendering,
+		IRR_NV_pixel_data_range,
+		IRR_NV_point_sprite,
+		IRR_NV_present_video,
+		IRR_NV_primitive_restart,
+		IRR_NV_register_combiners,
+		IRR_NV_register_combiners2,
+		IRR_NV_shader_atomic_counters,
+		IRR_NV_shader_atomic_float,
+		IRR_NV_shader_buffer_load,
+		IRR_NV_shader_buffer_store,
+		IRR_NV_shader_storage_buffer_object,
+		IRR_NV_tessellation_program5,
+		IRR_NV_texgen_emboss,
+		IRR_NV_texgen_reflection,
+		IRR_NV_texture_barrier,
+		IRR_NV_texture_compression_vtc,
+		IRR_NV_texture_env_combine4,
+		IRR_NV_texture_expand_normal,
+		IRR_NV_texture_multisample,
+		IRR_NV_texture_rectangle,
+		IRR_NV_texture_shader,
+		IRR_NV_texture_shader2,
+		IRR_NV_texture_shader3,
+		IRR_NV_transform_feedback,
+		IRR_NV_transform_feedback2,
+		IRR_NV_vdpau_interop,
+		IRR_NV_vertex_array_range,
+		IRR_NV_vertex_array_range2,
+		IRR_NV_vertex_attrib_integer_64bit,
+		IRR_NV_vertex_buffer_unified_memory,
+		IRR_NV_vertex_program,
+		IRR_NV_vertex_program1_1,
+		IRR_NV_vertex_program2,
+		IRR_NV_vertex_program2_option,
+		IRR_NV_vertex_program3,
+		IRR_NV_vertex_program4,
+		IRR_NV_video_capture,
+		IRR_OES_byte_coordinates,
+		IRR_OES_compressed_paletted_texture,
+		IRR_OES_fixed_point,
+		IRR_OES_query_matrix,
+		IRR_OES_read_format,
+		IRR_OES_single_precision,
+		IRR_OML_interlace,
+		IRR_OML_resample,
+		IRR_OML_subsample,
+		IRR_PGI_misc_hints,
+		IRR_PGI_vertex_hints,
+		IRR_REND_screen_coordinates,
+		IRR_S3_s3tc,
+		IRR_SGI_color_matrix,
+		IRR_SGI_color_table,
+		IRR_SGI_texture_color_table,
+		IRR_SGIS_detail_texture,
+		IRR_SGIS_fog_function,
+		IRR_SGIS_generate_mipmap,
+		IRR_SGIS_multisample,
+		IRR_SGIS_pixel_texture,
+		IRR_SGIS_point_line_texgen,
+		IRR_SGIS_point_parameters,
+		IRR_SGIS_sharpen_texture,
+		IRR_SGIS_texture4D,
+		IRR_SGIS_texture_border_clamp,
+		IRR_SGIS_texture_color_mask,
+		IRR_SGIS_texture_edge_clamp,
+		IRR_SGIS_texture_filter4,
+		IRR_SGIS_texture_lod,
+		IRR_SGIS_texture_select,
+		IRR_SGIX_async,
+		IRR_SGIX_async_histogram,
+		IRR_SGIX_async_pixel,
+		IRR_SGIX_blend_alpha_minmax,
+		IRR_SGIX_calligraphic_fragment,
+		IRR_SGIX_clipmap,
+		IRR_SGIX_convolution_accuracy,
+		IRR_SGIX_depth_pass_instrument,
+		IRR_SGIX_depth_texture,
+		IRR_SGIX_flush_raster,
+		IRR_SGIX_fog_offset,
+		IRR_SGIX_fog_scale,
+		IRR_SGIX_fragment_lighting,
+		IRR_SGIX_framezoom,
+		IRR_SGIX_igloo_interface,
+		IRR_SGIX_instruments,
+		IRR_SGIX_interlace,
+		IRR_SGIX_ir_instrument1,
+		IRR_SGIX_list_priority,
+		IRR_SGIX_pixel_texture,
+		IRR_SGIX_pixel_tiles,
+		IRR_SGIX_polynomial_ffd,
+		IRR_SGIX_reference_plane,
+		IRR_SGIX_resample,
+		IRR_SGIX_scalebias_hint,
+		IRR_SGIX_shadow,
+		IRR_SGIX_shadow_ambient,
+		IRR_SGIX_sprite,
+		IRR_SGIX_subsample,
+		IRR_SGIX_tag_sample_buffer,
+		IRR_SGIX_texture_add_env,
+		IRR_SGIX_texture_coordinate_clamp,
+		IRR_SGIX_texture_lod_bias,
+		IRR_SGIX_texture_multi_buffer,
+		IRR_SGIX_texture_scale_bias,
+		IRR_SGIX_vertex_preclip,
+		IRR_SGIX_ycrcb,
+		IRR_SGIX_ycrcba,
+		IRR_SGIX_ycrcb_subsample,
+		IRR_SUN_convolution_border_modes,
+		IRR_SUN_global_alpha,
+		IRR_SUN_mesh_array,
+		IRR_SUN_slice_accum,
+		IRR_SUN_triangle_list,
+		IRR_SUN_vertex,
+		IRR_SUNX_constant_data,
+		IRR_WIN_phong_shading,
+		IRR_WIN_specular_fog,
+		IRR_NVX_gpu_memory_info,
+		IRR_OpenGL_Feature_Count
+	};
+
+	// constructor
+	COpenGLExtensionHandler();
+
+	// deferred initialization
+	void initExtensions(video::IContextManager *cmgr, bool stencilBuffer);
+
+	const COpenGLCoreFeature &getFeature() const;
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryOpenGLFeature(EOpenGLFeatures feature) const
+	{
+		return FeatureAvailable[feature];
+	}
+
+	//! show all features with availability
+	void dump(ELOG_LEVEL logLevel) const;
+
+	// Some variables for properties
+	bool StencilBuffer;
+	bool TextureCompressionExtension;
+
+	// Some non-boolean properties
+	//! Maximum hardware lights supported
+	u8 MaxLights;
+	//! Maximal Anisotropy
+	u8 MaxAnisotropy;
+	//! Number of user clipplanes
+	u8 MaxUserClipPlanes;
+	//! Number of auxiliary buffers
+	u8 MaxAuxBuffers;
+	//! Optimal number of indices per meshbuffer
+	u32 MaxIndices;
+	//! Maximal texture dimension
+	u32 MaxTextureSize;
+	//! Maximal vertices handled by geometry shaders
+	u32 MaxGeometryVerticesOut;
+	//! Maximal LOD Bias
+	f32 MaxTextureLODBias;
+	//! Minimal and maximal supported thickness for lines without smoothing
+	GLfloat DimAliasedLine[2];
+	//! Minimal and maximal supported thickness for points without smoothing
+	GLfloat DimAliasedPoint[2];
+	//! Minimal and maximal supported thickness for lines with smoothing
+	GLfloat DimSmoothedLine[2];
+	//! Minimal and maximal supported thickness for points with smoothing
+	GLfloat DimSmoothedPoint[2];
+
+	//! OpenGL version as Integer: 100*Major+Minor, i.e. 2.1 becomes 201
+	u16 Version;
+	//! GLSL version as Integer: 100*Major+Minor
+	u16 ShaderLanguageVersion;
+
+	bool OcclusionQuerySupport;
+
+	// Info needed for workarounds.
+	bool IsAtiRadeonX;
+
+	//! Workaround until direct state access with framebuffers is stable enough in drivers
+	// https://devtalk.nvidia.com/default/topic/1030494/opengl/bug-amp-amp-spec-violation-checknamedframebufferstatus-returns-gl_framebuffer_incomplete_dimensions_ext-under-gl-4-5-core/
+	// https://stackoverflow.com/questions/51304706/problems-with-attaching-textures-of-different-sizes-to-fbo
+	static bool needsDSAFramebufferHack;
+
+	// public access to the (loaded) extensions.
+	// general functions
+	void irrGlActiveTexture(GLenum texture);
+	void irrGlClientActiveTexture(GLenum texture);
+	void extGlPointParameterf(GLint loc, GLfloat f);
+	void extGlPointParameterfv(GLint loc, const GLfloat *v);
+	void extGlStencilFuncSeparate(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+	void extGlStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+	void irrGlCompressedTexImage2D(GLenum target, GLint level,
+			GLenum internalformat, GLsizei width, GLsizei height,
+			GLint border, GLsizei imageSize, const void *data);
+	void irrGlCompressedTexSubImage2D(GLenum target, GLint level,
+			GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
+			GLenum format, GLsizei imageSize, const void *data);
+
+	// shader programming
+	void extGlGenPrograms(GLsizei n, GLuint *programs);
+	void extGlBindProgram(GLenum target, GLuint program);
+	void extGlProgramString(GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+	void extGlLoadProgram(GLenum target, GLuint id, GLsizei len, const GLubyte *string);
+	void extGlDeletePrograms(GLsizei n, const GLuint *programs);
+	void extGlProgramLocalParameter4fv(GLenum, GLuint, const GLfloat *);
+	GLhandleARB extGlCreateShaderObject(GLenum shaderType);
+	GLuint extGlCreateShader(GLenum shaderType);
+	// note: Due to the type confusion between shader_objects and OpenGL 2.0
+	// we have to add the ARB extension for proper method definitions in case
+	// that handleARB and uint are the same type
+	void extGlShaderSourceARB(GLhandleARB shader, GLsizei numOfStrings, const char **strings, const GLint *lenOfStrings);
+	void extGlShaderSource(GLuint shader, GLsizei numOfStrings, const char **strings, const GLint *lenOfStrings);
+	// note: Due to the type confusion between shader_objects and OpenGL 2.0
+	// we have to add the ARB extension for proper method definitions in case
+	// that handleARB and uint are the same type
+	void extGlCompileShaderARB(GLhandleARB shader);
+	void extGlCompileShader(GLuint shader);
+	GLhandleARB extGlCreateProgramObject(void);
+	GLuint extGlCreateProgram(void);
+	void extGlAttachObject(GLhandleARB program, GLhandleARB shader);
+	void extGlAttachShader(GLuint program, GLuint shader);
+	void extGlLinkProgramARB(GLhandleARB program);
+	// note: Due to the type confusion between shader_objects and OpenGL 2.0
+	// we have to add the ARB extension for proper method definitions in case
+	// that handleARB and uint are the same type
+	void extGlLinkProgram(GLuint program);
+	void extGlUseProgramObject(GLhandleARB prog);
+	void irrGlUseProgram(GLuint prog);
+	void extGlDeleteObject(GLhandleARB object);
+	void extGlDeleteProgram(GLuint object);
+	void extGlDeleteShader(GLuint shader);
+	void extGlGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders);
+	void extGlGetAttachedObjects(GLhandleARB program, GLsizei maxcount, GLsizei *count, GLhandleARB *shaders);
+	void extGlGetInfoLog(GLhandleARB object, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+	void extGlGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog);
+	void extGlGetProgramInfoLog(GLuint program, GLsizei maxLength, GLsizei *length, GLchar *infoLog);
+	void extGlGetObjectParameteriv(GLhandleARB object, GLenum type, GLint *param);
+	void extGlGetShaderiv(GLuint shader, GLenum type, GLint *param);
+	void extGlGetProgramiv(GLuint program, GLenum type, GLint *param);
+	GLint extGlGetUniformLocationARB(GLhandleARB program, const char *name);
+	GLint extGlGetUniformLocation(GLuint program, const char *name);
+	void extGlUniform1fv(GLint loc, GLsizei count, const GLfloat *v);
+	void extGlUniform2fv(GLint loc, GLsizei count, const GLfloat *v);
+	void extGlUniform3fv(GLint loc, GLsizei count, const GLfloat *v);
+	void extGlUniform4fv(GLint loc, GLsizei count, const GLfloat *v);
+	void extGlUniform1bv(GLint loc, GLsizei count, const bool *v);
+	void extGlUniform2bv(GLint loc, GLsizei count, const bool *v);
+	void extGlUniform3bv(GLint loc, GLsizei count, const bool *v);
+	void extGlUniform4bv(GLint loc, GLsizei count, const bool *v);
+	void extGlUniform1iv(GLint loc, GLsizei count, const GLint *v);
+	void extGlUniform2iv(GLint loc, GLsizei count, const GLint *v);
+	void extGlUniform3iv(GLint loc, GLsizei count, const GLint *v);
+	void extGlUniform4iv(GLint loc, GLsizei count, const GLint *v);
+	void extGlUniform1uiv(GLint loc, GLsizei count, const GLuint *v);
+	void extGlUniform2uiv(GLint loc, GLsizei count, const GLuint *v);
+	void extGlUniform3uiv(GLint loc, GLsizei count, const GLuint *v);
+	void extGlUniform4uiv(GLint loc, GLsizei count, const GLuint *v);
+	void extGlUniformMatrix2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix2x3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix2x4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix3x2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix3x4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix4x2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix4x3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlUniformMatrix4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v);
+	void extGlGetActiveUniformARB(GLhandleARB program, GLuint index, GLsizei maxlength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+	void extGlGetActiveUniform(GLuint program, GLuint index, GLsizei maxlength, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+
+	// framebuffer objects
+	void irrGlBindFramebuffer(GLenum target, GLuint framebuffer);
+	void irrGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
+	void irrGlGenFramebuffers(GLsizei n, GLuint *framebuffers);
+	GLenum irrGlCheckFramebufferStatus(GLenum target);
+	void irrGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+	void irrGlBindRenderbuffer(GLenum target, GLuint renderbuffer);
+	void irrGlDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
+	void irrGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers);
+	void irrGlRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+	void irrGlFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+	void irrGlGenerateMipmap(GLenum target);
+	void irrGlActiveStencilFace(GLenum face);
+	void irrGlDrawBuffer(GLenum mode);
+	void irrGlDrawBuffers(GLsizei n, const GLenum *bufs);
+
+	// vertex buffer object
+	void extGlGenBuffers(GLsizei n, GLuint *buffers);
+	void extGlBindBuffer(GLenum target, GLuint buffer);
+	void extGlBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+	void extGlDeleteBuffers(GLsizei n, const GLuint *buffers);
+	void extGlBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+	void extGlGetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+	void *extGlMapBuffer(GLenum target, GLenum access);
+	GLboolean extGlUnmapBuffer(GLenum target);
+	GLboolean extGlIsBuffer(GLuint buffer);
+	void extGlGetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
+	void extGlGetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
+	void extGlProvokingVertex(GLenum mode);
+	void extGlProgramParameteri(GLuint program, GLenum pname, GLint value);
+
+	// occlusion query
+	void extGlGenQueries(GLsizei n, GLuint *ids);
+	void extGlDeleteQueries(GLsizei n, const GLuint *ids);
+	GLboolean extGlIsQuery(GLuint id);
+	void extGlBeginQuery(GLenum target, GLuint id);
+	void extGlEndQuery(GLenum target);
+	void extGlGetQueryiv(GLenum target, GLenum pname, GLint *params);
+	void extGlGetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
+	void extGlGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
+
+	// blend
+	void irrGlBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+	void irrGlBlendEquation(GLenum mode);
+
+	// indexed
+	void irrGlEnableIndexed(GLenum target, GLuint index);
+	void irrGlDisableIndexed(GLenum target, GLuint index);
+	void irrGlColorMaskIndexed(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+	void irrGlBlendFuncIndexed(GLuint buf, GLenum src, GLenum dst);
+	void irrGlBlendFuncSeparateIndexed(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+	void irrGlBlendEquationIndexed(GLuint buf, GLenum mode);
+	void irrGlBlendEquationSeparateIndexed(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+
+	void extGlTextureSubImage2D(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+	void extGlTextureStorage2D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+	void extGlTextureStorage3D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+	void extGlGetTextureImage(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+	void extGlNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+	void extGlTextureParameteri(GLuint texture, GLenum pname, GLint param);
+	void extGlTextureParameterf(GLuint texture, GLenum pname, GLfloat param);
+	void extGlTextureParameteriv(GLuint texture, GLenum pname, const GLint *params);
+	void extGlTextureParameterfv(GLuint texture, GLenum pname, const GLfloat *params);
+	void extGlCreateTextures(GLenum target, GLsizei n, GLuint *textures);
+	void extGlCreateFramebuffers(GLsizei n, GLuint *framebuffers);
+	void extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum *targets);
+	void extGlGenerateTextureMipmap(GLuint texture, GLenum target);
+
+	// generic vsync setting method for several extensions
+	void extGlSwapInterval(int interval);
+
+	// the global feature array
+	bool FeatureAvailable[IRR_OpenGL_Feature_Count];
+
+protected:
+	COpenGLCoreFeature Feature;
+
+	PFNGLACTIVETEXTUREPROC pGlActiveTexture;
+	PFNGLACTIVETEXTUREARBPROC pGlActiveTextureARB;
+	PFNGLCLIENTACTIVETEXTUREARBPROC pGlClientActiveTextureARB;
+	PFNGLGENPROGRAMSARBPROC pGlGenProgramsARB;
+	PFNGLGENPROGRAMSNVPROC pGlGenProgramsNV;
+	PFNGLBINDPROGRAMARBPROC pGlBindProgramARB;
+	PFNGLBINDPROGRAMNVPROC pGlBindProgramNV;
+	PFNGLDELETEPROGRAMSARBPROC pGlDeleteProgramsARB;
+	PFNGLDELETEPROGRAMSNVPROC pGlDeleteProgramsNV;
+	PFNGLPROGRAMSTRINGARBPROC pGlProgramStringARB;
+	PFNGLLOADPROGRAMNVPROC pGlLoadProgramNV;
+	PFNGLPROGRAMLOCALPARAMETER4FVARBPROC pGlProgramLocalParameter4fvARB;
+	PFNGLCREATESHADEROBJECTARBPROC pGlCreateShaderObjectARB;
+	PFNGLSHADERSOURCEARBPROC pGlShaderSourceARB;
+	PFNGLCOMPILESHADERARBPROC pGlCompileShaderARB;
+	PFNGLCREATEPROGRAMOBJECTARBPROC pGlCreateProgramObjectARB;
+	PFNGLATTACHOBJECTARBPROC pGlAttachObjectARB;
+	PFNGLLINKPROGRAMARBPROC pGlLinkProgramARB;
+	PFNGLUSEPROGRAMOBJECTARBPROC pGlUseProgramObjectARB;
+	PFNGLDELETEOBJECTARBPROC pGlDeleteObjectARB;
+	PFNGLCREATEPROGRAMPROC pGlCreateProgram;
+	PFNGLUSEPROGRAMPROC pGlUseProgram;
+	PFNGLDELETEPROGRAMPROC pGlDeleteProgram;
+	PFNGLDELETESHADERPROC pGlDeleteShader;
+	PFNGLGETATTACHEDOBJECTSARBPROC pGlGetAttachedObjectsARB;
+	PFNGLGETATTACHEDSHADERSPROC pGlGetAttachedShaders;
+	PFNGLCREATESHADERPROC pGlCreateShader;
+	PFNGLSHADERSOURCEPROC pGlShaderSource;
+	PFNGLCOMPILESHADERPROC pGlCompileShader;
+	PFNGLATTACHSHADERPROC pGlAttachShader;
+	PFNGLLINKPROGRAMPROC pGlLinkProgram;
+	PFNGLGETINFOLOGARBPROC pGlGetInfoLogARB;
+	PFNGLGETSHADERINFOLOGPROC pGlGetShaderInfoLog;
+	PFNGLGETPROGRAMINFOLOGPROC pGlGetProgramInfoLog;
+	PFNGLGETOBJECTPARAMETERIVARBPROC pGlGetObjectParameterivARB;
+	PFNGLGETSHADERIVPROC pGlGetShaderiv;
+	PFNGLGETSHADERIVPROC pGlGetProgramiv;
+	PFNGLGETUNIFORMLOCATIONARBPROC pGlGetUniformLocationARB;
+	PFNGLGETUNIFORMLOCATIONPROC pGlGetUniformLocation;
+	PFNGLUNIFORM1FVARBPROC pGlUniform1fvARB;
+	PFNGLUNIFORM2FVARBPROC pGlUniform2fvARB;
+	PFNGLUNIFORM3FVARBPROC pGlUniform3fvARB;
+	PFNGLUNIFORM4FVARBPROC pGlUniform4fvARB;
+	PFNGLUNIFORM1IVARBPROC pGlUniform1ivARB;
+	PFNGLUNIFORM2IVARBPROC pGlUniform2ivARB;
+	PFNGLUNIFORM3IVARBPROC pGlUniform3ivARB;
+	PFNGLUNIFORM4IVARBPROC pGlUniform4ivARB;
+	PFNGLUNIFORM1UIVPROC pGlUniform1uiv;
+	PFNGLUNIFORM2UIVPROC pGlUniform2uiv;
+	PFNGLUNIFORM3UIVPROC pGlUniform3uiv;
+	PFNGLUNIFORM4UIVPROC pGlUniform4uiv;
+	PFNGLUNIFORMMATRIX2FVARBPROC pGlUniformMatrix2fvARB;
+	PFNGLUNIFORMMATRIX2X3FVPROC pGlUniformMatrix2x3fv;
+	PFNGLUNIFORMMATRIX2X4FVPROC pGlUniformMatrix2x4fv;
+	PFNGLUNIFORMMATRIX3X2FVPROC pGlUniformMatrix3x2fv;
+	PFNGLUNIFORMMATRIX3FVARBPROC pGlUniformMatrix3fvARB;
+	PFNGLUNIFORMMATRIX3X4FVPROC pGlUniformMatrix3x4fv;
+	PFNGLUNIFORMMATRIX4X2FVPROC pGlUniformMatrix4x2fv;
+	PFNGLUNIFORMMATRIX4X3FVPROC pGlUniformMatrix4x3fv;
+	PFNGLUNIFORMMATRIX4FVARBPROC pGlUniformMatrix4fvARB;
+	PFNGLGETACTIVEUNIFORMARBPROC pGlGetActiveUniformARB;
+	PFNGLGETACTIVEUNIFORMPROC pGlGetActiveUniform;
+	PFNGLPOINTPARAMETERFARBPROC pGlPointParameterfARB;
+	PFNGLPOINTPARAMETERFVARBPROC pGlPointParameterfvARB;
+	PFNGLSTENCILFUNCSEPARATEPROC pGlStencilFuncSeparate;
+	PFNGLSTENCILOPSEPARATEPROC pGlStencilOpSeparate;
+	PFNGLSTENCILFUNCSEPARATEATIPROC pGlStencilFuncSeparateATI;
+	PFNGLSTENCILOPSEPARATEATIPROC pGlStencilOpSeparateATI;
+	PFNGLCOMPRESSEDTEXIMAGE2DPROC pGlCompressedTexImage2D;
+	PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC pGlCompressedTexSubImage2D;
+	// ARB framebuffer object
+	PFNGLBINDFRAMEBUFFERPROC pGlBindFramebuffer;
+	PFNGLDELETEFRAMEBUFFERSPROC pGlDeleteFramebuffers;
+	PFNGLGENFRAMEBUFFERSPROC pGlGenFramebuffers;
+	PFNGLCHECKFRAMEBUFFERSTATUSPROC pGlCheckFramebufferStatus;
+	PFNGLFRAMEBUFFERTEXTURE2DPROC pGlFramebufferTexture2D;
+	PFNGLBINDRENDERBUFFERPROC pGlBindRenderbuffer;
+	PFNGLDELETERENDERBUFFERSPROC pGlDeleteRenderbuffers;
+	PFNGLGENRENDERBUFFERSPROC pGlGenRenderbuffers;
+	PFNGLRENDERBUFFERSTORAGEPROC pGlRenderbufferStorage;
+	PFNGLFRAMEBUFFERRENDERBUFFERPROC pGlFramebufferRenderbuffer;
+	PFNGLGENERATEMIPMAPPROC pGlGenerateMipmap;
+	// EXT framebuffer object
+	PFNGLBINDFRAMEBUFFEREXTPROC pGlBindFramebufferEXT;
+	PFNGLDELETEFRAMEBUFFERSEXTPROC pGlDeleteFramebuffersEXT;
+	PFNGLGENFRAMEBUFFERSEXTPROC pGlGenFramebuffersEXT;
+	PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC pGlCheckFramebufferStatusEXT;
+	PFNGLFRAMEBUFFERTEXTURE2DEXTPROC pGlFramebufferTexture2DEXT;
+	PFNGLBINDRENDERBUFFEREXTPROC pGlBindRenderbufferEXT;
+	PFNGLDELETERENDERBUFFERSEXTPROC pGlDeleteRenderbuffersEXT;
+	PFNGLGENRENDERBUFFERSEXTPROC pGlGenRenderbuffersEXT;
+	PFNGLRENDERBUFFERSTORAGEEXTPROC pGlRenderbufferStorageEXT;
+	PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC pGlFramebufferRenderbufferEXT;
+	PFNGLGENERATEMIPMAPEXTPROC pGlGenerateMipmapEXT;
+	PFNGLACTIVESTENCILFACEEXTPROC pGlActiveStencilFaceEXT;
+	PFNGLDRAWBUFFERSARBPROC pGlDrawBuffersARB;
+	PFNGLDRAWBUFFERSATIPROC pGlDrawBuffersATI;
+	PFNGLGENBUFFERSARBPROC pGlGenBuffersARB;
+	PFNGLBINDBUFFERARBPROC pGlBindBufferARB;
+	PFNGLBUFFERDATAARBPROC pGlBufferDataARB;
+	PFNGLDELETEBUFFERSARBPROC pGlDeleteBuffersARB;
+	PFNGLBUFFERSUBDATAARBPROC pGlBufferSubDataARB;
+	PFNGLGETBUFFERSUBDATAARBPROC pGlGetBufferSubDataARB;
+	PFNGLMAPBUFFERARBPROC pGlMapBufferARB;
+	PFNGLUNMAPBUFFERARBPROC pGlUnmapBufferARB;
+	PFNGLISBUFFERARBPROC pGlIsBufferARB;
+	PFNGLGETBUFFERPARAMETERIVARBPROC pGlGetBufferParameterivARB;
+	PFNGLGETBUFFERPOINTERVARBPROC pGlGetBufferPointervARB;
+	PFNGLPROVOKINGVERTEXPROC pGlProvokingVertexARB;
+	PFNGLPROVOKINGVERTEXEXTPROC pGlProvokingVertexEXT;
+	PFNGLPROGRAMPARAMETERIARBPROC pGlProgramParameteriARB;
+	PFNGLPROGRAMPARAMETERIEXTPROC pGlProgramParameteriEXT;
+	PFNGLGENQUERIESARBPROC pGlGenQueriesARB;
+	PFNGLDELETEQUERIESARBPROC pGlDeleteQueriesARB;
+	PFNGLISQUERYARBPROC pGlIsQueryARB;
+	PFNGLBEGINQUERYARBPROC pGlBeginQueryARB;
+	PFNGLENDQUERYARBPROC pGlEndQueryARB;
+	PFNGLGETQUERYIVARBPROC pGlGetQueryivARB;
+	PFNGLGETQUERYOBJECTIVARBPROC pGlGetQueryObjectivARB;
+	PFNGLGETQUERYOBJECTUIVARBPROC pGlGetQueryObjectuivARB;
+	PFNGLGENOCCLUSIONQUERIESNVPROC pGlGenOcclusionQueriesNV;
+	PFNGLDELETEOCCLUSIONQUERIESNVPROC pGlDeleteOcclusionQueriesNV;
+	PFNGLISOCCLUSIONQUERYNVPROC pGlIsOcclusionQueryNV;
+	PFNGLBEGINOCCLUSIONQUERYNVPROC pGlBeginOcclusionQueryNV;
+	PFNGLENDOCCLUSIONQUERYNVPROC pGlEndOcclusionQueryNV;
+	PFNGLGETOCCLUSIONQUERYIVNVPROC pGlGetOcclusionQueryivNV;
+	PFNGLGETOCCLUSIONQUERYUIVNVPROC pGlGetOcclusionQueryuivNV;
+	// Blend
+	PFNGLBLENDFUNCSEPARATEEXTPROC pGlBlendFuncSeparateEXT;
+	PFNGLBLENDFUNCSEPARATEPROC pGlBlendFuncSeparate;
+	PFNGLBLENDEQUATIONEXTPROC pGlBlendEquationEXT;
+	PFNGLBLENDEQUATIONPROC pGlBlendEquation;
+	PFNGLBLENDEQUATIONSEPARATEEXTPROC pGlBlendEquationSeparateEXT;
+	PFNGLBLENDEQUATIONSEPARATEPROC pGlBlendEquationSeparate;
+	// Indexed
+	PFNGLENABLEINDEXEDEXTPROC pGlEnableIndexedEXT;
+	PFNGLDISABLEINDEXEDEXTPROC pGlDisableIndexedEXT;
+	PFNGLCOLORMASKINDEXEDEXTPROC pGlColorMaskIndexedEXT;
+	PFNGLBLENDFUNCINDEXEDAMDPROC pGlBlendFuncIndexedAMD;
+	PFNGLBLENDFUNCIPROC pGlBlendFunciARB;
+	PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC pGlBlendFuncSeparateIndexedAMD;
+	PFNGLBLENDFUNCSEPARATEIPROC pGlBlendFuncSeparateiARB;
+	PFNGLBLENDEQUATIONINDEXEDAMDPROC pGlBlendEquationIndexedAMD;
+	PFNGLBLENDEQUATIONIPROC pGlBlendEquationiARB;
+	PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC pGlBlendEquationSeparateIndexedAMD;
+	PFNGLBLENDEQUATIONSEPARATEIPROC pGlBlendEquationSeparateiARB;
+
+	// DSA
+	PFNGLTEXTURESTORAGE2DPROC pGlTextureStorage2D;
+	PFNGLTEXTURESTORAGE3DPROC pGlTextureStorage3D;
+	PFNGLTEXTURESUBIMAGE2DPROC pGlTextureSubImage2D;
+	PFNGLGETTEXTUREIMAGEPROC pGlGetTextureImage;
+	PFNGLNAMEDFRAMEBUFFERTEXTUREPROC pGlNamedFramebufferTexture;
+	PFNGLTEXTUREPARAMETERIPROC pGlTextureParameteri;
+	PFNGLTEXTUREPARAMETERFPROC pGlTextureParameterf;
+	PFNGLTEXTUREPARAMETERIVPROC pGlTextureParameteriv;
+	PFNGLTEXTUREPARAMETERFVPROC pGlTextureParameterfv;
+
+	PFNGLCREATETEXTURESPROC pGlCreateTextures;
+	PFNGLCREATEFRAMEBUFFERSPROC pGlCreateFramebuffers;
+	PFNGLBINDTEXTURESPROC pGlBindTextures;
+	PFNGLGENERATETEXTUREMIPMAPPROC pGlGenerateTextureMipmap;
+	// DSA with EXT or functions to simulate it
+	PFNGLTEXTURESTORAGE2DEXTPROC pGlTextureStorage2DEXT;
+	PFNGLTEXSTORAGE2DPROC pGlTexStorage2D;
+	PFNGLTEXTURESTORAGE3DEXTPROC pGlTextureStorage3DEXT;
+	PFNGLTEXSTORAGE3DPROC pGlTexStorage3D;
+	PFNGLTEXTURESUBIMAGE2DEXTPROC pGlTextureSubImage2DEXT;
+	PFNGLGETTEXTUREIMAGEEXTPROC pGlGetTextureImageEXT;
+	PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC pGlNamedFramebufferTextureEXT;
+	PFNGLFRAMEBUFFERTEXTUREPROC pGlFramebufferTexture;
+	PFNGLGENERATETEXTUREMIPMAPEXTPROC pGlGenerateTextureMipmapEXT;
+
+#if defined(WGL_EXT_swap_control)
+	PFNWGLSWAPINTERVALEXTPROC pWglSwapIntervalEXT;
+#endif
+#if defined(GLX_SGI_swap_control)
+	PFNGLXSWAPINTERVALSGIPROC pGlxSwapIntervalSGI;
+#endif
+#if defined(GLX_EXT_swap_control)
+	PFNGLXSWAPINTERVALEXTPROC pGlxSwapIntervalEXT;
+#endif
+#if defined(GLX_MESA_swap_control)
+	PFNGLXSWAPINTERVALMESAPROC pGlxSwapIntervalMESA;
+#endif
+};
+
+inline void COpenGLExtensionHandler::irrGlActiveTexture(GLenum texture)
+{
+	if (pGlActiveTexture)
+		pGlActiveTexture(texture);
+	else if (pGlActiveTextureARB)
+		pGlActiveTextureARB(texture);
+}
+
+inline void COpenGLExtensionHandler::irrGlClientActiveTexture(GLenum texture)
+{
+	if (pGlClientActiveTextureARB)
+		pGlClientActiveTextureARB(texture);
+}
+
+inline void COpenGLExtensionHandler::extGlGenPrograms(GLsizei n, GLuint *programs)
+{
+	if (programs)
+		memset(programs, 0, n * sizeof(GLuint));
+	if (pGlGenProgramsARB)
+		pGlGenProgramsARB(n, programs);
+	else if (pGlGenProgramsNV)
+		pGlGenProgramsNV(n, programs);
+}
+
+inline void COpenGLExtensionHandler::extGlBindProgram(GLenum target, GLuint program)
+{
+	if (pGlBindProgramARB)
+		pGlBindProgramARB(target, program);
+	else if (pGlBindProgramNV)
+		pGlBindProgramNV(target, program);
+}
+
+inline void COpenGLExtensionHandler::extGlProgramString(GLenum target, GLenum format, GLsizei len, const GLvoid *string)
+{
+	if (pGlProgramStringARB)
+		pGlProgramStringARB(target, format, len, string);
+}
+
+inline void COpenGLExtensionHandler::extGlLoadProgram(GLenum target, GLuint id, GLsizei len, const GLubyte *string)
+{
+	if (pGlLoadProgramNV)
+		pGlLoadProgramNV(target, id, len, string);
+}
+
+inline void COpenGLExtensionHandler::extGlDeletePrograms(GLsizei n, const GLuint *programs)
+{
+	if (pGlDeleteProgramsARB)
+		pGlDeleteProgramsARB(n, programs);
+	else if (pGlDeleteProgramsNV)
+		pGlDeleteProgramsNV(n, programs);
+}
+
+inline void COpenGLExtensionHandler::extGlProgramLocalParameter4fv(GLenum n, GLuint i, const GLfloat *f)
+{
+	if (pGlProgramLocalParameter4fvARB)
+		pGlProgramLocalParameter4fvARB(n, i, f);
+}
+
+inline GLhandleARB COpenGLExtensionHandler::extGlCreateShaderObject(GLenum shaderType)
+{
+	if (pGlCreateShaderObjectARB)
+		return pGlCreateShaderObjectARB(shaderType);
+	return 0;
+}
+
+inline GLuint COpenGLExtensionHandler::extGlCreateShader(GLenum shaderType)
+{
+	if (pGlCreateShader)
+		return pGlCreateShader(shaderType);
+	return 0;
+}
+
+inline void COpenGLExtensionHandler::extGlShaderSourceARB(GLhandleARB shader, GLsizei numOfStrings, const char **strings, const GLint *lenOfStrings)
+{
+	if (pGlShaderSourceARB)
+		pGlShaderSourceARB(shader, numOfStrings, strings, lenOfStrings);
+}
+
+inline void COpenGLExtensionHandler::extGlShaderSource(GLuint shader, GLsizei numOfStrings, const char **strings, const GLint *lenOfStrings)
+{
+	if (pGlShaderSource)
+		pGlShaderSource(shader, numOfStrings, strings, lenOfStrings);
+}
+
+inline void COpenGLExtensionHandler::extGlCompileShaderARB(GLhandleARB shader)
+{
+	if (pGlCompileShaderARB)
+		pGlCompileShaderARB(shader);
+}
+
+inline void COpenGLExtensionHandler::extGlCompileShader(GLuint shader)
+{
+	if (pGlCompileShader)
+		pGlCompileShader(shader);
+}
+
+inline GLhandleARB COpenGLExtensionHandler::extGlCreateProgramObject(void)
+{
+	if (pGlCreateProgramObjectARB)
+		return pGlCreateProgramObjectARB();
+	return 0;
+}
+
+inline GLuint COpenGLExtensionHandler::extGlCreateProgram(void)
+{
+	if (pGlCreateProgram)
+		return pGlCreateProgram();
+	return 0;
+}
+
+inline void COpenGLExtensionHandler::extGlAttachObject(GLhandleARB program, GLhandleARB shader)
+{
+	if (pGlAttachObjectARB)
+		pGlAttachObjectARB(program, shader);
+}
+
+inline void COpenGLExtensionHandler::extGlAttachShader(GLuint program, GLuint shader)
+{
+	if (pGlAttachShader)
+		pGlAttachShader(program, shader);
+}
+
+inline void COpenGLExtensionHandler::extGlLinkProgramARB(GLhandleARB program)
+{
+	if (pGlLinkProgramARB)
+		pGlLinkProgramARB(program);
+}
+
+inline void COpenGLExtensionHandler::extGlLinkProgram(GLuint program)
+{
+	if (pGlLinkProgram)
+		pGlLinkProgram(program);
+}
+
+inline void COpenGLExtensionHandler::extGlUseProgramObject(GLhandleARB prog)
+{
+	if (pGlUseProgramObjectARB)
+		pGlUseProgramObjectARB(prog);
+}
+
+inline void COpenGLExtensionHandler::irrGlUseProgram(GLuint prog)
+{
+	if (pGlUseProgram)
+		pGlUseProgram(prog);
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteObject(GLhandleARB object)
+{
+	if (pGlDeleteObjectARB)
+		pGlDeleteObjectARB(object);
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteProgram(GLuint object)
+{
+	if (pGlDeleteProgram)
+		pGlDeleteProgram(object);
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteShader(GLuint shader)
+{
+	if (pGlDeleteShader)
+		pGlDeleteShader(shader);
+}
+
+inline void COpenGLExtensionHandler::extGlGetAttachedObjects(GLhandleARB program, GLsizei maxcount, GLsizei *count, GLhandleARB *shaders)
+{
+	if (count)
+		*count = 0;
+	if (pGlGetAttachedObjectsARB)
+		pGlGetAttachedObjectsARB(program, maxcount, count, shaders);
+}
+
+inline void COpenGLExtensionHandler::extGlGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders)
+{
+	if (count)
+		*count = 0;
+	if (pGlGetAttachedShaders)
+		pGlGetAttachedShaders(program, maxcount, count, shaders);
+}
+
+inline void COpenGLExtensionHandler::extGlGetInfoLog(GLhandleARB object, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog)
+{
+	if (length)
+		*length = 0;
+	if (pGlGetInfoLogARB)
+		pGlGetInfoLogARB(object, maxLength, length, infoLog);
+}
+
+inline void COpenGLExtensionHandler::extGlGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog)
+{
+	if (length)
+		*length = 0;
+	if (pGlGetShaderInfoLog)
+		pGlGetShaderInfoLog(shader, maxLength, length, infoLog);
+}
+
+inline void COpenGLExtensionHandler::extGlGetProgramInfoLog(GLuint program, GLsizei maxLength, GLsizei *length, GLchar *infoLog)
+{
+	if (length)
+		*length = 0;
+	if (pGlGetProgramInfoLog)
+		pGlGetProgramInfoLog(program, maxLength, length, infoLog);
+}
+
+inline void COpenGLExtensionHandler::extGlGetObjectParameteriv(GLhandleARB object, GLenum type, GLint *param)
+{
+	if (pGlGetObjectParameterivARB)
+		pGlGetObjectParameterivARB(object, type, param);
+}
+
+inline void COpenGLExtensionHandler::extGlGetShaderiv(GLuint shader, GLenum type, GLint *param)
+{
+	if (pGlGetShaderiv)
+		pGlGetShaderiv(shader, type, param);
+}
+
+inline void COpenGLExtensionHandler::extGlGetProgramiv(GLuint program, GLenum type, GLint *param)
+{
+	if (pGlGetProgramiv)
+		pGlGetProgramiv(program, type, param);
+}
+
+inline GLint COpenGLExtensionHandler::extGlGetUniformLocationARB(GLhandleARB program, const char *name)
+{
+	if (pGlGetUniformLocationARB)
+		return pGlGetUniformLocationARB(program, name);
+	return 0;
+}
+
+inline GLint COpenGLExtensionHandler::extGlGetUniformLocation(GLuint program, const char *name)
+{
+	if (pGlGetUniformLocation)
+		return pGlGetUniformLocation(program, name);
+	return 0;
+}
+
+inline void COpenGLExtensionHandler::extGlUniform1fv(GLint loc, GLsizei count, const GLfloat *v)
+{
+	if (pGlUniform1fvARB)
+		pGlUniform1fvARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform2fv(GLint loc, GLsizei count, const GLfloat *v)
+{
+	if (pGlUniform2fvARB)
+		pGlUniform2fvARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform3fv(GLint loc, GLsizei count, const GLfloat *v)
+{
+	if (pGlUniform3fvARB)
+		pGlUniform3fvARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform4fv(GLint loc, GLsizei count, const GLfloat *v)
+{
+	if (pGlUniform4fvARB)
+		pGlUniform4fvARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform1uiv(GLint loc, GLsizei count, const GLuint *v)
+{
+	if (pGlUniform1uiv)
+		pGlUniform1uiv(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform2uiv(GLint loc, GLsizei count, const GLuint *v)
+{
+	if (pGlUniform2uiv)
+		pGlUniform2uiv(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform3uiv(GLint loc, GLsizei count, const GLuint *v)
+{
+	if (pGlUniform3uiv)
+		pGlUniform3uiv(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform4uiv(GLint loc, GLsizei count, const GLuint *v)
+{
+	if (pGlUniform4uiv)
+		pGlUniform4uiv(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform1iv(GLint loc, GLsizei count, const GLint *v)
+{
+	if (pGlUniform1ivARB)
+		pGlUniform1ivARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform2iv(GLint loc, GLsizei count, const GLint *v)
+{
+	if (pGlUniform2ivARB)
+		pGlUniform2ivARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform3iv(GLint loc, GLsizei count, const GLint *v)
+{
+	if (pGlUniform3ivARB)
+		pGlUniform3ivARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniform4iv(GLint loc, GLsizei count, const GLint *v)
+{
+	if (pGlUniform4ivARB)
+		pGlUniform4ivARB(loc, count, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix2fvARB)
+		pGlUniformMatrix2fvARB(loc, count, transpose, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix2x3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix2x3fv)
+		pGlUniformMatrix2x3fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix2x3fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix2x4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix2x4fv)
+		pGlUniformMatrix2x4fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix2x4fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix3x2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix3x2fv)
+		pGlUniformMatrix3x2fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix3x2fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix3fvARB)
+		pGlUniformMatrix3fvARB(loc, count, transpose, v);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix3x4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix3x4fv)
+		pGlUniformMatrix3x4fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix3x4fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix4x2fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix4x2fv)
+		pGlUniformMatrix4x2fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix4x2fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix4x3fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix4x3fv)
+		pGlUniformMatrix4x3fv(loc, count, transpose, v);
+	else
+		os::Printer::log("glUniformMatrix4x3fv not supported", ELL_ERROR);
+}
+
+inline void COpenGLExtensionHandler::extGlUniformMatrix4fv(GLint loc, GLsizei count, GLboolean transpose, const GLfloat *v)
+{
+	if (pGlUniformMatrix4fvARB)
+		pGlUniformMatrix4fvARB(loc, count, transpose, v);
+}
+
+inline void COpenGLExtensionHandler::extGlGetActiveUniformARB(GLhandleARB program,
+		GLuint index, GLsizei maxlength, GLsizei *length,
+		GLint *size, GLenum *type, GLcharARB *name)
+{
+	if (length)
+		*length = 0;
+	if (pGlGetActiveUniformARB)
+		pGlGetActiveUniformARB(program, index, maxlength, length, size, type, name);
+}
+
+inline void COpenGLExtensionHandler::extGlGetActiveUniform(GLuint program,
+		GLuint index, GLsizei maxlength, GLsizei *length,
+		GLint *size, GLenum *type, GLchar *name)
+{
+	if (length)
+		*length = 0;
+	if (pGlGetActiveUniform)
+		pGlGetActiveUniform(program, index, maxlength, length, size, type, name);
+}
+
+inline void COpenGLExtensionHandler::extGlPointParameterf(GLint loc, GLfloat f)
+{
+	if (pGlPointParameterfARB)
+		pGlPointParameterfARB(loc, f);
+}
+
+inline void COpenGLExtensionHandler::extGlPointParameterfv(GLint loc, const GLfloat *v)
+{
+	if (pGlPointParameterfvARB)
+		pGlPointParameterfvARB(loc, v);
+}
+
+inline void COpenGLExtensionHandler::extGlStencilFuncSeparate(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+{
+	if (pGlStencilFuncSeparate)
+		pGlStencilFuncSeparate(frontfunc, backfunc, ref, mask);
+	else if (pGlStencilFuncSeparateATI)
+		pGlStencilFuncSeparateATI(frontfunc, backfunc, ref, mask);
+}
+
+inline void COpenGLExtensionHandler::extGlStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
+{
+	if (pGlStencilOpSeparate)
+		pGlStencilOpSeparate(face, fail, zfail, zpass);
+	else if (pGlStencilOpSeparateATI)
+		pGlStencilOpSeparateATI(face, fail, zfail, zpass);
+}
+
+inline void COpenGLExtensionHandler::irrGlCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+		GLsizei height, GLint border, GLsizei imageSize, const void *data)
+{
+	if (pGlCompressedTexImage2D)
+		pGlCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+}
+
+inline void COpenGLExtensionHandler::irrGlCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+		GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
+{
+	if (pGlCompressedTexSubImage2D)
+		pGlCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+}
+
+inline void COpenGLExtensionHandler::irrGlBindFramebuffer(GLenum target, GLuint framebuffer)
+{
+	if (pGlBindFramebuffer)
+		pGlBindFramebuffer(target, framebuffer);
+	else if (pGlBindFramebufferEXT)
+		pGlBindFramebufferEXT(target, framebuffer);
+}
+
+inline void COpenGLExtensionHandler::irrGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
+{
+	if (pGlDeleteFramebuffers)
+		pGlDeleteFramebuffers(n, framebuffers);
+	else if (pGlDeleteFramebuffersEXT)
+		pGlDeleteFramebuffersEXT(n, framebuffers);
+}
+
+inline void COpenGLExtensionHandler::irrGlGenFramebuffers(GLsizei n, GLuint *framebuffers)
+{
+	if (framebuffers)
+		memset(framebuffers, 0, n * sizeof(GLuint));
+	if (pGlGenFramebuffers)
+		pGlGenFramebuffers(n, framebuffers);
+	else if (pGlGenFramebuffersEXT)
+		pGlGenFramebuffersEXT(n, framebuffers);
+}
+
+inline GLenum COpenGLExtensionHandler::irrGlCheckFramebufferStatus(GLenum target)
+{
+	if (pGlCheckFramebufferStatus)
+		return pGlCheckFramebufferStatus(target);
+	else if (pGlCheckFramebufferStatusEXT)
+		return pGlCheckFramebufferStatusEXT(target);
+	else
+		return 0;
+}
+
+inline void COpenGLExtensionHandler::irrGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+{
+	if (pGlFramebufferTexture2D)
+		pGlFramebufferTexture2D(target, attachment, textarget, texture, level);
+	else if (pGlFramebufferTexture2DEXT)
+		pGlFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
+}
+
+inline void COpenGLExtensionHandler::irrGlBindRenderbuffer(GLenum target, GLuint renderbuffer)
+{
+	if (pGlBindRenderbuffer)
+		pGlBindRenderbuffer(target, renderbuffer);
+	else if (pGlBindRenderbufferEXT)
+		pGlBindRenderbufferEXT(target, renderbuffer);
+}
+
+inline void COpenGLExtensionHandler::irrGlDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
+{
+	if (pGlDeleteRenderbuffers)
+		pGlDeleteRenderbuffers(n, renderbuffers);
+	else if (pGlDeleteRenderbuffersEXT)
+		pGlDeleteRenderbuffersEXT(n, renderbuffers);
+}
+
+inline void COpenGLExtensionHandler::irrGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
+{
+	if (renderbuffers)
+		memset(renderbuffers, 0, n * sizeof(GLuint));
+	if (pGlGenRenderbuffers)
+		pGlGenRenderbuffers(n, renderbuffers);
+	else if (pGlGenRenderbuffersEXT)
+		pGlGenRenderbuffersEXT(n, renderbuffers);
+}
+
+inline void COpenGLExtensionHandler::irrGlRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
+{
+	if (pGlRenderbufferStorage)
+		pGlRenderbufferStorage(target, internalformat, width, height);
+	else if (pGlRenderbufferStorageEXT)
+		pGlRenderbufferStorageEXT(target, internalformat, width, height);
+}
+
+inline void COpenGLExtensionHandler::irrGlFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
+{
+	if (pGlFramebufferRenderbuffer)
+		pGlFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+	else if (pGlFramebufferRenderbufferEXT)
+		pGlFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
+}
+
+inline void COpenGLExtensionHandler::irrGlGenerateMipmap(GLenum target)
+{
+	if (pGlGenerateMipmap)
+		pGlGenerateMipmap(target);
+	else if (pGlGenerateMipmapEXT)
+		pGlGenerateMipmapEXT(target);
+}
+
+inline void COpenGLExtensionHandler::irrGlActiveStencilFace(GLenum face)
+{
+	if (pGlActiveStencilFaceEXT)
+		pGlActiveStencilFaceEXT(face);
+}
+
+inline void COpenGLExtensionHandler::irrGlDrawBuffer(GLenum mode)
+{
+	glDrawBuffer(mode);
+}
+
+inline void COpenGLExtensionHandler::irrGlDrawBuffers(GLsizei n, const GLenum *bufs)
+{
+	if (pGlDrawBuffersARB)
+		pGlDrawBuffersARB(n, bufs);
+	else if (pGlDrawBuffersATI)
+		pGlDrawBuffersATI(n, bufs);
+}
+
+inline void COpenGLExtensionHandler::extGlGenBuffers(GLsizei n, GLuint *buffers)
+{
+	if (buffers)
+		memset(buffers, 0, n * sizeof(GLuint));
+	if (pGlGenBuffersARB)
+		pGlGenBuffersARB(n, buffers);
+}
+
+inline void COpenGLExtensionHandler::extGlBindBuffer(GLenum target, GLuint buffer)
+{
+	if (pGlBindBufferARB)
+		pGlBindBufferARB(target, buffer);
+}
+
+inline void COpenGLExtensionHandler::extGlBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage)
+{
+	if (pGlBufferDataARB)
+		pGlBufferDataARB(target, size, data, usage);
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteBuffers(GLsizei n, const GLuint *buffers)
+{
+	if (pGlDeleteBuffersARB)
+		pGlDeleteBuffersARB(n, buffers);
+}
+
+inline void COpenGLExtensionHandler::extGlBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data)
+{
+	if (pGlBufferSubDataARB)
+		pGlBufferSubDataARB(target, offset, size, data);
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data)
+{
+	if (pGlGetBufferSubDataARB)
+		pGlGetBufferSubDataARB(target, offset, size, data);
+}
+
+inline void *COpenGLExtensionHandler::extGlMapBuffer(GLenum target, GLenum access)
+{
+	if (pGlMapBufferARB)
+		return pGlMapBufferARB(target, access);
+	return 0;
+}
+
+inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer(GLenum target)
+{
+	if (pGlUnmapBufferARB)
+		return pGlUnmapBufferARB(target);
+	return false;
+}
+
+inline GLboolean COpenGLExtensionHandler::extGlIsBuffer(GLuint buffer)
+{
+	if (pGlIsBufferARB)
+		return pGlIsBufferARB(buffer);
+	return false;
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+	if (pGlGetBufferParameterivARB)
+		pGlGetBufferParameterivARB(target, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlGetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
+{
+	if (pGlGetBufferPointervARB)
+		pGlGetBufferPointervARB(target, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlProvokingVertex(GLenum mode)
+{
+	if (FeatureAvailable[IRR_ARB_provoking_vertex] && pGlProvokingVertexARB)
+		pGlProvokingVertexARB(mode);
+	else if (FeatureAvailable[IRR_EXT_provoking_vertex] && pGlProvokingVertexEXT)
+		pGlProvokingVertexEXT(mode);
+}
+
+inline void COpenGLExtensionHandler::extGlProgramParameteri(GLuint program, GLenum pname, GLint value)
+{
+	if (queryFeature(EVDF_GEOMETRY_SHADER)) {
+		if (pGlProgramParameteriARB)
+			pGlProgramParameteriARB(program, pname, value);
+		else if (pGlProgramParameteriEXT)
+			pGlProgramParameteriEXT(program, pname, value);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlGenQueries(GLsizei n, GLuint *ids)
+{
+	if (pGlGenQueriesARB)
+		pGlGenQueriesARB(n, ids);
+	else if (pGlGenOcclusionQueriesNV)
+		pGlGenOcclusionQueriesNV(n, ids);
+}
+
+inline void COpenGLExtensionHandler::extGlDeleteQueries(GLsizei n, const GLuint *ids)
+{
+	if (pGlDeleteQueriesARB)
+		pGlDeleteQueriesARB(n, ids);
+	else if (pGlDeleteOcclusionQueriesNV)
+		pGlDeleteOcclusionQueriesNV(n, ids);
+}
+
+inline GLboolean COpenGLExtensionHandler::extGlIsQuery(GLuint id)
+{
+	if (pGlIsQueryARB)
+		return pGlIsQueryARB(id);
+	else if (pGlIsOcclusionQueryNV)
+		return pGlIsOcclusionQueryNV(id);
+	return false;
+}
+
+inline void COpenGLExtensionHandler::extGlBeginQuery(GLenum target, GLuint id)
+{
+	if (pGlBeginQueryARB)
+		pGlBeginQueryARB(target, id);
+	else if (pGlBeginOcclusionQueryNV)
+		pGlBeginOcclusionQueryNV(id);
+}
+
+inline void COpenGLExtensionHandler::extGlEndQuery(GLenum target)
+{
+	if (pGlEndQueryARB)
+		pGlEndQueryARB(target);
+	else if (pGlEndOcclusionQueryNV)
+		pGlEndOcclusionQueryNV();
+}
+
+inline void COpenGLExtensionHandler::extGlGetQueryiv(GLenum target, GLenum pname, GLint *params)
+{
+	if (pGlGetQueryivARB)
+		pGlGetQueryivARB(target, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
+{
+	if (pGlGetQueryObjectivARB)
+		pGlGetQueryObjectivARB(id, pname, params);
+	else if (pGlGetOcclusionQueryivNV)
+		pGlGetOcclusionQueryivNV(id, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
+{
+	if (pGlGetQueryObjectuivARB)
+		pGlGetQueryObjectuivARB(id, pname, params);
+	else if (pGlGetOcclusionQueryuivNV)
+		pGlGetOcclusionQueryuivNV(id, pname, params);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+	if (pGlBlendFuncSeparate)
+		pGlBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+	else if (pGlBlendFuncSeparateEXT)
+		pGlBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendEquation(GLenum mode)
+{
+	if (pGlBlendEquation)
+		pGlBlendEquation(mode);
+	else if (pGlBlendEquationEXT)
+		pGlBlendEquationEXT(mode);
+}
+
+inline void COpenGLExtensionHandler::irrGlEnableIndexed(GLenum target, GLuint index)
+{
+	if (FeatureAvailable[IRR_EXT_draw_buffers2] && pGlEnableIndexedEXT)
+		pGlEnableIndexedEXT(target, index);
+}
+
+inline void COpenGLExtensionHandler::irrGlDisableIndexed(GLenum target, GLuint index)
+{
+	if (FeatureAvailable[IRR_EXT_draw_buffers2] && pGlDisableIndexedEXT)
+		pGlDisableIndexedEXT(target, index);
+}
+
+inline void COpenGLExtensionHandler::irrGlColorMaskIndexed(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+	if (FeatureAvailable[IRR_EXT_draw_buffers2] && pGlColorMaskIndexedEXT)
+		pGlColorMaskIndexedEXT(buf, r, g, b, a);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendFuncIndexed(GLuint buf, GLenum src, GLenum dst)
+{
+	if (FeatureAvailable[IRR_ARB_draw_buffers_blend] && pGlBlendFunciARB)
+		pGlBlendFunciARB(buf, src, dst);
+	else if (FeatureAvailable[IRR_AMD_draw_buffers_blend] && pGlBlendFuncIndexedAMD)
+		pGlBlendFuncIndexedAMD(buf, src, dst);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendFuncSeparateIndexed(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+{
+	if (FeatureAvailable[IRR_ARB_draw_buffers_blend] && pGlBlendFuncSeparateiARB)
+		pGlBlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+	else if (FeatureAvailable[IRR_AMD_draw_buffers_blend] && pGlBlendFuncSeparateIndexedAMD)
+		pGlBlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendEquationIndexed(GLuint buf, GLenum mode)
+{
+	if (FeatureAvailable[IRR_ARB_draw_buffers_blend] && pGlBlendEquationiARB)
+		pGlBlendEquationiARB(buf, mode);
+	else if (FeatureAvailable[IRR_AMD_draw_buffers_blend] && pGlBlendEquationIndexedAMD)
+		pGlBlendEquationIndexedAMD(buf, mode);
+}
+
+inline void COpenGLExtensionHandler::irrGlBlendEquationSeparateIndexed(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+{
+	if (FeatureAvailable[IRR_ARB_draw_buffers_blend] && pGlBlendEquationSeparateiARB)
+		pGlBlendEquationSeparateiARB(buf, modeRGB, modeAlpha);
+	else if (FeatureAvailable[IRR_AMD_draw_buffers_blend] && pGlBlendEquationSeparateIndexedAMD)
+		pGlBlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha);
+}
+
+inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
+{
+	if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+		if (pGlTextureSubImage2D)
+			pGlTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
+	} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+		if (pGlTextureSubImage2DEXT)
+			pGlTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
+	} else {
+		GLint bound;
+		switch (target) {
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_1D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_1D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_2D:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound);
+			break;
+#ifdef GL_VERSION_3_2
+		case GL_TEXTURE_2D_MULTISAMPLE:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_MULTISAMPLE, &bound);
+			break;
+#endif
+		case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+		case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+		case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+		case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+		case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+		case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
+			break;
+#ifdef GL_VERSION_3_1
+		case GL_TEXTURE_RECTANGLE:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
+			break;
+#elif defined(GL_ARB_texture_rectangle)
+		case GL_TEXTURE_RECTANGLE_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
+			break;
+#endif
+		default:
+			return;
+		}
+		glBindTexture(target, texture);
+		glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+		glBindTexture(target, bound);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
+{
+	if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+		if (pGlTextureStorage2D)
+			pGlTextureStorage2D(texture, levels, internalformat, width, height);
+	} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+		if (pGlTextureStorage2DEXT)
+			pGlTextureStorage2DEXT(texture, target, levels, internalformat, width, height);
+	}
+
+	else if (pGlTexStorage2D) {
+		GLint bound;
+		switch (target) {
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_1D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_1D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_2D:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound);
+			break;
+		case GL_TEXTURE_CUBE_MAP:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
+			break;
+#ifdef GL_VERSION_3_1
+		case GL_TEXTURE_RECTANGLE:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
+			break;
+#elif defined(GL_ARB_texture_rectangle)
+		case GL_TEXTURE_RECTANGLE_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
+			break;
+#endif
+		default:
+			return;
+		}
+		glBindTexture(target, texture);
+		pGlTexStorage2D(target, levels, internalformat, width, height);
+		glBindTexture(target, bound);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
+{
+	if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+		if (pGlTextureStorage3D)
+			pGlTextureStorage3D(texture, levels, internalformat, width, height, depth);
+	} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+		if (pGlTextureStorage3DEXT)
+			pGlTextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth);
+	} else if (pGlTexStorage3D) {
+		GLint bound;
+		switch (target) {
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_2D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_2D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_3D:
+			glGetIntegerv(GL_TEXTURE_BINDING_3D, &bound);
+			break;
+#ifdef GL_VERSION_4_0
+		case GL_TEXTURE_CUBE_MAP_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY, &bound);
+			break;
+#elif defined(GL_ARB_texture_cube_map_array)
+		case GL_TEXTURE_CUBE_MAP_ARRAY_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound);
+			break;
+#endif
+		default:
+			return;
+		}
+		glBindTexture(target, texture);
+		pGlTexStorage3D(target, levels, internalformat, width, height, depth);
+		glBindTexture(target, bound);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlGetTextureImage(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
+{
+	if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+		if (pGlGetTextureImage)
+			pGlGetTextureImage(texture, level, format, type, bufSize, pixels);
+	} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+		if (pGlGetTextureImageEXT)
+			pGlGetTextureImageEXT(texture, target, level, format, type, pixels);
+	} else {
+		GLint bound;
+		switch (target) {
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_2D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_2D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_3D:
+			glGetIntegerv(GL_TEXTURE_BINDING_3D, &bound);
+			break;
+#ifdef GL_VERSION_4_0
+		case GL_TEXTURE_CUBE_MAP_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY, &bound);
+			break;
+#elif defined(GL_ARB_texture_cube_map_array)
+		case GL_TEXTURE_CUBE_MAP_ARRAY_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound);
+			break;
+#endif
+		default:
+			return;
+		}
+		glBindTexture(target, texture);
+		glGetTexImage(target, level, format, type, pixels);
+		glBindTexture(target, bound);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level)
+{
+	if (!needsDSAFramebufferHack) {
+		if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+			pGlNamedFramebufferTexture(framebuffer, attachment, texture, level);
+			return;
+		} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+			pGlNamedFramebufferTextureEXT(framebuffer, attachment, texture, level);
+			return;
+		}
+	}
+
+	GLuint bound;
+	glGetIntegerv(GL_FRAMEBUFFER_BINDING, reinterpret_cast<GLint *>(&bound));
+
+	if (bound != framebuffer)
+		pGlBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
+	pGlFramebufferTexture(GL_FRAMEBUFFER, attachment, texture, level);
+	if (bound != framebuffer)
+		pGlBindFramebuffer(GL_FRAMEBUFFER, bound);
+}
+
+inline void COpenGLExtensionHandler::extGlTextureParameteri(GLuint texture, GLenum pname, GLint param)
+{
+	if (pGlTextureParameteri)
+		pGlTextureParameteri(texture, pname, param);
+}
+
+inline void COpenGLExtensionHandler::extGlTextureParameterf(GLuint texture, GLenum pname, GLfloat param)
+{
+	if (pGlTextureParameterf)
+		pGlTextureParameterf(texture, pname, param);
+}
+
+inline void COpenGLExtensionHandler::extGlTextureParameteriv(GLuint texture, GLenum pname, const GLint *params)
+{
+	if (pGlTextureParameteriv)
+		pGlTextureParameteriv(texture, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlTextureParameterfv(GLuint texture, GLenum pname, const GLfloat *params)
+{
+	if (pGlTextureParameterfv)
+		pGlTextureParameterfv(texture, pname, params);
+}
+
+inline void COpenGLExtensionHandler::extGlCreateTextures(GLenum target, GLsizei n, GLuint *textures)
+{
+	if (Version >= 405) {
+		if (pGlCreateTextures)
+			pGlCreateTextures(target, n, textures);
+		else if (textures)
+			memset(textures, 0, n * sizeof(GLuint));
+	} else {
+		glGenTextures(n, textures);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlCreateFramebuffers(GLsizei n, GLuint *framebuffers)
+{
+	if (!needsDSAFramebufferHack) {
+		if (Version >= 405) {
+			pGlCreateFramebuffers(n, framebuffers);
+			return;
+		}
+	}
+
+	pGlGenFramebuffers(n, framebuffers);
+}
+
+inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum *targets)
+{
+	const GLenum supportedTargets[] = {GL_TEXTURE_1D, GL_TEXTURE_2D // GL 1.x
+			,
+			GL_TEXTURE_3D // GL 2.x
+#ifdef GL_VERSION_3_1
+			,
+			GL_TEXTURE_RECTANGLE
+#elif defined(GL_ARB_texture_rectangle)
+			,
+			GL_TEXTURE_RECTANGLE_ARB
+#endif
+			,
+			GL_TEXTURE_CUBE_MAP
+#ifdef GL_VERSION_3_0
+			,
+			GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY // GL 3.x
+#elif GL_EXT_texture_array
+			,
+			GL_TEXTURE_1D_ARRAY_EXT, GL_TEXTURE_2D_ARRAY_EXT
+#endif
+#ifdef GL_VERSION_3_1
+			,
+			GL_TEXTURE_BUFFER
+#elif defined(GL_ARB_texture_buffer_object)
+			,
+			GL_TEXTURE_BUFFER_ARB
+#elif defined(GL_EXT_texture_buffer_object)
+			,
+			GL_TEXTURE_BUFFER_EXT
+#endif
+#ifdef GL_VERSION_4_0
+			,
+			GL_TEXTURE_CUBE_MAP_ARRAY // GL 4.x
+#elif defined(GL_ARB_texture_cube_map_array)
+			,
+			GL_TEXTURE_CUBE_MAP_ARRAY_ARB
+#endif
+#ifdef GL_VERSION_3_2
+			,
+			GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_2D_MULTISAMPLE_ARRAY
+#endif
+	};
+
+	if (Version >= 404 || FeatureAvailable[IRR_ARB_multi_bind]) {
+		if (pGlBindTextures)
+			pGlBindTextures(first, count, textures);
+	} else {
+		GLint activeTex = 0;
+		glGetIntegerv(GL_ACTIVE_TEXTURE, &activeTex);
+
+		for (GLsizei i = 0; i < count; i++) {
+			GLuint texture = textures ? textures[i] : 0;
+
+			GLuint unit = first + i;
+			irrGlActiveTexture(GL_TEXTURE0 + unit);
+
+			if (texture)
+				glBindTexture(targets[i], texture);
+			else {
+				for (size_t j = 0; j < sizeof(supportedTargets) / sizeof(GLenum); j++)
+					glBindTexture(supportedTargets[j], 0);
+			}
+		}
+
+		irrGlActiveTexture(activeTex);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlGenerateTextureMipmap(GLuint texture, GLenum target)
+{
+	if (Version >= 405 || FeatureAvailable[IRR_ARB_direct_state_access]) {
+		if (pGlGenerateTextureMipmap)
+			pGlGenerateTextureMipmap(texture);
+	} else if (FeatureAvailable[IRR_EXT_direct_state_access]) {
+		if (pGlGenerateTextureMipmapEXT)
+			pGlGenerateTextureMipmapEXT(texture, target);
+	} else if (pGlGenerateMipmap) {
+		GLint bound;
+		switch (target) {
+		case GL_TEXTURE_1D:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D, &bound);
+			break;
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_1D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_1D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_1D_ARRAY_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_2D:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound);
+			break;
+#ifdef GL_VERSION_3_0
+		case GL_TEXTURE_2D_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, &bound);
+			break;
+#elif GL_EXT_texture_array
+		case GL_TEXTURE_2D_ARRAY_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY_EXT, &bound);
+			break;
+#endif
+#ifdef GL_VERSION_3_2
+		case GL_TEXTURE_2D_MULTISAMPLE:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_MULTISAMPLE, &bound);
+			break;
+		case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, &bound);
+			break;
+#endif
+		case GL_TEXTURE_3D:
+			glGetIntegerv(GL_TEXTURE_BINDING_3D, &bound);
+			break;
+#ifdef GL_VERSION_3_1
+		case GL_TEXTURE_BUFFER:
+			glGetIntegerv(GL_TEXTURE_BINDING_BUFFER, &bound);
+			break;
+#elif defined(GL_ARB_texture_buffer_object)
+		case GL_TEXTURE_BUFFER_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_BUFFER_ARB, &bound);
+			break;
+#elif defined(GL_EXT_texture_buffer_object)
+		case GL_TEXTURE_BUFFER_EXT:
+			glGetIntegerv(GL_TEXTURE_BINDING_BUFFER_EXT, &bound);
+			break;
+#endif
+		case GL_TEXTURE_CUBE_MAP:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
+			break;
+#ifdef GL_VERSION_4_0
+		case GL_TEXTURE_CUBE_MAP_ARRAY:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY, &bound);
+			break;
+#elif defined(GL_ARB_texture_cube_map_array)
+		case GL_TEXTURE_CUBE_MAP_ARRAY_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound);
+			break;
+#endif
+#ifdef GL_VERSION_3_1
+		case GL_TEXTURE_RECTANGLE:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
+			break;
+#elif defined(GL_ARB_texture_rectangle)
+		case GL_TEXTURE_RECTANGLE_ARB:
+			glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
+			break;
+#endif
+		default:
+			os::Printer::log("DevSH would like to ask you what are you doing!!??\n", ELL_ERROR);
+			return;
+		}
+		glBindTexture(target, texture);
+		pGlGenerateMipmap(target);
+		glBindTexture(target, bound);
+	}
+}
+
+inline void COpenGLExtensionHandler::extGlSwapInterval(int interval)
+{
+	// we have wglext, so try to use that
+#if defined(_IRR_WINDOWS_API_) && defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)
+#ifdef WGL_EXT_swap_control
+	if (pWglSwapIntervalEXT)
+		pWglSwapIntervalEXT(interval);
+#endif
+#endif
+#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
+#if defined(GLX_MESA_swap_control)
+	if (pGlxSwapIntervalMESA)
+		pGlxSwapIntervalMESA(interval);
+#elif defined(GLX_EXT_swap_control)
+	Display *dpy = glXGetCurrentDisplay();
+	GLXDrawable drawable = glXGetCurrentDrawable();
+	if (pGlxSwapIntervalEXT)
+		pGlxSwapIntervalEXT(dpy, drawable, interval);
+#elif defined(GLX_SGI_swap_control)
+	// does not work with interval==0
+	if (interval && pGlxSwapIntervalSGI)
+		pGlxSwapIntervalSGI(interval);
+}
+#endif
+#endif
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/COpenGLMaterialRenderer.h b/irr/src/COpenGLMaterialRenderer.h
new file mode 100644
index 000000000..b4706f537
--- /dev/null
+++ b/irr/src/COpenGLMaterialRenderer.h
@@ -0,0 +1,335 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "IMaterialRenderer.h"
+
+#include "COpenGLDriver.h"
+#include "COpenGLCacheHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Solid material renderer
+class COpenGLMaterialRenderer_SOLID : public IMaterialRenderer
+{
+public:
+	COpenGLMaterialRenderer_SOLID(video::COpenGLDriver *d) :
+			Driver(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override
+	{
+		if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE)
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE);
+		else
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE);
+
+		Driver->disableTextures(1);
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+	}
+
+protected:
+	video::COpenGLDriver *Driver;
+};
+
+//! Generic Texture Blend
+class COpenGLMaterialRenderer_ONETEXTURE_BLEND : public IMaterialRenderer
+{
+public:
+	COpenGLMaterialRenderer_ONETEXTURE_BLEND(video::COpenGLDriver *d) :
+			Driver(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override
+	{
+		if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE)
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE);
+		else
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE);
+
+		Driver->disableTextures(1);
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		//		if (material.MaterialType != lastMaterial.MaterialType ||
+		//			material.MaterialTypeParam != lastMaterial.MaterialTypeParam ||
+		//			resetAllRenderstates)
+		{
+			E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact;
+			E_MODULATE_FUNC modulate;
+			u32 alphaSource;
+			unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulate, alphaSource, material.MaterialTypeParam);
+
+			Driver->getCacheHandler()->setBlend(true);
+
+			if (Driver->queryFeature(EVDF_BLEND_SEPARATE)) {
+				Driver->getCacheHandler()->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
+						Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
+			} else {
+				Driver->getCacheHandler()->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
+			}
+
+			Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+#ifdef GL_ARB_texture_env_combine
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);
+			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (f32)modulate);
+#else
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+			glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, (f32)modulate);
+#endif
+
+			if (textureBlendFunc_hasAlpha(srcRGBFact) || textureBlendFunc_hasAlpha(dstRGBFact) ||
+					textureBlendFunc_hasAlpha(srcAlphaFact) || textureBlendFunc_hasAlpha(dstAlphaFact)) {
+				if (alphaSource == EAS_VERTEX_COLOR) {
+#ifdef GL_ARB_texture_env_combine
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_PRIMARY_COLOR_ARB);
+#else
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+#endif
+				} else if (alphaSource == EAS_TEXTURE) {
+#ifdef GL_ARB_texture_env_combine
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);
+#else
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+#endif
+				} else {
+#ifdef GL_ARB_texture_env_combine
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_PRIMARY_COLOR_ARB);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB, GL_TEXTURE);
+#else
+					glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+					glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT, GL_TEXTURE);
+#endif
+				}
+			}
+		}
+	}
+
+	void OnUnsetMaterial() override
+	{
+		Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+#ifdef GL_ARB_texture_env_combine
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.f);
+		glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);
+#else
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
+		glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f);
+		glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+#endif
+
+		Driver->getCacheHandler()->setBlend(false);
+	}
+
+	//! Returns if the material is transparent.
+	/** Is not always transparent, but mostly. */
+	bool isTransparent() const override
+	{
+		return true;
+	}
+
+protected:
+	video::COpenGLDriver *Driver;
+};
+
+//! Transparent vertex alpha material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA : public IMaterialRenderer
+{
+public:
+	COpenGLMaterialRenderer_TRANSPARENT_VERTEX_ALPHA(video::COpenGLDriver *d) :
+			Driver(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override
+	{
+		if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE)
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE);
+		else
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE);
+
+		Driver->disableTextures(1);
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		Driver->getCacheHandler()->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		Driver->getCacheHandler()->setBlend(true);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) {
+			Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+#ifdef GL_ARB_texture_env_combine
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_PRIMARY_COLOR_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);
+#else
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_PRIMARY_COLOR_EXT);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+#endif
+		}
+	}
+
+	void OnUnsetMaterial() override
+	{
+		Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#ifdef GL_ARB_texture_env_combine
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);
+		glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);
+#else
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
+		glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+#endif
+
+		Driver->getCacheHandler()->setBlend(false);
+	}
+
+	//! Returns if the material is transparent.
+	bool isTransparent() const override
+	{
+		return true;
+	}
+
+protected:
+	video::COpenGLDriver *Driver;
+};
+
+//! Transparent alpha channel material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL : public IMaterialRenderer
+{
+public:
+	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL(video::COpenGLDriver *d) :
+			Driver(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override
+	{
+		if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE)
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE);
+		else
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE);
+
+		Driver->disableTextures(1);
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		Driver->getCacheHandler()->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		Driver->getCacheHandler()->setBlend(true);
+		Driver->getCacheHandler()->setAlphaTest(true);
+		Driver->getCacheHandler()->setAlphaFunc(GL_GREATER, material.MaterialTypeParam);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates || material.MaterialTypeParam != lastMaterial.MaterialTypeParam) {
+			Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+#ifdef GL_ARB_texture_env_combine
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);
+#else
+			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_PREVIOUS_EXT);
+			glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_REPLACE);
+			glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT, GL_TEXTURE);
+#endif
+		}
+	}
+
+	void OnUnsetMaterial() override
+	{
+		Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE0_ARB);
+
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+#ifdef GL_ARB_texture_env_combine
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);
+#else
+		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT, GL_MODULATE);
+#endif
+		Driver->getCacheHandler()->setAlphaTest(false);
+		Driver->getCacheHandler()->setBlend(false);
+	}
+
+	//! Returns if the material is transparent.
+	bool isTransparent() const override
+	{
+		return true;
+	}
+
+protected:
+	video::COpenGLDriver *Driver;
+};
+
+//! Transparent alpha channel material renderer
+class COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF : public IMaterialRenderer
+{
+public:
+	COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL_REF(video::COpenGLDriver *d) :
+			Driver(d) {}
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override
+	{
+		if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_DISABLE)
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE_TO_ENABLE);
+		else
+			Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE);
+
+		Driver->disableTextures(1);
+		Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+		if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) {
+			Driver->getCacheHandler()->setAlphaTest(true);
+			Driver->getCacheHandler()->setAlphaFunc(GL_GREATER, 0.5f);
+		}
+	}
+
+	void OnUnsetMaterial() override
+	{
+		Driver->getCacheHandler()->setAlphaTest(false);
+	}
+
+	//! Returns if the material is transparent.
+	bool isTransparent() const override
+	{
+		return false; // this material is not really transparent because it does no blending.
+	}
+
+protected:
+	video::COpenGLDriver *Driver;
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif
diff --git a/irr/src/COpenGLSLMaterialRenderer.cpp b/irr/src/COpenGLSLMaterialRenderer.cpp
new file mode 100644
index 000000000..556405d7b
--- /dev/null
+++ b/irr/src/COpenGLSLMaterialRenderer.cpp
@@ -0,0 +1,683 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// This file was originally written by William Finlayson.  I (Nikolaus
+// Gebhardt) did some minor modifications and changes to it and integrated it
+// into Irrlicht. Thanks a lot to William for his work on this and that he gave
+// me his permission to add it into Irrlicht using the zlib license.
+
+// After Irrlicht 0.12, Michael Zoech did some improvements to this renderer, I
+// merged this into Irrlicht 0.14, thanks to him for his work.
+
+#include "COpenGLSLMaterialRenderer.h"
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "IGPUProgrammingServices.h"
+#include "IShaderConstantSetCallBack.h"
+#include "IMaterialRendererServices.h"
+#include "IVideoDriver.h"
+#include "os.h"
+
+#include "COpenGLDriver.h"
+#include "COpenGLCacheHandler.h"
+#include "COpenGLMaterialRenderer.h"
+
+#include "COpenGLCoreFeature.h"
+
+namespace irr
+{
+namespace video
+{
+
+//! Constructor
+COpenGLSLMaterialRenderer::COpenGLSLMaterialRenderer(video::COpenGLDriver *driver,
+		s32 &outMaterialTypeNr, const c8 *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8 *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const c8 *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData) :
+		Driver(driver),
+		CallBack(callback), Alpha(false), Blending(false), AlphaTest(false), Program(0), Program2(0), UserData(userData)
+{
+#ifdef _DEBUG
+	setDebugName("COpenGLSLMaterialRenderer");
+#endif
+
+	switch (baseMaterial) {
+	case EMT_TRANSPARENT_VERTEX_ALPHA:
+	case EMT_TRANSPARENT_ALPHA_CHANNEL:
+		Alpha = true;
+		break;
+	case EMT_ONETEXTURE_BLEND:
+		Blending = true;
+		break;
+	case EMT_TRANSPARENT_ALPHA_CHANNEL_REF:
+		AlphaTest = true;
+		break;
+	default:
+		break;
+	}
+
+	if (CallBack)
+		CallBack->grab();
+
+	if (!Driver->queryFeature(EVDF_ARB_GLSL))
+		return;
+
+	init(outMaterialTypeNr, vertexShaderProgram, pixelShaderProgram, geometryShaderProgram);
+}
+
+//! constructor only for use by derived classes who want to
+//! create a fall back material for example.
+COpenGLSLMaterialRenderer::COpenGLSLMaterialRenderer(COpenGLDriver *driver,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial, s32 userData) :
+		Driver(driver),
+		CallBack(callback), Alpha(false), Blending(false), AlphaTest(false), Program(0), Program2(0), UserData(userData)
+{
+	switch (baseMaterial) {
+	case EMT_TRANSPARENT_VERTEX_ALPHA:
+	case EMT_TRANSPARENT_ALPHA_CHANNEL:
+		Alpha = true;
+		break;
+	case EMT_ONETEXTURE_BLEND:
+		Blending = true;
+		break;
+	case EMT_TRANSPARENT_ALPHA_CHANNEL_REF:
+		AlphaTest = true;
+		break;
+	default:
+		break;
+	}
+
+	if (CallBack)
+		CallBack->grab();
+}
+
+//! Destructor
+COpenGLSLMaterialRenderer::~COpenGLSLMaterialRenderer()
+{
+	if (CallBack)
+		CallBack->drop();
+
+	if (Program) {
+		GLhandleARB shaders[8];
+		GLint count;
+		Driver->extGlGetAttachedObjects(Program, 8, &count, shaders);
+		// avoid bugs in some drivers, which return larger numbers
+		// use int variable to avoid compiler problems with template
+		int mincount = core::min_((int)count, 8);
+		for (int i = 0; i < mincount; ++i)
+			Driver->extGlDeleteObject(shaders[i]);
+		Driver->extGlDeleteObject(Program);
+		Program = 0;
+	}
+
+	if (Program2) {
+		GLuint shaders[8];
+		GLint count;
+		Driver->extGlGetAttachedShaders(Program2, 8, &count, shaders);
+		// avoid bugs in some drivers, which return larger numbers
+		// use int variable to avoid compiler problems with template
+		int mincount = core::min_((int)count, 8);
+		for (int i = 0; i < mincount; ++i)
+			Driver->extGlDeleteShader(shaders[i]);
+		Driver->extGlDeleteProgram(Program2);
+		Program2 = 0;
+	}
+
+	UniformInfo.clear();
+}
+
+void COpenGLSLMaterialRenderer::init(s32 &outMaterialTypeNr,
+		const c8 *vertexShaderProgram,
+		const c8 *pixelShaderProgram,
+		const c8 *geometryShaderProgram,
+		scene::E_PRIMITIVE_TYPE inType, scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut)
+{
+	outMaterialTypeNr = -1;
+
+	if (!createProgram())
+		return;
+
+#if defined(GL_ARB_vertex_shader) && defined(GL_ARB_fragment_shader)
+	if (vertexShaderProgram)
+		if (!createShader(GL_VERTEX_SHADER_ARB, vertexShaderProgram))
+			return;
+
+	if (pixelShaderProgram)
+		if (!createShader(GL_FRAGMENT_SHADER_ARB, pixelShaderProgram))
+			return;
+#endif
+
+#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_program4) || defined(GL_NV_geometry_shader4)
+	if (geometryShaderProgram && Driver->queryFeature(EVDF_GEOMETRY_SHADER)) {
+		if (!createShader(GL_GEOMETRY_SHADER_EXT, geometryShaderProgram))
+			return;
+#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4)
+		if (Program2) { // Geometry shaders are supported only in OGL2.x+ drivers.
+			Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_INPUT_TYPE_EXT, Driver->primitiveTypeToGL(inType));
+			Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_OUTPUT_TYPE_EXT, Driver->primitiveTypeToGL(outType));
+			if (verticesOut == 0)
+				Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_VERTICES_OUT_EXT, Driver->MaxGeometryVerticesOut);
+			else
+				Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_VERTICES_OUT_EXT, core::min_(verticesOut, Driver->MaxGeometryVerticesOut));
+		}
+#elif defined(GL_NV_geometry_program4)
+		if (verticesOut == 0)
+			Driver->extGlProgramVertexLimit(GL_GEOMETRY_PROGRAM_NV, Driver->MaxGeometryVerticesOut);
+		else
+			Driver->extGlProgramVertexLimit(GL_GEOMETRY_PROGRAM_NV, core::min_(verticesOut, Driver->MaxGeometryVerticesOut));
+#endif
+	}
+#endif
+
+	if (!linkProgram())
+		return;
+
+	// register myself as new material
+	outMaterialTypeNr = Driver->addMaterialRenderer(this);
+}
+
+bool COpenGLSLMaterialRenderer::OnRender(IMaterialRendererServices *service,
+		E_VERTEX_TYPE vtxtype)
+{
+	// call callback to set shader constants
+	if (CallBack && (Program || Program2))
+		CallBack->OnSetConstants(this, UserData);
+
+	return true;
+}
+
+void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial &material,
+		const video::SMaterial &lastMaterial,
+		bool resetAllRenderstates,
+		video::IMaterialRendererServices *services)
+{
+	if (Driver->getFixedPipelineState() == COpenGLDriver::EOFPS_ENABLE)
+		Driver->setFixedPipelineState(COpenGLDriver::EOFPS_ENABLE_TO_DISABLE);
+	else
+		Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE);
+
+	COpenGLCacheHandler *cacheHandler = Driver->getCacheHandler();
+
+	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) {
+		if (Program2)
+			Driver->irrGlUseProgram(Program2);
+		else if (Program)
+			Driver->extGlUseProgramObject(Program);
+	}
+
+	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+	if (Alpha) {
+		cacheHandler->setBlend(true);
+		cacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		cacheHandler->setAlphaTest(true);
+		cacheHandler->setAlphaFunc(GL_GREATER, 0.f);
+	} else if (Blending) {
+		E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact;
+		E_MODULATE_FUNC modulate;
+		u32 alphaSource;
+		unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulate, alphaSource, material.MaterialTypeParam);
+
+		if (Driver->queryFeature(EVDF_BLEND_SEPARATE)) {
+			cacheHandler->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
+					Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
+		} else {
+			cacheHandler->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
+		}
+
+		cacheHandler->setBlend(true);
+	} else if (AlphaTest) {
+		cacheHandler->setAlphaTest(true);
+		cacheHandler->setAlphaFunc(GL_GREATER, 0.5f);
+	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+}
+
+void COpenGLSLMaterialRenderer::OnUnsetMaterial()
+{
+	if (Program)
+		Driver->extGlUseProgramObject(0);
+	if (Program2)
+		Driver->irrGlUseProgram(0);
+
+	COpenGLCacheHandler *cacheHandler = Driver->getCacheHandler();
+	if (Alpha || Blending) {
+		cacheHandler->setBlend(false);
+	}
+	if (Alpha || AlphaTest) {
+		cacheHandler->setAlphaTest(false);
+	}
+}
+
+//! Returns if the material is transparent.
+bool COpenGLSLMaterialRenderer::isTransparent() const
+{
+	return (Alpha || Blending);
+}
+
+bool COpenGLSLMaterialRenderer::createProgram()
+{
+	if (Driver->Version >= 200)
+		Program2 = Driver->extGlCreateProgram();
+	else
+		Program = Driver->extGlCreateProgramObject();
+	return true;
+}
+
+bool COpenGLSLMaterialRenderer::createShader(GLenum shaderType, const char *shader)
+{
+	if (Program2) {
+		GLuint shaderHandle = Driver->extGlCreateShader(shaderType);
+		Driver->extGlShaderSource(shaderHandle, 1, &shader, NULL);
+		Driver->extGlCompileShader(shaderHandle);
+
+		GLint status = 0;
+
+#ifdef GL_VERSION_2_0
+		Driver->extGlGetShaderiv(shaderHandle, GL_COMPILE_STATUS, &status);
+#endif
+
+		if (status != GL_TRUE) {
+			core::stringc typeInfo("shaderType: ");
+			typeInfo += core::stringc((unsigned long)shaderType);
+			os::Printer::log("GLSL (> 2.x) shader failed to compile", typeInfo.c_str(), ELL_ERROR);
+			// check error message and log it
+			GLint maxLength = 0;
+			GLint length;
+#ifdef GL_VERSION_2_0
+			Driver->extGlGetShaderiv(shaderHandle, GL_INFO_LOG_LENGTH,
+					&maxLength);
+#endif
+			if (maxLength) {
+				GLchar *infoLog = new GLchar[maxLength];
+				Driver->extGlGetShaderInfoLog(shaderHandle, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		Driver->extGlAttachShader(Program2, shaderHandle);
+	} else {
+		GLhandleARB shaderHandle = Driver->extGlCreateShaderObject(shaderType);
+
+		Driver->extGlShaderSourceARB(shaderHandle, 1, &shader, NULL);
+		Driver->extGlCompileShaderARB(shaderHandle);
+
+		GLint status = 0;
+
+#ifdef GL_ARB_shader_objects
+		Driver->extGlGetObjectParameteriv(shaderHandle, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+#endif
+
+		if (!status) {
+			core::stringc typeInfo("shaderType: ");
+			typeInfo += core::stringc((unsigned long)shaderType);
+			os::Printer::log("GLSL shader failed to compile", typeInfo.c_str(), ELL_ERROR);
+			// check error message and log it
+			GLint maxLength = 0;
+			GLsizei length;
+#ifdef GL_ARB_shader_objects
+			Driver->extGlGetObjectParameteriv(shaderHandle,
+					GL_OBJECT_INFO_LOG_LENGTH_ARB, &maxLength);
+#endif
+			if (maxLength) {
+				GLcharARB *infoLog = new GLcharARB[maxLength];
+				Driver->extGlGetInfoLog(shaderHandle, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		Driver->extGlAttachObject(Program, shaderHandle);
+	}
+	return true;
+}
+
+bool COpenGLSLMaterialRenderer::linkProgram()
+{
+	if (Program2) {
+		Driver->extGlLinkProgram(Program2);
+
+		GLint status = 0;
+
+#ifdef GL_VERSION_2_0
+		Driver->extGlGetProgramiv(Program2, GL_LINK_STATUS, &status);
+#endif
+
+		if (!status) {
+			os::Printer::log("GLSL (> 2.x) shader program failed to link", ELL_ERROR);
+			// check error message and log it
+			GLint maxLength = 0;
+			GLsizei length;
+#ifdef GL_VERSION_2_0
+			Driver->extGlGetProgramiv(Program2, GL_INFO_LOG_LENGTH, &maxLength);
+#endif
+			if (maxLength) {
+				GLchar *infoLog = new GLchar[maxLength];
+				Driver->extGlGetProgramInfoLog(Program2, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		// get uniforms information
+
+		GLint num = 0;
+#ifdef GL_VERSION_2_0
+		Driver->extGlGetProgramiv(Program2, GL_ACTIVE_UNIFORMS, &num);
+#endif
+
+		if (num == 0) {
+			// no uniforms
+			return true;
+		}
+
+		GLint maxlen = 0;
+#ifdef GL_VERSION_2_0
+		Driver->extGlGetProgramiv(Program2, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxlen);
+#endif
+
+		if (maxlen == 0) {
+			os::Printer::log("GLSL (> 2.x): failed to retrieve uniform information", ELL_ERROR);
+			return false;
+		}
+
+		// seems that some implementations use an extra null terminator
+		++maxlen;
+		c8 *buf = new c8[maxlen];
+
+		UniformInfo.clear();
+		UniformInfo.reallocate(num);
+
+		for (GLint i = 0; i < num; ++i) {
+			SUniformInfo ui;
+			memset(buf, 0, maxlen);
+
+			GLint size;
+			Driver->extGlGetActiveUniform(Program2, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLchar *>(buf));
+			ui.name = buf;
+			ui.location = Driver->extGlGetUniformLocation(Program2, buf);
+
+			UniformInfo.push_back(ui);
+		}
+
+		delete[] buf;
+	} else {
+		Driver->extGlLinkProgramARB(Program);
+
+		GLint status = 0;
+
+#ifdef GL_ARB_shader_objects
+		Driver->extGlGetObjectParameteriv(Program, GL_OBJECT_LINK_STATUS_ARB, &status);
+#endif
+
+		if (!status) {
+			os::Printer::log("GLSL shader program failed to link", ELL_ERROR);
+			// check error message and log it
+			GLint maxLength = 0;
+			GLsizei length;
+#ifdef GL_ARB_shader_objects
+			Driver->extGlGetObjectParameteriv(Program,
+					GL_OBJECT_INFO_LOG_LENGTH_ARB, &maxLength);
+#endif
+			if (maxLength) {
+				GLcharARB *infoLog = new GLcharARB[maxLength];
+				Driver->extGlGetInfoLog(Program, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		// get uniforms information
+
+		GLint num = 0;
+#ifdef GL_ARB_shader_objects
+		Driver->extGlGetObjectParameteriv(Program, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &num);
+#endif
+
+		if (num == 0) {
+			// no uniforms
+			return true;
+		}
+
+		GLint maxlen = 0;
+#ifdef GL_ARB_shader_objects
+		Driver->extGlGetObjectParameteriv(Program, GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB, &maxlen);
+#endif
+
+		if (maxlen == 0) {
+			os::Printer::log("GLSL: failed to retrieve uniform information", ELL_ERROR);
+			return false;
+		}
+
+		// seems that some implementations use an extra null terminator
+		++maxlen;
+		c8 *buf = new c8[maxlen];
+
+		UniformInfo.clear();
+		UniformInfo.reallocate(num);
+
+		for (int i = 0; i < num; ++i) {
+			SUniformInfo ui;
+			memset(buf, 0, maxlen);
+
+			GLint size;
+			Driver->extGlGetActiveUniformARB(Program, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLcharARB *>(buf));
+			ui.name = buf;
+			ui.location = Driver->extGlGetUniformLocationARB(Program, buf);
+
+			UniformInfo.push_back(ui);
+		}
+
+		delete[] buf;
+	}
+
+	return true;
+}
+
+void COpenGLSLMaterialRenderer::setBasicRenderStates(const SMaterial &material,
+		const SMaterial &lastMaterial,
+		bool resetAllRenderstates)
+{
+	// forward
+	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+}
+
+s32 COpenGLSLMaterialRenderer::getVertexShaderConstantID(const c8 *name)
+{
+	return getPixelShaderConstantID(name);
+}
+
+s32 COpenGLSLMaterialRenderer::getPixelShaderConstantID(const c8 *name)
+{
+	for (u32 i = 0; i < UniformInfo.size(); ++i) {
+		if (UniformInfo[i].name == name)
+			return i;
+	}
+
+	return -1;
+}
+
+bool COpenGLSLMaterialRenderer::setVertexShaderConstant(s32 index, const f32 *floats, int count)
+{
+	return setPixelShaderConstant(index, floats, count);
+}
+
+bool COpenGLSLMaterialRenderer::setVertexShaderConstant(s32 index, const s32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+bool COpenGLSLMaterialRenderer::setVertexShaderConstant(s32 index, const u32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+bool COpenGLSLMaterialRenderer::setPixelShaderConstant(s32 index, const f32 *floats, int count)
+{
+	if (index < 0 || UniformInfo[index].location < 0)
+		return false;
+
+	bool status = true;
+
+	switch (UniformInfo[index].type) {
+	case GL_FLOAT:
+		Driver->extGlUniform1fv(UniformInfo[index].location, count, floats);
+		break;
+	case GL_FLOAT_VEC2:
+		Driver->extGlUniform2fv(UniformInfo[index].location, count / 2, floats);
+		break;
+	case GL_FLOAT_VEC3:
+		Driver->extGlUniform3fv(UniformInfo[index].location, count / 3, floats);
+		break;
+	case GL_FLOAT_VEC4:
+		Driver->extGlUniform4fv(UniformInfo[index].location, count / 4, floats);
+		break;
+	case GL_FLOAT_MAT2:
+		Driver->extGlUniformMatrix2fv(UniformInfo[index].location, count / 4, false, floats);
+		break;
+	case GL_FLOAT_MAT2x3:
+		Driver->extGlUniformMatrix2x3fv(UniformInfo[index].location, count / 6, false, floats);
+		break;
+	case GL_FLOAT_MAT2x4:
+		Driver->extGlUniformMatrix2x4fv(UniformInfo[index].location, count / 8, false, floats);
+		break;
+	case GL_FLOAT_MAT3x2:
+		Driver->extGlUniformMatrix3x2fv(UniformInfo[index].location, count / 6, false, floats);
+		break;
+	case GL_FLOAT_MAT3:
+		Driver->extGlUniformMatrix3fv(UniformInfo[index].location, count / 9, false, floats);
+		break;
+	case GL_FLOAT_MAT3x4:
+		Driver->extGlUniformMatrix3x4fv(UniformInfo[index].location, count / 12, false, floats);
+		break;
+	case GL_FLOAT_MAT4x2:
+		Driver->extGlUniformMatrix4x2fv(UniformInfo[index].location, count / 8, false, floats);
+		break;
+	case GL_FLOAT_MAT4x3:
+		Driver->extGlUniformMatrix4x3fv(UniformInfo[index].location, count / 12, false, floats);
+		break;
+	case GL_FLOAT_MAT4:
+		Driver->extGlUniformMatrix4fv(UniformInfo[index].location, count / 16, false, floats);
+		break;
+	case GL_SAMPLER_1D:
+	case GL_SAMPLER_2D:
+	case GL_SAMPLER_3D:
+	case GL_SAMPLER_CUBE:
+	case GL_SAMPLER_1D_SHADOW:
+	case GL_SAMPLER_2D_SHADOW: {
+		if (floats) {
+			const GLint id = static_cast<GLint>(*floats);
+			Driver->extGlUniform1iv(UniformInfo[index].location, 1, &id);
+		} else
+			status = false;
+	} break;
+	default:
+		status = false;
+		break;
+	}
+	return status;
+}
+
+bool COpenGLSLMaterialRenderer::setPixelShaderConstant(s32 index, const s32 *ints, int count)
+{
+	if (index < 0 || UniformInfo[index].location < 0)
+		return false;
+
+	bool status = true;
+
+	switch (UniformInfo[index].type) {
+	case GL_INT:
+	case GL_BOOL:
+		Driver->extGlUniform1iv(UniformInfo[index].location, count, reinterpret_cast<const GLint *>(ints));
+		break;
+	case GL_INT_VEC2:
+	case GL_BOOL_VEC2:
+		Driver->extGlUniform2iv(UniformInfo[index].location, count / 2, reinterpret_cast<const GLint *>(ints));
+		break;
+	case GL_INT_VEC3:
+	case GL_BOOL_VEC3:
+		Driver->extGlUniform3iv(UniformInfo[index].location, count / 3, reinterpret_cast<const GLint *>(ints));
+		break;
+	case GL_INT_VEC4:
+	case GL_BOOL_VEC4:
+		Driver->extGlUniform4iv(UniformInfo[index].location, count / 4, reinterpret_cast<const GLint *>(ints));
+		break;
+	case GL_SAMPLER_1D:
+	case GL_SAMPLER_2D:
+	case GL_SAMPLER_3D:
+	case GL_SAMPLER_CUBE:
+	case GL_SAMPLER_1D_SHADOW:
+	case GL_SAMPLER_2D_SHADOW:
+		Driver->extGlUniform1iv(UniformInfo[index].location, 1, reinterpret_cast<const GLint *>(ints));
+		break;
+	default:
+		status = false;
+		break;
+	}
+	return status;
+}
+
+bool COpenGLSLMaterialRenderer::setPixelShaderConstant(s32 index, const u32 *ints, int count)
+{
+	if (index < 0 || UniformInfo[index].location < 0)
+		return false;
+
+	bool status = true;
+
+	switch (UniformInfo[index].type) {
+	case GL_UNSIGNED_INT:
+		Driver->extGlUniform1uiv(UniformInfo[index].location, count, reinterpret_cast<const GLuint *>(ints));
+		break;
+#if defined(GL_VERSION_3_0)
+	case GL_UNSIGNED_INT_VEC2:
+		Driver->extGlUniform2uiv(UniformInfo[index].location, count / 2, reinterpret_cast<const GLuint *>(ints));
+		break;
+	case GL_UNSIGNED_INT_VEC3:
+		Driver->extGlUniform3uiv(UniformInfo[index].location, count / 3, reinterpret_cast<const GLuint *>(ints));
+		break;
+	case GL_UNSIGNED_INT_VEC4:
+		Driver->extGlUniform4uiv(UniformInfo[index].location, count / 4, reinterpret_cast<const GLuint *>(ints));
+		break;
+#endif
+	default:
+		status = false;
+		break;
+	}
+	return status;
+}
+
+IVideoDriver *COpenGLSLMaterialRenderer::getVideoDriver()
+{
+	return Driver;
+}
+
+} // end namespace video
+} // end namespace irr
+
+#endif
diff --git a/irr/src/COpenGLSLMaterialRenderer.h b/irr/src/COpenGLSLMaterialRenderer.h
new file mode 100644
index 000000000..2f4a485d2
--- /dev/null
+++ b/irr/src/COpenGLSLMaterialRenderer.h
@@ -0,0 +1,125 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#include "EMaterialTypes.h"
+#include "IMaterialRenderer.h"
+#include "IMaterialRendererServices.h"
+#include "IGPUProgrammingServices.h"
+#include "irrArray.h"
+#include "irrString.h"
+
+#include "COpenGLCommon.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGLDriver;
+class IShaderConstantSetCallBack;
+
+//! Class for using GLSL shaders with OpenGL
+//! Please note: This renderer implements its own IMaterialRendererServices
+class COpenGLSLMaterialRenderer : public IMaterialRenderer, public IMaterialRendererServices
+{
+public:
+	//! Constructor
+	COpenGLSLMaterialRenderer(
+			COpenGLDriver *driver,
+			s32 &outMaterialTypeNr,
+			const c8 *vertexShaderProgram = 0,
+			const c8 *vertexShaderEntryPointName = 0,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = video::EVST_VS_1_1,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = 0,
+			E_PIXEL_SHADER_TYPE psCompileTarget = video::EPST_PS_1_1,
+			const c8 *geometryShaderProgram = 0,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = EMT_SOLID,
+			s32 userData = 0);
+
+	//! Destructor
+	virtual ~COpenGLSLMaterialRenderer();
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override;
+
+	bool OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype) override;
+
+	void OnUnsetMaterial() override;
+
+	//! Returns if the material is transparent.
+	bool isTransparent() const override;
+
+	//! Access the callback provided by the users when creating shader materials
+	IShaderConstantSetCallBack *getShaderConstantSetCallBack() const override
+	{
+		return CallBack;
+	}
+
+	// implementations for the render services
+	void setBasicRenderStates(const SMaterial &material, const SMaterial &lastMaterial, bool resetAllRenderstates) override;
+	s32 getVertexShaderConstantID(const c8 *name) override;
+	s32 getPixelShaderConstantID(const c8 *name) override;
+	bool setVertexShaderConstant(s32 index, const f32 *floats, int count) override;
+	bool setVertexShaderConstant(s32 index, const s32 *ints, int count) override;
+	bool setVertexShaderConstant(s32 index, const u32 *ints, int count) override;
+	bool setPixelShaderConstant(s32 index, const f32 *floats, int count) override;
+	bool setPixelShaderConstant(s32 index, const s32 *ints, int count) override;
+	bool setPixelShaderConstant(s32 index, const u32 *ints, int count) override;
+	IVideoDriver *getVideoDriver() override;
+
+protected:
+	//! constructor only for use by derived classes who want to
+	//! create a fall back material for example.
+	COpenGLSLMaterialRenderer(COpenGLDriver *driver,
+			IShaderConstantSetCallBack *callback,
+			E_MATERIAL_TYPE baseMaterial,
+			s32 userData = 0);
+
+	void init(s32 &outMaterialTypeNr,
+			const c8 *vertexShaderProgram,
+			const c8 *pixelShaderProgram,
+			const c8 *geometryShaderProgram,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0);
+
+	bool createProgram();
+	bool createShader(GLenum shaderType, const char *shader);
+	bool linkProgram();
+
+	COpenGLDriver *Driver;
+	IShaderConstantSetCallBack *CallBack;
+
+	bool Alpha;
+	bool Blending;
+	bool AlphaTest;
+
+	struct SUniformInfo
+	{
+		core::stringc name;
+		GLenum type;
+		GLint location;
+	};
+
+	GLhandleARB Program;
+	GLuint Program2;
+	core::array<SUniformInfo> UniformInfo;
+	s32 UserData;
+};
+
+} // end namespace video
+} // end namespace irr
+
+#endif // compile with OpenGL
diff --git a/irr/src/CReadFile.cpp b/irr/src/CReadFile.cpp
new file mode 100644
index 000000000..6c6e49d55
--- /dev/null
+++ b/irr/src/CReadFile.cpp
@@ -0,0 +1,96 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CReadFile.h"
+
+namespace irr
+{
+namespace io
+{
+
+CReadFile::CReadFile(const io::path &fileName) :
+		File(0), FileSize(0), Filename(fileName)
+{
+#ifdef _DEBUG
+	setDebugName("CReadFile");
+#endif
+
+	openFile();
+}
+
+CReadFile::~CReadFile()
+{
+	if (File)
+		fclose(File);
+}
+
+//! returns how much was read
+size_t CReadFile::read(void *buffer, size_t sizeToRead)
+{
+	if (!isOpen())
+		return 0;
+
+	return fread(buffer, 1, sizeToRead, File);
+}
+
+//! changes position in file, returns true if successful
+//! if relativeMovement==true, the pos is changed relative to current pos,
+//! otherwise from begin of file
+bool CReadFile::seek(long finalPos, bool relativeMovement)
+{
+	if (!isOpen())
+		return false;
+
+	return fseek(File, finalPos, relativeMovement ? SEEK_CUR : SEEK_SET) == 0;
+}
+
+//! returns size of file
+long CReadFile::getSize() const
+{
+	return FileSize;
+}
+
+//! returns where in the file we are.
+long CReadFile::getPos() const
+{
+	return ftell(File);
+}
+
+//! opens the file
+void CReadFile::openFile()
+{
+	if (Filename.size() == 0) { // bugfix posted by rt
+		File = 0;
+		return;
+	}
+
+	File = fopen(Filename.c_str(), "rb");
+
+	if (File) {
+		// get FileSize
+
+		fseek(File, 0, SEEK_END);
+		FileSize = getPos();
+		fseek(File, 0, SEEK_SET);
+	}
+}
+
+//! returns name of file
+const io::path &CReadFile::getFileName() const
+{
+	return Filename;
+}
+
+IReadFile *CReadFile::createReadFile(const io::path &fileName)
+{
+	CReadFile *file = new CReadFile(fileName);
+	if (file->isOpen())
+		return file;
+
+	file->drop();
+	return 0;
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CReadFile.h b/irr/src/CReadFile.h
new file mode 100644
index 000000000..14f674772
--- /dev/null
+++ b/irr/src/CReadFile.h
@@ -0,0 +1,67 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <cstdio>
+#include "IReadFile.h"
+#include "irrString.h"
+
+namespace irr
+{
+
+namespace io
+{
+
+/*!
+	Class for reading a real file from disk.
+*/
+class CReadFile : public IReadFile
+{
+public:
+	CReadFile(const io::path &fileName);
+
+	virtual ~CReadFile();
+
+	//! returns how much was read
+	size_t read(void *buffer, size_t sizeToRead) override;
+
+	//! changes position in file, returns true if successful
+	bool seek(long finalPos, bool relativeMovement = false) override;
+
+	//! returns size of file
+	long getSize() const override;
+
+	//! returns if file is open
+	bool isOpen() const
+	{
+		return File != 0;
+	}
+
+	//! returns where in the file we are.
+	long getPos() const override;
+
+	//! returns name of file
+	const io::path &getFileName() const override;
+
+	//! Get the type of the class implementing this interface
+	EREAD_FILE_TYPE getType() const override
+	{
+		return ERFT_READ_FILE;
+	}
+
+	//! create read file on disk.
+	static IReadFile *createReadFile(const io::path &fileName);
+
+private:
+	//! opens the file
+	void openFile();
+
+	FILE *File;
+	long FileSize;
+	io::path Filename;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CSDLManager.cpp b/irr/src/CSDLManager.cpp
new file mode 100644
index 000000000..855c8c9e4
--- /dev/null
+++ b/irr/src/CSDLManager.cpp
@@ -0,0 +1,54 @@
+// Copyright (C) 2022 sfan5
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "CSDLManager.h"
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+
+#include "CIrrDeviceSDL.h"
+
+namespace irr
+{
+namespace video
+{
+
+CSDLManager::CSDLManager(CIrrDeviceSDL *device) :
+		IContextManager(), SDLDevice(device)
+{
+#ifdef _DEBUG
+	setDebugName("CSDLManager");
+#endif
+}
+
+bool CSDLManager::initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data)
+{
+	Data = data;
+	return true;
+}
+
+const SExposedVideoData &CSDLManager::getContext() const
+{
+	return Data;
+}
+
+bool CSDLManager::activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero)
+{
+	return true;
+}
+
+void *CSDLManager::getProcAddress(const std::string &procName)
+{
+	return SDL_GL_GetProcAddress(procName.c_str());
+}
+
+bool CSDLManager::swapBuffers()
+{
+	SDLDevice->SwapWindow();
+	return true;
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/CSDLManager.h b/irr/src/CSDLManager.h
new file mode 100644
index 000000000..22efeb1ee
--- /dev/null
+++ b/irr/src/CSDLManager.h
@@ -0,0 +1,49 @@
+// Copyright (C) 2022 sfan5
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+
+#include "IContextManager.h"
+
+namespace irr
+{
+class CIrrDeviceSDL;
+
+namespace video
+{
+
+// Manager for SDL with OpenGL
+class CSDLManager : public IContextManager
+{
+public:
+	CSDLManager(CIrrDeviceSDL *device);
+
+	virtual ~CSDLManager() {}
+
+	bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) override;
+
+	void terminate() override{};
+	bool generateSurface() override { return true; };
+	void destroySurface() override{};
+	bool generateContext() override { return true; };
+	void destroyContext() override{};
+
+	const SExposedVideoData &getContext() const override;
+
+	bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) override;
+
+	void *getProcAddress(const std::string &procName) override;
+
+	bool swapBuffers() override;
+
+private:
+	SExposedVideoData Data;
+	CIrrDeviceSDL *SDLDevice;
+};
+}
+}
+
+#endif
diff --git a/irr/src/CSceneCollisionManager.cpp b/irr/src/CSceneCollisionManager.cpp
new file mode 100644
index 000000000..692f3c44f
--- /dev/null
+++ b/irr/src/CSceneCollisionManager.cpp
@@ -0,0 +1,74 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSceneCollisionManager.h"
+#include "ICameraSceneNode.h"
+#include "SViewFrustum.h"
+
+#include "os.h"
+#include "irrMath.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CSceneCollisionManager::CSceneCollisionManager(ISceneManager *smanager, video::IVideoDriver *driver) :
+		SceneManager(smanager), Driver(driver)
+{
+#ifdef _DEBUG
+	setDebugName("CSceneCollisionManager");
+#endif
+
+	if (Driver)
+		Driver->grab();
+}
+
+//! destructor
+CSceneCollisionManager::~CSceneCollisionManager()
+{
+	if (Driver)
+		Driver->drop();
+}
+
+//! Returns a 3d ray which would go through the 2d screen coordinates.
+core::line3d<f32> CSceneCollisionManager::getRayFromScreenCoordinates(
+		const core::position2d<s32> &pos, const ICameraSceneNode *camera)
+{
+	core::line3d<f32> ln(0, 0, 0, 0, 0, 0);
+
+	if (!SceneManager)
+		return ln;
+
+	if (!camera)
+		camera = SceneManager->getActiveCamera();
+
+	if (!camera)
+		return ln;
+
+	const scene::SViewFrustum *f = camera->getViewFrustum();
+
+	core::vector3df farLeftUp = f->getFarLeftUp();
+	core::vector3df lefttoright = f->getFarRightUp() - farLeftUp;
+	core::vector3df uptodown = f->getFarLeftDown() - farLeftUp;
+
+	const core::rect<s32> &viewPort = Driver->getViewPort();
+	core::dimension2d<u32> screenSize(viewPort.getWidth(), viewPort.getHeight());
+
+	f32 dx = pos.X / (f32)screenSize.Width;
+	f32 dy = pos.Y / (f32)screenSize.Height;
+
+	if (camera->isOrthogonal())
+		ln.start = f->cameraPosition + (lefttoright * (dx - 0.5f)) + (uptodown * (dy - 0.5f));
+	else
+		ln.start = f->cameraPosition;
+
+	ln.end = farLeftUp + (lefttoright * dx) + (uptodown * dy);
+
+	return ln;
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CSceneCollisionManager.h b/irr/src/CSceneCollisionManager.h
new file mode 100644
index 000000000..d3dc2ef70
--- /dev/null
+++ b/irr/src/CSceneCollisionManager.h
@@ -0,0 +1,35 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneCollisionManager.h"
+#include "ISceneManager.h"
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class CSceneCollisionManager : public ISceneCollisionManager
+{
+public:
+	//! constructor
+	CSceneCollisionManager(ISceneManager *smanager, video::IVideoDriver *driver);
+
+	//! destructor
+	virtual ~CSceneCollisionManager();
+
+	//! Returns a 3d ray which would go through the 2d screen coordinates.
+	virtual core::line3d<f32> getRayFromScreenCoordinates(
+			const core::position2d<s32> &pos, const ICameraSceneNode *camera = 0) override;
+
+private:
+	ISceneManager *SceneManager;
+	video::IVideoDriver *Driver;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CSceneManager.cpp b/irr/src/CSceneManager.cpp
new file mode 100644
index 000000000..b20f6010a
--- /dev/null
+++ b/irr/src/CSceneManager.cpp
@@ -0,0 +1,809 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSceneManager.h"
+#include "IVideoDriver.h"
+#include "IFileSystem.h"
+#include "SAnimatedMesh.h"
+#include "CMeshCache.h"
+#include "IGUIEnvironment.h"
+#include "IMaterialRenderer.h"
+#include "IReadFile.h"
+#include "IWriteFile.h"
+
+#include "os.h"
+
+#include "CSkinnedMesh.h"
+#include "CXMeshFileLoader.h"
+#include "COBJMeshFileLoader.h"
+#include "CB3DMeshFileLoader.h"
+#include "CBillboardSceneNode.h"
+#include "CAnimatedMeshSceneNode.h"
+#include "CCameraSceneNode.h"
+#include "CMeshSceneNode.h"
+#include "CDummyTransformationSceneNode.h"
+#include "CEmptySceneNode.h"
+
+#include "CSceneCollisionManager.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CSceneManager::CSceneManager(video::IVideoDriver *driver,
+		gui::ICursorControl *cursorControl, IMeshCache *cache) :
+		ISceneNode(0, 0),
+		Driver(driver),
+		CursorControl(cursorControl),
+		ActiveCamera(0), ShadowColor(150, 0, 0, 0), AmbientLight(0, 0, 0, 0), Parameters(0),
+		MeshCache(cache), CurrentRenderPass(ESNRP_NONE)
+{
+#ifdef _DEBUG
+	ISceneManager::setDebugName("CSceneManager ISceneManager");
+	ISceneNode::setDebugName("CSceneManager ISceneNode");
+#endif
+
+	// root node's scene manager
+	SceneManager = this;
+
+	if (Driver)
+		Driver->grab();
+
+	if (CursorControl)
+		CursorControl->grab();
+
+	// create mesh cache if not there already
+	if (!MeshCache)
+		MeshCache = new CMeshCache();
+	else
+		MeshCache->grab();
+
+	// set scene parameters
+	Parameters = new io::CAttributes();
+
+	// create collision manager
+	CollisionManager = new CSceneCollisionManager(this, Driver);
+
+	// add file format loaders. add the least commonly used ones first,
+	// as these are checked last
+
+	// TODO: now that we have multiple scene managers, these should be
+	// shallow copies from the previous manager if there is one.
+
+	MeshLoaderList.push_back(new CXMeshFileLoader(this));
+	MeshLoaderList.push_back(new COBJMeshFileLoader(this));
+	MeshLoaderList.push_back(new CB3DMeshFileLoader(this));
+}
+
+//! destructor
+CSceneManager::~CSceneManager()
+{
+	clearDeletionList();
+
+	//! force to remove hardwareTextures from the driver
+	//! because Scenes may hold internally data bounded to sceneNodes
+	//! which may be destroyed twice
+	if (Driver)
+		Driver->removeAllHardwareBuffers();
+
+	if (CursorControl)
+		CursorControl->drop();
+
+	if (CollisionManager)
+		CollisionManager->drop();
+
+	u32 i;
+	for (i = 0; i < MeshLoaderList.size(); ++i)
+		MeshLoaderList[i]->drop();
+
+	if (ActiveCamera)
+		ActiveCamera->drop();
+	ActiveCamera = 0;
+
+	if (MeshCache)
+		MeshCache->drop();
+
+	if (Parameters)
+		Parameters->drop();
+
+	// remove all nodes before dropping the driver
+	// as render targets may be destroyed twice
+
+	removeAll();
+
+	if (Driver)
+		Driver->drop();
+}
+
+//! gets an animatable mesh. loads it if needed. returned pointer must not be dropped.
+IAnimatedMesh *CSceneManager::getMesh(io::IReadFile *file)
+{
+	if (!file)
+		return 0;
+
+	io::path name = file->getFileName();
+	IAnimatedMesh *msh = MeshCache->getMeshByName(name);
+	if (msh)
+		return msh;
+
+	msh = getUncachedMesh(file, name, name);
+
+	return msh;
+}
+
+// load and create a mesh which we know already isn't in the cache and put it in there
+IAnimatedMesh *CSceneManager::getUncachedMesh(io::IReadFile *file, const io::path &filename, const io::path &cachename)
+{
+	IAnimatedMesh *msh = 0;
+
+	// iterate the list in reverse order so user-added loaders can override the built-in ones
+	s32 count = MeshLoaderList.size();
+	for (s32 i = count - 1; i >= 0; --i) {
+		if (MeshLoaderList[i]->isALoadableFileExtension(filename)) {
+			// reset file to avoid side effects of previous calls to createMesh
+			file->seek(0);
+			msh = MeshLoaderList[i]->createMesh(file);
+			if (msh) {
+				MeshCache->addMesh(cachename, msh);
+				msh->drop();
+				break;
+			}
+		}
+	}
+
+	if (!msh)
+		os::Printer::log("Could not load mesh, file format seems to be unsupported", filename, ELL_ERROR);
+	else
+		os::Printer::log("Loaded mesh", filename, ELL_DEBUG);
+
+	return msh;
+}
+
+//! returns the video driver
+video::IVideoDriver *CSceneManager::getVideoDriver()
+{
+	return Driver;
+}
+
+//! adds a scene node for rendering a static mesh
+//! the returned pointer must not be dropped.
+IMeshSceneNode *CSceneManager::addMeshSceneNode(IMesh *mesh, ISceneNode *parent, s32 id,
+		const core::vector3df &position, const core::vector3df &rotation,
+		const core::vector3df &scale, bool alsoAddIfMeshPointerZero)
+{
+	if (!alsoAddIfMeshPointerZero && !mesh)
+		return 0;
+
+	if (!parent)
+		parent = this;
+
+	IMeshSceneNode *node = new CMeshSceneNode(mesh, parent, this, id, position, rotation, scale);
+	node->drop();
+
+	return node;
+}
+
+//! adds a scene node for rendering an animated mesh model
+IAnimatedMeshSceneNode *CSceneManager::addAnimatedMeshSceneNode(IAnimatedMesh *mesh, ISceneNode *parent, s32 id,
+		const core::vector3df &position, const core::vector3df &rotation,
+		const core::vector3df &scale, bool alsoAddIfMeshPointerZero)
+{
+	if (!alsoAddIfMeshPointerZero && !mesh)
+		return 0;
+
+	if (!parent)
+		parent = this;
+
+	IAnimatedMeshSceneNode *node =
+			new CAnimatedMeshSceneNode(mesh, parent, this, id, position, rotation, scale);
+	node->drop();
+
+	return node;
+}
+
+//! Adds a camera scene node to the tree and sets it as active camera.
+//! \param position: Position of the space relative to its parent where the camera will be placed.
+//! \param lookat: Position where the camera will look at. Also known as target.
+//! \param parent: Parent scene node of the camera. Can be null. If the parent moves,
+//! the camera will move too.
+//! \return Returns pointer to interface to camera
+ICameraSceneNode *CSceneManager::addCameraSceneNode(ISceneNode *parent,
+		const core::vector3df &position, const core::vector3df &lookat, s32 id,
+		bool makeActive)
+{
+	if (!parent)
+		parent = this;
+
+	ICameraSceneNode *node = new CCameraSceneNode(parent, this, id, position, lookat);
+
+	if (makeActive)
+		setActiveCamera(node);
+	node->drop();
+
+	return node;
+}
+
+//! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element,
+//! which always looks to the camera. It is usually used for things like explosions, fire,
+//! lensflares and things like that.
+IBillboardSceneNode *CSceneManager::addBillboardSceneNode(ISceneNode *parent,
+		const core::dimension2d<f32> &size, const core::vector3df &position, s32 id,
+		video::SColor colorTop, video::SColor colorBottom)
+{
+	if (!parent)
+		parent = this;
+
+	IBillboardSceneNode *node = new CBillboardSceneNode(parent, this, id, position, size,
+			colorTop, colorBottom);
+	node->drop();
+
+	return node;
+}
+
+//! Adds an empty scene node.
+ISceneNode *CSceneManager::addEmptySceneNode(ISceneNode *parent, s32 id)
+{
+	if (!parent)
+		parent = this;
+
+	ISceneNode *node = new CEmptySceneNode(parent, this, id);
+	node->drop();
+
+	return node;
+}
+
+//! Adds a dummy transformation scene node to the scene graph.
+IDummyTransformationSceneNode *CSceneManager::addDummyTransformationSceneNode(
+		ISceneNode *parent, s32 id)
+{
+	if (!parent)
+		parent = this;
+
+	IDummyTransformationSceneNode *node = new CDummyTransformationSceneNode(
+			parent, this, id);
+	node->drop();
+
+	return node;
+}
+
+//! Returns the root scene node. This is the scene node which is parent
+//! of all scene nodes. The root scene node is a special scene node which
+//! only exists to manage all scene nodes. It is not rendered and cannot
+//! be removed from the scene.
+//! \return Returns a pointer to the root scene node.
+ISceneNode *CSceneManager::getRootSceneNode()
+{
+	return this;
+}
+
+//! Returns the current active camera.
+//! \return The active camera is returned. Note that this can be NULL, if there
+//! was no camera created yet.
+ICameraSceneNode *CSceneManager::getActiveCamera() const
+{
+	return ActiveCamera;
+}
+
+//! Sets the active camera. The previous active camera will be deactivated.
+//! \param camera: The new camera which should be active.
+void CSceneManager::setActiveCamera(ICameraSceneNode *camera)
+{
+	if (camera)
+		camera->grab();
+	if (ActiveCamera)
+		ActiveCamera->drop();
+
+	ActiveCamera = camera;
+}
+
+//! renders the node.
+void CSceneManager::render()
+{
+}
+
+//! returns the axis aligned bounding box of this node
+const core::aabbox3d<f32> &CSceneManager::getBoundingBox() const
+{
+	_IRR_DEBUG_BREAK_IF(true) // Bounding Box of Scene Manager should never be used.
+
+	static const core::aabbox3d<f32> dummy;
+	return dummy;
+}
+
+//! returns if node is culled
+bool CSceneManager::isCulled(const ISceneNode *node) const
+{
+	const ICameraSceneNode *cam = getActiveCamera();
+	if (!cam) {
+		return false;
+	}
+	bool result = false;
+
+	// has occlusion query information
+	if (node->getAutomaticCulling() & scene::EAC_OCC_QUERY) {
+		result = (Driver->getOcclusionQueryResult(const_cast<ISceneNode *>(node)) == 0);
+	}
+
+	// can be seen by a bounding box ?
+	if (!result && (node->getAutomaticCulling() & scene::EAC_BOX)) {
+		core::aabbox3d<f32> tbox = node->getBoundingBox();
+		node->getAbsoluteTransformation().transformBoxEx(tbox);
+		result = !(tbox.intersectsWithBox(cam->getViewFrustum()->getBoundingBox()));
+	}
+
+	// can be seen by a bounding sphere
+	if (!result && (node->getAutomaticCulling() & scene::EAC_FRUSTUM_SPHERE)) {
+		const core::aabbox3df nbox = node->getTransformedBoundingBox();
+		const float rad = nbox.getRadius();
+		const core::vector3df center = nbox.getCenter();
+
+		const float camrad = cam->getViewFrustum()->getBoundingRadius();
+		const core::vector3df camcenter = cam->getViewFrustum()->getBoundingCenter();
+
+		const float dist = (center - camcenter).getLengthSQ();
+		const float maxdist = (rad + camrad) * (rad + camrad);
+
+		result = dist > maxdist;
+	}
+
+	// can be seen by cam pyramid planes ?
+	if (!result && (node->getAutomaticCulling() & scene::EAC_FRUSTUM_BOX)) {
+		SViewFrustum frust = *cam->getViewFrustum();
+
+		// transform the frustum to the node's current absolute transformation
+		core::matrix4 invTrans(node->getAbsoluteTransformation(), core::matrix4::EM4CONST_INVERSE);
+		// invTrans.makeInverse();
+		frust.transform(invTrans);
+
+		core::vector3df edges[8];
+		node->getBoundingBox().getEdges(edges);
+
+		for (s32 i = 0; i < scene::SViewFrustum::VF_PLANE_COUNT; ++i) {
+			bool boxInFrustum = false;
+			for (u32 j = 0; j < 8; ++j) {
+				if (frust.planes[i].classifyPointRelation(edges[j]) != core::ISREL3D_FRONT) {
+					boxInFrustum = true;
+					break;
+				}
+			}
+
+			if (!boxInFrustum) {
+				result = true;
+				break;
+			}
+		}
+	}
+
+	return result;
+}
+
+//! registers a node for rendering it at a specific time.
+u32 CSceneManager::registerNodeForRendering(ISceneNode *node, E_SCENE_NODE_RENDER_PASS pass)
+{
+	u32 taken = 0;
+
+	switch (pass) {
+		// take camera if it is not already registered
+	case ESNRP_CAMERA: {
+		taken = 1;
+		for (u32 i = 0; i != CameraList.size(); ++i) {
+			if (CameraList[i] == node) {
+				taken = 0;
+				break;
+			}
+		}
+		if (taken) {
+			CameraList.push_back(node);
+		}
+	} break;
+	case ESNRP_SKY_BOX:
+		SkyBoxList.push_back(node);
+		taken = 1;
+		break;
+	case ESNRP_SOLID:
+		if (!isCulled(node)) {
+			SolidNodeList.push_back(node);
+			taken = 1;
+		}
+		break;
+	case ESNRP_TRANSPARENT:
+		if (!isCulled(node)) {
+			TransparentNodeList.push_back(TransparentNodeEntry(node, camWorldPos));
+			taken = 1;
+		}
+		break;
+	case ESNRP_TRANSPARENT_EFFECT:
+		if (!isCulled(node)) {
+			TransparentEffectNodeList.push_back(TransparentNodeEntry(node, camWorldPos));
+			taken = 1;
+		}
+		break;
+	case ESNRP_AUTOMATIC:
+		if (!isCulled(node)) {
+			const u32 count = node->getMaterialCount();
+
+			taken = 0;
+			for (u32 i = 0; i < count; ++i) {
+				if (Driver->needsTransparentRenderPass(node->getMaterial(i))) {
+					// register as transparent node
+					TransparentNodeEntry e(node, camWorldPos);
+					TransparentNodeList.push_back(e);
+					taken = 1;
+					break;
+				}
+			}
+
+			// not transparent, register as solid
+			if (!taken) {
+				SolidNodeList.push_back(node);
+				taken = 1;
+			}
+		}
+		break;
+	case ESNRP_GUI:
+		if (!isCulled(node)) {
+			GuiNodeList.push_back(node);
+			taken = 1;
+		}
+
+	// as of yet unused
+	case ESNRP_LIGHT:
+	case ESNRP_SHADOW:
+	case ESNRP_NONE: // ignore this one
+		break;
+	}
+
+	return taken;
+}
+
+void CSceneManager::clearAllRegisteredNodesForRendering()
+{
+	CameraList.clear();
+	SkyBoxList.clear();
+	SolidNodeList.clear();
+	TransparentNodeList.clear();
+	TransparentEffectNodeList.clear();
+	GuiNodeList.clear();
+}
+
+//! This method is called just before the rendering process of the whole scene.
+//! draws all scene nodes
+void CSceneManager::drawAll()
+{
+	if (!Driver)
+		return;
+
+	u32 i; // new ISO for scoping problem in some compilers
+
+	// reset all transforms
+	Driver->setMaterial(video::SMaterial());
+	Driver->setTransform(video::ETS_PROJECTION, core::IdentityMatrix);
+	Driver->setTransform(video::ETS_VIEW, core::IdentityMatrix);
+	Driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
+	for (i = video::ETS_COUNT - 1; i >= video::ETS_TEXTURE_0; --i)
+		Driver->setTransform((video::E_TRANSFORMATION_STATE)i, core::IdentityMatrix);
+	// TODO: This should not use an attribute here but a real parameter when necessary (too slow!)
+	Driver->setAllowZWriteOnTransparent(Parameters->getAttributeAsBool(ALLOW_ZWRITE_ON_TRANSPARENT));
+
+	// do animations and other stuff.
+	OnAnimate(os::Timer::getTime());
+
+	/*!
+		First Scene Node for prerendering should be the active camera
+		consistent Camera is needed for culling
+	*/
+	camWorldPos.set(0, 0, 0);
+	if (ActiveCamera) {
+		ActiveCamera->render();
+		camWorldPos = ActiveCamera->getAbsolutePosition();
+	}
+
+	// let all nodes register themselves
+	OnRegisterSceneNode();
+
+	// render camera scenes
+	{
+		CurrentRenderPass = ESNRP_CAMERA;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		for (i = 0; i < CameraList.size(); ++i)
+			CameraList[i]->render();
+
+		CameraList.set_used(0);
+	}
+
+	// render skyboxes
+	{
+		CurrentRenderPass = ESNRP_SKY_BOX;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		for (i = 0; i < SkyBoxList.size(); ++i)
+			SkyBoxList[i]->render();
+
+		SkyBoxList.set_used(0);
+	}
+
+	// render default objects
+	{
+		CurrentRenderPass = ESNRP_SOLID;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		SolidNodeList.sort(); // sort by textures
+
+		for (i = 0; i < SolidNodeList.size(); ++i)
+			SolidNodeList[i].Node->render();
+
+		SolidNodeList.set_used(0);
+	}
+
+	// render transparent objects.
+	{
+		CurrentRenderPass = ESNRP_TRANSPARENT;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		TransparentNodeList.sort(); // sort by distance from camera
+		for (i = 0; i < TransparentNodeList.size(); ++i)
+			TransparentNodeList[i].Node->render();
+
+		TransparentNodeList.set_used(0);
+	}
+
+	// render transparent effect objects.
+	{
+		CurrentRenderPass = ESNRP_TRANSPARENT_EFFECT;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		TransparentEffectNodeList.sort(); // sort by distance from camera
+
+		for (i = 0; i < TransparentEffectNodeList.size(); ++i)
+			TransparentEffectNodeList[i].Node->render();
+
+		TransparentEffectNodeList.set_used(0);
+	}
+
+	// render custom gui nodes
+	{
+		CurrentRenderPass = ESNRP_GUI;
+		Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
+
+		for (i = 0; i < GuiNodeList.size(); ++i)
+			GuiNodeList[i]->render();
+
+		GuiNodeList.set_used(0);
+	}
+	clearDeletionList();
+
+	CurrentRenderPass = ESNRP_NONE;
+}
+
+//! Adds an external mesh loader.
+void CSceneManager::addExternalMeshLoader(IMeshLoader *externalLoader)
+{
+	if (!externalLoader)
+		return;
+
+	externalLoader->grab();
+	MeshLoaderList.push_back(externalLoader);
+}
+
+//! Returns the number of mesh loaders supported by Irrlicht at this time
+u32 CSceneManager::getMeshLoaderCount() const
+{
+	return MeshLoaderList.size();
+}
+
+//! Retrieve the given mesh loader
+IMeshLoader *CSceneManager::getMeshLoader(u32 index) const
+{
+	if (index < MeshLoaderList.size())
+		return MeshLoaderList[index];
+	else
+		return 0;
+}
+
+//! Returns a pointer to the scene collision manager.
+ISceneCollisionManager *CSceneManager::getSceneCollisionManager()
+{
+	return CollisionManager;
+}
+
+//! Returns a pointer to the mesh manipulator.
+IMeshManipulator *CSceneManager::getMeshManipulator()
+{
+	return Driver->getMeshManipulator();
+}
+
+//! Adds a scene node to the deletion queue.
+void CSceneManager::addToDeletionQueue(ISceneNode *node)
+{
+	if (!node)
+		return;
+
+	node->grab();
+	DeletionList.push_back(node);
+}
+
+//! clears the deletion list
+void CSceneManager::clearDeletionList()
+{
+	if (DeletionList.empty())
+		return;
+
+	for (u32 i = 0; i < DeletionList.size(); ++i) {
+		DeletionList[i]->remove();
+		DeletionList[i]->drop();
+	}
+
+	DeletionList.clear();
+}
+
+//! Returns the first scene node with the specified name.
+ISceneNode *CSceneManager::getSceneNodeFromName(const char *name, ISceneNode *start)
+{
+	if (start == 0)
+		start = getRootSceneNode();
+
+	auto startName = start->getName();
+	if (startName.has_value() && startName == name)
+		return start;
+
+	ISceneNode *node = 0;
+
+	const ISceneNodeList &list = start->getChildren();
+	ISceneNodeList::const_iterator it = list.begin();
+	for (; it != list.end(); ++it) {
+		node = getSceneNodeFromName(name, *it);
+		if (node)
+			return node;
+	}
+
+	return 0;
+}
+
+//! Returns the first scene node with the specified id.
+ISceneNode *CSceneManager::getSceneNodeFromId(s32 id, ISceneNode *start)
+{
+	if (start == 0)
+		start = getRootSceneNode();
+
+	if (start->getID() == id)
+		return start;
+
+	ISceneNode *node = 0;
+
+	const ISceneNodeList &list = start->getChildren();
+	ISceneNodeList::const_iterator it = list.begin();
+	for (; it != list.end(); ++it) {
+		node = getSceneNodeFromId(id, *it);
+		if (node)
+			return node;
+	}
+
+	return 0;
+}
+
+//! Returns the first scene node with the specified type.
+ISceneNode *CSceneManager::getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode *start)
+{
+	if (start == 0)
+		start = getRootSceneNode();
+
+	if (start->getType() == type || ESNT_ANY == type)
+		return start;
+
+	ISceneNode *node = 0;
+
+	const ISceneNodeList &list = start->getChildren();
+	ISceneNodeList::const_iterator it = list.begin();
+	for (; it != list.end(); ++it) {
+		node = getSceneNodeFromType(type, *it);
+		if (node)
+			return node;
+	}
+
+	return 0;
+}
+
+//! returns scene nodes by type.
+void CSceneManager::getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array<scene::ISceneNode *> &outNodes, ISceneNode *start)
+{
+	if (start == 0)
+		start = getRootSceneNode();
+
+	if (start->getType() == type || ESNT_ANY == type)
+		outNodes.push_back(start);
+
+	const ISceneNodeList &list = start->getChildren();
+	ISceneNodeList::const_iterator it = list.begin();
+
+	for (; it != list.end(); ++it) {
+		getSceneNodesFromType(type, outNodes, *it);
+	}
+}
+
+//! Posts an input event to the environment. Usually you do not have to
+//! use this method, it is used by the internal engine.
+bool CSceneManager::postEventFromUser(const SEvent &event)
+{
+	bool ret = false;
+	ICameraSceneNode *cam = getActiveCamera();
+	if (cam)
+		ret = cam->OnEvent(event);
+
+	return ret;
+}
+
+//! Removes all children of this scene node
+void CSceneManager::removeAll()
+{
+	ISceneNode::removeAll();
+	setActiveCamera(0);
+	// Make sure the driver is reset, might need a more complex method at some point
+	if (Driver)
+		Driver->setMaterial(video::SMaterial());
+}
+
+//! Clears the whole scene. All scene nodes are removed.
+void CSceneManager::clear()
+{
+	removeAll();
+}
+
+//! Returns interface to the parameters set in this scene.
+io::IAttributes *CSceneManager::getParameters()
+{
+	return Parameters;
+}
+
+//! Returns current render pass.
+E_SCENE_NODE_RENDER_PASS CSceneManager::getSceneNodeRenderPass() const
+{
+	return CurrentRenderPass;
+}
+
+//! Returns an interface to the mesh cache which is shared between all existing scene managers.
+IMeshCache *CSceneManager::getMeshCache()
+{
+	return MeshCache;
+}
+
+//! Creates a new scene manager.
+ISceneManager *CSceneManager::createNewSceneManager(bool cloneContent)
+{
+	CSceneManager *manager = new CSceneManager(Driver, CursorControl, MeshCache);
+
+	if (cloneContent)
+		manager->cloneMembers(this, manager);
+
+	return manager;
+}
+
+//! Sets ambient color of the scene
+void CSceneManager::setAmbientLight(const video::SColorf &ambientColor)
+{
+	AmbientLight = ambientColor;
+}
+
+//! Returns ambient color of the scene
+const video::SColorf &CSceneManager::getAmbientLight() const
+{
+	return AmbientLight;
+}
+
+//! Get a skinned mesh, which is not available as header-only code
+ISkinnedMesh *CSceneManager::createSkinnedMesh()
+{
+	return new CSkinnedMesh();
+}
+
+// creates a scenemanager
+ISceneManager *createSceneManager(video::IVideoDriver *driver, gui::ICursorControl *cursorcontrol)
+{
+	return new CSceneManager(driver, cursorcontrol, nullptr);
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CSceneManager.h b/irr/src/CSceneManager.h
new file mode 100644
index 000000000..0e27290a8
--- /dev/null
+++ b/irr/src/CSceneManager.h
@@ -0,0 +1,308 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ISceneManager.h"
+#include "ISceneNode.h"
+#include "ICursorControl.h"
+#include "irrString.h"
+#include "irrArray.h"
+#include "IMeshLoader.h"
+#include "CAttributes.h"
+
+namespace irr
+{
+namespace io
+{
+class IFileSystem;
+}
+namespace scene
+{
+class IMeshCache;
+
+/*!
+	The Scene Manager manages scene nodes, mesh resources, cameras and all the other stuff.
+*/
+class CSceneManager : public ISceneManager, public ISceneNode
+{
+public:
+	//! constructor
+	CSceneManager(video::IVideoDriver *driver, gui::ICursorControl *cursorControl, IMeshCache *cache = 0);
+
+	//! destructor
+	virtual ~CSceneManager();
+
+	//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.
+	IAnimatedMesh *getMesh(io::IReadFile *file) override;
+
+	//! Returns an interface to the mesh cache which is shared between all existing scene managers.
+	IMeshCache *getMeshCache() override;
+
+	//! returns the video driver
+	video::IVideoDriver *getVideoDriver() override;
+
+	//! adds a scene node for rendering an animated mesh model
+	virtual IAnimatedMeshSceneNode *addAnimatedMeshSceneNode(IAnimatedMesh *mesh, ISceneNode *parent = 0, s32 id = -1,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f),
+			bool alsoAddIfMeshPointerZero = false) override;
+
+	//! adds a scene node for rendering a static mesh
+	//! the returned pointer must not be dropped.
+	virtual IMeshSceneNode *addMeshSceneNode(IMesh *mesh, ISceneNode *parent = 0, s32 id = -1,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &rotation = core::vector3df(0, 0, 0),
+			const core::vector3df &scale = core::vector3df(1.0f, 1.0f, 1.0f),
+			bool alsoAddIfMeshPointerZero = false) override;
+
+	//! renders the node.
+	void render() override;
+
+	//! returns the axis aligned bounding box of this node
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! registers a node for rendering it at a specific time.
+	u32 registerNodeForRendering(ISceneNode *node, E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) override;
+
+	//! Clear all nodes which are currently registered for rendering
+	void clearAllRegisteredNodesForRendering() override;
+
+	//! draws all scene nodes
+	void drawAll() override;
+
+	//! Adds a camera scene node to the tree and sets it as active camera.
+	//! \param position: Position of the space relative to its parent where the camera will be placed.
+	//! \param lookat: Position where the camera will look at. Also known as target.
+	//! \param parent: Parent scene node of the camera. Can be null. If the parent moves,
+	//! the camera will move too.
+	//! \return Pointer to interface to camera
+	virtual ICameraSceneNode *addCameraSceneNode(ISceneNode *parent = 0,
+			const core::vector3df &position = core::vector3df(0, 0, 0),
+			const core::vector3df &lookat = core::vector3df(0, 0, 100),
+			s32 id = -1, bool makeActive = true) override;
+
+	//! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element,
+	//! which always looks to the camera. It is usually used for things like explosions, fire,
+	//! lensflares and things like that.
+	virtual IBillboardSceneNode *addBillboardSceneNode(ISceneNode *parent = 0,
+			const core::dimension2d<f32> &size = core::dimension2d<f32>(10.0f, 10.0f),
+			const core::vector3df &position = core::vector3df(0, 0, 0), s32 id = -1,
+			video::SColor shadeTop = 0xFFFFFFFF, video::SColor shadeBottom = 0xFFFFFFFF) override;
+
+	//! Adds a dummy transformation scene node to the scene graph.
+	virtual IDummyTransformationSceneNode *addDummyTransformationSceneNode(
+			ISceneNode *parent = 0, s32 id = -1) override;
+
+	//! Adds an empty scene node.
+	ISceneNode *addEmptySceneNode(ISceneNode *parent, s32 id = -1) override;
+
+	//! Returns the root scene node. This is the scene node which is parent
+	//! of all scene nodes. The root scene node is a special scene node which
+	//! only exists to manage all scene nodes. It is not rendered and cannot
+	//! be removed from the scene.
+	//! \return Pointer to the root scene node.
+	ISceneNode *getRootSceneNode() override;
+
+	//! Returns the current active camera.
+	//! \return The active camera is returned. Note that this can be NULL, if there
+	//! was no camera created yet.
+	ICameraSceneNode *getActiveCamera() const override;
+
+	//! Sets the active camera. The previous active camera will be deactivated.
+	//! \param camera: The new camera which should be active.
+	void setActiveCamera(ICameraSceneNode *camera) override;
+
+	//! Adds an external mesh loader.
+	void addExternalMeshLoader(IMeshLoader *externalLoader) override;
+
+	//! Returns the number of mesh loaders supported by Irrlicht at this time
+	u32 getMeshLoaderCount() const override;
+
+	//! Retrieve the given mesh loader
+	IMeshLoader *getMeshLoader(u32 index) const override;
+
+	//! Returns a pointer to the scene collision manager.
+	ISceneCollisionManager *getSceneCollisionManager() override;
+
+	//! Returns a pointer to the mesh manipulator.
+	IMeshManipulator *getMeshManipulator() override;
+
+	//! Adds a scene node to the deletion queue.
+	void addToDeletionQueue(ISceneNode *node) override;
+
+	//! Returns the first scene node with the specified id.
+	ISceneNode *getSceneNodeFromId(s32 id, ISceneNode *start = 0) override;
+
+	//! Returns the first scene node with the specified name.
+	ISceneNode *getSceneNodeFromName(const c8 *name, ISceneNode *start = 0) override;
+
+	//! Returns the first scene node with the specified type.
+	ISceneNode *getSceneNodeFromType(scene::ESCENE_NODE_TYPE type, ISceneNode *start = 0) override;
+
+	//! returns scene nodes by type.
+	void getSceneNodesFromType(ESCENE_NODE_TYPE type, core::array<scene::ISceneNode *> &outNodes, ISceneNode *start = 0) override;
+
+	//! Posts an input event to the environment. Usually you do not have to
+	//! use this method, it is used by the internal engine.
+	bool postEventFromUser(const SEvent &event) override;
+
+	//! Clears the whole scene. All scene nodes are removed.
+	void clear() override;
+
+	//! Removes all children of this scene node
+	void removeAll() override;
+
+	//! Returns interface to the parameters set in this scene.
+	io::IAttributes *getParameters() override;
+
+	//! Returns current render pass.
+	E_SCENE_NODE_RENDER_PASS getSceneNodeRenderPass() const override;
+
+	//! Creates a new scene manager.
+	ISceneManager *createNewSceneManager(bool cloneContent) override;
+
+	//! Returns type of the scene node
+	ESCENE_NODE_TYPE getType() const override { return ESNT_SCENE_MANAGER; }
+
+	//! Get a skinned mesh, which is not available as header-only code
+	ISkinnedMesh *createSkinnedMesh() override;
+
+	//! Sets ambient color of the scene
+	void setAmbientLight(const video::SColorf &ambientColor) override;
+
+	//! Returns ambient color of the scene
+	const video::SColorf &getAmbientLight() const override;
+
+	//! Get current render time.
+	E_SCENE_NODE_RENDER_PASS getCurrentRenderPass() const override { return CurrentRenderPass; }
+
+	//! Set current render time.
+	void setCurrentRenderPass(E_SCENE_NODE_RENDER_PASS nextPass) override { CurrentRenderPass = nextPass; }
+
+	//! returns if node is culled
+	bool isCulled(const ISceneNode *node) const override;
+
+private:
+	// load and create a mesh which we know already isn't in the cache and put it in there
+	IAnimatedMesh *getUncachedMesh(io::IReadFile *file, const io::path &filename, const io::path &cachename);
+
+	//! clears the deletion list
+	void clearDeletionList();
+
+	struct DefaultNodeEntry
+	{
+		DefaultNodeEntry()
+		{
+		}
+
+		DefaultNodeEntry(ISceneNode *n) :
+				Node(n), TextureValue(0)
+		{
+			if (n->getMaterialCount())
+				TextureValue = (n->getMaterial(0).getTexture(0));
+		}
+
+		bool operator<(const DefaultNodeEntry &other) const
+		{
+			return (TextureValue < other.TextureValue);
+		}
+
+		ISceneNode *Node;
+
+	private:
+		void *TextureValue;
+	};
+
+	//! sort on distance (center) to camera
+	struct TransparentNodeEntry
+	{
+		TransparentNodeEntry()
+		{
+		}
+
+		TransparentNodeEntry(ISceneNode *n, const core::vector3df &camera) :
+				Node(n)
+		{
+			Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera);
+		}
+
+		bool operator<(const TransparentNodeEntry &other) const
+		{
+			return Distance > other.Distance;
+		}
+
+		ISceneNode *Node;
+
+	private:
+		f64 Distance;
+	};
+
+	//! sort on distance (sphere) to camera
+	struct DistanceNodeEntry
+	{
+		DistanceNodeEntry(ISceneNode *n, const core::vector3df &cameraPos) :
+				Node(n)
+		{
+			setNodeAndDistanceFromPosition(n, cameraPos);
+		}
+
+		bool operator<(const DistanceNodeEntry &other) const
+		{
+			return Distance < other.Distance;
+		}
+
+		void setNodeAndDistanceFromPosition(ISceneNode *n, const core::vector3df &fromPosition)
+		{
+			Node = n;
+			Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(fromPosition);
+			Distance -= Node->getBoundingBox().getExtent().getLengthSQ() * 0.5;
+		}
+
+		ISceneNode *Node;
+
+	private:
+		f64 Distance;
+	};
+
+	//! video driver
+	video::IVideoDriver *Driver;
+
+	//! cursor control
+	gui::ICursorControl *CursorControl;
+
+	//! collision manager
+	ISceneCollisionManager *CollisionManager;
+
+	//! render pass lists
+	core::array<ISceneNode *> CameraList;
+	core::array<ISceneNode *> SkyBoxList;
+	core::array<DefaultNodeEntry> SolidNodeList;
+	core::array<TransparentNodeEntry> TransparentNodeList;
+	core::array<TransparentNodeEntry> TransparentEffectNodeList;
+	core::array<ISceneNode *> GuiNodeList;
+
+	core::array<IMeshLoader *> MeshLoaderList;
+	core::array<ISceneNode *> DeletionList;
+
+	//! current active camera
+	ICameraSceneNode *ActiveCamera;
+	core::vector3df camWorldPos; // Position of camera for transparent nodes.
+
+	video::SColor ShadowColor;
+	video::SColorf AmbientLight;
+
+	//! String parameters
+	// NOTE: Attributes are slow and should only be used for debug-info and not in release
+	io::CAttributes *Parameters;
+
+	//! Mesh cache
+	IMeshCache *MeshCache;
+
+	E_SCENE_NODE_RENDER_PASS CurrentRenderPass;
+};
+
+} // end namespace video
+} // end namespace scene
diff --git a/irr/src/CSkinnedMesh.cpp b/irr/src/CSkinnedMesh.cpp
new file mode 100644
index 000000000..eb7317309
--- /dev/null
+++ b/irr/src/CSkinnedMesh.cpp
@@ -0,0 +1,1336 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CSkinnedMesh.h"
+#include <optional>
+#include "CBoneSceneNode.h"
+#include "IAnimatedMeshSceneNode.h"
+#include "os.h"
+
+namespace
+{
+// Frames must always be increasing, so we remove objects where this isn't the case
+// return number of kicked keys
+template <class T> // T = objects containing a "frame" variable
+irr::u32 dropBadKeys(irr::core::array<T> &array)
+{
+	if (array.size() < 2)
+		return 0;
+
+	irr::u32 n = 1; // new index
+	for (irr::u32 j = 1; j < array.size(); ++j) {
+		if (array[j].frame < array[n - 1].frame)
+			continue; // bad frame, unneeded and may cause problems
+		if (n != j)
+			array[n] = array[j];
+		++n;
+	}
+	irr::u32 d = array.size() - n; // remove already copied keys
+	if (d > 0) {
+		array.erase(n, d);
+	}
+	return d;
+}
+
+// drop identical middle keys - we only need the first and last
+// return number of kicked keys
+template <class T, typename Cmp> // Cmp = comparison for keys of type T
+irr::u32 dropMiddleKeys(irr::core::array<T> &array, Cmp &cmp)
+{
+	if (array.size() < 3)
+		return 0;
+
+	irr::u32 s = 0; // old index for current key
+	irr::u32 n = 1; // new index for next key
+	for (irr::u32 j = 1; j < array.size(); ++j) {
+		if (cmp(array[j], array[s]))
+			continue; // same key, handle later
+
+		if (j > s + 1)                 // had there been identical keys?
+			array[n++] = array[j - 1]; // keep the last
+		array[n++] = array[j];         // keep the new one
+		s = j;
+	}
+	if (array.size() > s + 1)                 // identical keys at the array end?
+		array[n++] = array[array.size() - 1]; // keep the last
+
+	irr::u32 d = array.size() - n; // remove already copied keys
+	if (d > 0) {
+		array.erase(n, d);
+	}
+	return d;
+}
+
+bool identicalPos(const irr::scene::ISkinnedMesh::SPositionKey &a, const irr::scene::ISkinnedMesh::SPositionKey &b)
+{
+	return a.position == b.position;
+}
+
+bool identicalScale(const irr::scene::ISkinnedMesh::SScaleKey &a, const irr::scene::ISkinnedMesh::SScaleKey &b)
+{
+	return a.scale == b.scale;
+}
+
+bool identicalRotation(const irr::scene::ISkinnedMesh::SRotationKey &a, const irr::scene::ISkinnedMesh::SRotationKey &b)
+{
+	return a.rotation == b.rotation;
+}
+}
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CSkinnedMesh::CSkinnedMesh() :
+		SkinningBuffers(0), EndFrame(0.f), FramesPerSecond(25.f),
+		LastAnimatedFrame(-1), SkinnedLastFrame(false),
+		InterpolationMode(EIM_LINEAR),
+		HasAnimation(false), PreparedForSkinning(false),
+		AnimateNormals(true), HardwareSkinning(false)
+{
+#ifdef _DEBUG
+	setDebugName("CSkinnedMesh");
+#endif
+
+	SkinningBuffers = &LocalBuffers;
+}
+
+//! destructor
+CSkinnedMesh::~CSkinnedMesh()
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i)
+		delete AllJoints[i];
+
+	for (u32 j = 0; j < LocalBuffers.size(); ++j) {
+		if (LocalBuffers[j])
+			LocalBuffers[j]->drop();
+	}
+}
+
+//! returns the amount of frames in milliseconds.
+//! If the amount is 1, it is a static (=non animated) mesh.
+u32 CSkinnedMesh::getFrameCount() const
+{
+	return core::floor32(EndFrame + 1.f);
+}
+
+//! Gets the default animation speed of the animated mesh.
+/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
+f32 CSkinnedMesh::getAnimationSpeed() const
+{
+	return FramesPerSecond;
+}
+
+//! Gets the frame count of the animated mesh.
+/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
+The actual speed is set in the scene node the mesh is instantiated in.*/
+void CSkinnedMesh::setAnimationSpeed(f32 fps)
+{
+	FramesPerSecond = fps;
+}
+
+//! returns the animated mesh based on a detail level. 0 is the lowest, 255 the highest detail. Note, that some Meshes will ignore the detail level.
+IMesh *CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 endFrameLoop)
+{
+	// animate(frame,startFrameLoop, endFrameLoop);
+	if (frame == -1)
+		return this;
+
+	animateMesh((f32)frame, 1.0f);
+	skinMesh();
+	return this;
+}
+
+//--------------------------------------------------------------------------
+//			Keyframe Animation
+//--------------------------------------------------------------------------
+
+//! Animates this mesh's joints based on frame input
+//! blend: {0-old position, 1-New position}
+void CSkinnedMesh::animateMesh(f32 frame, f32 blend)
+{
+	if (!HasAnimation || LastAnimatedFrame == frame)
+		return;
+
+	LastAnimatedFrame = frame;
+	SkinnedLastFrame = false;
+
+	if (blend <= 0.f)
+		return; // No need to animate
+
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		// The joints can be animated here with no input from their
+		// parents, but for setAnimationMode extra checks are needed
+		// to their parents
+		SJoint *joint = AllJoints[i];
+
+		const core::vector3df oldPosition = joint->Animatedposition;
+		const core::vector3df oldScale = joint->Animatedscale;
+		const core::quaternion oldRotation = joint->Animatedrotation;
+
+		core::vector3df position = oldPosition;
+		core::vector3df scale = oldScale;
+		core::quaternion rotation = oldRotation;
+
+		getFrameData(frame, joint,
+				position, joint->positionHint,
+				scale, joint->scaleHint,
+				rotation, joint->rotationHint);
+
+		if (blend == 1.0f) {
+			// No blending needed
+			joint->Animatedposition = position;
+			joint->Animatedscale = scale;
+			joint->Animatedrotation = rotation;
+		} else {
+			// Blend animation
+			joint->Animatedposition = core::lerp(oldPosition, position, blend);
+			joint->Animatedscale = core::lerp(oldScale, scale, blend);
+			joint->Animatedrotation.slerp(oldRotation, rotation, blend);
+		}
+	}
+
+	// Note:
+	// LocalAnimatedMatrix needs to be built at some point, but this function may be called lots of times for
+	// one render (to play two animations at the same time) LocalAnimatedMatrix only needs to be built once.
+	// a call to buildAllLocalAnimatedMatrices is needed before skinning the mesh, and before the user gets the joints to move
+
+	//----------------
+	// Temp!
+	buildAllLocalAnimatedMatrices();
+	//-----------------
+
+	updateBoundingBox();
+}
+
+void CSkinnedMesh::buildAllLocalAnimatedMatrices()
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+
+		// Could be faster:
+
+		if (joint->UseAnimationFrom &&
+				(joint->UseAnimationFrom->PositionKeys.size() ||
+						joint->UseAnimationFrom->ScaleKeys.size() ||
+						joint->UseAnimationFrom->RotationKeys.size())) {
+			joint->GlobalSkinningSpace = false;
+
+			// IRR_TEST_BROKEN_QUATERNION_USE: TODO - switched to getMatrix_transposed instead of getMatrix for downward compatibility.
+			//								   Not tested so far if this was correct or wrong before quaternion fix!
+			joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix);
+
+			// --- joint->LocalAnimatedMatrix *= joint->Animatedrotation.getMatrix() ---
+			f32 *m1 = joint->LocalAnimatedMatrix.pointer();
+			core::vector3df &Pos = joint->Animatedposition;
+			m1[0] += Pos.X * m1[3];
+			m1[1] += Pos.Y * m1[3];
+			m1[2] += Pos.Z * m1[3];
+			m1[4] += Pos.X * m1[7];
+			m1[5] += Pos.Y * m1[7];
+			m1[6] += Pos.Z * m1[7];
+			m1[8] += Pos.X * m1[11];
+			m1[9] += Pos.Y * m1[11];
+			m1[10] += Pos.Z * m1[11];
+			m1[12] += Pos.X * m1[15];
+			m1[13] += Pos.Y * m1[15];
+			m1[14] += Pos.Z * m1[15];
+			// -----------------------------------
+
+			if (joint->ScaleKeys.size()) {
+				/*
+				core::matrix4 scaleMatrix;
+				scaleMatrix.setScale(joint->Animatedscale);
+				joint->LocalAnimatedMatrix *= scaleMatrix;
+				*/
+
+				// -------- joint->LocalAnimatedMatrix *= scaleMatrix -----------------
+				core::matrix4 &mat = joint->LocalAnimatedMatrix;
+				mat[0] *= joint->Animatedscale.X;
+				mat[1] *= joint->Animatedscale.X;
+				mat[2] *= joint->Animatedscale.X;
+				mat[3] *= joint->Animatedscale.X;
+				mat[4] *= joint->Animatedscale.Y;
+				mat[5] *= joint->Animatedscale.Y;
+				mat[6] *= joint->Animatedscale.Y;
+				mat[7] *= joint->Animatedscale.Y;
+				mat[8] *= joint->Animatedscale.Z;
+				mat[9] *= joint->Animatedscale.Z;
+				mat[10] *= joint->Animatedscale.Z;
+				mat[11] *= joint->Animatedscale.Z;
+				// -----------------------------------
+			}
+		} else {
+			joint->LocalAnimatedMatrix = joint->LocalMatrix;
+		}
+	}
+	SkinnedLastFrame = false;
+}
+
+void CSkinnedMesh::buildAllGlobalAnimatedMatrices(SJoint *joint, SJoint *parentJoint)
+{
+	if (!joint) {
+		for (u32 i = 0; i < RootJoints.size(); ++i)
+			buildAllGlobalAnimatedMatrices(RootJoints[i], 0);
+		return;
+	} else {
+		// Find global matrix...
+		if (!parentJoint || joint->GlobalSkinningSpace)
+			joint->GlobalAnimatedMatrix = joint->LocalAnimatedMatrix;
+		else
+			joint->GlobalAnimatedMatrix = parentJoint->GlobalAnimatedMatrix * joint->LocalAnimatedMatrix;
+	}
+
+	for (u32 j = 0; j < joint->Children.size(); ++j)
+		buildAllGlobalAnimatedMatrices(joint->Children[j], joint);
+}
+
+void CSkinnedMesh::getFrameData(f32 frame, SJoint *joint,
+		core::vector3df &position, s32 &positionHint,
+		core::vector3df &scale, s32 &scaleHint,
+		core::quaternion &rotation, s32 &rotationHint)
+{
+	s32 foundPositionIndex = -1;
+	s32 foundScaleIndex = -1;
+	s32 foundRotationIndex = -1;
+
+	if (joint->UseAnimationFrom) {
+		const core::array<SPositionKey> &PositionKeys = joint->UseAnimationFrom->PositionKeys;
+		const core::array<SScaleKey> &ScaleKeys = joint->UseAnimationFrom->ScaleKeys;
+		const core::array<SRotationKey> &RotationKeys = joint->UseAnimationFrom->RotationKeys;
+
+		if (PositionKeys.size()) {
+			foundPositionIndex = -1;
+
+			// Test the Hints...
+			if (positionHint >= 0 && (u32)positionHint < PositionKeys.size()) {
+				// check this hint
+				if (positionHint > 0 && PositionKeys[positionHint].frame >= frame && PositionKeys[positionHint - 1].frame < frame)
+					foundPositionIndex = positionHint;
+				else if (positionHint + 1 < (s32)PositionKeys.size()) {
+					// check the next index
+					if (PositionKeys[positionHint + 1].frame >= frame &&
+							PositionKeys[positionHint + 0].frame < frame) {
+						positionHint++;
+						foundPositionIndex = positionHint;
+					}
+				}
+			}
+
+			// The hint test failed, do a full scan...
+			if (foundPositionIndex == -1) {
+				for (u32 i = 0; i < PositionKeys.size(); ++i) {
+					if (PositionKeys[i].frame >= frame) { // Keys should to be sorted by frame
+						foundPositionIndex = i;
+						positionHint = i;
+						break;
+					}
+				}
+			}
+
+			// Do interpolation...
+			if (foundPositionIndex != -1) {
+				if (InterpolationMode == EIM_CONSTANT || foundPositionIndex == 0) {
+					position = PositionKeys[foundPositionIndex].position;
+				} else if (InterpolationMode == EIM_LINEAR) {
+					const SPositionKey &KeyA = PositionKeys[foundPositionIndex];
+					const SPositionKey &KeyB = PositionKeys[foundPositionIndex - 1];
+
+					const f32 fd1 = frame - KeyA.frame;
+					const f32 fd2 = KeyB.frame - frame;
+					position = ((KeyB.position - KeyA.position) / (fd1 + fd2)) * fd1 + KeyA.position;
+				}
+			}
+		}
+
+		//------------------------------------------------------------
+
+		if (ScaleKeys.size()) {
+			foundScaleIndex = -1;
+
+			// Test the Hints...
+			if (scaleHint >= 0 && (u32)scaleHint < ScaleKeys.size()) {
+				// check this hint
+				if (scaleHint > 0 && ScaleKeys[scaleHint].frame >= frame && ScaleKeys[scaleHint - 1].frame < frame)
+					foundScaleIndex = scaleHint;
+				else if (scaleHint + 1 < (s32)ScaleKeys.size()) {
+					// check the next index
+					if (ScaleKeys[scaleHint + 1].frame >= frame &&
+							ScaleKeys[scaleHint + 0].frame < frame) {
+						scaleHint++;
+						foundScaleIndex = scaleHint;
+					}
+				}
+			}
+
+			// The hint test failed, do a full scan...
+			if (foundScaleIndex == -1) {
+				for (u32 i = 0; i < ScaleKeys.size(); ++i) {
+					if (ScaleKeys[i].frame >= frame) { // Keys should to be sorted by frame
+						foundScaleIndex = i;
+						scaleHint = i;
+						break;
+					}
+				}
+			}
+
+			// Do interpolation...
+			if (foundScaleIndex != -1) {
+				if (InterpolationMode == EIM_CONSTANT || foundScaleIndex == 0) {
+					scale = ScaleKeys[foundScaleIndex].scale;
+				} else if (InterpolationMode == EIM_LINEAR) {
+					const SScaleKey &KeyA = ScaleKeys[foundScaleIndex];
+					const SScaleKey &KeyB = ScaleKeys[foundScaleIndex - 1];
+
+					const f32 fd1 = frame - KeyA.frame;
+					const f32 fd2 = KeyB.frame - frame;
+					scale = ((KeyB.scale - KeyA.scale) / (fd1 + fd2)) * fd1 + KeyA.scale;
+				}
+			}
+		}
+
+		//-------------------------------------------------------------
+
+		if (RotationKeys.size()) {
+			foundRotationIndex = -1;
+
+			// Test the Hints...
+			if (rotationHint >= 0 && (u32)rotationHint < RotationKeys.size()) {
+				// check this hint
+				if (rotationHint > 0 && RotationKeys[rotationHint].frame >= frame && RotationKeys[rotationHint - 1].frame < frame)
+					foundRotationIndex = rotationHint;
+				else if (rotationHint + 1 < (s32)RotationKeys.size()) {
+					// check the next index
+					if (RotationKeys[rotationHint + 1].frame >= frame &&
+							RotationKeys[rotationHint + 0].frame < frame) {
+						rotationHint++;
+						foundRotationIndex = rotationHint;
+					}
+				}
+			}
+
+			// The hint test failed, do a full scan...
+			if (foundRotationIndex == -1) {
+				for (u32 i = 0; i < RotationKeys.size(); ++i) {
+					if (RotationKeys[i].frame >= frame) { // Keys should be sorted by frame
+						foundRotationIndex = i;
+						rotationHint = i;
+						break;
+					}
+				}
+			}
+
+			// Do interpolation...
+			if (foundRotationIndex != -1) {
+				if (InterpolationMode == EIM_CONSTANT || foundRotationIndex == 0) {
+					rotation = RotationKeys[foundRotationIndex].rotation;
+				} else if (InterpolationMode == EIM_LINEAR) {
+					const SRotationKey &KeyA = RotationKeys[foundRotationIndex];
+					const SRotationKey &KeyB = RotationKeys[foundRotationIndex - 1];
+
+					const f32 fd1 = frame - KeyA.frame;
+					const f32 fd2 = KeyB.frame - frame;
+					const f32 t = fd1 / (fd1 + fd2);
+
+					/*
+					f32 t = 0;
+					if (KeyA.frame!=KeyB.frame)
+						t = (frame-KeyA.frame) / (KeyB.frame - KeyA.frame);
+					*/
+
+					rotation.slerp(KeyA.rotation, KeyB.rotation, t);
+				}
+			}
+		}
+	}
+}
+
+//--------------------------------------------------------------------------
+//				Software Skinning
+//--------------------------------------------------------------------------
+
+//! Preforms a software skin on this mesh based of joint positions
+void CSkinnedMesh::skinMesh()
+{
+	if (!HasAnimation || SkinnedLastFrame)
+		return;
+
+	//----------------
+	// This is marked as "Temp!".  A shiny dubloon to whomever can tell me why.
+	buildAllGlobalAnimatedMatrices();
+	//-----------------
+
+	SkinnedLastFrame = true;
+	if (!HardwareSkinning) {
+		// Software skin....
+		u32 i;
+
+		// rigid animation
+		for (i = 0; i < AllJoints.size(); ++i) {
+			for (u32 j = 0; j < AllJoints[i]->AttachedMeshes.size(); ++j) {
+				SSkinMeshBuffer *Buffer = (*SkinningBuffers)[AllJoints[i]->AttachedMeshes[j]];
+				Buffer->Transformation = AllJoints[i]->GlobalAnimatedMatrix;
+			}
+		}
+
+		// clear skinning helper array
+		for (i = 0; i < Vertices_Moved.size(); ++i)
+			for (u32 j = 0; j < Vertices_Moved[i].size(); ++j)
+				Vertices_Moved[i][j] = false;
+
+		// skin starting with the root joints
+		for (i = 0; i < RootJoints.size(); ++i)
+			skinJoint(RootJoints[i], 0);
+
+		for (i = 0; i < SkinningBuffers->size(); ++i)
+			(*SkinningBuffers)[i]->setDirty(EBT_VERTEX);
+	}
+	updateBoundingBox();
+}
+
+void CSkinnedMesh::skinJoint(SJoint *joint, SJoint *parentJoint)
+{
+	if (joint->Weights.size()) {
+		// Find this joints pull on vertices...
+		core::matrix4 jointVertexPull(core::matrix4::EM4CONST_NOTHING);
+		jointVertexPull.setbyproduct(joint->GlobalAnimatedMatrix, joint->GlobalInversedMatrix);
+
+		core::vector3df thisVertexMove, thisNormalMove;
+
+		core::array<scene::SSkinMeshBuffer *> &buffersUsed = *SkinningBuffers;
+
+		// Skin Vertices Positions and Normals...
+		for (u32 i = 0; i < joint->Weights.size(); ++i) {
+			SWeight &weight = joint->Weights[i];
+
+			// Pull this vertex...
+			jointVertexPull.transformVect(thisVertexMove, weight.StaticPos);
+
+			if (AnimateNormals)
+				jointVertexPull.rotateVect(thisNormalMove, weight.StaticNormal);
+
+			if (!(*(weight.Moved))) {
+				*(weight.Moved) = true;
+
+				buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos = thisVertexMove * weight.strength;
+
+				if (AnimateNormals)
+					buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal = thisNormalMove * weight.strength;
+
+				//*(weight._Pos) = thisVertexMove * weight.strength;
+			} else {
+				buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Pos += thisVertexMove * weight.strength;
+
+				if (AnimateNormals)
+					buffersUsed[weight.buffer_id]->getVertex(weight.vertex_id)->Normal += thisNormalMove * weight.strength;
+
+				//*(weight._Pos) += thisVertexMove * weight.strength;
+			}
+
+			buffersUsed[weight.buffer_id]->boundingBoxNeedsRecalculated();
+		}
+	}
+
+	// Skin all children
+	for (u32 j = 0; j < joint->Children.size(); ++j)
+		skinJoint(joint->Children[j], joint);
+}
+
+E_ANIMATED_MESH_TYPE CSkinnedMesh::getMeshType() const
+{
+	return EAMT_SKINNED;
+}
+
+//! Gets joint count.
+u32 CSkinnedMesh::getJointCount() const
+{
+	return AllJoints.size();
+}
+
+//! Gets the name of a joint.
+const std::optional<std::string> &CSkinnedMesh::getJointName(u32 number) const
+{
+	if (number >= getJointCount()) {
+		static const std::optional<std::string> nullopt;
+		return nullopt;
+	}
+	return AllJoints[number]->Name;
+}
+
+//! Gets a joint number from its name
+std::optional<u32> CSkinnedMesh::getJointNumber(const std::string &name) const
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		if (AllJoints[i]->Name == name)
+			return i;
+	}
+
+	return std::nullopt;
+}
+
+//! returns amount of mesh buffers.
+u32 CSkinnedMesh::getMeshBufferCount() const
+{
+	return LocalBuffers.size();
+}
+
+//! returns pointer to a mesh buffer
+IMeshBuffer *CSkinnedMesh::getMeshBuffer(u32 nr) const
+{
+	if (nr < LocalBuffers.size())
+		return LocalBuffers[nr];
+	else
+		return 0;
+}
+
+//! Returns pointer to a mesh buffer which fits a material
+IMeshBuffer *CSkinnedMesh::getMeshBuffer(const video::SMaterial &material) const
+{
+	for (u32 i = 0; i < LocalBuffers.size(); ++i) {
+		if (LocalBuffers[i]->getMaterial() == material)
+			return LocalBuffers[i];
+	}
+	return 0;
+}
+
+//! returns an axis aligned bounding box
+const core::aabbox3d<f32> &CSkinnedMesh::getBoundingBox() const
+{
+	return BoundingBox;
+}
+
+//! set user axis aligned bounding box
+void CSkinnedMesh::setBoundingBox(const core::aabbox3df &box)
+{
+	BoundingBox = box;
+}
+
+//! set the hardware mapping hint, for driver
+void CSkinnedMesh::setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint,
+		E_BUFFER_TYPE buffer)
+{
+	for (u32 i = 0; i < LocalBuffers.size(); ++i)
+		LocalBuffers[i]->setHardwareMappingHint(newMappingHint, buffer);
+}
+
+//! flags the meshbuffer as changed, reloads hardware buffers
+void CSkinnedMesh::setDirty(E_BUFFER_TYPE buffer)
+{
+	for (u32 i = 0; i < LocalBuffers.size(); ++i)
+		LocalBuffers[i]->setDirty(buffer);
+}
+
+//! uses animation from another mesh
+bool CSkinnedMesh::useAnimationFrom(const ISkinnedMesh *mesh)
+{
+	bool unmatched = false;
+
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+		joint->UseAnimationFrom = 0;
+
+		if (joint->Name == "")
+			unmatched = true;
+		else {
+			for (u32 j = 0; j < mesh->getAllJoints().size(); ++j) {
+				SJoint *otherJoint = mesh->getAllJoints()[j];
+				if (joint->Name == otherJoint->Name) {
+					joint->UseAnimationFrom = otherJoint;
+				}
+			}
+			if (!joint->UseAnimationFrom)
+				unmatched = true;
+		}
+	}
+
+	checkForAnimation();
+
+	return !unmatched;
+}
+
+//! Update Normals when Animating
+//! False= Don't animate them, faster
+//! True= Update normals (default)
+void CSkinnedMesh::updateNormalsWhenAnimating(bool on)
+{
+	AnimateNormals = on;
+}
+
+//! Sets Interpolation Mode
+void CSkinnedMesh::setInterpolationMode(E_INTERPOLATION_MODE mode)
+{
+	InterpolationMode = mode;
+}
+
+core::array<scene::SSkinMeshBuffer *> &CSkinnedMesh::getMeshBuffers()
+{
+	return LocalBuffers;
+}
+
+core::array<CSkinnedMesh::SJoint *> &CSkinnedMesh::getAllJoints()
+{
+	return AllJoints;
+}
+
+const core::array<CSkinnedMesh::SJoint *> &CSkinnedMesh::getAllJoints() const
+{
+	return AllJoints;
+}
+
+//! (This feature is not implemented in irrlicht yet)
+bool CSkinnedMesh::setHardwareSkinning(bool on)
+{
+	if (HardwareSkinning != on) {
+		if (on) {
+
+			// set mesh to static pose...
+			for (u32 i = 0; i < AllJoints.size(); ++i) {
+				SJoint *joint = AllJoints[i];
+				for (u32 j = 0; j < joint->Weights.size(); ++j) {
+					const u16 buffer_id = joint->Weights[j].buffer_id;
+					const u32 vertex_id = joint->Weights[j].vertex_id;
+					LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos = joint->Weights[j].StaticPos;
+					LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal = joint->Weights[j].StaticNormal;
+					LocalBuffers[buffer_id]->boundingBoxNeedsRecalculated();
+				}
+			}
+		}
+
+		HardwareSkinning = on;
+	}
+	return HardwareSkinning;
+}
+
+void CSkinnedMesh::refreshJointCache()
+{
+	// copy cache from the mesh...
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+		for (u32 j = 0; j < joint->Weights.size(); ++j) {
+			const u16 buffer_id = joint->Weights[j].buffer_id;
+			const u32 vertex_id = joint->Weights[j].vertex_id;
+			joint->Weights[j].StaticPos = LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos;
+			joint->Weights[j].StaticNormal = LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal;
+		}
+	}
+}
+
+void CSkinnedMesh::resetAnimation()
+{
+	// copy from the cache to the mesh...
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+		for (u32 j = 0; j < joint->Weights.size(); ++j) {
+			const u16 buffer_id = joint->Weights[j].buffer_id;
+			const u32 vertex_id = joint->Weights[j].vertex_id;
+			LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos = joint->Weights[j].StaticPos;
+			LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal = joint->Weights[j].StaticNormal;
+		}
+	}
+	SkinnedLastFrame = false;
+	LastAnimatedFrame = -1;
+}
+
+void CSkinnedMesh::calculateGlobalMatrices(SJoint *joint, SJoint *parentJoint)
+{
+	if (!joint && parentJoint) // bit of protection from endless loops
+		return;
+
+	// Go through the root bones
+	if (!joint) {
+		for (u32 i = 0; i < RootJoints.size(); ++i)
+			calculateGlobalMatrices(RootJoints[i], 0);
+		return;
+	}
+
+	if (!parentJoint)
+		joint->GlobalMatrix = joint->LocalMatrix;
+	else
+		joint->GlobalMatrix = parentJoint->GlobalMatrix * joint->LocalMatrix;
+
+	joint->LocalAnimatedMatrix = joint->LocalMatrix;
+	joint->GlobalAnimatedMatrix = joint->GlobalMatrix;
+
+	if (joint->GlobalInversedMatrix.isIdentity()) { // might be pre calculated
+		joint->GlobalInversedMatrix = joint->GlobalMatrix;
+		joint->GlobalInversedMatrix.makeInverse(); // slow
+	}
+
+	for (u32 j = 0; j < joint->Children.size(); ++j)
+		calculateGlobalMatrices(joint->Children[j], joint);
+	SkinnedLastFrame = false;
+}
+
+void CSkinnedMesh::checkForAnimation()
+{
+	u32 i, j;
+	// Check for animation...
+	HasAnimation = false;
+	for (i = 0; i < AllJoints.size(); ++i) {
+		if (AllJoints[i]->UseAnimationFrom) {
+			if (AllJoints[i]->UseAnimationFrom->PositionKeys.size() ||
+					AllJoints[i]->UseAnimationFrom->ScaleKeys.size() ||
+					AllJoints[i]->UseAnimationFrom->RotationKeys.size()) {
+				HasAnimation = true;
+			}
+		}
+	}
+
+	// meshes with weights, are still counted as animated for ragdolls, etc
+	if (!HasAnimation) {
+		for (i = 0; i < AllJoints.size(); ++i) {
+			if (AllJoints[i]->Weights.size())
+				HasAnimation = true;
+		}
+	}
+
+	if (HasAnimation) {
+		//--- Find the length of the animation ---
+		EndFrame = 0;
+		for (i = 0; i < AllJoints.size(); ++i) {
+			if (AllJoints[i]->UseAnimationFrom) {
+				if (AllJoints[i]->UseAnimationFrom->PositionKeys.size())
+					if (AllJoints[i]->UseAnimationFrom->PositionKeys.getLast().frame > EndFrame)
+						EndFrame = AllJoints[i]->UseAnimationFrom->PositionKeys.getLast().frame;
+
+				if (AllJoints[i]->UseAnimationFrom->ScaleKeys.size())
+					if (AllJoints[i]->UseAnimationFrom->ScaleKeys.getLast().frame > EndFrame)
+						EndFrame = AllJoints[i]->UseAnimationFrom->ScaleKeys.getLast().frame;
+
+				if (AllJoints[i]->UseAnimationFrom->RotationKeys.size())
+					if (AllJoints[i]->UseAnimationFrom->RotationKeys.getLast().frame > EndFrame)
+						EndFrame = AllJoints[i]->UseAnimationFrom->RotationKeys.getLast().frame;
+			}
+		}
+	}
+
+	if (HasAnimation && !PreparedForSkinning) {
+		PreparedForSkinning = true;
+
+		// check for bugs:
+		for (i = 0; i < AllJoints.size(); ++i) {
+			SJoint *joint = AllJoints[i];
+			for (j = 0; j < joint->Weights.size(); ++j) {
+				const u16 buffer_id = joint->Weights[j].buffer_id;
+				const u32 vertex_id = joint->Weights[j].vertex_id;
+
+				// check for invalid ids
+				if (buffer_id >= LocalBuffers.size()) {
+					os::Printer::log("Skinned Mesh: Weight buffer id too large", ELL_WARNING);
+					joint->Weights[j].buffer_id = joint->Weights[j].vertex_id = 0;
+				} else if (vertex_id >= LocalBuffers[buffer_id]->getVertexCount()) {
+					os::Printer::log("Skinned Mesh: Weight vertex id too large", ELL_WARNING);
+					joint->Weights[j].buffer_id = joint->Weights[j].vertex_id = 0;
+				}
+			}
+		}
+
+		// An array used in skinning
+
+		for (i = 0; i < Vertices_Moved.size(); ++i)
+			for (j = 0; j < Vertices_Moved[i].size(); ++j)
+				Vertices_Moved[i][j] = false;
+
+		// For skinning: cache weight values for speed
+
+		for (i = 0; i < AllJoints.size(); ++i) {
+			SJoint *joint = AllJoints[i];
+			for (j = 0; j < joint->Weights.size(); ++j) {
+				const u16 buffer_id = joint->Weights[j].buffer_id;
+				const u32 vertex_id = joint->Weights[j].vertex_id;
+
+				joint->Weights[j].Moved = &Vertices_Moved[buffer_id][vertex_id];
+				joint->Weights[j].StaticPos = LocalBuffers[buffer_id]->getVertex(vertex_id)->Pos;
+				joint->Weights[j].StaticNormal = LocalBuffers[buffer_id]->getVertex(vertex_id)->Normal;
+
+				// joint->Weights[j]._Pos=&Buffers[buffer_id]->getVertex(vertex_id)->Pos;
+			}
+		}
+
+		// normalize weights
+		normalizeWeights();
+	}
+	SkinnedLastFrame = false;
+}
+
+//! called by loader after populating with mesh and bone data
+void CSkinnedMesh::finalize()
+{
+	os::Printer::log("Skinned Mesh - finalize", ELL_DEBUG);
+	u32 i;
+
+	// Make sure we recalc the next frame
+	LastAnimatedFrame = -1;
+	SkinnedLastFrame = false;
+
+	// calculate bounding box
+	for (i = 0; i < LocalBuffers.size(); ++i) {
+		LocalBuffers[i]->recalculateBoundingBox();
+	}
+
+	if (AllJoints.size() || RootJoints.size()) {
+		// populate AllJoints or RootJoints, depending on which is empty
+		if (!RootJoints.size()) {
+
+			for (u32 CheckingIdx = 0; CheckingIdx < AllJoints.size(); ++CheckingIdx) {
+
+				bool foundParent = false;
+				for (i = 0; i < AllJoints.size(); ++i) {
+					for (u32 n = 0; n < AllJoints[i]->Children.size(); ++n) {
+						if (AllJoints[i]->Children[n] == AllJoints[CheckingIdx])
+							foundParent = true;
+					}
+				}
+
+				if (!foundParent)
+					RootJoints.push_back(AllJoints[CheckingIdx]);
+			}
+		} else {
+			AllJoints = RootJoints;
+		}
+	}
+
+	for (i = 0; i < AllJoints.size(); ++i) {
+		AllJoints[i]->UseAnimationFrom = AllJoints[i];
+	}
+
+	// Set array sizes...
+
+	for (i = 0; i < LocalBuffers.size(); ++i) {
+		Vertices_Moved.push_back(core::array<char>());
+		Vertices_Moved[i].set_used(LocalBuffers[i]->getVertexCount());
+	}
+
+	checkForAnimation();
+
+	if (HasAnimation) {
+		irr::u32 redundantPosKeys = 0;
+		irr::u32 unorderedPosKeys = 0;
+		irr::u32 redundantScaleKeys = 0;
+		irr::u32 unorderedScaleKeys = 0;
+		irr::u32 redundantRotationKeys = 0;
+		irr::u32 unorderedRotationKeys = 0;
+
+		//--- optimize and check keyframes ---
+		for (i = 0; i < AllJoints.size(); ++i) {
+			core::array<SPositionKey> &PositionKeys = AllJoints[i]->PositionKeys;
+			core::array<SScaleKey> &ScaleKeys = AllJoints[i]->ScaleKeys;
+			core::array<SRotationKey> &RotationKeys = AllJoints[i]->RotationKeys;
+
+			// redundant = identical middle keys - we only need the first and last frame
+			// unordered = frames which are out of order - we can't handle those
+			redundantPosKeys += dropMiddleKeys<SPositionKey>(PositionKeys, identicalPos);
+			unorderedPosKeys += dropBadKeys<SPositionKey>(PositionKeys);
+			redundantScaleKeys += dropMiddleKeys<SScaleKey>(ScaleKeys, identicalScale);
+			unorderedScaleKeys += dropBadKeys<SScaleKey>(ScaleKeys);
+			redundantRotationKeys += dropMiddleKeys<SRotationKey>(RotationKeys, identicalRotation);
+			unorderedRotationKeys += dropBadKeys<SRotationKey>(RotationKeys);
+
+			// Fill empty keyframe areas
+			if (PositionKeys.size()) {
+				SPositionKey *Key;
+				Key = &PositionKeys[0]; // getFirst
+				if (Key->frame != 0) {
+					PositionKeys.push_front(*Key);
+					Key = &PositionKeys[0]; // getFirst
+					Key->frame = 0;
+				}
+
+				Key = &PositionKeys.getLast();
+				if (Key->frame != EndFrame) {
+					PositionKeys.push_back(*Key);
+					Key = &PositionKeys.getLast();
+					Key->frame = EndFrame;
+				}
+			}
+
+			if (ScaleKeys.size()) {
+				SScaleKey *Key;
+				Key = &ScaleKeys[0]; // getFirst
+				if (Key->frame != 0) {
+					ScaleKeys.push_front(*Key);
+					Key = &ScaleKeys[0]; // getFirst
+					Key->frame = 0;
+				}
+
+				Key = &ScaleKeys.getLast();
+				if (Key->frame != EndFrame) {
+					ScaleKeys.push_back(*Key);
+					Key = &ScaleKeys.getLast();
+					Key->frame = EndFrame;
+				}
+			}
+
+			if (RotationKeys.size()) {
+				SRotationKey *Key;
+				Key = &RotationKeys[0]; // getFirst
+				if (Key->frame != 0) {
+					RotationKeys.push_front(*Key);
+					Key = &RotationKeys[0]; // getFirst
+					Key->frame = 0;
+				}
+
+				Key = &RotationKeys.getLast();
+				if (Key->frame != EndFrame) {
+					RotationKeys.push_back(*Key);
+					Key = &RotationKeys.getLast();
+					Key->frame = EndFrame;
+				}
+			}
+		}
+
+		if (redundantPosKeys > 0) {
+			os::Printer::log("Skinned Mesh - redundant position frames kicked", core::stringc(redundantPosKeys).c_str(), ELL_DEBUG);
+		}
+		if (unorderedPosKeys > 0) {
+			irr::os::Printer::log("Skinned Mesh - unsorted position frames kicked", irr::core::stringc(unorderedPosKeys).c_str(), irr::ELL_DEBUG);
+		}
+		if (redundantScaleKeys > 0) {
+			os::Printer::log("Skinned Mesh - redundant scale frames kicked", core::stringc(redundantScaleKeys).c_str(), ELL_DEBUG);
+		}
+		if (unorderedScaleKeys > 0) {
+			irr::os::Printer::log("Skinned Mesh - unsorted scale frames kicked", irr::core::stringc(unorderedScaleKeys).c_str(), irr::ELL_DEBUG);
+		}
+		if (redundantRotationKeys > 0) {
+			os::Printer::log("Skinned Mesh - redundant rotation frames kicked", core::stringc(redundantRotationKeys).c_str(), ELL_DEBUG);
+		}
+		if (unorderedRotationKeys > 0) {
+			irr::os::Printer::log("Skinned Mesh - unsorted rotation frames kicked", irr::core::stringc(unorderedRotationKeys).c_str(), irr::ELL_DEBUG);
+		}
+	}
+
+	// Needed for animation and skinning...
+
+	calculateGlobalMatrices(0, 0);
+
+	// animateMesh(0, 1);
+	// buildAllLocalAnimatedMatrices();
+	// buildAllGlobalAnimatedMatrices();
+
+	// rigid animation for non animated meshes
+	for (i = 0; i < AllJoints.size(); ++i) {
+		for (u32 j = 0; j < AllJoints[i]->AttachedMeshes.size(); ++j) {
+			SSkinMeshBuffer *Buffer = (*SkinningBuffers)[AllJoints[i]->AttachedMeshes[j]];
+			Buffer->Transformation = AllJoints[i]->GlobalAnimatedMatrix;
+		}
+	}
+
+	// calculate bounding box
+	if (LocalBuffers.empty())
+		BoundingBox.reset(0, 0, 0);
+	else {
+		irr::core::aabbox3df bb(LocalBuffers[0]->BoundingBox);
+		LocalBuffers[0]->Transformation.transformBoxEx(bb);
+		BoundingBox.reset(bb);
+
+		for (u32 j = 1; j < LocalBuffers.size(); ++j) {
+			bb = LocalBuffers[j]->BoundingBox;
+			LocalBuffers[j]->Transformation.transformBoxEx(bb);
+
+			BoundingBox.addInternalBox(bb);
+		}
+	}
+}
+
+void CSkinnedMesh::updateBoundingBox(void)
+{
+	if (!SkinningBuffers)
+		return;
+
+	core::array<SSkinMeshBuffer *> &buffer = *SkinningBuffers;
+	BoundingBox.reset(0, 0, 0);
+
+	if (!buffer.empty()) {
+		for (u32 j = 0; j < buffer.size(); ++j) {
+			buffer[j]->recalculateBoundingBox();
+			core::aabbox3df bb = buffer[j]->BoundingBox;
+			buffer[j]->Transformation.transformBoxEx(bb);
+
+			BoundingBox.addInternalBox(bb);
+		}
+	}
+}
+
+scene::SSkinMeshBuffer *CSkinnedMesh::addMeshBuffer()
+{
+	scene::SSkinMeshBuffer *buffer = new scene::SSkinMeshBuffer();
+	LocalBuffers.push_back(buffer);
+	return buffer;
+}
+
+CSkinnedMesh::SJoint *CSkinnedMesh::addJoint(SJoint *parent)
+{
+	SJoint *joint = new SJoint;
+
+	AllJoints.push_back(joint);
+	if (!parent) {
+		// Add root joints to array in finalize()
+	} else {
+		// Set parent (Be careful of the mesh loader also setting the parent)
+		parent->Children.push_back(joint);
+	}
+
+	return joint;
+}
+
+CSkinnedMesh::SPositionKey *CSkinnedMesh::addPositionKey(SJoint *joint)
+{
+	if (!joint)
+		return 0;
+
+	joint->PositionKeys.push_back(SPositionKey());
+	return &joint->PositionKeys.getLast();
+}
+
+CSkinnedMesh::SScaleKey *CSkinnedMesh::addScaleKey(SJoint *joint)
+{
+	if (!joint)
+		return 0;
+
+	joint->ScaleKeys.push_back(SScaleKey());
+	return &joint->ScaleKeys.getLast();
+}
+
+CSkinnedMesh::SRotationKey *CSkinnedMesh::addRotationKey(SJoint *joint)
+{
+	if (!joint)
+		return 0;
+
+	joint->RotationKeys.push_back(SRotationKey());
+	return &joint->RotationKeys.getLast();
+}
+
+CSkinnedMesh::SWeight *CSkinnedMesh::addWeight(SJoint *joint)
+{
+	if (!joint)
+		return 0;
+
+	joint->Weights.push_back(SWeight());
+	return &joint->Weights.getLast();
+}
+
+bool CSkinnedMesh::isStatic()
+{
+	return !HasAnimation;
+}
+
+void CSkinnedMesh::normalizeWeights()
+{
+	// note: unsure if weights ids are going to be used.
+
+	// Normalise the weights on bones....
+
+	u32 i, j;
+	core::array<core::array<f32>> verticesTotalWeight;
+
+	verticesTotalWeight.reallocate(LocalBuffers.size());
+	for (i = 0; i < LocalBuffers.size(); ++i) {
+		verticesTotalWeight.push_back(core::array<f32>());
+		verticesTotalWeight[i].set_used(LocalBuffers[i]->getVertexCount());
+	}
+
+	for (i = 0; i < verticesTotalWeight.size(); ++i)
+		for (j = 0; j < verticesTotalWeight[i].size(); ++j)
+			verticesTotalWeight[i][j] = 0;
+
+	for (i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+		for (j = 0; j < joint->Weights.size(); ++j) {
+			if (joint->Weights[j].strength <= 0) { // Check for invalid weights
+				joint->Weights.erase(j);
+				--j;
+			} else {
+				verticesTotalWeight[joint->Weights[j].buffer_id][joint->Weights[j].vertex_id] += joint->Weights[j].strength;
+			}
+		}
+	}
+
+	for (i = 0; i < AllJoints.size(); ++i) {
+		SJoint *joint = AllJoints[i];
+		for (j = 0; j < joint->Weights.size(); ++j) {
+			const f32 total = verticesTotalWeight[joint->Weights[j].buffer_id][joint->Weights[j].vertex_id];
+			if (total != 0 && total != 1)
+				joint->Weights[j].strength /= total;
+		}
+	}
+}
+
+void CSkinnedMesh::recoverJointsFromMesh(core::array<IBoneSceneNode *> &jointChildSceneNodes)
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		IBoneSceneNode *node = jointChildSceneNodes[i];
+		SJoint *joint = AllJoints[i];
+		node->setPosition(joint->LocalAnimatedMatrix.getTranslation());
+		node->setRotation(joint->LocalAnimatedMatrix.getRotationDegrees());
+		node->setScale(joint->LocalAnimatedMatrix.getScale());
+
+		node->positionHint = joint->positionHint;
+		node->scaleHint = joint->scaleHint;
+		node->rotationHint = joint->rotationHint;
+
+		node->updateAbsolutePosition();
+	}
+}
+
+void CSkinnedMesh::transferJointsToMesh(const core::array<IBoneSceneNode *> &jointChildSceneNodes)
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		const IBoneSceneNode *const node = jointChildSceneNodes[i];
+		SJoint *joint = AllJoints[i];
+
+		joint->LocalAnimatedMatrix.setRotationDegrees(node->getRotation());
+		joint->LocalAnimatedMatrix.setTranslation(node->getPosition());
+		joint->LocalAnimatedMatrix *= core::matrix4().setScale(node->getScale());
+
+		joint->positionHint = node->positionHint;
+		joint->scaleHint = node->scaleHint;
+		joint->rotationHint = node->rotationHint;
+
+		joint->GlobalSkinningSpace = (node->getSkinningSpace() == EBSS_GLOBAL);
+	}
+	// Make sure we recalc the next frame
+	LastAnimatedFrame = -1;
+	SkinnedLastFrame = false;
+}
+
+void CSkinnedMesh::transferOnlyJointsHintsToMesh(const core::array<IBoneSceneNode *> &jointChildSceneNodes)
+{
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		const IBoneSceneNode *const node = jointChildSceneNodes[i];
+		SJoint *joint = AllJoints[i];
+
+		joint->positionHint = node->positionHint;
+		joint->scaleHint = node->scaleHint;
+		joint->rotationHint = node->rotationHint;
+	}
+	SkinnedLastFrame = false;
+}
+
+void CSkinnedMesh::addJoints(core::array<IBoneSceneNode *> &jointChildSceneNodes,
+		IAnimatedMeshSceneNode *node, ISceneManager *smgr)
+{
+	// Create new joints
+	for (u32 i = 0; i < AllJoints.size(); ++i) {
+		jointChildSceneNodes.push_back(new CBoneSceneNode(0, smgr, 0, i, AllJoints[i]->Name));
+	}
+
+	// Match up parents
+	for (u32 i = 0; i < jointChildSceneNodes.size(); ++i) {
+		const SJoint *const joint = AllJoints[i]; // should be fine
+
+		s32 parentID = -1;
+
+		for (u32 j = 0; (parentID == -1) && (j < AllJoints.size()); ++j) {
+			if (i != j) {
+				const SJoint *const parentTest = AllJoints[j];
+				for (u32 n = 0; n < parentTest->Children.size(); ++n) {
+					if (parentTest->Children[n] == joint) {
+						parentID = j;
+						break;
+					}
+				}
+			}
+		}
+
+		IBoneSceneNode *bone = jointChildSceneNodes[i];
+		if (parentID != -1)
+			bone->setParent(jointChildSceneNodes[parentID]);
+		else
+			bone->setParent(node);
+
+		bone->drop();
+	}
+	SkinnedLastFrame = false;
+}
+
+void CSkinnedMesh::convertMeshToTangents()
+{
+	// now calculate tangents
+	for (u32 b = 0; b < LocalBuffers.size(); ++b) {
+		if (LocalBuffers[b]) {
+			LocalBuffers[b]->convertToTangents();
+
+			const s32 idxCnt = LocalBuffers[b]->getIndexCount();
+
+			u16 *idx = LocalBuffers[b]->getIndices();
+			video::S3DVertexTangents *v =
+					(video::S3DVertexTangents *)LocalBuffers[b]->getVertices();
+
+			for (s32 i = 0; i < idxCnt; i += 3) {
+				calculateTangents(
+						v[idx[i + 0]].Normal,
+						v[idx[i + 0]].Tangent,
+						v[idx[i + 0]].Binormal,
+						v[idx[i + 0]].Pos,
+						v[idx[i + 1]].Pos,
+						v[idx[i + 2]].Pos,
+						v[idx[i + 0]].TCoords,
+						v[idx[i + 1]].TCoords,
+						v[idx[i + 2]].TCoords);
+
+				calculateTangents(
+						v[idx[i + 1]].Normal,
+						v[idx[i + 1]].Tangent,
+						v[idx[i + 1]].Binormal,
+						v[idx[i + 1]].Pos,
+						v[idx[i + 2]].Pos,
+						v[idx[i + 0]].Pos,
+						v[idx[i + 1]].TCoords,
+						v[idx[i + 2]].TCoords,
+						v[idx[i + 0]].TCoords);
+
+				calculateTangents(
+						v[idx[i + 2]].Normal,
+						v[idx[i + 2]].Tangent,
+						v[idx[i + 2]].Binormal,
+						v[idx[i + 2]].Pos,
+						v[idx[i + 0]].Pos,
+						v[idx[i + 1]].Pos,
+						v[idx[i + 2]].TCoords,
+						v[idx[i + 0]].TCoords,
+						v[idx[i + 1]].TCoords);
+			}
+		}
+	}
+}
+
+void CSkinnedMesh::calculateTangents(
+		core::vector3df &normal,
+		core::vector3df &tangent,
+		core::vector3df &binormal,
+		const core::vector3df &vt1, const core::vector3df &vt2, const core::vector3df &vt3, // vertices
+		const core::vector2df &tc1, const core::vector2df &tc2, const core::vector2df &tc3) // texture coords
+{
+	core::vector3df v1 = vt1 - vt2;
+	core::vector3df v2 = vt3 - vt1;
+	normal = v2.crossProduct(v1);
+	normal.normalize();
+
+	// binormal
+
+	f32 deltaX1 = tc1.X - tc2.X;
+	f32 deltaX2 = tc3.X - tc1.X;
+	binormal = (v1 * deltaX2) - (v2 * deltaX1);
+	binormal.normalize();
+
+	// tangent
+
+	f32 deltaY1 = tc1.Y - tc2.Y;
+	f32 deltaY2 = tc3.Y - tc1.Y;
+	tangent = (v1 * deltaY2) - (v2 * deltaY1);
+	tangent.normalize();
+
+	// adjust
+
+	core::vector3df txb = tangent.crossProduct(binormal);
+	if (txb.dotProduct(normal) < 0.0f) {
+		tangent *= -1.0f;
+		binormal *= -1.0f;
+	}
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CSkinnedMesh.h b/irr/src/CSkinnedMesh.h
new file mode 100644
index 000000000..b0228c93b
--- /dev/null
+++ b/irr/src/CSkinnedMesh.h
@@ -0,0 +1,212 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// New skinned mesh
+
+#pragma once
+
+#include "ISkinnedMesh.h"
+#include "SMeshBuffer.h"
+#include "quaternion.h"
+
+namespace irr
+{
+namespace scene
+{
+
+class IAnimatedMeshSceneNode;
+class IBoneSceneNode;
+
+class CSkinnedMesh : public ISkinnedMesh
+{
+public:
+	//! constructor
+	CSkinnedMesh();
+
+	//! destructor
+	virtual ~CSkinnedMesh();
+
+	//! returns the amount of frames. If the amount is 1, it is a static (=non animated) mesh.
+	u32 getFrameCount() const override;
+
+	//! Gets the default animation speed of the animated mesh.
+	/** \return Amount of frames per second. If the amount is 0, it is a static, non animated mesh. */
+	f32 getAnimationSpeed() const override;
+
+	//! Gets the frame count of the animated mesh.
+	/** \param fps Frames per second to play the animation with. If the amount is 0, it is not animated.
+	The actual speed is set in the scene node the mesh is instantiated in.*/
+	void setAnimationSpeed(f32 fps) override;
+
+	//! returns the animated mesh based on a detail level (which is ignored)
+	IMesh *getMesh(s32 frame, s32 detailLevel = 255, s32 startFrameLoop = -1, s32 endFrameLoop = -1) override;
+
+	//! Animates this mesh's joints based on frame input
+	//! blend: {0-old position, 1-New position}
+	void animateMesh(f32 frame, f32 blend) override;
+
+	//! Preforms a software skin on this mesh based of joint positions
+	void skinMesh() override;
+
+	//! returns amount of mesh buffers.
+	u32 getMeshBufferCount() const override;
+
+	//! returns pointer to a mesh buffer
+	IMeshBuffer *getMeshBuffer(u32 nr) const override;
+
+	//! Returns pointer to a mesh buffer which fits a material
+	/** \param material: material to search for
+	\return Returns the pointer to the mesh buffer or
+	NULL if there is no such mesh buffer. */
+	IMeshBuffer *getMeshBuffer(const video::SMaterial &material) const override;
+
+	//! returns an axis aligned bounding box
+	const core::aabbox3d<f32> &getBoundingBox() const override;
+
+	//! set user axis aligned bounding box
+	void setBoundingBox(const core::aabbox3df &box) override;
+
+	//! set the hardware mapping hint, for driver
+	void setHardwareMappingHint(E_HARDWARE_MAPPING newMappingHint, E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override;
+
+	//! flags the meshbuffer as changed, reloads hardware buffers
+	void setDirty(E_BUFFER_TYPE buffer = EBT_VERTEX_AND_INDEX) override;
+
+	//! Returns the type of the animated mesh.
+	E_ANIMATED_MESH_TYPE getMeshType() const override;
+
+	//! Gets joint count.
+	u32 getJointCount() const override;
+
+	//! Gets the name of a joint.
+	const std::optional<std::string> &getJointName(u32 number) const override;
+
+	//! Gets a joint number from its name
+	std::optional<u32> getJointNumber(const std::string &name) const override;
+
+	//! uses animation from another mesh
+	bool useAnimationFrom(const ISkinnedMesh *mesh) override;
+
+	//! Update Normals when Animating
+	//! False= Don't (default)
+	//! True = Update normals, slower
+	void updateNormalsWhenAnimating(bool on) override;
+
+	//! Sets Interpolation Mode
+	void setInterpolationMode(E_INTERPOLATION_MODE mode) override;
+
+	//! Convertes the mesh to contain tangent information
+	void convertMeshToTangents() override;
+
+	//! Does the mesh have no animation
+	bool isStatic() override;
+
+	//! (This feature is not implemented in irrlicht yet)
+	bool setHardwareSkinning(bool on) override;
+
+	//! Refreshes vertex data cached in joints such as positions and normals
+	void refreshJointCache() override;
+
+	//! Moves the mesh into static position.
+	void resetAnimation() override;
+
+	// Interface for the mesh loaders (finalize should lock these functions, and they should have some prefix like loader_
+	// these functions will use the needed arrays, set values, etc to help the loaders
+
+	//! exposed for loaders to add mesh buffers
+	core::array<SSkinMeshBuffer *> &getMeshBuffers() override;
+
+	//! alternative method for adding joints
+	core::array<SJoint *> &getAllJoints() override;
+
+	//! alternative method for adding joints
+	const core::array<SJoint *> &getAllJoints() const override;
+
+	//! loaders should call this after populating the mesh
+	void finalize() override;
+
+	//! Adds a new meshbuffer to the mesh, access it as last one
+	SSkinMeshBuffer *addMeshBuffer() override;
+
+	//! Adds a new joint to the mesh, access it as last one
+	SJoint *addJoint(SJoint *parent = 0) override;
+
+	//! Adds a new position key to the mesh, access it as last one
+	SPositionKey *addPositionKey(SJoint *joint) override;
+	//! Adds a new rotation key to the mesh, access it as last one
+	SRotationKey *addRotationKey(SJoint *joint) override;
+	//! Adds a new scale key to the mesh, access it as last one
+	SScaleKey *addScaleKey(SJoint *joint) override;
+
+	//! Adds a new weight to the mesh, access it as last one
+	SWeight *addWeight(SJoint *joint) override;
+
+	virtual void updateBoundingBox(void);
+
+	//! Recovers the joints from the mesh
+	void recoverJointsFromMesh(core::array<IBoneSceneNode *> &jointChildSceneNodes);
+
+	//! Tranfers the joint data to the mesh
+	void transferJointsToMesh(const core::array<IBoneSceneNode *> &jointChildSceneNodes);
+
+	//! Tranfers the joint hints to the mesh
+	void transferOnlyJointsHintsToMesh(const core::array<IBoneSceneNode *> &jointChildSceneNodes);
+
+	//! Creates an array of joints from this mesh as children of node
+	void addJoints(core::array<IBoneSceneNode *> &jointChildSceneNodes,
+			IAnimatedMeshSceneNode *node,
+			ISceneManager *smgr);
+
+private:
+	void checkForAnimation();
+
+	void normalizeWeights();
+
+	void buildAllLocalAnimatedMatrices();
+
+	void buildAllGlobalAnimatedMatrices(SJoint *Joint = 0, SJoint *ParentJoint = 0);
+
+	void getFrameData(f32 frame, SJoint *Node,
+			core::vector3df &position, s32 &positionHint,
+			core::vector3df &scale, s32 &scaleHint,
+			core::quaternion &rotation, s32 &rotationHint);
+
+	void calculateGlobalMatrices(SJoint *Joint, SJoint *ParentJoint);
+
+	void skinJoint(SJoint *Joint, SJoint *ParentJoint);
+
+	void calculateTangents(core::vector3df &normal,
+			core::vector3df &tangent, core::vector3df &binormal,
+			const core::vector3df &vt1, const core::vector3df &vt2, const core::vector3df &vt3,
+			const core::vector2df &tc1, const core::vector2df &tc2, const core::vector2df &tc3);
+
+	core::array<SSkinMeshBuffer *> *SkinningBuffers; // Meshbuffer to skin, default is to skin localBuffers
+
+	core::array<SSkinMeshBuffer *> LocalBuffers;
+
+	core::array<SJoint *> AllJoints;
+	core::array<SJoint *> RootJoints;
+
+	// bool can't be used here because std::vector<bool>
+	// doesn't allow taking a reference to individual elements.
+	core::array<core::array<char>> Vertices_Moved;
+
+	core::aabbox3d<f32> BoundingBox;
+
+	f32 EndFrame;
+	f32 FramesPerSecond;
+
+	f32 LastAnimatedFrame;
+	bool SkinnedLastFrame;
+
+	E_INTERPOLATION_MODE InterpolationMode : 8;
+
+	bool HasAnimation;
+	bool PreparedForSkinning;
+	bool AnimateNormals;
+	bool HardwareSkinning;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CTimer.h b/irr/src/CTimer.h
new file mode 100644
index 000000000..950365cd5
--- /dev/null
+++ b/irr/src/CTimer.h
@@ -0,0 +1,96 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "ITimer.h"
+#include "os.h"
+
+namespace irr
+{
+//! Device independent implementation of the timer
+class CTimer : public ITimer
+{
+public:
+	CTimer()
+	{
+		os::Timer::initTimer();
+	}
+
+	//! Returns current real time in milliseconds of the system.
+	/** This value does not start with 0 when the application starts.
+	For example in one implementation the value returned could be the
+	amount of milliseconds which have elapsed since the system was started. */
+	u32 getRealTime() const override
+	{
+		return os::Timer::getRealTime();
+	}
+
+	//! Returns current virtual time in milliseconds.
+	/** This value starts with 0 and can be manipulated using setTime(), stopTimer(),
+	startTimer(), etc. This value depends on the set speed of the timer if the timer
+	is stopped, etc. If you need the system time, use getRealTime() */
+	u32 getTime() const override
+	{
+		return os::Timer::getTime();
+	}
+
+	//! sets current virtual time
+	void setTime(u32 time) override
+	{
+		os::Timer::setTime(time);
+	}
+
+	//! Stops the game timer.
+	/** The timer is reference counted, which means everything which calls
+	stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
+	corretly again. */
+	void stop() override
+	{
+		os::Timer::stopTimer();
+	}
+
+	//! Starts the game timer.
+	/** The timer is reference counted, which means everything which calls
+	stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
+	corretly again. */
+	void start() override
+	{
+		os::Timer::startTimer();
+	}
+
+	//! Sets the speed of the timer
+	/** The speed is the factor with which the time is running faster or slower then the
+	real system time. */
+	void setSpeed(f32 speed = 1.0f) override
+	{
+		os::Timer::setSpeed(speed);
+	}
+
+	//! Returns current speed of the timer
+	/** The speed is the factor with which the time is running faster or slower then the
+	real system time. */
+	f32 getSpeed() const override
+	{
+		return os::Timer::getSpeed();
+	}
+
+	//! Returns if game timer is currently stopped
+	bool isStopped() const override
+	{
+		bool ret = os::Timer::isStopped();
+		return ret;
+	}
+
+	//! Advances the virtual time
+	/** Makes the virtual timer update the time value based on the real time. This is
+	called automatically when calling IrrlichtDevice::run(), but you can call it manually
+	if you don't use this method. */
+	void tick() override
+	{
+		os::Timer::tick();
+	}
+};
+
+} // end namespace
diff --git a/irr/src/CWGLManager.cpp b/irr/src/CWGLManager.cpp
new file mode 100644
index 000000000..785524fbc
--- /dev/null
+++ b/irr/src/CWGLManager.cpp
@@ -0,0 +1,442 @@
+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "CWGLManager.h"
+
+#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
+
+#include "os.h"
+
+#include <GL/gl.h>
+#include <GL/wglext.h>
+
+namespace irr
+{
+namespace video
+{
+
+CWGLManager::CWGLManager() :
+		PrimaryContext(SExposedVideoData(0)), PixelFormat(0), libHandle(NULL)
+{
+#ifdef _DEBUG
+	setDebugName("CWGLManager");
+#endif
+	memset(FunctionPointers, 0, sizeof(FunctionPointers));
+}
+
+CWGLManager::~CWGLManager()
+{
+}
+
+bool CWGLManager::initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &videodata)
+{
+	// store params, videoData is set later as it would be overwritten else
+	Params = params;
+
+	// Create a window to test antialiasing support
+	const fschar_t *ClassName = __TEXT("CWGLManager");
+	HINSTANCE lhInstance = GetModuleHandle(0);
+
+	// Register Class
+	WNDCLASSEX wcex;
+	wcex.cbSize = sizeof(WNDCLASSEX);
+	wcex.style = CS_HREDRAW | CS_VREDRAW;
+	wcex.lpfnWndProc = (WNDPROC)DefWindowProc;
+	wcex.cbClsExtra = 0;
+	wcex.cbWndExtra = 0;
+	wcex.hInstance = lhInstance;
+	wcex.hIcon = 0;
+	wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+	wcex.lpszMenuName = 0;
+	wcex.lpszClassName = ClassName;
+	wcex.hIconSm = 0;
+	RegisterClassEx(&wcex);
+
+	RECT clientSize;
+	clientSize.top = 0;
+	clientSize.left = 0;
+	clientSize.right = Params.WindowSize.Width;
+	clientSize.bottom = Params.WindowSize.Height;
+
+	DWORD style = WS_POPUP;
+	if (!Params.Fullscreen)
+		style = WS_SYSMENU | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+
+	AdjustWindowRect(&clientSize, style, FALSE);
+
+	const s32 realWidth = clientSize.right - clientSize.left;
+	const s32 realHeight = clientSize.bottom - clientSize.top;
+
+	const s32 windowLeft = (GetSystemMetrics(SM_CXSCREEN) - realWidth) / 2;
+	const s32 windowTop = (GetSystemMetrics(SM_CYSCREEN) - realHeight) / 2;
+
+	HWND temporary_wnd = CreateWindow(ClassName, __TEXT(""), style, windowLeft,
+			windowTop, realWidth, realHeight, NULL, NULL, lhInstance, NULL);
+
+	if (!temporary_wnd) {
+		os::Printer::log("Cannot create a temporary window.", ELL_ERROR);
+		UnregisterClass(ClassName, lhInstance);
+		return false;
+	}
+
+	HDC HDc = GetDC(temporary_wnd);
+
+	// Set up pixel format descriptor with desired parameters
+	PIXELFORMATDESCRIPTOR tmp_pfd = {
+			sizeof(PIXELFORMATDESCRIPTOR),                         // Size Of This Pixel Format Descriptor
+			1,                                                     // Version Number
+			(DWORD)(PFD_DRAW_TO_WINDOW |                           // Format Must Support Window
+					PFD_SUPPORT_OPENGL |                           // Format Must Support OpenGL
+					(Params.Doublebuffer ? PFD_DOUBLEBUFFER : 0) | // Must Support Double Buffering
+					(Params.Stereobuffer ? PFD_STEREO : 0)),       // Must Support Stereo Buffer
+			PFD_TYPE_RGBA,                                         // Request An RGBA Format
+			Params.Bits,                                           // Select Our Color Depth
+			0, 0, 0, 0, 0, 0,                                      // Color Bits Ignored
+			0,                                                     // No Alpha Buffer
+			0,                                                     // Shift Bit Ignored
+			0,                                                     // No Accumulation Buffer
+			0, 0, 0, 0,                                            // Accumulation Bits Ignored
+			Params.ZBufferBits,                                    // Z-Buffer (Depth Buffer)
+			BYTE(Params.Stencilbuffer ? 1 : 0),                    // Stencil Buffer Depth
+			0,                                                     // No Auxiliary Buffer
+			PFD_MAIN_PLANE,                                        // Main Drawing Layer
+			0,                                                     // Reserved
+			0, 0, 0                                                // Layer Masks Ignored
+	};
+	pfd = tmp_pfd;
+
+	for (u32 i = 0; i < 6; ++i) {
+		if (i == 1) {
+			if (Params.Stencilbuffer) {
+				os::Printer::log("Cannot create a GL device with stencil buffer, disabling stencil shadows.", ELL_WARNING);
+				Params.Stencilbuffer = false;
+				pfd.cStencilBits = 0;
+			} else
+				continue;
+		} else if (i == 2) {
+			pfd.cDepthBits = 24;
+		} else if (i == 3) {
+			if (Params.Bits != 16)
+				pfd.cDepthBits = 16;
+			else
+				continue;
+		} else if (i == 4) {
+			// try single buffer
+			if (Params.Doublebuffer)
+				pfd.dwFlags &= ~PFD_DOUBLEBUFFER;
+			else
+				continue;
+		} else if (i == 5) {
+			os::Printer::log("Cannot create a GL device context", "No suitable format for temporary window.", ELL_ERROR);
+			ReleaseDC(temporary_wnd, HDc);
+			DestroyWindow(temporary_wnd);
+			UnregisterClass(ClassName, lhInstance);
+			return false;
+		}
+
+		// choose pixelformat
+		PixelFormat = ChoosePixelFormat(HDc, &pfd);
+		if (PixelFormat)
+			break;
+	}
+
+	SetPixelFormat(HDc, PixelFormat, &pfd);
+	os::Printer::log("Create temporary GL rendering context", ELL_DEBUG);
+	HGLRC hrc = wglCreateContext(HDc);
+	if (!hrc) {
+		os::Printer::log("Cannot create a temporary GL rendering context.", ELL_ERROR);
+		ReleaseDC(temporary_wnd, HDc);
+		DestroyWindow(temporary_wnd);
+		UnregisterClass(ClassName, lhInstance);
+		return false;
+	}
+
+	CurrentContext.OpenGLWin32.HDc = HDc;
+	CurrentContext.OpenGLWin32.HRc = hrc;
+	CurrentContext.OpenGLWin32.HWnd = temporary_wnd;
+
+	if (!activateContext(CurrentContext, false)) {
+		os::Printer::log("Cannot activate a temporary GL rendering context.", ELL_ERROR);
+		wglDeleteContext(hrc);
+		ReleaseDC(temporary_wnd, HDc);
+		DestroyWindow(temporary_wnd);
+		UnregisterClass(ClassName, lhInstance);
+		return false;
+	}
+
+	core::stringc wglExtensions;
+#ifdef WGL_ARB_extensions_string
+	PFNWGLGETEXTENSIONSSTRINGARBPROC irrGetExtensionsString = (PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+	if (irrGetExtensionsString)
+		wglExtensions = irrGetExtensionsString(HDc);
+#elif defined(WGL_EXT_extensions_string)
+	PFNWGLGETEXTENSIONSSTRINGEXTPROC irrGetExtensionsString = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)wglGetProcAddress("wglGetExtensionsStringEXT");
+	if (irrGetExtensionsString)
+		wglExtensions = irrGetExtensionsString(HDc);
+#endif
+	const bool pixel_format_supported = (wglExtensions.find("WGL_ARB_pixel_format") != -1);
+	const bool multi_sample_supported = ((wglExtensions.find("WGL_ARB_multisample") != -1) ||
+										 (wglExtensions.find("WGL_EXT_multisample") != -1) || (wglExtensions.find("WGL_3DFX_multisample") != -1));
+	if (params.DriverDebug)
+		os::Printer::log("WGL_extensions", wglExtensions);
+
+	// Without a GL context we can't call wglGetProcAddress so store this for later
+	FunctionPointers[0] = (void *)wglGetProcAddress("wglCreateContextAttribsARB");
+
+#ifdef WGL_ARB_pixel_format
+	PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat_ARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
+	if (pixel_format_supported && wglChoosePixelFormat_ARB) {
+		// This value determines the number of samples used for antialiasing
+		// My experience is that 8 does not show a big
+		// improvement over 4, but 4 shows a big improvement
+		// over 2.
+
+		if (Params.AntiAlias > 32)
+			Params.AntiAlias = 32;
+
+		f32 fAttributes[] = {0.0, 0.0};
+		s32 iAttributes[] = {
+				WGL_DRAW_TO_WINDOW_ARB, 1,
+				WGL_SUPPORT_OPENGL_ARB, 1,
+				WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
+				WGL_COLOR_BITS_ARB, (Params.Bits == 32) ? 24 : 15,
+				WGL_ALPHA_BITS_ARB, (Params.Bits == 32) ? 8 : 1,
+				WGL_DEPTH_BITS_ARB, Params.ZBufferBits, // 10,11
+				WGL_STENCIL_BITS_ARB, Params.Stencilbuffer ? 1 : 0,
+				WGL_DOUBLE_BUFFER_ARB, Params.Doublebuffer ? 1 : 0,
+				WGL_STEREO_ARB, Params.Stereobuffer ? 1 : 0,
+				WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
+#ifdef WGL_ARB_multisample
+				WGL_SAMPLES_ARB, Params.AntiAlias, // 20,21
+				WGL_SAMPLE_BUFFERS_ARB, (Params.AntiAlias > 0) ? 1 : 0,
+#elif defined(WGL_EXT_multisample)
+				WGL_SAMPLES_EXT, AntiAlias, // 20,21
+				WGL_SAMPLE_BUFFERS_EXT, (Params.AntiAlias > 0) ? 1 : 0,
+#elif defined(WGL_3DFX_multisample)
+				WGL_SAMPLES_3DFX, AntiAlias, // 20,21
+				WGL_SAMPLE_BUFFERS_3DFX, (Params.AntiAlias > 0) ? 1 : 0,
+#endif
+				//			WGL_DEPTH_FLOAT_EXT, 1,
+				0, 0, 0, 0,
+			};
+		int iAttrSize = sizeof(iAttributes) / sizeof(int);
+		if (!multi_sample_supported) {
+			memmove(&iAttributes[20], &iAttributes[24], sizeof(int) * (iAttrSize - 24));
+			iAttrSize -= 4;
+		}
+
+		s32 rv = 0;
+		// Try to get an acceptable pixel format
+		do {
+			int pixelFormat = 0;
+			UINT numFormats = 0;
+			const BOOL valid = wglChoosePixelFormat_ARB(HDc, iAttributes, fAttributes, 1, &pixelFormat, &numFormats);
+
+			if (valid && numFormats)
+				rv = pixelFormat;
+			else
+				iAttributes[21] -= 1;
+		} while (rv == 0 && iAttributes[21] > 1);
+		if (rv) {
+			PixelFormat = rv;
+			Params.AntiAlias = iAttributes[21];
+		}
+	} else
+#endif
+		Params.AntiAlias = 0;
+
+	// this only terminates the temporary HRc
+	destroyContext();
+	destroySurface();
+	terminate();
+	DestroyWindow(temporary_wnd);
+	UnregisterClass(ClassName, lhInstance);
+
+	// now get new window
+	CurrentContext.OpenGLWin32.HWnd = videodata.OpenGLWin32.HWnd;
+	// get hdc
+	if (!(CurrentContext.OpenGLWin32.HDc = GetDC((HWND)videodata.OpenGLWin32.HWnd))) {
+		os::Printer::log("Cannot create a GL device context.", ELL_ERROR);
+		return false;
+	}
+	if (!PrimaryContext.OpenGLWin32.HWnd) {
+		PrimaryContext.OpenGLWin32.HWnd = CurrentContext.OpenGLWin32.HWnd;
+		PrimaryContext.OpenGLWin32.HDc = CurrentContext.OpenGLWin32.HDc;
+	}
+
+	return true;
+}
+
+void CWGLManager::terminate()
+{
+	if (CurrentContext.OpenGLWin32.HDc)
+		ReleaseDC((HWND)CurrentContext.OpenGLWin32.HWnd, (HDC)CurrentContext.OpenGLWin32.HDc);
+	if (PrimaryContext.OpenGLWin32.HDc && PrimaryContext.OpenGLWin32.HDc == CurrentContext.OpenGLWin32.HDc)
+		memset(&PrimaryContext, 0, sizeof(PrimaryContext));
+	memset(&CurrentContext, 0, sizeof(CurrentContext));
+	if (libHandle)
+		FreeLibrary(libHandle);
+}
+
+bool CWGLManager::generateSurface()
+{
+	HDC HDc = (HDC)CurrentContext.OpenGLWin32.HDc;
+	// search for pixel format the simple way
+	if (PixelFormat == 0 || (!SetPixelFormat(HDc, PixelFormat, &pfd))) {
+		for (u32 i = 0; i < 5; ++i) {
+			if (i == 1) {
+				if (Params.Stencilbuffer) {
+					os::Printer::log("Cannot create a GL device with stencil buffer, disabling stencil shadows.", ELL_WARNING);
+					Params.Stencilbuffer = false;
+					pfd.cStencilBits = 0;
+				} else
+					continue;
+			} else if (i == 2) {
+				pfd.cDepthBits = 24;
+			}
+			if (i == 3) {
+				if (Params.Bits != 16)
+					pfd.cDepthBits = 16;
+				else
+					continue;
+			} else if (i == 4) {
+				os::Printer::log("Cannot create a GL device context", "No suitable format.", ELL_ERROR);
+				return false;
+			}
+
+			// choose pixelformat
+			PixelFormat = ChoosePixelFormat(HDc, &pfd);
+			if (PixelFormat)
+				break;
+		}
+
+		// set pixel format
+		if (!SetPixelFormat(HDc, PixelFormat, &pfd)) {
+			os::Printer::log("Cannot set the pixel format.", ELL_ERROR);
+			return false;
+		}
+	}
+
+	if (pfd.cAlphaBits != 0) {
+		if (pfd.cRedBits == 8)
+			ColorFormat = ECF_A8R8G8B8;
+		else
+			ColorFormat = ECF_A1R5G5B5;
+	} else {
+		if (pfd.cRedBits == 8)
+			ColorFormat = ECF_R8G8B8;
+		else
+			ColorFormat = ECF_R5G6B5;
+	}
+	os::Printer::log("Pixel Format", core::stringc(PixelFormat).c_str(), ELL_DEBUG);
+	return true;
+}
+
+void CWGLManager::destroySurface()
+{
+}
+
+bool CWGLManager::generateContext()
+{
+	HDC HDc = (HDC)CurrentContext.OpenGLWin32.HDc;
+	HGLRC hrc;
+	// create rendering context
+#ifdef WGL_ARB_create_context
+	PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs_ARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)FunctionPointers[0];
+	if (wglCreateContextAttribs_ARB) {
+		// with 3.0 all available profiles should be usable, higher versions impose restrictions
+		// we need at least 1.1
+		const int iAttribs[] = {
+				WGL_CONTEXT_MAJOR_VERSION_ARB, 1,
+				WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+				//			WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,	// enable to get a debug context (depends on driver if that does anything)
+				0,
+			};
+		hrc = wglCreateContextAttribs_ARB(HDc, 0, iAttribs);
+	} else
+#endif
+		hrc = wglCreateContext(HDc);
+	os::Printer::log("Irrlicht context");
+
+	if (!hrc) {
+		os::Printer::log("Cannot create a GL rendering context.", ELL_ERROR);
+		return false;
+	}
+
+	// set exposed data
+	CurrentContext.OpenGLWin32.HRc = hrc;
+	if (!PrimaryContext.OpenGLWin32.HRc)
+		PrimaryContext.OpenGLWin32.HRc = CurrentContext.OpenGLWin32.HRc;
+
+	return true;
+}
+
+const SExposedVideoData &CWGLManager::getContext() const
+{
+	return CurrentContext;
+}
+
+bool CWGLManager::activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero)
+{
+	if (videoData.OpenGLWin32.HWnd && videoData.OpenGLWin32.HDc && videoData.OpenGLWin32.HRc) {
+		if (!wglMakeCurrent((HDC)videoData.OpenGLWin32.HDc, (HGLRC)videoData.OpenGLWin32.HRc)) {
+			os::Printer::log("Render Context switch failed.");
+			return false;
+		}
+		CurrentContext = videoData;
+	} else if (!restorePrimaryOnZero && !videoData.OpenGLWin32.HDc && !videoData.OpenGLWin32.HRc) {
+		if (!wglMakeCurrent((HDC)0, (HGLRC)0)) {
+			os::Printer::log("Render Context reset failed.");
+			return false;
+		}
+		CurrentContext = videoData;
+	}
+	// set back to main context
+	else if (!videoData.OpenGLWin32.HWnd && CurrentContext.OpenGLWin32.HDc != PrimaryContext.OpenGLWin32.HDc) {
+		if (!wglMakeCurrent((HDC)PrimaryContext.OpenGLWin32.HDc, (HGLRC)PrimaryContext.OpenGLWin32.HRc)) {
+			os::Printer::log("Render Context switch (back to main) failed.");
+			return false;
+		}
+		CurrentContext = PrimaryContext;
+	}
+	return true;
+}
+
+void CWGLManager::destroyContext()
+{
+	if (CurrentContext.OpenGLWin32.HRc) {
+		if (!wglMakeCurrent((HDC)CurrentContext.OpenGLWin32.HDc, 0))
+			os::Printer::log("Release of render context failed.", ELL_WARNING);
+
+		if (!wglDeleteContext((HGLRC)CurrentContext.OpenGLWin32.HRc))
+			os::Printer::log("Deletion of render context failed.", ELL_WARNING);
+		if (PrimaryContext.OpenGLWin32.HRc == CurrentContext.OpenGLWin32.HRc)
+			PrimaryContext.OpenGLWin32.HRc = 0;
+		CurrentContext.OpenGLWin32.HRc = 0;
+	}
+}
+
+void *CWGLManager::getProcAddress(const std::string &procName)
+{
+	void *proc = NULL;
+	proc = (void *)wglGetProcAddress(procName.c_str());
+	if (!proc) { // Fallback
+		if (!libHandle)
+			libHandle = LoadLibraryA("opengl32.dll");
+		if (libHandle)
+			proc = (void *)GetProcAddress(libHandle, procName.c_str());
+	}
+	return proc;
+}
+
+bool CWGLManager::swapBuffers()
+{
+	return SwapBuffers((HDC)CurrentContext.OpenGLWin32.HDc) == TRUE;
+}
+
+}
+}
+
+#endif
diff --git a/irr/src/CWGLManager.h b/irr/src/CWGLManager.h
new file mode 100644
index 000000000..b8276d5f8
--- /dev/null
+++ b/irr/src/CWGLManager.h
@@ -0,0 +1,76 @@
+// Copyright (C) 2013 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
+
+#include "SIrrCreationParameters.h"
+#include "SExposedVideoData.h"
+#include "IContextManager.h"
+#include "SColor.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <libloaderapi.h>
+
+namespace irr
+{
+namespace video
+{
+// WGL manager.
+class CWGLManager : public IContextManager
+{
+public:
+	//! Constructor.
+	CWGLManager();
+
+	//! Destructor
+	~CWGLManager();
+
+	// Initialize
+	bool initialize(const SIrrlichtCreationParameters &params, const SExposedVideoData &data) override;
+
+	// Terminate
+	void terminate() override;
+
+	// Create surface.
+	bool generateSurface() override;
+
+	// Destroy surface.
+	void destroySurface() override;
+
+	// Create context.
+	bool generateContext() override;
+
+	// Destroy EGL context.
+	void destroyContext() override;
+
+	//! Get current context
+	const SExposedVideoData &getContext() const override;
+
+	//! Change render context, disable old and activate new defined by videoData
+	bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero) override;
+
+	// Get procedure address.
+	void *getProcAddress(const std::string &procName) override;
+
+	// Swap buffers.
+	bool swapBuffers() override;
+
+private:
+	SIrrlichtCreationParameters Params;
+	SExposedVideoData PrimaryContext;
+	SExposedVideoData CurrentContext;
+	s32 PixelFormat;
+	PIXELFORMATDESCRIPTOR pfd;
+	ECOLOR_FORMAT ColorFormat;
+	void *FunctionPointers[1];
+
+	HMODULE libHandle;
+};
+}
+}
+
+#endif
diff --git a/irr/src/CWriteFile.cpp b/irr/src/CWriteFile.cpp
new file mode 100644
index 000000000..362b284ee
--- /dev/null
+++ b/irr/src/CWriteFile.cpp
@@ -0,0 +1,106 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CWriteFile.h"
+#include <cstdio>
+
+namespace irr
+{
+namespace io
+{
+
+CWriteFile::CWriteFile(const io::path &fileName, bool append) :
+		Filename(fileName), FileSize(0)
+{
+#ifdef _DEBUG
+	setDebugName("CWriteFile");
+#endif
+
+	openFile(append);
+}
+
+CWriteFile::~CWriteFile()
+{
+	if (File)
+		fclose(File);
+}
+
+//! returns if file is open
+inline bool CWriteFile::isOpen() const
+{
+	return File != 0;
+}
+
+//! returns how much was read
+size_t CWriteFile::write(const void *buffer, size_t sizeToWrite)
+{
+	if (!isOpen())
+		return 0;
+
+	return fwrite(buffer, 1, sizeToWrite, File);
+}
+
+//! changes position in file, returns true if successful
+//! if relativeMovement==true, the pos is changed relative to current pos,
+//! otherwise from begin of file
+bool CWriteFile::seek(long finalPos, bool relativeMovement)
+{
+	if (!isOpen())
+		return false;
+
+	return fseek(File, finalPos, relativeMovement ? SEEK_CUR : SEEK_SET) == 0;
+}
+
+//! returns where in the file we are.
+long CWriteFile::getPos() const
+{
+	return ftell(File);
+}
+
+//! opens the file
+void CWriteFile::openFile(bool append)
+{
+	if (Filename.size() == 0) {
+		File = 0;
+		return;
+	}
+
+	File = fopen(Filename.c_str(), append ? "ab" : "wb");
+
+	if (File) {
+		// get FileSize
+
+		fseek(File, 0, SEEK_END);
+		FileSize = ftell(File);
+		fseek(File, 0, SEEK_SET);
+	}
+}
+
+//! returns name of file
+const io::path &CWriteFile::getFileName() const
+{
+	return Filename;
+}
+
+//! Flush the content of the buffer in the file
+bool CWriteFile::flush()
+{
+	if (!isOpen())
+		return false;
+
+	return fflush(File) == 0; // 0 indicates success, otherwise EOF and errno is set
+}
+
+IWriteFile *CWriteFile::createWriteFile(const io::path &fileName, bool append)
+{
+	CWriteFile *file = new CWriteFile(fileName, append);
+	if (file->isOpen())
+		return file;
+
+	file->drop();
+	return 0;
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CWriteFile.h b/irr/src/CWriteFile.h
new file mode 100644
index 000000000..20bca0894
--- /dev/null
+++ b/irr/src/CWriteFile.h
@@ -0,0 +1,58 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <cstdio>
+#include "IWriteFile.h"
+#include "irrString.h"
+
+namespace irr
+{
+
+namespace io
+{
+
+/*!
+	Class for writing a real file to disk.
+*/
+class CWriteFile : public IWriteFile
+{
+public:
+	CWriteFile(const io::path &fileName, bool append);
+
+	virtual ~CWriteFile();
+
+	//! Reads an amount of bytes from the file.
+	size_t write(const void *buffer, size_t sizeToWrite) override;
+
+	//! Changes position in file, returns true if successful.
+	bool seek(long finalPos, bool relativeMovement = false) override;
+
+	//! Returns the current position in the file.
+	long getPos() const override;
+
+	//! Returns name of file.
+	const io::path &getFileName() const override;
+
+	//! Flush the content of the buffer in the file
+	bool flush() override;
+
+	//! returns if file is open
+	bool isOpen() const;
+
+	//! creator method
+	static IWriteFile *createWriteFile(const io::path &fileName, bool append);
+
+private:
+	//! opens the file
+	void openFile(bool append);
+
+	io::path Filename;
+	FILE *File;
+	long FileSize;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CXMeshFileLoader.cpp b/irr/src/CXMeshFileLoader.cpp
new file mode 100644
index 000000000..5978980f4
--- /dev/null
+++ b/irr/src/CXMeshFileLoader.cpp
@@ -0,0 +1,2042 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CXMeshFileLoader.h"
+#include "os.h"
+
+#include "fast_atof.h"
+#include "coreutil.h"
+#include "ISceneManager.h"
+#include "IVideoDriver.h"
+#include "IReadFile.h"
+
+#ifdef _DEBUG
+#define _XREADER_DEBUG
+#endif
+// #define BETTER_MESHBUFFER_SPLITTING_FOR_X
+
+#define SET_ERR_AND_RETURN() \
+	do {                     \
+		ErrorState = true;   \
+		return false;        \
+	} while (0)
+
+namespace irr
+{
+namespace scene
+{
+
+//! Constructor
+CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager *smgr) :
+		AnimatedMesh(0), Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0), ErrorState(false),
+		CurFrame(0), MajorVersion(0), MinorVersion(0), BinaryFormat(false), FloatSize(0)
+{
+#ifdef _DEBUG
+	setDebugName("CXMeshFileLoader");
+#endif
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+//! based on the file extension (e.g. ".bsp")
+bool CXMeshFileLoader::isALoadableFileExtension(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "x");
+}
+
+//! creates/loads an animated mesh from the file.
+//! \return Pointer to the created mesh. Returns 0 if loading failed.
+//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+//! See IReferenceCounted::drop() for more information.
+IAnimatedMesh *CXMeshFileLoader::createMesh(io::IReadFile *file)
+{
+	if (!file)
+		return 0;
+
+#ifdef _XREADER_DEBUG
+	u32 time = os::Timer::getRealTime();
+#endif
+
+	AnimatedMesh = new CSkinnedMesh();
+
+	if (load(file)) {
+		AnimatedMesh->finalize();
+	} else {
+		AnimatedMesh->drop();
+		AnimatedMesh = 0;
+	}
+#ifdef _XREADER_DEBUG
+	time = os::Timer::getRealTime() - time;
+	core::stringc tmpString = "Time to load ";
+	tmpString += BinaryFormat ? "binary" : "ascii";
+	tmpString += " X file: ";
+	tmpString += time;
+	tmpString += "ms";
+	os::Printer::log(tmpString.c_str());
+#endif
+	// Clear up
+
+	MajorVersion = 0;
+	MinorVersion = 0;
+	BinaryFormat = 0;
+	BinaryNumCount = 0;
+	FloatSize = 0;
+	P = 0;
+	End = 0;
+	CurFrame = 0;
+
+	delete[] Buffer;
+	Buffer = 0;
+
+	for (u32 i = 0; i < Meshes.size(); ++i)
+		delete Meshes[i];
+	Meshes.clear();
+
+	return AnimatedMesh;
+}
+
+bool CXMeshFileLoader::load(io::IReadFile *file)
+{
+	if (!readFileIntoMemory(file))
+		return false;
+
+	if (!parseFile())
+		return false;
+
+	for (u32 n = 0; n < Meshes.size(); ++n) {
+		SXMesh *mesh = Meshes[n];
+
+		// default material if nothing loaded
+		if (!mesh->Materials.size()) {
+			mesh->Materials.push_back(video::SMaterial());
+			mesh->Materials[0].DiffuseColor.set(0xff777777);
+			mesh->Materials[0].Shininess = 0.f;
+			mesh->Materials[0].SpecularColor.set(0xff777777);
+			mesh->Materials[0].EmissiveColor.set(0xff000000);
+		}
+
+		u32 i;
+
+		mesh->Buffers.reallocate(mesh->Materials.size());
+#ifndef BETTER_MESHBUFFER_SPLITTING_FOR_X
+		const u32 bufferOffset = AnimatedMesh->getMeshBufferCount();
+#endif
+		for (i = 0; i < mesh->Materials.size(); ++i) {
+			mesh->Buffers.push_back(AnimatedMesh->addMeshBuffer());
+			mesh->Buffers.getLast()->Material = mesh->Materials[i];
+
+			if (!mesh->HasSkinning) {
+				// Set up rigid animation
+				if (mesh->AttachedJointID != -1) {
+					AnimatedMesh->getAllJoints()[mesh->AttachedJointID]->AttachedMeshes.push_back(AnimatedMesh->getMeshBuffers().size() - 1);
+				}
+			}
+		}
+
+		if (!mesh->FaceMaterialIndices.size()) {
+			mesh->FaceMaterialIndices.set_used(mesh->Indices.size() / 3);
+			for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i)
+				mesh->FaceMaterialIndices[i] = 0;
+		}
+
+		if (!mesh->HasVertexColors) {
+			for (u32 j = 0; j < mesh->FaceMaterialIndices.size(); ++j) {
+				for (u32 id = j * 3 + 0; id <= j * 3 + 2; ++id) {
+					mesh->Vertices[mesh->Indices[id]].Color = mesh->Buffers[mesh->FaceMaterialIndices[j]]->Material.DiffuseColor;
+				}
+			}
+		}
+
+#ifdef BETTER_MESHBUFFER_SPLITTING_FOR_X
+		{
+			// the same vertex can be used in many different meshbuffers, but it's slow to work out
+
+			core::array<core::array<u32>> verticesLinkIndex;
+			verticesLinkIndex.reallocate(mesh->Vertices.size());
+			core::array<core::array<u16>> verticesLinkBuffer;
+			verticesLinkBuffer.reallocate(mesh->Vertices.size());
+
+			for (i = 0; i < mesh->Vertices.size(); ++i) {
+				verticesLinkIndex.push_back(core::array<u32>());
+				verticesLinkBuffer.push_back(core::array<u16>());
+			}
+
+			for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i) {
+				for (u32 id = i * 3 + 0; id <= i * 3 + 2; ++id) {
+					core::array<u16> &Array = verticesLinkBuffer[mesh->Indices[id]];
+					bool found = false;
+
+					for (u32 j = 0; j < Array.size(); ++j) {
+						if (Array[j] == mesh->FaceMaterialIndices[i]) {
+							found = true;
+							break;
+						}
+					}
+
+					if (!found)
+						Array.push_back(mesh->FaceMaterialIndices[i]);
+				}
+			}
+
+			for (i = 0; i < verticesLinkBuffer.size(); ++i) {
+				if (!verticesLinkBuffer[i].size())
+					verticesLinkBuffer[i].push_back(0);
+			}
+
+			for (i = 0; i < mesh->Vertices.size(); ++i) {
+				core::array<u16> &Array = verticesLinkBuffer[i];
+				verticesLinkIndex[i].reallocate(Array.size());
+				for (u32 j = 0; j < Array.size(); ++j) {
+					scene::SSkinMeshBuffer *buffer = mesh->Buffers[Array[j]];
+					verticesLinkIndex[i].push_back(buffer->Vertices_Standard.size());
+					buffer->Vertices_Standard.push_back(mesh->Vertices[i]);
+				}
+			}
+
+			for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i) {
+				scene::SSkinMeshBuffer *buffer = mesh->Buffers[mesh->FaceMaterialIndices[i]];
+
+				for (u32 id = i * 3 + 0; id <= i * 3 + 2; ++id) {
+					core::array<u16> &Array = verticesLinkBuffer[mesh->Indices[id]];
+
+					for (u32 j = 0; j < Array.size(); ++j) {
+						if (Array[j] == mesh->FaceMaterialIndices[i])
+							buffer->Indices.push_back(verticesLinkIndex[mesh->Indices[id]][j]);
+					}
+				}
+			}
+
+			for (u32 j = 0; j < mesh->WeightJoint.size(); ++j) {
+				ISkinnedMesh::SJoint *joint = AnimatedMesh->getAllJoints()[mesh->WeightJoint[j]];
+				ISkinnedMesh::SWeight &weight = joint->Weights[mesh->WeightNum[j]];
+
+				u32 id = weight.vertex_id;
+
+				if (id >= verticesLinkIndex.size()) {
+					os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
+					id = 0;
+					weight.strength = 0.f;
+				}
+
+				if (verticesLinkBuffer[id].size() == 1) {
+					weight.vertex_id = verticesLinkIndex[id][0];
+					weight.buffer_id = verticesLinkBuffer[id][0];
+				} else if (verticesLinkBuffer[id].size() != 0) {
+					for (u32 k = 1; k < verticesLinkBuffer[id].size(); ++k) {
+						ISkinnedMesh::SWeight *WeightClone = AnimatedMesh->addWeight(joint);
+						WeightClone->strength = weight.strength;
+						WeightClone->vertex_id = verticesLinkIndex[id][k];
+						WeightClone->buffer_id = verticesLinkBuffer[id][k];
+					}
+				}
+			}
+		}
+#else
+		{
+			core::array<u32> verticesLinkIndex;
+			core::array<s16> verticesLinkBuffer;
+			verticesLinkBuffer.set_used(mesh->Vertices.size());
+
+			// init with 0
+			for (i = 0; i < mesh->Vertices.size(); ++i) {
+				// watch out for vertices which are not part of the mesh
+				// they will keep the -1 and can lead to out-of-bounds access
+				verticesLinkBuffer[i] = -1;
+			}
+
+			bool warned = false;
+			// store meshbuffer number per vertex
+			for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i) {
+				for (u32 id = i * 3 + 0; id <= i * 3 + 2; ++id) {
+					if ((verticesLinkBuffer[mesh->Indices[id]] != -1) && (verticesLinkBuffer[mesh->Indices[id]] != (s16)mesh->FaceMaterialIndices[i])) {
+						if (!warned) {
+							os::Printer::log("X loader", "Duplicated vertex, animation might be corrupted.", ELL_WARNING);
+							warned = true;
+						}
+						const u32 tmp = mesh->Vertices.size();
+						mesh->Vertices.push_back(mesh->Vertices[mesh->Indices[id]]);
+						mesh->Indices[id] = tmp;
+						verticesLinkBuffer.set_used(mesh->Vertices.size());
+					}
+					verticesLinkBuffer[mesh->Indices[id]] = mesh->FaceMaterialIndices[i];
+				}
+			}
+
+			if (mesh->FaceMaterialIndices.size() != 0) {
+				// store vertices in buffers and remember relation in verticesLinkIndex
+				u32 *vCountArray = new u32[mesh->Buffers.size()];
+				memset(vCountArray, 0, mesh->Buffers.size() * sizeof(u32));
+				// count vertices in each buffer and reallocate
+				for (i = 0; i < mesh->Vertices.size(); ++i) {
+					if (verticesLinkBuffer[i] != -1)
+						++vCountArray[verticesLinkBuffer[i]];
+				}
+				if (mesh->TCoords2.size()) {
+					for (i = 0; i != mesh->Buffers.size(); ++i) {
+						mesh->Buffers[i]->Vertices_2TCoords.reallocate(vCountArray[i]);
+						mesh->Buffers[i]->VertexType = video::EVT_2TCOORDS;
+					}
+				} else {
+					for (i = 0; i != mesh->Buffers.size(); ++i)
+						mesh->Buffers[i]->Vertices_Standard.reallocate(vCountArray[i]);
+				}
+
+				verticesLinkIndex.set_used(mesh->Vertices.size());
+				// actually store vertices
+				for (i = 0; i < mesh->Vertices.size(); ++i) {
+					// if a vertex is missing for some reason, just skip it
+					if (verticesLinkBuffer[i] == -1)
+						continue;
+					scene::SSkinMeshBuffer *buffer = mesh->Buffers[verticesLinkBuffer[i]];
+
+					if (mesh->TCoords2.size()) {
+						verticesLinkIndex[i] = buffer->Vertices_2TCoords.size();
+						buffer->Vertices_2TCoords.push_back(mesh->Vertices[i]);
+						// We have a problem with correct tcoord2 handling here
+						// crash fixed for now by checking the values
+						buffer->Vertices_2TCoords.getLast().TCoords2 = (i < mesh->TCoords2.size()) ? mesh->TCoords2[i] : mesh->Vertices[i].TCoords;
+					} else {
+						verticesLinkIndex[i] = buffer->Vertices_Standard.size();
+						buffer->Vertices_Standard.push_back(mesh->Vertices[i]);
+					}
+				}
+
+				// count indices per buffer and reallocate
+				memset(vCountArray, 0, mesh->Buffers.size() * sizeof(u32));
+				for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i)
+					++vCountArray[mesh->FaceMaterialIndices[i]];
+				for (i = 0; i != mesh->Buffers.size(); ++i)
+					mesh->Buffers[i]->Indices.reallocate(vCountArray[i]);
+				delete[] vCountArray;
+				// create indices per buffer
+				for (i = 0; i < mesh->FaceMaterialIndices.size(); ++i) {
+					scene::SSkinMeshBuffer *buffer = mesh->Buffers[mesh->FaceMaterialIndices[i]];
+					for (u32 id = i * 3 + 0; id != i * 3 + 3; ++id) {
+						buffer->Indices.push_back(verticesLinkIndex[mesh->Indices[id]]);
+					}
+				}
+			}
+
+			for (u32 j = 0; j < mesh->WeightJoint.size(); ++j) {
+				ISkinnedMesh::SWeight &weight = (AnimatedMesh->getAllJoints()[mesh->WeightJoint[j]]->Weights[mesh->WeightNum[j]]);
+
+				u32 id = weight.vertex_id;
+
+				if (id >= verticesLinkIndex.size()) {
+					os::Printer::log("X loader: Weight id out of range", ELL_WARNING);
+					id = 0;
+					weight.strength = 0.f;
+				}
+
+				weight.vertex_id = verticesLinkIndex[id];
+				weight.buffer_id = verticesLinkBuffer[id] + bufferOffset;
+			}
+		}
+#endif
+	}
+
+	return true;
+}
+
+//! Reads file into memory
+bool CXMeshFileLoader::readFileIntoMemory(io::IReadFile *file)
+{
+	const long size = file->getSize();
+	if (size < 12) {
+		os::Printer::log("X File is too small.", ELL_WARNING);
+		return false;
+	}
+
+	Buffer = new c8[size + 1];
+	Buffer[size] = 0x0; // null-terminate
+
+	//! read all into memory
+	if (file->read(Buffer, size) != static_cast<size_t>(size)) {
+		os::Printer::log("Could not read from x file.", ELL_WARNING);
+		return false;
+	}
+
+	Line = 1;
+	End = Buffer + size;
+
+	//! check header "xof "
+	if (strncmp(Buffer, "xof ", 4) != 0) {
+		os::Printer::log("Not an x file, wrong header.", ELL_WARNING);
+		return false;
+	}
+
+	//! read minor and major version, e.g. 0302 or 0303
+	c8 tmp[3];
+	tmp[0] = Buffer[4];
+	tmp[1] = Buffer[5];
+	tmp[2] = 0x0;
+	MajorVersion = core::strtoul10(tmp);
+
+	tmp[0] = Buffer[6];
+	tmp[1] = Buffer[7];
+	MinorVersion = core::strtoul10(tmp);
+
+	//! read format
+	if (strncmp(&Buffer[8], "txt ", 4) == 0)
+		BinaryFormat = false;
+	else if (strncmp(&Buffer[8], "bin ", 4) == 0)
+		BinaryFormat = true;
+	else {
+		os::Printer::log("Only uncompressed x files currently supported.", ELL_WARNING);
+		return false;
+	}
+	BinaryNumCount = 0;
+
+	//! read float size
+	if (strncmp(&Buffer[12], "0032", 4) == 0)
+		FloatSize = 4;
+	else if (strncmp(&Buffer[12], "0064", 4) == 0)
+		FloatSize = 8;
+	else {
+		os::Printer::log("Float size not supported.", ELL_WARNING);
+		return false;
+	}
+
+	P = &Buffer[16];
+
+	readUntilEndOfLine();
+
+	return true;
+}
+
+//! Parses the file
+bool CXMeshFileLoader::parseFile()
+{
+	while (parseDataObject()) {
+		// loop
+	}
+
+	return !ErrorState;
+}
+
+//! Parses the next Data object in the file
+bool CXMeshFileLoader::parseDataObject()
+{
+	core::stringc objectName = getNextToken();
+
+	if (objectName.size() == 0)
+		return false;
+
+		// parse specific object
+#ifdef _XREADER_DEBUG
+	os::Printer::log("debug DataObject", objectName.c_str(), ELL_DEBUG);
+#endif
+
+	if (objectName == "template")
+		return parseDataObjectTemplate();
+	else if (objectName == "Frame") {
+		return parseDataObjectFrame(0);
+	} else if (objectName == "Mesh") {
+		// some meshes have no frames at all
+		// CurFrame = AnimatedMesh->addJoint(0);
+
+		SXMesh *mesh = new SXMesh;
+
+		// mesh->Buffer=AnimatedMesh->addMeshBuffer();
+		Meshes.push_back(mesh);
+
+		return parseDataObjectMesh(*mesh);
+	} else if (objectName == "AnimationSet") {
+		return parseDataObjectAnimationSet();
+	} else if (objectName == "AnimTicksPerSecond") {
+		return parseDataObjectAnimationTicksPerSecond();
+	} else if (objectName == "Material") {
+		return parseUnknownDataObject();
+	} else if (objectName == "}") {
+		os::Printer::log("} found in dataObject", ELL_WARNING);
+		return true;
+	}
+
+	os::Printer::log("Unknown data object in animation of .x file", objectName.c_str(), ELL_WARNING);
+
+	return parseUnknownDataObject();
+}
+
+bool CXMeshFileLoader::parseDataObjectTemplate()
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading template", ELL_DEBUG);
+#endif
+
+	// parse a template data object. Currently not stored.
+	core::stringc name;
+
+	if (!readHeadOfDataObject(&name)) {
+		os::Printer::log("Left delimiter in template data object missing.",
+				name.c_str(), ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// read GUID
+	getNextToken();
+
+	// read and ignore data members
+	while (true) {
+		core::stringc s = getNextToken();
+
+		if (s == "}")
+			break;
+
+		if (s.size() == 0)
+			return false;
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectFrame(CSkinnedMesh::SJoint *Parent)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading frame", ELL_DEBUG);
+#endif
+
+	// A coordinate frame, or "frame of reference." The Frame template
+	// is open and can contain any object. The Direct3D extensions (D3DX)
+	// mesh-loading functions recognize Mesh, FrameTransformMatrix, and
+	// Frame template instances as child objects when loading a Frame
+	// instance.
+
+	u32 JointID = 0;
+
+	core::stringc name;
+
+	if (!readHeadOfDataObject(&name)) {
+		os::Printer::log("No opening brace in Frame found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	CSkinnedMesh::SJoint *joint = 0;
+
+	if (name.size()) {
+		auto n = AnimatedMesh->getJointNumber(name.c_str());
+		if (n.has_value()) {
+			JointID = *n;
+			joint = AnimatedMesh->getAllJoints()[JointID];
+		}
+	}
+
+	if (!joint) {
+#ifdef _XREADER_DEBUG
+		os::Printer::log("creating joint ", name.c_str(), ELL_DEBUG);
+#endif
+		joint = AnimatedMesh->addJoint(Parent);
+		joint->Name = name.c_str();
+		JointID = AnimatedMesh->getAllJoints().size() - 1;
+	} else {
+#ifdef _XREADER_DEBUG
+		os::Printer::log("using joint ", name.c_str(), ELL_DEBUG);
+#endif
+		if (Parent)
+			Parent->Children.push_back(joint);
+	}
+
+	// Now inside a frame.
+	// read tokens until closing brace is reached.
+
+	while (true) {
+		core::stringc objectName = getNextToken();
+
+#ifdef _XREADER_DEBUG
+		os::Printer::log("debug DataObject in frame:", objectName.c_str(), ELL_DEBUG);
+#endif
+
+		if (objectName.size() == 0) {
+			os::Printer::log("Unexpected ending found in Frame in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		} else if (objectName == "}") {
+			break; // frame finished
+		} else if (objectName == "Frame") {
+
+			if (!parseDataObjectFrame(joint))
+				return false;
+		} else if (objectName == "FrameTransformMatrix") {
+			if (!parseDataObjectTransformationMatrix(joint->LocalMatrix))
+				return false;
+
+			// joint->LocalAnimatedMatrix
+			// joint->LocalAnimatedMatrix.makeInverse();
+			// joint->LocalMatrix=tmp*joint->LocalAnimatedMatrix;
+		} else if (objectName == "Mesh") {
+			/*
+			frame.Meshes.push_back(SXMesh());
+			if (!parseDataObjectMesh(frame.Meshes.getLast()))
+				return false;
+			*/
+			SXMesh *mesh = new SXMesh;
+
+			mesh->AttachedJointID = JointID;
+
+			Meshes.push_back(mesh);
+
+			if (!parseDataObjectMesh(*mesh))
+				return false;
+		} else {
+			os::Printer::log("Unknown data object in frame in x file", objectName.c_str(), ELL_WARNING);
+			if (!parseUnknownDataObject())
+				return false;
+		}
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectTransformationMatrix(core::matrix4 &mat)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading Transformation Matrix", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	readMatrix(mat);
+
+	if (!checkForOneFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Transformation Matrix found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh)
+{
+	core::stringc name;
+
+	if (!readHeadOfDataObject(&name)) {
+#ifdef _XREADER_DEBUG
+		os::Printer::log("CXFileReader: Reading mesh", ELL_DEBUG);
+#endif
+		os::Printer::log("No opening brace in Mesh found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading mesh", name.c_str(), ELL_DEBUG);
+#endif
+
+	// read vertex count
+	const u32 nVertices = readInt();
+
+	// read vertices
+	mesh.Vertices.set_used(nVertices);
+	for (u32 n = 0; n < nVertices; ++n) {
+		readVector3(mesh.Vertices[n].Pos);
+		mesh.Vertices[n].Color = 0xFFFFFFFF;
+		mesh.Vertices[n].Normal = core::vector3df(0.0f);
+	}
+
+	if (!checkForTwoFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Vertex Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	// read faces
+	const u32 nFaces = readInt();
+
+	mesh.Indices.set_used(nFaces * 3);
+	mesh.IndexCountPerFace.set_used(nFaces);
+
+	core::array<u32> polygonfaces;
+	u32 currentIndex = 0;
+
+	for (u32 k = 0; k < nFaces; ++k) {
+		const u32 fcnt = readInt();
+
+		if (fcnt != 3) {
+			if (fcnt < 3) {
+				os::Printer::log("Invalid face count (<3) found in Mesh x file reader.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+
+			// read face indices
+			polygonfaces.set_used(fcnt);
+			u32 triangles = (fcnt - 2);
+			mesh.Indices.set_used(mesh.Indices.size() + ((triangles - 1) * 3));
+			mesh.IndexCountPerFace[k] = (u16)(triangles * 3);
+
+			for (u32 f = 0; f < fcnt; ++f)
+				polygonfaces[f] = readInt();
+
+			for (u32 jk = 0; jk < triangles; ++jk) {
+				mesh.Indices[currentIndex++] = polygonfaces[0];
+				mesh.Indices[currentIndex++] = polygonfaces[jk + 1];
+				mesh.Indices[currentIndex++] = polygonfaces[jk + 2];
+			}
+
+			// TODO: change face indices in material list
+		} else {
+			mesh.Indices[currentIndex++] = readInt();
+			mesh.Indices[currentIndex++] = readInt();
+			mesh.Indices[currentIndex++] = readInt();
+			mesh.IndexCountPerFace[k] = 3;
+		}
+	}
+
+	for (u32 j = 0; j < mesh.Indices.size(); j++) {
+		if (mesh.Indices[j] >= mesh.Vertices.size()) {
+			os::Printer::log("Out of range index found in Mesh x file reader.", ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		}
+	}
+
+	if (!checkForTwoFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Face Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	// here, other data objects may follow
+
+	while (true) {
+		core::stringc objectName = getNextToken();
+
+		if (objectName.size() == 0) {
+			os::Printer::log("Unexpected ending found in Mesh in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		} else if (objectName == "}") {
+			break; // mesh finished
+		}
+
+#ifdef _XREADER_DEBUG
+		os::Printer::log("debug DataObject in mesh", objectName.c_str(), ELL_DEBUG);
+#endif
+
+		if (objectName == "MeshNormals") {
+			if (!parseDataObjectMeshNormals(mesh))
+				return false;
+		} else if (objectName == "MeshTextureCoords") {
+			if (!parseDataObjectMeshTextureCoords(mesh))
+				return false;
+		} else if (objectName == "MeshVertexColors") {
+			if (!parseDataObjectMeshVertexColors(mesh))
+				return false;
+		} else if (objectName == "MeshMaterialList") {
+			if (!parseDataObjectMeshMaterialList(mesh))
+				return false;
+		} else if (objectName == "VertexDuplicationIndices") {
+			// we'll ignore vertex duplication indices
+			// TODO: read them
+			if (!parseUnknownDataObject())
+				return false;
+		} else if (objectName == "DeclData") {
+			if (!readHeadOfDataObject()) {
+				os::Printer::log("No starting brace in DeclData found.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+			// arbitrary vertex attributes
+			// first comes the number of element definitions
+			// then the vertex element type definitions
+			// with format type;tesselator;semantics;usageindex
+			// we want to support 2;0;6;0 == tangent
+			//                    2;0;7;0 == binormal
+			//                    2;0;3;0 == normal
+			//                  1/2;0;5;0 == 1st uv coord
+			// and              1/2;0;5;1 == 2nd uv coord
+			// type==2 is 3xf32, type==1 is 2xf32
+			u32 j;
+			const u32 dcnt = readInt();
+			u16 size = 0;
+			s16 normalpos = -1;
+			s16 uvpos = -1;
+			s16 uv2pos = -1;
+			s16 tangentpos = -1;
+			s16 binormalpos = -1;
+			s16 normaltype = -1;
+			s16 uvtype = -1;
+			s16 uv2type = -1;
+			s16 tangenttype = -1;
+			s16 binormaltype = -1;
+
+			(void)tangentpos;   // disable unused variable warnings
+			(void)binormalpos;  // disable unused variable warnings
+			(void)tangenttype;  // disable unused variable warnings
+			(void)binormaltype; // disable unused variable warnings
+
+			for (j = 0; j < dcnt; ++j) {
+				const u32 type = readInt();
+				// const u32 tesselator = readInt();
+				readInt();
+				const u32 semantics = readInt();
+				const u32 index = readInt();
+				switch (semantics) {
+				case 3:
+					normalpos = size;
+					normaltype = type;
+					break;
+				case 5:
+					if (index == 0) {
+						uvpos = size;
+						uvtype = type;
+					} else if (index == 1) {
+						uv2pos = size;
+						uv2type = type;
+					}
+					break;
+				case 6:
+					tangentpos = size;
+					tangenttype = type;
+					break;
+				case 7:
+					binormalpos = size;
+					binormaltype = type;
+					break;
+				default:
+					break;
+				}
+				switch (type) {
+				case 0:
+					size += 4;
+					break;
+				case 1:
+					size += 8;
+					break;
+				case 2:
+					size += 12;
+					break;
+				case 3:
+					size += 16;
+					break;
+				case 4:
+				case 5:
+				case 6:
+					size += 4;
+					break;
+				case 7:
+					size += 8;
+					break;
+				case 8:
+				case 9:
+					size += 4;
+					break;
+				case 10:
+					size += 8;
+					break;
+				case 11:
+					size += 4;
+					break;
+				case 12:
+					size += 8;
+					break;
+				case 13:
+					size += 4;
+					break;
+				case 14:
+					size += 4;
+					break;
+				case 15:
+					size += 4;
+					break;
+				case 16:
+					size += 8;
+					break;
+				}
+			}
+			const u32 datasize = readInt();
+			u32 *data = new u32[datasize];
+			for (j = 0; j < datasize; ++j)
+				data[j] = readInt();
+
+			if (!checkForOneFollowingSemicolons()) {
+				os::Printer::log("No finishing semicolon in DeclData found.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			}
+			if (!checkForClosingBrace()) {
+				os::Printer::log("No closing brace in DeclData.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				delete[] data;
+				SET_ERR_AND_RETURN();
+			}
+			u8 *dataptr = (u8 *)data;
+			if ((uv2pos != -1) && (uv2type == 1))
+				mesh.TCoords2.reallocate(mesh.Vertices.size());
+			for (j = 0; j < mesh.Vertices.size(); ++j) {
+				if ((normalpos != -1) && (normaltype == 2))
+					mesh.Vertices[j].Normal.set(*((core::vector3df *)(dataptr + normalpos)));
+				if ((uvpos != -1) && (uvtype == 1))
+					mesh.Vertices[j].TCoords.set(*((core::vector2df *)(dataptr + uvpos)));
+				if ((uv2pos != -1) && (uv2type == 1))
+					mesh.TCoords2.push_back(*((core::vector2df *)(dataptr + uv2pos)));
+				dataptr += size;
+			}
+			delete[] data;
+		} else if (objectName == "FVFData") {
+			if (!readHeadOfDataObject()) {
+				os::Printer::log("No starting brace in FVFData found.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+			const u32 dataformat = readInt();
+			const u32 datasize = readInt();
+			u32 *data = new u32[datasize];
+			for (u32 j = 0; j < datasize; ++j)
+				data[j] = readInt();
+			if (dataformat & 0x102) { // 2nd uv set
+				mesh.TCoords2.reallocate(mesh.Vertices.size());
+				u8 *dataptr = (u8 *)data;
+				const u32 size = ((dataformat >> 8) & 0xf) * sizeof(core::vector2df);
+				for (u32 j = 0; j < mesh.Vertices.size(); ++j) {
+					mesh.TCoords2.push_back(*((core::vector2df *)(dataptr)));
+					dataptr += size;
+				}
+			}
+			delete[] data;
+			if (!checkForOneFollowingSemicolons()) {
+				os::Printer::log("No finishing semicolon in FVFData found.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			}
+			if (!checkForClosingBrace()) {
+				os::Printer::log("No closing brace in FVFData found in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+		} else if (objectName == "XSkinMeshHeader") {
+			if (!parseDataObjectSkinMeshHeader(mesh))
+				return false;
+		} else if (objectName == "SkinWeights") {
+			// mesh.SkinWeights.push_back(SXSkinWeight());
+			// if (!parseDataObjectSkinWeights(mesh.SkinWeights.getLast()))
+			if (!parseDataObjectSkinWeights(mesh))
+				return false;
+		} else {
+			os::Printer::log("Unknown data object in mesh in x file", objectName.c_str(), ELL_WARNING);
+			if (!parseUnknownDataObject())
+				return false;
+		}
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading mesh skin weights", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Skin Weights found in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	core::stringc TransformNodeName;
+
+	if (!getNextTokenAsString(TransformNodeName)) {
+		os::Printer::log("Unknown syntax while reading transform node name string in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	mesh.HasSkinning = true;
+
+	auto n = AnimatedMesh->getJointNumber(TransformNodeName.c_str());
+	CSkinnedMesh::SJoint *joint = n.has_value() ? AnimatedMesh->getAllJoints()[*n] : nullptr;
+
+	if (!joint) {
+#ifdef _XREADER_DEBUG
+		os::Printer::log("creating joint for skinning ", TransformNodeName.c_str(), ELL_DEBUG);
+#endif
+		n = AnimatedMesh->getAllJoints().size();
+		joint = AnimatedMesh->addJoint(0);
+		joint->Name = TransformNodeName.c_str();
+	}
+
+	// read vertex weights
+	const u32 nWeights = readInt();
+
+	// read vertex indices
+	u32 i;
+
+	const u32 jointStart = joint->Weights.size();
+	joint->Weights.reallocate(jointStart + nWeights);
+
+	mesh.WeightJoint.reallocate(mesh.WeightJoint.size() + nWeights);
+	mesh.WeightNum.reallocate(mesh.WeightNum.size() + nWeights);
+
+	for (i = 0; i < nWeights; ++i) {
+		mesh.WeightJoint.push_back(*n);
+		mesh.WeightNum.push_back(joint->Weights.size());
+
+		CSkinnedMesh::SWeight *weight = AnimatedMesh->addWeight(joint);
+
+		weight->buffer_id = 0;
+		weight->vertex_id = readInt();
+	}
+
+	// read vertex weights
+
+	for (i = jointStart; i < jointStart + nWeights; ++i)
+		joint->Weights[i].strength = readFloat();
+
+	// read matrix offset
+
+	// transforms the mesh vertices to the space of the bone
+	// When concatenated to the bone's transform, this provides the
+	// world space coordinates of the mesh as affected by the bone
+	core::matrix4 &MatrixOffset = joint->GlobalInversedMatrix;
+
+	readMatrix(MatrixOffset);
+
+	if (!checkForOneFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Skin Weights found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Skin Weights found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectSkinMeshHeader(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading skin mesh header", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Skin Mesh header found in .x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	mesh.MaxSkinWeightsPerVertex = readInt();
+	mesh.MaxSkinWeightsPerFace = readInt();
+	mesh.BoneCount = readInt();
+
+	if (!BinaryFormat)
+		getNextToken(); // skip semicolon
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in skin mesh header in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectMeshNormals(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading mesh normals", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Mesh Normals found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// read count
+	const u32 nNormals = readInt();
+	core::array<core::vector3df> normals;
+	normals.set_used(nNormals);
+
+	// read normals
+	for (u32 i = 0; i < nNormals; ++i)
+		readVector3(normals[i]);
+
+	if (!checkForTwoFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Normals Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	core::array<u32> normalIndices;
+	normalIndices.set_used(mesh.Indices.size());
+
+	// read face normal indices
+	const u32 nFNormals = readInt();
+	// if (nFNormals >= mesh.IndexCountPerFace.size())
+	if (0) { // this condition doesn't work for some reason
+		os::Printer::log("Too many face normals found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	u32 normalidx = 0;
+	core::array<u32> polygonfaces;
+	for (u32 k = 0; k < nFNormals; ++k) {
+		const u32 fcnt = readInt();
+		u32 triangles = fcnt - 2;
+		u32 indexcount = triangles * 3;
+
+		if (indexcount != mesh.IndexCountPerFace[k]) {
+			os::Printer::log("Not matching normal and face index count found in x file", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		}
+
+		if (indexcount == 3) {
+			// default, only one triangle in this face
+			for (u32 h = 0; h < 3; ++h) {
+				const u32 normalnum = readInt();
+				mesh.Vertices[mesh.Indices[normalidx++]].Normal.set(normals[normalnum]);
+			}
+		} else {
+			polygonfaces.set_used(fcnt);
+			// multiple triangles in this face
+			for (u32 h = 0; h < fcnt; ++h)
+				polygonfaces[h] = readInt();
+
+			for (u32 jk = 0; jk < triangles; ++jk) {
+				mesh.Vertices[mesh.Indices[normalidx++]].Normal.set(normals[polygonfaces[0]]);
+				mesh.Vertices[mesh.Indices[normalidx++]].Normal.set(normals[polygonfaces[jk + 1]]);
+				mesh.Vertices[mesh.Indices[normalidx++]].Normal.set(normals[polygonfaces[jk + 2]]);
+			}
+		}
+	}
+
+	if (!checkForTwoFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Face Normals Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Mesh Normals found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectMeshTextureCoords(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading mesh texture coordinates", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Mesh Texture Coordinates found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	const u32 nCoords = readInt();
+	// if (nCoords >= mesh.Vertices.size())
+	if (0) { // this condition doesn't work for some reason
+		os::Printer::log("Too many texture coords found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	for (u32 i = 0; i < nCoords; ++i)
+		readVector2(mesh.Vertices[i].TCoords);
+
+	if (!checkForTwoFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading mesh vertex colors", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace for Mesh Vertex Colors found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	mesh.HasVertexColors = true;
+	const u32 nColors = readInt();
+	for (u32 i = 0; i < nColors; ++i) {
+		const u32 Index = readInt();
+		if (Index >= mesh.Vertices.size()) {
+			os::Printer::log("index value in parseDataObjectMeshVertexColors out of bounds", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		}
+		readRGBA(mesh.Vertices[Index].Color);
+		checkForOneFollowingSemicolons();
+	}
+
+	if (!checkForOneFollowingSemicolons()) {
+		os::Printer::log("No finishing semicolon in Mesh Vertex Colors Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Mesh Texture Coordinates Array found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		return false;
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading mesh material list", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Mesh Material List found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// read material count
+	const u32 nMaterials = readInt();
+	mesh.Materials.reallocate(nMaterials);
+
+	// read non triangulated face material index count
+	const u32 nFaceIndices = readInt();
+
+	// There seems to be a compact representation of "all faces the same material"
+	// being represented as 1;1;0;; which means 1 material, 1 face with first material
+	// all the other faces have to obey then, so check is disabled
+	// if (nFaceIndices != mesh.IndexCountPerFace.size())
+	//	os::Printer::log("Index count per face not equal to face material index count in x file.", ELL_WARNING);
+
+	// read non triangulated face indices and create triangulated ones
+	mesh.FaceMaterialIndices.set_used(mesh.Indices.size() / 3);
+	u32 triangulatedindex = 0;
+	u32 ind = 0;
+	for (u32 tfi = 0; tfi < mesh.IndexCountPerFace.size(); ++tfi) {
+		if (tfi < nFaceIndices)
+			ind = readInt();
+		if (ind >= core::max_(nMaterials, 1U)) {
+			os::Printer::log("Out of range index found in x file", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		}
+		const u32 fc = mesh.IndexCountPerFace[tfi] / 3;
+		for (u32 k = 0; k < fc; ++k)
+			mesh.FaceMaterialIndices[triangulatedindex++] = ind;
+	}
+
+	// in version 03.02, the face indices end with two semicolons.
+	// commented out version check, as version 03.03 exported from blender also has 2 semicolons
+	if (!BinaryFormat) { // && MajorVersion == 3 && MinorVersion <= 2)
+		if (P[0] == ';')
+			++P;
+	}
+
+	// read following data objects
+
+	while (true) {
+		core::stringc objectName = getNextToken();
+
+		if (objectName.size() == 0) {
+			os::Printer::log("Unexpected ending found in Mesh Material list in .x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		} else if (objectName == "}") {
+			break; // material list finished
+		} else if (objectName == "{") {
+			// template materials now available thanks to joeWright
+			objectName = getNextToken();
+			mesh.Materials.push_back(video::SMaterial());
+			getNextToken(); // skip }
+		} else if (objectName == "Material") {
+			mesh.Materials.push_back(video::SMaterial());
+			if (!parseUnknownDataObject())
+				return false;
+		} else if (objectName == ";") {
+			// ignore
+		} else {
+			os::Printer::log("Unknown data object in material list in x file", objectName.c_str(), ELL_WARNING);
+			if (!parseUnknownDataObject())
+				return false;
+		}
+	}
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectAnimationSet()
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: Reading animation set", ELL_DEBUG);
+#endif
+
+	core::stringc AnimationName;
+
+	if (!readHeadOfDataObject(&AnimationName)) {
+		os::Printer::log("No opening brace in Animation Set found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+	os::Printer::log("Reading animationset ", AnimationName, ELL_DEBUG);
+
+	while (true) {
+		core::stringc objectName = getNextToken();
+
+		if (objectName.size() == 0) {
+			os::Printer::log("Unexpected ending found in Animation set in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		} else if (objectName == "}") {
+			break; // animation set finished
+		} else if (objectName == "Animation") {
+			if (!parseDataObjectAnimation())
+				return false;
+		} else {
+			os::Printer::log("Unknown data object in animation set in x file", objectName.c_str(), ELL_WARNING);
+			if (!parseUnknownDataObject())
+				return false;
+		}
+	}
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectAnimationTicksPerSecond()
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading AnimationTicksPerSecond", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Animation found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	const u32 ticks = readInt();
+
+	if (!checkForOneFollowingSemicolons()) {
+		os::Printer::log("No closing semicolon in AnimationTicksPerSecond in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in AnimationTicksPerSecond in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	AnimatedMesh->setAnimationSpeed(static_cast<irr::f32>(ticks));
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectAnimation()
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading animation", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Animation found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// anim.closed = true;
+	// anim.linearPositionQuality = true;
+	CSkinnedMesh::SJoint animationDump;
+
+	core::stringc FrameName;
+
+	while (true) {
+		core::stringc objectName = getNextToken();
+
+		if (objectName.size() == 0) {
+			os::Printer::log("Unexpected ending found in Animation in x file.", ELL_WARNING);
+			os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			SET_ERR_AND_RETURN();
+		} else if (objectName == "}") {
+			break; // animation finished
+		} else if (objectName == "AnimationKey") {
+			if (!parseDataObjectAnimationKey(&animationDump))
+				return false;
+		} else if (objectName == "AnimationOptions") {
+			// TODO: parse options.
+			if (!parseUnknownDataObject())
+				return false;
+		} else if (objectName == "{") {
+			// read frame name
+			FrameName = getNextToken();
+
+			if (!checkForClosingBrace()) {
+				os::Printer::log("Unexpected ending found in Animation in x file.", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+		} else {
+			os::Printer::log("Unknown data object in animation in x file", objectName.c_str(), ELL_WARNING);
+			if (!parseUnknownDataObject())
+				SET_ERR_AND_RETURN();
+		}
+	}
+
+	if (FrameName.size() != 0) {
+#ifdef _XREADER_DEBUG
+		os::Printer::log("frame name", FrameName.c_str(), ELL_DEBUG);
+#endif
+		auto n = AnimatedMesh->getJointNumber(FrameName.c_str());
+
+		CSkinnedMesh::SJoint *joint;
+		if (n.has_value()) {
+			joint = AnimatedMesh->getAllJoints()[*n];
+		} else {
+#ifdef _XREADER_DEBUG
+			os::Printer::log("creating joint for animation ", FrameName.c_str(), ELL_DEBUG);
+#endif
+			joint = AnimatedMesh->addJoint(0);
+			joint->Name = FrameName.c_str();
+		}
+
+		joint->PositionKeys.reallocate(joint->PositionKeys.size() + animationDump.PositionKeys.size());
+		for (u32 n = 0; n < animationDump.PositionKeys.size(); ++n) {
+			joint->PositionKeys.push_back(animationDump.PositionKeys[n]);
+		}
+
+		joint->ScaleKeys.reallocate(joint->ScaleKeys.size() + animationDump.ScaleKeys.size());
+		for (u32 n = 0; n < animationDump.ScaleKeys.size(); ++n) {
+			joint->ScaleKeys.push_back(animationDump.ScaleKeys[n]);
+		}
+
+		joint->RotationKeys.reallocate(joint->RotationKeys.size() + animationDump.RotationKeys.size());
+		for (u32 n = 0; n < animationDump.RotationKeys.size(); ++n) {
+			joint->RotationKeys.push_back(animationDump.RotationKeys[n]);
+		}
+	} else
+		os::Printer::log("joint name was never given", ELL_WARNING);
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading animation key", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Animation Key found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// read key type
+
+	const u32 keyType = readInt();
+
+	if (keyType > 4) {
+		os::Printer::log("Unknown key type found in Animation Key in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	// read number of keys
+	const u32 numberOfKeys = readInt();
+
+	// eat the semicolon after the "0".  if there are keys present, readInt()
+	// does this for us.  If there aren't, we need to do it explicitly
+	if (numberOfKeys == 0)
+		checkForOneFollowingSemicolons();
+
+	for (u32 i = 0; i < numberOfKeys; ++i) {
+		// read time
+		const f32 time = (f32)readInt();
+
+		// read keys
+		switch (keyType) {
+		case 0: // rotation
+		{
+			// read quaternions
+
+			// read count
+			if (readInt() != 4) {
+				os::Printer::log("Expected 4 numbers in animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+
+			f32 W = -readFloat();
+			f32 X = -readFloat();
+			f32 Y = -readFloat();
+			f32 Z = -readFloat();
+
+			if (!checkForTwoFollowingSemicolons()) {
+				os::Printer::log("No finishing semicolon after quaternion animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			}
+
+			ISkinnedMesh::SRotationKey *key = AnimatedMesh->addRotationKey(joint);
+			key->frame = time;
+			key->rotation.set(X, Y, Z, W);
+			key->rotation.normalize();
+		} break;
+		case 1: // scale
+		case 2: // position
+		{
+			// read vectors
+
+			// read count
+			if (readInt() != 3) {
+				os::Printer::log("Expected 3 numbers in animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+
+			core::vector3df vector;
+			readVector3(vector);
+
+			if (!checkForTwoFollowingSemicolons()) {
+				os::Printer::log("No finishing semicolon after vector animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			}
+
+			if (keyType == 2) {
+				ISkinnedMesh::SPositionKey *key = AnimatedMesh->addPositionKey(joint);
+				key->frame = time;
+				key->position = vector;
+			} else {
+				ISkinnedMesh::SScaleKey *key = AnimatedMesh->addScaleKey(joint);
+				key->frame = time;
+				key->scale = vector;
+			}
+		} break;
+		case 3:
+		case 4: {
+			// read matrix
+
+			// read count
+			if (readInt() != 16) {
+				os::Printer::log("Expected 16 numbers in animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+				SET_ERR_AND_RETURN();
+			}
+
+			// read matrix
+			core::matrix4 mat(core::matrix4::EM4CONST_NOTHING);
+			readMatrix(mat);
+
+			// mat=joint->LocalMatrix*mat;
+
+			if (!checkForOneFollowingSemicolons()) {
+				os::Printer::log("No finishing semicolon after matrix animation key in x file", ELL_WARNING);
+				os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+			}
+
+			// core::vector3df rotation = mat.getRotationDegrees();
+
+			ISkinnedMesh::SRotationKey *keyR = AnimatedMesh->addRotationKey(joint);
+			keyR->frame = time;
+
+			// IRR_TEST_BROKEN_QUATERNION_USE: TODO - switched from mat to mat.getTransposed() for downward compatibility.
+			// Not tested so far if this was correct or wrong before quaternion fix!
+			keyR->rotation = core::quaternion(mat.getTransposed());
+
+			ISkinnedMesh::SPositionKey *keyP = AnimatedMesh->addPositionKey(joint);
+			keyP->frame = time;
+			keyP->position = mat.getTranslation();
+
+			/*
+							core::vector3df scale=mat.getScale();
+
+							if (scale.X==0)
+								scale.X=1;
+							if (scale.Y==0)
+								scale.Y=1;
+							if (scale.Z==0)
+								scale.Z=1;
+							ISkinnedMesh::SScaleKey *keyS=AnimatedMesh->addScaleKey(joint);
+							keyS->frame=time;
+							keyS->scale=scale;
+			*/
+		} break;
+		} // end switch
+	}
+
+	if (!checkForOneFollowingSemicolons())
+		--P;
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in animation key in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseDataObjectTextureFilename(core::stringc &texturename)
+{
+#ifdef _XREADER_DEBUG
+	os::Printer::log("CXFileReader: reading texture filename", ELL_DEBUG);
+#endif
+
+	if (!readHeadOfDataObject()) {
+		os::Printer::log("No opening brace in Texture filename found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	if (!getNextTokenAsString(texturename)) {
+		os::Printer::log("Unknown syntax while reading texture filename string in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	if (!checkForClosingBrace()) {
+		os::Printer::log("No closing brace in Texture filename found in x file", ELL_WARNING);
+		os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
+		SET_ERR_AND_RETURN();
+	}
+
+	return true;
+}
+
+bool CXMeshFileLoader::parseUnknownDataObject()
+{
+	// find opening delimiter
+	while (true) {
+		core::stringc t = getNextToken();
+
+		if (t.size() == 0)
+			return false;
+
+		if (t == "{")
+			break;
+	}
+
+	u32 counter = 1;
+
+	// parse until closing delimiter
+
+	while (counter) {
+		core::stringc t = getNextToken();
+
+		if (t.size() == 0)
+			return false;
+
+		if (t == "{")
+			++counter;
+		else if (t == "}")
+			--counter;
+	}
+
+	return true;
+}
+
+//! checks for closing curly brace, returns false if not there
+bool CXMeshFileLoader::checkForClosingBrace()
+{
+	return (getNextToken() == "}");
+}
+
+//! checks for one following semicolon, returns false if not there
+bool CXMeshFileLoader::checkForOneFollowingSemicolons()
+{
+	if (BinaryFormat)
+		return true;
+
+	if (getNextToken() == ";")
+		return true;
+	else {
+		--P;
+		return false;
+	}
+}
+
+//! checks for two following semicolons, returns false if they are not there
+bool CXMeshFileLoader::checkForTwoFollowingSemicolons()
+{
+	if (BinaryFormat)
+		return true;
+
+	for (u32 k = 0; k < 2; ++k) {
+		if (getNextToken() != ";") {
+			--P;
+			return false;
+		}
+	}
+
+	return true;
+}
+
+//! reads header of dataobject including the opening brace.
+//! returns false if error happened, and writes name of object
+//! if there is one
+bool CXMeshFileLoader::readHeadOfDataObject(core::stringc *outname)
+{
+	core::stringc nameOrBrace = getNextToken();
+	if (nameOrBrace != "{") {
+		if (outname)
+			(*outname) = nameOrBrace;
+
+		if (getNextToken() != "{")
+			return false;
+	}
+
+	return true;
+}
+
+//! returns next parseable token. Returns empty string if no token there
+core::stringc CXMeshFileLoader::getNextToken()
+{
+	core::stringc s;
+
+	// process binary-formatted file
+	if (BinaryFormat) {
+		// in binary mode it will only return NAME and STRING token
+		// and (correctly) skip over other tokens.
+
+		s16 tok = readBinWord();
+		u32 len;
+
+		// standalone tokens
+		switch (tok) {
+		case 1:
+			// name token
+			len = readBinDWord();
+			s = core::stringc(P, len);
+			P += len;
+			return s;
+		case 2:
+			// string token
+			len = readBinDWord();
+			s = core::stringc(P, len);
+			P += (len + 2);
+			return s;
+		case 3:
+			// integer token
+			P += 4;
+			return "<integer>";
+		case 5:
+			// GUID token
+			P += 16;
+			return "<guid>";
+		case 6:
+			len = readBinDWord();
+			P += (len * 4);
+			return "<int_list>";
+		case 7:
+			len = readBinDWord();
+			P += (len * FloatSize);
+			return "<flt_list>";
+		case 0x0a:
+			return "{";
+		case 0x0b:
+			return "}";
+		case 0x0c:
+			return "(";
+		case 0x0d:
+			return ")";
+		case 0x0e:
+			return "[";
+		case 0x0f:
+			return "]";
+		case 0x10:
+			return "<";
+		case 0x11:
+			return ">";
+		case 0x12:
+			return ".";
+		case 0x13:
+			return ",";
+		case 0x14:
+			return ";";
+		case 0x1f:
+			return "template";
+		case 0x28:
+			return "WORD";
+		case 0x29:
+			return "DWORD";
+		case 0x2a:
+			return "FLOAT";
+		case 0x2b:
+			return "DOUBLE";
+		case 0x2c:
+			return "CHAR";
+		case 0x2d:
+			return "UCHAR";
+		case 0x2e:
+			return "SWORD";
+		case 0x2f:
+			return "SDWORD";
+		case 0x30:
+			return "void";
+		case 0x31:
+			return "string";
+		case 0x32:
+			return "unicode";
+		case 0x33:
+			return "cstring";
+		case 0x34:
+			return "array";
+		}
+	}
+	// process text-formatted file
+	else {
+		findNextNoneWhiteSpace();
+
+		if (P >= End)
+			return s;
+
+		while ((P < End) && !core::isspace(P[0])) {
+			// either keep token delimiters when already holding a token, or return if first valid char
+			if (P[0] == ';' || P[0] == '}' || P[0] == '{' || P[0] == ',') {
+				if (!s.size()) {
+					s.append(P[0]);
+					++P;
+				}
+				break; // stop for delimiter
+			}
+			s.append(P[0]);
+			++P;
+		}
+	}
+	return s;
+}
+
+//! places pointer to next begin of a token, which must be a number,
+// and ignores comments
+void CXMeshFileLoader::findNextNoneWhiteSpaceNumber()
+{
+	if (BinaryFormat)
+		return;
+
+	while ((P < End) && (P[0] != '-') && (P[0] != '.') &&
+			!(core::isdigit(P[0]))) {
+		// check if this is a comment
+		if ((P[0] == '/' && P[1] == '/') || P[0] == '#')
+			readUntilEndOfLine();
+		else
+			++P;
+	}
+}
+
+// places pointer to next begin of a token, and ignores comments
+void CXMeshFileLoader::findNextNoneWhiteSpace()
+{
+	if (BinaryFormat)
+		return;
+
+	while (true) {
+		while ((P < End) && core::isspace(P[0])) {
+			if (*P == '\n')
+				++Line;
+			++P;
+		}
+
+		if (P >= End)
+			return;
+
+		// check if this is a comment
+		if ((P[0] == '/' && P[1] == '/') ||
+				P[0] == '#')
+			readUntilEndOfLine();
+		else
+			break;
+	}
+}
+
+//! reads a x file style string
+bool CXMeshFileLoader::getNextTokenAsString(core::stringc &out)
+{
+	if (BinaryFormat) {
+		out = getNextToken();
+		return true;
+	}
+	findNextNoneWhiteSpace();
+
+	if (P >= End)
+		return false;
+
+	if (P[0] != '"')
+		return false;
+	++P;
+
+	while (P < End && P[0] != '"') {
+		out.append(P[0]);
+		++P;
+	}
+
+	if (P[1] != ';' || P[0] != '"')
+		return false;
+	P += 2;
+
+	return true;
+}
+
+void CXMeshFileLoader::readUntilEndOfLine()
+{
+	if (BinaryFormat)
+		return;
+
+	while (P < End) {
+		if (P[0] == '\n' || P[0] == '\r') {
+			++P;
+			++Line;
+			return;
+		}
+
+		++P;
+	}
+}
+
+u16 CXMeshFileLoader::readBinWord()
+{
+	if (P >= End)
+		return 0;
+#ifdef __BIG_ENDIAN__
+	const u16 tmp = os::Byteswap::byteswap(*(u16 *)P);
+#else
+	const u16 tmp = *(u16 *)P;
+#endif
+	P += 2;
+	return tmp;
+}
+
+u32 CXMeshFileLoader::readBinDWord()
+{
+	if (P >= End)
+		return 0;
+#ifdef __BIG_ENDIAN__
+	const u32 tmp = os::Byteswap::byteswap(*(u32 *)P);
+#else
+	const u32 tmp = *(u32 *)P;
+#endif
+	P += 4;
+	return tmp;
+}
+
+u32 CXMeshFileLoader::readInt()
+{
+	if (BinaryFormat) {
+		if (!BinaryNumCount) {
+			const u16 tmp = readBinWord(); // 0x06 or 0x03
+			if (tmp == 0x06)
+				BinaryNumCount = readBinDWord();
+			else
+				BinaryNumCount = 1; // single int
+		}
+		--BinaryNumCount;
+		return readBinDWord();
+	} else {
+		findNextNoneWhiteSpaceNumber();
+		return core::strtoul10(P, &P);
+	}
+}
+
+f32 CXMeshFileLoader::readFloat()
+{
+	if (BinaryFormat) {
+		if (!BinaryNumCount) {
+			const u16 tmp = readBinWord(); // 0x07 or 0x42
+			if (tmp == 0x07)
+				BinaryNumCount = readBinDWord();
+			else
+				BinaryNumCount = 1; // single int
+		}
+		--BinaryNumCount;
+		if (FloatSize == 8) {
+#ifdef __BIG_ENDIAN__
+			// TODO: Check if data is properly converted here
+			f32 ctmp[2];
+			ctmp[1] = os::Byteswap::byteswap(*(f32 *)P);
+			ctmp[0] = os::Byteswap::byteswap(*(f32 *)P + 4);
+			const f32 tmp = (f32)(*(f64 *)(void *)ctmp);
+#else
+			const f32 tmp = (f32)(*(f64 *)P);
+#endif
+			P += 8;
+			return tmp;
+		} else {
+#ifdef __BIG_ENDIAN__
+			const f32 tmp = os::Byteswap::byteswap(*(f32 *)P);
+#else
+			const f32 tmp = *(f32 *)P;
+#endif
+			P += 4;
+			return tmp;
+		}
+	}
+	findNextNoneWhiteSpaceNumber();
+	f32 ftmp;
+	P = core::fast_atof_move(P, ftmp);
+	return ftmp;
+}
+
+// read 2-dimensional vector. Stops at semicolon after second value for text file format
+bool CXMeshFileLoader::readVector2(core::vector2df &vec)
+{
+	vec.X = readFloat();
+	vec.Y = readFloat();
+	return true;
+}
+
+// read 3-dimensional vector. Stops at semicolon after third value for text file format
+bool CXMeshFileLoader::readVector3(core::vector3df &vec)
+{
+	vec.X = readFloat();
+	vec.Y = readFloat();
+	vec.Z = readFloat();
+	return true;
+}
+
+// read color without alpha value. Stops after second semicolon after blue value
+bool CXMeshFileLoader::readRGB(video::SColor &color)
+{
+	video::SColorf tmpColor;
+	tmpColor.r = readFloat();
+	tmpColor.g = readFloat();
+	tmpColor.b = readFloat();
+	color = tmpColor.toSColor();
+	return checkForOneFollowingSemicolons();
+}
+
+// read color with alpha value. Stops after second semicolon after blue value
+bool CXMeshFileLoader::readRGBA(video::SColor &color)
+{
+	video::SColorf tmpColor;
+	tmpColor.r = readFloat();
+	tmpColor.g = readFloat();
+	tmpColor.b = readFloat();
+	tmpColor.a = readFloat();
+	color = tmpColor.toSColor();
+	return checkForOneFollowingSemicolons();
+}
+
+// read matrix from list of floats
+bool CXMeshFileLoader::readMatrix(core::matrix4 &mat)
+{
+	for (u32 i = 0; i < 16; ++i)
+		mat[i] = readFloat();
+	return checkForOneFollowingSemicolons();
+}
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CXMeshFileLoader.h b/irr/src/CXMeshFileLoader.h
new file mode 100644
index 000000000..711806270
--- /dev/null
+++ b/irr/src/CXMeshFileLoader.h
@@ -0,0 +1,181 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IMeshLoader.h"
+#include "irrString.h"
+#include "CSkinnedMesh.h"
+
+namespace irr
+{
+namespace io
+{
+class IReadFile;
+} // end namespace io
+namespace scene
+{
+class IMeshManipulator;
+
+//! Meshloader capable of loading x meshes.
+class CXMeshFileLoader : public IMeshLoader
+{
+public:
+	//! Constructor
+	CXMeshFileLoader(scene::ISceneManager *smgr);
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".cob")
+	bool isALoadableFileExtension(const io::path &filename) const override;
+
+	//! creates/loads an animated mesh from the file.
+	//! \return Pointer to the created mesh. Returns 0 if loading failed.
+	//! If you no longer need the mesh, you should call IAnimatedMesh::drop().
+	//! See IReferenceCounted::drop() for more information.
+	IAnimatedMesh *createMesh(io::IReadFile *file) override;
+
+	struct SXMesh
+	{
+		SXMesh() :
+				MaxSkinWeightsPerVertex(0), MaxSkinWeightsPerFace(0), BoneCount(0), AttachedJointID(-1), HasSkinning(false), HasVertexColors(false) {}
+		// this mesh contains triangulated texture data.
+		// because in an .x file, faces can be made of more than 3
+		// vertices, the indices data structure is triangulated during the
+		// loading process. The IndexCountPerFace array is filled during
+		// this triangulation process and stores how much indices belong to
+		// every face. This data structure can be ignored, because all data
+		// in this structure is triangulated.
+
+		core::stringc Name;
+
+		u32 MaxSkinWeightsPerVertex;
+		u32 MaxSkinWeightsPerFace;
+		u32 BoneCount;
+
+		core::array<u16> IndexCountPerFace; // default 3, but could be more
+
+		core::array<scene::SSkinMeshBuffer *> Buffers;
+
+		core::array<video::S3DVertex> Vertices;
+		core::array<core::vector2df> TCoords2;
+
+		core::array<u32> Indices;
+
+		core::array<u32> FaceMaterialIndices; // index of material for each face
+
+		core::array<video::SMaterial> Materials; // material array
+
+		core::array<u32> WeightJoint;
+		core::array<u32> WeightNum;
+
+		s32 AttachedJointID;
+
+		bool HasSkinning;
+		bool HasVertexColors;
+	};
+
+private:
+	bool load(io::IReadFile *file);
+
+	bool readFileIntoMemory(io::IReadFile *file);
+
+	bool parseFile();
+
+	bool parseDataObject();
+
+	bool parseDataObjectTemplate();
+
+	bool parseDataObjectFrame(CSkinnedMesh::SJoint *parent);
+
+	bool parseDataObjectTransformationMatrix(core::matrix4 &mat);
+
+	bool parseDataObjectMesh(SXMesh &mesh);
+
+	bool parseDataObjectSkinWeights(SXMesh &mesh);
+
+	bool parseDataObjectSkinMeshHeader(SXMesh &mesh);
+
+	bool parseDataObjectMeshNormals(SXMesh &mesh);
+
+	bool parseDataObjectMeshTextureCoords(SXMesh &mesh);
+
+	bool parseDataObjectMeshVertexColors(SXMesh &mesh);
+
+	bool parseDataObjectMeshMaterialList(SXMesh &mesh);
+
+	bool parseDataObjectAnimationSet();
+
+	bool parseDataObjectAnimationTicksPerSecond();
+
+	bool parseDataObjectAnimation();
+
+	bool parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint);
+
+	bool parseDataObjectTextureFilename(core::stringc &texturename);
+
+	bool parseUnknownDataObject();
+
+	//! places pointer to next begin of a token, and ignores comments
+	void findNextNoneWhiteSpace();
+
+	//! places pointer to next begin of a token, which must be a number,
+	// and ignores comments
+	void findNextNoneWhiteSpaceNumber();
+
+	//! returns next parseable token. Returns empty string if no token there
+	core::stringc getNextToken();
+
+	//! reads header of dataobject including the opening brace.
+	//! returns false if error happened, and writes name of object
+	//! if there is one
+	bool readHeadOfDataObject(core::stringc *outname = 0);
+
+	//! checks for closing curly brace, returns false if not there
+	bool checkForClosingBrace();
+
+	//! checks for one following semicolons, returns false if not there
+	bool checkForOneFollowingSemicolons();
+
+	//! checks for two following semicolons, returns false if they are not there
+	bool checkForTwoFollowingSemicolons();
+
+	//! reads a x file style string
+	bool getNextTokenAsString(core::stringc &out);
+
+	void readUntilEndOfLine();
+
+	u16 readBinWord();
+	u32 readBinDWord();
+	u32 readInt();
+	f32 readFloat();
+	bool readVector2(core::vector2df &vec);
+	bool readVector3(core::vector3df &vec);
+	bool readMatrix(core::matrix4 &mat);
+	bool readRGB(video::SColor &color);
+	bool readRGBA(video::SColor &color);
+
+	CSkinnedMesh *AnimatedMesh;
+
+	c8 *Buffer;
+	const c8 *P;
+	c8 *End;
+	// counter for number arrays in binary format
+	u32 BinaryNumCount;
+	u32 Line;
+	io::path FilePath;
+
+	bool ErrorState;
+
+	CSkinnedMesh::SJoint *CurFrame;
+
+	core::array<SXMesh *> Meshes;
+
+	u32 MajorVersion;
+	u32 MinorVersion;
+	bool BinaryFormat;
+	c8 FloatSize;
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/CZipReader.cpp b/irr/src/CZipReader.cpp
new file mode 100644
index 000000000..b761c72e8
--- /dev/null
+++ b/irr/src/CZipReader.cpp
@@ -0,0 +1,519 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CZipReader.h"
+
+#include "os.h"
+
+#include "CFileList.h"
+#include "CReadFile.h"
+#include "coreutil.h"
+
+#include <zlib.h> // use system lib
+
+namespace irr
+{
+namespace io
+{
+
+// -----------------------------------------------------------------------------
+// zip loader
+// -----------------------------------------------------------------------------
+
+//! Constructor
+CArchiveLoaderZIP::CArchiveLoaderZIP(io::IFileSystem *fs) :
+		FileSystem(fs)
+{
+#ifdef _DEBUG
+	setDebugName("CArchiveLoaderZIP");
+#endif
+}
+
+//! returns true if the file maybe is able to be loaded by this class
+bool CArchiveLoaderZIP::isALoadableFileFormat(const io::path &filename) const
+{
+	return core::hasFileExtension(filename, "zip", "pk3") ||
+		   core::hasFileExtension(filename, "gz", "tgz");
+}
+
+//! Check to see if the loader can create archives of this type.
+bool CArchiveLoaderZIP::isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const
+{
+	return (fileType == EFAT_ZIP || fileType == EFAT_GZIP);
+}
+
+//! Creates an archive from the filename
+/** \param file File handle to check.
+\return Pointer to newly created archive, or 0 upon error. */
+IFileArchive *CArchiveLoaderZIP::createArchive(const io::path &filename, bool ignoreCase, bool ignorePaths) const
+{
+	IFileArchive *archive = 0;
+	io::IReadFile *file = FileSystem->createAndOpenFile(filename);
+
+	if (file) {
+		archive = createArchive(file, ignoreCase, ignorePaths);
+		file->drop();
+	}
+
+	return archive;
+}
+
+//! creates/loads an archive from the file.
+//! \return Pointer to the created archive. Returns 0 if loading failed.
+IFileArchive *CArchiveLoaderZIP::createArchive(io::IReadFile *file, bool ignoreCase, bool ignorePaths) const
+{
+	IFileArchive *archive = 0;
+	if (file) {
+		file->seek(0);
+
+		u16 sig;
+		file->read(&sig, 2);
+
+#ifdef __BIG_ENDIAN__
+		sig = os::Byteswap::byteswap(sig);
+#endif
+
+		file->seek(0);
+
+		bool isGZip = (sig == 0x8b1f);
+
+		archive = new CZipReader(FileSystem, file, ignoreCase, ignorePaths, isGZip);
+	}
+	return archive;
+}
+
+//! Check if the file might be loaded by this class
+/** Check might look into the file.
+\param file File handle to check.
+\return True if file seems to be loadable. */
+bool CArchiveLoaderZIP::isALoadableFileFormat(io::IReadFile *file) const
+{
+	SZIPFileHeader header;
+
+	file->read(&header.Sig, 4);
+#ifdef __BIG_ENDIAN__
+	header.Sig = os::Byteswap::byteswap(header.Sig);
+#endif
+
+	return header.Sig == 0x04034b50 ||      // ZIP
+		   (header.Sig & 0xffff) == 0x8b1f; // gzip
+}
+
+// -----------------------------------------------------------------------------
+// zip archive
+// -----------------------------------------------------------------------------
+
+CZipReader::CZipReader(IFileSystem *fs, IReadFile *file, bool ignoreCase, bool ignorePaths, bool isGZip) :
+		CFileList((file ? file->getFileName() : io::path("")), ignoreCase, ignorePaths), FileSystem(fs), File(file), IsGZip(isGZip)
+{
+#ifdef _DEBUG
+	setDebugName("CZipReader");
+#endif
+
+	if (File) {
+		File->grab();
+
+		// load file entries
+		if (IsGZip)
+			while (scanGZipHeader()) {
+			}
+		else
+			while (scanZipHeader()) {
+			}
+
+		sort();
+	}
+}
+
+CZipReader::~CZipReader()
+{
+	if (File)
+		File->drop();
+}
+
+//! get the archive type
+E_FILE_ARCHIVE_TYPE CZipReader::getType() const
+{
+	return IsGZip ? EFAT_GZIP : EFAT_ZIP;
+}
+
+const IFileList *CZipReader::getFileList() const
+{
+	return this;
+}
+
+//! scans for a local header, returns false if there is no more local file header.
+//! The gzip file format seems to think that there can be multiple files in a gzip file
+//! but none
+bool CZipReader::scanGZipHeader()
+{
+	SZipFileEntry entry;
+	entry.Offset = 0;
+	memset(&entry.header, 0, sizeof(SZIPFileHeader));
+
+	// read header
+	SGZIPMemberHeader header;
+	if (File->read(&header, sizeof(SGZIPMemberHeader)) == sizeof(SGZIPMemberHeader)) {
+
+#ifdef __BIG_ENDIAN__
+		header.sig = os::Byteswap::byteswap(header.sig);
+		header.time = os::Byteswap::byteswap(header.time);
+#endif
+
+		// check header value
+		if (header.sig != 0x8b1f)
+			return false;
+
+		// now get the file info
+		if (header.flags & EGZF_EXTRA_FIELDS) {
+			// read lenth of extra data
+			u16 dataLen;
+
+			File->read(&dataLen, 2);
+
+#ifdef __BIG_ENDIAN__
+			dataLen = os::Byteswap::byteswap(dataLen);
+#endif
+
+			// skip it
+			File->seek(dataLen, true);
+		}
+
+		io::path ZipFileName = "";
+
+		if (header.flags & EGZF_FILE_NAME) {
+			c8 c;
+			File->read(&c, 1);
+			while (c) {
+				ZipFileName.append(c);
+				File->read(&c, 1);
+			}
+		} else {
+			// no file name?
+			ZipFileName = Path;
+			core::deletePathFromFilename(ZipFileName);
+
+			// rename tgz to tar or remove gz extension
+			if (core::hasFileExtension(ZipFileName, "tgz")) {
+				ZipFileName[ZipFileName.size() - 2] = 'a';
+				ZipFileName[ZipFileName.size() - 1] = 'r';
+			} else if (core::hasFileExtension(ZipFileName, "gz")) {
+				ZipFileName[ZipFileName.size() - 3] = 0;
+				ZipFileName.validate();
+			}
+		}
+
+		if (header.flags & EGZF_COMMENT) {
+			c8 c = 'a';
+			while (c)
+				File->read(&c, 1);
+		}
+
+		if (header.flags & EGZF_CRC16)
+			File->seek(2, true);
+
+		// we are now at the start of the data blocks
+		entry.Offset = File->getPos();
+
+		entry.header.FilenameLength = ZipFileName.size();
+
+		entry.header.CompressionMethod = header.compressionMethod;
+		entry.header.DataDescriptor.CompressedSize = (File->getSize() - 8) - File->getPos();
+
+		// seek to file end
+		File->seek(entry.header.DataDescriptor.CompressedSize, true);
+
+		// read CRC
+		File->read(&entry.header.DataDescriptor.CRC32, 4);
+		// read uncompressed size
+		File->read(&entry.header.DataDescriptor.UncompressedSize, 4);
+
+#ifdef __BIG_ENDIAN__
+		entry.header.DataDescriptor.CRC32 = os::Byteswap::byteswap(entry.header.DataDescriptor.CRC32);
+		entry.header.DataDescriptor.UncompressedSize = os::Byteswap::byteswap(entry.header.DataDescriptor.UncompressedSize);
+#endif
+
+		// now we've filled all the fields, this is just a standard deflate block
+		addItem(ZipFileName, entry.Offset, entry.header.DataDescriptor.UncompressedSize, false, 0);
+		FileInfo.push_back(entry);
+	}
+
+	// there's only one block of data in a gzip file
+	return false;
+}
+
+//! scans for a local header, returns false if there is no more local file header.
+bool CZipReader::scanZipHeader(bool ignoreGPBits)
+{
+	io::path ZipFileName = "";
+	SZipFileEntry entry;
+	entry.Offset = 0;
+	memset(&entry.header, 0, sizeof(SZIPFileHeader));
+
+	File->read(&entry.header, sizeof(SZIPFileHeader));
+
+#ifdef __BIG_ENDIAN__
+	entry.header.Sig = os::Byteswap::byteswap(entry.header.Sig);
+	entry.header.VersionToExtract = os::Byteswap::byteswap(entry.header.VersionToExtract);
+	entry.header.GeneralBitFlag = os::Byteswap::byteswap(entry.header.GeneralBitFlag);
+	entry.header.CompressionMethod = os::Byteswap::byteswap(entry.header.CompressionMethod);
+	entry.header.LastModFileTime = os::Byteswap::byteswap(entry.header.LastModFileTime);
+	entry.header.LastModFileDate = os::Byteswap::byteswap(entry.header.LastModFileDate);
+	entry.header.DataDescriptor.CRC32 = os::Byteswap::byteswap(entry.header.DataDescriptor.CRC32);
+	entry.header.DataDescriptor.CompressedSize = os::Byteswap::byteswap(entry.header.DataDescriptor.CompressedSize);
+	entry.header.DataDescriptor.UncompressedSize = os::Byteswap::byteswap(entry.header.DataDescriptor.UncompressedSize);
+	entry.header.FilenameLength = os::Byteswap::byteswap(entry.header.FilenameLength);
+	entry.header.ExtraFieldLength = os::Byteswap::byteswap(entry.header.ExtraFieldLength);
+#endif
+
+	if (entry.header.Sig != 0x04034b50)
+		return false; // local file headers end here.
+
+	// read filename
+	{
+		c8 *tmp = new c8[entry.header.FilenameLength + 2];
+		File->read(tmp, entry.header.FilenameLength);
+		tmp[entry.header.FilenameLength] = 0;
+		ZipFileName = tmp;
+		delete[] tmp;
+	}
+
+	if (entry.header.ExtraFieldLength)
+		File->seek(entry.header.ExtraFieldLength, true);
+
+	// if bit 3 was set, use CentralDirectory for setup
+	if (!ignoreGPBits && entry.header.GeneralBitFlag & ZIP_INFO_IN_DATA_DESCRIPTOR) {
+		SZIPFileCentralDirEnd dirEnd;
+		FileInfo.clear();
+		Files.clear();
+		// First place where the end record could be stored
+		File->seek(File->getSize() - 22);
+		const char endID[] = {0x50, 0x4b, 0x05, 0x06, 0x0};
+		char tmp[5] = {'\0'};
+		bool found = false;
+		// search for the end record ID
+		while (!found && File->getPos() > 0) {
+			int seek = 8;
+			File->read(tmp, 4);
+			switch (tmp[0]) {
+			case 0x50:
+				if (!strcmp(endID, tmp)) {
+					seek = 4;
+					found = true;
+				}
+				break;
+			case 0x4b:
+				seek = 5;
+				break;
+			case 0x05:
+				seek = 6;
+				break;
+			case 0x06:
+				seek = 7;
+				break;
+			}
+			File->seek(-seek, true);
+		}
+		File->read(&dirEnd, sizeof(dirEnd));
+#ifdef __BIG_ENDIAN__
+		dirEnd.NumberDisk = os::Byteswap::byteswap(dirEnd.NumberDisk);
+		dirEnd.NumberStart = os::Byteswap::byteswap(dirEnd.NumberStart);
+		dirEnd.TotalDisk = os::Byteswap::byteswap(dirEnd.TotalDisk);
+		dirEnd.TotalEntries = os::Byteswap::byteswap(dirEnd.TotalEntries);
+		dirEnd.Size = os::Byteswap::byteswap(dirEnd.Size);
+		dirEnd.Offset = os::Byteswap::byteswap(dirEnd.Offset);
+		dirEnd.CommentLength = os::Byteswap::byteswap(dirEnd.CommentLength);
+#endif
+		FileInfo.reallocate(dirEnd.TotalEntries);
+		File->seek(dirEnd.Offset);
+		while (scanCentralDirectoryHeader()) {
+		}
+		return false;
+	}
+
+	// store position in file
+	entry.Offset = File->getPos();
+	// move forward length of data
+	File->seek(entry.header.DataDescriptor.CompressedSize, true);
+
+#ifdef _DEBUG
+// os::Debuginfo::print("added file from archive", ZipFileName.c_str());
+#endif
+
+	addItem(ZipFileName, entry.Offset, entry.header.DataDescriptor.UncompressedSize, ZipFileName.lastChar() == '/', FileInfo.size());
+	FileInfo.push_back(entry);
+
+	return true;
+}
+
+//! scans for a local header, returns false if there is no more local file header.
+bool CZipReader::scanCentralDirectoryHeader()
+{
+	io::path ZipFileName = "";
+	SZIPFileCentralDirFileHeader entry;
+	File->read(&entry, sizeof(SZIPFileCentralDirFileHeader));
+
+#ifdef __BIG_ENDIAN__
+	entry.Sig = os::Byteswap::byteswap(entry.Sig);
+	entry.VersionMadeBy = os::Byteswap::byteswap(entry.VersionMadeBy);
+	entry.VersionToExtract = os::Byteswap::byteswap(entry.VersionToExtract);
+	entry.GeneralBitFlag = os::Byteswap::byteswap(entry.GeneralBitFlag);
+	entry.CompressionMethod = os::Byteswap::byteswap(entry.CompressionMethod);
+	entry.LastModFileTime = os::Byteswap::byteswap(entry.LastModFileTime);
+	entry.LastModFileDate = os::Byteswap::byteswap(entry.LastModFileDate);
+	entry.CRC32 = os::Byteswap::byteswap(entry.CRC32);
+	entry.CompressedSize = os::Byteswap::byteswap(entry.CompressedSize);
+	entry.UncompressedSize = os::Byteswap::byteswap(entry.UncompressedSize);
+	entry.FilenameLength = os::Byteswap::byteswap(entry.FilenameLength);
+	entry.ExtraFieldLength = os::Byteswap::byteswap(entry.ExtraFieldLength);
+	entry.FileCommentLength = os::Byteswap::byteswap(entry.FileCommentLength);
+	entry.DiskNumberStart = os::Byteswap::byteswap(entry.DiskNumberStart);
+	entry.InternalFileAttributes = os::Byteswap::byteswap(entry.InternalFileAttributes);
+	entry.ExternalFileAttributes = os::Byteswap::byteswap(entry.ExternalFileAttributes);
+	entry.RelativeOffsetOfLocalHeader = os::Byteswap::byteswap(entry.RelativeOffsetOfLocalHeader);
+#endif
+
+	if (entry.Sig != 0x02014b50)
+		return false; // central dir headers end here.
+
+	const long pos = File->getPos();
+	File->seek(entry.RelativeOffsetOfLocalHeader);
+	scanZipHeader(true);
+	File->seek(pos + entry.FilenameLength + entry.ExtraFieldLength + entry.FileCommentLength);
+	FileInfo.getLast().header.DataDescriptor.CompressedSize = entry.CompressedSize;
+	FileInfo.getLast().header.DataDescriptor.UncompressedSize = entry.UncompressedSize;
+	FileInfo.getLast().header.DataDescriptor.CRC32 = entry.CRC32;
+	Files.getLast().Size = entry.UncompressedSize;
+	return true;
+}
+
+//! opens a file by file name
+IReadFile *CZipReader::createAndOpenFile(const io::path &filename)
+{
+	s32 index = findFile(filename, false);
+
+	if (index != -1)
+		return createAndOpenFile(index);
+
+	return 0;
+}
+
+//! opens a file by index
+IReadFile *CZipReader::createAndOpenFile(u32 index)
+{
+	// Irrlicht supports 0, 8, 12, 14, 99
+	// 0 - The file is stored (no compression)
+	// 1 - The file is Shrunk
+	// 2 - The file is Reduced with compression factor 1
+	// 3 - The file is Reduced with compression factor 2
+	// 4 - The file is Reduced with compression factor 3
+	// 5 - The file is Reduced with compression factor 4
+	// 6 - The file is Imploded
+	// 7 - Reserved for Tokenizing compression algorithm
+	// 8 - The file is Deflated
+	// 9 - Reserved for enhanced Deflating
+	// 10 - PKWARE Date Compression Library Imploding
+	// 12 - bzip2 - Compression Method from libbz2, WinZip 10
+	// 14 - LZMA - Compression Method, WinZip 12
+	// 96 - Jpeg compression - Compression Method, WinZip 12
+	// 97 - WavPack - Compression Method, WinZip 11
+	// 98 - PPMd - Compression Method, WinZip 10
+	// 99 - AES encryption, WinZip 9
+
+	const SZipFileEntry &e = FileInfo[Files[index].ID];
+	char buf[64];
+	s16 actualCompressionMethod = e.header.CompressionMethod;
+	IReadFile *decrypted = 0;
+	u8 *decryptedBuf = 0;
+	u32 decryptedSize = e.header.DataDescriptor.CompressedSize;
+	switch (actualCompressionMethod) {
+	case 0: // no compression
+	{
+		if (decrypted)
+			return decrypted;
+		else
+			return createLimitReadFile(Files[index].FullName, File, e.Offset, decryptedSize);
+	}
+	case 8: {
+		const u32 uncompressedSize = e.header.DataDescriptor.UncompressedSize;
+		c8 *pBuf = new c8[uncompressedSize];
+		if (!pBuf) {
+			snprintf_irr(buf, 64, "Not enough memory for decompressing %s", Files[index].FullName.c_str());
+			os::Printer::log(buf, ELL_ERROR);
+			if (decrypted)
+				decrypted->drop();
+			return 0;
+		}
+
+		u8 *pcData = decryptedBuf;
+		if (!pcData) {
+			pcData = new u8[decryptedSize];
+			if (!pcData) {
+				snprintf_irr(buf, 64, "Not enough memory for decompressing %s", Files[index].FullName.c_str());
+				os::Printer::log(buf, ELL_ERROR);
+				delete[] pBuf;
+				return 0;
+			}
+
+			// memset(pcData, 0, decryptedSize);
+			File->seek(e.Offset);
+			File->read(pcData, decryptedSize);
+		}
+
+		// Setup the inflate stream.
+		z_stream stream;
+		s32 err;
+
+		stream.next_in = (Bytef *)pcData;
+		stream.avail_in = (uInt)decryptedSize;
+		stream.next_out = (Bytef *)pBuf;
+		stream.avail_out = uncompressedSize;
+		stream.zalloc = (alloc_func)0;
+		stream.zfree = (free_func)0;
+
+		// Perform inflation. wbits < 0 indicates no zlib header inside the data.
+		err = inflateInit2(&stream, -MAX_WBITS);
+		if (err == Z_OK) {
+			err = inflate(&stream, Z_FINISH);
+			inflateEnd(&stream);
+			if (err == Z_STREAM_END)
+				err = Z_OK;
+			err = Z_OK;
+			inflateEnd(&stream);
+		}
+
+		if (decrypted)
+			decrypted->drop();
+		else
+			delete[] pcData;
+
+		if (err != Z_OK) {
+			snprintf_irr(buf, 64, "Error decompressing %s", Files[index].FullName.c_str());
+			os::Printer::log(buf, ELL_ERROR);
+			delete[] pBuf;
+			return 0;
+		} else
+			return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
+	}
+	case 12: {
+		os::Printer::log("bzip2 decompression not supported. File cannot be read.", ELL_ERROR);
+		return 0;
+	}
+	case 14: {
+		os::Printer::log("lzma decompression not supported. File cannot be read.", ELL_ERROR);
+		return 0;
+	}
+	case 99:
+		// If we come here with an encrypted file, decryption support is missing
+		os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR);
+		return 0;
+	default:
+		snprintf_irr(buf, 64, "file has unsupported compression method. %s", Files[index].FullName.c_str());
+		os::Printer::log(buf, ELL_ERROR);
+		return 0;
+	};
+}
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/CZipReader.h b/irr/src/CZipReader.h
new file mode 100644
index 000000000..d9afd668a
--- /dev/null
+++ b/irr/src/CZipReader.h
@@ -0,0 +1,218 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReadFile.h"
+#include "irrArray.h"
+#include "irrString.h"
+#include "IFileSystem.h"
+#include "CFileList.h"
+
+namespace irr
+{
+namespace io
+{
+// set if the file is encrypted
+const s16 ZIP_FILE_ENCRYPTED = 0x0001;
+// the fields crc-32, compressed size and uncompressed size are set to
+// zero in the local header
+const s16 ZIP_INFO_IN_DATA_DESCRIPTOR = 0x0008;
+
+// byte-align structures
+#include "irrpack.h"
+
+struct SZIPFileDataDescriptor
+{
+	u32 CRC32;
+	u32 CompressedSize;
+	u32 UncompressedSize;
+} PACK_STRUCT;
+
+struct SZIPFileHeader
+{
+	u32 Sig; // 'PK0304' little endian (0x04034b50)
+	s16 VersionToExtract;
+	s16 GeneralBitFlag;
+	s16 CompressionMethod;
+	s16 LastModFileTime;
+	s16 LastModFileDate;
+	SZIPFileDataDescriptor DataDescriptor;
+	s16 FilenameLength;
+	s16 ExtraFieldLength;
+	// filename (variable size)
+	// extra field (variable size )
+} PACK_STRUCT;
+
+struct SZIPFileCentralDirFileHeader
+{
+	u32 Sig; // 'PK0102' (0x02014b50)
+	u16 VersionMadeBy;
+	u16 VersionToExtract;
+	u16 GeneralBitFlag;
+	u16 CompressionMethod;
+	u16 LastModFileTime;
+	u16 LastModFileDate;
+	u32 CRC32;
+	u32 CompressedSize;
+	u32 UncompressedSize;
+	u16 FilenameLength;
+	u16 ExtraFieldLength;
+	u16 FileCommentLength;
+	u16 DiskNumberStart;
+	u16 InternalFileAttributes;
+	u32 ExternalFileAttributes;
+	u32 RelativeOffsetOfLocalHeader;
+
+	// filename (variable size)
+	// extra field (variable size)
+	// file comment (variable size)
+
+} PACK_STRUCT;
+
+struct SZIPFileCentralDirEnd
+{
+	u32 Sig;           // 'PK0506' end_of central dir signature			// (0x06054b50)
+	u16 NumberDisk;    // number of this disk
+	u16 NumberStart;   // number of the disk with the start of the central directory
+	u16 TotalDisk;     // total number of entries in the central dir on this disk
+	u16 TotalEntries;  // total number of entries in the central dir
+	u32 Size;          // size of the central directory
+	u32 Offset;        // offset of start of centraldirectory with respect to the starting disk number
+	u16 CommentLength; // zipfile comment length
+					   // zipfile comment (variable size)
+} PACK_STRUCT;
+
+struct SZipFileExtraHeader
+{
+	s16 ID;
+	s16 Size;
+} PACK_STRUCT;
+
+struct SZipFileAESExtraData
+{
+	s16 Version;
+	u8 Vendor[2];
+	u8 EncryptionStrength;
+	s16 CompressionMode;
+} PACK_STRUCT;
+
+enum E_GZIP_FLAGS
+{
+	EGZF_TEXT_DAT = 1,
+	EGZF_CRC16 = 2,
+	EGZF_EXTRA_FIELDS = 4,
+	EGZF_FILE_NAME = 8,
+	EGZF_COMMENT = 16
+};
+
+struct SGZIPMemberHeader
+{
+	u16 sig;              // 0x8b1f
+	u8 compressionMethod; // 8 = deflate
+	u8 flags;
+	u32 time;
+	u8 extraFlags; // slow compress = 2, fast compress = 4
+	u8 operatingSystem;
+} PACK_STRUCT;
+
+// Default alignment
+#include "irrunpack.h"
+
+//! Contains extended info about zip files in the archive
+struct SZipFileEntry
+{
+	//! Position of data in the archive file
+	s32 Offset;
+
+	//! The header for this file containing compression info etc
+	SZIPFileHeader header;
+};
+
+//! Archiveloader capable of loading ZIP Archives
+class CArchiveLoaderZIP : public IArchiveLoader
+{
+public:
+	//! Constructor
+	CArchiveLoaderZIP(io::IFileSystem *fs);
+
+	//! returns true if the file maybe is able to be loaded by this class
+	//! based on the file extension (e.g. ".zip")
+	bool isALoadableFileFormat(const io::path &filename) const override;
+
+	//! Check if the file might be loaded by this class
+	/** Check might look into the file.
+	\param file File handle to check.
+	\return True if file seems to be loadable. */
+	bool isALoadableFileFormat(io::IReadFile *file) const override;
+
+	//! Check to see if the loader can create archives of this type.
+	/** Check based on the archive type.
+	\param fileType The archive type to check.
+	\return True if the archile loader supports this type, false if not */
+	bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const override;
+
+	//! Creates an archive from the filename
+	/** \param file File handle to check.
+	\return Pointer to newly created archive, or 0 upon error. */
+	IFileArchive *createArchive(const io::path &filename, bool ignoreCase, bool ignorePaths) const override;
+
+	//! creates/loads an archive from the file.
+	//! \return Pointer to the created archive. Returns 0 if loading failed.
+	io::IFileArchive *createArchive(io::IReadFile *file, bool ignoreCase, bool ignorePaths) const override;
+
+private:
+	io::IFileSystem *FileSystem;
+};
+
+/*!
+	Zip file Reader written April 2002 by N.Gebhardt.
+*/
+class CZipReader : public virtual IFileArchive, virtual CFileList
+{
+public:
+	//! constructor
+	CZipReader(IFileSystem *fs, IReadFile *file, bool ignoreCase, bool ignorePaths, bool isGZip = false);
+
+	//! destructor
+	virtual ~CZipReader();
+
+	//! opens a file by file name
+	IReadFile *createAndOpenFile(const io::path &filename) override;
+
+	//! opens a file by index
+	IReadFile *createAndOpenFile(u32 index) override;
+
+	//! returns the list of files
+	const IFileList *getFileList() const override;
+
+	//! get the archive type
+	E_FILE_ARCHIVE_TYPE getType() const override;
+
+	//! return the id of the file Archive
+	const io::path &getArchiveName() const override { return Path; }
+
+protected:
+	//! reads the next file header from a ZIP file, returns false if there are no more headers.
+	/* if ignoreGPBits is set, the item will be read despite missing
+	file information. This is used when reading items from the central
+	directory. */
+	bool scanZipHeader(bool ignoreGPBits = false);
+
+	//! the same but for gzip files
+	bool scanGZipHeader();
+
+	bool scanCentralDirectoryHeader();
+
+	io::IFileSystem *FileSystem;
+	IReadFile *File;
+
+	// holds extended info about files
+	core::array<SZipFileEntry> FileInfo;
+
+	bool IsGZip;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/IAttribute.h b/irr/src/IAttribute.h
new file mode 100644
index 000000000..b0dc76eee
--- /dev/null
+++ b/irr/src/IAttribute.h
@@ -0,0 +1,51 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "IReferenceCounted.h"
+#include "SColor.h"
+#include "vector3d.h"
+#include "vector2d.h"
+#include "position2d.h"
+#include "rect.h"
+#include "dimension2d.h"
+#include "irrString.h"
+#include "irrArray.h"
+#include "EAttributes.h"
+
+namespace irr
+{
+namespace io
+{
+
+// All derived attribute types implement at least getter/setter for their own type (like CBoolAttribute will have setBool/getBool).
+// Simple types will also implement getStringW and setString, but don't expect it to work for all types.
+// String serialization makes no sense for some attribute-types (like stringw arrays or pointers), but is still useful for many types.
+// (Note: I do _not_ know yet why the default string serialization is asymmetric with char* in set and wchar_t* in get).
+// Additionally many attribute types will implement conversion functions like CBoolAttribute has p.E. getInt/setInt().
+// The reason for conversion functions is likely to make reading old formats easier which have changed in the meantime. For example
+// an old xml can contain a bool attribute which is an int in a newer format. You can still call getInt() even thought the attribute has the wrong type.
+// And please do _not_ confuse these attributes here with the ones used in the xml-reader (aka SAttribute which is just a key-value pair).
+
+class IAttribute : public virtual IReferenceCounted
+{
+public:
+	virtual ~IAttribute(){};
+
+	virtual s32 getInt() const { return 0; }
+	virtual f32 getFloat() const { return 0; }
+	virtual bool getBool() const { return false; }
+
+	virtual void setInt(s32 intValue){};
+	virtual void setFloat(f32 floatValue){};
+	virtual void setBool(bool boolValue){};
+
+	core::stringc Name;
+
+	virtual E_ATTRIBUTE_TYPE getType() const = 0;
+};
+
+} // end namespace io
+} // end namespace irr
diff --git a/irr/src/Irrlicht.cpp b/irr/src/Irrlicht.cpp
new file mode 100644
index 000000000..d119584e3
--- /dev/null
+++ b/irr/src/Irrlicht.cpp
@@ -0,0 +1,121 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+static const char *const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Gebhardt"; // put string in binary
+
+#include "irrlicht.h"
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
+#include "CIrrDeviceWin32.h"
+#endif
+
+#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
+#include "CIrrDeviceLinux.h"
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+#include "CIrrDeviceOSX.h"
+#endif
+
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+#include "CIrrDeviceSDL.h"
+#endif
+
+namespace irr
+{
+//! stub for calling createDeviceEx
+IRRLICHT_API IrrlichtDevice *IRRCALLCONV createDevice(video::E_DRIVER_TYPE driverType,
+		const core::dimension2d<u32> &windowSize,
+		u32 bits, bool fullscreen,
+		bool stencilbuffer, bool vsync, IEventReceiver *res)
+{
+	(void)copyright; // prevent unused variable warning
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = driverType;
+	p.WindowSize = windowSize;
+	p.Bits = (u8)bits;
+	p.Fullscreen = fullscreen;
+	p.Stencilbuffer = stencilbuffer;
+	p.Vsync = vsync;
+	p.EventReceiver = res;
+
+	return createDeviceEx(p);
+}
+
+extern "C" IRRLICHT_API IrrlichtDevice *IRRCALLCONV createDeviceEx(const SIrrlichtCreationParameters &params)
+{
+
+	IrrlichtDevice *dev = 0;
+
+#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
+	if (params.DeviceType == EIDT_WIN32 || (!dev && params.DeviceType == EIDT_BEST))
+		dev = new CIrrDeviceWin32(params);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
+	if (params.DeviceType == EIDT_OSX || (!dev && params.DeviceType == EIDT_BEST))
+		dev = new CIrrDeviceMacOSX(params);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_X11_DEVICE_
+	if (params.DeviceType == EIDT_X11 || (!dev && params.DeviceType == EIDT_BEST))
+		dev = new CIrrDeviceLinux(params);
+#endif
+
+#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
+	if (params.DeviceType == EIDT_SDL || (!dev && params.DeviceType == EIDT_BEST))
+		dev = new CIrrDeviceSDL(params);
+#endif
+
+	if (dev && !dev->getVideoDriver() && params.DriverType != video::EDT_NULL) {
+		dev->closeDevice(); // destroy window
+		dev->run();         // consume quit message
+		dev->drop();
+		dev = 0;
+	}
+
+	return dev;
+}
+
+namespace core
+{
+const matrix4 IdentityMatrix(matrix4::EM4CONST_IDENTITY);
+}
+
+namespace video
+{
+SMaterial IdentityMaterial;
+
+extern "C" IRRLICHT_API bool IRRCALLCONV isDriverSupported(E_DRIVER_TYPE driver)
+{
+	switch (driver) {
+	case EDT_NULL:
+		return true;
+#ifdef ENABLE_OPENGL3
+	case EDT_OPENGL3:
+		return true;
+#endif
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+	case EDT_OPENGL:
+		return true;
+#endif
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+	case EDT_OGLES1:
+		return true;
+#endif
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+	case EDT_OGLES2:
+		return true;
+#endif
+#ifdef _IRR_COMPILE_WITH_WEBGL1_
+	case EDT_WEBGL1:
+		return true;
+#endif
+	default:
+		return false;
+	}
+}
+}
+
+} // end namespace irr
diff --git a/irr/src/KHR/khrplatform.h b/irr/src/KHR/khrplatform.h
new file mode 100644
index 000000000..84821e08b
--- /dev/null
+++ b/irr/src/KHR/khrplatform.h
@@ -0,0 +1,310 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+/* If the preprocessor constant KHRONOS_STATIC is defined, make the
+ * header compatible with static linking. */
+#define KHRONOS_APICALL
+#elif defined(_WIN32)
+#define KHRONOS_APICALL __declspec(dllimport)
+#elif defined(__SYMBIAN32__)
+#define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+/* Win32 but not WinCE */
+#define KHRONOS_APIENTRY __stdcall
+#else
+#define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined(__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t khronos_int32_t;
+typedef uint32_t khronos_uint32_t;
+typedef int64_t khronos_int64_t;
+typedef uint64_t khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64 1
+#define KHRONOS_SUPPORT_FLOAT 1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t khronos_int32_t;
+typedef uint32_t khronos_uint32_t;
+typedef int64_t khronos_int64_t;
+typedef uint64_t khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64 1
+#define KHRONOS_SUPPORT_FLOAT 1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32 khronos_int32_t;
+typedef unsigned __int32 khronos_uint32_t;
+typedef __int64 khronos_int64_t;
+typedef unsigned __int64 khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64 1
+#define KHRONOS_SUPPORT_FLOAT 1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int khronos_int32_t;
+typedef unsigned int khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int khronos_int64_t;
+typedef unsigned long int khronos_uint64_t;
+#else
+typedef long long int khronos_int64_t;
+typedef unsigned long long int khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64 1
+#define KHRONOS_SUPPORT_FLOAT 1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int khronos_int32_t;
+typedef unsigned int khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64 0
+#define KHRONOS_SUPPORT_FLOAT 0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t khronos_int32_t;
+typedef uint32_t khronos_uint32_t;
+typedef int64_t khronos_int64_t;
+typedef uint64_t khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64 1
+#define KHRONOS_SUPPORT_FLOAT 1
+
+#endif
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed char khronos_int8_t;
+typedef unsigned char khronos_uint8_t;
+typedef signed short int khronos_int16_t;
+typedef unsigned short int khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t khronos_intptr_t;
+typedef uintptr_t khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed long int khronos_intptr_t;
+typedef unsigned long int khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed long int khronos_ssize_t;
+typedef unsigned long int khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef float khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t khronos_utime_nanoseconds_t;
+typedef khronos_int64_t khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum
+{
+	KHRONOS_FALSE = 0,
+	KHRONOS_TRUE = 1,
+	KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
diff --git a/irr/src/OpenGL/Common.h b/irr/src/OpenGL/Common.h
new file mode 100644
index 000000000..84b2ec3e4
--- /dev/null
+++ b/irr/src/OpenGL/Common.h
@@ -0,0 +1,60 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2015 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+// even though we have mt_opengl.h our driver code still uses GL_* constants
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#include <SDL_video.h>
+#include <SDL_opengl.h>
+#else
+#include "vendor/gl.h"
+#endif
+
+// macro used with COpenGL3DriverBase
+#define TEST_GL_ERROR(cls) (cls)->testGLError(__FILE__, __LINE__)
+
+namespace irr
+{
+namespace video
+{
+
+// Forward declarations.
+
+class COpenGLCoreFeature;
+
+template <class TOpenGLDriver>
+class COpenGLCoreTexture;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreRenderTarget;
+
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreCacheHandler;
+
+class COpenGL3DriverBase;
+typedef COpenGLCoreTexture<COpenGL3DriverBase> COpenGL3Texture;
+typedef COpenGLCoreRenderTarget<COpenGL3DriverBase, COpenGL3Texture> COpenGL3RenderTarget;
+typedef COpenGLCoreCacheHandler<COpenGL3DriverBase, COpenGL3Texture> COpenGL3CacheHandler;
+
+enum class OpenGLSpec : u8
+{
+	Core,
+	Compat,
+	ES,
+	// WebGL, // TODO
+};
+
+struct OpenGLVersion
+{
+	OpenGLSpec Spec;
+	u8 Major;
+	u8 Minor;
+	u8 Release;
+};
+
+}
+}
diff --git a/irr/src/OpenGL/Driver.cpp b/irr/src/OpenGL/Driver.cpp
new file mode 100644
index 000000000..0dd6ea1bb
--- /dev/null
+++ b/irr/src/OpenGL/Driver.cpp
@@ -0,0 +1,1968 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2014 Patryk Nadrowski
+// Copyright (C) 2009-2010 Amundis
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "Driver.h"
+#include <cassert>
+#include "CNullDriver.h"
+#include "IContextManager.h"
+
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreRenderTarget.h"
+#include "COpenGLCoreCacheHandler.h"
+
+#include "MaterialRenderer.h"
+#include "FixedPipelineRenderer.h"
+#include "Renderer2D.h"
+
+#include "EVertexAttributes.h"
+#include "CImage.h"
+#include "os.h"
+
+#include "mt_opengl.h"
+
+namespace irr
+{
+namespace video
+{
+struct VertexAttribute
+{
+	enum class Mode
+	{
+		Regular,
+		Normalized,
+		Integral,
+	};
+	int Index;
+	int ComponentCount;
+	GLenum ComponentType;
+	Mode mode;
+	int Offset;
+};
+
+struct VertexType
+{
+	int VertexSize;
+	std::vector<VertexAttribute> Attributes;
+};
+
+static const VertexAttribute *begin(const VertexType &type)
+{
+	return type.Attributes.data();
+}
+
+static const VertexAttribute *end(const VertexType &type)
+{
+	return type.Attributes.data() + type.Attributes.size();
+}
+
+static const VertexType vtStandard = {
+		sizeof(S3DVertex),
+		{
+				{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
+				{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Normal)},
+				{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)},
+				{EVA_TCOORD0, 2, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, TCoords)},
+		},
+};
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
+
+static const VertexType vt2TCoords = {
+		sizeof(S3DVertex2TCoords),
+		{
+				{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Pos)},
+				{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, Normal)},
+				{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex2TCoords, Color)},
+				{EVA_TCOORD0, 2, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, TCoords)},
+				{EVA_TCOORD1, 2, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex2TCoords, TCoords2)},
+		},
+};
+
+static const VertexType vtTangents = {
+		sizeof(S3DVertexTangents),
+		{
+				{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Pos)},
+				{EVA_NORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Normal)},
+				{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertexTangents, Color)},
+				{EVA_TCOORD0, 2, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, TCoords)},
+				{EVA_TANGENT, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Tangent)},
+				{EVA_BINORMAL, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertexTangents, Binormal)},
+		},
+};
+
+#pragma GCC diagnostic pop
+
+static const VertexType &getVertexTypeDescription(E_VERTEX_TYPE type)
+{
+	switch (type) {
+	case EVT_STANDARD:
+		return vtStandard;
+	case EVT_2TCOORDS:
+		return vt2TCoords;
+	case EVT_TANGENTS:
+		return vtTangents;
+	default:
+		assert(false);
+	}
+}
+
+static const VertexType vt2DImage = {
+		sizeof(S3DVertex),
+		{
+				{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
+				{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)},
+				{EVA_TCOORD0, 2, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, TCoords)},
+		},
+};
+
+static const VertexType vtPrimitive = {
+		sizeof(S3DVertex),
+		{
+				{EVA_POSITION, 3, GL_FLOAT, VertexAttribute::Mode::Regular, offsetof(S3DVertex, Pos)},
+				{EVA_COLOR, 4, GL_UNSIGNED_BYTE, VertexAttribute::Mode::Normalized, offsetof(S3DVertex, Color)},
+		},
+};
+
+void APIENTRY COpenGL3DriverBase::debugCb(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
+{
+	((COpenGL3DriverBase *)userParam)->debugCb(source, type, id, severity, length, message);
+}
+
+void COpenGL3DriverBase::debugCb(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message)
+{
+	// shader compiler can be very noisy
+	if (source == GL_DEBUG_SOURCE_SHADER_COMPILER && severity == GL_DEBUG_SEVERITY_NOTIFICATION)
+		return;
+
+	ELOG_LEVEL ll = ELL_INFORMATION;
+	if (severity == GL_DEBUG_SEVERITY_HIGH)
+		ll = ELL_ERROR;
+	else if (severity == GL_DEBUG_SEVERITY_MEDIUM)
+		ll = ELL_WARNING;
+	char buf[256];
+	snprintf_irr(buf, sizeof(buf), "%04x %04x %.*s", source, type, length, message);
+	os::Printer::log("GL", buf, ll);
+}
+
+COpenGL3DriverBase::COpenGL3DriverBase(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager) :
+		CNullDriver(io, params.WindowSize), COpenGL3ExtensionHandler(), CacheHandler(0),
+		Params(params), ResetRenderStates(true), LockRenderStateMode(false), AntiAlias(params.AntiAlias),
+		MaterialRenderer2DActive(0), MaterialRenderer2DTexture(0), MaterialRenderer2DNoTexture(0),
+		CurrentRenderMode(ERM_NONE), Transformation3DChanged(true),
+		OGLES2ShaderPath(params.OGLES2ShaderPath),
+		ColorFormat(ECF_R8G8B8), ContextManager(contextManager), EnableErrorTest(params.DriverDebug)
+{
+#ifdef _DEBUG
+	setDebugName("Driver");
+#endif
+
+	if (!ContextManager)
+		return;
+
+	ContextManager->grab();
+	ContextManager->generateSurface();
+	ContextManager->generateContext();
+	ExposedData = ContextManager->getContext();
+	ContextManager->activateContext(ExposedData, false);
+	GL.LoadAllProcedures(ContextManager);
+	if (EnableErrorTest) {
+		GL.Enable(GL_DEBUG_OUTPUT);
+		GL.DebugMessageCallback(debugCb, this);
+	}
+	initQuadsIndices();
+}
+
+COpenGL3DriverBase::~COpenGL3DriverBase()
+{
+	deleteMaterialRenders();
+
+	CacheHandler->getTextureCache().clear();
+
+	removeAllRenderTargets();
+	deleteAllTextures();
+	removeAllOcclusionQueries();
+	removeAllHardwareBuffers();
+
+	delete MaterialRenderer2DTexture;
+	delete MaterialRenderer2DNoTexture;
+	delete CacheHandler;
+
+	if (ContextManager) {
+		ContextManager->destroyContext();
+		ContextManager->destroySurface();
+		ContextManager->terminate();
+		ContextManager->drop();
+	}
+}
+
+void COpenGL3DriverBase::initQuadsIndices(int max_vertex_count)
+{
+	int max_quad_count = max_vertex_count / 4;
+	std::vector<GLushort> QuadsIndices;
+	QuadsIndices.reserve(6 * max_quad_count);
+	for (int k = 0; k < max_quad_count; k++) {
+		QuadsIndices.push_back(4 * k + 0);
+		QuadsIndices.push_back(4 * k + 1);
+		QuadsIndices.push_back(4 * k + 2);
+		QuadsIndices.push_back(4 * k + 0);
+		QuadsIndices.push_back(4 * k + 2);
+		QuadsIndices.push_back(4 * k + 3);
+	}
+	GL.GenBuffers(1, &QuadIndexBuffer);
+	GL.BindBuffer(GL_ARRAY_BUFFER, QuadIndexBuffer);
+	GL.BufferData(GL_ARRAY_BUFFER, sizeof(QuadsIndices[0]) * QuadsIndices.size(), QuadsIndices.data(), GL_STATIC_DRAW);
+	GL.BindBuffer(GL_ARRAY_BUFFER, 0);
+	QuadIndexCount = QuadsIndices.size();
+}
+
+void COpenGL3DriverBase::initVersion()
+{
+	Name = GL.GetString(GL_VERSION);
+	printVersion();
+
+	// print renderer information
+	VendorName = GL.GetString(GL_VENDOR);
+	os::Printer::log("Vendor", VendorName.c_str(), ELL_INFORMATION);
+
+	Version = getVersionFromOpenGL();
+}
+
+bool COpenGL3DriverBase::isVersionAtLeast(int major, int minor) const noexcept
+{
+	if (Version.Major < major)
+		return false;
+	if (Version.Major > major)
+		return true;
+	return Version.Minor >= minor;
+}
+
+bool COpenGL3DriverBase::genericDriverInit(const core::dimension2d<u32> &screenSize, bool stencilBuffer)
+{
+	initVersion();
+	initFeatures();
+	printTextureFormats();
+
+	// reset cache handler
+	delete CacheHandler;
+	CacheHandler = new COpenGL3CacheHandler(this);
+
+	StencilBuffer = stencilBuffer;
+
+	DriverAttributes->setAttribute("MaxTextures", (s32)Feature.MaxTextureUnits);
+	DriverAttributes->setAttribute("MaxSupportedTextures", (s32)Feature.MaxTextureUnits);
+	//		DriverAttributes->setAttribute("MaxLights", MaxLights);
+	DriverAttributes->setAttribute("MaxAnisotropy", MaxAnisotropy);
+	//		DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes);
+	//		DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers);
+	//		DriverAttributes->setAttribute("MaxMultipleRenderTargets", MaxMultipleRenderTargets);
+	DriverAttributes->setAttribute("MaxIndices", (s32)MaxIndices);
+	DriverAttributes->setAttribute("MaxTextureSize", (s32)MaxTextureSize);
+	DriverAttributes->setAttribute("MaxTextureLODBias", MaxTextureLODBias);
+	DriverAttributes->setAttribute("Version", 100 * Version.Major + Version.Minor);
+	DriverAttributes->setAttribute("AntiAlias", AntiAlias);
+
+	GL.PixelStorei(GL_PACK_ALIGNMENT, 1);
+
+	UserClipPlane.reallocate(0);
+
+	for (s32 i = 0; i < ETS_COUNT; ++i)
+		setTransform(static_cast<E_TRANSFORMATION_STATE>(i), core::IdentityMatrix);
+
+	setAmbientLight(SColorf(0.0f, 0.0f, 0.0f, 0.0f));
+	GL.ClearDepthf(1.0f);
+
+	GL.Hint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
+	GL.FrontFace(GL_CW);
+
+	// create material renderers
+	createMaterialRenderers();
+
+	// set the renderstates
+	setRenderStates3DMode();
+
+	// set fog mode
+	setFog(FogColor, FogType, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
+
+	// create matrix for flipping textures
+	TextureFlipMatrix.buildTextureTransform(0.0f, core::vector2df(0, 0), core::vector2df(0, 1.0f), core::vector2df(1.0f, -1.0f));
+
+	// We need to reset once more at the beginning of the first rendering.
+	// This fixes problems with intermediate changes to the material during texture load.
+	ResetRenderStates = true;
+
+	TEST_GL_ERROR(this);
+
+	return true;
+}
+
+void COpenGL3DriverBase::printTextureFormats()
+{
+	char buf[128];
+	for (u32 i = 0; i < static_cast<u32>(ECF_UNKNOWN); i++) {
+		auto &info = TextureFormats[i];
+		if (!info.InternalFormat) {
+			snprintf_irr(buf, sizeof(buf), "%s -> unsupported", ColorFormatNames[i]);
+		} else {
+			snprintf_irr(buf, sizeof(buf), "%s -> %#06x %#06x %#06x%s",
+					ColorFormatNames[i], info.InternalFormat, info.PixelFormat,
+					info.PixelType, info.Converter ? " (c)" : "");
+		}
+		os::Printer::log(buf, ELL_DEBUG);
+	}
+}
+
+void COpenGL3DriverBase::loadShaderData(const io::path &vertexShaderName, const io::path &fragmentShaderName, c8 **vertexShaderData, c8 **fragmentShaderData)
+{
+	io::path vsPath(OGLES2ShaderPath);
+	vsPath += vertexShaderName;
+
+	io::path fsPath(OGLES2ShaderPath);
+	fsPath += fragmentShaderName;
+
+	*vertexShaderData = 0;
+	*fragmentShaderData = 0;
+
+	io::IReadFile *vsFile = FileSystem->createAndOpenFile(vsPath);
+	if (!vsFile) {
+		std::string warning("Warning: Missing shader files needed to simulate fixed function materials:\n");
+		warning.append(vsPath.c_str()).append("\n");
+		warning += "Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
+		os::Printer::log(warning.c_str(), ELL_WARNING);
+		return;
+	}
+
+	io::IReadFile *fsFile = FileSystem->createAndOpenFile(fsPath);
+	if (!fsFile) {
+		std::string warning("Warning: Missing shader files needed to simulate fixed function materials:\n");
+		warning.append(fsPath.c_str()).append("\n");
+		warning += "Shaderpath can be changed in SIrrCreationParamters::OGLES2ShaderPath";
+		os::Printer::log(warning.c_str(), ELL_WARNING);
+		return;
+	}
+
+	long size = vsFile->getSize();
+	if (size) {
+		*vertexShaderData = new c8[size + 1];
+		vsFile->read(*vertexShaderData, size);
+		(*vertexShaderData)[size] = 0;
+	}
+	{
+		auto tmp = std::string("Loaded ") + std::to_string(size) + " bytes for vertex shader " + vertexShaderName.c_str();
+		os::Printer::log(tmp.c_str(), ELL_INFORMATION);
+	}
+
+	size = fsFile->getSize();
+	if (size) {
+		// if both handles are the same we must reset the file
+		if (fsFile == vsFile)
+			fsFile->seek(0);
+
+		*fragmentShaderData = new c8[size + 1];
+		fsFile->read(*fragmentShaderData, size);
+		(*fragmentShaderData)[size] = 0;
+	}
+	{
+		auto tmp = std::string("Loaded ") + std::to_string(size) + " bytes for fragment shader " + fragmentShaderName.c_str();
+		os::Printer::log(tmp.c_str(), ELL_INFORMATION);
+	}
+
+	vsFile->drop();
+	fsFile->drop();
+}
+
+void COpenGL3DriverBase::createMaterialRenderers()
+{
+	// Create callbacks.
+
+	COpenGL3MaterialSolidCB *SolidCB = new COpenGL3MaterialSolidCB();
+	COpenGL3MaterialSolidCB *TransparentAlphaChannelCB = new COpenGL3MaterialSolidCB();
+	COpenGL3MaterialSolidCB *TransparentAlphaChannelRefCB = new COpenGL3MaterialSolidCB();
+	COpenGL3MaterialSolidCB *TransparentVertexAlphaCB = new COpenGL3MaterialSolidCB();
+	COpenGL3MaterialOneTextureBlendCB *OneTextureBlendCB = new COpenGL3MaterialOneTextureBlendCB();
+
+	// Create built-in materials.
+	// The addition order must be the same as in the E_MATERIAL_TYPE enumeration. Thus the
+
+	const core::stringc VertexShader = OGLES2ShaderPath + "Solid.vsh";
+
+	// EMT_SOLID
+	core::stringc FragmentShader = OGLES2ShaderPath + "Solid.fsh";
+	addHighLevelShaderMaterialFromFiles(VertexShader, "main", EVST_VS_2_0, FragmentShader, "main", EPST_PS_2_0, "", "main",
+			EGST_GS_4_0, scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0, SolidCB, EMT_SOLID, 0);
+
+	// EMT_TRANSPARENT_ALPHA_CHANNEL
+	FragmentShader = OGLES2ShaderPath + "TransparentAlphaChannel.fsh";
+	addHighLevelShaderMaterialFromFiles(VertexShader, "main", EVST_VS_2_0, FragmentShader, "main", EPST_PS_2_0, "", "main",
+			EGST_GS_4_0, scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0, TransparentAlphaChannelCB, EMT_TRANSPARENT_ALPHA_CHANNEL, 0);
+
+	// EMT_TRANSPARENT_ALPHA_CHANNEL_REF
+	FragmentShader = OGLES2ShaderPath + "TransparentAlphaChannelRef.fsh";
+	addHighLevelShaderMaterialFromFiles(VertexShader, "main", EVST_VS_2_0, FragmentShader, "main", EPST_PS_2_0, "", "main",
+			EGST_GS_4_0, scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0, TransparentAlphaChannelRefCB, EMT_SOLID, 0);
+
+	// EMT_TRANSPARENT_VERTEX_ALPHA
+	FragmentShader = OGLES2ShaderPath + "TransparentVertexAlpha.fsh";
+	addHighLevelShaderMaterialFromFiles(VertexShader, "main", EVST_VS_2_0, FragmentShader, "main", EPST_PS_2_0, "", "main",
+			EGST_GS_4_0, scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0, TransparentVertexAlphaCB, EMT_TRANSPARENT_ALPHA_CHANNEL, 0);
+
+	// EMT_ONETEXTURE_BLEND
+	FragmentShader = OGLES2ShaderPath + "OneTextureBlend.fsh";
+	addHighLevelShaderMaterialFromFiles(VertexShader, "main", EVST_VS_2_0, FragmentShader, "main", EPST_PS_2_0, "", "main",
+			EGST_GS_4_0, scene::EPT_TRIANGLES, scene::EPT_TRIANGLE_STRIP, 0, OneTextureBlendCB, EMT_ONETEXTURE_BLEND, 0);
+
+	// Drop callbacks.
+
+	SolidCB->drop();
+	TransparentAlphaChannelCB->drop();
+	TransparentAlphaChannelRefCB->drop();
+	TransparentVertexAlphaCB->drop();
+	OneTextureBlendCB->drop();
+
+	// Create 2D material renderers
+
+	c8 *vs2DData = 0;
+	c8 *fs2DData = 0;
+	loadShaderData(io::path("Renderer2D.vsh"), io::path("Renderer2D.fsh"), &vs2DData, &fs2DData);
+	MaterialRenderer2DTexture = new COpenGL3Renderer2D(vs2DData, fs2DData, this, true);
+	delete[] vs2DData;
+	delete[] fs2DData;
+	vs2DData = 0;
+	fs2DData = 0;
+
+	loadShaderData(io::path("Renderer2D.vsh"), io::path("Renderer2D_noTex.fsh"), &vs2DData, &fs2DData);
+	MaterialRenderer2DNoTexture = new COpenGL3Renderer2D(vs2DData, fs2DData, this, false);
+	delete[] vs2DData;
+	delete[] fs2DData;
+}
+
+bool COpenGL3DriverBase::setMaterialTexture(irr::u32 layerIdx, const irr::video::ITexture *texture)
+{
+	Material.TextureLayers[layerIdx].Texture = const_cast<ITexture *>(texture); // function uses const-pointer for texture because all draw functions use const-pointers already
+	return CacheHandler->getTextureCache().set(0, texture);
+}
+
+bool COpenGL3DriverBase::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil, const SExposedVideoData &videoData, core::rect<s32> *sourceRect)
+{
+	CNullDriver::beginScene(clearFlag, clearColor, clearDepth, clearStencil, videoData, sourceRect);
+
+	if (ContextManager)
+		ContextManager->activateContext(videoData, true);
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+bool COpenGL3DriverBase::endScene()
+{
+	CNullDriver::endScene();
+
+	GL.Flush();
+
+	if (ContextManager)
+		return ContextManager->swapBuffers();
+
+	return false;
+}
+
+//! Returns the transformation set by setTransform
+const core::matrix4 &COpenGL3DriverBase::getTransform(E_TRANSFORMATION_STATE state) const
+{
+	return Matrices[state];
+}
+
+//! sets transformation
+void COpenGL3DriverBase::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat)
+{
+	Matrices[state] = mat;
+	Transformation3DChanged = true;
+}
+
+bool COpenGL3DriverBase::updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const u32 vertexCount = mb->getVertexCount();
+	const E_VERTEX_TYPE vType = mb->getVertexType();
+	const u32 vertexSize = getVertexPitchFromType(vType);
+
+	const void *buffer = vertices;
+	size_t bufferSize = vertexSize * vertexCount;
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_verticesID) {
+		GL.GenBuffers(1, &HWBuffer->vbo_verticesID);
+		if (!HWBuffer->vbo_verticesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_verticesSize < bufferSize) {
+		newBuffer = true;
+	}
+
+	GL.BindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		GL.BufferSubData(GL_ARRAY_BUFFER, 0, bufferSize, buffer);
+	else {
+		HWBuffer->vbo_verticesSize = bufferSize;
+
+		GLenum usage = GL_STATIC_DRAW;
+		if (HWBuffer->Mapped_Index == scene::EHM_STREAM)
+			usage = GL_STREAM_DRAW;
+		else if (HWBuffer->Mapped_Index == scene::EHM_DYNAMIC)
+			usage = GL_DYNAMIC_DRAW;
+		GL.BufferData(GL_ARRAY_BUFFER, bufferSize, buffer, usage);
+	}
+
+	GL.BindBuffer(GL_ARRAY_BUFFER, 0);
+
+	return (!TEST_GL_ERROR(this));
+}
+
+bool COpenGL3DriverBase::updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+
+	const void *indices = mb->getIndices();
+	u32 indexCount = mb->getIndexCount();
+
+	GLenum indexSize;
+	switch (mb->getIndexType()) {
+	case (EIT_16BIT): {
+		indexSize = sizeof(u16);
+		break;
+	}
+	case (EIT_32BIT): {
+		indexSize = sizeof(u32);
+		break;
+	}
+	default: {
+		return false;
+	}
+	}
+
+	// get or create buffer
+	bool newBuffer = false;
+	if (!HWBuffer->vbo_indicesID) {
+		GL.GenBuffers(1, &HWBuffer->vbo_indicesID);
+		if (!HWBuffer->vbo_indicesID)
+			return false;
+		newBuffer = true;
+	} else if (HWBuffer->vbo_indicesSize < indexCount * indexSize) {
+		newBuffer = true;
+	}
+
+	GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+
+	// copy data to graphics card
+	if (!newBuffer)
+		GL.BufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indexCount * indexSize, indices);
+	else {
+		HWBuffer->vbo_indicesSize = indexCount * indexSize;
+
+		GLenum usage = GL_STATIC_DRAW;
+		if (HWBuffer->Mapped_Index == scene::EHM_STREAM)
+			usage = GL_STREAM_DRAW;
+		else if (HWBuffer->Mapped_Index == scene::EHM_DYNAMIC)
+			usage = GL_DYNAMIC_DRAW;
+		GL.BufferData(GL_ELEMENT_ARRAY_BUFFER, indexCount * indexSize, indices, usage);
+	}
+
+	GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	return (!TEST_GL_ERROR(this));
+}
+
+//! updates hardware buffer if needed
+bool COpenGL3DriverBase::updateHardwareBuffer(SHWBufferLink *HWBuffer)
+{
+	if (!HWBuffer)
+		return false;
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Vertex != HWBuffer->MeshBuffer->getChangedID_Vertex() || !static_cast<SHWBufferLink_opengl *>(HWBuffer)->vbo_verticesID) {
+
+			HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+
+			if (!updateVertexHardwareBuffer(static_cast<SHWBufferLink_opengl *>(HWBuffer)))
+				return false;
+		}
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		if (HWBuffer->ChangedID_Index != HWBuffer->MeshBuffer->getChangedID_Index() || !static_cast<SHWBufferLink_opengl *>(HWBuffer)->vbo_indicesID) {
+
+			HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+
+			if (!updateIndexHardwareBuffer((SHWBufferLink_opengl *)HWBuffer))
+				return false;
+		}
+	}
+
+	return true;
+}
+
+//! Create hardware buffer from meshbuffer
+COpenGL3DriverBase::SHWBufferLink *COpenGL3DriverBase::createHardwareBuffer(const scene::IMeshBuffer *mb)
+{
+	if (!mb || (mb->getHardwareMappingHint_Index() == scene::EHM_NEVER && mb->getHardwareMappingHint_Vertex() == scene::EHM_NEVER))
+		return 0;
+
+	SHWBufferLink_opengl *HWBuffer = new SHWBufferLink_opengl(mb);
+
+	// add to map
+	HWBuffer->listPosition = HWBufferList.insert(HWBufferList.end(), HWBuffer);
+
+	HWBuffer->ChangedID_Vertex = HWBuffer->MeshBuffer->getChangedID_Vertex();
+	HWBuffer->ChangedID_Index = HWBuffer->MeshBuffer->getChangedID_Index();
+	HWBuffer->Mapped_Vertex = mb->getHardwareMappingHint_Vertex();
+	HWBuffer->Mapped_Index = mb->getHardwareMappingHint_Index();
+	HWBuffer->vbo_verticesID = 0;
+	HWBuffer->vbo_indicesID = 0;
+	HWBuffer->vbo_verticesSize = 0;
+	HWBuffer->vbo_indicesSize = 0;
+
+	if (!updateHardwareBuffer(HWBuffer)) {
+		deleteHardwareBuffer(HWBuffer);
+		return 0;
+	}
+
+	return HWBuffer;
+}
+
+void COpenGL3DriverBase::deleteHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	SHWBufferLink_opengl *HWBuffer = static_cast<SHWBufferLink_opengl *>(_HWBuffer);
+	if (HWBuffer->vbo_verticesID) {
+		GL.DeleteBuffers(1, &HWBuffer->vbo_verticesID);
+		HWBuffer->vbo_verticesID = 0;
+	}
+	if (HWBuffer->vbo_indicesID) {
+		GL.DeleteBuffers(1, &HWBuffer->vbo_indicesID);
+		HWBuffer->vbo_indicesID = 0;
+	}
+
+	CNullDriver::deleteHardwareBuffer(_HWBuffer);
+}
+
+//! Draw hardware buffer
+void COpenGL3DriverBase::drawHardwareBuffer(SHWBufferLink *_HWBuffer)
+{
+	if (!_HWBuffer)
+		return;
+
+	SHWBufferLink_opengl *HWBuffer = static_cast<SHWBufferLink_opengl *>(_HWBuffer);
+
+	updateHardwareBuffer(HWBuffer); // check if update is needed
+
+	const scene::IMeshBuffer *mb = HWBuffer->MeshBuffer;
+	const void *vertices = mb->getVertices();
+	const void *indexList = mb->getIndices();
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER) {
+		GL.BindBuffer(GL_ARRAY_BUFFER, HWBuffer->vbo_verticesID);
+		vertices = 0;
+	}
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER) {
+		GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, HWBuffer->vbo_indicesID);
+		indexList = 0;
+	}
+
+	drawVertexPrimitiveList(vertices, mb->getVertexCount(),
+			indexList, mb->getPrimitiveCount(),
+			mb->getVertexType(), mb->getPrimitiveType(),
+			mb->getIndexType());
+
+	if (HWBuffer->Mapped_Vertex != scene::EHM_NEVER)
+		GL.BindBuffer(GL_ARRAY_BUFFER, 0);
+
+	if (HWBuffer->Mapped_Index != scene::EHM_NEVER)
+		GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+}
+
+IRenderTarget *COpenGL3DriverBase::addRenderTarget()
+{
+	COpenGL3RenderTarget *renderTarget = new COpenGL3RenderTarget(this);
+	RenderTargets.push_back(renderTarget);
+
+	return renderTarget;
+}
+
+//! draws a vertex primitive list
+void COpenGL3DriverBase::drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+		const void *indexList, u32 primitiveCount,
+		E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType)
+{
+	if (!primitiveCount || !vertexCount)
+		return;
+
+	if (!checkPrimitiveCount(primitiveCount))
+		return;
+
+	CNullDriver::drawVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
+
+	setRenderStates3DMode();
+
+	auto &vTypeDesc = getVertexTypeDescription(vType);
+	beginDraw(vTypeDesc, reinterpret_cast<uintptr_t>(vertices));
+	GLenum indexSize = 0;
+
+	switch (iType) {
+	case (EIT_16BIT): {
+		indexSize = GL_UNSIGNED_SHORT;
+		break;
+	}
+	case (EIT_32BIT): {
+#ifdef GL_OES_element_index_uint
+#ifndef GL_UNSIGNED_INT
+#define GL_UNSIGNED_INT 0x1405
+#endif
+		if (FeatureAvailable[COGLESCoreExtensionHandler::IRR_GL_OES_element_index_uint])
+			indexSize = GL_UNSIGNED_INT;
+		else
+#endif
+			indexSize = GL_UNSIGNED_SHORT;
+		break;
+	}
+	}
+
+	switch (pType) {
+	case scene::EPT_POINTS:
+	case scene::EPT_POINT_SPRITES:
+		GL.DrawArrays(GL_POINTS, 0, primitiveCount);
+		break;
+	case scene::EPT_LINE_STRIP:
+		GL.DrawElements(GL_LINE_STRIP, primitiveCount + 1, indexSize, indexList);
+		break;
+	case scene::EPT_LINE_LOOP:
+		GL.DrawElements(GL_LINE_LOOP, primitiveCount, indexSize, indexList);
+		break;
+	case scene::EPT_LINES:
+		GL.DrawElements(GL_LINES, primitiveCount * 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_STRIP:
+		GL.DrawElements(GL_TRIANGLE_STRIP, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLE_FAN:
+		GL.DrawElements(GL_TRIANGLE_FAN, primitiveCount + 2, indexSize, indexList);
+		break;
+	case scene::EPT_TRIANGLES:
+		GL.DrawElements((LastMaterial.Wireframe) ? GL_LINES : (LastMaterial.PointCloud) ? GL_POINTS
+																						: GL_TRIANGLES,
+				primitiveCount * 3, indexSize, indexList);
+		break;
+	default:
+		break;
+	}
+
+	endDraw(vTypeDesc);
+}
+
+void COpenGL3DriverBase::draw2DImage(const video::ITexture *texture, const core::position2d<s32> &destPos,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect, SColor color,
+		bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	if (!sourceRect.isValid())
+		return;
+
+	SColor colors[4] = {color, color, color, color};
+	draw2DImage(texture, {destPos, sourceRect.getSize()}, sourceRect, clipRect, colors, useAlphaChannelOfTexture);
+}
+
+void COpenGL3DriverBase::draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+		const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect,
+		const video::SColor *const colors, bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	// texcoords need to be flipped horizontally for RTTs
+	const bool isRTT = texture->isRenderTarget();
+	const core::dimension2du &ss = texture->getOriginalSize();
+	const f32 invW = 1.f / static_cast<f32>(ss.Width);
+	const f32 invH = 1.f / static_cast<f32>(ss.Height);
+	const core::rect<f32> tcoords(
+			sourceRect.UpperLeftCorner.X * invW,
+			(isRTT ? sourceRect.LowerRightCorner.Y : sourceRect.UpperLeftCorner.Y) * invH,
+			sourceRect.LowerRightCorner.X * invW,
+			(isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH);
+
+	const video::SColor temp[4] = {
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+			0xFFFFFFFF,
+		};
+
+	const video::SColor *const useColor = colors ? colors : temp;
+
+	chooseMaterial2D();
+	if (!setMaterialTexture(0, texture))
+		return;
+
+	setRenderStates2DMode(useColor[0].getAlpha() < 255 || useColor[1].getAlpha() < 255 ||
+								  useColor[2].getAlpha() < 255 || useColor[3].getAlpha() < 255,
+			true, useAlphaChannelOfTexture);
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	if (clipRect) {
+		if (!clipRect->isValid())
+			return;
+
+		GL.Enable(GL_SCISSOR_TEST);
+		GL.Scissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
+				clipRect->getWidth(), clipRect->getHeight());
+	}
+
+	f32 left = (f32)destRect.UpperLeftCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 right = (f32)destRect.LowerRightCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 down = 2.f - (f32)destRect.LowerRightCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+	f32 top = 2.f - (f32)destRect.UpperLeftCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex(left, top, 0, 0, 0, 1, useColor[0], tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[1] = S3DVertex(right, top, 0, 0, 0, 1, useColor[3], tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y);
+	vertices[2] = S3DVertex(right, down, 0, 0, 0, 1, useColor[2], tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y);
+	vertices[3] = S3DVertex(left, down, 0, 0, 0, 1, useColor[1], tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y);
+
+	drawQuad(vt2DImage, vertices);
+
+	if (clipRect)
+		GL.Disable(GL_SCISSOR_TEST);
+
+	TEST_GL_ERROR(this);
+}
+
+void COpenGL3DriverBase::draw2DImage(const video::ITexture *texture, u32 layer, bool flip)
+{
+	if (!texture)
+		return;
+
+	chooseMaterial2D();
+	if (!setMaterialTexture(0, texture))
+		return;
+
+	setRenderStates2DMode(false, true, true);
+
+	S3DVertex quad2DVertices[4];
+
+	quad2DVertices[0].Pos = core::vector3df(-1.f, 1.f, 0.f);
+	quad2DVertices[1].Pos = core::vector3df(1.f, 1.f, 0.f);
+	quad2DVertices[2].Pos = core::vector3df(1.f, -1.f, 0.f);
+	quad2DVertices[3].Pos = core::vector3df(-1.f, -1.f, 0.f);
+
+	f32 modificator = (flip) ? 1.f : 0.f;
+
+	quad2DVertices[0].TCoords = core::vector2df(0.f, 0.f + modificator);
+	quad2DVertices[1].TCoords = core::vector2df(1.f, 0.f + modificator);
+	quad2DVertices[2].TCoords = core::vector2df(1.f, 1.f - modificator);
+	quad2DVertices[3].TCoords = core::vector2df(0.f, 1.f - modificator);
+
+	quad2DVertices[0].Color = SColor(0xFFFFFFFF);
+	quad2DVertices[1].Color = SColor(0xFFFFFFFF);
+	quad2DVertices[2].Color = SColor(0xFFFFFFFF);
+	quad2DVertices[3].Color = SColor(0xFFFFFFFF);
+
+	drawQuad(vt2DImage, quad2DVertices);
+}
+
+void COpenGL3DriverBase::draw2DImageBatch(const video::ITexture *texture,
+		const core::array<core::position2d<s32>> &positions,
+		const core::array<core::rect<s32>> &sourceRects,
+		const core::rect<s32> *clipRect,
+		SColor color, bool useAlphaChannelOfTexture)
+{
+	if (!texture)
+		return;
+
+	chooseMaterial2D();
+	if (!setMaterialTexture(0, texture))
+		return;
+
+	setRenderStates2DMode(color.getAlpha() < 255, true, useAlphaChannelOfTexture);
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	if (clipRect) {
+		if (!clipRect->isValid())
+			return;
+
+		GL.Enable(GL_SCISSOR_TEST);
+		GL.Scissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
+				clipRect->getWidth(), clipRect->getHeight());
+	}
+
+	const irr::u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
+	assert(6 * drawCount <= QuadIndexCount); // FIXME split the batch? or let it crash?
+
+	core::array<S3DVertex> vtx(drawCount * 4);
+
+	for (u32 i = 0; i < drawCount; i++) {
+		core::position2d<s32> targetPos = positions[i];
+		core::position2d<s32> sourcePos = sourceRects[i].UpperLeftCorner;
+		// This needs to be signed as it may go negative.
+		core::dimension2d<s32> sourceSize(sourceRects[i].getSize());
+
+		// now draw it.
+
+		core::rect<f32> tcoords;
+		tcoords.UpperLeftCorner.X = (((f32)sourcePos.X)) / texture->getOriginalSize().Width;
+		tcoords.UpperLeftCorner.Y = (((f32)sourcePos.Y)) / texture->getOriginalSize().Height;
+		tcoords.LowerRightCorner.X = tcoords.UpperLeftCorner.X + ((f32)(sourceSize.Width) / texture->getOriginalSize().Width);
+		tcoords.LowerRightCorner.Y = tcoords.UpperLeftCorner.Y + ((f32)(sourceSize.Height) / texture->getOriginalSize().Height);
+
+		const core::rect<s32> poss(targetPos, sourceSize);
+
+		f32 left = (f32)poss.UpperLeftCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+		f32 right = (f32)poss.LowerRightCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+		f32 down = 2.f - (f32)poss.LowerRightCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+		f32 top = 2.f - (f32)poss.UpperLeftCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+
+		vtx.push_back(S3DVertex(left, top, 0.0f,
+				0.0f, 0.0f, 0.0f, color,
+				tcoords.UpperLeftCorner.X, tcoords.UpperLeftCorner.Y));
+		vtx.push_back(S3DVertex(right, top, 0.0f,
+				0.0f, 0.0f, 0.0f, color,
+				tcoords.LowerRightCorner.X, tcoords.UpperLeftCorner.Y));
+		vtx.push_back(S3DVertex(right, down, 0.0f,
+				0.0f, 0.0f, 0.0f, color,
+				tcoords.LowerRightCorner.X, tcoords.LowerRightCorner.Y));
+		vtx.push_back(S3DVertex(left, down, 0.0f,
+				0.0f, 0.0f, 0.0f, color,
+				tcoords.UpperLeftCorner.X, tcoords.LowerRightCorner.Y));
+	}
+
+	GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, QuadIndexBuffer);
+	drawElements(GL_TRIANGLES, vt2DImage, vtx.const_pointer(), vtx.size(), 0, 6 * drawCount);
+	GL.BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+	if (clipRect)
+		GL.Disable(GL_SCISSOR_TEST);
+}
+
+//! draw a 2d rectangle
+void COpenGL3DriverBase::draw2DRectangle(SColor color,
+		const core::rect<s32> &position,
+		const core::rect<s32> *clip)
+{
+	chooseMaterial2D();
+	setMaterialTexture(0, 0);
+
+	setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	f32 left = (f32)pos.UpperLeftCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 right = (f32)pos.LowerRightCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 down = 2.f - (f32)pos.LowerRightCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+	f32 top = 2.f - (f32)pos.UpperLeftCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex(left, top, 0, 0, 0, 1, color, 0, 0);
+	vertices[1] = S3DVertex(right, top, 0, 0, 0, 1, color, 0, 0);
+	vertices[2] = S3DVertex(right, down, 0, 0, 0, 1, color, 0, 0);
+	vertices[3] = S3DVertex(left, down, 0, 0, 0, 1, color, 0, 0);
+
+	drawQuad(vtPrimitive, vertices);
+}
+
+//! draw an 2d rectangle
+void COpenGL3DriverBase::draw2DRectangle(const core::rect<s32> &position,
+		SColor colorLeftUp, SColor colorRightUp,
+		SColor colorLeftDown, SColor colorRightDown,
+		const core::rect<s32> *clip)
+{
+	core::rect<s32> pos = position;
+
+	if (clip)
+		pos.clipAgainst(*clip);
+
+	if (!pos.isValid())
+		return;
+
+	chooseMaterial2D();
+	setMaterialTexture(0, 0);
+
+	setRenderStates2DMode(colorLeftUp.getAlpha() < 255 ||
+								  colorRightUp.getAlpha() < 255 ||
+								  colorLeftDown.getAlpha() < 255 ||
+								  colorRightDown.getAlpha() < 255,
+			false, false);
+
+	const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+	f32 left = (f32)pos.UpperLeftCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 right = (f32)pos.LowerRightCorner.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+	f32 down = 2.f - (f32)pos.LowerRightCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+	f32 top = 2.f - (f32)pos.UpperLeftCorner.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+
+	S3DVertex vertices[4];
+	vertices[0] = S3DVertex(left, top, 0, 0, 0, 1, colorLeftUp, 0, 0);
+	vertices[1] = S3DVertex(right, top, 0, 0, 0, 1, colorRightUp, 0, 0);
+	vertices[2] = S3DVertex(right, down, 0, 0, 0, 1, colorRightDown, 0, 0);
+	vertices[3] = S3DVertex(left, down, 0, 0, 0, 1, colorLeftDown, 0, 0);
+
+	drawQuad(vtPrimitive, vertices);
+}
+
+//! Draws a 2d line.
+void COpenGL3DriverBase::draw2DLine(const core::position2d<s32> &start,
+		const core::position2d<s32> &end, SColor color)
+{
+	{
+		chooseMaterial2D();
+		setMaterialTexture(0, 0);
+
+		setRenderStates2DMode(color.getAlpha() < 255, false, false);
+
+		const core::dimension2d<u32> &renderTargetSize = getCurrentRenderTargetSize();
+
+		f32 startX = (f32)start.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+		f32 endX = (f32)end.X / (f32)renderTargetSize.Width * 2.f - 1.f;
+		f32 startY = 2.f - (f32)start.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+		f32 endY = 2.f - (f32)end.Y / (f32)renderTargetSize.Height * 2.f - 1.f;
+
+		S3DVertex vertices[2];
+		vertices[0] = S3DVertex(startX, startY, 0, 0, 0, 1, color, 0, 0);
+		vertices[1] = S3DVertex(endX, endY, 0, 0, 0, 1, color, 1, 1);
+
+		drawArrays(GL_LINES, vtPrimitive, vertices, 2);
+	}
+}
+
+void COpenGL3DriverBase::drawQuad(const VertexType &vertexType, const S3DVertex (&vertices)[4])
+{
+	drawArrays(GL_TRIANGLE_FAN, vertexType, vertices, 4);
+}
+
+void COpenGL3DriverBase::drawArrays(GLenum primitiveType, const VertexType &vertexType, const void *vertices, int vertexCount)
+{
+	beginDraw(vertexType, reinterpret_cast<uintptr_t>(vertices));
+	GL.DrawArrays(primitiveType, 0, vertexCount);
+	endDraw(vertexType);
+}
+
+void COpenGL3DriverBase::drawElements(GLenum primitiveType, const VertexType &vertexType, const void *vertices, int vertexCount, const u16 *indices, int indexCount)
+{
+	beginDraw(vertexType, reinterpret_cast<uintptr_t>(vertices));
+	GL.DrawRangeElements(primitiveType, 0, vertexCount - 1, indexCount, GL_UNSIGNED_SHORT, indices);
+	endDraw(vertexType);
+}
+
+void COpenGL3DriverBase::beginDraw(const VertexType &vertexType, uintptr_t verticesBase)
+{
+	for (auto attr : vertexType) {
+		GL.EnableVertexAttribArray(attr.Index);
+		switch (attr.mode) {
+		case VertexAttribute::Mode::Regular:
+			GL.VertexAttribPointer(attr.Index, attr.ComponentCount, attr.ComponentType, GL_FALSE, vertexType.VertexSize, reinterpret_cast<void *>(verticesBase + attr.Offset));
+			break;
+		case VertexAttribute::Mode::Normalized:
+			GL.VertexAttribPointer(attr.Index, attr.ComponentCount, attr.ComponentType, GL_TRUE, vertexType.VertexSize, reinterpret_cast<void *>(verticesBase + attr.Offset));
+			break;
+		case VertexAttribute::Mode::Integral:
+			GL.VertexAttribIPointer(attr.Index, attr.ComponentCount, attr.ComponentType, vertexType.VertexSize, reinterpret_cast<void *>(verticesBase + attr.Offset));
+			break;
+		}
+	}
+}
+
+void COpenGL3DriverBase::endDraw(const VertexType &vertexType)
+{
+	for (auto attr : vertexType)
+		GL.DisableVertexAttribArray(attr.Index);
+}
+
+ITexture *COpenGL3DriverBase::createDeviceDependentTexture(const io::path &name, IImage *image)
+{
+	core::array<IImage *> imageArray(1);
+	imageArray.push_back(image);
+
+	COpenGL3Texture *texture = new COpenGL3Texture(name, imageArray, ETT_2D, this);
+
+	return texture;
+}
+
+ITexture *COpenGL3DriverBase::createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image)
+{
+	COpenGL3Texture *texture = new COpenGL3Texture(name, image, ETT_CUBEMAP, this);
+
+	return texture;
+}
+
+//! Sets a material.
+void COpenGL3DriverBase::setMaterial(const SMaterial &material)
+{
+	Material = material;
+	OverrideMaterial.apply(Material);
+
+	for (u32 i = 0; i < Feature.MaxTextureUnits; ++i) {
+		CacheHandler->getTextureCache().set(i, material.getTexture(i));
+		setTransform((E_TRANSFORMATION_STATE)(ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
+	}
+}
+
+//! prints error if an error happened.
+bool COpenGL3DriverBase::testGLError(const char *file, int line)
+{
+	if (!EnableErrorTest)
+		return false;
+
+	GLenum g = GL.GetError();
+	const char *err = nullptr;
+	switch (g) {
+	case GL_NO_ERROR:
+		return false;
+	case GL_INVALID_ENUM:
+		err = "GL_INVALID_ENUM";
+		break;
+	case GL_INVALID_VALUE:
+		err = "GL_INVALID_VALUE";
+		break;
+	case GL_INVALID_OPERATION:
+		err = "GL_INVALID_OPERATION";
+		break;
+	case GL_STACK_OVERFLOW:
+		err = "GL_STACK_OVERFLOW";
+		break;
+	case GL_STACK_UNDERFLOW:
+		err = "GL_STACK_UNDERFLOW";
+		break;
+	case GL_OUT_OF_MEMORY:
+		err = "GL_OUT_OF_MEMORY";
+		break;
+	case GL_INVALID_FRAMEBUFFER_OPERATION:
+		err = "GL_INVALID_FRAMEBUFFER_OPERATION";
+		break;
+#ifdef GL_VERSION_4_5
+	case GL_CONTEXT_LOST:
+		err = "GL_CONTEXT_LOST";
+		break;
+#endif
+	};
+
+	// Empty the error queue, see <https://www.khronos.org/opengl/wiki/OpenGL_Error>
+	bool multiple = false;
+	while (GL.GetError() != GL_NO_ERROR)
+		multiple = true;
+
+	// basename
+	for (char sep : {'/', '\\'}) {
+		const char *tmp = strrchr(file, sep);
+		if (tmp)
+			file = tmp+1;
+	}
+
+	char buf[80];
+	snprintf_irr(buf, sizeof(buf), "%s %s:%d%s",
+		err, file, line, multiple ? " (older errors exist)" : "");
+	os::Printer::log(buf, ELL_ERROR);
+	return true;
+}
+
+void COpenGL3DriverBase::setRenderStates3DMode()
+{
+	if (LockRenderStateMode)
+		return;
+
+	if (CurrentRenderMode != ERM_3D) {
+		// Reset Texture Stages
+		CacheHandler->setBlend(false);
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		ResetRenderStates = true;
+	}
+
+	if (ResetRenderStates || LastMaterial != Material) {
+		// unset old material
+
+		// unset last 3d material
+		if (CurrentRenderMode == ERM_2D && MaterialRenderer2DActive) {
+			MaterialRenderer2DActive->OnUnsetMaterial();
+			MaterialRenderer2DActive = 0;
+		} else if (LastMaterial.MaterialType != Material.MaterialType &&
+				   static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+
+		// set new material.
+		if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+			MaterialRenderers[Material.MaterialType].Renderer->OnSetMaterial(
+					Material, LastMaterial, ResetRenderStates, this);
+
+		LastMaterial = Material;
+		CacheHandler->correctCacheMaterial(LastMaterial);
+		ResetRenderStates = false;
+	}
+
+	if (static_cast<u32>(Material.MaterialType) < MaterialRenderers.size())
+		MaterialRenderers[Material.MaterialType].Renderer->OnRender(this, video::EVT_STANDARD);
+
+	CurrentRenderMode = ERM_3D;
+}
+
+//! Can be called by an IMaterialRenderer to make its work easier.
+void COpenGL3DriverBase::setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial, bool resetAllRenderStates)
+{
+	// ZBuffer
+	switch (material.ZBuffer) {
+	case ECFN_DISABLED:
+		CacheHandler->setDepthTest(false);
+		break;
+	case ECFN_LESSEQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_LEQUAL);
+		break;
+	case ECFN_EQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_EQUAL);
+		break;
+	case ECFN_LESS:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_LESS);
+		break;
+	case ECFN_NOTEQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_NOTEQUAL);
+		break;
+	case ECFN_GREATEREQUAL:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_GEQUAL);
+		break;
+	case ECFN_GREATER:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_GREATER);
+		break;
+	case ECFN_ALWAYS:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_ALWAYS);
+		break;
+	case ECFN_NEVER:
+		CacheHandler->setDepthTest(true);
+		CacheHandler->setDepthFunc(GL_NEVER);
+		break;
+	default:
+		break;
+	}
+
+	// ZWrite
+	if (getWriteZBuffer(material)) {
+		CacheHandler->setDepthMask(true);
+	} else {
+		CacheHandler->setDepthMask(false);
+	}
+
+	// Back face culling
+	if ((material.FrontfaceCulling) && (material.BackfaceCulling)) {
+		CacheHandler->setCullFaceFunc(GL_FRONT_AND_BACK);
+		CacheHandler->setCullFace(true);
+	} else if (material.BackfaceCulling) {
+		CacheHandler->setCullFaceFunc(GL_BACK);
+		CacheHandler->setCullFace(true);
+	} else if (material.FrontfaceCulling) {
+		CacheHandler->setCullFaceFunc(GL_FRONT);
+		CacheHandler->setCullFace(true);
+	} else {
+		CacheHandler->setCullFace(false);
+	}
+
+	// Color Mask
+	CacheHandler->setColorMask(material.ColorMask);
+
+	// Blend Equation
+	if (material.BlendOperation == EBO_NONE)
+		CacheHandler->setBlend(false);
+	else {
+		CacheHandler->setBlend(true);
+
+		switch (material.BlendOperation) {
+		case EBO_ADD:
+			CacheHandler->setBlendEquation(GL_FUNC_ADD);
+			break;
+		case EBO_SUBTRACT:
+			CacheHandler->setBlendEquation(GL_FUNC_SUBTRACT);
+			break;
+		case EBO_REVSUBTRACT:
+			CacheHandler->setBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+			break;
+		case EBO_MIN:
+			if (BlendMinMaxSupported)
+				CacheHandler->setBlendEquation(GL_MIN);
+			else
+				os::Printer::log("Attempt to use EBO_MIN without driver support", ELL_WARNING);
+			break;
+		case EBO_MAX:
+			if (BlendMinMaxSupported)
+				CacheHandler->setBlendEquation(GL_MAX);
+			else
+				os::Printer::log("Attempt to use EBO_MAX without driver support", ELL_WARNING);
+			break;
+		default:
+			break;
+		}
+	}
+
+	// Blend Factor
+	if (IR(material.BlendFactor) & 0xFFFFFFFF // TODO: why the & 0xFFFFFFFF?
+			&& material.MaterialType != EMT_ONETEXTURE_BLEND) {
+		E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR dstRGBFact = EBF_ZERO;
+		E_BLEND_FACTOR srcAlphaFact = EBF_ZERO;
+		E_BLEND_FACTOR dstAlphaFact = EBF_ZERO;
+		E_MODULATE_FUNC modulo = EMFN_MODULATE_1X;
+		u32 alphaSource = 0;
+
+		unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulo, alphaSource, material.BlendFactor);
+
+		CacheHandler->setBlendFuncSeparate(getGLBlend(srcRGBFact), getGLBlend(dstRGBFact),
+				getGLBlend(srcAlphaFact), getGLBlend(dstAlphaFact));
+	}
+
+	// TODO: Polygon Offset. Not sure if it was left out deliberately or if it won't work with this driver.
+
+	if (resetAllRenderStates || lastmaterial.Thickness != material.Thickness)
+		GL.LineWidth(core::clamp(static_cast<GLfloat>(material.Thickness), DimAliasedLine[0], DimAliasedLine[1]));
+
+	// Anti aliasing
+	if (resetAllRenderStates || lastmaterial.AntiAliasing != material.AntiAliasing) {
+		if (material.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			GL.Enable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+		else if (lastmaterial.AntiAliasing & EAAM_ALPHA_TO_COVERAGE)
+			GL.Disable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+	}
+
+	// Texture parameters
+	setTextureRenderStates(material, resetAllRenderStates);
+}
+
+//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+void COpenGL3DriverBase::setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates)
+{
+	// Set textures to TU/TIU and apply filters to them
+
+	for (s32 i = Feature.MaxTextureUnits - 1; i >= 0; --i) {
+		const COpenGL3Texture *tmpTexture = CacheHandler->getTextureCache()[i];
+
+		if (!tmpTexture)
+			continue;
+
+		GLenum tmpTextureType = tmpTexture->getOpenGLTextureType();
+
+		CacheHandler->setActiveTexture(GL_TEXTURE0 + i);
+
+		if (resetAllRenderstates)
+			tmpTexture->getStatesCache().IsCached = false;
+
+		if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MagFilter != tmpTexture->getStatesCache().MagFilter) {
+			E_TEXTURE_MAG_FILTER magFilter = material.TextureLayers[i].MagFilter;
+			GL.TexParameteri(tmpTextureType, GL_TEXTURE_MAG_FILTER,
+					magFilter == ETMAGF_NEAREST ? GL_NEAREST : (assert(magFilter == ETMAGF_LINEAR), GL_LINEAR));
+
+			tmpTexture->getStatesCache().MagFilter = magFilter;
+		}
+
+		if (material.UseMipMaps && tmpTexture->hasMipMaps()) {
+			if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter ||
+					!tmpTexture->getStatesCache().MipMapStatus) {
+				E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+				GL.TexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER,
+						minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST
+																						 : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR       ? GL_NEAREST_MIPMAP_LINEAR
+																																		   : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR));
+
+				tmpTexture->getStatesCache().MinFilter = minFilter;
+				tmpTexture->getStatesCache().MipMapStatus = true;
+			}
+		} else {
+			if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].MinFilter != tmpTexture->getStatesCache().MinFilter ||
+					tmpTexture->getStatesCache().MipMapStatus) {
+				E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter;
+				GL.TexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER,
+						(minFilter == ETMINF_NEAREST_MIPMAP_NEAREST || minFilter == ETMINF_NEAREST_MIPMAP_LINEAR) ? GL_NEAREST : (assert(minFilter == ETMINF_LINEAR_MIPMAP_NEAREST || minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR));
+
+				tmpTexture->getStatesCache().MinFilter = minFilter;
+				tmpTexture->getStatesCache().MipMapStatus = false;
+			}
+		}
+
+		if (AnisotropicFilterSupported &&
+				(!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].AnisotropicFilter != tmpTexture->getStatesCache().AnisotropicFilter)) {
+			GL.TexParameteri(tmpTextureType, GL.TEXTURE_MAX_ANISOTROPY,
+					material.TextureLayers[i].AnisotropicFilter > 1 ? core::min_(MaxAnisotropy, material.TextureLayers[i].AnisotropicFilter) : 1);
+
+			tmpTexture->getStatesCache().AnisotropicFilter = material.TextureLayers[i].AnisotropicFilter;
+		}
+
+		if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapU != tmpTexture->getStatesCache().WrapU) {
+			GL.TexParameteri(tmpTextureType, GL_TEXTURE_WRAP_S, getTextureWrapMode(material.TextureLayers[i].TextureWrapU));
+			tmpTexture->getStatesCache().WrapU = material.TextureLayers[i].TextureWrapU;
+		}
+
+		if (!tmpTexture->getStatesCache().IsCached || material.TextureLayers[i].TextureWrapV != tmpTexture->getStatesCache().WrapV) {
+			GL.TexParameteri(tmpTextureType, GL_TEXTURE_WRAP_T, getTextureWrapMode(material.TextureLayers[i].TextureWrapV));
+			tmpTexture->getStatesCache().WrapV = material.TextureLayers[i].TextureWrapV;
+		}
+
+		tmpTexture->getStatesCache().IsCached = true;
+	}
+}
+
+// Get OpenGL ES2.0 texture wrap mode from Irrlicht wrap mode.
+GLint COpenGL3DriverBase::getTextureWrapMode(u8 clamp) const
+{
+	switch (clamp) {
+	case ETC_CLAMP:
+	case ETC_CLAMP_TO_EDGE:
+	case ETC_CLAMP_TO_BORDER:
+		return GL_CLAMP_TO_EDGE;
+	case ETC_MIRROR:
+		return GL_REPEAT;
+	default:
+		return GL_REPEAT;
+	}
+}
+
+//! sets the needed renderstates
+void COpenGL3DriverBase::setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel)
+{
+	if (LockRenderStateMode)
+		return;
+
+	COpenGL3Renderer2D *nextActiveRenderer = texture ? MaterialRenderer2DTexture : MaterialRenderer2DNoTexture;
+
+	if (CurrentRenderMode != ERM_2D) {
+		// unset last 3d material
+		if (CurrentRenderMode == ERM_3D) {
+			if (static_cast<u32>(LastMaterial.MaterialType) < MaterialRenderers.size())
+				MaterialRenderers[LastMaterial.MaterialType].Renderer->OnUnsetMaterial();
+		}
+
+		CurrentRenderMode = ERM_2D;
+	} else if (MaterialRenderer2DActive && MaterialRenderer2DActive != nextActiveRenderer) {
+		MaterialRenderer2DActive->OnUnsetMaterial();
+	}
+
+	MaterialRenderer2DActive = nextActiveRenderer;
+
+	MaterialRenderer2DActive->OnSetMaterial(Material, LastMaterial, true, 0);
+	LastMaterial = Material;
+	CacheHandler->correctCacheMaterial(LastMaterial);
+
+	// no alphaChannel without texture
+	alphaChannel &= texture;
+
+	if (alphaChannel || alpha) {
+		CacheHandler->setBlend(true);
+		CacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		CacheHandler->setBlendEquation(GL_FUNC_ADD);
+	} else
+		CacheHandler->setBlend(false);
+
+	Material.setTexture(0, const_cast<COpenGL3Texture *>(CacheHandler->getTextureCache().get(0)));
+	setTransform(ETS_TEXTURE_0, core::IdentityMatrix);
+
+	if (texture) {
+		if (OverrideMaterial2DEnabled)
+			setTextureRenderStates(OverrideMaterial2D, false);
+		else
+			setTextureRenderStates(InitMaterial2D, false);
+	}
+
+	MaterialRenderer2DActive->OnRender(this, video::EVT_STANDARD);
+}
+
+void COpenGL3DriverBase::chooseMaterial2D()
+{
+	if (!OverrideMaterial2DEnabled)
+		Material = InitMaterial2D;
+
+	if (OverrideMaterial2DEnabled) {
+		OverrideMaterial2D.Lighting = false;
+		OverrideMaterial2D.ZWriteEnable = EZW_OFF;
+		OverrideMaterial2D.ZBuffer = ECFN_DISABLED; // it will be ECFN_DISABLED after merge
+		OverrideMaterial2D.Lighting = false;
+
+		Material = OverrideMaterial2D;
+	}
+}
+
+//! \return Returns the name of the video driver.
+const char *COpenGL3DriverBase::getName() const
+{
+	return Name.c_str();
+}
+
+void COpenGL3DriverBase::setViewPort(const core::rect<s32> &area)
+{
+	core::rect<s32> vp = area;
+	core::rect<s32> rendert(0, 0, getCurrentRenderTargetSize().Width, getCurrentRenderTargetSize().Height);
+	vp.clipAgainst(rendert);
+
+	if (vp.getHeight() > 0 && vp.getWidth() > 0)
+		CacheHandler->setViewport(vp.UpperLeftCorner.X, getCurrentRenderTargetSize().Height - vp.UpperLeftCorner.Y - vp.getHeight(), vp.getWidth(), vp.getHeight());
+
+	ViewPort = vp;
+}
+
+void COpenGL3DriverBase::setViewPortRaw(u32 width, u32 height)
+{
+	CacheHandler->setViewport(0, 0, width, height);
+	ViewPort = core::recti(0, 0, width, height);
+}
+
+//! Draws a 3d line.
+void COpenGL3DriverBase::draw3DLine(const core::vector3df &start,
+		const core::vector3df &end, SColor color)
+{
+	setRenderStates3DMode();
+
+	S3DVertex vertices[2];
+	vertices[0] = S3DVertex(start.X, start.Y, start.Z, 0, 0, 1, color, 0, 0);
+	vertices[1] = S3DVertex(end.X, end.Y, end.Z, 0, 0, 1, color, 0, 0);
+
+	drawArrays(GL_LINES, vtPrimitive, vertices, 2);
+}
+
+//! Only used by the internal engine. Used to notify the driver that
+//! the window was resized.
+void COpenGL3DriverBase::OnResize(const core::dimension2d<u32> &size)
+{
+	CNullDriver::OnResize(size);
+	CacheHandler->setViewport(0, 0, size.Width, size.Height);
+	Transformation3DChanged = true;
+}
+
+//! Returns type of video driver
+E_DRIVER_TYPE COpenGL3DriverBase::getDriverType() const
+{
+	return EDT_OPENGL3;
+}
+
+//! returns color format
+ECOLOR_FORMAT COpenGL3DriverBase::getColorFormat() const
+{
+	return ColorFormat;
+}
+
+//! Get a vertex shader constant index.
+s32 COpenGL3DriverBase::getVertexShaderConstantID(const c8 *name)
+{
+	return getPixelShaderConstantID(name);
+}
+
+//! Get a pixel shader constant index.
+s32 COpenGL3DriverBase::getPixelShaderConstantID(const c8 *name)
+{
+	os::Printer::log("Error: Please call services->getPixelShaderConstantID(), not VideoDriver->getPixelShaderConstantID().");
+	return -1;
+}
+
+//! Sets a constant for the vertex shader based on an index.
+bool COpenGL3DriverBase::setVertexShaderConstant(s32 index, const f32 *floats, int count)
+{
+	os::Printer::log("Error: Please call services->setVertexShaderConstant(), not VideoDriver->setVertexShaderConstant().");
+	return false;
+}
+
+//! Int interface for the above.
+bool COpenGL3DriverBase::setVertexShaderConstant(s32 index, const s32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setVertexShaderConstant(), not VideoDriver->setVertexShaderConstant().");
+	return false;
+}
+
+bool COpenGL3DriverBase::setVertexShaderConstant(s32 index, const u32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setVertexShaderConstant(), not VideoDriver->setVertexShaderConstant().");
+	return false;
+}
+
+//! Sets a constant for the pixel shader based on an index.
+bool COpenGL3DriverBase::setPixelShaderConstant(s32 index, const f32 *floats, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Int interface for the above.
+bool COpenGL3DriverBase::setPixelShaderConstant(s32 index, const s32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+bool COpenGL3DriverBase::setPixelShaderConstant(s32 index, const u32 *ints, int count)
+{
+	os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
+	return false;
+}
+
+//! Adds a new material renderer to the VideoDriver, using GLSL to render geometry.
+s32 COpenGL3DriverBase::addHighLevelShaderMaterial(
+		const c8 *vertexShaderProgram,
+		const c8 *vertexShaderEntryPointName,
+		E_VERTEX_SHADER_TYPE vsCompileTarget,
+		const c8 *pixelShaderProgram,
+		const c8 *pixelShaderEntryPointName,
+		E_PIXEL_SHADER_TYPE psCompileTarget,
+		const c8 *geometryShaderProgram,
+		const c8 *geometryShaderEntryPointName,
+		E_GEOMETRY_SHADER_TYPE gsCompileTarget,
+		scene::E_PRIMITIVE_TYPE inType,
+		scene::E_PRIMITIVE_TYPE outType,
+		u32 verticesOut,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData)
+{
+	s32 nr = -1;
+	COpenGL3MaterialRenderer *r = new COpenGL3MaterialRenderer(
+			this, nr, vertexShaderProgram,
+			pixelShaderProgram,
+			callback, baseMaterial, userData);
+
+	r->drop();
+	return nr;
+}
+
+//! Returns a pointer to the IVideoDriver interface. (Implementation for
+//! IMaterialRendererServices)
+IVideoDriver *COpenGL3DriverBase::getVideoDriver()
+{
+	return this;
+}
+
+//! Returns pointer to the IGPUProgrammingServices interface.
+IGPUProgrammingServices *COpenGL3DriverBase::getGPUProgrammingServices()
+{
+	return this;
+}
+
+ITexture *COpenGL3DriverBase::addRenderTargetTexture(const core::dimension2d<u32> &size,
+		const io::path &name, const ECOLOR_FORMAT format)
+{
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	COpenGL3Texture *renderTargetTexture = new COpenGL3Texture(name, size, ETT_2D, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+ITexture *COpenGL3DriverBase::addRenderTargetTextureCubemap(const irr::u32 sideLen, const io::path &name, const ECOLOR_FORMAT format)
+{
+	// disable mip-mapping
+	bool generateMipLevels = getTextureCreationFlag(ETCF_CREATE_MIP_MAPS);
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, false);
+
+	bool supportForFBO = (Feature.ColorAttachment > 0);
+
+	const core::dimension2d<u32> size(sideLen, sideLen);
+	core::dimension2du destSize(size);
+
+	if (!supportForFBO) {
+		destSize = core::dimension2d<u32>(core::min_(size.Width, ScreenSize.Width), core::min_(size.Height, ScreenSize.Height));
+		destSize = destSize.getOptimalSize((size == size.getOptimalSize()), false, false);
+	}
+
+	COpenGL3Texture *renderTargetTexture = new COpenGL3Texture(name, destSize, ETT_CUBEMAP, format, this);
+	addTexture(renderTargetTexture);
+	renderTargetTexture->drop();
+
+	// restore mip-mapping
+	setTextureCreationFlag(ETCF_CREATE_MIP_MAPS, generateMipLevels);
+
+	return renderTargetTexture;
+}
+
+//! Returns the maximum amount of primitives
+u32 COpenGL3DriverBase::getMaximalPrimitiveCount() const
+{
+	return 65535;
+}
+
+bool COpenGL3DriverBase::setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor, f32 clearDepth, u8 clearStencil)
+{
+	if (target && target->getDriverType() != getDriverType()) {
+		os::Printer::log("Fatal Error: Tried to set a render target not owned by OpenGL 3 driver.", ELL_ERROR);
+		return false;
+	}
+
+	core::dimension2d<u32> destRenderTargetSize(0, 0);
+
+	if (target) {
+		COpenGL3RenderTarget *renderTarget = static_cast<COpenGL3RenderTarget *>(target);
+
+		CacheHandler->setFBO(renderTarget->getBufferID());
+		renderTarget->update();
+
+		destRenderTargetSize = renderTarget->getSize();
+
+		setViewPortRaw(destRenderTargetSize.Width, destRenderTargetSize.Height);
+	} else {
+		CacheHandler->setFBO(0);
+
+		destRenderTargetSize = core::dimension2d<u32>(0, 0);
+
+		setViewPortRaw(ScreenSize.Width, ScreenSize.Height);
+	}
+
+	if (CurrentRenderTargetSize != destRenderTargetSize) {
+		CurrentRenderTargetSize = destRenderTargetSize;
+
+		Transformation3DChanged = true;
+	}
+
+	CurrentRenderTarget = target;
+
+	clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
+
+	return true;
+}
+
+void COpenGL3DriverBase::clearBuffers(u16 flag, SColor color, f32 depth, u8 stencil)
+{
+	GLbitfield mask = 0;
+	u8 colorMask = 0;
+	bool depthMask = false;
+
+	CacheHandler->getColorMask(colorMask);
+	CacheHandler->getDepthMask(depthMask);
+
+	if (flag & ECBF_COLOR) {
+		CacheHandler->setColorMask(ECP_ALL);
+
+		const f32 inv = 1.0f / 255.0f;
+		GL.ClearColor(color.getRed() * inv, color.getGreen() * inv,
+				color.getBlue() * inv, color.getAlpha() * inv);
+
+		mask |= GL_COLOR_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_DEPTH) {
+		CacheHandler->setDepthMask(true);
+		GL.ClearDepthf(depth);
+		mask |= GL_DEPTH_BUFFER_BIT;
+	}
+
+	if (flag & ECBF_STENCIL) {
+		GL.ClearStencil(stencil);
+		mask |= GL_STENCIL_BUFFER_BIT;
+	}
+
+	if (mask)
+		GL.Clear(mask);
+
+	CacheHandler->setColorMask(colorMask);
+	CacheHandler->setDepthMask(depthMask);
+}
+
+//! Returns an image created from the last rendered frame.
+// We want to read the front buffer to get the latest render finished.
+// This is not possible under ogl-es, though, so one has to call this method
+// outside of the render loop only.
+IImage *COpenGL3DriverBase::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
+{
+	if (target == video::ERT_MULTI_RENDER_TEXTURES || target == video::ERT_RENDER_TEXTURE || target == video::ERT_STEREO_BOTH_BUFFERS)
+		return 0;
+
+	GLint internalformat = GL_RGBA;
+	GLint type = GL_UNSIGNED_BYTE;
+	{
+		//			GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &internalformat);
+		//			GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type);
+		// there's a format we don't support ATM
+		if (GL_UNSIGNED_SHORT_4_4_4_4 == type) {
+			internalformat = GL_RGBA;
+			type = GL_UNSIGNED_BYTE;
+		}
+	}
+
+	IImage *newImage = 0;
+	if (GL_RGBA == internalformat) {
+		if (GL_UNSIGNED_BYTE == type)
+			newImage = new CImage(ECF_A8R8G8B8, ScreenSize);
+		else
+			newImage = new CImage(ECF_A1R5G5B5, ScreenSize);
+	} else {
+		if (GL_UNSIGNED_BYTE == type)
+			newImage = new CImage(ECF_R8G8B8, ScreenSize);
+		else
+			newImage = new CImage(ECF_R5G6B5, ScreenSize);
+	}
+
+	if (!newImage)
+		return 0;
+
+	u8 *pixels = static_cast<u8 *>(newImage->getData());
+	if (!pixels) {
+		newImage->drop();
+		return 0;
+	}
+
+	GL.ReadPixels(0, 0, ScreenSize.Width, ScreenSize.Height, internalformat, type, pixels);
+	TEST_GL_ERROR(this);
+
+	// opengl images are horizontally flipped, so we have to fix that here.
+	const s32 pitch = newImage->getPitch();
+	u8 *p2 = pixels + (ScreenSize.Height - 1) * pitch;
+	u8 *tmpBuffer = new u8[pitch];
+	for (u32 i = 0; i < ScreenSize.Height; i += 2) {
+		memcpy(tmpBuffer, pixels, pitch);
+		memcpy(pixels, p2, pitch);
+		memcpy(p2, tmpBuffer, pitch);
+		pixels += pitch;
+		p2 -= pitch;
+	}
+	delete[] tmpBuffer;
+
+	// also GL_RGBA doesn't match the internal encoding of the image (which is BGRA)
+	if (GL_RGBA == internalformat && GL_UNSIGNED_BYTE == type) {
+		pixels = static_cast<u8 *>(newImage->getData());
+		for (u32 i = 0; i < ScreenSize.Height; i++) {
+			for (u32 j = 0; j < ScreenSize.Width; j++) {
+				u32 c = *(u32 *)(pixels + 4 * j);
+				*(u32 *)(pixels + 4 * j) = (c & 0xFF00FF00) |
+										   ((c & 0x00FF0000) >> 16) | ((c & 0x000000FF) << 16);
+			}
+			pixels += pitch;
+		}
+	}
+
+	if (TEST_GL_ERROR(this)) {
+		newImage->drop();
+		return 0;
+	}
+	return newImage;
+}
+
+void COpenGL3DriverBase::removeTexture(ITexture *texture)
+{
+	CacheHandler->getTextureCache().remove(texture);
+	CNullDriver::removeTexture(texture);
+}
+
+//! Set/unset a clipping plane.
+bool COpenGL3DriverBase::setClipPlane(u32 index, const core::plane3df &plane, bool enable)
+{
+	if (index >= UserClipPlane.size())
+		UserClipPlane.push_back(SUserClipPlane());
+
+	UserClipPlane[index].Plane = plane;
+	UserClipPlane[index].Enabled = enable;
+	return true;
+}
+
+//! Enable/disable a clipping plane.
+void COpenGL3DriverBase::enableClipPlane(u32 index, bool enable)
+{
+	UserClipPlane[index].Enabled = enable;
+}
+
+//! Get the ClipPlane Count
+u32 COpenGL3DriverBase::getClipPlaneCount() const
+{
+	return UserClipPlane.size();
+}
+
+const core::plane3df &COpenGL3DriverBase::getClipPlane(irr::u32 index) const
+{
+	if (index < UserClipPlane.size())
+		return UserClipPlane[index].Plane;
+	else {
+		_IRR_DEBUG_BREAK_IF(true) // invalid index
+		static const core::plane3df dummy;
+		return dummy;
+	}
+}
+
+core::dimension2du COpenGL3DriverBase::getMaxTextureSize() const
+{
+	return core::dimension2du(MaxTextureSize, MaxTextureSize);
+}
+
+GLenum COpenGL3DriverBase::getGLBlend(E_BLEND_FACTOR factor) const
+{
+	static GLenum const blendTable[] = {
+			GL_ZERO,
+			GL_ONE,
+			GL_DST_COLOR,
+			GL_ONE_MINUS_DST_COLOR,
+			GL_SRC_COLOR,
+			GL_ONE_MINUS_SRC_COLOR,
+			GL_SRC_ALPHA,
+			GL_ONE_MINUS_SRC_ALPHA,
+			GL_DST_ALPHA,
+			GL_ONE_MINUS_DST_ALPHA,
+			GL_SRC_ALPHA_SATURATE,
+		};
+
+	return blendTable[factor];
+}
+
+bool COpenGL3DriverBase::getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+		GLenum &pixelType, void (**converter)(const void *, s32, void *)) const
+{
+	auto &info = TextureFormats[format];
+	internalFormat = info.InternalFormat;
+	pixelFormat = info.PixelFormat;
+	pixelType = info.PixelType;
+	*converter = info.Converter;
+	return info.InternalFormat != 0;
+}
+
+bool COpenGL3DriverBase::queryTextureFormat(ECOLOR_FORMAT format) const
+{
+	return TextureFormats[format].InternalFormat != 0;
+}
+
+bool COpenGL3DriverBase::needsTransparentRenderPass(const irr::video::SMaterial &material) const
+{
+	return CNullDriver::needsTransparentRenderPass(material) || material.isAlphaBlendOperation();
+}
+
+const SMaterial &COpenGL3DriverBase::getCurrentMaterial() const
+{
+	return Material;
+}
+
+COpenGL3CacheHandler *COpenGL3DriverBase::getCacheHandler() const
+{
+	return CacheHandler;
+}
+
+} // end namespace
+} // end namespace
diff --git a/irr/src/OpenGL/Driver.h b/irr/src/OpenGL/Driver.h
new file mode 100644
index 000000000..51554334b
--- /dev/null
+++ b/irr/src/OpenGL/Driver.h
@@ -0,0 +1,399 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2014 Patryk Nadrowski
+// Copyright (C) 2009-2010 Amundis
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include "SIrrCreationParameters.h"
+
+#include "Common.h"
+#include "CNullDriver.h"
+#include "IMaterialRendererServices.h"
+#include "EDriverFeatures.h"
+#include "fast_atof.h"
+#include "ExtensionHandler.h"
+#include "IContextManager.h"
+
+namespace irr
+{
+namespace video
+{
+struct VertexType;
+
+class COpenGL3FixedPipelineRenderer;
+class COpenGL3Renderer2D;
+
+class COpenGL3DriverBase : public CNullDriver, public IMaterialRendererServices, public COpenGL3ExtensionHandler
+{
+	friend class COpenGLCoreTexture<COpenGL3DriverBase>;
+
+protected:
+	//! constructor (use createOpenGL3Driver instead)
+	COpenGL3DriverBase(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+
+public:
+	//! destructor
+	virtual ~COpenGL3DriverBase();
+
+	virtual bool beginScene(u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0), f32 clearDepth = 1.f, u8 clearStencil = 0,
+			const SExposedVideoData &videoData = SExposedVideoData(), core::rect<s32> *sourceRect = 0) override;
+
+	bool endScene() override;
+
+	//! sets transformation
+	void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4 &mat) override;
+
+	struct SHWBufferLink_opengl : public SHWBufferLink
+	{
+		SHWBufferLink_opengl(const scene::IMeshBuffer *meshBuffer) :
+				SHWBufferLink(meshBuffer), vbo_verticesID(0), vbo_indicesID(0), vbo_verticesSize(0), vbo_indicesSize(0)
+		{
+		}
+
+		u32 vbo_verticesID; // tmp
+		u32 vbo_indicesID;  // tmp
+
+		u32 vbo_verticesSize; // tmp
+		u32 vbo_indicesSize;  // tmp
+	};
+
+	bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+	bool updateIndexHardwareBuffer(SHWBufferLink_opengl *HWBuffer);
+
+	//! updates hardware buffer if needed
+	bool updateHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Create hardware buffer from mesh
+	SHWBufferLink *createHardwareBuffer(const scene::IMeshBuffer *mb) override;
+
+	//! Delete hardware buffer (only some drivers can)
+	void deleteHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	//! Draw hardware buffer
+	void drawHardwareBuffer(SHWBufferLink *HWBuffer) override;
+
+	IRenderTarget *addRenderTarget() override;
+
+	//! draws a vertex primitive list
+	virtual void drawVertexPrimitiveList(const void *vertices, u32 vertexCount,
+			const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType) override;
+
+	//! queries the features of the driver, returns true if feature is available
+	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const override
+	{
+		return FeatureEnabled[feature] && COpenGL3ExtensionHandler::queryFeature(feature);
+	}
+
+	//! Sets a material.
+	void setMaterial(const SMaterial &material) override;
+
+	virtual void draw2DImage(const video::ITexture *texture,
+			const core::position2d<s32> &destPos,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			SColor color = SColor(255, 255, 255, 255), bool useAlphaChannelOfTexture = false) override;
+
+	virtual void draw2DImage(const video::ITexture *texture, const core::rect<s32> &destRect,
+			const core::rect<s32> &sourceRect, const core::rect<s32> *clipRect = 0,
+			const video::SColor *const colors = 0, bool useAlphaChannelOfTexture = false) override;
+
+	// internally used
+	virtual void draw2DImage(const video::ITexture *texture, u32 layer, bool flip);
+
+	using CNullDriver::draw2DImage;
+
+	void draw2DImageBatch(const video::ITexture *texture,
+			const core::array<core::position2d<s32>> &positions,
+			const core::array<core::rect<s32>> &sourceRects,
+			const core::rect<s32> *clipRect,
+			SColor color,
+			bool useAlphaChannelOfTexture) override;
+
+	//! draw an 2d rectangle
+	virtual void draw2DRectangle(SColor color, const core::rect<s32> &pos,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws an 2d rectangle with a gradient.
+	virtual void draw2DRectangle(const core::rect<s32> &pos,
+			SColor colorLeftUp, SColor colorRightUp, SColor colorLeftDown, SColor colorRightDown,
+			const core::rect<s32> *clip = 0) override;
+
+	//! Draws a 2d line.
+	virtual void draw2DLine(const core::position2d<s32> &start,
+			const core::position2d<s32> &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Draws a 3d line.
+	virtual void draw3DLine(const core::vector3df &start,
+			const core::vector3df &end,
+			SColor color = SColor(255, 255, 255, 255)) override;
+
+	//! Returns the name of the video driver.
+	const char *getName() const override;
+
+	//! Returns the maximum texture size supported.
+	core::dimension2du getMaxTextureSize() const override;
+
+	//! sets a viewport
+	void setViewPort(const core::rect<s32> &area) override;
+
+	//! Only used internally by the engine
+	void OnResize(const core::dimension2d<u32> &size) override;
+
+	//! Returns type of video driver
+	E_DRIVER_TYPE getDriverType() const override;
+
+	//! get color format of the current color buffer
+	ECOLOR_FORMAT getColorFormat() const override;
+
+	//! Returns the transformation set by setTransform
+	const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override;
+
+	//! Can be called by an IMaterialRenderer to make its work easier.
+	void setBasicRenderStates(const SMaterial &material, const SMaterial &lastmaterial, bool resetAllRenderstates) override;
+
+	//! Compare in SMaterial doesn't check texture parameters, so we should call this on each OnRender call.
+	void setTextureRenderStates(const SMaterial &material, bool resetAllRenderstates);
+
+	//! Get a vertex shader constant index.
+	s32 getVertexShaderConstantID(const c8 *name) override;
+
+	//! Get a pixel shader constant index.
+	s32 getPixelShaderConstantID(const c8 *name) override;
+
+	//! Sets a constant for the vertex shader based on an index.
+	bool setVertexShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setVertexShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setVertexShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! Sets a constant for the pixel shader based on an index.
+	bool setPixelShaderConstant(s32 index, const f32 *floats, int count) override;
+
+	//! Int interface for the above.
+	bool setPixelShaderConstant(s32 index, const s32 *ints, int count) override;
+
+	//! Uint interface for the above.
+	bool setPixelShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	//! Adds a new material renderer to the VideoDriver
+	virtual s32 addHighLevelShaderMaterial(
+			const c8 *vertexShaderProgram,
+			const c8 *vertexShaderEntryPointName = 0,
+			E_VERTEX_SHADER_TYPE vsCompileTarget = EVST_VS_1_1,
+			const c8 *pixelShaderProgram = 0,
+			const c8 *pixelShaderEntryPointName = 0,
+			E_PIXEL_SHADER_TYPE psCompileTarget = EPST_PS_1_1,
+			const c8 *geometryShaderProgram = 0,
+			const c8 *geometryShaderEntryPointName = "main",
+			E_GEOMETRY_SHADER_TYPE gsCompileTarget = EGST_GS_4_0,
+			scene::E_PRIMITIVE_TYPE inType = scene::EPT_TRIANGLES,
+			scene::E_PRIMITIVE_TYPE outType = scene::EPT_TRIANGLE_STRIP,
+			u32 verticesOut = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = video::EMT_SOLID,
+			s32 userData = 0) override;
+
+	//! Returns pointer to the IGPUProgrammingServices interface.
+	IGPUProgrammingServices *getGPUProgrammingServices() override;
+
+	//! Returns a pointer to the IVideoDriver interface.
+	IVideoDriver *getVideoDriver() override;
+
+	//! Returns the maximum amount of primitives
+	u32 getMaximalPrimitiveCount() const override;
+
+	virtual ITexture *addRenderTargetTexture(const core::dimension2d<u32> &size,
+			const io::path &name, const ECOLOR_FORMAT format = ECF_UNKNOWN) override;
+
+	//! Creates a render target texture for a cubemap
+	ITexture *addRenderTargetTextureCubemap(const irr::u32 sideLen,
+			const io::path &name, const ECOLOR_FORMAT format) override;
+
+	virtual bool setRenderTargetEx(IRenderTarget *target, u16 clearFlag, SColor clearColor = SColor(255, 0, 0, 0),
+			f32 clearDepth = 1.f, u8 clearStencil = 0) override;
+
+	void clearBuffers(u16 flag, SColor color = SColor(255, 0, 0, 0), f32 depth = 1.f, u8 stencil = 0) override;
+
+	//! Returns an image created from the last rendered frame.
+	IImage *createScreenShot(video::ECOLOR_FORMAT format = video::ECF_UNKNOWN, video::E_RENDER_TARGET target = video::ERT_FRAME_BUFFER) override;
+
+	//! checks if an OpenGL error has happened and prints it, use via TEST_GL_ERROR().
+	// Does *nothing* unless in debug mode.
+	bool testGLError(const char *file, int line);
+
+	//! Set/unset a clipping plane.
+	bool setClipPlane(u32 index, const core::plane3df &plane, bool enable = false) override;
+
+	//! returns the current amount of user clip planes set.
+	u32 getClipPlaneCount() const;
+
+	//! returns the 0 indexed Plane
+	const core::plane3df &getClipPlane(u32 index) const;
+
+	//! Enable/disable a clipping plane.
+	void enableClipPlane(u32 index, bool enable) override;
+
+	//! Returns the graphics card vendor name.
+	core::stringc getVendorInfo() override
+	{
+		return VendorName;
+	};
+
+	void removeTexture(ITexture *texture) override;
+
+	//! Check if the driver supports creating textures with the given color format
+	bool queryTextureFormat(ECOLOR_FORMAT format) const override;
+
+	//! Used by some SceneNodes to check if a material should be rendered in the transparent render pass
+	bool needsTransparentRenderPass(const irr::video::SMaterial &material) const override;
+
+	//! Convert E_BLEND_FACTOR to OpenGL equivalent
+	GLenum getGLBlend(E_BLEND_FACTOR factor) const;
+
+	virtual bool getColorFormatParameters(ECOLOR_FORMAT format, GLint &internalFormat, GLenum &pixelFormat,
+			GLenum &pixelType, void (**converter)(const void *, s32, void *)) const;
+
+	//! Get current material.
+	const SMaterial &getCurrentMaterial() const;
+
+	COpenGL3CacheHandler *getCacheHandler() const;
+
+protected:
+	virtual bool genericDriverInit(const core::dimension2d<u32> &screenSize, bool stencilBuffer);
+
+	void initVersion();
+	virtual OpenGLVersion getVersionFromOpenGL() const = 0;
+
+	virtual void initFeatures() = 0;
+
+	bool isVersionAtLeast(int major, int minor = 0) const noexcept;
+
+	void chooseMaterial2D();
+
+	ITexture *createDeviceDependentTexture(const io::path &name, IImage *image) override;
+
+	ITexture *createDeviceDependentTextureCubemap(const io::path &name, const core::array<IImage *> &image) override;
+
+	//! Map Irrlicht wrap mode to OpenGL enum
+	GLint getTextureWrapMode(u8 clamp) const;
+
+	//! sets the needed renderstates
+	void setRenderStates3DMode();
+
+	//! sets the needed renderstates
+	void setRenderStates2DMode(bool alpha, bool texture, bool alphaChannel);
+
+	//! Prevent setRenderStateMode calls to do anything.
+	// hack to allow drawing meshbuffers in 2D mode.
+	// Better solution would be passing this flag through meshbuffers,
+	// but the way this is currently implemented in Irrlicht makes this tricky to implement
+	void lockRenderStateMode()
+	{
+		LockRenderStateMode = true;
+	}
+
+	//! Allow setRenderStateMode calls to work again
+	void unlockRenderStateMode()
+	{
+		LockRenderStateMode = false;
+	}
+
+	void draw2D3DVertexPrimitiveList(const void *vertices,
+			u32 vertexCount, const void *indexList, u32 primitiveCount,
+			E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType,
+			E_INDEX_TYPE iType, bool is3D);
+
+	void createMaterialRenderers();
+
+	void loadShaderData(const io::path &vertexShaderName, const io::path &fragmentShaderName, c8 **vertexShaderData, c8 **fragmentShaderData);
+
+	bool setMaterialTexture(irr::u32 layerIdx, const irr::video::ITexture *texture);
+
+	//! Same as `CacheHandler->setViewport`, but also sets `ViewPort`
+	virtual void setViewPortRaw(u32 width, u32 height);
+
+	void drawQuad(const VertexType &vertexType, const S3DVertex (&vertices)[4]);
+	void drawArrays(GLenum primitiveType, const VertexType &vertexType, const void *vertices, int vertexCount);
+	void drawElements(GLenum primitiveType, const VertexType &vertexType, const void *vertices, int vertexCount, const u16 *indices, int indexCount);
+	void drawElements(GLenum primitiveType, const VertexType &vertexType, uintptr_t vertices, uintptr_t indices, int indexCount);
+
+	void beginDraw(const VertexType &vertexType, uintptr_t verticesBase);
+	void endDraw(const VertexType &vertexType);
+
+	COpenGL3CacheHandler *CacheHandler;
+	core::stringc Name;
+	core::stringc VendorName;
+	SIrrlichtCreationParameters Params;
+	OpenGLVersion Version;
+
+	//! bool to make all renderstates reset if set to true.
+	bool ResetRenderStates;
+	bool LockRenderStateMode;
+	u8 AntiAlias;
+
+	struct SUserClipPlane
+	{
+		core::plane3df Plane;
+		bool Enabled;
+	};
+
+	core::array<SUserClipPlane> UserClipPlane;
+
+	core::matrix4 TextureFlipMatrix;
+
+	using FColorConverter = void (*)(const void *source, s32 count, void *dest);
+	struct STextureFormatInfo
+	{
+		GLenum InternalFormat;
+		GLenum PixelFormat;
+		GLenum PixelType;
+		FColorConverter Converter;
+	};
+	STextureFormatInfo TextureFormats[ECF_UNKNOWN] = {};
+
+private:
+	COpenGL3Renderer2D *MaterialRenderer2DActive;
+	COpenGL3Renderer2D *MaterialRenderer2DTexture;
+	COpenGL3Renderer2D *MaterialRenderer2DNoTexture;
+
+	core::matrix4 Matrices[ETS_COUNT];
+
+	//! enumeration for rendering modes such as 2d and 3d for minimizing the switching of renderStates.
+	enum E_RENDER_MODE
+	{
+		ERM_NONE = 0, // no render state has been set yet.
+		ERM_2D,       // 2d drawing rendermode
+		ERM_3D        // 3d rendering mode
+	};
+
+	E_RENDER_MODE CurrentRenderMode;
+	bool Transformation3DChanged;
+	irr::io::path OGLES2ShaderPath;
+
+	SMaterial Material, LastMaterial;
+
+	//! Color buffer format
+	ECOLOR_FORMAT ColorFormat;
+
+	IContextManager *ContextManager;
+
+	void printTextureFormats();
+
+	bool EnableErrorTest;
+
+	unsigned QuadIndexCount;
+	GLuint QuadIndexBuffer = 0;
+	void initQuadsIndices(int max_vertex_count = 65536);
+
+	void debugCb(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message);
+	static void APIENTRY debugCb(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
+};
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/OpenGL/ExtensionHandler.cpp b/irr/src/OpenGL/ExtensionHandler.cpp
new file mode 100644
index 000000000..3c248ba0a
--- /dev/null
+++ b/irr/src/OpenGL/ExtensionHandler.cpp
@@ -0,0 +1,28 @@
+// Copyright (C) 2015 Patryk Nadrowski
+// Copyright (C) 2009-2010 Amundis
+// 2017 modified by Michael Zeilfelder (unifying extension handlers)
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "ExtensionHandler.h"
+
+#include "irrString.h"
+#include "SMaterial.h"
+#include "fast_atof.h"
+#include "os.h"
+#include <mt_opengl.h>
+
+namespace irr
+{
+namespace video
+{
+
+void COpenGL3ExtensionHandler::initExtensions()
+{
+	// reading extensions happens in mt_opengl.cpp
+	for (size_t j = 0; j < IRR_OGLES_Feature_Count; ++j)
+		FeatureAvailable[j] = queryExtension(getFeatureString(j));
+}
+
+} // end namespace video
+} // end namespace irr
diff --git a/irr/src/OpenGL/ExtensionHandler.h b/irr/src/OpenGL/ExtensionHandler.h
new file mode 100644
index 000000000..8f76c0eea
--- /dev/null
+++ b/irr/src/OpenGL/ExtensionHandler.h
@@ -0,0 +1,167 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2015 Patryk Nadrowski
+// Copyright (C) 2009-2010 Amundis
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include <unordered_set>
+
+#include "EDriverFeatures.h"
+#include "irrTypes.h"
+#include "os.h"
+
+#include "Common.h"
+#include <mt_opengl.h> // must be after Common.h
+
+#include "COGLESCoreExtensionHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGL3ExtensionHandler : public COGLESCoreExtensionHandler
+{
+public:
+	COpenGL3ExtensionHandler() :
+			COGLESCoreExtensionHandler() {}
+
+	void initExtensions();
+
+	/// Checks whether a named extension is present
+	inline bool queryExtension(const std::string &name) const noexcept
+	{
+		return GL.IsExtensionPresent(name);
+	}
+
+	bool queryFeature(video::E_VIDEO_DRIVER_FEATURE feature) const
+	{
+		switch (feature) {
+		case EVDF_RENDER_TO_TARGET:
+		case EVDF_HARDWARE_TL:
+		case EVDF_MULTITEXTURE:
+		case EVDF_BILINEAR_FILTER:
+		case EVDF_MIP_MAP:
+		case EVDF_MIP_MAP_AUTO_UPDATE:
+		case EVDF_VERTEX_SHADER_1_1:
+		case EVDF_PIXEL_SHADER_1_1:
+		case EVDF_PIXEL_SHADER_1_2:
+		case EVDF_PIXEL_SHADER_2_0:
+		case EVDF_VERTEX_SHADER_2_0:
+		case EVDF_ARB_GLSL:
+		case EVDF_TEXTURE_NSQUARE:
+		case EVDF_TEXTURE_NPOT:
+		case EVDF_FRAMEBUFFER_OBJECT:
+		case EVDF_VERTEX_BUFFER_OBJECT:
+		case EVDF_COLOR_MASK:
+		case EVDF_ALPHA_TO_COVERAGE:
+		case EVDF_POLYGON_OFFSET:
+		case EVDF_BLEND_OPERATIONS:
+		case EVDF_BLEND_SEPARATE:
+		case EVDF_TEXTURE_MATRIX:
+		case EVDF_TEXTURE_CUBEMAP:
+			return true;
+		case EVDF_ARB_VERTEX_PROGRAM_1:
+		case EVDF_ARB_FRAGMENT_PROGRAM_1:
+		case EVDF_GEOMETRY_SHADER:
+		case EVDF_MULTIPLE_RENDER_TARGETS:
+		case EVDF_MRT_BLEND:
+		case EVDF_MRT_COLOR_MASK:
+		case EVDF_MRT_BLEND_FUNC:
+		case EVDF_OCCLUSION_QUERY:
+			return false;
+		case EVDF_STENCIL_BUFFER:
+			return StencilBuffer;
+		default:
+			return false;
+		};
+	}
+
+	static GLint GetInteger(GLenum key)
+	{
+		GLint val = 0;
+		GL.GetIntegerv(key, &val);
+		return val;
+	};
+
+	inline void irrGlActiveTexture(GLenum texture)
+	{
+		GL.ActiveTexture(texture);
+	}
+
+	inline void irrGlCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border,
+			GLsizei imageSize, const void *data)
+	{
+		os::Printer::log("Compressed textures aren't supported", ELL_ERROR);
+	}
+
+	inline void irrGlCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
+			GLenum format, GLsizei imageSize, const void *data)
+	{
+		os::Printer::log("Compressed textures aren't supported", ELL_ERROR);
+	}
+
+	inline void irrGlUseProgram(GLuint prog)
+	{
+		GL.UseProgram(prog);
+	}
+
+	inline void irrGlBindFramebuffer(GLenum target, GLuint framebuffer)
+	{
+		GL.BindFramebuffer(target, framebuffer);
+	}
+
+	inline void irrGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
+	{
+		GL.DeleteFramebuffers(n, framebuffers);
+	}
+
+	inline void irrGlGenFramebuffers(GLsizei n, GLuint *framebuffers)
+	{
+		GL.GenFramebuffers(n, framebuffers);
+	}
+
+	inline GLenum irrGlCheckFramebufferStatus(GLenum target)
+	{
+		return GL.CheckFramebufferStatus(target);
+	}
+
+	inline void irrGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+	{
+		GL.FramebufferTexture2D(target, attachment, textarget, texture, level);
+	}
+
+	inline void irrGlGenerateMipmap(GLenum target)
+	{
+		GL.GenerateMipmap(target);
+	}
+
+	inline void irrGlDrawBuffer(GLenum mode)
+	{
+		// GLES only has DrawBuffers, so use that
+		GL.DrawBuffers(1, &mode);
+	}
+
+	inline void irrGlDrawBuffers(GLsizei n, const GLenum *bufs)
+	{
+		GL.DrawBuffers(n, bufs);
+	}
+
+	inline void irrGlBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+	{
+		GL.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+	}
+
+	inline void irrGlBlendEquation(GLenum mode)
+	{
+		GL.BlendEquation(mode);
+	}
+
+	bool AnisotropicFilterSupported = false;
+	bool BlendMinMaxSupported = false;
+};
+
+}
+}
diff --git a/irr/src/OpenGL/FixedPipelineRenderer.cpp b/irr/src/OpenGL/FixedPipelineRenderer.cpp
new file mode 100644
index 000000000..7c4adf719
--- /dev/null
+++ b/irr/src/OpenGL/FixedPipelineRenderer.cpp
@@ -0,0 +1,186 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "FixedPipelineRenderer.h"
+
+#include "IVideoDriver.h"
+
+namespace irr
+{
+namespace video
+{
+
+// Base callback
+
+COpenGL3MaterialBaseCB::COpenGL3MaterialBaseCB() :
+		FirstUpdateBase(true), WVPMatrixID(-1), WVMatrixID(-1), NMatrixID(-1),
+		FogEnableID(-1), FogTypeID(-1), FogColorID(-1), FogStartID(-1),
+		FogEndID(-1), FogDensityID(-1), ThicknessID(-1), LightEnable(false), MaterialAmbient(SColorf(0.f, 0.f, 0.f)), MaterialDiffuse(SColorf(0.f, 0.f, 0.f)), MaterialEmissive(SColorf(0.f, 0.f, 0.f)), MaterialSpecular(SColorf(0.f, 0.f, 0.f)),
+		MaterialShininess(0.f), FogEnable(0), FogType(1), FogColor(SColorf(0.f, 0.f, 0.f, 1.f)), FogStart(0.f), FogEnd(0.f), FogDensity(0.f), Thickness(1.f)
+{
+}
+
+void COpenGL3MaterialBaseCB::OnSetMaterial(const SMaterial &material)
+{
+	LightEnable = material.Lighting;
+	MaterialAmbient = SColorf(material.AmbientColor);
+	MaterialDiffuse = SColorf(material.DiffuseColor);
+	MaterialEmissive = SColorf(material.EmissiveColor);
+	MaterialSpecular = SColorf(material.SpecularColor);
+	MaterialShininess = material.Shininess;
+
+	FogEnable = material.FogEnable ? 1 : 0;
+
+	Thickness = (material.Thickness > 0.f) ? material.Thickness : 1.f;
+}
+
+void COpenGL3MaterialBaseCB::OnSetConstants(IMaterialRendererServices *services, s32 userData)
+{
+	IVideoDriver *driver = services->getVideoDriver();
+
+	if (FirstUpdateBase) {
+		WVPMatrixID = services->getVertexShaderConstantID("uWVPMatrix");
+		WVMatrixID = services->getVertexShaderConstantID("uWVMatrix");
+		NMatrixID = services->getVertexShaderConstantID("uNMatrix");
+
+		FogEnableID = services->getVertexShaderConstantID("uFogEnable");
+		FogTypeID = services->getVertexShaderConstantID("uFogType");
+		FogColorID = services->getVertexShaderConstantID("uFogColor");
+		FogStartID = services->getVertexShaderConstantID("uFogStart");
+		FogEndID = services->getVertexShaderConstantID("uFogEnd");
+		FogDensityID = services->getVertexShaderConstantID("uFogDensity");
+		ThicknessID = services->getVertexShaderConstantID("uThickness");
+
+		FirstUpdateBase = false;
+	}
+
+	const core::matrix4 W = driver->getTransform(ETS_WORLD);
+	const core::matrix4 V = driver->getTransform(ETS_VIEW);
+	const core::matrix4 P = driver->getTransform(ETS_PROJECTION);
+
+	core::matrix4 Matrix = P * V * W;
+	services->setPixelShaderConstant(WVPMatrixID, Matrix.pointer(), 16);
+
+	Matrix = V * W;
+	services->setPixelShaderConstant(WVMatrixID, Matrix.pointer(), 16);
+
+	Matrix.makeInverse();
+	services->setPixelShaderConstant(NMatrixID, Matrix.getTransposed().pointer(), 16);
+
+	services->setPixelShaderConstant(FogEnableID, &FogEnable, 1);
+
+	if (FogEnable) {
+		SColor TempColor(0);
+		E_FOG_TYPE TempType = EFT_FOG_LINEAR;
+		bool TempPerFragment = false;
+		bool TempRange = false;
+
+		driver->getFog(TempColor, TempType, FogStart, FogEnd, FogDensity, TempPerFragment, TempRange);
+
+		FogType = (s32)TempType;
+		FogColor = SColorf(TempColor);
+
+		services->setPixelShaderConstant(FogTypeID, &FogType, 1);
+		services->setPixelShaderConstant(FogColorID, reinterpret_cast<f32 *>(&FogColor), 4);
+		services->setPixelShaderConstant(FogStartID, &FogStart, 1);
+		services->setPixelShaderConstant(FogEndID, &FogEnd, 1);
+		services->setPixelShaderConstant(FogDensityID, &FogDensity, 1);
+	}
+
+	services->setPixelShaderConstant(ThicknessID, &Thickness, 1);
+}
+
+// EMT_SOLID + EMT_TRANSPARENT_ALPHA_CHANNEL + EMT_TRANSPARENT_VERTEX_ALPHA
+
+COpenGL3MaterialSolidCB::COpenGL3MaterialSolidCB() :
+		FirstUpdate(true), TMatrix0ID(-1), AlphaRefID(-1), TextureUsage0ID(-1), TextureUnit0ID(-1), AlphaRef(0.5f), TextureUsage0(0), TextureUnit0(0)
+{
+}
+
+void COpenGL3MaterialSolidCB::OnSetMaterial(const SMaterial &material)
+{
+	COpenGL3MaterialBaseCB::OnSetMaterial(material);
+
+	AlphaRef = material.MaterialTypeParam;
+	TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0;
+}
+
+void COpenGL3MaterialSolidCB::OnSetConstants(IMaterialRendererServices *services, s32 userData)
+{
+	COpenGL3MaterialBaseCB::OnSetConstants(services, userData);
+
+	IVideoDriver *driver = services->getVideoDriver();
+
+	if (FirstUpdate) {
+		TMatrix0ID = services->getVertexShaderConstantID("uTMatrix0");
+		AlphaRefID = services->getVertexShaderConstantID("uAlphaRef");
+		TextureUsage0ID = services->getVertexShaderConstantID("uTextureUsage0");
+		TextureUnit0ID = services->getVertexShaderConstantID("uTextureUnit0");
+
+		FirstUpdate = false;
+	}
+
+	core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
+	services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);
+
+	services->setPixelShaderConstant(AlphaRefID, &AlphaRef, 1);
+	services->setPixelShaderConstant(TextureUsage0ID, &TextureUsage0, 1);
+	services->setPixelShaderConstant(TextureUnit0ID, &TextureUnit0, 1);
+}
+
+// EMT_ONETEXTURE_BLEND
+
+COpenGL3MaterialOneTextureBlendCB::COpenGL3MaterialOneTextureBlendCB() :
+		FirstUpdate(true), TMatrix0ID(-1), BlendTypeID(-1), TextureUsage0ID(-1), TextureUnit0ID(-1), BlendType(0), TextureUsage0(0), TextureUnit0(0)
+{
+}
+
+void COpenGL3MaterialOneTextureBlendCB::OnSetMaterial(const SMaterial &material)
+{
+	COpenGL3MaterialBaseCB::OnSetMaterial(material);
+
+	BlendType = 0;
+
+	E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact;
+	E_MODULATE_FUNC modulate;
+	u32 alphaSource;
+	unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulate, alphaSource, material.MaterialTypeParam);
+
+	if (textureBlendFunc_hasAlpha(srcRGBFact) || textureBlendFunc_hasAlpha(dstRGBFact) || textureBlendFunc_hasAlpha(srcAlphaFact) || textureBlendFunc_hasAlpha(dstAlphaFact)) {
+		if (alphaSource == EAS_VERTEX_COLOR) {
+			BlendType = 1;
+		} else if (alphaSource == EAS_TEXTURE) {
+			BlendType = 2;
+		}
+	}
+
+	TextureUsage0 = (material.TextureLayers[0].Texture) ? 1 : 0;
+}
+
+void COpenGL3MaterialOneTextureBlendCB::OnSetConstants(IMaterialRendererServices *services, s32 userData)
+{
+	COpenGL3MaterialBaseCB::OnSetConstants(services, userData);
+
+	IVideoDriver *driver = services->getVideoDriver();
+
+	if (FirstUpdate) {
+		TMatrix0ID = services->getVertexShaderConstantID("uTMatrix0");
+		BlendTypeID = services->getVertexShaderConstantID("uBlendType");
+		TextureUsage0ID = services->getVertexShaderConstantID("uTextureUsage0");
+		TextureUnit0ID = services->getVertexShaderConstantID("uTextureUnit0");
+
+		FirstUpdate = false;
+	}
+
+	core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
+	services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);
+
+	services->setPixelShaderConstant(BlendTypeID, &BlendType, 1);
+	services->setPixelShaderConstant(TextureUsage0ID, &TextureUsage0, 1);
+	services->setPixelShaderConstant(TextureUnit0ID, &TextureUnit0, 1);
+}
+
+}
+}
diff --git a/irr/src/OpenGL/FixedPipelineRenderer.h b/irr/src/OpenGL/FixedPipelineRenderer.h
new file mode 100644
index 000000000..a07af1df9
--- /dev/null
+++ b/irr/src/OpenGL/FixedPipelineRenderer.h
@@ -0,0 +1,101 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include "IShaderConstantSetCallBack.h"
+#include "IMaterialRendererServices.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGL3MaterialBaseCB : public IShaderConstantSetCallBack
+{
+public:
+	COpenGL3MaterialBaseCB();
+
+	virtual void OnSetMaterial(const SMaterial &material);
+	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData);
+
+protected:
+	bool FirstUpdateBase;
+
+	s32 WVPMatrixID;
+	s32 WVMatrixID;
+	s32 NMatrixID;
+
+	s32 FogEnableID;
+	s32 FogTypeID;
+	s32 FogColorID;
+	s32 FogStartID;
+	s32 FogEndID;
+	s32 FogDensityID;
+
+	s32 ThicknessID;
+
+	bool LightEnable;
+	SColorf GlobalAmbient;
+	SColorf MaterialAmbient;
+	SColorf MaterialDiffuse;
+	SColorf MaterialEmissive;
+	SColorf MaterialSpecular;
+	f32 MaterialShininess;
+
+	s32 FogEnable;
+	s32 FogType;
+	SColorf FogColor;
+	f32 FogStart;
+	f32 FogEnd;
+	f32 FogDensity;
+
+	f32 Thickness;
+};
+
+class COpenGL3MaterialSolidCB : public COpenGL3MaterialBaseCB
+{
+public:
+	COpenGL3MaterialSolidCB();
+
+	virtual void OnSetMaterial(const SMaterial &material);
+	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData);
+
+protected:
+	bool FirstUpdate;
+
+	s32 TMatrix0ID;
+	s32 AlphaRefID;
+	s32 TextureUsage0ID;
+	s32 TextureUnit0ID;
+
+	f32 AlphaRef;
+	s32 TextureUsage0;
+	s32 TextureUnit0;
+};
+
+class COpenGL3MaterialOneTextureBlendCB : public COpenGL3MaterialBaseCB
+{
+public:
+	COpenGL3MaterialOneTextureBlendCB();
+
+	virtual void OnSetMaterial(const SMaterial &material);
+	virtual void OnSetConstants(IMaterialRendererServices *services, s32 userData);
+
+protected:
+	bool FirstUpdate;
+
+	s32 TMatrix0ID;
+	s32 BlendTypeID;
+	s32 TextureUsage0ID;
+	s32 TextureUnit0ID;
+
+	s32 BlendType;
+	s32 TextureUsage0;
+	s32 TextureUnit0;
+};
+
+}
+}
diff --git a/irr/src/OpenGL/MaterialRenderer.cpp b/irr/src/OpenGL/MaterialRenderer.cpp
new file mode 100644
index 000000000..51a796d48
--- /dev/null
+++ b/irr/src/OpenGL/MaterialRenderer.cpp
@@ -0,0 +1,429 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "MaterialRenderer.h"
+
+#include "EVertexAttributes.h"
+#include "IGPUProgrammingServices.h"
+#include "IShaderConstantSetCallBack.h"
+#include "IVideoDriver.h"
+#include "os.h"
+
+#include "Driver.h"
+
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreCacheHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+COpenGL3MaterialRenderer::COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
+		s32 &outMaterialTypeNr,
+		const c8 *vertexShaderProgram,
+		const c8 *pixelShaderProgram,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial,
+		s32 userData) :
+		Driver(driver),
+		CallBack(callback), Alpha(false), Blending(false), Program(0), UserData(userData)
+{
+#ifdef _DEBUG
+	setDebugName("MaterialRenderer");
+#endif
+
+	switch (baseMaterial) {
+	case EMT_TRANSPARENT_VERTEX_ALPHA:
+	case EMT_TRANSPARENT_ALPHA_CHANNEL:
+		Alpha = true;
+		break;
+	case EMT_ONETEXTURE_BLEND:
+		Blending = true;
+		break;
+	default:
+		break;
+	}
+
+	if (CallBack)
+		CallBack->grab();
+
+	init(outMaterialTypeNr, vertexShaderProgram, pixelShaderProgram);
+}
+
+COpenGL3MaterialRenderer::COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
+		IShaderConstantSetCallBack *callback,
+		E_MATERIAL_TYPE baseMaterial, s32 userData) :
+		Driver(driver),
+		CallBack(callback), Alpha(false), Blending(false), Program(0), UserData(userData)
+{
+	switch (baseMaterial) {
+	case EMT_TRANSPARENT_VERTEX_ALPHA:
+	case EMT_TRANSPARENT_ALPHA_CHANNEL:
+		Alpha = true;
+		break;
+	case EMT_ONETEXTURE_BLEND:
+		Blending = true;
+		break;
+	default:
+		break;
+	}
+
+	if (CallBack)
+		CallBack->grab();
+}
+
+COpenGL3MaterialRenderer::~COpenGL3MaterialRenderer()
+{
+	if (CallBack)
+		CallBack->drop();
+
+	if (Program) {
+		GLuint shaders[8];
+		GLint count;
+		GL.GetAttachedShaders(Program, 8, &count, shaders);
+
+		count = core::min_(count, 8);
+		for (GLint i = 0; i < count; ++i)
+			GL.DeleteShader(shaders[i]);
+		GL.DeleteProgram(Program);
+		Program = 0;
+	}
+
+	UniformInfo.clear();
+}
+
+GLuint COpenGL3MaterialRenderer::getProgram() const
+{
+	return Program;
+}
+
+void COpenGL3MaterialRenderer::init(s32 &outMaterialTypeNr,
+		const c8 *vertexShaderProgram,
+		const c8 *pixelShaderProgram,
+		bool addMaterial)
+{
+	outMaterialTypeNr = -1;
+
+	Program = GL.CreateProgram();
+
+	if (!Program)
+		return;
+
+	if (vertexShaderProgram)
+		if (!createShader(GL_VERTEX_SHADER, vertexShaderProgram))
+			return;
+
+	if (pixelShaderProgram)
+		if (!createShader(GL_FRAGMENT_SHADER, pixelShaderProgram))
+			return;
+
+	for (size_t i = 0; i < EVA_COUNT; ++i)
+		GL.BindAttribLocation(Program, i, sBuiltInVertexAttributeNames[i]);
+
+	if (!linkProgram())
+		return;
+
+	if (addMaterial)
+		outMaterialTypeNr = Driver->addMaterialRenderer(this);
+}
+
+bool COpenGL3MaterialRenderer::OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype)
+{
+	if (CallBack && Program)
+		CallBack->OnSetConstants(this, UserData);
+
+	return true;
+}
+
+void COpenGL3MaterialRenderer::OnSetMaterial(const video::SMaterial &material,
+		const video::SMaterial &lastMaterial,
+		bool resetAllRenderstates,
+		video::IMaterialRendererServices *services)
+{
+	COpenGL3CacheHandler *cacheHandler = Driver->getCacheHandler();
+
+	cacheHandler->setProgram(Program);
+
+	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+	if (Alpha) {
+		cacheHandler->setBlend(true);
+		cacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	} else if (Blending) {
+		E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact;
+		E_MODULATE_FUNC modulate;
+		u32 alphaSource;
+		unpack_textureBlendFuncSeparate(srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact, modulate, alphaSource, material.MaterialTypeParam);
+
+		cacheHandler->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
+				Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
+
+		cacheHandler->setBlend(true);
+	}
+
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+}
+
+void COpenGL3MaterialRenderer::OnUnsetMaterial()
+{
+}
+
+bool COpenGL3MaterialRenderer::isTransparent() const
+{
+	return (Alpha || Blending);
+}
+
+s32 COpenGL3MaterialRenderer::getRenderCapability() const
+{
+	return 0;
+}
+
+bool COpenGL3MaterialRenderer::createShader(GLenum shaderType, const char *shader)
+{
+	if (Program) {
+		GLuint shaderHandle = GL.CreateShader(shaderType);
+		GL.ShaderSource(shaderHandle, 1, &shader, NULL);
+		GL.CompileShader(shaderHandle);
+
+		GLint status = 0;
+
+		GL.GetShaderiv(shaderHandle, GL_COMPILE_STATUS, &status);
+
+		if (status != GL_TRUE) {
+			os::Printer::log("GLSL shader failed to compile", ELL_ERROR);
+
+			GLint maxLength = 0;
+			GLint length;
+
+			GL.GetShaderiv(shaderHandle, GL_INFO_LOG_LENGTH,
+					&maxLength);
+
+			if (maxLength) {
+				GLchar *infoLog = new GLchar[maxLength];
+				GL.GetShaderInfoLog(shaderHandle, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		GL.AttachShader(Program, shaderHandle);
+	}
+
+	return true;
+}
+
+bool COpenGL3MaterialRenderer::linkProgram()
+{
+	if (Program) {
+		GL.LinkProgram(Program);
+
+		GLint status = 0;
+
+		GL.GetProgramiv(Program, GL_LINK_STATUS, &status);
+
+		if (!status) {
+			os::Printer::log("GLSL shader program failed to link", ELL_ERROR);
+
+			GLint maxLength = 0;
+			GLsizei length;
+
+			GL.GetProgramiv(Program, GL_INFO_LOG_LENGTH, &maxLength);
+
+			if (maxLength) {
+				GLchar *infoLog = new GLchar[maxLength];
+				GL.GetProgramInfoLog(Program, maxLength, &length, infoLog);
+				os::Printer::log(reinterpret_cast<const c8 *>(infoLog), ELL_ERROR);
+				delete[] infoLog;
+			}
+
+			return false;
+		}
+
+		GLint num = 0;
+
+		GL.GetProgramiv(Program, GL_ACTIVE_UNIFORMS, &num);
+
+		if (num == 0)
+			return true;
+
+		GLint maxlen = 0;
+
+		GL.GetProgramiv(Program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxlen);
+
+		if (maxlen == 0) {
+			os::Printer::log("GLSL: failed to retrieve uniform information", ELL_ERROR);
+			return false;
+		}
+
+		// seems that some implementations use an extra null terminator.
+		++maxlen;
+		c8 *buf = new c8[maxlen];
+
+		UniformInfo.clear();
+		UniformInfo.reallocate(num);
+
+		for (GLint i = 0; i < num; ++i) {
+			SUniformInfo ui;
+			memset(buf, 0, maxlen);
+
+			GLint size;
+			GL.GetActiveUniform(Program, i, maxlen, 0, &size, &ui.type, reinterpret_cast<GLchar *>(buf));
+
+			core::stringc name = "";
+
+			// array support, workaround for some bugged drivers.
+			for (s32 i = 0; i < maxlen; ++i) {
+				if (buf[i] == '[' || buf[i] == '\0')
+					break;
+
+				name += buf[i];
+			}
+
+			ui.name = name;
+			ui.location = GL.GetUniformLocation(Program, buf);
+
+			UniformInfo.push_back(ui);
+		}
+
+		delete[] buf;
+	}
+
+	return true;
+}
+
+void COpenGL3MaterialRenderer::setBasicRenderStates(const SMaterial &material,
+		const SMaterial &lastMaterial,
+		bool resetAllRenderstates)
+{
+	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+}
+
+s32 COpenGL3MaterialRenderer::getVertexShaderConstantID(const c8 *name)
+{
+	return getPixelShaderConstantID(name);
+}
+
+s32 COpenGL3MaterialRenderer::getPixelShaderConstantID(const c8 *name)
+{
+	for (u32 i = 0; i < UniformInfo.size(); ++i) {
+		if (UniformInfo[i].name == name)
+			return i;
+	}
+
+	return -1;
+}
+
+bool COpenGL3MaterialRenderer::setVertexShaderConstant(s32 index, const f32 *floats, int count)
+{
+	return setPixelShaderConstant(index, floats, count);
+}
+
+bool COpenGL3MaterialRenderer::setVertexShaderConstant(s32 index, const s32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+bool COpenGL3MaterialRenderer::setVertexShaderConstant(s32 index, const u32 *ints, int count)
+{
+	return setPixelShaderConstant(index, ints, count);
+}
+
+bool COpenGL3MaterialRenderer::setPixelShaderConstant(s32 index, const f32 *floats, int count)
+{
+	if (index < 0 || UniformInfo[index].location < 0)
+		return false;
+
+	bool status = true;
+
+	switch (UniformInfo[index].type) {
+	case GL_FLOAT:
+		GL.Uniform1fv(UniformInfo[index].location, count, floats);
+		break;
+	case GL_FLOAT_VEC2:
+		GL.Uniform2fv(UniformInfo[index].location, count / 2, floats);
+		break;
+	case GL_FLOAT_VEC3:
+		GL.Uniform3fv(UniformInfo[index].location, count / 3, floats);
+		break;
+	case GL_FLOAT_VEC4:
+		GL.Uniform4fv(UniformInfo[index].location, count / 4, floats);
+		break;
+	case GL_FLOAT_MAT2:
+		GL.UniformMatrix2fv(UniformInfo[index].location, count / 4, false, floats);
+		break;
+	case GL_FLOAT_MAT3:
+		GL.UniformMatrix3fv(UniformInfo[index].location, count / 9, false, floats);
+		break;
+	case GL_FLOAT_MAT4:
+		GL.UniformMatrix4fv(UniformInfo[index].location, count / 16, false, floats);
+		break;
+	case GL_SAMPLER_2D:
+	case GL_SAMPLER_CUBE: {
+		if (floats) {
+			const GLint id = (GLint)(*floats);
+			GL.Uniform1iv(UniformInfo[index].location, 1, &id);
+		} else
+			status = false;
+	} break;
+	default:
+		status = false;
+		break;
+	}
+
+	return status;
+}
+
+bool COpenGL3MaterialRenderer::setPixelShaderConstant(s32 index, const s32 *ints, int count)
+{
+	if (index < 0 || UniformInfo[index].location < 0)
+		return false;
+
+	bool status = true;
+
+	switch (UniformInfo[index].type) {
+	case GL_INT:
+	case GL_BOOL:
+		GL.Uniform1iv(UniformInfo[index].location, count, ints);
+		break;
+	case GL_INT_VEC2:
+	case GL_BOOL_VEC2:
+		GL.Uniform2iv(UniformInfo[index].location, count / 2, ints);
+		break;
+	case GL_INT_VEC3:
+	case GL_BOOL_VEC3:
+		GL.Uniform3iv(UniformInfo[index].location, count / 3, ints);
+		break;
+	case GL_INT_VEC4:
+	case GL_BOOL_VEC4:
+		GL.Uniform4iv(UniformInfo[index].location, count / 4, ints);
+		break;
+	case GL_SAMPLER_2D:
+	case GL_SAMPLER_CUBE:
+		GL.Uniform1iv(UniformInfo[index].location, 1, ints);
+		break;
+	default:
+		status = false;
+		break;
+	}
+
+	return status;
+}
+
+bool COpenGL3MaterialRenderer::setPixelShaderConstant(s32 index, const u32 *ints, int count)
+{
+	os::Printer::log("Unsigned int support needs at least GLES 3.0", ELL_WARNING);
+	return false;
+}
+
+IVideoDriver *COpenGL3MaterialRenderer::getVideoDriver()
+{
+	return Driver;
+}
+
+}
+}
diff --git a/irr/src/OpenGL/MaterialRenderer.h b/irr/src/OpenGL/MaterialRenderer.h
new file mode 100644
index 000000000..fa37cfff3
--- /dev/null
+++ b/irr/src/OpenGL/MaterialRenderer.h
@@ -0,0 +1,93 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "EMaterialTypes.h"
+#include "IMaterialRenderer.h"
+#include "IMaterialRendererServices.h"
+#include "IGPUProgrammingServices.h"
+#include "irrArray.h"
+#include "irrString.h"
+
+#include "Common.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGL3DriverBase;
+
+class COpenGL3MaterialRenderer : public IMaterialRenderer, public IMaterialRendererServices
+{
+public:
+	COpenGL3MaterialRenderer(
+			COpenGL3DriverBase *driver,
+			s32 &outMaterialTypeNr,
+			const c8 *vertexShaderProgram = 0,
+			const c8 *pixelShaderProgram = 0,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = EMT_SOLID,
+			s32 userData = 0);
+
+	virtual ~COpenGL3MaterialRenderer();
+
+	GLuint getProgram() const;
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services) override;
+
+	virtual bool OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype) override;
+
+	virtual void OnUnsetMaterial() override;
+
+	virtual bool isTransparent() const override;
+
+	virtual s32 getRenderCapability() const override;
+
+	void setBasicRenderStates(const SMaterial &material, const SMaterial &lastMaterial, bool resetAllRenderstates) override;
+
+	s32 getVertexShaderConstantID(const c8 *name) override;
+	s32 getPixelShaderConstantID(const c8 *name) override;
+	bool setVertexShaderConstant(s32 index, const f32 *floats, int count) override;
+	bool setVertexShaderConstant(s32 index, const s32 *ints, int count) override;
+	bool setVertexShaderConstant(s32 index, const u32 *ints, int count) override;
+	bool setPixelShaderConstant(s32 index, const f32 *floats, int count) override;
+	bool setPixelShaderConstant(s32 index, const s32 *ints, int count) override;
+	bool setPixelShaderConstant(s32 index, const u32 *ints, int count) override;
+
+	IVideoDriver *getVideoDriver() override;
+
+protected:
+	COpenGL3MaterialRenderer(COpenGL3DriverBase *driver,
+			IShaderConstantSetCallBack *callback = 0,
+			E_MATERIAL_TYPE baseMaterial = EMT_SOLID,
+			s32 userData = 0);
+
+	void init(s32 &outMaterialTypeNr, const c8 *vertexShaderProgram, const c8 *pixelShaderProgram, bool addMaterial = true);
+
+	bool createShader(GLenum shaderType, const char *shader);
+	bool linkProgram();
+
+	COpenGL3DriverBase *Driver;
+	IShaderConstantSetCallBack *CallBack;
+
+	bool Alpha;
+	bool Blending;
+
+	struct SUniformInfo
+	{
+		core::stringc name;
+		GLenum type;
+		GLint location;
+	};
+
+	GLuint Program;
+	core::array<SUniformInfo> UniformInfo;
+	s32 UserData;
+};
+
+}
+}
diff --git a/irr/src/OpenGL/Renderer2D.cpp b/irr/src/OpenGL/Renderer2D.cpp
new file mode 100644
index 000000000..b625feda4
--- /dev/null
+++ b/irr/src/OpenGL/Renderer2D.cpp
@@ -0,0 +1,81 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "Renderer2D.h"
+
+#include "IGPUProgrammingServices.h"
+#include "os.h"
+
+#include "Driver.h"
+
+#include "COpenGLCoreFeature.h"
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreCacheHandler.h"
+
+namespace irr
+{
+namespace video
+{
+
+COpenGL3Renderer2D::COpenGL3Renderer2D(const c8 *vertexShaderProgram, const c8 *pixelShaderProgram, COpenGL3DriverBase *driver, bool withTexture) :
+		COpenGL3MaterialRenderer(driver, 0, EMT_SOLID),
+		WithTexture(withTexture)
+{
+#ifdef _DEBUG
+	setDebugName("Renderer2D");
+#endif
+
+	int Temp = 0;
+
+	init(Temp, vertexShaderProgram, pixelShaderProgram, false);
+
+	COpenGL3CacheHandler *cacheHandler = Driver->getCacheHandler();
+
+	cacheHandler->setProgram(Program);
+
+	// These states don't change later.
+
+	ThicknessID = getPixelShaderConstantID("uThickness");
+	if (WithTexture) {
+		TextureUsageID = getPixelShaderConstantID("uTextureUsage");
+		s32 TextureUnitID = getPixelShaderConstantID("uTextureUnit");
+
+		s32 TextureUnit = 0;
+		setPixelShaderConstant(TextureUnitID, &TextureUnit, 1);
+
+		s32 TextureUsage = 0;
+		setPixelShaderConstant(TextureUsageID, &TextureUsage, 1);
+	}
+
+	cacheHandler->setProgram(0);
+}
+
+COpenGL3Renderer2D::~COpenGL3Renderer2D()
+{
+}
+
+void COpenGL3Renderer2D::OnSetMaterial(const video::SMaterial &material,
+		const video::SMaterial &lastMaterial,
+		bool resetAllRenderstates,
+		video::IMaterialRendererServices *services)
+{
+	Driver->getCacheHandler()->setProgram(Program);
+	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
+
+	f32 Thickness = (material.Thickness > 0.f) ? material.Thickness : 1.f;
+	setPixelShaderConstant(ThicknessID, &Thickness, 1);
+
+	if (WithTexture) {
+		s32 TextureUsage = material.TextureLayers[0].Texture ? 1 : 0;
+		setPixelShaderConstant(TextureUsageID, &TextureUsage, 1);
+	}
+}
+
+bool COpenGL3Renderer2D::OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype)
+{
+	return true;
+}
+
+}
+}
diff --git a/irr/src/OpenGL/Renderer2D.h b/irr/src/OpenGL/Renderer2D.h
new file mode 100644
index 000000000..6cfc7029d
--- /dev/null
+++ b/irr/src/OpenGL/Renderer2D.h
@@ -0,0 +1,32 @@
+// Copyright (C) 2014 Patryk Nadrowski
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+
+#include "MaterialRenderer.h"
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGL3Renderer2D : public COpenGL3MaterialRenderer
+{
+public:
+	COpenGL3Renderer2D(const c8 *vertexShaderProgram, const c8 *pixelShaderProgram, COpenGL3DriverBase *driver, bool withTexture);
+	~COpenGL3Renderer2D();
+
+	virtual void OnSetMaterial(const SMaterial &material, const SMaterial &lastMaterial,
+			bool resetAllRenderstates, IMaterialRendererServices *services);
+
+	virtual bool OnRender(IMaterialRendererServices *service, E_VERTEX_TYPE vtxtype);
+
+protected:
+	bool WithTexture;
+	s32 ThicknessID;
+	s32 TextureUsageID;
+};
+
+}
+}
diff --git a/irr/src/OpenGL3/Driver.cpp b/irr/src/OpenGL3/Driver.cpp
new file mode 100644
index 000000000..fd018b91d
--- /dev/null
+++ b/irr/src/OpenGL3/Driver.cpp
@@ -0,0 +1,89 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "Driver.h"
+#include <cassert>
+#include "mt_opengl.h"
+
+namespace irr
+{
+namespace video
+{
+
+E_DRIVER_TYPE COpenGL3Driver::getDriverType() const
+{
+	return EDT_OPENGL3;
+}
+
+OpenGLVersion COpenGL3Driver::getVersionFromOpenGL() const
+{
+	GLint major, minor, profile;
+	GL.GetIntegerv(GL_MAJOR_VERSION, &major);
+	GL.GetIntegerv(GL_MINOR_VERSION, &minor);
+	GL.GetIntegerv(GL_CONTEXT_PROFILE_MASK, &profile);
+	// The spec is clear a context can’t be both core and compatibility at the same time.
+	// However, the returned value is a mask. Ask Khronos why. -- numzero
+	if (profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT)
+		return {OpenGLSpec::Compat, (u8)major, (u8)minor, 0};
+	if (profile & GL_CONTEXT_CORE_PROFILE_BIT)
+		return {OpenGLSpec::Core, (u8)major, (u8)minor, 0};
+	os::Printer::log("Got unrecognized OpenGL profile", ELL_ERROR);
+	return {OpenGLSpec::Core, (u8)major, (u8)minor, 0};
+}
+
+void COpenGL3Driver::initFeatures()
+{
+	assert(Version.Spec == OpenGLSpec::Compat);
+	assert(isVersionAtLeast(3, 2));
+	initExtensions();
+
+	TextureFormats[ECF_A1R5G5B5] = {GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}; // WARNING: may not be renderable
+	TextureFormats[ECF_R5G6B5] = {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5};              // GL_RGB565 is an extension until 4.1
+	TextureFormats[ECF_R8G8B8] = {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE};                    // WARNING: may not be renderable
+	TextureFormats[ECF_A8R8G8B8] = {GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV};
+	TextureFormats[ECF_R16F] = {GL_R16F, GL_RED, GL_HALF_FLOAT};
+	TextureFormats[ECF_G16R16F] = {GL_RG16F, GL_RG, GL_HALF_FLOAT};
+	TextureFormats[ECF_A16B16G16R16F] = {GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT};
+	TextureFormats[ECF_R32F] = {GL_R32F, GL_RED, GL_FLOAT};
+	TextureFormats[ECF_G32R32F] = {GL_RG32F, GL_RG, GL_FLOAT};
+	TextureFormats[ECF_A32B32G32R32F] = {GL_RGBA32F, GL_RGBA, GL_FLOAT};
+	TextureFormats[ECF_R8] = {GL_R8, GL_RED, GL_UNSIGNED_BYTE};
+	TextureFormats[ECF_R8G8] = {GL_RG8, GL_RG, GL_UNSIGNED_BYTE};
+	TextureFormats[ECF_R16] = {GL_R16, GL_RED, GL_UNSIGNED_SHORT};
+	TextureFormats[ECF_R16G16] = {GL_RG16, GL_RG, GL_UNSIGNED_SHORT};
+	TextureFormats[ECF_D16] = {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT};
+	TextureFormats[ECF_D32] = {GL_DEPTH_COMPONENT32, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT}; // WARNING: may not be renderable (?!)
+	TextureFormats[ECF_D24S8] = {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8};
+
+	AnisotropicFilterSupported = isVersionAtLeast(4, 6) || queryExtension("GL_ARB_texture_filter_anisotropic") || queryExtension("GL_EXT_texture_filter_anisotropic");
+	BlendMinMaxSupported = true;
+
+	// COGLESCoreExtensionHandler::Feature
+	static_assert(MATERIAL_MAX_TEXTURES <= 16, "Only up to 16 textures are guaranteed");
+	Feature.BlendOperation = true;
+	Feature.ColorAttachment = GetInteger(GL_MAX_COLOR_ATTACHMENTS);
+	Feature.MaxTextureUnits = MATERIAL_MAX_TEXTURES;
+	Feature.MultipleRenderTarget = GetInteger(GL_MAX_DRAW_BUFFERS);
+
+	// COGLESCoreExtensionHandler
+	if (AnisotropicFilterSupported)
+		MaxAnisotropy = GetInteger(GL.MAX_TEXTURE_MAX_ANISOTROPY);
+	MaxIndices = GetInteger(GL_MAX_ELEMENTS_INDICES);
+	MaxTextureSize = GetInteger(GL_MAX_TEXTURE_SIZE);
+	GL.GetFloatv(GL_MAX_TEXTURE_LOD_BIAS, &MaxTextureLODBias);
+	GL.GetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, DimAliasedLine);
+	DimAliasedPoint[0] = 1.0f;
+	DimAliasedPoint[1] = 1.0f;
+}
+
+IVideoDriver *createOpenGL3Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("Using COpenGL3Driver", ELL_INFORMATION);
+	COpenGL3Driver *driver = new COpenGL3Driver(params, io, contextManager);
+	driver->genericDriverInit(params.WindowSize, params.Stencilbuffer); // don't call in constructor, it uses virtual function calls of driver
+	return driver;
+}
+
+}
+}
diff --git a/irr/src/OpenGL3/Driver.h b/irr/src/OpenGL3/Driver.h
new file mode 100644
index 000000000..f4934051e
--- /dev/null
+++ b/irr/src/OpenGL3/Driver.h
@@ -0,0 +1,30 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+#include "OpenGL/Driver.h"
+
+namespace irr
+{
+namespace video
+{
+
+/// OpenGL 3+ driver
+///
+/// For OpenGL 3.2 and higher. Compatibility profile is required currently.
+class COpenGL3Driver : public COpenGL3DriverBase
+{
+	friend IVideoDriver *createOpenGL3Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+
+public:
+	using COpenGL3DriverBase::COpenGL3DriverBase;
+	E_DRIVER_TYPE getDriverType() const override;
+
+protected:
+	OpenGLVersion getVersionFromOpenGL() const override;
+	void initFeatures() override;
+};
+
+}
+}
diff --git a/irr/src/OpenGLES2/Driver.cpp b/irr/src/OpenGLES2/Driver.cpp
new file mode 100644
index 000000000..249b6caef
--- /dev/null
+++ b/irr/src/OpenGLES2/Driver.cpp
@@ -0,0 +1,144 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#include "Driver.h"
+#include <cassert>
+#include <CColorConverter.h>
+
+namespace irr
+{
+namespace video
+{
+
+E_DRIVER_TYPE COpenGLES2Driver::getDriverType() const
+{
+	return EDT_OGLES2;
+}
+
+OpenGLVersion COpenGLES2Driver::getVersionFromOpenGL() const
+{
+	auto version_string = reinterpret_cast<const char *>(GL.GetString(GL_VERSION));
+	int major, minor;
+	if (sscanf(version_string, "OpenGL ES %d.%d", &major, &minor) != 2) {
+		os::Printer::log("Failed to parse OpenGL ES version string", version_string, ELL_ERROR);
+		return {OpenGLSpec::ES, 0, 0, 0};
+	}
+	return {OpenGLSpec::ES, (u8)major, (u8)minor, 0};
+}
+
+void COpenGLES2Driver::initFeatures()
+{
+	assert(Version.Spec == OpenGLSpec::ES);
+	assert(Version.Major >= 2);
+	initExtensions();
+
+	static const GLenum BGRA8_EXT = 0x93A1;
+
+	if (Version.Major >= 3) {
+		// NOTE floating-point formats may not be suitable for render targets.
+		TextureFormats[ECF_A1R5G5B5] = {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, CColorConverter::convert_A1R5G5B5toR5G5B5A1};
+		TextureFormats[ECF_R5G6B5] = {GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5};
+		TextureFormats[ECF_R8G8B8] = {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE};
+		TextureFormats[ECF_A8R8G8B8] = {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, CColorConverter::convert_A8R8G8B8toA8B8G8R8};
+		TextureFormats[ECF_R16F] = {GL_R16F, GL_RED, GL_HALF_FLOAT};
+		TextureFormats[ECF_G16R16F] = {GL_RG16F, GL_RG, GL_HALF_FLOAT};
+		TextureFormats[ECF_A16B16G16R16F] = {GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT};
+		TextureFormats[ECF_R32F] = {GL_R32F, GL_RED, GL_FLOAT};
+		TextureFormats[ECF_G32R32F] = {GL_RG32F, GL_RG, GL_FLOAT};
+		TextureFormats[ECF_A32B32G32R32F] = {GL_RGBA32F, GL_RGBA, GL_FLOAT};
+		TextureFormats[ECF_R8] = {GL_R8, GL_RED, GL_UNSIGNED_BYTE};
+		TextureFormats[ECF_R8G8] = {GL_RG8, GL_RG, GL_UNSIGNED_BYTE};
+		TextureFormats[ECF_D16] = {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT};
+		TextureFormats[ECF_D24S8] = {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8};
+
+		if (FeatureAvailable[IRR_GL_EXT_texture_format_BGRA8888])
+			TextureFormats[ECF_A8R8G8B8] = {GL_BGRA, GL_BGRA, GL_UNSIGNED_BYTE};
+		else if (FeatureAvailable[IRR_GL_APPLE_texture_format_BGRA8888])
+			TextureFormats[ECF_A8R8G8B8] = {BGRA8_EXT, GL_BGRA, GL_UNSIGNED_BYTE};
+
+		if (FeatureAvailable[IRR_GL_OES_depth32])
+			TextureFormats[ECF_D32] = {GL_DEPTH_COMPONENT32, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT};
+	} else {
+		// NOTE These are *texture* formats. They may or may not be suitable
+		// for render targets. The specs only talks on *sized* formats for the
+		// latter but forbids creating textures with sized internal formats,
+		// reserving them for renderbuffers.
+
+		static const GLenum HALF_FLOAT_OES = 0x8D61; // not equal to GL_HALF_FLOAT
+		TextureFormats[ECF_A1R5G5B5] = {GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, CColorConverter::convert_A1R5G5B5toR5G5B5A1};
+		TextureFormats[ECF_R5G6B5] = {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5};
+		TextureFormats[ECF_R8G8B8] = {GL_RGB, GL_RGB, GL_UNSIGNED_BYTE};
+		TextureFormats[ECF_A8R8G8B8] = {GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, CColorConverter::convert_A8R8G8B8toA8B8G8R8};
+
+		if (FeatureAvailable[IRR_GL_EXT_texture_format_BGRA8888])
+			TextureFormats[ECF_A8R8G8B8] = {GL_BGRA, GL_BGRA, GL_UNSIGNED_BYTE};
+		else if (FeatureAvailable[IRR_GL_APPLE_texture_format_BGRA8888])
+			TextureFormats[ECF_A8R8G8B8] = {BGRA8_EXT, GL_BGRA, GL_UNSIGNED_BYTE};
+
+		if (FeatureAvailable[IRR_GL_OES_texture_half_float]) {
+			TextureFormats[ECF_A16B16G16R16F] = {GL_RGBA, GL_RGBA, HALF_FLOAT_OES};
+		}
+		if (FeatureAvailable[IRR_GL_OES_texture_float]) {
+			TextureFormats[ECF_A32B32G32R32F] = {GL_RGBA, GL_RGBA, GL_FLOAT};
+		}
+		if (FeatureAvailable[IRR_GL_EXT_texture_rg]) {
+			TextureFormats[ECF_R8] = {GL_RED, GL_RED, GL_UNSIGNED_BYTE};
+			TextureFormats[ECF_R8G8] = {GL_RG, GL_RG, GL_UNSIGNED_BYTE};
+
+			if (FeatureAvailable[IRR_GL_OES_texture_half_float]) {
+				TextureFormats[ECF_R16F] = {GL_RED, GL_RED, HALF_FLOAT_OES};
+				TextureFormats[ECF_G16R16F] = {GL_RG, GL_RG, HALF_FLOAT_OES};
+			}
+			if (FeatureAvailable[IRR_GL_OES_texture_float]) {
+				TextureFormats[ECF_R32F] = {GL_RED, GL_RED, GL_FLOAT};
+				TextureFormats[ECF_G32R32F] = {GL_RG, GL_RG, GL_FLOAT};
+			}
+		}
+
+		if (FeatureAvailable[IRR_GL_OES_depth_texture]) {
+			TextureFormats[ECF_D16] = {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT};
+			if (FeatureAvailable[IRR_GL_OES_depth32])
+				TextureFormats[ECF_D32] = {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT};
+			if (FeatureAvailable[IRR_GL_OES_packed_depth_stencil])
+				TextureFormats[ECF_D24S8] = {GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8};
+		}
+	}
+
+	const bool MRTSupported = Version.Major >= 3 || queryExtension("GL_EXT_draw_buffers");
+	AnisotropicFilterSupported = queryExtension("GL_EXT_texture_filter_anisotropic");
+	BlendMinMaxSupported = (Version.Major >= 3) || FeatureAvailable[IRR_GL_EXT_blend_minmax];
+	const bool TextureLODBiasSupported = queryExtension("GL_EXT_texture_lod_bias");
+
+	// COGLESCoreExtensionHandler::Feature
+	static_assert(MATERIAL_MAX_TEXTURES <= 8, "Only up to 8 textures are guaranteed");
+	Feature.BlendOperation = true;
+	Feature.ColorAttachment = 1;
+	if (MRTSupported)
+		Feature.ColorAttachment = GetInteger(GL_MAX_COLOR_ATTACHMENTS);
+	Feature.MaxTextureUnits = MATERIAL_MAX_TEXTURES;
+	if (MRTSupported)
+		Feature.MultipleRenderTarget = GetInteger(GL_MAX_DRAW_BUFFERS);
+
+	// COGLESCoreExtensionHandler
+	if (AnisotropicFilterSupported)
+		MaxAnisotropy = GetInteger(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT);
+	if (Version.Major >= 3 || queryExtension("GL_EXT_draw_range_elements"))
+		MaxIndices = GetInteger(GL_MAX_ELEMENTS_INDICES);
+	MaxTextureSize = GetInteger(GL_MAX_TEXTURE_SIZE);
+	if (TextureLODBiasSupported)
+		GL.GetFloatv(GL_MAX_TEXTURE_LOD_BIAS, &MaxTextureLODBias);
+	GL.GetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, DimAliasedLine); // NOTE: this is not in the OpenGL ES 2.0 spec...
+	GL.GetFloatv(GL_ALIASED_POINT_SIZE_RANGE, DimAliasedPoint);
+}
+
+IVideoDriver *createOGLES2Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager)
+{
+	os::Printer::log("Using COpenGLES2Driver", ELL_INFORMATION);
+	COpenGLES2Driver *driver = new COpenGLES2Driver(params, io, contextManager);
+	driver->genericDriverInit(params.WindowSize, params.Stencilbuffer); // don't call in constructor, it uses virtual function calls of driver
+	return driver;
+}
+
+}
+}
diff --git a/irr/src/OpenGLES2/Driver.h b/irr/src/OpenGLES2/Driver.h
new file mode 100644
index 000000000..003f6d454
--- /dev/null
+++ b/irr/src/OpenGLES2/Driver.h
@@ -0,0 +1,30 @@
+// Copyright (C) 2023 Vitaliy Lobachevskiy
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in Irrlicht.h
+
+#pragma once
+#include "OpenGL/Driver.h"
+
+namespace irr
+{
+namespace video
+{
+
+/// OpenGL ES 2+ driver
+///
+/// For OpenGL ES 2.0 and higher.
+class COpenGLES2Driver : public COpenGL3DriverBase
+{
+	friend IVideoDriver *createOGLES2Driver(const SIrrlichtCreationParameters &params, io::IFileSystem *io, IContextManager *contextManager);
+
+public:
+	using COpenGL3DriverBase::COpenGL3DriverBase;
+	E_DRIVER_TYPE getDriverType() const override;
+
+protected:
+	OpenGLVersion getVersionFromOpenGL() const override;
+	void initFeatures() override;
+};
+
+}
+}
diff --git a/irr/src/SB3DStructs.h b/irr/src/SB3DStructs.h
new file mode 100644
index 000000000..b5e61daae
--- /dev/null
+++ b/irr/src/SB3DStructs.h
@@ -0,0 +1,71 @@
+// Copyright (C) 2006-2012 Luke Hoschke
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+// B3D Mesh loader
+// File format designed by Mark Sibly for the Blitz3D engine and has been
+// declared public domain
+
+#pragma once
+
+#include "SMaterial.h"
+#include "irrMath.h"
+
+namespace irr
+{
+namespace scene
+{
+
+struct SB3dChunkHeader
+{
+	c8 name[4];
+	s32 size;
+};
+
+struct SB3dChunk
+{
+	SB3dChunk(const SB3dChunkHeader &header, long sp) :
+			length(header.size + 8), startposition(sp)
+	{
+		length = core::max_(length, 8);
+		name[0] = header.name[0];
+		name[1] = header.name[1];
+		name[2] = header.name[2];
+		name[3] = header.name[3];
+	}
+	c8 name[4];
+	s32 length;
+	long startposition;
+};
+
+struct SB3dTexture
+{
+	std::string TextureName;
+	s32 Flags;
+	s32 Blend;
+	f32 Xpos;
+	f32 Ypos;
+	f32 Xscale;
+	f32 Yscale;
+	f32 Angle;
+};
+
+struct SB3dMaterial
+{
+	SB3dMaterial() :
+			red(1.0f), green(1.0f),
+			blue(1.0f), alpha(1.0f), shininess(0.0f), blend(1),
+			fx(0)
+	{
+		for (u32 i = 0; i < video::MATERIAL_MAX_TEXTURES; ++i)
+			Textures[i] = 0;
+	}
+	video::SMaterial Material;
+	f32 red, green, blue, alpha;
+	f32 shininess;
+	s32 blend, fx;
+	SB3dTexture *Textures[video::MATERIAL_MAX_TEXTURES];
+};
+
+} // end namespace scene
+} // end namespace irr
diff --git a/irr/src/SoftwareDriver2_helper.h b/irr/src/SoftwareDriver2_helper.h
new file mode 100644
index 000000000..602f9e295
--- /dev/null
+++ b/irr/src/SoftwareDriver2_helper.h
@@ -0,0 +1,290 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt / Thomas Alten
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+/*
+	History:
+	- changed behavior for log2 textures ( replaced multiplies by shift )
+*/
+
+#pragma once
+
+#include "irrMath.h"
+#include "SMaterial.h"
+
+#ifndef REALINLINE
+#ifdef _MSC_VER
+#define REALINLINE __forceinline
+#else
+#define REALINLINE inline
+#endif
+#endif
+
+namespace irr
+{
+
+// ----------------------- Generic ----------------------------------
+//! align_next - align to next upper 2^n
+#define align_next(num, to) (((num) + (to - 1)) & (~(to - 1)))
+
+//! a more useful memset for pixel. dest must be aligned at least to 4 byte
+// (standard memset only works with 8-bit values)
+inline void memset32(void *dest, const u32 value, size_t bytesize)
+{
+	u32 *d = (u32 *)dest;
+
+	size_t i;
+
+	// loops unrolled to reduce the number of increments by factor ~8.
+	i = bytesize >> (2 + 3);
+	while (i) {
+		d[0] = value;
+		d[1] = value;
+		d[2] = value;
+		d[3] = value;
+
+		d[4] = value;
+		d[5] = value;
+		d[6] = value;
+		d[7] = value;
+
+		d += 8;
+		i -= 1;
+	}
+
+	i = (bytesize >> 2) & 7;
+	while (i) {
+		d[0] = value;
+		d += 1;
+		i -= 1;
+	}
+}
+
+//! a more useful memset for pixel. dest must be aligned at least to 2 byte
+// (standard memset only works with 8-bit values)
+inline void memset16(void *dest, const u16 value, size_t bytesize)
+{
+	u16 *d = (u16 *)dest;
+
+	size_t i;
+
+	// loops unrolled to reduce the number of increments by factor ~8.
+	i = bytesize >> (1 + 3);
+	while (i) {
+		d[0] = value;
+		d[1] = value;
+		d[2] = value;
+		d[3] = value;
+
+		d[4] = value;
+		d[5] = value;
+		d[6] = value;
+		d[7] = value;
+
+		d += 8;
+		--i;
+	}
+
+	i = (bytesize >> 1) & 7;
+	while (i) {
+		d[0] = value;
+		++d;
+		--i;
+	}
+}
+
+// integer log2 of an integer. returning 0 as denormal
+static inline s32 s32_log2_s32(u32 in)
+{
+	s32 ret = 0;
+	while (in > 1) {
+		in >>= 1;
+		ret++;
+	}
+	return ret;
+}
+
+// ------------------ Video---------------------------------------
+/*!
+	Pixel = dest * ( 1 - alpha ) + source * alpha
+	alpha [0;256]
+*/
+REALINLINE u32 PixelBlend32(const u32 c2, const u32 c1, const u32 alpha)
+{
+	u32 srcRB = c1 & 0x00FF00FF;
+	u32 srcXG = c1 & 0x0000FF00;
+
+	u32 dstRB = c2 & 0x00FF00FF;
+	u32 dstXG = c2 & 0x0000FF00;
+
+	u32 rb = srcRB - dstRB;
+	u32 xg = srcXG - dstXG;
+
+	rb *= alpha;
+	xg *= alpha;
+	rb >>= 8;
+	xg >>= 8;
+
+	rb += dstRB;
+	xg += dstXG;
+
+	rb &= 0x00FF00FF;
+	xg &= 0x0000FF00;
+
+	return rb | xg;
+}
+
+/*!
+	Pixel = dest * ( 1 - alpha ) + source * alpha
+	alpha [0;32]
+*/
+inline u16 PixelBlend16(const u16 c2, const u16 c1, const u16 alpha)
+{
+	const u16 srcRB = c1 & 0x7C1F;
+	const u16 srcXG = c1 & 0x03E0;
+
+	const u16 dstRB = c2 & 0x7C1F;
+	const u16 dstXG = c2 & 0x03E0;
+
+	u32 rb = srcRB - dstRB;
+	u32 xg = srcXG - dstXG;
+
+	rb *= alpha;
+	xg *= alpha;
+	rb >>= 5;
+	xg >>= 5;
+
+	rb += dstRB;
+	xg += dstXG;
+
+	rb &= 0x7C1F;
+	xg &= 0x03E0;
+
+	return (u16)(rb | xg);
+}
+
+/*
+	Pixel = c0 * (c1/31). c0 Alpha retain
+*/
+inline u16 PixelMul16(const u16 c0, const u16 c1)
+{
+	return (u16)(((((c0 & 0x7C00) * (c1 & 0x7C00)) & 0x3E000000) >> 15) |
+				 ((((c0 & 0x03E0) * (c1 & 0x03E0)) & 0x000F8000) >> 10) |
+				 ((((c0 & 0x001F) * (c1 & 0x001F)) & 0x000003E0) >> 5) |
+				 (c0 & 0x8000));
+}
+
+/*
+	Pixel = c0 * (c1/31).
+*/
+inline u16 PixelMul16_2(u16 c0, u16 c1)
+{
+	return (u16)((((c0 & 0x7C00) * (c1 & 0x7C00)) & 0x3E000000) >> 15 |
+				 (((c0 & 0x03E0) * (c1 & 0x03E0)) & 0x000F8000) >> 10 |
+				 (((c0 & 0x001F) * (c1 & 0x001F)) & 0x000003E0) >> 5 |
+				 (c0 & c1 & 0x8000));
+}
+
+/*
+	Pixel = c0 * (c1/255). c0 Alpha Retain
+*/
+REALINLINE u32 PixelMul32(const u32 c0, const u32 c1)
+{
+	return (c0 & 0xFF000000) |
+		   ((((c0 & 0x00FF0000) >> 12) * ((c1 & 0x00FF0000) >> 12)) & 0x00FF0000) |
+		   ((((c0 & 0x0000FF00) * (c1 & 0x0000FF00)) >> 16) & 0x0000FF00) |
+		   ((((c0 & 0x000000FF) * (c1 & 0x000000FF)) >> 8) & 0x000000FF);
+}
+
+/*
+	Pixel = c0 * (c1/255).
+*/
+REALINLINE u32 PixelMul32_2(const u32 c0, const u32 c1)
+{
+	return ((((c0 & 0xFF000000) >> 16) * ((c1 & 0xFF000000) >> 16)) & 0xFF000000) |
+		   ((((c0 & 0x00FF0000) >> 12) * ((c1 & 0x00FF0000) >> 12)) & 0x00FF0000) |
+		   ((((c0 & 0x0000FF00) * (c1 & 0x0000FF00)) >> 16) & 0x0000FF00) |
+		   ((((c0 & 0x000000FF) * (c1 & 0x000000FF)) >> 8) & 0x000000FF);
+}
+
+/*
+	Pixel = clamp ( c0 + c1, 0, 255 )
+*/
+REALINLINE u32 PixelAdd32(const u32 c2, const u32 c1)
+{
+	u32 sum = (c2 & 0x00FFFFFF) + (c1 & 0x00FFFFFF);
+	u32 low_bits = (c2 ^ c1) & 0x00010101;
+	s32 carries = (sum - low_bits) & 0x01010100;
+	u32 modulo = sum - carries;
+	u32 clamp = carries - (carries >> 8);
+	return modulo | clamp;
+}
+
+// 1 - Bit Alpha Blending
+inline u16 PixelBlend16(const u16 c2, const u16 c1)
+{
+	u16 mask = ((c1 & 0x8000) >> 15) + 0x7fff;
+	return (c2 & mask) | (c1 & ~mask);
+}
+/*!
+	Pixel = dest * ( 1 - SourceAlpha ) + source * SourceAlpha (OpenGL blending)
+*/
+inline u32 PixelBlend32(const u32 c2, const u32 c1)
+{
+	// alpha test
+	u32 alpha = c1 & 0xFF000000;
+
+	if (0 == alpha)
+		return c2;
+	if (0xFF000000 == alpha) {
+		return c1;
+	}
+
+	alpha >>= 24;
+
+	// add highbit alpha, if ( alpha > 127 ) alpha += 1;
+	alpha += (alpha >> 7);
+
+	u32 srcRB = c1 & 0x00FF00FF;
+	u32 srcXG = c1 & 0x0000FF00;
+
+	u32 dstRB = c2 & 0x00FF00FF;
+	u32 dstXG = c2 & 0x0000FF00;
+
+	u32 rb = srcRB - dstRB;
+	u32 xg = srcXG - dstXG;
+
+	rb *= alpha;
+	xg *= alpha;
+	rb >>= 8;
+	xg >>= 8;
+
+	rb += dstRB;
+	xg += dstXG;
+
+	rb &= 0x00FF00FF;
+	xg &= 0x0000FF00;
+
+	return (c1 & 0xFF000000) | rb | xg;
+}
+
+// 2D Region closed [x0;x1]
+struct AbsRectangle
+{
+	s32 x0;
+	s32 y0;
+	s32 x1;
+	s32 y1;
+};
+
+//! 2D Intersection test
+inline bool intersect(AbsRectangle &dest, const AbsRectangle &a, const AbsRectangle &b)
+{
+	dest.x0 = core::s32_max(a.x0, b.x0);
+	dest.y0 = core::s32_max(a.y0, b.y0);
+	dest.x1 = core::s32_min(a.x1, b.x1);
+	dest.y1 = core::s32_min(a.y1, b.y1);
+	return dest.x0 < dest.x1 && dest.y0 < dest.y1;
+}
+
+} // end namespace irr
diff --git a/irr/src/builtInFont.png b/irr/src/builtInFont.png
new file mode 100644
index 000000000..feed4f6f0
Binary files /dev/null and b/irr/src/builtInFont.png differ
diff --git a/irr/src/mt_opengl_loader.cpp b/irr/src/mt_opengl_loader.cpp
new file mode 100755
index 000000000..084f83118
--- /dev/null
+++ b/irr/src/mt_opengl_loader.cpp
@@ -0,0 +1,783 @@
+// This code was generated by scripts/BindingGenerator.lua
+// Do not modify it, modify and run the generator instead.
+
+#include "mt_opengl.h"
+#include <string>
+#include <sstream>
+
+OpenGLProcedures GL = OpenGLProcedures();
+
+void OpenGLProcedures::LoadAllProcedures(irr::video::IContextManager *cmgr)
+{
+
+	if (!CullFace) CullFace = (PFNGLCULLFACEPROC_MT)cmgr->getProcAddress("glCullFace");
+	if (!FrontFace) FrontFace = (PFNGLFRONTFACEPROC_MT)cmgr->getProcAddress("glFrontFace");
+	if (!Hint) Hint = (PFNGLHINTPROC_MT)cmgr->getProcAddress("glHint");
+	if (!LineWidth) LineWidth = (PFNGLLINEWIDTHPROC_MT)cmgr->getProcAddress("glLineWidth");
+	if (!PointSize) PointSize = (PFNGLPOINTSIZEPROC_MT)cmgr->getProcAddress("glPointSize");
+	if (!PolygonMode) PolygonMode = (PFNGLPOLYGONMODEPROC_MT)cmgr->getProcAddress("glPolygonMode");
+	if (!Scissor) Scissor = (PFNGLSCISSORPROC_MT)cmgr->getProcAddress("glScissor");
+	if (!TexParameterf) TexParameterf = (PFNGLTEXPARAMETERFPROC_MT)cmgr->getProcAddress("glTexParameterf");
+	if (!TexParameterfv) TexParameterfv = (PFNGLTEXPARAMETERFVPROC_MT)cmgr->getProcAddress("glTexParameterfv");
+	if (!TexParameteri) TexParameteri = (PFNGLTEXPARAMETERIPROC_MT)cmgr->getProcAddress("glTexParameteri");
+	if (!TexParameteriv) TexParameteriv = (PFNGLTEXPARAMETERIVPROC_MT)cmgr->getProcAddress("glTexParameteriv");
+	if (!TexImage1D) TexImage1D = (PFNGLTEXIMAGE1DPROC_MT)cmgr->getProcAddress("glTexImage1D");
+	if (!TexImage2D) TexImage2D = (PFNGLTEXIMAGE2DPROC_MT)cmgr->getProcAddress("glTexImage2D");
+	if (!DrawBuffer) DrawBuffer = (PFNGLDRAWBUFFERPROC_MT)cmgr->getProcAddress("glDrawBuffer");
+	if (!Clear) Clear = (PFNGLCLEARPROC_MT)cmgr->getProcAddress("glClear");
+	if (!ClearColor) ClearColor = (PFNGLCLEARCOLORPROC_MT)cmgr->getProcAddress("glClearColor");
+	if (!ClearStencil) ClearStencil = (PFNGLCLEARSTENCILPROC_MT)cmgr->getProcAddress("glClearStencil");
+	if (!ClearDepth) ClearDepth = (PFNGLCLEARDEPTHPROC_MT)cmgr->getProcAddress("glClearDepth");
+	if (!StencilMask) StencilMask = (PFNGLSTENCILMASKPROC_MT)cmgr->getProcAddress("glStencilMask");
+	if (!ColorMask) ColorMask = (PFNGLCOLORMASKPROC_MT)cmgr->getProcAddress("glColorMask");
+	if (!DepthMask) DepthMask = (PFNGLDEPTHMASKPROC_MT)cmgr->getProcAddress("glDepthMask");
+	if (!Disable) Disable = (PFNGLDISABLEPROC_MT)cmgr->getProcAddress("glDisable");
+	if (!Enable) Enable = (PFNGLENABLEPROC_MT)cmgr->getProcAddress("glEnable");
+	if (!Finish) Finish = (PFNGLFINISHPROC_MT)cmgr->getProcAddress("glFinish");
+	if (!Flush) Flush = (PFNGLFLUSHPROC_MT)cmgr->getProcAddress("glFlush");
+	if (!BlendFunc) BlendFunc = (PFNGLBLENDFUNCPROC_MT)cmgr->getProcAddress("glBlendFunc");
+	if (!LogicOp) LogicOp = (PFNGLLOGICOPPROC_MT)cmgr->getProcAddress("glLogicOp");
+	if (!StencilFunc) StencilFunc = (PFNGLSTENCILFUNCPROC_MT)cmgr->getProcAddress("glStencilFunc");
+	if (!StencilOp) StencilOp = (PFNGLSTENCILOPPROC_MT)cmgr->getProcAddress("glStencilOp");
+	if (!DepthFunc) DepthFunc = (PFNGLDEPTHFUNCPROC_MT)cmgr->getProcAddress("glDepthFunc");
+	if (!PixelStoref) PixelStoref = (PFNGLPIXELSTOREFPROC_MT)cmgr->getProcAddress("glPixelStoref");
+	if (!PixelStorei) PixelStorei = (PFNGLPIXELSTOREIPROC_MT)cmgr->getProcAddress("glPixelStorei");
+	if (!ReadBuffer) ReadBuffer = (PFNGLREADBUFFERPROC_MT)cmgr->getProcAddress("glReadBuffer");
+	if (!ReadPixels) ReadPixels = (PFNGLREADPIXELSPROC_MT)cmgr->getProcAddress("glReadPixels");
+	if (!GetBooleanv) GetBooleanv = (PFNGLGETBOOLEANVPROC_MT)cmgr->getProcAddress("glGetBooleanv");
+	if (!GetDoublev) GetDoublev = (PFNGLGETDOUBLEVPROC_MT)cmgr->getProcAddress("glGetDoublev");
+	if (!GetError) GetError = (PFNGLGETERRORPROC_MT)cmgr->getProcAddress("glGetError");
+	if (!GetFloatv) GetFloatv = (PFNGLGETFLOATVPROC_MT)cmgr->getProcAddress("glGetFloatv");
+	if (!GetIntegerv) GetIntegerv = (PFNGLGETINTEGERVPROC_MT)cmgr->getProcAddress("glGetIntegerv");
+	if (!GetString) GetString = (PFNGLGETSTRINGPROC_MT)cmgr->getProcAddress("glGetString");
+	if (!GetTexImage) GetTexImage = (PFNGLGETTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetTexImage");
+	if (!GetTexParameterfv) GetTexParameterfv = (PFNGLGETTEXPARAMETERFVPROC_MT)cmgr->getProcAddress("glGetTexParameterfv");
+	if (!GetTexParameteriv) GetTexParameteriv = (PFNGLGETTEXPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetTexParameteriv");
+	if (!GetTexLevelParameterfv) GetTexLevelParameterfv = (PFNGLGETTEXLEVELPARAMETERFVPROC_MT)cmgr->getProcAddress("glGetTexLevelParameterfv");
+	if (!GetTexLevelParameteriv) GetTexLevelParameteriv = (PFNGLGETTEXLEVELPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetTexLevelParameteriv");
+	if (!IsEnabled) IsEnabled = (PFNGLISENABLEDPROC_MT)cmgr->getProcAddress("glIsEnabled");
+	if (!DepthRange) DepthRange = (PFNGLDEPTHRANGEPROC_MT)cmgr->getProcAddress("glDepthRange");
+	if (!Viewport) Viewport = (PFNGLVIEWPORTPROC_MT)cmgr->getProcAddress("glViewport");
+	if (!DrawArrays) DrawArrays = (PFNGLDRAWARRAYSPROC_MT)cmgr->getProcAddress("glDrawArrays");
+	if (!DrawElements) DrawElements = (PFNGLDRAWELEMENTSPROC_MT)cmgr->getProcAddress("glDrawElements");
+	if (!GetPointerv) GetPointerv = (PFNGLGETPOINTERVPROC_MT)cmgr->getProcAddress("glGetPointerv");
+	if (!PolygonOffset) PolygonOffset = (PFNGLPOLYGONOFFSETPROC_MT)cmgr->getProcAddress("glPolygonOffset");
+	if (!CopyTexImage1D) CopyTexImage1D = (PFNGLCOPYTEXIMAGE1DPROC_MT)cmgr->getProcAddress("glCopyTexImage1D");
+	if (!CopyTexImage2D) CopyTexImage2D = (PFNGLCOPYTEXIMAGE2DPROC_MT)cmgr->getProcAddress("glCopyTexImage2D");
+	if (!CopyTexSubImage1D) CopyTexSubImage1D = (PFNGLCOPYTEXSUBIMAGE1DPROC_MT)cmgr->getProcAddress("glCopyTexSubImage1D");
+	if (!CopyTexSubImage2D) CopyTexSubImage2D = (PFNGLCOPYTEXSUBIMAGE2DPROC_MT)cmgr->getProcAddress("glCopyTexSubImage2D");
+	if (!TexSubImage1D) TexSubImage1D = (PFNGLTEXSUBIMAGE1DPROC_MT)cmgr->getProcAddress("glTexSubImage1D");
+	if (!TexSubImage2D) TexSubImage2D = (PFNGLTEXSUBIMAGE2DPROC_MT)cmgr->getProcAddress("glTexSubImage2D");
+	if (!BindTexture) BindTexture = (PFNGLBINDTEXTUREPROC_MT)cmgr->getProcAddress("glBindTexture");
+	if (!DeleteTextures) DeleteTextures = (PFNGLDELETETEXTURESPROC_MT)cmgr->getProcAddress("glDeleteTextures");
+	if (!GenTextures) GenTextures = (PFNGLGENTEXTURESPROC_MT)cmgr->getProcAddress("glGenTextures");
+	if (!IsTexture) IsTexture = (PFNGLISTEXTUREPROC_MT)cmgr->getProcAddress("glIsTexture");
+	if (!DrawRangeElements) DrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC_MT)cmgr->getProcAddress("glDrawRangeElements");
+	if (!TexImage3D) TexImage3D = (PFNGLTEXIMAGE3DPROC_MT)cmgr->getProcAddress("glTexImage3D");
+	if (!TexSubImage3D) TexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC_MT)cmgr->getProcAddress("glTexSubImage3D");
+	if (!CopyTexSubImage3D) CopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC_MT)cmgr->getProcAddress("glCopyTexSubImage3D");
+	if (!ActiveTexture) ActiveTexture = (PFNGLACTIVETEXTUREPROC_MT)cmgr->getProcAddress("glActiveTexture");
+	if (!SampleCoverage) SampleCoverage = (PFNGLSAMPLECOVERAGEPROC_MT)cmgr->getProcAddress("glSampleCoverage");
+	if (!CompressedTexImage3D) CompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC_MT)cmgr->getProcAddress("glCompressedTexImage3D");
+	if (!CompressedTexImage2D) CompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC_MT)cmgr->getProcAddress("glCompressedTexImage2D");
+	if (!CompressedTexImage1D) CompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC_MT)cmgr->getProcAddress("glCompressedTexImage1D");
+	if (!CompressedTexSubImage3D) CompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC_MT)cmgr->getProcAddress("glCompressedTexSubImage3D");
+	if (!CompressedTexSubImage2D) CompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC_MT)cmgr->getProcAddress("glCompressedTexSubImage2D");
+	if (!CompressedTexSubImage1D) CompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC_MT)cmgr->getProcAddress("glCompressedTexSubImage1D");
+	if (!GetCompressedTexImage) GetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetCompressedTexImage");
+	if (!BlendFuncSeparate) BlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC_MT)cmgr->getProcAddress("glBlendFuncSeparate");
+	if (!MultiDrawArrays) MultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC_MT)cmgr->getProcAddress("glMultiDrawArrays");
+	if (!MultiDrawElements) MultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC_MT)cmgr->getProcAddress("glMultiDrawElements");
+	if (!PointParameterf) PointParameterf = (PFNGLPOINTPARAMETERFPROC_MT)cmgr->getProcAddress("glPointParameterf");
+	if (!PointParameterfv) PointParameterfv = (PFNGLPOINTPARAMETERFVPROC_MT)cmgr->getProcAddress("glPointParameterfv");
+	if (!PointParameteri) PointParameteri = (PFNGLPOINTPARAMETERIPROC_MT)cmgr->getProcAddress("glPointParameteri");
+	if (!PointParameteriv) PointParameteriv = (PFNGLPOINTPARAMETERIVPROC_MT)cmgr->getProcAddress("glPointParameteriv");
+	if (!BlendColor) BlendColor = (PFNGLBLENDCOLORPROC_MT)cmgr->getProcAddress("glBlendColor");
+	if (!BlendEquation) BlendEquation = (PFNGLBLENDEQUATIONPROC_MT)cmgr->getProcAddress("glBlendEquation");
+	if (!GenQueries) GenQueries = (PFNGLGENQUERIESPROC_MT)cmgr->getProcAddress("glGenQueries");
+	if (!DeleteQueries) DeleteQueries = (PFNGLDELETEQUERIESPROC_MT)cmgr->getProcAddress("glDeleteQueries");
+	if (!IsQuery) IsQuery = (PFNGLISQUERYPROC_MT)cmgr->getProcAddress("glIsQuery");
+	if (!BeginQuery) BeginQuery = (PFNGLBEGINQUERYPROC_MT)cmgr->getProcAddress("glBeginQuery");
+	if (!EndQuery) EndQuery = (PFNGLENDQUERYPROC_MT)cmgr->getProcAddress("glEndQuery");
+	if (!GetQueryiv) GetQueryiv = (PFNGLGETQUERYIVPROC_MT)cmgr->getProcAddress("glGetQueryiv");
+	if (!GetQueryObjectiv) GetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC_MT)cmgr->getProcAddress("glGetQueryObjectiv");
+	if (!GetQueryObjectuiv) GetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC_MT)cmgr->getProcAddress("glGetQueryObjectuiv");
+	if (!BindBuffer) BindBuffer = (PFNGLBINDBUFFERPROC_MT)cmgr->getProcAddress("glBindBuffer");
+	if (!DeleteBuffers) DeleteBuffers = (PFNGLDELETEBUFFERSPROC_MT)cmgr->getProcAddress("glDeleteBuffers");
+	if (!GenBuffers) GenBuffers = (PFNGLGENBUFFERSPROC_MT)cmgr->getProcAddress("glGenBuffers");
+	if (!IsBuffer) IsBuffer = (PFNGLISBUFFERPROC_MT)cmgr->getProcAddress("glIsBuffer");
+	if (!BufferData) BufferData = (PFNGLBUFFERDATAPROC_MT)cmgr->getProcAddress("glBufferData");
+	if (!BufferSubData) BufferSubData = (PFNGLBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glBufferSubData");
+	if (!GetBufferSubData) GetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glGetBufferSubData");
+	if (!MapBuffer) MapBuffer = (PFNGLMAPBUFFERPROC_MT)cmgr->getProcAddress("glMapBuffer");
+	if (!UnmapBuffer) UnmapBuffer = (PFNGLUNMAPBUFFERPROC_MT)cmgr->getProcAddress("glUnmapBuffer");
+	if (!GetBufferParameteriv) GetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetBufferParameteriv");
+	if (!GetBufferPointerv) GetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC_MT)cmgr->getProcAddress("glGetBufferPointerv");
+	if (!BlendEquationSeparate) BlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC_MT)cmgr->getProcAddress("glBlendEquationSeparate");
+	if (!DrawBuffers) DrawBuffers = (PFNGLDRAWBUFFERSPROC_MT)cmgr->getProcAddress("glDrawBuffers");
+	if (!StencilOpSeparate) StencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC_MT)cmgr->getProcAddress("glStencilOpSeparate");
+	if (!StencilFuncSeparate) StencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC_MT)cmgr->getProcAddress("glStencilFuncSeparate");
+	if (!StencilMaskSeparate) StencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC_MT)cmgr->getProcAddress("glStencilMaskSeparate");
+	if (!AttachShader) AttachShader = (PFNGLATTACHSHADERPROC_MT)cmgr->getProcAddress("glAttachShader");
+	if (!BindAttribLocation) BindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC_MT)cmgr->getProcAddress("glBindAttribLocation");
+	if (!CompileShader) CompileShader = (PFNGLCOMPILESHADERPROC_MT)cmgr->getProcAddress("glCompileShader");
+	if (!CreateProgram) CreateProgram = (PFNGLCREATEPROGRAMPROC_MT)cmgr->getProcAddress("glCreateProgram");
+	if (!CreateShader) CreateShader = (PFNGLCREATESHADERPROC_MT)cmgr->getProcAddress("glCreateShader");
+	if (!DeleteProgram) DeleteProgram = (PFNGLDELETEPROGRAMPROC_MT)cmgr->getProcAddress("glDeleteProgram");
+	if (!DeleteShader) DeleteShader = (PFNGLDELETESHADERPROC_MT)cmgr->getProcAddress("glDeleteShader");
+	if (!DetachShader) DetachShader = (PFNGLDETACHSHADERPROC_MT)cmgr->getProcAddress("glDetachShader");
+	if (!DisableVertexAttribArray) DisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC_MT)cmgr->getProcAddress("glDisableVertexAttribArray");
+	if (!EnableVertexAttribArray) EnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC_MT)cmgr->getProcAddress("glEnableVertexAttribArray");
+	if (!GetActiveAttrib) GetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC_MT)cmgr->getProcAddress("glGetActiveAttrib");
+	if (!GetActiveUniform) GetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC_MT)cmgr->getProcAddress("glGetActiveUniform");
+	if (!GetAttachedShaders) GetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC_MT)cmgr->getProcAddress("glGetAttachedShaders");
+	if (!GetAttribLocation) GetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC_MT)cmgr->getProcAddress("glGetAttribLocation");
+	if (!GetProgramiv) GetProgramiv = (PFNGLGETPROGRAMIVPROC_MT)cmgr->getProcAddress("glGetProgramiv");
+	if (!GetProgramInfoLog) GetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC_MT)cmgr->getProcAddress("glGetProgramInfoLog");
+	if (!GetShaderiv) GetShaderiv = (PFNGLGETSHADERIVPROC_MT)cmgr->getProcAddress("glGetShaderiv");
+	if (!GetShaderInfoLog) GetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC_MT)cmgr->getProcAddress("glGetShaderInfoLog");
+	if (!GetShaderSource) GetShaderSource = (PFNGLGETSHADERSOURCEPROC_MT)cmgr->getProcAddress("glGetShaderSource");
+	if (!GetUniformLocation) GetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC_MT)cmgr->getProcAddress("glGetUniformLocation");
+	if (!GetUniformfv) GetUniformfv = (PFNGLGETUNIFORMFVPROC_MT)cmgr->getProcAddress("glGetUniformfv");
+	if (!GetUniformiv) GetUniformiv = (PFNGLGETUNIFORMIVPROC_MT)cmgr->getProcAddress("glGetUniformiv");
+	if (!GetVertexAttribdv) GetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC_MT)cmgr->getProcAddress("glGetVertexAttribdv");
+	if (!GetVertexAttribfv) GetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC_MT)cmgr->getProcAddress("glGetVertexAttribfv");
+	if (!GetVertexAttribiv) GetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC_MT)cmgr->getProcAddress("glGetVertexAttribiv");
+	if (!GetVertexAttribPointerv) GetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC_MT)cmgr->getProcAddress("glGetVertexAttribPointerv");
+	if (!IsProgram) IsProgram = (PFNGLISPROGRAMPROC_MT)cmgr->getProcAddress("glIsProgram");
+	if (!IsShader) IsShader = (PFNGLISSHADERPROC_MT)cmgr->getProcAddress("glIsShader");
+	if (!LinkProgram) LinkProgram = (PFNGLLINKPROGRAMPROC_MT)cmgr->getProcAddress("glLinkProgram");
+	if (!ShaderSource) ShaderSource = (PFNGLSHADERSOURCEPROC_MT)cmgr->getProcAddress("glShaderSource");
+	if (!UseProgram) UseProgram = (PFNGLUSEPROGRAMPROC_MT)cmgr->getProcAddress("glUseProgram");
+	if (!Uniform1f) Uniform1f = (PFNGLUNIFORM1FPROC_MT)cmgr->getProcAddress("glUniform1f");
+	if (!Uniform2f) Uniform2f = (PFNGLUNIFORM2FPROC_MT)cmgr->getProcAddress("glUniform2f");
+	if (!Uniform3f) Uniform3f = (PFNGLUNIFORM3FPROC_MT)cmgr->getProcAddress("glUniform3f");
+	if (!Uniform4f) Uniform4f = (PFNGLUNIFORM4FPROC_MT)cmgr->getProcAddress("glUniform4f");
+	if (!Uniform1i) Uniform1i = (PFNGLUNIFORM1IPROC_MT)cmgr->getProcAddress("glUniform1i");
+	if (!Uniform2i) Uniform2i = (PFNGLUNIFORM2IPROC_MT)cmgr->getProcAddress("glUniform2i");
+	if (!Uniform3i) Uniform3i = (PFNGLUNIFORM3IPROC_MT)cmgr->getProcAddress("glUniform3i");
+	if (!Uniform4i) Uniform4i = (PFNGLUNIFORM4IPROC_MT)cmgr->getProcAddress("glUniform4i");
+	if (!Uniform1fv) Uniform1fv = (PFNGLUNIFORM1FVPROC_MT)cmgr->getProcAddress("glUniform1fv");
+	if (!Uniform2fv) Uniform2fv = (PFNGLUNIFORM2FVPROC_MT)cmgr->getProcAddress("glUniform2fv");
+	if (!Uniform3fv) Uniform3fv = (PFNGLUNIFORM3FVPROC_MT)cmgr->getProcAddress("glUniform3fv");
+	if (!Uniform4fv) Uniform4fv = (PFNGLUNIFORM4FVPROC_MT)cmgr->getProcAddress("glUniform4fv");
+	if (!Uniform1iv) Uniform1iv = (PFNGLUNIFORM1IVPROC_MT)cmgr->getProcAddress("glUniform1iv");
+	if (!Uniform2iv) Uniform2iv = (PFNGLUNIFORM2IVPROC_MT)cmgr->getProcAddress("glUniform2iv");
+	if (!Uniform3iv) Uniform3iv = (PFNGLUNIFORM3IVPROC_MT)cmgr->getProcAddress("glUniform3iv");
+	if (!Uniform4iv) Uniform4iv = (PFNGLUNIFORM4IVPROC_MT)cmgr->getProcAddress("glUniform4iv");
+	if (!UniformMatrix2fv) UniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC_MT)cmgr->getProcAddress("glUniformMatrix2fv");
+	if (!UniformMatrix3fv) UniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC_MT)cmgr->getProcAddress("glUniformMatrix3fv");
+	if (!UniformMatrix4fv) UniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC_MT)cmgr->getProcAddress("glUniformMatrix4fv");
+	if (!ValidateProgram) ValidateProgram = (PFNGLVALIDATEPROGRAMPROC_MT)cmgr->getProcAddress("glValidateProgram");
+	if (!VertexAttrib1d) VertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC_MT)cmgr->getProcAddress("glVertexAttrib1d");
+	if (!VertexAttrib1dv) VertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC_MT)cmgr->getProcAddress("glVertexAttrib1dv");
+	if (!VertexAttrib1f) VertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC_MT)cmgr->getProcAddress("glVertexAttrib1f");
+	if (!VertexAttrib1fv) VertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC_MT)cmgr->getProcAddress("glVertexAttrib1fv");
+	if (!VertexAttrib1s) VertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC_MT)cmgr->getProcAddress("glVertexAttrib1s");
+	if (!VertexAttrib1sv) VertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC_MT)cmgr->getProcAddress("glVertexAttrib1sv");
+	if (!VertexAttrib2d) VertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC_MT)cmgr->getProcAddress("glVertexAttrib2d");
+	if (!VertexAttrib2dv) VertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC_MT)cmgr->getProcAddress("glVertexAttrib2dv");
+	if (!VertexAttrib2f) VertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC_MT)cmgr->getProcAddress("glVertexAttrib2f");
+	if (!VertexAttrib2fv) VertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC_MT)cmgr->getProcAddress("glVertexAttrib2fv");
+	if (!VertexAttrib2s) VertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC_MT)cmgr->getProcAddress("glVertexAttrib2s");
+	if (!VertexAttrib2sv) VertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC_MT)cmgr->getProcAddress("glVertexAttrib2sv");
+	if (!VertexAttrib3d) VertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC_MT)cmgr->getProcAddress("glVertexAttrib3d");
+	if (!VertexAttrib3dv) VertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC_MT)cmgr->getProcAddress("glVertexAttrib3dv");
+	if (!VertexAttrib3f) VertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC_MT)cmgr->getProcAddress("glVertexAttrib3f");
+	if (!VertexAttrib3fv) VertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC_MT)cmgr->getProcAddress("glVertexAttrib3fv");
+	if (!VertexAttrib3s) VertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC_MT)cmgr->getProcAddress("glVertexAttrib3s");
+	if (!VertexAttrib3sv) VertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC_MT)cmgr->getProcAddress("glVertexAttrib3sv");
+	if (!VertexAttrib4Nbv) VertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nbv");
+	if (!VertexAttrib4Niv) VertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Niv");
+	if (!VertexAttrib4Nsv) VertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nsv");
+	if (!VertexAttrib4Nub) VertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nub");
+	if (!VertexAttrib4Nubv) VertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nubv");
+	if (!VertexAttrib4Nuiv) VertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nuiv");
+	if (!VertexAttrib4Nusv) VertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC_MT)cmgr->getProcAddress("glVertexAttrib4Nusv");
+	if (!VertexAttrib4bv) VertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC_MT)cmgr->getProcAddress("glVertexAttrib4bv");
+	if (!VertexAttrib4d) VertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC_MT)cmgr->getProcAddress("glVertexAttrib4d");
+	if (!VertexAttrib4dv) VertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC_MT)cmgr->getProcAddress("glVertexAttrib4dv");
+	if (!VertexAttrib4f) VertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC_MT)cmgr->getProcAddress("glVertexAttrib4f");
+	if (!VertexAttrib4fv) VertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC_MT)cmgr->getProcAddress("glVertexAttrib4fv");
+	if (!VertexAttrib4iv) VertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC_MT)cmgr->getProcAddress("glVertexAttrib4iv");
+	if (!VertexAttrib4s) VertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC_MT)cmgr->getProcAddress("glVertexAttrib4s");
+	if (!VertexAttrib4sv) VertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC_MT)cmgr->getProcAddress("glVertexAttrib4sv");
+	if (!VertexAttrib4ubv) VertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC_MT)cmgr->getProcAddress("glVertexAttrib4ubv");
+	if (!VertexAttrib4uiv) VertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC_MT)cmgr->getProcAddress("glVertexAttrib4uiv");
+	if (!VertexAttrib4usv) VertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC_MT)cmgr->getProcAddress("glVertexAttrib4usv");
+	if (!VertexAttribPointer) VertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC_MT)cmgr->getProcAddress("glVertexAttribPointer");
+	if (!UniformMatrix2x3fv) UniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC_MT)cmgr->getProcAddress("glUniformMatrix2x3fv");
+	if (!UniformMatrix3x2fv) UniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC_MT)cmgr->getProcAddress("glUniformMatrix3x2fv");
+	if (!UniformMatrix2x4fv) UniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC_MT)cmgr->getProcAddress("glUniformMatrix2x4fv");
+	if (!UniformMatrix4x2fv) UniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC_MT)cmgr->getProcAddress("glUniformMatrix4x2fv");
+	if (!UniformMatrix3x4fv) UniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC_MT)cmgr->getProcAddress("glUniformMatrix3x4fv");
+	if (!UniformMatrix4x3fv) UniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC_MT)cmgr->getProcAddress("glUniformMatrix4x3fv");
+	if (!ColorMaski) ColorMaski = (PFNGLCOLORMASKIPROC_MT)cmgr->getProcAddress("glColorMaski");
+	if (!Enablei) Enablei = (PFNGLENABLEIPROC_MT)cmgr->getProcAddress("glEnablei");
+	if (!Disablei) Disablei = (PFNGLDISABLEIPROC_MT)cmgr->getProcAddress("glDisablei");
+	if (!IsEnabledi) IsEnabledi = (PFNGLISENABLEDIPROC_MT)cmgr->getProcAddress("glIsEnabledi");
+	if (!BeginTransformFeedback) BeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glBeginTransformFeedback");
+	if (!EndTransformFeedback) EndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glEndTransformFeedback");
+	if (!BindBufferRange) BindBufferRange = (PFNGLBINDBUFFERRANGEPROC_MT)cmgr->getProcAddress("glBindBufferRange");
+	if (!BindBufferBase) BindBufferBase = (PFNGLBINDBUFFERBASEPROC_MT)cmgr->getProcAddress("glBindBufferBase");
+	if (!TransformFeedbackVaryings) TransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC_MT)cmgr->getProcAddress("glTransformFeedbackVaryings");
+	if (!GetTransformFeedbackVarying) GetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC_MT)cmgr->getProcAddress("glGetTransformFeedbackVarying");
+	if (!ClampColor) ClampColor = (PFNGLCLAMPCOLORPROC_MT)cmgr->getProcAddress("glClampColor");
+	if (!BeginConditionalRender) BeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC_MT)cmgr->getProcAddress("glBeginConditionalRender");
+	if (!EndConditionalRender) EndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC_MT)cmgr->getProcAddress("glEndConditionalRender");
+	if (!VertexAttribIPointer) VertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC_MT)cmgr->getProcAddress("glVertexAttribIPointer");
+	if (!GetVertexAttribIiv) GetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC_MT)cmgr->getProcAddress("glGetVertexAttribIiv");
+	if (!GetVertexAttribIuiv) GetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC_MT)cmgr->getProcAddress("glGetVertexAttribIuiv");
+	if (!VertexAttribI1i) VertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC_MT)cmgr->getProcAddress("glVertexAttribI1i");
+	if (!VertexAttribI2i) VertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC_MT)cmgr->getProcAddress("glVertexAttribI2i");
+	if (!VertexAttribI3i) VertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC_MT)cmgr->getProcAddress("glVertexAttribI3i");
+	if (!VertexAttribI4i) VertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC_MT)cmgr->getProcAddress("glVertexAttribI4i");
+	if (!VertexAttribI1ui) VertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC_MT)cmgr->getProcAddress("glVertexAttribI1ui");
+	if (!VertexAttribI2ui) VertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC_MT)cmgr->getProcAddress("glVertexAttribI2ui");
+	if (!VertexAttribI3ui) VertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC_MT)cmgr->getProcAddress("glVertexAttribI3ui");
+	if (!VertexAttribI4ui) VertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC_MT)cmgr->getProcAddress("glVertexAttribI4ui");
+	if (!VertexAttribI1iv) VertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC_MT)cmgr->getProcAddress("glVertexAttribI1iv");
+	if (!VertexAttribI2iv) VertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC_MT)cmgr->getProcAddress("glVertexAttribI2iv");
+	if (!VertexAttribI3iv) VertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC_MT)cmgr->getProcAddress("glVertexAttribI3iv");
+	if (!VertexAttribI4iv) VertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC_MT)cmgr->getProcAddress("glVertexAttribI4iv");
+	if (!VertexAttribI1uiv) VertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC_MT)cmgr->getProcAddress("glVertexAttribI1uiv");
+	if (!VertexAttribI2uiv) VertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC_MT)cmgr->getProcAddress("glVertexAttribI2uiv");
+	if (!VertexAttribI3uiv) VertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC_MT)cmgr->getProcAddress("glVertexAttribI3uiv");
+	if (!VertexAttribI4uiv) VertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC_MT)cmgr->getProcAddress("glVertexAttribI4uiv");
+	if (!VertexAttribI4bv) VertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC_MT)cmgr->getProcAddress("glVertexAttribI4bv");
+	if (!VertexAttribI4sv) VertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC_MT)cmgr->getProcAddress("glVertexAttribI4sv");
+	if (!VertexAttribI4ubv) VertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC_MT)cmgr->getProcAddress("glVertexAttribI4ubv");
+	if (!VertexAttribI4usv) VertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC_MT)cmgr->getProcAddress("glVertexAttribI4usv");
+	if (!GetUniformuiv) GetUniformuiv = (PFNGLGETUNIFORMUIVPROC_MT)cmgr->getProcAddress("glGetUniformuiv");
+	if (!BindFragDataLocation) BindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC_MT)cmgr->getProcAddress("glBindFragDataLocation");
+	if (!GetFragDataLocation) GetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC_MT)cmgr->getProcAddress("glGetFragDataLocation");
+	if (!Uniform1ui) Uniform1ui = (PFNGLUNIFORM1UIPROC_MT)cmgr->getProcAddress("glUniform1ui");
+	if (!Uniform2ui) Uniform2ui = (PFNGLUNIFORM2UIPROC_MT)cmgr->getProcAddress("glUniform2ui");
+	if (!Uniform3ui) Uniform3ui = (PFNGLUNIFORM3UIPROC_MT)cmgr->getProcAddress("glUniform3ui");
+	if (!Uniform4ui) Uniform4ui = (PFNGLUNIFORM4UIPROC_MT)cmgr->getProcAddress("glUniform4ui");
+	if (!Uniform1uiv) Uniform1uiv = (PFNGLUNIFORM1UIVPROC_MT)cmgr->getProcAddress("glUniform1uiv");
+	if (!Uniform2uiv) Uniform2uiv = (PFNGLUNIFORM2UIVPROC_MT)cmgr->getProcAddress("glUniform2uiv");
+	if (!Uniform3uiv) Uniform3uiv = (PFNGLUNIFORM3UIVPROC_MT)cmgr->getProcAddress("glUniform3uiv");
+	if (!Uniform4uiv) Uniform4uiv = (PFNGLUNIFORM4UIVPROC_MT)cmgr->getProcAddress("glUniform4uiv");
+	if (!TexParameterIiv) TexParameterIiv = (PFNGLTEXPARAMETERIIVPROC_MT)cmgr->getProcAddress("glTexParameterIiv");
+	if (!TexParameterIuiv) TexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glTexParameterIuiv");
+	if (!GetTexParameterIiv) GetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC_MT)cmgr->getProcAddress("glGetTexParameterIiv");
+	if (!GetTexParameterIuiv) GetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glGetTexParameterIuiv");
+	if (!ClearBufferiv) ClearBufferiv = (PFNGLCLEARBUFFERIVPROC_MT)cmgr->getProcAddress("glClearBufferiv");
+	if (!ClearBufferuiv) ClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC_MT)cmgr->getProcAddress("glClearBufferuiv");
+	if (!ClearBufferfv) ClearBufferfv = (PFNGLCLEARBUFFERFVPROC_MT)cmgr->getProcAddress("glClearBufferfv");
+	if (!ClearBufferfi) ClearBufferfi = (PFNGLCLEARBUFFERFIPROC_MT)cmgr->getProcAddress("glClearBufferfi");
+	if (!GetStringi) GetStringi = (PFNGLGETSTRINGIPROC_MT)cmgr->getProcAddress("glGetStringi");
+	if (!IsRenderbuffer) IsRenderbuffer = (PFNGLISRENDERBUFFERPROC_MT)cmgr->getProcAddress("glIsRenderbuffer");
+	if (!BindRenderbuffer) BindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC_MT)cmgr->getProcAddress("glBindRenderbuffer");
+	if (!DeleteRenderbuffers) DeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC_MT)cmgr->getProcAddress("glDeleteRenderbuffers");
+	if (!GenRenderbuffers) GenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC_MT)cmgr->getProcAddress("glGenRenderbuffers");
+	if (!RenderbufferStorage) RenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC_MT)cmgr->getProcAddress("glRenderbufferStorage");
+	if (!GetRenderbufferParameteriv) GetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetRenderbufferParameteriv");
+	if (!IsFramebuffer) IsFramebuffer = (PFNGLISFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glIsFramebuffer");
+	if (!BindFramebuffer) BindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glBindFramebuffer");
+	if (!DeleteFramebuffers) DeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC_MT)cmgr->getProcAddress("glDeleteFramebuffers");
+	if (!GenFramebuffers) GenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC_MT)cmgr->getProcAddress("glGenFramebuffers");
+	if (!CheckFramebufferStatus) CheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC_MT)cmgr->getProcAddress("glCheckFramebufferStatus");
+	if (!FramebufferTexture1D) FramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC_MT)cmgr->getProcAddress("glFramebufferTexture1D");
+	if (!FramebufferTexture2D) FramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC_MT)cmgr->getProcAddress("glFramebufferTexture2D");
+	if (!FramebufferTexture3D) FramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC_MT)cmgr->getProcAddress("glFramebufferTexture3D");
+	if (!FramebufferRenderbuffer) FramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC_MT)cmgr->getProcAddress("glFramebufferRenderbuffer");
+	if (!GetFramebufferAttachmentParameteriv) GetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetFramebufferAttachmentParameteriv");
+	if (!GenerateMipmap) GenerateMipmap = (PFNGLGENERATEMIPMAPPROC_MT)cmgr->getProcAddress("glGenerateMipmap");
+	if (!BlitFramebuffer) BlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glBlitFramebuffer");
+	if (!RenderbufferStorageMultisample) RenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT)cmgr->getProcAddress("glRenderbufferStorageMultisample");
+	if (!FramebufferTextureLayer) FramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC_MT)cmgr->getProcAddress("glFramebufferTextureLayer");
+	if (!FramebufferTextureLayer) FramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC_MT)cmgr->getProcAddress("glFramebufferTextureLayerARB");
+	if (!MapBufferRange) MapBufferRange = (PFNGLMAPBUFFERRANGEPROC_MT)cmgr->getProcAddress("glMapBufferRange");
+	if (!FlushMappedBufferRange) FlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC_MT)cmgr->getProcAddress("glFlushMappedBufferRange");
+	if (!BindVertexArray) BindVertexArray = (PFNGLBINDVERTEXARRAYPROC_MT)cmgr->getProcAddress("glBindVertexArray");
+	if (!DeleteVertexArrays) DeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC_MT)cmgr->getProcAddress("glDeleteVertexArrays");
+	if (!GenVertexArrays) GenVertexArrays = (PFNGLGENVERTEXARRAYSPROC_MT)cmgr->getProcAddress("glGenVertexArrays");
+	if (!IsVertexArray) IsVertexArray = (PFNGLISVERTEXARRAYPROC_MT)cmgr->getProcAddress("glIsVertexArray");
+	if (!DrawArraysInstanced) DrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawArraysInstanced");
+	if (!DrawArraysInstanced) DrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawArraysInstancedARB");
+	if (!DrawElementsInstanced) DrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawElementsInstanced");
+	if (!DrawElementsInstanced) DrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawElementsInstancedARB");
+	if (!TexBuffer) TexBuffer = (PFNGLTEXBUFFERPROC_MT)cmgr->getProcAddress("glTexBuffer");
+	if (!TexBuffer) TexBuffer = (PFNGLTEXBUFFERPROC_MT)cmgr->getProcAddress("glTexBufferARB");
+	if (!PrimitiveRestartIndex) PrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC_MT)cmgr->getProcAddress("glPrimitiveRestartIndex");
+	if (!CopyBufferSubData) CopyBufferSubData = (PFNGLCOPYBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glCopyBufferSubData");
+	if (!GetUniformIndices) GetUniformIndices = (PFNGLGETUNIFORMINDICESPROC_MT)cmgr->getProcAddress("glGetUniformIndices");
+	if (!GetActiveUniformsiv) GetActiveUniformsiv = (PFNGLGETACTIVEUNIFORMSIVPROC_MT)cmgr->getProcAddress("glGetActiveUniformsiv");
+	if (!GetActiveUniformName) GetActiveUniformName = (PFNGLGETACTIVEUNIFORMNAMEPROC_MT)cmgr->getProcAddress("glGetActiveUniformName");
+	if (!GetUniformBlockIndex) GetUniformBlockIndex = (PFNGLGETUNIFORMBLOCKINDEXPROC_MT)cmgr->getProcAddress("glGetUniformBlockIndex");
+	if (!GetActiveUniformBlockiv) GetActiveUniformBlockiv = (PFNGLGETACTIVEUNIFORMBLOCKIVPROC_MT)cmgr->getProcAddress("glGetActiveUniformBlockiv");
+	if (!GetActiveUniformBlockName) GetActiveUniformBlockName = (PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC_MT)cmgr->getProcAddress("glGetActiveUniformBlockName");
+	if (!UniformBlockBinding) UniformBlockBinding = (PFNGLUNIFORMBLOCKBINDINGPROC_MT)cmgr->getProcAddress("glUniformBlockBinding");
+	if (!DrawElementsBaseVertex) DrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC_MT)cmgr->getProcAddress("glDrawElementsBaseVertex");
+	if (!DrawRangeElementsBaseVertex) DrawRangeElementsBaseVertex = (PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC_MT)cmgr->getProcAddress("glDrawRangeElementsBaseVertex");
+	if (!DrawElementsInstancedBaseVertex) DrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC_MT)cmgr->getProcAddress("glDrawElementsInstancedBaseVertex");
+	if (!MultiDrawElementsBaseVertex) MultiDrawElementsBaseVertex = (PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC_MT)cmgr->getProcAddress("glMultiDrawElementsBaseVertex");
+	if (!ProvokingVertex) ProvokingVertex = (PFNGLPROVOKINGVERTEXPROC_MT)cmgr->getProcAddress("glProvokingVertex");
+	if (!FenceSync) FenceSync = (PFNGLFENCESYNCPROC_MT)cmgr->getProcAddress("glFenceSync");
+	if (!IsSync) IsSync = (PFNGLISSYNCPROC_MT)cmgr->getProcAddress("glIsSync");
+	if (!DeleteSync) DeleteSync = (PFNGLDELETESYNCPROC_MT)cmgr->getProcAddress("glDeleteSync");
+	if (!ClientWaitSync) ClientWaitSync = (PFNGLCLIENTWAITSYNCPROC_MT)cmgr->getProcAddress("glClientWaitSync");
+	if (!WaitSync) WaitSync = (PFNGLWAITSYNCPROC_MT)cmgr->getProcAddress("glWaitSync");
+	if (!GetInteger64v) GetInteger64v = (PFNGLGETINTEGER64VPROC_MT)cmgr->getProcAddress("glGetInteger64v");
+	if (!GetSynciv) GetSynciv = (PFNGLGETSYNCIVPROC_MT)cmgr->getProcAddress("glGetSynciv");
+	if (!GetBufferParameteri64v) GetBufferParameteri64v = (PFNGLGETBUFFERPARAMETERI64VPROC_MT)cmgr->getProcAddress("glGetBufferParameteri64v");
+	if (!FramebufferTexture) FramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC_MT)cmgr->getProcAddress("glFramebufferTexture");
+	if (!FramebufferTexture) FramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC_MT)cmgr->getProcAddress("glFramebufferTextureARB");
+	if (!TexImage2DMultisample) TexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTexImage2DMultisample");
+	if (!TexImage3DMultisample) TexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTexImage3DMultisample");
+	if (!GetMultisamplefv) GetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC_MT)cmgr->getProcAddress("glGetMultisamplefv");
+	if (!SampleMaski) SampleMaski = (PFNGLSAMPLEMASKIPROC_MT)cmgr->getProcAddress("glSampleMaski");
+	if (!BindFragDataLocationIndexed) BindFragDataLocationIndexed = (PFNGLBINDFRAGDATALOCATIONINDEXEDPROC_MT)cmgr->getProcAddress("glBindFragDataLocationIndexed");
+	if (!GetFragDataIndex) GetFragDataIndex = (PFNGLGETFRAGDATAINDEXPROC_MT)cmgr->getProcAddress("glGetFragDataIndex");
+	if (!GenSamplers) GenSamplers = (PFNGLGENSAMPLERSPROC_MT)cmgr->getProcAddress("glGenSamplers");
+	if (!DeleteSamplers) DeleteSamplers = (PFNGLDELETESAMPLERSPROC_MT)cmgr->getProcAddress("glDeleteSamplers");
+	if (!IsSampler) IsSampler = (PFNGLISSAMPLERPROC_MT)cmgr->getProcAddress("glIsSampler");
+	if (!BindSampler) BindSampler = (PFNGLBINDSAMPLERPROC_MT)cmgr->getProcAddress("glBindSampler");
+	if (!SamplerParameteri) SamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC_MT)cmgr->getProcAddress("glSamplerParameteri");
+	if (!SamplerParameteriv) SamplerParameteriv = (PFNGLSAMPLERPARAMETERIVPROC_MT)cmgr->getProcAddress("glSamplerParameteriv");
+	if (!SamplerParameterf) SamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC_MT)cmgr->getProcAddress("glSamplerParameterf");
+	if (!SamplerParameterfv) SamplerParameterfv = (PFNGLSAMPLERPARAMETERFVPROC_MT)cmgr->getProcAddress("glSamplerParameterfv");
+	if (!SamplerParameterIiv) SamplerParameterIiv = (PFNGLSAMPLERPARAMETERIIVPROC_MT)cmgr->getProcAddress("glSamplerParameterIiv");
+	if (!SamplerParameterIuiv) SamplerParameterIuiv = (PFNGLSAMPLERPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glSamplerParameterIuiv");
+	if (!GetSamplerParameteriv) GetSamplerParameteriv = (PFNGLGETSAMPLERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetSamplerParameteriv");
+	if (!GetSamplerParameterIiv) GetSamplerParameterIiv = (PFNGLGETSAMPLERPARAMETERIIVPROC_MT)cmgr->getProcAddress("glGetSamplerParameterIiv");
+	if (!GetSamplerParameterfv) GetSamplerParameterfv = (PFNGLGETSAMPLERPARAMETERFVPROC_MT)cmgr->getProcAddress("glGetSamplerParameterfv");
+	if (!GetSamplerParameterIuiv) GetSamplerParameterIuiv = (PFNGLGETSAMPLERPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glGetSamplerParameterIuiv");
+	if (!QueryCounter) QueryCounter = (PFNGLQUERYCOUNTERPROC_MT)cmgr->getProcAddress("glQueryCounter");
+	if (!GetQueryObjecti64v) GetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC_MT)cmgr->getProcAddress("glGetQueryObjecti64v");
+	if (!GetQueryObjectui64v) GetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC_MT)cmgr->getProcAddress("glGetQueryObjectui64v");
+	if (!VertexAttribDivisor) VertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC_MT)cmgr->getProcAddress("glVertexAttribDivisor");
+	if (!VertexAttribDivisor) VertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC_MT)cmgr->getProcAddress("glVertexAttribDivisorARB");
+	if (!VertexAttribP1ui) VertexAttribP1ui = (PFNGLVERTEXATTRIBP1UIPROC_MT)cmgr->getProcAddress("glVertexAttribP1ui");
+	if (!VertexAttribP1uiv) VertexAttribP1uiv = (PFNGLVERTEXATTRIBP1UIVPROC_MT)cmgr->getProcAddress("glVertexAttribP1uiv");
+	if (!VertexAttribP2ui) VertexAttribP2ui = (PFNGLVERTEXATTRIBP2UIPROC_MT)cmgr->getProcAddress("glVertexAttribP2ui");
+	if (!VertexAttribP2uiv) VertexAttribP2uiv = (PFNGLVERTEXATTRIBP2UIVPROC_MT)cmgr->getProcAddress("glVertexAttribP2uiv");
+	if (!VertexAttribP3ui) VertexAttribP3ui = (PFNGLVERTEXATTRIBP3UIPROC_MT)cmgr->getProcAddress("glVertexAttribP3ui");
+	if (!VertexAttribP3uiv) VertexAttribP3uiv = (PFNGLVERTEXATTRIBP3UIVPROC_MT)cmgr->getProcAddress("glVertexAttribP3uiv");
+	if (!VertexAttribP4ui) VertexAttribP4ui = (PFNGLVERTEXATTRIBP4UIPROC_MT)cmgr->getProcAddress("glVertexAttribP4ui");
+	if (!VertexAttribP4uiv) VertexAttribP4uiv = (PFNGLVERTEXATTRIBP4UIVPROC_MT)cmgr->getProcAddress("glVertexAttribP4uiv");
+	if (!MinSampleShading) MinSampleShading = (PFNGLMINSAMPLESHADINGPROC_MT)cmgr->getProcAddress("glMinSampleShading");
+	if (!MinSampleShading) MinSampleShading = (PFNGLMINSAMPLESHADINGPROC_MT)cmgr->getProcAddress("glMinSampleShadingARB");
+	if (!BlendEquationi) BlendEquationi = (PFNGLBLENDEQUATIONIPROC_MT)cmgr->getProcAddress("glBlendEquationi");
+	if (!BlendEquationi) BlendEquationi = (PFNGLBLENDEQUATIONIPROC_MT)cmgr->getProcAddress("glBlendEquationiARB");
+	if (!BlendEquationSeparatei) BlendEquationSeparatei = (PFNGLBLENDEQUATIONSEPARATEIPROC_MT)cmgr->getProcAddress("glBlendEquationSeparatei");
+	if (!BlendEquationSeparatei) BlendEquationSeparatei = (PFNGLBLENDEQUATIONSEPARATEIPROC_MT)cmgr->getProcAddress("glBlendEquationSeparateiARB");
+	if (!BlendFunci) BlendFunci = (PFNGLBLENDFUNCIPROC_MT)cmgr->getProcAddress("glBlendFunci");
+	if (!BlendFunci) BlendFunci = (PFNGLBLENDFUNCIPROC_MT)cmgr->getProcAddress("glBlendFunciARB");
+	if (!BlendFuncSeparatei) BlendFuncSeparatei = (PFNGLBLENDFUNCSEPARATEIPROC_MT)cmgr->getProcAddress("glBlendFuncSeparatei");
+	if (!BlendFuncSeparatei) BlendFuncSeparatei = (PFNGLBLENDFUNCSEPARATEIPROC_MT)cmgr->getProcAddress("glBlendFuncSeparateiARB");
+	if (!DrawArraysIndirect) DrawArraysIndirect = (PFNGLDRAWARRAYSINDIRECTPROC_MT)cmgr->getProcAddress("glDrawArraysIndirect");
+	if (!DrawElementsIndirect) DrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC_MT)cmgr->getProcAddress("glDrawElementsIndirect");
+	if (!Uniform1d) Uniform1d = (PFNGLUNIFORM1DPROC_MT)cmgr->getProcAddress("glUniform1d");
+	if (!Uniform2d) Uniform2d = (PFNGLUNIFORM2DPROC_MT)cmgr->getProcAddress("glUniform2d");
+	if (!Uniform3d) Uniform3d = (PFNGLUNIFORM3DPROC_MT)cmgr->getProcAddress("glUniform3d");
+	if (!Uniform4d) Uniform4d = (PFNGLUNIFORM4DPROC_MT)cmgr->getProcAddress("glUniform4d");
+	if (!Uniform1dv) Uniform1dv = (PFNGLUNIFORM1DVPROC_MT)cmgr->getProcAddress("glUniform1dv");
+	if (!Uniform2dv) Uniform2dv = (PFNGLUNIFORM2DVPROC_MT)cmgr->getProcAddress("glUniform2dv");
+	if (!Uniform3dv) Uniform3dv = (PFNGLUNIFORM3DVPROC_MT)cmgr->getProcAddress("glUniform3dv");
+	if (!Uniform4dv) Uniform4dv = (PFNGLUNIFORM4DVPROC_MT)cmgr->getProcAddress("glUniform4dv");
+	if (!UniformMatrix2dv) UniformMatrix2dv = (PFNGLUNIFORMMATRIX2DVPROC_MT)cmgr->getProcAddress("glUniformMatrix2dv");
+	if (!UniformMatrix3dv) UniformMatrix3dv = (PFNGLUNIFORMMATRIX3DVPROC_MT)cmgr->getProcAddress("glUniformMatrix3dv");
+	if (!UniformMatrix4dv) UniformMatrix4dv = (PFNGLUNIFORMMATRIX4DVPROC_MT)cmgr->getProcAddress("glUniformMatrix4dv");
+	if (!UniformMatrix2x3dv) UniformMatrix2x3dv = (PFNGLUNIFORMMATRIX2X3DVPROC_MT)cmgr->getProcAddress("glUniformMatrix2x3dv");
+	if (!UniformMatrix2x4dv) UniformMatrix2x4dv = (PFNGLUNIFORMMATRIX2X4DVPROC_MT)cmgr->getProcAddress("glUniformMatrix2x4dv");
+	if (!UniformMatrix3x2dv) UniformMatrix3x2dv = (PFNGLUNIFORMMATRIX3X2DVPROC_MT)cmgr->getProcAddress("glUniformMatrix3x2dv");
+	if (!UniformMatrix3x4dv) UniformMatrix3x4dv = (PFNGLUNIFORMMATRIX3X4DVPROC_MT)cmgr->getProcAddress("glUniformMatrix3x4dv");
+	if (!UniformMatrix4x2dv) UniformMatrix4x2dv = (PFNGLUNIFORMMATRIX4X2DVPROC_MT)cmgr->getProcAddress("glUniformMatrix4x2dv");
+	if (!UniformMatrix4x3dv) UniformMatrix4x3dv = (PFNGLUNIFORMMATRIX4X3DVPROC_MT)cmgr->getProcAddress("glUniformMatrix4x3dv");
+	if (!GetUniformdv) GetUniformdv = (PFNGLGETUNIFORMDVPROC_MT)cmgr->getProcAddress("glGetUniformdv");
+	if (!GetSubroutineUniformLocation) GetSubroutineUniformLocation = (PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC_MT)cmgr->getProcAddress("glGetSubroutineUniformLocation");
+	if (!GetSubroutineIndex) GetSubroutineIndex = (PFNGLGETSUBROUTINEINDEXPROC_MT)cmgr->getProcAddress("glGetSubroutineIndex");
+	if (!GetActiveSubroutineUniformiv) GetActiveSubroutineUniformiv = (PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC_MT)cmgr->getProcAddress("glGetActiveSubroutineUniformiv");
+	if (!GetActiveSubroutineUniformName) GetActiveSubroutineUniformName = (PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC_MT)cmgr->getProcAddress("glGetActiveSubroutineUniformName");
+	if (!GetActiveSubroutineName) GetActiveSubroutineName = (PFNGLGETACTIVESUBROUTINENAMEPROC_MT)cmgr->getProcAddress("glGetActiveSubroutineName");
+	if (!UniformSubroutinesuiv) UniformSubroutinesuiv = (PFNGLUNIFORMSUBROUTINESUIVPROC_MT)cmgr->getProcAddress("glUniformSubroutinesuiv");
+	if (!GetUniformSubroutineuiv) GetUniformSubroutineuiv = (PFNGLGETUNIFORMSUBROUTINEUIVPROC_MT)cmgr->getProcAddress("glGetUniformSubroutineuiv");
+	if (!GetProgramStageiv) GetProgramStageiv = (PFNGLGETPROGRAMSTAGEIVPROC_MT)cmgr->getProcAddress("glGetProgramStageiv");
+	if (!PatchParameteri) PatchParameteri = (PFNGLPATCHPARAMETERIPROC_MT)cmgr->getProcAddress("glPatchParameteri");
+	if (!PatchParameterfv) PatchParameterfv = (PFNGLPATCHPARAMETERFVPROC_MT)cmgr->getProcAddress("glPatchParameterfv");
+	if (!BindTransformFeedback) BindTransformFeedback = (PFNGLBINDTRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glBindTransformFeedback");
+	if (!DeleteTransformFeedbacks) DeleteTransformFeedbacks = (PFNGLDELETETRANSFORMFEEDBACKSPROC_MT)cmgr->getProcAddress("glDeleteTransformFeedbacks");
+	if (!GenTransformFeedbacks) GenTransformFeedbacks = (PFNGLGENTRANSFORMFEEDBACKSPROC_MT)cmgr->getProcAddress("glGenTransformFeedbacks");
+	if (!IsTransformFeedback) IsTransformFeedback = (PFNGLISTRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glIsTransformFeedback");
+	if (!PauseTransformFeedback) PauseTransformFeedback = (PFNGLPAUSETRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glPauseTransformFeedback");
+	if (!ResumeTransformFeedback) ResumeTransformFeedback = (PFNGLRESUMETRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glResumeTransformFeedback");
+	if (!DrawTransformFeedback) DrawTransformFeedback = (PFNGLDRAWTRANSFORMFEEDBACKPROC_MT)cmgr->getProcAddress("glDrawTransformFeedback");
+	if (!DrawTransformFeedbackStream) DrawTransformFeedbackStream = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC_MT)cmgr->getProcAddress("glDrawTransformFeedbackStream");
+	if (!BeginQueryIndexed) BeginQueryIndexed = (PFNGLBEGINQUERYINDEXEDPROC_MT)cmgr->getProcAddress("glBeginQueryIndexed");
+	if (!EndQueryIndexed) EndQueryIndexed = (PFNGLENDQUERYINDEXEDPROC_MT)cmgr->getProcAddress("glEndQueryIndexed");
+	if (!GetQueryIndexediv) GetQueryIndexediv = (PFNGLGETQUERYINDEXEDIVPROC_MT)cmgr->getProcAddress("glGetQueryIndexediv");
+	if (!ReleaseShaderCompiler) ReleaseShaderCompiler = (PFNGLRELEASESHADERCOMPILERPROC_MT)cmgr->getProcAddress("glReleaseShaderCompiler");
+	if (!ShaderBinary) ShaderBinary = (PFNGLSHADERBINARYPROC_MT)cmgr->getProcAddress("glShaderBinary");
+	if (!GetShaderPrecisionFormat) GetShaderPrecisionFormat = (PFNGLGETSHADERPRECISIONFORMATPROC_MT)cmgr->getProcAddress("glGetShaderPrecisionFormat");
+	if (!DepthRangef) DepthRangef = (PFNGLDEPTHRANGEFPROC_MT)cmgr->getProcAddress("glDepthRangef");
+	if (!ClearDepthf) ClearDepthf = (PFNGLCLEARDEPTHFPROC_MT)cmgr->getProcAddress("glClearDepthf");
+	if (!GetProgramBinary) GetProgramBinary = (PFNGLGETPROGRAMBINARYPROC_MT)cmgr->getProcAddress("glGetProgramBinary");
+	if (!ProgramBinary) ProgramBinary = (PFNGLPROGRAMBINARYPROC_MT)cmgr->getProcAddress("glProgramBinary");
+	if (!ProgramParameteri) ProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC_MT)cmgr->getProcAddress("glProgramParameteri");
+	if (!ProgramParameteri) ProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC_MT)cmgr->getProcAddress("glProgramParameteriARB");
+	if (!UseProgramStages) UseProgramStages = (PFNGLUSEPROGRAMSTAGESPROC_MT)cmgr->getProcAddress("glUseProgramStages");
+	if (!ActiveShaderProgram) ActiveShaderProgram = (PFNGLACTIVESHADERPROGRAMPROC_MT)cmgr->getProcAddress("glActiveShaderProgram");
+	if (!CreateShaderProgramv) CreateShaderProgramv = (PFNGLCREATESHADERPROGRAMVPROC_MT)cmgr->getProcAddress("glCreateShaderProgramv");
+	if (!BindProgramPipeline) BindProgramPipeline = (PFNGLBINDPROGRAMPIPELINEPROC_MT)cmgr->getProcAddress("glBindProgramPipeline");
+	if (!DeleteProgramPipelines) DeleteProgramPipelines = (PFNGLDELETEPROGRAMPIPELINESPROC_MT)cmgr->getProcAddress("glDeleteProgramPipelines");
+	if (!GenProgramPipelines) GenProgramPipelines = (PFNGLGENPROGRAMPIPELINESPROC_MT)cmgr->getProcAddress("glGenProgramPipelines");
+	if (!IsProgramPipeline) IsProgramPipeline = (PFNGLISPROGRAMPIPELINEPROC_MT)cmgr->getProcAddress("glIsProgramPipeline");
+	if (!GetProgramPipelineiv) GetProgramPipelineiv = (PFNGLGETPROGRAMPIPELINEIVPROC_MT)cmgr->getProcAddress("glGetProgramPipelineiv");
+	if (!ProgramUniform1i) ProgramUniform1i = (PFNGLPROGRAMUNIFORM1IPROC_MT)cmgr->getProcAddress("glProgramUniform1i");
+	if (!ProgramUniform1iv) ProgramUniform1iv = (PFNGLPROGRAMUNIFORM1IVPROC_MT)cmgr->getProcAddress("glProgramUniform1iv");
+	if (!ProgramUniform1f) ProgramUniform1f = (PFNGLPROGRAMUNIFORM1FPROC_MT)cmgr->getProcAddress("glProgramUniform1f");
+	if (!ProgramUniform1fv) ProgramUniform1fv = (PFNGLPROGRAMUNIFORM1FVPROC_MT)cmgr->getProcAddress("glProgramUniform1fv");
+	if (!ProgramUniform1d) ProgramUniform1d = (PFNGLPROGRAMUNIFORM1DPROC_MT)cmgr->getProcAddress("glProgramUniform1d");
+	if (!ProgramUniform1dv) ProgramUniform1dv = (PFNGLPROGRAMUNIFORM1DVPROC_MT)cmgr->getProcAddress("glProgramUniform1dv");
+	if (!ProgramUniform1ui) ProgramUniform1ui = (PFNGLPROGRAMUNIFORM1UIPROC_MT)cmgr->getProcAddress("glProgramUniform1ui");
+	if (!ProgramUniform1uiv) ProgramUniform1uiv = (PFNGLPROGRAMUNIFORM1UIVPROC_MT)cmgr->getProcAddress("glProgramUniform1uiv");
+	if (!ProgramUniform2i) ProgramUniform2i = (PFNGLPROGRAMUNIFORM2IPROC_MT)cmgr->getProcAddress("glProgramUniform2i");
+	if (!ProgramUniform2iv) ProgramUniform2iv = (PFNGLPROGRAMUNIFORM2IVPROC_MT)cmgr->getProcAddress("glProgramUniform2iv");
+	if (!ProgramUniform2f) ProgramUniform2f = (PFNGLPROGRAMUNIFORM2FPROC_MT)cmgr->getProcAddress("glProgramUniform2f");
+	if (!ProgramUniform2fv) ProgramUniform2fv = (PFNGLPROGRAMUNIFORM2FVPROC_MT)cmgr->getProcAddress("glProgramUniform2fv");
+	if (!ProgramUniform2d) ProgramUniform2d = (PFNGLPROGRAMUNIFORM2DPROC_MT)cmgr->getProcAddress("glProgramUniform2d");
+	if (!ProgramUniform2dv) ProgramUniform2dv = (PFNGLPROGRAMUNIFORM2DVPROC_MT)cmgr->getProcAddress("glProgramUniform2dv");
+	if (!ProgramUniform2ui) ProgramUniform2ui = (PFNGLPROGRAMUNIFORM2UIPROC_MT)cmgr->getProcAddress("glProgramUniform2ui");
+	if (!ProgramUniform2uiv) ProgramUniform2uiv = (PFNGLPROGRAMUNIFORM2UIVPROC_MT)cmgr->getProcAddress("glProgramUniform2uiv");
+	if (!ProgramUniform3i) ProgramUniform3i = (PFNGLPROGRAMUNIFORM3IPROC_MT)cmgr->getProcAddress("glProgramUniform3i");
+	if (!ProgramUniform3iv) ProgramUniform3iv = (PFNGLPROGRAMUNIFORM3IVPROC_MT)cmgr->getProcAddress("glProgramUniform3iv");
+	if (!ProgramUniform3f) ProgramUniform3f = (PFNGLPROGRAMUNIFORM3FPROC_MT)cmgr->getProcAddress("glProgramUniform3f");
+	if (!ProgramUniform3fv) ProgramUniform3fv = (PFNGLPROGRAMUNIFORM3FVPROC_MT)cmgr->getProcAddress("glProgramUniform3fv");
+	if (!ProgramUniform3d) ProgramUniform3d = (PFNGLPROGRAMUNIFORM3DPROC_MT)cmgr->getProcAddress("glProgramUniform3d");
+	if (!ProgramUniform3dv) ProgramUniform3dv = (PFNGLPROGRAMUNIFORM3DVPROC_MT)cmgr->getProcAddress("glProgramUniform3dv");
+	if (!ProgramUniform3ui) ProgramUniform3ui = (PFNGLPROGRAMUNIFORM3UIPROC_MT)cmgr->getProcAddress("glProgramUniform3ui");
+	if (!ProgramUniform3uiv) ProgramUniform3uiv = (PFNGLPROGRAMUNIFORM3UIVPROC_MT)cmgr->getProcAddress("glProgramUniform3uiv");
+	if (!ProgramUniform4i) ProgramUniform4i = (PFNGLPROGRAMUNIFORM4IPROC_MT)cmgr->getProcAddress("glProgramUniform4i");
+	if (!ProgramUniform4iv) ProgramUniform4iv = (PFNGLPROGRAMUNIFORM4IVPROC_MT)cmgr->getProcAddress("glProgramUniform4iv");
+	if (!ProgramUniform4f) ProgramUniform4f = (PFNGLPROGRAMUNIFORM4FPROC_MT)cmgr->getProcAddress("glProgramUniform4f");
+	if (!ProgramUniform4fv) ProgramUniform4fv = (PFNGLPROGRAMUNIFORM4FVPROC_MT)cmgr->getProcAddress("glProgramUniform4fv");
+	if (!ProgramUniform4d) ProgramUniform4d = (PFNGLPROGRAMUNIFORM4DPROC_MT)cmgr->getProcAddress("glProgramUniform4d");
+	if (!ProgramUniform4dv) ProgramUniform4dv = (PFNGLPROGRAMUNIFORM4DVPROC_MT)cmgr->getProcAddress("glProgramUniform4dv");
+	if (!ProgramUniform4ui) ProgramUniform4ui = (PFNGLPROGRAMUNIFORM4UIPROC_MT)cmgr->getProcAddress("glProgramUniform4ui");
+	if (!ProgramUniform4uiv) ProgramUniform4uiv = (PFNGLPROGRAMUNIFORM4UIVPROC_MT)cmgr->getProcAddress("glProgramUniform4uiv");
+	if (!ProgramUniformMatrix2fv) ProgramUniformMatrix2fv = (PFNGLPROGRAMUNIFORMMATRIX2FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2fv");
+	if (!ProgramUniformMatrix3fv) ProgramUniformMatrix3fv = (PFNGLPROGRAMUNIFORMMATRIX3FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3fv");
+	if (!ProgramUniformMatrix4fv) ProgramUniformMatrix4fv = (PFNGLPROGRAMUNIFORMMATRIX4FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4fv");
+	if (!ProgramUniformMatrix2dv) ProgramUniformMatrix2dv = (PFNGLPROGRAMUNIFORMMATRIX2DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2dv");
+	if (!ProgramUniformMatrix3dv) ProgramUniformMatrix3dv = (PFNGLPROGRAMUNIFORMMATRIX3DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3dv");
+	if (!ProgramUniformMatrix4dv) ProgramUniformMatrix4dv = (PFNGLPROGRAMUNIFORMMATRIX4DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4dv");
+	if (!ProgramUniformMatrix2x3fv) ProgramUniformMatrix2x3fv = (PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2x3fv");
+	if (!ProgramUniformMatrix3x2fv) ProgramUniformMatrix3x2fv = (PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3x2fv");
+	if (!ProgramUniformMatrix2x4fv) ProgramUniformMatrix2x4fv = (PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2x4fv");
+	if (!ProgramUniformMatrix4x2fv) ProgramUniformMatrix4x2fv = (PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4x2fv");
+	if (!ProgramUniformMatrix3x4fv) ProgramUniformMatrix3x4fv = (PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3x4fv");
+	if (!ProgramUniformMatrix4x3fv) ProgramUniformMatrix4x3fv = (PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4x3fv");
+	if (!ProgramUniformMatrix2x3dv) ProgramUniformMatrix2x3dv = (PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2x3dv");
+	if (!ProgramUniformMatrix3x2dv) ProgramUniformMatrix3x2dv = (PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3x2dv");
+	if (!ProgramUniformMatrix2x4dv) ProgramUniformMatrix2x4dv = (PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix2x4dv");
+	if (!ProgramUniformMatrix4x2dv) ProgramUniformMatrix4x2dv = (PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4x2dv");
+	if (!ProgramUniformMatrix3x4dv) ProgramUniformMatrix3x4dv = (PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix3x4dv");
+	if (!ProgramUniformMatrix4x3dv) ProgramUniformMatrix4x3dv = (PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC_MT)cmgr->getProcAddress("glProgramUniformMatrix4x3dv");
+	if (!ValidateProgramPipeline) ValidateProgramPipeline = (PFNGLVALIDATEPROGRAMPIPELINEPROC_MT)cmgr->getProcAddress("glValidateProgramPipeline");
+	if (!GetProgramPipelineInfoLog) GetProgramPipelineInfoLog = (PFNGLGETPROGRAMPIPELINEINFOLOGPROC_MT)cmgr->getProcAddress("glGetProgramPipelineInfoLog");
+	if (!VertexAttribL1d) VertexAttribL1d = (PFNGLVERTEXATTRIBL1DPROC_MT)cmgr->getProcAddress("glVertexAttribL1d");
+	if (!VertexAttribL2d) VertexAttribL2d = (PFNGLVERTEXATTRIBL2DPROC_MT)cmgr->getProcAddress("glVertexAttribL2d");
+	if (!VertexAttribL3d) VertexAttribL3d = (PFNGLVERTEXATTRIBL3DPROC_MT)cmgr->getProcAddress("glVertexAttribL3d");
+	if (!VertexAttribL4d) VertexAttribL4d = (PFNGLVERTEXATTRIBL4DPROC_MT)cmgr->getProcAddress("glVertexAttribL4d");
+	if (!VertexAttribL1dv) VertexAttribL1dv = (PFNGLVERTEXATTRIBL1DVPROC_MT)cmgr->getProcAddress("glVertexAttribL1dv");
+	if (!VertexAttribL2dv) VertexAttribL2dv = (PFNGLVERTEXATTRIBL2DVPROC_MT)cmgr->getProcAddress("glVertexAttribL2dv");
+	if (!VertexAttribL3dv) VertexAttribL3dv = (PFNGLVERTEXATTRIBL3DVPROC_MT)cmgr->getProcAddress("glVertexAttribL3dv");
+	if (!VertexAttribL4dv) VertexAttribL4dv = (PFNGLVERTEXATTRIBL4DVPROC_MT)cmgr->getProcAddress("glVertexAttribL4dv");
+	if (!VertexAttribLPointer) VertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC_MT)cmgr->getProcAddress("glVertexAttribLPointer");
+	if (!GetVertexAttribLdv) GetVertexAttribLdv = (PFNGLGETVERTEXATTRIBLDVPROC_MT)cmgr->getProcAddress("glGetVertexAttribLdv");
+	if (!ViewportArrayv) ViewportArrayv = (PFNGLVIEWPORTARRAYVPROC_MT)cmgr->getProcAddress("glViewportArrayv");
+	if (!ViewportIndexedf) ViewportIndexedf = (PFNGLVIEWPORTINDEXEDFPROC_MT)cmgr->getProcAddress("glViewportIndexedf");
+	if (!ViewportIndexedfv) ViewportIndexedfv = (PFNGLVIEWPORTINDEXEDFVPROC_MT)cmgr->getProcAddress("glViewportIndexedfv");
+	if (!ScissorArrayv) ScissorArrayv = (PFNGLSCISSORARRAYVPROC_MT)cmgr->getProcAddress("glScissorArrayv");
+	if (!ScissorIndexed) ScissorIndexed = (PFNGLSCISSORINDEXEDPROC_MT)cmgr->getProcAddress("glScissorIndexed");
+	if (!ScissorIndexedv) ScissorIndexedv = (PFNGLSCISSORINDEXEDVPROC_MT)cmgr->getProcAddress("glScissorIndexedv");
+	if (!DepthRangeArrayv) DepthRangeArrayv = (PFNGLDEPTHRANGEARRAYVPROC_MT)cmgr->getProcAddress("glDepthRangeArrayv");
+	if (!DepthRangeIndexed) DepthRangeIndexed = (PFNGLDEPTHRANGEINDEXEDPROC_MT)cmgr->getProcAddress("glDepthRangeIndexed");
+	if (!DrawArraysInstancedBaseInstance) DrawArraysInstancedBaseInstance = (PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC_MT)cmgr->getProcAddress("glDrawArraysInstancedBaseInstance");
+	if (!DrawElementsInstancedBaseInstance) DrawElementsInstancedBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC_MT)cmgr->getProcAddress("glDrawElementsInstancedBaseInstance");
+	if (!DrawElementsInstancedBaseVertexBaseInstance) DrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC_MT)cmgr->getProcAddress("glDrawElementsInstancedBaseVertexBaseInstance");
+	if (!GetInternalformativ) GetInternalformativ = (PFNGLGETINTERNALFORMATIVPROC_MT)cmgr->getProcAddress("glGetInternalformativ");
+	if (!GetActiveAtomicCounterBufferiv) GetActiveAtomicCounterBufferiv = (PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC_MT)cmgr->getProcAddress("glGetActiveAtomicCounterBufferiv");
+	if (!BindImageTexture) BindImageTexture = (PFNGLBINDIMAGETEXTUREPROC_MT)cmgr->getProcAddress("glBindImageTexture");
+	if (!MemoryBarrier) MemoryBarrier = (PFNGLMEMORYBARRIERPROC_MT)cmgr->getProcAddress("glMemoryBarrier");
+	if (!TexStorage1D) TexStorage1D = (PFNGLTEXSTORAGE1DPROC_MT)cmgr->getProcAddress("glTexStorage1D");
+	if (!TexStorage2D) TexStorage2D = (PFNGLTEXSTORAGE2DPROC_MT)cmgr->getProcAddress("glTexStorage2D");
+	if (!TexStorage3D) TexStorage3D = (PFNGLTEXSTORAGE3DPROC_MT)cmgr->getProcAddress("glTexStorage3D");
+	if (!DrawTransformFeedbackInstanced) DrawTransformFeedbackInstanced = (PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawTransformFeedbackInstanced");
+	if (!DrawTransformFeedbackStreamInstanced) DrawTransformFeedbackStreamInstanced = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC_MT)cmgr->getProcAddress("glDrawTransformFeedbackStreamInstanced");
+	if (!ClearBufferData) ClearBufferData = (PFNGLCLEARBUFFERDATAPROC_MT)cmgr->getProcAddress("glClearBufferData");
+	if (!ClearBufferSubData) ClearBufferSubData = (PFNGLCLEARBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glClearBufferSubData");
+	if (!DispatchCompute) DispatchCompute = (PFNGLDISPATCHCOMPUTEPROC_MT)cmgr->getProcAddress("glDispatchCompute");
+	if (!DispatchComputeIndirect) DispatchComputeIndirect = (PFNGLDISPATCHCOMPUTEINDIRECTPROC_MT)cmgr->getProcAddress("glDispatchComputeIndirect");
+	if (!CopyImageSubData) CopyImageSubData = (PFNGLCOPYIMAGESUBDATAPROC_MT)cmgr->getProcAddress("glCopyImageSubData");
+	if (!FramebufferParameteri) FramebufferParameteri = (PFNGLFRAMEBUFFERPARAMETERIPROC_MT)cmgr->getProcAddress("glFramebufferParameteri");
+	if (!GetFramebufferParameteriv) GetFramebufferParameteriv = (PFNGLGETFRAMEBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetFramebufferParameteriv");
+	if (!GetInternalformati64v) GetInternalformati64v = (PFNGLGETINTERNALFORMATI64VPROC_MT)cmgr->getProcAddress("glGetInternalformati64v");
+	if (!InvalidateTexSubImage) InvalidateTexSubImage = (PFNGLINVALIDATETEXSUBIMAGEPROC_MT)cmgr->getProcAddress("glInvalidateTexSubImage");
+	if (!InvalidateTexImage) InvalidateTexImage = (PFNGLINVALIDATETEXIMAGEPROC_MT)cmgr->getProcAddress("glInvalidateTexImage");
+	if (!InvalidateBufferSubData) InvalidateBufferSubData = (PFNGLINVALIDATEBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glInvalidateBufferSubData");
+	if (!InvalidateBufferData) InvalidateBufferData = (PFNGLINVALIDATEBUFFERDATAPROC_MT)cmgr->getProcAddress("glInvalidateBufferData");
+	if (!InvalidateFramebuffer) InvalidateFramebuffer = (PFNGLINVALIDATEFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glInvalidateFramebuffer");
+	if (!InvalidateSubFramebuffer) InvalidateSubFramebuffer = (PFNGLINVALIDATESUBFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glInvalidateSubFramebuffer");
+	if (!MultiDrawArraysIndirect) MultiDrawArraysIndirect = (PFNGLMULTIDRAWARRAYSINDIRECTPROC_MT)cmgr->getProcAddress("glMultiDrawArraysIndirect");
+	if (!MultiDrawElementsIndirect) MultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC_MT)cmgr->getProcAddress("glMultiDrawElementsIndirect");
+	if (!GetProgramInterfaceiv) GetProgramInterfaceiv = (PFNGLGETPROGRAMINTERFACEIVPROC_MT)cmgr->getProcAddress("glGetProgramInterfaceiv");
+	if (!GetProgramResourceIndex) GetProgramResourceIndex = (PFNGLGETPROGRAMRESOURCEINDEXPROC_MT)cmgr->getProcAddress("glGetProgramResourceIndex");
+	if (!GetProgramResourceName) GetProgramResourceName = (PFNGLGETPROGRAMRESOURCENAMEPROC_MT)cmgr->getProcAddress("glGetProgramResourceName");
+	if (!GetProgramResourceiv) GetProgramResourceiv = (PFNGLGETPROGRAMRESOURCEIVPROC_MT)cmgr->getProcAddress("glGetProgramResourceiv");
+	if (!GetProgramResourceLocation) GetProgramResourceLocation = (PFNGLGETPROGRAMRESOURCELOCATIONPROC_MT)cmgr->getProcAddress("glGetProgramResourceLocation");
+	if (!GetProgramResourceLocationIndex) GetProgramResourceLocationIndex = (PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC_MT)cmgr->getProcAddress("glGetProgramResourceLocationIndex");
+	if (!ShaderStorageBlockBinding) ShaderStorageBlockBinding = (PFNGLSHADERSTORAGEBLOCKBINDINGPROC_MT)cmgr->getProcAddress("glShaderStorageBlockBinding");
+	if (!TexBufferRange) TexBufferRange = (PFNGLTEXBUFFERRANGEPROC_MT)cmgr->getProcAddress("glTexBufferRange");
+	if (!TexStorage2DMultisample) TexStorage2DMultisample = (PFNGLTEXSTORAGE2DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTexStorage2DMultisample");
+	if (!TexStorage3DMultisample) TexStorage3DMultisample = (PFNGLTEXSTORAGE3DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTexStorage3DMultisample");
+	if (!TextureView) TextureView = (PFNGLTEXTUREVIEWPROC_MT)cmgr->getProcAddress("glTextureView");
+	if (!BindVertexBuffer) BindVertexBuffer = (PFNGLBINDVERTEXBUFFERPROC_MT)cmgr->getProcAddress("glBindVertexBuffer");
+	if (!VertexAttribFormat) VertexAttribFormat = (PFNGLVERTEXATTRIBFORMATPROC_MT)cmgr->getProcAddress("glVertexAttribFormat");
+	if (!VertexAttribIFormat) VertexAttribIFormat = (PFNGLVERTEXATTRIBIFORMATPROC_MT)cmgr->getProcAddress("glVertexAttribIFormat");
+	if (!VertexAttribLFormat) VertexAttribLFormat = (PFNGLVERTEXATTRIBLFORMATPROC_MT)cmgr->getProcAddress("glVertexAttribLFormat");
+	if (!VertexAttribBinding) VertexAttribBinding = (PFNGLVERTEXATTRIBBINDINGPROC_MT)cmgr->getProcAddress("glVertexAttribBinding");
+	if (!VertexBindingDivisor) VertexBindingDivisor = (PFNGLVERTEXBINDINGDIVISORPROC_MT)cmgr->getProcAddress("glVertexBindingDivisor");
+	if (!DebugMessageControl) DebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC_MT)cmgr->getProcAddress("glDebugMessageControl");
+	if (!DebugMessageControl) DebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC_MT)cmgr->getProcAddress("glDebugMessageControlARB");
+	if (!DebugMessageInsert) DebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC_MT)cmgr->getProcAddress("glDebugMessageInsert");
+	if (!DebugMessageInsert) DebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC_MT)cmgr->getProcAddress("glDebugMessageInsertARB");
+	if (!DebugMessageCallback) DebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC_MT)cmgr->getProcAddress("glDebugMessageCallback");
+	if (!DebugMessageCallback) DebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC_MT)cmgr->getProcAddress("glDebugMessageCallbackARB");
+	if (!GetDebugMessageLog) GetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC_MT)cmgr->getProcAddress("glGetDebugMessageLog");
+	if (!GetDebugMessageLog) GetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC_MT)cmgr->getProcAddress("glGetDebugMessageLogARB");
+	if (!PushDebugGroup) PushDebugGroup = (PFNGLPUSHDEBUGGROUPPROC_MT)cmgr->getProcAddress("glPushDebugGroup");
+	if (!PopDebugGroup) PopDebugGroup = (PFNGLPOPDEBUGGROUPPROC_MT)cmgr->getProcAddress("glPopDebugGroup");
+	if (!ObjectLabel) ObjectLabel = (PFNGLOBJECTLABELPROC_MT)cmgr->getProcAddress("glObjectLabel");
+	if (!GetObjectLabel) GetObjectLabel = (PFNGLGETOBJECTLABELPROC_MT)cmgr->getProcAddress("glGetObjectLabel");
+	if (!ObjectPtrLabel) ObjectPtrLabel = (PFNGLOBJECTPTRLABELPROC_MT)cmgr->getProcAddress("glObjectPtrLabel");
+	if (!GetObjectPtrLabel) GetObjectPtrLabel = (PFNGLGETOBJECTPTRLABELPROC_MT)cmgr->getProcAddress("glGetObjectPtrLabel");
+	if (!BufferStorage) BufferStorage = (PFNGLBUFFERSTORAGEPROC_MT)cmgr->getProcAddress("glBufferStorage");
+	if (!ClearTexImage) ClearTexImage = (PFNGLCLEARTEXIMAGEPROC_MT)cmgr->getProcAddress("glClearTexImage");
+	if (!ClearTexSubImage) ClearTexSubImage = (PFNGLCLEARTEXSUBIMAGEPROC_MT)cmgr->getProcAddress("glClearTexSubImage");
+	if (!BindBuffersBase) BindBuffersBase = (PFNGLBINDBUFFERSBASEPROC_MT)cmgr->getProcAddress("glBindBuffersBase");
+	if (!BindBuffersRange) BindBuffersRange = (PFNGLBINDBUFFERSRANGEPROC_MT)cmgr->getProcAddress("glBindBuffersRange");
+	if (!BindTextures) BindTextures = (PFNGLBINDTEXTURESPROC_MT)cmgr->getProcAddress("glBindTextures");
+	if (!BindSamplers) BindSamplers = (PFNGLBINDSAMPLERSPROC_MT)cmgr->getProcAddress("glBindSamplers");
+	if (!BindImageTextures) BindImageTextures = (PFNGLBINDIMAGETEXTURESPROC_MT)cmgr->getProcAddress("glBindImageTextures");
+	if (!BindVertexBuffers) BindVertexBuffers = (PFNGLBINDVERTEXBUFFERSPROC_MT)cmgr->getProcAddress("glBindVertexBuffers");
+	if (!ClipControl) ClipControl = (PFNGLCLIPCONTROLPROC_MT)cmgr->getProcAddress("glClipControl");
+	if (!CreateTransformFeedbacks) CreateTransformFeedbacks = (PFNGLCREATETRANSFORMFEEDBACKSPROC_MT)cmgr->getProcAddress("glCreateTransformFeedbacks");
+	if (!TransformFeedbackBufferBase) TransformFeedbackBufferBase = (PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC_MT)cmgr->getProcAddress("glTransformFeedbackBufferBase");
+	if (!TransformFeedbackBufferRange) TransformFeedbackBufferRange = (PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC_MT)cmgr->getProcAddress("glTransformFeedbackBufferRange");
+	if (!GetTransformFeedbackiv) GetTransformFeedbackiv = (PFNGLGETTRANSFORMFEEDBACKIVPROC_MT)cmgr->getProcAddress("glGetTransformFeedbackiv");
+	if (!CreateBuffers) CreateBuffers = (PFNGLCREATEBUFFERSPROC_MT)cmgr->getProcAddress("glCreateBuffers");
+	if (!NamedBufferStorage) NamedBufferStorage = (PFNGLNAMEDBUFFERSTORAGEPROC_MT)cmgr->getProcAddress("glNamedBufferStorage");
+	if (!NamedBufferData) NamedBufferData = (PFNGLNAMEDBUFFERDATAPROC_MT)cmgr->getProcAddress("glNamedBufferData");
+	if (!NamedBufferSubData) NamedBufferSubData = (PFNGLNAMEDBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glNamedBufferSubData");
+	if (!CopyNamedBufferSubData) CopyNamedBufferSubData = (PFNGLCOPYNAMEDBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glCopyNamedBufferSubData");
+	if (!ClearNamedBufferData) ClearNamedBufferData = (PFNGLCLEARNAMEDBUFFERDATAPROC_MT)cmgr->getProcAddress("glClearNamedBufferData");
+	if (!ClearNamedBufferSubData) ClearNamedBufferSubData = (PFNGLCLEARNAMEDBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glClearNamedBufferSubData");
+	if (!MapNamedBuffer) MapNamedBuffer = (PFNGLMAPNAMEDBUFFERPROC_MT)cmgr->getProcAddress("glMapNamedBuffer");
+	if (!MapNamedBufferRange) MapNamedBufferRange = (PFNGLMAPNAMEDBUFFERRANGEPROC_MT)cmgr->getProcAddress("glMapNamedBufferRange");
+	if (!UnmapNamedBuffer) UnmapNamedBuffer = (PFNGLUNMAPNAMEDBUFFERPROC_MT)cmgr->getProcAddress("glUnmapNamedBuffer");
+	if (!FlushMappedNamedBufferRange) FlushMappedNamedBufferRange = (PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC_MT)cmgr->getProcAddress("glFlushMappedNamedBufferRange");
+	if (!GetNamedBufferParameteriv) GetNamedBufferParameteriv = (PFNGLGETNAMEDBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetNamedBufferParameteriv");
+	if (!GetNamedBufferParameteri64v) GetNamedBufferParameteri64v = (PFNGLGETNAMEDBUFFERPARAMETERI64VPROC_MT)cmgr->getProcAddress("glGetNamedBufferParameteri64v");
+	if (!GetNamedBufferPointerv) GetNamedBufferPointerv = (PFNGLGETNAMEDBUFFERPOINTERVPROC_MT)cmgr->getProcAddress("glGetNamedBufferPointerv");
+	if (!GetNamedBufferSubData) GetNamedBufferSubData = (PFNGLGETNAMEDBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glGetNamedBufferSubData");
+	if (!CreateFramebuffers) CreateFramebuffers = (PFNGLCREATEFRAMEBUFFERSPROC_MT)cmgr->getProcAddress("glCreateFramebuffers");
+	if (!NamedFramebufferRenderbuffer) NamedFramebufferRenderbuffer = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC_MT)cmgr->getProcAddress("glNamedFramebufferRenderbuffer");
+	if (!NamedFramebufferParameteri) NamedFramebufferParameteri = (PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC_MT)cmgr->getProcAddress("glNamedFramebufferParameteri");
+	if (!NamedFramebufferTexture) NamedFramebufferTexture = (PFNGLNAMEDFRAMEBUFFERTEXTUREPROC_MT)cmgr->getProcAddress("glNamedFramebufferTexture");
+	if (!NamedFramebufferTextureLayer) NamedFramebufferTextureLayer = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC_MT)cmgr->getProcAddress("glNamedFramebufferTextureLayer");
+	if (!NamedFramebufferDrawBuffer) NamedFramebufferDrawBuffer = (PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC_MT)cmgr->getProcAddress("glNamedFramebufferDrawBuffer");
+	if (!NamedFramebufferDrawBuffers) NamedFramebufferDrawBuffers = (PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC_MT)cmgr->getProcAddress("glNamedFramebufferDrawBuffers");
+	if (!NamedFramebufferReadBuffer) NamedFramebufferReadBuffer = (PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC_MT)cmgr->getProcAddress("glNamedFramebufferReadBuffer");
+	if (!InvalidateNamedFramebufferData) InvalidateNamedFramebufferData = (PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC_MT)cmgr->getProcAddress("glInvalidateNamedFramebufferData");
+	if (!InvalidateNamedFramebufferSubData) InvalidateNamedFramebufferSubData = (PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC_MT)cmgr->getProcAddress("glInvalidateNamedFramebufferSubData");
+	if (!ClearNamedFramebufferiv) ClearNamedFramebufferiv = (PFNGLCLEARNAMEDFRAMEBUFFERIVPROC_MT)cmgr->getProcAddress("glClearNamedFramebufferiv");
+	if (!ClearNamedFramebufferuiv) ClearNamedFramebufferuiv = (PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC_MT)cmgr->getProcAddress("glClearNamedFramebufferuiv");
+	if (!ClearNamedFramebufferfv) ClearNamedFramebufferfv = (PFNGLCLEARNAMEDFRAMEBUFFERFVPROC_MT)cmgr->getProcAddress("glClearNamedFramebufferfv");
+	if (!ClearNamedFramebufferfi) ClearNamedFramebufferfi = (PFNGLCLEARNAMEDFRAMEBUFFERFIPROC_MT)cmgr->getProcAddress("glClearNamedFramebufferfi");
+	if (!BlitNamedFramebuffer) BlitNamedFramebuffer = (PFNGLBLITNAMEDFRAMEBUFFERPROC_MT)cmgr->getProcAddress("glBlitNamedFramebuffer");
+	if (!CheckNamedFramebufferStatus) CheckNamedFramebufferStatus = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC_MT)cmgr->getProcAddress("glCheckNamedFramebufferStatus");
+	if (!GetNamedFramebufferParameteriv) GetNamedFramebufferParameteriv = (PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetNamedFramebufferParameteriv");
+	if (!GetNamedFramebufferAttachmentParameteriv) GetNamedFramebufferAttachmentParameteriv = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetNamedFramebufferAttachmentParameteriv");
+	if (!CreateRenderbuffers) CreateRenderbuffers = (PFNGLCREATERENDERBUFFERSPROC_MT)cmgr->getProcAddress("glCreateRenderbuffers");
+	if (!NamedRenderbufferStorage) NamedRenderbufferStorage = (PFNGLNAMEDRENDERBUFFERSTORAGEPROC_MT)cmgr->getProcAddress("glNamedRenderbufferStorage");
+	if (!NamedRenderbufferStorageMultisample) NamedRenderbufferStorageMultisample = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC_MT)cmgr->getProcAddress("glNamedRenderbufferStorageMultisample");
+	if (!GetNamedRenderbufferParameteriv) GetNamedRenderbufferParameteriv = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetNamedRenderbufferParameteriv");
+	if (!CreateTextures) CreateTextures = (PFNGLCREATETEXTURESPROC_MT)cmgr->getProcAddress("glCreateTextures");
+	if (!TextureBuffer) TextureBuffer = (PFNGLTEXTUREBUFFERPROC_MT)cmgr->getProcAddress("glTextureBuffer");
+	if (!TextureBufferRange) TextureBufferRange = (PFNGLTEXTUREBUFFERRANGEPROC_MT)cmgr->getProcAddress("glTextureBufferRange");
+	if (!TextureStorage1D) TextureStorage1D = (PFNGLTEXTURESTORAGE1DPROC_MT)cmgr->getProcAddress("glTextureStorage1D");
+	if (!TextureStorage2D) TextureStorage2D = (PFNGLTEXTURESTORAGE2DPROC_MT)cmgr->getProcAddress("glTextureStorage2D");
+	if (!TextureStorage3D) TextureStorage3D = (PFNGLTEXTURESTORAGE3DPROC_MT)cmgr->getProcAddress("glTextureStorage3D");
+	if (!TextureStorage2DMultisample) TextureStorage2DMultisample = (PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTextureStorage2DMultisample");
+	if (!TextureStorage3DMultisample) TextureStorage3DMultisample = (PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC_MT)cmgr->getProcAddress("glTextureStorage3DMultisample");
+	if (!TextureSubImage1D) TextureSubImage1D = (PFNGLTEXTURESUBIMAGE1DPROC_MT)cmgr->getProcAddress("glTextureSubImage1D");
+	if (!TextureSubImage2D) TextureSubImage2D = (PFNGLTEXTURESUBIMAGE2DPROC_MT)cmgr->getProcAddress("glTextureSubImage2D");
+	if (!TextureSubImage3D) TextureSubImage3D = (PFNGLTEXTURESUBIMAGE3DPROC_MT)cmgr->getProcAddress("glTextureSubImage3D");
+	if (!CompressedTextureSubImage1D) CompressedTextureSubImage1D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC_MT)cmgr->getProcAddress("glCompressedTextureSubImage1D");
+	if (!CompressedTextureSubImage2D) CompressedTextureSubImage2D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC_MT)cmgr->getProcAddress("glCompressedTextureSubImage2D");
+	if (!CompressedTextureSubImage3D) CompressedTextureSubImage3D = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC_MT)cmgr->getProcAddress("glCompressedTextureSubImage3D");
+	if (!CopyTextureSubImage1D) CopyTextureSubImage1D = (PFNGLCOPYTEXTURESUBIMAGE1DPROC_MT)cmgr->getProcAddress("glCopyTextureSubImage1D");
+	if (!CopyTextureSubImage2D) CopyTextureSubImage2D = (PFNGLCOPYTEXTURESUBIMAGE2DPROC_MT)cmgr->getProcAddress("glCopyTextureSubImage2D");
+	if (!CopyTextureSubImage3D) CopyTextureSubImage3D = (PFNGLCOPYTEXTURESUBIMAGE3DPROC_MT)cmgr->getProcAddress("glCopyTextureSubImage3D");
+	if (!TextureParameterf) TextureParameterf = (PFNGLTEXTUREPARAMETERFPROC_MT)cmgr->getProcAddress("glTextureParameterf");
+	if (!TextureParameterfv) TextureParameterfv = (PFNGLTEXTUREPARAMETERFVPROC_MT)cmgr->getProcAddress("glTextureParameterfv");
+	if (!TextureParameteri) TextureParameteri = (PFNGLTEXTUREPARAMETERIPROC_MT)cmgr->getProcAddress("glTextureParameteri");
+	if (!TextureParameterIiv) TextureParameterIiv = (PFNGLTEXTUREPARAMETERIIVPROC_MT)cmgr->getProcAddress("glTextureParameterIiv");
+	if (!TextureParameterIuiv) TextureParameterIuiv = (PFNGLTEXTUREPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glTextureParameterIuiv");
+	if (!TextureParameteriv) TextureParameteriv = (PFNGLTEXTUREPARAMETERIVPROC_MT)cmgr->getProcAddress("glTextureParameteriv");
+	if (!GenerateTextureMipmap) GenerateTextureMipmap = (PFNGLGENERATETEXTUREMIPMAPPROC_MT)cmgr->getProcAddress("glGenerateTextureMipmap");
+	if (!BindTextureUnit) BindTextureUnit = (PFNGLBINDTEXTUREUNITPROC_MT)cmgr->getProcAddress("glBindTextureUnit");
+	if (!GetTextureImage) GetTextureImage = (PFNGLGETTEXTUREIMAGEPROC_MT)cmgr->getProcAddress("glGetTextureImage");
+	if (!GetCompressedTextureImage) GetCompressedTextureImage = (PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC_MT)cmgr->getProcAddress("glGetCompressedTextureImage");
+	if (!GetTextureLevelParameterfv) GetTextureLevelParameterfv = (PFNGLGETTEXTURELEVELPARAMETERFVPROC_MT)cmgr->getProcAddress("glGetTextureLevelParameterfv");
+	if (!GetTextureLevelParameteriv) GetTextureLevelParameteriv = (PFNGLGETTEXTURELEVELPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetTextureLevelParameteriv");
+	if (!GetTextureParameterfv) GetTextureParameterfv = (PFNGLGETTEXTUREPARAMETERFVPROC_MT)cmgr->getProcAddress("glGetTextureParameterfv");
+	if (!GetTextureParameterIiv) GetTextureParameterIiv = (PFNGLGETTEXTUREPARAMETERIIVPROC_MT)cmgr->getProcAddress("glGetTextureParameterIiv");
+	if (!GetTextureParameterIuiv) GetTextureParameterIuiv = (PFNGLGETTEXTUREPARAMETERIUIVPROC_MT)cmgr->getProcAddress("glGetTextureParameterIuiv");
+	if (!GetTextureParameteriv) GetTextureParameteriv = (PFNGLGETTEXTUREPARAMETERIVPROC_MT)cmgr->getProcAddress("glGetTextureParameteriv");
+	if (!CreateVertexArrays) CreateVertexArrays = (PFNGLCREATEVERTEXARRAYSPROC_MT)cmgr->getProcAddress("glCreateVertexArrays");
+	if (!DisableVertexArrayAttrib) DisableVertexArrayAttrib = (PFNGLDISABLEVERTEXARRAYATTRIBPROC_MT)cmgr->getProcAddress("glDisableVertexArrayAttrib");
+	if (!EnableVertexArrayAttrib) EnableVertexArrayAttrib = (PFNGLENABLEVERTEXARRAYATTRIBPROC_MT)cmgr->getProcAddress("glEnableVertexArrayAttrib");
+	if (!VertexArrayElementBuffer) VertexArrayElementBuffer = (PFNGLVERTEXARRAYELEMENTBUFFERPROC_MT)cmgr->getProcAddress("glVertexArrayElementBuffer");
+	if (!VertexArrayVertexBuffer) VertexArrayVertexBuffer = (PFNGLVERTEXARRAYVERTEXBUFFERPROC_MT)cmgr->getProcAddress("glVertexArrayVertexBuffer");
+	if (!VertexArrayVertexBuffers) VertexArrayVertexBuffers = (PFNGLVERTEXARRAYVERTEXBUFFERSPROC_MT)cmgr->getProcAddress("glVertexArrayVertexBuffers");
+	if (!VertexArrayAttribBinding) VertexArrayAttribBinding = (PFNGLVERTEXARRAYATTRIBBINDINGPROC_MT)cmgr->getProcAddress("glVertexArrayAttribBinding");
+	if (!VertexArrayAttribFormat) VertexArrayAttribFormat = (PFNGLVERTEXARRAYATTRIBFORMATPROC_MT)cmgr->getProcAddress("glVertexArrayAttribFormat");
+	if (!VertexArrayAttribIFormat) VertexArrayAttribIFormat = (PFNGLVERTEXARRAYATTRIBIFORMATPROC_MT)cmgr->getProcAddress("glVertexArrayAttribIFormat");
+	if (!VertexArrayAttribLFormat) VertexArrayAttribLFormat = (PFNGLVERTEXARRAYATTRIBLFORMATPROC_MT)cmgr->getProcAddress("glVertexArrayAttribLFormat");
+	if (!VertexArrayBindingDivisor) VertexArrayBindingDivisor = (PFNGLVERTEXARRAYBINDINGDIVISORPROC_MT)cmgr->getProcAddress("glVertexArrayBindingDivisor");
+	if (!GetVertexArrayiv) GetVertexArrayiv = (PFNGLGETVERTEXARRAYIVPROC_MT)cmgr->getProcAddress("glGetVertexArrayiv");
+	if (!GetVertexArrayIndexediv) GetVertexArrayIndexediv = (PFNGLGETVERTEXARRAYINDEXEDIVPROC_MT)cmgr->getProcAddress("glGetVertexArrayIndexediv");
+	if (!GetVertexArrayIndexed64iv) GetVertexArrayIndexed64iv = (PFNGLGETVERTEXARRAYINDEXED64IVPROC_MT)cmgr->getProcAddress("glGetVertexArrayIndexed64iv");
+	if (!CreateSamplers) CreateSamplers = (PFNGLCREATESAMPLERSPROC_MT)cmgr->getProcAddress("glCreateSamplers");
+	if (!CreateProgramPipelines) CreateProgramPipelines = (PFNGLCREATEPROGRAMPIPELINESPROC_MT)cmgr->getProcAddress("glCreateProgramPipelines");
+	if (!CreateQueries) CreateQueries = (PFNGLCREATEQUERIESPROC_MT)cmgr->getProcAddress("glCreateQueries");
+	if (!GetQueryBufferObjecti64v) GetQueryBufferObjecti64v = (PFNGLGETQUERYBUFFEROBJECTI64VPROC_MT)cmgr->getProcAddress("glGetQueryBufferObjecti64v");
+	if (!GetQueryBufferObjectiv) GetQueryBufferObjectiv = (PFNGLGETQUERYBUFFEROBJECTIVPROC_MT)cmgr->getProcAddress("glGetQueryBufferObjectiv");
+	if (!GetQueryBufferObjectui64v) GetQueryBufferObjectui64v = (PFNGLGETQUERYBUFFEROBJECTUI64VPROC_MT)cmgr->getProcAddress("glGetQueryBufferObjectui64v");
+	if (!GetQueryBufferObjectuiv) GetQueryBufferObjectuiv = (PFNGLGETQUERYBUFFEROBJECTUIVPROC_MT)cmgr->getProcAddress("glGetQueryBufferObjectuiv");
+	if (!MemoryBarrierByRegion) MemoryBarrierByRegion = (PFNGLMEMORYBARRIERBYREGIONPROC_MT)cmgr->getProcAddress("glMemoryBarrierByRegion");
+	if (!GetTextureSubImage) GetTextureSubImage = (PFNGLGETTEXTURESUBIMAGEPROC_MT)cmgr->getProcAddress("glGetTextureSubImage");
+	if (!GetCompressedTextureSubImage) GetCompressedTextureSubImage = (PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC_MT)cmgr->getProcAddress("glGetCompressedTextureSubImage");
+	if (!GetGraphicsResetStatus) GetGraphicsResetStatus = (PFNGLGETGRAPHICSRESETSTATUSPROC_MT)cmgr->getProcAddress("glGetGraphicsResetStatus");
+	if (!GetGraphicsResetStatus) GetGraphicsResetStatus = (PFNGLGETGRAPHICSRESETSTATUSPROC_MT)cmgr->getProcAddress("glGetGraphicsResetStatusARB");
+	if (!GetnCompressedTexImage) GetnCompressedTexImage = (PFNGLGETNCOMPRESSEDTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetnCompressedTexImage");
+	if (!GetnCompressedTexImage) GetnCompressedTexImage = (PFNGLGETNCOMPRESSEDTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetnCompressedTexImageARB");
+	if (!GetnTexImage) GetnTexImage = (PFNGLGETNTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetnTexImage");
+	if (!GetnTexImage) GetnTexImage = (PFNGLGETNTEXIMAGEPROC_MT)cmgr->getProcAddress("glGetnTexImageARB");
+	if (!GetnUniformdv) GetnUniformdv = (PFNGLGETNUNIFORMDVPROC_MT)cmgr->getProcAddress("glGetnUniformdv");
+	if (!GetnUniformdv) GetnUniformdv = (PFNGLGETNUNIFORMDVPROC_MT)cmgr->getProcAddress("glGetnUniformdvARB");
+	if (!GetnUniformfv) GetnUniformfv = (PFNGLGETNUNIFORMFVPROC_MT)cmgr->getProcAddress("glGetnUniformfv");
+	if (!GetnUniformfv) GetnUniformfv = (PFNGLGETNUNIFORMFVPROC_MT)cmgr->getProcAddress("glGetnUniformfvARB");
+	if (!GetnUniformiv) GetnUniformiv = (PFNGLGETNUNIFORMIVPROC_MT)cmgr->getProcAddress("glGetnUniformiv");
+	if (!GetnUniformiv) GetnUniformiv = (PFNGLGETNUNIFORMIVPROC_MT)cmgr->getProcAddress("glGetnUniformivARB");
+	if (!GetnUniformuiv) GetnUniformuiv = (PFNGLGETNUNIFORMUIVPROC_MT)cmgr->getProcAddress("glGetnUniformuiv");
+	if (!GetnUniformuiv) GetnUniformuiv = (PFNGLGETNUNIFORMUIVPROC_MT)cmgr->getProcAddress("glGetnUniformuivARB");
+	if (!ReadnPixels) ReadnPixels = (PFNGLREADNPIXELSPROC_MT)cmgr->getProcAddress("glReadnPixels");
+	if (!ReadnPixels) ReadnPixels = (PFNGLREADNPIXELSPROC_MT)cmgr->getProcAddress("glReadnPixelsARB");
+	if (!TextureBarrier) TextureBarrier = (PFNGLTEXTUREBARRIERPROC_MT)cmgr->getProcAddress("glTextureBarrier");
+	if (!SpecializeShader) SpecializeShader = (PFNGLSPECIALIZESHADERPROC_MT)cmgr->getProcAddress("glSpecializeShader");
+	if (!SpecializeShader) SpecializeShader = (PFNGLSPECIALIZESHADERPROC_MT)cmgr->getProcAddress("glSpecializeShaderARB");
+	if (!MultiDrawArraysIndirectCount) MultiDrawArraysIndirectCount = (PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC_MT)cmgr->getProcAddress("glMultiDrawArraysIndirectCount");
+	if (!MultiDrawArraysIndirectCount) MultiDrawArraysIndirectCount = (PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC_MT)cmgr->getProcAddress("glMultiDrawArraysIndirectCountARB");
+	if (!MultiDrawElementsIndirectCount) MultiDrawElementsIndirectCount = (PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC_MT)cmgr->getProcAddress("glMultiDrawElementsIndirectCount");
+	if (!MultiDrawElementsIndirectCount) MultiDrawElementsIndirectCount = (PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC_MT)cmgr->getProcAddress("glMultiDrawElementsIndirectCountARB");
+	if (!PolygonOffsetClamp) PolygonOffsetClamp = (PFNGLPOLYGONOFFSETCLAMPPROC_MT)cmgr->getProcAddress("glPolygonOffsetClamp");
+	if (!PrimitiveBoundingBox) PrimitiveBoundingBox = (PFNGLPRIMITIVEBOUNDINGBOXPROC_MT)cmgr->getProcAddress("glPrimitiveBoundingBoxARB");
+	if (!GetTextureHandle) GetTextureHandle = (PFNGLGETTEXTUREHANDLEPROC_MT)cmgr->getProcAddress("glGetTextureHandleARB");
+	if (!GetTextureSamplerHandle) GetTextureSamplerHandle = (PFNGLGETTEXTURESAMPLERHANDLEPROC_MT)cmgr->getProcAddress("glGetTextureSamplerHandleARB");
+	if (!MakeTextureHandleResident) MakeTextureHandleResident = (PFNGLMAKETEXTUREHANDLERESIDENTPROC_MT)cmgr->getProcAddress("glMakeTextureHandleResidentARB");
+	if (!MakeTextureHandleNonResident) MakeTextureHandleNonResident = (PFNGLMAKETEXTUREHANDLENONRESIDENTPROC_MT)cmgr->getProcAddress("glMakeTextureHandleNonResidentARB");
+	if (!GetImageHandle) GetImageHandle = (PFNGLGETIMAGEHANDLEPROC_MT)cmgr->getProcAddress("glGetImageHandleARB");
+	if (!MakeImageHandleResident) MakeImageHandleResident = (PFNGLMAKEIMAGEHANDLERESIDENTPROC_MT)cmgr->getProcAddress("glMakeImageHandleResidentARB");
+	if (!MakeImageHandleNonResident) MakeImageHandleNonResident = (PFNGLMAKEIMAGEHANDLENONRESIDENTPROC_MT)cmgr->getProcAddress("glMakeImageHandleNonResidentARB");
+	if (!UniformHandleui64) UniformHandleui64 = (PFNGLUNIFORMHANDLEUI64PROC_MT)cmgr->getProcAddress("glUniformHandleui64ARB");
+	if (!UniformHandleui64v) UniformHandleui64v = (PFNGLUNIFORMHANDLEUI64VPROC_MT)cmgr->getProcAddress("glUniformHandleui64vARB");
+	if (!ProgramUniformHandleui64) ProgramUniformHandleui64 = (PFNGLPROGRAMUNIFORMHANDLEUI64PROC_MT)cmgr->getProcAddress("glProgramUniformHandleui64ARB");
+	if (!ProgramUniformHandleui64v) ProgramUniformHandleui64v = (PFNGLPROGRAMUNIFORMHANDLEUI64VPROC_MT)cmgr->getProcAddress("glProgramUniformHandleui64vARB");
+	if (!IsTextureHandleResident) IsTextureHandleResident = (PFNGLISTEXTUREHANDLERESIDENTPROC_MT)cmgr->getProcAddress("glIsTextureHandleResidentARB");
+	if (!IsImageHandleResident) IsImageHandleResident = (PFNGLISIMAGEHANDLERESIDENTPROC_MT)cmgr->getProcAddress("glIsImageHandleResidentARB");
+	if (!VertexAttribL1ui64) VertexAttribL1ui64 = (PFNGLVERTEXATTRIBL1UI64PROC_MT)cmgr->getProcAddress("glVertexAttribL1ui64ARB");
+	if (!VertexAttribL1ui64v) VertexAttribL1ui64v = (PFNGLVERTEXATTRIBL1UI64VPROC_MT)cmgr->getProcAddress("glVertexAttribL1ui64vARB");
+	if (!GetVertexAttribLui64v) GetVertexAttribLui64v = (PFNGLGETVERTEXATTRIBLUI64VPROC_MT)cmgr->getProcAddress("glGetVertexAttribLui64vARB");
+	if (!CreateSyncFromCLevent) CreateSyncFromCLevent = (PFNGLCREATESYNCFROMCLEVENTPROC_MT)cmgr->getProcAddress("glCreateSyncFromCLeventARB");
+	if (!DispatchComputeGroupSize) DispatchComputeGroupSize = (PFNGLDISPATCHCOMPUTEGROUPSIZEPROC_MT)cmgr->getProcAddress("glDispatchComputeGroupSizeARB");
+	if (!FramebufferTextureFace) FramebufferTextureFace = (PFNGLFRAMEBUFFERTEXTUREFACEPROC_MT)cmgr->getProcAddress("glFramebufferTextureFaceARB");
+	if (!Uniform1i64) Uniform1i64 = (PFNGLUNIFORM1I64PROC_MT)cmgr->getProcAddress("glUniform1i64ARB");
+	if (!Uniform2i64) Uniform2i64 = (PFNGLUNIFORM2I64PROC_MT)cmgr->getProcAddress("glUniform2i64ARB");
+	if (!Uniform3i64) Uniform3i64 = (PFNGLUNIFORM3I64PROC_MT)cmgr->getProcAddress("glUniform3i64ARB");
+	if (!Uniform4i64) Uniform4i64 = (PFNGLUNIFORM4I64PROC_MT)cmgr->getProcAddress("glUniform4i64ARB");
+	if (!Uniform1i64v) Uniform1i64v = (PFNGLUNIFORM1I64VPROC_MT)cmgr->getProcAddress("glUniform1i64vARB");
+	if (!Uniform2i64v) Uniform2i64v = (PFNGLUNIFORM2I64VPROC_MT)cmgr->getProcAddress("glUniform2i64vARB");
+	if (!Uniform3i64v) Uniform3i64v = (PFNGLUNIFORM3I64VPROC_MT)cmgr->getProcAddress("glUniform3i64vARB");
+	if (!Uniform4i64v) Uniform4i64v = (PFNGLUNIFORM4I64VPROC_MT)cmgr->getProcAddress("glUniform4i64vARB");
+	if (!Uniform1ui64) Uniform1ui64 = (PFNGLUNIFORM1UI64PROC_MT)cmgr->getProcAddress("glUniform1ui64ARB");
+	if (!Uniform2ui64) Uniform2ui64 = (PFNGLUNIFORM2UI64PROC_MT)cmgr->getProcAddress("glUniform2ui64ARB");
+	if (!Uniform3ui64) Uniform3ui64 = (PFNGLUNIFORM3UI64PROC_MT)cmgr->getProcAddress("glUniform3ui64ARB");
+	if (!Uniform4ui64) Uniform4ui64 = (PFNGLUNIFORM4UI64PROC_MT)cmgr->getProcAddress("glUniform4ui64ARB");
+	if (!Uniform1ui64v) Uniform1ui64v = (PFNGLUNIFORM1UI64VPROC_MT)cmgr->getProcAddress("glUniform1ui64vARB");
+	if (!Uniform2ui64v) Uniform2ui64v = (PFNGLUNIFORM2UI64VPROC_MT)cmgr->getProcAddress("glUniform2ui64vARB");
+	if (!Uniform3ui64v) Uniform3ui64v = (PFNGLUNIFORM3UI64VPROC_MT)cmgr->getProcAddress("glUniform3ui64vARB");
+	if (!Uniform4ui64v) Uniform4ui64v = (PFNGLUNIFORM4UI64VPROC_MT)cmgr->getProcAddress("glUniform4ui64vARB");
+	if (!GetUniformi64v) GetUniformi64v = (PFNGLGETUNIFORMI64VPROC_MT)cmgr->getProcAddress("glGetUniformi64vARB");
+	if (!GetUniformui64v) GetUniformui64v = (PFNGLGETUNIFORMUI64VPROC_MT)cmgr->getProcAddress("glGetUniformui64vARB");
+	if (!GetnUniformi64v) GetnUniformi64v = (PFNGLGETNUNIFORMI64VPROC_MT)cmgr->getProcAddress("glGetnUniformi64vARB");
+	if (!GetnUniformui64v) GetnUniformui64v = (PFNGLGETNUNIFORMUI64VPROC_MT)cmgr->getProcAddress("glGetnUniformui64vARB");
+	if (!ProgramUniform1i64) ProgramUniform1i64 = (PFNGLPROGRAMUNIFORM1I64PROC_MT)cmgr->getProcAddress("glProgramUniform1i64ARB");
+	if (!ProgramUniform2i64) ProgramUniform2i64 = (PFNGLPROGRAMUNIFORM2I64PROC_MT)cmgr->getProcAddress("glProgramUniform2i64ARB");
+	if (!ProgramUniform3i64) ProgramUniform3i64 = (PFNGLPROGRAMUNIFORM3I64PROC_MT)cmgr->getProcAddress("glProgramUniform3i64ARB");
+	if (!ProgramUniform4i64) ProgramUniform4i64 = (PFNGLPROGRAMUNIFORM4I64PROC_MT)cmgr->getProcAddress("glProgramUniform4i64ARB");
+	if (!ProgramUniform1i64v) ProgramUniform1i64v = (PFNGLPROGRAMUNIFORM1I64VPROC_MT)cmgr->getProcAddress("glProgramUniform1i64vARB");
+	if (!ProgramUniform2i64v) ProgramUniform2i64v = (PFNGLPROGRAMUNIFORM2I64VPROC_MT)cmgr->getProcAddress("glProgramUniform2i64vARB");
+	if (!ProgramUniform3i64v) ProgramUniform3i64v = (PFNGLPROGRAMUNIFORM3I64VPROC_MT)cmgr->getProcAddress("glProgramUniform3i64vARB");
+	if (!ProgramUniform4i64v) ProgramUniform4i64v = (PFNGLPROGRAMUNIFORM4I64VPROC_MT)cmgr->getProcAddress("glProgramUniform4i64vARB");
+	if (!ProgramUniform1ui64) ProgramUniform1ui64 = (PFNGLPROGRAMUNIFORM1UI64PROC_MT)cmgr->getProcAddress("glProgramUniform1ui64ARB");
+	if (!ProgramUniform2ui64) ProgramUniform2ui64 = (PFNGLPROGRAMUNIFORM2UI64PROC_MT)cmgr->getProcAddress("glProgramUniform2ui64ARB");
+	if (!ProgramUniform3ui64) ProgramUniform3ui64 = (PFNGLPROGRAMUNIFORM3UI64PROC_MT)cmgr->getProcAddress("glProgramUniform3ui64ARB");
+	if (!ProgramUniform4ui64) ProgramUniform4ui64 = (PFNGLPROGRAMUNIFORM4UI64PROC_MT)cmgr->getProcAddress("glProgramUniform4ui64ARB");
+	if (!ProgramUniform1ui64v) ProgramUniform1ui64v = (PFNGLPROGRAMUNIFORM1UI64VPROC_MT)cmgr->getProcAddress("glProgramUniform1ui64vARB");
+	if (!ProgramUniform2ui64v) ProgramUniform2ui64v = (PFNGLPROGRAMUNIFORM2UI64VPROC_MT)cmgr->getProcAddress("glProgramUniform2ui64vARB");
+	if (!ProgramUniform3ui64v) ProgramUniform3ui64v = (PFNGLPROGRAMUNIFORM3UI64VPROC_MT)cmgr->getProcAddress("glProgramUniform3ui64vARB");
+	if (!ProgramUniform4ui64v) ProgramUniform4ui64v = (PFNGLPROGRAMUNIFORM4UI64VPROC_MT)cmgr->getProcAddress("glProgramUniform4ui64vARB");
+	if (!MaxShaderCompilerThreads) MaxShaderCompilerThreads = (PFNGLMAXSHADERCOMPILERTHREADSPROC_MT)cmgr->getProcAddress("glMaxShaderCompilerThreadsARB");
+	if (!MaxShaderCompilerThreads) MaxShaderCompilerThreads = (PFNGLMAXSHADERCOMPILERTHREADSPROC_MT)cmgr->getProcAddress("glMaxShaderCompilerThreadsKHR");
+	if (!FramebufferSampleLocationsfv) FramebufferSampleLocationsfv = (PFNGLFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT)cmgr->getProcAddress("glFramebufferSampleLocationsfvARB");
+	if (!NamedFramebufferSampleLocationsfv) NamedFramebufferSampleLocationsfv = (PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVPROC_MT)cmgr->getProcAddress("glNamedFramebufferSampleLocationsfvARB");
+	if (!EvaluateDepthValues) EvaluateDepthValues = (PFNGLEVALUATEDEPTHVALUESPROC_MT)cmgr->getProcAddress("glEvaluateDepthValuesARB");
+	if (!NamedString) NamedString = (PFNGLNAMEDSTRINGPROC_MT)cmgr->getProcAddress("glNamedStringARB");
+	if (!DeleteNamedString) DeleteNamedString = (PFNGLDELETENAMEDSTRINGPROC_MT)cmgr->getProcAddress("glDeleteNamedStringARB");
+	if (!CompileShaderInclude) CompileShaderInclude = (PFNGLCOMPILESHADERINCLUDEPROC_MT)cmgr->getProcAddress("glCompileShaderIncludeARB");
+	if (!IsNamedString) IsNamedString = (PFNGLISNAMEDSTRINGPROC_MT)cmgr->getProcAddress("glIsNamedStringARB");
+	if (!GetNamedString) GetNamedString = (PFNGLGETNAMEDSTRINGPROC_MT)cmgr->getProcAddress("glGetNamedStringARB");
+	if (!GetNamedStringiv) GetNamedStringiv = (PFNGLGETNAMEDSTRINGIVPROC_MT)cmgr->getProcAddress("glGetNamedStringivARB");
+	if (!BufferPageCommitment) BufferPageCommitment = (PFNGLBUFFERPAGECOMMITMENTPROC_MT)cmgr->getProcAddress("glBufferPageCommitmentARB");
+	if (!NamedBufferPageCommitment) NamedBufferPageCommitment = (PFNGLNAMEDBUFFERPAGECOMMITMENTPROC_MT)cmgr->getProcAddress("glNamedBufferPageCommitmentARB");
+	if (!TexPageCommitment) TexPageCommitment = (PFNGLTEXPAGECOMMITMENTPROC_MT)cmgr->getProcAddress("glTexPageCommitmentARB");
+
+	// OpenGL 3 way to enumerate extensions
+	GLint ext_count = 0;
+	GetIntegerv(NUM_EXTENSIONS, &ext_count);
+	extensions.reserve(ext_count);
+	for (GLint k = 0; k < ext_count; k++) {
+		auto tmp = GetStringi(EXTENSIONS, k);
+		if (tmp)
+			extensions.emplace((char*)tmp);
+	}
+	if (!extensions.empty())
+		return;
+
+	// OpenGL 2 / ES 2 way to enumerate extensions
+	auto ext_str = GetString(EXTENSIONS);
+	if (!ext_str)
+		return;
+	// get the extension string, chop it up
+	std::stringstream ext_ss((char*)ext_str);
+	std::string tmp;
+	while (std::getline(ext_ss, tmp, ' '))
+		extensions.emplace(tmp);
+
+}
diff --git a/irr/src/os.cpp b/irr/src/os.cpp
new file mode 100644
index 000000000..96be8dd63
--- /dev/null
+++ b/irr/src/os.cpp
@@ -0,0 +1,379 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "os.h"
+#include "irrString.h"
+#include "irrMath.h"
+
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#include <SDL_endian.h>
+#define bswap_16(X) SDL_Swap16(X)
+#define bswap_32(X) SDL_Swap32(X)
+#define bswap_64(X) SDL_Swap64(X)
+#elif defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)
+#include <cstdlib>
+#define bswap_16(X) _byteswap_ushort(X)
+#define bswap_32(X) _byteswap_ulong(X)
+#define bswap_64(X) _byteswap_uint64(X)
+#elif defined(_IRR_OSX_PLATFORM_)
+#include <libkern/OSByteOrder.h>
+#define bswap_16(X) OSReadSwapInt16(&X, 0)
+#define bswap_32(X) OSReadSwapInt32(&X, 0)
+#define bswap_64(X) OSReadSwapInt64(&X, 0)
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_16(X) bswap16(X)
+#define bswap_32(X) bswap32(X)
+#define bswap_64(X) bswap64(X)
+#elif defined(__OpenBSD__)
+#include <endian.h>
+#define bswap_16(X) letoh16(X)
+#define bswap_32(X) letoh32(X)
+#define bswap_64(X) letoh64(X)
+#elif !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__PPC__) && !defined(_IRR_WINDOWS_API_)
+#include <byteswap.h>
+#else
+#define bswap_16(X) ((((X) & 0xFF) << 8) | (((X) & 0xFF00) >> 8))
+#define bswap_32(X) ((((X) & 0x000000FF) << 24) | (((X) & 0xFF000000) >> 24) | (((X) & 0x0000FF00) << 8) | (((X) & 0x00FF0000) >> 8))
+#define bswap_64(X) ((((X) & 0x00000000000000FF) << 56) | (((X) & 0xFF00000000000000) >> 56) | (((X) & 0x000000000000FF00) << 40) | (((X) & 0x00FF000000000000) >> 40) | (((X) & 0x0000000000FF0000) << 24) | (((X) & 0x0000FF0000000000) >> 24) | (((X) & 0x00000000FF000000) << 8) | (((X) & 0x000000FF00000000) >> 8))
+#endif
+
+namespace irr
+{
+namespace os
+{
+u16 Byteswap::byteswap(u16 num)
+{
+	return bswap_16(num);
+}
+s16 Byteswap::byteswap(s16 num)
+{
+	return bswap_16(num);
+}
+u32 Byteswap::byteswap(u32 num)
+{
+	return bswap_32(num);
+}
+s32 Byteswap::byteswap(s32 num)
+{
+	return bswap_32(num);
+}
+u64 Byteswap::byteswap(u64 num)
+{
+	return bswap_64(num);
+}
+s64 Byteswap::byteswap(s64 num)
+{
+	return bswap_64(num);
+}
+f32 Byteswap::byteswap(f32 num)
+{
+	u32 tmp = IR(num);
+	tmp = bswap_32(tmp);
+	return (FR(tmp));
+}
+}
+}
+
+#if defined(_IRR_WINDOWS_API_)
+// ----------------------------------------------------------------
+// Windows specific functions
+// ----------------------------------------------------------------
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <ctime>
+
+namespace irr
+{
+namespace os
+{
+//! prints a debuginfo string
+void Printer::print(const c8 *message, ELOG_LEVEL ll)
+{
+	core::stringc tmp(message);
+	tmp += "\n";
+	OutputDebugStringA(tmp.c_str());
+	printf("%s", tmp.c_str());
+}
+
+static LARGE_INTEGER HighPerformanceFreq;
+static BOOL HighPerformanceTimerSupport = FALSE;
+
+void Timer::initTimer()
+{
+	HighPerformanceTimerSupport = QueryPerformanceFrequency(&HighPerformanceFreq);
+	initVirtualTimer();
+}
+
+u32 Timer::getRealTime()
+{
+	if (HighPerformanceTimerSupport) {
+		LARGE_INTEGER nTime;
+		BOOL queriedOK = QueryPerformanceCounter(&nTime);
+
+		if (queriedOK)
+			return u32((nTime.QuadPart) * 1000 / HighPerformanceFreq.QuadPart);
+	}
+
+	return GetTickCount();
+}
+
+} // end namespace os
+
+#elif defined(_IRR_ANDROID_PLATFORM_)
+
+// ----------------------------------------------------------------
+// Android version
+// ----------------------------------------------------------------
+
+#include <android/log.h>
+
+namespace irr
+{
+namespace os
+{
+
+//! prints a debuginfo string
+void Printer::print(const c8 *message, ELOG_LEVEL ll)
+{
+	android_LogPriority LogLevel = ANDROID_LOG_UNKNOWN;
+
+	switch (ll) {
+	case ELL_DEBUG:
+		LogLevel = ANDROID_LOG_DEBUG;
+		break;
+	case ELL_INFORMATION:
+		LogLevel = ANDROID_LOG_INFO;
+		break;
+	case ELL_WARNING:
+		LogLevel = ANDROID_LOG_WARN;
+		break;
+	case ELL_ERROR:
+		LogLevel = ANDROID_LOG_ERROR;
+		break;
+	default: // ELL_NONE
+		LogLevel = ANDROID_LOG_VERBOSE;
+		break;
+	}
+
+	// Android logcat restricts log-output and cuts the rest of the message away. But we want it all.
+	// On my device max-len is 1023 (+ 0 byte). Some websites claim a limit of 4096 so maybe different numbers on different devices.
+	const size_t maxLogLen = 1023;
+	size_t msgLen = strlen(message);
+	size_t start = 0;
+	while (msgLen - start > maxLogLen) {
+		__android_log_print(LogLevel, "Irrlicht", "%.*s\n", maxLogLen, &message[start]);
+		start += maxLogLen;
+	}
+	__android_log_print(LogLevel, "Irrlicht", "%s\n", &message[start]);
+}
+
+void Timer::initTimer()
+{
+	initVirtualTimer();
+}
+
+u32 Timer::getRealTime()
+{
+	timeval tv;
+	gettimeofday(&tv, 0);
+	return (u32)(tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+}
+} // end namespace os
+
+#elif defined(_IRR_EMSCRIPTEN_PLATFORM_)
+
+// ----------------------------------------------------------------
+// emscripten version
+// ----------------------------------------------------------------
+
+#include <emscripten.h>
+#include <ctime>
+#include <sys/time.h>
+
+namespace irr
+{
+namespace os
+{
+
+//! prints a debuginfo string
+void Printer::print(const c8 *message, ELOG_LEVEL ll)
+{
+	int log_level;
+	switch (ll) {
+	case ELL_DEBUG:
+		log_level = 0;
+		break;
+	case ELL_INFORMATION:
+		log_level = 0;
+		break;
+	case ELL_WARNING:
+		log_level = EM_LOG_WARN;
+		break;
+	case ELL_ERROR:
+		log_level = EM_LOG_ERROR;
+		break;
+	default: // ELL_NONE
+		log_level = 0;
+		break;
+	}
+	emscripten_log(log_level, "%s", message); // Note: not adding \n as emscripten_log seems to do that already.
+}
+
+void Timer::initTimer()
+{
+	initVirtualTimer();
+}
+
+u32 Timer::getRealTime()
+{
+	double time = emscripten_get_now();
+	return (u32)(time);
+}
+} // end namespace os
+
+#else
+
+// ----------------------------------------------------------------
+// linux/ansi version
+// ----------------------------------------------------------------
+
+#include <cstdio>
+#include <ctime>
+#include <sys/time.h>
+
+namespace irr
+{
+namespace os
+{
+
+//! prints a debuginfo string
+void Printer::print(const c8 *message, ELOG_LEVEL ll)
+{
+	printf("%s\n", message);
+}
+
+void Timer::initTimer()
+{
+	initVirtualTimer();
+}
+
+u32 Timer::getRealTime()
+{
+	timeval tv;
+	gettimeofday(&tv, 0);
+	return (u32)(tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+}
+} // end namespace os
+
+#endif // end linux / emscripten / android / windows
+
+namespace os
+{
+// The platform independent implementation of the printer
+ILogger *Printer::Logger = 0;
+
+void Printer::log(const c8 *message, ELOG_LEVEL ll)
+{
+	if (Logger)
+		Logger->log(message, ll);
+}
+
+void Printer::log(const c8 *message, const c8 *hint, ELOG_LEVEL ll)
+{
+	if (Logger)
+		Logger->log(message, hint, ll);
+}
+
+void Printer::log(const c8 *message, const io::path &hint, ELOG_LEVEL ll)
+{
+	if (Logger)
+		Logger->log(message, hint.c_str(), ll);
+}
+
+// ------------------------------------------------------
+// virtual timer implementation
+
+f32 Timer::VirtualTimerSpeed = 1.0f;
+s32 Timer::VirtualTimerStopCounter = 0;
+u32 Timer::LastVirtualTime = 0;
+u32 Timer::StartRealTime = 0;
+u32 Timer::StaticTime = 0;
+
+//! returns current virtual time
+u32 Timer::getTime()
+{
+	if (isStopped())
+		return LastVirtualTime;
+
+	return LastVirtualTime + (u32)((StaticTime - StartRealTime) * VirtualTimerSpeed);
+}
+
+//! ticks, advances the virtual timer
+void Timer::tick()
+{
+	StaticTime = getRealTime();
+}
+
+//! sets the current virtual time
+void Timer::setTime(u32 time)
+{
+	StaticTime = getRealTime();
+	LastVirtualTime = time;
+	StartRealTime = StaticTime;
+}
+
+//! stops the virtual timer
+void Timer::stopTimer()
+{
+	if (!isStopped()) {
+		// stop the virtual timer
+		LastVirtualTime = getTime();
+	}
+
+	--VirtualTimerStopCounter;
+}
+
+//! starts the virtual timer
+void Timer::startTimer()
+{
+	++VirtualTimerStopCounter;
+
+	if (!isStopped()) {
+		// restart virtual timer
+		setTime(LastVirtualTime);
+	}
+}
+
+//! sets the speed of the virtual timer
+void Timer::setSpeed(f32 speed)
+{
+	setTime(getTime());
+
+	VirtualTimerSpeed = speed;
+	if (VirtualTimerSpeed < 0.0f)
+		VirtualTimerSpeed = 0.0f;
+}
+
+//! gets the speed of the virtual timer
+f32 Timer::getSpeed()
+{
+	return VirtualTimerSpeed;
+}
+
+//! returns if the timer currently is stopped
+bool Timer::isStopped()
+{
+	return VirtualTimerStopCounter < 0;
+}
+
+void Timer::initVirtualTimer()
+{
+	StaticTime = getRealTime();
+	StartRealTime = StaticTime;
+}
+
+} // end namespace os
+} // end namespace irr
diff --git a/irr/src/os.h b/irr/src/os.h
new file mode 100644
index 000000000..fcbaeddd5
--- /dev/null
+++ b/irr/src/os.h
@@ -0,0 +1,91 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include "irrTypes.h"
+#include "irrString.h"
+#include "path.h"
+#include "ILogger.h"
+#include "ITimer.h"
+
+namespace irr
+{
+
+namespace os
+{
+class Byteswap
+{
+public:
+	static u16 byteswap(u16 num);
+	static s16 byteswap(s16 num);
+	static u32 byteswap(u32 num);
+	static s32 byteswap(s32 num);
+	static u64 byteswap(u64 num);
+	static s64 byteswap(s64 num);
+	static f32 byteswap(f32 num);
+	// prevent accidental swapping of chars
+	static inline u8 byteswap(u8 num) { return num; }
+	static inline c8 byteswap(c8 num) { return num; }
+};
+
+class Printer
+{
+public:
+	// prints out a string to the console out stdout or debug log or whatever
+	static void print(const c8 *message, ELOG_LEVEL ll = ELL_INFORMATION);
+	static void log(const c8 *message, ELOG_LEVEL ll = ELL_INFORMATION);
+	static void log(const wchar_t *message, ELOG_LEVEL ll = ELL_INFORMATION);
+
+	// The string ": " is added between message and hint
+	static void log(const c8 *message, const c8 *hint, ELOG_LEVEL ll = ELL_INFORMATION);
+	static void log(const c8 *message, const io::path &hint, ELOG_LEVEL ll = ELL_INFORMATION);
+	static ILogger *Logger;
+};
+
+class Timer
+{
+public:
+	//! returns the current time in milliseconds
+	static u32 getTime();
+
+	//! initializes the real timer
+	static void initTimer();
+
+	//! sets the current virtual (game) time
+	static void setTime(u32 time);
+
+	//! stops the virtual (game) timer
+	static void stopTimer();
+
+	//! starts the game timer
+	static void startTimer();
+
+	//! sets the speed of the virtual timer
+	static void setSpeed(f32 speed);
+
+	//! gets the speed of the virtual timer
+	static f32 getSpeed();
+
+	//! returns if the timer currently is stopped
+	static bool isStopped();
+
+	//! makes the virtual timer update the time value based on the real time
+	static void tick();
+
+	//! returns the current real time in milliseconds
+	static u32 getRealTime();
+
+private:
+	static void initVirtualTimer();
+
+	static f32 VirtualTimerSpeed;
+	static s32 VirtualTimerStopCounter;
+	static u32 StartRealTime;
+	static u32 LastVirtualTime;
+	static u32 StaticTime;
+};
+
+} // end namespace os
+} // end namespace irr
diff --git a/irr/src/vendor/gl.h b/irr/src/vendor/gl.h
new file mode 100644
index 000000000..d1aae08ea
--- /dev/null
+++ b/irr/src/vendor/gl.h
@@ -0,0 +1,2098 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __gl_h_
+#define __gl_h_
+
+/**********************************************************************
+ * Begin system-specific stuff.
+ */
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if defined(__WIN32__) && !defined(__CYGWIN__)
+#  define GLAPI extern
+#  if !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+     /* Win32 but not WinCE */
+#    define GLAPIENTRY __stdcall
+#  else
+#    define GLAPIENTRY
+#  endif
+#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
+#  define GLAPI extern
+#  define GLAPIENTRY __stdcall
+#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#  define GLAPI __attribute__((visibility("default")))
+#  define GLAPIENTRY
+#endif /* WIN32 && !CYGWIN */
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY GLAPIENTRY
+#endif
+
+/* "P" suffix to be used for a pointer to a function */
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define GL_VERSION_1_1   1
+#define GL_VERSION_1_2   1
+#define GL_VERSION_1_3   1
+#define GL_ARB_imaging   1
+
+
+/*
+ * Datatypes
+ */
+typedef unsigned int	GLenum;
+typedef unsigned char	GLboolean;
+typedef unsigned int	GLbitfield;
+typedef void		GLvoid;
+typedef signed char	GLbyte;		/* 1-byte signed */
+typedef short		GLshort;	/* 2-byte signed */
+typedef int		GLint;		/* 4-byte signed */
+typedef unsigned char	GLubyte;	/* 1-byte unsigned */
+typedef unsigned short	GLushort;	/* 2-byte unsigned */
+typedef unsigned int	GLuint;		/* 4-byte unsigned */
+typedef int		GLsizei;	/* 4-byte signed */
+typedef float		GLfloat;	/* single precision float */
+typedef float		GLclampf;	/* single precision float in [0,1] */
+typedef double		GLdouble;	/* double precision float */
+typedef double		GLclampd;	/* double precision float in [0,1] */
+
+
+
+/*
+ * Constants
+ */
+
+/* Boolean values */
+#define GL_FALSE				0
+#define GL_TRUE					1
+
+/* Data types */
+#define GL_BYTE					0x1400
+#define GL_UNSIGNED_BYTE			0x1401
+#define GL_SHORT				0x1402
+#define GL_UNSIGNED_SHORT			0x1403
+#define GL_INT					0x1404
+#define GL_UNSIGNED_INT				0x1405
+#define GL_FLOAT				0x1406
+#define GL_2_BYTES				0x1407
+#define GL_3_BYTES				0x1408
+#define GL_4_BYTES				0x1409
+#define GL_DOUBLE				0x140A
+
+/* Primitives */
+#define GL_POINTS				0x0000
+#define GL_LINES				0x0001
+#define GL_LINE_LOOP				0x0002
+#define GL_LINE_STRIP				0x0003
+#define GL_TRIANGLES				0x0004
+#define GL_TRIANGLE_STRIP			0x0005
+#define GL_TRIANGLE_FAN				0x0006
+#define GL_QUADS				0x0007
+#define GL_QUAD_STRIP				0x0008
+#define GL_POLYGON				0x0009
+
+/* Vertex Arrays */
+#define GL_VERTEX_ARRAY				0x8074
+#define GL_NORMAL_ARRAY				0x8075
+#define GL_COLOR_ARRAY				0x8076
+#define GL_INDEX_ARRAY				0x8077
+#define GL_TEXTURE_COORD_ARRAY			0x8078
+#define GL_EDGE_FLAG_ARRAY			0x8079
+#define GL_VERTEX_ARRAY_SIZE			0x807A
+#define GL_VERTEX_ARRAY_TYPE			0x807B
+#define GL_VERTEX_ARRAY_STRIDE			0x807C
+#define GL_NORMAL_ARRAY_TYPE			0x807E
+#define GL_NORMAL_ARRAY_STRIDE			0x807F
+#define GL_COLOR_ARRAY_SIZE			0x8081
+#define GL_COLOR_ARRAY_TYPE			0x8082
+#define GL_COLOR_ARRAY_STRIDE			0x8083
+#define GL_INDEX_ARRAY_TYPE			0x8085
+#define GL_INDEX_ARRAY_STRIDE			0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE		0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE		0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE		0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE		0x808C
+#define GL_VERTEX_ARRAY_POINTER			0x808E
+#define GL_NORMAL_ARRAY_POINTER			0x808F
+#define GL_COLOR_ARRAY_POINTER			0x8090
+#define GL_INDEX_ARRAY_POINTER			0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER		0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER		0x8093
+#define GL_V2F					0x2A20
+#define GL_V3F					0x2A21
+#define GL_C4UB_V2F				0x2A22
+#define GL_C4UB_V3F				0x2A23
+#define GL_C3F_V3F				0x2A24
+#define GL_N3F_V3F				0x2A25
+#define GL_C4F_N3F_V3F				0x2A26
+#define GL_T2F_V3F				0x2A27
+#define GL_T4F_V4F				0x2A28
+#define GL_T2F_C4UB_V3F				0x2A29
+#define GL_T2F_C3F_V3F				0x2A2A
+#define GL_T2F_N3F_V3F				0x2A2B
+#define GL_T2F_C4F_N3F_V3F			0x2A2C
+#define GL_T4F_C4F_N3F_V4F			0x2A2D
+
+/* Matrix Mode */
+#define GL_MATRIX_MODE				0x0BA0
+#define GL_MODELVIEW				0x1700
+#define GL_PROJECTION				0x1701
+#define GL_TEXTURE				0x1702
+
+/* Points */
+#define GL_POINT_SMOOTH				0x0B10
+#define GL_POINT_SIZE				0x0B11
+#define GL_POINT_SIZE_GRANULARITY 		0x0B13
+#define GL_POINT_SIZE_RANGE			0x0B12
+
+/* Lines */
+#define GL_LINE_SMOOTH				0x0B20
+#define GL_LINE_STIPPLE				0x0B24
+#define GL_LINE_STIPPLE_PATTERN			0x0B25
+#define GL_LINE_STIPPLE_REPEAT			0x0B26
+#define GL_LINE_WIDTH				0x0B21
+#define GL_LINE_WIDTH_GRANULARITY		0x0B23
+#define GL_LINE_WIDTH_RANGE			0x0B22
+
+/* Polygons */
+#define GL_POINT				0x1B00
+#define GL_LINE					0x1B01
+#define GL_FILL					0x1B02
+#define GL_CW					0x0900
+#define GL_CCW					0x0901
+#define GL_FRONT				0x0404
+#define GL_BACK					0x0405
+#define GL_POLYGON_MODE				0x0B40
+#define GL_POLYGON_SMOOTH			0x0B41
+#define GL_POLYGON_STIPPLE			0x0B42
+#define GL_EDGE_FLAG				0x0B43
+#define GL_CULL_FACE				0x0B44
+#define GL_CULL_FACE_MODE			0x0B45
+#define GL_FRONT_FACE				0x0B46
+#define GL_POLYGON_OFFSET_FACTOR		0x8038
+#define GL_POLYGON_OFFSET_UNITS			0x2A00
+#define GL_POLYGON_OFFSET_POINT			0x2A01
+#define GL_POLYGON_OFFSET_LINE			0x2A02
+#define GL_POLYGON_OFFSET_FILL			0x8037
+
+/* Display Lists */
+#define GL_COMPILE				0x1300
+#define GL_COMPILE_AND_EXECUTE			0x1301
+#define GL_LIST_BASE				0x0B32
+#define GL_LIST_INDEX				0x0B33
+#define GL_LIST_MODE				0x0B30
+
+/* Depth buffer */
+#define GL_NEVER				0x0200
+#define GL_LESS					0x0201
+#define GL_EQUAL				0x0202
+#define GL_LEQUAL				0x0203
+#define GL_GREATER				0x0204
+#define GL_NOTEQUAL				0x0205
+#define GL_GEQUAL				0x0206
+#define GL_ALWAYS				0x0207
+#define GL_DEPTH_TEST				0x0B71
+#define GL_DEPTH_BITS				0x0D56
+#define GL_DEPTH_CLEAR_VALUE			0x0B73
+#define GL_DEPTH_FUNC				0x0B74
+#define GL_DEPTH_RANGE				0x0B70
+#define GL_DEPTH_WRITEMASK			0x0B72
+#define GL_DEPTH_COMPONENT			0x1902
+
+/* Lighting */
+#define GL_LIGHTING				0x0B50
+#define GL_LIGHT0				0x4000
+#define GL_LIGHT1				0x4001
+#define GL_LIGHT2				0x4002
+#define GL_LIGHT3				0x4003
+#define GL_LIGHT4				0x4004
+#define GL_LIGHT5				0x4005
+#define GL_LIGHT6				0x4006
+#define GL_LIGHT7				0x4007
+#define GL_SPOT_EXPONENT			0x1205
+#define GL_SPOT_CUTOFF				0x1206
+#define GL_CONSTANT_ATTENUATION			0x1207
+#define GL_LINEAR_ATTENUATION			0x1208
+#define GL_QUADRATIC_ATTENUATION		0x1209
+#define GL_AMBIENT				0x1200
+#define GL_DIFFUSE				0x1201
+#define GL_SPECULAR				0x1202
+#define GL_SHININESS				0x1601
+#define GL_EMISSION				0x1600
+#define GL_POSITION				0x1203
+#define GL_SPOT_DIRECTION			0x1204
+#define GL_AMBIENT_AND_DIFFUSE			0x1602
+#define GL_COLOR_INDEXES			0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE			0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER		0x0B51
+#define GL_LIGHT_MODEL_AMBIENT			0x0B53
+#define GL_FRONT_AND_BACK			0x0408
+#define GL_SHADE_MODEL				0x0B54
+#define GL_FLAT					0x1D00
+#define GL_SMOOTH				0x1D01
+#define GL_COLOR_MATERIAL			0x0B57
+#define GL_COLOR_MATERIAL_FACE			0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER		0x0B56
+#define GL_NORMALIZE				0x0BA1
+
+/* User clipping planes */
+#define GL_CLIP_PLANE0				0x3000
+#define GL_CLIP_PLANE1				0x3001
+#define GL_CLIP_PLANE2				0x3002
+#define GL_CLIP_PLANE3				0x3003
+#define GL_CLIP_PLANE4				0x3004
+#define GL_CLIP_PLANE5				0x3005
+
+/* Accumulation buffer */
+#define GL_ACCUM_RED_BITS			0x0D58
+#define GL_ACCUM_GREEN_BITS			0x0D59
+#define GL_ACCUM_BLUE_BITS			0x0D5A
+#define GL_ACCUM_ALPHA_BITS			0x0D5B
+#define GL_ACCUM_CLEAR_VALUE			0x0B80
+#define GL_ACCUM				0x0100
+#define GL_ADD					0x0104
+#define GL_LOAD					0x0101
+#define GL_MULT					0x0103
+#define GL_RETURN				0x0102
+
+/* Alpha testing */
+#define GL_ALPHA_TEST				0x0BC0
+#define GL_ALPHA_TEST_REF			0x0BC2
+#define GL_ALPHA_TEST_FUNC			0x0BC1
+
+/* Blending */
+#define GL_BLEND				0x0BE2
+#define GL_BLEND_SRC				0x0BE1
+#define GL_BLEND_DST				0x0BE0
+#define GL_ZERO					0
+#define GL_ONE					1
+#define GL_SRC_COLOR				0x0300
+#define GL_ONE_MINUS_SRC_COLOR			0x0301
+#define GL_SRC_ALPHA				0x0302
+#define GL_ONE_MINUS_SRC_ALPHA			0x0303
+#define GL_DST_ALPHA				0x0304
+#define GL_ONE_MINUS_DST_ALPHA			0x0305
+#define GL_DST_COLOR				0x0306
+#define GL_ONE_MINUS_DST_COLOR			0x0307
+#define GL_SRC_ALPHA_SATURATE			0x0308
+
+/* Render Mode */
+#define GL_FEEDBACK				0x1C01
+#define GL_RENDER				0x1C00
+#define GL_SELECT				0x1C02
+
+/* Feedback */
+#define GL_2D					0x0600
+#define GL_3D					0x0601
+#define GL_3D_COLOR				0x0602
+#define GL_3D_COLOR_TEXTURE			0x0603
+#define GL_4D_COLOR_TEXTURE			0x0604
+#define GL_POINT_TOKEN				0x0701
+#define GL_LINE_TOKEN				0x0702
+#define GL_LINE_RESET_TOKEN			0x0707
+#define GL_POLYGON_TOKEN			0x0703
+#define GL_BITMAP_TOKEN				0x0704
+#define GL_DRAW_PIXEL_TOKEN			0x0705
+#define GL_COPY_PIXEL_TOKEN			0x0706
+#define GL_PASS_THROUGH_TOKEN			0x0700
+#define GL_FEEDBACK_BUFFER_POINTER		0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE			0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE			0x0DF2
+
+/* Selection */
+#define GL_SELECTION_BUFFER_POINTER		0x0DF3
+#define GL_SELECTION_BUFFER_SIZE		0x0DF4
+
+/* Fog */
+#define GL_FOG					0x0B60
+#define GL_FOG_MODE				0x0B65
+#define GL_FOG_DENSITY				0x0B62
+#define GL_FOG_COLOR				0x0B66
+#define GL_FOG_INDEX				0x0B61
+#define GL_FOG_START				0x0B63
+#define GL_FOG_END				0x0B64
+#define GL_LINEAR				0x2601
+#define GL_EXP					0x0800
+#define GL_EXP2					0x0801
+
+/* Logic Ops */
+#define GL_LOGIC_OP				0x0BF1
+#define GL_INDEX_LOGIC_OP			0x0BF1
+#define GL_COLOR_LOGIC_OP			0x0BF2
+#define GL_LOGIC_OP_MODE			0x0BF0
+#define GL_CLEAR				0x1500
+#define GL_SET					0x150F
+#define GL_COPY					0x1503
+#define GL_COPY_INVERTED			0x150C
+#define GL_NOOP					0x1505
+#define GL_INVERT				0x150A
+#define GL_AND					0x1501
+#define GL_NAND					0x150E
+#define GL_OR					0x1507
+#define GL_NOR					0x1508
+#define GL_XOR					0x1506
+#define GL_EQUIV				0x1509
+#define GL_AND_REVERSE				0x1502
+#define GL_AND_INVERTED				0x1504
+#define GL_OR_REVERSE				0x150B
+#define GL_OR_INVERTED				0x150D
+
+/* Stencil */
+#define GL_STENCIL_BITS				0x0D57
+#define GL_STENCIL_TEST				0x0B90
+#define GL_STENCIL_CLEAR_VALUE			0x0B91
+#define GL_STENCIL_FUNC				0x0B92
+#define GL_STENCIL_VALUE_MASK			0x0B93
+#define GL_STENCIL_FAIL				0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL		0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
+#define GL_STENCIL_REF				0x0B97
+#define GL_STENCIL_WRITEMASK			0x0B98
+#define GL_STENCIL_INDEX			0x1901
+#define GL_KEEP					0x1E00
+#define GL_REPLACE				0x1E01
+#define GL_INCR					0x1E02
+#define GL_DECR					0x1E03
+
+/* Buffers, Pixel Drawing/Reading */
+#define GL_NONE					0
+#define GL_LEFT					0x0406
+#define GL_RIGHT				0x0407
+/*GL_FRONT					0x0404 */
+/*GL_BACK					0x0405 */
+/*GL_FRONT_AND_BACK				0x0408 */
+#define GL_FRONT_LEFT				0x0400
+#define GL_FRONT_RIGHT				0x0401
+#define GL_BACK_LEFT				0x0402
+#define GL_BACK_RIGHT				0x0403
+#define GL_AUX0					0x0409
+#define GL_AUX1					0x040A
+#define GL_AUX2					0x040B
+#define GL_AUX3					0x040C
+#define GL_COLOR_INDEX				0x1900
+#define GL_RED					0x1903
+#define GL_GREEN				0x1904
+#define GL_BLUE					0x1905
+#define GL_ALPHA				0x1906
+#define GL_LUMINANCE				0x1909
+#define GL_LUMINANCE_ALPHA			0x190A
+#define GL_ALPHA_BITS				0x0D55
+#define GL_RED_BITS				0x0D52
+#define GL_GREEN_BITS				0x0D53
+#define GL_BLUE_BITS				0x0D54
+#define GL_INDEX_BITS				0x0D51
+#define GL_SUBPIXEL_BITS			0x0D50
+#define GL_AUX_BUFFERS				0x0C00
+#define GL_READ_BUFFER				0x0C02
+#define GL_DRAW_BUFFER				0x0C01
+#define GL_DOUBLEBUFFER				0x0C32
+#define GL_STEREO				0x0C33
+#define GL_BITMAP				0x1A00
+#define GL_COLOR				0x1800
+#define GL_DEPTH				0x1801
+#define GL_STENCIL				0x1802
+#define GL_DITHER				0x0BD0
+#define GL_RGB					0x1907
+#define GL_RGBA					0x1908
+
+/* Implementation limits */
+#define GL_MAX_LIST_NESTING			0x0B31
+#define GL_MAX_EVAL_ORDER			0x0D30
+#define GL_MAX_LIGHTS				0x0D31
+#define GL_MAX_CLIP_PLANES			0x0D32
+#define GL_MAX_TEXTURE_SIZE			0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE			0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
+#define GL_MAX_NAME_STACK_DEPTH			0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
+#define GL_MAX_VIEWPORT_DIMS			0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH	0x0D3B
+
+/* Gets */
+#define GL_ATTRIB_STACK_DEPTH			0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH		0x0BB1
+#define GL_COLOR_CLEAR_VALUE			0x0C22
+#define GL_COLOR_WRITEMASK			0x0C23
+#define GL_CURRENT_INDEX			0x0B01
+#define GL_CURRENT_COLOR			0x0B00
+#define GL_CURRENT_NORMAL			0x0B02
+#define GL_CURRENT_RASTER_COLOR			0x0B04
+#define GL_CURRENT_RASTER_DISTANCE		0x0B09
+#define GL_CURRENT_RASTER_INDEX			0x0B05
+#define GL_CURRENT_RASTER_POSITION		0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS	0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID	0x0B08
+#define GL_CURRENT_TEXTURE_COORDS		0x0B03
+#define GL_INDEX_CLEAR_VALUE			0x0C20
+#define GL_INDEX_MODE				0x0C30
+#define GL_INDEX_WRITEMASK			0x0C21
+#define GL_MODELVIEW_MATRIX			0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH		0x0BA3
+#define GL_NAME_STACK_DEPTH			0x0D70
+#define GL_PROJECTION_MATRIX			0x0BA7
+#define GL_PROJECTION_STACK_DEPTH		0x0BA4
+#define GL_RENDER_MODE				0x0C40
+#define GL_RGBA_MODE				0x0C31
+#define GL_TEXTURE_MATRIX			0x0BA8
+#define GL_TEXTURE_STACK_DEPTH			0x0BA5
+#define GL_VIEWPORT				0x0BA2
+
+/* Evaluators */
+#define GL_AUTO_NORMAL				0x0D80
+#define GL_MAP1_COLOR_4				0x0D90
+#define GL_MAP1_INDEX				0x0D91
+#define GL_MAP1_NORMAL				0x0D92
+#define GL_MAP1_TEXTURE_COORD_1			0x0D93
+#define GL_MAP1_TEXTURE_COORD_2			0x0D94
+#define GL_MAP1_TEXTURE_COORD_3			0x0D95
+#define GL_MAP1_TEXTURE_COORD_4			0x0D96
+#define GL_MAP1_VERTEX_3			0x0D97
+#define GL_MAP1_VERTEX_4			0x0D98
+#define GL_MAP2_COLOR_4				0x0DB0
+#define GL_MAP2_INDEX				0x0DB1
+#define GL_MAP2_NORMAL				0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1			0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2			0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3			0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4			0x0DB6
+#define GL_MAP2_VERTEX_3			0x0DB7
+#define GL_MAP2_VERTEX_4			0x0DB8
+#define GL_MAP1_GRID_DOMAIN			0x0DD0
+#define GL_MAP1_GRID_SEGMENTS			0x0DD1
+#define GL_MAP2_GRID_DOMAIN			0x0DD2
+#define GL_MAP2_GRID_SEGMENTS			0x0DD3
+#define GL_COEFF				0x0A00
+#define GL_ORDER				0x0A01
+#define GL_DOMAIN				0x0A02
+
+/* Hints */
+#define GL_PERSPECTIVE_CORRECTION_HINT		0x0C50
+#define GL_POINT_SMOOTH_HINT			0x0C51
+#define GL_LINE_SMOOTH_HINT			0x0C52
+#define GL_POLYGON_SMOOTH_HINT			0x0C53
+#define GL_FOG_HINT				0x0C54
+#define GL_DONT_CARE				0x1100
+#define GL_FASTEST				0x1101
+#define GL_NICEST				0x1102
+
+/* Scissor box */
+#define GL_SCISSOR_BOX				0x0C10
+#define GL_SCISSOR_TEST				0x0C11
+
+/* Pixel Mode / Transfer */
+#define GL_MAP_COLOR				0x0D10
+#define GL_MAP_STENCIL				0x0D11
+#define GL_INDEX_SHIFT				0x0D12
+#define GL_INDEX_OFFSET				0x0D13
+#define GL_RED_SCALE				0x0D14
+#define GL_RED_BIAS				0x0D15
+#define GL_GREEN_SCALE				0x0D18
+#define GL_GREEN_BIAS				0x0D19
+#define GL_BLUE_SCALE				0x0D1A
+#define GL_BLUE_BIAS				0x0D1B
+#define GL_ALPHA_SCALE				0x0D1C
+#define GL_ALPHA_BIAS				0x0D1D
+#define GL_DEPTH_SCALE				0x0D1E
+#define GL_DEPTH_BIAS				0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE		0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE		0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE		0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE		0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE		0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE		0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE		0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE		0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE		0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE		0x0CB9
+#define GL_PIXEL_MAP_S_TO_S			0x0C71
+#define GL_PIXEL_MAP_I_TO_I			0x0C70
+#define GL_PIXEL_MAP_I_TO_R			0x0C72
+#define GL_PIXEL_MAP_I_TO_G			0x0C73
+#define GL_PIXEL_MAP_I_TO_B			0x0C74
+#define GL_PIXEL_MAP_I_TO_A			0x0C75
+#define GL_PIXEL_MAP_R_TO_R			0x0C76
+#define GL_PIXEL_MAP_G_TO_G			0x0C77
+#define GL_PIXEL_MAP_B_TO_B			0x0C78
+#define GL_PIXEL_MAP_A_TO_A			0x0C79
+#define GL_PACK_ALIGNMENT			0x0D05
+#define GL_PACK_LSB_FIRST			0x0D01
+#define GL_PACK_ROW_LENGTH			0x0D02
+#define GL_PACK_SKIP_PIXELS			0x0D04
+#define GL_PACK_SKIP_ROWS			0x0D03
+#define GL_PACK_SWAP_BYTES			0x0D00
+#define GL_UNPACK_ALIGNMENT			0x0CF5
+#define GL_UNPACK_LSB_FIRST			0x0CF1
+#define GL_UNPACK_ROW_LENGTH			0x0CF2
+#define GL_UNPACK_SKIP_PIXELS			0x0CF4
+#define GL_UNPACK_SKIP_ROWS			0x0CF3
+#define GL_UNPACK_SWAP_BYTES			0x0CF0
+#define GL_ZOOM_X				0x0D16
+#define GL_ZOOM_Y				0x0D17
+
+/* Texture mapping */
+#define GL_TEXTURE_ENV				0x2300
+#define GL_TEXTURE_ENV_MODE			0x2200
+#define GL_TEXTURE_1D				0x0DE0
+#define GL_TEXTURE_2D				0x0DE1
+#define GL_TEXTURE_WRAP_S			0x2802
+#define GL_TEXTURE_WRAP_T			0x2803
+#define GL_TEXTURE_MAG_FILTER			0x2800
+#define GL_TEXTURE_MIN_FILTER			0x2801
+#define GL_TEXTURE_ENV_COLOR			0x2201
+#define GL_TEXTURE_GEN_S			0x0C60
+#define GL_TEXTURE_GEN_T			0x0C61
+#define GL_TEXTURE_GEN_R			0x0C62
+#define GL_TEXTURE_GEN_Q			0x0C63
+#define GL_TEXTURE_GEN_MODE			0x2500
+#define GL_TEXTURE_BORDER_COLOR			0x1004
+#define GL_TEXTURE_WIDTH			0x1000
+#define GL_TEXTURE_HEIGHT			0x1001
+#define GL_TEXTURE_BORDER			0x1005
+#define GL_TEXTURE_COMPONENTS			0x1003
+#define GL_TEXTURE_RED_SIZE			0x805C
+#define GL_TEXTURE_GREEN_SIZE			0x805D
+#define GL_TEXTURE_BLUE_SIZE			0x805E
+#define GL_TEXTURE_ALPHA_SIZE			0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE		0x8060
+#define GL_TEXTURE_INTENSITY_SIZE		0x8061
+#define GL_NEAREST_MIPMAP_NEAREST		0x2700
+#define GL_NEAREST_MIPMAP_LINEAR		0x2702
+#define GL_LINEAR_MIPMAP_NEAREST		0x2701
+#define GL_LINEAR_MIPMAP_LINEAR			0x2703
+#define GL_OBJECT_LINEAR			0x2401
+#define GL_OBJECT_PLANE				0x2501
+#define GL_EYE_LINEAR				0x2400
+#define GL_EYE_PLANE				0x2502
+#define GL_SPHERE_MAP				0x2402
+#define GL_DECAL				0x2101
+#define GL_MODULATE				0x2100
+#define GL_NEAREST				0x2600
+#define GL_REPEAT				0x2901
+#define GL_CLAMP				0x2900
+#define GL_S					0x2000
+#define GL_T					0x2001
+#define GL_R					0x2002
+#define GL_Q					0x2003
+
+/* Utility */
+#define GL_VENDOR				0x1F00
+#define GL_RENDERER				0x1F01
+#define GL_VERSION				0x1F02
+#define GL_EXTENSIONS				0x1F03
+
+/* Errors */
+#define GL_NO_ERROR 				0
+#define GL_INVALID_ENUM				0x0500
+#define GL_INVALID_VALUE			0x0501
+#define GL_INVALID_OPERATION			0x0502
+#define GL_STACK_OVERFLOW			0x0503
+#define GL_STACK_UNDERFLOW			0x0504
+#define GL_OUT_OF_MEMORY			0x0505
+
+/* glPush/PopAttrib bits */
+#define GL_CURRENT_BIT				0x00000001
+#define GL_POINT_BIT				0x00000002
+#define GL_LINE_BIT				0x00000004
+#define GL_POLYGON_BIT				0x00000008
+#define GL_POLYGON_STIPPLE_BIT			0x00000010
+#define GL_PIXEL_MODE_BIT			0x00000020
+#define GL_LIGHTING_BIT				0x00000040
+#define GL_FOG_BIT				0x00000080
+#define GL_DEPTH_BUFFER_BIT			0x00000100
+#define GL_ACCUM_BUFFER_BIT			0x00000200
+#define GL_STENCIL_BUFFER_BIT			0x00000400
+#define GL_VIEWPORT_BIT				0x00000800
+#define GL_TRANSFORM_BIT			0x00001000
+#define GL_ENABLE_BIT				0x00002000
+#define GL_COLOR_BUFFER_BIT			0x00004000
+#define GL_HINT_BIT				0x00008000
+#define GL_EVAL_BIT				0x00010000
+#define GL_LIST_BIT				0x00020000
+#define GL_TEXTURE_BIT				0x00040000
+#define GL_SCISSOR_BIT				0x00080000
+#define GL_ALL_ATTRIB_BITS			0xFFFFFFFF
+
+
+/* OpenGL 1.1 */
+#define GL_PROXY_TEXTURE_1D			0x8063
+#define GL_PROXY_TEXTURE_2D			0x8064
+#define GL_TEXTURE_PRIORITY			0x8066
+#define GL_TEXTURE_RESIDENT			0x8067
+#define GL_TEXTURE_BINDING_1D			0x8068
+#define GL_TEXTURE_BINDING_2D			0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT		0x1003
+#define GL_ALPHA4				0x803B
+#define GL_ALPHA8				0x803C
+#define GL_ALPHA12				0x803D
+#define GL_ALPHA16				0x803E
+#define GL_LUMINANCE4				0x803F
+#define GL_LUMINANCE8				0x8040
+#define GL_LUMINANCE12				0x8041
+#define GL_LUMINANCE16				0x8042
+#define GL_LUMINANCE4_ALPHA4			0x8043
+#define GL_LUMINANCE6_ALPHA2			0x8044
+#define GL_LUMINANCE8_ALPHA8			0x8045
+#define GL_LUMINANCE12_ALPHA4			0x8046
+#define GL_LUMINANCE12_ALPHA12			0x8047
+#define GL_LUMINANCE16_ALPHA16			0x8048
+#define GL_INTENSITY				0x8049
+#define GL_INTENSITY4				0x804A
+#define GL_INTENSITY8				0x804B
+#define GL_INTENSITY12				0x804C
+#define GL_INTENSITY16				0x804D
+#define GL_R3_G3_B2				0x2A10
+#define GL_RGB4					0x804F
+#define GL_RGB5					0x8050
+#define GL_RGB8					0x8051
+#define GL_RGB10				0x8052
+#define GL_RGB12				0x8053
+#define GL_RGB16				0x8054
+#define GL_RGBA2				0x8055
+#define GL_RGBA4				0x8056
+#define GL_RGB5_A1				0x8057
+#define GL_RGBA8				0x8058
+#define GL_RGB10_A2				0x8059
+#define GL_RGBA12				0x805A
+#define GL_RGBA16				0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT		0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT		0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 		0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 		0xFFFFFFFF
+
+
+
+/*
+ * Miscellaneous
+ */
+
+GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
+
+GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glClear( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
+
+GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
+
+GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
+
+GLAPI void GLAPIENTRY glCullFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glPointSize( GLfloat size );
+
+GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
+
+GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
+
+GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
+
+GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
+
+GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
+
+GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
+
+GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
+
+GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
+
+GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
+
+GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
+
+GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
+
+GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnable( GLenum cap );
+
+GLAPI void GLAPIENTRY glDisable( GLenum cap );
+
+GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
+
+
+GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
+
+
+GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
+
+GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
+
+GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glPopAttrib( void );
+
+
+GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
+
+
+GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
+
+GLAPI GLenum GLAPIENTRY glGetError( void );
+
+GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
+
+GLAPI void GLAPIENTRY glFinish( void );
+
+GLAPI void GLAPIENTRY glFlush( void );
+
+GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
+
+GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
+
+GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
+
+GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
+
+GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+GLAPI void GLAPIENTRY glPushMatrix( void );
+
+GLAPI void GLAPIENTRY glPopMatrix( void );
+
+GLAPI void GLAPIENTRY glLoadIdentity( void );
+
+GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glRotated( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
+
+GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
+
+GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
+
+GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
+
+GLAPI void GLAPIENTRY glEndList( void );
+
+GLAPI void GLAPIENTRY glCallList( GLuint list );
+
+GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+GLAPI void GLAPIENTRY glListBase( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+GLAPI void GLAPIENTRY glBegin( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnd( void );
+
+
+GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
+GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
+GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
+
+GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
+GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glIndexd( GLdouble c );
+GLAPI void GLAPIENTRY glIndexf( GLfloat c );
+GLAPI void GLAPIENTRY glIndexi( GLint c );
+GLAPI void GLAPIENTRY glIndexs( GLshort c );
+GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
+GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
+GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
+GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
+GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
+GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
+GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
+GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
+GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
+GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
+GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
+GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
+
+GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
+
+GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
+
+
+GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
+GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
+GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
+GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
+
+GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
+GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
+GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
+GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
+GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
+GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
+GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
+GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
+GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
+GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
+GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
+
+GLAPI void GLAPIENTRY glArrayElement( GLint i );
+
+GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
+
+GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
+
+GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
+                                    GLfloat *params );
+GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
+                                    GLint *params );
+
+GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
+GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
+GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
+
+GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+GLAPI void GLAPIENTRY glClearStencil( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
+GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
+                                           GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
+                                           GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
+
+GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
+
+GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
+
+GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
+
+
+GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+GLAPI void GLAPIENTRY glMap2d( GLenum target,
+		     GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+		     GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+		     const GLdouble *points );
+GLAPI void GLAPIENTRY glMap2f( GLenum target,
+		     GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+		     GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+		     const GLfloat *points );
+
+GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
+GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
+GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
+
+GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
+GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
+
+GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
+GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
+
+GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
+
+GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
+
+GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
+
+GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
+
+GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
+
+GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
+
+GLAPI void GLAPIENTRY glInitNames( void );
+
+GLAPI void GLAPIENTRY glLoadName( GLuint name );
+
+GLAPI void GLAPIENTRY glPushName( GLuint name );
+
+GLAPI void GLAPIENTRY glPopName( void );
+
+
+
+/*
+ * OpenGL 1.2
+ */
+
+#define GL_RESCALE_NORMAL			0x803A
+#define GL_CLAMP_TO_EDGE			0x812F
+#define GL_MAX_ELEMENTS_VERTICES		0x80E8
+#define GL_MAX_ELEMENTS_INDICES			0x80E9
+#define GL_BGR					0x80E0
+#define GL_BGRA					0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2			0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV		0x8362
+#define GL_UNSIGNED_SHORT_5_6_5			0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV		0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4		0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV		0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1		0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV		0x8366
+#define GL_UNSIGNED_INT_8_8_8_8			0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV		0x8367
+#define GL_UNSIGNED_INT_10_10_10_2		0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV		0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL		0x81F8
+#define GL_SINGLE_COLOR				0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR		0x81FA
+#define GL_TEXTURE_MIN_LOD			0x813A
+#define GL_TEXTURE_MAX_LOD			0x813B
+#define GL_TEXTURE_BASE_LEVEL			0x813C
+#define GL_TEXTURE_MAX_LEVEL			0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE		0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY	0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE		0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY	0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE		0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE		0x846E
+#define GL_PACK_SKIP_IMAGES			0x806B
+#define GL_PACK_IMAGE_HEIGHT			0x806C
+#define GL_UNPACK_SKIP_IMAGES			0x806D
+#define GL_UNPACK_IMAGE_HEIGHT			0x806E
+#define GL_TEXTURE_3D				0x806F
+#define GL_PROXY_TEXTURE_3D			0x8070
+#define GL_TEXTURE_DEPTH			0x8071
+#define GL_TEXTURE_WRAP_R			0x8072
+#define GL_MAX_3D_TEXTURE_SIZE			0x8073
+#define GL_TEXTURE_BINDING_3D			0x806A
+
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+/*
+ * GL_ARB_imaging
+ */
+
+#define GL_CONSTANT_COLOR			0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR		0x8002
+#define GL_CONSTANT_ALPHA			0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA		0x8004
+#define GL_COLOR_TABLE				0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE		0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE	0x80D2
+#define GL_PROXY_COLOR_TABLE			0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE	0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE	0x80D5
+#define GL_COLOR_TABLE_SCALE			0x80D6
+#define GL_COLOR_TABLE_BIAS			0x80D7
+#define GL_COLOR_TABLE_FORMAT			0x80D8
+#define GL_COLOR_TABLE_WIDTH			0x80D9
+#define GL_COLOR_TABLE_RED_SIZE			0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE		0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE		0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE		0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE		0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE		0x80DF
+#define GL_CONVOLUTION_1D			0x8010
+#define GL_CONVOLUTION_2D			0x8011
+#define GL_SEPARABLE_2D				0x8012
+#define GL_CONVOLUTION_BORDER_MODE		0x8013
+#define GL_CONVOLUTION_FILTER_SCALE		0x8014
+#define GL_CONVOLUTION_FILTER_BIAS		0x8015
+#define GL_REDUCE				0x8016
+#define GL_CONVOLUTION_FORMAT			0x8017
+#define GL_CONVOLUTION_WIDTH			0x8018
+#define GL_CONVOLUTION_HEIGHT			0x8019
+#define GL_MAX_CONVOLUTION_WIDTH		0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT		0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE		0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE		0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE		0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE		0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS		0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS		0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS		0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS		0x8023
+#define GL_CONSTANT_BORDER			0x8151
+#define GL_REPLICATE_BORDER			0x8153
+#define GL_CONVOLUTION_BORDER_COLOR		0x8154
+#define GL_COLOR_MATRIX				0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH		0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH		0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE		0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE	0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE		0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE	0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS		0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS		0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS		0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS		0x80BB
+#define GL_HISTOGRAM				0x8024
+#define GL_PROXY_HISTOGRAM			0x8025
+#define GL_HISTOGRAM_WIDTH			0x8026
+#define GL_HISTOGRAM_FORMAT			0x8027
+#define GL_HISTOGRAM_RED_SIZE			0x8028
+#define GL_HISTOGRAM_GREEN_SIZE			0x8029
+#define GL_HISTOGRAM_BLUE_SIZE			0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE			0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE		0x802C
+#define GL_HISTOGRAM_SINK			0x802D
+#define GL_MINMAX				0x802E
+#define GL_MINMAX_FORMAT			0x802F
+#define GL_MINMAX_SINK				0x8030
+#define GL_TABLE_TOO_LARGE			0x8031
+#define GL_BLEND_EQUATION			0x8009
+#define GL_MIN					0x8007
+#define GL_MAX					0x8008
+#define GL_FUNC_ADD				0x8006
+#define GL_FUNC_SUBTRACT			0x800A
+#define GL_FUNC_REVERSE_SUBTRACT		0x800B
+#define GL_BLEND_COLOR				0x8005
+
+
+GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
+                                              const GLint *params);
+
+GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
+
+GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
+				   GLenum internalformat, GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
+
+GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
+				      GLenum format, GLenum type,
+				      GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
+						 GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
+						 GLint *params );
+
+GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
+				GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
+
+GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
+					      GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
+					      GLint *params );
+
+GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+	const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
+	GLfloat params );
+
+GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
+	const GLfloat *params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
+	GLint params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
+	const GLint *params );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width,
+	GLsizei height);
+
+GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *image );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
+	GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
+	GLint *params );
+
+GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *row, const GLvoid *column );
+
+GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+
+
+
+/*
+ * OpenGL 1.3
+ */
+
+/* multitexture */
+#define GL_TEXTURE0				0x84C0
+#define GL_TEXTURE1				0x84C1
+#define GL_TEXTURE2				0x84C2
+#define GL_TEXTURE3				0x84C3
+#define GL_TEXTURE4				0x84C4
+#define GL_TEXTURE5				0x84C5
+#define GL_TEXTURE6				0x84C6
+#define GL_TEXTURE7				0x84C7
+#define GL_TEXTURE8				0x84C8
+#define GL_TEXTURE9				0x84C9
+#define GL_TEXTURE10				0x84CA
+#define GL_TEXTURE11				0x84CB
+#define GL_TEXTURE12				0x84CC
+#define GL_TEXTURE13				0x84CD
+#define GL_TEXTURE14				0x84CE
+#define GL_TEXTURE15				0x84CF
+#define GL_TEXTURE16				0x84D0
+#define GL_TEXTURE17				0x84D1
+#define GL_TEXTURE18				0x84D2
+#define GL_TEXTURE19				0x84D3
+#define GL_TEXTURE20				0x84D4
+#define GL_TEXTURE21				0x84D5
+#define GL_TEXTURE22				0x84D6
+#define GL_TEXTURE23				0x84D7
+#define GL_TEXTURE24				0x84D8
+#define GL_TEXTURE25				0x84D9
+#define GL_TEXTURE26				0x84DA
+#define GL_TEXTURE27				0x84DB
+#define GL_TEXTURE28				0x84DC
+#define GL_TEXTURE29				0x84DD
+#define GL_TEXTURE30				0x84DE
+#define GL_TEXTURE31				0x84DF
+#define GL_ACTIVE_TEXTURE			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE		0x84E1
+#define GL_MAX_TEXTURE_UNITS			0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP				0x8511
+#define GL_REFLECTION_MAP			0x8512
+#define GL_TEXTURE_CUBE_MAP			0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP		0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X		0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X		0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y		0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y		0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z		0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z		0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP		0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE		0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA			0x84E9
+#define GL_COMPRESSED_LUMINANCE			0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA		0x84EB
+#define GL_COMPRESSED_INTENSITY			0x84EC
+#define GL_COMPRESSED_RGB			0x84ED
+#define GL_COMPRESSED_RGBA			0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT		0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE	0x86A0
+#define GL_TEXTURE_COMPRESSED			0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS	0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS		0x86A3
+/* multisample */
+#define GL_MULTISAMPLE				0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE		0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE			0x809F
+#define GL_SAMPLE_COVERAGE			0x80A0
+#define GL_SAMPLE_BUFFERS			0x80A8
+#define GL_SAMPLES				0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE		0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT		0x80AB
+#define GL_MULTISAMPLE_BIT			0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX		0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX		0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX		0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX		0x84E6
+/* texture_env_combine */
+#define GL_COMBINE				0x8570
+#define GL_COMBINE_RGB				0x8571
+#define GL_COMBINE_ALPHA			0x8572
+#define GL_SOURCE0_RGB				0x8580
+#define GL_SOURCE1_RGB				0x8581
+#define GL_SOURCE2_RGB				0x8582
+#define GL_SOURCE0_ALPHA			0x8588
+#define GL_SOURCE1_ALPHA			0x8589
+#define GL_SOURCE2_ALPHA			0x858A
+#define GL_OPERAND0_RGB				0x8590
+#define GL_OPERAND1_RGB				0x8591
+#define GL_OPERAND2_RGB				0x8592
+#define GL_OPERAND0_ALPHA			0x8598
+#define GL_OPERAND1_ALPHA			0x8599
+#define GL_OPERAND2_ALPHA			0x859A
+#define GL_RGB_SCALE				0x8573
+#define GL_ADD_SIGNED				0x8574
+#define GL_INTERPOLATE				0x8575
+#define GL_SUBTRACT				0x84E7
+#define GL_CONSTANT				0x8576
+#define GL_PRIMARY_COLOR			0x8577
+#define GL_PREVIOUS				0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB				0x86AE
+#define GL_DOT3_RGBA				0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER			0x812D
+
+GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble * m );
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat * m );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble * m );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat * m );
+
+GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
+
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+
+
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB				0x84C0
+#define GL_TEXTURE1_ARB				0x84C1
+#define GL_TEXTURE2_ARB				0x84C2
+#define GL_TEXTURE3_ARB				0x84C3
+#define GL_TEXTURE4_ARB				0x84C4
+#define GL_TEXTURE5_ARB				0x84C5
+#define GL_TEXTURE6_ARB				0x84C6
+#define GL_TEXTURE7_ARB				0x84C7
+#define GL_TEXTURE8_ARB				0x84C8
+#define GL_TEXTURE9_ARB				0x84C9
+#define GL_TEXTURE10_ARB			0x84CA
+#define GL_TEXTURE11_ARB			0x84CB
+#define GL_TEXTURE12_ARB			0x84CC
+#define GL_TEXTURE13_ARB			0x84CD
+#define GL_TEXTURE14_ARB			0x84CE
+#define GL_TEXTURE15_ARB			0x84CF
+#define GL_TEXTURE16_ARB			0x84D0
+#define GL_TEXTURE17_ARB			0x84D1
+#define GL_TEXTURE18_ARB			0x84D2
+#define GL_TEXTURE19_ARB			0x84D3
+#define GL_TEXTURE20_ARB			0x84D4
+#define GL_TEXTURE21_ARB			0x84D5
+#define GL_TEXTURE22_ARB			0x84D6
+#define GL_TEXTURE23_ARB			0x84D7
+#define GL_TEXTURE24_ARB			0x84D8
+#define GL_TEXTURE25_ARB			0x84D9
+#define GL_TEXTURE26_ARB			0x84DA
+#define GL_TEXTURE27_ARB			0x84DB
+#define GL_TEXTURE28_ARB			0x84DC
+#define GL_TEXTURE29_ARB			0x84DD
+#define GL_TEXTURE30_ARB			0x84DE
+#define GL_TEXTURE31_ARB			0x84DF
+#define GL_ACTIVE_TEXTURE_ARB			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+/*
+ * Define this token if you want "old-style" header file behaviour (extensions
+ * defined in gl.h).  Otherwise, extensions will be included from glext.h.
+ */
+#if defined(GL_GLEXT_LEGACY)
+
+/* All extensions that used to be here are now found in glext.h */
+
+#else  /* GL_GLEXT_LEGACY */
+
+#include "vendor/glext.h"
+
+#endif  /* GL_GLEXT_LEGACY */
+
+
+
+/*
+ * ???. GL_MESA_packed_depth_stencil
+ * XXX obsolete
+ */
+#ifndef GL_MESA_packed_depth_stencil
+#define GL_MESA_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_MESA			0x8750
+#define GL_UNSIGNED_INT_24_8_MESA		0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA		0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA		0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA		0x8754
+
+#endif /* GL_MESA_packed_depth_stencil */
+
+
+#ifndef GL_ATI_blend_equation_separate
+#define GL_ATI_blend_equation_separate 1
+
+#define GL_ALPHA_BLEND_EQUATION_ATI	        0x883D
+
+GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
+
+#endif /* GL_ATI_blend_equation_separate */
+
+
+/* GL_OES_EGL_image */
+#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
+typedef void* GLeglImageOES;
+#endif
+
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
+#endif
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl_h_ */
diff --git a/irr/src/vendor/glext.h b/irr/src/vendor/glext.h
new file mode 100644
index 000000000..480d4dada
--- /dev/null
+++ b/irr/src/vendor/glext.h
@@ -0,0 +1,12912 @@
+#ifndef __gl_glext_h_
+#define __gl_glext_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright 2013-2020 The Khronos Group Inc.
+** SPDX-License-Identifier: MIT
+**
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   https://github.com/KhronosGroup/OpenGL-Registry
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#define GL_GLEXT_VERSION 20231129
+
+#include <KHR/khrplatform.h>
+
+/* Generated C header for:
+ * API: gl
+ * Profile: compatibility
+ * Versions considered: .*
+ * Versions emitted: 1\.[2-9]|[234]\.[0-9]
+ * Default extensions included: gl
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_VERSION_1_2 */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, void *img);
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif
+#endif /* GL_VERSION_1_3 */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#define GL_BLEND_COLOR                    0x8005
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_FUNC_ADD                       0x8006
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+#endif
+#endif /* GL_VERSION_1_4 */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC2_ALPHA                     0x858A
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void *APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_VERSION_1_5 */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+typedef char GLchar;
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_VERSION_2_0 */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+#endif /* GL_VERSION_2_1 */
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+typedef khronos_uint16_t GLhalf;
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_COLOR_ATTACHMENT16             0x8CF0
+#define GL_COLOR_ATTACHMENT17             0x8CF1
+#define GL_COLOR_ATTACHMENT18             0x8CF2
+#define GL_COLOR_ATTACHMENT19             0x8CF3
+#define GL_COLOR_ATTACHMENT20             0x8CF4
+#define GL_COLOR_ATTACHMENT21             0x8CF5
+#define GL_COLOR_ATTACHMENT22             0x8CF6
+#define GL_COLOR_ATTACHMENT23             0x8CF7
+#define GL_COLOR_ATTACHMENT24             0x8CF8
+#define GL_COLOR_ATTACHMENT25             0x8CF9
+#define GL_COLOR_ATTACHMENT26             0x8CFA
+#define GL_COLOR_ATTACHMENT27             0x8CFB
+#define GL_COLOR_ATTACHMENT28             0x8CFC
+#define GL_COLOR_ATTACHMENT29             0x8CFD
+#define GL_COLOR_ATTACHMENT30             0x8CFE
+#define GL_COLOR_ATTACHMENT31             0x8CFF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#define GL_HALF_FLOAT                     0x140B
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void *(APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte *APIENTRY glGetStringi (GLenum name, GLuint index);
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void *APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif
+#endif /* GL_VERSION_3_0 */
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+#endif /* GL_VERSION_3_1 */
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+typedef struct __GLsync *GLsync;
+typedef khronos_uint64_t GLuint64;
+typedef khronos_int64_t GLint64;
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+#define GL_DEPTH_CLAMP                    0x864F
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint maskNumber, GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *data);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint maskNumber, GLbitfield mask);
+#endif
+#endif /* GL_VERSION_3_2 */
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
+#define GL_SRC1_COLOR                     0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#define GL_SAMPLER_BINDING                0x8919
+#define GL_RGB10_A2UI                     0x906F
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#define GL_INT_2_10_10_10_REV             0x8D9F
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+#endif
+#endif /* GL_VERSION_3_3 */
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+#define GL_ISOLINES                       0x8E7A
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLfloat value);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLfloat value);
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect);
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_VERSION_4_0 */
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+#define GL_FIXED                          0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+#define GL_SHADER_COMPILER                0x8DFA
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#define GL_RGB565                         0x8D62
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH          0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GL_PROGRAM_BINARY_FORMATS         0x87FF
+#define GL_VERTEX_SHADER_BIT              0x00000001
+#define GL_FRAGMENT_SHADER_BIT            0x00000002
+#define GL_GEOMETRY_SHADER_BIT            0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
+#define GL_ALL_SHADER_BITS                0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE              0x8258
+#define GL_ACTIVE_PROGRAM                 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING       0x825A
+#define GL_MAX_VIEWPORTS                  0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
+#define GL_LAYER_PROVOKING_VERTEX         0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX               0x8260
+typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
+typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar *const*strings);
+typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
+typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReleaseShaderCompiler (void);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
+GLAPI void APIENTRY glClearDepthf (GLfloat d);
+GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
+GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar *const*strings);
+GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
+GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
+GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
+GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f);
+GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
+#endif
+#endif /* GL_VERSION_4_1 */
+
+#ifndef GL_VERSION_4_2
+#define GL_VERSION_4_2 1
+#define GL_COPY_READ_BUFFER_BINDING       0x8F36
+#define GL_COPY_WRITE_BUFFER_BINDING      0x8F37
+#define GL_TRANSFORM_FEEDBACK_ACTIVE      0x8E24
+#define GL_TRANSFORM_FEEDBACK_PAUSED      0x8E23
+#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH  0x9127
+#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
+#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH  0x9129
+#define GL_UNPACK_COMPRESSED_BLOCK_SIZE   0x912A
+#define GL_PACK_COMPRESSED_BLOCK_WIDTH    0x912B
+#define GL_PACK_COMPRESSED_BLOCK_HEIGHT   0x912C
+#define GL_PACK_COMPRESSED_BLOCK_DEPTH    0x912D
+#define GL_PACK_COMPRESSED_BLOCK_SIZE     0x912E
+#define GL_NUM_SAMPLE_COUNTS              0x9380
+#define GL_MIN_MAP_BUFFER_ALIGNMENT       0x90BC
+#define GL_ATOMIC_COUNTER_BUFFER          0x92C0
+#define GL_ATOMIC_COUNTER_BUFFER_BINDING  0x92C1
+#define GL_ATOMIC_COUNTER_BUFFER_START    0x92C2
+#define GL_ATOMIC_COUNTER_BUFFER_SIZE     0x92C3
+#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
+#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
+#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
+#define GL_MAX_VERTEX_ATOMIC_COUNTERS     0x92D2
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS   0x92D5
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS   0x92D6
+#define GL_MAX_COMBINED_ATOMIC_COUNTERS   0x92D7
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
+#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS  0x92D9
+#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
+#define GL_UNSIGNED_INT_ATOMIC_COUNTER    0x92DB
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT      0x00000002
+#define GL_UNIFORM_BARRIER_BIT            0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT      0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
+#define GL_COMMAND_BARRIER_BIT            0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT       0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT     0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT      0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT        0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT     0x00001000
+#define GL_ALL_BARRIER_BITS               0xFFFFFFFF
+#define GL_MAX_IMAGE_UNITS                0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
+#define GL_IMAGE_BINDING_NAME             0x8F3A
+#define GL_IMAGE_BINDING_LEVEL            0x8F3B
+#define GL_IMAGE_BINDING_LAYERED          0x8F3C
+#define GL_IMAGE_BINDING_LAYER            0x8F3D
+#define GL_IMAGE_BINDING_ACCESS           0x8F3E
+#define GL_IMAGE_1D                       0x904C
+#define GL_IMAGE_2D                       0x904D
+#define GL_IMAGE_3D                       0x904E
+#define GL_IMAGE_2D_RECT                  0x904F
+#define GL_IMAGE_CUBE                     0x9050
+#define GL_IMAGE_BUFFER                   0x9051
+#define GL_IMAGE_1D_ARRAY                 0x9052
+#define GL_IMAGE_2D_ARRAY                 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY           0x9054
+#define GL_IMAGE_2D_MULTISAMPLE           0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY     0x9056
+#define GL_INT_IMAGE_1D                   0x9057
+#define GL_INT_IMAGE_2D                   0x9058
+#define GL_INT_IMAGE_3D                   0x9059
+#define GL_INT_IMAGE_2D_RECT              0x905A
+#define GL_INT_IMAGE_CUBE                 0x905B
+#define GL_INT_IMAGE_BUFFER               0x905C
+#define GL_INT_IMAGE_1D_ARRAY             0x905D
+#define GL_INT_IMAGE_2D_ARRAY             0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY       0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE       0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D          0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D          0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D          0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT     0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE        0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER      0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY    0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY    0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
+#define GL_MAX_IMAGE_SAMPLES              0x906D
+#define GL_IMAGE_BINDING_FORMAT           0x906E
+#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
+#define GL_MAX_VERTEX_IMAGE_UNIFORMS      0x90CA
+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS    0x90CD
+#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS    0x90CE
+#define GL_MAX_COMBINED_IMAGE_UNIFORMS    0x90CF
+#define GL_COMPRESSED_RGBA_BPTC_UNORM     0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GL_TEXTURE_IMMUTABLE_FORMAT       0x912F
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+GLAPI void APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint *params);
+GLAPI void APIENTRY glGetActiveAtomicCounterBufferiv (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glBindImageTexture (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+GLAPI void APIENTRY glMemoryBarrier (GLbitfield barriers);
+GLAPI void APIENTRY glTexStorage1D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei instancecount);
+GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#endif
+#endif /* GL_VERSION_4_2 */
+
+#ifndef GL_VERSION_4_3
+#define GL_VERSION_4_3 1
+typedef void (APIENTRY  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_NUM_SHADING_LANGUAGE_VERSIONS  0x82E9
+#define GL_VERTEX_ATTRIB_ARRAY_LONG       0x874E
+#define GL_COMPRESSED_RGB8_ETC2           0x9274
+#define GL_COMPRESSED_SRGB8_ETC2          0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC      0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
+#define GL_COMPRESSED_R11_EAC             0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC      0x9271
+#define GL_COMPRESSED_RG11_EAC            0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC     0x9273
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX  0x8D69
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
+#define GL_MAX_ELEMENT_INDEX              0x8D6B
+#define GL_COMPUTE_SHADER                 0x91B9
+#define GL_MAX_COMPUTE_UNIFORM_BLOCKS     0x91BB
+#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
+#define GL_MAX_COMPUTE_IMAGE_UNIFORMS     0x91BD
+#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
+#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
+#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
+#define GL_MAX_COMPUTE_ATOMIC_COUNTERS    0x8265
+#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
+#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
+#define GL_MAX_COMPUTE_WORK_GROUP_COUNT   0x91BE
+#define GL_MAX_COMPUTE_WORK_GROUP_SIZE    0x91BF
+#define GL_COMPUTE_WORK_GROUP_SIZE        0x8267
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
+#define GL_DISPATCH_INDIRECT_BUFFER       0x90EE
+#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
+#define GL_COMPUTE_SHADER_BIT             0x00000020
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#define GL_DEBUG_SOURCE_API               0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#define GL_BUFFER                         0x82E0
+#define GL_SHADER                         0x82E1
+#define GL_PROGRAM                        0x82E2
+#define GL_QUERY                          0x82E3
+#define GL_PROGRAM_PIPELINE               0x82E4
+#define GL_SAMPLER                        0x82E6
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#define GL_DEBUG_OUTPUT                   0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#define GL_MAX_UNIFORM_LOCATIONS          0x826E
+#define GL_FRAMEBUFFER_DEFAULT_WIDTH      0x9310
+#define GL_FRAMEBUFFER_DEFAULT_HEIGHT     0x9311
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS     0x9312
+#define GL_FRAMEBUFFER_DEFAULT_SAMPLES    0x9313
+#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
+#define GL_MAX_FRAMEBUFFER_WIDTH          0x9315
+#define GL_MAX_FRAMEBUFFER_HEIGHT         0x9316
+#define GL_MAX_FRAMEBUFFER_LAYERS         0x9317
+#define GL_MAX_FRAMEBUFFER_SAMPLES        0x9318
+#define GL_INTERNALFORMAT_SUPPORTED       0x826F
+#define GL_INTERNALFORMAT_PREFERRED       0x8270
+#define GL_INTERNALFORMAT_RED_SIZE        0x8271
+#define GL_INTERNALFORMAT_GREEN_SIZE      0x8272
+#define GL_INTERNALFORMAT_BLUE_SIZE       0x8273
+#define GL_INTERNALFORMAT_ALPHA_SIZE      0x8274
+#define GL_INTERNALFORMAT_DEPTH_SIZE      0x8275
+#define GL_INTERNALFORMAT_STENCIL_SIZE    0x8276
+#define GL_INTERNALFORMAT_SHARED_SIZE     0x8277
+#define GL_INTERNALFORMAT_RED_TYPE        0x8278
+#define GL_INTERNALFORMAT_GREEN_TYPE      0x8279
+#define GL_INTERNALFORMAT_BLUE_TYPE       0x827A
+#define GL_INTERNALFORMAT_ALPHA_TYPE      0x827B
+#define GL_INTERNALFORMAT_DEPTH_TYPE      0x827C
+#define GL_INTERNALFORMAT_STENCIL_TYPE    0x827D
+#define GL_MAX_WIDTH                      0x827E
+#define GL_MAX_HEIGHT                     0x827F
+#define GL_MAX_DEPTH                      0x8280
+#define GL_MAX_LAYERS                     0x8281
+#define GL_MAX_COMBINED_DIMENSIONS        0x8282
+#define GL_COLOR_COMPONENTS               0x8283
+#define GL_DEPTH_COMPONENTS               0x8284
+#define GL_STENCIL_COMPONENTS             0x8285
+#define GL_COLOR_RENDERABLE               0x8286
+#define GL_DEPTH_RENDERABLE               0x8287
+#define GL_STENCIL_RENDERABLE             0x8288
+#define GL_FRAMEBUFFER_RENDERABLE         0x8289
+#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
+#define GL_FRAMEBUFFER_BLEND              0x828B
+#define GL_READ_PIXELS                    0x828C
+#define GL_READ_PIXELS_FORMAT             0x828D
+#define GL_READ_PIXELS_TYPE               0x828E
+#define GL_TEXTURE_IMAGE_FORMAT           0x828F
+#define GL_TEXTURE_IMAGE_TYPE             0x8290
+#define GL_GET_TEXTURE_IMAGE_FORMAT       0x8291
+#define GL_GET_TEXTURE_IMAGE_TYPE         0x8292
+#define GL_MIPMAP                         0x8293
+#define GL_MANUAL_GENERATE_MIPMAP         0x8294
+#define GL_AUTO_GENERATE_MIPMAP           0x8295
+#define GL_COLOR_ENCODING                 0x8296
+#define GL_SRGB_READ                      0x8297
+#define GL_SRGB_WRITE                     0x8298
+#define GL_FILTER                         0x829A
+#define GL_VERTEX_TEXTURE                 0x829B
+#define GL_TESS_CONTROL_TEXTURE           0x829C
+#define GL_TESS_EVALUATION_TEXTURE        0x829D
+#define GL_GEOMETRY_TEXTURE               0x829E
+#define GL_FRAGMENT_TEXTURE               0x829F
+#define GL_COMPUTE_TEXTURE                0x82A0
+#define GL_TEXTURE_SHADOW                 0x82A1
+#define GL_TEXTURE_GATHER                 0x82A2
+#define GL_TEXTURE_GATHER_SHADOW          0x82A3
+#define GL_SHADER_IMAGE_LOAD              0x82A4
+#define GL_SHADER_IMAGE_STORE             0x82A5
+#define GL_SHADER_IMAGE_ATOMIC            0x82A6
+#define GL_IMAGE_TEXEL_SIZE               0x82A7
+#define GL_IMAGE_COMPATIBILITY_CLASS      0x82A8
+#define GL_IMAGE_PIXEL_FORMAT             0x82A9
+#define GL_IMAGE_PIXEL_TYPE               0x82AA
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
+#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
+#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
+#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE  0x82B3
+#define GL_CLEAR_BUFFER                   0x82B4
+#define GL_TEXTURE_VIEW                   0x82B5
+#define GL_VIEW_COMPATIBILITY_CLASS       0x82B6
+#define GL_FULL_SUPPORT                   0x82B7
+#define GL_CAVEAT_SUPPORT                 0x82B8
+#define GL_IMAGE_CLASS_4_X_32             0x82B9
+#define GL_IMAGE_CLASS_2_X_32             0x82BA
+#define GL_IMAGE_CLASS_1_X_32             0x82BB
+#define GL_IMAGE_CLASS_4_X_16             0x82BC
+#define GL_IMAGE_CLASS_2_X_16             0x82BD
+#define GL_IMAGE_CLASS_1_X_16             0x82BE
+#define GL_IMAGE_CLASS_4_X_8              0x82BF
+#define GL_IMAGE_CLASS_2_X_8              0x82C0
+#define GL_IMAGE_CLASS_1_X_8              0x82C1
+#define GL_IMAGE_CLASS_11_11_10           0x82C2
+#define GL_IMAGE_CLASS_10_10_10_2         0x82C3
+#define GL_VIEW_CLASS_128_BITS            0x82C4
+#define GL_VIEW_CLASS_96_BITS             0x82C5
+#define GL_VIEW_CLASS_64_BITS             0x82C6
+#define GL_VIEW_CLASS_48_BITS             0x82C7
+#define GL_VIEW_CLASS_32_BITS             0x82C8
+#define GL_VIEW_CLASS_24_BITS             0x82C9
+#define GL_VIEW_CLASS_16_BITS             0x82CA
+#define GL_VIEW_CLASS_8_BITS              0x82CB
+#define GL_VIEW_CLASS_S3TC_DXT1_RGB       0x82CC
+#define GL_VIEW_CLASS_S3TC_DXT1_RGBA      0x82CD
+#define GL_VIEW_CLASS_S3TC_DXT3_RGBA      0x82CE
+#define GL_VIEW_CLASS_S3TC_DXT5_RGBA      0x82CF
+#define GL_VIEW_CLASS_RGTC1_RED           0x82D0
+#define GL_VIEW_CLASS_RGTC2_RG            0x82D1
+#define GL_VIEW_CLASS_BPTC_UNORM          0x82D2
+#define GL_VIEW_CLASS_BPTC_FLOAT          0x82D3
+#define GL_UNIFORM                        0x92E1
+#define GL_UNIFORM_BLOCK                  0x92E2
+#define GL_PROGRAM_INPUT                  0x92E3
+#define GL_PROGRAM_OUTPUT                 0x92E4
+#define GL_BUFFER_VARIABLE                0x92E5
+#define GL_SHADER_STORAGE_BLOCK           0x92E6
+#define GL_VERTEX_SUBROUTINE              0x92E8
+#define GL_TESS_CONTROL_SUBROUTINE        0x92E9
+#define GL_TESS_EVALUATION_SUBROUTINE     0x92EA
+#define GL_GEOMETRY_SUBROUTINE            0x92EB
+#define GL_FRAGMENT_SUBROUTINE            0x92EC
+#define GL_COMPUTE_SUBROUTINE             0x92ED
+#define GL_VERTEX_SUBROUTINE_UNIFORM      0x92EE
+#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
+#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
+#define GL_GEOMETRY_SUBROUTINE_UNIFORM    0x92F1
+#define GL_FRAGMENT_SUBROUTINE_UNIFORM    0x92F2
+#define GL_COMPUTE_SUBROUTINE_UNIFORM     0x92F3
+#define GL_TRANSFORM_FEEDBACK_VARYING     0x92F4
+#define GL_ACTIVE_RESOURCES               0x92F5
+#define GL_MAX_NAME_LENGTH                0x92F6
+#define GL_MAX_NUM_ACTIVE_VARIABLES       0x92F7
+#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
+#define GL_NAME_LENGTH                    0x92F9
+#define GL_TYPE                           0x92FA
+#define GL_ARRAY_SIZE                     0x92FB
+#define GL_OFFSET                         0x92FC
+#define GL_BLOCK_INDEX                    0x92FD
+#define GL_ARRAY_STRIDE                   0x92FE
+#define GL_MATRIX_STRIDE                  0x92FF
+#define GL_IS_ROW_MAJOR                   0x9300
+#define GL_ATOMIC_COUNTER_BUFFER_INDEX    0x9301
+#define GL_BUFFER_BINDING                 0x9302
+#define GL_BUFFER_DATA_SIZE               0x9303
+#define GL_NUM_ACTIVE_VARIABLES           0x9304
+#define GL_ACTIVE_VARIABLES               0x9305
+#define GL_REFERENCED_BY_VERTEX_SHADER    0x9306
+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
+#define GL_REFERENCED_BY_GEOMETRY_SHADER  0x9309
+#define GL_REFERENCED_BY_FRAGMENT_SHADER  0x930A
+#define GL_REFERENCED_BY_COMPUTE_SHADER   0x930B
+#define GL_TOP_LEVEL_ARRAY_SIZE           0x930C
+#define GL_TOP_LEVEL_ARRAY_STRIDE         0x930D
+#define GL_LOCATION                       0x930E
+#define GL_LOCATION_INDEX                 0x930F
+#define GL_IS_PER_PATCH                   0x92E7
+#define GL_SHADER_STORAGE_BUFFER          0x90D2
+#define GL_SHADER_STORAGE_BUFFER_BINDING  0x90D3
+#define GL_SHADER_STORAGE_BUFFER_START    0x90D4
+#define GL_SHADER_STORAGE_BUFFER_SIZE     0x90D5
+#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
+#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
+#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
+#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
+#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
+#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE  0x90DE
+#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
+#define GL_SHADER_STORAGE_BARRIER_BIT     0x00002000
+#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
+#define GL_DEPTH_STENCIL_TEXTURE_MODE     0x90EA
+#define GL_TEXTURE_BUFFER_OFFSET          0x919D
+#define GL_TEXTURE_BUFFER_SIZE            0x919E
+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
+#define GL_TEXTURE_VIEW_MIN_LEVEL         0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS        0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER         0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS        0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS       0x82DF
+#define GL_VERTEX_ATTRIB_BINDING          0x82D4
+#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET  0x82D5
+#define GL_VERTEX_BINDING_DIVISOR         0x82D6
+#define GL_VERTEX_BINDING_OFFSET          0x82D7
+#define GL_VERTEX_BINDING_STRIDE          0x82D8
+#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
+#define GL_MAX_VERTEX_ATTRIB_BINDINGS     0x82DA
+#define GL_VERTEX_BINDING_BUFFER          0x8F4F
+#define GL_DISPLAY_LIST                   0x82E7
+typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params);
+typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+GLAPI void APIENTRY glDispatchComputeIndirect (GLintptr indirect);
+GLAPI void APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+GLAPI void APIENTRY glFramebufferParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei count, GLint64 *params);
+GLAPI void APIENTRY glInvalidateTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glInvalidateTexImage (GLuint texture, GLint level);
+GLAPI void APIENTRY glInvalidateBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glInvalidateBufferData (GLuint buffer);
+GLAPI void APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiDrawArraysIndirect (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glGetProgramInterfaceiv (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+GLAPI GLuint APIENTRY glGetProgramResourceIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLint *params);
+GLAPI GLint APIENTRY glGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI GLint APIENTRY glGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+GLAPI void APIENTRY glTexBufferRange (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTexStorage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexStorage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureView (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+GLAPI void APIENTRY glBindVertexBuffer (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormat (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribIFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribLFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribBinding (GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexBindingDivisor (GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GLAPI void APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GLAPI void APIENTRY glPopDebugGroup (void);
+GLAPI void APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GLAPI void APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_VERSION_4_3 */
+
+#ifndef GL_VERSION_4_4
+#define GL_VERSION_4_4 1
+#define GL_MAX_VERTEX_ATTRIB_STRIDE       0x82E5
+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221
+#define GL_TEXTURE_BUFFER_BINDING         0x8C2A
+#define GL_MAP_PERSISTENT_BIT             0x0040
+#define GL_MAP_COHERENT_BIT               0x0080
+#define GL_DYNAMIC_STORAGE_BIT            0x0100
+#define GL_CLIENT_STORAGE_BIT             0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE       0x821F
+#define GL_BUFFER_STORAGE_FLAGS           0x8220
+#define GL_CLEAR_TEXTURE                  0x9365
+#define GL_LOCATION_COMPONENT             0x934A
+#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B
+#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C
+#define GL_QUERY_BUFFER                   0x9192
+#define GL_QUERY_BUFFER_BARRIER_BIT       0x00008000
+#define GL_QUERY_BUFFER_BINDING           0x9193
+#define GL_QUERY_RESULT_NO_WAIT           0x9194
+#define GL_MIRROR_CLAMP_TO_EDGE           0x8743
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+typedef void (APIENTRYP PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint *samplers);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorage (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearTexImage (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glBindBuffersBase (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+GLAPI void APIENTRY glBindBuffersRange (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+GLAPI void APIENTRY glBindTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindSamplers (GLuint first, GLsizei count, const GLuint *samplers);
+GLAPI void APIENTRY glBindImageTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#endif
+#endif /* GL_VERSION_4_4 */
+
+#ifndef GL_VERSION_4_5
+#define GL_VERSION_4_5 1
+#define GL_CONTEXT_LOST                   0x0507
+#define GL_NEGATIVE_ONE_TO_ONE            0x935E
+#define GL_ZERO_TO_ONE                    0x935F
+#define GL_CLIP_ORIGIN                    0x935C
+#define GL_CLIP_DEPTH_MODE                0x935D
+#define GL_QUERY_WAIT_INVERTED            0x8E17
+#define GL_QUERY_NO_WAIT_INVERTED         0x8E18
+#define GL_QUERY_BY_REGION_WAIT_INVERTED  0x8E19
+#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A
+#define GL_MAX_CULL_DISTANCES             0x82F9
+#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA
+#define GL_TEXTURE_TARGET                 0x1006
+#define GL_QUERY_TARGET                   0x82EA
+#define GL_GUILTY_CONTEXT_RESET           0x8253
+#define GL_INNOCENT_CONTEXT_RESET         0x8254
+#define GL_UNKNOWN_CONTEXT_RESET          0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY    0x8256
+#define GL_LOSE_CONTEXT_ON_RESET          0x8252
+#define GL_NO_RESET_NOTIFICATION          0x8261
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_MINMAX                         0x802E
+#define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
+#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
+typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
+typedef void (APIENTRYP PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum buf);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum src);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef void (APIENTRYP PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint *textures);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+typedef void (APIENTRYP PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint *samplers);
+typedef void (APIENTRYP PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef void (APIENTRYP PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSPROC) (void);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNMAPDVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClipControl (GLenum origin, GLenum depth);
+GLAPI void APIENTRY glCreateTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glTransformFeedbackBufferBase (GLuint xfb, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackBufferRange (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glGetTransformFeedbackiv (GLuint xfb, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki_v (GLuint xfb, GLenum pname, GLuint index, GLint *param);
+GLAPI void APIENTRY glGetTransformFeedbacki64_v (GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
+GLAPI void APIENTRY glCreateBuffers (GLsizei n, GLuint *buffers);
+GLAPI void APIENTRY glNamedBufferStorage (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferData (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glCopyNamedBufferSubData (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glClearNamedBufferData (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubData (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void *APIENTRY glMapNamedBuffer (GLuint buffer, GLenum access);
+GLAPI void *APIENTRY glMapNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI GLboolean APIENTRY glUnmapNamedBuffer (GLuint buffer);
+GLAPI void APIENTRY glFlushMappedNamedBufferRange (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glGetNamedBufferParameteriv (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferParameteri64v (GLuint buffer, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetNamedBufferPointerv (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glCreateFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI void APIENTRY glNamedFramebufferRenderbuffer (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glNamedFramebufferParameteri (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glNamedFramebufferTexture (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayer (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffer (GLuint framebuffer, GLenum buf);
+GLAPI void APIENTRY glNamedFramebufferDrawBuffers (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glNamedFramebufferReadBuffer (GLuint framebuffer, GLenum src);
+GLAPI void APIENTRY glInvalidateNamedFramebufferData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateNamedFramebufferSubData (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glClearNamedFramebufferiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearNamedFramebufferuiv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearNamedFramebufferfv (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearNamedFramebufferfi (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI void APIENTRY glBlitNamedFramebuffer (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatus (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glGetNamedFramebufferParameteriv (GLuint framebuffer, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameteriv (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glNamedRenderbufferStorage (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisample (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameteriv (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateTextures (GLenum target, GLsizei n, GLuint *textures);
+GLAPI void APIENTRY glTextureBuffer (GLuint texture, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureBufferRange (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3D (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisample (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCompressedTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCopyTextureSubImage1D (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTextureSubImage3D (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureParameterf (GLuint texture, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfv (GLuint texture, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glTextureParameteri (GLuint texture, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterIiv (GLuint texture, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuiv (GLuint texture, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glTextureParameteriv (GLuint texture, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glGenerateTextureMipmap (GLuint texture);
+GLAPI void APIENTRY glBindTextureUnit (GLuint unit, GLuint texture);
+GLAPI void APIENTRY glGetTextureImage (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureImage (GLuint texture, GLint level, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetTextureLevelParameterfv (GLuint texture, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameteriv (GLuint texture, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterfv (GLuint texture, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterIiv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuiv (GLuint texture, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetTextureParameteriv (GLuint texture, GLenum pname, GLint *params);
+GLAPI void APIENTRY glCreateVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI void APIENTRY glDisableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glEnableVertexArrayAttrib (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glVertexArrayElementBuffer (GLuint vaobj, GLuint buffer);
+GLAPI void APIENTRY glVertexArrayVertexBuffer (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexBuffers (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+GLAPI void APIENTRY glVertexArrayAttribBinding (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayAttribFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribIFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayAttribLFormat (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayBindingDivisor (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glGetVertexArrayiv (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexediv (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayIndexed64iv (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
+GLAPI void APIENTRY glCreateSamplers (GLsizei n, GLuint *samplers);
+GLAPI void APIENTRY glCreateProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI void APIENTRY glCreateQueries (GLenum target, GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glGetQueryBufferObjecti64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectui64v (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glGetQueryBufferObjectuiv (GLuint id, GLuint buffer, GLenum pname, GLintptr offset);
+GLAPI void APIENTRY glMemoryBarrierByRegion (GLbitfield barriers);
+GLAPI void APIENTRY glGetTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetCompressedTextureSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
+GLAPI GLenum APIENTRY glGetGraphicsResetStatus (void);
+GLAPI void APIENTRY glGetnCompressedTexImage (GLenum target, GLint lod, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
+GLAPI void APIENTRY glGetnUniformdv (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnUniformfv (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformiv (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuiv (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glReadnPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnMapdv (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfv (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapiv (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfv (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuiv (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusv (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStipple (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTable (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilter (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilter (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glTextureBarrier (void);
+#endif
+#endif /* GL_VERSION_4_5 */
+
+#ifndef GL_VERSION_4_6
+#define GL_VERSION_4_6 1
+#define GL_SHADER_BINARY_FORMAT_SPIR_V    0x9551
+#define GL_SPIR_V_BINARY                  0x9552
+#define GL_PARAMETER_BUFFER               0x80EE
+#define GL_PARAMETER_BUFFER_BINDING       0x80EF
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT      0x00000008
+#define GL_VERTICES_SUBMITTED             0x82EE
+#define GL_PRIMITIVES_SUBMITTED           0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS      0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES    0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS    0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS     0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES      0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES     0x82F7
+#define GL_POLYGON_OFFSET_CLAMP           0x8E1B
+#define GL_SPIR_V_EXTENSIONS              0x9553
+#define GL_NUM_SPIR_V_EXTENSIONS          0x9554
+#define GL_TEXTURE_MAX_ANISOTROPY         0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY     0x84FF
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW    0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED
+typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpecializeShader (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+GLAPI void APIENTRY glMultiDrawArraysIndirectCount (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCount (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glPolygonOffsetClamp (GLfloat factor, GLfloat units, GLfloat clamp);
+#endif
+#endif /* GL_VERSION_4_6 */
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+#endif /* GL_ARB_ES2_compatibility */
+
+#ifndef GL_ARB_ES3_1_compatibility
+#define GL_ARB_ES3_1_compatibility 1
+#endif /* GL_ARB_ES3_1_compatibility */
+
+#ifndef GL_ARB_ES3_2_compatibility
+#define GL_ARB_ES3_2_compatibility 1
+#define GL_PRIMITIVE_BOUNDING_BOX_ARB     0x92BE
+#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381
+#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382
+typedef void (APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveBoundingBoxARB (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+#endif
+#endif /* GL_ARB_ES3_2_compatibility */
+
+#ifndef GL_ARB_ES3_compatibility
+#define GL_ARB_ES3_compatibility 1
+#endif /* GL_ARB_ES3_compatibility */
+
+#ifndef GL_ARB_arrays_of_arrays
+#define GL_ARB_arrays_of_arrays 1
+#endif /* GL_ARB_arrays_of_arrays */
+
+#ifndef GL_ARB_base_instance
+#define GL_ARB_base_instance 1
+#endif /* GL_ARB_base_instance */
+
+#ifndef GL_ARB_bindless_texture
+#define GL_ARB_bindless_texture 1
+typedef khronos_uint64_t GLuint64EXT;
+#define GL_UNSIGNED_INT64_ARB             0x140F
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleARB (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleARB (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentARB (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleARB (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentARB (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64ARB (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64ARB (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentARB (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glVertexAttribL1ui64ARB (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL1ui64vARB (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLui64vARB (GLuint index, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_ARB_bindless_texture */
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#endif /* GL_ARB_blend_func_extended */
+
+#ifndef GL_ARB_buffer_storage
+#define GL_ARB_buffer_storage 1
+#endif /* GL_ARB_buffer_storage */
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+struct _cl_context;
+struct _cl_event;
+#define GL_SYNC_CL_EVENT_ARB              0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
+typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#endif
+#endif /* GL_ARB_cl_event */
+
+#ifndef GL_ARB_clear_buffer_object
+#define GL_ARB_clear_buffer_object 1
+#endif /* GL_ARB_clear_buffer_object */
+
+#ifndef GL_ARB_clear_texture
+#define GL_ARB_clear_texture 1
+#endif /* GL_ARB_clear_texture */
+
+#ifndef GL_ARB_clip_control
+#define GL_ARB_clip_control 1
+#endif /* GL_ARB_clip_control */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif
+#endif /* GL_ARB_color_buffer_float */
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif /* GL_ARB_compatibility */
+
+#ifndef GL_ARB_compressed_texture_pixel_storage
+#define GL_ARB_compressed_texture_pixel_storage 1
+#endif /* GL_ARB_compressed_texture_pixel_storage */
+
+#ifndef GL_ARB_compute_shader
+#define GL_ARB_compute_shader 1
+#endif /* GL_ARB_compute_shader */
+
+#ifndef GL_ARB_compute_variable_group_size
+#define GL_ARB_compute_variable_group_size 1
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344
+#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345
+#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDispatchComputeGroupSizeARB (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#endif
+#endif /* GL_ARB_compute_variable_group_size */
+
+#ifndef GL_ARB_conditional_render_inverted
+#define GL_ARB_conditional_render_inverted 1
+#endif /* GL_ARB_conditional_render_inverted */
+
+#ifndef GL_ARB_conservative_depth
+#define GL_ARB_conservative_depth 1
+#endif /* GL_ARB_conservative_depth */
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#endif /* GL_ARB_copy_buffer */
+
+#ifndef GL_ARB_copy_image
+#define GL_ARB_copy_image 1
+#endif /* GL_ARB_copy_image */
+
+#ifndef GL_ARB_cull_distance
+#define GL_ARB_cull_distance 1
+#endif /* GL_ARB_cull_distance */
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
+#define GL_DEBUG_SOURCE_API_ARB           0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif
+#endif /* GL_ARB_debug_output */
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif /* GL_ARB_depth_buffer_float */
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif /* GL_ARB_depth_clamp */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif /* GL_ARB_depth_texture */
+
+#ifndef GL_ARB_derivative_control
+#define GL_ARB_derivative_control 1
+#endif /* GL_ARB_derivative_control */
+
+#ifndef GL_ARB_direct_state_access
+#define GL_ARB_direct_state_access 1
+#endif /* GL_ARB_direct_state_access */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ARB_draw_buffers */
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+#endif /* GL_ARB_draw_buffers_blend */
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#endif /* GL_ARB_draw_indirect */
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_ARB_draw_instanced */
+
+#ifndef GL_ARB_enhanced_layouts
+#define GL_ARB_enhanced_layouts 1
+#endif /* GL_ARB_enhanced_layouts */
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+#endif /* GL_ARB_explicit_attrib_location */
+
+#ifndef GL_ARB_explicit_uniform_location
+#define GL_ARB_explicit_uniform_location 1
+#endif /* GL_ARB_explicit_uniform_location */
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif /* GL_ARB_fragment_coord_conventions */
+
+#ifndef GL_ARB_fragment_layer_viewport
+#define GL_ARB_fragment_layer_viewport 1
+#endif /* GL_ARB_fragment_layer_viewport */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, void *string);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif
+#endif /* GL_ARB_fragment_program */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif /* GL_ARB_fragment_program_shadow */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif /* GL_ARB_fragment_shader */
+
+#ifndef GL_ARB_fragment_shader_interlock
+#define GL_ARB_fragment_shader_interlock 1
+#endif /* GL_ARB_fragment_shader_interlock */
+
+#ifndef GL_ARB_framebuffer_no_attachments
+#define GL_ARB_framebuffer_no_attachments 1
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#endif /* GL_ARB_framebuffer_object */
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif /* GL_ARB_framebuffer_sRGB */
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_ARB_geometry_shader4 */
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+#endif /* GL_ARB_get_program_binary */
+
+#ifndef GL_ARB_get_texture_sub_image
+#define GL_ARB_get_texture_sub_image 1
+#endif /* GL_ARB_get_texture_sub_image */
+
+#ifndef GL_ARB_gl_spirv
+#define GL_ARB_gl_spirv 1
+#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551
+#define GL_SPIR_V_BINARY_ARB              0x9552
+typedef void (APIENTRYP PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpecializeShaderARB (GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
+#endif
+#endif /* GL_ARB_gl_spirv */
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+#endif /* GL_ARB_gpu_shader5 */
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+#ifndef GL_ARB_gpu_shader_int64
+#define GL_ARB_gpu_shader_int64 1
+#define GL_INT64_ARB                      0x140E
+#define GL_INT64_VEC2_ARB                 0x8FE9
+#define GL_INT64_VEC3_ARB                 0x8FEA
+#define GL_INT64_VEC4_ARB                 0x8FEB
+#define GL_UNSIGNED_INT64_VEC2_ARB        0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_ARB        0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_ARB        0x8FF7
+typedef void (APIENTRYP PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64 *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64ARB (GLint location, GLint64 x);
+GLAPI void APIENTRY glUniform2i64ARB (GLint location, GLint64 x, GLint64 y);
+GLAPI void APIENTRY glUniform3i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z);
+GLAPI void APIENTRY glUniform4i64ARB (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+GLAPI void APIENTRY glUniform1i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform2i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform3i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform4i64vARB (GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glUniform1ui64ARB (GLint location, GLuint64 x);
+GLAPI void APIENTRY glUniform2ui64ARB (GLint location, GLuint64 x, GLuint64 y);
+GLAPI void APIENTRY glUniform3ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+GLAPI void APIENTRY glUniform4ui64ARB (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+GLAPI void APIENTRY glUniform1ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform2ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform3ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glUniform4ui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glGetUniformi64vARB (GLuint program, GLint location, GLint64 *params);
+GLAPI void APIENTRY glGetUniformui64vARB (GLuint program, GLint location, GLuint64 *params);
+GLAPI void APIENTRY glGetnUniformi64vARB (GLuint program, GLint location, GLsizei bufSize, GLint64 *params);
+GLAPI void APIENTRY glGetnUniformui64vARB (GLuint program, GLint location, GLsizei bufSize, GLuint64 *params);
+GLAPI void APIENTRY glProgramUniform1i64ARB (GLuint program, GLint location, GLint64 x);
+GLAPI void APIENTRY glProgramUniform2i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y);
+GLAPI void APIENTRY glProgramUniform3i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z);
+GLAPI void APIENTRY glProgramUniform4i64ARB (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w);
+GLAPI void APIENTRY glProgramUniform1i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform2i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform3i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform4i64vARB (GLuint program, GLint location, GLsizei count, const GLint64 *value);
+GLAPI void APIENTRY glProgramUniform1ui64ARB (GLuint program, GLint location, GLuint64 x);
+GLAPI void APIENTRY glProgramUniform2ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y);
+GLAPI void APIENTRY glProgramUniform3ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z);
+GLAPI void APIENTRY glProgramUniform4ui64ARB (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w);
+GLAPI void APIENTRY glProgramUniform1ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform2ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform3ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniform4ui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *value);
+#endif
+#endif /* GL_ARB_gpu_shader_int64 */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+typedef khronos_uint16_t GLhalfARB;
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif /* GL_ARB_half_float_pixel */
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif /* GL_ARB_half_float_vertex */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif
+#endif /* GL_ARB_imaging */
+
+#ifndef GL_ARB_indirect_parameters
+#define GL_ARB_indirect_parameters 1
+#define GL_PARAMETER_BUFFER_ARB           0x80EE
+#define GL_PARAMETER_BUFFER_BINDING_ARB   0x80EF
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_ARB_indirect_parameters */
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif
+#endif /* GL_ARB_instanced_arrays */
+
+#ifndef GL_ARB_internalformat_query
+#define GL_ARB_internalformat_query 1
+#endif /* GL_ARB_internalformat_query */
+
+#ifndef GL_ARB_internalformat_query2
+#define GL_ARB_internalformat_query2 1
+#define GL_SRGB_DECODE_ARB                0x8299
+#define GL_VIEW_CLASS_EAC_R11             0x9383
+#define GL_VIEW_CLASS_EAC_RG11            0x9384
+#define GL_VIEW_CLASS_ETC2_RGB            0x9385
+#define GL_VIEW_CLASS_ETC2_RGBA           0x9386
+#define GL_VIEW_CLASS_ETC2_EAC_RGBA       0x9387
+#define GL_VIEW_CLASS_ASTC_4x4_RGBA       0x9388
+#define GL_VIEW_CLASS_ASTC_5x4_RGBA       0x9389
+#define GL_VIEW_CLASS_ASTC_5x5_RGBA       0x938A
+#define GL_VIEW_CLASS_ASTC_6x5_RGBA       0x938B
+#define GL_VIEW_CLASS_ASTC_6x6_RGBA       0x938C
+#define GL_VIEW_CLASS_ASTC_8x5_RGBA       0x938D
+#define GL_VIEW_CLASS_ASTC_8x6_RGBA       0x938E
+#define GL_VIEW_CLASS_ASTC_8x8_RGBA       0x938F
+#define GL_VIEW_CLASS_ASTC_10x5_RGBA      0x9390
+#define GL_VIEW_CLASS_ASTC_10x6_RGBA      0x9391
+#define GL_VIEW_CLASS_ASTC_10x8_RGBA      0x9392
+#define GL_VIEW_CLASS_ASTC_10x10_RGBA     0x9393
+#define GL_VIEW_CLASS_ASTC_12x10_RGBA     0x9394
+#define GL_VIEW_CLASS_ASTC_12x12_RGBA     0x9395
+#endif /* GL_ARB_internalformat_query2 */
+
+#ifndef GL_ARB_invalidate_subdata
+#define GL_ARB_invalidate_subdata 1
+#endif /* GL_ARB_invalidate_subdata */
+
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+#endif /* GL_ARB_map_buffer_alignment */
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#endif /* GL_ARB_map_buffer_range */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_ARB_matrix_palette */
+
+#ifndef GL_ARB_multi_bind
+#define GL_ARB_multi_bind 1
+#endif /* GL_ARB_multi_bind */
+
+#ifndef GL_ARB_multi_draw_indirect
+#define GL_ARB_multi_draw_indirect 1
+#endif /* GL_ARB_multi_draw_indirect */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLfloat value, GLboolean invert);
+#endif
+#endif /* GL_ARB_multisample */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif
+#endif /* GL_ARB_multitexture */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_ARB_occlusion_query */
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+#endif /* GL_ARB_occlusion_query2 */
+
+#ifndef GL_ARB_parallel_shader_compile
+#define GL_ARB_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0
+#define GL_COMPLETION_STATUS_ARB          0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsARB (GLuint count);
+#endif
+#endif /* GL_ARB_parallel_shader_compile */
+
+#ifndef GL_ARB_pipeline_statistics_query
+#define GL_ARB_pipeline_statistics_query 1
+#define GL_VERTICES_SUBMITTED_ARB         0x82EE
+#define GL_PRIMITIVES_SUBMITTED_ARB       0x82EF
+#define GL_VERTEX_SHADER_INVOCATIONS_ARB  0x82F0
+#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1
+#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2
+#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3
+#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4
+#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5
+#define GL_CLIPPING_INPUT_PRIMITIVES_ARB  0x82F6
+#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7
+#endif /* GL_ARB_pipeline_statistics_query */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif /* GL_ARB_pixel_buffer_object */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_ARB_point_parameters */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif /* GL_ARB_point_sprite */
+
+#ifndef GL_ARB_polygon_offset_clamp
+#define GL_ARB_polygon_offset_clamp 1
+#endif /* GL_ARB_polygon_offset_clamp */
+
+#ifndef GL_ARB_post_depth_coverage
+#define GL_ARB_post_depth_coverage 1
+#endif /* GL_ARB_post_depth_coverage */
+
+#ifndef GL_ARB_program_interface_query
+#define GL_ARB_program_interface_query 1
+#endif /* GL_ARB_program_interface_query */
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#endif /* GL_ARB_provoking_vertex */
+
+#ifndef GL_ARB_query_buffer_object
+#define GL_ARB_query_buffer_object 1
+#endif /* GL_ARB_query_buffer_object */
+
+#ifndef GL_ARB_robust_buffer_access_behavior
+#define GL_ARB_robust_buffer_access_behavior 1
+#endif /* GL_ARB_robust_buffer_access_behavior */
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
+GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#endif
+#endif /* GL_ARB_robustness */
+
+#ifndef GL_ARB_robustness_isolation
+#define GL_ARB_robustness_isolation 1
+#endif /* GL_ARB_robustness_isolation */
+
+#ifndef GL_ARB_sample_locations
+#define GL_ARB_sample_locations 1
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340
+#define GL_SAMPLE_LOCATION_ARB            0x8E50
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLEVALUATEDEPTHVALUESARBPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSampleLocationsfvARB (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvARB (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glEvaluateDepthValuesARB (void);
+#endif
+#endif /* GL_ARB_sample_locations */
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#define GL_SAMPLE_SHADING_ARB             0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
+#endif
+#endif /* GL_ARB_sample_shading */
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#endif /* GL_ARB_sampler_objects */
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif /* GL_ARB_seamless_cube_map */
+
+#ifndef GL_ARB_seamless_cubemap_per_texture
+#define GL_ARB_seamless_cubemap_per_texture 1
+#endif /* GL_ARB_seamless_cubemap_per_texture */
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+#endif /* GL_ARB_separate_shader_objects */
+
+#ifndef GL_ARB_shader_atomic_counter_ops
+#define GL_ARB_shader_atomic_counter_ops 1
+#endif /* GL_ARB_shader_atomic_counter_ops */
+
+#ifndef GL_ARB_shader_atomic_counters
+#define GL_ARB_shader_atomic_counters 1
+#endif /* GL_ARB_shader_atomic_counters */
+
+#ifndef GL_ARB_shader_ballot
+#define GL_ARB_shader_ballot 1
+#endif /* GL_ARB_shader_ballot */
+
+#ifndef GL_ARB_shader_bit_encoding
+#define GL_ARB_shader_bit_encoding 1
+#endif /* GL_ARB_shader_bit_encoding */
+
+#ifndef GL_ARB_shader_clock
+#define GL_ARB_shader_clock 1
+#endif /* GL_ARB_shader_clock */
+
+#ifndef GL_ARB_shader_draw_parameters
+#define GL_ARB_shader_draw_parameters 1
+#endif /* GL_ARB_shader_draw_parameters */
+
+#ifndef GL_ARB_shader_group_vote
+#define GL_ARB_shader_group_vote 1
+#endif /* GL_ARB_shader_group_vote */
+
+#ifndef GL_ARB_shader_image_load_store
+#define GL_ARB_shader_image_load_store 1
+#endif /* GL_ARB_shader_image_load_store */
+
+#ifndef GL_ARB_shader_image_size
+#define GL_ARB_shader_image_size 1
+#endif /* GL_ARB_shader_image_size */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef __APPLE__
+typedef void *GLhandleARB;
+#else
+typedef unsigned int GLhandleARB;
+#endif
+typedef char GLcharARB;
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+#endif /* GL_ARB_shader_objects */
+
+#ifndef GL_ARB_shader_precision
+#define GL_ARB_shader_precision 1
+#endif /* GL_ARB_shader_precision */
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+#endif /* GL_ARB_shader_stencil_export */
+
+#ifndef GL_ARB_shader_storage_buffer_object
+#define GL_ARB_shader_storage_buffer_object 1
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#endif /* GL_ARB_shader_subroutine */
+
+#ifndef GL_ARB_shader_texture_image_samples
+#define GL_ARB_shader_texture_image_samples 1
+#endif /* GL_ARB_shader_texture_image_samples */
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif /* GL_ARB_shader_texture_lod */
+
+#ifndef GL_ARB_shader_viewport_layer_array
+#define GL_ARB_shader_viewport_layer_array 1
+#endif /* GL_ARB_shader_viewport_layer_array */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif /* GL_ARB_shading_language_100 */
+
+#ifndef GL_ARB_shading_language_420pack
+#define GL_ARB_shading_language_420pack 1
+#endif /* GL_ARB_shading_language_420pack */
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ARB_shading_language_include */
+
+#ifndef GL_ARB_shading_language_packing
+#define GL_ARB_shading_language_packing 1
+#endif /* GL_ARB_shading_language_packing */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif /* GL_ARB_shadow */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif /* GL_ARB_shadow_ambient */
+
+#ifndef GL_ARB_sparse_buffer
+#define GL_ARB_sparse_buffer 1
+#define GL_SPARSE_STORAGE_BIT_ARB         0x0400
+#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB    0x82F8
+typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTARBPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferPageCommitmentARB (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentARB (GLuint buffer, GLintptr offset, GLsizeiptr size, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_buffer */
+
+#ifndef GL_ARB_sparse_texture
+#define GL_ARB_sparse_texture 1
+#define GL_TEXTURE_SPARSE_ARB             0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB    0x91A7
+#define GL_NUM_SPARSE_LEVELS_ARB          0x91AA
+#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB     0x91A8
+#define GL_VIRTUAL_PAGE_SIZE_X_ARB        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_ARB        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_ARB        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+#endif
+#endif /* GL_ARB_sparse_texture */
+
+#ifndef GL_ARB_sparse_texture2
+#define GL_ARB_sparse_texture2 1
+#endif /* GL_ARB_sparse_texture2 */
+
+#ifndef GL_ARB_sparse_texture_clamp
+#define GL_ARB_sparse_texture_clamp 1
+#endif /* GL_ARB_sparse_texture_clamp */
+
+#ifndef GL_ARB_spirv_extensions
+#define GL_ARB_spirv_extensions 1
+#endif /* GL_ARB_spirv_extensions */
+
+#ifndef GL_ARB_stencil_texturing
+#define GL_ARB_stencil_texturing 1
+#endif /* GL_ARB_stencil_texturing */
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#endif /* GL_ARB_sync */
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#endif /* GL_ARB_tessellation_shader */
+
+#ifndef GL_ARB_texture_barrier
+#define GL_ARB_texture_barrier 1
+#endif /* GL_ARB_texture_barrier */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif /* GL_ARB_texture_border_clamp */
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_ARB_texture_buffer_object */
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+#endif /* GL_ARB_texture_buffer_object_rgb32 */
+
+#ifndef GL_ARB_texture_buffer_range
+#define GL_ARB_texture_buffer_range 1
+#endif /* GL_ARB_texture_buffer_range */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void *img);
+#endif
+#endif /* GL_ARB_texture_compression */
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif /* GL_ARB_texture_compression_bptc */
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif /* GL_ARB_texture_compression_rgtc */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif /* GL_ARB_texture_cube_map */
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+#endif /* GL_ARB_texture_cube_map_array */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif /* GL_ARB_texture_env_add */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif /* GL_ARB_texture_env_combine */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif /* GL_ARB_texture_env_crossbar */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif /* GL_ARB_texture_env_dot3 */
+
+#ifndef GL_ARB_texture_filter_anisotropic
+#define GL_ARB_texture_filter_anisotropic 1
+#endif /* GL_ARB_texture_filter_anisotropic */
+
+#ifndef GL_ARB_texture_filter_minmax
+#define GL_ARB_texture_filter_minmax 1
+#define GL_TEXTURE_REDUCTION_MODE_ARB     0x9366
+#define GL_WEIGHTED_AVERAGE_ARB           0x9367
+#endif /* GL_ARB_texture_filter_minmax */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif /* GL_ARB_texture_float */
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
+#endif /* GL_ARB_texture_gather */
+
+#ifndef GL_ARB_texture_mirror_clamp_to_edge
+#define GL_ARB_texture_mirror_clamp_to_edge 1
+#endif /* GL_ARB_texture_mirror_clamp_to_edge */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#endif /* GL_ARB_texture_multisample */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif /* GL_ARB_texture_non_power_of_two */
+
+#ifndef GL_ARB_texture_query_levels
+#define GL_ARB_texture_query_levels 1
+#endif /* GL_ARB_texture_query_levels */
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif /* GL_ARB_texture_query_lod */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif /* GL_ARB_texture_rectangle */
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif /* GL_ARB_texture_rg */
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+#endif /* GL_ARB_texture_rgb10_a2ui */
+
+#ifndef GL_ARB_texture_stencil8
+#define GL_ARB_texture_stencil8 1
+#endif /* GL_ARB_texture_stencil8 */
+
+#ifndef GL_ARB_texture_storage
+#define GL_ARB_texture_storage 1
+#endif /* GL_ARB_texture_storage */
+
+#ifndef GL_ARB_texture_storage_multisample
+#define GL_ARB_texture_storage_multisample 1
+#endif /* GL_ARB_texture_storage_multisample */
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+#endif /* GL_ARB_texture_swizzle */
+
+#ifndef GL_ARB_texture_view
+#define GL_ARB_texture_view 1
+#endif /* GL_ARB_texture_view */
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#endif /* GL_ARB_timer_query */
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#endif /* GL_ARB_transform_feedback2 */
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#endif /* GL_ARB_transform_feedback3 */
+
+#ifndef GL_ARB_transform_feedback_instanced
+#define GL_ARB_transform_feedback_instanced 1
+#endif /* GL_ARB_transform_feedback_instanced */
+
+#ifndef GL_ARB_transform_feedback_overflow_query
+#define GL_ARB_transform_feedback_overflow_query 1
+#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC
+#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED
+#endif /* GL_ARB_transform_feedback_overflow_query */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif
+#endif /* GL_ARB_transpose_matrix */
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#endif /* GL_ARB_uniform_buffer_object */
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif /* GL_ARB_vertex_array_bgra */
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#endif /* GL_ARB_vertex_array_object */
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+#ifndef GL_ARB_vertex_attrib_binding
+#define GL_ARB_vertex_attrib_binding 1
+#endif /* GL_ARB_vertex_attrib_binding */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif
+#endif /* GL_ARB_vertex_blend */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+typedef khronos_ssize_t GLsizeiptrARB;
+typedef khronos_intptr_t GLintptrARB;
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+GLAPI void *APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, void **pointer);
+#endif
+#endif /* GL_ARB_vertex_program */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif
+#endif /* GL_ARB_vertex_shader */
+
+#ifndef GL_ARB_vertex_type_10f_11f_11f_rev
+#define GL_ARB_vertex_type_10f_11f_11f_rev 1
+#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYDVNVPROC) (GLuint first, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDDNVPROC) (GLuint index, GLdouble n, GLdouble f);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangeArraydvNV (GLuint first, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glDepthRangeIndexeddNV (GLuint index, GLdouble n, GLdouble f);
+#endif
+#endif /* GL_ARB_viewport_array */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif
+#endif /* GL_ARB_window_pos */
+
+#ifndef GL_KHR_blend_equation_advanced
+#define GL_KHR_blend_equation_advanced 1
+#define GL_MULTIPLY_KHR                   0x9294
+#define GL_SCREEN_KHR                     0x9295
+#define GL_OVERLAY_KHR                    0x9296
+#define GL_DARKEN_KHR                     0x9297
+#define GL_LIGHTEN_KHR                    0x9298
+#define GL_COLORDODGE_KHR                 0x9299
+#define GL_COLORBURN_KHR                  0x929A
+#define GL_HARDLIGHT_KHR                  0x929B
+#define GL_SOFTLIGHT_KHR                  0x929C
+#define GL_DIFFERENCE_KHR                 0x929E
+#define GL_EXCLUSION_KHR                  0x92A0
+#define GL_HSL_HUE_KHR                    0x92AD
+#define GL_HSL_SATURATION_KHR             0x92AE
+#define GL_HSL_COLOR_KHR                  0x92AF
+#define GL_HSL_LUMINOSITY_KHR             0x92B0
+typedef void (APIENTRYP PFNGLBLENDBARRIERKHRPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendBarrierKHR (void);
+#endif
+#endif /* GL_KHR_blend_equation_advanced */
+
+#ifndef GL_KHR_blend_equation_advanced_coherent
+#define GL_KHR_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_KHR    0x9285
+#endif /* GL_KHR_blend_equation_advanced_coherent */
+
+#ifndef GL_KHR_context_flush_control
+#define GL_KHR_context_flush_control 1
+#endif /* GL_KHR_context_flush_control */
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#endif /* GL_KHR_debug */
+
+#ifndef GL_KHR_no_error
+#define GL_KHR_no_error 1
+#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
+#endif /* GL_KHR_no_error */
+
+#ifndef GL_KHR_parallel_shader_compile
+#define GL_KHR_parallel_shader_compile 1
+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
+#define GL_COMPLETION_STATUS_KHR          0x91B1
+typedef void (APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
+#endif
+#endif /* GL_KHR_parallel_shader_compile */
+
+#ifndef GL_KHR_robust_buffer_access_behavior
+#define GL_KHR_robust_buffer_access_behavior 1
+#endif /* GL_KHR_robust_buffer_access_behavior */
+
+#ifndef GL_KHR_robustness
+#define GL_KHR_robustness 1
+#define GL_CONTEXT_ROBUST_ACCESS          0x90F3
+#endif /* GL_KHR_robustness */
+
+#ifndef GL_KHR_shader_subgroup
+#define GL_KHR_shader_subgroup 1
+#define GL_SUBGROUP_SIZE_KHR              0x9532
+#define GL_SUBGROUP_SUPPORTED_STAGES_KHR  0x9533
+#define GL_SUBGROUP_SUPPORTED_FEATURES_KHR 0x9534
+#define GL_SUBGROUP_QUAD_ALL_STAGES_KHR   0x9535
+#define GL_SUBGROUP_FEATURE_BASIC_BIT_KHR 0x00000001
+#define GL_SUBGROUP_FEATURE_VOTE_BIT_KHR  0x00000002
+#define GL_SUBGROUP_FEATURE_ARITHMETIC_BIT_KHR 0x00000004
+#define GL_SUBGROUP_FEATURE_BALLOT_BIT_KHR 0x00000008
+#define GL_SUBGROUP_FEATURE_SHUFFLE_BIT_KHR 0x00000010
+#define GL_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT_KHR 0x00000020
+#define GL_SUBGROUP_FEATURE_CLUSTERED_BIT_KHR 0x00000040
+#define GL_SUBGROUP_FEATURE_QUAD_BIT_KHR  0x00000080
+#endif /* GL_KHR_shader_subgroup */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR   0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR   0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR   0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR   0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR   0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR   0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR   0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR   0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR  0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR  0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR  0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif /* GL_KHR_texture_compression_astc_ldr */
+
+#ifndef GL_KHR_texture_compression_astc_sliced_3d
+#define GL_KHR_texture_compression_astc_sliced_3d 1
+#endif /* GL_KHR_texture_compression_astc_sliced_3d */
+
+#ifndef GL_OES_byte_coordinates
+#define GL_OES_byte_coordinates 1
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD1BOESPROC) (GLbyte s);
+typedef void (APIENTRYP PFNGLTEXCOORD1BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLTEXCOORD2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLTEXCOORD3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLTEXCOORD4BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX2BOESPROC) (GLbyte x, GLbyte y);
+typedef void (APIENTRYP PFNGLVERTEX2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX3BOESPROC) (GLbyte x, GLbyte y, GLbyte z);
+typedef void (APIENTRYP PFNGLVERTEX3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+typedef void (APIENTRYP PFNGLVERTEX4BVOESPROC) (const GLbyte *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiTexCoord1bOES (GLenum texture, GLbyte s);
+GLAPI void APIENTRY glMultiTexCoord1bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord2bOES (GLenum texture, GLbyte s, GLbyte t);
+GLAPI void APIENTRY glMultiTexCoord2bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord3bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glMultiTexCoord3bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord4bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glMultiTexCoord4bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord1bOES (GLbyte s);
+GLAPI void APIENTRY glTexCoord1bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord2bOES (GLbyte s, GLbyte t);
+GLAPI void APIENTRY glTexCoord2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord3bOES (GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glTexCoord3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord4bOES (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glTexCoord4bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex2bOES (GLbyte x, GLbyte y);
+GLAPI void APIENTRY glVertex2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex3bOES (GLbyte x, GLbyte y, GLbyte z);
+GLAPI void APIENTRY glVertex3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex4bOES (GLbyte x, GLbyte y, GLbyte z, GLbyte w);
+GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords);
+#endif
+#endif /* GL_OES_byte_coordinates */
+
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#define GL_PALETTE4_RGB8_OES              0x8B90
+#define GL_PALETTE4_RGBA8_OES             0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES          0x8B92
+#define GL_PALETTE4_RGBA4_OES             0x8B93
+#define GL_PALETTE4_RGB5_A1_OES           0x8B94
+#define GL_PALETTE8_RGB8_OES              0x8B95
+#define GL_PALETTE8_RGBA8_OES             0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES          0x8B97
+#define GL_PALETTE8_RGBA4_OES             0x8B98
+#define GL_PALETTE8_RGB5_A1_OES           0x8B99
+#endif /* GL_OES_compressed_paletted_texture */
+
+#ifndef GL_OES_fixed_point
+#define GL_OES_fixed_point 1
+typedef khronos_int32_t GLfixed;
+#define GL_FIXED_OES                      0x140C
+typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
+typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
+typedef void (APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
+typedef void (APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
+typedef void (APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
+typedef void (APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
+typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLACCUMXOESPROC) (GLenum op, GLfixed value);
+typedef void (APIENTRYP PFNGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+typedef void (APIENTRYP PFNGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue);
+typedef void (APIENTRYP PFNGLCOLOR3XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCOLOR4XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLEVALCOORD1XOESPROC) (GLfixed u);
+typedef void (APIENTRYP PFNGLEVALCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v);
+typedef void (APIENTRYP PFNGLEVALCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v);
+typedef void (APIENTRYP PFNGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values);
+typedef void (APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLINDEXXOESPROC) (GLfixed component);
+typedef void (APIENTRYP PFNGLINDEXXVOESPROC) (const GLfixed *component);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+typedef void (APIENTRYP PFNGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+typedef void (APIENTRYP PFNGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2);
+typedef void (APIENTRYP PFNGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLNORMAL3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLPASSTHROUGHXOESPROC) (GLfixed token);
+typedef void (APIENTRYP PFNGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values);
+typedef void (APIENTRYP PFNGLPIXELSTOREXPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+typedef void (APIENTRYP PFNGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLRASTERPOS2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLRASTERPOS3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+typedef void (APIENTRYP PFNGLRASTERPOS4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+typedef void (APIENTRYP PFNGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2);
+typedef void (APIENTRYP PFNGLTEXCOORD1XOESPROC) (GLfixed s);
+typedef void (APIENTRYP PFNGLTEXCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLTEXCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLTEXCOORD3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLTEXCOORD4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLVERTEX2XOESPROC) (GLfixed x);
+typedef void (APIENTRYP PFNGLVERTEX2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX3XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLVERTEX3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLVERTEX4XVOESPROC) (const GLfixed *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref);
+GLAPI void APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearDepthxOES (GLfixed depth);
+GLAPI void APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
+GLAPI void APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glDepthRangexOES (GLfixed n, GLfixed f);
+GLAPI void APIENTRY glFogxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glFogxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation);
+GLAPI void APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glLineWidthxOES (GLfixed width);
+GLAPI void APIENTRY glLoadMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glMultMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
+GLAPI void APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glPointSizexOES (GLfixed size);
+GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
+GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glAccumxOES (GLenum op, GLfixed value);
+GLAPI void APIENTRY glBitmapxOES (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+GLAPI void APIENTRY glBlendColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearAccumxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glColor3xOES (GLfixed red, GLfixed green, GLfixed blue);
+GLAPI void APIENTRY glColor3xvOES (const GLfixed *components);
+GLAPI void APIENTRY glColor4xvOES (const GLfixed *components);
+GLAPI void APIENTRY glConvolutionParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glConvolutionParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glEvalCoord1xOES (GLfixed u);
+GLAPI void APIENTRY glEvalCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glEvalCoord2xOES (GLfixed u, GLfixed v);
+GLAPI void APIENTRY glEvalCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glFeedbackBufferxOES (GLsizei n, GLenum type, const GLfixed *buffer);
+GLAPI void APIENTRY glGetConvolutionParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetHistogramParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetLightxOES (GLenum light, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetMapxvOES (GLenum target, GLenum query, GLfixed *v);
+GLAPI void APIENTRY glGetMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glGetPixelMapxv (GLenum map, GLint size, GLfixed *values);
+GLAPI void APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexLevelParameterxvOES (GLenum target, GLint level, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glIndexxOES (GLfixed component);
+GLAPI void APIENTRY glIndexxvOES (const GLfixed *component);
+GLAPI void APIENTRY glLoadTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMap1xOES (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+GLAPI void APIENTRY glMap2xOES (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+GLAPI void APIENTRY glMapGrid1xOES (GLint n, GLfixed u1, GLfixed u2);
+GLAPI void APIENTRY glMapGrid2xOES (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+GLAPI void APIENTRY glMultTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord1xOES (GLenum texture, GLfixed s);
+GLAPI void APIENTRY glMultiTexCoord1xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord2xOES (GLenum texture, GLfixed s, GLfixed t);
+GLAPI void APIENTRY glMultiTexCoord2xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord3xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glMultiTexCoord3xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord4xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glNormal3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glPassThroughxOES (GLfixed token);
+GLAPI void APIENTRY glPixelMapx (GLenum map, GLint size, const GLfixed *values);
+GLAPI void APIENTRY glPixelStorex (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelTransferxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelZoomxOES (GLfixed xfactor, GLfixed yfactor);
+GLAPI void APIENTRY glPrioritizeTexturesxOES (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+GLAPI void APIENTRY glRasterPos2xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glRasterPos2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos3xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glRasterPos3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos4xOES (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+GLAPI void APIENTRY glRasterPos4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRectxOES (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+GLAPI void APIENTRY glRectxvOES (const GLfixed *v1, const GLfixed *v2);
+GLAPI void APIENTRY glTexCoord1xOES (GLfixed s);
+GLAPI void APIENTRY glTexCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord2xOES (GLfixed s, GLfixed t);
+GLAPI void APIENTRY glTexCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord3xOES (GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glTexCoord3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord4xOES (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glTexCoord4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glVertex2xOES (GLfixed x);
+GLAPI void APIENTRY glVertex2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex3xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glVertex3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex4xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glVertex4xvOES (const GLfixed *coords);
+#endif
+#endif /* GL_OES_fixed_point */
+
+#ifndef GL_OES_query_matrix
+#define GL_OES_query_matrix 1
+typedef GLbitfield (APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent);
+#endif
+#endif /* GL_OES_query_matrix */
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif /* GL_OES_read_format */
+
+#ifndef GL_OES_single_precision
+#define GL_OES_single_precision 1
+typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
+typedef void (APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
+typedef void (APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearDepthfOES (GLclampf depth);
+GLAPI void APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
+GLAPI void APIENTRY glDepthRangefOES (GLclampf n, GLclampf f);
+GLAPI void APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+GLAPI void APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation);
+GLAPI void APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#endif
+#endif /* GL_OES_single_precision */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif /* GL_3DFX_multisample */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif
+#endif /* GL_3DFX_tbuffer */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+#define GL_FACTOR_MIN_AMD                 0x901C
+#define GL_FACTOR_MAX_AMD                 0x901D
+#endif /* GL_AMD_blend_minmax_factor */
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+#endif /* GL_AMD_conservative_depth */
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif
+#endif /* GL_AMD_debug_output */
+
+#ifndef GL_AMD_depth_clamp_separate
+#define GL_AMD_depth_clamp_separate 1
+#define GL_DEPTH_CLAMP_NEAR_AMD           0x901E
+#define GL_DEPTH_CLAMP_FAR_AMD            0x901F
+#endif /* GL_AMD_depth_clamp_separate */
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_AMD_draw_buffers_blend */
+
+#ifndef GL_AMD_framebuffer_multisample_advanced
+#define GL_AMD_framebuffer_multisample_advanced 1
+#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
+#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
+#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
+#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
+#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
+#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_AMD_framebuffer_multisample_advanced */
+
+#ifndef GL_AMD_framebuffer_sample_positions
+#define GL_AMD_framebuffer_sample_positions 1
+#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
+#define GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD 0x91AE
+#define GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD 0x91AF
+#define GL_ALL_PIXELS_AMD                 0xFFFFFFFF
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLEPOSITIONSFVAMDPROC) (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERFVAMDPROC) (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERFVAMDPROC) (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSamplePositionsfvAMD (GLenum target, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
+GLAPI void APIENTRY glNamedFramebufferSamplePositionsfvAMD (GLuint framebuffer, GLuint numsamples, GLuint pixelindex, const GLfloat *values);
+GLAPI void APIENTRY glGetFramebufferParameterfvAMD (GLenum target, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
+GLAPI void APIENTRY glGetNamedFramebufferParameterfvAMD (GLuint framebuffer, GLenum pname, GLuint numsamples, GLuint pixelindex, GLsizei size, GLfloat *values);
+#endif
+#endif /* GL_AMD_framebuffer_sample_positions */
+
+#ifndef GL_AMD_gcn_shader
+#define GL_AMD_gcn_shader 1
+#endif /* GL_AMD_gcn_shader */
+
+#ifndef GL_AMD_gpu_shader_half_float
+#define GL_AMD_gpu_shader_half_float 1
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
+#define GL_FLOAT16_MAT2_AMD               0x91C5
+#define GL_FLOAT16_MAT3_AMD               0x91C6
+#define GL_FLOAT16_MAT4_AMD               0x91C7
+#define GL_FLOAT16_MAT2x3_AMD             0x91C8
+#define GL_FLOAT16_MAT2x4_AMD             0x91C9
+#define GL_FLOAT16_MAT3x2_AMD             0x91CA
+#define GL_FLOAT16_MAT3x4_AMD             0x91CB
+#define GL_FLOAT16_MAT4x2_AMD             0x91CC
+#define GL_FLOAT16_MAT4x3_AMD             0x91CD
+#endif /* GL_AMD_gpu_shader_half_float */
+
+#ifndef GL_AMD_gpu_shader_int16
+#define GL_AMD_gpu_shader_int16 1
+#endif /* GL_AMD_gpu_shader_int16 */
+
+#ifndef GL_AMD_gpu_shader_int64
+#define GL_AMD_gpu_shader_int64 1
+typedef khronos_int64_t GLint64EXT;
+#define GL_INT64_NV                       0x140E
+#define GL_UNSIGNED_INT64_NV              0x140F
+#define GL_INT8_NV                        0x8FE0
+#define GL_INT8_VEC2_NV                   0x8FE1
+#define GL_INT8_VEC3_NV                   0x8FE2
+#define GL_INT8_VEC4_NV                   0x8FE3
+#define GL_INT16_NV                       0x8FE4
+#define GL_INT16_VEC2_NV                  0x8FE5
+#define GL_INT16_VEC3_NV                  0x8FE6
+#define GL_INT16_VEC4_NV                  0x8FE7
+#define GL_INT64_VEC2_NV                  0x8FE9
+#define GL_INT64_VEC3_NV                  0x8FEA
+#define GL_INT64_VEC4_NV                  0x8FEB
+#define GL_UNSIGNED_INT8_NV               0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
+#define GL_UNSIGNED_INT16_NV              0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
+GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
+GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_AMD_gpu_shader_int64 */
+
+#ifndef GL_AMD_interleaved_elements
+#define GL_AMD_interleaved_elements 1
+#define GL_VERTEX_ELEMENT_SWIZZLE_AMD     0x91A4
+#define GL_VERTEX_ID_SWIZZLE_AMD          0x91A5
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribParameteriAMD (GLuint index, GLenum pname, GLint param);
+#endif
+#endif /* GL_AMD_interleaved_elements */
+
+#ifndef GL_AMD_multi_draw_indirect
+#define GL_AMD_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectAMD (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#endif
+#endif /* GL_AMD_multi_draw_indirect */
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+#define GL_DATA_BUFFER_AMD                0x9151
+#define GL_PERFORMANCE_MONITOR_AMD        0x9152
+#define GL_QUERY_OBJECT_AMD               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
+#define GL_SAMPLER_OBJECT_AMD             0x9155
+typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
+typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
+typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
+GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
+GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
+#endif
+#endif /* GL_AMD_name_gen_delete */
+
+#ifndef GL_AMD_occlusion_query_event
+#define GL_AMD_occlusion_query_event 1
+#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F
+#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001
+#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002
+#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004
+#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008
+#define GL_QUERY_ALL_EVENT_BITS_AMD       0xFFFFFFFF
+typedef void (APIENTRYP PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryObjectParameteruiAMD (GLenum target, GLuint id, GLenum pname, GLuint param);
+#endif
+#endif /* GL_AMD_occlusion_query_event */
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+#endif /* GL_AMD_performance_monitor */
+
+#ifndef GL_AMD_pinned_memory
+#define GL_AMD_pinned_memory 1
+#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
+#endif /* GL_AMD_pinned_memory */
+
+#ifndef GL_AMD_query_buffer_object
+#define GL_AMD_query_buffer_object 1
+#define GL_QUERY_BUFFER_AMD               0x9192
+#define GL_QUERY_BUFFER_BINDING_AMD       0x9193
+#define GL_QUERY_RESULT_NO_WAIT_AMD       0x9194
+#endif /* GL_AMD_query_buffer_object */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
+#endif
+#endif /* GL_AMD_sample_positions */
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif /* GL_AMD_seamless_cubemap_per_texture */
+
+#ifndef GL_AMD_shader_atomic_counter_ops
+#define GL_AMD_shader_atomic_counter_ops 1
+#endif /* GL_AMD_shader_atomic_counter_ops */
+
+#ifndef GL_AMD_shader_ballot
+#define GL_AMD_shader_ballot 1
+#endif /* GL_AMD_shader_ballot */
+
+#ifndef GL_AMD_shader_explicit_vertex_parameter
+#define GL_AMD_shader_explicit_vertex_parameter 1
+#endif /* GL_AMD_shader_explicit_vertex_parameter */
+
+#ifndef GL_AMD_shader_gpu_shader_half_float_fetch
+#define GL_AMD_shader_gpu_shader_half_float_fetch 1
+#endif /* GL_AMD_shader_gpu_shader_half_float_fetch */
+
+#ifndef GL_AMD_shader_image_load_store_lod
+#define GL_AMD_shader_image_load_store_lod 1
+#endif /* GL_AMD_shader_image_load_store_lod */
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif /* GL_AMD_shader_stencil_export */
+
+#ifndef GL_AMD_shader_trinary_minmax
+#define GL_AMD_shader_trinary_minmax 1
+#endif /* GL_AMD_shader_trinary_minmax */
+
+#ifndef GL_AMD_sparse_texture
+#define GL_AMD_sparse_texture 1
+#define GL_VIRTUAL_PAGE_SIZE_X_AMD        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_AMD        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_AMD        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A
+#define GL_MIN_SPARSE_LEVEL_AMD           0x919B
+#define GL_MIN_LOD_WARNING_AMD            0x919C
+#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001
+typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorageSparseAMD (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+GLAPI void APIENTRY glTextureStorageSparseAMD (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#endif
+#endif /* GL_AMD_sparse_texture */
+
+#ifndef GL_AMD_stencil_operation_extended
+#define GL_AMD_stencil_operation_extended 1
+#define GL_SET_AMD                        0x874A
+#define GL_REPLACE_VALUE_AMD              0x874B
+#define GL_STENCIL_OP_VALUE_AMD           0x874C
+#define GL_STENCIL_BACK_OP_VALUE_AMD      0x874D
+typedef void (APIENTRYP PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
+#endif
+#endif /* GL_AMD_stencil_operation_extended */
+
+#ifndef GL_AMD_texture_gather_bias_lod
+#define GL_AMD_texture_gather_bias_lod 1
+#endif /* GL_AMD_texture_gather_bias_lod */
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif /* GL_AMD_texture_texture4 */
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+#endif /* GL_AMD_transform_feedback3_lines_triangles */
+
+#ifndef GL_AMD_transform_feedback4
+#define GL_AMD_transform_feedback4 1
+#define GL_STREAM_RASTERIZATION_AMD       0x91A0
+#endif /* GL_AMD_transform_feedback4 */
+
+#ifndef GL_AMD_vertex_shader_layer
+#define GL_AMD_vertex_shader_layer 1
+#endif /* GL_AMD_vertex_shader_layer */
+
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+#ifndef GL_AMD_vertex_shader_viewport_index
+#define GL_AMD_vertex_shader_viewport_index 1
+#endif /* GL_AMD_vertex_shader_viewport_index */
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif /* GL_APPLE_aux_depth_stencil */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif /* GL_APPLE_client_storage */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+#endif /* GL_APPLE_element_array */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif
+#endif /* GL_APPLE_fence */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif /* GL_APPLE_float_pixels */
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+#endif /* GL_APPLE_flush_buffer_range */
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_APPLE_object_purgeable */
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#define GL_RGB_422_APPLE                  0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#define GL_RGB_RAW_422_APPLE              0x8A51
+#endif /* GL_APPLE_rgb_422 */
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif /* GL_APPLE_row_bytes */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif /* GL_APPLE_specular_vector */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_APPLE_texture_range */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif /* GL_APPLE_transform_hint */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE           0x85B4
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#define GL_YCBCR_422_APPLE                0x85B9
+#endif /* GL_APPLE_ycbcr_422 */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ATI_draw_buffers */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+#endif /* GL_ATI_element_array */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif
+#endif /* GL_ATI_fragment_shader */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+typedef void *(APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void *APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif
+#endif /* GL_ATI_map_object_buffer */
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif /* GL_ATI_meminfo */
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+#define GL_RGBA_FLOAT_MODE_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif /* GL_ATI_pixel_format_float */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_pn_triangles */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+#endif /* GL_ATI_separate_stencil */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif /* GL_ATI_text_fragment_shader */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif /* GL_ATI_texture_env_combine3 */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif /* GL_ATI_texture_float */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif /* GL_ATI_texture_mirror_once */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const void *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_array_object */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_vertex_streams */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif /* GL_EXT_422_pixels */
+
+#ifndef GL_EXT_EGL_image_storage
+#define GL_EXT_EGL_image_storage 1
+typedef void *GLeglImageOES;
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
+GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
+#endif
+#endif /* GL_EXT_EGL_image_storage */
+
+#ifndef GL_EXT_EGL_sync
+#define GL_EXT_EGL_sync 1
+#endif /* GL_EXT_EGL_sync */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#define GL_ABGR_EXT                       0x8000
+#endif /* GL_EXT_abgr */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif /* GL_EXT_bgra */
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif
+#endif /* GL_EXT_bindable_uniform */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#endif
+#endif /* GL_EXT_blend_color */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_EXT_blend_func_separate */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif /* GL_EXT_blend_logic_op */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_BLEND_EQUATION_EXT             0x8009
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_blend_minmax */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif /* GL_EXT_blend_subtract */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif /* GL_EXT_clip_volume_hint */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif /* GL_EXT_cmyka */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+#endif /* GL_EXT_color_subtable */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#endif
+#endif /* GL_EXT_convolution */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_coordinate_frame */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_copy_texture */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_cull_vertex */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
+#define GL_PROGRAM_OBJECT_EXT             0x8B40
+#define GL_SHADER_OBJECT_EXT              0x8B48
+#define GL_BUFFER_OBJECT_EXT              0x9151
+#define GL_QUERY_OBJECT_EXT               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT        0x9154
+typedef void (APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_EXT_debug_label */
+
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+typedef void (APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPopGroupMarkerEXT (void);
+#endif
+#endif /* GL_EXT_debug_marker */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void **data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void **params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void **param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void **param);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, void **data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void *APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glEnableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloati_vEXT (GLenum pname, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetDoublei_vEXT (GLenum pname, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetPointeri_vEXT (GLenum pname, GLuint index, void **params);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, void *string);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glVertexArrayVertexOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayEdgeFlagOffsetEXT (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayIndexOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayNormalOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayMultiTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayFogCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArraySecondaryColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glEnableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glDisableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glEnableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glDisableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glGetVertexArrayIntegervEXT (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointervEXT (GLuint vaobj, GLenum pname, void **param);
+GLAPI void APIENTRY glGetVertexArrayIntegeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, void **param);
+GLAPI void *APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glNamedBufferStorageEXT (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
+GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor);
+#endif
+#endif /* GL_EXT_direct_state_access */
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#endif
+#endif /* GL_EXT_draw_buffers2 */
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_draw_instanced */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#endif
+#endif /* GL_EXT_draw_range_elements */
+
+#ifndef GL_EXT_external_buffer
+#define GL_EXT_external_buffer 1
+typedef void *GLeglClientBufferEXT;
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEEXTERNALEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTERNALEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorageExternalEXT (GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+GLAPI void APIENTRY glNamedBufferStorageExternalEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags);
+#endif
+#endif /* GL_EXT_external_buffer */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_fog_coord */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifndef GL_EXT_framebuffer_blit_layers
+#define GL_EXT_framebuffer_blit_layers 1
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYERSEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferLayersEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glBlitFramebufferLayerEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit_layers */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifndef GL_EXT_framebuffer_multisample_blit_scaled
+#define GL_EXT_framebuffer_multisample_blit_scaled 1
+#define GL_SCALED_RESOLVE_FASTEST_EXT     0x90BA
+#define GL_SCALED_RESOLVE_NICEST_EXT      0x90BB
+#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif
+#endif /* GL_EXT_framebuffer_object */
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif /* GL_EXT_framebuffer_sRGB */
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif
+#endif /* GL_EXT_geometry_shader4 */
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+#endif /* GL_EXT_gpu_program_parameters */
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT   0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT   0x8905
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_EXT_gpu_shader4 */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif
+#endif /* GL_EXT_histogram */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif /* GL_EXT_index_array_formats */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif
+#endif /* GL_EXT_index_func */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_index_material */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif /* GL_EXT_index_texture */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_light_texture */
+
+#ifndef GL_EXT_memory_object
+#define GL_EXT_memory_object 1
+#define GL_TEXTURE_TILING_EXT             0x9580
+#define GL_DEDICATED_MEMORY_OBJECT_EXT    0x9581
+#define GL_PROTECTED_MEMORY_OBJECT_EXT    0x959B
+#define GL_NUM_TILING_TYPES_EXT           0x9582
+#define GL_TILING_TYPES_EXT               0x9583
+#define GL_OPTIMAL_TILING_EXT             0x9584
+#define GL_LINEAR_TILING_EXT              0x9585
+#define GL_NUM_DEVICE_UUIDS_EXT           0x9596
+#define GL_DEVICE_UUID_EXT                0x9597
+#define GL_DRIVER_UUID_EXT                0x9598
+#define GL_UUID_SIZE_EXT                  16
+typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEVEXTPROC) (GLenum pname, GLubyte *data);
+typedef void (APIENTRYP PFNGLGETUNSIGNEDBYTEI_VEXTPROC) (GLenum target, GLuint index, GLubyte *data);
+typedef void (APIENTRYP PFNGLDELETEMEMORYOBJECTSEXTPROC) (GLsizei n, const GLuint *memoryObjects);
+typedef GLboolean (APIENTRYP PFNGLISMEMORYOBJECTEXTPROC) (GLuint memoryObject);
+typedef void (APIENTRYP PFNGLCREATEMEMORYOBJECTSEXTPROC) (GLsizei n, GLuint *memoryObjects);
+typedef void (APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC) (GLuint memoryObject, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEMEMEXTPROC) (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM2DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM3DMULTISAMPLEEXTPROC) (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEMEMEXTPROC) (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXSTORAGEMEM1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGEMEM1DEXTPROC) (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUnsignedBytevEXT (GLenum pname, GLubyte *data);
+GLAPI void APIENTRY glGetUnsignedBytei_vEXT (GLenum target, GLuint index, GLubyte *data);
+GLAPI void APIENTRY glDeleteMemoryObjectsEXT (GLsizei n, const GLuint *memoryObjects);
+GLAPI GLboolean APIENTRY glIsMemoryObjectEXT (GLuint memoryObject);
+GLAPI void APIENTRY glCreateMemoryObjectsEXT (GLsizei n, GLuint *memoryObjects);
+GLAPI void APIENTRY glMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMemoryObjectParameterivEXT (GLuint memoryObject, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTexStorageMem2DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem2DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem3DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem3DMultisampleEXT (GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glBufferStorageMemEXT (GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem2DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem2DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem3DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem3DMultisampleEXT (GLuint texture, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glNamedBufferStorageMemEXT (GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTexStorageMem1DEXT (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureStorageMem1DEXT (GLuint texture, GLsizei levels, GLenum internalFormat, GLsizei width, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_EXT_memory_object */
+
+#ifndef GL_EXT_memory_object_fd
+#define GL_EXT_memory_object_fd 1
+#define GL_HANDLE_TYPE_OPAQUE_FD_EXT      0x9586
+typedef void (APIENTRYP PFNGLIMPORTMEMORYFDEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportMemoryFdEXT (GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_memory_object_fd */
+
+#ifndef GL_EXT_memory_object_win32
+#define GL_EXT_memory_object_win32 1
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_EXT   0x9587
+#define GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT 0x9588
+#define GL_DEVICE_LUID_EXT                0x9599
+#define GL_DEVICE_NODE_MASK_EXT           0x959A
+#define GL_LUID_SIZE_EXT                  8
+#define GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT 0x9589
+#define GL_HANDLE_TYPE_D3D12_RESOURCE_EXT 0x958A
+#define GL_HANDLE_TYPE_D3D11_IMAGE_EXT    0x958B
+#define GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT 0x958C
+typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32HANDLEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+typedef void (APIENTRYP PFNGLIMPORTMEMORYWIN32NAMEEXTPROC) (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportMemoryWin32HandleEXT (GLuint memory, GLuint64 size, GLenum handleType, void *handle);
+GLAPI void APIENTRY glImportMemoryWin32NameEXT (GLuint memory, GLuint64 size, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_memory_object_win32 */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif /* GL_EXT_misc_attribute */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif
+#endif /* GL_EXT_multisample */
+
+#ifndef GL_EXT_multiview_tessellation_geometry_shader
+#define GL_EXT_multiview_tessellation_geometry_shader 1
+#endif /* GL_EXT_multiview_tessellation_geometry_shader */
+
+#ifndef GL_EXT_multiview_texture_multisample
+#define GL_EXT_multiview_texture_multisample 1
+#endif /* GL_EXT_multiview_texture_multisample */
+
+#ifndef GL_EXT_multiview_timer_query
+#define GL_EXT_multiview_timer_query 1
+#endif /* GL_EXT_multiview_timer_query */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif /* GL_EXT_packed_depth_stencil */
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif /* GL_EXT_packed_float */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif /* GL_EXT_packed_pixels */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, void *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_paletted_texture */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif /* GL_EXT_pixel_buffer_object */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_pixel_transform */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif /* GL_EXT_pixel_transform_color_table */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_EXT_point_parameters */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif
+#endif /* GL_EXT_polygon_offset */
+
+#ifndef GL_EXT_polygon_offset_clamp
+#define GL_EXT_polygon_offset_clamp 1
+#define GL_POLYGON_OFFSET_CLAMP_EXT       0x8E1B
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetClampEXT (GLfloat factor, GLfloat units, GLfloat clamp);
+#endif
+#endif /* GL_EXT_polygon_offset_clamp */
+
+#ifndef GL_EXT_post_depth_coverage
+#define GL_EXT_post_depth_coverage 1
+#endif /* GL_EXT_post_depth_coverage */
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_provoking_vertex */
+
+#ifndef GL_EXT_raster_multisample
+#define GL_EXT_raster_multisample 1
+#define GL_RASTER_MULTISAMPLE_EXT         0x9327
+#define GL_RASTER_SAMPLES_EXT             0x9328
+#define GL_MAX_RASTER_SAMPLES_EXT         0x9329
+#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A
+#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B
+#define GL_EFFECTIVE_RASTER_SAMPLES_EXT   0x932C
+typedef void (APIENTRYP PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRasterSamplesEXT (GLuint samples, GLboolean fixedsamplelocations);
+#endif
+#endif /* GL_EXT_raster_multisample */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif /* GL_EXT_rescale_normal */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_secondary_color */
+
+#ifndef GL_EXT_semaphore
+#define GL_EXT_semaphore 1
+#define GL_LAYOUT_GENERAL_EXT             0x958D
+#define GL_LAYOUT_COLOR_ATTACHMENT_EXT    0x958E
+#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
+#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
+#define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
+#define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
+#define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
+#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
+#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
+typedef void (APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
+typedef void (APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
+typedef GLboolean (APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
+typedef void (APIENTRYP PFNGLSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, const GLuint64 *params);
+typedef void (APIENTRYP PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC) (GLuint semaphore, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLWAITSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+typedef void (APIENTRYP PFNGLSIGNALSEMAPHOREEXTPROC) (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenSemaphoresEXT (GLsizei n, GLuint *semaphores);
+GLAPI void APIENTRY glDeleteSemaphoresEXT (GLsizei n, const GLuint *semaphores);
+GLAPI GLboolean APIENTRY glIsSemaphoreEXT (GLuint semaphore);
+GLAPI void APIENTRY glSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, const GLuint64 *params);
+GLAPI void APIENTRY glGetSemaphoreParameterui64vEXT (GLuint semaphore, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glWaitSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
+GLAPI void APIENTRY glSignalSemaphoreEXT (GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
+#endif
+#endif /* GL_EXT_semaphore */
+
+#ifndef GL_EXT_semaphore_fd
+#define GL_EXT_semaphore_fd 1
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREFDEXTPROC) (GLuint semaphore, GLenum handleType, GLint fd);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportSemaphoreFdEXT (GLuint semaphore, GLenum handleType, GLint fd);
+#endif
+#endif /* GL_EXT_semaphore_fd */
+
+#ifndef GL_EXT_semaphore_win32
+#define GL_EXT_semaphore_win32 1
+#define GL_HANDLE_TYPE_D3D12_FENCE_EXT    0x9594
+#define GL_D3D12_FENCE_VALUE_EXT          0x9595
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32HANDLEEXTPROC) (GLuint semaphore, GLenum handleType, void *handle);
+typedef void (APIENTRYP PFNGLIMPORTSEMAPHOREWIN32NAMEEXTPROC) (GLuint semaphore, GLenum handleType, const void *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImportSemaphoreWin32HandleEXT (GLuint semaphore, GLenum handleType, void *handle);
+GLAPI void APIENTRY glImportSemaphoreWin32NameEXT (GLuint semaphore, GLenum handleType, const void *name);
+#endif
+#endif /* GL_EXT_semaphore_win32 */
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif
+#endif /* GL_EXT_separate_shader_objects */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif /* GL_EXT_separate_specular_color */
+
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_EXT_shader_framebuffer_fetch 1
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
+#endif /* GL_EXT_shader_framebuffer_fetch */
+
+#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
+#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
+typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
+#endif
+#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
+
+#ifndef GL_EXT_shader_image_load_formatted
+#define GL_EXT_shader_image_load_formatted 1
+#endif /* GL_EXT_shader_image_load_formatted */
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
+#define GL_IMAGE_1D_EXT                   0x904C
+#define GL_IMAGE_2D_EXT                   0x904D
+#define GL_IMAGE_3D_EXT                   0x904E
+#define GL_IMAGE_2D_RECT_EXT              0x904F
+#define GL_IMAGE_CUBE_EXT                 0x9050
+#define GL_IMAGE_BUFFER_EXT               0x9051
+#define GL_IMAGE_1D_ARRAY_EXT             0x9052
+#define GL_IMAGE_2D_ARRAY_EXT             0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT               0x9057
+#define GL_INT_IMAGE_2D_EXT               0x9058
+#define GL_INT_IMAGE_3D_EXT               0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
+#define GL_INT_IMAGE_CUBE_EXT             0x905B
+#define GL_INT_IMAGE_BUFFER_EXT           0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
+#endif
+#endif /* GL_EXT_shader_image_load_store */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+#endif /* GL_EXT_shader_integer_mix */
+
+#ifndef GL_EXT_shader_samples_identical
+#define GL_EXT_shader_samples_identical 1
+#endif /* GL_EXT_shader_samples_identical */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif /* GL_EXT_shadow_funcs */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif /* GL_EXT_shared_texture_palette */
+
+#ifndef GL_EXT_sparse_texture2
+#define GL_EXT_sparse_texture2 1
+#endif /* GL_EXT_sparse_texture2 */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+#endif /* GL_EXT_stencil_clear_tag */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif
+#endif /* GL_EXT_stencil_two_side */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif /* GL_EXT_stencil_wrap */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_subtexture */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif /* GL_EXT_texture */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_texture3D */
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+#endif /* GL_EXT_texture_array */
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_EXT_texture_buffer_object */
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif /* GL_EXT_texture_compression_latc */
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif /* GL_EXT_texture_compression_rgtc */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif /* GL_EXT_texture_compression_s3tc */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif /* GL_EXT_texture_cube_map */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif /* GL_EXT_texture_env_add */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif /* GL_EXT_texture_env_combine */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif /* GL_EXT_texture_env_dot3 */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+#ifndef GL_EXT_texture_filter_minmax
+#define GL_EXT_texture_filter_minmax 1
+#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
+#define GL_WEIGHTED_AVERAGE_EXT           0x9367
+#endif /* GL_EXT_texture_filter_minmax */
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+#endif /* GL_EXT_texture_integer */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif /* GL_EXT_texture_lod_bias */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif /* GL_EXT_texture_mirror_clamp */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+#endif /* GL_EXT_texture_object */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif /* GL_EXT_texture_sRGB */
+
+#ifndef GL_EXT_texture_sRGB_R8
+#define GL_EXT_texture_sRGB_R8 1
+#define GL_SR8_EXT                        0x8FBD
+#endif /* GL_EXT_texture_sRGB_R8 */
+
+#ifndef GL_EXT_texture_sRGB_RG8
+#define GL_EXT_texture_sRGB_RG8 1
+#define GL_SRG8_EXT                       0x8FBE
+#endif /* GL_EXT_texture_sRGB_RG8 */
+
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+#define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
+#define GL_DECODE_EXT                     0x8A49
+#define GL_SKIP_DECODE_EXT                0x8A4A
+#endif /* GL_EXT_texture_sRGB_decode */
+
+#ifndef GL_EXT_texture_shadow_lod
+#define GL_EXT_texture_shadow_lod 1
+#endif /* GL_EXT_texture_shadow_lod */
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif /* GL_EXT_texture_shared_exponent */
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#endif /* GL_EXT_texture_snorm */
+
+#ifndef GL_EXT_texture_storage
+#define GL_EXT_texture_storage 1
+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT   0x912F
+#define GL_RGBA32F_EXT                    0x8814
+#define GL_RGB32F_EXT                     0x8815
+#define GL_ALPHA32F_EXT                   0x8816
+#define GL_LUMINANCE32F_EXT               0x8818
+#define GL_LUMINANCE_ALPHA32F_EXT         0x8819
+#define GL_RGBA16F_EXT                    0x881A
+#define GL_RGB16F_EXT                     0x881B
+#define GL_ALPHA16F_EXT                   0x881C
+#define GL_LUMINANCE16F_EXT               0x881E
+#define GL_LUMINANCE_ALPHA16F_EXT         0x881F
+#define GL_BGRA8_EXT                      0x93A1
+#define GL_R8_EXT                         0x8229
+#define GL_RG8_EXT                        0x822B
+#define GL_R32F_EXT                       0x822E
+#define GL_RG32F_EXT                      0x8230
+#define GL_R16F_EXT                       0x822D
+#define GL_RG16F_EXT                      0x822F
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_EXT_texture_storage */
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif /* GL_EXT_texture_swizzle */
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#define GL_TIME_ELAPSED_EXT               0x88BF
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+#endif /* GL_EXT_timer_query */
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+#endif /* GL_EXT_transform_feedback */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, void **params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_array */
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif /* GL_EXT_vertex_array_bgra */
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+#define GL_DOUBLE_VEC2_EXT                0x8FFC
+#define GL_DOUBLE_VEC3_EXT                0x8FFD
+#define GL_DOUBLE_VEC4_EXT                0x8FFE
+#define GL_DOUBLE_MAT2_EXT                0x8F46
+#define GL_DOUBLE_MAT3_EXT                0x8F47
+#define GL_DOUBLE_MAT4_EXT                0x8F48
+#define GL_DOUBLE_MAT2x3_EXT              0x8F49
+#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
+#endif
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const void *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const void *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, void **data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif
+#endif /* GL_EXT_vertex_shader */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     0x0BA3
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          0x0BA6
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 0x1700
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_weighting */
+
+#ifndef GL_EXT_win32_keyed_mutex
+#define GL_EXT_win32_keyed_mutex 1
+typedef GLboolean (APIENTRYP PFNGLACQUIREKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key, GLuint timeout);
+typedef GLboolean (APIENTRYP PFNGLRELEASEKEYEDMUTEXWIN32EXTPROC) (GLuint memory, GLuint64 key);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAcquireKeyedMutexWin32EXT (GLuint memory, GLuint64 key, GLuint timeout);
+GLAPI GLboolean APIENTRY glReleaseKeyedMutexWin32EXT (GLuint memory, GLuint64 key);
+#endif
+#endif /* GL_EXT_win32_keyed_mutex */
+
+#ifndef GL_EXT_window_rectangles
+#define GL_EXT_window_rectangles 1
+#define GL_INCLUSIVE_EXT                  0x8F10
+#define GL_EXCLUSIVE_EXT                  0x8F11
+#define GL_WINDOW_RECTANGLE_EXT           0x8F12
+#define GL_WINDOW_RECTANGLE_MODE_EXT      0x8F13
+#define GL_MAX_WINDOW_RECTANGLES_EXT      0x8F14
+#define GL_NUM_WINDOW_RECTANGLES_EXT      0x8F15
+typedef void (APIENTRYP PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLint *box);
+#endif
+#endif /* GL_EXT_window_rectangles */
+
+#ifndef GL_EXT_x11_sync_object
+#define GL_EXT_x11_sync_object 1
+#define GL_SYNC_X11_FENCE_EXT             0x90E1
+typedef GLsync (APIENTRYP PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glImportSyncEXT (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#endif
+#endif /* GL_EXT_x11_sync_object */
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif
+#endif /* GL_GREMEDY_frame_terminator */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const void *string);
+#endif
+#endif /* GL_GREMEDY_string_marker */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif /* GL_HP_convolution_border_modes */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_HP_image_transform */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif /* GL_HP_occlusion_test */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif /* GL_HP_texture_lighting */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#define GL_CULL_VERTEX_IBM                103050
+#endif /* GL_IBM_cull_vertex */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#endif
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif /* GL_IBM_rasterpos_clip */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+#define GL_ALL_STATIC_DATA_IBM            103060
+#define GL_STATIC_VERTEX_ARRAY_IBM        103061
+typedef void (APIENTRYP PFNGLFLUSHSTATICDATAIBMPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushStaticDataIBM (GLenum target);
+#endif
+#endif /* GL_IBM_static_data */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean **pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#endif
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_INGR_blend_func_separate */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif /* GL_INGR_color_clamp */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif /* GL_INGR_interlace_read */
+
+#ifndef GL_INTEL_blackhole_render
+#define GL_INTEL_blackhole_render 1
+#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
+#endif /* GL_INTEL_blackhole_render */
+
+#ifndef GL_INTEL_conservative_rasterization
+#define GL_INTEL_conservative_rasterization 1
+#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
+#endif /* GL_INTEL_conservative_rasterization */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+#endif /* GL_INTEL_fragment_shader_ordering */
+
+#ifndef GL_INTEL_framebuffer_CMAA
+#define GL_INTEL_framebuffer_CMAA 1
+typedef void (APIENTRYP PFNGLAPPLYFRAMEBUFFERATTACHMENTCMAAINTELPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyFramebufferAttachmentCMAAINTEL (void);
+#endif
+#endif /* GL_INTEL_framebuffer_CMAA */
+
+#ifndef GL_INTEL_map_texture
+#define GL_INTEL_map_texture 1
+#define GL_TEXTURE_MEMORY_LAYOUT_INTEL    0x83FF
+#define GL_LAYOUT_DEFAULT_INTEL           0
+#define GL_LAYOUT_LINEAR_INTEL            1
+#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2
+typedef void (APIENTRYP PFNGLSYNCTEXTUREINTELPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level);
+typedef void *(APIENTRYP PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSyncTextureINTEL (GLuint texture);
+GLAPI void APIENTRY glUnmapTexture2DINTEL (GLuint texture, GLint level);
+GLAPI void *APIENTRY glMapTexture2DINTEL (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#endif
+#endif /* GL_INTEL_map_texture */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const void **pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const void **pointer);
+#endif
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifndef GL_INTEL_performance_query
+#define GL_INTEL_performance_query 1
+#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000
+#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001
+#define GL_PERFQUERY_WAIT_INTEL           0x83FB
+#define GL_PERFQUERY_FLUSH_INTEL          0x83FA
+#define GL_PERFQUERY_DONOT_FLUSH_INTEL    0x83F9
+#define GL_PERFQUERY_COUNTER_EVENT_INTEL  0x94F0
+#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
+#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
+#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
+#define GL_PERFQUERY_COUNTER_RAW_INTEL    0x94F4
+#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
+#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
+#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
+#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
+#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
+#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
+#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
+#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
+#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
+#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
+typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle);
+typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
+typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle);
+GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
+GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
+GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
+GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#endif
+#endif /* GL_INTEL_performance_query */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif /* GL_MESAX_texture_stack */
+
+#ifndef GL_MESA_framebuffer_flip_x
+#define GL_MESA_framebuffer_flip_x 1
+#define GL_FRAMEBUFFER_FLIP_X_MESA        0x8BBC
+#endif /* GL_MESA_framebuffer_flip_x */
+
+#ifndef GL_MESA_framebuffer_flip_y
+#define GL_MESA_framebuffer_flip_y 1
+#define GL_FRAMEBUFFER_FLIP_Y_MESA        0x8BBB
+typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIMESAPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVMESAPROC) (GLenum target, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferParameteriMESA (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetFramebufferParameterivMESA (GLenum target, GLenum pname, GLint *params);
+#endif
+#endif /* GL_MESA_framebuffer_flip_y */
+
+#ifndef GL_MESA_framebuffer_swap_xy
+#define GL_MESA_framebuffer_swap_xy 1
+#define GL_FRAMEBUFFER_SWAP_XY_MESA       0x8BBD
+#endif /* GL_MESA_framebuffer_swap_xy */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#define GL_PACK_INVERT_MESA               0x8758
+#endif /* GL_MESA_pack_invert */
+
+#ifndef GL_MESA_program_binary_formats
+#define GL_MESA_program_binary_formats 1
+#define GL_PROGRAM_BINARY_FORMAT_MESA     0x875F
+#endif /* GL_MESA_program_binary_formats */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif
+#endif /* GL_MESA_resize_buffers */
+
+#ifndef GL_MESA_shader_integer_functions
+#define GL_MESA_shader_integer_functions 1
+#endif /* GL_MESA_shader_integer_functions */
+
+#ifndef GL_MESA_tile_raster_order
+#define GL_MESA_tile_raster_order 1
+#define GL_TILE_RASTER_ORDER_FIXED_MESA   0x8BB8
+#define GL_TILE_RASTER_ORDER_INCREASING_X_MESA 0x8BB9
+#define GL_TILE_RASTER_ORDER_INCREASING_Y_MESA 0x8BBA
+#endif /* GL_MESA_tile_raster_order */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif
+#endif /* GL_MESA_window_pos */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif /* GL_MESA_ycbcr_texture */
+
+#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers
+#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1
+#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */
+
+#ifndef GL_NVX_conditional_render
+#define GL_NVX_conditional_render 1
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNVX (GLuint id);
+GLAPI void APIENTRY glEndConditionalRenderNVX (void);
+#endif
+#endif /* GL_NVX_conditional_render */
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_NVX_gpu_memory_info 1
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+#endif /* GL_NVX_gpu_memory_info */
+
+#ifndef GL_NVX_gpu_multicast2
+#define GL_NVX_gpu_multicast2 1
+#define GL_UPLOAD_GPU_MASK_NVX            0x954A
+typedef void (APIENTRYP PFNGLUPLOADGPUMASKNVXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMULTICASTVIEWPORTARRAYVNVXPROC) (GLuint gpu, GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTICASTVIEWPORTPOSITIONWSCALENVXPROC) (GLuint gpu, GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+typedef void (APIENTRYP PFNGLMULTICASTSCISSORARRAYVNVXPROC) (GLuint gpu, GLuint first, GLsizei count, const GLint *v);
+typedef GLuint (APIENTRYP PFNGLASYNCCOPYBUFFERSUBDATANVXPROC) (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+typedef GLuint (APIENTRYP PFNGLASYNCCOPYIMAGESUBDATANVXPROC) (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUploadGpuMaskNVX (GLbitfield mask);
+GLAPI void APIENTRY glMulticastViewportArrayvNVX (GLuint gpu, GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glMulticastViewportPositionWScaleNVX (GLuint gpu, GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+GLAPI void APIENTRY glMulticastScissorArrayvNVX (GLuint gpu, GLuint first, GLsizei count, const GLint *v);
+GLAPI GLuint APIENTRY glAsyncCopyBufferSubDataNVX (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *fenceValueArray, GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+GLAPI GLuint APIENTRY glAsyncCopyImageSubDataNVX (GLsizei waitSemaphoreCount, const GLuint *waitSemaphoreArray, const GLuint64 *waitValueArray, GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth, GLsizei signalSemaphoreCount, const GLuint *signalSemaphoreArray, const GLuint64 *signalValueArray);
+#endif
+#endif /* GL_NVX_gpu_multicast2 */
+
+#ifndef GL_NVX_linked_gpu_multicast
+#define GL_NVX_linked_gpu_multicast 1
+#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX  0x0800
+#define GL_MAX_LGPU_GPUS_NVX              0x92BA
+typedef void (APIENTRYP PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLLGPUINTERLOCKNVXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLGPUNamedBufferSubDataNVX (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glLGPUCopyImageSubDataNVX (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glLGPUInterlockNVX (void);
+#endif
+#endif /* GL_NVX_linked_gpu_multicast */
+
+#ifndef GL_NVX_progress_fence
+#define GL_NVX_progress_fence 1
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRESSFENCENVXPROC) (void);
+typedef void (APIENTRYP PFNGLSIGNALSEMAPHOREUI64NVXPROC) (GLuint signalGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+typedef void (APIENTRYP PFNGLWAITSEMAPHOREUI64NVXPROC) (GLuint waitGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+typedef void (APIENTRYP PFNGLCLIENTWAITSEMAPHOREUI64NVXPROC) (GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glCreateProgressFenceNVX (void);
+GLAPI void APIENTRY glSignalSemaphoreui64NVX (GLuint signalGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+GLAPI void APIENTRY glWaitSemaphoreui64NVX (GLuint waitGpu, GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+GLAPI void APIENTRY glClientWaitSemaphoreui64NVX (GLsizei fenceObjectCount, const GLuint *semaphoreArray, const GLuint64 *fenceValueArray);
+#endif
+#endif /* GL_NVX_progress_fence */
+
+#ifndef GL_NV_alpha_to_coverage_dither_control
+#define GL_NV_alpha_to_coverage_dither_control 1
+#define GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV 0x934D
+#define GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV 0x934E
+#define GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV 0x934F
+#define GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV 0x92BF
+typedef void (APIENTRYP PFNGLALPHATOCOVERAGEDITHERCONTROLNVPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAlphaToCoverageDitherControlNV (GLenum mode);
+#endif
+#endif /* GL_NV_alpha_to_coverage_dither_control */
+
+#ifndef GL_NV_bindless_multi_draw_indirect
+#define GL_NV_bindless_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+#ifndef GL_NV_bindless_multi_draw_indirect_count
+#define GL_NV_bindless_multi_draw_indirect_count 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessCountNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessCountNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect_count */
+
+#ifndef GL_NV_bindless_texture
+#define GL_NV_bindless_texture 1
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle);
+#endif
+#endif /* GL_NV_bindless_texture */
+
+#ifndef GL_NV_blend_equation_advanced
+#define GL_NV_blend_equation_advanced 1
+#define GL_BLEND_OVERLAP_NV               0x9281
+#define GL_BLEND_PREMULTIPLIED_SRC_NV     0x9280
+#define GL_BLUE_NV                        0x1905
+#define GL_COLORBURN_NV                   0x929A
+#define GL_COLORDODGE_NV                  0x9299
+#define GL_CONJOINT_NV                    0x9284
+#define GL_CONTRAST_NV                    0x92A1
+#define GL_DARKEN_NV                      0x9297
+#define GL_DIFFERENCE_NV                  0x929E
+#define GL_DISJOINT_NV                    0x9283
+#define GL_DST_ATOP_NV                    0x928F
+#define GL_DST_IN_NV                      0x928B
+#define GL_DST_NV                         0x9287
+#define GL_DST_OUT_NV                     0x928D
+#define GL_DST_OVER_NV                    0x9289
+#define GL_EXCLUSION_NV                   0x92A0
+#define GL_GREEN_NV                       0x1904
+#define GL_HARDLIGHT_NV                   0x929B
+#define GL_HARDMIX_NV                     0x92A9
+#define GL_HSL_COLOR_NV                   0x92AF
+#define GL_HSL_HUE_NV                     0x92AD
+#define GL_HSL_LUMINOSITY_NV              0x92B0
+#define GL_HSL_SATURATION_NV              0x92AE
+#define GL_INVERT_OVG_NV                  0x92B4
+#define GL_INVERT_RGB_NV                  0x92A3
+#define GL_LIGHTEN_NV                     0x9298
+#define GL_LINEARBURN_NV                  0x92A5
+#define GL_LINEARDODGE_NV                 0x92A4
+#define GL_LINEARLIGHT_NV                 0x92A7
+#define GL_MINUS_CLAMPED_NV               0x92B3
+#define GL_MINUS_NV                       0x929F
+#define GL_MULTIPLY_NV                    0x9294
+#define GL_OVERLAY_NV                     0x9296
+#define GL_PINLIGHT_NV                    0x92A8
+#define GL_PLUS_CLAMPED_ALPHA_NV          0x92B2
+#define GL_PLUS_CLAMPED_NV                0x92B1
+#define GL_PLUS_DARKER_NV                 0x9292
+#define GL_PLUS_NV                        0x9291
+#define GL_RED_NV                         0x1903
+#define GL_SCREEN_NV                      0x9295
+#define GL_SOFTLIGHT_NV                   0x929C
+#define GL_SRC_ATOP_NV                    0x928E
+#define GL_SRC_IN_NV                      0x928A
+#define GL_SRC_NV                         0x9286
+#define GL_SRC_OUT_NV                     0x928C
+#define GL_SRC_OVER_NV                    0x9288
+#define GL_UNCORRELATED_NV                0x9282
+#define GL_VIVIDLIGHT_NV                  0x92A6
+#define GL_XOR_NV                         0x1506
+typedef void (APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLBLENDBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendParameteriNV (GLenum pname, GLint value);
+GLAPI void APIENTRY glBlendBarrierNV (void);
+#endif
+#endif /* GL_NV_blend_equation_advanced */
+
+#ifndef GL_NV_blend_equation_advanced_coherent
+#define GL_NV_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
+#endif /* GL_NV_blend_equation_advanced_coherent */
+
+#ifndef GL_NV_blend_minmax_factor
+#define GL_NV_blend_minmax_factor 1
+#endif /* GL_NV_blend_minmax_factor */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif /* GL_NV_blend_square */
+
+#ifndef GL_NV_clip_space_w_scaling
+#define GL_NV_clip_space_w_scaling 1
+#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
+#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
+#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
+typedef void (APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
+#endif
+#endif /* GL_NV_clip_space_w_scaling */
+
+#ifndef GL_NV_command_list
+#define GL_NV_command_list 1
+#define GL_TERMINATE_SEQUENCE_COMMAND_NV  0x0000
+#define GL_NOP_COMMAND_NV                 0x0001
+#define GL_DRAW_ELEMENTS_COMMAND_NV       0x0002
+#define GL_DRAW_ARRAYS_COMMAND_NV         0x0003
+#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004
+#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV   0x0005
+#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006
+#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007
+#define GL_ELEMENT_ADDRESS_COMMAND_NV     0x0008
+#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV   0x0009
+#define GL_UNIFORM_ADDRESS_COMMAND_NV     0x000A
+#define GL_BLEND_COLOR_COMMAND_NV         0x000B
+#define GL_STENCIL_REF_COMMAND_NV         0x000C
+#define GL_LINE_WIDTH_COMMAND_NV          0x000D
+#define GL_POLYGON_OFFSET_COMMAND_NV      0x000E
+#define GL_ALPHA_REF_COMMAND_NV           0x000F
+#define GL_VIEWPORT_COMMAND_NV            0x0010
+#define GL_SCISSOR_COMMAND_NV             0x0011
+#define GL_FRONT_FACE_COMMAND_NV          0x0012
+typedef void (APIENTRYP PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint *states);
+typedef void (APIENTRYP PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint *states);
+typedef GLboolean (APIENTRYP PFNGLISSTATENVPROC) (GLuint state);
+typedef void (APIENTRYP PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode);
+typedef GLuint (APIENTRYP PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size);
+typedef GLushort (APIENTRYP PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint *lists);
+typedef void (APIENTRYP PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint *lists);
+typedef GLboolean (APIENTRYP PFNGLISCOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+typedef void (APIENTRYP PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments);
+typedef void (APIENTRYP PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list);
+typedef void (APIENTRYP PFNGLCALLCOMMANDLISTNVPROC) (GLuint list);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCreateStatesNV (GLsizei n, GLuint *states);
+GLAPI void APIENTRY glDeleteStatesNV (GLsizei n, const GLuint *states);
+GLAPI GLboolean APIENTRY glIsStateNV (GLuint state);
+GLAPI void APIENTRY glStateCaptureNV (GLuint state, GLenum mode);
+GLAPI GLuint APIENTRY glGetCommandHeaderNV (GLenum tokenID, GLuint size);
+GLAPI GLushort APIENTRY glGetStageIndexNV (GLenum shadertype);
+GLAPI void APIENTRY glDrawCommandsNV (GLenum primitiveMode, GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsAddressNV (GLenum primitiveMode, const GLuint64 *indirects, const GLsizei *sizes, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesNV (GLuint buffer, const GLintptr *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glDrawCommandsStatesAddressNV (const GLuint64 *indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCreateCommandListsNV (GLsizei n, GLuint *lists);
+GLAPI void APIENTRY glDeleteCommandListsNV (GLsizei n, const GLuint *lists);
+GLAPI GLboolean APIENTRY glIsCommandListNV (GLuint list);
+GLAPI void APIENTRY glListDrawCommandsStatesClientNV (GLuint list, GLuint segment, const void **indirects, const GLsizei *sizes, const GLuint *states, const GLuint *fbos, GLuint count);
+GLAPI void APIENTRY glCommandListSegmentsNV (GLuint list, GLuint segments);
+GLAPI void APIENTRY glCompileCommandListNV (GLuint list);
+GLAPI void APIENTRY glCallCommandListNV (GLuint list);
+#endif
+#endif /* GL_NV_command_list */
+
+#ifndef GL_NV_compute_program5
+#define GL_NV_compute_program5 1
+#define GL_COMPUTE_PROGRAM_NV             0x90FB
+#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
+#endif /* GL_NV_compute_program5 */
+
+#ifndef GL_NV_compute_shader_derivatives
+#define GL_NV_compute_shader_derivatives 1
+#endif /* GL_NV_compute_shader_derivatives */
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif
+#endif /* GL_NV_conditional_render */
+
+#ifndef GL_NV_conservative_raster
+#define GL_NV_conservative_raster 1
+#define GL_CONSERVATIVE_RASTERIZATION_NV  0x9346
+#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347
+#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348
+#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349
+typedef void (APIENTRYP PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybits);
+#endif
+#endif /* GL_NV_conservative_raster */
+
+#ifndef GL_NV_conservative_raster_dilate
+#define GL_NV_conservative_raster_dilate 1
+#define GL_CONSERVATIVE_RASTER_DILATE_NV  0x9379
+#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A
+#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B
+typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat value);
+#endif
+#endif /* GL_NV_conservative_raster_dilate */
+
+#ifndef GL_NV_conservative_raster_pre_snap
+#define GL_NV_conservative_raster_pre_snap 1
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
+#endif /* GL_NV_conservative_raster_pre_snap */
+
+#ifndef GL_NV_conservative_raster_pre_snap_triangles
+#define GL_NV_conservative_raster_pre_snap_triangles 1
+#define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
+#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E
+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F
+typedef void (APIENTRYP PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param);
+#endif
+#endif /* GL_NV_conservative_raster_pre_snap_triangles */
+
+#ifndef GL_NV_conservative_raster_underestimation
+#define GL_NV_conservative_raster_underestimation 1
+#endif /* GL_NV_conservative_raster_underestimation */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif /* GL_NV_copy_depth_to_color */
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_NV_copy_image */
+
+#ifndef GL_NV_deep_texture3D
+#define GL_NV_deep_texture3D 1
+#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0
+#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV   0x90D1
+#endif /* GL_NV_deep_texture3D */
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif
+#endif /* GL_NV_depth_buffer_float */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif /* GL_NV_depth_clamp */
+
+#ifndef GL_NV_draw_texture
+#define GL_NV_draw_texture 1
+typedef void (APIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#endif
+#endif /* GL_NV_draw_texture */
+
+#ifndef GL_NV_draw_vulkan_image
+#define GL_NV_draw_vulkan_image 1
+typedef void (APIENTRY  *GLVULKANPROCNV)(void);
+typedef void (APIENTRYP PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+typedef GLVULKANPROCNV (APIENTRYP PFNGLGETVKPROCADDRNVPROC) (const GLchar *name);
+typedef void (APIENTRYP PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
+typedef void (APIENTRYP PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore);
+typedef void (APIENTRYP PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawVkImageNV (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+GLAPI GLVULKANPROCNV APIENTRY glGetVkProcAddrNV (const GLchar *name);
+GLAPI void APIENTRY glWaitVkSemaphoreNV (GLuint64 vkSemaphore);
+GLAPI void APIENTRY glSignalVkSemaphoreNV (GLuint64 vkSemaphore);
+GLAPI void APIENTRY glSignalVkFenceNV (GLuint64 vkFence);
+#endif
+#endif /* GL_NV_draw_vulkan_image */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif
+#endif /* GL_NV_evaluators */
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif
+#endif /* GL_NV_explicit_multisample */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif
+#endif /* GL_NV_fence */
+
+#ifndef GL_NV_fill_rectangle
+#define GL_NV_fill_rectangle 1
+#define GL_FILL_RECTANGLE_NV              0x933C
+#endif /* GL_NV_fill_rectangle */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif /* GL_NV_float_buffer */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+#endif /* GL_NV_fog_distance */
+
+#ifndef GL_NV_fragment_coverage_to_color
+#define GL_NV_fragment_coverage_to_color 1
+#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV  0x92DD
+#define GL_FRAGMENT_COVERAGE_COLOR_NV     0x92DE
+typedef void (APIENTRYP PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentCoverageColorNV (GLuint color);
+#endif
+#endif /* GL_NV_fragment_coverage_to_color */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+#endif /* GL_NV_fragment_program */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif /* GL_NV_fragment_program2 */
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif /* GL_NV_fragment_program4 */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif /* GL_NV_fragment_program_option */
+
+#ifndef GL_NV_fragment_shader_barycentric
+#define GL_NV_fragment_shader_barycentric 1
+#endif /* GL_NV_fragment_shader_barycentric */
+
+#ifndef GL_NV_fragment_shader_interlock
+#define GL_NV_fragment_shader_interlock 1
+#endif /* GL_NV_fragment_shader_interlock */
+
+#ifndef GL_NV_framebuffer_mixed_samples
+#define GL_NV_framebuffer_mixed_samples 1
+#define GL_COVERAGE_MODULATION_TABLE_NV   0x9331
+#define GL_COLOR_SAMPLES_NV               0x8E20
+#define GL_DEPTH_SAMPLES_NV               0x932D
+#define GL_STENCIL_SAMPLES_NV             0x932E
+#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F
+#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330
+#define GL_COVERAGE_MODULATION_NV         0x9332
+#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCoverageModulationTableNV (GLsizei n, const GLfloat *v);
+GLAPI void APIENTRY glGetCoverageModulationTableNV (GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glCoverageModulationNV (GLenum components);
+#endif
+#endif /* GL_NV_framebuffer_mixed_samples */
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_NV_geometry_program4 */
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif /* GL_NV_geometry_shader4 */
+
+#ifndef GL_NV_geometry_shader_passthrough
+#define GL_NV_geometry_shader_passthrough 1
+#endif /* GL_NV_geometry_shader_passthrough */
+
+#ifndef GL_NV_gpu_multicast
+#define GL_NV_gpu_multicast 1
+#define GL_PER_GPU_STORAGE_BIT_NV         0x0800
+#define GL_MULTICAST_GPUS_NV              0x92BA
+#define GL_RENDER_GPU_MASK_NV             0x9558
+#define GL_PER_GPU_STORAGE_NV             0x9548
+#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
+typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTICASTBARRIERNVPROC) (void);
+typedef void (APIENTRYP PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask);
+typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask);
+GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glMulticastFramebufferSampleLocationsfvNV (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glMulticastBarrierNV (void);
+GLAPI void APIENTRY glMulticastWaitSyncNV (GLuint signalGpu, GLbitfield waitGpuMask);
+GLAPI void APIENTRY glMulticastGetQueryObjectivNV (GLuint gpu, GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMulticastGetQueryObjectuivNV (GLuint gpu, GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMulticastGetQueryObjecti64vNV (GLuint gpu, GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glMulticastGetQueryObjectui64vNV (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
+#endif
+#endif /* GL_NV_gpu_multicast */
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif
+#endif /* GL_NV_gpu_program4 */
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
+#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
+#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
+typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
+#endif
+#endif /* GL_NV_gpu_program5 */
+
+#ifndef GL_NV_gpu_program5_mem_extended
+#define GL_NV_gpu_program5_mem_extended 1
+#endif /* GL_NV_gpu_program5_mem_extended */
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+#endif /* GL_NV_gpu_shader5 */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+typedef unsigned short GLhalfNV;
+#define GL_HALF_FLOAT_NV                  0x140B
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+#endif
+#endif /* GL_NV_half_float */
+
+#ifndef GL_NV_internalformat_sample_query
+#define GL_NV_internalformat_sample_query 1
+#define GL_MULTISAMPLES_NV                0x9371
+#define GL_SUPERSAMPLE_SCALE_X_NV         0x9372
+#define GL_SUPERSAMPLE_SCALE_Y_NV         0x9373
+#define GL_CONFORMANT_NV                  0x9374
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetInternalformatSampleivNV (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei count, GLint *params);
+#endif
+#endif /* GL_NV_internalformat_sample_query */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif /* GL_NV_light_max_exponent */
+
+#ifndef GL_NV_memory_attachment
+#define GL_NV_memory_attachment 1
+#define GL_ATTACHED_MEMORY_OBJECT_NV      0x95A4
+#define GL_ATTACHED_MEMORY_OFFSET_NV      0x95A5
+#define GL_MEMORY_ATTACHABLE_ALIGNMENT_NV 0x95A6
+#define GL_MEMORY_ATTACHABLE_SIZE_NV      0x95A7
+#define GL_MEMORY_ATTACHABLE_NV           0x95A8
+#define GL_DETACHED_MEMORY_INCARNATION_NV 0x95A9
+#define GL_DETACHED_TEXTURES_NV           0x95AA
+#define GL_DETACHED_BUFFERS_NV            0x95AB
+#define GL_MAX_DETACHED_TEXTURES_NV       0x95AC
+#define GL_MAX_DETACHED_BUFFERS_NV        0x95AD
+typedef void (APIENTRYP PFNGLGETMEMORYOBJECTDETACHEDRESOURCESUIVNVPROC) (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+typedef void (APIENTRYP PFNGLRESETMEMORYOBJECTPARAMETERNVPROC) (GLuint memory, GLenum pname);
+typedef void (APIENTRYP PFNGLTEXATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLBUFFERATTACHMEMORYNVPROC) (GLenum target, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLTEXTUREATTACHMEMORYNVPROC) (GLuint texture, GLuint memory, GLuint64 offset);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERATTACHMEMORYNVPROC) (GLuint buffer, GLuint memory, GLuint64 offset);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMemoryObjectDetachedResourcesuivNV (GLuint memory, GLenum pname, GLint first, GLsizei count, GLuint *params);
+GLAPI void APIENTRY glResetMemoryObjectParameterNV (GLuint memory, GLenum pname);
+GLAPI void APIENTRY glTexAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glBufferAttachMemoryNV (GLenum target, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glTextureAttachMemoryNV (GLuint texture, GLuint memory, GLuint64 offset);
+GLAPI void APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, GLuint64 offset);
+#endif
+#endif /* GL_NV_memory_attachment */
+
+#ifndef GL_NV_memory_object_sparse
+#define GL_NV_memory_object_sparse 1
+typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTMEMNVPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTMEMNVPROC) (GLenum target, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTMEMNVPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTMEMNVPROC) (GLuint texture, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferPageCommitmentMemNV (GLenum target, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+GLAPI void APIENTRY glTexPageCommitmentMemNV (GLenum target, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentMemNV (GLuint buffer, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+GLAPI void APIENTRY glTexturePageCommitmentMemNV (GLuint texture, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+#endif
+#endif /* GL_NV_memory_object_sparse */
+
+#ifndef GL_NV_mesh_shader
+#define GL_NV_mesh_shader 1
+#define GL_MESH_SHADER_NV                 0x9559
+#define GL_TASK_SHADER_NV                 0x955A
+#define GL_MAX_MESH_UNIFORM_BLOCKS_NV     0x8E60
+#define GL_MAX_MESH_TEXTURE_IMAGE_UNITS_NV 0x8E61
+#define GL_MAX_MESH_IMAGE_UNIFORMS_NV     0x8E62
+#define GL_MAX_MESH_UNIFORM_COMPONENTS_NV 0x8E63
+#define GL_MAX_MESH_ATOMIC_COUNTER_BUFFERS_NV 0x8E64
+#define GL_MAX_MESH_ATOMIC_COUNTERS_NV    0x8E65
+#define GL_MAX_MESH_SHADER_STORAGE_BLOCKS_NV 0x8E66
+#define GL_MAX_COMBINED_MESH_UNIFORM_COMPONENTS_NV 0x8E67
+#define GL_MAX_TASK_UNIFORM_BLOCKS_NV     0x8E68
+#define GL_MAX_TASK_TEXTURE_IMAGE_UNITS_NV 0x8E69
+#define GL_MAX_TASK_IMAGE_UNIFORMS_NV     0x8E6A
+#define GL_MAX_TASK_UNIFORM_COMPONENTS_NV 0x8E6B
+#define GL_MAX_TASK_ATOMIC_COUNTER_BUFFERS_NV 0x8E6C
+#define GL_MAX_TASK_ATOMIC_COUNTERS_NV    0x8E6D
+#define GL_MAX_TASK_SHADER_STORAGE_BLOCKS_NV 0x8E6E
+#define GL_MAX_COMBINED_TASK_UNIFORM_COMPONENTS_NV 0x8E6F
+#define GL_MAX_MESH_WORK_GROUP_INVOCATIONS_NV 0x95A2
+#define GL_MAX_TASK_WORK_GROUP_INVOCATIONS_NV 0x95A3
+#define GL_MAX_MESH_TOTAL_MEMORY_SIZE_NV  0x9536
+#define GL_MAX_TASK_TOTAL_MEMORY_SIZE_NV  0x9537
+#define GL_MAX_MESH_OUTPUT_VERTICES_NV    0x9538
+#define GL_MAX_MESH_OUTPUT_PRIMITIVES_NV  0x9539
+#define GL_MAX_TASK_OUTPUT_COUNT_NV       0x953A
+#define GL_MAX_DRAW_MESH_TASKS_COUNT_NV   0x953D
+#define GL_MAX_MESH_VIEWS_NV              0x9557
+#define GL_MESH_OUTPUT_PER_VERTEX_GRANULARITY_NV 0x92DF
+#define GL_MESH_OUTPUT_PER_PRIMITIVE_GRANULARITY_NV 0x9543
+#define GL_MAX_MESH_WORK_GROUP_SIZE_NV    0x953B
+#define GL_MAX_TASK_WORK_GROUP_SIZE_NV    0x953C
+#define GL_MESH_WORK_GROUP_SIZE_NV        0x953E
+#define GL_TASK_WORK_GROUP_SIZE_NV        0x953F
+#define GL_MESH_VERTICES_OUT_NV           0x9579
+#define GL_MESH_PRIMITIVES_OUT_NV         0x957A
+#define GL_MESH_OUTPUT_TYPE_NV            0x957B
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_MESH_SHADER_NV 0x959C
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TASK_SHADER_NV 0x959D
+#define GL_REFERENCED_BY_MESH_SHADER_NV   0x95A0
+#define GL_REFERENCED_BY_TASK_SHADER_NV   0x95A1
+#define GL_MESH_SHADER_BIT_NV             0x00000040
+#define GL_TASK_SHADER_BIT_NV             0x00000080
+#define GL_MESH_SUBROUTINE_NV             0x957C
+#define GL_TASK_SUBROUTINE_NV             0x957D
+#define GL_MESH_SUBROUTINE_UNIFORM_NV     0x957E
+#define GL_TASK_SUBROUTINE_UNIFORM_NV     0x957F
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_MESH_SHADER_NV 0x959E
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TASK_SHADER_NV 0x959F
+typedef void (APIENTRYP PFNGLDRAWMESHTASKSNVPROC) (GLuint first, GLuint count);
+typedef void (APIENTRYP PFNGLDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTNVPROC) (GLintptr indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWMESHTASKSINDIRECTCOUNTNVPROC) (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshTasksNV (GLuint first, GLuint count);
+GLAPI void APIENTRY glDrawMeshTasksIndirectNV (GLintptr indirect);
+GLAPI void APIENTRY glMultiDrawMeshTasksIndirectNV (GLintptr indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawMeshTasksIndirectCountNV (GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_NV_mesh_shader */
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+#endif /* GL_NV_multisample_coverage */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif /* GL_NV_multisample_filter_hint */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_occlusion_query */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif /* GL_NV_packed_depth_stencil */
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#endif
+#endif /* GL_NV_parameter_buffer_object */
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif /* GL_NV_parameter_buffer_object2 */
+
+#ifndef GL_NV_path_rendering
+#define GL_NV_path_rendering 1
+#define GL_PATH_FORMAT_SVG_NV             0x9070
+#define GL_PATH_FORMAT_PS_NV              0x9071
+#define GL_STANDARD_FONT_NAME_NV          0x9072
+#define GL_SYSTEM_FONT_NAME_NV            0x9073
+#define GL_FILE_NAME_NV                   0x9074
+#define GL_PATH_STROKE_WIDTH_NV           0x9075
+#define GL_PATH_END_CAPS_NV               0x9076
+#define GL_PATH_INITIAL_END_CAP_NV        0x9077
+#define GL_PATH_TERMINAL_END_CAP_NV       0x9078
+#define GL_PATH_JOIN_STYLE_NV             0x9079
+#define GL_PATH_MITER_LIMIT_NV            0x907A
+#define GL_PATH_DASH_CAPS_NV              0x907B
+#define GL_PATH_INITIAL_DASH_CAP_NV       0x907C
+#define GL_PATH_TERMINAL_DASH_CAP_NV      0x907D
+#define GL_PATH_DASH_OFFSET_NV            0x907E
+#define GL_PATH_CLIENT_LENGTH_NV          0x907F
+#define GL_PATH_FILL_MODE_NV              0x9080
+#define GL_PATH_FILL_MASK_NV              0x9081
+#define GL_PATH_FILL_COVER_MODE_NV        0x9082
+#define GL_PATH_STROKE_COVER_MODE_NV      0x9083
+#define GL_PATH_STROKE_MASK_NV            0x9084
+#define GL_COUNT_UP_NV                    0x9088
+#define GL_COUNT_DOWN_NV                  0x9089
+#define GL_PATH_OBJECT_BOUNDING_BOX_NV    0x908A
+#define GL_CONVEX_HULL_NV                 0x908B
+#define GL_BOUNDING_BOX_NV                0x908D
+#define GL_TRANSLATE_X_NV                 0x908E
+#define GL_TRANSLATE_Y_NV                 0x908F
+#define GL_TRANSLATE_2D_NV                0x9090
+#define GL_TRANSLATE_3D_NV                0x9091
+#define GL_AFFINE_2D_NV                   0x9092
+#define GL_AFFINE_3D_NV                   0x9094
+#define GL_TRANSPOSE_AFFINE_2D_NV         0x9096
+#define GL_TRANSPOSE_AFFINE_3D_NV         0x9098
+#define GL_UTF8_NV                        0x909A
+#define GL_UTF16_NV                       0x909B
+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
+#define GL_PATH_COMMAND_COUNT_NV          0x909D
+#define GL_PATH_COORD_COUNT_NV            0x909E
+#define GL_PATH_DASH_ARRAY_COUNT_NV       0x909F
+#define GL_PATH_COMPUTED_LENGTH_NV        0x90A0
+#define GL_PATH_FILL_BOUNDING_BOX_NV      0x90A1
+#define GL_PATH_STROKE_BOUNDING_BOX_NV    0x90A2
+#define GL_SQUARE_NV                      0x90A3
+#define GL_ROUND_NV                       0x90A4
+#define GL_TRIANGULAR_NV                  0x90A5
+#define GL_BEVEL_NV                       0x90A6
+#define GL_MITER_REVERT_NV                0x90A7
+#define GL_MITER_TRUNCATE_NV              0x90A8
+#define GL_SKIP_MISSING_GLYPH_NV          0x90A9
+#define GL_USE_MISSING_GLYPH_NV           0x90AA
+#define GL_PATH_ERROR_POSITION_NV         0x90AB
+#define GL_ACCUM_ADJACENT_PAIRS_NV        0x90AD
+#define GL_ADJACENT_PAIRS_NV              0x90AE
+#define GL_FIRST_TO_REST_NV               0x90AF
+#define GL_PATH_GEN_MODE_NV               0x90B0
+#define GL_PATH_GEN_COEFF_NV              0x90B1
+#define GL_PATH_GEN_COMPONENTS_NV         0x90B3
+#define GL_PATH_STENCIL_FUNC_NV           0x90B7
+#define GL_PATH_STENCIL_REF_NV            0x90B8
+#define GL_PATH_STENCIL_VALUE_MASK_NV     0x90B9
+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
+#define GL_PATH_COVER_DEPTH_FUNC_NV       0x90BF
+#define GL_PATH_DASH_OFFSET_RESET_NV      0x90B4
+#define GL_MOVE_TO_RESETS_NV              0x90B5
+#define GL_MOVE_TO_CONTINUES_NV           0x90B6
+#define GL_CLOSE_PATH_NV                  0x00
+#define GL_MOVE_TO_NV                     0x02
+#define GL_RELATIVE_MOVE_TO_NV            0x03
+#define GL_LINE_TO_NV                     0x04
+#define GL_RELATIVE_LINE_TO_NV            0x05
+#define GL_HORIZONTAL_LINE_TO_NV          0x06
+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
+#define GL_VERTICAL_LINE_TO_NV            0x08
+#define GL_RELATIVE_VERTICAL_LINE_TO_NV   0x09
+#define GL_QUADRATIC_CURVE_TO_NV          0x0A
+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
+#define GL_CUBIC_CURVE_TO_NV              0x0C
+#define GL_RELATIVE_CUBIC_CURVE_TO_NV     0x0D
+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV   0x0E
+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
+#define GL_SMOOTH_CUBIC_CURVE_TO_NV       0x10
+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
+#define GL_SMALL_CCW_ARC_TO_NV            0x12
+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV   0x13
+#define GL_SMALL_CW_ARC_TO_NV             0x14
+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV    0x15
+#define GL_LARGE_CCW_ARC_TO_NV            0x16
+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV   0x17
+#define GL_LARGE_CW_ARC_TO_NV             0x18
+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV    0x19
+#define GL_RESTART_PATH_NV                0xF0
+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV    0xF2
+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV     0xF4
+#define GL_RECT_NV                        0xF6
+#define GL_CIRCULAR_CCW_ARC_TO_NV         0xF8
+#define GL_CIRCULAR_CW_ARC_TO_NV          0xFA
+#define GL_CIRCULAR_TANGENT_ARC_TO_NV     0xFC
+#define GL_ARC_TO_NV                      0xFE
+#define GL_RELATIVE_ARC_TO_NV             0xFF
+#define GL_BOLD_BIT_NV                    0x01
+#define GL_ITALIC_BIT_NV                  0x02
+#define GL_GLYPH_WIDTH_BIT_NV             0x01
+#define GL_GLYPH_HEIGHT_BIT_NV            0x02
+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
+#define GL_GLYPH_HAS_KERNING_BIT_NV       0x100
+#define GL_FONT_X_MIN_BOUNDS_BIT_NV       0x00010000
+#define GL_FONT_Y_MIN_BOUNDS_BIT_NV       0x00020000
+#define GL_FONT_X_MAX_BOUNDS_BIT_NV       0x00040000
+#define GL_FONT_Y_MAX_BOUNDS_BIT_NV       0x00080000
+#define GL_FONT_UNITS_PER_EM_BIT_NV       0x00100000
+#define GL_FONT_ASCENDER_BIT_NV           0x00200000
+#define GL_FONT_DESCENDER_BIT_NV          0x00400000
+#define GL_FONT_HEIGHT_BIT_NV             0x00800000
+#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV  0x01000000
+#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
+#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
+#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
+#define GL_FONT_HAS_KERNING_BIT_NV        0x10000000
+#define GL_ROUNDED_RECT_NV                0xE8
+#define GL_RELATIVE_ROUNDED_RECT_NV       0xE9
+#define GL_ROUNDED_RECT2_NV               0xEA
+#define GL_RELATIVE_ROUNDED_RECT2_NV      0xEB
+#define GL_ROUNDED_RECT4_NV               0xEC
+#define GL_RELATIVE_ROUNDED_RECT4_NV      0xED
+#define GL_ROUNDED_RECT8_NV               0xEE
+#define GL_RELATIVE_ROUNDED_RECT8_NV      0xEF
+#define GL_RELATIVE_RECT_NV               0xF7
+#define GL_FONT_GLYPHS_AVAILABLE_NV       0x9368
+#define GL_FONT_TARGET_UNAVAILABLE_NV     0x9369
+#define GL_FONT_UNAVAILABLE_NV            0x936A
+#define GL_FONT_UNINTELLIGIBLE_NV         0x936B
+#define GL_CONIC_CURVE_TO_NV              0x1A
+#define GL_RELATIVE_CONIC_CURVE_TO_NV     0x1B
+#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV  0x20000000
+#define GL_STANDARD_FONT_FORMAT_NV        0x936C
+#define GL_2_BYTES_NV                     0x1407
+#define GL_3_BYTES_NV                     0x1408
+#define GL_4_BYTES_NV                     0x1409
+#define GL_EYE_LINEAR_NV                  0x2400
+#define GL_OBJECT_LINEAR_NV               0x2401
+#define GL_CONSTANT_NV                    0x8576
+#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
+#define GL_PATH_PROJECTION_NV             0x1701
+#define GL_PATH_MODELVIEW_NV              0x1700
+#define GL_PATH_MODELVIEW_STACK_DEPTH_NV  0x0BA3
+#define GL_PATH_MODELVIEW_MATRIX_NV       0x0BA6
+#define GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV 0x0D36
+#define GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV 0x84E3
+#define GL_PATH_PROJECTION_STACK_DEPTH_NV 0x0BA4
+#define GL_PATH_PROJECTION_MATRIX_NV      0x0BA7
+#define GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV 0x0D38
+#define GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV 0x84E4
+#define GL_FRAGMENT_INPUT_NV              0x936D
+typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path);
+typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString);
+typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
+typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
+typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands);
+typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords);
+typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
+typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
+typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint *baseAndCount);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLfloat *params);
+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
+GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
+GLAPI GLboolean APIENTRY glIsPathNV (GLuint path);
+GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const void *pathString);
+GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath);
+GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value);
+GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value);
+GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value);
+GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value);
+GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units);
+GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask);
+GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask);
+GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
+GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands);
+GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords);
+GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
+GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
+GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
+GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+GLAPI void APIENTRY glMatrixLoad3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoad3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x2fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMult3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTranspose3x3fNV (GLenum matrixMode, const GLfloat *m);
+GLAPI void APIENTRY glStencilThenCoverFillPathNV (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverStrokePathNV (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
+GLAPI void APIENTRY glStencilThenCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilThenCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint *baseAndCount);
+GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLfloat *params);
+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
+#endif
+#endif /* GL_NV_path_rendering */
+
+#ifndef GL_NV_path_rendering_shared_edge
+#define GL_NV_path_rendering_shared_edge 1
+#define GL_SHARED_EDGE_NV                 0xC0
+#endif /* GL_NV_path_rendering_shared_edge */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif
+#endif /* GL_NV_pixel_data_range */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_NV_point_sprite */
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_NV_present_video */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif
+#endif /* GL_NV_primitive_restart */
+
+#ifndef GL_NV_primitive_shading_rate
+#define GL_NV_primitive_shading_rate 1
+#define GL_SHADING_RATE_IMAGE_PER_PRIMITIVE_NV 0x95B1
+#define GL_SHADING_RATE_IMAGE_PALETTE_COUNT_NV 0x95B2
+#endif /* GL_NV_primitive_shading_rate */
+
+#ifndef GL_NV_query_resource
+#define GL_NV_query_resource 1
+#define GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV 0x9540
+#define GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV 0x9542
+#define GL_QUERY_RESOURCE_SYS_RESERVED_NV 0x9544
+#define GL_QUERY_RESOURCE_TEXTURE_NV      0x9545
+#define GL_QUERY_RESOURCE_RENDERBUFFER_NV 0x9546
+#define GL_QUERY_RESOURCE_BUFFEROBJECT_NV 0x9547
+typedef GLint (APIENTRYP PFNGLQUERYRESOURCENVPROC) (GLenum queryType, GLint tagId, GLuint count, GLint *buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glQueryResourceNV (GLenum queryType, GLint tagId, GLuint count, GLint *buffer);
+#endif
+#endif /* GL_NV_query_resource */
+
+#ifndef GL_NV_query_resource_tag
+#define GL_NV_query_resource_tag 1
+typedef void (APIENTRYP PFNGLGENQUERYRESOURCETAGNVPROC) (GLsizei n, GLint *tagIds);
+typedef void (APIENTRYP PFNGLDELETEQUERYRESOURCETAGNVPROC) (GLsizei n, const GLint *tagIds);
+typedef void (APIENTRYP PFNGLQUERYRESOURCETAGNVPROC) (GLint tagId, const GLchar *tagString);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueryResourceTagNV (GLsizei n, GLint *tagIds);
+GLAPI void APIENTRY glDeleteQueryResourceTagNV (GLsizei n, const GLint *tagIds);
+GLAPI void APIENTRY glQueryResourceTagNV (GLint tagId, const GLchar *tagString);
+#endif
+#endif /* GL_NV_query_resource_tag */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_register_combiners */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_NV_register_combiners2 */
+
+#ifndef GL_NV_representative_fragment_test
+#define GL_NV_representative_fragment_test 1
+#define GL_REPRESENTATIVE_FRAGMENT_TEST_NV 0x937F
+#endif /* GL_NV_representative_fragment_test */
+
+#ifndef GL_NV_robustness_video_memory_purge
+#define GL_NV_robustness_video_memory_purge 1
+#define GL_PURGED_CONTEXT_RESET_NV        0x92BB
+#endif /* GL_NV_robustness_video_memory_purge */
+
+#ifndef GL_NV_sample_locations
+#define GL_NV_sample_locations 1
+#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E
+#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340
+#define GL_SAMPLE_LOCATION_NV             0x8E50
+#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341
+#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342
+#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343
+typedef void (APIENTRYP PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLRESOLVEDEPTHVALUESNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferSampleLocationsfvNV (GLenum target, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glNamedFramebufferSampleLocationsfvNV (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glResolveDepthValuesNV (void);
+#endif
+#endif /* GL_NV_sample_locations */
+
+#ifndef GL_NV_sample_mask_override_coverage
+#define GL_NV_sample_mask_override_coverage 1
+#endif /* GL_NV_sample_mask_override_coverage */
+
+#ifndef GL_NV_scissor_exclusive
+#define GL_NV_scissor_exclusive 1
+#define GL_SCISSOR_TEST_EXCLUSIVE_NV      0x9555
+#define GL_SCISSOR_BOX_EXCLUSIVE_NV       0x9556
+typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVENVPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSOREXCLUSIVEARRAYVNVPROC) (GLuint first, GLsizei count, const GLint *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glScissorExclusiveNV (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorExclusiveArrayvNV (GLuint first, GLsizei count, const GLint *v);
+#endif
+#endif /* GL_NV_scissor_exclusive */
+
+#ifndef GL_NV_shader_atomic_counters
+#define GL_NV_shader_atomic_counters 1
+#endif /* GL_NV_shader_atomic_counters */
+
+#ifndef GL_NV_shader_atomic_float
+#define GL_NV_shader_atomic_float 1
+#endif /* GL_NV_shader_atomic_float */
+
+#ifndef GL_NV_shader_atomic_float64
+#define GL_NV_shader_atomic_float64 1
+#endif /* GL_NV_shader_atomic_float64 */
+
+#ifndef GL_NV_shader_atomic_fp16_vector
+#define GL_NV_shader_atomic_fp16_vector 1
+#endif /* GL_NV_shader_atomic_fp16_vector */
+
+#ifndef GL_NV_shader_atomic_int64
+#define GL_NV_shader_atomic_int64 1
+#endif /* GL_NV_shader_atomic_int64 */
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_NV_shader_buffer_load */
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_NV_shader_buffer_store 1
+#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
+#endif /* GL_NV_shader_buffer_store */
+
+#ifndef GL_NV_shader_storage_buffer_object
+#define GL_NV_shader_storage_buffer_object 1
+#endif /* GL_NV_shader_storage_buffer_object */
+
+#ifndef GL_NV_shader_subgroup_partitioned
+#define GL_NV_shader_subgroup_partitioned 1
+#define GL_SUBGROUP_FEATURE_PARTITIONED_BIT_NV 0x00000100
+#endif /* GL_NV_shader_subgroup_partitioned */
+
+#ifndef GL_NV_shader_texture_footprint
+#define GL_NV_shader_texture_footprint 1
+#endif /* GL_NV_shader_texture_footprint */
+
+#ifndef GL_NV_shader_thread_group
+#define GL_NV_shader_thread_group 1
+#define GL_WARP_SIZE_NV                   0x9339
+#define GL_WARPS_PER_SM_NV                0x933A
+#define GL_SM_COUNT_NV                    0x933B
+#endif /* GL_NV_shader_thread_group */
+
+#ifndef GL_NV_shader_thread_shuffle
+#define GL_NV_shader_thread_shuffle 1
+#endif /* GL_NV_shader_thread_shuffle */
+
+#ifndef GL_NV_shading_rate_image
+#define GL_NV_shading_rate_image 1
+#define GL_SHADING_RATE_IMAGE_NV          0x9563
+#define GL_SHADING_RATE_NO_INVOCATIONS_NV 0x9564
+#define GL_SHADING_RATE_1_INVOCATION_PER_PIXEL_NV 0x9565
+#define GL_SHADING_RATE_1_INVOCATION_PER_1X2_PIXELS_NV 0x9566
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X1_PIXELS_NV 0x9567
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X2_PIXELS_NV 0x9568
+#define GL_SHADING_RATE_1_INVOCATION_PER_2X4_PIXELS_NV 0x9569
+#define GL_SHADING_RATE_1_INVOCATION_PER_4X2_PIXELS_NV 0x956A
+#define GL_SHADING_RATE_1_INVOCATION_PER_4X4_PIXELS_NV 0x956B
+#define GL_SHADING_RATE_2_INVOCATIONS_PER_PIXEL_NV 0x956C
+#define GL_SHADING_RATE_4_INVOCATIONS_PER_PIXEL_NV 0x956D
+#define GL_SHADING_RATE_8_INVOCATIONS_PER_PIXEL_NV 0x956E
+#define GL_SHADING_RATE_16_INVOCATIONS_PER_PIXEL_NV 0x956F
+#define GL_SHADING_RATE_IMAGE_BINDING_NV  0x955B
+#define GL_SHADING_RATE_IMAGE_TEXEL_WIDTH_NV 0x955C
+#define GL_SHADING_RATE_IMAGE_TEXEL_HEIGHT_NV 0x955D
+#define GL_SHADING_RATE_IMAGE_PALETTE_SIZE_NV 0x955E
+#define GL_MAX_COARSE_FRAGMENT_SAMPLES_NV 0x955F
+#define GL_SHADING_RATE_SAMPLE_ORDER_DEFAULT_NV 0x95AE
+#define GL_SHADING_RATE_SAMPLE_ORDER_PIXEL_MAJOR_NV 0x95AF
+#define GL_SHADING_RATE_SAMPLE_ORDER_SAMPLE_MAJOR_NV 0x95B0
+typedef void (APIENTRYP PFNGLBINDSHADINGRATEIMAGENVPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLGETSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint entry, GLenum *rate);
+typedef void (APIENTRYP PFNGLGETSHADINGRATESAMPLELOCATIONIVNVPROC) (GLenum rate, GLuint samples, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEBARRIERNVPROC) (GLboolean synchronize);
+typedef void (APIENTRYP PFNGLSHADINGRATEIMAGEPALETTENVPROC) (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates);
+typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERNVPROC) (GLenum order);
+typedef void (APIENTRYP PFNGLSHADINGRATESAMPLEORDERCUSTOMNVPROC) (GLenum rate, GLuint samples, const GLint *locations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindShadingRateImageNV (GLuint texture);
+GLAPI void APIENTRY glGetShadingRateImagePaletteNV (GLuint viewport, GLuint entry, GLenum *rate);
+GLAPI void APIENTRY glGetShadingRateSampleLocationivNV (GLenum rate, GLuint samples, GLuint index, GLint *location);
+GLAPI void APIENTRY glShadingRateImageBarrierNV (GLboolean synchronize);
+GLAPI void APIENTRY glShadingRateImagePaletteNV (GLuint viewport, GLuint first, GLsizei count, const GLenum *rates);
+GLAPI void APIENTRY glShadingRateSampleOrderNV (GLenum order);
+GLAPI void APIENTRY glShadingRateSampleOrderCustomNV (GLenum rate, GLuint samples, const GLint *locations);
+#endif
+#endif /* GL_NV_shading_rate_image */
+
+#ifndef GL_NV_stereo_view_rendering
+#define GL_NV_stereo_view_rendering 1
+#endif /* GL_NV_stereo_view_rendering */
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+#endif /* GL_NV_tessellation_program5 */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif /* GL_NV_texgen_emboss */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif /* GL_NV_texgen_reflection */
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif
+#endif /* GL_NV_texture_barrier */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif /* GL_NV_texture_compression_vtc */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif /* GL_NV_texture_env_combine4 */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif /* GL_NV_texture_expand_normal */
+
+#ifndef GL_NV_texture_multisample
+#define GL_NV_texture_multisample 1
+#define GL_TEXTURE_COVERAGE_SAMPLES_NV    0x9045
+#define GL_TEXTURE_COLOR_SAMPLES_NV       0x9046
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTexImage3DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#endif
+#endif /* GL_NV_texture_multisample */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif /* GL_NV_texture_rectangle */
+
+#ifndef GL_NV_texture_rectangle_compressed
+#define GL_NV_texture_rectangle_compressed 1
+#endif /* GL_NV_texture_rectangle_compressed */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    0x86E1
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     0x86E2
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif /* GL_NV_texture_shader */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif /* GL_NV_texture_shader2 */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif /* GL_NV_texture_shader3 */
+
+#ifndef GL_NV_timeline_semaphore
+#define GL_NV_timeline_semaphore 1
+#define GL_TIMELINE_SEMAPHORE_VALUE_NV    0x9595
+#define GL_SEMAPHORE_TYPE_NV              0x95B3
+#define GL_SEMAPHORE_TYPE_BINARY_NV       0x95B4
+#define GL_SEMAPHORE_TYPE_TIMELINE_NV     0x95B5
+#define GL_MAX_TIMELINE_SEMAPHORE_VALUE_DIFFERENCE_NV 0x95B6
+typedef void (APIENTRYP PFNGLCREATESEMAPHORESNVPROC) (GLsizei n, GLuint *semaphores);
+typedef void (APIENTRYP PFNGLSEMAPHOREPARAMETERIVNVPROC) (GLuint semaphore, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETSEMAPHOREPARAMETERIVNVPROC) (GLuint semaphore, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCreateSemaphoresNV (GLsizei n, GLuint *semaphores);
+GLAPI void APIENTRY glSemaphoreParameterivNV (GLuint semaphore, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetSemaphoreParameterivNV (GLuint semaphore, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_timeline_semaphore */
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#define GL_LAYER_NV                       0x8DAA
+#define GL_NEXT_BUFFER_NV                 -2
+#define GL_SKIP_COMPONENTS4_NV            -3
+#define GL_SKIP_COMPONENTS3_NV            -4
+#define GL_SKIP_COMPONENTS2_NV            -5
+#define GL_SKIP_COMPONENTS1_NV            -6
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLsizei count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif
+#endif /* GL_NV_transform_feedback */
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif
+#endif /* GL_NV_transform_feedback2 */
+
+#ifndef GL_NV_uniform_buffer_std430_layout
+#define GL_NV_uniform_buffer_std430_layout 1
+#endif /* GL_NV_uniform_buffer_std430_layout */
+
+#ifndef GL_NV_uniform_buffer_unified_memory
+#define GL_NV_uniform_buffer_unified_memory 1
+#define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
+#define GL_UNIFORM_BUFFER_ADDRESS_NV      0x936F
+#define GL_UNIFORM_BUFFER_LENGTH_NV       0x9370
+#endif /* GL_NV_uniform_buffer_unified_memory */
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+typedef GLintptr GLvdpauSurfaceNV;
+#define GL_SURFACE_STATE_NV               0x86EB
+#define GL_SURFACE_REGISTERED_NV          0x86FD
+#define GL_SURFACE_MAPPED_NV              0x8700
+#define GL_WRITE_DISCARD_NV               0x88BE
+typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const void *vdpDevice, const void *getProcAddress);
+typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLboolean (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVDPAUInitNV (const void *vdpDevice, const void *getProcAddress);
+GLAPI void APIENTRY glVDPAUFiniNV (void);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLboolean APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
+GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif
+#endif /* GL_NV_vdpau_interop */
+
+#ifndef GL_NV_vdpau_interop2
+#define GL_NV_vdpau_interop2 1
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACEWITHPICTURESTRUCTURENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceWithPictureStructureNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames, GLboolean isFrameStructure);
+#endif
+#endif /* GL_NV_vdpau_interop2 */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const void *pointer);
+#endif
+#endif /* GL_NV_vertex_array_range */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif /* GL_NV_vertex_array_range2 */
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+#endif /* GL_NV_vertex_program */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif /* GL_NV_vertex_program1_1 */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif /* GL_NV_vertex_program2 */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif /* GL_NV_vertex_program2_option */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif /* GL_NV_vertex_program3 */
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif /* GL_NV_vertex_program4 */
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+#endif /* GL_NV_video_capture */
+
+#ifndef GL_NV_viewport_array2
+#define GL_NV_viewport_array2 1
+#endif /* GL_NV_viewport_array2 */
+
+#ifndef GL_NV_viewport_swizzle
+#define GL_NV_viewport_swizzle 1
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355
+#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356
+#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357
+#define GL_VIEWPORT_SWIZZLE_X_NV          0x9358
+#define GL_VIEWPORT_SWIZZLE_Y_NV          0x9359
+#define GL_VIEWPORT_SWIZZLE_Z_NV          0x935A
+#define GL_VIEWPORT_SWIZZLE_W_NV          0x935B
+typedef void (APIENTRYP PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew);
+#endif
+#endif /* GL_NV_viewport_swizzle */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif /* GL_OML_interlace */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif /* GL_OML_resample */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif /* GL_OML_subsample */
+
+#ifndef GL_OVR_multiview
+#define GL_OVR_multiview 1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
+#define GL_MAX_VIEWS_OVR                  0x9631
+#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+#endif
+#endif /* GL_OVR_multiview */
+
+#ifndef GL_OVR_multiview2
+#define GL_OVR_multiview2 1
+#endif /* GL_OVR_multiview2 */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif
+#endif /* GL_PGI_misc_hints */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif /* GL_PGI_vertex_hints */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif /* GL_REND_screen_coordinates */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#define GL_RGBA_DXT5_S3TC                 0x83A4
+#define GL_RGBA4_DXT5_S3TC                0x83A5
+#endif /* GL_S3_s3tc */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_detail_texture */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif
+#endif /* GL_SGIS_fog_function */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif /* GL_SGIS_generate_mipmap */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif
+#endif /* GL_SGIS_multisample */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_SGIS_pixel_texture */
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif /* GL_SGIS_point_line_texgen */
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_SGIS_point_parameters */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_SGIS_texture4D */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif /* GL_SGIS_texture_border_clamp */
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+#endif /* GL_SGIS_texture_color_mask */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif /* GL_SGIS_texture_edge_clamp */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif /* GL_SGIS_texture_lod */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif /* GL_SGIS_texture_select */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#define GL_ASYNC_MARKER_SGIX              0x8329
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif
+#endif /* GL_SGIX_async */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif /* GL_SGIX_async_histogram */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif /* GL_SGIX_async_pixel */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif /* GL_SGIX_calligraphic_fragment */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif /* GL_SGIX_clipmap */
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif /* GL_SGIX_convolution_accuracy */
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif /* GL_SGIX_depth_pass_instrument */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif /* GL_SGIX_depth_texture */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif
+#endif /* GL_SGIX_flush_raster */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif /* GL_SGIX_fog_offset */
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif
+#endif /* GL_SGIX_fragment_lighting */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif
+#endif /* GL_SGIX_framezoom */
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const void *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const void *params);
+#endif
+#endif /* GL_SGIX_igloo_interface */
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif
+#endif /* GL_SGIX_instruments */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#define GL_INTERLACE_SGIX                 0x8094
+#endif /* GL_SGIX_interlace */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif /* GL_SGIX_ir_instrument1 */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#define GL_LIST_PRIORITY_SGIX             0x8182
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_list_priority */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif
+#endif /* GL_SGIX_pixel_texture */
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif /* GL_SGIX_pixel_tiles */
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif
+#endif /* GL_SGIX_polynomial_ffd */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif
+#endif /* GL_SGIX_reference_plane */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#define GL_PACK_RESAMPLE_SGIX             0x842E
+#define GL_UNPACK_RESAMPLE_SGIX           0x842F
+#define GL_RESAMPLE_REPLICATE_SGIX        0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x8434
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif /* GL_SGIX_resample */
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif /* GL_SGIX_scalebias_hint */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif /* GL_SGIX_shadow */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif /* GL_SGIX_shadow_ambient */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_sprite */
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif /* GL_SGIX_subsample */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif /* GL_SGIX_texture_add_env */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif /* GL_SGIX_texture_lod_bias */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif /* GL_SGIX_texture_multi_buffer */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif /* GL_SGIX_texture_scale_bias */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif /* GL_SGIX_vertex_preclip */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif /* GL_SGIX_ycrcb */
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif /* GL_SGIX_ycrcb_subsample */
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif /* GL_SGIX_ycrcba */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif /* GL_SGI_color_matrix */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif
+#endif /* GL_SGI_color_table */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif /* GL_SGI_texture_color_table */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif
+#endif /* GL_SUNX_constant_data */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif /* GL_SUN_convolution_border_modes */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif
+#endif /* GL_SUN_global_alpha */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+#endif /* GL_SUN_mesh_array */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif /* GL_SUN_slice_accum */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const void **pointer);
+#endif
+#endif /* GL_SUN_triangle_list */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+#endif /* GL_SUN_vertex */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif /* GL_WIN_phong_shading */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif /* GL_WIN_specular_fog */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/irr/test/CMakeLists.txt b/irr/test/CMakeLists.txt
new file mode 100644
index 000000000..6518f69c1
--- /dev/null
+++ b/irr/test/CMakeLists.txt
@@ -0,0 +1,32 @@
+link_libraries(IrrlichtMt::IrrlichtMt)
+add_executable(image_loader_test image_loader_test.cpp)
+
+function(test_image_loader format expected input)
+	string(TOLOWER ${format} suffix)
+	add_test(NAME ImageLoader${format}-${input} COMMAND image_loader_test ${expected} data/sample_${input}.${suffix} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+endfunction()
+
+test_image_loader(BMP 16color-16bpp 4bpp_v3)
+# test_image_loader(BMP 16color-16bpp 4bpp_v7)
+# test_image_loader(BMP 16color-16bpp 4bpp_v3_rle)
+# test_image_loader(BMP 16color-16bpp 4bpp_v7_rle)
+test_image_loader(BMP 30color-16bpp 8bpp_v3)
+# test_image_loader(BMP 30color-16bpp 8bpp_v7)
+test_image_loader(BMP 30color-16bpp 8bpp_v3_rle)
+# test_image_loader(BMP 30color-16bpp 8bpp_v7_rle)
+# test_image_loader(BMP 30color-16bpp 16bpp_v3)
+# test_image_loader(BMP 30color-16bpp 16bpp_v7)
+test_image_loader(BMP 30color-24bpp 24bpp_v3)
+test_image_loader(BMP 30color-24bpp 24bpp_v7)
+
+test_image_loader(PNG 30color-24bpp 8bpp)
+test_image_loader(PNG 30color-24bpp 24bpp)
+
+test_image_loader(TGA 30color-32bpp 8bpp_up)
+test_image_loader(TGA 30color-32bpp 8bpp_down)
+# test_image_loader(TGA 30color-16bpp 8bpp_rle_up)
+# test_image_loader(TGA 30color-16bpp 8bpp_rle_down)
+test_image_loader(TGA 30color-24bpp 24bpp_up)
+test_image_loader(TGA 30color-24bpp 24bpp_down)
+test_image_loader(TGA 30color-24bpp 24bpp_rle_up)
+test_image_loader(TGA 30color-24bpp 24bpp_rle_down)
diff --git a/irr/test/data/sample_16bpp_v3.bmp b/irr/test/data/sample_16bpp_v3.bmp
new file mode 100644
index 000000000..4b6fbcf50
Binary files /dev/null and b/irr/test/data/sample_16bpp_v3.bmp differ
diff --git a/irr/test/data/sample_16bpp_v7.bmp b/irr/test/data/sample_16bpp_v7.bmp
new file mode 100644
index 000000000..7a0b8a6ed
Binary files /dev/null and b/irr/test/data/sample_16bpp_v7.bmp differ
diff --git a/irr/test/data/sample_24bpp.png b/irr/test/data/sample_24bpp.png
new file mode 100644
index 000000000..d38f5989c
Binary files /dev/null and b/irr/test/data/sample_24bpp.png differ
diff --git a/irr/test/data/sample_24bpp_down.tga b/irr/test/data/sample_24bpp_down.tga
new file mode 100644
index 000000000..031f88282
Binary files /dev/null and b/irr/test/data/sample_24bpp_down.tga differ
diff --git a/irr/test/data/sample_24bpp_rle_down.tga b/irr/test/data/sample_24bpp_rle_down.tga
new file mode 100644
index 000000000..24e765e19
Binary files /dev/null and b/irr/test/data/sample_24bpp_rle_down.tga differ
diff --git a/irr/test/data/sample_24bpp_rle_up.tga b/irr/test/data/sample_24bpp_rle_up.tga
new file mode 100644
index 000000000..4a5f9604d
Binary files /dev/null and b/irr/test/data/sample_24bpp_rle_up.tga differ
diff --git a/irr/test/data/sample_24bpp_up.tga b/irr/test/data/sample_24bpp_up.tga
new file mode 100644
index 000000000..1f1edc6e9
Binary files /dev/null and b/irr/test/data/sample_24bpp_up.tga differ
diff --git a/irr/test/data/sample_24bpp_v3.bmp b/irr/test/data/sample_24bpp_v3.bmp
new file mode 100644
index 000000000..4684f1466
Binary files /dev/null and b/irr/test/data/sample_24bpp_v3.bmp differ
diff --git a/irr/test/data/sample_24bpp_v7.bmp b/irr/test/data/sample_24bpp_v7.bmp
new file mode 100644
index 000000000..1fa343188
Binary files /dev/null and b/irr/test/data/sample_24bpp_v7.bmp differ
diff --git a/irr/test/data/sample_4bpp_v3.bmp b/irr/test/data/sample_4bpp_v3.bmp
new file mode 100644
index 000000000..0cc06f316
Binary files /dev/null and b/irr/test/data/sample_4bpp_v3.bmp differ
diff --git a/irr/test/data/sample_8bpp.png b/irr/test/data/sample_8bpp.png
new file mode 100644
index 000000000..c81f816f4
Binary files /dev/null and b/irr/test/data/sample_8bpp.png differ
diff --git a/irr/test/data/sample_8bpp_down.tga b/irr/test/data/sample_8bpp_down.tga
new file mode 100644
index 000000000..e46cad554
Binary files /dev/null and b/irr/test/data/sample_8bpp_down.tga differ
diff --git a/irr/test/data/sample_8bpp_rle_down.tga b/irr/test/data/sample_8bpp_rle_down.tga
new file mode 100644
index 000000000..3d34bff4c
Binary files /dev/null and b/irr/test/data/sample_8bpp_rle_down.tga differ
diff --git a/irr/test/data/sample_8bpp_rle_up.tga b/irr/test/data/sample_8bpp_rle_up.tga
new file mode 100644
index 000000000..0372bc34c
Binary files /dev/null and b/irr/test/data/sample_8bpp_rle_up.tga differ
diff --git a/irr/test/data/sample_8bpp_up.tga b/irr/test/data/sample_8bpp_up.tga
new file mode 100644
index 000000000..a314e8689
Binary files /dev/null and b/irr/test/data/sample_8bpp_up.tga differ
diff --git a/irr/test/data/sample_8bpp_v3.bmp b/irr/test/data/sample_8bpp_v3.bmp
new file mode 100644
index 000000000..a890e6465
Binary files /dev/null and b/irr/test/data/sample_8bpp_v3.bmp differ
diff --git a/irr/test/data/sample_8bpp_v3_rle.bmp b/irr/test/data/sample_8bpp_v3_rle.bmp
new file mode 100644
index 000000000..d460d0fd6
Binary files /dev/null and b/irr/test/data/sample_8bpp_v3_rle.bmp differ
diff --git a/irr/test/data/sample_8bpp_v7.bmp b/irr/test/data/sample_8bpp_v7.bmp
new file mode 100644
index 000000000..a31a342c2
Binary files /dev/null and b/irr/test/data/sample_8bpp_v7.bmp differ
diff --git a/irr/test/data/sample_8bpp_v7_rle.bmp b/irr/test/data/sample_8bpp_v7_rle.bmp
new file mode 100644
index 000000000..d197b09a6
Binary files /dev/null and b/irr/test/data/sample_8bpp_v7_rle.bmp differ
diff --git a/irr/test/image_loader_test.cpp b/irr/test/image_loader_test.cpp
new file mode 100644
index 000000000..1dd4888f2
--- /dev/null
+++ b/irr/test/image_loader_test.cpp
@@ -0,0 +1,162 @@
+#include <cstdio>
+#include <initializer_list>
+#include <stdexcept>
+#include <vector>
+#include <irrlicht.h>
+
+using namespace irr;
+
+struct ImageDesc
+{
+	const char *name;
+	video::ECOLOR_FORMAT format;
+	std::vector<u8> data;
+};
+
+template <typename T>
+std::vector<u8> to_byte_array(std::initializer_list<T> in_data)
+{
+	std::vector<u8> data;
+	data.resize(sizeof(T) * in_data.size());
+	memcpy(data.data(), in_data.begin(), data.size());
+	return data;
+}
+
+static const ImageDesc test_images[] = {
+	{"16color-16bpp", video::ECF_A1R5G5B5, to_byte_array<u16>({
+		0xb6df, 0xb6df, 0xb6df, 0xb6df, 0xc23f, 0xc23f, 0xd61f, 0xd61f, 0xea3f, 0xea3f, 0xfe5e, 0xfe5e, 0xfe7c, 0xfe7a, 0xfe7a, 0xfe97, 0xfeb5, 0xfeb5, 0xff16,
+		0xb6df, 0xb6df, 0xff3f, 0xff3f, 0xc23f, 0xf2df, 0xf2df, 0xf2df, 0xea3f, 0xda7f, 0xda7f, 0xfe5e, 0xfe7a, 0xc23f, 0xbe7f, 0xbe7f, 0xfeb5, 0xfeb5, 0xfb76,
+		0xb6df, 0xff9e, 0xc23f, 0xc23f, 0xc23f, 0xf2df, 0xd61f, 0xf2df, 0xea3f, 0xda7f, 0xfe5e, 0xda7f, 0xfe7a, 0xc23f, 0xfe97, 0xfeb5, 0xfeb5, 0xff16, 0xfb76,
+		0xb6df, 0xff9e, 0xbe7f, 0xc23f, 0xd61f, 0xfe7c, 0xd61f, 0xf2df, 0xfe5e, 0xf2df, 0xfe7c, 0xda7f, 0xfe7a, 0xda7f, 0xbe7f, 0xfeb5, 0xff16, 0xff16, 0xfb76,
+		0xb6df, 0xff9e, 0xc23f, 0xc23f, 0xd61f, 0xff3f, 0xd61f, 0xf2df, 0xfe5e, 0xda7f, 0xfe7c, 0xda7f, 0xfe7a, 0xc23f, 0xfeb5, 0xfeb5, 0xff16, 0xff16, 0xfb76,
+		0xb6df, 0xbe7f, 0xff9e, 0xff3f, 0xd61f, 0xff3f, 0xf2df, 0xf2df, 0xfe5e, 0xf2df, 0xda7f, 0xfe97, 0xfe97, 0xda7f, 0xc23f, 0xda7f, 0xfb76, 0xfb76, 0xfb76,
+		0xbe7f, 0xc23f, 0xc23f, 0xd61f, 0xd61f, 0xea3f, 0xea3f, 0xfe5e, 0xfe5e, 0xfe7c, 0xfe7c, 0xfe7a, 0xfe97, 0xfeb5, 0xfeb5, 0xfeb5, 0xfb76, 0xfb76, 0xfb76,
+		0xbe7f, 0xc23f, 0xd61f, 0xd61f, 0xd61f, 0xea3f, 0xea3f, 0xfe5e, 0xfe5e, 0xfe7c, 0xfe97, 0xfe97, 0xfe97, 0xfeb5, 0xff16, 0xff16, 0xfb76, 0xfb76, 0xfb76,
+		0xc23f, 0xff9e, 0xc23f, 0xd61f, 0xff3f, 0xea3f, 0xfe5e, 0xff3f, 0xfe7c, 0xfe7c, 0xf2df, 0xfe97, 0xfeb5, 0xfeb5, 0xda7f, 0xff16, 0xc23f, 0xc23f, 0xbe7f,
+		0xc23f, 0xff9e, 0xff9e, 0xd61f, 0xff9e, 0xea3f, 0xff3f, 0xfe5e, 0xff3f, 0xfe7a, 0xf2df, 0xf2df, 0xfeb5, 0xf2df, 0xda7f, 0xfb76, 0xc23f, 0xfb76, 0xfb76,
+		0xc23f, 0xff9e, 0xd61f, 0xff9e, 0xff9e, 0xfe5e, 0xff3f, 0xff3f, 0xff3f, 0xfe7a, 0xff3f, 0xfeb5, 0xf2df, 0xff16, 0xda7f, 0xfb76, 0xda7f, 0xda7f, 0xfb76,
+		0xc23f, 0xff9e, 0xea3f, 0xea3f, 0xff9e, 0xfe5e, 0xff9e, 0xfe7c, 0xff3f, 0xfe97, 0xf2df, 0xfeb5, 0xfeb5, 0xff16, 0xf2df, 0xfb76, 0xda7f, 0xfb76, 0xfb76,
+		0xd61f, 0xff9e, 0xd61f, 0xea3f, 0xff9e, 0xfe5e, 0xff9e, 0xfe7c, 0xff3f, 0xfe97, 0xff3f, 0xfeb5, 0xff16, 0xfb76, 0xda7f, 0xfb76, 0xda7f, 0xda7f, 0xc23f,
+		0xd61f, 0xd61f, 0xea3f, 0xea3f, 0xea3f, 0xfe5e, 0xfe7c, 0xfe7a, 0xfe7a, 0xfe97, 0xfeb5, 0xff16, 0xff16, 0xfb76, 0xfb76, 0xfb76, 0xfb76, 0xfb76, 0xfb76,
+		0xd61f, 0xd61f, 0xea3f, 0xfe5e, 0xfe5e, 0xfe7c, 0xfe7a, 0xfe7a, 0xfe97, 0xfeb5, 0xfeb5, 0xff16, 0xff16, 0xfb76, 0xfb76, 0xfb76, 0xfb76, 0xfb76, 0xfb76,
+	})},
+
+	{"30color-16bpp", video::ECF_A1R5G5B5, to_byte_array<u16>({
+		0xbabf, 0xbabf, 0xbabf, 0xbabf, 0xbe3f, 0xbdff, 0xc9ff, 0xda1f, 0xee3f, 0xee3f, 0xfa5f, 0xfe5e, 0xfe7c, 0xfe7b, 0xfe79, 0xfe97, 0xfeb5, 0xfed5, 0xff16,
+		0xbabf, 0xbabf, 0xff1f, 0xff1f, 0xbdff, 0xfaff, 0xf2df, 0xeabf, 0xee3f, 0xe27f, 0xda7f, 0xfe5e, 0xfe7b, 0xc25f, 0xbe7f, 0xbe7f, 0xfeb5, 0xfed5, 0xff56,
+		0xbabf, 0xff7e, 0xbe7f, 0xc25f, 0xbdff, 0xfaff, 0xda1f, 0xf2df, 0xee3f, 0xda7f, 0xfe5e, 0xce5f, 0xfe79, 0xce5f, 0xfe97, 0xfeb5, 0xfed5, 0xff16, 0xff56,
+		0xbabf, 0xff7e, 0xbe7f, 0xbdff, 0xc9ff, 0xfaff, 0xda1f, 0xf2df, 0xfa5f, 0xeabf, 0xfe5e, 0xda7f, 0xfe79, 0xce5f, 0xc25f, 0xfeb5, 0xff16, 0xff16, 0xff76,
+		0xbabf, 0xff7e, 0xc25f, 0xbdff, 0xc9ff, 0xff1f, 0xda1f, 0xf2df, 0xfa5f, 0xeabf, 0xfe7c, 0xda7f, 0xfe79, 0xce5f, 0xfeb5, 0xfed5, 0xff16, 0xff56, 0xff97,
+		0xbabf, 0xbe7f, 0xff7e, 0xff5e, 0xda1f, 0xff1f, 0xfaff, 0xfaff, 0xfa5f, 0xf2df, 0xeabf, 0xfe79, 0xfe97, 0xda7f, 0xce5f, 0xce5f, 0xff56, 0xff76, 0xff97,
+		0xbe7f, 0xc25f, 0xbdff, 0xc9ff, 0xda1f, 0xda1f, 0xee3f, 0xfa5f, 0xfa5f, 0xfe7c, 0xfe7b, 0xfe79, 0xfe97, 0xfeb5, 0xfed5, 0xfed5, 0xff76, 0xff76, 0xff97,
+		0xbe7f, 0xbe3f, 0xc9ff, 0xc9ff, 0xda1f, 0xee3f, 0xee3f, 0xfa5f, 0xfe5e, 0xfe7c, 0xfe79, 0xfe97, 0xfe97, 0xfeb5, 0xff16, 0xff16, 0xff76, 0xff97, 0xff97,
+		0xbe3f, 0xffbe, 0xc9ff, 0xda1f, 0xff5e, 0xee3f, 0xfa5f, 0xff1f, 0xfe7c, 0xfe7b, 0xf2df, 0xfe97, 0xfeb5, 0xfeb5, 0xda7f, 0xff76, 0xce5f, 0xbe3f, 0xc25f,
+		0xbe3f, 0xffbe, 0xffbe, 0xda1f, 0xff7e, 0xfa5f, 0xff5e, 0xfe5e, 0xff1f, 0xfe79, 0xf2df, 0xf2df, 0xfeb5, 0xeabf, 0xda7f, 0xff76, 0xce5f, 0xff97, 0xff97,
+		0xbdff, 0xffbe, 0xda1f, 0xff7e, 0xff7e, 0xfa5f, 0xff5e, 0xff1f, 0xff1f, 0xfe79, 0xfaff, 0xfeb5, 0xf2df, 0xff16, 0xe27f, 0xff97, 0xda7f, 0xce5f, 0xff97,
+		0xbdff, 0xffbe, 0xda1f, 0xee3f, 0xffbe, 0xfa5f, 0xff7e, 0xfe7b, 0xff1f, 0xfe97, 0xfaff, 0xfeb5, 0xfed5, 0xff56, 0xeabf, 0xff97, 0xda7f, 0xff97, 0xff97,
+		0xc9ff, 0xffbe, 0xda1f, 0xee3f, 0xff7e, 0xfa5f, 0xff7e, 0xfe7c, 0xff5e, 0xfe97, 0xfaff, 0xfed5, 0xff16, 0xff56, 0xeabf, 0xff97, 0xda7f, 0xda7f, 0xce5f,
+		0xda1f, 0xda1f, 0xee3f, 0xee3f, 0xfa5f, 0xfe5e, 0xfe7c, 0xfe79, 0xfe79, 0xfe97, 0xfeb5, 0xfed5, 0xff16, 0xff56, 0xff97, 0xff97, 0xff97, 0xff97, 0xff97,
+		0xda1f, 0xda1f, 0xee3f, 0xfa5f, 0xfe5e, 0xfe7c, 0xfe7b, 0xfe79, 0xfe97, 0xfeb5, 0xfed5, 0xff16, 0xff56, 0xff97, 0xff97, 0xff97, 0xff97, 0xff97, 0xff97,
+	})},
+
+	{"30color-24bpp", video::ECF_R8G8B8, {
+		0x71, 0xaf, 0xff, 0x71, 0xaf, 0xff, 0x71, 0xaf, 0xff, 0x71, 0xaf, 0xff, 0x7b, 0x8b, 0xff, 0x7a, 0x7f, 0xff, 0x90, 0x7f, 0xff, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xfe, 0x96, 0xf0, 0xfd, 0x99, 0xe3, 0xfd, 0x9b, 0xda, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1,
+		0x71, 0xaf, 0xff, 0x71, 0xaf, 0xff, 0xff, 0xc6, 0xfc, 0xff, 0xc6, 0xfc, 0x7a, 0x7f, 0xff, 0xf7, 0xbe, 0xff, 0xe4, 0xb2, 0xfe, 0xd4, 0xa9, 0xff, 0xd9, 0x8c, 0xff, 0xc3, 0x98, 0xff, 0xb2, 0x9a, 0xff, 0xfe, 0x96, 0xf0, 0xfd, 0x9b, 0xda, 0x86, 0x93, 0xfe, 0x78, 0x9b, 0xff, 0x78, 0x9b, 0xff, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf8, 0xd2, 0xb3,
+		0x71, 0xaf, 0xff, 0xfe, 0xdc, 0xf3, 0x78, 0x9b, 0xff, 0x86, 0x93, 0xfe, 0x7a, 0x7f, 0xff, 0xf7, 0xbe, 0xff, 0xb6, 0x85, 0xff, 0xe4, 0xb2, 0xfe, 0xd9, 0x8c, 0xff, 0xb2, 0x9a, 0xff, 0xfe, 0x96, 0xf0, 0x9a, 0x91, 0xff, 0xfc, 0x9f, 0xca, 0x9a, 0x91, 0xff, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1, 0xf8, 0xd2, 0xb3,
+		0x71, 0xaf, 0xff, 0xfe, 0xdc, 0xf3, 0x78, 0x9b, 0xff, 0x7a, 0x7f, 0xff, 0x90, 0x7f, 0xff, 0xf7, 0xbe, 0xff, 0xb6, 0x85, 0xff, 0xe4, 0xb2, 0xfe, 0xf4, 0x92, 0xfe, 0xd4, 0xa9, 0xff, 0xfe, 0x96, 0xf0, 0xb2, 0x9a, 0xff, 0xfc, 0x9f, 0xca, 0x9a, 0x91, 0xff, 0x86, 0x93, 0xfe, 0xfb, 0xa9, 0xab, 0xf9, 0xc6, 0xb1, 0xf9, 0xc6, 0xb1, 0xf8, 0xd8, 0xb5,
+		0x71, 0xaf, 0xff, 0xfe, 0xdc, 0xf3, 0x86, 0x93, 0xfe, 0x7a, 0x7f, 0xff, 0x90, 0x7f, 0xff, 0xff, 0xc6, 0xfc, 0xb6, 0x85, 0xff, 0xe4, 0xb2, 0xfe, 0xf4, 0x92, 0xfe, 0xd4, 0xa9, 0xff, 0xfd, 0x99, 0xe3, 0xb2, 0x9a, 0xff, 0xfc, 0x9f, 0xca, 0x9a, 0x91, 0xff, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1, 0xf8, 0xd2, 0xb3, 0xf8, 0xe4, 0xb9,
+		0x71, 0xaf, 0xff, 0x78, 0x9b, 0xff, 0xfe, 0xdc, 0xf3, 0xff, 0xd0, 0xf7, 0xb6, 0x85, 0xff, 0xff, 0xc6, 0xfc, 0xf7, 0xbe, 0xff, 0xf7, 0xbe, 0xff, 0xf4, 0x92, 0xfe, 0xe4, 0xb2, 0xfe, 0xd4, 0xa9, 0xff, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xb2, 0x9a, 0xff, 0x9a, 0x91, 0xff, 0x9a, 0x91, 0xff, 0xf8, 0xd2, 0xb3, 0xf8, 0xd8, 0xb5, 0xf8, 0xe4, 0xb9,
+		0x78, 0x9b, 0xff, 0x86, 0x93, 0xfe, 0x7a, 0x7f, 0xff, 0x90, 0x7f, 0xff, 0xb6, 0x85, 0xff, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xf4, 0x92, 0xfe, 0xfd, 0x99, 0xe3, 0xfd, 0x9b, 0xda, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xfa, 0xb6, 0xad, 0xf8, 0xd8, 0xb5, 0xf8, 0xd8, 0xb5, 0xf8, 0xe4, 0xb9,
+		0x78, 0x9b, 0xff, 0x7b, 0x8b, 0xff, 0x90, 0x7f, 0xff, 0x90, 0x7f, 0xff, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xfe, 0x96, 0xf0, 0xfd, 0x99, 0xe3, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xf9, 0xc6, 0xb1, 0xf9, 0xc6, 0xb1, 0xf8, 0xd8, 0xb5, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9,
+		0x7b, 0x8b, 0xff, 0xff, 0xeb, 0xf2, 0x90, 0x7f, 0xff, 0xb6, 0x85, 0xff, 0xff, 0xd0, 0xf7, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xff, 0xc6, 0xfc, 0xfd, 0x99, 0xe3, 0xfd, 0x9b, 0xda, 0xe4, 0xb2, 0xfe, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfb, 0xa9, 0xab, 0xb2, 0x9a, 0xff, 0xf8, 0xd8, 0xb5, 0x9a, 0x91, 0xff, 0x7b, 0x8b, 0xff, 0x86, 0x93, 0xfe,
+		0x7b, 0x8b, 0xff, 0xff, 0xeb, 0xf2, 0xff, 0xeb, 0xf2, 0xb6, 0x85, 0xff, 0xfe, 0xdc, 0xf3, 0xf4, 0x92, 0xfe, 0xff, 0xd0, 0xf7, 0xfe, 0x96, 0xf0, 0xff, 0xc6, 0xfc, 0xfc, 0x9f, 0xca, 0xe4, 0xb2, 0xfe, 0xe4, 0xb2, 0xfe, 0xfb, 0xa9, 0xab, 0xd4, 0xa9, 0xff, 0xb2, 0x9a, 0xff, 0xf8, 0xd8, 0xb5, 0x9a, 0x91, 0xff, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9,
+		0x7a, 0x7f, 0xff, 0xff, 0xeb, 0xf2, 0xb6, 0x85, 0xff, 0xfe, 0xdc, 0xf3, 0xfe, 0xdc, 0xf3, 0xf4, 0x92, 0xfe, 0xff, 0xd0, 0xf7, 0xff, 0xc6, 0xfc, 0xff, 0xc6, 0xfc, 0xfc, 0x9f, 0xca, 0xf7, 0xbe, 0xff, 0xfb, 0xa9, 0xab, 0xe4, 0xb2, 0xfe, 0xf9, 0xc6, 0xb1, 0xc3, 0x98, 0xff, 0xf8, 0xe4, 0xb9, 0xb2, 0x9a, 0xff, 0x9a, 0x91, 0xff, 0xf8, 0xe4, 0xb9,
+		0x7a, 0x7f, 0xff, 0xff, 0xeb, 0xf2, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xff, 0xeb, 0xf2, 0xf4, 0x92, 0xfe, 0xfe, 0xdc, 0xf3, 0xfd, 0x9b, 0xda, 0xff, 0xc6, 0xfc, 0xfc, 0xa4, 0xbc, 0xf7, 0xbe, 0xff, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf8, 0xd2, 0xb3, 0xd4, 0xa9, 0xff, 0xf8, 0xe4, 0xb9, 0xb2, 0x9a, 0xff, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9,
+		0x90, 0x7f, 0xff, 0xff, 0xeb, 0xf2, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xfe, 0xdc, 0xf3, 0xf4, 0x92, 0xfe, 0xfe, 0xdc, 0xf3, 0xfd, 0x99, 0xe3, 0xff, 0xd0, 0xf7, 0xfc, 0xa4, 0xbc, 0xf7, 0xbe, 0xff, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1, 0xf8, 0xd2, 0xb3, 0xd4, 0xa9, 0xff, 0xf8, 0xe4, 0xb9, 0xb2, 0x9a, 0xff, 0xb2, 0x9a, 0xff, 0x9a, 0x91, 0xff,
+		0xb6, 0x85, 0xff, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xfe, 0x96, 0xf0, 0xfd, 0x99, 0xe3, 0xfc, 0x9f, 0xca, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1, 0xf8, 0xd2, 0xb3, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9,
+		0xb6, 0x85, 0xff, 0xb6, 0x85, 0xff, 0xd9, 0x8c, 0xff, 0xf4, 0x92, 0xfe, 0xfe, 0x96, 0xf0, 0xfd, 0x99, 0xe3, 0xfd, 0x9b, 0xda, 0xfc, 0x9f, 0xca, 0xfc, 0xa4, 0xbc, 0xfb, 0xa9, 0xab, 0xfa, 0xb6, 0xad, 0xf9, 0xc6, 0xb1, 0xf8, 0xd2, 0xb3, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9, 0xf8, 0xe4, 0xb9,
+	}},
+
+	{"30color-32bpp", video::ECF_A8R8G8B8, to_byte_array<u32>({
+		0xff71afff, 0xff71afff, 0xff71afff, 0xff71afff, 0xff7b8bff, 0xff7a7fff, 0xff907fff, 0xffb685ff, 0xffd98cff, 0xffd98cff, 0xfff492fe, 0xfffe96f0, 0xfffd99e3, 0xfffd9bda, 0xfffc9fca, 0xfffca4bc, 0xfffba9ab, 0xfffab6ad, 0xfff9c6b1,
+		0xff71afff, 0xff71afff, 0xffffc6fc, 0xffffc6fc, 0xff7a7fff, 0xfff7beff, 0xffe4b2fe, 0xffd4a9ff, 0xffd98cff, 0xffc398ff, 0xffb29aff, 0xfffe96f0, 0xfffd9bda, 0xff8693fe, 0xff789bff, 0xff789bff, 0xfffba9ab, 0xfffab6ad, 0xfff8d2b3,
+		0xff71afff, 0xfffedcf3, 0xff789bff, 0xff8693fe, 0xff7a7fff, 0xfff7beff, 0xffb685ff, 0xffe4b2fe, 0xffd98cff, 0xffb29aff, 0xfffe96f0, 0xff9a91ff, 0xfffc9fca, 0xff9a91ff, 0xfffca4bc, 0xfffba9ab, 0xfffab6ad, 0xfff9c6b1, 0xfff8d2b3,
+		0xff71afff, 0xfffedcf3, 0xff789bff, 0xff7a7fff, 0xff907fff, 0xfff7beff, 0xffb685ff, 0xffe4b2fe, 0xfff492fe, 0xffd4a9ff, 0xfffe96f0, 0xffb29aff, 0xfffc9fca, 0xff9a91ff, 0xff8693fe, 0xfffba9ab, 0xfff9c6b1, 0xfff9c6b1, 0xfff8d8b5,
+		0xff71afff, 0xfffedcf3, 0xff8693fe, 0xff7a7fff, 0xff907fff, 0xffffc6fc, 0xffb685ff, 0xffe4b2fe, 0xfff492fe, 0xffd4a9ff, 0xfffd99e3, 0xffb29aff, 0xfffc9fca, 0xff9a91ff, 0xfffba9ab, 0xfffab6ad, 0xfff9c6b1, 0xfff8d2b3, 0xfff8e4b9,
+		0xff71afff, 0xff789bff, 0xfffedcf3, 0xffffd0f7, 0xffb685ff, 0xffffc6fc, 0xfff7beff, 0xfff7beff, 0xfff492fe, 0xffe4b2fe, 0xffd4a9ff, 0xfffc9fca, 0xfffca4bc, 0xffb29aff, 0xff9a91ff, 0xff9a91ff, 0xfff8d2b3, 0xfff8d8b5, 0xfff8e4b9,
+		0xff789bff, 0xff8693fe, 0xff7a7fff, 0xff907fff, 0xffb685ff, 0xffb685ff, 0xffd98cff, 0xfff492fe, 0xfff492fe, 0xfffd99e3, 0xfffd9bda, 0xfffc9fca, 0xfffca4bc, 0xfffba9ab, 0xfffab6ad, 0xfffab6ad, 0xfff8d8b5, 0xfff8d8b5, 0xfff8e4b9,
+		0xff789bff, 0xff7b8bff, 0xff907fff, 0xff907fff, 0xffb685ff, 0xffd98cff, 0xffd98cff, 0xfff492fe, 0xfffe96f0, 0xfffd99e3, 0xfffc9fca, 0xfffca4bc, 0xfffca4bc, 0xfffba9ab, 0xfff9c6b1, 0xfff9c6b1, 0xfff8d8b5, 0xfff8e4b9, 0xfff8e4b9,
+		0xff7b8bff, 0xffffebf2, 0xff907fff, 0xffb685ff, 0xffffd0f7, 0xffd98cff, 0xfff492fe, 0xffffc6fc, 0xfffd99e3, 0xfffd9bda, 0xffe4b2fe, 0xfffca4bc, 0xfffba9ab, 0xfffba9ab, 0xffb29aff, 0xfff8d8b5, 0xff9a91ff, 0xff7b8bff, 0xff8693fe,
+		0xff7b8bff, 0xffffebf2, 0xffffebf2, 0xffb685ff, 0xfffedcf3, 0xfff492fe, 0xffffd0f7, 0xfffe96f0, 0xffffc6fc, 0xfffc9fca, 0xffe4b2fe, 0xffe4b2fe, 0xfffba9ab, 0xffd4a9ff, 0xffb29aff, 0xfff8d8b5, 0xff9a91ff, 0xfff8e4b9, 0xfff8e4b9,
+		0xff7a7fff, 0xffffebf2, 0xffb685ff, 0xfffedcf3, 0xfffedcf3, 0xfff492fe, 0xffffd0f7, 0xffffc6fc, 0xffffc6fc, 0xfffc9fca, 0xfff7beff, 0xfffba9ab, 0xffe4b2fe, 0xfff9c6b1, 0xffc398ff, 0xfff8e4b9, 0xffb29aff, 0xff9a91ff, 0xfff8e4b9,
+		0xff7a7fff, 0xffffebf2, 0xffb685ff, 0xffd98cff, 0xffffebf2, 0xfff492fe, 0xfffedcf3, 0xfffd9bda, 0xffffc6fc, 0xfffca4bc, 0xfff7beff, 0xfffba9ab, 0xfffab6ad, 0xfff8d2b3, 0xffd4a9ff, 0xfff8e4b9, 0xffb29aff, 0xfff8e4b9, 0xfff8e4b9,
+		0xff907fff, 0xffffebf2, 0xffb685ff, 0xffd98cff, 0xfffedcf3, 0xfff492fe, 0xfffedcf3, 0xfffd99e3, 0xffffd0f7, 0xfffca4bc, 0xfff7beff, 0xfffab6ad, 0xfff9c6b1, 0xfff8d2b3, 0xffd4a9ff, 0xfff8e4b9, 0xffb29aff, 0xffb29aff, 0xff9a91ff,
+		0xffb685ff, 0xffb685ff, 0xffd98cff, 0xffd98cff, 0xfff492fe, 0xfffe96f0, 0xfffd99e3, 0xfffc9fca, 0xfffc9fca, 0xfffca4bc, 0xfffba9ab, 0xfffab6ad, 0xfff9c6b1, 0xfff8d2b3, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9,
+		0xffb685ff, 0xffb685ff, 0xffd98cff, 0xfff492fe, 0xfffe96f0, 0xfffd99e3, 0xfffd9bda, 0xfffc9fca, 0xfffca4bc, 0xfffba9ab, 0xfffab6ad, 0xfff9c6b1, 0xfff8d2b3, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9, 0xfff8e4b9,
+	})},
+
+};
+
+void printImageBytes(const video::IImage *img)
+{
+	const auto *data = (u8 *)img->getData();
+	const auto w = img->getPitch();
+	const auto h = img->getDimension().Height;
+	for (int y = 0; y < h; y++) {
+		for (int k = 0; k < w; k++) {
+			std::printf("0x%02x, ", *data++);
+		}
+		std::printf("\n");
+	}
+}
+
+int main(int argc, char *argv[])
+try {
+	if (argc != 3)
+		throw std::runtime_error("Invalid arguments. Expected sample ID and image file name");
+
+	const ImageDesc *sample = nullptr;
+	for (auto &&image : test_images) {
+		if (strcmp(argv[1], image.name) == 0)
+			sample = &image;
+	}
+	if (!sample)
+		throw std::runtime_error("Sample not found");
+
+	SIrrlichtCreationParameters p;
+	p.DriverType = video::EDT_NULL;
+	p.WindowSize = core::dimension2du(640, 480);
+	p.LoggingLevel = ELL_DEBUG;
+
+	auto *device = createDeviceEx(p);
+	if (!device)
+		throw std::runtime_error("Failed to create device");
+
+	auto *driver = device->getVideoDriver();
+
+	auto *img = driver->createImageFromFile(argv[2]);
+	if (!img)
+		throw std::runtime_error("Failed to load image");
+
+	if (img->getDimension() != core::dimension2du{19, 15})
+		throw std::runtime_error("Wrong image dimensions");
+
+	if (img->getColorFormat() != sample->format)
+		throw std::runtime_error("Wrong image format");
+
+	if (img->getImageDataSizeInBytes() != sample->data.size())
+		throw std::logic_error("Image data size not equal to sample size");
+
+	if (memcmp(img->getData(), sample->data.data(), sample->data.size()) != 0) {
+		printImageBytes(img);
+		throw std::runtime_error("Wrong image contents");
+	}
+
+	img->drop();
+	device->drop();
+
+	return 0;
+} catch (const std::exception &e) {
+	std::printf("Test failed: %s\n", e.what());
+	return 1;
+}
diff --git a/lib/bitop/bit.cpp b/lib/bitop/bit.cpp
index 39b53838f..9957ab5c2 100644
--- a/lib/bitop/bit.cpp
+++ b/lib/bitop/bit.cpp
@@ -37,8 +37,8 @@ extern "C" {
 #include "lauxlib.h"
 }
 
-#ifdef _MSC_VER
-/* MSVC is stuck in the last century and doesn't have C99's stdint.h. */
+#if defined(_MSC_VER) && (_MSC_VER < 1700)
+/* Old MSVC is stuck in the last century and doesn't have C99's stdint.h. */
 typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
diff --git a/lib/catch2/CMakeLists.txt b/lib/catch2/CMakeLists.txt
index 3c471d49d..252dc11e3 100644
--- a/lib/catch2/CMakeLists.txt
+++ b/lib/catch2/CMakeLists.txt
@@ -1,8 +1,8 @@
-# catch2 is distributed as a standalone header.
+# catch2 is distributed as a standalone header / source amalgamation.
 #
 # Downloaded from:
 #
-#      https://github.com/catchorg/Catch2/releases/download/v2.13.9/catch.hpp
+#      https://github.com/catchorg/Catch2/releases/tag/v3.6.0
 #
 # The following changes were made to always print in microseconds, fixed format:
 #
@@ -12,5 +12,7 @@
 # -        return os << duration.value() << ' ' << duration.unitsAsString();
 # +        return os << std::fixed << duration.value() << ' ' << duration.unitsAsString();
 
-add_library(catch2 INTERFACE)
-target_include_directories(catch2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(catch2 STATIC catch_amalgamated.cpp)
+target_compile_definitions(catch2 PRIVATE CATCH_CONFIG_NOSTDOUT CATCH_AMALGAMATED_CUSTOM_MAIN)
+add_library(Catch2::Catch2 ALIAS catch2)
+target_include_directories(catch2 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/lib/catch2/catch.hpp b/lib/catch2/catch.hpp
deleted file mode 100644
index 88f110677..000000000
--- a/lib/catch2/catch.hpp
+++ /dev/null
@@ -1,17970 +0,0 @@
-/*
- *  Catch v2.13.9
- *  Generated: 2022-04-12 22:37:23.260201
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// start catch.hpp
-
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 9
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// start catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-     // Because REQUIREs trigger GCC's -Wparentheses, and because still
-     // supported version of g++ have only buggy support for _Pragmas,
-     // Wparentheses have to be suppressed globally.
-#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
-
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-// end catch_suppress_warnings.h
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#  define CATCH_CONFIG_ALL_PARTS
-#endif
-
-// In the impl file, we want to have access to all parts of the headers
-// Can also be used to sanely support PCHs
-#if defined(CATCH_CONFIG_ALL_PARTS)
-#  define CATCH_CONFIG_EXTERNAL_INTERFACES
-#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#    undef CATCH_CONFIG_DISABLE_MATCHERS
-#  endif
-#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  endif
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-// start catch_platform.h
-
-// See e.g.:
-// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
-#ifdef __APPLE__
-#  include <TargetConditionals.h>
-#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
-      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
-#    define CATCH_PLATFORM_MAC
-#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
-#    define CATCH_PLATFORM_IPHONE
-#  endif
-
-#elif defined(linux) || defined(__linux) || defined(__linux__)
-#  define CATCH_PLATFORM_LINUX
-
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
-#  define CATCH_PLATFORM_WINDOWS
-#endif
-
-// end catch_platform.h
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// start catch_user_interfaces.h
-
-namespace Catch {
-    unsigned int rngSeed();
-}
-
-// end catch_user_interfaces.h
-// start catch_tag_alias_autoregistrar.h
-
-// start catch_common.h
-
-// start catch_compiler_capabilities.h
-
-// Detect a number of compiler features - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
-// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
-// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-#ifdef __cplusplus
-
-#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
-#    define CATCH_CPP14_OR_GREATER
-#  endif
-
-#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#    define CATCH_CPP17_OR_GREATER
-#  endif
-
-#endif
-
-// Only GCC compiler should be used in this block, so other compilers trying to
-// mask themselves as GCC should be ignored.
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
-
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
-
-#endif
-
-#if defined(__clang__)
-
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
-
-// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
-// which results in calls to destructors being emitted for each temporary,
-// without a matching initialization. In practice, this can result in something
-// like `std::string::~string` being called on an uninitialized value.
-//
-// For example, this code will likely segfault under IBM XL:
-// ```
-// REQUIRE(std::string("12") + "34" == "1234")
-// ```
-//
-// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
-#  if !defined(__ibmxl__) && !defined(__CUDACC__)
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
-#  endif
-
-#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-
-#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Assume that non-Windows platforms support posix signals by default
-#if !defined(CATCH_PLATFORM_WINDOWS)
-    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// We know some environments not to support full POSIX signals
-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
-    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#endif
-
-#ifdef __OS400__
-#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#       define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Android somehow still does not support std::to_string
-#if defined(__ANDROID__)
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Not all Windows environments support SEH properly
-#if defined(__MINGW32__)
-#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// PS4
-#if defined(__ORBIS__)
-#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
-
-// Required for some versions of Cygwin to declare gettimeofday
-// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
-#   define _BSD_SOURCE
-// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
-# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
-
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-
-# endif
-#endif // __CYGWIN__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#if defined(_MSC_VER)
-
-// Universal Windows platform does not support SEH
-// Or console colours (or console at all...)
-#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#    define CATCH_CONFIG_COLOUR_NONE
-#  else
-#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
-#  endif
-
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
-
-// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
-// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
-// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
-#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#    endif // MSVC_TRADITIONAL
-
-// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-#  endif // __clang__
-
-#endif // _MSC_VER
-
-#if defined(_REENTRANT) || defined(_MSC_VER)
-// Enable async processing, as -pthread is specified or no additional linking is required
-# define CATCH_INTERNAL_CONFIG_USE_ASYNC
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// Check if we are compiled with -fno-exceptions or equivalent
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// DJGPP
-#ifdef __DJGPP__
-#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
-#endif // __DJGPP__
-
-////////////////////////////////////////////////////////////////////////////////
-// Embarcadero C++Build
-#if defined(__BORLANDC__)
-    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use of __COUNTER__ is suppressed during code analysis in
-// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
-// handled by it.
-// Otherwise all supported compilers support COUNTER macro,
-// but user still might want to turn it off
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// RTX is a special version of Windows that is real time.
-// This means that it is detected as Windows, but does not provide
-// the same set of capabilities as real Windows does.
-#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
-    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
-    #define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
-#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Various stdlib support checks that require __has_include
-#if defined(__has_include)
-  // Check if string_view is available and usable
-  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    include <cstddef>
-  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
-  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #    endif
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-  #    if defined(__clang__) && (__clang_major__ < 8)
-         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
-         // fix should be in clang 8, workaround in libstdc++ 8.2
-  #      include <ciso646>
-  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #        define CATCH_CONFIG_NO_CPP17_VARIANT
-  #      else
-  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #    else
-  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #    endif // defined(__clang__) && (__clang_major__ < 8)
-  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-#endif // defined(__has_include)
-
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
-#   define CATCH_CONFIG_WINDOWS_SEH
-#endif
-// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
-#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
-#   define CATCH_CONFIG_POSIX_SIGNALS
-#endif
-// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
-#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
-#   define CATCH_CONFIG_WCHAR
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
-#    define CATCH_CONFIG_CPP11_TO_STRING
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#  define CATCH_CONFIG_CPP17_OPTIONAL
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
-#  define CATCH_CONFIG_CPP17_STRING_VIEW
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
-#  define CATCH_CONFIG_CPP17_VARIANT
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
-#  define CATCH_CONFIG_CPP17_BYTE
-#endif
-
-#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
-#  define CATCH_CONFIG_NEW_CAPTURE
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-#  define CATCH_CONFIG_POLYFILL_ISNAN
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
-#  define CATCH_CONFIG_USE_ASYNC
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#  define CATCH_CONFIG_ANDROID_LOGWRITE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Even if we do not think the compiler has that warning, we still have
-// to provide a macro that can be used by the code.
-#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
-#endif
-
-// The goal of this macro is to avoid evaluation of the arguments, but
-// still have the compiler warn on problems inside...
-#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
-#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
-#endif
-
-#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#elif defined(__clang__) && (__clang_major__ < 5)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#define CATCH_TRY if ((true))
-#define CATCH_CATCH_ALL if ((false))
-#define CATCH_CATCH_ANON(type) if ((false))
-#else
-#define CATCH_TRY try
-#define CATCH_CATCH_ALL catch (...)
-#define CATCH_CATCH_ANON(type) catch (type)
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
-#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#endif
-
-// end catch_compiler_capabilities.h
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <cstdint>
-
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
-namespace Catch {
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-
-    protected:
-        NonCopyable();
-        virtual ~NonCopyable();
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
-            line( _line )
-        {}
-
-        SourceLineInfo( SourceLineInfo const& other )            = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
-        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
-        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
-
-        bool empty() const noexcept { return file[0] == '\0'; }
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
-
-        char const* file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // Bring in operator<< from global namespace into Catch namespace
-    // This is necessary because the overload of operator<< above makes
-    // lookup stop at namespace Catch
-    using ::operator<<;
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() const;
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-
-// end catch_common.h
-namespace Catch {
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_tag_alias_autoregistrar.h
-// start catch_test_registry.h
-
-// start catch_interfaces_testcase.h
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != (StringRef const& other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns the current start pointer. If the StringRef is not
-        // null-terminated, throws std::domain_exception
-        auto c_str() const -> char const*;
-
-    public: // substrings and searches
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, size()).
-        // If start > size(), then the substring is empty.
-        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
-
-        // Returns the current start pointer. May not be null-terminated.
-        auto data() const noexcept -> char const*;
-
-        constexpr auto isNullTerminated() const noexcept -> bool {
-            return m_start[m_size] == '\0';
-        }
-
-    public: // iterators
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-    };
-
-    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
-    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
-
-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-// end catch_stringref.h
-// start catch_preprocessor.hpp
-
-
-#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
-#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
-
-#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
-// MSVC needs more evaluations
-#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
-#else
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
-#endif
-
-#define CATCH_REC_END(...)
-#define CATCH_REC_OUT
-
-#define CATCH_EMPTY()
-#define CATCH_DEFER(id) id CATCH_EMPTY()
-
-#define CATCH_REC_GET_END2() 0, CATCH_REC_END
-#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
-#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
-#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
-#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
-#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
-
-#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-
-#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-
-// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
-// and passes userdata as the first parameter to each invocation,
-// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
-#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
-#else
-// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
-#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
-#endif
-
-#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
-#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
-
-#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
-#else
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
-#endif
-
-#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
-    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
-
-#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
-#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
-#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
-#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
-#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
-#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
-#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
-#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
-#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
-#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
-#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
-
-#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-
-#define INTERNAL_CATCH_TYPE_GEN\
-    template<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here.
-    template <typename Func, typename... U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
-#else
-    // Keep ::type here because we still support C++11
-    template <typename Func, typename... U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator, typename Sentinel = InputIterator>
-        std::string rangeToString(InputIterator first, Sentinel last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    // Import begin/ end from std here
-    using std::begin;
-    using std::end;
-
-    namespace detail {
-        template <typename...>
-        struct void_type {
-            using type = void;
-        };
-
-        template <typename T, typename = void>
-        struct is_range_impl : std::false_type {
-        };
-
-        template <typename T>
-        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
-        };
-    } // namespace detail
-
-    template <typename T>
-    struct is_range : detail::is_range_impl<T> {
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analysers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) const {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true iff the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = nextImpl();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            return nextImpl();
-        }
-
-    private:
-        bool nextImpl() {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual double minDuration() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        double minDuration = -1;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        double minDuration() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-
-#include <iterator>
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    //! Should the reporter show
-    bool shouldShowDuration( IConfig const& config, double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection( std::string const& className,
-                           std::string const& rootName,
-                           SectionNode const& sectionNode,
-                           bool testOkToFail );
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                Catch::throw_exception(optimized_away_error{});
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = (std::max)(cumn(a1), 0);
-                auto hi = (std::min)(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = (std::min)(
-                    resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                TStorage data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
-            return lhs.name == rhs.name
-                && lhs.location == rhs.location;
-        }
-    };
-
-    class ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    class  ITracker {
-        NameAndLocation m_nameAndLocation;
-
-    public:
-        ITracker(NameAndLocation const& nameAndLoc) :
-            m_nameAndLocation(nameAndLoc)
-        {}
-
-        // static queries
-        NameAndLocation const& nameAndLocation() const {
-            return m_nameAndLocation;
-        }
-
-        virtual ~ITracker();
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-        virtual bool hasStarted() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-        bool hasStarted() const override {
-            return m_runState != NotStarted;
-        }
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-        //! Returns filters active in this tracker
-        std::vector<std::string> const& getFilters() const;
-        //! Returns whitespace-trimmed name of the tracked section
-        std::string const& trimmedName() const;
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #endif
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-#include <cassert>
-
-namespace Catch {
-
-    // Wrapper for platform-specific fatal error (signals/SEH) handlers
-    //
-    // Tries to be cooperative with other handlers, and not step over
-    // other handlers. This means that unknown structured exceptions
-    // are passed on, previous signal handlers are called, and so on.
-    //
-    // Can only be instantiated once, and assumes that once a signal
-    // is caught, the binary will end up terminating. Thus, there
-    class FatalConditionHandler {
-        bool m_started = false;
-
-        // Install/disengage implementation for specific platform.
-        // Should be if-defed to work on current platform, can assume
-        // engage-disengage 1:1 pairing.
-        void engage_platform();
-        void disengage_platform();
-    public:
-        // Should also have platform-specific implementations as needed
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-
-        void engage() {
-            assert(!m_started && "Handler cannot be installed twice.");
-            m_started = true;
-            engage_platform();
-        }
-
-        void disengage() {
-            assert(m_started && "Handler cannot be uninstalled without being installed first");
-            m_started = false;
-            disengage_platform();
-        }
-    };
-
-    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
-    class FatalConditionHandlerGuard {
-        FatalConditionHandler* m_handler;
-    public:
-        FatalConditionHandlerGuard(FatalConditionHandler* handler):
-            m_handler(handler) {
-            m_handler->engage();
-        }
-        ~FatalConditionHandlerGuard() {
-            m_handler->disengage();
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        FatalConditionHandler m_fatalConditionhandler;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( config.minDuration, "seconds" )
-                ["-D"]["--min-duration"]
-                ( "show test durations for tests taking at least the given number of seconds" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    double Config::minDuration() const                 { return m_data.minDuration; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurrence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#include <algorithm>
-
-#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    // If neither SEH nor signal handling is required, the handler impls
-    // do not have to do anything, and can be empty.
-    void FatalConditionHandler::engage_platform() {}
-    void FatalConditionHandler::disengage_platform() {}
-    FatalConditionHandler::FatalConditionHandler() = default;
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-} // end namespace Catch
-
-#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
-#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
-#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    //! Signals fatal error message to the run context
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-
-    //! Minimal size Catch2 needs for its own fatal error handling.
-    //! Picked anecdotally, so it might not be sufficient on all
-    //! platforms, and for all configurations.
-    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
-} // end unnamed namespace
-
-#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    // Since we do not support multiple instantiations, we put these
-    // into global variables and rely on cleaning them up in outlined
-    // constructors/destructors
-    static PVOID exceptionHandlerHandle = nullptr;
-
-    // For MSVC, we reserve part of the stack memory for handling
-    // memory overflow structured exception.
-    FatalConditionHandler::FatalConditionHandler() {
-        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
-        if (!SetThreadStackGuarantee(&guaranteeSize)) {
-            // We do not want to fully error out, because needing
-            // the stack reserve should be rare enough anyway.
-            Catch::cerr()
-                << "Failed to reserve piece of stack."
-                << " Stack overflows will not be reported successfully.";
-        }
-    }
-
-    // We do not attempt to unset the stack guarantee, because
-    // Windows does not support lowering the stack size guarantee.
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-    void FatalConditionHandler::engage_platform() {
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        if (!exceptionHandlerHandle) {
-            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
-        }
-    }
-
-    void FatalConditionHandler::disengage_platform() {
-        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
-            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
-        }
-        exceptionHandlerHandle = nullptr;
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_WINDOWS_SEH
-
-#if defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
-// which is zero initialization, but not explicit. We want to avoid
-// that.
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-    static char* altStackMem = nullptr;
-    static std::size_t altStackSize = 0;
-    static stack_t oldSigStack{};
-    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
-
-    static void restorePreviousSignalHandlers() {
-        // We set signal handlers back to the previous ones. Hopefully
-        // nobody overwrote them in the meantime, and doesn't expect
-        // their signal handlers to live past ours given that they
-        // installed them after ours..
-        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-        }
-        // Return the old stack
-        sigaltstack(&oldSigStack, nullptr);
-    }
-
-    static void handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        // We need to restore previous signal handlers and let them do
-        // their thing, so that the users can have the debugger break
-        // when a signal is raised, and so on.
-        restorePreviousSignalHandlers();
-        reportFatal( name );
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
-        if (altStackSize == 0) {
-            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
-        }
-        altStackMem = new char[altStackSize]();
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        delete[] altStackMem;
-        // We signal that another instance can be constructed by zeroing
-        // out the pointer.
-        altStackMem = nullptr;
-    }
-
-    void FatalConditionHandler::engage_platform() {
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = altStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-
-    void FatalConditionHandler::disengage_platform() {
-        restorePreviousSignalHandlers();
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_POSIX_SIGNALS
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        // static cast as a workaround for IBM XLC
-        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w+")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-#endif
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if (currentTracker.nameAndLocation() == nameAndLocation) {
-                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
-                    assert(thisTracker);
-                    assert(thisTracker->isGeneratorTracker());
-                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
-                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                } else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
-
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    auto* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = &( parent->parent() );
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
-
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find( filters.begin(),
-                                        filters.end(),
-                                        static_cast<SectionTracker&>( *child )
-                                            .trimmedName() ) !=
-                                 filters.end() ) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->next() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
-                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-        m_reporter->benchmarkPreparing(name);
-    }
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-    void RunContext::benchmarkFailed(std::string const & error) {
-        m_reporter->benchmarkFailed(error);
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
-        m_activeTestCase->invoke();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-                else
-                {
-                    filename.insert(0, "#");
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-#endif
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            using hash_t = uint64_t;
-
-            explicit TestHasher( hash_t hashSuffix ):
-                m_hashSuffix{ hashSuffix } {}
-
-            uint32_t operator()( TestCase const& t ) const {
-                // FNV-1a hash with multiplication fold.
-                const hash_t prime = 1099511628211u;
-                hash_t hash = 14695981039346656037u;
-                for ( const char c : t.name ) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                hash ^= m_hashSuffix;
-                hash *= prime;
-                const uint32_t low{ static_cast<uint32_t>( hash ) };
-                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
-                return low * high;
-            }
-
-        private:
-            hash_t m_hashSuffix;
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h{ config.rngSeed() };
-
-                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
-        ITracker(nameAndLocation),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if (m_filters.empty()
-            || m_filters[0] == ""
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-    std::vector<std::string> const& SectionTracker::getFilters() const {
-        return m_filters;
-    }
-
-    std::string const& SectionTracker::trimmedName() const {
-        return m_trimmed_name;
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-// start catch_config_uncaught_exceptions.hpp
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE_1_0.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-
-#if defined(_MSC_VER)
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-#endif
-
-#include <exception>
-
-#if defined(__cpp_lib_uncaught_exceptions) \
-    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif // __cpp_lib_uncaught_exceptions
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-// end catch_config_uncaught_exceptions.hpp
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        return false;
-#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 13, 9, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    bool shouldShowDuration( IConfig const& config, double duration ) {
-        if ( config.showDurations() == ShowDurations::Always ) {
-            return true;
-        }
-        if ( config.showDurations() == ShowDurations::Never ) {
-            return false;
-        }
-        const double min = config.minDuration();
-        return min >= 0 && duration >= min;
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            double dur = _sectionStats.durationInSeconds;
-            if ( shouldShowDuration( *m_config, dur ) ) {
-                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Microseconds)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << std::fixed << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    double dur = _sectionStats.durationInSeconds;
-    if (shouldShowDuration(*m_config, dur)) {
-        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp, timeStampSize-1);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-
-        // Formats the duration in seconds to 3 decimal places.
-        // This is done because some genius defined Maven Surefire schema
-        // in a way that only accepts 3 decimal places, and tools like
-        // Jenkins use that schema for validation JUnit reporter output.
-        std::string formatDuration( double seconds ) {
-            ReusableStringStream rss;
-            rss << std::fixed << std::setprecision( 3 ) << seconds;
-            return rss.str();
-        }
-
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", formatDuration( suiteTime ) );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
-    }
-
-    void JunitReporter::writeSection( std::string const& className,
-                                      std::string const& rootName,
-                                      SectionNode const& sectionNode,
-                                      bool testOkToFail) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
-            // This is not ideal, but it should be enough to mimic gtest's
-            // junit output.
-            // Ideally the JUnit reporter would also handle `skipTest`
-            // events and write those out appropriately.
-            xml.writeAttribute( "status", "run" );
-
-            if (sectionNode.stats.assertions.failedButOk) {
-                xml.scopedElement("skipped")
-                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
-            }
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode, testOkToFail );
-            else
-                writeSection( className, name, *childNode, testOkToFail );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
-            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
-            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( ... ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/lib/catch2/catch_amalgamated.cpp b/lib/catch2/catch_amalgamated.cpp
new file mode 100644
index 000000000..9cb764be8
--- /dev/null
+++ b/lib/catch2/catch_amalgamated.cpp
@@ -0,0 +1,11638 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+//  Catch v3.6.0
+//  Generated: 2024-05-05 20:53:27.562886
+//  ----------------------------------------------------------
+//  This file is an amalgamation of multiple different files.
+//  You probably shouldn't edit it directly.
+//  ----------------------------------------------------------
+
+#include "catch_amalgamated.hpp"
+
+
+#ifndef CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
+#define CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+// We might end up with the define made globally through the compiler,
+// and we don't want to trigger warnings for this
+#if !defined(NOMINMAX)
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN)
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+#endif // CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
+
+
+
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            ChronometerConcept::~ChronometerConcept() = default;
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
+// Adapted from donated nonius code.
+
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+                    for (auto current = first; current != last; ++current) {
+                        samples.push_back( current->count() );
+                    }
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(
+                        cfg.benchmarkConfidenceInterval(),
+                        cfg.benchmarkResamples(),
+                        samples.data(),
+                        samples.data() + samples.size() );
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(
+                        samples.data(), samples.data() + samples.size() );
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<FDuration> {
+                            FDuration(e.point),
+                                FDuration(e.lower_bound),
+                                FDuration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<FDuration> samples2;
+                    samples2.reserve(samples.size());
+                    for (auto s : samples) {
+                        samples2.push_back( FDuration( s ) );
+                    }
+
+                    return {
+                        CATCH_MOVE(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<FDuration> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+
+                    FDuration mean = FDuration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(*it);
+                        mean += *it;
+                    }
+                    mean /= i;
+
+                    return SampleAnalysis{
+                        CATCH_MOVE(samples),
+                        Estimate<FDuration>{ mean, mean, mean, 0.0 },
+                        Estimate<FDuration>{ FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             0.0 },
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
+
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            BenchmarkFunction::callable::~callable() = default;
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
+
+
+#include <exception>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override;
+            };
+
+            const char* optimized_away_error::what() const noexcept {
+                return "could not measure benchmark, maybe it was optimized away";
+            }
+
+            void throw_optimized_away_error() {
+                Catch::throw_exception(optimized_away_error{});
+            }
+
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
+// Adapted from donated nonius code.
+
+
+
+#include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
+#include <numeric>
+#include <random>
+
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            namespace {
+
+                template <typename URng, typename Estimator>
+                static sample
+                resample( URng& rng,
+                          unsigned int resamples,
+                          double const* first,
+                          double const* last,
+                          Estimator& estimator ) {
+                    auto n = static_cast<size_t>( last - first );
+                    Catch::uniform_integer_distribution<size_t> dist( 0, n - 1 );
+
+                    sample out;
+                    out.reserve( resamples );
+                    std::vector<double> resampled;
+                    resampled.reserve( n );
+                    for ( size_t i = 0; i < resamples; ++i ) {
+                        resampled.clear();
+                        for ( size_t s = 0; s < n; ++s ) {
+                            resampled.push_back( first[dist( rng )] );
+                        }
+                        const auto estimate =
+                            estimator( resampled.data(), resampled.data() + resampled.size() );
+                        out.push_back( estimate );
+                    }
+                    std::sort( out.begin(), out.end() );
+                    return out;
+                }
+
+                static double outlier_variance( Estimate<double> mean,
+                                                Estimate<double> stddev,
+                                                int n ) {
+                    double sb = stddev.point;
+                    double mn = mean.point / n;
+                    double mg_min = mn / 2.;
+                    double sg = (std::min)( mg_min / 4., sb / std::sqrt( n ) );
+                    double sg2 = sg * sg;
+                    double sb2 = sb * sb;
+
+                    auto c_max = [n, mn, sb2, sg2]( double x ) -> double {
+                        double k = mn - x;
+                        double d = k * k;
+                        double nd = n * d;
+                        double k0 = -n * nd;
+                        double k1 = sb2 - n * sg2 + nd;
+                        double det = k1 * k1 - 4 * sg2 * k0;
+                        return static_cast<int>( -2. * k0 /
+                                                 ( k1 + std::sqrt( det ) ) );
+                    };
+
+                    auto var_out = [n, sb2, sg2]( double c ) {
+                        double nc = n - c;
+                        return ( nc / n ) * ( sb2 - nc * sg2 );
+                    };
+
+                    return (std::min)( var_out( 1 ),
+                                       var_out(
+                                           (std::min)( c_max( 0. ),
+                                                       c_max( mg_min ) ) ) ) /
+                           sb2;
+                }
+
+                static double erf_inv( double x ) {
+                    // Code accompanying the article "Approximating the erfinv
+                    // function" in GPU Computing Gems, Volume 2
+                    double w, p;
+
+                    w = -log( ( 1.0 - x ) * ( 1.0 + x ) );
+
+                    if ( w < 6.250000 ) {
+                        w = w - 3.125000;
+                        p = -3.6444120640178196996e-21;
+                        p = -1.685059138182016589e-19 + p * w;
+                        p = 1.2858480715256400167e-18 + p * w;
+                        p = 1.115787767802518096e-17 + p * w;
+                        p = -1.333171662854620906e-16 + p * w;
+                        p = 2.0972767875968561637e-17 + p * w;
+                        p = 6.6376381343583238325e-15 + p * w;
+                        p = -4.0545662729752068639e-14 + p * w;
+                        p = -8.1519341976054721522e-14 + p * w;
+                        p = 2.6335093153082322977e-12 + p * w;
+                        p = -1.2975133253453532498e-11 + p * w;
+                        p = -5.4154120542946279317e-11 + p * w;
+                        p = 1.051212273321532285e-09 + p * w;
+                        p = -4.1126339803469836976e-09 + p * w;
+                        p = -2.9070369957882005086e-08 + p * w;
+                        p = 4.2347877827932403518e-07 + p * w;
+                        p = -1.3654692000834678645e-06 + p * w;
+                        p = -1.3882523362786468719e-05 + p * w;
+                        p = 0.0001867342080340571352 + p * w;
+                        p = -0.00074070253416626697512 + p * w;
+                        p = -0.0060336708714301490533 + p * w;
+                        p = 0.24015818242558961693 + p * w;
+                        p = 1.6536545626831027356 + p * w;
+                    } else if ( w < 16.000000 ) {
+                        w = sqrt( w ) - 3.250000;
+                        p = 2.2137376921775787049e-09;
+                        p = 9.0756561938885390979e-08 + p * w;
+                        p = -2.7517406297064545428e-07 + p * w;
+                        p = 1.8239629214389227755e-08 + p * w;
+                        p = 1.5027403968909827627e-06 + p * w;
+                        p = -4.013867526981545969e-06 + p * w;
+                        p = 2.9234449089955446044e-06 + p * w;
+                        p = 1.2475304481671778723e-05 + p * w;
+                        p = -4.7318229009055733981e-05 + p * w;
+                        p = 6.8284851459573175448e-05 + p * w;
+                        p = 2.4031110387097893999e-05 + p * w;
+                        p = -0.0003550375203628474796 + p * w;
+                        p = 0.00095328937973738049703 + p * w;
+                        p = -0.0016882755560235047313 + p * w;
+                        p = 0.0024914420961078508066 + p * w;
+                        p = -0.0037512085075692412107 + p * w;
+                        p = 0.005370914553590063617 + p * w;
+                        p = 1.0052589676941592334 + p * w;
+                        p = 3.0838856104922207635 + p * w;
+                    } else {
+                        w = sqrt( w ) - 5.000000;
+                        p = -2.7109920616438573243e-11;
+                        p = -2.5556418169965252055e-10 + p * w;
+                        p = 1.5076572693500548083e-09 + p * w;
+                        p = -3.7894654401267369937e-09 + p * w;
+                        p = 7.6157012080783393804e-09 + p * w;
+                        p = -1.4960026627149240478e-08 + p * w;
+                        p = 2.9147953450901080826e-08 + p * w;
+                        p = -6.7711997758452339498e-08 + p * w;
+                        p = 2.2900482228026654717e-07 + p * w;
+                        p = -9.9298272942317002539e-07 + p * w;
+                        p = 4.5260625972231537039e-06 + p * w;
+                        p = -1.9681778105531670567e-05 + p * w;
+                        p = 7.5995277030017761139e-05 + p * w;
+                        p = -0.00021503011930044477347 + p * w;
+                        p = -0.00013871931833623122026 + p * w;
+                        p = 1.0103004648645343977 + p * w;
+                        p = 4.8499064014085844221 + p * w;
+                    }
+                    return p * x;
+                }
+
+                static double
+                standard_deviation( double const* first, double const* last ) {
+                    auto m = Catch::Benchmark::Detail::mean( first, last );
+                    double variance =
+                        std::accumulate( first,
+                                         last,
+                                         0.,
+                                         [m]( double a, double b ) {
+                                             double diff = b - m;
+                                             return a + diff * diff;
+                                         } ) /
+                        ( last - first );
+                    return std::sqrt( variance );
+                }
+
+                static sample jackknife( double ( *estimator )( double const*,
+                                                                double const* ),
+                                         double* first,
+                                         double* last ) {
+                    const auto second = first + 1;
+                    sample results;
+                    results.reserve( static_cast<size_t>( last - first ) );
+
+                    for ( auto it = first; it != last; ++it ) {
+                        std::iter_swap( it, first );
+                        results.push_back( estimator( second, last ) );
+                    }
+
+                    return results;
+                }
+
+
+            } // namespace
+        }     // namespace Detail
+    }         // namespace Benchmark
+} // namespace Catch
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last ) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if ( Catch::Detail::directCompare( g, 0 ) ) {
+                    return xj;
+                }
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            OutlierClassification
+            classify_outliers( double const* first, double const* last ) {
+                std::vector<double> copy( first, last );
+
+                auto q1 = weighted_average_quantile( 1, 4, copy.data(), copy.data() + copy.size() );
+                auto q3 = weighted_average_quantile( 3, 4, copy.data(), copy.data() + copy.size() );
+                auto iqr = q3 - q1;
+                auto los = q1 - ( iqr * 3. );
+                auto lom = q1 - ( iqr * 1.5 );
+                auto him = q3 + ( iqr * 1.5 );
+                auto his = q3 + ( iqr * 3. );
+
+                OutlierClassification o;
+                for ( ; first != last; ++first ) {
+                    const double t = *first;
+                    if ( t < los ) {
+                        ++o.low_severe;
+                    } else if ( t < lom ) {
+                        ++o.low_mild;
+                    } else if ( t > his ) {
+                        ++o.high_severe;
+                    } else if ( t > him ) {
+                        ++o.high_mild;
+                    }
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            double mean( double const* first, double const* last ) {
+                auto count = last - first;
+                double sum = 0.;
+                while (first != last) {
+                    sum += *first;
+                    ++first;
+                }
+                return sum / static_cast<double>(count);
+            }
+
+            double normal_cdf( double x ) {
+                return std::erfc( -x / std::sqrt( 2.0 ) ) / 2.0;
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) ) {
+                auto n_samples = last - first;
+
+                double point = estimator( first, last );
+                // Degenerate case with a single sample
+                if ( n_samples == 1 )
+                    return { point, point, point, confidence_level };
+
+                sample jack = jackknife( estimator, first, last );
+                double jack_mean =
+                    mean( jack.data(), jack.data() + jack.size() );
+                double sum_squares = 0, sum_cubes = 0;
+                for ( double x : jack ) {
+                    auto difference = jack_mean - x;
+                    auto square = difference * difference;
+                    auto cube = square * difference;
+                    sum_squares += square;
+                    sum_cubes += cube;
+                }
+
+                double accel = sum_cubes / ( 6 * std::pow( sum_squares, 1.5 ) );
+                long n = static_cast<long>( resample.size() );
+                double prob_n =
+                    std::count_if( resample.begin(),
+                                   resample.end(),
+                                   [point]( double x ) { return x < point; } ) /
+                    static_cast<double>( n );
+                // degenerate case with uniform samples
+                if ( Catch::Detail::directCompare( prob_n, 0. ) ) {
+                    return { point, point, point, confidence_level };
+                }
+
+                double bias = normal_quantile( prob_n );
+                double z1 = normal_quantile( ( 1. - confidence_level ) / 2. );
+
+                auto cumn = [n]( double x ) -> long {
+                    return std::lround( normal_cdf( x ) *
+                                        static_cast<double>( n ) );
+                };
+                auto a = [bias, accel]( double b ) {
+                    return bias + b / ( 1. - accel * b );
+                };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a( b1 );
+                double a2 = a( b2 );
+                auto lo = static_cast<size_t>( (std::max)( cumn( a1 ), 0l ) );
+                auto hi =
+                    static_cast<size_t>( (std::min)( cumn( a2 ), n - 1 ) );
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last) {
+                auto mean = &Detail::mean;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(double const*, double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
+                    return std::async(std::launch::async, [=] {
+                        SimplePcg32 rng( seed );
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(double const* , double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
+                    SimplePcg32 rng( seed );
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( static_cast<double>(std::numeric_limits<float>::epsilon())*100. ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+namespace literals {
+    Approx operator ""_a(long double val) {
+        return Approx(val);
+    }
+    Approx operator ""_a(unsigned long long val) {
+        return Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Approx>::convert(Catch::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+
+
+
+namespace Catch {
+
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData&& data )
+    :   m_info( info ),
+        m_resultData( CATCH_MOVE(data) )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        if ( m_info.macroName.empty() ) {
+            return static_cast<std::string>( m_info.capturedExpression );
+        }
+        std::string expr;
+        expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+        expr += m_info.macroName;
+        expr += "( ";
+        expr += m_info.capturedExpression;
+        expr += " )";
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    StringRef AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+
+
+
+#include <fstream>
+
+namespace Catch {
+
+    namespace {
+        static bool enableBazelEnvSupport() {
+#if defined( CATCH_CONFIG_BAZEL_SUPPORT )
+            return true;
+#else
+            return Detail::getEnv( "BAZEL_TEST" ) != nullptr;
+#endif
+        }
+
+        struct bazelShardingOptions {
+            unsigned int shardIndex, shardCount;
+            std::string shardFilePath;
+        };
+
+        static Optional<bazelShardingOptions> readBazelShardingOptions() {
+            const auto bazelShardIndex = Detail::getEnv( "TEST_SHARD_INDEX" );
+            const auto bazelShardTotal = Detail::getEnv( "TEST_TOTAL_SHARDS" );
+            const auto bazelShardInfoFile = Detail::getEnv( "TEST_SHARD_STATUS_FILE" );
+
+
+            const bool has_all =
+                bazelShardIndex && bazelShardTotal && bazelShardInfoFile;
+            if ( !has_all ) {
+                // We provide nice warning message if the input is
+                // misconfigured.
+                auto warn = []( const char* env_var ) {
+                    Catch::cerr()
+                        << "Warning: Bazel shard configuration is missing '"
+                        << env_var << "'. Shard configuration is skipped.\n";
+                };
+                if ( !bazelShardIndex ) {
+                    warn( "TEST_SHARD_INDEX" );
+                }
+                if ( !bazelShardTotal ) {
+                    warn( "TEST_TOTAL_SHARDS" );
+                }
+                if ( !bazelShardInfoFile ) {
+                    warn( "TEST_SHARD_STATUS_FILE" );
+                }
+                return {};
+            }
+
+            auto shardIndex = parseUInt( bazelShardIndex );
+            if ( !shardIndex ) {
+                Catch::cerr()
+                    << "Warning: could not parse 'TEST_SHARD_INDEX' ('" << bazelShardIndex
+                    << "') as unsigned int.\n";
+                return {};
+            }
+            auto shardTotal = parseUInt( bazelShardTotal );
+            if ( !shardTotal ) {
+                Catch::cerr()
+                    << "Warning: could not parse 'TEST_TOTAL_SHARD' ('"
+                    << bazelShardTotal << "') as unsigned int.\n";
+                return {};
+            }
+
+            return bazelShardingOptions{
+                *shardIndex, *shardTotal, bazelShardInfoFile };
+
+        }
+    } // end namespace
+
+
+    bool operator==( ProcessedReporterSpec const& lhs,
+                     ProcessedReporterSpec const& rhs ) {
+        return lhs.name == rhs.name &&
+               lhs.outputFilename == rhs.outputFilename &&
+               lhs.colourMode == rhs.colourMode &&
+               lhs.customOptions == rhs.customOptions;
+    }
+
+    Config::Config( ConfigData const& data ):
+        m_data( data ) {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        // Insert the default reporter if user hasn't asked for a specific one
+        if ( m_data.reporterSpecifications.empty() ) {
+#if defined( CATCH_CONFIG_DEFAULT_REPORTER )
+            const auto default_spec = CATCH_CONFIG_DEFAULT_REPORTER;
+#else
+            const auto default_spec = "console";
+#endif
+            auto parsed = parseReporterSpec(default_spec);
+            CATCH_ENFORCE( parsed,
+                           "Cannot parse the provided default reporter spec: '"
+                               << default_spec << '\'' );
+            m_data.reporterSpecifications.push_back( std::move( *parsed ) );
+        }
+
+        if ( enableBazelEnvSupport() ) {
+            readBazelEnvVars();
+        }
+
+        // Bazel support can modify the test specs, so parsing has to happen
+        // after reading Bazel env vars.
+        TestSpecParser parser( ITagAliasRegistry::get() );
+        if ( !m_data.testsOrTags.empty() ) {
+            m_hasTestFilters = true;
+            for ( auto const& testOrTags : m_data.testsOrTags ) {
+                parser.parse( testOrTags );
+            }
+        }
+        m_testSpec = parser.testSpec();
+
+
+        // We now fixup the reporter specs to handle default output spec,
+        // default colour spec, etc
+        bool defaultOutputUsed = false;
+        for ( auto const& reporterSpec : m_data.reporterSpecifications ) {
+            // We do the default-output check separately, while always
+            // using the default output below to make the code simpler
+            // and avoid superfluous copies.
+            if ( reporterSpec.outputFile().none() ) {
+                CATCH_ENFORCE( !defaultOutputUsed,
+                               "Internal error: cannot use default output for "
+                               "multiple reporters" );
+                defaultOutputUsed = true;
+            }
+
+            m_processedReporterSpecs.push_back( ProcessedReporterSpec{
+                reporterSpec.name(),
+                reporterSpec.outputFile() ? *reporterSpec.outputFile()
+                                          : data.defaultOutputFilename,
+                reporterSpec.colourMode().valueOr( data.defaultColourMode ),
+                reporterSpec.customOptions() } );
+        }
+    }
+
+    Config::~Config() = default;
+
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+    bool Config::listListeners() const      { return m_data.listListeners; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    std::vector<ReporterSpec> const& Config::getReporterSpecs() const {
+        return m_data.reporterSpecifications;
+    }
+
+    std::vector<ProcessedReporterSpec> const&
+    Config::getProcessedReporterSpecs() const {
+        return m_processedReporterSpecs;
+    }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    StringRef Config::name() const { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const {
+        return !!( m_data.warnings & WarnAbout::NoAssertions );
+    }
+    bool Config::warnAboutUnmatchedTestSpecs() const {
+        return !!( m_data.warnings & WarnAbout::UnmatchedTestSpec );
+    }
+    bool Config::zeroTestsCountAsSuccess() const       { return m_data.allowZeroTests; }
+    ShowDurations Config::showDurations() const        { return m_data.showDurations; }
+    double Config::minDuration() const                 { return m_data.minDuration; }
+    TestRunOrder Config::runOrder() const              { return m_data.runOrder; }
+    uint32_t Config::rngSeed() const                   { return m_data.rngSeed; }
+    unsigned int Config::shardCount() const            { return m_data.shardCount; }
+    unsigned int Config::shardIndex() const            { return m_data.shardIndex; }
+    ColourMode Config::defaultColourMode() const       { return m_data.defaultColourMode; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::skipBenchmarks() const                           { return m_data.skipBenchmarks; }
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    unsigned int Config::benchmarkSamples() const                 { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
+    void Config::readBazelEnvVars() {
+        // Register a JUnit reporter for Bazel. Bazel sets an environment
+        // variable with the path to XML output. If this file is written to
+        // during test, Bazel will not generate a default XML output.
+        // This allows the XML output file to contain higher level of detail
+        // than what is possible otherwise.
+        const auto bazelOutputFile = Detail::getEnv( "XML_OUTPUT_FILE" );
+
+        if ( bazelOutputFile ) {
+            m_data.reporterSpecifications.push_back(
+                { "junit", std::string( bazelOutputFile ), {}, {} } );
+        }
+
+        const auto bazelTestSpec = Detail::getEnv( "TESTBRIDGE_TEST_ONLY" );
+        if ( bazelTestSpec ) {
+            // Presumably the test spec from environment should overwrite
+            // the one we got from CLI (if we got any)
+            m_data.testsOrTags.clear();
+            m_data.testsOrTags.push_back( bazelTestSpec );
+        }
+
+        const auto bazelShardOptions = readBazelShardingOptions();
+        if ( bazelShardOptions ) {
+            std::ofstream f( bazelShardOptions->shardFilePath,
+                             std::ios_base::out | std::ios_base::trunc );
+            if ( f.is_open() ) {
+                f << "";
+                m_data.shardIndex = bazelShardOptions->shardIndex;
+                m_data.shardCount = bazelShardOptions->shardCount;
+            }
+        }
+    }
+
+} // end namespace Catch
+
+
+
+
+
+namespace Catch {
+    std::uint32_t getSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+}
+
+
+
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    ////////////////////////////////////////////////////////////////////////////
+
+
+    ScopedMessage::ScopedMessage( MessageBuilder&& builder ):
+        m_info( CATCH_MOVE(builder.m_info) ) {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old ) noexcept:
+        m_info( CATCH_MOVE( old.m_info ) ) {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+
+    Capturer::Capturer( StringRef macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType resultType,
+                        StringRef names ):
+        m_resultCapture( getResultCapture() ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            default:; // noop
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+
+
+
+
+#include <exception>
+
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub,
+                            public IMutableRegistryHub,
+                            private Detail::NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            ReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr factory ) override {
+                m_reporterRegistry.registerReporter( name, CATCH_MOVE(factory) );
+            }
+            void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) override {
+                m_reporterRegistry.registerListener( CATCH_MOVE(factory) );
+            }
+            void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override {
+                m_testCaseRegistry.registerTest( CATCH_MOVE(testInfo), CATCH_MOVE(invoker) );
+            }
+            void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( CATCH_MOVE(translator) );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+
+} // end namespace Catch
+
+
+
+#include <algorithm>
+#include <cassert>
+#include <exception>
+#include <iomanip>
+#include <set>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IEventListenerPtr createReporter(std::string const& reporterName, ReporterConfig&& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, CATCH_MOVE(config));
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << '\'');
+
+            return reporter;
+        }
+
+        IEventListenerPtr prepareReporters(Config const* config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()
+                    && config->getProcessedReporterSpecs().size() == 1) {
+                auto const& spec = config->getProcessedReporterSpecs()[0];
+                return createReporter(
+                    spec.name,
+                    ReporterConfig( config,
+                                    makeStream( spec.outputFilename ),
+                                    spec.colourMode,
+                                    spec.customOptions ) );
+            }
+
+            auto multi = Detail::make_unique<MultiReporter>(config);
+
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi->addListener(listener->create(config));
+            }
+
+            for ( auto const& reporterSpec : config->getProcessedReporterSpecs() ) {
+                multi->addReporter( createReporter(
+                    reporterSpec.name,
+                    ReporterConfig( config,
+                                    makeStream( reporterSpec.outputFilename ),
+                                    reporterSpec.colourMode,
+                                    reporterSpec.customOptions ) ) );
+            }
+
+            return multi;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(IEventListenerPtr&& reporter, Config const* config):
+                m_reporter(reporter.get()),
+                m_config{config},
+                m_context{config, CATCH_MOVE(reporter)} {
+
+                assert( m_config->testSpec().getInvalidSpecs().empty() &&
+                        "Invalid test specs should be handled before running tests" );
+
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                auto const& testSpec = m_config->testSpec();
+                if ( !testSpec.hasFilters() ) {
+                    for ( auto const& test : allTestCases ) {
+                        if ( !test.getTestCaseInfo().isHidden() ) {
+                            m_tests.emplace( &test );
+                        }
+                    }
+                } else {
+                    m_matches =
+                        testSpec.matchesByFilter( allTestCases, *m_config );
+                    for ( auto const& match : m_matches ) {
+                        m_tests.insert( match.tests.begin(),
+                                        match.tests.end() );
+                    }
+                }
+
+                m_tests = createShard(m_tests, m_config->shardCount(), m_config->shardIndex());
+            }
+
+            Totals execute() {
+                Totals totals;
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_reporter->skipTest(testCase->getTestCaseInfo());
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_unmatchedTestSpecs = true;
+                        m_reporter->noMatchingTestCases( match.name );
+                    }
+                }
+
+                return totals;
+            }
+
+            bool hadUnmatchedTestSpecs() const {
+                return m_unmatchedTestSpecs;
+            }
+
+
+        private:
+            IEventListener* m_reporter;
+            Config const* m_config;
+            RunContext m_context;
+            std::set<TestCaseHandle const*> m_tests;
+            TestSpec::Matches m_matches;
+            bool m_unmatchedTestSpecs = false;
+        };
+
+        void applyFilenamesAsTags() {
+            for (auto const& testInfo : getRegistryHub().getTestCaseRegistry().getAllInfos()) {
+                testInfo->addFilenameTag();
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config.get());
+
+            m_startupExceptions = true;
+            auto errStream = makeStream( "%stderr" );
+            auto colourImpl = makeColourImpl(
+                ColourMode::PlatformDefault, errStream.get() );
+            auto guard = colourImpl->guardColour( Colour::Red );
+            errStream->stream() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    errStream->stream() << TextFlow::Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch2 v" << libraryVersion() << '\n'
+                << m_cli << '\n'
+                << "For more detailed usage please see the project docs\n\n" << std::flush;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch2\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << '\n' << std::flush;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( Clara::Args( argc, argv ) );
+
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config.get());
+            auto errStream = makeStream( "%stderr" );
+            auto colour = makeColourImpl( ColourMode::PlatformDefault, errStream.get() );
+
+            errStream->stream()
+                << colour->guardColour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << TextFlow::Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            errStream->stream() << "Run with -? for usage\n\n" << std::flush;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting\n" << std::flush;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << '\n' << std::flush;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    Clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( Clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = Detail::make_unique<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        if ( m_configData.shardIndex >= m_configData.shardCount ) {
+            Catch::cerr() << "The shard count (" << m_configData.shardCount
+                          << ") must be greater than the shard index ("
+                          << m_configData.shardIndex << ")\n"
+                          << std::flush;
+            return 1;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if (m_configData.filenamesAsTags) {
+                applyFilenamesAsTags();
+            }
+
+            // Set up global config instance before we start calling into other functions
+            getCurrentMutableContext().setConfig(m_config.get());
+
+            // Create reporter(s) so we can route listings through them
+            auto reporter = prepareReporters(m_config.get());
+
+            auto const& invalidSpecs = m_config->testSpec().getInvalidSpecs();
+            if ( !invalidSpecs.empty() ) {
+                for ( auto const& spec : invalidSpecs ) {
+                    reporter->reportInvalidTestSpec( spec );
+                }
+                return 1;
+            }
+
+
+            // Handle list request
+            if (list(*reporter, *m_config)) {
+                return 0;
+            }
+
+            TestGroup tests { CATCH_MOVE(reporter), m_config.get() };
+            auto const totals = tests.execute();
+
+            if ( tests.hadUnmatchedTestSpecs()
+                && m_config->warnAboutUnmatchedTestSpecs() ) {
+                return 3;
+            }
+
+            if ( totals.testCases.total() == 0
+                && !m_config->zeroTestsCountAsSuccess() ) {
+                return 2;
+            }
+
+            if ( totals.testCases.total() > 0 &&
+                 totals.testCases.total() == totals.testCases.skipped
+                && !m_config->zeroTestsCountAsSuccess() ) {
+                return 4;
+            }
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, static_cast<int>(totals.assertions.failed));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << '\n' << std::flush;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+
+
+
+#include <cassert>
+#include <cctype>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        using TCP_underlying_type = uint8_t;
+        static_assert(sizeof(TestCaseProperties) == sizeof(TCP_underlying_type),
+                      "The size of the TestCaseProperties is different from the assumed size");
+
+        TestCaseProperties operator|(TestCaseProperties lhs, TestCaseProperties rhs) {
+            return static_cast<TestCaseProperties>(
+                static_cast<TCP_underlying_type>(lhs) | static_cast<TCP_underlying_type>(rhs)
+            );
+        }
+
+        TestCaseProperties& operator|=(TestCaseProperties& lhs, TestCaseProperties rhs) {
+            lhs = static_cast<TestCaseProperties>(
+                static_cast<TCP_underlying_type>(lhs) | static_cast<TCP_underlying_type>(rhs)
+            );
+            return lhs;
+        }
+
+        TestCaseProperties operator&(TestCaseProperties lhs, TestCaseProperties rhs) {
+            return static_cast<TestCaseProperties>(
+                static_cast<TCP_underlying_type>(lhs) & static_cast<TCP_underlying_type>(rhs)
+            );
+        }
+
+        bool applies(TestCaseProperties tcp) {
+            static_assert(static_cast<TCP_underlying_type>(TestCaseProperties::None) == 0,
+                          "TestCaseProperties::None must be equal to 0");
+            return tcp != TestCaseProperties::None;
+        }
+
+        TestCaseProperties parseSpecialTag( StringRef tag ) {
+            if( !tag.empty() && tag[0] == '.' )
+                return TestCaseProperties::IsHidden;
+            else if( tag == "!throws"_sr )
+                return TestCaseProperties::Throws;
+            else if( tag == "!shouldfail"_sr )
+                return TestCaseProperties::ShouldFail;
+            else if( tag == "!mayfail"_sr )
+                return TestCaseProperties::MayFail;
+            else if( tag == "!nonportable"_sr )
+                return TestCaseProperties::NonPortable;
+            else if( tag == "!benchmark"_sr )
+                return TestCaseProperties::Benchmark | TestCaseProperties::IsHidden;
+            else
+                return TestCaseProperties::None;
+        }
+        bool isReservedTag( StringRef tag ) {
+            return parseSpecialTag( tag ) == TestCaseProperties::None
+                && tag.size() > 0
+                && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( StringRef tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+
+        std::string makeDefaultName() {
+            static size_t counter = 0;
+            return "Anonymous test case " + std::to_string(++counter);
+        }
+
+        StringRef extractFilenamePart(StringRef filename) {
+            size_t lastDot = filename.size();
+            while (lastDot > 0 && filename[lastDot - 1] != '.') {
+                --lastDot;
+            }
+            // In theory we could have filename without any extension in it
+            if ( lastDot == 0 ) { return StringRef(); }
+
+            --lastDot;
+            size_t nameStart = lastDot;
+            while (nameStart > 0 && filename[nameStart - 1] != '/' && filename[nameStart - 1] != '\\') {
+                --nameStart;
+            }
+
+            return filename.substr(nameStart, lastDot - nameStart);
+        }
+
+        // Returns the upper bound on size of extra tags ([#file]+[.])
+        size_t sizeOfExtraTags(StringRef filepath) {
+            // [.] is 3, [#] is another 3
+            const size_t extras = 3 + 3;
+            return extractFilenamePart(filepath).size() + extras;
+        }
+    } // end unnamed namespace
+
+    bool operator<(  Tag const& lhs, Tag const& rhs ) {
+        Detail::CaseInsensitiveLess cmp;
+        return cmp( lhs.original, rhs.original );
+    }
+    bool operator==( Tag const& lhs, Tag const& rhs ) {
+        Detail::CaseInsensitiveEqualTo cmp;
+        return cmp( lhs.original, rhs.original );
+    }
+
+    Detail::unique_ptr<TestCaseInfo>
+        makeTestCaseInfo(StringRef _className,
+                         NameAndTags const& nameAndTags,
+                         SourceLineInfo const& _lineInfo ) {
+        return Detail::make_unique<TestCaseInfo>(_className, nameAndTags, _lineInfo);
+    }
+
+    TestCaseInfo::TestCaseInfo(StringRef _className,
+                               NameAndTags const& _nameAndTags,
+                               SourceLineInfo const& _lineInfo):
+        name( _nameAndTags.name.empty() ? makeDefaultName() : _nameAndTags.name ),
+        className( _className ),
+        lineInfo( _lineInfo )
+    {
+        StringRef originalTags = _nameAndTags.tags;
+        // We need to reserve enough space to store all of the tags
+        // (including optional hidden tag and filename tag)
+        auto requiredSize = originalTags.size() + sizeOfExtraTags(_lineInfo.file);
+        backingTags.reserve(requiredSize);
+
+        // We cannot copy the tags directly, as we need to normalize
+        // some tags, so that [.foo] is copied as [.][foo].
+        size_t tagStart = 0;
+        size_t tagEnd = 0;
+        bool inTag = false;
+        for (size_t idx = 0; idx < originalTags.size(); ++idx) {
+            auto c = originalTags[idx];
+            if (c == '[') {
+                CATCH_ENFORCE(
+                    !inTag,
+                    "Found '[' inside a tag while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
+                inTag = true;
+                tagStart = idx;
+            }
+            if (c == ']') {
+                CATCH_ENFORCE(
+                    inTag,
+                    "Found unmatched ']' while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
+                inTag = false;
+                tagEnd = idx;
+                assert(tagStart < tagEnd);
+
+                // We need to check the tag for special meanings, copy
+                // it over to backing storage and actually reference the
+                // backing storage in the saved tags
+                StringRef tagStr = originalTags.substr(tagStart+1, tagEnd - tagStart - 1);
+                CATCH_ENFORCE( !tagStr.empty(),
+                               "Found an empty tag while registering test case '"
+                                   << _nameAndTags.name << "' at "
+                                   << _lineInfo );
+
+                enforceNotReservedTag(tagStr, lineInfo);
+                properties |= parseSpecialTag(tagStr);
+                // When copying a tag to the backing storage, we need to
+                // check if it is a merged hide tag, such as [.foo], and
+                // if it is, we need to handle it as if it was [foo].
+                if (tagStr.size() > 1 && tagStr[0] == '.') {
+                    tagStr = tagStr.substr(1, tagStr.size() - 1);
+                }
+                // We skip over dealing with the [.] tag, as we will add
+                // it later unconditionally and then sort and unique all
+                // the tags.
+                internalAppendTag(tagStr);
+            }
+        }
+        CATCH_ENFORCE( !inTag,
+                       "Found an unclosed tag while registering test case '"
+                           << _nameAndTags.name << "' at " << _lineInfo );
+
+
+        // Add [.] if relevant
+        if (isHidden()) {
+            internalAppendTag("."_sr);
+        }
+
+        // Sort and prepare tags
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)),
+                   end(tags));
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return applies( properties & TestCaseProperties::IsHidden );
+    }
+    bool TestCaseInfo::throws() const {
+        return applies( properties & TestCaseProperties::Throws );
+    }
+    bool TestCaseInfo::okToFail() const {
+        return applies( properties & (TestCaseProperties::ShouldFail | TestCaseProperties::MayFail ) );
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return applies( properties & (TestCaseProperties::ShouldFail) );
+    }
+
+    void TestCaseInfo::addFilenameTag() {
+        std::string combined("#");
+        combined += extractFilenamePart(lineInfo.file);
+        internalAppendTag(combined);
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.original.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret += tag.original;
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    void TestCaseInfo::internalAppendTag(StringRef tagStr) {
+        backingTags += '[';
+        const auto backingStart = backingTags.size();
+        backingTags += tagStr;
+        const auto backingEnd = backingTags.size();
+        backingTags += ']';
+        tags.emplace_back(StringRef(backingTags.c_str() + backingStart, backingEnd - backingStart));
+    }
+
+    bool operator<( TestCaseInfo const& lhs, TestCaseInfo const& rhs ) {
+        // We want to avoid redoing the string comparisons multiple times,
+        // so we store the result of a three-way comparison before using
+        // it in the actual comparison logic.
+        const auto cmpName = lhs.name.compare( rhs.name );
+        if ( cmpName != 0 ) {
+            return cmpName < 0;
+        }
+        const auto cmpClassName = lhs.className.compare( rhs.className );
+        if ( cmpClassName != 0 ) {
+            return cmpClassName < 0;
+        }
+        return lhs.tags < rhs.tags;
+    }
+
+    TestCaseInfo const& TestCaseHandle::getTestCaseInfo() const {
+        return *m_info;
+    }
+
+} // end namespace Catch
+
+
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <ostream>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    void TestSpec::NamePattern::serializeTo( std::ostream& out ) const {
+        out << '"' << name() << '"';
+    }
+
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( tag )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find( begin( testCase.tags ),
+                          end( testCase.tags ),
+                          Tag( m_tag ) ) != end( testCase.tags );
+    }
+
+    void TestSpec::TagPattern::serializeTo( std::ostream& out ) const {
+        out << name();
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        bool should_use = !testCase.isHidden();
+        for (auto const& pattern : m_required) {
+            should_use = true;
+            if (!pattern->matches(testCase)) {
+                return false;
+            }
+        }
+        for (auto const& pattern : m_forbidden) {
+            if (pattern->matches(testCase)) {
+                return false;
+            }
+        }
+        return should_use;
+    }
+
+    void TestSpec::Filter::serializeTo( std::ostream& out ) const {
+        bool first = true;
+        for ( auto const& pattern : m_required ) {
+            if ( !first ) {
+                out << ' ';
+            }
+            out << *pattern;
+            first = false;
+        }
+        for ( auto const& pattern : m_forbidden ) {
+            if ( !first ) {
+                out << ' ';
+            }
+            out << *pattern;
+            first = false;
+        }
+    }
+
+
+    std::string TestSpec::extractFilterName( Filter const& filter ) {
+        Catch::ReusableStringStream sstr;
+        sstr << filter;
+        return sstr.str();
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const {
+        Matches matches;
+        matches.reserve( m_filters.size() );
+        for ( auto const& filter : m_filters ) {
+            std::vector<TestCaseHandle const*> currentMatches;
+            for ( auto const& test : testCases )
+                if ( isThrowSafe( test, config ) &&
+                     filter.matches( test.getTestCaseInfo() ) )
+                    currentMatches.emplace_back( &test );
+            matches.push_back(
+                FilterMatch{ extractFilterName( filter ), currentMatches } );
+        }
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidSpecs() const {
+        return m_invalidSpecs;
+    }
+
+    void TestSpec::serializeTo( std::ostream& out ) const {
+        bool first = true;
+        for ( auto const& filter : m_filters ) {
+            if ( !first ) {
+                out << ',';
+            }
+            out << filter;
+            first = false;
+        }
+    }
+
+}
+
+
+
+#include <chrono>
+
+namespace Catch {
+
+    namespace {
+        static auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+            return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+        }
+    } // end unnamed namespace
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+
+} // namespace Catch
+
+
+
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+
+        template<typename T>
+        std::string fpToString(T value, int precision) {
+            if (Catch::isnan(value)) {
+                return "nan";
+            }
+
+            ReusableStringStream rss;
+            rss << std::setprecision(precision)
+                << std::fixed
+                << value;
+            std::string d = rss.str();
+            std::size_t i = d.find_last_not_of('0');
+            if (i != std::string::npos && i != d.size() - 1) {
+                if (d[i] == '.')
+                    i++;
+                d = d.substr(0, i + 1);
+            }
+            return d;
+        }
+    } // end unnamed namespace
+
+    std::string convertIntoString(StringRef string, bool escapeInvisibles) {
+        std::string ret;
+        // This is enough for the "don't escape invisibles" case, and a good
+        // lower bound on the "escape invisibles" case.
+        ret.reserve(string.size() + 2);
+
+        if (!escapeInvisibles) {
+            ret += '"';
+            ret += string;
+            ret += '"';
+            return ret;
+        }
+
+        ret += '"';
+        for (char c : string) {
+            switch (c) {
+            case '\r':
+                ret.append("\\r");
+                break;
+            case '\n':
+                ret.append("\\n");
+                break;
+            case '\t':
+                ret.append("\\t");
+                break;
+            case '\f':
+                ret.append("\\f");
+                break;
+            default:
+                ret.push_back(c);
+                break;
+            }
+        }
+        ret += '"';
+
+        return ret;
+    }
+
+    std::string convertIntoString(StringRef string) {
+        return convertIntoString(string, getCurrentContext().getConfig()->showInvisibles());
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+} // end Detail namespace
+
+
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    return Detail::convertIntoString( str );
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return Detail::convertIntoString( StringRef( str.data(), str.size() ) );
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return Detail::convertIntoString( str );
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) { // NOLINT(readability-non-const-parameter)
+    if (str) {
+        return Detail::convertIntoString( str );
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char value) {
+    return ::Catch::Detail::stringify(static_cast<char>(value));
+}
+
+int StringMaker<float>::precision = std::numeric_limits<float>::max_digits10;
+
+std::string StringMaker<float>::convert(float value) {
+    return Detail::fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = std::numeric_limits<double>::max_digits10;
+
+std::string StringMaker<double>::convert(double value) {
+    return Detail::fpToString(value, precision);
+}
+
+} // end namespace Catch
+
+
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        diff.skipped = skipped - other.skipped;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        skipped += other.skipped;
+        return *this;
+    }
+
+    std::uint64_t Counts::total() const {
+        return passed + failed + failedButOk + skipped;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0 && skipped == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else if ( diff.assertions.skipped > 0 )
+            ++ diff.testCases.skipped;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+
+
+
+
+namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator ) {
+            getMutableRegistryHub().registerTranslator(
+                CATCH_MOVE( translator ) );
+        }
+    } // namespace Detail
+} // namespace Catch
+
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 3, 6, 0, "", 0 );
+        return version;
+    }
+
+}
+
+
+
+
+namespace Catch {
+
+    const char* GeneratorException::what() const noexcept {
+        return m_msg;
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+
+    IGeneratorTracker::~IGeneratorTracker() = default;
+
+namespace Generators {
+
+namespace Detail {
+
+    [[noreturn]]
+    void throw_generator_exception(char const* msg) {
+        Catch::throw_exception(GeneratorException{ msg });
+    }
+} // end namespace Detail
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() = default;
+
+    IGeneratorTracker* acquireGeneratorTracker(StringRef generatorName, SourceLineInfo const& lineInfo ) {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+    IGeneratorTracker* createGeneratorTracker( StringRef generatorName,
+                                 SourceLineInfo lineInfo,
+                                 GeneratorBasePtr&& generator ) {
+        return getResultCapture().createGeneratorTracker(
+            generatorName, lineInfo, CATCH_MOVE( generator ) );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+
+
+
+#include <random>
+
+namespace Catch {
+    namespace Generators {
+        namespace Detail {
+            std::uint32_t getSeed() { return sharedRng()(); }
+        } // namespace Detail
+
+        struct RandomFloatingGenerator<long double>::PImpl {
+            PImpl( long double a, long double b, uint32_t seed ):
+                rng( seed ), dist( a, b ) {}
+
+            Catch::SimplePcg32 rng;
+            std::uniform_real_distribution<long double> dist;
+        };
+
+        RandomFloatingGenerator<long double>::RandomFloatingGenerator(
+            long double a, long double b, std::uint32_t seed) :
+            m_pimpl(Catch::Detail::make_unique<PImpl>(a, b, seed)) {
+            static_cast<void>( next() );
+        }
+
+        RandomFloatingGenerator<long double>::~RandomFloatingGenerator() =
+            default;
+        bool RandomFloatingGenerator<long double>::next() {
+            m_current_number = m_pimpl->dist( m_pimpl->rng );
+            return true;
+        }
+    } // namespace Generators
+} // namespace Catch
+
+
+
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+
+
+
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+
+
+
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+
+
+
+#include <string>
+
+namespace Catch {
+    namespace Generators {
+
+        bool GeneratorUntypedBase::countedNext() {
+            auto ret = next();
+            if ( ret ) {
+                m_stringReprCache.clear();
+                ++m_currentElementIndex;
+            }
+            return ret;
+        }
+
+        StringRef GeneratorUntypedBase::currentElementAsString() const {
+            if ( m_stringReprCache.empty() ) {
+                m_stringReprCache = stringifyImpl();
+            }
+            return m_stringReprCache;
+        }
+
+    } // namespace Generators
+} // namespace Catch
+
+
+
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+
+
+
+#include <cassert>
+
+namespace Catch {
+
+    ReporterConfig::ReporterConfig(
+        IConfig const* _fullConfig,
+        Detail::unique_ptr<IStream> _stream,
+        ColourMode colourMode,
+        std::map<std::string, std::string> customOptions ):
+        m_stream( CATCH_MOVE(_stream) ),
+        m_fullConfig( _fullConfig ),
+        m_colourMode( colourMode ),
+        m_customOptions( CATCH_MOVE( customOptions ) ) {}
+
+    Detail::unique_ptr<IStream> ReporterConfig::takeStream() && {
+        assert( m_stream );
+        return CATCH_MOVE( m_stream );
+    }
+    IConfig const * ReporterConfig::fullConfig() const { return m_fullConfig; }
+    ColourMode ReporterConfig::colourMode() const { return m_colourMode; }
+
+    std::map<std::string, std::string> const&
+    ReporterConfig::customOptions() const {
+        return m_customOptions;
+    }
+
+    ReporterConfig::~ReporterConfig() = default;
+
+    AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                    std::vector<MessageInfo> const& _infoMessages,
+                                    Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder.m_info.message = static_cast<std::string>(assertionResult.getMessage());
+
+            infoMessages.push_back( CATCH_MOVE(builder.m_info) );
+        }
+    }
+
+    SectionStats::SectionStats(  SectionInfo&& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( CATCH_MOVE(_sectionInfo) ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string&& _stdOut,
+                                   std::string&& _stdErr,
+                                   bool _aborting )
+    : testInfo( &_testInfo ),
+        totals( _totals ),
+        stdOut( CATCH_MOVE(_stdOut) ),
+        stdErr( CATCH_MOVE(_stdErr) ),
+        aborting( _aborting )
+    {}
+
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    IEventListener::~IEventListener() = default;
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+    IReporterFactory::~IReporterFactory() = default;
+    EventListenerFactory::~EventListenerFactory() = default;
+}
+
+
+
+
+namespace Catch {
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+
+
+
+namespace Catch {
+
+    AssertionHandler::AssertionHandler
+        (   StringRef macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {
+        m_resultCapture.notifyAssertionStarted( m_assertionInfo );
+    }
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        m_completed = true;
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+            throw_test_failure_exception();
+        }
+        if ( m_reaction.shouldSkip ) {
+            throw_test_skip_exception();
+        }
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ) );
+    }
+
+} // namespace Catch
+
+
+
+
+#include <algorithm>
+
+namespace Catch {
+    namespace Detail {
+
+        bool CaseInsensitiveLess::operator()( StringRef lhs,
+                                              StringRef rhs ) const {
+            return std::lexicographical_compare(
+                lhs.begin(), lhs.end(),
+                rhs.begin(), rhs.end(),
+                []( char l, char r ) { return toLower( l ) < toLower( r ); } );
+        }
+
+        bool
+        CaseInsensitiveEqualTo::operator()( StringRef lhs,
+                                            StringRef rhs ) const {
+            return std::equal(
+                lhs.begin(), lhs.end(),
+                rhs.begin(), rhs.end(),
+                []( char l, char r ) { return toLower( l ) == toLower( r ); } );
+        }
+
+    } // namespace Detail
+} // namespace Catch
+
+
+
+
+#include <algorithm>
+#include <ostream>
+
+namespace {
+    bool isOptPrefix( char c ) {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+               || c == '/'
+#endif
+            ;
+    }
+
+    Catch::StringRef normaliseOpt( Catch::StringRef optName ) {
+        if ( optName[0] == '-'
+#if defined(CATCH_PLATFORM_WINDOWS)
+             || optName[0] == '/'
+#endif
+        ) {
+            return optName.substr( 1, optName.size() );
+        }
+
+        return optName;
+    }
+
+    static size_t find_first_separator(Catch::StringRef sr) {
+        auto is_separator = []( char c ) {
+            return c == ' ' || c == ':' || c == '=';
+        };
+        size_t pos = 0;
+        while (pos < sr.size()) {
+            if (is_separator(sr[pos])) { return pos; }
+            ++pos;
+        }
+
+        return Catch::StringRef::npos;
+    }
+
+} // namespace
+
+namespace Catch {
+    namespace Clara {
+        namespace Detail {
+
+            void TokenStream::loadBuffer() {
+                m_tokenBuffer.clear();
+
+                // Skip any empty strings
+                while ( it != itEnd && it->empty() ) {
+                    ++it;
+                }
+
+                if ( it != itEnd ) {
+                    StringRef next = *it;
+                    if ( isOptPrefix( next[0] ) ) {
+                        auto delimiterPos = find_first_separator(next);
+                        if ( delimiterPos != StringRef::npos ) {
+                            m_tokenBuffer.push_back(
+                                { TokenType::Option,
+                                  next.substr( 0, delimiterPos ) } );
+                            m_tokenBuffer.push_back(
+                                { TokenType::Argument,
+                                  next.substr( delimiterPos + 1, next.size() ) } );
+                        } else {
+                            if ( next[1] != '-' && next.size() > 2 ) {
+                                // Combined short args, e.g. "-ab" for "-a -b"
+                                for ( size_t i = 1; i < next.size(); ++i ) {
+                                    m_tokenBuffer.push_back(
+                                        { TokenType::Option,
+                                          next.substr( i, 1 ) } );
+                                }
+                            } else {
+                                m_tokenBuffer.push_back(
+                                    { TokenType::Option, next } );
+                            }
+                        }
+                    } else {
+                        m_tokenBuffer.push_back(
+                            { TokenType::Argument, next } );
+                    }
+                }
+            }
+
+            TokenStream::TokenStream( Args const& args ):
+                TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+            TokenStream::TokenStream( Iterator it_, Iterator itEnd_ ):
+                it( it_ ), itEnd( itEnd_ ) {
+                loadBuffer();
+            }
+
+            TokenStream& TokenStream::operator++() {
+                if ( m_tokenBuffer.size() >= 2 ) {
+                    m_tokenBuffer.erase( m_tokenBuffer.begin() );
+                } else {
+                    if ( it != itEnd )
+                        ++it;
+                    loadBuffer();
+                }
+                return *this;
+            }
+
+            ParserResult convertInto( std::string const& source,
+                                      std::string& target ) {
+                target = source;
+                return ParserResult::ok( ParseResultType::Matched );
+            }
+
+            ParserResult convertInto( std::string const& source,
+                                      bool& target ) {
+                std::string srcLC = toLower( source );
+
+                if ( srcLC == "y" || srcLC == "1" || srcLC == "true" ||
+                     srcLC == "yes" || srcLC == "on" ) {
+                    target = true;
+                } else if ( srcLC == "n" || srcLC == "0" || srcLC == "false" ||
+                            srcLC == "no" || srcLC == "off" ) {
+                    target = false;
+                } else {
+                    return ParserResult::runtimeError(
+                        "Expected a boolean value but did not recognise: '" +
+                        source + '\'' );
+                }
+                return ParserResult::ok( ParseResultType::Matched );
+            }
+
+            size_t ParserBase::cardinality() const { return 1; }
+
+            InternalParseResult ParserBase::parse( Args const& args ) const {
+                return parse( static_cast<std::string>(args.exeName()), TokenStream( args ) );
+            }
+
+            ParseState::ParseState( ParseResultType type,
+                                    TokenStream remainingTokens ):
+                m_type( type ), m_remainingTokens( CATCH_MOVE(remainingTokens) ) {}
+
+            ParserResult BoundFlagRef::setFlag( bool flag ) {
+                m_ref = flag;
+                return ParserResult::ok( ParseResultType::Matched );
+            }
+
+            ResultBase::~ResultBase() = default;
+
+            bool BoundRef::isContainer() const { return false; }
+
+            bool BoundRef::isFlag() const { return false; }
+
+            bool BoundFlagRefBase::isFlag() const { return true; }
+
+} // namespace Detail
+
+        Detail::InternalParseResult Arg::parse(std::string const&,
+                                               Detail::TokenStream tokens) const {
+            auto validationResult = validate();
+            if (!validationResult)
+                return Detail::InternalParseResult(validationResult);
+
+            auto token = *tokens;
+            if (token.type != Detail::TokenType::Argument)
+                return Detail::InternalParseResult::ok(Detail::ParseState(
+                    ParseResultType::NoMatch, CATCH_MOVE(tokens)));
+
+            assert(!m_ref->isFlag());
+            auto valueRef =
+                static_cast<Detail::BoundValueRefBase*>(m_ref.get());
+
+            auto result = valueRef->setValue(static_cast<std::string>(token.token));
+            if ( !result )
+                return Detail::InternalParseResult( result );
+            else
+                return Detail::InternalParseResult::ok(
+                    Detail::ParseState( ParseResultType::Matched,
+                                        CATCH_MOVE( ++tokens ) ) );
+        }
+
+        Opt::Opt(bool& ref) :
+            ParserRefImpl(std::make_shared<Detail::BoundFlagRef>(ref)) {}
+
+        Detail::HelpColumns Opt::getHelpColumns() const {
+            ReusableStringStream oss;
+            bool first = true;
+            for (auto const& opt : m_optNames) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if (!m_hint.empty())
+                oss << " <" << m_hint << '>';
+            return { oss.str(), m_description };
+        }
+
+        bool Opt::isMatch(StringRef optToken) const {
+            auto normalisedToken = normaliseOpt(optToken);
+            for (auto const& name : m_optNames) {
+                if (normaliseOpt(name) == normalisedToken)
+                    return true;
+            }
+            return false;
+        }
+
+        Detail::InternalParseResult Opt::parse(std::string const&,
+                                       Detail::TokenStream tokens) const {
+            auto validationResult = validate();
+            if (!validationResult)
+                return Detail::InternalParseResult(validationResult);
+
+            if (tokens &&
+                tokens->type == Detail::TokenType::Option) {
+                auto const& token = *tokens;
+                if (isMatch(token.token)) {
+                    if (m_ref->isFlag()) {
+                        auto flagRef =
+                            static_cast<Detail::BoundFlagRefBase*>(
+                                m_ref.get());
+                        auto result = flagRef->setFlag(true);
+                        if (!result)
+                            return Detail::InternalParseResult(result);
+                        if (result.value() ==
+                            ParseResultType::ShortCircuitAll)
+                            return Detail::InternalParseResult::ok(Detail::ParseState(
+                                result.value(), CATCH_MOVE(tokens)));
+                    } else {
+                        auto valueRef =
+                            static_cast<Detail::BoundValueRefBase*>(
+                                m_ref.get());
+                        ++tokens;
+                        if (!tokens)
+                            return Detail::InternalParseResult::runtimeError(
+                                "Expected argument following " +
+                                token.token);
+                        auto const& argToken = *tokens;
+                        if (argToken.type != Detail::TokenType::Argument)
+                            return Detail::InternalParseResult::runtimeError(
+                                "Expected argument following " +
+                                token.token);
+                        const auto result = valueRef->setValue(static_cast<std::string>(argToken.token));
+                        if (!result)
+                            return Detail::InternalParseResult(result);
+                        if (result.value() ==
+                            ParseResultType::ShortCircuitAll)
+                            return Detail::InternalParseResult::ok(Detail::ParseState(
+                                result.value(), CATCH_MOVE(tokens)));
+                    }
+                    return Detail::InternalParseResult::ok(Detail::ParseState(
+                        ParseResultType::Matched, CATCH_MOVE(++tokens)));
+                }
+            }
+            return Detail::InternalParseResult::ok(
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
+        }
+
+        Detail::Result Opt::validate() const {
+            if (m_optNames.empty())
+                return Detail::Result::logicError("No options supplied to Opt");
+            for (auto const& name : m_optNames) {
+                if (name.empty())
+                    return Detail::Result::logicError(
+                        "Option name cannot be empty");
+#ifdef CATCH_PLATFORM_WINDOWS
+                if (name[0] != '-' && name[0] != '/')
+                    return Detail::Result::logicError(
+                        "Option name must begin with '-' or '/'");
+#else
+                if (name[0] != '-')
+                    return Detail::Result::logicError(
+                        "Option name must begin with '-'");
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+
+        ExeName::ExeName() :
+            m_name(std::make_shared<std::string>("<executable>")) {}
+
+        ExeName::ExeName(std::string& ref) : ExeName() {
+            m_ref = std::make_shared<Detail::BoundValueRef<std::string>>(ref);
+        }
+
+        Detail::InternalParseResult
+            ExeName::parse(std::string const&,
+                           Detail::TokenStream tokens) const {
+            return Detail::InternalParseResult::ok(
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
+        }
+
+        ParserResult ExeName::set(std::string const& newName) {
+            auto lastSlash = newName.find_last_of("\\/");
+            auto filename = (lastSlash == std::string::npos)
+                ? newName
+                : newName.substr(lastSlash + 1);
+
+            *m_name = filename;
+            if (m_ref)
+                return m_ref->setValue(filename);
+            else
+                return ParserResult::ok(ParseResultType::Matched);
+        }
+
+
+
+
+        Parser& Parser::operator|=( Parser const& other ) {
+            m_options.insert( m_options.end(),
+                              other.m_options.begin(),
+                              other.m_options.end() );
+            m_args.insert(
+                m_args.end(), other.m_args.begin(), other.m_args.end() );
+            return *this;
+        }
+
+        std::vector<Detail::HelpColumns> Parser::getHelpColumns() const {
+            std::vector<Detail::HelpColumns> cols;
+            cols.reserve( m_options.size() );
+            for ( auto const& o : m_options ) {
+                cols.push_back(o.getHelpColumns());
+            }
+            return cols;
+        }
+
+        void Parser::writeToStream( std::ostream& os ) const {
+            if ( !m_exeName.name().empty() ) {
+                os << "usage:\n"
+                   << "  " << m_exeName.name() << ' ';
+                bool required = true, first = true;
+                for ( auto const& arg : m_args ) {
+                    if ( first )
+                        first = false;
+                    else
+                        os << ' ';
+                    if ( arg.isOptional() && required ) {
+                        os << '[';
+                        required = false;
+                    }
+                    os << '<' << arg.hint() << '>';
+                    if ( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if ( !required )
+                    os << ']';
+                if ( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:\n";
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for ( auto const& cols : rows )
+                optWidth = ( std::max )( optWidth, cols.left.size() + 2 );
+
+            optWidth = ( std::min )( optWidth, consoleWidth / 2 );
+
+            for ( auto& cols : rows ) {
+                auto row = TextFlow::Column( CATCH_MOVE(cols.left) )
+                               .width( optWidth )
+                               .indent( 2 ) +
+                           TextFlow::Spacer( 4 ) +
+                           TextFlow::Column( static_cast<std::string>(cols.descriptions) )
+                               .width( consoleWidth - 7 - optWidth );
+                os << row << '\n';
+            }
+        }
+
+        Detail::Result Parser::validate() const {
+            for ( auto const& opt : m_options ) {
+                auto result = opt.validate();
+                if ( !result )
+                    return result;
+            }
+            for ( auto const& arg : m_args ) {
+                auto result = arg.validate();
+                if ( !result )
+                    return result;
+            }
+            return Detail::Result::ok();
+        }
+
+        Detail::InternalParseResult
+        Parser::parse( std::string const& exeName,
+                       Detail::TokenStream tokens ) const {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            std::vector<ParserInfo> parseInfos;
+            parseInfos.reserve( m_options.size() + m_args.size() );
+            for ( auto const& opt : m_options ) {
+                parseInfos.push_back( { &opt, 0 } );
+            }
+            for ( auto const& arg : m_args ) {
+                parseInfos.push_back( { &arg, 0 } );
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = Detail::InternalParseResult::ok(
+                Detail::ParseState( ParseResultType::NoMatch, CATCH_MOVE(tokens) ) );
+            while ( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for ( auto& parseInfo : parseInfos ) {
+                    if ( parseInfo.parser->cardinality() == 0 ||
+                         parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(
+                            exeName, CATCH_MOVE(result).value().remainingTokens() );
+                        if ( !result )
+                            return result;
+                        if ( result.value().type() !=
+                             ParseResultType::NoMatch ) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if ( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if ( !tokenParsed )
+                    return Detail::InternalParseResult::runtimeError(
+                        "Unrecognised token: " +
+                        result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+
+        Args::Args(int argc, char const* const* argv) :
+            m_exeName(argv[0]), m_args(argv + 1, argv + argc) {}
+
+        Args::Args(std::initializer_list<StringRef> args) :
+            m_exeName(*args.begin()),
+            m_args(args.begin() + 1, args.end()) {}
+
+
+        Help::Help( bool& showHelpFlag ):
+            Opt( [&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            } ) {
+            static_cast<Opt&> ( *this )(
+                "display usage information" )["-?"]["-h"]["--help"]
+                .optional();
+        }
+
+    } // namespace Clara
+} // namespace Catch
+
+
+
+
+#include <fstream>
+#include <string>
+
+namespace Catch {
+
+    Clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace Clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+            if ( warning == "NoAssertions" ) {
+                config.warnings = static_cast<WarnAbout::What>(config.warnings | WarnAbout::NoAssertions);
+                return ParserResult::ok( ParseResultType::Matched );
+            } else if ( warning == "UnmatchedTestSpec" ) {
+                config.warnings = static_cast<WarnAbout::What>(config.warnings | WarnAbout::UnmatchedTestSpec);
+                return ParserResult::ok( ParseResultType::Matched );
+            }
+
+            return ParserResult ::runtimeError(
+                "Unrecognised warning option: '" + warning + '\'' );
+        };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + '\'' );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + CATCH_MOVE(line) + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = TestRunOrder::Declared;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = TestRunOrder::LexicographicallySorted;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = TestRunOrder::Randomized;
+                else
+                    return ParserResult::runtimeError( "Unrecognised ordering: '" + order + '\'' );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed == "time" ) {
+                    config.rngSeed = generateRandomSeed(GenerateFrom::Time);
+                    return ParserResult::ok(ParseResultType::Matched);
+                } else if (seed == "random-device") {
+                    config.rngSeed = generateRandomSeed(GenerateFrom::RandomDevice);
+                    return ParserResult::ok(ParseResultType::Matched);
+                }
+
+                // TODO: ideally we should be parsing uint32_t directly
+                //       fix this later when we add new parse overload
+                auto parsedSeed = parseUInt( seed, 0 );
+                if ( !parsedSeed ) {
+                    return ParserResult::runtimeError( "Could not parse '" + seed + "' as seed" );
+                }
+                config.rngSeed = *parsedSeed;
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setDefaultColourMode = [&]( std::string const& colourMode ) {
+            Optional<ColourMode> maybeMode = Catch::Detail::stringToColourMode(toLower( colourMode ));
+            if ( !maybeMode ) {
+                return ParserResult::runtimeError(
+                    "colour mode must be one of: default, ansi, win32, "
+                    "or none. '" +
+                    colourMode + "' is not recognised" );
+            }
+            auto mode = *maybeMode;
+            if ( !isColourImplAvailable( mode ) ) {
+                return ParserResult::runtimeError(
+                    "colour mode '" + colourMode +
+                    "' is not supported in this binary" );
+            }
+            config.defaultColourMode = mode;
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + '\'' );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& userReporterSpec ) {
+            if ( userReporterSpec.empty() ) {
+                return ParserResult::runtimeError( "Received empty reporter spec." );
+            }
+
+            Optional<ReporterSpec> parsed =
+                parseReporterSpec( userReporterSpec );
+            if ( !parsed ) {
+                return ParserResult::runtimeError(
+                    "Could not parse reporter spec '" + userReporterSpec +
+                    "'" );
+            }
+
+            auto const& reporterSpec = *parsed;
+
+            auto const& factories =
+                getRegistryHub().getReporterRegistry().getFactories();
+            auto result = factories.find( reporterSpec.name() );
+
+            if ( result == factories.end() ) {
+                return ParserResult::runtimeError(
+                    "Unrecognized reporter, '" + reporterSpec.name() +
+                    "'. Check available with --list-reporters" );
+            }
+
+
+            const bool hadOutputFile = reporterSpec.outputFile().some();
+            config.reporterSpecifications.push_back( CATCH_MOVE( *parsed ) );
+            // It would be enough to check this only once at the very end, but
+            // there is  not a place where we could call this check, so do it
+            // every time it could fail. For valid inputs, this is still called
+            // at most once.
+            if (!hadOutputFile) {
+                int n_reporters_without_file = 0;
+                for (auto const& spec : config.reporterSpecifications) {
+                    if (spec.outputFile().none()) {
+                        n_reporters_without_file++;
+                    }
+                }
+                if (n_reporters_without_file > 1) {
+                    return ParserResult::runtimeError( "Only one reporter may have unspecified output file." );
+                }
+            }
+
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setShardCount = [&]( std::string const& shardCount ) {
+            auto parsedCount = parseUInt( shardCount );
+            if ( !parsedCount ) {
+                return ParserResult::runtimeError(
+                    "Could not parse '" + shardCount + "' as shard count" );
+            }
+            if ( *parsedCount == 0 ) {
+                return ParserResult::runtimeError(
+                    "Shard count must be positive" );
+            }
+            config.shardCount = *parsedCount;
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto const setShardIndex = [&](std::string const& shardIndex) {
+            auto parsedIndex = parseUInt( shardIndex );
+            if ( !parsedIndex ) {
+                return ParserResult::runtimeError(
+                    "Could not parse '" + shardIndex + "' as shard index" );
+            }
+            config.shardIndex = *parsedIndex;
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.defaultOutputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "default output filename" )
+            | Opt( accept_many, setReporter, "name[::key=value]*" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( accept_many, setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( config.minDuration, "seconds" )
+                ["-D"]["--min-duration"]
+                ( "show test durations for tests taking at least the given number of seconds" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTests )
+                ["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all available reporters" )
+            | Opt( config.listListeners )
+                ["--list-listeners"]
+                ( "list all listeners" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|'random-device'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setDefaultColourMode, "ansi|win32|none|default" )
+                ["--colour-mode"]
+                ( "what color mode should be used as default" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.skipBenchmarks)
+                ["--skip-benchmarks"]
+                ( "disable running benchmarks")
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
+            | Opt( setShardCount, "shard count" )
+                ["--shard-count"]
+                ( "split the tests to execute into this many groups" )
+            | Opt( setShardIndex, "shard index" )
+                ["--shard-index"]
+                ( "index of the group of tests to execute (see --shard-count)" )
+            | Opt( config.allowZeroTests )
+                ["--allow-running-no-tests"]
+                ( "Treat 'No tests run' as a success" )
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+
+
+#include <cassert>
+#include <ostream>
+#include <utility>
+
+namespace Catch {
+
+    ColourImpl::~ColourImpl() = default;
+
+    ColourImpl::ColourGuard ColourImpl::guardColour( Colour::Code colourCode ) {
+        return ColourGuard(colourCode, this );
+    }
+
+    void ColourImpl::ColourGuard::engageImpl( std::ostream& stream ) {
+        assert( &stream == &m_colourImpl->m_stream->stream() &&
+                "Engaging colour guard for different stream than used by the "
+                "parent colour implementation" );
+        static_cast<void>( stream );
+
+        m_engaged = true;
+        m_colourImpl->use( m_code );
+    }
+
+    ColourImpl::ColourGuard::ColourGuard( Colour::Code code,
+                                          ColourImpl const* colour ):
+        m_colourImpl( colour ), m_code( code ) {
+    }
+    ColourImpl::ColourGuard::ColourGuard( ColourGuard&& rhs ) noexcept:
+        m_colourImpl( rhs.m_colourImpl ),
+        m_code( rhs.m_code ),
+        m_engaged( rhs.m_engaged ) {
+        rhs.m_engaged = false;
+    }
+    ColourImpl::ColourGuard&
+    ColourImpl::ColourGuard::operator=( ColourGuard&& rhs ) noexcept {
+        using std::swap;
+        swap( m_colourImpl, rhs.m_colourImpl );
+        swap( m_code, rhs.m_code );
+        swap( m_engaged, rhs.m_engaged );
+
+        return *this;
+    }
+    ColourImpl::ColourGuard::~ColourGuard() {
+        if ( m_engaged ) {
+            m_colourImpl->use( Colour::None );
+        }
+    }
+
+    ColourImpl::ColourGuard&
+    ColourImpl::ColourGuard::engage( std::ostream& stream ) & {
+        engageImpl( stream );
+        return *this;
+    }
+
+    ColourImpl::ColourGuard&&
+    ColourImpl::ColourGuard::engage( std::ostream& stream ) && {
+        engageImpl( stream );
+        return CATCH_MOVE(*this);
+    }
+
+    namespace {
+        //! A do-nothing implementation of colour, used as fallback for unknown
+        //! platforms, and when the user asks to deactivate all colours.
+        class NoColourImpl final : public ColourImpl {
+        public:
+            NoColourImpl( IStream* stream ): ColourImpl( stream ) {}
+
+        private:
+            void use( Colour::Code ) const override {}
+        };
+    } // namespace
+
+
+} // namespace Catch
+
+
+#if defined ( CATCH_CONFIG_COLOUR_WIN32 ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl final : public ColourImpl {
+    public:
+        Win32ColourImpl(IStream* stream):
+            ColourImpl(stream) {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( GetStdHandle( STD_OUTPUT_HANDLE ),
+                                        &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        static bool useImplementationForStream(IStream const& stream) {
+            // Win32 text colour APIs can only be used on console streams
+            // We cannot check that the output hasn't been redirected,
+            // so we just check that the original stream is console stream.
+            return stream.isConsole();
+        }
+
+    private:
+        void use( Colour::Code _colourCode ) const override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+        void setTextAttribute( WORD _textAttribute ) const {
+            SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ),
+                                     _textAttribute |
+                                         originalBackgroundAttributes );
+        }
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+} // end anon namespace
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+
+#if defined( CATCH_PLATFORM_LINUX ) || defined( CATCH_PLATFORM_MAC )
+#    define CATCH_INTERNAL_HAS_ISATTY
+#    include <unistd.h>
+#endif
+
+namespace Catch {
+namespace {
+
+    class ANSIColourImpl final : public ColourImpl {
+    public:
+        ANSIColourImpl( IStream* stream ): ColourImpl( stream ) {}
+
+        static bool useImplementationForStream(IStream const& stream) {
+            // This is kinda messy due to trying to support a bunch of
+            // different platforms at once.
+            // The basic idea is that if we are asked to do autodetection (as
+            // opposed to being told to use posixy colours outright), then we
+            // only want to use the colours if we are writing to console.
+            // However, console might be redirected, so we make an attempt at
+            // checking for that on platforms where we know how to do that.
+            bool useColour = stream.isConsole();
+#if defined( CATCH_INTERNAL_HAS_ISATTY ) && \
+    !( defined( __DJGPP__ ) && defined( __STRICT_ANSI__ ) )
+            ErrnoGuard _; // for isatty
+            useColour = useColour && isatty( STDOUT_FILENO );
+#    endif
+#    if defined( CATCH_PLATFORM_MAC ) || defined( CATCH_PLATFORM_IPHONE )
+            useColour = useColour && !isDebuggerActive();
+#    endif
+
+            return useColour;
+        }
+
+    private:
+        void use( Colour::Code _colourCode ) const override {
+            auto setColour = [&out =
+                                  m_stream->stream()]( char const* escapeCode ) {
+                // The escape sequence must be flushed to console, otherwise
+                // if stdin and stderr are intermixed, we'd get accidentally
+                // coloured output.
+                out << '\033' << escapeCode << std::flush;
+            };
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+    };
+
+} // end anon namespace
+} // end namespace Catch
+
+namespace Catch {
+
+    Detail::unique_ptr<ColourImpl> makeColourImpl( ColourMode colourSelection,
+                                                   IStream* stream ) {
+#if defined( CATCH_CONFIG_COLOUR_WIN32 )
+        if ( colourSelection == ColourMode::Win32 ) {
+            return Detail::make_unique<Win32ColourImpl>( stream );
+        }
+#endif
+        if ( colourSelection == ColourMode::ANSI ) {
+            return Detail::make_unique<ANSIColourImpl>( stream );
+        }
+        if ( colourSelection == ColourMode::None ) {
+            return Detail::make_unique<NoColourImpl>( stream );
+        }
+
+        if ( colourSelection == ColourMode::PlatformDefault) {
+#if defined( CATCH_CONFIG_COLOUR_WIN32 )
+            if ( Win32ColourImpl::useImplementationForStream( *stream ) ) {
+                return Detail::make_unique<Win32ColourImpl>( stream );
+            }
+#endif
+            if ( ANSIColourImpl::useImplementationForStream( *stream ) ) {
+                return Detail::make_unique<ANSIColourImpl>( stream );
+            }
+            return Detail::make_unique<NoColourImpl>( stream );
+        }
+
+        CATCH_ERROR( "Could not create colour impl for selection " << static_cast<int>(colourSelection) );
+    }
+
+    bool isColourImplAvailable( ColourMode colourSelection ) {
+        switch ( colourSelection ) {
+#if defined( CATCH_CONFIG_COLOUR_WIN32 )
+        case ColourMode::Win32:
+#endif
+        case ColourMode::ANSI:
+        case ColourMode::None:
+        case ColourMode::PlatformDefault:
+            return true;
+        default:
+            return false;
+        }
+    }
+
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+
+
+
+namespace Catch {
+
+    Context* Context::currentContext = nullptr;
+
+    void cleanUpContext() {
+        delete Context::currentContext;
+        Context::currentContext = nullptr;
+    }
+    void Context::createContext() {
+        currentContext = new Context();
+    }
+
+    Context& getCurrentMutableContext() {
+        if ( !Context::currentContext ) { Context::createContext(); }
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *Context::currentContext;
+    }
+
+    void Context::setResultCapture( IResultCapture* resultCapture ) {
+        m_resultCapture = resultCapture;
+    }
+
+    void Context::setConfig( IConfig const* config ) { m_config = config; }
+
+    SimplePcg32& sharedRng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+
+
+
+
+
+#include <ostream>
+
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+
+
+
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+
+#  include <cassert>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n\n" << std::flush;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+
+
+
+
+namespace Catch {
+
+    void ITransientExpression::streamReconstructedExpression(
+        std::ostream& os ) const {
+        // We can't make this function pure virtual to keep ITransientExpression
+        // constexpr, so we write error message instead
+        os << "Some class derived from ITransientExpression without overriding streamReconstructedExpression";
+    }
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << ' ' << op << ' ' << rhs;
+        else
+            os << lhs << '\n' << op << '\n' << rhs;
+    }
+}
+
+
+
+#include <stdexcept>
+
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+
+
+} // namespace Catch;
+
+
+
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() = default;
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurrence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() = default;
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        Catch::Detail::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            auto enumInfo = Catch::Detail::make_unique<EnumInfo>();
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+
+
+
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+
+
+
+#include <exception>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    namespace {
+        static std::string tryTranslators(
+            std::vector<
+                Detail::unique_ptr<IExceptionTranslator const>> const& translators ) {
+            if ( translators.empty() ) {
+                std::rethrow_exception( std::current_exception() );
+            } else {
+                return translators[0]->translate( translators.begin() + 1,
+                                                  translators.end() );
+            }
+        }
+
+    }
+#endif //!defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() = default;
+
+    void ExceptionTranslatorRegistry::registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) {
+        m_translators.push_back( CATCH_MOVE( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        // Compiling a mixed mode project with MSVC means that CLR
+        // exceptions will be caught in (...) as well. However, these do
+        // do not fill-in std::current_exception and thus lead to crash
+        // when attempting rethrow.
+        // /EHa switch also causes structured exceptions to be caught
+        // here, but they fill-in current_exception properly, so
+        // at worst the output should be a little weird, instead of
+        // causing a crash.
+        if ( std::current_exception() == nullptr ) {
+            return "Non C++ exception. Possibly a CLR exception.";
+        }
+
+        // First we try user-registered translators. If none of them can
+        // handle the exception, it will be rethrown handled by our defaults.
+        try {
+            return tryTranslators(m_translators);
+        }
+        // To avoid having to handle TFE explicitly everywhere, we just
+        // rethrow it so that it goes back up the caller.
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( TestSkipException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception const& ex ) {
+            return ex.what();
+        }
+        catch( std::string const& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+
+
+
+/** \file
+ * This file provides platform specific implementations of FatalConditionHandler
+ *
+ * This means that there is a lot of conditional compilation, and platform
+ * specific code. Currently, Catch2 supports a dummy handler (if no
+ * handler is desired), and 2 platform specific handlers:
+ *  * Windows' SEH
+ *  * POSIX signals
+ *
+ * Consequently, various pieces of code below are compiled if either of
+ * the platform specific handlers is enabled, or if none of them are
+ * enabled. It is assumed that both cannot be enabled at the same time,
+ * and doing so should cause a compilation error.
+ *
+ * If another platform specific handler is added, the compile guards
+ * below will need to be updated taking these assumptions into account.
+ */
+
+
+
+#include <algorithm>
+
+#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    // If neither SEH nor signal handling is required, the handler impls
+    // do not have to do anything, and can be empty.
+    void FatalConditionHandler::engage_platform() {}
+    void FatalConditionHandler::disengage_platform() noexcept {}
+    FatalConditionHandler::FatalConditionHandler() = default;
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+} // end namespace Catch
+
+#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
+#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
+#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    //! Signals fatal error message to the run context
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+
+    //! Minimal size Catch2 needs for its own fatal error handling.
+    //! Picked empirically, so it might not be sufficient on all
+    //! platforms, and for all configurations.
+    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
+} // end unnamed namespace
+
+#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { EXCEPTION_ILLEGAL_INSTRUCTION,  "SIGILL - Illegal instruction signal" },
+        { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" },
+        { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" },
+        { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" },
+    };
+
+    static LONG CALLBACK topLevelExceptionFilter(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    // Since we do not support multiple instantiations, we put these
+    // into global variables and rely on cleaning them up in outlined
+    // constructors/destructors
+    static LPTOP_LEVEL_EXCEPTION_FILTER previousTopLevelExceptionFilter = nullptr;
+
+
+    // For MSVC, we reserve part of the stack memory for handling
+    // memory overflow structured exception.
+    FatalConditionHandler::FatalConditionHandler() {
+        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
+        if (!SetThreadStackGuarantee(&guaranteeSize)) {
+            // We do not want to fully error out, because needing
+            // the stack reserve should be rare enough anyway.
+            Catch::cerr()
+                << "Failed to reserve piece of stack."
+                << " Stack overflows will not be reported successfully.";
+        }
+    }
+
+    // We do not attempt to unset the stack guarantee, because
+    // Windows does not support lowering the stack size guarantee.
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+
+    void FatalConditionHandler::engage_platform() {
+        // Register as a the top level exception filter.
+        previousTopLevelExceptionFilter = SetUnhandledExceptionFilter(topLevelExceptionFilter);
+    }
+
+    void FatalConditionHandler::disengage_platform() noexcept {
+        if (SetUnhandledExceptionFilter(previousTopLevelExceptionFilter) != topLevelExceptionFilter) {
+            Catch::cerr()
+                << "Unexpected SEH unhandled exception filter on disengage."
+                << " The filter was restored, but might be rolled back unexpectedly.";
+        }
+        previousTopLevelExceptionFilter = nullptr;
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_CONFIG_WINDOWS_SEH
+
+#if defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
+// which is zero initialization, but not explicit. We want to avoid
+// that.
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+    static char* altStackMem = nullptr;
+    static std::size_t altStackSize = 0;
+    static stack_t oldSigStack{};
+    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
+
+    static void restorePreviousSignalHandlers() noexcept {
+        // We set signal handlers back to the previous ones. Hopefully
+        // nobody overwrote them in the meantime, and doesn't expect
+        // their signal handlers to live past ours given that they
+        // installed them after ours..
+        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+        }
+        // Return the old stack
+        sigaltstack(&oldSigStack, nullptr);
+    }
+
+    static void handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        // We need to restore previous signal handlers and let them do
+        // their thing, so that the users can have the debugger break
+        // when a signal is raised, and so on.
+        restorePreviousSignalHandlers();
+        reportFatal( name );
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
+        if (altStackSize == 0) {
+            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
+        }
+        altStackMem = new char[altStackSize]();
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        delete[] altStackMem;
+        // We signal that another instance can be constructed by zeroing
+        // out the pointer.
+        altStackMem = nullptr;
+    }
+
+    void FatalConditionHandler::engage_platform() {
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = altStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+
+
+    void FatalConditionHandler::disengage_platform() noexcept {
+        restorePreviousSignalHandlers();
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_CONFIG_POSIX_SIGNALS
+
+
+
+
+#include <cstring>
+
+namespace Catch {
+    namespace Detail {
+
+        uint32_t convertToBits(float f) {
+            static_assert(sizeof(float) == sizeof(uint32_t), "Important ULP matcher assumption violated");
+            uint32_t i;
+            std::memcpy(&i, &f, sizeof(f));
+            return i;
+        }
+
+        uint64_t convertToBits(double d) {
+            static_assert(sizeof(double) == sizeof(uint64_t), "Important ULP matcher assumption violated");
+            uint64_t i;
+            std::memcpy(&i, &d, sizeof(d));
+            return i;
+        }
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        bool directCompare( float lhs, float rhs ) { return lhs == rhs; }
+        bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+
+    } // end namespace Detail
+} // end namespace Catch
+
+
+
+
+
+
+#include <cstdlib>
+
+namespace Catch {
+    namespace Detail {
+
+#if !defined (CATCH_CONFIG_GETENV)
+        char const* getEnv( char const* ) { return nullptr; }
+#else
+
+        char const* getEnv( char const* varName ) {
+#    if defined( _MSC_VER )
+#        pragma warning( push )
+#        pragma warning( disable : 4996 ) // use getenv_s instead of getenv
+#    endif
+
+            return std::getenv( varName );
+
+#    if defined( _MSC_VER )
+#        pragma warning( pop )
+#    endif
+        }
+#endif
+} // namespace Detail
+} // namespace Catch
+
+
+
+
+#include <cstdio>
+#include <fstream>
+#include <sstream>
+#include <vector>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+namespace Detail {
+    namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl final : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept override {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const& str ) {
+                if ( !str.empty() ) {
+                    writeToDebugConsole( str );
+                }
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream final : public IStream {
+            std::ofstream m_ofs;
+        public:
+            FileStream( std::string const& filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << '\'' );
+                m_ofs << std::unitbuf;
+            }
+        public: // IStream
+            std::ostream& stream() override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream final : public IStream {
+            std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+
+        public: // IStream
+            std::ostream& stream() override { return m_os; }
+            bool isConsole() const override { return true; }
+        };
+
+        class CerrStream : public IStream {
+            std::ostream m_os;
+
+        public:
+            // Store the streambuf from cerr up-front because
+            // cout may get redirected when running tests
+            CerrStream(): m_os( Catch::cerr().rdbuf() ) {}
+
+        public: // IStream
+            std::ostream& stream() override { return m_os; }
+            bool isConsole() const override { return true; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream final : public IStream {
+            Detail::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( Detail::make_unique<StreamBufImpl<OutputDebugWriter>>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+        public: // IStream
+            std::ostream& stream() override { return m_os; }
+        };
+
+    } // unnamed namespace
+} // namespace Detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream> {
+        if ( filename.empty() || filename == "-" ) {
+            return Detail::make_unique<Detail::CoutStream>();
+        }
+        if( filename[0] == '%' ) {
+            if ( filename == "%debug" ) {
+                return Detail::make_unique<Detail::DebugOutStream>();
+            } else if ( filename == "%stderr" ) {
+                return Detail::make_unique<Detail::CerrStream>();
+            } else if ( filename == "%stdout" ) {
+                return Detail::make_unique<Detail::CoutStream>();
+            } else {
+                CATCH_ERROR( "Unrecognised stream: '" << filename << '\'' );
+            }
+        }
+        return Detail::make_unique<Detail::FileStream>( filename );
+    }
+
+}
+
+
+
+namespace Catch {
+    void JsonUtils::indent( std::ostream& os, std::uint64_t level ) {
+        for ( std::uint64_t i = 0; i < level; ++i ) {
+            os << "  ";
+        }
+    }
+    void JsonUtils::appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level ) {
+        if ( should_comma ) { os << ','; }
+        should_comma = true;
+        os << '\n';
+        indent( os, level );
+    }
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os ):
+        JsonObjectWriter{ os, 0 } {}
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os,
+                                        std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '{';
+    }
+    JsonObjectWriter::JsonObjectWriter( JsonObjectWriter&& source ) noexcept:
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+
+    JsonObjectWriter::~JsonObjectWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << '}';
+    }
+
+    JsonValueWriter JsonObjectWriter::write( StringRef key ) {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+
+        m_os << '"' << key << "\": ";
+        return JsonValueWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os ):
+        JsonArrayWriter{ os, 0 } {}
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '[';
+    }
+    JsonArrayWriter::JsonArrayWriter( JsonArrayWriter&& source ) noexcept:
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+    JsonArrayWriter::~JsonArrayWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << ']';
+    }
+
+    JsonObjectWriter JsonArrayWriter::writeObject() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonObjectWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter JsonArrayWriter::writeArray() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonArrayWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter& JsonArrayWriter::write( bool value ) {
+        return writeImpl( value );
+    }
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os ):
+        JsonValueWriter{ os, 0 } {}
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {}
+
+    JsonObjectWriter JsonValueWriter::writeObject() && {
+        return JsonObjectWriter{ m_os, m_indent_level };
+    }
+
+    JsonArrayWriter JsonValueWriter::writeArray() && {
+        return JsonArrayWriter{ m_os, m_indent_level };
+    }
+
+    void JsonValueWriter::write( Catch::StringRef value ) && {
+        writeImpl( value, true );
+    }
+
+    void JsonValueWriter::write( bool value ) && {
+        writeImpl( value ? "true"_sr : "false"_sr, false );
+    }
+
+    void JsonValueWriter::writeImpl( Catch::StringRef value, bool quote ) {
+        if ( quote ) { m_os << '"'; }
+        for (char c : value) {
+            // Escape list taken from https://www.json.org/json-en.html,
+            // string definition.
+            // Note that while forward slash _can_ be escaped, it does
+            // not have to be, if JSON is not further embedded somewhere
+            // where forward slash is meaningful.
+            if ( c == '"' ) {
+                m_os << "\\\"";
+            } else if ( c == '\\' ) {
+                m_os << "\\\\";
+            } else if ( c == '\b' ) {
+                m_os << "\\b";
+            } else if ( c == '\f' ) {
+                m_os << "\\f";
+            } else if ( c == '\n' ) {
+                m_os << "\\n";
+            } else if ( c == '\r' ) {
+                m_os << "\\r";
+            } else if ( c == '\t' ) {
+                m_os << "\\t";
+            } else {
+                m_os << c;
+            }
+        }
+        if ( quote ) { m_os << '"'; }
+    }
+
+} // namespace Catch
+
+
+
+
+namespace Catch {
+
+    auto operator << (std::ostream& os, LazyExpression const& lazyExpr) -> std::ostream& {
+        if (lazyExpr.m_isNegated)
+            os << '!';
+
+        if (lazyExpr) {
+            if (lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression())
+                os << '(' << *lazyExpr.m_transientExpression << ')';
+            else
+                os << *lazyExpr.m_transientExpression;
+        } else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+} // namespace Catch
+
+
+
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else // ^^ Windows crt debug heap enabled // Windows crt debug heap disabled vv
+
+    Catch::LeakDetector::LeakDetector() = default;
+
+#endif // CATCH_CONFIG_WINDOWS_CRTDBG
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+
+
+
+
+namespace Catch {
+    namespace {
+
+        void listTests(IEventListener& reporter, IConfig const& config) {
+            auto const& testSpec = config.testSpec();
+            auto matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config);
+            reporter.listTests(matchedTestCases);
+        }
+
+        void listTags(IEventListener& reporter, IConfig const& config) {
+            auto const& testSpec = config.testSpec();
+            std::vector<TestCaseHandle> matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config);
+
+            std::map<StringRef, TagInfo, Detail::CaseInsensitiveLess> tagCounts;
+            for (auto const& testCase : matchedTestCases) {
+                for (auto const& tagName : testCase.getTestCaseInfo().tags) {
+                    auto it = tagCounts.find(tagName.original);
+                    if (it == tagCounts.end())
+                        it = tagCounts.insert(std::make_pair(tagName.original, TagInfo())).first;
+                    it->second.add(tagName.original);
+                }
+            }
+
+            std::vector<TagInfo> infos; infos.reserve(tagCounts.size());
+            for (auto& tagc : tagCounts) {
+                infos.push_back(CATCH_MOVE(tagc.second));
+            }
+
+            reporter.listTags(infos);
+        }
+
+        void listReporters(IEventListener& reporter) {
+            std::vector<ReporterDescription> descriptions;
+
+            auto const& factories = getRegistryHub().getReporterRegistry().getFactories();
+            descriptions.reserve(factories.size());
+            for (auto const& fac : factories) {
+                descriptions.push_back({ fac.first, fac.second->getDescription() });
+            }
+
+            reporter.listReporters(descriptions);
+        }
+
+        void listListeners(IEventListener& reporter) {
+            std::vector<ListenerDescription> descriptions;
+
+            auto const& factories =
+                getRegistryHub().getReporterRegistry().getListeners();
+            descriptions.reserve( factories.size() );
+            for ( auto const& fac : factories ) {
+                descriptions.push_back( { fac->getName(), fac->getDescription() } );
+            }
+
+            reporter.listListeners( descriptions );
+        }
+
+    } // end anonymous namespace
+
+    void TagInfo::add( StringRef spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        // 2 per tag for brackets '[' and ']'
+        size_t size =  spellings.size() * 2;
+        for (auto const& spelling : spellings) {
+            size += spelling.size();
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    bool list( IEventListener& reporter, Config const& config ) {
+        bool listed = false;
+        if (config.listTests()) {
+            listed = true;
+            listTests(reporter, config);
+        }
+        if (config.listTags()) {
+            listed = true;
+            listTags(reporter, config);
+        }
+        if (config.listReporters()) {
+            listed = true;
+            listReporters(reporter);
+        }
+        if ( config.listListeners() ) {
+            listed = true;
+            listListeners( reporter );
+        }
+        return listed;
+    }
+
+} // end namespace Catch
+
+
+
+namespace Catch {
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+    static LeakDetector leakDetector;
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+}
+
+// Allow users of amalgamated .cpp file to remove our main and provide their own.
+#if !defined(CATCH_AMALGAMATED_CUSTOM_MAIN)
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int __cdecl wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    // We want to force the linker not to discard the global variable
+    // and its constructor, as it (optionally) registers leak detector
+    (void)&Catch::leakDetector;
+
+    return Catch::Session().run( argc, argv );
+}
+
+#endif // !defined(CATCH_AMALGAMATED_CUSTOM_MAIN
+
+
+
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+} // end namespace Catch
+
+
+
+#include <cstdio>
+#include <cstring>
+#include <sstream>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w+")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+
+
+
+
+#include <limits>
+#include <stdexcept>
+
+namespace Catch {
+
+    Optional<unsigned int> parseUInt(std::string const& input, int base) {
+        auto trimmed = trim( input );
+        // std::stoull is annoying and accepts numbers starting with '-',
+        // it just negates them into unsigned int
+        if ( trimmed.empty() || trimmed[0] == '-' ) {
+            return {};
+        }
+
+        CATCH_TRY {
+            size_t pos = 0;
+            const auto ret = std::stoull( trimmed, &pos, base );
+
+            // We did not consume the whole input, so there is an issue
+            // This can be bunch of different stuff, like multiple numbers
+            // in the input, or invalid digits/characters and so on. Either
+            // way, we do not want to return the partially parsed result.
+            if ( pos != trimmed.size() ) {
+                return {};
+            }
+            // Too large
+            if ( ret > std::numeric_limits<unsigned int>::max() ) {
+                return {};
+            }
+            return static_cast<unsigned int>(ret);
+        }
+        CATCH_CATCH_ANON( std::invalid_argument const& ) {
+            // no conversion could be performed
+        }
+        CATCH_CATCH_ANON( std::out_of_range const& ) {
+            // the input does not fit into an unsigned long long
+        }
+        return {};
+    }
+
+} // namespace Catch
+
+
+
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+#if !defined( CATCH_CONFIG_GLOBAL_NEXTAFTER )
+    float nextafter( float x, float y ) { return std::nextafter( x, y ); }
+    double nextafter( double x, double y ) { return std::nextafter( x, y ); }
+#else
+    float nextafter( float x, float y ) { return ::nextafterf( x, y ); }
+    double nextafter( double x, double y ) { return ::nextafter( x, y ); }
+#endif
+
+} // end namespace Catch
+
+
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+
+
+
+
+
+#include <ctime>
+#include <random>
+
+namespace Catch {
+
+    std::uint32_t generateRandomSeed( GenerateFrom from ) {
+        switch ( from ) {
+        case GenerateFrom::Time:
+            return static_cast<std::uint32_t>( std::time( nullptr ) );
+
+        case GenerateFrom::Default:
+        case GenerateFrom::RandomDevice: {
+            std::random_device rd;
+            return Detail::fillBitsFrom<std::uint32_t>( rd );
+        }
+
+        default:
+            CATCH_ERROR("Unknown generation method");
+        }
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+    struct ReporterRegistry::ReporterRegistryImpl {
+        std::vector<Detail::unique_ptr<EventListenerFactory>> listeners;
+        std::map<std::string, IReporterFactoryPtr, Detail::CaseInsensitiveLess>
+            factories;
+    };
+
+    ReporterRegistry::ReporterRegistry():
+        m_impl( Detail::make_unique<ReporterRegistryImpl>() ) {
+        // Because it is impossible to move out of initializer list,
+        // we have to add the elements manually
+        m_impl->factories["Automake"] =
+            Detail::make_unique<ReporterFactory<AutomakeReporter>>();
+        m_impl->factories["compact"] =
+            Detail::make_unique<ReporterFactory<CompactReporter>>();
+        m_impl->factories["console"] =
+            Detail::make_unique<ReporterFactory<ConsoleReporter>>();
+        m_impl->factories["JUnit"] =
+            Detail::make_unique<ReporterFactory<JunitReporter>>();
+        m_impl->factories["SonarQube"] =
+            Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
+        m_impl->factories["TAP"] =
+            Detail::make_unique<ReporterFactory<TAPReporter>>();
+        m_impl->factories["TeamCity"] =
+            Detail::make_unique<ReporterFactory<TeamCityReporter>>();
+        m_impl->factories["XML"] =
+            Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_impl->factories["JSON"] =
+            Detail::make_unique<ReporterFactory<JsonReporter>>();
+    }
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IEventListenerPtr
+    ReporterRegistry::create( std::string const& name,
+                              ReporterConfig&& config ) const {
+        auto it = m_impl->factories.find( name );
+        if ( it == m_impl->factories.end() ) return nullptr;
+        return it->second->create( CATCH_MOVE( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name,
+                                             IReporterFactoryPtr factory ) {
+        CATCH_ENFORCE( name.find( "::" ) == name.npos,
+                       "'::' is not allowed in reporter name: '" + name +
+                           '\'' );
+        auto ret = m_impl->factories.emplace( name, CATCH_MOVE( factory ) );
+        CATCH_ENFORCE( ret.second,
+                       "reporter using '" + name +
+                           "' as name was already registered" );
+    }
+    void ReporterRegistry::registerListener(
+        Detail::unique_ptr<EventListenerFactory> factory ) {
+        m_impl->listeners.push_back( CATCH_MOVE( factory ) );
+    }
+
+    std::map<std::string,
+             IReporterFactoryPtr,
+             Detail::CaseInsensitiveLess> const&
+    ReporterRegistry::getFactories() const {
+        return m_impl->factories;
+    }
+
+    std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+    ReporterRegistry::getListeners() const {
+        return m_impl->listeners;
+    }
+} // namespace Catch
+
+
+
+
+
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        struct kvPair {
+            StringRef key, value;
+        };
+
+        kvPair splitKVPair(StringRef kvString) {
+            auto splitPos = static_cast<size_t>(
+                std::find( kvString.begin(), kvString.end(), '=' ) -
+                kvString.begin() );
+
+            return { kvString.substr( 0, splitPos ),
+                     kvString.substr( splitPos + 1, kvString.size() ) };
+        }
+    }
+
+    namespace Detail {
+        std::vector<std::string> splitReporterSpec( StringRef reporterSpec ) {
+            static constexpr auto separator = "::";
+            static constexpr size_t separatorSize = 2;
+
+            size_t separatorPos = 0;
+            auto findNextSeparator = [&reporterSpec]( size_t startPos ) {
+                static_assert(
+                    separatorSize == 2,
+                    "The code below currently assumes 2 char separator" );
+
+                auto currentPos = startPos;
+                do {
+                    while ( currentPos < reporterSpec.size() &&
+                            reporterSpec[currentPos] != separator[0] ) {
+                        ++currentPos;
+                    }
+                    if ( currentPos + 1 < reporterSpec.size() &&
+                         reporterSpec[currentPos + 1] == separator[1] ) {
+                        return currentPos;
+                    }
+                    ++currentPos;
+                } while ( currentPos < reporterSpec.size() );
+
+                return static_cast<size_t>( -1 );
+            };
+
+            std::vector<std::string> parts;
+
+            while ( separatorPos < reporterSpec.size() ) {
+                const auto nextSeparator = findNextSeparator( separatorPos );
+                parts.push_back( static_cast<std::string>( reporterSpec.substr(
+                    separatorPos, nextSeparator - separatorPos ) ) );
+
+                if ( nextSeparator == static_cast<size_t>( -1 ) ) {
+                    break;
+                }
+                separatorPos = nextSeparator + separatorSize;
+            }
+
+            // Handle a separator at the end.
+            // This is not a valid spec, but we want to do validation in a
+            // centralized place
+            if ( separatorPos == reporterSpec.size() ) {
+                parts.emplace_back();
+            }
+
+            return parts;
+        }
+
+        Optional<ColourMode> stringToColourMode( StringRef colourMode ) {
+            if ( colourMode == "default" ) {
+                return ColourMode::PlatformDefault;
+            } else if ( colourMode == "ansi" ) {
+                return ColourMode::ANSI;
+            } else if ( colourMode == "win32" ) {
+                return ColourMode::Win32;
+            } else if ( colourMode == "none" ) {
+                return ColourMode::None;
+            } else {
+                return {};
+            }
+        }
+    } // namespace Detail
+
+
+    bool operator==( ReporterSpec const& lhs, ReporterSpec const& rhs ) {
+        return lhs.m_name == rhs.m_name &&
+               lhs.m_outputFileName == rhs.m_outputFileName &&
+               lhs.m_colourMode == rhs.m_colourMode &&
+               lhs.m_customOptions == rhs.m_customOptions;
+    }
+
+    Optional<ReporterSpec> parseReporterSpec( StringRef reporterSpec ) {
+        auto parts = Detail::splitReporterSpec( reporterSpec );
+
+        assert( parts.size() > 0 && "Split should never return empty vector" );
+
+        std::map<std::string, std::string> kvPairs;
+        Optional<std::string> outputFileName;
+        Optional<ColourMode> colourMode;
+
+        // First part is always reporter name, so we skip it
+        for ( size_t i = 1; i < parts.size(); ++i ) {
+            auto kv = splitKVPair( parts[i] );
+            auto key = kv.key, value = kv.value;
+
+            if ( key.empty() || value.empty() ) { // NOLINT(bugprone-branch-clone)
+                return {};
+            } else if ( key[0] == 'X' ) {
+                // This is a reporter-specific option, we don't check these
+                // apart from basic sanity checks
+                if ( key.size() == 1 ) {
+                    return {};
+                }
+
+                auto ret = kvPairs.emplace( std::string(kv.key), std::string(kv.value) );
+                if ( !ret.second ) {
+                    // Duplicated key. We might want to handle this differently,
+                    // e.g. by overwriting the existing value?
+                    return {};
+                }
+            } else if ( key == "out" ) {
+                // Duplicated key
+                if ( outputFileName ) {
+                    return {};
+                }
+                outputFileName = static_cast<std::string>( value );
+            } else if ( key == "colour-mode" ) {
+                // Duplicated key
+                if ( colourMode ) {
+                    return {};
+                }
+                colourMode = Detail::stringToColourMode( value );
+                // Parsing failed
+                if ( !colourMode ) {
+                    return {};
+                }
+            } else {
+                // Unrecognized option
+                return {};
+            }
+        }
+
+        return ReporterSpec{ CATCH_MOVE( parts[0] ),
+                             CATCH_MOVE( outputFileName ),
+                             CATCH_MOVE( colourMode ),
+                             CATCH_MOVE( kvPairs ) };
+    }
+
+ReporterSpec::ReporterSpec(
+        std::string name,
+        Optional<std::string> outputFileName,
+        Optional<ColourMode> colourMode,
+        std::map<std::string, std::string> customOptions ):
+        m_name( CATCH_MOVE( name ) ),
+        m_outputFileName( CATCH_MOVE( outputFileName ) ),
+        m_colourMode( CATCH_MOVE( colourMode ) ),
+        m_customOptions( CATCH_MOVE( customOptions ) ) {}
+
+} // namespace Catch
+
+
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+
+
+
+#include <cstdio>
+#include <sstream>
+#include <vector>
+
+namespace Catch {
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<Detail::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( Detail::make_unique<std::ostringstream>() );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    std::string ReusableStringStream::str() const {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    void ReusableStringStream::str( std::string const& str ) {
+        static_cast<std::ostringstream*>( m_oss )->str( str );
+    }
+
+
+}
+
+
+
+
+#include <cassert>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace Generators {
+        namespace {
+            struct GeneratorTracker final : TestCaseTracking::TrackerBase,
+                                      IGeneratorTracker {
+                GeneratorBasePtr m_generator;
+
+                GeneratorTracker(
+                    TestCaseTracking::NameAndLocation&& nameAndLocation,
+                    TrackerContext& ctx,
+                    ITracker* parent ):
+                    TrackerBase( CATCH_MOVE( nameAndLocation ), ctx, parent ) {}
+
+                static GeneratorTracker*
+                acquire( TrackerContext& ctx,
+                         TestCaseTracking::NameAndLocationRef const&
+                             nameAndLocation ) {
+                    GeneratorTracker* tracker;
+
+                    ITracker& currentTracker = ctx.currentTracker();
+                    // Under specific circumstances, the generator we want
+                    // to acquire is also the current tracker. If this is
+                    // the case, we have to avoid looking through current
+                    // tracker's children, and instead return the current
+                    // tracker.
+                    // A case where this check is important is e.g.
+                    //     for (int i = 0; i < 5; ++i) {
+                    //         int n = GENERATE(1, 2);
+                    //     }
+                    //
+                    // without it, the code above creates 5 nested generators.
+                    if ( currentTracker.nameAndLocation() == nameAndLocation ) {
+                        auto thisTracker = currentTracker.parent()->findChild(
+                            nameAndLocation );
+                        assert( thisTracker );
+                        assert( thisTracker->isGeneratorTracker() );
+                        tracker = static_cast<GeneratorTracker*>( thisTracker );
+                    } else if ( ITracker* childTracker =
+                                    currentTracker.findChild(
+                                        nameAndLocation ) ) {
+                        assert( childTracker );
+                        assert( childTracker->isGeneratorTracker() );
+                        tracker =
+                            static_cast<GeneratorTracker*>( childTracker );
+                    } else {
+                        return nullptr;
+                    }
+
+                    if ( !tracker->isComplete() ) { tracker->open(); }
+
+                    return tracker;
+                }
+
+                // TrackerBase interface
+                bool isGeneratorTracker() const override { return true; }
+                auto hasGenerator() const -> bool override {
+                    return !!m_generator;
+                }
+                void close() override {
+                    TrackerBase::close();
+                    // If a generator has a child (it is followed by a section)
+                    // and none of its children have started, then we must wait
+                    // until later to start consuming its values.
+                    // This catches cases where `GENERATE` is placed between two
+                    // `SECTION`s.
+                    // **The check for m_children.empty cannot be removed**.
+                    // doing so would break `GENERATE` _not_ followed by
+                    // `SECTION`s.
+                    const bool should_wait_for_child = [&]() {
+                        // No children -> nobody to wait for
+                        if ( m_children.empty() ) { return false; }
+                        // If at least one child started executing, don't wait
+                        if ( std::find_if(
+                                 m_children.begin(),
+                                 m_children.end(),
+                                 []( TestCaseTracking::ITrackerPtr const&
+                                         tracker ) {
+                                     return tracker->hasStarted();
+                                 } ) != m_children.end() ) {
+                            return false;
+                        }
+
+                        // No children have started. We need to check if they
+                        // _can_ start, and thus we should wait for them, or
+                        // they cannot start (due to filters), and we shouldn't
+                        // wait for them
+                        ITracker* parent = m_parent;
+                        // This is safe: there is always at least one section
+                        // tracker in a test case tracking tree
+                        while ( !parent->isSectionTracker() ) {
+                            parent = parent->parent();
+                        }
+                        assert( parent &&
+                                "Missing root (test case) level section" );
+
+                        auto const& parentSection =
+                            static_cast<SectionTracker const&>( *parent );
+                        auto const& filters = parentSection.getFilters();
+                        // No filters -> no restrictions on running sections
+                        if ( filters.empty() ) { return true; }
+
+                        for ( auto const& child : m_children ) {
+                            if ( child->isSectionTracker() &&
+                                 std::find( filters.begin(),
+                                            filters.end(),
+                                            static_cast<SectionTracker const&>(
+                                                *child )
+                                                .trimmedName() ) !=
+                                     filters.end() ) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }();
+
+                    // This check is a bit tricky, because m_generator->next()
+                    // has a side-effect, where it consumes generator's current
+                    // value, but we do not want to invoke the side-effect if
+                    // this generator is still waiting for any child to start.
+                    assert( m_generator && "Tracker without generator" );
+                    if ( should_wait_for_child ||
+                         ( m_runState == CompletedSuccessfully &&
+                           m_generator->countedNext() ) ) {
+                        m_children.clear();
+                        m_runState = Executing;
+                    }
+                }
+
+                // IGeneratorTracker interface
+                auto getGenerator() const -> GeneratorBasePtr const& override {
+                    return m_generator;
+                }
+                void setGenerator( GeneratorBasePtr&& generator ) override {
+                    m_generator = CATCH_MOVE( generator );
+                }
+            };
+        } // namespace
+    }
+
+    RunContext::RunContext(IConfig const* _config, IEventListenerPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_config(_config),
+        m_reporter(CATCH_MOVE(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        getCurrentMutableContext().setResultCapture( this );
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCaseHandle const& testCase) {
+        const Totals prevTotals = m_totals;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+        m_reporter->testCaseStarting(testInfo);
+        m_activeTestCase = &testCase;
+
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+
+        // We intentionally only seed the internal RNG once per test case,
+        // before it is first invoked. The reason for that is a complex
+        // interplay of generator/section implementation details and the
+        // Random*Generator types.
+        //
+        // The issue boils down to us needing to seed the Random*Generators
+        // with different seed each, so that they return different sequences
+        // of random numbers. We do this by giving them a number from the
+        // shared RNG instance as their seed.
+        //
+        // However, this runs into an issue if the reseeding happens each
+        // time the test case is entered (as opposed to first time only),
+        // because multiple generators could get the same seed, e.g. in
+        // ```cpp
+        // TEST_CASE() {
+        //     auto i = GENERATE(take(10, random(0, 100));
+        //     SECTION("A") {
+        //         auto j = GENERATE(take(10, random(0, 100));
+        //     }
+        //     SECTION("B") {
+        //         auto k = GENERATE(take(10, random(0, 100));
+        //     }
+        // }
+        // ```
+        // `i` and `j` would properly return values from different sequences,
+        // but `i` and `k` would return the same sequence, because their seed
+        // would be the same.
+        // (The reason their seeds would be the same is that the generator
+        //  for k would be initialized when the test case is entered the second
+        //  time, after the shared RNG instance was reset to the same value
+        //  it had when the generator for i was initialized.)
+        seedRng( *m_config );
+
+        uint64_t testRuns = 0;
+        std::string redirectedCout;
+        std::string redirectedCerr;
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocationRef(testInfo.name, testInfo.lineInfo));
+
+            m_reporter->testCasePartialStarting(testInfo, testRuns);
+
+            const auto beforeRunTotals = m_totals;
+            std::string oneRunCout, oneRunCerr;
+            runCurrentTest(oneRunCout, oneRunCerr);
+            redirectedCout += oneRunCout;
+            redirectedCerr += oneRunCerr;
+
+            const auto singleRunTotals = m_totals.delta(beforeRunTotals);
+            auto statsForOneRun = TestCaseStats(testInfo, singleRunTotals, CATCH_MOVE(oneRunCout), CATCH_MOVE(oneRunCerr), aborting());
+
+            m_reporter->testCasePartialEnded(statsForOneRun, testRuns);
+            ++testRuns;
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  CATCH_MOVE(redirectedCout),
+                                  CATCH_MOVE(redirectedCerr),
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+
+    void RunContext::assertionEnded(AssertionResult&& result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (result.getResultType() == ResultWas::ExplicitSkip) {
+            m_totals.assertions.skipped++;
+            m_lastAssertionPassed = true;
+        } else if (!result.succeeded()) {
+            m_lastAssertionPassed = false;
+            if (result.isOk()) {
+            }
+            else if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals));
+
+        if ( result.getResultType() != ResultWas::Warning ) {
+            m_messageScopes.clear();
+        }
+
+        // Reset working state. assertion info will be reset after
+        // populateReaction is run if it is needed
+        m_lastResult = CATCH_MOVE( result );
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+        m_lastAssertionInfo.resultDisposition = ResultDisposition::Normal;
+    }
+
+    void RunContext::notifyAssertionStarted( AssertionInfo const& info ) {
+        m_reporter->assertionStarting( info );
+    }
+
+    bool RunContext::sectionStarted( StringRef sectionName,
+                                     SourceLineInfo const& sectionLineInfo,
+                                     Counts& assertions ) {
+        ITracker& sectionTracker =
+            SectionTracker::acquire( m_trackerContext,
+                                     TestCaseTracking::NameAndLocationRef(
+                                         sectionName, sectionLineInfo ) );
+
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        SectionInfo sectionInfo( sectionLineInfo, static_cast<std::string>(sectionName) );
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    IGeneratorTracker*
+    RunContext::acquireGeneratorTracker( StringRef generatorName,
+                                         SourceLineInfo const& lineInfo ) {
+        using namespace Generators;
+        GeneratorTracker* tracker = GeneratorTracker::acquire(
+            m_trackerContext,
+            TestCaseTracking::NameAndLocationRef(
+                 generatorName, lineInfo ) );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    IGeneratorTracker* RunContext::createGeneratorTracker(
+        StringRef generatorName,
+        SourceLineInfo lineInfo,
+        Generators::GeneratorBasePtr&& generator ) {
+
+        auto nameAndLoc = TestCaseTracking::NameAndLocation( static_cast<std::string>( generatorName ), lineInfo );
+        auto& currentTracker = m_trackerContext.currentTracker();
+        assert(
+            currentTracker.nameAndLocation() != nameAndLoc &&
+            "Trying to create tracker for a genreator that already has one" );
+
+        auto newTracker = Catch::Detail::make_unique<Generators::GeneratorTracker>(
+            CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker );
+        auto ret = newTracker.get();
+        currentTracker.addChild( CATCH_MOVE( newTracker ) );
+
+        ret->setGenerator( CATCH_MOVE( generator ) );
+        ret->open();
+        return ret;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo&& endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(CATCH_MOVE(endInfo.sectionInfo), assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo&& endInfo) {
+        if ( m_unfinishedSections.empty() ) {
+            m_activeSections.back()->fail();
+        } else {
+            m_activeSections.back()->close();
+        }
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(CATCH_MOVE(endInfo));
+    }
+
+    void RunContext::benchmarkPreparing( StringRef name ) {
+        m_reporter->benchmarkPreparing(name);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+    void RunContext::benchmarkFailed( StringRef error ) {
+        m_reporter->benchmarkFailed( error );
+    }
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder&& builder ) {
+        m_messageScopes.emplace_back( CATCH_MOVE(builder) );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, CATCH_MOVE(tempResult));
+
+        assertionEnded(CATCH_MOVE(result) );
+        resetAssertionInfo();
+
+        // Best effort cleanup for sections that have not been destructed yet
+        // Since this is a fatal error, we have not had and won't have the opportunity to destruct them properly
+        while (!m_activeSections.empty()) {
+            auto nl = m_activeSections.back()->nameAndLocation();
+            SectionEndInfo endInfo{ SectionInfo(CATCH_MOVE(nl.location), CATCH_MOVE(nl.name)), {}, 0.0 };
+            sectionEndedEarly(CATCH_MOVE(endInfo));
+        }
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(CATCH_MOVE(testCaseSection), assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ANON (TestSkipException&) {
+            // This just means the test was explicitly skipped
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(CATCH_MOVE(testCaseSection), assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        // We need to engage a handler for signals/structured exceptions
+        // before running the tests themselves, or the binary can crash
+        // without failed test being reported.
+        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
+        // We keep having issue where some compilers warn about an unused
+        // variable, even though the type has non-trivial constructor and
+        // destructor. This is annoying and ugly, but it makes them stfu.
+        (void)_;
+
+        m_activeTestCase->invoke();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(CATCH_MOVE(*it));
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+        resetAssertionInfo();
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( CATCH_MOVE(assertionResult) );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo,
+                                         CATCH_MOVE( data ) };
+
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) {
+            populateReaction( reaction );
+        } else if ( resultType == ResultWas::ExplicitSkip ) {
+            // TODO: Need to handle this explicitly, as ExplicitSkip is
+            // considered "OK"
+            reaction.shouldSkip = true;
+        }
+        resetAssertionInfo();
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string&& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = CATCH_MOVE(message);
+        AssertionResult assertionResult{ info, CATCH_MOVE(data) };
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        populateReaction( reaction );
+        resetAssertionInfo();
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        using namespace std::string_literals;
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"s;
+        AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        resetAssertionInfo();
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
+
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) { populateReaction( reaction ); }
+        resetAssertionInfo();
+    }
+
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        sharedRng().seed(config.rngSeed());
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+
+
+
+namespace Catch {
+
+    Section::Section( SectionInfo&& info ):
+        m_info( CATCH_MOVE( info ) ),
+        m_sectionIncluded(
+            getResultCapture().sectionStarted( m_info.name, m_info.lineInfo, m_assertions ) ) {
+        // Non-"included" sections will not use the timing information
+        // anyway, so don't bother with the potential syscall.
+        if (m_sectionIncluded) {
+            m_timer.start();
+        }
+    }
+
+    Section::Section( SourceLineInfo const& _lineInfo,
+                      StringRef _name,
+                      const char* const ):
+        m_info( { "invalid", static_cast<std::size_t>( -1 ) }, std::string{} ),
+        m_sectionIncluded(
+            getResultCapture().sectionStarted( _name, _lineInfo, m_assertions ) ) {
+        // We delay initialization the SectionInfo member until we know
+        // this section needs it, so we avoid allocating std::string for name.
+        // We also delay timer start to avoid the potential syscall unless we
+        // will actually use the result.
+        if ( m_sectionIncluded ) {
+            m_info.name = static_cast<std::string>( _name );
+            m_info.lineInfo = _lineInfo;
+            m_timer.start();
+        }
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ CATCH_MOVE(m_info), m_assertions, m_timer.getElapsedSeconds() };
+            if ( uncaught_exceptions() ) {
+                getResultCapture().sectionEndedEarly( CATCH_MOVE(endInfo) );
+            } else {
+                getResultCapture().sectionEnded( CATCH_MOVE( endInfo ) );
+            }
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+
+} // end namespace Catch
+
+
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() = default;
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+
+
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+#endif
+
+} // end namespace Catch
+
+
+
+
+
+#include <iostream>
+
+namespace Catch {
+
+// If you #define this you must implement these functions
+#if !defined( CATCH_CONFIG_NOSTDOUT )
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+
+} // namespace Catch
+
+
+
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( StringRef s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        for ( char& c : s ) {
+            c = toLower( c );
+        }
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    char toLower(char c) {
+        return static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+    }
+
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        std::size_t i = str.find( replaceThis );
+        if (i == std::string::npos) {
+            return false;
+        }
+        std::size_t copyBegin = 0;
+        std::string origStr = CATCH_MOVE(str);
+        str.clear();
+        // There is at least one replacement, so reserve with the best guess
+        // we can make without actually counting the number of occurences.
+        str.reserve(origStr.size() - replaceThis.size() + withThis.size());
+        do {
+            str.append(origStr, copyBegin, i-copyBegin );
+            str += withThis;
+            copyBegin = i + replaceThis.size();
+            if( copyBegin < origStr.size() )
+                i = origStr.find( replaceThis, copyBegin );
+            else
+                i = std::string::npos;
+        } while( i != std::string::npos );
+        if ( copyBegin < origStr.size() ) {
+            str.append(origStr, copyBegin, origStr.size() );
+        }
+        return true;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+
+
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, std::strlen(rawChars) )
+    {}
+
+
+    bool StringRef::operator<(StringRef rhs) const noexcept {
+        if (m_size < rhs.m_size) {
+            return strncmp(m_start, rhs.m_start, m_size) <= 0;
+        }
+        return strncmp(m_start, rhs.m_start, rhs.m_size) < 0;
+    }
+
+    int StringRef::compare( StringRef rhs ) const {
+        auto cmpResult =
+            strncmp( m_start, rhs.m_start, std::min( m_size, rhs.m_size ) );
+
+        // This means that strncmp found a difference before the strings
+        // ended, and we can return it directly
+        if ( cmpResult != 0 ) {
+            return cmpResult;
+        }
+
+        // If strings are equal up to length, then their comparison results on
+        // their size
+        if ( m_size < rhs.m_size ) {
+            return -1;
+        } else if ( m_size > rhs.m_size ) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    auto operator << ( std::ostream& os, StringRef str ) -> std::ostream& {
+        return os.write(str.data(), static_cast<std::streamsize>(str.size()));
+    }
+
+    std::string operator+(StringRef lhs, StringRef rhs) {
+        std::string ret;
+        ret.reserve(lhs.size() + rhs.size());
+        ret += lhs;
+        ret += rhs;
+        return ret;
+    }
+
+    auto operator+=( std::string& lhs, StringRef rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+
+
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() = default;
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() = default;
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+    TestCaseInfoHasher::TestCaseInfoHasher( hash_t seed ): m_seed( seed ) {}
+
+    uint32_t TestCaseInfoHasher::operator()( TestCaseInfo const& t ) const {
+        // FNV-1a hash algorithm that is designed for uniqueness:
+        const hash_t prime = 1099511628211u;
+        hash_t hash = 14695981039346656037u;
+        for ( const char c : t.name ) {
+            hash ^= c;
+            hash *= prime;
+        }
+        for ( const char c : t.className ) {
+            hash ^= c;
+            hash *= prime;
+        }
+        for ( const Tag& tag : t.tags ) {
+            for ( const char c : tag.original ) {
+                hash ^= c;
+                hash *= prime;
+            }
+        }
+        hash ^= m_seed;
+        hash *= prime;
+        const uint32_t low{ static_cast<uint32_t>( hash ) };
+        const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+        return low * high;
+    }
+} // namespace Catch
+
+
+
+
+#include <algorithm>
+#include <set>
+
+namespace Catch {
+
+    namespace {
+        static void enforceNoDuplicateTestCases(
+            std::vector<TestCaseHandle> const& tests ) {
+            auto testInfoCmp = []( TestCaseInfo const* lhs,
+                                   TestCaseInfo const* rhs ) {
+                return *lhs < *rhs;
+            };
+            std::set<TestCaseInfo const*, decltype( testInfoCmp )&> seenTests(
+                testInfoCmp );
+            for ( auto const& test : tests ) {
+                const auto infoPtr = &test.getTestCaseInfo();
+                const auto prev = seenTests.insert( infoPtr );
+                CATCH_ENFORCE( prev.second,
+                               "error: test case \""
+                                   << infoPtr->name << "\", with tags \""
+                                   << infoPtr->tagsAsString()
+                                   << "\" already defined.\n"
+                                   << "\tFirst seen at "
+                                   << ( *prev.first )->lineInfo << "\n"
+                                   << "\tRedefined at " << infoPtr->lineInfo );
+            }
+        }
+
+        static bool matchTest( TestCaseHandle const& testCase,
+                               TestSpec const& testSpec,
+                               IConfig const& config ) {
+            return testSpec.matches( testCase.getTestCaseInfo() ) &&
+                   isThrowSafe( testCase, config );
+        }
+
+    } // end unnamed namespace
+
+    std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ) {
+        switch (config.runOrder()) {
+        case TestRunOrder::Declared:
+            return unsortedTestCases;
+
+        case TestRunOrder::LexicographicallySorted: {
+            std::vector<TestCaseHandle> sorted = unsortedTestCases;
+            std::sort(
+                sorted.begin(),
+                sorted.end(),
+                []( TestCaseHandle const& lhs, TestCaseHandle const& rhs ) {
+                    return lhs.getTestCaseInfo() < rhs.getTestCaseInfo();
+                }
+            );
+            return sorted;
+        }
+        case TestRunOrder::Randomized: {
+            using TestWithHash = std::pair<TestCaseInfoHasher::hash_t, TestCaseHandle>;
+
+            TestCaseInfoHasher h{ config.rngSeed() };
+            std::vector<TestWithHash> indexed_tests;
+            indexed_tests.reserve(unsortedTestCases.size());
+
+            for (auto const& handle : unsortedTestCases) {
+                indexed_tests.emplace_back(h(handle.getTestCaseInfo()), handle);
+            }
+
+            std::sort( indexed_tests.begin(),
+                       indexed_tests.end(),
+                       []( TestWithHash const& lhs, TestWithHash const& rhs ) {
+                           if ( lhs.first == rhs.first ) {
+                               return lhs.second.getTestCaseInfo() <
+                                      rhs.second.getTestCaseInfo();
+                           }
+                           return lhs.first < rhs.first;
+                       } );
+
+            std::vector<TestCaseHandle> randomized;
+            randomized.reserve(indexed_tests.size());
+
+            for (auto const& indexed : indexed_tests) {
+                randomized.push_back(indexed.second);
+            }
+
+            return randomized;
+        }
+        }
+
+        CATCH_INTERNAL_ERROR("Unknown test order value!");
+    }
+
+    bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config ) {
+        return !testCase.getTestCaseInfo().throws() || config.allowThrows();
+    }
+
+    std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCaseHandle> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.getTestCaseInfo().isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return createShard(filtered, config.shardCount(), config.shardIndex());
+    }
+    std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    TestRegistry::~TestRegistry() = default;
+
+    void TestRegistry::registerTest(Detail::unique_ptr<TestCaseInfo> testInfo, Detail::unique_ptr<ITestInvoker> testInvoker) {
+        m_handles.emplace_back(testInfo.get(), testInvoker.get());
+        m_viewed_test_infos.push_back(testInfo.get());
+        m_owned_test_infos.push_back(CATCH_MOVE(testInfo));
+        m_invokers.push_back(CATCH_MOVE(testInvoker));
+    }
+
+    std::vector<TestCaseInfo*> const& TestRegistry::getAllInfos() const {
+        return m_viewed_test_infos;
+    }
+
+    std::vector<TestCaseHandle> const& TestRegistry::getAllTests() const {
+        return m_handles;
+    }
+    std::vector<TestCaseHandle> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_handles );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_handles );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+} // end namespace Catch
+
+
+
+
+#include <algorithm>
+#include <cassert>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string&& _name, SourceLineInfo const& _location )
+    :   name( CATCH_MOVE(_name) ),
+        location( _location )
+    {}
+
+
+    ITracker::~ITracker() = default;
+
+    void ITracker::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void ITracker::addChild( ITrackerPtr&& child ) {
+        m_children.push_back( CATCH_MOVE(child) );
+    }
+
+    ITracker* ITracker::findChild( NameAndLocationRef const& nameAndLocation ) {
+        auto it = std::find_if(
+            m_children.begin(),
+            m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ) {
+                auto const& tnameAndLoc = tracker->nameAndLocation();
+                if ( tnameAndLoc.location.line !=
+                     nameAndLocation.location.line ) {
+                    return false;
+                }
+                return tnameAndLoc == nameAndLocation;
+            } );
+        return ( it != m_children.end() ) ? it->get() : nullptr;
+    }
+
+    bool ITracker::isSectionTracker() const { return false; }
+    bool ITracker::isGeneratorTracker() const { return false; }
+
+    bool ITracker::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+
+    bool ITracker::hasStarted() const { return m_runState != NotStarted; }
+
+    void ITracker::openChild() {
+        if (m_runState != ExecutingChildren) {
+            m_runState = ExecutingChildren;
+            if (m_parent) {
+                m_parent->openChild();
+            }
+        }
+    }
+
+    ITracker& TrackerContext::startRun() {
+        using namespace std::string_literals;
+        m_rootTracker = Catch::Detail::make_unique<SectionTracker>(
+            NameAndLocation( "{root}"s, CATCH_INTERNAL_LINEINFO ),
+            *this,
+            nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+
+    TrackerBase::TrackerBase( NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(CATCH_MOVE(nameAndLocation), parent),
+        m_ctx( ctx )
+    {}
+
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( CATCH_MOVE(nameAndLocation), ctx, parent ),
+        m_trimmed_name(trim(StringRef(ITracker::nameAndLocation().name)))
+    {
+        if( parent ) {
+            while ( !parent->isSectionTracker() ) {
+                parent = parent->parent();
+            }
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if (m_filters.empty()
+            || m_filters[0].empty()
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocationRef const& nameAndLocation ) {
+        SectionTracker* tracker;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if ( ITracker* childTracker =
+                 currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            tracker = static_cast<SectionTracker*>( childTracker );
+        } else {
+            auto newTracker = Catch::Detail::make_unique<SectionTracker>(
+                NameAndLocation{ static_cast<std::string>(nameAndLocation.name),
+                                 nameAndLocation.location },
+                ctx,
+                &currentTracker );
+            tracker = newTracker.get();
+            currentTracker.addChild( CATCH_MOVE( newTracker ) );
+        }
+
+        if ( !ctx.completedCycle() ) {
+            tracker->tryOpen();
+        }
+
+        return *tracker;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(StringRef{}); // Root - should never be consulted
+            m_filters.emplace_back(StringRef{}); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<StringRef> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+    StringRef SectionTracker::trimmedName() const {
+        return m_trimmed_name;
+    }
+
+} // namespace TestCaseTracking
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+
+
+
+namespace Catch {
+
+    void throw_test_failure_exception() {
+#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
+        throw TestFailureException{};
+#else
+        CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+    }
+
+    void throw_test_skip_exception() {
+#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
+        throw Catch::TestSkipException();
+#else
+        CATCH_ERROR( "Explicitly skipping tests during runtime requires exceptions" );
+#endif
+    }
+
+} // namespace Catch
+
+
+
+#include <algorithm>
+#include <iterator>
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+
+    namespace {
+        static StringRef extractClassName( StringRef classOrMethodName ) {
+            if ( !startsWith( classOrMethodName, '&' ) ) {
+                return classOrMethodName;
+            }
+
+            // Remove the leading '&' to avoid having to special case it later
+            const auto methodName =
+                classOrMethodName.substr( 1, classOrMethodName.size() );
+
+            auto reverseStart = std::make_reverse_iterator( methodName.end() );
+            auto reverseEnd = std::make_reverse_iterator( methodName.begin() );
+
+            // We make a simplifying assumption that ":" is only present
+            // in the input as part of "::" from C++ typenames (this is
+            // relatively safe assumption because the input is generated
+            // as stringification of type through preprocessor).
+            auto lastColons = std::find( reverseStart, reverseEnd, ':' ) + 1;
+            auto secondLastColons =
+                std::find( lastColons + 1, reverseEnd, ':' );
+
+            auto const startIdx = reverseEnd - secondLastColons;
+            auto const classNameSize = secondLastColons - lastColons - 1;
+
+            return methodName.substr(
+                static_cast<std::size_t>( startIdx ),
+                static_cast<std::size_t>( classNameSize ) );
+        }
+
+        class TestInvokerAsFunction final : public ITestInvoker {
+            using TestType = void ( * )();
+            TestType m_testAsFunction;
+
+        public:
+            TestInvokerAsFunction( TestType testAsFunction ) noexcept:
+                m_testAsFunction( testAsFunction ) {}
+
+            void invoke() const override { m_testAsFunction(); }
+        };
+
+    } // namespace
+
+    Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() ) {
+        return Detail::make_unique<TestInvokerAsFunction>( testAsFunction );
+    }
+
+    AutoReg::AutoReg( Detail::unique_ptr<ITestInvoker> invoker, SourceLineInfo const& lineInfo, StringRef classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCaseInfo(
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo),
+                        CATCH_MOVE(invoker)
+                    );
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+}
+
+
+
+
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidSpecs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return CATCH_MOVE(m_testSpec);
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_required.empty() || !m_currentFilter.m_forbidden.empty() ) {
+            m_testSpec.m_filters.push_back( CATCH_MOVE(m_currentFilter) );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+        m_realPatternPos = 0;
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            if (m_exclusion) {
+                m_currentFilter.m_forbidden.emplace_back(Detail::make_unique<TestSpec::NamePattern>(token, m_substring));
+            } else {
+                m_currentFilter.m_required.emplace_back(Detail::make_unique<TestSpec::NamePattern>(token, m_substring));
+            }
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                if (m_exclusion) {
+                    m_currentFilter.m_forbidden.emplace_back(Detail::make_unique<TestSpec::TagPattern>(".", m_substring));
+                } else {
+                    m_currentFilter.m_required.emplace_back(Detail::make_unique<TestSpec::TagPattern>(".", m_substring));
+                }
+            }
+            if (m_exclusion) {
+                m_currentFilter.m_forbidden.emplace_back(Detail::make_unique<TestSpec::TagPattern>(token, m_substring));
+            } else {
+                m_currentFilter.m_required.emplace_back(Detail::make_unique<TestSpec::TagPattern>(token, m_substring));
+            }
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+} // namespace Catch
+
+
+
+#include <algorithm>
+#include <cstring>
+#include <ostream>
+
+namespace {
+    bool isWhitespace( char c ) {
+        return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+    }
+
+    bool isBreakableBefore( char c ) {
+        static const char chars[] = "[({<|";
+        return std::memchr( chars, c, sizeof( chars ) - 1 ) != nullptr;
+    }
+
+    bool isBreakableAfter( char c ) {
+        static const char chars[] = "])}>.,:;*+-=&/\\";
+        return std::memchr( chars, c, sizeof( chars ) - 1 ) != nullptr;
+    }
+
+} // namespace
+
+namespace Catch {
+    namespace TextFlow {
+        void AnsiSkippingString::preprocessString() {
+            for ( auto it = m_string.begin(); it != m_string.end(); ) {
+                // try to read through an ansi sequence
+                while ( it != m_string.end() && *it == '\033' &&
+                        it + 1 != m_string.end() && *( it + 1 ) == '[' ) {
+                    auto cursor = it + 2;
+                    while ( cursor != m_string.end() &&
+                            ( isdigit( *cursor ) || *cursor == ';' ) ) {
+                        ++cursor;
+                    }
+                    if ( cursor == m_string.end() || *cursor != 'm' ) {
+                        break;
+                    }
+                    // 'm' -> 0xff
+                    *cursor = AnsiSkippingString::sentinel;
+                    // if we've read an ansi sequence, set the iterator and
+                    // return to the top of the loop
+                    it = cursor + 1;
+                }
+                if ( it != m_string.end() ) {
+                    ++m_size;
+                    ++it;
+                }
+            }
+        }
+
+        AnsiSkippingString::AnsiSkippingString( std::string const& text ):
+            m_string( text ) {
+            preprocessString();
+        }
+
+        AnsiSkippingString::AnsiSkippingString( std::string&& text ):
+            m_string( CATCH_MOVE( text ) ) {
+            preprocessString();
+        }
+
+        AnsiSkippingString::const_iterator AnsiSkippingString::begin() const {
+            return const_iterator( m_string );
+        }
+
+        AnsiSkippingString::const_iterator AnsiSkippingString::end() const {
+            return const_iterator( m_string, const_iterator::EndTag{} );
+        }
+
+        std::string AnsiSkippingString::substring( const_iterator begin,
+                                                   const_iterator end ) const {
+            // There's one caveat here to an otherwise simple substring: when
+            // making a begin iterator we might have skipped ansi sequences at
+            // the start. If `begin` here is a begin iterator, skipped over
+            // initial ansi sequences, we'll use the true beginning of the
+            // string. Lastly: We need to transform any chars we replaced with
+            // 0xff back to 'm'
+            auto str = std::string( begin == this->begin() ? m_string.begin()
+                                                           : begin.m_it,
+                                    end.m_it );
+            std::transform( str.begin(), str.end(), str.begin(), []( char c ) {
+                return c == AnsiSkippingString::sentinel ? 'm' : c;
+            } );
+            return str;
+        }
+
+        void AnsiSkippingString::const_iterator::tryParseAnsiEscapes() {
+            // check if we've landed on an ansi sequence, and if so read through
+            // it
+            while ( m_it != m_string->end() && *m_it == '\033' &&
+                    m_it + 1 != m_string->end() &&  *( m_it + 1 ) == '[' ) {
+                auto cursor = m_it + 2;
+                while ( cursor != m_string->end() &&
+                        ( isdigit( *cursor ) || *cursor == ';' ) ) {
+                    ++cursor;
+                }
+                if ( cursor == m_string->end() ||
+                     *cursor != AnsiSkippingString::sentinel ) {
+                    break;
+                }
+                // if we've read an ansi sequence, set the iterator and
+                // return to the top of the loop
+                m_it = cursor + 1;
+            }
+        }
+
+        void AnsiSkippingString::const_iterator::advance() {
+            assert( m_it != m_string->end() );
+            m_it++;
+            tryParseAnsiEscapes();
+        }
+
+        void AnsiSkippingString::const_iterator::unadvance() {
+            assert( m_it != m_string->begin() );
+            m_it--;
+            // if *m_it is 0xff, scan back to the \033 and then m_it-- once more
+            // (and repeat check)
+            while ( *m_it == AnsiSkippingString::sentinel ) {
+                while ( *m_it != '\033' ) {
+                    assert( m_it != m_string->begin() );
+                    m_it--;
+                }
+                // if this happens, we must have been a begin iterator that had
+                // skipped over ansi sequences at the start of a string
+                assert( m_it != m_string->begin() );
+                assert( *m_it == '\033' );
+                m_it--;
+            }
+        }
+
+        static bool isBoundary( AnsiSkippingString const& line,
+                                AnsiSkippingString::const_iterator it ) {
+            return it == line.end() ||
+                   ( isWhitespace( *it ) &&
+                     !isWhitespace( *it.oneBefore() ) ) ||
+                   isBreakableBefore( *it ) ||
+                   isBreakableAfter( *it.oneBefore() );
+        }
+
+        void Column::const_iterator::calcLength() {
+            m_addHyphen = false;
+            m_parsedTo = m_lineStart;
+            AnsiSkippingString const& current_line = m_column.m_string;
+
+            if ( m_parsedTo == current_line.end() ) {
+                m_lineEnd = m_parsedTo;
+                return;
+            }
+
+            assert( m_lineStart != current_line.end() );
+            if ( *m_lineStart == '\n' ) { ++m_parsedTo; }
+
+            const auto maxLineLength = m_column.m_width - indentSize();
+            std::size_t lineLength = 0;
+            while ( m_parsedTo != current_line.end() &&
+                    lineLength < maxLineLength && *m_parsedTo != '\n' ) {
+                ++m_parsedTo;
+                ++lineLength;
+            }
+
+            // If we encountered a newline before the column is filled,
+            // then we linebreak at the newline and consider this line
+            // finished.
+            if ( lineLength < maxLineLength ) {
+                m_lineEnd = m_parsedTo;
+            } else {
+                // Look for a natural linebreak boundary in the column
+                // (We look from the end, so that the first found boundary is
+                // the right one)
+                m_lineEnd = m_parsedTo;
+                while ( lineLength > 0 &&
+                        !isBoundary( current_line, m_lineEnd ) ) {
+                    --lineLength;
+                    --m_lineEnd;
+                }
+                while ( lineLength > 0 &&
+                        isWhitespace( *m_lineEnd.oneBefore() ) ) {
+                    --lineLength;
+                    --m_lineEnd;
+                }
+
+                // If we found one, then that is where we linebreak, otherwise
+                // we have to split text with a hyphen
+                if ( lineLength == 0 ) {
+                    m_addHyphen = true;
+                    m_lineEnd = m_parsedTo.oneBefore();
+                }
+            }
+        }
+
+        size_t Column::const_iterator::indentSize() const {
+            auto initial = m_lineStart == m_column.m_string.begin()
+                               ? m_column.m_initialIndent
+                               : std::string::npos;
+            return initial == std::string::npos ? m_column.m_indent : initial;
+        }
+
+        std::string Column::const_iterator::addIndentAndSuffix(
+            AnsiSkippingString::const_iterator start,
+            AnsiSkippingString::const_iterator end ) const {
+            std::string ret;
+            const auto desired_indent = indentSize();
+            // ret.reserve( desired_indent + (end - start) + m_addHyphen );
+            ret.append( desired_indent, ' ' );
+            // ret.append( start, end );
+            ret += m_column.m_string.substring( start, end );
+            if ( m_addHyphen ) { ret.push_back( '-' ); }
+
+            return ret;
+        }
+
+        Column::const_iterator::const_iterator( Column const& column ):
+            m_column( column ),
+            m_lineStart( column.m_string.begin() ),
+            m_lineEnd( column.m_string.begin() ),
+            m_parsedTo( column.m_string.begin() ) {
+            assert( m_column.m_width > m_column.m_indent );
+            assert( m_column.m_initialIndent == std::string::npos ||
+                    m_column.m_width > m_column.m_initialIndent );
+            calcLength();
+            if ( m_lineStart == m_lineEnd ) {
+                m_lineStart = m_column.m_string.end();
+            }
+        }
+
+        std::string Column::const_iterator::operator*() const {
+            assert( m_lineStart <= m_parsedTo );
+            return addIndentAndSuffix( m_lineStart, m_lineEnd );
+        }
+
+        Column::const_iterator& Column::const_iterator::operator++() {
+            m_lineStart = m_lineEnd;
+            AnsiSkippingString const& current_line = m_column.m_string;
+            if ( m_lineStart != current_line.end() && *m_lineStart == '\n' ) {
+                m_lineStart++;
+            } else {
+                while ( m_lineStart != current_line.end() &&
+                        isWhitespace( *m_lineStart ) ) {
+                    ++m_lineStart;
+                }
+            }
+
+            if ( m_lineStart != current_line.end() ) { calcLength(); }
+            return *this;
+        }
+
+        Column::const_iterator Column::const_iterator::operator++( int ) {
+            const_iterator prev( *this );
+            operator++();
+            return prev;
+        }
+
+        std::ostream& operator<<( std::ostream& os, Column const& col ) {
+            bool first = true;
+            for ( auto line : col ) {
+                if ( first ) {
+                    first = false;
+                } else {
+                    os << '\n';
+                }
+                os << line;
+            }
+            return os;
+        }
+
+        Column Spacer( size_t spaceWidth ) {
+            Column ret{ "" };
+            ret.width( spaceWidth );
+            return ret;
+        }
+
+        Columns::iterator::iterator( Columns const& columns, EndTag ):
+            m_columns( columns.m_columns ), m_activeIterators( 0 ) {
+
+            m_iterators.reserve( m_columns.size() );
+            for ( auto const& col : m_columns ) {
+                m_iterators.push_back( col.end() );
+            }
+        }
+
+        Columns::iterator::iterator( Columns const& columns ):
+            m_columns( columns.m_columns ),
+            m_activeIterators( m_columns.size() ) {
+
+            m_iterators.reserve( m_columns.size() );
+            for ( auto const& col : m_columns ) {
+                m_iterators.push_back( col.begin() );
+            }
+        }
+
+        std::string Columns::iterator::operator*() const {
+            std::string row, padding;
+
+            for ( size_t i = 0; i < m_columns.size(); ++i ) {
+                const auto width = m_columns[i].width();
+                if ( m_iterators[i] != m_columns[i].end() ) {
+                    std::string col = *m_iterators[i];
+                    row += padding;
+                    row += col;
+
+                    padding.clear();
+                    if ( col.size() < width ) {
+                        padding.append( width - col.size(), ' ' );
+                    }
+                } else {
+                    padding.append( width, ' ' );
+                }
+            }
+            return row;
+        }
+
+        Columns::iterator& Columns::iterator::operator++() {
+            for ( size_t i = 0; i < m_columns.size(); ++i ) {
+                if ( m_iterators[i] != m_columns[i].end() ) {
+                    ++m_iterators[i];
+                }
+            }
+            return *this;
+        }
+
+        Columns::iterator Columns::iterator::operator++( int ) {
+            iterator prev( *this );
+            operator++();
+            return prev;
+        }
+
+        std::ostream& operator<<( std::ostream& os, Columns const& cols ) {
+            bool first = true;
+            for ( auto line : cols ) {
+                if ( first ) {
+                    first = false;
+                } else {
+                    os << '\n';
+                }
+                os << line;
+            }
+            return os;
+        }
+
+        Columns operator+( Column const& lhs, Column const& rhs ) {
+            Columns cols;
+            cols += lhs;
+            cols += rhs;
+            return cols;
+        }
+        Columns operator+( Column&& lhs, Column&& rhs ) {
+            Columns cols;
+            cols += CATCH_MOVE( lhs );
+            cols += CATCH_MOVE( rhs );
+            return cols;
+        }
+
+        Columns& operator+=( Columns& lhs, Column const& rhs ) {
+            lhs.m_columns.push_back( rhs );
+            return lhs;
+        }
+        Columns& operator+=( Columns& lhs, Column&& rhs ) {
+            lhs.m_columns.push_back( CATCH_MOVE( rhs ) );
+            return lhs;
+        }
+        Columns operator+( Columns const& lhs, Column const& rhs ) {
+            auto combined( lhs );
+            combined += rhs;
+            return combined;
+        }
+        Columns operator+( Columns&& lhs, Column&& rhs ) {
+            lhs += CATCH_MOVE( rhs );
+            return CATCH_MOVE( lhs );
+        }
+
+    } // namespace TextFlow
+} // namespace Catch
+
+
+
+
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+
+
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+
+
+// Note: swapping these two includes around causes MSVC to error out
+//       while in /permissive- mode. No, I don't know why.
+//       Tested on VS 2019, 18.{3, 4}.x
+
+#include <cstdint>
+#include <iomanip>
+#include <type_traits>
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type_t<XmlFormatting>>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type_t<XmlFormatting>>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type_t<XmlFormatting>>(lhs) |
+            static_cast<std::underlying_type_t<XmlFormatting>>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type_t<XmlFormatting>>(lhs) &
+            static_cast<std::underlying_type_t<XmlFormatting>>(rhs)
+        );
+    }
+
+
+    XmlEncode::XmlEncode( StringRef str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            unsigned char c = static_cast<unsigned char>(m_str[idx]);
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    unsigned char nc = static_cast<unsigned char>(m_str[idx + n]);
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement&
+    XmlWriter::ScopedElement::writeText( StringRef text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::ScopedElement&
+    XmlWriter::ScopedElement::writeAttribute( StringRef name,
+                                              StringRef attribute ) {
+        m_writer->writeAttribute( name, attribute );
+        return *this;
+    }
+
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << '>';
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( StringRef name,
+                                          StringRef attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( StringRef name, bool attribute ) {
+        writeAttribute(name, (attribute ? "true"_sr : "false"_sr));
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( StringRef name,
+                                          char const* attribute ) {
+        writeAttribute( name, StringRef( attribute ) );
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( StringRef text, XmlFormatting fmt ) {
+        CATCH_ENFORCE(!m_tags.empty(), "Cannot write text as top level element");
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text, XmlEncode::ForTextNodes );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( StringRef text, XmlFormatting fmt ) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!-- " << text << " -->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( StringRef url ) {
+        m_os << R"(<?xml-stylesheet type="text/xsl" href=")" << url << R"("?>)" << '\n';
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << R"(<?xml version="1.0" encoding="UTF-8"?>)" << '\n';
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << '\n' << std::flush;
+            m_needsNewline = false;
+        }
+    }
+}
+
+
+
+
+
+namespace Catch {
+namespace Matchers {
+
+    std::string MatcherUntypedBase::toString() const {
+        if (m_cachedToString.empty()) {
+            m_cachedToString = describe();
+        }
+        return m_cachedToString;
+    }
+
+    MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+} // namespace Matchers
+} // namespace Catch
+
+
+
+
+namespace Catch {
+namespace Matchers {
+
+    std::string IsEmptyMatcher::describe() const {
+        return "is empty";
+    }
+
+    std::string HasSizeMatcher::describe() const {
+        ReusableStringStream sstr;
+        sstr << "has size == " << m_target_size;
+        return sstr.str();
+    }
+
+    IsEmptyMatcher IsEmpty() {
+        return {};
+    }
+
+    HasSizeMatcher SizeIs(std::size_t sz) {
+        return HasSizeMatcher{ sz };
+    }
+
+} // end namespace Matchers
+} // end namespace Catch
+
+
+
+namespace Catch {
+namespace Matchers {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + '"';
+}
+
+ExceptionMessageMatcher Message(std::string const& message) {
+    return ExceptionMessageMatcher(message);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+
+
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <sstream>
+#include <iomanip>
+#include <limits>
+
+
+namespace Catch {
+namespace {
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        // This should also handle positive and negative zeros, infinities
+        const auto ulpDist = ulpDistance(lhs, rhs);
+
+        return ulpDist <= maxUlpDiff;
+    }
+
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+        start = Catch::nextafter(start, direction);
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Detail {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+} // end namespace Detail
+
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, Detail::FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == Detail::FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+        CATCH_ENFORCE( std::numeric_limits<double>::is_iec559,
+                       "WithinUlp matcher only supports platforms with "
+                       "IEEE-754 compatible floating point representation" );
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case Detail::FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case Detail::FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown Detail::FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == Detail::FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == Detail::FloatingPointKind::Double) {
+            write( ret,
+                   step( m_target,
+                         -std::numeric_limits<double>::infinity(),
+                         m_ulps ) );
+            ret << ", ";
+            write( ret,
+                   step( m_target,
+                         std::numeric_limits<double>::infinity(),
+                         m_ulps ) );
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write( ret,
+                   step( static_cast<float>( m_target ),
+                         -std::numeric_limits<float>::infinity(),
+                         m_ulps ) );
+            ret << ", ";
+            write( ret,
+                   step( static_cast<float>( m_target ),
+                         std::numeric_limits<float>::infinity(),
+                         m_ulps ) );
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << ::Catch::Detail::stringify(m_target) << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+
+WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return WithinUlpsMatcher(target, maxUlpDiff, Detail::FloatingPointKind::Double);
+}
+
+WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return WithinUlpsMatcher(target, maxUlpDiff, Detail::FloatingPointKind::Float);
+}
+
+WithinAbsMatcher WithinAbs(double target, double margin) {
+    return WithinAbsMatcher(target, margin);
+}
+
+WithinRelMatcher WithinRel(double target, double eps) {
+    return WithinRelMatcher(target, eps);
+}
+
+WithinRelMatcher WithinRel(double target) {
+    return WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+WithinRelMatcher WithinRel(float target, float eps) {
+    return WithinRelMatcher(target, eps);
+}
+
+WithinRelMatcher WithinRel(float target) {
+    return WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+
+
+bool IsNaNMatcher::match( double const& matchee ) const {
+    return std::isnan( matchee );
+}
+
+std::string IsNaNMatcher::describe() const {
+    using namespace std::string_literals;
+    return "is NaN"s;
+}
+
+IsNaNMatcher IsNaN() { return IsNaNMatcher(); }
+
+    } // namespace Matchers
+} // namespace Catch
+
+
+
+
+std::string Catch::Matchers::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+
+
+
+namespace Catch {
+    namespace Matchers {
+        std::string AllTrueMatcher::describe() const { return "contains only true"; }
+
+        AllTrueMatcher AllTrue() { return AllTrueMatcher{}; }
+
+        std::string NoneTrueMatcher::describe() const { return "contains no true"; }
+
+        NoneTrueMatcher NoneTrue() { return NoneTrueMatcher{}; }
+
+        std::string AnyTrueMatcher::describe() const { return "contains at least one true"; }
+
+        AnyTrueMatcher AnyTrue() { return AnyTrueMatcher{}; }
+    } // namespace Matchers
+} // namespace Catch
+
+
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    CasedString::CasedString( std::string const& str, CaseSensitive caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_str( adjustString( str ) )
+    {}
+    std::string CasedString::adjustString( std::string const& str ) const {
+        return m_caseSensitivity == CaseSensitive::No
+               ? toLower( str )
+               : str;
+    }
+    StringRef CasedString::caseSensitivitySuffix() const {
+        return m_caseSensitivity == CaseSensitive::Yes
+                   ? StringRef()
+                   : " (case insensitive)"_sr;
+    }
+
+
+    StringMatcherBase::StringMatcherBase( StringRef operation, CasedString const& comparator )
+    : m_comparator( comparator ),
+      m_operation( operation ) {
+    }
+
+    std::string StringMatcherBase::describe() const {
+        std::string description;
+        description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                    m_comparator.caseSensitivitySuffix().size());
+        description += m_operation;
+        description += ": \"";
+        description += m_comparator.m_str;
+        description += '"';
+        description += m_comparator.caseSensitivitySuffix();
+        return description;
+    }
+
+    StringEqualsMatcher::StringEqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals"_sr, comparator ) {}
+
+    bool StringEqualsMatcher::match( std::string const& source ) const {
+        return m_comparator.adjustString( source ) == m_comparator.m_str;
+    }
+
+
+    StringContainsMatcher::StringContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains"_sr, comparator ) {}
+
+    bool StringContainsMatcher::match( std::string const& source ) const {
+        return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+    }
+
+
+    StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with"_sr, comparator ) {}
+
+    bool StartsWithMatcher::match( std::string const& source ) const {
+        return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+    }
+
+
+    EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with"_sr, comparator ) {}
+
+    bool EndsWithMatcher::match( std::string const& source ) const {
+        return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+    }
+
+
+
+    RegexMatcher::RegexMatcher(std::string regex, CaseSensitive caseSensitivity): m_regex(CATCH_MOVE(regex)), m_caseSensitivity(caseSensitivity) {}
+
+    bool RegexMatcher::match(std::string const& matchee) const {
+        auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+        if (m_caseSensitivity == CaseSensitive::No) {
+            flags |= std::regex::icase;
+        }
+        auto reg = std::regex(m_regex, flags);
+        return std::regex_match(matchee, reg);
+    }
+
+    std::string RegexMatcher::describe() const {
+        return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Yes)? " case sensitively" : " case insensitively");
+    }
+
+
+    StringEqualsMatcher Equals( std::string const& str, CaseSensitive caseSensitivity ) {
+        return StringEqualsMatcher( CasedString( str, caseSensitivity) );
+    }
+    StringContainsMatcher ContainsSubstring( std::string const& str, CaseSensitive caseSensitivity ) {
+        return StringContainsMatcher( CasedString( str, caseSensitivity) );
+    }
+    EndsWithMatcher EndsWith( std::string const& str, CaseSensitive caseSensitivity ) {
+        return EndsWithMatcher( CasedString( str, caseSensitivity) );
+    }
+    StartsWithMatcher StartsWith( std::string const& str, CaseSensitive caseSensitivity ) {
+        return StartsWithMatcher( CasedString( str, caseSensitivity) );
+    }
+
+    RegexMatcher Matches(std::string const& regex, CaseSensitive caseSensitivity) {
+        return RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+
+
+namespace Catch {
+namespace Matchers {
+    MatcherGenericBase::~MatcherGenericBase() = default;
+
+    namespace Detail {
+
+        std::string describe_multi_matcher(StringRef combine, std::string const* descriptions_begin, std::string const* descriptions_end) {
+            std::string description;
+            std::size_t combined_size = 4;
+            for ( auto desc = descriptions_begin; desc != descriptions_end; ++desc ) {
+                combined_size += desc->size();
+            }
+            combined_size += static_cast<size_t>(descriptions_end - descriptions_begin - 1) * combine.size();
+
+            description.reserve(combined_size);
+
+            description += "( ";
+            bool first = true;
+            for( auto desc = descriptions_begin; desc != descriptions_end; ++desc ) {
+                if( first )
+                    first = false;
+                else
+                    description += combine;
+                description += *desc;
+            }
+            description += " )";
+            return description;
+        }
+
+    } // namespace Detail
+} // namespace Matchers
+} // namespace Catch
+
+
+
+
+namespace Catch {
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( CATCH_MOVE(exceptionMessage), matcher );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+
+
+
+#include <ostream>
+
+namespace Catch {
+
+    AutomakeReporter::~AutomakeReporter() = default;
+
+    void AutomakeReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+        // Possible values to emit are PASS, XFAIL, SKIP, FAIL, XPASS and ERROR.
+        m_stream << ":test-result: ";
+        if ( _testCaseStats.totals.testCases.skipped > 0 ) {
+            m_stream << "SKIP";
+        } else if (_testCaseStats.totals.assertions.allPassed()) {
+            m_stream << "PASS";
+        } else if (_testCaseStats.totals.assertions.allOk()) {
+            m_stream << "XFAIL";
+        } else {
+            m_stream << "FAIL";
+        }
+        m_stream << ' ' << _testCaseStats.testInfo->name << '\n';
+        StreamingReporterBase::testCaseEnded(_testCaseStats);
+    }
+
+    void AutomakeReporter::skipTest(TestCaseInfo const& testInfo) {
+        m_stream << ":test-result: SKIP " << testInfo.name << '\n';
+    }
+
+} // end namespace Catch
+
+
+
+
+
+
+namespace Catch {
+    ReporterBase::ReporterBase( ReporterConfig&& config ):
+        IEventListener( config.fullConfig() ),
+        m_wrapped_stream( CATCH_MOVE(config).takeStream() ),
+        m_stream( m_wrapped_stream->stream() ),
+        m_colour( makeColourImpl( config.colourMode(), m_wrapped_stream.get() ) ),
+        m_customOptions( config.customOptions() )
+    {}
+
+    ReporterBase::~ReporterBase() = default;
+
+    void ReporterBase::listReporters(
+        std::vector<ReporterDescription> const& descriptions ) {
+        defaultListReporters(m_stream, descriptions, m_config->verbosity());
+    }
+
+    void ReporterBase::listListeners(
+        std::vector<ListenerDescription> const& descriptions ) {
+        defaultListListeners( m_stream, descriptions );
+    }
+
+    void ReporterBase::listTests(std::vector<TestCaseHandle> const& tests) {
+        defaultListTests(m_stream,
+                         m_colour.get(),
+                         tests,
+                         m_config->hasTestFilters(),
+                         m_config->verbosity());
+    }
+
+    void ReporterBase::listTags(std::vector<TagInfo> const& tags) {
+        defaultListTags( m_stream, tags, m_config->hasTestFilters() );
+    }
+
+} // namespace Catch
+
+
+
+
+#include <ostream>
+
+namespace Catch {
+namespace {
+
+    // Colour::LightGrey
+    static constexpr Colour::Code compactDimColour = Colour::FileName;
+
+#ifdef CATCH_PLATFORM_MAC
+    static constexpr Catch::StringRef compactFailedString = "FAILED"_sr;
+    static constexpr Catch::StringRef compactPassedString = "PASSED"_sr;
+#else
+    static constexpr Catch::StringRef compactFailedString = "failed"_sr;
+    static constexpr Catch::StringRef compactPassedString = "passed"_sr;
+#endif
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages, ColourImpl* colourImpl_)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages)
+        , colourImpl(colourImpl_)
+    {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, compactPassedString);
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, compactFailedString + " - but was ok"_sr);
+            else
+                printResultType(Colour::Error, compactFailedString);
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, compactFailedString);
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, compactFailedString);
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, compactFailedString);
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info"_sr);
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning"_sr);
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, compactFailedString);
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+        case ResultWas::ExplicitSkip:
+            printResultType(Colour::Skip, "skipped"_sr);
+            printMessage();
+            printRemainingMessages();
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        stream << colourImpl->guardColour( Colour::FileName )
+               << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, StringRef passOrFail) const {
+        if (!passOrFail.empty()) {
+            stream << colourImpl->guardColour(colour) << ' ' << passOrFail;
+            stream << ':';
+        }
+    }
+
+    void printIssue(char const* issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                stream << colourImpl->guardColour(compactDimColour) << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << colourImpl->guardColour(compactDimColour) << " for: ";
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = compactDimColour) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(itEnd - itMessage);
+
+        stream << colourImpl->guardColour( colour ) << " with "
+               << pluralise( N, "message"_sr ) << ':';
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    stream << colourImpl->guardColour(compactDimColour) << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> const& messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+    ColourImpl* colourImpl;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        void CompactReporter::noMatchingTestCases( StringRef unmatchedSpec ) {
+            m_stream << "No test cases matched '" << unmatchedSpec << "'\n";
+        }
+
+        void CompactReporter::testRunStarting( TestRunInfo const& ) {
+            if ( m_config->testSpec().hasFilters() ) {
+                m_stream << m_colour->guardColour( Colour::BrightYellow )
+                         << "Filters: "
+                         << m_config->testSpec()
+                         << '\n';
+            }
+            m_stream << "RNG seed: " << getSeed() << '\n';
+        }
+
+        void CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning && result.getResultType() != ResultWas::ExplicitSkip )
+                    return;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( m_stream, _assertionStats, printInfoMessages, m_colour.get() );
+            printer.print();
+
+            m_stream << '\n' << std::flush;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            double dur = _sectionStats.durationInSeconds;
+            if ( shouldShowDuration( *m_config, dur ) ) {
+                m_stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << '\n' << std::flush;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTestRunTotals( m_stream, *m_colour, _testRunStats.totals );
+            m_stream << "\n\n" << std::flush;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() = default;
+
+} // end namespace Catch
+
+
+
+
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, ColourImpl* colourImpl_, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        messages(_stats.infoMessages),
+        colourImpl(colourImpl_),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED"_sr;
+            //if( result.hasMessage() )
+            if (messages.size() == 1)
+                messageLabel = "with message"_sr;
+            if (messages.size() > 1)
+                messageLabel = "with messages"_sr;
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok"_sr;
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED"_sr;
+            }
+            if (messages.size() == 1)
+                messageLabel = "with message"_sr;
+            if (messages.size() > 1)
+                messageLabel = "with messages"_sr;
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED"_sr;
+            // todo switch
+            switch (messages.size()) { case 0:
+                messageLabel = "due to unexpected exception with "_sr;
+                break;
+            case 1:
+                messageLabel = "due to unexpected exception with message"_sr;
+                break;
+            default:
+                messageLabel = "due to unexpected exception with messages"_sr;
+                break;
+            }
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED"_sr;
+            messageLabel = "due to a fatal error condition"_sr;
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED"_sr;
+            messageLabel = "because no exception was thrown where one was expected"_sr;
+            break;
+        case ResultWas::Info:
+            messageLabel = "info"_sr;
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning"_sr;
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED"_sr;
+            colour = Colour::Error;
+            if (messages.size() == 1)
+                messageLabel = "explicitly with message"_sr;
+            if (messages.size() > 1)
+                messageLabel = "explicitly with messages"_sr;
+            break;
+        case ResultWas::ExplicitSkip:
+            colour = Colour::Skip;
+            passOrFail = "SKIPPED"_sr;
+            if (messages.size() == 1)
+                messageLabel = "explicitly with message"_sr;
+            if (messages.size() > 1)
+                messageLabel = "explicitly with messages"_sr;
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **"_sr;
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            stream << colourImpl->guardColour(colour) << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << colourImpl->guardColour( Colour::OriginalExpression )
+                   << "  " << result.getExpressionInMacro() << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            stream << colourImpl->guardColour( Colour::ReconstructedExpression )
+                   << TextFlow::Column( result.getExpandedExpression() )
+                          .indent( 2 )
+                   << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << TextFlow::Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        stream << colourImpl->guardColour( Colour::FileName )
+               << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    StringRef passOrFail;
+    StringRef messageLabel;
+    std::vector<MessageInfo> const& messages;
+    ColourImpl* colourImpl;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio( std::uint64_t number, std::uint64_t total ) {
+    const auto ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : static_cast<std::size_t>(ratio);
+}
+
+std::size_t&
+findMax( std::size_t& i, std::size_t& j, std::size_t& k, std::size_t& l ) {
+    if (i > j && i > k && i > l)
+        return i;
+    else if (j > k && j > l)
+        return j;
+    else if (k > l)
+        return k;
+    else
+        return l;
+}
+
+struct ColumnBreak {};
+struct RowBreak {};
+struct OutputFlush {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    double m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(double inNanoseconds, Unit units = Unit::Microseconds)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return m_inNanoseconds;
+        }
+    }
+    StringRef unitsAsString() const {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns"_sr;
+        case Unit::Microseconds:
+            return "us"_sr;
+        case Unit::Milliseconds:
+            return "ms"_sr;
+        case Unit::Seconds:
+            return "s"_sr;
+        case Unit::Minutes:
+            return "m"_sr;
+        default:
+            return "** internal error **"_sr;
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << std::fixed << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+enum class Justification { Left, Right };
+
+struct ColumnInfo {
+    std::string name;
+    std::size_t width;
+    Justification justification;
+};
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    ReusableStringStream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( CATCH_MOVE( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			TextFlow::Columns headerCols;
+			for (auto const& info : m_columnInfos) {
+                assert(info.width > 2);
+				headerCols += TextFlow::Column(info.name).width(info.width - 2);
+                headerCols += TextFlow::Spacer( 2 );
+			}
+			m_os << headerCols << '\n';
+
+            m_os << lineOfChars('-') << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << '\n' << std::flush;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator<< (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator<< (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < colInfo.width)
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == Justification::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator<< (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+
+    friend TablePrinter& operator<<(TablePrinter& tp, OutputFlush) {
+        tp.m_os << std::flush;
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig&& config):
+    StreamingReporterBase( CATCH_MOVE( config ) ),
+    m_tablePrinter(Detail::make_unique<TablePrinter>(m_stream,
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, Justification::Left },
+                { "     samples", 14, Justification::Right },
+                { "  iterations", 14, Justification::Right },
+                { "        mean", 14, Justification::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, Justification::Left },
+                { "samples      mean       std dev", 14, Justification::Right },
+                { "iterations   low mean   low std dev", 14, Justification::Right },
+                { "est run time high mean  high std dev", 14, Justification::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases( StringRef unmatchedSpec ) {
+    m_stream << "No test cases matched '" << unmatchedSpec << "'\n";
+}
+
+void ConsoleReporter::reportInvalidTestSpec( StringRef arg ) {
+    m_stream << "Invalid Filter: " << arg << '\n';
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+void ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    // TODO: Make configurable whether skips should be printed
+    if (!includeResults && result.getResultType() != ResultWas::Warning && result.getResultType() != ResultWas::ExplicitSkip)
+        return;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(m_stream, _assertionStats, m_colour.get(), includeResults);
+    printer.print();
+    m_stream << '\n' << std::flush;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        auto guard =
+            m_colour->guardColour( Colour::ResultError ).engage( m_stream );
+        if (m_sectionStack.size() > 1)
+            m_stream << "\nNo assertions in section";
+        else
+            m_stream << "\nNo assertions in test case";
+        m_stream << " '" << _sectionStats.sectionInfo.name << "'\n\n" << std::flush;
+    }
+    double dur = _sectionStats.durationInSeconds;
+    if (shouldShowDuration(*m_config, dur)) {
+        m_stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << '\n' << std::flush;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+void ConsoleReporter::benchmarkPreparing( StringRef name ) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = TextFlow::Column( static_cast<std::string>( name ) )
+                       .width( m_tablePrinter->columnInfos()[0].width - 2 );
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if ( !m_config->benchmarkNoAnalysis() ) {
+        ( *m_tablePrinter )
+            << Duration( info.estimatedDuration ) << ColumnBreak();
+    }
+    ( *m_tablePrinter ) << OutputFlush{};
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed( StringRef error ) {
+    auto guard = m_colour->guardColour( Colour::Red ).engage( m_stream );
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTestRunTotals( m_stream, *m_colour, _testRunStats.totals );
+    m_stream << '\n' << std::flush;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testRunInfo) {
+    StreamingReporterBase::testRunStarting(_testRunInfo);
+    if ( m_config->testSpec().hasFilters() ) {
+        m_stream << m_colour->guardColour( Colour::BrightYellow ) << "Filters: "
+                 << m_config->testSpec() << '\n';
+    }
+    m_stream << "Randomness seeded to: " << getSeed() << '\n';
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if ( !m_testRunInfoPrinted ) {
+        lazyPrintRunInfo();
+    }
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    m_stream << '\n'
+             << lineOfChars( '~' ) << '\n'
+             << m_colour->guardColour( Colour::SecondaryText )
+             << currentTestRunInfo.name << " is a Catch2 v" << libraryVersion()
+             << " host application.\n"
+             << "Run with -? for options\n\n";
+
+    m_testRunInfoPrinted = true;
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        auto guard = m_colour->guardColour( Colour::Headers ).engage( m_stream );
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+
+    m_stream << lineOfChars( '-' ) << '\n'
+             << m_colour->guardColour( Colour::FileName ) << lineInfo << '\n'
+             << lineOfChars( '.' ) << "\n\n"
+             << std::flush;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    m_stream << lineOfChars('.') << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    m_stream << lineOfChars('-') << '\n';
+    {
+        auto guard = m_colour->guardColour( Colour::Headers ).engage( m_stream );
+        printHeaderString(_name);
+    }
+}
+
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    // We want to get a bit fancy with line breaking here, so that subsequent
+    // lines start after ":" if one is present, e.g.
+    // ```
+    // blablabla: Fancy
+    //            linebreaking
+    // ```
+    // but we also want to avoid problems with overly long indentation causing
+    // the text to take up too many lines, e.g.
+    // ```
+    // blablabla: F
+    //            a
+    //            n
+    //            c
+    //            y
+    //            .
+    //            .
+    //            .
+    // ```
+    // So we limit the prefix indentation check to first quarter of the possible
+    // width
+    std::size_t idx = _string.find( ": " );
+    if ( idx != std::string::npos && idx < CATCH_CONFIG_CONSOLE_WIDTH / 4 ) {
+        idx += 2;
+    } else {
+        idx = 0;
+    }
+    m_stream << TextFlow::Column( _string )
+                  .indent( indent + idx )
+                  .initialIndent( indent )
+           << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        std::size_t skippedRatio = makeRatio(totals.testCases.skipped, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio + skippedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio, skippedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio, skippedRatio)--;
+
+        m_stream << m_colour->guardColour( Colour::Error )
+                 << std::string( failedRatio, '=' )
+                 << m_colour->guardColour( Colour::ResultExpectedFailure )
+                 << std::string( failedButOkRatio, '=' );
+        if ( totals.testCases.allPassed() ) {
+            m_stream << m_colour->guardColour( Colour::ResultSuccess )
+                     << std::string( passedRatio, '=' );
+        } else {
+            m_stream << m_colour->guardColour( Colour::Success )
+                     << std::string( passedRatio, '=' );
+        }
+        m_stream << m_colour->guardColour( Colour::Skip )
+                 << std::string( skippedRatio, '=' );
+    } else {
+        m_stream << m_colour->guardColour( Colour::Warning )
+                 << std::string( CATCH_CONFIG_CONSOLE_WIDTH - 1, '=' );
+    }
+    m_stream << '\n';
+}
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+
+
+
+
+#include <algorithm>
+#include <cassert>
+
+namespace Catch {
+    namespace {
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ): m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) = default;
+            bool operator()(
+                Detail::unique_ptr<CumulativeReporterBase::SectionNode> const&
+                    node ) const {
+                return (
+                    ( node->stats.sectionInfo.name == m_other.name ) &&
+                    ( node->stats.sectionInfo.lineInfo == m_other.lineInfo ) );
+            }
+            void operator=( BySectionInfo const& ) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+    } // namespace
+
+    namespace Detail {
+        AssertionOrBenchmarkResult::AssertionOrBenchmarkResult(
+            AssertionStats const& assertion ):
+            m_assertion( assertion ) {}
+
+        AssertionOrBenchmarkResult::AssertionOrBenchmarkResult(
+            BenchmarkStats<> const& benchmark ):
+            m_benchmark( benchmark ) {}
+
+        bool AssertionOrBenchmarkResult::isAssertion() const {
+            return m_assertion.some();
+        }
+        bool AssertionOrBenchmarkResult::isBenchmark() const {
+            return m_benchmark.some();
+        }
+
+        AssertionStats const& AssertionOrBenchmarkResult::asAssertion() const {
+            assert(m_assertion.some());
+
+            return *m_assertion;
+        }
+        BenchmarkStats<> const& AssertionOrBenchmarkResult::asBenchmark() const {
+            assert(m_benchmark.some());
+
+            return *m_benchmark;
+        }
+
+    }
+
+    CumulativeReporterBase::~CumulativeReporterBase() = default;
+
+    void CumulativeReporterBase::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_sectionStack.back()->assertionsAndBenchmarks.emplace_back(benchmarkStats);
+    }
+
+    void
+    CumulativeReporterBase::sectionStarting( SectionInfo const& sectionInfo ) {
+        // We need a copy, because SectionStats expect to take ownership
+        SectionStats incompleteStats( SectionInfo(sectionInfo), Counts(), 0, false );
+        SectionNode* node;
+        if ( m_sectionStack.empty() ) {
+            if ( !m_rootSection ) {
+                m_rootSection =
+                    Detail::make_unique<SectionNode>( incompleteStats );
+            }
+            node = m_rootSection.get();
+        } else {
+            SectionNode& parentNode = *m_sectionStack.back();
+            auto it = std::find_if( parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+            if ( it == parentNode.childSections.end() ) {
+                auto newNode =
+                    Detail::make_unique<SectionNode>( incompleteStats );
+                node = newNode.get();
+                parentNode.childSections.push_back( CATCH_MOVE( newNode ) );
+            } else {
+                node = it->get();
+            }
+        }
+
+        m_deepestSection = node;
+        m_sectionStack.push_back( node );
+    }
+
+    void CumulativeReporterBase::assertionEnded(
+        AssertionStats const& assertionStats ) {
+        assert( !m_sectionStack.empty() );
+        // AssertionResult holds a pointer to a temporary DecomposedExpression,
+        // which getExpandedExpression() calls to build the expression string.
+        // Our section stack copy of the assertionResult will likely outlive the
+        // temporary, so it must be expanded or discarded now to avoid calling
+        // a destroyed object later.
+        if ( m_shouldStoreFailedAssertions &&
+             !assertionStats.assertionResult.isOk() ) {
+            static_cast<void>(
+                assertionStats.assertionResult.getExpandedExpression() );
+        }
+        if ( m_shouldStoreSuccesfulAssertions &&
+             assertionStats.assertionResult.isOk() ) {
+            static_cast<void>(
+                assertionStats.assertionResult.getExpandedExpression() );
+        }
+        SectionNode& sectionNode = *m_sectionStack.back();
+        sectionNode.assertionsAndBenchmarks.emplace_back( assertionStats );
+    }
+
+    void CumulativeReporterBase::sectionEnded( SectionStats const& sectionStats ) {
+        assert( !m_sectionStack.empty() );
+        SectionNode& node = *m_sectionStack.back();
+        node.stats = sectionStats;
+        m_sectionStack.pop_back();
+    }
+
+    void CumulativeReporterBase::testCaseEnded(
+        TestCaseStats const& testCaseStats ) {
+        auto node = Detail::make_unique<TestCaseNode>( testCaseStats );
+        assert( m_sectionStack.size() == 0 );
+        node->children.push_back( CATCH_MOVE(m_rootSection) );
+        m_testCases.push_back( CATCH_MOVE(node) );
+
+        assert( m_deepestSection );
+        m_deepestSection->stdOut = testCaseStats.stdOut;
+        m_deepestSection->stdErr = testCaseStats.stdErr;
+    }
+
+
+    void CumulativeReporterBase::testRunEnded( TestRunStats const& testRunStats ) {
+        assert(!m_testRun && "CumulativeReporterBase assumes there can only be one test run");
+        m_testRun = Detail::make_unique<TestRunNode>( testRunStats );
+        m_testRun->children.swap( m_testCases );
+        testRunEndedCumulative();
+    }
+
+    bool CumulativeReporterBase::SectionNode::hasAnyAssertions() const {
+        return std::any_of(
+            assertionsAndBenchmarks.begin(),
+            assertionsAndBenchmarks.end(),
+            []( Detail::AssertionOrBenchmarkResult const& res ) {
+                return res.isAssertion();
+            } );
+    }
+
+} // end namespace Catch
+
+
+
+
+namespace Catch {
+
+    void EventListenerBase::fatalErrorEncountered( StringRef ) {}
+
+    void EventListenerBase::benchmarkPreparing( StringRef ) {}
+    void EventListenerBase::benchmarkStarting( BenchmarkInfo const& ) {}
+    void EventListenerBase::benchmarkEnded( BenchmarkStats<> const& ) {}
+    void EventListenerBase::benchmarkFailed( StringRef ) {}
+
+    void EventListenerBase::assertionStarting( AssertionInfo const& ) {}
+
+    void EventListenerBase::assertionEnded( AssertionStats const& ) {}
+    void EventListenerBase::listReporters(
+        std::vector<ReporterDescription> const& ) {}
+    void EventListenerBase::listListeners(
+        std::vector<ListenerDescription> const& ) {}
+    void EventListenerBase::listTests( std::vector<TestCaseHandle> const& ) {}
+    void EventListenerBase::listTags( std::vector<TagInfo> const& ) {}
+    void EventListenerBase::noMatchingTestCases( StringRef ) {}
+    void EventListenerBase::reportInvalidTestSpec( StringRef ) {}
+    void EventListenerBase::testRunStarting( TestRunInfo const& ) {}
+    void EventListenerBase::testCaseStarting( TestCaseInfo const& ) {}
+    void EventListenerBase::testCasePartialStarting(TestCaseInfo const&, uint64_t) {}
+    void EventListenerBase::sectionStarting( SectionInfo const& ) {}
+    void EventListenerBase::sectionEnded( SectionStats const& ) {}
+    void EventListenerBase::testCasePartialEnded(TestCaseStats const&, uint64_t) {}
+    void EventListenerBase::testCaseEnded( TestCaseStats const& ) {}
+    void EventListenerBase::testRunEnded( TestRunStats const& ) {}
+    void EventListenerBase::skipTest( TestCaseInfo const& ) {}
+} // namespace Catch
+
+
+
+
+#include <algorithm>
+#include <cfloat>
+#include <cstdio>
+#include <ostream>
+#include <iomanip>
+
+namespace Catch {
+
+    namespace {
+        void listTestNamesOnly(std::ostream& out,
+                               std::vector<TestCaseHandle> const& tests) {
+            for (auto const& test : tests) {
+                auto const& testCaseInfo = test.getTestCaseInfo();
+
+                if (startsWith(testCaseInfo.name, '#')) {
+                    out << '"' << testCaseInfo.name << '"';
+                } else {
+                    out << testCaseInfo.name;
+                }
+
+                out << '\n';
+            }
+            out << std::flush;
+        }
+    } // end unnamed namespace
+
+
+    // Because formatting using c++ streams is stateful, drop down to C is
+    // required Alternatively we could use stringstream, but its performance
+    // is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        size_t printedLength = static_cast<size_t>(
+            sprintf_s( buffer, "%.3f", duration ) );
+#else
+        size_t printedLength = static_cast<size_t>(
+            std::snprintf( buffer, maxDoubleSize, "%.3f", duration ) );
+#endif
+        return std::string( buffer, printedLength );
+    }
+
+    bool shouldShowDuration( IConfig const& config, double duration ) {
+        if ( config.showDurations() == ShowDurations::Always ) {
+            return true;
+        }
+        if ( config.showDurations() == ShowDurations::Never ) {
+            return false;
+        }
+        const double min = config.minDuration();
+        return min >= 0 && duration >= min;
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& filters ) {
+        // We add a ' ' separator between each filter
+        size_t serialized_size = filters.size() - 1;
+        for (auto const& filter : filters) {
+            serialized_size += filter.size();
+        }
+
+        std::string serialized;
+        serialized.reserve(serialized_size);
+        bool first = true;
+
+        for (auto const& filter : filters) {
+            if (!first) {
+                serialized.push_back(' ');
+            }
+            first = false;
+            serialized.append(filter);
+        }
+
+        return serialized;
+    }
+
+    std::ostream& operator<<( std::ostream& out, lineOfChars value ) {
+        for ( size_t idx = 0; idx < CATCH_CONFIG_CONSOLE_WIDTH - 1; ++idx ) {
+            out.put( value.c );
+        }
+        return out;
+    }
+
+    void
+    defaultListReporters( std::ostream& out,
+                          std::vector<ReporterDescription> const& descriptions,
+                          Verbosity verbosity ) {
+        out << "Available reporters:\n";
+        const auto maxNameLen =
+            std::max_element( descriptions.begin(),
+                              descriptions.end(),
+                              []( ReporterDescription const& lhs,
+                                  ReporterDescription const& rhs ) {
+                                  return lhs.name.size() < rhs.name.size();
+                              } )
+                ->name.size();
+
+        for ( auto const& desc : descriptions ) {
+            if ( verbosity == Verbosity::Quiet ) {
+                out << TextFlow::Column( desc.name )
+                           .indent( 2 )
+                           .width( 5 + maxNameLen )
+                    << '\n';
+            } else {
+                out << TextFlow::Column( desc.name + ':' )
+                               .indent( 2 )
+                               .width( 5 + maxNameLen ) +
+                           TextFlow::Column( desc.description )
+                               .initialIndent( 0 )
+                               .indent( 2 )
+                               .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen - 8 )
+                    << '\n';
+            }
+        }
+        out << '\n' << std::flush;
+    }
+
+    void defaultListListeners( std::ostream& out,
+                               std::vector<ListenerDescription> const& descriptions ) {
+        out << "Registered listeners:\n";
+
+        if(descriptions.empty()) {
+            return;
+        }
+
+        const auto maxNameLen =
+            std::max_element( descriptions.begin(),
+                              descriptions.end(),
+                              []( ListenerDescription const& lhs,
+                                  ListenerDescription const& rhs ) {
+                                  return lhs.name.size() < rhs.name.size();
+                              } )
+                ->name.size();
+
+        for ( auto const& desc : descriptions ) {
+            out << TextFlow::Column( static_cast<std::string>( desc.name ) +
+                                     ':' )
+                           .indent( 2 )
+                           .width( maxNameLen + 5 ) +
+                       TextFlow::Column( desc.description )
+                           .initialIndent( 0 )
+                           .indent( 2 )
+                           .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen - 8 )
+                << '\n';
+        }
+
+        out << '\n' << std::flush;
+    }
+
+    void defaultListTags( std::ostream& out,
+                          std::vector<TagInfo> const& tags,
+                          bool isFiltered ) {
+        if ( isFiltered ) {
+            out << "Tags for matching test cases:\n";
+        } else {
+            out << "All available tags:\n";
+        }
+
+        for ( auto const& tagCount : tags ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw( 2 ) << tagCount.count << "  ";
+            auto str = rss.str();
+            auto wrapper = TextFlow::Column( tagCount.all() )
+                               .initialIndent( 0 )
+                               .indent( str.size() )
+                               .width( CATCH_CONFIG_CONSOLE_WIDTH - 10 );
+            out << str << wrapper << '\n';
+        }
+        out << pluralise(tags.size(), "tag"_sr) << "\n\n" << std::flush;
+    }
+
+    void defaultListTests(std::ostream& out, ColourImpl* streamColour, std::vector<TestCaseHandle> const& tests, bool isFiltered, Verbosity verbosity) {
+        // We special case this to provide the equivalent of old
+        // `--list-test-names-only`, which could then be used by the
+        // `--input-file` option.
+        if (verbosity == Verbosity::Quiet) {
+            listTestNamesOnly(out, tests);
+            return;
+        }
+
+        if (isFiltered) {
+            out << "Matching test cases:\n";
+        } else {
+            out << "All available test cases:\n";
+        }
+
+        for (auto const& test : tests) {
+            auto const& testCaseInfo = test.getTestCaseInfo();
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            auto colourGuard = streamColour->guardColour( colour ).engage( out );
+
+            out << TextFlow::Column(testCaseInfo.name).indent(2) << '\n';
+            if (verbosity >= Verbosity::High) {
+                out << TextFlow::Column(Catch::Detail::stringify(testCaseInfo.lineInfo)).indent(4) << '\n';
+            }
+            if (!testCaseInfo.tags.empty() &&
+                verbosity > Verbosity::Quiet) {
+                out << TextFlow::Column(testCaseInfo.tagsAsString()).indent(6) << '\n';
+            }
+        }
+
+        if (isFiltered) {
+            out << pluralise(tests.size(), "matching test case"_sr);
+        } else {
+            out << pluralise(tests.size(), "test case"_sr);
+        }
+        out << "\n\n" << std::flush;
+    }
+
+    namespace {
+        class SummaryColumn {
+        public:
+            SummaryColumn( std::string suffix, Colour::Code colour ):
+                m_suffix( CATCH_MOVE( suffix ) ), m_colour( colour ) {}
+
+            SummaryColumn&& addRow( std::uint64_t count ) && {
+                std::string row = std::to_string(count);
+                auto const new_width = std::max( m_width, row.size() );
+                if ( new_width > m_width ) {
+                    for ( auto& oldRow : m_rows ) {
+                        oldRow.insert( 0, new_width - m_width, ' ' );
+                    }
+                } else {
+                    row.insert( 0, m_width - row.size(), ' ' );
+                }
+                m_width = new_width;
+                m_rows.push_back( row );
+                return std::move( *this );
+            }
+
+            std::string const& getSuffix() const { return m_suffix; }
+            Colour::Code getColour() const { return m_colour; }
+            std::string const& getRow( std::size_t index ) const {
+                return m_rows[index];
+            }
+
+        private:
+            std::string m_suffix;
+            Colour::Code m_colour;
+            std::size_t m_width = 0;
+            std::vector<std::string> m_rows;
+        };
+
+        void printSummaryRow( std::ostream& stream,
+                              ColourImpl& colour,
+                              StringRef label,
+                              std::vector<SummaryColumn> const& cols,
+                              std::size_t row ) {
+            for ( auto const& col : cols ) {
+                auto const& value = col.getRow( row );
+                auto const& suffix = col.getSuffix();
+                if ( suffix.empty() ) {
+                    stream << label << ": ";
+                    if ( value != "0" ) {
+                        stream << value;
+                    } else {
+                        stream << colour.guardColour( Colour::Warning )
+                               << "- none -";
+                    }
+                } else if ( value != "0" ) {
+                    stream << colour.guardColour( Colour::LightGrey ) << " | "
+                           << colour.guardColour( col.getColour() ) << value
+                           << ' ' << suffix;
+                }
+            }
+            stream << '\n';
+        }
+    } // namespace
+
+    void printTestRunTotals( std::ostream& stream,
+                             ColourImpl& streamColour,
+                             Totals const& totals ) {
+        if ( totals.testCases.total() == 0 ) {
+            stream << streamColour.guardColour( Colour::Warning )
+                   << "No tests ran\n";
+            return;
+        }
+
+        if ( totals.assertions.total() > 0 && totals.testCases.allPassed() ) {
+            stream << streamColour.guardColour( Colour::ResultSuccess )
+                   << "All tests passed";
+            stream << " ("
+                   << pluralise( totals.assertions.passed, "assertion"_sr )
+                   << " in "
+                   << pluralise( totals.testCases.passed, "test case"_sr )
+                   << ')' << '\n';
+            return;
+        }
+
+        std::vector<SummaryColumn> columns;
+        // Don't include "skipped assertions" in total count
+        const auto totalAssertionCount =
+            totals.assertions.total() - totals.assertions.skipped;
+        columns.push_back( SummaryColumn( "", Colour::None )
+                               .addRow( totals.testCases.total() )
+                               .addRow( totalAssertionCount ) );
+        columns.push_back( SummaryColumn( "passed", Colour::Success )
+                               .addRow( totals.testCases.passed )
+                               .addRow( totals.assertions.passed ) );
+        columns.push_back( SummaryColumn( "failed", Colour::ResultError )
+                               .addRow( totals.testCases.failed )
+                               .addRow( totals.assertions.failed ) );
+        columns.push_back( SummaryColumn( "skipped", Colour::Skip )
+                               .addRow( totals.testCases.skipped )
+                               // Don't print "skipped assertions"
+                               .addRow( 0 ) );
+        columns.push_back(
+            SummaryColumn( "failed as expected", Colour::ResultExpectedFailure )
+                .addRow( totals.testCases.failedButOk )
+                .addRow( totals.assertions.failedButOk ) );
+        printSummaryRow( stream, streamColour, "test cases"_sr, columns, 0 );
+        printSummaryRow( stream, streamColour, "assertions"_sr, columns, 1 );
+    }
+
+} // namespace Catch
+
+
+//
+
+namespace Catch {
+    namespace {
+        void writeSourceInfo( JsonObjectWriter& writer,
+                              SourceLineInfo const& sourceInfo ) {
+            auto source_location_writer =
+                writer.write( "source-location"_sr ).writeObject();
+            source_location_writer.write( "filename"_sr )
+                .write( sourceInfo.file );
+            source_location_writer.write( "line"_sr ).write( sourceInfo.line );
+        }
+
+        void writeTags( JsonArrayWriter writer, std::vector<Tag> const& tags ) {
+            for ( auto const& tag : tags ) {
+                writer.write( tag.original );
+            }
+        }
+
+        void writeProperties( JsonArrayWriter writer,
+                              TestCaseInfo const& info ) {
+            if ( info.isHidden() ) { writer.write( "is-hidden"_sr ); }
+            if ( info.okToFail() ) { writer.write( "ok-to-fail"_sr ); }
+            if ( info.expectedToFail() ) {
+                writer.write( "expected-to-fail"_sr );
+            }
+            if ( info.throws() ) { writer.write( "throws"_sr ); }
+        }
+
+    } // namespace
+
+    JsonReporter::JsonReporter( ReporterConfig&& config ):
+        StreamingReporterBase{ CATCH_MOVE( config ) } {
+
+        m_preferences.shouldRedirectStdOut = true;
+        // TBD: Do we want to report all assertions? XML reporter does
+        //      not, but for machine-parseable reporters I think the answer
+        //      should be yes.
+        m_preferences.shouldReportAllAssertions = true;
+
+        m_objectWriters.emplace( m_stream );
+        m_writers.emplace( Writer::Object );
+        auto& writer = m_objectWriters.top();
+
+        writer.write( "version"_sr ).write( 1 );
+
+        {
+            auto metadata_writer = writer.write( "metadata"_sr ).writeObject();
+            metadata_writer.write( "name"_sr ).write( m_config->name() );
+            metadata_writer.write( "rng-seed"_sr ).write( m_config->rngSeed() );
+            metadata_writer.write( "catch2-version"_sr )
+                .write( libraryVersion() );
+            if ( m_config->testSpec().hasFilters() ) {
+                metadata_writer.write( "filters"_sr )
+                    .write( m_config->testSpec() );
+            }
+        }
+    }
+
+    JsonReporter::~JsonReporter() {
+        endListing();
+        // TODO: Ensure this closes the top level object, add asserts
+        assert( m_writers.size() == 1 && "Only the top level object should be open" );
+        assert( m_writers.top() == Writer::Object );
+        endObject();
+        m_stream << '\n' << std::flush;
+        assert( m_writers.empty() );
+    }
+
+    JsonArrayWriter& JsonReporter::startArray() {
+        m_arrayWriters.emplace( m_arrayWriters.top().writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+    JsonArrayWriter& JsonReporter::startArray( StringRef key ) {
+        m_arrayWriters.emplace(
+            m_objectWriters.top().write( key ).writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+
+    JsonObjectWriter& JsonReporter::startObject() {
+        m_objectWriters.emplace( m_arrayWriters.top().writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+    JsonObjectWriter& JsonReporter::startObject( StringRef key ) {
+        m_objectWriters.emplace(
+            m_objectWriters.top().write( key ).writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+
+    void JsonReporter::endObject() {
+        assert( isInside( Writer::Object ) );
+        m_objectWriters.pop();
+        m_writers.pop();
+    }
+    void JsonReporter::endArray() {
+        assert( isInside( Writer::Array ) );
+        m_arrayWriters.pop();
+        m_writers.pop();
+    }
+
+    bool JsonReporter::isInside( Writer writer ) {
+        return !m_writers.empty() && m_writers.top() == writer;
+    }
+
+    void JsonReporter::startListing() {
+        if ( !m_startedListing ) { startObject( "listings"_sr ); }
+        m_startedListing = true;
+    }
+    void JsonReporter::endListing() {
+        if ( m_startedListing ) { endObject(); }
+        m_startedListing = false;
+    }
+
+    std::string JsonReporter::getDescription() {
+        return "Outputs listings as JSON. Test listing is Work-in-Progress!";
+    }
+
+    void JsonReporter::testRunStarting( TestRunInfo const& runInfo ) {
+        StreamingReporterBase::testRunStarting( runInfo );
+        endListing();
+
+        assert( isInside( Writer::Object ) );
+        startObject( "test-run"_sr );
+        startArray( "test-cases"_sr );
+    }
+
+     static void writeCounts( JsonObjectWriter&& writer, Counts const& counts ) {
+        writer.write( "passed"_sr ).write( counts.passed );
+        writer.write( "failed"_sr ).write( counts.failed );
+        writer.write( "fail-but-ok"_sr ).write( counts.failedButOk );
+        writer.write( "skipped"_sr ).write( counts.skipped );
+    }
+
+    void JsonReporter::testRunEnded(TestRunStats const& runStats) {
+        assert( isInside( Writer::Array ) );
+        // End "test-cases"
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         runStats.totals.assertions );
+            writeCounts( totals.write( "test-cases"_sr ).writeObject(),
+                         runStats.totals.testCases );
+        }
+
+        // End the "test-run" object
+        endObject();
+    }
+
+    void JsonReporter::testCaseStarting( TestCaseInfo const& tcInfo ) {
+        StreamingReporterBase::testCaseStarting( tcInfo );
+
+        assert( isInside( Writer::Array ) &&
+                "We should be in the 'test-cases' array" );
+        startObject();
+        // "test-info" prelude
+        {
+            auto testInfo =
+                m_objectWriters.top().write( "test-info"_sr ).writeObject();
+            // TODO: handle testName vs className!!
+            testInfo.write( "name"_sr ).write( tcInfo.name );
+            writeSourceInfo(testInfo, tcInfo.lineInfo);
+            writeTags( testInfo.write( "tags"_sr ).writeArray(), tcInfo.tags );
+            writeProperties( testInfo.write( "properties"_sr ).writeArray(),
+                             tcInfo );
+        }
+
+
+        // Start the array for individual test runs (testCasePartial pairs)
+        startArray( "runs"_sr );
+    }
+
+    void JsonReporter::testCaseEnded( TestCaseStats const& tcStats ) {
+        StreamingReporterBase::testCaseEnded( tcStats );
+
+        // We need to close the 'runs' array before finishing the test case
+        assert( isInside( Writer::Array ) );
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in partial result?
+        }
+        // We do not write out stderr/stdout, because we instead wrote those out in partial runs
+
+        // TODO: aborting?
+
+        // And we also close this test case's object
+        assert( isInside( Writer::Object ) );
+        endObject();
+    }
+
+    void JsonReporter::testCasePartialStarting( TestCaseInfo const& /*tcInfo*/,
+                                                uint64_t index ) {
+        startObject();
+        m_objectWriters.top().write( "run-idx"_sr ).write( index );
+        startArray( "path"_sr );
+        // TODO: we want to delay most of the printing to the 'root' section
+        // TODO: childSection key name?
+    }
+
+    void JsonReporter::testCasePartialEnded( TestCaseStats const& tcStats,
+                                             uint64_t /*index*/ ) {
+        // Fixme: the top level section handles this.
+        //// path object
+        endArray();
+        if ( !tcStats.stdOut.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stdout"_sr )
+                .write( tcStats.stdOut );
+        }
+        if ( !tcStats.stdErr.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stderr"_sr )
+                .write( tcStats.stdErr );
+        }
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will
+            // always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in
+            // partial result?
+        }
+        // TODO: aborting?
+        // run object
+        endObject();
+    }
+
+    void JsonReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        assert( isInside( Writer::Array ) &&
+                "Section should always start inside an object" );
+        // We want to nest top level sections, even though it shares name
+        // and source loc with the TEST_CASE
+        auto& sectionObject = startObject();
+        sectionObject.write( "kind"_sr ).write( "section"_sr );
+        sectionObject.write( "name"_sr ).write( sectionInfo.name );
+        writeSourceInfo( m_objectWriters.top(), sectionInfo.lineInfo );
+
+
+        // TBD: Do we want to create this event lazily? It would become
+        //      rather complex, but we could do it, and it would look
+        //      better for empty sections. OTOH, empty sections should
+        //      be rare.
+        startArray( "path"_sr );
+    }
+    void JsonReporter::sectionEnded( SectionStats const& /*sectionStats */) {
+        // End the subpath array
+        endArray();
+        // TODO: metadata
+        // TODO: what info do we have here?
+
+        // End the section object
+        endObject();
+    }
+
+    void JsonReporter::assertionStarting( AssertionInfo const& /*assertionInfo*/ ) {}
+    void JsonReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        // TODO: There is lot of different things to handle here, but
+        //       we can fill it in later, after we show that the basic
+        //       outline and streaming reporter impl works well enough.
+        //if ( !m_config->includeSuccessfulResults()
+        //    && assertionStats.assertionResult.isOk() ) {
+        //    return;
+        //}
+        assert( isInside( Writer::Array ) );
+        auto assertionObject = m_arrayWriters.top().writeObject();
+
+        assertionObject.write( "kind"_sr ).write( "assertion"_sr );
+        writeSourceInfo( assertionObject,
+                         assertionStats.assertionResult.getSourceInfo() );
+        assertionObject.write( "status"_sr )
+            .write( assertionStats.assertionResult.isOk() );
+        // TODO: handling of result.
+        // TODO: messages
+        // TODO: totals?
+    }
+
+
+    void JsonReporter::benchmarkPreparing( StringRef name ) { (void)name; }
+    void JsonReporter::benchmarkStarting( BenchmarkInfo const& ) {}
+    void JsonReporter::benchmarkEnded( BenchmarkStats<> const& ) {}
+    void JsonReporter::benchmarkFailed( StringRef error ) { (void)error; }
+
+    void JsonReporter::listReporters(
+        std::vector<ReporterDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "reporters"_sr ).writeArray();
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listListeners(
+        std::vector<ListenerDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "listeners"_sr ).writeArray();
+
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listTests( std::vector<TestCaseHandle> const& tests ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tests"_sr ).writeArray();
+
+        for ( auto const& test : tests ) {
+            auto desc_writer = writer.writeObject();
+            auto const& info = test.getTestCaseInfo();
+
+            desc_writer.write( "name"_sr ).write( info.name );
+            desc_writer.write( "class-name"_sr ).write( info.className );
+            {
+                auto tag_writer = desc_writer.write( "tags"_sr ).writeArray();
+                for ( auto const& tag : info.tags ) {
+                    tag_writer.write( tag.original );
+                }
+            }
+            writeSourceInfo( desc_writer, info.lineInfo );
+        }
+    }
+    void JsonReporter::listTags( std::vector<TagInfo> const& tags ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tags"_sr ).writeArray();
+        for ( auto const& tag : tags ) {
+            auto tag_writer = writer.writeObject();
+            {
+                auto aliases_writer =
+                    tag_writer.write( "aliases"_sr ).writeArray();
+                for ( auto alias : tag.spellings ) {
+                    aliases_writer.write( alias );
+                }
+            }
+            tag_writer.write( "count"_sr ).write( tag.count );
+        }
+    }
+} // namespace Catch
+
+
+
+
+#include <cassert>
+#include <ctime>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            time_t rawtime;
+            std::time(&rawtime);
+
+            std::tm timeInfo = {};
+#if defined (_MSC_VER) || defined (__MINGW32__)
+            gmtime_s(&timeInfo, &rawtime);
+#elif defined (CATCH_PLATFORM_PLAYSTATION)
+            gmtime_s(&rawtime, &timeInfo);
+#elif defined (__IAR_SYSTEMS_ICC__)
+            timeInfo = *std::gmtime(&rawtime);
+#else
+            gmtime_r(&rawtime, &timeInfo);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+
+            return std::string(timeStamp, timeStampSize - 1);
+        }
+
+        std::string fileNameTag(std::vector<Tag> const& tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (Tag const& tag) {
+                                       return tag.original.size() > 0
+                                           && tag.original[0] == '#'; });
+            if (it != tags.end()) {
+                return static_cast<std::string>(
+                    it->original.substr(1, it->original.size() - 1)
+                );
+            }
+            return std::string();
+        }
+
+        // Formats the duration in seconds to 3 decimal places.
+        // This is done because some genius defined Maven Surefire schema
+        // in a way that only accepts 3 decimal places, and tools like
+        // Jenkins use that schema for validation JUnit reporter output.
+        std::string formatDuration( double seconds ) {
+            ReusableStringStream rss;
+            rss << std::fixed << std::setprecision( 3 ) << seconds;
+            return rss.str();
+        }
+
+        static void normalizeNamespaceMarkers(std::string& str) {
+            std::size_t pos = str.find( "::" );
+            while ( pos != std::string::npos ) {
+                str.replace( pos, 2, "." );
+                pos += 1;
+                pos = str.find( "::", pos );
+            }
+        }
+
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig&& _config )
+        :   CumulativeReporterBase( CATCH_MOVE(_config) ),
+            xml( m_stream )
+        {
+            m_preferences.shouldRedirectStdOut = true;
+            m_preferences.shouldReportAllAssertions = true;
+            m_shouldStoreSuccesfulAssertions = false;
+        }
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    void JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        const auto suiteTime = suiteTimer.getElapsedSeconds();
+        writeRun( *m_testRun, suiteTime );
+        xml.endElement();
+    }
+
+    void JunitReporter::writeRun( TestRunNode const& testRunNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestRunStats const& stats = testRunNode.value;
+        xml.writeAttribute( "name"_sr, stats.runInfo.name );
+        xml.writeAttribute( "errors"_sr, unexpectedExceptions );
+        xml.writeAttribute( "failures"_sr, stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "skipped"_sr, stats.totals.assertions.skipped );
+        xml.writeAttribute( "tests"_sr, stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname"_sr, "tbd"_sr ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time"_sr, ""_sr );
+        else
+            xml.writeAttribute( "time"_sr, formatDuration( suiteTime ) );
+        xml.writeAttribute( "timestamp"_sr, getCurrentTimestamp() );
+
+        // Write properties
+        {
+            auto properties = xml.scopedElement("properties");
+            xml.scopedElement("property")
+                .writeAttribute("name"_sr, "random-seed"_sr)
+                .writeAttribute("value"_sr, m_config->rngSeed());
+            if (m_config->testSpec().hasFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name"_sr, "filters"_sr)
+                    .writeAttribute("value"_sr, m_config->testSpec());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : testRunNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className =
+            static_cast<std::string>( stats.testInfo->className );
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo->tags);
+            if ( className.empty() ) {
+                className = "global";
+            }
+        }
+
+        if ( !m_config->name().empty() )
+            className = static_cast<std::string>(m_config->name()) + '.' + className;
+
+        normalizeNamespaceMarkers(className);
+
+        writeSection( className, "", rootSection, stats.testInfo->okToFail() );
+    }
+
+    void JunitReporter::writeSection( std::string const& className,
+                                      std::string const& rootName,
+                                      SectionNode const& sectionNode,
+                                      bool testOkToFail) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( sectionNode.hasAnyAssertions()
+           || !sectionNode.stdOut.empty()
+           || !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname"_sr, name );
+                xml.writeAttribute( "name"_sr, "root"_sr );
+            }
+            else {
+                xml.writeAttribute( "classname"_sr, className );
+                xml.writeAttribute( "name"_sr, name );
+            }
+            xml.writeAttribute( "time"_sr, formatDuration( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status"_sr, "run"_sr );
+
+            if (sectionNode.stats.assertions.failedButOk) {
+                xml.scopedElement("skipped")
+                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
+            }
+
+            writeAssertions( sectionNode );
+
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode, testOkToFail );
+            else
+                writeSection( className, name, *childNode, testOkToFail );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for (auto const& assertionOrBenchmark : sectionNode.assertionsAndBenchmarks) {
+            if (assertionOrBenchmark.isAssertion()) {
+                writeAssertion(assertionOrBenchmark.asAssertion());
+            }
+        }
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if ( !result.isOk() ||
+             result.getResultType() == ResultWas::ExplicitSkip ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+                case ResultWas::ExplicitSkip:
+                    elementName = "skipped";
+                    break;
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message"_sr, result.getExpression() );
+            xml.writeAttribute( "type"_sr, result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if ( result.getResultType() == ResultWas::ExplicitSkip ) {
+                rss << "SKIPPED\n";
+            } else {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << TextFlow::Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            }
+
+            if( result.hasMessage() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+} // end namespace Catch
+
+
+
+
+#include <ostream>
+
+namespace Catch {
+    void MultiReporter::updatePreferences(IEventListener const& reporterish) {
+        m_preferences.shouldRedirectStdOut |=
+            reporterish.getPreferences().shouldRedirectStdOut;
+        m_preferences.shouldReportAllAssertions |=
+            reporterish.getPreferences().shouldReportAllAssertions;
+    }
+
+    void MultiReporter::addListener( IEventListenerPtr&& listener ) {
+        updatePreferences(*listener);
+        m_reporterLikes.insert(m_reporterLikes.begin() + m_insertedListeners, CATCH_MOVE(listener) );
+        ++m_insertedListeners;
+    }
+
+    void MultiReporter::addReporter( IEventListenerPtr&& reporter ) {
+        updatePreferences(*reporter);
+
+        // We will need to output the captured stdout if there are reporters
+        // that do not want it captured.
+        // We do not consider listeners, because it is generally assumed that
+        // listeners are output-transparent, even though they can ask for stdout
+        // capture to do something with it.
+        m_haveNoncapturingReporters |= !reporter->getPreferences().shouldRedirectStdOut;
+
+        // Reporters can always be placed to the back without breaking the
+        // reporting order
+        m_reporterLikes.push_back( CATCH_MOVE( reporter ) );
+    }
+
+    void MultiReporter::noMatchingTestCases( StringRef unmatchedSpec ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->noMatchingTestCases( unmatchedSpec );
+        }
+    }
+
+    void MultiReporter::fatalErrorEncountered( StringRef error ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->fatalErrorEncountered( error );
+        }
+    }
+
+    void MultiReporter::reportInvalidTestSpec( StringRef arg ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->reportInvalidTestSpec( arg );
+        }
+    }
+
+    void MultiReporter::benchmarkPreparing( StringRef name ) {
+        for (auto& reporterish : m_reporterLikes) {
+            reporterish->benchmarkPreparing(name);
+        }
+    }
+    void MultiReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->benchmarkStarting( benchmarkInfo );
+        }
+    }
+    void MultiReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->benchmarkEnded( benchmarkStats );
+        }
+    }
+
+    void MultiReporter::benchmarkFailed( StringRef error ) {
+        for (auto& reporterish : m_reporterLikes) {
+            reporterish->benchmarkFailed(error);
+        }
+    }
+
+    void MultiReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testRunStarting( testRunInfo );
+        }
+    }
+
+    void MultiReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testCaseStarting( testInfo );
+        }
+    }
+
+    void
+    MultiReporter::testCasePartialStarting( TestCaseInfo const& testInfo,
+                                                uint64_t partNumber ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testCasePartialStarting( testInfo, partNumber );
+        }
+    }
+
+    void MultiReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->sectionStarting( sectionInfo );
+        }
+    }
+
+    void MultiReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->assertionStarting( assertionInfo );
+        }
+    }
+
+    void MultiReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        const bool reportByDefault =
+            assertionStats.assertionResult.getResultType() != ResultWas::Ok ||
+            m_config->includeSuccessfulResults();
+
+        for ( auto & reporterish : m_reporterLikes ) {
+            if ( reportByDefault ||
+                 reporterish->getPreferences().shouldReportAllAssertions ) {
+                    reporterish->assertionEnded( assertionStats );
+            }
+        }
+    }
+
+    void MultiReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->sectionEnded( sectionStats );
+        }
+    }
+
+    void MultiReporter::testCasePartialEnded( TestCaseStats const& testStats,
+                                                  uint64_t partNumber ) {
+        if ( m_preferences.shouldRedirectStdOut &&
+             m_haveNoncapturingReporters ) {
+            if ( !testStats.stdOut.empty() ) {
+                Catch::cout() << testStats.stdOut << std::flush;
+            }
+            if ( !testStats.stdErr.empty() ) {
+                Catch::cerr() << testStats.stdErr << std::flush;
+            }
+        }
+
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testCasePartialEnded( testStats, partNumber );
+        }
+    }
+
+    void MultiReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testCaseEnded( testCaseStats );
+        }
+    }
+
+    void MultiReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->testRunEnded( testRunStats );
+        }
+    }
+
+
+    void MultiReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->skipTest( testInfo );
+        }
+    }
+
+    void MultiReporter::listReporters(std::vector<ReporterDescription> const& descriptions) {
+        for (auto& reporterish : m_reporterLikes) {
+            reporterish->listReporters(descriptions);
+        }
+    }
+
+    void MultiReporter::listListeners(
+        std::vector<ListenerDescription> const& descriptions ) {
+        for ( auto& reporterish : m_reporterLikes ) {
+            reporterish->listListeners( descriptions );
+        }
+    }
+
+    void MultiReporter::listTests(std::vector<TestCaseHandle> const& tests) {
+        for (auto& reporterish : m_reporterLikes) {
+            reporterish->listTests(tests);
+        }
+    }
+
+    void MultiReporter::listTags(std::vector<TagInfo> const& tags) {
+        for (auto& reporterish : m_reporterLikes) {
+            reporterish->listTags(tags);
+        }
+    }
+
+} // end namespace Catch
+
+
+
+
+
+namespace Catch {
+    namespace Detail {
+
+        void registerReporterImpl( std::string const& name,
+                                   IReporterFactoryPtr reporterPtr ) {
+            CATCH_TRY {
+                getMutableRegistryHub().registerReporter(
+                    name, CATCH_MOVE( reporterPtr ) );
+            }
+            CATCH_CATCH_ALL {
+                // Do not throw when constructing global objects, instead
+                // register the exception to be processed later
+                getMutableRegistryHub().registerStartupException();
+            }
+        }
+
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory ) {
+            getMutableRegistryHub().registerListener( CATCH_MOVE(listenerFactory) );
+        }
+
+
+    } // namespace Detail
+} // namespace Catch
+
+
+
+
+#include <map>
+
+namespace Catch {
+
+    namespace {
+        std::string createMetadataString(IConfig const& config) {
+            ReusableStringStream sstr;
+            if ( config.testSpec().hasFilters() ) {
+                sstr << "filters='"
+                         << config.testSpec()
+                         << "' ";
+            }
+            sstr << "rng-seed=" << config.rngSeed();
+            return sstr.str();
+        }
+    }
+
+    void SonarQubeReporter::testRunStarting(TestRunInfo const& testRunInfo) {
+        CumulativeReporterBase::testRunStarting(testRunInfo);
+
+        xml.writeComment( createMetadataString( *m_config ) );
+        xml.startElement("testExecutions");
+        xml.writeAttribute("version"_sr, '1');
+    }
+
+    void SonarQubeReporter::writeRun( TestRunNode const& runNode ) {
+        std::map<StringRef, std::vector<TestCaseNode const*>> testsPerFile;
+
+        for ( auto const& child : runNode.children ) {
+            testsPerFile[child->value.testInfo->lineInfo.file].push_back(
+                child.get() );
+        }
+
+        for ( auto const& kv : testsPerFile ) {
+            writeTestFile( kv.first, kv.second );
+        }
+    }
+
+    void SonarQubeReporter::writeTestFile(StringRef filename, std::vector<TestCaseNode const*> const& testCaseNodes) {
+        XmlWriter::ScopedElement e = xml.scopedElement("file");
+        xml.writeAttribute("path"_sr, filename);
+
+        for (auto const& child : testCaseNodes)
+            writeTestCase(*child);
+    }
+
+    void SonarQubeReporter::writeTestCase(TestCaseNode const& testCaseNode) {
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert(testCaseNode.children.size() == 1);
+        SectionNode const& rootSection = *testCaseNode.children.front();
+        writeSection("", rootSection, testCaseNode.value.testInfo->okToFail());
+    }
+
+    void SonarQubeReporter::writeSection(std::string const& rootName, SectionNode const& sectionNode, bool okToFail) {
+        std::string name = trim(sectionNode.stats.sectionInfo.name);
+        if (!rootName.empty())
+            name = rootName + '/' + name;
+
+        if ( sectionNode.hasAnyAssertions()
+            || !sectionNode.stdOut.empty()
+            ||  !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement("testCase");
+            xml.writeAttribute("name"_sr, name);
+            xml.writeAttribute("duration"_sr, static_cast<long>(sectionNode.stats.durationInSeconds * 1000));
+
+            writeAssertions(sectionNode, okToFail);
+        }
+
+        for (auto const& childNode : sectionNode.childSections)
+            writeSection(name, *childNode, okToFail);
+    }
+
+    void SonarQubeReporter::writeAssertions(SectionNode const& sectionNode, bool okToFail) {
+        for (auto const& assertionOrBenchmark : sectionNode.assertionsAndBenchmarks) {
+            if (assertionOrBenchmark.isAssertion()) {
+                writeAssertion(assertionOrBenchmark.asAssertion(), okToFail);
+            }
+        }
+    }
+
+    void SonarQubeReporter::writeAssertion(AssertionStats const& stats, bool okToFail) {
+        AssertionResult const& result = stats.assertionResult;
+        if ( !result.isOk() ||
+             result.getResultType() == ResultWas::ExplicitSkip ) {
+            std::string elementName;
+            if (okToFail) {
+                elementName = "skipped";
+            } else {
+                switch (result.getResultType()) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+                case ResultWas::ExplicitSkip:
+                    elementName = "skipped";
+                    break;
+                    // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+                }
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement(elementName);
+
+            ReusableStringStream messageRss;
+            messageRss << result.getTestMacroName() << '(' << result.getExpression() << ')';
+            xml.writeAttribute("message"_sr, messageRss.str());
+
+            ReusableStringStream textRss;
+            if ( result.getResultType() == ResultWas::ExplicitSkip ) {
+                textRss << "SKIPPED\n";
+            } else {
+                textRss << "FAILED:\n";
+                if (result.hasExpression()) {
+                    textRss << '\t' << result.getExpressionInMacro() << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    textRss << "with expansion:\n\t" << result.getExpandedExpression() << '\n';
+                }
+            }
+
+            if (result.hasMessage())
+                textRss << result.getMessage() << '\n';
+
+            for (auto const& msg : stats.infoMessages)
+                if (msg.type == ResultWas::Info)
+                    textRss << msg.message << '\n';
+
+            textRss << "at " << result.getSourceInfo();
+            xml.writeText(textRss.str(), XmlFormatting::Newline);
+        }
+    }
+
+} // end namespace Catch
+
+
+
+namespace Catch {
+
+    StreamingReporterBase::~StreamingReporterBase() = default;
+
+    void
+    StreamingReporterBase::testRunStarting( TestRunInfo const& _testRunInfo ) {
+        currentTestRunInfo = _testRunInfo;
+    }
+
+    void StreamingReporterBase::testRunEnded( TestRunStats const& ) {
+        currentTestCaseInfo = nullptr;
+    }
+
+} // end namespace Catch
+
+
+
+#include <algorithm>
+#include <ostream>
+
+namespace Catch {
+
+    namespace {
+        // Yes, this has to be outside the class and namespaced by naming.
+        // Making older compiler happy is hard.
+        static constexpr StringRef tapFailedString = "not ok"_sr;
+        static constexpr StringRef tapPassedString = "ok"_sr;
+        static constexpr Colour::Code tapDimColour = Colour::FileName;
+
+        class TapAssertionPrinter {
+        public:
+            TapAssertionPrinter& operator= (TapAssertionPrinter const&) = delete;
+            TapAssertionPrinter(TapAssertionPrinter const&) = delete;
+            TapAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, std::size_t _counter, ColourImpl* colour_)
+                : stream(_stream)
+                , result(_stats.assertionResult)
+                , messages(_stats.infoMessages)
+                , itMessage(_stats.infoMessages.begin())
+                , printInfoMessages(true)
+                , counter(_counter)
+                , colourImpl( colour_ ) {}
+
+            void print() {
+                itMessage = messages.begin();
+
+                switch (result.getResultType()) {
+                case ResultWas::Ok:
+                    printResultType(tapPassedString);
+                    printOriginalExpression();
+                    printReconstructedExpression();
+                    if (!result.hasExpression())
+                        printRemainingMessages(Colour::None);
+                    else
+                        printRemainingMessages();
+                    break;
+                case ResultWas::ExpressionFailed:
+                    if (result.isOk()) {
+                        printResultType(tapPassedString);
+                    } else {
+                        printResultType(tapFailedString);
+                    }
+                    printOriginalExpression();
+                    printReconstructedExpression();
+                    if (result.isOk()) {
+                        printIssue(" # TODO");
+                    }
+                    printRemainingMessages();
+                    break;
+                case ResultWas::ThrewException:
+                    printResultType(tapFailedString);
+                    printIssue("unexpected exception with message:"_sr);
+                    printMessage();
+                    printExpressionWas();
+                    printRemainingMessages();
+                    break;
+                case ResultWas::FatalErrorCondition:
+                    printResultType(tapFailedString);
+                    printIssue("fatal error condition with message:"_sr);
+                    printMessage();
+                    printExpressionWas();
+                    printRemainingMessages();
+                    break;
+                case ResultWas::DidntThrowException:
+                    printResultType(tapFailedString);
+                    printIssue("expected exception, got none"_sr);
+                    printExpressionWas();
+                    printRemainingMessages();
+                    break;
+                case ResultWas::Info:
+                    printResultType("info"_sr);
+                    printMessage();
+                    printRemainingMessages();
+                    break;
+                case ResultWas::Warning:
+                    printResultType("warning"_sr);
+                    printMessage();
+                    printRemainingMessages();
+                    break;
+                case ResultWas::ExplicitFailure:
+                    printResultType(tapFailedString);
+                    printIssue("explicitly"_sr);
+                    printRemainingMessages(Colour::None);
+                    break;
+                case ResultWas::ExplicitSkip:
+                    printResultType(tapPassedString);
+                    printIssue(" # SKIP"_sr);
+                    printMessage();
+                    printRemainingMessages();
+                    break;
+                    // These cases are here to prevent compiler warnings
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    printResultType("** internal error **"_sr);
+                    break;
+                }
+            }
+
+        private:
+            void printResultType(StringRef passOrFail) const {
+                if (!passOrFail.empty()) {
+                    stream << passOrFail << ' ' << counter << " -";
+                }
+            }
+
+            void printIssue(StringRef issue) const {
+                stream << ' ' << issue;
+            }
+
+            void printExpressionWas() {
+                if (result.hasExpression()) {
+                    stream << ';';
+                    stream << colourImpl->guardColour( tapDimColour )
+                           << " expression was:";
+                    printOriginalExpression();
+                }
+            }
+
+            void printOriginalExpression() const {
+                if (result.hasExpression()) {
+                    stream << ' ' << result.getExpression();
+                }
+            }
+
+            void printReconstructedExpression() const {
+                if (result.hasExpandedExpression()) {
+                    stream << colourImpl->guardColour( tapDimColour ) << " for: ";
+
+                    std::string expr = result.getExpandedExpression();
+                    std::replace(expr.begin(), expr.end(), '\n', ' ');
+                    stream << expr;
+                }
+            }
+
+            void printMessage() {
+                if (itMessage != messages.end()) {
+                    stream << " '" << itMessage->message << '\'';
+                    ++itMessage;
+                }
+            }
+
+            void printRemainingMessages(Colour::Code colour = tapDimColour) {
+                if (itMessage == messages.end()) {
+                    return;
+                }
+
+                // using messages.end() directly (or auto) yields compilation error:
+                std::vector<MessageInfo>::const_iterator itEnd = messages.end();
+                const std::size_t N = static_cast<std::size_t>(itEnd - itMessage);
+
+                stream << colourImpl->guardColour( colour ) << " with "
+                       << pluralise( N, "message"_sr ) << ':';
+
+                for (; itMessage != itEnd; ) {
+                    // If this assertion is a warning ignore any INFO messages
+                    if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                        stream << " '" << itMessage->message << '\'';
+                        if (++itMessage != itEnd) {
+                            stream << colourImpl->guardColour(tapDimColour) << " and";
+                        }
+                    }
+                }
+            }
+
+        private:
+            std::ostream& stream;
+            AssertionResult const& result;
+            std::vector<MessageInfo> const& messages;
+            std::vector<MessageInfo>::const_iterator itMessage;
+            bool printInfoMessages;
+            std::size_t counter;
+            ColourImpl* colourImpl;
+        };
+
+    } // End anonymous namespace
+
+    void TAPReporter::testRunStarting( TestRunInfo const& ) {
+        if ( m_config->testSpec().hasFilters() ) {
+            m_stream << "# filters: " << m_config->testSpec() << '\n';
+        }
+        m_stream << "# rng-seed: " << m_config->rngSeed() << '\n';
+    }
+
+    void TAPReporter::noMatchingTestCases( StringRef unmatchedSpec ) {
+        m_stream << "# No test cases matched '" << unmatchedSpec << "'\n";
+    }
+
+    void TAPReporter::assertionEnded(AssertionStats const& _assertionStats) {
+        ++counter;
+
+        m_stream << "# " << currentTestCaseInfo->name << '\n';
+        TapAssertionPrinter printer(m_stream, _assertionStats, counter, m_colour.get());
+        printer.print();
+
+        m_stream << '\n' << std::flush;
+    }
+
+    void TAPReporter::testRunEnded(TestRunStats const& _testRunStats) {
+        m_stream << "1.." << _testRunStats.totals.assertions.total();
+        if (_testRunStats.totals.testCases.total() == 0) {
+            m_stream << " # Skipped: No tests ran.";
+        }
+        m_stream << "\n\n" << std::flush;
+        StreamingReporterBase::testRunEnded(_testRunStats);
+    }
+
+
+
+
+} // end namespace Catch
+
+
+
+
+#include <cassert>
+#include <ostream>
+
+namespace Catch {
+
+    namespace {
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::ostream& os, std::string const& _string, std::size_t indent = 0) {
+            std::size_t i = _string.find(": ");
+            if (i != std::string::npos)
+                i += 2;
+            else
+                i = 0;
+            os << TextFlow::Column(_string)
+                  .indent(indent + i)
+                  .initialIndent(indent) << '\n';
+        }
+
+        std::string escape(StringRef str) {
+            std::string escaped = static_cast<std::string>(str);
+            replaceInPlace(escaped, "|", "||");
+            replaceInPlace(escaped, "'", "|'");
+            replaceInPlace(escaped, "\n", "|n");
+            replaceInPlace(escaped, "\r", "|r");
+            replaceInPlace(escaped, "[", "|[");
+            replaceInPlace(escaped, "]", "|]");
+            return escaped;
+        }
+    } // end anonymous namespace
+
+
+    TeamCityReporter::~TeamCityReporter() = default;
+
+    void TeamCityReporter::testRunStarting( TestRunInfo const& runInfo ) {
+        m_stream << "##teamcity[testSuiteStarted name='" << escape( runInfo.name )
+               << "']\n";
+    }
+
+    void TeamCityReporter::testRunEnded( TestRunStats const& runStats ) {
+        m_stream << "##teamcity[testSuiteFinished name='"
+               << escape( runStats.runInfo.name ) << "']\n";
+    }
+
+    void TeamCityReporter::assertionEnded(AssertionStats const& assertionStats) {
+        AssertionResult const& result = assertionStats.assertionResult;
+        if ( !result.isOk() ||
+             result.getResultType() == ResultWas::ExplicitSkip ) {
+
+            ReusableStringStream msg;
+            if (!m_headerPrintedForThisSection)
+                printSectionHeader(msg.get());
+            m_headerPrintedForThisSection = true;
+
+            msg << result.getSourceInfo() << '\n';
+
+            switch (result.getResultType()) {
+            case ResultWas::ExpressionFailed:
+                msg << "expression failed";
+                break;
+            case ResultWas::ThrewException:
+                msg << "unexpected exception";
+                break;
+            case ResultWas::FatalErrorCondition:
+                msg << "fatal error condition";
+                break;
+            case ResultWas::DidntThrowException:
+                msg << "no exception was thrown where one was expected";
+                break;
+            case ResultWas::ExplicitFailure:
+                msg << "explicit failure";
+                break;
+            case ResultWas::ExplicitSkip:
+                msg << "explicit skip";
+                break;
+
+                // We shouldn't get here because of the isOk() test
+            case ResultWas::Ok:
+            case ResultWas::Info:
+            case ResultWas::Warning:
+                CATCH_ERROR("Internal error in TeamCity reporter");
+                // These cases are here to prevent compiler warnings
+            case ResultWas::Unknown:
+            case ResultWas::FailureBit:
+            case ResultWas::Exception:
+                CATCH_ERROR("Not implemented");
+            }
+            if (assertionStats.infoMessages.size() == 1)
+                msg << " with message:";
+            if (assertionStats.infoMessages.size() > 1)
+                msg << " with messages:";
+            for (auto const& messageInfo : assertionStats.infoMessages)
+                msg << "\n  \"" << messageInfo.message << '"';
+
+
+            if (result.hasExpression()) {
+                msg <<
+                    "\n  " << result.getExpressionInMacro() << "\n"
+                    "with expansion:\n"
+                    "  " << result.getExpandedExpression() << '\n';
+            }
+
+            if ( result.getResultType() == ResultWas::ExplicitSkip ) {
+                m_stream << "##teamcity[testIgnored";
+            } else if ( currentTestCaseInfo->okToFail() ) {
+                msg << "- failure ignore as test marked as 'ok to fail'\n";
+                m_stream << "##teamcity[testIgnored";
+            } else {
+                m_stream << "##teamcity[testFailed";
+            }
+            m_stream << " name='" << escape( currentTestCaseInfo->name ) << '\''
+                     << " message='" << escape( msg.str() ) << '\'' << "]\n";
+        }
+        m_stream.flush();
+    }
+
+    void TeamCityReporter::testCaseStarting(TestCaseInfo const& testInfo) {
+        m_testTimer.start();
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_stream << "##teamcity[testStarted name='"
+            << escape(testInfo.name) << "']\n";
+        m_stream.flush();
+    }
+
+    void TeamCityReporter::testCaseEnded(TestCaseStats const& testCaseStats) {
+        StreamingReporterBase::testCaseEnded(testCaseStats);
+        auto const& testCaseInfo = *testCaseStats.testInfo;
+        if (!testCaseStats.stdOut.empty())
+            m_stream << "##teamcity[testStdOut name='"
+            << escape(testCaseInfo.name)
+            << "' out='" << escape(testCaseStats.stdOut) << "']\n";
+        if (!testCaseStats.stdErr.empty())
+            m_stream << "##teamcity[testStdErr name='"
+            << escape(testCaseInfo.name)
+            << "' out='" << escape(testCaseStats.stdErr) << "']\n";
+        m_stream << "##teamcity[testFinished name='"
+            << escape(testCaseInfo.name) << "' duration='"
+            << m_testTimer.getElapsedMilliseconds() << "']\n";
+        m_stream.flush();
+    }
+
+    void TeamCityReporter::printSectionHeader(std::ostream& os) {
+        assert(!m_sectionStack.empty());
+
+        if (m_sectionStack.size() > 1) {
+            os << lineOfChars('-') << '\n';
+
+            std::vector<SectionInfo>::const_iterator
+                it = m_sectionStack.begin() + 1, // Skip first section (test case)
+                itEnd = m_sectionStack.end();
+            for (; it != itEnd; ++it)
+                printHeaderString(os, it->name);
+            os << lineOfChars('-') << '\n';
+        }
+
+        SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
+
+        os << lineInfo << '\n';
+        os << lineOfChars('.') << "\n\n";
+    }
+
+} // end namespace Catch
+
+
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig&& _config )
+    :   StreamingReporterBase( CATCH_MOVE(_config) ),
+        m_xml(m_stream)
+    {
+        m_preferences.shouldRedirectStdOut = true;
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename"_sr, sourceInfo.file )
+            .writeAttribute( "line"_sr, sourceInfo.line );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement("Catch2TestRun")
+             .writeAttribute("name"_sr, m_config->name())
+             .writeAttribute("rng-seed"_sr, m_config->rngSeed())
+             .writeAttribute("xml-format-version"_sr, 3)
+             .writeAttribute("catch2-version"_sr, libraryVersion());
+        if ( m_config->testSpec().hasFilters() ) {
+            m_xml.writeAttribute( "filters"_sr, m_config->testSpec() );
+        }
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name"_sr, trim( StringRef(testInfo.name) ) )
+            .writeAttribute( "tags"_sr, testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name"_sr, trim( StringRef(sectionInfo.name) ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    void XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    auto t = m_xml.scopedElement( "Info" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    auto t = m_xml.scopedElement( "Warning" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if ( !includeResults && result.getResultType() != ResultWas::Warning &&
+             result.getResultType() != ResultWas::ExplicitSkip ) {
+            return;
+        }
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success"_sr, result.succeeded() )
+                .writeAttribute( "type"_sr, result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                     .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::ExplicitSkip:
+                m_xml.startElement( "Skip" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if ( --m_sectionDepth > 0 ) {
+            {
+                XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+                e.writeAttribute( "successes"_sr, sectionStats.assertions.passed );
+                e.writeAttribute( "failures"_sr, sectionStats.assertions.failed );
+                e.writeAttribute( "expectedFailures"_sr, sectionStats.assertions.failedButOk );
+                e.writeAttribute( "skipped"_sr, sectionStats.assertions.skipped > 0 );
+
+                if ( m_config->showDurations() == ShowDurations::Always )
+                    e.writeAttribute( "durationInSeconds"_sr, sectionStats.durationInSeconds );
+            }
+            // Ends assertion tag
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success"_sr, testCaseStats.totals.assertions.allOk() );
+        e.writeAttribute( "skips"_sr, testCaseStats.totals.assertions.skipped );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds"_sr, m_testCaseTimer.getElapsedSeconds() );
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( StringRef(testCaseStats.stdOut) ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( StringRef(testCaseStats.stdErr) ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes"_sr, testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures"_sr, testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures"_sr, testRunStats.totals.assertions.failedButOk )
+            .writeAttribute( "skips"_sr, testRunStats.totals.assertions.skipped );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes"_sr, testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures"_sr, testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures"_sr, testRunStats.totals.testCases.failedButOk )
+            .writeAttribute( "skips"_sr, testRunStats.totals.testCases.skipped );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkPreparing( StringRef name ) {
+        m_xml.startElement("BenchmarkResults")
+             .writeAttribute("name"_sr, name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples"_sr, info.samples)
+            .writeAttribute("resamples"_sr, info.resamples)
+            .writeAttribute("iterations"_sr, info.iterations)
+            .writeAttribute("clockResolution"_sr, info.clockResolution)
+            .writeAttribute("estimatedDuration"_sr, info.estimatedDuration)
+            .writeComment("All values in nano seconds"_sr);
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.scopedElement("mean")
+            .writeAttribute("value"_sr, benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound"_sr, benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound"_sr, benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci"_sr, benchmarkStats.mean.confidence_interval);
+        m_xml.scopedElement("standardDeviation")
+            .writeAttribute("value"_sr, benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound"_sr, benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound"_sr, benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci"_sr, benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.scopedElement("outliers")
+            .writeAttribute("variance"_sr, benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild"_sr, benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere"_sr, benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild"_sr, benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere"_sr, benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(StringRef error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message"_sr, error);
+        m_xml.endElement();
+    }
+
+    void XmlReporter::listReporters(std::vector<ReporterDescription> const& descriptions) {
+        auto outerTag = m_xml.scopedElement("AvailableReporters");
+        for (auto const& reporter : descriptions) {
+            auto inner = m_xml.scopedElement("Reporter");
+            m_xml.startElement("Name", XmlFormatting::Indent)
+                 .writeText(reporter.name, XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+            m_xml.startElement("Description", XmlFormatting::Indent)
+                 .writeText(reporter.description, XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+        }
+    }
+
+    void XmlReporter::listListeners(std::vector<ListenerDescription> const& descriptions) {
+        auto outerTag = m_xml.scopedElement( "RegisteredListeners" );
+        for ( auto const& listener : descriptions ) {
+            auto inner = m_xml.scopedElement( "Listener" );
+            m_xml.startElement( "Name", XmlFormatting::Indent )
+                .writeText( listener.name, XmlFormatting::None )
+                .endElement( XmlFormatting::Newline );
+            m_xml.startElement( "Description", XmlFormatting::Indent )
+                .writeText( listener.description, XmlFormatting::None )
+                .endElement( XmlFormatting::Newline );
+        }
+    }
+
+    void XmlReporter::listTests(std::vector<TestCaseHandle> const& tests) {
+        auto outerTag = m_xml.scopedElement("MatchingTests");
+        for (auto const& test : tests) {
+            auto innerTag = m_xml.scopedElement("TestCase");
+            auto const& testInfo = test.getTestCaseInfo();
+            m_xml.startElement("Name", XmlFormatting::Indent)
+                 .writeText(testInfo.name, XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+            m_xml.startElement("ClassName", XmlFormatting::Indent)
+                 .writeText(testInfo.className, XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+            m_xml.startElement("Tags", XmlFormatting::Indent)
+                 .writeText(testInfo.tagsAsString(), XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+
+            auto sourceTag = m_xml.scopedElement("SourceInfo");
+            m_xml.startElement("File", XmlFormatting::Indent)
+                 .writeText(testInfo.lineInfo.file, XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+            m_xml.startElement("Line", XmlFormatting::Indent)
+                 .writeText(std::to_string(testInfo.lineInfo.line), XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+        }
+    }
+
+    void XmlReporter::listTags(std::vector<TagInfo> const& tags) {
+        auto outerTag = m_xml.scopedElement("TagsFromMatchingTests");
+        for (auto const& tag : tags) {
+            auto innerTag = m_xml.scopedElement("Tag");
+            m_xml.startElement("Count", XmlFormatting::Indent)
+                 .writeText(std::to_string(tag.count), XmlFormatting::None)
+                 .endElement(XmlFormatting::Newline);
+            auto aliasTag = m_xml.scopedElement("Aliases");
+            for (auto const& alias : tag.spellings) {
+                m_xml.startElement("Alias", XmlFormatting::Indent)
+                     .writeText(alias, XmlFormatting::None)
+                     .endElement(XmlFormatting::Newline);
+            }
+        }
+    }
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
diff --git a/lib/catch2/catch_amalgamated.hpp b/lib/catch2/catch_amalgamated.hpp
new file mode 100644
index 000000000..6cc67e76f
--- /dev/null
+++ b/lib/catch2/catch_amalgamated.hpp
@@ -0,0 +1,14057 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+//  Catch v3.6.0
+//  Generated: 2024-05-05 20:53:27.071502
+//  ----------------------------------------------------------
+//  This file is an amalgamation of multiple different files.
+//  You probably shouldn't edit it directly.
+//  ----------------------------------------------------------
+#ifndef CATCH_AMALGAMATED_HPP_INCLUDED
+#define CATCH_AMALGAMATED_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2. It includes **all** of Catch2 headers.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of (significantly) increased
+ * compilation times.
+ *
+ * When a new header is added to either the top level folder, or to the
+ * corresponding internal subfolder, it should be added here. Headers
+ * added to the various subparts (e.g. matchers, generators, etc...),
+ * should go their respective catch-all headers.
+ */
+
+#ifndef CATCH_ALL_HPP_INCLUDED
+#define CATCH_ALL_HPP_INCLUDED
+
+
+
+/** \file
+ * This is a convenience header for Catch2's benchmarking. It includes
+ * **all** of Catch2 headers related to benchmarking.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of (significantly) increased
+ * compilation times.
+ *
+ * When a new header is added to either the `benchmark` folder, or to
+ * the corresponding internal (detail) subfolder, it should be added here.
+ */
+
+#ifndef CATCH_BENCHMARK_ALL_HPP_INCLUDED
+#define CATCH_BENCHMARK_ALL_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_BENCHMARK_HPP_INCLUDED
+#define CATCH_BENCHMARK_HPP_INCLUDED
+
+
+
+#ifndef CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+#define CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+
+
+#ifndef CATCH_PLATFORM_HPP_INCLUDED
+#define CATCH_PLATFORM_HPP_INCLUDED
+
+// See e.g.:
+// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
+#ifdef __APPLE__
+#  ifndef __has_extension
+#    define __has_extension(x) 0
+#  endif
+#  include <TargetConditionals.h>
+#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
+      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
+#    define CATCH_PLATFORM_MAC
+#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
+#    define CATCH_PLATFORM_IPHONE
+#  endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+
+#  if defined( WINAPI_FAMILY ) && ( WINAPI_FAMILY == WINAPI_FAMILY_APP )
+#      define CATCH_PLATFORM_WINDOWS_UWP
+#  endif
+
+#elif defined(__ORBIS__) || defined(__PROSPERO__)
+#  define CATCH_PLATFORM_PLAYSTATION
+
+#endif
+
+#endif // CATCH_PLATFORM_HPP_INCLUDED
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+#    define CATCH_CPP20_OR_GREATER
+#  endif
+
+#endif
+
+// Only GCC compiler should be used in this block, so other compilers trying to
+// mask themselves as GCC should be ignored.
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) && !defined(__NVCOMPILER)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+// This only works on GCC 9+. so we have to also add a global suppression of Wparentheses
+// for older versions of GCC.
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+         _Pragma( "GCC diagnostic ignored \"-Wunused-result\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wuseless-cast\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wshadow\"" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
+#endif
+
+#if defined(__NVCOMPILER)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "diag push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "diag pop" )
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma( "diag_suppress declared_but_not_referenced" )
+#endif
+
+#if defined(__CUDACC__) && !defined(__clang__)
+#  ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
+// New pragmas introduced in CUDA 11.5+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "nv_diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "nv_diagnostic pop" )
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma( "nv_diag_suppress 177" )
+#  else
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma( "diag_suppress 177" )
+#  endif
+#endif
+
+// clang-cl defines _MSC_VER as well as __clang__, which could cause the
+// start/stop internal suppression macros to be double defined.
+#if defined(__clang__) && !defined(_MSC_VER)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+#endif // __clang__ && !_MSC_VER
+
+#if defined(__clang__)
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Similarly, NVHPC's implementation of `__builtin_constant_p` has a bug which
+// results in calls to the immediately evaluated lambda expressions to be
+// reported as unevaluated lambdas.
+// https://developer.nvidia.com/nvidia_bug/3321845.
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__) && !defined(__CUDACC__) && !defined( __NVCOMPILER )
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
+        _Pragma( "clang diagnostic ignored \"-Wcomma\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+        _Pragma( "clang diagnostic ignored \"-Wshadow\"" )
+
+#endif // __clang__
+
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined( CATCH_PLATFORM_WINDOWS ) ||                                       \
+    defined( CATCH_PLATFORM_PLAYSTATION ) ||                                   \
+    defined( __CYGWIN__ ) ||                                                   \
+    defined( __QNX__ ) ||                                                      \
+    defined( __EMSCRIPTEN__ ) ||                                               \
+    defined( __DJGPP__ ) ||                                                    \
+    defined( __OS400__ )
+#    define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#else
+#    define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that some platforms do not support getenv.
+#if defined( CATCH_PLATFORM_WINDOWS_UWP ) ||                                   \
+    defined( CATCH_PLATFORM_PLAYSTATION ) ||                                   \
+    defined( _GAMING_XBOX )
+#    define CATCH_INTERNAL_CONFIG_NO_GETENV
+#else
+#    define CATCH_INTERNAL_CONFIG_GETENV
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+// We want to defer to nvcc-specific warning suppression if we are compiled
+// with nvcc masquerading for MSVC.
+#    if !defined( __CUDACC__ )
+#        define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            __pragma( warning( push ) )
+#        define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+            __pragma( warning( pop ) )
+#    endif
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(CATCH_PLATFORM_WINDOWS_UWP)
+#    define CATCH_INTERNAL_CONFIG_NO_COLOUR_WIN32
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_INTERNAL_CONFIG_NO_COLOUR_WIN32
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    include <cstddef>
+  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
+  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #    endif
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GETENV) && !defined(CATCH_INTERNAL_CONFIG_NO_GETENV) && !defined(CATCH_CONFIG_NO_GETENV) && !defined(CATCH_CONFIG_GETENV)
+#   define CATCH_CONFIG_GETENV
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined( CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED ) && \
+    !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS ) &&          \
+    !defined( CATCH_CONFIG_NO_DISABLE_EXCEPTIONS )
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS
+#endif
+
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+#if defined( CATCH_PLATFORM_WINDOWS ) &&       \
+    !defined( CATCH_CONFIG_COLOUR_WIN32 ) && \
+    !defined( CATCH_CONFIG_NO_COLOUR_WIN32 ) && \
+    !defined( CATCH_INTERNAL_CONFIG_NO_COLOUR_WIN32 )
+#    define CATCH_CONFIG_COLOUR_WIN32
+#endif
+
+#if defined( CATCH_CONFIG_SHARED_LIBRARY ) && defined( _MSC_VER ) && \
+    !defined( CATCH_CONFIG_STATIC )
+#    ifdef Catch2_EXPORTS
+#        define CATCH_EXPORT //__declspec( dllexport ) // not needed
+#    else
+#        define CATCH_EXPORT __declspec( dllimport )
+#    endif
+#else
+#    define CATCH_EXPORT
+#endif
+
+#endif // CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+
+
+#ifndef CATCH_CONTEXT_HPP_INCLUDED
+#define CATCH_CONTEXT_HPP_INCLUDED
+
+
+namespace Catch {
+
+    class IResultCapture;
+    class IConfig;
+
+    class Context {
+        IConfig const* m_config = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+
+        CATCH_EXPORT static Context* currentContext;
+        friend Context& getCurrentMutableContext();
+        friend Context const& getCurrentContext();
+        static void createContext();
+        friend void cleanUpContext();
+
+    public:
+        IResultCapture* getResultCapture() const { return m_resultCapture; }
+        IConfig const* getConfig() const { return m_config; }
+        void setResultCapture( IResultCapture* resultCapture );
+        void setConfig( IConfig const* config );
+    };
+
+    Context& getCurrentMutableContext();
+
+    inline Context const& getCurrentContext() {
+        // We duplicate the logic from `getCurrentMutableContext` here,
+        // to avoid paying the call overhead in debug mode.
+        if ( !Context::currentContext ) { Context::createContext(); }
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *Context::currentContext;
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& sharedRng();
+}
+
+#endif // CATCH_CONTEXT_HPP_INCLUDED
+
+
+#ifndef CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
+#define CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
+
+#include <type_traits>
+
+//! Replacement for std::move with better compile time performance
+#define CATCH_MOVE(...) static_cast<std::remove_reference_t<decltype(__VA_ARGS__)>&&>(__VA_ARGS__)
+
+//! Replacement for std::forward with better compile time performance
+#define CATCH_FORWARD(...) static_cast<decltype(__VA_ARGS__)&&>(__VA_ARGS__)
+
+#endif // CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
+
+
+#ifndef CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
+#define CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
+
+namespace Catch {
+
+    //! Used to signal that an assertion macro failed
+    struct TestFailureException{};
+    //! Used to signal that the remainder of a test should be skipped
+    struct TestSkipException {};
+
+    /**
+     * Outlines throwing of `TestFailureException` into a single TU
+     *
+     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
+     */
+    [[noreturn]] void throw_test_failure_exception();
+
+    /**
+     * Outlines throwing of `TestSkipException` into a single TU
+     *
+     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
+     */
+    [[noreturn]] void throw_test_skip_exception();
+
+} // namespace Catch
+
+#endif // CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
+
+
+#ifndef CATCH_UNIQUE_NAME_HPP_INCLUDED
+#define CATCH_UNIQUE_NAME_HPP_INCLUDED
+
+
+
+
+/** \file
+ * Wrapper for the CONFIG configuration option
+ *
+ * When generating internal unique names, there are two options. Either
+ * we mix in the current line number, or mix in an incrementing number.
+ * We prefer the latter, using `__COUNTER__`, but users might want to
+ * use the former.
+ */
+
+#ifndef CATCH_CONFIG_COUNTER_HPP_INCLUDED
+#define CATCH_CONFIG_COUNTER_HPP_INCLUDED
+
+
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+#if defined( CATCH_INTERNAL_CONFIG_COUNTER ) && \
+    !defined( CATCH_CONFIG_NO_COUNTER ) && \
+    !defined( CATCH_CONFIG_COUNTER )
+#    define CATCH_CONFIG_COUNTER
+#endif
+
+
+#endif // CATCH_CONFIG_COUNTER_HPP_INCLUDED
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#endif // CATCH_UNIQUE_NAME_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+#define CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+
+#include <string>
+#include <chrono>
+
+
+
+#ifndef CATCH_STRINGREF_HPP_INCLUDED
+#define CATCH_STRINGREF_HPP_INCLUDED
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+#include <cstring>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+        static constexpr size_type npos{ static_cast<size_type>( -1 ) };
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef other ) const noexcept -> bool {
+            return m_size == other.m_size
+                && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+        }
+        auto operator != (StringRef other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        constexpr auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+        bool operator<(StringRef rhs) const noexcept;
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        constexpr StringRef substr(size_type start, size_type length) const noexcept {
+            if (start < m_size) {
+                const auto shortened_size = m_size - start;
+                return StringRef(m_start + start, (shortened_size < length) ? shortened_size : length);
+            } else {
+                return StringRef();
+            }
+        }
+
+        // Returns the current start pointer. May not be null-terminated.
+        constexpr char const* data() const noexcept {
+            return m_start;
+        }
+
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+
+
+        friend std::string& operator += (std::string& lhs, StringRef rhs);
+        friend std::ostream& operator << (std::ostream& os, StringRef str);
+        friend std::string operator+(StringRef lhs, StringRef rhs);
+
+        /**
+         * Provides a three-way comparison with rhs
+         *
+         * Returns negative number if lhs < rhs, 0 if lhs == rhs, and a positive
+         * number if lhs > rhs
+         */
+        int compare( StringRef rhs ) const;
+    };
+
+
+    constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+#endif // CATCH_STRINGREF_HPP_INCLUDED
+
+
+#ifndef CATCH_RESULT_TYPE_HPP_INCLUDED
+#define CATCH_RESULT_TYPE_HPP_INCLUDED
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+        // TODO: Should explicit skip be considered "not OK" (cf. isOk)? I.e., should it have the failure bit?
+        ExplicitSkip = 4,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+#endif // CATCH_RESULT_TYPE_HPP_INCLUDED
+
+
+#ifndef CATCH_UNIQUE_PTR_HPP_INCLUDED
+#define CATCH_UNIQUE_PTR_HPP_INCLUDED
+
+#include <cassert>
+#include <type_traits>
+
+
+namespace Catch {
+namespace Detail {
+    /**
+     * A reimplementation of `std::unique_ptr` for improved compilation performance
+     *
+     * Does not support arrays nor custom deleters.
+     */
+    template <typename T>
+    class unique_ptr {
+        T* m_ptr;
+    public:
+        constexpr unique_ptr(std::nullptr_t = nullptr):
+            m_ptr{}
+        {}
+        explicit constexpr unique_ptr(T* ptr):
+            m_ptr(ptr)
+        {}
+
+        template <typename U, typename = std::enable_if_t<std::is_base_of<T, U>::value>>
+        unique_ptr(unique_ptr<U>&& from):
+            m_ptr(from.release())
+        {}
+
+        template <typename U, typename = std::enable_if_t<std::is_base_of<T, U>::value>>
+        unique_ptr& operator=(unique_ptr<U>&& from) {
+            reset(from.release());
+
+            return *this;
+        }
+
+        unique_ptr(unique_ptr const&) = delete;
+        unique_ptr& operator=(unique_ptr const&) = delete;
+
+        unique_ptr(unique_ptr&& rhs) noexcept:
+            m_ptr(rhs.m_ptr) {
+            rhs.m_ptr = nullptr;
+        }
+        unique_ptr& operator=(unique_ptr&& rhs) noexcept {
+            reset(rhs.release());
+
+            return *this;
+        }
+
+        ~unique_ptr() {
+            delete m_ptr;
+        }
+
+        T& operator*() {
+            assert(m_ptr);
+            return *m_ptr;
+        }
+        T const& operator*() const {
+            assert(m_ptr);
+            return *m_ptr;
+        }
+        T* operator->() noexcept {
+            assert(m_ptr);
+            return m_ptr;
+        }
+        T const* operator->() const noexcept {
+            assert(m_ptr);
+            return m_ptr;
+        }
+
+        T* get() { return m_ptr; }
+        T const* get() const { return m_ptr; }
+
+        void reset(T* ptr = nullptr) {
+            delete m_ptr;
+            m_ptr = ptr;
+        }
+
+        T* release() {
+            auto temp = m_ptr;
+            m_ptr = nullptr;
+            return temp;
+        }
+
+        explicit operator bool() const {
+            return m_ptr;
+        }
+
+        friend void swap(unique_ptr& lhs, unique_ptr& rhs) {
+            auto temp = lhs.m_ptr;
+            lhs.m_ptr = rhs.m_ptr;
+            rhs.m_ptr = temp;
+        }
+    };
+
+    //! Specialization to cause compile-time error for arrays
+    template <typename T>
+    class unique_ptr<T[]>;
+
+    template <typename T, typename... Args>
+    unique_ptr<T> make_unique(Args&&... args) {
+        return unique_ptr<T>(new T(CATCH_FORWARD(args)...));
+    }
+
+
+} // end namespace Detail
+} // end namespace Catch
+
+#endif // CATCH_UNIQUE_PTR_HPP_INCLUDED
+
+
+#ifndef CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_CLOCK_HPP_INCLUDED
+#define CATCH_CLOCK_HPP_INCLUDED
+
+#include <chrono>
+
+namespace Catch {
+    namespace Benchmark {
+        using IDuration = std::chrono::nanoseconds;
+        using FDuration = std::chrono::duration<double, std::nano>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CLOCK_HPP_INCLUDED
+
+namespace Catch {
+
+    // We cannot forward declare the type with default template argument
+    // multiple times, so it is split out into a separate header so that
+    // we can prevent multiple declarations in dependees
+    template <typename Duration = Benchmark::FDuration>
+    struct BenchmarkStats;
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    class ITransientExpression;
+    class IGeneratorTracker;
+
+    struct BenchmarkInfo;
+
+    namespace Generators {
+        class GeneratorUntypedBase;
+        using GeneratorBasePtr = Catch::Detail::unique_ptr<GeneratorUntypedBase>;
+    }
+
+
+    class IResultCapture {
+    public:
+        virtual ~IResultCapture();
+
+        virtual void notifyAssertionStarted( AssertionInfo const& info ) = 0;
+        virtual bool sectionStarted( StringRef sectionName,
+                                     SourceLineInfo const& sectionLineInfo,
+                                     Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo&& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo&& endInfo ) = 0;
+
+        virtual IGeneratorTracker*
+        acquireGeneratorTracker( StringRef generatorName,
+                                 SourceLineInfo const& lineInfo ) = 0;
+        virtual IGeneratorTracker*
+        createGeneratorTracker( StringRef generatorName,
+                                SourceLineInfo lineInfo,
+                                Generators::GeneratorBasePtr&& generator ) = 0;
+
+        virtual void benchmarkPreparing( StringRef name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( StringRef error ) = 0;
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder&& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string&& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+#endif // CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_CONFIG_HPP_INCLUDED
+#define CATCH_INTERFACES_CONFIG_HPP_INCLUDED
+
+
+
+#ifndef CATCH_NONCOPYABLE_HPP_INCLUDED
+#define CATCH_NONCOPYABLE_HPP_INCLUDED
+
+namespace Catch {
+    namespace Detail {
+
+        //! Deriving classes become noncopyable and nonmovable
+        class NonCopyable {
+            NonCopyable( NonCopyable const& ) = delete;
+            NonCopyable( NonCopyable&& ) = delete;
+            NonCopyable& operator=( NonCopyable const& ) = delete;
+            NonCopyable& operator=( NonCopyable&& ) = delete;
+
+        protected:
+            NonCopyable() noexcept = default;
+        };
+
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_NONCOPYABLE_HPP_INCLUDED
+
+#include <chrono>
+#include <iosfwd>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        //! A test case or leaf section did not run any assertions
+        NoAssertions = 0x01,
+        //! A command line test spec matched no test cases
+        UnmatchedTestSpec = 0x02,
+    }; };
+
+    enum class ShowDurations {
+        DefaultForReporter,
+        Always,
+        Never
+    };
+    enum class TestRunOrder {
+        Declared,
+        LexicographicallySorted,
+        Randomized
+    };
+    enum class ColourMode : std::uint8_t {
+        //! Let Catch2 pick implementation based on platform detection
+        PlatformDefault,
+        //! Use ANSI colour code escapes
+        ANSI,
+        //! Use Win32 console colour API
+        Win32,
+        //! Don't use any colour
+        None
+    };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+    class IStream;
+
+    class IConfig : public Detail::NonCopyable {
+    public:
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual StringRef name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutUnmatchedTestSpecs() const = 0;
+        virtual bool zeroTestsCountAsSuccess() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations showDurations() const = 0;
+        virtual double minDuration() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual TestRunOrder runOrder() const = 0;
+        virtual uint32_t rngSeed() const = 0;
+        virtual unsigned int shardCount() const = 0;
+        virtual unsigned int shardIndex() const = 0;
+        virtual ColourMode defaultColourMode() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool skipBenchmarks() const = 0;
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual unsigned int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
+    };
+}
+
+#endif // CATCH_INTERFACES_CONFIG_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
+#define CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    class TestCaseHandle;
+    struct TestCaseInfo;
+    class ITestCaseRegistry;
+    class IExceptionTranslatorRegistry;
+    class IExceptionTranslator;
+    class ReporterRegistry;
+    class IReporterFactory;
+    class ITagAliasRegistry;
+    class ITestInvoker;
+    class IMutableEnumValuesRegistry;
+    struct SourceLineInfo;
+
+    class StartupExceptionRegistry;
+    class EventListenerFactory;
+
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
+
+    class IRegistryHub {
+    public:
+        virtual ~IRegistryHub(); // = default
+
+        virtual ReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    class IMutableRegistryHub {
+    public:
+        virtual ~IMutableRegistryHub(); // = default
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0;
+        virtual void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) = 0;
+        virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0;
+        virtual void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+#endif // CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
+
+
+#ifndef CATCH_BENCHMARK_STATS_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_ESTIMATE_HPP_INCLUDED
+#define CATCH_ESTIMATE_HPP_INCLUDED
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Type>
+        struct Estimate {
+            Type point;
+            Type lower_bound;
+            Type upper_bound;
+            double confidence_interval;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_ESTIMATE_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
+#define CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_OUTLIERS_CLASSIFICATION_HPP_INCLUDED
+// The fwd decl & default specialization needs to be seen by VS2017 before
+// BenchmarkStats itself, or VS2017 will report compilation error.
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        unsigned int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    // We need to keep template parameter for backwards compatibility,
+    // but we also do not want to use the template paraneter.
+    template <class Dummy>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Benchmark::FDuration> samples;
+        Benchmark::Estimate<Benchmark::FDuration> mean;
+        Benchmark::Estimate<Benchmark::FDuration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+    };
+
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_ENVIRONMENT_HPP_INCLUDED
+#define CATCH_ENVIRONMENT_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Benchmark {
+        struct EnvironmentEstimate {
+            FDuration mean;
+            OutlierClassification outliers;
+        };
+        struct Environment {
+            EnvironmentEstimate clock_resolution;
+            EnvironmentEstimate clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_ENVIRONMENT_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_EXECUTION_PLAN_HPP_INCLUDED
+#define CATCH_EXECUTION_PLAN_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
+#define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_CHRONOMETER_HPP_INCLUDED
+#define CATCH_CHRONOMETER_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_OPTIMIZER_HPP_INCLUDED
+#define CATCH_OPTIMIZER_HPP_INCLUDED
+
+#if defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
+
+#if defined(_MSVC_VER)
+#pragma optimize("", off)
+#elif defined(__IAR_SYSTEMS_ICC__)
+// For IAR the pragma only affects the following function
+#pragma optimize=disable
+#endif
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#if defined(_MSVC_VER)
+#pragma optimize("", on)
+#endif
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<!std::is_same<void, decltype(fn(args...))>::value> {
+            deoptimize_value(CATCH_FORWARD(fn) (CATCH_FORWARD(args)...));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<std::is_same<void, decltype(fn(args...))>::value> {
+            CATCH_FORWARD((fn)) (CATCH_FORWARD(args)...);
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_OPTIMIZER_HPP_INCLUDED
+
+
+#ifndef CATCH_META_HPP_INCLUDED
+#define CATCH_META_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+    template <typename>
+    struct true_given : std::true_type {};
+
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        static true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
+        template <typename...>
+        static std::false_type test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::result_of_t<Func(U...)>>>;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+#endif // CATCH_META_HPP_INCLUDED
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept(); // = default;
+
+                ChronometerConcept() = default;
+                ChronometerConcept(ChronometerConcept const&) = default;
+                ChronometerConcept& operator=(ChronometerConcept const&) = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                IDuration elapsed() const {
+                    return std::chrono::duration_cast<std::chrono::nanoseconds>(
+                        finished - started );
+                }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(CATCH_FORWARD(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return repeats; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int repeats_)
+                : impl(&meter)
+                , repeats(repeats_) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < repeats; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int repeats;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CHRONOMETER_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<std::decay_t<T>, std::decay_t<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual Catch::Detail::unique_ptr<callable> clone() const = 0;
+                    virtual ~callable(); // = default;
+
+                    callable() = default;
+                    callable(callable const&) = default;
+                    callable& operator=(callable const&) = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun_) : fun(CATCH_MOVE(fun_)) {}
+                    model(Fun const& fun_) : fun(fun_) {}
+
+                    Catch::Detail::unique_ptr<callable> clone() const override {
+                        return Catch::Detail::make_unique<model<Fun>>( *this );
+                    }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    std::enable_if_t<!is_related<Fun, BenchmarkFunction>::value, int> = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<std::decay_t<Fun>>(CATCH_FORWARD(fun))) {}
+
+                BenchmarkFunction( BenchmarkFunction&& that ) noexcept:
+                    f( CATCH_MOVE( that.f ) ) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction&
+                operator=( BenchmarkFunction&& that ) noexcept {
+                    f = CATCH_MOVE( that.f );
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f = that.f->clone();
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                Catch::Detail::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_REPEAT_HPP_INCLUDED
+#define CATCH_REPEAT_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<std::decay_t<Fun>> repeat(Fun&& fun) {
+                return { CATCH_FORWARD(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_REPEAT_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+#define CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_MEASURE_HPP_INCLUDED
+#define CATCH_MEASURE_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+#define CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(CATCH_FORWARD(fun), CATCH_FORWARD(args)...);
+            }
+
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            return Detail::complete_invoke(CATCH_FORWARD(fun));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_TIMING_HPP_INCLUDED
+#define CATCH_TIMING_HPP_INCLUDED
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Result>
+        struct Timing {
+            IDuration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Func, typename... Args>
+        using TimingOf = Timing<Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_TIMING_HPP_INCLUDED
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, CATCH_FORWARD(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, CATCH_FORWARD(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_MEASURE_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), CATCH_MOVE(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = std::conditional_t<is_callable<Fun(Chronometer)>::value, Chronometer, int>;
+
+
+            [[noreturn]]
+            void throw_optimized_away_error();
+
+            template <typename Clock, typename Fun>
+            TimingOf<Fun, run_for_at_least_argument_t<Clock, Fun>>
+                run_for_at_least(IDuration how_long,
+                                 const int initial_iterations,
+                                 Fun&& fun) {
+                auto iters = initial_iterations;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, CATCH_MOVE(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                throw_optimized_away_error();
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            FDuration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            FDuration warmup_time;
+            int warmup_iterations;
+
+            template <typename Clock>
+            std::vector<FDuration> run(const IConfig &cfg, Environment env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(
+                    std::chrono::duration_cast<IDuration>( warmup_time ),
+                    warmup_iterations,
+                    Detail::repeat( []() { return Clock::now(); } )
+                );
+
+                std::vector<FDuration> times;
+                const auto num_samples = cfg.benchmarkSamples();
+                times.reserve( num_samples );
+                for ( size_t i = 0; i < num_samples; ++i ) {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark( Chronometer( model, iterations_per_sample ) );
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if ( sample_time < FDuration::zero() ) {
+                        sample_time = FDuration::zero();
+                    }
+                    times.push_back(sample_time / iterations_per_sample);
+                }
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_EXECUTION_PLAN_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
+#define CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_STATS_HPP_INCLUDED
+#define CATCH_STATS_HPP_INCLUDED
+
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last );
+
+            OutlierClassification
+            classify_outliers( double const* first, double const* last );
+
+            double mean( double const* first, double const* last );
+
+            double normal_cdf( double x );
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) );
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_STATS_HPP_INCLUDED
+
+#include <algorithm>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(static_cast<size_t>(k + 1));
+                for ( int i = 0; i < k + 1; ++i ) {
+                    times.push_back( Clock::now() );
+                }
+
+                std::vector<double> deltas;
+                deltas.reserve(static_cast<size_t>(k));
+                for ( size_t idx = 1; idx < times.size(); ++idx ) {
+                    deltas.push_back( static_cast<double>(
+                        ( times[idx] - times[idx - 1] ).count() ) );
+                }
+
+                return deltas;
+            }
+
+            constexpr auto warmup_iterations = 10000;
+            constexpr auto warmup_time = std::chrono::milliseconds(100);
+            constexpr auto minimum_ticks = 1000;
+            constexpr auto warmup_seed = 10000;
+            constexpr auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            constexpr auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            constexpr auto clock_cost_estimation_tick_limit = 100000;
+            constexpr auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            constexpr auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(warmup_time, warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(clock_resolution_estimation_time, iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FDuration(mean(r.data(), r.data() + r.size())),
+                    classify_outliers(r.data(), r.data() + r.size()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate estimate_clock_cost(FDuration resolution) {
+                auto time_limit = (std::min)(
+                    resolution * clock_cost_estimation_tick_limit,
+                    FDuration(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(clock_cost_estimation_time, iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(static_cast<size_t>(nsamples));
+                for ( int s = 0; s < nsamples; ++s ) {
+                    times.push_back( static_cast<double>(
+                        ( time_clock( r.iterations ) / r.iterations )
+                            .count() ) );
+                }
+                return {
+                    FDuration(mean(times.data(), times.data() + times.size())),
+                    classify_outliers(times.data(), times.data() + times.size()),
+                };
+            }
+
+            template <typename Clock>
+            Environment measure_environment() {
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+                static Catch::Detail::unique_ptr<Environment> env;
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = Catch::Detail::make_unique<Environment>( Environment{resolution, cost} );
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_ANALYSE_HPP_INCLUDED
+#define CATCH_ANALYSE_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
+#define CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
+
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        struct SampleAnalysis {
+            std::vector<FDuration> samples;
+            Estimate<FDuration> mean;
+            Estimate<FDuration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
+
+
+namespace Catch {
+    class IConfig;
+
+    namespace Benchmark {
+        namespace Detail {
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_ANALYSE_HPP_INCLUDED
+
+#include <algorithm>
+#include <chrono>
+#include <exception>
+#include <string>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string&& benchmarkName)
+                : name(CATCH_MOVE(benchmarkName)) {}
+
+            template <class FUN>
+            Benchmark(std::string&& benchmarkName , FUN &&func)
+                : fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}
+
+            template <typename Clock>
+            ExecutionPlan prepare(const IConfig &cfg, Environment env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                static_assert( Clock::is_steady,
+                               "Benchmarking clock should be steady" );
+                auto const* cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        CATCH_MOVE(name),
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
+                    BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+                } CATCH_CATCH_ANON (TestFailureException const&) {
+                    getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
+                } CATCH_CATCH_ALL{
+                    getResultCapture().benchmarkFailed(translateActiveException());
+                    // We let the exception go further up so that the
+                    // test case is marked as failed.
+                    std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun, std::enable_if_t<!Detail::is_related<Fun, Benchmark>::value, int> = 0>
+                Benchmark & operator=(Fun func) {
+                auto const* cfg = getCurrentContext().getConfig();
+                if (!cfg->skipBenchmarks()) {
+                    fun = Detail::BenchmarkFunction(func);
+                    run();
+                }
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+#if defined(CATCH_CONFIG_PREFIX_ALL)
+
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), name)
+
+#else
+
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), name)
+
+#endif
+
+#endif // CATCH_BENCHMARK_HPP_INCLUDED
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_CONSTRUCTOR_HPP_INCLUDED
+#define CATCH_CONSTRUCTOR_HPP_INCLUDED
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                ObjectStorage() = default;
+
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
+
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(data) T(CATCH_MOVE(other.stored_object()));
+                }
+
+                ~ObjectStorage() { destruct_on_exit<T>(); }
+
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (data) T(CATCH_FORWARD(args)...);
+                }
+
+                template <bool AllowManualDestruction = !Destruct>
+                std::enable_if_t<AllowManualDestruction> destruct()
+                {
+                    stored_object().~T();
+                }
+
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(std::enable_if_t<Destruct, U>* = nullptr) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(std::enable_if_t<!Destruct, U>* = nullptr) { }
+
+#if defined( __GNUC__ ) && __GNUC__ <= 6
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+                T& stored_object() { return *reinterpret_cast<T*>( data ); }
+
+                T const& stored_object() const {
+                    return *reinterpret_cast<T const*>( data );
+                }
+#if defined( __GNUC__ ) && __GNUC__ <= 6
+#    pragma GCC diagnostic pop
+#endif
+
+                alignas( T ) unsigned char data[sizeof( T )]{};
+            };
+        } // namespace Detail
+
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
+
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONSTRUCTOR_HPP_INCLUDED
+
+#endif // CATCH_BENCHMARK_ALL_HPP_INCLUDED
+
+
+#ifndef CATCH_APPROX_HPP_INCLUDED
+#define CATCH_APPROX_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TOSTRING_HPP_INCLUDED
+#define CATCH_TOSTRING_HPP_INCLUDED
+
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+
+
+
+
+/** \file
+ * Wrapper for the WCHAR configuration option
+ *
+ * We want to support platforms that do not provide `wchar_t`, so we
+ * sometimes have to disable providing wchar_t overloads through Catch2,
+ * e.g. the StringMaker specialization for `std::wstring`.
+ */
+
+#ifndef CATCH_CONFIG_WCHAR_HPP_INCLUDED
+#define CATCH_CONFIG_WCHAR_HPP_INCLUDED
+
+
+// We assume that WCHAR should be enabled by default, and only disabled
+// for a shortlist (so far only DJGPP) of compilers.
+
+#if defined(__DJGPP__)
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+#if !defined( CATCH_INTERNAL_CONFIG_NO_WCHAR ) && \
+    !defined( CATCH_CONFIG_NO_WCHAR ) && \
+    !defined( CATCH_CONFIG_WCHAR )
+#    define CATCH_CONFIG_WCHAR
+#endif
+
+#endif // CATCH_CONFIG_WCHAR_HPP_INCLUDED
+
+
+#ifndef CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED
+#define CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED
+
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+#include <string>
+
+namespace Catch {
+
+    class ReusableStringStream : Detail::NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        //! Returns the serialized state
+        std::string str() const;
+        //! Sets internal state to `str`
+        void str(std::string const& str);
+
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// Old versions of GCC do not understand -Wnonnull-compare
+#pragma GCC diagnostic ignored "-Wpragmas"
+// Streaming a function pointer triggers Waddress and Wnonnull-compare
+// on GCC, because it implicitly converts it to bool and then decides
+// that the check it uses (a? true : false) is tautological and cannot
+// be null...
+#pragma GCC diagnostic ignored "-Waddress"
+#pragma GCC diagnostic ignored "-Wnonnull-compare"
+#endif
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+#endif // CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED
+
+
+#ifndef CATCH_VOID_TYPE_HPP_INCLUDED
+#define CATCH_VOID_TYPE_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Detail {
+
+        template <typename...>
+        struct make_void { using type = void; };
+
+        template <typename... Ts>
+        using void_t = typename make_void<Ts...>::type;
+
+    } // namespace Detail
+} // namespace Catch
+
+
+#endif // CATCH_VOID_TYPE_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+#define CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    class IMutableEnumValuesRegistry {
+    public:
+        virtual ~IMutableEnumValuesRegistry(); // = default;
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+#endif // CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy{};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+    // Bring in global namespace operator<< for ADL lookup in
+    // `IsStreamInsertable` below.
+    using ::operator<<;
+
+    namespace Detail {
+
+        inline std::size_t catch_strnlen(const char *str, std::size_t n) {
+            auto ret = std::char_traits<char>::find(str, n, '\0');
+            if (ret != nullptr) {
+                return static_cast<std::size_t>(ret - str);
+            }
+            return n;
+        }
+
+        constexpr StringRef unprintableString = "{?}"_sr;
+
+        //! Encases `string in quotes, and optionally escapes invisibles
+        std::string convertIntoString( StringRef string, bool escapeInvisibles );
+
+        //! Encases `string` in quotes, and escapes invisibles if user requested
+        //! it via CLI
+        std::string convertIntoString( StringRef string );
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        std::enable_if_t<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string> convertUnstreamable( T const& ) {
+            return std::string(Detail::unprintableString);
+        }
+        template<typename T>
+        std::enable_if_t<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string> convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+
+        template<typename T>
+        std::enable_if_t<
+            std::is_enum<T>::value,
+        std::string> convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        std::enable_if_t<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        std::enable_if_t<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<std::remove_cv_t<std::remove_reference_t<T>>>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<std::underlying_type_t<E>>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#if defined(CATCH_CONFIG_WCHAR)
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif // CATCH_CONFIG_WCHAR
+
+    template<size_t SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return Detail::convertIntoString(
+                StringRef( str, Detail::catch_strnlen( str, SZ ) ) );
+        }
+    };
+    template<size_t SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            auto reinterpreted = reinterpret_cast<char const*>(str);
+            return Detail::convertIntoString(
+                StringRef(reinterpreted, Detail::catch_strnlen(reinterpreted, SZ)));
+        }
+    };
+    template<size_t SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            auto reinterpreted = reinterpret_cast<char const*>(str);
+            return Detail::convertIntoString(
+                StringRef(reinterpreted, Detail::catch_strnlen(reinterpreted, SZ)));
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b) {
+            using namespace std::string_literals;
+            return b ? "true"s : "false"s;
+        }
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char value);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char value);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t) {
+            using namespace std::string_literals;
+            return "nullptr"s;
+        }
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        CATCH_EXPORT static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        CATCH_EXPORT static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator, typename Sentinel = InputIterator>
+        std::string rangeToString(InputIterator first, Sentinel last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in their headers
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            if (optional.has_value()) {
+                return ::Catch::Detail::stringify(*optional);
+            } else {
+                return "{ }";
+            }
+        }
+    };
+    template <>
+    struct StringMaker<std::nullopt_t> {
+        static std::string convert(const std::nullopt_t&) {
+            return "{ }";
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
+    using std::end;
+
+    namespace Detail {
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {};
+
+        template <typename T>
+        struct is_range_impl<T, void_t<decltype(begin(std::declval<T>()))>> : std::true_type {};
+    } // namespace Detail
+
+    template <typename T>
+    struct is_range : Detail::is_range_impl<T> {};
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, std::enable_if_t<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, size_t SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol() {
+        Catch::ReusableStringStream rss;
+        rss << '[' << Ratio::num << '/'
+            << Ratio::den << ']';
+        return rss.str();
+    }
+};
+
+template <>
+struct ratio_string<std::atto> {
+    static char symbol() { return 'a'; }
+};
+template <>
+struct ratio_string<std::femto> {
+    static char symbol() { return 'f'; }
+};
+template <>
+struct ratio_string<std::pico> {
+    static char symbol() { return 'p'; }
+};
+template <>
+struct ratio_string<std::nano> {
+    static char symbol() { return 'n'; }
+};
+template <>
+struct ratio_string<std::micro> {
+    static char symbol() { return 'u'; }
+};
+template <>
+struct ratio_string<std::milli> {
+    static char symbol() { return 'm'; }
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp, timeStampSize - 1);
+        }
+    };
+}
+
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif // CATCH_TOSTRING_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Sets and validates the new margin (margin >= 0)
+        void setMargin(double margin);
+        // Sets and validates the new epsilon (0 < epsilon < 1)
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        Approx operator()( T const& value ) const {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        Approx& epsilon( T const& newEpsilon ) {
+            const auto epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        Approx& margin( T const& newMargin ) {
+            const auto marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+
+namespace literals {
+    Approx operator ""_a(long double val);
+    Approx operator ""_a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Approx> {
+    static std::string convert(Catch::Approx const& value);
+};
+
+} // end namespace Catch
+
+#endif // CATCH_APPROX_HPP_INCLUDED
+
+
+#ifndef CATCH_ASSERTION_INFO_HPP_INCLUDED
+#define CATCH_ASSERTION_INFO_HPP_INCLUDED
+
+
+
+#ifndef CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+#define CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+
+#include <cstddef>
+#include <iosfwd>
+
+namespace Catch {
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        constexpr SourceLineInfo( char const* _file, std::size_t _line ) noexcept:
+            file( _file ),
+            line( _line )
+        {}
+
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+
+        friend std::ostream& operator << (std::ostream& os, SourceLineInfo const& info);
+    };
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+#endif // CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+
+namespace Catch {
+
+    struct AssertionInfo {
+        // AssertionInfo() = delete;
+
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_ASSERTION_INFO_HPP_INCLUDED
+
+
+#ifndef CATCH_ASSERTION_RESULT_HPP_INCLUDED
+#define CATCH_ASSERTION_RESULT_HPP_INCLUDED
+
+
+
+#ifndef CATCH_LAZY_EXPR_HPP_INCLUDED
+#define CATCH_LAZY_EXPR_HPP_INCLUDED
+
+#include <iosfwd>
+
+namespace Catch {
+
+    class ITransientExpression;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated ):
+            m_isNegated(isNegated)
+        {}
+        LazyExpression(LazyExpression const& other) = default;
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const {
+            return m_transientExpression != nullptr;
+        }
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_LAZY_EXPR_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData&& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        StringRef getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_ASSERTION_RESULT_HPP_INCLUDED
+
+
+#ifndef CATCH_CONFIG_HPP_INCLUDED
+#define CATCH_CONFIG_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TEST_SPEC_HPP_INCLUDED
+#define CATCH_TEST_SPEC_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+
+
+#ifndef CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+#define CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+
+
+
+#ifndef CATCH_CASE_SENSITIVE_HPP_INCLUDED
+#define CATCH_CASE_SENSITIVE_HPP_INCLUDED
+
+namespace Catch {
+
+    enum class CaseSensitive { Yes, No };
+
+} // namespace Catch
+
+#endif // CATCH_CASE_SENSITIVE_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive caseSensitivity );
+        bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+#endif // CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    class IConfig;
+    struct TestCaseInfo;
+    class TestCaseHandle;
+
+    class TestSpec {
+
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            virtual void serializeTo( std::ostream& out ) const = 0;
+            // Writes string that would be reparsed into the pattern
+            friend std::ostream& operator<<(std::ostream& out,
+                                            Pattern const& pattern) {
+                pattern.serializeTo( out );
+                return out;
+            }
+
+            std::string const m_name;
+        };
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            void serializeTo( std::ostream& out ) const override;
+
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            void serializeTo( std::ostream& out ) const override;
+
+            std::string m_tag;
+        };
+
+        struct Filter {
+            std::vector<Detail::unique_ptr<Pattern>> m_required;
+            std::vector<Detail::unique_ptr<Pattern>> m_forbidden;
+
+            //! Serializes this filter into a string that would be parsed into
+            //! an equivalent filter
+            void serializeTo( std::ostream& out ) const;
+            friend std::ostream& operator<<(std::ostream& out, Filter const& f) {
+                f.serializeTo( out );
+                return out;
+            }
+
+            bool matches( TestCaseInfo const& testCase ) const;
+        };
+
+        static std::string extractFilterName( Filter const& filter );
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCaseHandle const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidSpecs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidSpecs;
+
+        friend class TestSpecParser;
+        //! Serializes this test spec into a string that would be parsed into
+        //! equivalent test spec
+        void serializeTo( std::ostream& out ) const;
+        friend std::ostream& operator<<(std::ostream& out,
+                                        TestSpec const& spec) {
+            spec.serializeTo( out );
+            return out;
+        }
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif // CATCH_TEST_SPEC_HPP_INCLUDED
+
+
+#ifndef CATCH_OPTIONAL_HPP_INCLUDED
+#define CATCH_OPTIONAL_HPP_INCLUDED
+
+
+#include <cassert>
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Optional {
+    public:
+        Optional(): nullableValue( nullptr ) {}
+        ~Optional() { reset(); }
+
+        Optional( T const& _value ):
+            nullableValue( new ( storage ) T( _value ) ) {}
+        Optional( T&& _value ):
+            nullableValue( new ( storage ) T( CATCH_MOVE( _value ) ) ) {}
+
+        Optional& operator=( T const& _value ) {
+            reset();
+            nullableValue = new ( storage ) T( _value );
+            return *this;
+        }
+        Optional& operator=( T&& _value ) {
+            reset();
+            nullableValue = new ( storage ) T( CATCH_MOVE( _value ) );
+            return *this;
+        }
+
+        Optional( Optional const& _other ):
+            nullableValue( _other ? new ( storage ) T( *_other ) : nullptr ) {}
+        Optional( Optional&& _other ):
+            nullableValue( _other ? new ( storage ) T( CATCH_MOVE( *_other ) )
+                                  : nullptr ) {}
+
+        Optional& operator=( Optional const& _other ) {
+            if ( &_other != this ) {
+                reset();
+                if ( _other ) { nullableValue = new ( storage ) T( *_other ); }
+            }
+            return *this;
+        }
+        Optional& operator=( Optional&& _other ) {
+            if ( &_other != this ) {
+                reset();
+                if ( _other ) {
+                    nullableValue = new ( storage ) T( CATCH_MOVE( *_other ) );
+                }
+            }
+            return *this;
+        }
+
+        void reset() {
+            if ( nullableValue ) { nullableValue->~T(); }
+            nullableValue = nullptr;
+        }
+
+        T& operator*() {
+            assert(nullableValue);
+            return *nullableValue;
+        }
+        T const& operator*() const {
+            assert(nullableValue);
+            return *nullableValue;
+        }
+        T* operator->() {
+            assert(nullableValue);
+            return nullableValue;
+        }
+        const T* operator->() const {
+            assert(nullableValue);
+            return nullableValue;
+        }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+        friend bool operator==(Optional const& a, Optional const& b) {
+            if (a.none() && b.none()) {
+                return true;
+            } else if (a.some() && b.some()) {
+                return *a == *b;
+            } else {
+                return false;
+            }
+        }
+        friend bool operator!=(Optional const& a, Optional const& b) {
+            return !( a == b );
+        }
+
+    private:
+        T* nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_OPTIONAL_HPP_INCLUDED
+
+
+#ifndef CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
+#define CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    enum class GenerateFrom {
+        Time,
+        RandomDevice,
+        //! Currently equivalent to RandomDevice, but can change at any point
+        Default
+    };
+
+    std::uint32_t generateRandomSeed(GenerateFrom from);
+
+} // end namespace Catch
+
+#endif // CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
+#define CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
+
+
+#include <map>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    enum class ColourMode : std::uint8_t;
+
+    namespace Detail {
+        //! Splits the reporter spec into reporter name and kv-pair options
+        std::vector<std::string> splitReporterSpec( StringRef reporterSpec );
+
+        Optional<ColourMode> stringToColourMode( StringRef colourMode );
+    }
+
+    /**
+     * Structured reporter spec that a reporter can be created from
+     *
+     * Parsing has been validated, but semantics have not. This means e.g.
+     * that the colour mode is known to Catch2, but it might not be
+     * compiled into the binary, and the output filename might not be
+     * openable.
+     */
+    class ReporterSpec {
+        std::string m_name;
+        Optional<std::string> m_outputFileName;
+        Optional<ColourMode> m_colourMode;
+        std::map<std::string, std::string> m_customOptions;
+
+        friend bool operator==( ReporterSpec const& lhs,
+                                ReporterSpec const& rhs );
+        friend bool operator!=( ReporterSpec const& lhs,
+                                ReporterSpec const& rhs ) {
+            return !( lhs == rhs );
+        }
+
+    public:
+        ReporterSpec(
+            std::string name,
+            Optional<std::string> outputFileName,
+            Optional<ColourMode> colourMode,
+            std::map<std::string, std::string> customOptions );
+
+        std::string const& name() const { return m_name; }
+
+        Optional<std::string> const& outputFile() const {
+            return m_outputFileName;
+        }
+
+        Optional<ColourMode> const& colourMode() const { return m_colourMode; }
+
+        std::map<std::string, std::string> const& customOptions() const {
+            return m_customOptions;
+        }
+    };
+
+    /**
+     * Parses provided reporter spec string into
+     *
+     * Returns empty optional on errors, e.g.
+     *  * field that is not first and not a key+value pair
+     *  * duplicated keys in kv pair
+     *  * unknown catch reporter option
+     *  * empty key/value in an custom kv pair
+     *  * ...
+     */
+    Optional<ReporterSpec> parseReporterSpec( StringRef reporterSpec );
+
+}
+
+#endif // CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
+
+#include <chrono>
+#include <map>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    class IStream;
+
+    /**
+     * `ReporterSpec` but with the defaults filled in.
+     *
+     * Like `ReporterSpec`, the semantics are unchecked.
+     */
+    struct ProcessedReporterSpec {
+        std::string name;
+        std::string outputFilename;
+        ColourMode colourMode;
+        std::map<std::string, std::string> customOptions;
+        friend bool operator==( ProcessedReporterSpec const& lhs,
+                                ProcessedReporterSpec const& rhs );
+        friend bool operator!=( ProcessedReporterSpec const& lhs,
+                                ProcessedReporterSpec const& rhs ) {
+            return !( lhs == rhs );
+        }
+    };
+
+    struct ConfigData {
+
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listListeners = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+        bool allowZeroTests = false;
+
+        int abortAfter = -1;
+        uint32_t rngSeed = generateRandomSeed(GenerateFrom::Default);
+
+        unsigned int shardCount = 1;
+        unsigned int shardIndex = 0;
+
+        bool skipBenchmarks = false;
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100'000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations showDurations = ShowDurations::DefaultForReporter;
+        double minDuration = -1;
+        TestRunOrder runOrder = TestRunOrder::Declared;
+        ColourMode defaultColourMode = ColourMode::PlatformDefault;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string defaultOutputFilename;
+        std::string name;
+        std::string processName;
+        std::vector<ReporterSpec> reporterSpecifications;
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        ~Config() override; // = default in the cpp file
+
+        bool listTests() const;
+        bool listTags() const;
+        bool listReporters() const;
+        bool listListeners() const;
+
+        std::vector<ReporterSpec> const& getReporterSpecs() const;
+        std::vector<ProcessedReporterSpec> const&
+        getProcessedReporterSpecs() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        StringRef name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutUnmatchedTestSpecs() const override;
+        bool zeroTestsCountAsSuccess() const override;
+        ShowDurations showDurations() const override;
+        double minDuration() const override;
+        TestRunOrder runOrder() const override;
+        uint32_t rngSeed() const override;
+        unsigned int shardCount() const override;
+        unsigned int shardIndex() const override;
+        ColourMode defaultColourMode() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool skipBenchmarks() const override;
+        bool benchmarkNoAnalysis() const override;
+        unsigned int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+        // Reads Bazel env vars and applies them to the config
+        void readBazelEnvVars();
+
+        ConfigData m_data;
+        std::vector<ProcessedReporterSpec> m_processedReporterSpecs;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+} // end namespace Catch
+
+#endif // CATCH_CONFIG_HPP_INCLUDED
+
+
+#ifndef CATCH_GET_RANDOM_SEED_HPP_INCLUDED
+#define CATCH_GET_RANDOM_SEED_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+    //! Returns Catch2's current RNG seed.
+    std::uint32_t getSeed();
+}
+
+#endif // CATCH_GET_RANDOM_SEED_HPP_INCLUDED
+
+
+#ifndef CATCH_MESSAGE_HPP_INCLUDED
+#define CATCH_MESSAGE_HPP_INCLUDED
+
+
+
+
+/** \file
+ * Wrapper for the CATCH_CONFIG_PREFIX_MESSAGES configuration option
+ *
+ * CATCH_CONFIG_PREFIX_ALL can be used to avoid clashes with other macros
+ * by prepending CATCH_. This may not be desirable if the only clashes are with
+ * logger macros such as INFO and WARN. In this cases
+ * CATCH_CONFIG_PREFIX_MESSAGES can be used to only prefix a small subset
+ * of relevant macros.
+ *
+ */
+
+#ifndef CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+#define CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_PREFIX_MESSAGES)
+    #define CATCH_CONFIG_PREFIX_MESSAGES
+#endif
+
+#endif // CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+
+
+#ifndef CATCH_STREAM_END_STOP_HPP_INCLUDED
+#define CATCH_STREAM_END_STOP_HPP_INCLUDED
+
+
+namespace Catch {
+
+    // Use this in variadic streaming macros to allow
+    //    << +StreamEndStop
+    // as well as
+    //    << stuff +StreamEndStop
+    struct StreamEndStop {
+        constexpr StringRef operator+() const { return StringRef(); }
+
+        template <typename T>
+        constexpr friend T const& operator+( T const& value, StreamEndStop ) {
+            return value;
+        }
+    };
+
+} // namespace Catch
+
+#endif // CATCH_STREAM_END_STOP_HPP_INCLUDED
+
+
+#ifndef CATCH_MESSAGE_INFO_HPP_INCLUDED
+#define CATCH_MESSAGE_INFO_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == (MessageInfo const& other) const {
+            return sequence == other.sequence;
+        }
+        bool operator < (MessageInfo const& other) const {
+            return sequence < other.sequence;
+        }
+    private:
+        static unsigned int globalCount;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_MESSAGE_INFO_HPP_INCLUDED
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct SourceLineInfo;
+    class IResultCapture;
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type ):
+            m_info(macroName, lineInfo, type) {}
+
+        template<typename T>
+        MessageBuilder&& operator << ( T const& value ) && {
+            m_stream << value;
+            return CATCH_MOVE(*this);
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder&& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old ) noexcept;
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved = false;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture;
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+
+        Capturer(Capturer const&) = delete;
+        Capturer& operator=(Capturer const&) = delete;
+
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    Catch::Capturer varName( macroName##_catch_sr,        \
+                             CATCH_INTERNAL_LINEINFO,     \
+                             Catch::ResultWas::Info,      \
+                             #__VA_ARGS__##_catch_sr );   \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    const Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+
+#if defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
+
+  #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+  #define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+  #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+  #define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE", __VA_ARGS__ )
+
+#elif defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
+
+  #define CATCH_INFO( msg )          (void)(0)
+  #define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+  #define CATCH_WARN( msg )          (void)(0)
+  #define CATCH_CAPTURE( ... )       (void)(0)
+
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
+
+  #define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+  #define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+  #define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+  #define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE", __VA_ARGS__ )
+
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
+
+  #define INFO( msg )          (void)(0)
+  #define UNSCOPED_INFO( msg ) (void)(0)
+  #define WARN( msg )          (void)(0)
+  #define CAPTURE( ... )       (void)(0)
+
+#endif // end of user facing macro declarations
+
+
+
+
+#endif // CATCH_MESSAGE_HPP_INCLUDED
+
+
+#ifndef CATCH_SECTION_INFO_HPP_INCLUDED
+#define CATCH_SECTION_INFO_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TOTALS_HPP_INCLUDED
+#define CATCH_TOTALS_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::uint64_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::uint64_t passed = 0;
+        std::uint64_t failed = 0;
+        std::uint64_t failedButOk = 0;
+        std::uint64_t skipped = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+#endif // CATCH_TOTALS_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        // The last argument is ignored, so that people can write
+        // SECTION("ShortName", "Proper description that is long") and
+        // still use the `-c` flag comfortably.
+        SectionInfo( SourceLineInfo const& _lineInfo, std::string _name,
+                    const char* const = nullptr ):
+            name(CATCH_MOVE(_name)),
+            lineInfo(_lineInfo)
+            {}
+
+        std::string name;
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_SECTION_INFO_HPP_INCLUDED
+
+
+#ifndef CATCH_SESSION_HPP_INCLUDED
+#define CATCH_SESSION_HPP_INCLUDED
+
+
+
+#ifndef CATCH_COMMANDLINE_HPP_INCLUDED
+#define CATCH_COMMANDLINE_HPP_INCLUDED
+
+
+
+#ifndef CATCH_CLARA_HPP_INCLUDED
+#define CATCH_CLARA_HPP_INCLUDED
+
+#if defined( __clang__ )
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wweak-vtables"
+#    pragma clang diagnostic ignored "-Wshadow"
+#    pragma clang diagnostic ignored "-Wdeprecated"
+#endif
+
+#if defined( __GNUC__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wsign-conversion"
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#    ifdef __has_include
+#        if __has_include( <optional>) && __cplusplus >= 201703L
+#            include <optional>
+#            define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#        endif
+#    endif
+#endif
+
+
+#include <cassert>
+#include <memory>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+namespace Catch {
+    namespace Clara {
+
+        class Args;
+        class Parser;
+
+        // enum of result types from a parse
+        enum class ParseResultType {
+            Matched,
+            NoMatch,
+            ShortCircuitAll,
+            ShortCircuitSame
+        };
+
+        struct accept_many_t {};
+        constexpr accept_many_t accept_many {};
+
+        namespace Detail {
+            struct fake_arg {
+                template <typename T>
+                operator T();
+            };
+
+            template <typename F, typename = void>
+            struct is_unary_function : std::false_type {};
+
+            template <typename F>
+            struct is_unary_function<
+                F,
+                Catch::Detail::void_t<decltype(
+                    std::declval<F>()( fake_arg() ) )
+                >
+            > : std::true_type {};
+
+            // Traits for extracting arg and return type of lambdas (for single
+            // argument lambdas)
+            template <typename L>
+            struct UnaryLambdaTraits
+                : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+            template <typename ClassT, typename ReturnT, typename... Args>
+            struct UnaryLambdaTraits<ReturnT ( ClassT::* )( Args... ) const> {
+                static const bool isValid = false;
+            };
+
+            template <typename ClassT, typename ReturnT, typename ArgT>
+            struct UnaryLambdaTraits<ReturnT ( ClassT::* )( ArgT ) const> {
+                static const bool isValid = true;
+                using ArgType = std::remove_const_t<std::remove_reference_t<ArgT>>;
+                using ReturnType = ReturnT;
+            };
+
+            class TokenStream;
+
+            // Wraps a token coming from a token stream. These may not directly
+            // correspond to strings as a single string may encode an option +
+            // its argument if the : or = form is used
+            enum class TokenType { Option, Argument };
+            struct Token {
+                TokenType type;
+                StringRef token;
+            };
+
+            // Abstracts iterators into args as a stream of tokens, with option
+            // arguments uniformly handled
+            class TokenStream {
+                using Iterator = std::vector<StringRef>::const_iterator;
+                Iterator it;
+                Iterator itEnd;
+                std::vector<Token> m_tokenBuffer;
+                void loadBuffer();
+
+            public:
+                explicit TokenStream( Args const& args );
+                TokenStream( Iterator it, Iterator itEnd );
+
+                explicit operator bool() const {
+                    return !m_tokenBuffer.empty() || it != itEnd;
+                }
+
+                size_t count() const {
+                    return m_tokenBuffer.size() + ( itEnd - it );
+                }
+
+                Token operator*() const {
+                    assert( !m_tokenBuffer.empty() );
+                    return m_tokenBuffer.front();
+                }
+
+                Token const* operator->() const {
+                    assert( !m_tokenBuffer.empty() );
+                    return &m_tokenBuffer.front();
+                }
+
+                TokenStream& operator++();
+            };
+
+            //! Denotes type of a parsing result
+            enum class ResultType {
+                Ok,          ///< No errors
+                LogicError,  ///< Error in user-specified arguments for
+                             ///< construction
+                RuntimeError ///< Error in parsing inputs
+            };
+
+            class ResultBase {
+            protected:
+                ResultBase( ResultType type ): m_type( type ) {}
+                virtual ~ResultBase(); // = default;
+
+
+                ResultBase(ResultBase const&) = default;
+                ResultBase& operator=(ResultBase const&) = default;
+                ResultBase(ResultBase&&) = default;
+                ResultBase& operator=(ResultBase&&) = default;
+
+                virtual void enforceOk() const = 0;
+
+                ResultType m_type;
+            };
+
+            template <typename T>
+            class ResultValueBase : public ResultBase {
+            public:
+                T const& value() const& {
+                    enforceOk();
+                    return m_value;
+                }
+                T&& value() && {
+                    enforceOk();
+                    return CATCH_MOVE( m_value );
+                }
+
+            protected:
+                ResultValueBase( ResultType type ): ResultBase( type ) {}
+
+                ResultValueBase( ResultValueBase const& other ):
+                    ResultBase( other ) {
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( other.m_value );
+                }
+                ResultValueBase( ResultValueBase&& other ):
+                    ResultBase( other ) {
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                }
+
+
+                ResultValueBase( ResultType, T const& value ):
+                    ResultBase( ResultType::Ok ) {
+                    new ( &m_value ) T( value );
+                }
+                ResultValueBase( ResultType, T&& value ):
+                    ResultBase( ResultType::Ok ) {
+                    new ( &m_value ) T( CATCH_MOVE(value) );
+                }
+
+                ResultValueBase& operator=( ResultValueBase const& other ) {
+                    if ( m_type == ResultType::Ok )
+                        m_value.~T();
+                    ResultBase::operator=( other );
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( other.m_value );
+                    return *this;
+                }
+                ResultValueBase& operator=( ResultValueBase&& other ) {
+                    if ( m_type == ResultType::Ok ) m_value.~T();
+                    ResultBase::operator=( other );
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                    return *this;
+                }
+
+
+                ~ResultValueBase() override {
+                    if ( m_type == ResultType::Ok )
+                        m_value.~T();
+                }
+
+                union {
+                    T m_value;
+                };
+            };
+
+            template <> class ResultValueBase<void> : public ResultBase {
+            protected:
+                using ResultBase::ResultBase;
+            };
+
+            template <typename T = void>
+            class BasicResult : public ResultValueBase<T> {
+            public:
+                template <typename U>
+                explicit BasicResult( BasicResult<U> const& other ):
+                    ResultValueBase<T>( other.type() ),
+                    m_errorMessage( other.errorMessage() ) {
+                    assert( type() != ResultType::Ok );
+                }
+
+                template <typename U>
+                static auto ok( U&& value ) -> BasicResult {
+                    return { ResultType::Ok, CATCH_FORWARD(value) };
+                }
+                static auto ok() -> BasicResult { return { ResultType::Ok }; }
+                static auto logicError( std::string&& message )
+                    -> BasicResult {
+                    return { ResultType::LogicError, CATCH_MOVE(message) };
+                }
+                static auto runtimeError( std::string&& message )
+                    -> BasicResult {
+                    return { ResultType::RuntimeError, CATCH_MOVE(message) };
+                }
+
+                explicit operator bool() const {
+                    return m_type == ResultType::Ok;
+                }
+                auto type() const -> ResultType { return m_type; }
+                auto errorMessage() const -> std::string const& {
+                    return m_errorMessage;
+                }
+
+            protected:
+                void enforceOk() const override {
+
+                    // Errors shouldn't reach this point, but if they do
+                    // the actual error message will be in m_errorMessage
+                    assert( m_type != ResultType::LogicError );
+                    assert( m_type != ResultType::RuntimeError );
+                    if ( m_type != ResultType::Ok )
+                        std::abort();
+                }
+
+                std::string
+                    m_errorMessage; // Only populated if resultType is an error
+
+                BasicResult( ResultType type,
+                             std::string&& message ):
+                    ResultValueBase<T>( type ), m_errorMessage( CATCH_MOVE(message) ) {
+                    assert( m_type != ResultType::Ok );
+                }
+
+                using ResultValueBase<T>::ResultValueBase;
+                using ResultBase::m_type;
+            };
+
+            class ParseState {
+            public:
+                ParseState( ParseResultType type,
+                            TokenStream remainingTokens );
+
+                ParseResultType type() const { return m_type; }
+                TokenStream const& remainingTokens() const& {
+                    return m_remainingTokens;
+                }
+                TokenStream&& remainingTokens() && {
+                    return CATCH_MOVE( m_remainingTokens );
+                }
+
+            private:
+                ParseResultType m_type;
+                TokenStream m_remainingTokens;
+            };
+
+            using Result = BasicResult<void>;
+            using ParserResult = BasicResult<ParseResultType>;
+            using InternalParseResult = BasicResult<ParseState>;
+
+            struct HelpColumns {
+                std::string left;
+                StringRef descriptions;
+            };
+
+            template <typename T>
+            ParserResult convertInto( std::string const& source, T& target ) {
+                std::stringstream ss( source );
+                ss >> target;
+                if ( ss.fail() ) {
+                    return ParserResult::runtimeError(
+                        "Unable to convert '" + source +
+                        "' to destination type" );
+                } else {
+                    return ParserResult::ok( ParseResultType::Matched );
+                }
+            }
+            ParserResult convertInto( std::string const& source,
+                                      std::string& target );
+            ParserResult convertInto( std::string const& source, bool& target );
+
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+            template <typename T>
+            auto convertInto( std::string const& source,
+                              CLARA_CONFIG_OPTIONAL_TYPE<T>& target )
+                -> ParserResult {
+                T temp;
+                auto result = convertInto( source, temp );
+                if ( result )
+                    target = CATCH_MOVE( temp );
+                return result;
+            }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+            struct BoundRef : Catch::Detail::NonCopyable {
+                virtual ~BoundRef() = default;
+                virtual bool isContainer() const;
+                virtual bool isFlag() const;
+            };
+            struct BoundValueRefBase : BoundRef {
+                virtual auto setValue( std::string const& arg )
+                    -> ParserResult = 0;
+            };
+            struct BoundFlagRefBase : BoundRef {
+                virtual auto setFlag( bool flag ) -> ParserResult = 0;
+                bool isFlag() const override;
+            };
+
+            template <typename T> struct BoundValueRef : BoundValueRefBase {
+                T& m_ref;
+
+                explicit BoundValueRef( T& ref ): m_ref( ref ) {}
+
+                ParserResult setValue( std::string const& arg ) override {
+                    return convertInto( arg, m_ref );
+                }
+            };
+
+            template <typename T>
+            struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+                std::vector<T>& m_ref;
+
+                explicit BoundValueRef( std::vector<T>& ref ): m_ref( ref ) {}
+
+                auto isContainer() const -> bool override { return true; }
+
+                auto setValue( std::string const& arg )
+                    -> ParserResult override {
+                    T temp;
+                    auto result = convertInto( arg, temp );
+                    if ( result )
+                        m_ref.push_back( temp );
+                    return result;
+                }
+            };
+
+            struct BoundFlagRef : BoundFlagRefBase {
+                bool& m_ref;
+
+                explicit BoundFlagRef( bool& ref ): m_ref( ref ) {}
+
+                ParserResult setFlag( bool flag ) override;
+            };
+
+            template <typename ReturnType> struct LambdaInvoker {
+                static_assert(
+                    std::is_same<ReturnType, ParserResult>::value,
+                    "Lambda must return void or clara::ParserResult" );
+
+                template <typename L, typename ArgType>
+                static auto invoke( L const& lambda, ArgType const& arg )
+                    -> ParserResult {
+                    return lambda( arg );
+                }
+            };
+
+            template <> struct LambdaInvoker<void> {
+                template <typename L, typename ArgType>
+                static auto invoke( L const& lambda, ArgType const& arg )
+                    -> ParserResult {
+                    lambda( arg );
+                    return ParserResult::ok( ParseResultType::Matched );
+                }
+            };
+
+            template <typename ArgType, typename L>
+            auto invokeLambda( L const& lambda, std::string const& arg )
+                -> ParserResult {
+                ArgType temp{};
+                auto result = convertInto( arg, temp );
+                return !result ? result
+                               : LambdaInvoker<typename UnaryLambdaTraits<
+                                     L>::ReturnType>::invoke( lambda, temp );
+            }
+
+            template <typename L> struct BoundLambda : BoundValueRefBase {
+                L m_lambda;
+
+                static_assert(
+                    UnaryLambdaTraits<L>::isValid,
+                    "Supplied lambda must take exactly one argument" );
+                explicit BoundLambda( L const& lambda ): m_lambda( lambda ) {}
+
+                auto setValue( std::string const& arg )
+                    -> ParserResult override {
+                    return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>(
+                        m_lambda, arg );
+                }
+            };
+
+            template <typename L> struct BoundManyLambda : BoundLambda<L> {
+                explicit BoundManyLambda( L const& lambda ): BoundLambda<L>( lambda ) {}
+                bool isContainer() const override { return true; }
+            };
+
+            template <typename L> struct BoundFlagLambda : BoundFlagRefBase {
+                L m_lambda;
+
+                static_assert(
+                    UnaryLambdaTraits<L>::isValid,
+                    "Supplied lambda must take exactly one argument" );
+                static_assert(
+                    std::is_same<typename UnaryLambdaTraits<L>::ArgType,
+                                 bool>::value,
+                    "flags must be boolean" );
+
+                explicit BoundFlagLambda( L const& lambda ):
+                    m_lambda( lambda ) {}
+
+                auto setFlag( bool flag ) -> ParserResult override {
+                    return LambdaInvoker<typename UnaryLambdaTraits<
+                        L>::ReturnType>::invoke( m_lambda, flag );
+                }
+            };
+
+            enum class Optionality { Optional, Required };
+
+            class ParserBase {
+            public:
+                virtual ~ParserBase() = default;
+                virtual auto validate() const -> Result { return Result::ok(); }
+                virtual auto parse( std::string const& exeName,
+                                    TokenStream tokens ) const
+                    -> InternalParseResult = 0;
+                virtual size_t cardinality() const;
+
+                InternalParseResult parse( Args const& args ) const;
+            };
+
+            template <typename DerivedT>
+            class ComposableParserImpl : public ParserBase {
+            public:
+                template <typename T>
+                auto operator|( T const& other ) const -> Parser;
+            };
+
+            // Common code and state for Args and Opts
+            template <typename DerivedT>
+            class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+            protected:
+                Optionality m_optionality = Optionality::Optional;
+                std::shared_ptr<BoundRef> m_ref;
+                StringRef m_hint;
+                StringRef m_description;
+
+                explicit ParserRefImpl( std::shared_ptr<BoundRef> const& ref ):
+                    m_ref( ref ) {}
+
+            public:
+                template <typename LambdaT>
+                ParserRefImpl( accept_many_t,
+                               LambdaT const& ref,
+                               StringRef hint ):
+                    m_ref( std::make_shared<BoundManyLambda<LambdaT>>( ref ) ),
+                    m_hint( hint ) {}
+
+                template <typename T,
+                          typename = typename std::enable_if_t<
+                              !Detail::is_unary_function<T>::value>>
+                ParserRefImpl( T& ref, StringRef hint ):
+                    m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+                    m_hint( hint ) {}
+
+                template <typename LambdaT,
+                          typename = typename std::enable_if_t<
+                              Detail::is_unary_function<LambdaT>::value>>
+                ParserRefImpl( LambdaT const& ref, StringRef hint ):
+                    m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+                    m_hint( hint ) {}
+
+                DerivedT& operator()( StringRef description ) & {
+                    m_description = description;
+                    return static_cast<DerivedT&>( *this );
+                }
+                DerivedT&& operator()( StringRef description ) && {
+                    m_description = description;
+                    return static_cast<DerivedT&&>( *this );
+                }
+
+                auto optional() -> DerivedT& {
+                    m_optionality = Optionality::Optional;
+                    return static_cast<DerivedT&>( *this );
+                }
+
+                auto required() -> DerivedT& {
+                    m_optionality = Optionality::Required;
+                    return static_cast<DerivedT&>( *this );
+                }
+
+                auto isOptional() const -> bool {
+                    return m_optionality == Optionality::Optional;
+                }
+
+                auto cardinality() const -> size_t override {
+                    if ( m_ref->isContainer() )
+                        return 0;
+                    else
+                        return 1;
+                }
+
+                StringRef hint() const { return m_hint; }
+            };
+
+        } // namespace detail
+
+
+        // A parser for arguments
+        class Arg : public Detail::ParserRefImpl<Arg> {
+        public:
+            using ParserRefImpl::ParserRefImpl;
+            using ParserBase::parse;
+
+            Detail::InternalParseResult
+                parse(std::string const&,
+                      Detail::TokenStream tokens) const override;
+        };
+
+        // A parser for options
+        class Opt : public Detail::ParserRefImpl<Opt> {
+        protected:
+            std::vector<StringRef> m_optNames;
+
+        public:
+            template <typename LambdaT>
+            explicit Opt(LambdaT const& ref) :
+                ParserRefImpl(
+                    std::make_shared<Detail::BoundFlagLambda<LambdaT>>(ref)) {}
+
+            explicit Opt(bool& ref);
+
+            template <typename LambdaT,
+                      typename = typename std::enable_if_t<
+                          Detail::is_unary_function<LambdaT>::value>>
+            Opt( LambdaT const& ref, StringRef hint ):
+                ParserRefImpl( ref, hint ) {}
+
+            template <typename LambdaT>
+            Opt( accept_many_t, LambdaT const& ref, StringRef hint ):
+                ParserRefImpl( accept_many, ref, hint ) {}
+
+            template <typename T,
+                      typename = typename std::enable_if_t<
+                          !Detail::is_unary_function<T>::value>>
+            Opt( T& ref, StringRef hint ):
+                ParserRefImpl( ref, hint ) {}
+
+            Opt& operator[]( StringRef optName ) & {
+                m_optNames.push_back(optName);
+                return *this;
+            }
+            Opt&& operator[]( StringRef optName ) && {
+                m_optNames.push_back( optName );
+                return CATCH_MOVE(*this);
+            }
+
+            Detail::HelpColumns getHelpColumns() const;
+
+            bool isMatch(StringRef optToken) const;
+
+            using ParserBase::parse;
+
+            Detail::InternalParseResult
+                parse(std::string const&,
+                      Detail::TokenStream tokens) const override;
+
+            Detail::Result validate() const override;
+        };
+
+        // Specifies the name of the executable
+        class ExeName : public Detail::ComposableParserImpl<ExeName> {
+            std::shared_ptr<std::string> m_name;
+            std::shared_ptr<Detail::BoundValueRefBase> m_ref;
+
+        public:
+            ExeName();
+            explicit ExeName(std::string& ref);
+
+            template <typename LambdaT>
+            explicit ExeName(LambdaT const& lambda) : ExeName() {
+                m_ref = std::make_shared<Detail::BoundLambda<LambdaT>>(lambda);
+            }
+
+            // The exe name is not parsed out of the normal tokens, but is
+            // handled specially
+            Detail::InternalParseResult
+                parse(std::string const&,
+                      Detail::TokenStream tokens) const override;
+
+            std::string const& name() const { return *m_name; }
+            Detail::ParserResult set(std::string const& newName);
+        };
+
+
+        // A Combined parser
+        class Parser : Detail::ParserBase {
+            mutable ExeName m_exeName;
+            std::vector<Opt> m_options;
+            std::vector<Arg> m_args;
+
+        public:
+
+            auto operator|=(ExeName const& exeName) -> Parser& {
+                m_exeName = exeName;
+                return *this;
+            }
+
+            auto operator|=(Arg const& arg) -> Parser& {
+                m_args.push_back(arg);
+                return *this;
+            }
+
+            friend Parser& operator|=( Parser& p, Opt const& opt ) {
+                p.m_options.push_back( opt );
+                return p;
+            }
+            friend Parser& operator|=( Parser& p, Opt&& opt ) {
+                p.m_options.push_back( CATCH_MOVE(opt) );
+                return p;
+            }
+
+            Parser& operator|=(Parser const& other);
+
+            template <typename T>
+            friend Parser operator|( Parser const& p, T&& rhs ) {
+                Parser temp( p );
+                temp |= rhs;
+                return temp;
+            }
+
+            template <typename T>
+            friend Parser operator|( Parser&& p, T&& rhs ) {
+                p |= CATCH_FORWARD(rhs);
+                return CATCH_MOVE(p);
+            }
+
+            std::vector<Detail::HelpColumns> getHelpColumns() const;
+
+            void writeToStream(std::ostream& os) const;
+
+            friend auto operator<<(std::ostream& os, Parser const& parser)
+                -> std::ostream& {
+                parser.writeToStream(os);
+                return os;
+            }
+
+            Detail::Result validate() const override;
+
+            using ParserBase::parse;
+            Detail::InternalParseResult
+                parse(std::string const& exeName,
+                      Detail::TokenStream tokens) const override;
+        };
+
+        /**
+         * Wrapper over argc + argv, assumes that the inputs outlive it
+         */
+        class Args {
+            friend Detail::TokenStream;
+            StringRef m_exeName;
+            std::vector<StringRef> m_args;
+
+        public:
+            Args(int argc, char const* const* argv);
+            // Helper constructor for testing
+            Args(std::initializer_list<StringRef> args);
+
+            StringRef exeName() const { return m_exeName; }
+        };
+
+
+        // Convenience wrapper for option parser that specifies the help option
+        struct Help : Opt {
+            Help(bool& showHelpFlag);
+        };
+
+        // Result type for parser operation
+        using Detail::ParserResult;
+
+        namespace Detail {
+            template <typename DerivedT>
+            template <typename T>
+            Parser
+                ComposableParserImpl<DerivedT>::operator|(T const& other) const {
+                return Parser() | static_cast<DerivedT const&>(*this) | other;
+            }
+        }
+
+    } // namespace Clara
+} // namespace Catch
+
+#if defined( __clang__ )
+#    pragma clang diagnostic pop
+#endif
+
+#if defined( __GNUC__ )
+#    pragma GCC diagnostic pop
+#endif
+
+#endif // CATCH_CLARA_HPP_INCLUDED
+
+namespace Catch {
+
+    struct ConfigData;
+
+    Clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+#endif // CATCH_COMMANDLINE_HPP_INCLUDED
+
+namespace Catch {
+
+    class Session : Detail::NonCopyable {
+    public:
+
+        Session();
+        ~Session();
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        Clara::Parser const& cli() const;
+        void cli( Clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        Clara::Parser m_cli;
+        ConfigData m_configData;
+        Detail::unique_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_SESSION_HPP_INCLUDED
+
+
+#ifndef CATCH_TAG_ALIAS_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo):
+            tag(_tag),
+            lineInfo(_lineInfo)
+        {}
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_TAG_ALIAS_HPP_INCLUDED
+
+
+#ifndef CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
+
+
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#endif // CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
+
+
+#ifndef CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+#define CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+
+// We need this suppression to leak, because it took until GCC 10
+// for the front end to handle local suppression via _Pragma properly
+// inside templates (so `TEMPLATE_TEST_CASE` and co).
+// **THIS IS DIFFERENT FOR STANDARD TESTS, WHERE GCC 9 IS SUFFICIENT**
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && __GNUC__ < 10
+#pragma GCC diagnostic ignored "-Wparentheses"
+#endif
+
+
+
+
+#ifndef CATCH_TEST_MACROS_HPP_INCLUDED
+#define CATCH_TEST_MACROS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+#define CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_ASSERTION_HANDLER_HPP_INCLUDED
+#define CATCH_ASSERTION_HANDLER_HPP_INCLUDED
+
+
+
+#ifndef CATCH_DECOMPOSER_HPP_INCLUDED
+#define CATCH_DECOMPOSER_HPP_INCLUDED
+
+
+
+#ifndef CATCH_COMPARE_TRAITS_HPP_INCLUDED
+#define CATCH_COMPARE_TRAITS_HPP_INCLUDED
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Detail {
+
+#if defined( __GNUC__ ) && !defined( __clang__ )
+#    pragma GCC diagnostic push
+    // GCC likes to complain about comparing bool with 0, in the decltype()
+    // that defines the comparable traits below.
+#    pragma GCC diagnostic ignored "-Wbool-compare"
+    // "ordered comparison of pointer with integer zero" same as above,
+    // but it does not have a separate warning flag to suppress
+#    pragma GCC diagnostic ignored "-Wextra"
+    // Did you know that comparing floats with `0` directly
+    // is super-duper dangerous in unevaluated context?
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+#if defined( __clang__ )
+#    pragma clang diagnostic push
+    // Did you know that comparing floats with `0` directly
+    // is super-duper dangerous in unevaluated context?
+#    pragma clang diagnostic ignored "-Wfloat-equal"
+#endif
+
+#define CATCH_DEFINE_COMPARABLE_TRAIT( id, op )                               \
+    template <typename, typename, typename = void>                            \
+    struct is_##id##_comparable : std::false_type {};                         \
+    template <typename T, typename U>                                         \
+    struct is_##id##_comparable<                                              \
+        T,                                                                    \
+        U,                                                                    \
+        void_t<decltype( std::declval<T>() op std::declval<U>() )>>           \
+        : std::true_type {};                                                  \
+    template <typename, typename = void>                                      \
+    struct is_##id##_0_comparable : std::false_type {};                       \
+    template <typename T>                                                     \
+    struct is_##id##_0_comparable<T,                                          \
+                                  void_t<decltype( std::declval<T>() op 0 )>> \
+        : std::true_type {};
+
+        // We need all 6 pre-spaceship comparison ops: <, <=, >, >=, ==, !=
+        CATCH_DEFINE_COMPARABLE_TRAIT( lt, < )
+        CATCH_DEFINE_COMPARABLE_TRAIT( le, <= )
+        CATCH_DEFINE_COMPARABLE_TRAIT( gt, > )
+        CATCH_DEFINE_COMPARABLE_TRAIT( ge, >= )
+        CATCH_DEFINE_COMPARABLE_TRAIT( eq, == )
+        CATCH_DEFINE_COMPARABLE_TRAIT( ne, != )
+
+#undef CATCH_DEFINE_COMPARABLE_TRAIT
+
+#if defined( __GNUC__ ) && !defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+#if defined( __clang__ )
+#    pragma clang diagnostic pop
+#endif
+
+
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_COMPARE_TRAITS_HPP_INCLUDED
+
+
+#ifndef CATCH_LOGICAL_TRAITS_HPP_INCLUDED
+#define CATCH_LOGICAL_TRAITS_HPP_INCLUDED
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+#if defined( __cpp_lib_logical_traits ) && __cpp_lib_logical_traits >= 201510
+
+    using std::conjunction;
+    using std::disjunction;
+    using std::negation;
+
+#else
+
+    template <class...> struct conjunction : std::true_type {};
+    template <class B1> struct conjunction<B1> : B1 {};
+    template <class B1, class... Bn>
+    struct conjunction<B1, Bn...>
+        : std::conditional_t<bool( B1::value ), conjunction<Bn...>, B1> {};
+
+    template <class...> struct disjunction : std::false_type {};
+    template <class B1> struct disjunction<B1> : B1 {};
+    template <class B1, class... Bn>
+    struct disjunction<B1, Bn...>
+        : std::conditional_t<bool( B1::value ), B1, disjunction<Bn...>> {};
+
+    template <class B>
+    struct negation : std::integral_constant<bool, !bool(B::value)> {};
+
+#endif
+
+} // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_LOGICAL_TRAITS_HPP_INCLUDED
+
+#include <type_traits>
+#include <iosfwd>
+
+/** \file
+ * Why does decomposing look the way it does:
+ *
+ * Conceptually, decomposing is simple. We change `REQUIRE( a == b )` into
+ * `Decomposer{} <= a == b`, so that `Decomposer{} <= a` is evaluated first,
+ * and our custom operator is used for `a == b`, because `a` is transformed
+ * into `ExprLhs<T&>` and then into `BinaryExpr<T&, U&>`.
+ *
+ * In practice, decomposing ends up a mess, because we have to support
+ * various fun things.
+ *
+ * 1) Types that are only comparable with literal 0, and they do this by
+ *    comparing against a magic type with pointer constructor and deleted
+ *    other constructors. Example: `REQUIRE((a <=> b) == 0)` in libstdc++
+ *
+ * 2) Types that are only comparable with literal 0, and they do this by
+ *    comparing against a magic type with consteval integer constructor.
+ *    Example: `REQUIRE((a <=> b) == 0)` in current MSVC STL.
+ *
+ * 3) Types that have no linkage, and so we cannot form a reference to
+ *    them. Example: some implementations of traits.
+ *
+ * 4) Starting with C++20, when the compiler sees `a == b`, it also uses
+ *    `b == a` when constructing the overload set. For us this means that
+ *    when the compiler handles `ExprLhs<T> == b`, it also tries to resolve
+ *    the overload set for `b == ExprLhs<T>`.
+ *
+ * To accomodate these use cases, decomposer ended up rather complex.
+ *
+ * 1) These types are handled by adding SFINAE overloads to our comparison
+ *    operators, checking whether `T == U` are comparable with the given
+ *    operator, and if not, whether T (or U) are comparable with literal 0.
+ *    If yes, the overload compares T (or U) with 0 literal inline in the
+ *    definition.
+ *
+ *    Note that for extra correctness, we check  that the other type is
+ *    either an `int` (literal 0 is captured as `int` by templates), or
+ *    a `long` (some platforms use 0L for `NULL` and we want to support
+ *    that for pointer comparisons).
+ *
+ * 2) For these types, `is_foo_comparable<T, int>` is true, but letting
+ *    them fall into the overload that actually does `T == int` causes
+ *    compilation error. Handling them requires that the decomposition
+ *    is `constexpr`, so that P2564R3 applies and the `consteval` from
+ *    their accompanying magic type is propagated through the `constexpr`
+ *    call stack.
+ *
+ *    However this is not enough to handle these types automatically,
+ *    because our default is to capture types by reference, to avoid
+ *    runtime copies. While these references cannot become dangling,
+ *    they outlive the constexpr context and thus the default capture
+ *    path cannot be actually constexpr.
+ *
+ *    The solution is to capture these types by value, by explicitly
+ *    specializing `Catch::capture_by_value` for them. Catch2 provides
+ *    specialization for `std::foo_ordering`s, but users can specialize
+ *    the trait for their own types as well.
+ *
+ * 3) If a type has no linkage, we also cannot capture it by reference.
+ *    The solution is once again to capture them by value. We handle
+ *    the common cases by using `std::is_arithmetic` as the default
+ *    for `Catch::capture_by_value`, but that is only a some-effort
+ *    heuristic. But as with 2), users can specialize `capture_by_value`
+ *    for their own types as needed.
+ *
+ * 4) To support C++20 and make the SFINAE on our decomposing operators
+ *    work, the SFINAE has to happen in return type, rather than in
+ *    a template type. This is due to our use of logical type traits
+ *    (`conjunction`/`disjunction`/`negation`), that we use to workaround
+ *    an issue in older (9-) versions of GCC. I still blame C++20 for
+ *    this, because without the comparison order switching, the logical
+ *    traits could still be used in template type.
+ *
+ * There are also other side concerns, e.g. supporting both `REQUIRE(a)`
+ * and `REQUIRE(a == b)`, or making `REQUIRE_THAT(a, IsEqual(b))` slot
+ * nicely into the same expression handling logic, but these are rather
+ * straightforward and add only a bit of complexity (e.g. common base
+ * class for decomposed expressions).
+ */
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wsign-compare"
+#  pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#elif defined __GNUC__
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wsign-compare"
+#  pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+#if defined(CATCH_CPP20_OR_GREATER) && __has_include(<compare>)
+#  include <compare>
+#    if defined( __cpp_lib_three_way_comparison ) && \
+            __cpp_lib_three_way_comparison >= 201907L
+#      define CATCH_CONFIG_CPP20_COMPARE_OVERLOADS
+#    endif
+#endif
+
+namespace Catch {
+
+    namespace Detail {
+        // This was added in C++20, but we require only C++14 for now.
+        template <typename T>
+        using RemoveCVRef_t = std::remove_cv_t<std::remove_reference_t<T>>;
+    }
+
+    // Note: There is nothing that stops us from extending this,
+    //       e.g. to `std::is_scalar`, but the more encompassing
+    //       traits are usually also more expensive. For now we
+    //       keep this as it used to be and it can be changed later.
+    template <typename T>
+    struct capture_by_value
+        : std::integral_constant<bool, std::is_arithmetic<T>{}> {};
+
+#if defined( CATCH_CONFIG_CPP20_COMPARE_OVERLOADS )
+    template <>
+    struct capture_by_value<std::strong_ordering> : std::true_type {};
+    template <>
+    struct capture_by_value<std::weak_ordering> : std::true_type {};
+    template <>
+    struct capture_by_value<std::partial_ordering> : std::true_type {};
+#endif
+
+    template <typename T>
+    struct always_false : std::false_type {};
+
+    class ITransientExpression {
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    public:
+        constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        constexpr auto getResult() const -> bool { return m_result; }
+        //! This function **has** to be overriden by the derived class.
+        virtual void streamReconstructedExpression( std::ostream& os ) const;
+
+        constexpr ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        ITransientExpression() = default;
+        ITransientExpression(ITransientExpression const&) = default;
+        ITransientExpression& operator=(ITransientExpression const&) = default;
+
+        friend std::ostream& operator<<(std::ostream& out, ITransientExpression const& expr) {
+            expr.streamReconstructedExpression(out);
+            return out;
+        }
+
+    protected:
+        ~ITransientExpression() = default;
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        constexpr BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit constexpr UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit constexpr ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+#define CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR( id, op )           \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT&& rhs )             \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>,      \
+                                Detail::negation<capture_by_value<             \
+                                    Detail::RemoveCVRef_t<RhsT>>>>::value,     \
+            BinaryExpr<LhsT, RhsT const&>> {                                   \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>,      \
+                                capture_by_value<RhsT>>::value,                \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<                                               \
+                Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>,    \
+                Detail::is_eq_0_comparable<LhsT>,                              \
+              /* We allow long because we want `ptr op NULL` to be accepted */ \
+                Detail::disjunction<std::is_same<RhsT, int>,                   \
+                                    std::is_same<RhsT, long>>>::value,         \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        if ( rhs != 0 ) { throw_test_failure_exception(); }                    \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op 0 ), lhs.m_lhs, #op##_sr, rhs };   \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<                                               \
+                Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>,    \
+                Detail::is_eq_0_comparable<RhsT>,                              \
+              /* We allow long because we want `ptr op NULL` to be accepted */ \
+                Detail::disjunction<std::is_same<LhsT, int>,                   \
+                                    std::is_same<LhsT, long>>>::value,         \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        if ( lhs.m_lhs != 0 ) { throw_test_failure_exception(); }              \
+        return { static_cast<bool>( 0 op rhs ), lhs.m_lhs, #op##_sr, rhs };    \
+    }
+
+        CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR( eq, == )
+        CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR( ne, != )
+
+    #undef CATCH_INTERNAL_DEFINE_EXPRESSION_EQUALITY_OPERATOR
+
+
+#define CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( id, op )         \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT&& rhs )             \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>,      \
+                                Detail::negation<capture_by_value<             \
+                                    Detail::RemoveCVRef_t<RhsT>>>>::value,     \
+            BinaryExpr<LhsT, RhsT const&>> {                                   \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<Detail::is_##id##_comparable<LhsT, RhsT>,      \
+                                capture_by_value<RhsT>>::value,                \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<                                               \
+                Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>,    \
+                Detail::is_##id##_0_comparable<LhsT>,                          \
+                std::is_same<RhsT, int>>::value,                               \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        if ( rhs != 0 ) { throw_test_failure_exception(); }                    \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op 0 ), lhs.m_lhs, #op##_sr, rhs };   \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<                                                   \
+            Detail::conjunction<                                               \
+                Detail::negation<Detail::is_##id##_comparable<LhsT, RhsT>>,    \
+                Detail::is_##id##_0_comparable<RhsT>,                          \
+                std::is_same<LhsT, int>>::value,                               \
+            BinaryExpr<LhsT, RhsT>> {                                          \
+        if ( lhs.m_lhs != 0 ) { throw_test_failure_exception(); }              \
+        return { static_cast<bool>( 0 op rhs ), lhs.m_lhs, #op##_sr, rhs };    \
+    }
+
+        CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( lt, < )
+        CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( le, <= )
+        CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( gt, > )
+        CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR( ge, >= )
+
+    #undef CATCH_INTERNAL_DEFINE_EXPRESSION_COMPARISON_OPERATOR
+
+
+#define CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR( op )                        \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT&& rhs )             \
+        -> std::enable_if_t<                                                   \
+            !capture_by_value<Detail::RemoveCVRef_t<RhsT>>::value,             \
+            BinaryExpr<LhsT, RhsT const&>> {                                   \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }                                                                          \
+    template <typename RhsT>                                                   \
+    constexpr friend auto operator op( ExprLhs&& lhs, RhsT rhs )               \
+        -> std::enable_if_t<capture_by_value<RhsT>::value,                     \
+                            BinaryExpr<LhsT, RhsT>> {                          \
+        return {                                                               \
+            static_cast<bool>( lhs.m_lhs op rhs ), lhs.m_lhs, #op##_sr, rhs }; \
+    }
+
+        CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR(|)
+        CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR(&)
+        CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR(^)
+
+    #undef CATCH_INTERNAL_DEFINE_EXPRESSION_OPERATOR
+
+        template<typename RhsT>
+        friend auto operator && ( ExprLhs &&, RhsT && ) -> BinaryExpr<LhsT, RhsT const&> {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        friend auto operator || ( ExprLhs &&, RhsT && ) -> BinaryExpr<LhsT, RhsT const&> {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        constexpr auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    struct Decomposer {
+        template <typename T,
+                  std::enable_if_t<!capture_by_value<Detail::RemoveCVRef_t<T>>::value,
+                      int> = 0>
+        constexpr friend auto operator <= ( Decomposer &&, T && lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<const T&>{ lhs };
+        }
+
+        template <typename T,
+                  std::enable_if_t<capture_by_value<T>::value, int> = 0>
+        constexpr friend auto operator <= ( Decomposer &&, T value ) -> ExprLhs<T> {
+            return ExprLhs<T>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#ifdef __clang__
+#  pragma clang diagnostic pop
+#elif defined __GNUC__
+#  pragma GCC diagnostic pop
+#endif
+
+#endif // CATCH_DECOMPOSER_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+        bool shouldSkip = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str );
+
+} // namespace Catch
+
+#endif // CATCH_ASSERTION_HANDLER_HPP_INCLUDED
+
+
+#ifndef CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__##_catch_sr
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"_catch_sr
+#endif
+
+#endif // CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+
+// We need this suppression to leak, because it took until GCC 10
+// for the front end to handle local suppression via _Pragma properly
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && __GNUC__ <= 9
+  #pragma GCC diagnostic ignored "-Wparentheses"
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { (handler).handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { /* NOLINT(bugprone-infinite-loop) */ \
+        /* The expression should not be evaluated, but warnings should hopefully be checked */ \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); /* NOLINT(bugprone-chained-comparison) */ \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<const bool&>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
+    // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
+            static_cast<void>(__VA_ARGS__); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+                CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
+                static_cast<void>(__VA_ARGS__); \
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+                CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
+                static_cast<void>(expr); \
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+                CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
+                static_cast<void>(__VA_ARGS__); \
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+#endif // CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+
+
+#ifndef CATCH_SECTION_HPP_INCLUDED
+#define CATCH_SECTION_HPP_INCLUDED
+
+
+
+
+/** \file
+ * Wrapper for the STATIC_ANALYSIS_SUPPORT configuration option
+ *
+ * Some of Catch2's macros can be defined differently to work better with
+ * static analysis tools, like clang-tidy or coverity.
+ * Currently the main use case is to show that `SECTION`s are executed
+ * exclusively, and not all in one run of a `TEST_CASE`.
+ */
+
+#ifndef CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+#define CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+
+
+#if defined(__clang_analyzer__) || defined(__COVERITY__)
+    #define CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT
+#endif
+
+#if defined( CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT )
+#    define CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+#endif
+
+
+#endif // CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+
+
+#ifndef CATCH_TIMER_HPP_INCLUDED
+#define CATCH_TIMER_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_TIMER_HPP_INCLUDED
+
+namespace Catch {
+
+    class Section : Detail::NonCopyable {
+    public:
+        Section( SectionInfo&& info );
+        Section( SourceLineInfo const& _lineInfo,
+                 StringRef _name,
+                 const char* const = nullptr );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+#    define INTERNAL_CATCH_SECTION( ... )                                 \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                         \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                  \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(            \
+                 catch_internal_Section ) =                               \
+                 Catch::Section( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                     \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                     \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS              \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(        \
+                 catch_internal_Section ) =                           \
+                 Catch::SectionInfo(                                  \
+                     CATCH_INTERNAL_LINEINFO,                         \
+                     ( Catch::ReusableStringStream() << __VA_ARGS__ ) \
+                         .str() ) )                                   \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#else
+
+// These section definitions imply that at most one section at one level
+// will be intered (because only one section's __LINE__ can be equal to
+// the dummy `catchInternalSectionHint` variable from `TEST_CASE`).
+
+namespace Catch {
+    namespace Detail {
+        // Intentionally without linkage, as it should only be used as a dummy
+        // symbol for static analysis.
+        // The arguments are used as a dummy for checking warnings in the passed
+        // expressions.
+        int GetNewSectionHint( StringRef, const char* const = nullptr );
+    } // namespace Detail
+} // namespace Catch
+
+
+#    define INTERNAL_CATCH_SECTION( ... )                                   \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint =                                     \
+                 Catch::Detail::GetNewSectionHint(__VA_ARGS__);             \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                           \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint = Catch::Detail::GetNewSectionHint(   \
+                ( Catch::ReusableStringStream() << __VA_ARGS__ ).str());    \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#endif
+
+
+#endif // CATCH_SECTION_HPP_INCLUDED
+
+
+#ifndef CATCH_TEST_REGISTRY_HPP_INCLUDED
+#define CATCH_TEST_REGISTRY_HPP_INCLUDED
+
+
+
+#ifndef CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+#define CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+
+namespace Catch {
+
+    class ITestInvoker {
+    public:
+        virtual void invoke() const = 0;
+        virtual ~ITestInvoker(); // = default
+    };
+
+} // namespace Catch
+
+#endif // CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+
+
+#ifndef CATCH_PREPROCESSOR_REMOVE_PARENS_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_REMOVE_PARENS_HPP_INCLUDED
+
+#define INTERNAL_CATCH_EXPAND1( param ) INTERNAL_CATCH_EXPAND2( param )
+#define INTERNAL_CATCH_EXPAND2( ... ) INTERNAL_CATCH_NO##__VA_ARGS__
+#define INTERNAL_CATCH_DEF( ... ) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+
+#define INTERNAL_CATCH_REMOVE_PARENS( ... ) \
+    INTERNAL_CATCH_EXPAND1( INTERNAL_CATCH_DEF __VA_ARGS__ )
+
+#endif // CATCH_PREPROCESSOR_REMOVE_PARENS_HPP_INCLUDED
+
+// GCC 5 and older do not properly handle disabling unused-variable warning
+// with a _Pragma. This means that we have to leak the suppression to the
+// user code as well :-(
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 5
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+
+
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() );
+
+template<typename C>
+Detail::unique_ptr<ITestInvoker> makeTestInvoker( void (C::*testAsMethod)() ) {
+    return Detail::make_unique<TestInvokerAsMethod<C>>( testAsMethod );
+}
+
+struct NameAndTags {
+    constexpr NameAndTags( StringRef name_ = StringRef(),
+                           StringRef tags_ = StringRef() ) noexcept:
+        name( name_ ), tags( tags_ ) {}
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : Detail::NonCopyable {
+    AutoReg( Detail::unique_ptr<ITestInvoker> invoker, SourceLineInfo const& lineInfo, StringRef classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static inline void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+#endif
+
+
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace{ const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), __VA_ARGS__ )
+
+#else  // ^^ !CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT | vv CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+
+
+// Dummy registrator for the dumy test case macros
+namespace Catch {
+    namespace Detail {
+        struct DummyUse {
+            DummyUse( void ( * )( int ), Catch::NameAndTags const& );
+        };
+    } // namespace Detail
+} // namespace Catch
+
+// Note that both the presence of the argument and its exact name are
+// necessary for the section support.
+
+// We provide a shadowed variable so that a `SECTION` inside non-`TEST_CASE`
+// tests can compile. The redefined `TEST_CASE` shadows this with param.
+static int catchInternalSectionHint = 0;
+
+#    define INTERNAL_CATCH_TESTCASE2( fname, ... )                         \
+        static void fname( int );                                          \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                          \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                   \
+        static const Catch::Detail::DummyUse INTERNAL_CATCH_UNIQUE_NAME(   \
+            dummyUser )( &(fname), Catch::NameAndTags{ __VA_ARGS__ } );    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                            \
+        static void fname( [[maybe_unused]] int catchInternalSectionHint ) \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#    define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( dummyFunction ), __VA_ARGS__ )
+
+
+#endif // CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
+            Catch::makeTestInvoker( &TestName::test ),                    \
+            CATCH_INTERNAL_LINEINFO,                                      \
+            #ClassName##_catch_sr,                                        \
+            Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), ClassName, __VA_ARGS__ )
+
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace {                                                           \
+        const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
+            Catch::makeTestInvoker( &QualifiedMethod ),                   \
+            CATCH_INTERNAL_LINEINFO,                                      \
+            "&" #QualifiedMethod##_catch_sr,                              \
+            Catch::NameAndTags{ __VA_ARGS__ } );                          \
+    } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        do { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+            CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } while(false)
+
+
+#endif // CATCH_TEST_REGISTRY_HPP_INCLUDED
+
+
+// All of our user-facing macros support configuration toggle, that
+// forces them to be defined prefixed with CATCH_. We also like to
+// support another toggle that can minimize (disable) their implementation.
+// Given this, we have 4 different configuration options below
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+
+  #define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+  #define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+  #define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+  #define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+  #define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+  #define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+  #define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+  #define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+  #define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+  #define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+  #define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+  #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+  #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+  #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+  #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+  #define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+  #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+  #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CATCH_SKIP( ... ) INTERNAL_CATCH_MSG( "SKIP", Catch::ResultWas::ExplicitSkip, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+
+  #if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+    #define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+    #define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+    #define CATCH_STATIC_CHECK( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+    #define CATCH_STATIC_CHECK_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+  #else
+    #define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+    #define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+    #define CATCH_STATIC_CHECK( ... )       CATCH_CHECK( __VA_ARGS__ )
+    #define CATCH_STATIC_CHECK_FALSE( ... ) CATCH_CHECK_FALSE( __VA_ARGS__ )
+  #endif
+
+
+  // "BDD-style" convenience wrappers
+  #define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+  #define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+  #define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+  #define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+  #define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+  #define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+  #define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+  #define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE) // ^^ prefixed, implemented | vv prefixed, disabled
+
+  #define CATCH_REQUIRE( ... )        (void)(0)
+  #define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+  #define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+  #define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+  #define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+  #define CATCH_CHECK( ... )         (void)(0)
+  #define CATCH_CHECK_FALSE( ... )   (void)(0)
+  #define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+  #define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+  #define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+  #define CATCH_CHECK_THROWS( ... )  (void)(0)
+  #define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+  #define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+  #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ))
+  #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ))
+  #define CATCH_METHOD_AS_TEST_CASE( method, ... )
+  #define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+  #define CATCH_SECTION( ... )
+  #define CATCH_DYNAMIC_SECTION( ... )
+  #define CATCH_FAIL( ... ) (void)(0)
+  #define CATCH_FAIL_CHECK( ... ) (void)(0)
+  #define CATCH_SUCCEED( ... ) (void)(0)
+  #define CATCH_SKIP( ... ) (void)(0)
+
+  #define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+  #define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+  #define CATCH_STATIC_CHECK( ... )       (void)(0)
+  #define CATCH_STATIC_CHECK_FALSE( ... ) (void)(0)
+
+  // "BDD-style" convenience wrappers
+  #define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ))
+  #define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), className )
+  #define CATCH_GIVEN( desc )
+  #define CATCH_AND_GIVEN( desc )
+  #define CATCH_WHEN( desc )
+  #define CATCH_AND_WHEN( desc )
+  #define CATCH_THEN( desc )
+  #define CATCH_AND_THEN( desc )
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE) // ^^ prefixed, disabled | vv unprefixed, implemented
+
+  #define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+  #define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+  #define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+  #define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+  #define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+  #define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+  #define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+  #define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+  #define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+  #define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+  #define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+  #define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+  #define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+  #define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+  #define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+  #define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+  #define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+  #define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+  #define SKIP( ... ) INTERNAL_CATCH_MSG( "SKIP", Catch::ResultWas::ExplicitSkip, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+
+  #if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+    #define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+    #define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+    #define STATIC_CHECK( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+    #define STATIC_CHECK_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+  #else
+    #define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+    #define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+    #define STATIC_CHECK( ... )       CHECK( __VA_ARGS__ )
+    #define STATIC_CHECK_FALSE( ... ) CHECK_FALSE( __VA_ARGS__ )
+  #endif
+
+  // "BDD-style" convenience wrappers
+  #define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+  #define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+  #define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+  #define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+  #define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+  #define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+  #define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+  #define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE) // ^^ unprefixed, implemented | vv unprefixed, disabled
+
+  #define REQUIRE( ... )       (void)(0)
+  #define REQUIRE_FALSE( ... ) (void)(0)
+
+  #define REQUIRE_THROWS( ... ) (void)(0)
+  #define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+  #define REQUIRE_NOTHROW( ... ) (void)(0)
+
+  #define CHECK( ... ) (void)(0)
+  #define CHECK_FALSE( ... ) (void)(0)
+  #define CHECKED_IF( ... ) if (__VA_ARGS__)
+  #define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+  #define CHECK_NOFAIL( ... ) (void)(0)
+
+  #define CHECK_THROWS( ... )  (void)(0)
+  #define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+  #define CHECK_NOTHROW( ... ) (void)(0)
+
+  #define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), __VA_ARGS__)
+  #define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ))
+  #define METHOD_AS_TEST_CASE( method, ... )
+  #define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+  #define SECTION( ... )
+  #define DYNAMIC_SECTION( ... )
+  #define FAIL( ... ) (void)(0)
+  #define FAIL_CHECK( ... ) (void)(0)
+  #define SUCCEED( ... ) (void)(0)
+  #define SKIP( ... ) (void)(0)
+
+  #define STATIC_REQUIRE( ... )       (void)(0)
+  #define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+  #define STATIC_CHECK( ... )       (void)(0)
+  #define STATIC_CHECK_FALSE( ... ) (void)(0)
+
+  // "BDD-style" convenience wrappers
+  #define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ) )
+  #define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), className )
+
+  #define GIVEN( desc )
+  #define AND_GIVEN( desc )
+  #define WHEN( desc )
+  #define AND_WHEN( desc )
+  #define THEN( desc )
+  #define AND_THEN( desc )
+
+#endif // ^^ unprefixed, disabled
+
+// end of user facing macros
+
+#endif // CATCH_TEST_MACROS_HPP_INCLUDED
+
+
+#ifndef CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
+#define CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
+
+
+
+#ifndef CATCH_PREPROCESSOR_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_HPP_INCLUDED
+
+
+#if defined(__GNUC__)
+// We need to silence "empty __VA_ARGS__ warning", and using just _Pragma does not work
+#pragma GCC system_header
+#endif
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+#endif // CATCH_PREPROCESSOR_HPP_INCLUDED
+
+
+// GCC 5 and older do not properly handle disabling unused-variable warning
+// with a _Pragma. This means that we have to leak the suppression to the
+// user code as well :-(
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 5
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    size_t index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)}; /* NOLINT(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,hicpp-avoid-c-arrays) */\
+                    using expander = size_t[]; /* NOLINT(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,hicpp-avoid-c-arrays) */\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static const int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS       \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    size_t index = 0;                                    \
+                    using expander = size_t[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                size_t index = 0;                                    \
+                using expander = size_t[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " INTERNAL_CATCH_STRINGIZE(TmplList) " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), Name, Tags, TmplList )
+
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    size_t index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = size_t[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_CLASS_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    std::size_t index = 0;\
+                    using expander = std::size_t[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + '<' + std::string(types_list[index % num_types]) + '>', Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    size_t index = 0;\
+                    using expander = size_t[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName##_catch_sr, Catch::NameAndTags{ Name " - " INTERNAL_CATCH_STRINGIZE(TmplList) " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEMPLATE_TEST_ ), ClassName, Name, Tags, TmplList )
+
+
+#endif // CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
+
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+
+  #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+    #define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+    #define CATCH_TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+    #define CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #else
+    #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+  #endif
+
+#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+
+  #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+    #define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+  #else
+    #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+    #define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+    #define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+  #endif
+
+  // When disabled, these can be shared between proper preprocessor and MSVC preprocessor
+  #define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+  #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+  #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define CATCH_TEMPLATE_LIST_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE(__VA_ARGS__)
+  #define CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+
+  #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+    #define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+    #define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+    #define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+    #define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+    #define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+    #define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+    #define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+    #define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+    #define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #else
+    #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+    #define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+    #define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+    #define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+    #define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+    #define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+    #define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+    #define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+    #define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+    #define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+  #endif
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+
+  #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+    #define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+    #define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+    #define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+  #else
+    #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+    #define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+    #define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+    #define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+  #endif
+
+  // When disabled, these can be shared between proper preprocessor and MSVC preprocessor
+  #define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+  #define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+  #define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+  #define TEMPLATE_LIST_TEST_CASE( ... ) TEMPLATE_TEST_CASE(__VA_ARGS__)
+  #define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+
+#endif // end of user facing macro declarations
+
+
+#endif // CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+
+
+#ifndef CATCH_TEST_CASE_INFO_HPP_INCLUDED
+#define CATCH_TEST_CASE_INFO_HPP_INCLUDED
+
+
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    /**
+     * A **view** of a tag string that provides case insensitive comparisons
+     *
+     * Note that in Catch2 internals, the square brackets around tags are
+     * not a part of tag's representation, so e.g. "[cool-tag]" is represented
+     * as "cool-tag" internally.
+     */
+    struct Tag {
+        constexpr Tag(StringRef original_):
+            original(original_)
+        {}
+        StringRef original;
+
+        friend bool operator< ( Tag const& lhs, Tag const& rhs );
+        friend bool operator==( Tag const& lhs, Tag const& rhs );
+    };
+
+    class ITestInvoker;
+    struct NameAndTags;
+
+    enum class TestCaseProperties : uint8_t {
+        None = 0,
+        IsHidden = 1 << 1,
+        ShouldFail = 1 << 2,
+        MayFail = 1 << 3,
+        Throws = 1 << 4,
+        NonPortable = 1 << 5,
+        Benchmark = 1 << 6
+    };
+
+    /**
+     * Various metadata about the test case.
+     *
+     * A test case is uniquely identified by its (class)name and tags
+     * combination, with source location being ignored, and other properties
+     * being determined from tags.
+     *
+     * Tags are kept sorted.
+     */
+    struct TestCaseInfo : Detail::NonCopyable {
+
+        TestCaseInfo(StringRef _className,
+                     NameAndTags const& _nameAndTags,
+                     SourceLineInfo const& _lineInfo);
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        // Adds the tag(s) with test's filename (for the -# flag)
+        void addFilenameTag();
+
+        //! Orders by name, classname and tags
+        friend bool operator<( TestCaseInfo const& lhs,
+                               TestCaseInfo const& rhs );
+
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        StringRef className;
+    private:
+        std::string backingTags;
+        // Internally we copy tags to the backing storage and then add
+        // refs to this storage to the tags vector.
+        void internalAppendTag(StringRef tagString);
+    public:
+        std::vector<Tag> tags;
+        SourceLineInfo lineInfo;
+        TestCaseProperties properties = TestCaseProperties::None;
+    };
+
+    /**
+     * Wrapper over the test case information and the test case invoker
+     *
+     * Does not own either, and is specifically made to be cheap
+     * to copy around.
+     */
+    class TestCaseHandle {
+        TestCaseInfo* m_info;
+        ITestInvoker* m_invoker;
+    public:
+        TestCaseHandle(TestCaseInfo* info, ITestInvoker* invoker) :
+            m_info(info), m_invoker(invoker) {}
+
+        void invoke() const {
+            m_invoker->invoke();
+        }
+
+        TestCaseInfo const& getTestCaseInfo() const;
+    };
+
+    Detail::unique_ptr<TestCaseInfo>
+    makeTestCaseInfo( StringRef className,
+                      NameAndTags const& nameAndTags,
+                      SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif // CATCH_TEST_CASE_INFO_HPP_INCLUDED
+
+
+#ifndef CATCH_TRANSLATE_EXCEPTION_HPP_INCLUDED
+#define CATCH_TRANSLATE_EXCEPTION_HPP_INCLUDED
+
+
+
+#ifndef CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
+#define CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
+
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    class IExceptionTranslator;
+    using ExceptionTranslators = std::vector<Detail::unique_ptr<IExceptionTranslator const>>;
+
+    class IExceptionTranslator {
+    public:
+        virtual ~IExceptionTranslator(); // = default
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    class IExceptionTranslatorRegistry {
+    public:
+        virtual ~IExceptionTranslatorRegistry(); // = default
+        virtual std::string translateActiveException() const = 0;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
+
+#include <exception>
+
+namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator );
+    }
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T const& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T const& ex ) {
+                    return m_translateFunction( ex );
+                }
+#else
+                return "You should never get here!";
+#endif
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T const& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
+            Detail::registerTranslatorImpl(
+                Detail::make_unique<ExceptionTranslator<T>>(
+                    translateFunction ) );
+        }
+    };
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+            static std::string translatorName( signature )
+#endif
+
+
+// This macro is always prefixed
+#if !defined(CATCH_CONFIG_DISABLE)
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+#else
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+#endif
+
+
+#endif // CATCH_TRANSLATE_EXCEPTION_HPP_INCLUDED
+
+
+#ifndef CATCH_VERSION_HPP_INCLUDED
+#define CATCH_VERSION_HPP_INCLUDED
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+#endif // CATCH_VERSION_HPP_INCLUDED
+
+
+#ifndef CATCH_VERSION_MACROS_HPP_INCLUDED
+#define CATCH_VERSION_MACROS_HPP_INCLUDED
+
+#define CATCH_VERSION_MAJOR 3
+#define CATCH_VERSION_MINOR 6
+#define CATCH_VERSION_PATCH 0
+
+#endif // CATCH_VERSION_MACROS_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2's Generator support. It includes
+ * **all** of Catch2 headers related to generators.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of (significantly) increased
+ * compilation times.
+ *
+ * When a new header is added to either the `generators` folder,
+ * or to the corresponding internal subfolder, it should be added here.
+ */
+
+#ifndef CATCH_GENERATORS_ALL_HPP_INCLUDED
+#define CATCH_GENERATORS_ALL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+#define CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+
+#include <exception>
+
+namespace Catch {
+
+    // Exception type to be thrown when a Generator runs into an error,
+    // e.g. it cannot initialize the first return value based on
+    // runtime information
+    class GeneratorException : public std::exception {
+        const char* const m_msg = "";
+
+    public:
+        GeneratorException(const char* msg):
+            m_msg(msg)
+        {}
+
+        const char* what() const noexcept override final;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+
+
+#ifndef CATCH_GENERATORS_HPP_INCLUDED
+#define CATCH_GENERATORS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
+#define CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+            // Caches result from `toStringImpl`, assume that when it is an
+            // empty string, the cache is invalidated.
+            mutable std::string m_stringReprCache;
+
+            // Counts based on `next` returning true
+            std::size_t m_currentElementIndex = 0;
+
+            /**
+             * Attempts to move the generator to the next element
+             *
+             * Returns true iff the move succeeded (and a valid element
+             * can be retrieved).
+             */
+            virtual bool next() = 0;
+
+            //! Customization point for `currentElementAsString`
+            virtual std::string stringifyImpl() const = 0;
+
+        public:
+            GeneratorUntypedBase() = default;
+            // Generation of copy ops is deprecated (and Clang will complain)
+            // if there is a user destructor defined
+            GeneratorUntypedBase(GeneratorUntypedBase const&) = default;
+            GeneratorUntypedBase& operator=(GeneratorUntypedBase const&) = default;
+
+            virtual ~GeneratorUntypedBase(); // = default;
+
+            /**
+             * Attempts to move the generator to the next element
+             *
+             * Serves as a non-virtual interface to `next`, so that the
+             * top level interface can provide sanity checking and shared
+             * features.
+             *
+             * As with `next`, returns true iff the move succeeded and
+             * the generator has new valid element to provide.
+             */
+            bool countedNext();
+
+            std::size_t currentElementIndex() const { return m_currentElementIndex; }
+
+            /**
+             * Returns generator's current element as user-friendly string.
+             *
+             * By default returns string equivalent to calling
+             * `Catch::Detail::stringify` on the current element, but generators
+             * can customize their implementation as needed.
+             *
+             * Not thread-safe due to internal caching.
+             *
+             * The returned ref is valid only until the generator instance
+             * is destructed, or it moves onto the next element, whichever
+             * comes first.
+             */
+            StringRef currentElementAsString() const;
+        };
+        using GeneratorBasePtr = Catch::Detail::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    class IGeneratorTracker {
+    public:
+        virtual ~IGeneratorTracker(); // = default;
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
+
+#include <vector>
+#include <tuple>
+
+namespace Catch {
+
+namespace Generators {
+
+namespace Detail {
+
+    //! Throws GeneratorException with the provided message
+    [[noreturn]]
+    void throw_generator_exception(char const * msg);
+
+} // end namespace detail
+
+    template<typename T>
+    class IGenerator : public GeneratorUntypedBase {
+        std::string stringifyImpl() const override {
+            return ::Catch::Detail::stringify( get() );
+        }
+
+    public:
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template <typename T>
+    using GeneratorPtr = Catch::Detail::unique_ptr<IGenerator<T>>;
+
+    template <typename T>
+    class GeneratorWrapper final {
+        GeneratorPtr<T> m_generator;
+    public:
+        //! Takes ownership of the passed pointer.
+        GeneratorWrapper(IGenerator<T>* generator):
+            m_generator(generator) {}
+        GeneratorWrapper(GeneratorPtr<T> generator):
+            m_generator(CATCH_MOVE(generator)) {}
+
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->countedNext();
+        }
+    };
+
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T const& value) :
+            m_value(value)
+        {}
+        SingleValueGenerator(T&& value):
+            m_value(CATCH_MOVE(value))
+        {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T, typename DecayedT = std::decay_t<T>>
+    GeneratorWrapper<DecayedT> value( T&& value ) {
+        return GeneratorWrapper<DecayedT>(
+            Catch::Detail::make_unique<SingleValueGenerator<DecayedT>>(
+                CATCH_FORWARD( value ) ) );
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(Catch::Detail::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void add_generator( GeneratorWrapper<T>&& generator ) {
+            m_generators.emplace_back( CATCH_MOVE( generator ) );
+        }
+        void add_generator( T const& val ) {
+            m_generators.emplace_back( value( val ) );
+        }
+        void add_generator( T&& val ) {
+            m_generators.emplace_back( value( CATCH_MOVE( val ) ) );
+        }
+        template <typename U>
+        std::enable_if_t<!std::is_same<std::decay_t<U>, T>::value>
+        add_generator( U&& val ) {
+            add_generator( T( CATCH_FORWARD( val ) ) );
+        }
+
+        template <typename U> void add_generators( U&& valueOrGenerator ) {
+            add_generator( CATCH_FORWARD( valueOrGenerator ) );
+        }
+
+        template <typename U, typename... Gs>
+        void add_generators( U&& valueOrGenerator, Gs&&... moreGenerators ) {
+            add_generator( CATCH_FORWARD( valueOrGenerator ) );
+            add_generators( CATCH_FORWARD( moreGenerators )... );
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            add_generators(CATCH_FORWARD(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+
+    template <typename... Ts>
+    GeneratorWrapper<std::tuple<std::decay_t<Ts>...>>
+    table( std::initializer_list<std::tuple<std::decay_t<Ts>...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(CATCH_MOVE(generator), CATCH_FORWARD(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(CATCH_MOVE(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<std::decay_t<T>> {
+        return makeGenerators( value( CATCH_FORWARD( val ) ), CATCH_FORWARD( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( CATCH_FORWARD( val ) ) ), CATCH_FORWARD( moreGenerators )... );
+    }
+
+    IGeneratorTracker* acquireGeneratorTracker( StringRef generatorName,
+                                                SourceLineInfo const& lineInfo );
+    IGeneratorTracker* createGeneratorTracker( StringRef generatorName,
+                                               SourceLineInfo lineInfo,
+                                               GeneratorBasePtr&& generator );
+
+    template<typename L>
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> typename decltype(generatorExpression())::type {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker* tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        // Creation of tracker is delayed after generator creation, so
+        // that constructing generator can fail without breaking everything.
+        if (!tracker) {
+            tracker = createGeneratorTracker(
+                generatorName,
+                lineInfo,
+                Catch::Detail::make_unique<Generators<UnderlyingType>>(
+                    generatorExpression() ) );
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker->getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define CATCH_INTERNAL_GENERATOR_STRINGIZE_IMPL( ... ) #__VA_ARGS__##_catch_sr
+#define CATCH_INTERNAL_GENERATOR_STRINGIZE(...) CATCH_INTERNAL_GENERATOR_STRINGIZE_IMPL(__VA_ARGS__)
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_GENERATOR_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_GENERATOR_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_GENERATOR_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+#endif // CATCH_GENERATORS_HPP_INCLUDED
+
+
+#ifndef CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
+#define CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
+
+
+#include <cassert>
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator final : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(CATCH_MOVE(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(Catch::Detail::make_unique<TakeGenerator<T>>(target, CATCH_MOVE(generator)));
+    }
+
+
+    template <typename T, typename Predicate>
+    class FilterGenerator final : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(CATCH_MOVE(generator)),
+            m_predicate(CATCH_FORWARD(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = next();
+                if (!has_initial_value) {
+                    Detail::throw_generator_exception("No valid value found in filtered generator");
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(Catch::Detail::make_unique<FilterGenerator<T, Predicate>>(CATCH_FORWARD(pred), CATCH_MOVE(generator)));
+    }
+
+    template <typename T>
+    class RepeatGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(CATCH_MOVE(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(Catch::Detail::make_unique<RepeatGenerator<T>>(repeats, CATCH_MOVE(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator final : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(CATCH_MOVE(generator)),
+            m_function(CATCH_FORWARD(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            Catch::Detail::make_unique<MapGenerator<T, U, Func>>(CATCH_FORWARD(function), CATCH_MOVE(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            Catch::Detail::make_unique<MapGenerator<T, U, Func>>(CATCH_FORWARD(function), CATCH_MOVE(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(CATCH_MOVE(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Detail::throw_generator_exception("Not enough values to initialize the first chunk");
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            Catch::Detail::make_unique<ChunkGenerator<T>>(size, CATCH_MOVE(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+
+#endif // CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
+
+
+#ifndef CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+#define CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+
+
+
+#ifndef CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+#define CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+
+
+
+#ifndef CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+
+
+
+
+#ifndef CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+
+// Note: We use the usual enable-disable-autodetect dance here even though
+//       we do not support these in CMake configuration options (yet?).
+//       It is highly unlikely that we will need to make these actually
+//       user-configurable, but this will make it simpler if weend up needing
+//       it, and it provides an escape hatch to the users who need it.
+#if defined( __SIZEOF_INT128__ )
+#    define CATCH_CONFIG_INTERNAL_UINT128
+// Unlike GCC, MSVC does not polyfill umul as mulh + mul pair on ARM machines.
+// Currently we do not bother doing this ourselves, but we could if it became
+// important for perf.
+#elif defined( _MSC_VER ) && defined( _M_X64 )
+#    define CATCH_CONFIG_INTERNAL_MSVC_UMUL128
+#endif
+
+#if defined( CATCH_CONFIG_INTERNAL_UINT128 ) && \
+    !defined( CATCH_CONFIG_NO_UINT128 ) &&      \
+    !defined( CATCH_CONFIG_UINT128 )
+#define CATCH_CONFIG_UINT128
+#endif
+
+#if defined( CATCH_CONFIG_INTERNAL_MSVC_UMUL128 ) && \
+    !defined( CATCH_CONFIG_NO_MSVC_UMUL128 ) &&      \
+    !defined( CATCH_CONFIG_MSVC_UMUL128 )
+#    define CATCH_CONFIG_MSVC_UMUL128
+#    include <intrin.h>
+#endif
+
+
+namespace Catch {
+    namespace Detail {
+
+        template <std::size_t>
+        struct SizedUnsignedType;
+#define SizedUnsignedTypeHelper( TYPE )        \
+    template <>                                \
+    struct SizedUnsignedType<sizeof( TYPE )> { \
+        using type = TYPE;                     \
+    }
+
+        SizedUnsignedTypeHelper( std::uint8_t );
+        SizedUnsignedTypeHelper( std::uint16_t );
+        SizedUnsignedTypeHelper( std::uint32_t );
+        SizedUnsignedTypeHelper( std::uint64_t );
+#undef SizedUnsignedTypeHelper
+
+        template <std::size_t sz>
+        using SizedUnsignedType_t = typename SizedUnsignedType<sz>::type;
+
+        template <typename T>
+        using DoubleWidthUnsignedType_t = SizedUnsignedType_t<2 * sizeof( T )>;
+
+        template <typename T>
+        struct ExtendedMultResult {
+            T upper;
+            T lower;
+            bool operator==( ExtendedMultResult const& rhs ) const {
+                return upper == rhs.upper && lower == rhs.lower;
+            }
+        };
+
+        /**
+         * Returns 128 bit result of lhs * rhs using portable C++ code
+         *
+         * This implementation is almost twice as fast as naive long multiplication,
+         * and unlike intrinsic-based approach, it supports constexpr evaluation.
+         */
+        constexpr ExtendedMultResult<std::uint64_t>
+        extendedMultPortable(std::uint64_t lhs, std::uint64_t rhs) {
+#define CarryBits( x ) ( x >> 32 )
+#define Digits( x ) ( x & 0xFF'FF'FF'FF )
+            std::uint64_t lhs_low = Digits( lhs );
+            std::uint64_t rhs_low = Digits( rhs );
+            std::uint64_t low_low = ( lhs_low * rhs_low );
+            std::uint64_t high_high = CarryBits( lhs ) * CarryBits( rhs );
+
+            // We add in carry bits from low-low already
+            std::uint64_t high_low =
+                ( CarryBits( lhs ) * rhs_low ) + CarryBits( low_low );
+            // Note that we can add only low bits from high_low, to avoid
+            // overflow with large inputs
+            std::uint64_t low_high =
+                ( lhs_low * CarryBits( rhs ) ) + Digits( high_low );
+
+            return { high_high + CarryBits( high_low ) + CarryBits( low_high ),
+                     ( low_high << 32 ) | Digits( low_low ) };
+#undef CarryBits
+#undef Digits
+        }
+
+        //! Returns 128 bit result of lhs * rhs
+        inline ExtendedMultResult<std::uint64_t>
+        extendedMult( std::uint64_t lhs, std::uint64_t rhs ) {
+#if defined( CATCH_CONFIG_UINT128 )
+            auto result = __uint128_t( lhs ) * __uint128_t( rhs );
+            return { static_cast<std::uint64_t>( result >> 64 ),
+                     static_cast<std::uint64_t>( result ) };
+#elif defined( CATCH_CONFIG_MSVC_UMUL128 )
+            std::uint64_t high;
+            std::uint64_t low = _umul128( lhs, rhs, &high );
+            return { high, low };
+#else
+            return extendedMultPortable( lhs, rhs );
+#endif
+        }
+
+
+        template <typename UInt>
+        constexpr ExtendedMultResult<UInt> extendedMult( UInt lhs, UInt rhs ) {
+            static_assert( std::is_unsigned<UInt>::value,
+                           "extendedMult can only handle unsigned integers" );
+            static_assert( sizeof( UInt ) < sizeof( std::uint64_t ),
+                           "Generic extendedMult can only handle types smaller "
+                           "than uint64_t" );
+            using WideType = DoubleWidthUnsignedType_t<UInt>;
+
+            auto result = WideType( lhs ) * WideType( rhs );
+            return {
+                static_cast<UInt>( result >> ( CHAR_BIT * sizeof( UInt ) ) ),
+                static_cast<UInt>( result & UInt( -1 ) ) };
+        }
+
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) >= sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value, "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            // We want to return the top bits from a generator, as they are
+            // usually considered higher quality.
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+
+            return static_cast<TargetType>( gen() >>
+                                            ( generated_bits - return_bits) );
+        }
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) < sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value,
+                           "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+            std::size_t filled_bits = 0;
+            TargetType ret = 0;
+            do {
+                ret <<= generated_bits;
+                ret |= gen();
+                filled_bits += generated_bits;
+            } while ( filled_bits < return_bits );
+
+            return ret;
+        }
+
+        /*
+         * Transposes numbers into unsigned type while keeping their ordering
+         *
+         * This means that signed types are changed so that the ordering is
+         * [INT_MIN, ..., -1, 0, ..., INT_MAX], rather than order we would
+         * get by simple casting ([0, ..., INT_MAX, INT_MIN, ..., -1])
+         */
+        template <typename OriginalType, typename UnsignedType>
+        std::enable_if_t<std::is_signed<OriginalType>::value, UnsignedType>
+        transposeToNaturalOrder( UnsignedType in ) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value,
+                           "Input type must be unsigned" );
+            // Assuming 2s complement (standardized in current C++), the
+            // positive and negative numbers are already internally ordered,
+            // and their difference is in the top bit. Swapping it orders
+            // them the desired way.
+            constexpr auto highest_bit =
+                UnsignedType( 1 ) << ( sizeof( UnsignedType ) * CHAR_BIT - 1 );
+            return static_cast<UnsignedType>( in ^ highest_bit );
+        }
+
+
+
+        template <typename OriginalType,
+                  typename UnsignedType>
+        std::enable_if_t<std::is_unsigned<OriginalType>::value, UnsignedType>
+            transposeToNaturalOrder(UnsignedType in) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value, "Input type must be unsigned" );
+            // No reordering is needed for unsigned -> unsigned
+            return in;
+        }
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+
+namespace Catch {
+
+/**
+ * Implementation of uniform distribution on integers.
+ *
+ * Unlike `std::uniform_int_distribution`, this implementation supports
+ * various 1 byte integral types, including bool (but you should not
+ * actually use it for bools).
+ *
+ * The underlying algorithm is based on the one described in "Fast Random
+ * Integer Generation in an Interval" by Daniel Lemire, but has been
+ * optimized under the assumption of reuse of the same distribution object.
+ */
+template <typename IntegerType>
+class uniform_integer_distribution {
+    static_assert(std::is_integral<IntegerType>::value, "...");
+
+    using UnsignedIntegerType = Detail::SizedUnsignedType_t<sizeof(IntegerType)>;
+
+    // Only the left bound is stored, and we store it converted to its
+    // unsigned image. This avoids having to do the conversions inside
+    // the operator(), at the cost of having to do the conversion in
+    // the a() getter. The right bound is only needed in the b() getter,
+    // so we recompute it there from other stored data.
+    UnsignedIntegerType m_a;
+
+    // How many different values are there in [a, b]. a == b => 1, can be 0 for distribution over all values in the type.
+    UnsignedIntegerType m_ab_distance;
+
+    // We hoisted this out of the main generation function. Technically,
+    // this means that using this distribution will be slower than Lemire's
+    // algorithm if this distribution instance will be used only few times,
+    // but it will be faster if it is used many times. Since Catch2 uses
+    // distributions only to implement random generators, we assume that each
+    // distribution will be reused many times and this is an optimization.
+    UnsignedIntegerType m_rejection_threshold = 0;
+
+    UnsignedIntegerType computeDistance(IntegerType a, IntegerType b) const {
+        // This overflows and returns 0 if a == 0 and b == TYPE_MAX.
+        // We handle that later when generating the number.
+        return transposeTo(b) - transposeTo(a) + 1;
+    }
+
+    static UnsignedIntegerType computeRejectionThreshold(UnsignedIntegerType ab_distance) {
+        // distance == 0 means that we will return all possible values from
+        // the type's range, and that we shouldn't reject anything.
+        if ( ab_distance == 0 ) { return 0; }
+        return ( ~ab_distance + 1 ) % ab_distance;
+    }
+
+    static UnsignedIntegerType transposeTo(IntegerType in) {
+        return Detail::transposeToNaturalOrder<IntegerType>(
+            static_cast<UnsignedIntegerType>( in ) );
+    }
+    static IntegerType transposeBack(UnsignedIntegerType in) {
+        return static_cast<IntegerType>(
+            Detail::transposeToNaturalOrder<IntegerType>(in) );
+    }
+
+public:
+    using result_type = IntegerType;
+
+    uniform_integer_distribution( IntegerType a, IntegerType b ):
+        m_a( transposeTo(a) ),
+        m_ab_distance( computeDistance(a, b) ),
+        m_rejection_threshold( computeRejectionThreshold(m_ab_distance) ) {
+        assert( a <= b );
+    }
+
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        // All possible values of result_type are valid.
+        if ( m_ab_distance == 0 ) {
+            return transposeBack( Detail::fillBitsFrom<UnsignedIntegerType>( g ) );
+        }
+
+        auto random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+        auto emul = Detail::extendedMult( random_number, m_ab_distance );
+        // Unlike Lemire's algorithm we skip the ab_distance check, since
+        // we precomputed the rejection threshold, which is always tighter.
+        while (emul.lower < m_rejection_threshold) {
+            random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+            emul = Detail::extendedMult( random_number, m_ab_distance );
+        }
+
+        return transposeBack(m_a + emul.upper);
+    }
+
+    result_type a() const { return transposeBack(m_a); }
+    result_type b() const { return transposeBack(m_ab_distance + m_a - 1); }
+};
+
+} // end namespace Catch
+
+#endif // CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+
+
+
+#ifndef CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+
+
+
+
+#ifndef CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_POLYFILLS_HPP_INCLUDED
+#define CATCH_POLYFILLS_HPP_INCLUDED
+
+namespace Catch {
+
+    bool isnan(float f);
+    bool isnan(double d);
+
+    float nextafter(float x, float y);
+    double nextafter(double x, double y);
+
+}
+
+#endif // CATCH_POLYFILLS_HPP_INCLUDED
+
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+        /**
+         * Returns the largest magnitude of 1-ULP distance inside the [a, b] range.
+         *
+         * Assumes `a < b`.
+         */
+        template <typename FloatType>
+        FloatType gamma(FloatType a, FloatType b) {
+            static_assert( std::is_floating_point<FloatType>::value,
+                           "gamma returns the largest ULP magnitude within "
+                           "floating point range [a, b]. This only makes sense "
+                           "for floating point types" );
+            assert( a <= b );
+
+            const auto gamma_up = Catch::nextafter( a, std::numeric_limits<FloatType>::infinity() ) - a;
+            const auto gamma_down = b - Catch::nextafter( b, -std::numeric_limits<FloatType>::infinity() );
+
+            return gamma_up < gamma_down ? gamma_down : gamma_up;
+        }
+
+        template <typename FloatingPoint>
+        struct DistanceTypePicker;
+        template <>
+        struct DistanceTypePicker<float> {
+            using type = std::uint32_t;
+        };
+        template <>
+        struct DistanceTypePicker<double> {
+            using type = std::uint64_t;
+        };
+
+        template <typename T>
+        using DistanceType = typename DistanceTypePicker<T>::type;
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        /**
+         * Computes the number of equi-distant floats in [a, b]
+         *
+         * Since not every range can be split into equidistant floats
+         * exactly, we actually compute ceil(b/distance - a/distance),
+         * because in those cases we want to overcount.
+         *
+         * Uses modified Dekker's FastTwoSum algorithm to handle rounding.
+         */
+        template <typename FloatType>
+        DistanceType<FloatType>
+        count_equidistant_floats( FloatType a, FloatType b, FloatType distance ) {
+            assert( a <= b );
+            // We get distance as gamma for our uniform float distribution,
+            // so this will round perfectly.
+            const auto ag = a / distance;
+            const auto bg = b / distance;
+
+            const auto s = bg - ag;
+            const auto err = ( std::fabs( a ) <= std::fabs( b ) )
+                                 ? -ag - ( s - bg )
+                                 : bg - ( s + ag );
+            const auto ceil_s = static_cast<DistanceType<FloatType>>( std::ceil( s ) );
+
+            return ( ceil_s != s ) ? ceil_s : ceil_s + ( err > 0 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+#include <cmath>
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        // The issue with overflow only happens with maximal ULP and HUGE
+        // distance, e.g. when generating numbers in [-inf, inf] for given
+        // type. So we only check for the largest possible ULP in the
+        // type, and return something that does not overflow to inf in 1 mult.
+        constexpr std::uint64_t calculate_max_steps_in_one_go(double gamma) {
+            if ( gamma == 1.99584030953472e+292 ) { return 9007199254740991; }
+            return static_cast<std::uint64_t>( -1 );
+        }
+        constexpr std::uint32_t calculate_max_steps_in_one_go(float gamma) {
+            if ( gamma == 2.028241e+31f ) { return 16777215; }
+            return static_cast<std::uint32_t>( -1 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+    }
+
+/**
+ * Implementation of uniform distribution on floating point numbers.
+ *
+ * Note that we support only `float` and `double` types, because these
+ * usually mean the same thing across different platform. `long double`
+ * varies wildly by platform and thus we cannot provide reproducible
+ * implementation. Also note that we don't implement all parts of
+ * distribution per standard: this distribution is not serializable, nor
+ * can the range be arbitrarily reset.
+ *
+ * The implementation also uses different approach than the one taken by
+ * `std::uniform_real_distribution`, where instead of generating a number
+ * between [0, 1) and then multiplying the range bounds with it, we first
+ * split the [a, b] range into a set of equidistributed floating point
+ * numbers, and then use uniform int distribution to pick which one to
+ * return.
+ *
+ * This has the advantage of guaranteeing uniformity (the multiplication
+ * method loses uniformity due to rounding when multiplying floats), except
+ * for small non-uniformity at one side of the interval, where we have
+ * to deal with the fact that not every interval is splittable into
+ * equidistributed floats.
+ *
+ * Based on "Drawing random floating-point numbers from an interval" by
+ * Frederic Goualard.
+ */
+template <typename FloatType>
+class uniform_floating_point_distribution {
+    static_assert(std::is_floating_point<FloatType>::value, "...");
+    static_assert(!std::is_same<FloatType, long double>::value,
+                  "We do not support long double due to inconsistent behaviour between platforms");
+
+    using WidthType = Detail::DistanceType<FloatType>;
+
+    FloatType m_a, m_b;
+    FloatType m_ulp_magnitude;
+    WidthType m_floats_in_range;
+    uniform_integer_distribution<WidthType> m_int_dist;
+
+    // In specific cases, we can overflow into `inf` when computing the
+    // `steps * g` offset. To avoid this, we don't offset by more than this
+    // in one multiply + addition.
+    WidthType m_max_steps_in_one_go;
+    // We don't want to do the magnitude check every call to `operator()`
+    bool m_a_has_leq_magnitude;
+
+public:
+    using result_type = FloatType;
+
+    uniform_floating_point_distribution( FloatType a, FloatType b ):
+        m_a( a ),
+        m_b( b ),
+        m_ulp_magnitude( Detail::gamma( m_a, m_b ) ),
+        m_floats_in_range( Detail::count_equidistant_floats( m_a, m_b, m_ulp_magnitude ) ),
+        m_int_dist(0, m_floats_in_range),
+        m_max_steps_in_one_go( Detail::calculate_max_steps_in_one_go(m_ulp_magnitude)),
+        m_a_has_leq_magnitude(std::fabs(m_a) <= std::fabs(m_b))
+    {
+        assert( a <= b );
+    }
+
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        WidthType steps = m_int_dist( g );
+        if ( m_a_has_leq_magnitude ) {
+            if ( steps == m_floats_in_range ) { return m_a; }
+            auto b = m_b;
+            while (steps > m_max_steps_in_one_go) {
+                b -= m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return b - steps * m_ulp_magnitude;
+        } else {
+            if ( steps == m_floats_in_range ) { return m_b; }
+            auto a = m_a;
+            while (steps > m_max_steps_in_one_go) {
+                a += m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return a + steps * m_ulp_magnitude;
+        }
+    }
+
+    result_type a() const { return m_a; }
+    result_type b() const { return m_b; }
+};
+
+} // end namespace Catch
+
+#endif // CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+
+namespace Catch {
+namespace Generators {
+namespace Detail {
+    // Returns a suitable seed for a random floating generator based off
+    // the primary internal rng. It does so by taking current value from
+    // the rng and returning it as the seed.
+    std::uint32_t getSeed();
+}
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32 m_rng;
+    Catch::uniform_floating_point_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+    RandomFloatingGenerator( Float a, Float b, std::uint32_t seed ):
+        m_rng(seed),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <>
+class RandomFloatingGenerator<long double> final : public IGenerator<long double> {
+    // We still rely on <random> for this specialization, but we don't
+    // want to drag it into the header.
+    struct PImpl;
+    Catch::Detail::unique_ptr<PImpl> m_pimpl;
+    long double m_current_number;
+
+public:
+    RandomFloatingGenerator( long double a, long double b, std::uint32_t seed );
+
+    long double const& get() const override { return m_current_number; }
+    bool next() override;
+
+    ~RandomFloatingGenerator() override; // = default
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32 m_rng;
+    Catch::uniform_integer_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+    RandomIntegerGenerator( Integer a, Integer b, std::uint32_t seed ):
+        m_rng(seed),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename T>
+std::enable_if_t<std::is_integral<T>::value, GeneratorWrapper<T>>
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        Catch::Detail::make_unique<RandomIntegerGenerator<T>>(a, b, Detail::getSeed())
+    );
+}
+
+template <typename T>
+std::enable_if_t<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        Catch::Detail::make_unique<RandomFloatingGenerator<T>>(a, b, Detail::getSeed())
+    );
+}
+
+
+} // namespace Generators
+} // namespace Catch
+
+
+#endif // CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+
+
+#ifndef CATCH_GENERATORS_RANGE_HPP_INCLUDED
+#define CATCH_GENERATORS_RANGE_HPP_INCLUDED
+
+
+#include <iterator>
+#include <type_traits>
+
+namespace Catch {
+namespace Generators {
+
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(Catch::Detail::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(Catch::Detail::make_unique<RangeGenerator<T>>(start, end));
+}
+
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Detail::throw_generator_exception("IteratorGenerator received no valid values");
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container>
+auto from_range(Container const& cnt) {
+    using std::begin;
+    using std::end;
+    return from_range( begin( cnt ), end( cnt ) );
+}
+
+
+} // namespace Generators
+} // namespace Catch
+
+
+#endif // CATCH_GENERATORS_RANGE_HPP_INCLUDED
+
+#endif // CATCH_GENERATORS_ALL_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2's interfaces. It includes
+ * **all** of Catch2 headers related to interfaces.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of somewhat increased compilation
+ * times.
+ *
+ * When a new header is added to either the `interfaces` folder, or to
+ * the corresponding internal subfolder, it should be added here.
+ */
+
+
+#ifndef CATCH_INTERFACES_ALL_HPP_INCLUDED
+#define CATCH_INTERFACES_ALL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+#define CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TEST_RUN_INFO_HPP_INCLUDED
+#define CATCH_TEST_RUN_INFO_HPP_INCLUDED
+
+
+namespace Catch {
+
+    struct TestRunInfo {
+        constexpr TestRunInfo(StringRef _name) : name(_name) {}
+        StringRef name;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_TEST_RUN_INFO_HPP_INCLUDED
+
+#include <map>
+#include <string>
+#include <vector>
+#include <iosfwd>
+
+namespace Catch {
+
+    struct ReporterDescription;
+    struct ListenerDescription;
+    struct TagInfo;
+    struct TestCaseInfo;
+    class TestCaseHandle;
+    class IConfig;
+    class IStream;
+    enum class ColourMode : std::uint8_t;
+
+    struct ReporterConfig {
+        ReporterConfig( IConfig const* _fullConfig,
+                        Detail::unique_ptr<IStream> _stream,
+                        ColourMode colourMode,
+                        std::map<std::string, std::string> customOptions );
+
+        ReporterConfig( ReporterConfig&& ) = default;
+        ReporterConfig& operator=( ReporterConfig&& ) = default;
+        ~ReporterConfig(); // = default
+
+        Detail::unique_ptr<IStream> takeStream() &&;
+        IConfig const* fullConfig() const;
+        ColourMode colourMode() const;
+        std::map<std::string, std::string> const& customOptions() const;
+
+    private:
+        Detail::unique_ptr<IStream> m_stream;
+        IConfig const* m_fullConfig;
+        ColourMode m_colourMode;
+        std::map<std::string, std::string> m_customOptions;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo&& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string&& _stdOut,
+                        std::string&& _stdErr,
+                        bool _aborting );
+
+        TestCaseInfo const * testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    //! By setting up its preferences, a reporter can modify Catch2's behaviour
+    //! in some regards, e.g. it can request Catch2 to capture writes to
+    //! stdout/stderr during test execution, and pass them to the reporter.
+    struct ReporterPreferences {
+        //! Catch2 should redirect writes to stdout and pass them to the
+        //! reporter
+        bool shouldRedirectStdOut = false;
+        //! Catch2 should call `Reporter::assertionEnded` even for passing
+        //! assertions
+        bool shouldReportAllAssertions = false;
+    };
+
+    /**
+     * The common base for all reporters and event listeners
+     *
+     * Implementing classes must also implement:
+     *
+     *     //! User-friendly description of the reporter/listener type
+     *     static std::string getDescription()
+     *
+     * Generally shouldn't be derived from by users of Catch2 directly,
+     * instead they should derive from one of the utility bases that
+     * derive from this class.
+     */
+    class IEventListener {
+    protected:
+        //! Derived classes can set up their preferences here
+        ReporterPreferences m_preferences;
+        //! The test run's config as filled in from CLI and defaults
+        IConfig const* m_config;
+
+    public:
+        IEventListener( IConfig const* config ): m_config( config ) {}
+
+        virtual ~IEventListener(); // = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+
+        ReporterPreferences const& getPreferences() const {
+            return m_preferences;
+        }
+
+        //! Called when no test cases match provided test spec
+        virtual void noMatchingTestCases( StringRef unmatchedSpec ) = 0;
+        //! Called for all invalid test specs from the cli
+        virtual void reportInvalidTestSpec( StringRef invalidArgument ) = 0;
+
+        /**
+         * Called once in a testing run before tests are started
+         *
+         * Not called if tests won't be run (e.g. only listing will happen)
+         */
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+
+        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
+        virtual void testCasePartialStarting( TestCaseInfo const& testInfo, uint64_t partNumber ) = 0;
+        //! Called when a `SECTION` is being entered. Not called for skipped sections
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+        //! Called when user-code is being probed before the actual benchmark runs
+        virtual void benchmarkPreparing( StringRef benchmarkName ) = 0;
+        //! Called after probe but before the user-code is being benchmarked
+        virtual void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) = 0;
+        //! Called with the benchmark results if benchmark successfully finishes
+        virtual void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) = 0;
+        //! Called if running the benchmarks fails for any reason
+        virtual void benchmarkFailed( StringRef benchmarkName ) = 0;
+
+        //! Called before assertion success/failure is evaluated
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        //! Called after assertion was fully evaluated
+        virtual void assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        //! Called after a `SECTION` has finished running
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
+        virtual void testCasePartialEnded(TestCaseStats const& testCaseStats, uint64_t partNumber ) = 0;
+        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        /**
+         * Called once after all tests in a testing run are finished
+         *
+         * Not called if tests weren't run (e.g. only listings happened)
+         */
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        /**
+         * Called with test cases that are skipped due to the test run aborting.
+         * NOT called for test cases that are explicitly skipped using the `SKIP` macro.
+         *
+         * Deprecated - will be removed in the next major release.
+         */
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        //! Called if a fatal error (signal/structured exception) occurred
+        virtual void fatalErrorEncountered( StringRef error ) = 0;
+
+        //! Writes out information about provided reporters using reporter-specific format
+        virtual void listReporters(std::vector<ReporterDescription> const& descriptions) = 0;
+        //! Writes out the provided listeners descriptions using reporter-specific format
+        virtual void listListeners(std::vector<ListenerDescription> const& descriptions) = 0;
+        //! Writes out information about provided tests using reporter-specific format
+        virtual void listTests(std::vector<TestCaseHandle> const& tests) = 0;
+        //! Writes out information about the provided tags using reporter-specific format
+        virtual void listTags(std::vector<TagInfo> const& tags) = 0;
+    };
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+
+} // end namespace Catch
+
+#endif // CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_REPORTER_FACTORY_HPP_INCLUDED
+#define CATCH_INTERFACES_REPORTER_FACTORY_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    struct ReporterConfig;
+    class IConfig;
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+
+
+    class IReporterFactory {
+    public:
+        virtual ~IReporterFactory(); // = default
+
+        virtual IEventListenerPtr
+        create( ReporterConfig&& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
+
+    class EventListenerFactory {
+    public:
+        virtual ~EventListenerFactory(); // = default
+        virtual IEventListenerPtr create( IConfig const* config ) const = 0;
+        //! Return a meaningful name for the listener, e.g. its type name
+        virtual StringRef getName() const = 0;
+        //! Return listener's description if available
+        virtual std::string getDescription() const = 0;
+    };
+} // namespace Catch
+
+#endif // CATCH_INTERFACES_REPORTER_FACTORY_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#define CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    class ITagAliasRegistry {
+    public:
+        virtual ~ITagAliasRegistry(); // = default
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+
+
+#ifndef CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+#define CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+
+#include <vector>
+
+namespace Catch {
+
+    struct TestCaseInfo;
+    class TestCaseHandle;
+    class IConfig;
+
+    class ITestCaseRegistry {
+    public:
+        virtual ~ITestCaseRegistry(); // = default
+        // TODO: this exists only for adding filenames to test cases -- let's expose this in a saner way later
+        virtual std::vector<TestCaseInfo* > const& getAllInfos() const = 0;
+        virtual std::vector<TestCaseHandle> const& getAllTests() const = 0;
+        virtual std::vector<TestCaseHandle> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+}
+
+#endif // CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+
+#endif // CATCH_INTERFACES_ALL_HPP_INCLUDED
+
+
+#ifndef CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
+#define CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Detail {
+        //! Provides case-insensitive `op<` semantics when called
+        struct CaseInsensitiveLess {
+            bool operator()( StringRef lhs,
+                             StringRef rhs ) const;
+        };
+
+        //! Provides case-insensitive `op==` semantics when called
+        struct CaseInsensitiveEqualTo {
+            bool operator()( StringRef lhs,
+                             StringRef rhs ) const;
+        };
+
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
+
+
+
+/** \file
+ * Wrapper for ANDROID_LOGWRITE configuration option
+ *
+ * We want to default to enabling it when compiled for android, but
+ * users of the library should also be able to disable it if they want
+ * to.
+ */
+
+#ifndef CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+#define CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+
+
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+
+#if defined( CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE ) && \
+    !defined( CATCH_CONFIG_NO_ANDROID_LOGWRITE ) &&      \
+    !defined( CATCH_CONFIG_ANDROID_LOGWRITE )
+#    define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#endif // CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+
+
+
+/** \file
+ * Wrapper for UNCAUGHT_EXCEPTIONS configuration option
+ *
+ * For some functionality, Catch2 requires to know whether there is
+ * an active exception. Because `std::uncaught_exception` is deprecated
+ * in C++17, we want to use `std::uncaught_exceptions` if possible.
+ */
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+
+#ifndef CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#define CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+
+
+#include <iosfwd>
+#include <cstdint>
+
+namespace Catch {
+
+    enum class ColourMode : std::uint8_t;
+    class IStream;
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+            Skip = LightGrey,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+    };
+
+    class ColourImpl {
+    protected:
+        //! The associated stream of this ColourImpl instance
+        IStream* m_stream;
+    public:
+        ColourImpl( IStream* stream ): m_stream( stream ) {}
+
+        //! RAII wrapper around writing specific colour of text using specific
+        //! colour impl into a stream.
+        class ColourGuard {
+            ColourImpl const* m_colourImpl;
+            Colour::Code m_code;
+            bool m_engaged = false;
+
+        public:
+            //! Does **not** engage the guard/start the colour
+            ColourGuard( Colour::Code code,
+                         ColourImpl const* colour );
+
+            ColourGuard( ColourGuard const& rhs ) = delete;
+            ColourGuard& operator=( ColourGuard const& rhs ) = delete;
+
+            ColourGuard( ColourGuard&& rhs ) noexcept;
+            ColourGuard& operator=( ColourGuard&& rhs ) noexcept;
+
+            //! Removes colour _if_ the guard was engaged
+            ~ColourGuard();
+
+            /**
+             * Explicitly engages colour for given stream.
+             *
+             * The API based on operator<< should be preferred.
+             */
+            ColourGuard& engage( std::ostream& stream ) &;
+            /**
+             * Explicitly engages colour for given stream.
+             *
+             * The API based on operator<< should be preferred.
+             */
+            ColourGuard&& engage( std::ostream& stream ) &&;
+
+        private:
+            //! Engages the guard and starts using colour
+            friend std::ostream& operator<<( std::ostream& lhs,
+                                             ColourGuard& guard ) {
+                guard.engageImpl( lhs );
+                return lhs;
+            }
+            //! Engages the guard and starts using colour
+            friend std::ostream& operator<<( std::ostream& lhs,
+                                            ColourGuard&& guard) {
+                guard.engageImpl( lhs );
+                return lhs;
+            }
+
+            void engageImpl( std::ostream& stream );
+
+        };
+
+        virtual ~ColourImpl(); // = default
+        /**
+         * Creates a guard object for given colour and this colour impl
+         *
+         * **Important:**
+         * the guard starts disengaged, and has to be engaged explicitly.
+         */
+        ColourGuard guardColour( Colour::Code colourCode );
+
+    private:
+        virtual void use( Colour::Code colourCode ) const = 0;
+    };
+
+    //! Provides ColourImpl based on global config and target compilation platform
+    Detail::unique_ptr<ColourImpl> makeColourImpl( ColourMode colourSelection,
+                                                   IStream* stream );
+
+    //! Checks if specific colour impl has been compiled into the binary
+    bool isColourImplAvailable( ColourMode colourSelection );
+
+} // end namespace Catch
+
+#endif // CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+
+
+#ifndef CATCH_CONSOLE_WIDTH_HPP_INCLUDED
+#define CATCH_CONSOLE_WIDTH_HPP_INCLUDED
+
+// This include must be kept so that user's configured value for CONSOLE_WIDTH
+// is used before we attempt to provide a default value
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#endif // CATCH_CONSOLE_WIDTH_HPP_INCLUDED
+
+
+#ifndef CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+#define CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+
+
+#include <cstddef>
+#include <initializer_list>
+
+// We want a simple polyfill over `std::empty`, `std::size` and so on
+// for C++14 or C++ libraries with incomplete support.
+// We also have to handle that MSVC std lib will happily provide these
+// under older standards.
+#if defined(CATCH_CPP17_OR_GREATER) || defined(_MSC_VER)
+
+// We are already using this header either way, so there shouldn't
+// be much additional overhead in including it to get the feature
+// test macros
+#include <string>
+
+#  if !defined(__cpp_lib_nonmember_container_access)
+#      define CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
+#  endif
+
+#else
+#define CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
+#endif
+
+
+
+namespace Catch {
+namespace Detail {
+
+#if defined(CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS)
+    template <typename Container>
+    constexpr auto empty(Container const& cont) -> decltype(cont.empty()) {
+        return cont.empty();
+    }
+    template <typename T, std::size_t N>
+    constexpr bool empty(const T (&)[N]) noexcept {
+        // GCC < 7 does not support the const T(&)[] parameter syntax
+        // so we have to ignore the length explicitly
+        (void)N;
+        return false;
+    }
+    template <typename T>
+    constexpr bool empty(std::initializer_list<T> list) noexcept {
+        return list.size() > 0;
+    }
+
+
+    template <typename Container>
+    constexpr auto size(Container const& cont) -> decltype(cont.size()) {
+        return cont.size();
+    }
+    template <typename T, std::size_t N>
+    constexpr std::size_t size(const T(&)[N]) noexcept {
+        return N;
+    }
+#endif // CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
+
+} // end namespace Detail
+} // end namespace Catch
+
+
+
+#endif // CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+
+
+#ifndef CATCH_DEBUG_CONSOLE_HPP_INCLUDED
+#define CATCH_DEBUG_CONSOLE_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+#endif // CATCH_DEBUG_CONSOLE_HPP_INCLUDED
+
+
+#ifndef CATCH_DEBUGGER_HPP_INCLUDED
+#define CATCH_DEBUGGER_HPP_INCLUDED
+
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP() __asm__(".inst 0xd43e0000")
+    #elif defined(__POWERPC__)
+        #define CATCH_TRAP() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
+        : : : "memory","r0","r3","r4" ) /* NOLINT */
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
+#endif
+
+#endif // CATCH_DEBUGGER_HPP_INCLUDED
+
+
+#ifndef CATCH_ENFORCE_HPP_INCLUDED
+#define CATCH_ENFORCE_HPP_INCLUDED
+
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+
+#endif // CATCH_ENFORCE_HPP_INCLUDED
+
+
+#ifndef CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+#define CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+
+        Catch::Detail::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<Catch::Detail::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+#endif // CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+
+
+#ifndef CATCH_ERRNO_GUARD_HPP_INCLUDED
+#define CATCH_ERRNO_GUARD_HPP_INCLUDED
+
+namespace Catch {
+
+    //! Simple RAII class that stores the value of `errno`
+    //! at construction and restores it at destruction.
+    class ErrnoGuard {
+    public:
+        // Keep these outlined to avoid dragging in macros from <cerrno>
+
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+#endif // CATCH_ERRNO_GUARD_HPP_INCLUDED
+
+
+#ifndef CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+#define CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+
+
+#include <vector>
+#include <string>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry() override;
+        void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator );
+        std::string translateActiveException() const override;
+
+    private:
+        ExceptionTranslators m_translators;
+    };
+}
+
+#endif // CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+
+
+#ifndef CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
+#define CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
+
+#include <cassert>
+
+namespace Catch {
+
+    /**
+     * Wrapper for platform-specific fatal error (signals/SEH) handlers
+     *
+     * Tries to be cooperative with other handlers, and not step over
+     * other handlers. This means that unknown structured exceptions
+     * are passed on, previous signal handlers are called, and so on.
+     *
+     * Can only be instantiated once, and assumes that once a signal
+     * is caught, the binary will end up terminating. Thus, there
+     */
+    class FatalConditionHandler {
+        bool m_started = false;
+
+        // Install/disengage implementation for specific platform.
+        // Should be if-defed to work on current platform, can assume
+        // engage-disengage 1:1 pairing.
+        void engage_platform();
+        void disengage_platform() noexcept;
+    public:
+        // Should also have platform-specific implementations as needed
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+
+        void engage() {
+            assert(!m_started && "Handler cannot be installed twice.");
+            m_started = true;
+            engage_platform();
+        }
+
+        void disengage() noexcept {
+            assert(m_started && "Handler cannot be uninstalled without being installed first");
+            m_started = false;
+            disengage_platform();
+        }
+    };
+
+    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
+    class FatalConditionHandlerGuard {
+        FatalConditionHandler* m_handler;
+    public:
+        FatalConditionHandlerGuard(FatalConditionHandler* handler):
+            m_handler(handler) {
+            m_handler->engage();
+        }
+        ~FatalConditionHandlerGuard() {
+            m_handler->disengage();
+        }
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
+
+
+#ifndef CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
+#define CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <utility>
+#include <limits>
+
+namespace Catch {
+    namespace Detail {
+
+        uint32_t convertToBits(float f);
+        uint64_t convertToBits(double d);
+
+        // Used when we know we want == comparison of two doubles
+        // to centralize warning suppression
+        bool directCompare( float lhs, float rhs );
+        bool directCompare( double lhs, double rhs );
+
+    } // end namespace Detail
+
+
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+    // We do a bunch of direct compensations of floating point numbers,
+    // because we know what we are doing and actually do want the direct
+    // comparison behaviour.
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+    /**
+     * Calculates the ULP distance between two floating point numbers
+     *
+     * The ULP distance of two floating point numbers is the count of
+     * valid floating point numbers representable between them.
+     *
+     * There are some exceptions between how this function counts the
+     * distance, and the interpretation of the standard as implemented.
+     * by e.g. `nextafter`. For this function it always holds that:
+     * * `(x == y) => ulpDistance(x, y) == 0` (so `ulpDistance(-0, 0) == 0`)
+     * * `ulpDistance(maxFinite, INF) == 1`
+     * * `ulpDistance(x, -x) == 2 * ulpDistance(x, 0)`
+     *
+     * \pre `!isnan( lhs )`
+     * \pre `!isnan( rhs )`
+     * \pre floating point numbers are represented in IEEE-754 format
+     */
+    template <typename FP>
+    uint64_t ulpDistance( FP lhs, FP rhs ) {
+        assert( std::numeric_limits<FP>::is_iec559 &&
+            "ulpDistance assumes IEEE-754 format for floating point types" );
+        assert( !Catch::isnan( lhs ) &&
+                "Distance between NaN and number is not meaningful" );
+        assert( !Catch::isnan( rhs ) &&
+                "Distance between NaN and number is not meaningful" );
+
+        // We want X == Y to imply 0 ULP distance even if X and Y aren't
+        // bit-equal (-0 and 0), or X - Y != 0 (same sign infinities).
+        if ( lhs == rhs ) { return 0; }
+
+        // We need a properly typed positive zero for type inference.
+        static constexpr FP positive_zero{};
+
+        // We want to ensure that +/- 0 is always represented as positive zero
+        if ( lhs == positive_zero ) { lhs = positive_zero; }
+        if ( rhs == positive_zero ) { rhs = positive_zero; }
+
+        // If arguments have different signs, we can handle them by summing
+        // how far are they from 0 each.
+        if ( std::signbit( lhs ) != std::signbit( rhs ) ) {
+            return ulpDistance( std::abs( lhs ), positive_zero ) +
+                   ulpDistance( std::abs( rhs ), positive_zero );
+        }
+
+        // When both lhs and rhs are of the same sign, we can just
+        // read the numbers bitwise as integers, and then subtract them
+        // (assuming IEEE).
+        uint64_t lc = Detail::convertToBits( lhs );
+        uint64_t rc = Detail::convertToBits( rhs );
+
+        // The ulp distance between two numbers is symmetric, so to avoid
+        // dealing with overflows we want the bigger converted number on the lhs
+        if ( lc < rc ) {
+            std::swap( lc, rc );
+        }
+
+        return lc - rc;
+    }
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+
+} // end namespace Catch
+
+#endif // CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+
+#ifndef CATCH_GETENV_HPP_INCLUDED
+#define CATCH_GETENV_HPP_INCLUDED
+
+namespace Catch {
+namespace Detail {
+
+    //! Wrapper over `std::getenv` that compiles on UWP (and always returns nullptr there)
+    char const* getEnv(char const* varName);
+
+}
+}
+
+#endif // CATCH_GETENV_HPP_INCLUDED
+
+
+#ifndef CATCH_IS_PERMUTATION_HPP_INCLUDED
+#define CATCH_IS_PERMUTATION_HPP_INCLUDED
+
+#include <algorithm>
+#include <iterator>
+
+namespace Catch {
+    namespace Detail {
+
+        template <typename ForwardIter,
+                  typename Sentinel,
+                  typename T,
+                  typename Comparator>
+        ForwardIter find_sentinel( ForwardIter start,
+                                   Sentinel sentinel,
+                                   T const& value,
+                                   Comparator cmp ) {
+            while ( start != sentinel ) {
+                if ( cmp( *start, value ) ) { break; }
+                ++start;
+            }
+            return start;
+        }
+
+        template <typename ForwardIter,
+                  typename Sentinel,
+                  typename T,
+                  typename Comparator>
+        std::ptrdiff_t count_sentinel( ForwardIter start,
+                                       Sentinel sentinel,
+                                       T const& value,
+                                       Comparator cmp ) {
+            std::ptrdiff_t count = 0;
+            while ( start != sentinel ) {
+                if ( cmp( *start, value ) ) { ++count; }
+                ++start;
+            }
+            return count;
+        }
+
+        template <typename ForwardIter, typename Sentinel>
+        std::enable_if_t<!std::is_same<ForwardIter, Sentinel>::value,
+                         std::ptrdiff_t>
+        sentinel_distance( ForwardIter iter, const Sentinel sentinel ) {
+            std::ptrdiff_t dist = 0;
+            while ( iter != sentinel ) {
+                ++iter;
+                ++dist;
+            }
+            return dist;
+        }
+
+        template <typename ForwardIter>
+        std::ptrdiff_t sentinel_distance( ForwardIter first,
+                                          ForwardIter last ) {
+            return std::distance( first, last );
+        }
+
+        template <typename ForwardIter1,
+                  typename Sentinel1,
+                  typename ForwardIter2,
+                  typename Sentinel2,
+                  typename Comparator>
+        bool check_element_counts( ForwardIter1 first_1,
+                                   const Sentinel1 end_1,
+                                   ForwardIter2 first_2,
+                                   const Sentinel2 end_2,
+                                   Comparator cmp ) {
+            auto cursor = first_1;
+            while ( cursor != end_1 ) {
+                if ( find_sentinel( first_1, cursor, *cursor, cmp ) ==
+                     cursor ) {
+                    // we haven't checked this element yet
+                    const auto count_in_range_2 =
+                        count_sentinel( first_2, end_2, *cursor, cmp );
+                    // Not a single instance in 2nd range, so it cannot be a
+                    // permutation of 1st range
+                    if ( count_in_range_2 == 0 ) { return false; }
+
+                    const auto count_in_range_1 =
+                        count_sentinel( cursor, end_1, *cursor, cmp );
+                    if ( count_in_range_1 != count_in_range_2 ) {
+                        return false;
+                    }
+                }
+
+                ++cursor;
+            }
+
+            return true;
+        }
+
+        template <typename ForwardIter1,
+                  typename Sentinel1,
+                  typename ForwardIter2,
+                  typename Sentinel2,
+                  typename Comparator>
+        bool is_permutation( ForwardIter1 first_1,
+                             const Sentinel1 end_1,
+                             ForwardIter2 first_2,
+                             const Sentinel2 end_2,
+                             Comparator cmp ) {
+            // TODO: no optimization for stronger iterators, because we would also have to constrain on sentinel vs not sentinel types
+            // TODO: Comparator has to be "both sides", e.g. a == b => b == a
+            // This skips shared prefix of the two ranges
+            while (first_1 != end_1 && first_2 != end_2 && cmp(*first_1, *first_2)) {
+                ++first_1;
+                ++first_2;
+            }
+
+            // We need to handle case where at least one of the ranges has no more elements
+            if (first_1 == end_1 || first_2 == end_2) {
+                return first_1 == end_1 && first_2 == end_2;
+            }
+
+            // pair counting is n**2, so we pay linear walk to compare the sizes first
+            auto dist_1 = sentinel_distance( first_1, end_1 );
+            auto dist_2 = sentinel_distance( first_2, end_2 );
+
+            if (dist_1 != dist_2) { return false; }
+
+            // Since we do not try to handle stronger iterators pair (e.g.
+            // bidir) optimally, the only thing left to do is to check counts in
+            // the remaining ranges.
+            return check_element_counts( first_1, end_1, first_2, end_2, cmp );
+        }
+
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_IS_PERMUTATION_HPP_INCLUDED
+
+
+#ifndef CATCH_ISTREAM_HPP_INCLUDED
+#define CATCH_ISTREAM_HPP_INCLUDED
+
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+#include <string>
+
+namespace Catch {
+
+    class IStream {
+    public:
+        virtual ~IStream(); // = default
+        virtual std::ostream& stream() = 0;
+        /**
+         * Best guess on whether the instance is writing to a console (e.g. via stdout/stderr)
+         *
+         * This is useful for e.g. Win32 colour support, because the Win32
+         * API manipulates console directly, unlike POSIX escape codes,
+         * that can be written anywhere.
+         *
+         * Due to variety of ways to change where the stdout/stderr is
+         * _actually_ being written, users should always assume that
+         * the answer might be wrong.
+         */
+        virtual bool isConsole() const { return false; }
+    };
+
+    /**
+     * Creates a stream wrapper that writes to specific file.
+     *
+     * Also recognizes 4 special filenames
+     * * `-` for stdout
+     * * `%stdout` for stdout
+     * * `%stderr` for stderr
+     * * `%debug` for platform specific debugging output
+     *
+     * \throws if passed an unrecognized %-prefixed stream
+     */
+    auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream>;
+
+}
+
+#endif // CATCH_STREAM_HPP_INCLUDED
+
+
+#ifndef CATCH_JSONWRITER_HPP_INCLUDED
+#define CATCH_JSONWRITER_HPP_INCLUDED
+
+
+#include <cstdint>
+#include <sstream>
+
+namespace Catch {
+    class JsonObjectWriter;
+    class JsonArrayWriter;
+
+    struct JsonUtils {
+        static void indent( std::ostream& os, std::uint64_t level );
+        static void appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level );
+    };
+
+    class JsonValueWriter {
+    public:
+        JsonValueWriter( std::ostream& os );
+        JsonValueWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter writeObject() &&;
+        JsonArrayWriter writeArray() &&;
+
+        template <typename T>
+        void write( T const& value ) && {
+            writeImpl( value, !std::is_arithmetic<T>::value );
+        }
+        void write( StringRef value ) &&;
+        void write( bool value ) &&;
+
+    private:
+        void writeImpl( StringRef value, bool quote );
+
+        // Without this SFINAE, this overload is a better match
+        // for `std::string`, `char const*`, `char const[N]` args.
+        // While it would still work, it would cause code bloat
+        // and multiple iteration over the strings
+        template <typename T,
+                  typename = typename std::enable_if_t<
+                      !std::is_convertible<T, StringRef>::value>>
+        void writeImpl( T const& value, bool quote_value ) {
+            m_sstream << value;
+            writeImpl( m_sstream.str(), quote_value );
+        }
+
+        std::ostream& m_os;
+        std::stringstream m_sstream;
+        std::uint64_t m_indent_level;
+    };
+
+    class JsonObjectWriter {
+    public:
+        JsonObjectWriter( std::ostream& os );
+        JsonObjectWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter( JsonObjectWriter&& source ) noexcept;
+        JsonObjectWriter& operator=( JsonObjectWriter&& source ) = delete;
+
+        ~JsonObjectWriter();
+
+        JsonValueWriter write( StringRef key );
+
+    private:
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+    class JsonArrayWriter {
+    public:
+        JsonArrayWriter( std::ostream& os );
+        JsonArrayWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonArrayWriter( JsonArrayWriter&& source ) noexcept;
+        JsonArrayWriter& operator=( JsonArrayWriter&& source ) = delete;
+
+        ~JsonArrayWriter();
+
+        JsonObjectWriter writeObject();
+        JsonArrayWriter writeArray();
+
+        template <typename T>
+        JsonArrayWriter& write( T const& value ) {
+            return writeImpl( value );
+        }
+
+        JsonArrayWriter& write( bool value );
+
+    private:
+        template <typename T>
+        JsonArrayWriter& writeImpl( T const& value ) {
+            JsonUtils::appendCommaNewline(
+                m_os, m_should_comma, m_indent_level + 1 );
+            JsonValueWriter{ m_os }.write( value );
+
+            return *this;
+        }
+
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_JSONWRITER_HPP_INCLUDED
+
+
+#ifndef CATCH_LEAK_DETECTOR_HPP_INCLUDED
+#define CATCH_LEAK_DETECTOR_HPP_INCLUDED
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+#endif // CATCH_LEAK_DETECTOR_HPP_INCLUDED
+
+
+#ifndef CATCH_LIST_HPP_INCLUDED
+#define CATCH_LIST_HPP_INCLUDED
+
+
+#include <set>
+#include <string>
+
+
+namespace Catch {
+
+    class IEventListener;
+    class Config;
+
+
+    struct ReporterDescription {
+        std::string name, description;
+    };
+    struct ListenerDescription {
+        StringRef name;
+        std::string description;
+    };
+
+    struct TagInfo {
+        void add(StringRef spelling);
+        std::string all() const;
+
+        std::set<StringRef> spellings;
+        std::size_t count = 0;
+    };
+
+    bool list( IEventListener& reporter, Config const& config );
+
+} // end namespace Catch
+
+#endif // CATCH_LIST_HPP_INCLUDED
+
+
+#ifndef CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
+#define CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
+
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
+
+
+#ifndef CATCH_PARSE_NUMBERS_HPP_INCLUDED
+#define CATCH_PARSE_NUMBERS_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    /**
+     * Parses unsigned int from the input, using provided base
+     *
+     * Effectively a wrapper around std::stoul but with better error checking
+     * e.g. "-1" is rejected, instead of being parsed as UINT_MAX.
+     */
+    Optional<unsigned int> parseUInt(std::string const& input, int base = 10);
+}
+
+#endif // CATCH_PARSE_NUMBERS_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_REGISTRY_HPP_INCLUDED
+#define CATCH_REPORTER_REGISTRY_HPP_INCLUDED
+
+
+#include <map>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+    class IReporterFactory;
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
+    struct ReporterConfig;
+    class EventListenerFactory;
+
+    class ReporterRegistry {
+        struct ReporterRegistryImpl;
+        Detail::unique_ptr<ReporterRegistryImpl> m_impl;
+
+    public:
+        ReporterRegistry();
+        ~ReporterRegistry(); // = default;
+
+        IEventListenerPtr create( std::string const& name,
+                                  ReporterConfig&& config ) const;
+
+        void registerReporter( std::string const& name,
+                               IReporterFactoryPtr factory );
+
+        void
+        registerListener( Detail::unique_ptr<EventListenerFactory> factory );
+
+        std::map<std::string,
+                 IReporterFactoryPtr,
+                 Detail::CaseInsensitiveLess> const&
+        getFactories() const;
+
+        std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+        getListeners() const;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_REGISTRY_HPP_INCLUDED
+
+
+#ifndef CATCH_RUN_CONTEXT_HPP_INCLUDED
+#define CATCH_RUN_CONTEXT_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+#define CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string&& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            // This is a very cheap check that should have a very high hit rate.
+            // If we get to SourceLineInfo::operator==, we will redo it, but the
+            // cost of repeating is trivial at that point (we will be paying
+            // multiple strcmp/memcmps at that point).
+            if ( lhs.location.line != rhs.location.line ) { return false; }
+            return lhs.name == rhs.name && lhs.location == rhs.location;
+        }
+        friend bool operator!=(NameAndLocation const& lhs,
+                               NameAndLocation const& rhs) {
+            return !( lhs == rhs );
+        }
+    };
+
+    /**
+     * This is a variant of `NameAndLocation` that does not own the name string
+     *
+     * This avoids extra allocations when trying to locate a tracker by its
+     * name and location, as long as we make sure that trackers only keep
+     * around the owning variant.
+     */
+    struct NameAndLocationRef {
+        StringRef name;
+        SourceLineInfo location;
+
+        constexpr NameAndLocationRef( StringRef name_,
+                                      SourceLineInfo location_ ):
+            name( name_ ), location( location_ ) {}
+
+        friend bool operator==( NameAndLocation const& lhs,
+                                NameAndLocationRef const& rhs ) {
+            // This is a very cheap check that should have a very high hit rate.
+            // If we get to SourceLineInfo::operator==, we will redo it, but the
+            // cost of repeating is trivial at that point (we will be paying
+            // multiple strcmp/memcmps at that point).
+            if ( lhs.location.line != rhs.location.line ) { return false; }
+            return StringRef( lhs.name ) == rhs.name &&
+                   lhs.location == rhs.location;
+        }
+        friend bool operator==( NameAndLocationRef const& lhs,
+                                NameAndLocation const& rhs ) {
+            return rhs == lhs;
+        }
+    };
+
+    class ITracker;
+
+    using ITrackerPtr = Catch::Detail::unique_ptr<ITracker>;
+
+    class ITracker {
+        NameAndLocation m_nameAndLocation;
+
+        using Children = std::vector<ITrackerPtr>;
+
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        ITracker* m_parent = nullptr;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        ITracker( NameAndLocation&& nameAndLoc, ITracker* parent ):
+            m_nameAndLocation( CATCH_MOVE(nameAndLoc) ),
+            m_parent( parent )
+        {}
+
+
+        // static queries
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+        ITracker* parent() const {
+            return m_parent;
+        }
+
+        virtual ~ITracker(); // = default
+
+
+        // dynamic queries
+
+        //! Returns true if tracker run to completion (successfully or not)
+        virtual bool isComplete() const = 0;
+        //! Returns true if tracker run to completion successfully
+        bool isSuccessfullyCompleted() const {
+            return m_runState == CompletedSuccessfully;
+        }
+        //! Returns true if tracker has started but hasn't been completed
+        bool isOpen() const;
+        //! Returns true iff tracker has started
+        bool hasStarted() const;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        void markAsNeedingAnotherRun();
+
+        //! Register a nested ITracker
+        void addChild( ITrackerPtr&& child );
+        /**
+         * Returns ptr to specific child if register with this tracker.
+         *
+         * Returns nullptr if not found.
+         */
+        ITracker* findChild( NameAndLocationRef const& nameAndLocation );
+        //! Have any children been added?
+        bool hasChildren() const {
+            return !m_children.empty();
+        }
+
+
+        //! Marks tracker as executing a child, doing se recursively up the tree
+        void openChild();
+
+        /**
+         * Returns true if the instance is a section tracker
+         *
+         * Subclasses should override to true if they are, replaces RTTI
+         * for internal debug checks.
+         */
+        virtual bool isSectionTracker() const;
+        /**
+         * Returns true if the instance is a generator tracker
+         *
+         * Subclasses should override to true if they are, replaces RTTI
+         * for internal debug checks.
+         */
+        virtual bool isGeneratorTracker() const;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+
+        void startCycle() {
+            m_currentTracker = m_rootTracker.get();
+            m_runState = Executing;
+        }
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker() { return *m_currentTracker; }
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+
+        TrackerContext& m_ctx;
+
+    public:
+        TrackerBase( NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isComplete() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<StringRef> m_filters;
+        // Note that lifetime-wise we piggy back off the name stored in the `ITracker` parent`.
+        // Currently it allocates owns the name, so this is safe. If it is later refactored
+        // to not own the name, the name still has to outlive the `ITracker` parent, so
+        // this should still be safe.
+        StringRef m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocationRef const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<StringRef> const& filters );
+        //! Returns filters active in this tracker
+        std::vector<StringRef> const& getFilters() const { return m_filters; }
+        //! Returns whitespace-trimmed name of the tracked section
+        StringRef trimmedName() const;
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#endif // CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class IGeneratorTracker;
+    class IConfig;
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext final : public IResultCapture {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfig const* _config, IEventListenerPtr&& reporter );
+
+        ~RunContext() override;
+
+        Totals runTest(TestCaseHandle const& testCase);
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string&& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        void notifyAssertionStarted( AssertionInfo const& info ) override;
+        bool sectionStarted( StringRef sectionName,
+                             SourceLineInfo const& sectionLineInfo,
+                             Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo&& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo&& endInfo ) override;
+
+        IGeneratorTracker*
+        acquireGeneratorTracker( StringRef generatorName,
+                                 SourceLineInfo const& lineInfo ) override;
+        IGeneratorTracker* createGeneratorTracker(
+            StringRef generatorName,
+            SourceLineInfo lineInfo,
+            Generators::GeneratorBasePtr&& generator ) override;
+
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder&& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult&& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        TestCaseHandle const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Optional<AssertionResult> m_lastResult;
+
+        IConfig const* m_config;
+        Totals m_totals;
+        IEventListenerPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        FatalConditionHandler m_fatalConditionhandler;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+#endif // CATCH_RUN_CONTEXT_HPP_INCLUDED
+
+
+#ifndef CATCH_SHARDING_HPP_INCLUDED
+#define CATCH_SHARDING_HPP_INCLUDED
+
+#include <cassert>
+#include <cmath>
+#include <algorithm>
+
+namespace Catch {
+
+    template<typename Container>
+    Container createShard(Container const& container, std::size_t const shardCount, std::size_t const shardIndex) {
+        assert(shardCount > shardIndex);
+
+        if (shardCount == 1) {
+            return container;
+        }
+
+        const std::size_t totalTestCount = container.size();
+
+        const std::size_t shardSize = totalTestCount / shardCount;
+        const std::size_t leftoverTests = totalTestCount % shardCount;
+
+        const std::size_t startIndex = shardIndex * shardSize + (std::min)(shardIndex, leftoverTests);
+        const std::size_t endIndex = (shardIndex + 1) * shardSize + (std::min)(shardIndex + 1, leftoverTests);
+
+        auto startIterator = std::next(container.begin(), static_cast<std::ptrdiff_t>(startIndex));
+        auto endIterator = std::next(container.begin(), static_cast<std::ptrdiff_t>(endIndex));
+
+        return Container(startIterator, endIterator);
+    }
+
+}
+
+#endif // CATCH_SHARDING_HPP_INCLUDED
+
+
+#ifndef CATCH_SINGLETONS_HPP_INCLUDED
+#define CATCH_SINGLETONS_HPP_INCLUDED
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton(); // = default
+    };
+
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+#endif // CATCH_SINGLETONS_HPP_INCLUDED
+
+
+#ifndef CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
+#define CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
+
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+#endif
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
+
+
+
+#ifndef CATCH_STDSTREAMS_HPP_INCLUDED
+#define CATCH_STDSTREAMS_HPP_INCLUDED
+
+#include <iosfwd>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+} // namespace Catch
+
+#endif
+
+
+#ifndef CATCH_STRING_MANIP_HPP_INCLUDED
+#define CATCH_STRING_MANIP_HPP_INCLUDED
+
+
+#include <cstdint>
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( StringRef s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    char toLower( char c );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    /**
+     * Helper for streaming a "count [maybe-plural-of-label]" human-friendly string
+     *
+     * Usage example:
+     * ```cpp
+     * std::cout << "Found " << pluralise(count, "error") << '\n';
+     * ```
+     *
+     * **Important:** The provided string must outlive the instance
+     */
+    class pluralise {
+        std::uint64_t m_count;
+        StringRef m_label;
+
+    public:
+        constexpr pluralise(std::uint64_t count, StringRef label):
+            m_count(count),
+            m_label(label)
+        {}
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+    };
+}
+
+#endif // CATCH_STRING_MANIP_HPP_INCLUDED
+
+
+#ifndef CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+
+
+#include <map>
+#include <string>
+
+namespace Catch {
+    struct SourceLineInfo;
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+
+
+#ifndef CATCH_TEST_CASE_INFO_HASHER_HPP_INCLUDED
+#define CATCH_TEST_CASE_INFO_HASHER_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    struct TestCaseInfo;
+
+    class TestCaseInfoHasher {
+    public:
+        using hash_t = std::uint64_t;
+        TestCaseInfoHasher( hash_t seed );
+        uint32_t operator()( TestCaseInfo const& t ) const;
+
+    private:
+        hash_t m_seed;
+    };
+
+} // namespace Catch
+
+#endif /* CATCH_TEST_CASE_INFO_HASHER_HPP_INCLUDED */
+
+
+#ifndef CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+#define CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+
+
+#include <vector>
+
+namespace Catch {
+
+    class IConfig;
+    class ITestInvoker;
+    class TestCaseHandle;
+    class TestSpec;
+
+    std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config );
+
+    std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        void registerTest( Detail::unique_ptr<TestCaseInfo> testInfo, Detail::unique_ptr<ITestInvoker> testInvoker );
+
+        std::vector<TestCaseInfo*> const& getAllInfos() const override;
+        std::vector<TestCaseHandle> const& getAllTests() const override;
+        std::vector<TestCaseHandle> const& getAllTestsSorted( IConfig const& config ) const override;
+
+        ~TestRegistry() override; // = default
+
+    private:
+        std::vector<Detail::unique_ptr<TestCaseInfo>> m_owned_test_infos;
+        // Keeps a materialized vector for `getAllInfos`.
+        // We should get rid of that eventually (see interface note)
+        std::vector<TestCaseInfo*> m_viewed_test_infos;
+
+        std::vector<Detail::unique_ptr<ITestInvoker>> m_invokers;
+        std::vector<TestCaseHandle> m_handles;
+        mutable TestRunOrder m_currentSortOrder = TestRunOrder::Declared;
+        mutable std::vector<TestCaseHandle> m_sortedFunctions;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+
+} // end namespace Catch
+
+
+#endif // CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+
+
+#ifndef CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+#define CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+
+#include <vector>
+#include <string>
+
+namespace Catch {
+
+    class ITagAliasRegistry;
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif // CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+
+
+#ifndef CATCH_TEXTFLOW_HPP_INCLUDED
+#define CATCH_TEXTFLOW_HPP_INCLUDED
+
+
+#include <cassert>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    namespace TextFlow {
+
+        class Columns;
+
+        /**
+         * Abstraction for a string with ansi escape sequences that
+         * automatically skips over escapes when iterating. Only graphical
+         * escape sequences are considered.
+         *
+         * Internal representation:
+         * An escape sequence looks like \033[39;49m
+         * We need bidirectional iteration and the unbound length of escape
+         * sequences poses a problem for operator-- To make this work we'll
+         * replace the last `m` with a 0xff (this is a codepoint that won't have
+         * any utf-8 meaning).
+         */
+        class AnsiSkippingString {
+            std::string m_string;
+            std::size_t m_size = 0;
+
+            // perform 0xff replacement and calculate m_size
+            void preprocessString();
+
+        public:
+            class const_iterator;
+            using iterator = const_iterator;
+            // note: must be u-suffixed or this will cause a "truncation of
+            // constant value" warning on MSVC
+            static constexpr char sentinel = static_cast<char>( 0xffu );
+
+            explicit AnsiSkippingString( std::string const& text );
+            explicit AnsiSkippingString( std::string&& text );
+
+            const_iterator begin() const;
+            const_iterator end() const;
+
+            size_t size() const { return m_size; }
+
+            std::string substring( const_iterator begin,
+                                   const_iterator end ) const;
+        };
+
+        class AnsiSkippingString::const_iterator {
+            friend AnsiSkippingString;
+            struct EndTag {};
+
+            const std::string* m_string;
+            std::string::const_iterator m_it;
+
+            explicit const_iterator( const std::string& string, EndTag ):
+                m_string( &string ), m_it( string.end() ) {}
+
+            void tryParseAnsiEscapes();
+            void advance();
+            void unadvance();
+
+        public:
+            using difference_type = std::ptrdiff_t;
+            using value_type = char;
+            using pointer = value_type*;
+            using reference = value_type&;
+            using iterator_category = std::bidirectional_iterator_tag;
+
+            explicit const_iterator( const std::string& string ):
+                m_string( &string ), m_it( string.begin() ) {
+                tryParseAnsiEscapes();
+            }
+
+            char operator*() const { return *m_it; }
+
+            const_iterator& operator++() {
+                advance();
+                return *this;
+            }
+            const_iterator operator++( int ) {
+                iterator prev( *this );
+                operator++();
+                return prev;
+            }
+            const_iterator& operator--() {
+                unadvance();
+                return *this;
+            }
+            const_iterator operator--( int ) {
+                iterator prev( *this );
+                operator--();
+                return prev;
+            }
+
+            bool operator==( const_iterator const& other ) const {
+                return m_it == other.m_it;
+            }
+            bool operator!=( const_iterator const& other ) const {
+                return !operator==( other );
+            }
+            bool operator<=( const_iterator const& other ) const {
+                return m_it <= other.m_it;
+            }
+
+            const_iterator oneBefore() const {
+                auto it = *this;
+                return --it;
+            }
+        };
+
+        /**
+         * Represents a column of text with specific width and indentation
+         *
+         * When written out to a stream, it will perform linebreaking
+         * of the provided text so that the written lines fit within
+         * target width.
+         */
+        class Column {
+            // String to be written out
+            AnsiSkippingString m_string;
+            // Width of the column for linebreaking
+            size_t m_width = CATCH_CONFIG_CONSOLE_WIDTH - 1;
+            // Indentation of other lines (including first if initial indent is
+            // unset)
+            size_t m_indent = 0;
+            // Indentation of the first line
+            size_t m_initialIndent = std::string::npos;
+
+        public:
+            /**
+             * Iterates "lines" in `Column` and returns them
+             */
+            class const_iterator {
+                friend Column;
+                struct EndTag {};
+
+                Column const& m_column;
+                // Where does the current line start?
+                AnsiSkippingString::const_iterator m_lineStart;
+                // How long should the current line be?
+                AnsiSkippingString::const_iterator m_lineEnd;
+                // How far have we checked the string to iterate?
+                AnsiSkippingString::const_iterator m_parsedTo;
+                // Should a '-' be appended to the line?
+                bool m_addHyphen = false;
+
+                const_iterator( Column const& column, EndTag ):
+                    m_column( column ),
+                    m_lineStart( m_column.m_string.end() ),
+                    m_lineEnd( column.m_string.end() ),
+                    m_parsedTo( column.m_string.end() ) {}
+
+                // Calculates the length of the current line
+                void calcLength();
+
+                // Returns current indentation width
+                size_t indentSize() const;
+
+                // Creates an indented and (optionally) suffixed string from
+                // current iterator position, indentation and length.
+                std::string addIndentAndSuffix(
+                    AnsiSkippingString::const_iterator start,
+                    AnsiSkippingString::const_iterator end ) const;
+
+            public:
+                using difference_type = std::ptrdiff_t;
+                using value_type = std::string;
+                using pointer = value_type*;
+                using reference = value_type&;
+                using iterator_category = std::forward_iterator_tag;
+
+                explicit const_iterator( Column const& column );
+
+                std::string operator*() const;
+
+                const_iterator& operator++();
+                const_iterator operator++( int );
+
+                bool operator==( const_iterator const& other ) const {
+                    return m_lineStart == other.m_lineStart &&
+                           &m_column == &other.m_column;
+                }
+                bool operator!=( const_iterator const& other ) const {
+                    return !operator==( other );
+                }
+            };
+            using iterator = const_iterator;
+
+            explicit Column( std::string const& text ): m_string( text ) {}
+            explicit Column( std::string&& text ):
+                m_string( CATCH_MOVE( text ) ) {}
+
+            Column& width( size_t newWidth ) & {
+                assert( newWidth > 0 );
+                m_width = newWidth;
+                return *this;
+            }
+            Column&& width( size_t newWidth ) && {
+                assert( newWidth > 0 );
+                m_width = newWidth;
+                return CATCH_MOVE( *this );
+            }
+            Column& indent( size_t newIndent ) & {
+                m_indent = newIndent;
+                return *this;
+            }
+            Column&& indent( size_t newIndent ) && {
+                m_indent = newIndent;
+                return CATCH_MOVE( *this );
+            }
+            Column& initialIndent( size_t newIndent ) & {
+                m_initialIndent = newIndent;
+                return *this;
+            }
+            Column&& initialIndent( size_t newIndent ) && {
+                m_initialIndent = newIndent;
+                return CATCH_MOVE( *this );
+            }
+
+            size_t width() const { return m_width; }
+            const_iterator begin() const { return const_iterator( *this ); }
+            const_iterator end() const {
+                return { *this, const_iterator::EndTag{} };
+            }
+
+            friend std::ostream& operator<<( std::ostream& os,
+                                             Column const& col );
+
+            friend Columns operator+( Column const& lhs, Column const& rhs );
+            friend Columns operator+( Column&& lhs, Column&& rhs );
+        };
+
+        //! Creates a column that serves as an empty space of specific width
+        Column Spacer( size_t spaceWidth );
+
+        class Columns {
+            std::vector<Column> m_columns;
+
+        public:
+            class iterator {
+                friend Columns;
+                struct EndTag {};
+
+                std::vector<Column> const& m_columns;
+                std::vector<Column::const_iterator> m_iterators;
+                size_t m_activeIterators;
+
+                iterator( Columns const& columns, EndTag );
+
+            public:
+                using difference_type = std::ptrdiff_t;
+                using value_type = std::string;
+                using pointer = value_type*;
+                using reference = value_type&;
+                using iterator_category = std::forward_iterator_tag;
+
+                explicit iterator( Columns const& columns );
+
+                auto operator==( iterator const& other ) const -> bool {
+                    return m_iterators == other.m_iterators;
+                }
+                auto operator!=( iterator const& other ) const -> bool {
+                    return m_iterators != other.m_iterators;
+                }
+                std::string operator*() const;
+                iterator& operator++();
+                iterator operator++( int );
+            };
+            using const_iterator = iterator;
+
+            iterator begin() const { return iterator( *this ); }
+            iterator end() const { return { *this, iterator::EndTag() }; }
+
+            friend Columns& operator+=( Columns& lhs, Column const& rhs );
+            friend Columns& operator+=( Columns& lhs, Column&& rhs );
+            friend Columns operator+( Columns const& lhs, Column const& rhs );
+            friend Columns operator+( Columns&& lhs, Column&& rhs );
+
+            friend std::ostream& operator<<( std::ostream& os,
+                                             Columns const& cols );
+        };
+
+    } // namespace TextFlow
+} // namespace Catch
+#endif // CATCH_TEXTFLOW_HPP_INCLUDED
+
+
+#ifndef CATCH_TO_STRING_HPP_INCLUDED
+#define CATCH_TO_STRING_HPP_INCLUDED
+
+#include <string>
+
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+#endif // CATCH_TO_STRING_HPP_INCLUDED
+
+
+#ifndef CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+#define CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+#endif // CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+
+#ifndef CATCH_XMLWRITER_HPP_INCLUDED
+#define CATCH_XMLWRITER_HPP_INCLUDED
+
+
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    /**
+     * Helper for XML-encoding text (escaping angle brackets, quotes, etc)
+     *
+     * Note: doesn't take ownership of passed strings, and thus the
+     *       encoded string must outlive the encoding instance.
+     */
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( StringRef str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        StringRef m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement&
+            writeText( StringRef text,
+                       XmlFormatting fmt = XmlFormatting::Newline |
+                                           XmlFormatting::Indent );
+
+            ScopedElement& writeAttribute( StringRef name,
+                                           StringRef attribute );
+            template <typename T,
+                      // Without this SFINAE, this overload is a better match
+                      // for `std::string`, `char const*`, `char const[N]` args.
+                      // While it would still work, it would cause code bloat
+                      // and multiple iteration over the strings
+                      typename = typename std::enable_if_t<
+                          !std::is_convertible<T, StringRef>::value>>
+            ScopedElement& writeAttribute( StringRef name,
+                                           T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        //! The attribute content is XML-encoded
+        XmlWriter& writeAttribute( StringRef name, StringRef attribute );
+
+        //! Writes the attribute as "true/false"
+        XmlWriter& writeAttribute( StringRef name, bool attribute );
+
+        //! The attribute content is XML-encoded
+        XmlWriter& writeAttribute( StringRef name, char const* attribute );
+
+        //! The attribute value must provide op<<(ostream&, T). The resulting
+        //! serialization is XML-encoded
+        template <typename T,
+                  // Without this SFINAE, this overload is a better match
+                  // for `std::string`, `char const*`, `char const[N]` args.
+                  // While it would still work, it would cause code bloat
+                  // and multiple iteration over the strings
+                  typename = typename std::enable_if_t<
+                      !std::is_convertible<T, StringRef>::value>>
+        XmlWriter& writeAttribute( StringRef name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        //! Writes escaped `text` in a element
+        XmlWriter& writeText( StringRef text,
+                              XmlFormatting fmt = XmlFormatting::Newline |
+                                                  XmlFormatting::Indent );
+
+        //! Writes XML comment as "<!-- text -->"
+        XmlWriter& writeComment( StringRef text,
+                                 XmlFormatting fmt = XmlFormatting::Newline |
+                                                     XmlFormatting::Indent );
+
+        void writeStylesheetRef( StringRef url );
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+#endif // CATCH_XMLWRITER_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2's Matcher support. It includes
+ * **all** of Catch2 headers related to matchers.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of increased compilation times.
+ *
+ * When a new header is added to either the `matchers` folder, or to
+ * the corresponding internal subfolder, it should be added here.
+ */
+
+#ifndef CATCH_MATCHERS_ALL_HPP_INCLUDED
+#define CATCH_MATCHERS_ALL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_MATCHERS_HPP_INCLUDED
+#define CATCH_MATCHERS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_MATCHERS_IMPL_HPP_INCLUDED
+#define CATCH_MATCHERS_IMPL_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wsign-compare"
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#elif defined __GNUC__
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wsign-compare"
+#    pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT && m_arg;
+        MatcherT const& m_matcher;
+    public:
+        MatchExpr( ArgT && arg, MatcherT const& matcher )
+        :   ITransientExpression{ true, matcher.match( arg ) }, // not forwarding arg here on purpose
+            m_arg( CATCH_FORWARD(arg) ),
+            m_matcher( matcher )
+        {}
+
+        void streamReconstructedExpression( std::ostream& os ) const override {
+            os << Catch::Detail::stringify( m_arg )
+               << ' '
+               << m_matcher.toString();
+        }
+    };
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+
+    namespace Matchers {
+        template <typename ArgT>
+        class MatcherBase;
+    }
+
+    using StringMatcher = Matchers::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT && arg, MatcherT const& matcher ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( CATCH_FORWARD(arg), matcher );
+    }
+
+} // namespace Catch
+
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+
+#endif // CATCH_MATCHERS_IMPL_HPP_INCLUDED
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+
+    class MatcherUntypedBase {
+    public:
+        MatcherUntypedBase() = default;
+
+        MatcherUntypedBase(MatcherUntypedBase const&) = default;
+        MatcherUntypedBase(MatcherUntypedBase&&) = default;
+
+        MatcherUntypedBase& operator = (MatcherUntypedBase const&) = delete;
+        MatcherUntypedBase& operator = (MatcherUntypedBase&&) = delete;
+
+        std::string toString() const;
+
+    protected:
+        virtual ~MatcherUntypedBase(); // = default;
+        virtual std::string describe() const = 0;
+        mutable std::string m_cachedToString;
+    };
+
+
+    template<typename T>
+    class MatcherBase : public MatcherUntypedBase {
+    public:
+        virtual bool match( T const& arg ) const = 0;
+    };
+
+    namespace Detail {
+
+        template<typename ArgT>
+        class MatchAllOf final : public MatcherBase<ArgT> {
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+
+        public:
+            MatchAllOf() = default;
+            MatchAllOf(MatchAllOf const&) = delete;
+            MatchAllOf& operator=(MatchAllOf const&) = delete;
+            MatchAllOf(MatchAllOf&&) = default;
+            MatchAllOf& operator=(MatchAllOf&&) = default;
+
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            friend MatchAllOf operator&& (MatchAllOf&& lhs, MatcherBase<ArgT> const& rhs) {
+                lhs.m_matchers.push_back(&rhs);
+                return CATCH_MOVE(lhs);
+            }
+            friend MatchAllOf operator&& (MatcherBase<ArgT> const& lhs, MatchAllOf&& rhs) {
+                rhs.m_matchers.insert(rhs.m_matchers.begin(), &lhs);
+                return CATCH_MOVE(rhs);
+            }
+        };
+
+        //! lvalue overload is intentionally deleted, users should
+        //! not be trying to compose stored composition matchers
+        template<typename ArgT>
+        MatchAllOf<ArgT> operator&& (MatchAllOf<ArgT> const& lhs, MatcherBase<ArgT> const& rhs) = delete;
+        //! lvalue overload is intentionally deleted, users should
+        //! not be trying to compose stored composition matchers
+        template<typename ArgT>
+        MatchAllOf<ArgT> operator&& (MatcherBase<ArgT> const& lhs, MatchAllOf<ArgT> const& rhs) = delete;
+
+        template<typename ArgT>
+        class MatchAnyOf final : public MatcherBase<ArgT> {
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        public:
+            MatchAnyOf() = default;
+            MatchAnyOf(MatchAnyOf const&) = delete;
+            MatchAnyOf& operator=(MatchAnyOf const&) = delete;
+            MatchAnyOf(MatchAnyOf&&) = default;
+            MatchAnyOf& operator=(MatchAnyOf&&) = default;
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            friend MatchAnyOf operator|| (MatchAnyOf&& lhs, MatcherBase<ArgT> const& rhs) {
+                lhs.m_matchers.push_back(&rhs);
+                return CATCH_MOVE(lhs);
+            }
+            friend MatchAnyOf operator|| (MatcherBase<ArgT> const& lhs, MatchAnyOf&& rhs) {
+                rhs.m_matchers.insert(rhs.m_matchers.begin(), &lhs);
+                return CATCH_MOVE(rhs);
+            }
+        };
+
+        //! lvalue overload is intentionally deleted, users should
+        //! not be trying to compose stored composition matchers
+        template<typename ArgT>
+        MatchAnyOf<ArgT> operator|| (MatchAnyOf<ArgT> const& lhs, MatcherBase<ArgT> const& rhs) = delete;
+        //! lvalue overload is intentionally deleted, users should
+        //! not be trying to compose stored composition matchers
+        template<typename ArgT>
+        MatchAnyOf<ArgT> operator|| (MatcherBase<ArgT> const& lhs, MatchAnyOf<ArgT> const& rhs) = delete;
+
+        template<typename ArgT>
+        class MatchNotOf final : public MatcherBase<ArgT> {
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+
+        public:
+            explicit MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ):
+                m_underlyingMatcher( underlyingMatcher )
+            {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+        };
+
+    } // namespace Detail
+
+    template <typename T>
+    Detail::MatchAllOf<T> operator&& (MatcherBase<T> const& lhs, MatcherBase<T> const& rhs) {
+        return Detail::MatchAllOf<T>{} && lhs && rhs;
+    }
+    template <typename T>
+    Detail::MatchAnyOf<T> operator|| (MatcherBase<T> const& lhs, MatcherBase<T> const& rhs) {
+        return Detail::MatchAnyOf<T>{} || lhs || rhs;
+    }
+
+    template <typename T>
+    Detail::MatchNotOf<T> operator! (MatcherBase<T> const& matcher) {
+        return Detail::MatchNotOf<T>{ matcher };
+    }
+
+
+} // namespace Matchers
+} // namespace Catch
+
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+  #define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+  #define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+
+  #define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+  #define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+
+  #define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+  #define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+
+#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+
+  #define CATCH_REQUIRE_THROWS_WITH( expr, matcher )                   (void)(0)
+  #define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+
+  #define CATCH_CHECK_THROWS_WITH( expr, matcher )                     (void)(0)
+  #define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher )   (void)(0)
+
+  #define CATCH_CHECK_THAT( arg, matcher )                             (void)(0)
+  #define CATCH_REQUIRE_THAT( arg, matcher )                           (void)(0)
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+
+  #define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+  #define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+
+  #define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+  #define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+
+  #define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+  #define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+
+  #define REQUIRE_THROWS_WITH( expr, matcher )                   (void)(0)
+  #define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+
+  #define CHECK_THROWS_WITH( expr, matcher )                     (void)(0)
+  #define CHECK_THROWS_MATCHES( expr, exceptionType, matcher )   (void)(0)
+
+  #define CHECK_THAT( arg, matcher )                             (void)(0)
+  #define REQUIRE_THAT( arg, matcher )                           (void)(0)
+
+#endif // end of user facing macro declarations
+
+#endif // CATCH_MATCHERS_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+#define CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+
+
+
+#ifndef CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+#define CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+
+
+#include <array>
+#include <algorithm>
+#include <string>
+#include <type_traits>
+
+namespace Catch {
+namespace Matchers {
+    class MatcherGenericBase : public MatcherUntypedBase {
+    public:
+        MatcherGenericBase() = default;
+        ~MatcherGenericBase() override; // = default;
+
+        MatcherGenericBase(MatcherGenericBase const&) = default;
+        MatcherGenericBase(MatcherGenericBase&&) = default;
+
+        MatcherGenericBase& operator=(MatcherGenericBase const&) = delete;
+        MatcherGenericBase& operator=(MatcherGenericBase&&) = delete;
+    };
+
+
+    namespace Detail {
+        template<std::size_t N, std::size_t M>
+        std::array<void const*, N + M> array_cat(std::array<void const*, N> && lhs, std::array<void const*, M> && rhs) {
+            std::array<void const*, N + M> arr{};
+            std::copy_n(lhs.begin(), N, arr.begin());
+            std::copy_n(rhs.begin(), M, arr.begin() + N);
+            return arr;
+        }
+
+        template<std::size_t N>
+        std::array<void const*, N+1> array_cat(std::array<void const*, N> && lhs, void const* rhs) {
+            std::array<void const*, N+1> arr{};
+            std::copy_n(lhs.begin(), N, arr.begin());
+            arr[N] = rhs;
+            return arr;
+        }
+
+        template<std::size_t N>
+        std::array<void const*, N+1> array_cat(void const* lhs, std::array<void const*, N> && rhs) {
+            std::array<void const*, N + 1> arr{ {lhs} };
+            std::copy_n(rhs.begin(), N, arr.begin() + 1);
+            return arr;
+        }
+
+        template<typename T>
+        using is_generic_matcher = std::is_base_of<
+            Catch::Matchers::MatcherGenericBase,
+            std::remove_cv_t<std::remove_reference_t<T>>
+        >;
+
+        template<typename... Ts>
+        using are_generic_matchers = Catch::Detail::conjunction<is_generic_matcher<Ts>...>;
+
+        template<typename T>
+        using is_matcher = std::is_base_of<
+            Catch::Matchers::MatcherUntypedBase,
+            std::remove_cv_t<std::remove_reference_t<T>>
+        >;
+
+
+        template<std::size_t N, typename Arg>
+        bool match_all_of(Arg&&, std::array<void const*, N> const&, std::index_sequence<>) {
+            return true;
+        }
+
+        template<typename T, typename... MatcherTs, std::size_t N, typename Arg, std::size_t Idx, std::size_t... Indices>
+        bool match_all_of(Arg&& arg, std::array<void const*, N> const& matchers, std::index_sequence<Idx, Indices...>) {
+            return static_cast<T const*>(matchers[Idx])->match(arg) && match_all_of<MatcherTs...>(arg, matchers, std::index_sequence<Indices...>{});
+        }
+
+
+        template<std::size_t N, typename Arg>
+        bool match_any_of(Arg&&, std::array<void const*, N> const&, std::index_sequence<>) {
+            return false;
+        }
+
+        template<typename T, typename... MatcherTs, std::size_t N, typename Arg, std::size_t Idx, std::size_t... Indices>
+        bool match_any_of(Arg&& arg, std::array<void const*, N> const& matchers, std::index_sequence<Idx, Indices...>) {
+            return static_cast<T const*>(matchers[Idx])->match(arg) || match_any_of<MatcherTs...>(arg, matchers, std::index_sequence<Indices...>{});
+        }
+
+        std::string describe_multi_matcher(StringRef combine, std::string const* descriptions_begin, std::string const* descriptions_end);
+
+        template<typename... MatcherTs, std::size_t... Idx>
+        std::string describe_multi_matcher(StringRef combine, std::array<void const*, sizeof...(MatcherTs)> const& matchers, std::index_sequence<Idx...>) {
+            std::array<std::string, sizeof...(MatcherTs)> descriptions {{
+                static_cast<MatcherTs const*>(matchers[Idx])->toString()...
+            }};
+
+            return describe_multi_matcher(combine, descriptions.data(), descriptions.data() + descriptions.size());
+        }
+
+
+        template<typename... MatcherTs>
+        class MatchAllOfGeneric final : public MatcherGenericBase {
+        public:
+            MatchAllOfGeneric(MatchAllOfGeneric const&) = delete;
+            MatchAllOfGeneric& operator=(MatchAllOfGeneric const&) = delete;
+            MatchAllOfGeneric(MatchAllOfGeneric&&) = default;
+            MatchAllOfGeneric& operator=(MatchAllOfGeneric&&) = default;
+
+            MatchAllOfGeneric(MatcherTs const&... matchers) : m_matchers{ {std::addressof(matchers)...} } {}
+            explicit MatchAllOfGeneric(std::array<void const*, sizeof...(MatcherTs)> matchers) : m_matchers{matchers} {}
+
+            template<typename Arg>
+            bool match(Arg&& arg) const {
+                return match_all_of<MatcherTs...>(arg, m_matchers, std::index_sequence_for<MatcherTs...>{});
+            }
+
+            std::string describe() const override {
+                return describe_multi_matcher<MatcherTs...>(" and "_sr, m_matchers, std::index_sequence_for<MatcherTs...>{});
+            }
+
+            // Has to be public to enable the concatenating operators
+            // below, because they are not friend of the RHS, only LHS,
+            // and thus cannot access private fields of RHS
+            std::array<void const*, sizeof...( MatcherTs )> m_matchers;
+
+
+            //! Avoids type nesting for `GenericAllOf && GenericAllOf` case
+            template<typename... MatchersRHS>
+            friend
+            MatchAllOfGeneric<MatcherTs..., MatchersRHS...> operator && (
+                    MatchAllOfGeneric<MatcherTs...>&& lhs,
+                    MatchAllOfGeneric<MatchersRHS...>&& rhs) {
+                return MatchAllOfGeneric<MatcherTs..., MatchersRHS...>{array_cat(CATCH_MOVE(lhs.m_matchers), CATCH_MOVE(rhs.m_matchers))};
+            }
+
+            //! Avoids type nesting for `GenericAllOf && some matcher` case
+            template<typename MatcherRHS>
+            friend std::enable_if_t<is_matcher<MatcherRHS>::value,
+            MatchAllOfGeneric<MatcherTs..., MatcherRHS>> operator && (
+                    MatchAllOfGeneric<MatcherTs...>&& lhs,
+                    MatcherRHS const& rhs) {
+                return MatchAllOfGeneric<MatcherTs..., MatcherRHS>{array_cat(CATCH_MOVE(lhs.m_matchers), static_cast<void const*>(&rhs))};
+            }
+
+            //! Avoids type nesting for `some matcher && GenericAllOf` case
+            template<typename MatcherLHS>
+            friend std::enable_if_t<is_matcher<MatcherLHS>::value,
+            MatchAllOfGeneric<MatcherLHS, MatcherTs...>> operator && (
+                    MatcherLHS const& lhs,
+                    MatchAllOfGeneric<MatcherTs...>&& rhs) {
+                return MatchAllOfGeneric<MatcherLHS, MatcherTs...>{array_cat(static_cast<void const*>(std::addressof(lhs)), CATCH_MOVE(rhs.m_matchers))};
+            }
+        };
+
+
+        template<typename... MatcherTs>
+        class MatchAnyOfGeneric final : public MatcherGenericBase {
+        public:
+            MatchAnyOfGeneric(MatchAnyOfGeneric const&) = delete;
+            MatchAnyOfGeneric& operator=(MatchAnyOfGeneric const&) = delete;
+            MatchAnyOfGeneric(MatchAnyOfGeneric&&) = default;
+            MatchAnyOfGeneric& operator=(MatchAnyOfGeneric&&) = default;
+
+            MatchAnyOfGeneric(MatcherTs const&... matchers) : m_matchers{ {std::addressof(matchers)...} } {}
+            explicit MatchAnyOfGeneric(std::array<void const*, sizeof...(MatcherTs)> matchers) : m_matchers{matchers} {}
+
+            template<typename Arg>
+            bool match(Arg&& arg) const {
+                return match_any_of<MatcherTs...>(arg, m_matchers, std::index_sequence_for<MatcherTs...>{});
+            }
+
+            std::string describe() const override {
+                return describe_multi_matcher<MatcherTs...>(" or "_sr, m_matchers, std::index_sequence_for<MatcherTs...>{});
+            }
+
+
+            // Has to be public to enable the concatenating operators
+            // below, because they are not friend of the RHS, only LHS,
+            // and thus cannot access private fields of RHS
+            std::array<void const*, sizeof...( MatcherTs )> m_matchers;
+
+            //! Avoids type nesting for `GenericAnyOf || GenericAnyOf` case
+            template<typename... MatchersRHS>
+            friend MatchAnyOfGeneric<MatcherTs..., MatchersRHS...> operator || (
+                    MatchAnyOfGeneric<MatcherTs...>&& lhs,
+                    MatchAnyOfGeneric<MatchersRHS...>&& rhs) {
+                return MatchAnyOfGeneric<MatcherTs..., MatchersRHS...>{array_cat(CATCH_MOVE(lhs.m_matchers), CATCH_MOVE(rhs.m_matchers))};
+            }
+
+            //! Avoids type nesting for `GenericAnyOf || some matcher` case
+            template<typename MatcherRHS>
+            friend std::enable_if_t<is_matcher<MatcherRHS>::value,
+            MatchAnyOfGeneric<MatcherTs..., MatcherRHS>> operator || (
+                    MatchAnyOfGeneric<MatcherTs...>&& lhs,
+                    MatcherRHS const& rhs) {
+                return MatchAnyOfGeneric<MatcherTs..., MatcherRHS>{array_cat(CATCH_MOVE(lhs.m_matchers), static_cast<void const*>(std::addressof(rhs)))};
+            }
+
+            //! Avoids type nesting for `some matcher || GenericAnyOf` case
+            template<typename MatcherLHS>
+            friend std::enable_if_t<is_matcher<MatcherLHS>::value,
+            MatchAnyOfGeneric<MatcherLHS, MatcherTs...>> operator || (
+                MatcherLHS const& lhs,
+                MatchAnyOfGeneric<MatcherTs...>&& rhs) {
+                return MatchAnyOfGeneric<MatcherLHS, MatcherTs...>{array_cat(static_cast<void const*>(std::addressof(lhs)), CATCH_MOVE(rhs.m_matchers))};
+            }
+        };
+
+
+        template<typename MatcherT>
+        class MatchNotOfGeneric final : public MatcherGenericBase {
+            MatcherT const& m_matcher;
+
+        public:
+            MatchNotOfGeneric(MatchNotOfGeneric const&) = delete;
+            MatchNotOfGeneric& operator=(MatchNotOfGeneric const&) = delete;
+            MatchNotOfGeneric(MatchNotOfGeneric&&) = default;
+            MatchNotOfGeneric& operator=(MatchNotOfGeneric&&) = default;
+
+            explicit MatchNotOfGeneric(MatcherT const& matcher) : m_matcher{matcher} {}
+
+            template<typename Arg>
+            bool match(Arg&& arg) const {
+                return !m_matcher.match(arg);
+            }
+
+            std::string describe() const override {
+                return "not " + m_matcher.toString();
+            }
+
+            //! Negating negation can just unwrap and return underlying matcher
+            friend MatcherT const& operator ! (MatchNotOfGeneric<MatcherT> const& matcher) {
+                return matcher.m_matcher;
+            }
+        };
+    } // namespace Detail
+
+
+    // compose only generic matchers
+    template<typename MatcherLHS, typename MatcherRHS>
+    std::enable_if_t<Detail::are_generic_matchers<MatcherLHS, MatcherRHS>::value, Detail::MatchAllOfGeneric<MatcherLHS, MatcherRHS>>
+        operator && (MatcherLHS const& lhs, MatcherRHS const& rhs) {
+        return { lhs, rhs };
+    }
+
+    template<typename MatcherLHS, typename MatcherRHS>
+    std::enable_if_t<Detail::are_generic_matchers<MatcherLHS, MatcherRHS>::value, Detail::MatchAnyOfGeneric<MatcherLHS, MatcherRHS>>
+        operator || (MatcherLHS const& lhs, MatcherRHS const& rhs) {
+        return { lhs, rhs };
+    }
+
+    //! Wrap provided generic matcher in generic negator
+    template<typename MatcherT>
+    std::enable_if_t<Detail::is_generic_matcher<MatcherT>::value, Detail::MatchNotOfGeneric<MatcherT>>
+        operator ! (MatcherT const& matcher) {
+        return Detail::MatchNotOfGeneric<MatcherT>{matcher};
+    }
+
+
+    // compose mixed generic and non-generic matchers
+    template<typename MatcherLHS, typename ArgRHS>
+    std::enable_if_t<Detail::is_generic_matcher<MatcherLHS>::value, Detail::MatchAllOfGeneric<MatcherLHS, MatcherBase<ArgRHS>>>
+        operator && (MatcherLHS const& lhs, MatcherBase<ArgRHS> const& rhs) {
+        return { lhs, rhs };
+    }
+
+    template<typename ArgLHS, typename MatcherRHS>
+    std::enable_if_t<Detail::is_generic_matcher<MatcherRHS>::value, Detail::MatchAllOfGeneric<MatcherBase<ArgLHS>, MatcherRHS>>
+        operator && (MatcherBase<ArgLHS> const& lhs, MatcherRHS const& rhs) {
+        return { lhs, rhs };
+    }
+
+    template<typename MatcherLHS, typename ArgRHS>
+    std::enable_if_t<Detail::is_generic_matcher<MatcherLHS>::value, Detail::MatchAnyOfGeneric<MatcherLHS, MatcherBase<ArgRHS>>>
+        operator || (MatcherLHS const& lhs, MatcherBase<ArgRHS> const& rhs) {
+        return { lhs, rhs };
+    }
+
+    template<typename ArgLHS, typename MatcherRHS>
+    std::enable_if_t<Detail::is_generic_matcher<MatcherRHS>::value, Detail::MatchAnyOfGeneric<MatcherBase<ArgLHS>, MatcherRHS>>
+        operator || (MatcherBase<ArgLHS> const& lhs, MatcherRHS const& rhs) {
+        return { lhs, rhs };
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+
+namespace Catch {
+    namespace Matchers {
+
+        class IsEmptyMatcher final : public MatcherGenericBase {
+        public:
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+#if defined(CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS)
+                using Catch::Detail::empty;
+#else
+                using std::empty;
+#endif
+                return empty(rng);
+            }
+
+            std::string describe() const override;
+        };
+
+        class HasSizeMatcher final : public MatcherGenericBase {
+            std::size_t m_target_size;
+        public:
+            explicit HasSizeMatcher(std::size_t target_size):
+                m_target_size(target_size)
+            {}
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+#if defined(CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS)
+                using Catch::Detail::size;
+#else
+                using std::size;
+#endif
+                return size(rng) == m_target_size;
+            }
+
+            std::string describe() const override;
+        };
+
+        template <typename Matcher>
+        class SizeMatchesMatcher final : public MatcherGenericBase {
+            Matcher m_matcher;
+        public:
+            explicit SizeMatchesMatcher(Matcher m):
+                m_matcher(CATCH_MOVE(m))
+            {}
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+#if defined(CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS)
+                using Catch::Detail::size;
+#else
+                using std::size;
+#endif
+                return m_matcher.match(size(rng));
+            }
+
+            std::string describe() const override {
+                return "size matches " + m_matcher.describe();
+            }
+        };
+
+
+        //! Creates a matcher that accepts empty ranges/containers
+        IsEmptyMatcher IsEmpty();
+        //! Creates a matcher that accepts ranges/containers with specific size
+        HasSizeMatcher SizeIs(std::size_t sz);
+        template <typename Matcher>
+        std::enable_if_t<Detail::is_matcher<Matcher>::value,
+        SizeMatchesMatcher<Matcher>> SizeIs(Matcher&& m) {
+            return SizeMatchesMatcher<Matcher>{CATCH_FORWARD(m)};
+        }
+
+    } // end namespace Matchers
+} // end namespace Catch
+
+#endif // CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+#define CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+
+
+#include <algorithm>
+#include <functional>
+
+namespace Catch {
+    namespace Matchers {
+        //! Matcher for checking that an element in range is equal to specific element
+        template <typename T, typename Equality>
+        class ContainsElementMatcher final : public MatcherGenericBase {
+            T m_desired;
+            Equality m_eq;
+        public:
+            template <typename T2, typename Equality2>
+            ContainsElementMatcher(T2&& target, Equality2&& predicate):
+                m_desired(CATCH_FORWARD(target)),
+                m_eq(CATCH_FORWARD(predicate))
+            {}
+
+            std::string describe() const override {
+                return "contains element " + Catch::Detail::stringify(m_desired);
+            }
+
+            template <typename RangeLike>
+            bool match( RangeLike&& rng ) const {
+                for ( auto&& elem : rng ) {
+                    if ( m_eq( elem, m_desired ) ) { return true; }
+                }
+                return false;
+            }
+        };
+
+        //! Meta-matcher for checking that an element in a range matches a specific matcher
+        template <typename Matcher>
+        class ContainsMatcherMatcher final : public MatcherGenericBase {
+            Matcher m_matcher;
+        public:
+            // Note that we do a copy+move to avoid having to SFINAE this
+            // constructor (and also avoid some perfect forwarding failure
+            // cases)
+            ContainsMatcherMatcher(Matcher matcher):
+                m_matcher(CATCH_MOVE(matcher))
+            {}
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (m_matcher.match(elem)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "contains element matching " + m_matcher.describe();
+            }
+        };
+
+        /**
+         * Creates a matcher that checks whether a range contains a specific element.
+         *
+         * Uses `std::equal_to` to do the comparison
+         */
+        template <typename T>
+        std::enable_if_t<!Detail::is_matcher<T>::value,
+        ContainsElementMatcher<T, std::equal_to<>>> Contains(T&& elem) {
+            return { CATCH_FORWARD(elem), std::equal_to<>{} };
+        }
+
+        //! Creates a matcher that checks whether a range contains element matching a matcher
+        template <typename Matcher>
+        std::enable_if_t<Detail::is_matcher<Matcher>::value,
+        ContainsMatcherMatcher<Matcher>> Contains(Matcher&& matcher) {
+            return { CATCH_FORWARD(matcher) };
+        }
+
+        /**
+         * Creates a matcher that checks whether a range contains a specific element.
+         *
+         * Uses `eq` to do the comparisons, the element is provided on the rhs
+         */
+        template <typename T, typename Equality>
+        ContainsElementMatcher<T, Equality> Contains(T&& elem, Equality&& eq) {
+            return { CATCH_FORWARD(elem), CATCH_FORWARD(eq) };
+        }
+
+    }
+}
+
+#endif // CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+#define CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+
+
+namespace Catch {
+namespace Matchers {
+
+class ExceptionMessageMatcher final : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+//! Creates a matcher that checks whether a std derived exception has the provided message
+ExceptionMessageMatcher Message(std::string const& message);
+
+template <typename StringMatcherType>
+class ExceptionMessageMatchesMatcher final
+    : public MatcherBase<std::exception> {
+    StringMatcherType m_matcher;
+
+public:
+    ExceptionMessageMatchesMatcher( StringMatcherType matcher ):
+        m_matcher( CATCH_MOVE( matcher ) ) {}
+
+    bool match( std::exception const& ex ) const override {
+        return m_matcher.match( ex.what() );
+    }
+
+    std::string describe() const override {
+        return " matches \"" + m_matcher.describe() + '"';
+    }
+};
+
+//! Creates a matcher that checks whether a message from an std derived
+//! exception matches a provided matcher
+template <typename StringMatcherType>
+ExceptionMessageMatchesMatcher<StringMatcherType>
+MessageMatches( StringMatcherType&& matcher ) {
+    return { CATCH_FORWARD( matcher ) };
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED
+#define CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED
+
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Detail {
+        enum class FloatingPointKind : uint8_t;
+    }
+
+    class  WithinAbsMatcher final : public MatcherBase<double> {
+    public:
+        WithinAbsMatcher(double target, double margin);
+        bool match(double const& matchee) const override;
+        std::string describe() const override;
+    private:
+        double m_target;
+        double m_margin;
+    };
+
+    //! Creates a matcher that accepts numbers within certain range of target
+    WithinAbsMatcher WithinAbs( double target, double margin );
+
+
+
+    class WithinUlpsMatcher final : public MatcherBase<double> {
+    public:
+        WithinUlpsMatcher( double target,
+                           uint64_t ulps,
+                           Detail::FloatingPointKind baseType );
+        bool match(double const& matchee) const override;
+        std::string describe() const override;
+    private:
+        double m_target;
+        uint64_t m_ulps;
+        Detail::FloatingPointKind m_type;
+    };
+
+    //! Creates a matcher that accepts doubles within certain ULP range of target
+    WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    //! Creates a matcher that accepts floats within certain ULP range of target
+    WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+
+
+
+    // Given IEEE-754 format for floats and doubles, we can assume
+    // that float -> double promotion is lossless. Given this, we can
+    // assume that if we do the standard relative comparison of
+    // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+    // the same result if we do this for floats, as if we do this for
+    // doubles that were promoted from floats.
+    class WithinRelMatcher final : public MatcherBase<double> {
+    public:
+        WithinRelMatcher( double target, double epsilon );
+        bool match(double const& matchee) const override;
+        std::string describe() const override;
+    private:
+        double m_target;
+        double m_epsilon;
+    };
+
+    //! Creates a matcher that accepts doubles within certain relative range of target
+    WithinRelMatcher WithinRel(double target, double eps);
+    //! Creates a matcher that accepts doubles within 100*DBL_EPS relative range of target
+    WithinRelMatcher WithinRel(double target);
+    //! Creates a matcher that accepts doubles within certain relative range of target
+    WithinRelMatcher WithinRel(float target, float eps);
+    //! Creates a matcher that accepts floats within 100*FLT_EPS relative range of target
+    WithinRelMatcher WithinRel(float target);
+
+
+
+    class IsNaNMatcher final : public MatcherBase<double> {
+    public:
+        IsNaNMatcher() = default;
+        bool match( double const& matchee ) const override;
+        std::string describe() const override;
+    };
+
+    IsNaNMatcher IsNaN();
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
+#define CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+} // namespace Detail
+
+template <typename T, typename Predicate>
+class PredicateMatcher final : public MatcherBase<T> {
+    Predicate m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(Predicate&& elem, std::string const& descr)
+        :m_predicate(CATCH_FORWARD(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+    /**
+     * Creates a matcher that calls delegates `match` to the provided predicate.
+     *
+     * The user has to explicitly specify the argument type to the matcher
+     */
+    template<typename T, typename Pred>
+    PredicateMatcher<T, Pred> Predicate(Pred&& predicate, std::string const& description = "") {
+        static_assert(is_callable<Pred(T)>::value, "Predicate not callable with argument T");
+        static_assert(std::is_same<bool, FunctionReturnType<Pred, T>>::value, "Predicate does not return bool");
+        return PredicateMatcher<T, Pred>(CATCH_FORWARD(predicate), description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_QUANTIFIERS_HPP_INCLUDED
+#define CATCH_MATCHERS_QUANTIFIERS_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Matchers {
+        // Matcher for checking that all elements in range matches a given matcher.
+        template <typename Matcher>
+        class AllMatchMatcher final : public MatcherGenericBase {
+            Matcher m_matcher;
+        public:
+            AllMatchMatcher(Matcher matcher):
+                m_matcher(CATCH_MOVE(matcher))
+            {}
+
+            std::string describe() const override {
+                return "all match " + m_matcher.describe();
+            }
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (!m_matcher.match(elem)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        };
+
+        // Matcher for checking that no element in range matches a given matcher.
+        template <typename Matcher>
+        class NoneMatchMatcher final : public MatcherGenericBase {
+            Matcher m_matcher;
+        public:
+            NoneMatchMatcher(Matcher matcher):
+                m_matcher(CATCH_MOVE(matcher))
+            {}
+
+            std::string describe() const override {
+                return "none match " + m_matcher.describe();
+            }
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (m_matcher.match(elem)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        };
+
+        // Matcher for checking that at least one element in range matches a given matcher.
+        template <typename Matcher>
+        class AnyMatchMatcher final : public MatcherGenericBase {
+            Matcher m_matcher;
+        public:
+            AnyMatchMatcher(Matcher matcher):
+                m_matcher(CATCH_MOVE(matcher))
+            {}
+
+            std::string describe() const override {
+                return "any match " + m_matcher.describe();
+            }
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (m_matcher.match(elem)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        };
+
+        // Matcher for checking that all elements in range are true.
+        class AllTrueMatcher final : public MatcherGenericBase {
+        public:
+            std::string describe() const override;
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (!elem) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        };
+
+        // Matcher for checking that no element in range is true.
+        class NoneTrueMatcher final : public MatcherGenericBase {
+        public:
+            std::string describe() const override;
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (elem) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        };
+
+        // Matcher for checking that any element in range is true.
+        class AnyTrueMatcher final : public MatcherGenericBase {
+        public:
+            std::string describe() const override;
+
+            template <typename RangeLike>
+            bool match(RangeLike&& rng) const {
+                for (auto&& elem : rng) {
+                    if (elem) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        };
+
+        // Creates a matcher that checks whether all elements in a range match a matcher
+        template <typename Matcher>
+        AllMatchMatcher<Matcher> AllMatch(Matcher&& matcher) {
+            return { CATCH_FORWARD(matcher) };
+        }
+
+        // Creates a matcher that checks whether no element in a range matches a matcher.
+        template <typename Matcher>
+        NoneMatchMatcher<Matcher> NoneMatch(Matcher&& matcher) {
+            return { CATCH_FORWARD(matcher) };
+        }
+
+        // Creates a matcher that checks whether any element in a range matches a matcher.
+        template <typename Matcher>
+        AnyMatchMatcher<Matcher> AnyMatch(Matcher&& matcher) {
+            return { CATCH_FORWARD(matcher) };
+        }
+
+        // Creates a matcher that checks whether all elements in a range are true
+        AllTrueMatcher AllTrue();
+
+        // Creates a matcher that checks whether no element in a range is true
+        NoneTrueMatcher NoneTrue();
+
+        // Creates a matcher that checks whether any element in a range is true
+        AnyTrueMatcher AnyTrue();
+    }
+}
+
+#endif // CATCH_MATCHERS_QUANTIFIERS_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_RANGE_EQUALS_HPP_INCLUDED
+#define CATCH_MATCHERS_RANGE_EQUALS_HPP_INCLUDED
+
+
+#include <algorithm>
+#include <utility>
+
+namespace Catch {
+    namespace Matchers {
+
+        /**
+         * Matcher for checking that an element contains the same
+         * elements in the same order
+         */
+        template <typename TargetRangeLike, typename Equality>
+        class RangeEqualsMatcher final : public MatcherGenericBase {
+            TargetRangeLike m_desired;
+            Equality m_predicate;
+
+        public:
+            template <typename TargetRangeLike2, typename Equality2>
+            RangeEqualsMatcher( TargetRangeLike2&& range,
+                                Equality2&& predicate ):
+                m_desired( CATCH_FORWARD( range ) ),
+                m_predicate( CATCH_FORWARD( predicate ) ) {}
+
+            template <typename RangeLike>
+            bool match( RangeLike&& rng ) const {
+                auto rng_start = begin( rng );
+                const auto rng_end = end( rng );
+                auto target_start = begin( m_desired );
+                const auto target_end = end( m_desired );
+
+                while (rng_start != rng_end && target_start != target_end) {
+                    if (!m_predicate(*rng_start, *target_start)) {
+                        return false;
+                    }
+                    ++rng_start;
+                    ++target_start;
+                }
+                return rng_start == rng_end && target_start == target_end;
+            }
+
+            std::string describe() const override {
+                return "elements are " + Catch::Detail::stringify( m_desired );
+            }
+        };
+
+        /**
+         * Matcher for checking that an element contains the same
+         * elements (but not necessarily in the same order)
+         */
+        template <typename TargetRangeLike, typename Equality>
+        class UnorderedRangeEqualsMatcher final : public MatcherGenericBase {
+            TargetRangeLike m_desired;
+            Equality m_predicate;
+
+        public:
+            template <typename TargetRangeLike2, typename Equality2>
+            UnorderedRangeEqualsMatcher( TargetRangeLike2&& range,
+                                         Equality2&& predicate ):
+                m_desired( CATCH_FORWARD( range ) ),
+                m_predicate( CATCH_FORWARD( predicate ) ) {}
+
+            template <typename RangeLike>
+            bool match( RangeLike&& rng ) const {
+                using std::begin;
+                using std::end;
+                return Catch::Detail::is_permutation( begin( m_desired ),
+                                                      end( m_desired ),
+                                                      begin( rng ),
+                                                      end( rng ),
+                                                      m_predicate );
+            }
+
+            std::string describe() const override {
+                return "unordered elements are " +
+                       ::Catch::Detail::stringify( m_desired );
+            }
+        };
+
+        /**
+         * Creates a matcher that checks if all elements in a range are equal
+         * to all elements in another range.
+         *
+         * Uses `std::equal_to` to do the comparison
+         */
+        template <typename RangeLike>
+        std::enable_if_t<!Detail::is_matcher<RangeLike>::value,
+                         RangeEqualsMatcher<RangeLike, std::equal_to<>>>
+        RangeEquals( RangeLike&& range ) {
+            return { CATCH_FORWARD( range ), std::equal_to<>{} };
+        }
+
+        /**
+         * Creates a matcher that checks if all elements in a range are equal
+         * to all elements in another range.
+         *
+         * Uses to provided predicate `predicate` to do the comparisons
+         */
+        template <typename RangeLike, typename Equality>
+        RangeEqualsMatcher<RangeLike, Equality>
+        RangeEquals( RangeLike&& range, Equality&& predicate ) {
+            return { CATCH_FORWARD( range ), CATCH_FORWARD( predicate ) };
+        }
+
+        /**
+         * Creates a matcher that checks if all elements in a range are equal
+         * to all elements in another range, in some permutation
+         *
+         * Uses `std::equal_to` to do the comparison
+         */
+        template <typename RangeLike>
+        std::enable_if_t<
+            !Detail::is_matcher<RangeLike>::value,
+            UnorderedRangeEqualsMatcher<RangeLike, std::equal_to<>>>
+        UnorderedRangeEquals( RangeLike&& range ) {
+            return { CATCH_FORWARD( range ), std::equal_to<>{} };
+        }
+
+        /**
+         * Creates a matcher that checks if all elements in a range are equal
+         * to all elements in another range, in some permutation.
+         *
+         * Uses to provided predicate `predicate` to do the comparisons
+         */
+        template <typename RangeLike, typename Equality>
+        UnorderedRangeEqualsMatcher<RangeLike, Equality>
+        UnorderedRangeEquals( RangeLike&& range, Equality&& predicate ) {
+            return { CATCH_FORWARD( range ), CATCH_FORWARD( predicate ) };
+        }
+    } // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_RANGE_EQUALS_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_STRING_HPP_INCLUDED
+#define CATCH_MATCHERS_STRING_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    struct CasedString {
+        CasedString( std::string const& str, CaseSensitive caseSensitivity );
+        std::string adjustString( std::string const& str ) const;
+        StringRef caseSensitivitySuffix() const;
+
+        CaseSensitive m_caseSensitivity;
+        std::string m_str;
+    };
+
+    class StringMatcherBase : public MatcherBase<std::string> {
+    protected:
+        CasedString m_comparator;
+        StringRef m_operation;
+
+    public:
+        StringMatcherBase( StringRef operation,
+                           CasedString const& comparator );
+        std::string describe() const override;
+    };
+
+    class StringEqualsMatcher final : public StringMatcherBase {
+    public:
+        StringEqualsMatcher( CasedString const& comparator );
+        bool match( std::string const& source ) const override;
+    };
+    class StringContainsMatcher final : public StringMatcherBase {
+    public:
+        StringContainsMatcher( CasedString const& comparator );
+        bool match( std::string const& source ) const override;
+    };
+    class StartsWithMatcher final : public StringMatcherBase {
+    public:
+        StartsWithMatcher( CasedString const& comparator );
+        bool match( std::string const& source ) const override;
+    };
+    class EndsWithMatcher final : public StringMatcherBase {
+    public:
+        EndsWithMatcher( CasedString const& comparator );
+        bool match( std::string const& source ) const override;
+    };
+
+    class RegexMatcher final : public MatcherBase<std::string> {
+        std::string m_regex;
+        CaseSensitive m_caseSensitivity;
+
+    public:
+        RegexMatcher( std::string regex, CaseSensitive caseSensitivity );
+        bool match( std::string const& matchee ) const override;
+        std::string describe() const override;
+    };
+
+    //! Creates matcher that accepts strings that are exactly equal to `str`
+    StringEqualsMatcher Equals( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
+    //! Creates matcher that accepts strings that contain `str`
+    StringContainsMatcher ContainsSubstring( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
+    //! Creates matcher that accepts strings that _end_ with `str`
+    EndsWithMatcher EndsWith( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
+    //! Creates matcher that accepts strings that _start_ with `str`
+    StartsWithMatcher StartsWith( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
+    //! Creates matcher that accepts strings matching `regex`
+    RegexMatcher Matches( std::string const& regex, CaseSensitive caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_STRING_HPP_INCLUDED
+
+
+#ifndef CATCH_MATCHERS_VECTOR_HPP_INCLUDED
+#define CATCH_MATCHERS_VECTOR_HPP_INCLUDED
+
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    template<typename T, typename Alloc>
+    class VectorContainsElementMatcher final : public MatcherBase<std::vector<T, Alloc>> {
+        T const& m_comparator;
+
+    public:
+        VectorContainsElementMatcher(T const& comparator):
+            m_comparator(comparator)
+        {}
+
+        bool match(std::vector<T, Alloc> const& v) const override {
+            for (auto const& el : v) {
+                if (el == m_comparator) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        std::string describe() const override {
+            return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+        }
+    };
+
+    template<typename T, typename AllocComp, typename AllocMatch>
+    class ContainsMatcher final : public MatcherBase<std::vector<T, AllocMatch>> {
+        std::vector<T, AllocComp> const& m_comparator;
+
+    public:
+        ContainsMatcher(std::vector<T, AllocComp> const& comparator):
+            m_comparator( comparator )
+        {}
+
+        bool match(std::vector<T, AllocMatch> const& v) const override {
+            // !TBD: see note in EqualsMatcher
+            if (m_comparator.size() > v.size())
+                return false;
+            for (auto const& comparator : m_comparator) {
+                auto present = false;
+                for (const auto& el : v) {
+                    if (el == comparator) {
+                        present = true;
+                        break;
+                    }
+                }
+                if (!present) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        std::string describe() const override {
+            return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+        }
+    };
+
+    template<typename T, typename AllocComp, typename AllocMatch>
+    class EqualsMatcher final : public MatcherBase<std::vector<T, AllocMatch>> {
+        std::vector<T, AllocComp> const& m_comparator;
+
+    public:
+        EqualsMatcher(std::vector<T, AllocComp> const& comparator):
+            m_comparator( comparator )
+        {}
+
+        bool match(std::vector<T, AllocMatch> const& v) const override {
+            // !TBD: This currently works if all elements can be compared using !=
+            // - a more general approach would be via a compare template that defaults
+            // to using !=. but could be specialised for, e.g. std::vector<T> etc
+            // - then just call that directly
+            if ( m_comparator.size() != v.size() ) { return false; }
+            for ( std::size_t i = 0; i < v.size(); ++i ) {
+                if ( !( m_comparator[i] == v[i] ) ) { return false; }
+            }
+            return true;
+        }
+        std::string describe() const override {
+            return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+        }
+    };
+
+    template<typename T, typename AllocComp, typename AllocMatch>
+    class ApproxMatcher final : public MatcherBase<std::vector<T, AllocMatch>> {
+        std::vector<T, AllocComp> const& m_comparator;
+        mutable Catch::Approx approx = Catch::Approx::custom();
+
+    public:
+        ApproxMatcher(std::vector<T, AllocComp> const& comparator):
+            m_comparator( comparator )
+        {}
+
+        bool match(std::vector<T, AllocMatch> const& v) const override {
+            if (m_comparator.size() != v.size())
+                return false;
+            for (std::size_t i = 0; i < v.size(); ++i)
+                if (m_comparator[i] != approx(v[i]))
+                    return false;
+            return true;
+        }
+        std::string describe() const override {
+            return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+        }
+        template <typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        ApproxMatcher& epsilon( T const& newEpsilon ) {
+            approx.epsilon(static_cast<double>(newEpsilon));
+            return *this;
+        }
+        template <typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        ApproxMatcher& margin( T const& newMargin ) {
+            approx.margin(static_cast<double>(newMargin));
+            return *this;
+        }
+        template <typename = std::enable_if_t<std::is_constructible<double, T>::value>>
+        ApproxMatcher& scale( T const& newScale ) {
+            approx.scale(static_cast<double>(newScale));
+            return *this;
+        }
+    };
+
+    template<typename T, typename AllocComp, typename AllocMatch>
+    class UnorderedEqualsMatcher final : public MatcherBase<std::vector<T, AllocMatch>> {
+        std::vector<T, AllocComp> const& m_target;
+
+    public:
+        UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target):
+            m_target(target)
+        {}
+        bool match(std::vector<T, AllocMatch> const& vec) const override {
+            if (m_target.size() != vec.size()) {
+                return false;
+            }
+            return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+        }
+
+        std::string describe() const override {
+            return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+        }
+    };
+
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    //! Creates a matcher that matches vectors that contain all elements in `comparator`
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return ContainsMatcher<T, AllocComp, AllocMatch>(comparator);
+    }
+
+    //! Creates a matcher that matches vectors that contain `comparator` as an element
+    template<typename T, typename Alloc = std::allocator<T>>
+    VectorContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return VectorContainsElementMatcher<T, Alloc>(comparator);
+    }
+
+    //! Creates a matcher that matches vectors that are exactly equal to `comparator`
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return EqualsMatcher<T, AllocComp, AllocMatch>(comparator);
+    }
+
+    //! Creates a matcher that matches vectors that `comparator` as an element
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return ApproxMatcher<T, AllocComp, AllocMatch>(comparator);
+    }
+
+    //! Creates a matcher that matches vectors that is equal to `target` modulo permutation
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return UnorderedEqualsMatcher<T, AllocComp, AllocMatch>(target);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+#endif // CATCH_MATCHERS_VECTOR_HPP_INCLUDED
+
+#endif // CATCH_MATCHERS_ALL_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2's Reporter support. It includes
+ * **all** of Catch2 headers related to reporters, including all reporters.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of (significantly) increased
+ * compilation times.
+ *
+ * When a new header (reporter) is added to either the `reporter` folder,
+ * or to the corresponding internal subfolder, it should be added here.
+ */
+
+#ifndef CATCH_REPORTERS_ALL_HPP_INCLUDED
+#define CATCH_REPORTERS_ALL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+#define CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+
+
+
+#ifndef CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
+#define CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
+
+
+
+#ifndef CATCH_REPORTER_COMMON_BASE_HPP_INCLUDED
+#define CATCH_REPORTER_COMMON_BASE_HPP_INCLUDED
+
+
+#include <map>
+#include <string>
+
+namespace Catch {
+    class ColourImpl;
+
+    /**
+     * This is the base class for all reporters.
+     *
+     * If are writing a reporter, you must derive from this type, or one
+     * of the helper reporter bases that are derived from this type.
+     *
+     * ReporterBase centralizes handling of various common tasks in reporters,
+     * like storing the right stream for the reporters to write to, and
+     * providing the default implementation of the different listing events.
+     */
+    class ReporterBase : public IEventListener {
+    protected:
+        //! The stream wrapper as passed to us by outside code
+        Detail::unique_ptr<IStream> m_wrapped_stream;
+        //! Cached output stream from `m_wrapped_stream` to reduce
+        //! number of indirect calls needed to write output.
+        std::ostream& m_stream;
+        //! Colour implementation this reporter was configured for
+        Detail::unique_ptr<ColourImpl> m_colour;
+        //! The custom reporter options user passed down to the reporter
+        std::map<std::string, std::string> m_customOptions;
+
+    public:
+        ReporterBase( ReporterConfig&& config );
+        ~ReporterBase() override; // = default;
+
+        /**
+         * Provides a simple default listing of reporters.
+         *
+         * Should look roughly like the reporter listing in v2 and earlier
+         * versions of Catch2.
+         */
+        void listReporters(
+            std::vector<ReporterDescription> const& descriptions ) override;
+        /**
+         * Provides a simple default listing of listeners
+         *
+         * Looks similarly to listing of reporters, but with listener type
+         * instead of reporter name.
+         */
+        void listListeners(
+            std::vector<ListenerDescription> const& descriptions ) override;
+        /**
+         * Provides a simple default listing of tests.
+         *
+         * Should look roughly like the test listing in v2 and earlier versions
+         * of Catch2. Especially supports low-verbosity listing that mimics the
+         * old `--list-test-names-only` output.
+         */
+        void listTests( std::vector<TestCaseHandle> const& tests ) override;
+        /**
+         * Provides a simple default listing of tags.
+         *
+         * Should look roughly like the tag listing in v2 and earlier versions
+         * of Catch2.
+         */
+        void listTags( std::vector<TagInfo> const& tags ) override;
+    };
+} // namespace Catch
+
+#endif // CATCH_REPORTER_COMMON_BASE_HPP_INCLUDED
+
+#include <vector>
+
+namespace Catch {
+
+    class StreamingReporterBase : public ReporterBase {
+    public:
+        // GCC5 compat: we cannot use inherited constructor, because it
+        //              doesn't implement backport of P0136
+        StreamingReporterBase(ReporterConfig&& _config):
+            ReporterBase(CATCH_MOVE(_config))
+        {}
+        ~StreamingReporterBase() override;
+
+        void benchmarkPreparing( StringRef ) override {}
+        void benchmarkStarting( BenchmarkInfo const& ) override {}
+        void benchmarkEnded( BenchmarkStats<> const& ) override {}
+        void benchmarkFailed( StringRef ) override {}
+
+        void fatalErrorEncountered( StringRef /*error*/ ) override {}
+        void noMatchingTestCases( StringRef /*unmatchedSpec*/ ) override {}
+        void reportInvalidTestSpec( StringRef /*invalidArgument*/ ) override {}
+
+        void testRunStarting( TestRunInfo const& _testRunInfo ) override;
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = &_testInfo;
+        }
+        void testCasePartialStarting( TestCaseInfo const&, uint64_t ) override {}
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void assertionStarting( AssertionInfo const& ) override {}
+        void assertionEnded( AssertionStats const& ) override {}
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCasePartialEnded( TestCaseStats const&, uint64_t ) override {}
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo = nullptr;
+        }
+        void testRunEnded( TestRunStats const& /* _testRunStats */ ) override;
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+    protected:
+        TestRunInfo currentTestRunInfo{ "test run has not started yet"_sr };
+        TestCaseInfo const* currentTestCaseInfo = nullptr;
+
+        //! Stack of all _active_ sections in the _current_ test case
+        std::vector<SectionInfo> m_sectionStack;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class AutomakeReporter final : public StreamingReporterBase {
+    public:
+        // GCC5 compat: we cannot use inherited constructor, because it
+        //              doesn't implement backport of P0136
+        AutomakeReporter(ReporterConfig&& _config):
+            StreamingReporterBase(CATCH_MOVE(_config))
+        {}
+        ~AutomakeReporter() override;
+
+        static std::string getDescription() {
+            using namespace std::string_literals;
+            return "Reports test results in the format of Automake .trs files"s;
+        }
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void skipTest(TestCaseInfo const& testInfo) override;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_COMPACT_HPP_INCLUDED
+#define CATCH_REPORTER_COMPACT_HPP_INCLUDED
+
+
+
+
+namespace Catch {
+
+    class CompactReporter final : public StreamingReporterBase {
+    public:
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases( StringRef unmatchedSpec ) override;
+
+        void testRunStarting( TestRunInfo const& _testInfo ) override;
+
+        void assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_COMPACT_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+#define CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+
+
+namespace Catch {
+    // Fwd decls
+    class TablePrinter;
+
+    class ConsoleReporter final : public StreamingReporterBase {
+        Detail::unique_ptr<TablePrinter> m_tablePrinter;
+
+    public:
+        ConsoleReporter(ReporterConfig&& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases( StringRef unmatchedSpec ) override;
+        void reportInvalidTestSpec( StringRef arg ) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        void assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+
+    private:
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotalsDivider(Totals const& totals);
+
+        bool m_headerPrinted = false;
+        bool m_testRunInfoPrinted = false;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
+#define CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
+
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+
+        //! Represents either an assertion or a benchmark result to be handled by cumulative reporter later
+        class AssertionOrBenchmarkResult {
+            // This should really be a variant, but this is much faster
+            // to write and the data layout here is already terrible
+            // enough that we do not have to care about the object size.
+            Optional<AssertionStats> m_assertion;
+            Optional<BenchmarkStats<>> m_benchmark;
+        public:
+            AssertionOrBenchmarkResult(AssertionStats const& assertion);
+            AssertionOrBenchmarkResult(BenchmarkStats<> const& benchmark);
+
+            bool isAssertion() const;
+            bool isBenchmark() const;
+
+            AssertionStats const& asAssertion() const;
+            BenchmarkStats<> const& asBenchmark() const;
+        };
+    }
+
+    /**
+     * Utility base for reporters that need to handle all results at once
+     *
+     * It stores tree of all test cases, sections and assertions, and after the
+     * test run is finished, calls into `testRunEndedCumulative` to pass the
+     * control to the deriving class.
+     *
+     * If you are deriving from this class and override any testing related
+     * member functions, you should first call into the base's implementation to
+     * avoid breaking the tree construction.
+     *
+     * Due to the way this base functions, it has to expand assertions up-front,
+     * even if they are later unused (e.g. because the deriving reporter does
+     * not report successful assertions, or because the deriving reporter does
+     * not use assertion expansion at all). Derived classes can use two
+     * customization points, `m_shouldStoreSuccesfulAssertions` and
+     * `m_shouldStoreFailedAssertions`, to disable the expansion and gain extra
+     * performance. **Accessing the assertion expansions if it wasn't stored is
+     * UB.**
+     */
+    class CumulativeReporterBase : public ReporterBase {
+    public:
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+
+            using ChildNodes = std::vector<Detail::unique_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+
+            bool hasAnyAssertions() const;
+
+            SectionStats stats;
+            std::vector<Detail::unique_ptr<SectionNode>> childSections;
+            std::vector<Detail::AssertionOrBenchmarkResult> assertionsAndBenchmarks;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestRunNode = Node<TestRunStats, TestCaseNode>;
+
+        // GCC5 compat: we cannot use inherited constructor, because it
+        //              doesn't implement backport of P0136
+        CumulativeReporterBase(ReporterConfig&& _config):
+            ReporterBase(CATCH_MOVE(_config))
+        {}
+        ~CumulativeReporterBase() override;
+
+        void benchmarkPreparing( StringRef ) override {}
+        void benchmarkStarting( BenchmarkInfo const& ) override {}
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed( StringRef ) override {}
+
+        void noMatchingTestCases( StringRef ) override {}
+        void reportInvalidTestSpec( StringRef ) override {}
+        void fatalErrorEncountered( StringRef /*error*/ ) override {}
+
+        void testRunStarting( TestRunInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+        void testCasePartialStarting( TestCaseInfo const&, uint64_t ) override {}
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+
+        void assertionStarting( AssertionInfo const& ) override {}
+
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCasePartialEnded( TestCaseStats const&, uint64_t ) override {}
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+        //! Customization point: called after last test finishes (testRunEnded has been handled)
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+    protected:
+        //! Should the cumulative base store the assertion expansion for successful assertions?
+        bool m_shouldStoreSuccesfulAssertions = true;
+        //! Should the cumulative base store the assertion expansion for failed assertions?
+        bool m_shouldStoreFailedAssertions = true;
+
+        // We need lazy construction here. We should probably refactor it
+        // later, after the events are redone.
+        //! The root node of the test run tree.
+        Detail::unique_ptr<TestRunNode> m_testRun;
+
+    private:
+        // Note: We rely on pointer identity being stable, which is why
+        //       we store pointers to the nodes rather than the values.
+        std::vector<Detail::unique_ptr<TestCaseNode>> m_testCases;
+        // Root section of the _current_ test case
+        Detail::unique_ptr<SectionNode> m_rootSection;
+        // Deepest section of the _current_ test case
+        SectionNode* m_deepestSection = nullptr;
+        // Stack of _active_ sections in the _current_ test case
+        std::vector<SectionNode*> m_sectionStack;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_EVENT_LISTENER_HPP_INCLUDED
+#define CATCH_REPORTER_EVENT_LISTENER_HPP_INCLUDED
+
+
+namespace Catch {
+
+    /**
+     * Base class to simplify implementing listeners.
+     *
+     * Provides empty default implementation for all IEventListener member
+     * functions, so that a listener implementation can pick which
+     * member functions it actually cares about.
+     */
+    class EventListenerBase : public IEventListener {
+    public:
+        using IEventListener::IEventListener;
+
+        void reportInvalidTestSpec( StringRef unmatchedSpec ) override;
+        void fatalErrorEncountered( StringRef error ) override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+
+        void listReporters(
+            std::vector<ReporterDescription> const& descriptions ) override;
+        void listListeners(
+            std::vector<ListenerDescription> const& descriptions ) override;
+        void listTests( std::vector<TestCaseHandle> const& tests ) override;
+        void listTags( std::vector<TagInfo> const& tagInfos ) override;
+
+        void noMatchingTestCases( StringRef unmatchedSpec ) override;
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void testCasePartialStarting( TestCaseInfo const& testInfo,
+                                      uint64_t partNumber ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCasePartialEnded( TestCaseStats const& testCaseStats,
+                                   uint64_t partNumber ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+        void skipTest( TestCaseInfo const& testInfo ) override;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_EVENT_LISTENER_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_HELPERS_HPP_INCLUDED
+#define CATCH_REPORTER_HELPERS_HPP_INCLUDED
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+
+
+namespace Catch {
+
+    class IConfig;
+    class TestCaseHandle;
+    class ColourImpl;
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    //! Should the reporter show duration of test given current configuration?
+    bool shouldShowDuration( IConfig const& config, double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& filters );
+
+    struct lineOfChars {
+        char c;
+        constexpr lineOfChars( char c_ ): c( c_ ) {}
+
+        friend std::ostream& operator<<( std::ostream& out, lineOfChars value );
+    };
+
+    /**
+     * Lists reporter descriptions to the provided stream in user-friendly
+     * format
+     *
+     * Used as the default listing implementation by the first party reporter
+     * bases. The output should be backwards compatible with the output of
+     * Catch2 v2 binaries.
+     */
+    void
+    defaultListReporters( std::ostream& out,
+                          std::vector<ReporterDescription> const& descriptions,
+                          Verbosity verbosity );
+
+    /**
+     * Lists listeners descriptions to the provided stream in user-friendly
+     * format
+     */
+    void defaultListListeners( std::ostream& out,
+                               std::vector<ListenerDescription> const& descriptions );
+
+    /**
+     * Lists tag information to the provided stream in user-friendly format
+     *
+     * Used as the default listing implementation by the first party reporter
+     * bases. The output should be backwards compatible with the output of
+     * Catch2 v2 binaries.
+     */
+    void defaultListTags( std::ostream& out, std::vector<TagInfo> const& tags, bool isFiltered );
+
+    /**
+     * Lists test case information to the provided stream in user-friendly
+     * format
+     *
+     * Used as the default listing implementation by the first party reporter
+     * bases. The output is backwards compatible with the output of Catch2
+     * v2 binaries, and also supports the format specific to the old
+     * `--list-test-names-only` option, for people who used it in integrations.
+     */
+    void defaultListTests( std::ostream& out,
+                           ColourImpl* streamColour,
+                           std::vector<TestCaseHandle> const& tests,
+                           bool isFiltered,
+                           Verbosity verbosity );
+
+    /**
+     * Prints test run totals to the provided stream in user-friendly format
+     *
+     * Used by the console and compact reporters.
+     */
+    void printTestRunTotals( std::ostream& stream,
+                      ColourImpl& streamColour,
+                      Totals const& totals );
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_HELPERS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_REPORTER_JSON_HPP_INCLUDED
+#define CATCH_REPORTER_JSON_HPP_INCLUDED
+
+
+#include <stack>
+
+namespace Catch {
+    class JsonReporter : public StreamingReporterBase {
+    public:
+        JsonReporter( ReporterConfig&& config );
+
+        ~JsonReporter() override;
+
+        static std::string getDescription();
+
+    public: // StreamingReporterBase
+        void testRunStarting( TestRunInfo const& runInfo ) override;
+        void testRunEnded( TestRunStats const& runStats ) override;
+
+        void testCaseStarting( TestCaseInfo const& tcInfo ) override;
+        void testCaseEnded( TestCaseStats const& tcStats ) override;
+
+        void testCasePartialStarting( TestCaseInfo const& tcInfo,
+                                      uint64_t index ) override;
+        void testCasePartialEnded( TestCaseStats const& tcStats,
+                                   uint64_t index ) override;
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+
+        //void testRunEndedCumulative() override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& ) override;
+        void benchmarkEnded( BenchmarkStats<> const& ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void listReporters(
+            std::vector<ReporterDescription> const& descriptions ) override;
+        void listListeners(
+            std::vector<ListenerDescription> const& descriptions ) override;
+        void listTests( std::vector<TestCaseHandle> const& tests ) override;
+        void listTags( std::vector<TagInfo> const& tags ) override;
+
+    private:
+        Timer m_testCaseTimer;
+        enum class Writer {
+            Object,
+            Array
+        };
+
+        JsonArrayWriter& startArray();
+        JsonArrayWriter& startArray( StringRef key );
+
+        JsonObjectWriter& startObject();
+        JsonObjectWriter& startObject( StringRef key );
+
+        void endObject();
+        void endArray();
+
+        bool isInside( Writer writer );
+
+        void startListing();
+        void endListing();
+
+        // Invariant:
+        // When m_writers is not empty and its top element is
+        // - Writer::Object, then m_objectWriters is not be empty
+        // - Writer::Array,  then m_arrayWriters shall not be empty
+        std::stack<JsonObjectWriter> m_objectWriters{};
+        std::stack<JsonArrayWriter> m_arrayWriters{};
+        std::stack<Writer> m_writers{};
+
+        bool m_startedListing = false;
+
+        // std::size_t m_sectionDepth = 0;
+        // std::size_t m_sectionStarted = 0;
+    };
+} // namespace Catch
+
+#endif // CATCH_REPORTER_JSON_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_JUNIT_HPP_INCLUDED
+#define CATCH_REPORTER_JUNIT_HPP_INCLUDED
+
+
+
+namespace Catch {
+
+    class JunitReporter final : public CumulativeReporterBase {
+    public:
+        JunitReporter(ReporterConfig&& _config);
+
+        static std::string getDescription();
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        void assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testRunEndedCumulative() override;
+
+    private:
+        void writeRun(TestRunNode const& testRunNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection( std::string const& className,
+                           std::string const& rootName,
+                           SectionNode const& sectionNode,
+                           bool testOkToFail );
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_JUNIT_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_MULTI_HPP_INCLUDED
+#define CATCH_REPORTER_MULTI_HPP_INCLUDED
+
+
+namespace Catch {
+
+    class MultiReporter final : public IEventListener {
+        /*
+         * Stores all added reporters and listeners
+         *
+         * All Listeners are stored before all reporters, and individual
+         * listeners/reporters are stored in order of insertion.
+         */
+        std::vector<IEventListenerPtr> m_reporterLikes;
+        bool m_haveNoncapturingReporters = false;
+
+        // Keep track of how many listeners we have already inserted,
+        // so that we can insert them into the main vector at the right place
+        size_t m_insertedListeners = 0;
+
+        void updatePreferences(IEventListener const& reporterish);
+
+    public:
+        using IEventListener::IEventListener;
+
+        void addListener( IEventListenerPtr&& listener );
+        void addReporter( IEventListenerPtr&& reporter );
+
+    public: // IEventListener
+
+        void noMatchingTestCases( StringRef unmatchedSpec ) override;
+        void fatalErrorEncountered( StringRef error ) override;
+        void reportInvalidTestSpec( StringRef arg ) override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void testCasePartialStarting(TestCaseInfo const& testInfo, uint64_t partNumber) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCasePartialEnded(TestCaseStats const& testStats, uint64_t partNumber) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+
+        void listReporters(std::vector<ReporterDescription> const& descriptions) override;
+        void listListeners(std::vector<ListenerDescription> const& descriptions) override;
+        void listTests(std::vector<TestCaseHandle> const& tests) override;
+        void listTags(std::vector<TagInfo> const& tags) override;
+
+
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_MULTI_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+#define CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+
+
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+
+        template <typename T, typename = void>
+        struct has_description : std::false_type {};
+
+        template <typename T>
+        struct has_description<
+            T,
+            void_t<decltype( T::getDescription() )>>
+            : std::true_type {};
+
+        //! Indirection for reporter registration, so that the error handling is
+        //! independent on the reporter's concrete type
+        void registerReporterImpl( std::string const& name,
+                                   IReporterFactoryPtr reporterPtr );
+        //! Actually registers the factory, independent on listener's concrete type
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory );
+    } // namespace Detail
+
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+
+    template <typename T>
+    class ReporterFactory : public IReporterFactory {
+
+        IEventListenerPtr create( ReporterConfig&& config ) const override {
+            return Detail::make_unique<T>( CATCH_MOVE(config) );
+        }
+
+        std::string getDescription() const override {
+            return T::getDescription();
+        }
+    };
+
+
+    template<typename T>
+    class ReporterRegistrar {
+    public:
+        explicit ReporterRegistrar( std::string const& name ) {
+            registerReporterImpl( name,
+                                  Detail::make_unique<ReporterFactory<T>>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class TypedListenerFactory : public EventListenerFactory {
+            StringRef m_listenerName;
+
+            std::string getDescriptionImpl( std::true_type ) const {
+                return T::getDescription();
+            }
+
+            std::string getDescriptionImpl( std::false_type ) const {
+                return "(No description provided)";
+            }
+
+        public:
+            TypedListenerFactory( StringRef listenerName ):
+                m_listenerName( listenerName ) {}
+
+            IEventListenerPtr create( IConfig const* config ) const override {
+                return Detail::make_unique<T>( config );
+            }
+
+            StringRef getName() const override {
+                return m_listenerName;
+            }
+
+            std::string getDescription() const override {
+                return getDescriptionImpl( Detail::has_description<T>{} );
+            }
+        };
+
+    public:
+        ListenerRegistrar(StringRef listenerName) {
+            registerListenerImpl( Detail::make_unique<TypedListenerFactory>(listenerName) );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#    define CATCH_REGISTER_REPORTER( name, reporterType )                      \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                              \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                               \
+        namespace {                                                            \
+            Catch::ReporterRegistrar<reporterType> INTERNAL_CATCH_UNIQUE_NAME( \
+                catch_internal_RegistrarFor )( name );                         \
+        }                                                                      \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define CATCH_REGISTER_LISTENER( listenerType )                            \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                              \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                               \
+        namespace {                                                            \
+            Catch::ListenerRegistrar<listenerType> INTERNAL_CATCH_UNIQUE_NAME( \
+                catch_internal_RegistrarFor )( #listenerType##_catch_sr );     \
+        }                                                                      \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+#endif // CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_SONARQUBE_HPP_INCLUDED
+#define CATCH_REPORTER_SONARQUBE_HPP_INCLUDED
+
+
+
+namespace Catch {
+
+    class SonarQubeReporter final : public CumulativeReporterBase {
+    public:
+        SonarQubeReporter(ReporterConfig&& config)
+        : CumulativeReporterBase(CATCH_MOVE(config))
+        , xml(m_stream) {
+            m_preferences.shouldRedirectStdOut = true;
+            m_preferences.shouldReportAllAssertions = true;
+            m_shouldStoreSuccesfulAssertions = false;
+        }
+
+        static std::string getDescription() {
+            using namespace std::string_literals;
+            return "Reports test results in the Generic Test Data SonarQube XML format"s;
+        }
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+
+        void testRunEndedCumulative() override {
+            writeRun( *m_testRun );
+            xml.endElement();
+        }
+
+        void writeRun( TestRunNode const& runNode );
+
+        void writeTestFile(StringRef filename, std::vector<TestCaseNode const*> const& testCaseNodes);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& rootName, SectionNode const& sectionNode, bool okToFail);
+
+        void writeAssertions(SectionNode const& sectionNode, bool okToFail);
+
+        void writeAssertion(AssertionStats const& stats, bool okToFail);
+
+    private:
+        XmlWriter xml;
+    };
+
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_SONARQUBE_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_TAP_HPP_INCLUDED
+#define CATCH_REPORTER_TAP_HPP_INCLUDED
+
+
+namespace Catch {
+
+    class TAPReporter final : public StreamingReporterBase {
+    public:
+        TAPReporter( ReporterConfig&& config ):
+            StreamingReporterBase( CATCH_MOVE(config) ) {
+            m_preferences.shouldReportAllAssertions = true;
+        }
+
+        static std::string getDescription() {
+            using namespace std::string_literals;
+            return "Reports test results in TAP format, suitable for test harnesses"s;
+        }
+
+        void testRunStarting( TestRunInfo const& testInfo ) override;
+
+        void noMatchingTestCases( StringRef unmatchedSpec ) override;
+
+        void assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    private:
+        std::size_t counter = 0;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_TAP_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+#define CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+
+
+#include <cstring>
+
+#ifdef __clang__
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    class TeamCityReporter final : public StreamingReporterBase {
+    public:
+        TeamCityReporter( ReporterConfig&& _config )
+        :   StreamingReporterBase( CATCH_MOVE(_config) )
+        {
+            m_preferences.shouldRedirectStdOut = true;
+        }
+
+        ~TeamCityReporter() override;
+
+        static std::string getDescription() {
+            using namespace std::string_literals;
+            return "Reports test results as TeamCity service messages"s;
+        }
+
+        void testRunStarting( TestRunInfo const& runInfo ) override;
+        void testRunEnded( TestRunStats const& runStats ) override;
+
+
+        void assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override {
+            m_headerPrintedForThisSection = false;
+            StreamingReporterBase::sectionStarting( sectionInfo );
+        }
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+    private:
+        void printSectionHeader(std::ostream& os);
+
+        bool m_headerPrintedForThisSection = false;
+        Timer m_testTimer;
+    };
+
+} // end namespace Catch
+
+#ifdef __clang__
+#   pragma clang diagnostic pop
+#endif
+
+#endif // CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+
+
+#ifndef CATCH_REPORTER_XML_HPP_INCLUDED
+#define CATCH_REPORTER_XML_HPP_INCLUDED
+
+
+
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase {
+    public:
+        XmlReporter(ReporterConfig&& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        void assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void listReporters(std::vector<ReporterDescription> const& descriptions) override;
+        void listListeners(std::vector<ListenerDescription> const& descriptions) override;
+        void listTests(std::vector<TestCaseHandle> const& tests) override;
+        void listTags(std::vector<TagInfo> const& tags) override;
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_REPORTER_XML_HPP_INCLUDED
+
+#endif // CATCH_REPORTERS_ALL_HPP_INCLUDED
+
+#endif // CATCH_ALL_HPP_INCLUDED
+#endif // CATCH_AMALGAMATED_HPP_INCLUDED
diff --git a/lib/gmp/mini-gmp.c b/lib/gmp/mini-gmp.c
index e2e686123..69a72bfd4 100644
--- a/lib/gmp/mini-gmp.c
+++ b/lib/gmp/mini-gmp.c
@@ -1,27 +1,39 @@
 /* mini-gmp, a minimalistic implementation of a GNU GMP subset.
 
    Contributed to the GNU project by Niels Möller
+   Additional functionalities and improvements by Marco Bodrato.
 
-Copyright 1991-1997, 1999-2019 Free Software Foundation, Inc.
+Copyright 1991-1997, 1999-2022 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * the GNU General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your option) any
+    later version.
+
+or both in parallel, as here.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
+You should have received copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
 
 /* NOTE: All functions in this file which are not declared in
    mini-gmp.h are internal, and are not intended to be compatible
-   neither with GMP nor with future versions of mini-gmp. */
+   with GMP or with future versions of mini-gmp. */
 
 /* Much of the material copied from GMP files, including: gmp-impl.h,
    longlong.h, mpn/generic/add_n.c, mpn/generic/addmul_1.c,
@@ -43,7 +55,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include <float.h>
 #endif
 
-
+
 /* Macros */
 #define GMP_LIMB_BITS (sizeof(mp_limb_t) * CHAR_BIT)
 
@@ -79,6 +91,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #define gmp_assert_nocarry(x) do { \
     mp_limb_t __cy = (x);	   \
     assert (__cy == 0);		   \
+    (void) (__cy);		   \
   } while (0)
 
 #define gmp_clz(count, x) do {						\
@@ -137,6 +150,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
       mp_limb_t __x0, __x1, __x2, __x3;					\
       unsigned __ul, __vl, __uh, __vh;					\
       mp_limb_t __u = (u), __v = (v);					\
+      assert (sizeof (unsigned) * 2 >= sizeof (mp_limb_t));		\
 									\
       __ul = __u & GMP_LLIMB_MASK;					\
       __uh = __u >> (GMP_LIMB_BITS / 2);				\
@@ -158,12 +172,19 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
     }									\
   } while (0)
 
+/* If mp_limb_t is of size smaller than int, plain u*v implies
+   automatic promotion to *signed* int, and then multiply may overflow
+   and cause undefined behavior. Explicitly cast to unsigned int for
+   that case. */
+#define gmp_umullo_limb(u, v) \
+  ((sizeof(mp_limb_t) >= sizeof(int)) ? (u)*(v) : (unsigned int)(u) * (v))
+
 #define gmp_udiv_qrnnd_preinv(q, r, nh, nl, d, di)			\
   do {									\
     mp_limb_t _qh, _ql, _r, _mask;					\
     gmp_umul_ppmm (_qh, _ql, (nh), (di));				\
     gmp_add_ssaaaa (_qh, _ql, _qh, _ql, (nh) + 1, (nl));		\
-    _r = (nl) - _qh * (d);						\
+    _r = (nl) - gmp_umullo_limb (_qh, (d));				\
     _mask = -(mp_limb_t) (_r > _ql); /* both > and >= are OK */		\
     _qh += _mask;							\
     _r += _mask & (d);							\
@@ -184,7 +205,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
     gmp_add_ssaaaa ((q), _q0, (q), _q0, (n2), (n1));			\
 									\
     /* Compute the two most significant limbs of n - q'd */		\
-    (r1) = (n1) - (d1) * (q);						\
+    (r1) = (n1) - gmp_umullo_limb ((d1), (q));				\
     gmp_sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0));		\
     gmp_umul_ppmm (_t1, _t0, (d0), (q));				\
     gmp_sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0);			\
@@ -340,20 +361,27 @@ mp_set_memory_functions (void *(*alloc_func) (size_t),
   gmp_free_func = free_func;
 }
 
-#define gmp_xalloc(size) ((*gmp_allocate_func)((size)))
-#define gmp_free(p) ((*gmp_free_func) ((p), 0))
+#define gmp_alloc(size) ((*gmp_allocate_func)((size)))
+#define gmp_free(p, size) ((*gmp_free_func) ((p), (size)))
+#define gmp_realloc(ptr, old_size, size) ((*gmp_reallocate_func)(ptr, old_size, size))
 
 static mp_ptr
-gmp_xalloc_limbs (mp_size_t size)
+gmp_alloc_limbs (mp_size_t size)
 {
-  return (mp_ptr) gmp_xalloc (size * sizeof (mp_limb_t));
+  return (mp_ptr) gmp_alloc (size * sizeof (mp_limb_t));
 }
 
 static mp_ptr
-gmp_xrealloc_limbs (mp_ptr old, mp_size_t size)
+gmp_realloc_limbs (mp_ptr old, mp_size_t old_size, mp_size_t size)
 {
   assert (size > 0);
-  return (mp_ptr) (*gmp_reallocate_func) (old, 0, size * sizeof (mp_limb_t));
+  return (mp_ptr) gmp_realloc (old, old_size * sizeof (mp_limb_t), size * sizeof (mp_limb_t));
+}
+
+static void
+gmp_free_limbs (mp_ptr old, mp_size_t size)
+{
+  gmp_free (old, size * sizeof (mp_limb_t));
 }
 
 
@@ -765,6 +793,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
     mp_limb_t p, ql;
     unsigned ul, uh, qh;
 
+    assert (sizeof (unsigned) * 2 >= sizeof (mp_limb_t));
     /* For notation, let b denote the half-limb base, so that B = b^2.
        Split u1 = b uh + ul. */
     ul = u1 & GMP_LLIMB_MASK;
@@ -945,11 +974,17 @@ mpn_div_qr_1_preinv (mp_ptr qp, mp_srcptr np, mp_size_t nn,
   mp_limb_t d, di;
   mp_limb_t r;
   mp_ptr tp = NULL;
+  mp_size_t tn = 0;
 
   if (inv->shift > 0)
     {
       /* Shift, reusing qp area if possible. In-place shift if qp == np. */
-      tp = qp ? qp : gmp_xalloc_limbs (nn);
+      tp = qp;
+      if (!tp)
+        {
+	   tn = nn;
+	   tp = gmp_alloc_limbs (tn);
+        }
       r = mpn_lshift (tp, np, nn, inv->shift);
       np = tp;
     }
@@ -966,8 +1001,8 @@ mpn_div_qr_1_preinv (mp_ptr qp, mp_srcptr np, mp_size_t nn,
       if (qp)
 	qp[nn] = q;
     }
-  if ((inv->shift > 0) && (tp != qp))
-    gmp_free (tp);
+  if (tn)
+    gmp_free_limbs (tp, tn);
 
   return r >> inv->shift;
 }
@@ -1125,13 +1160,13 @@ mpn_div_qr (mp_ptr qp, mp_ptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn)
   mpn_div_qr_invert (&inv, dp, dn);
   if (dn > 2 && inv.shift > 0)
     {
-      tp = gmp_xalloc_limbs (dn);
+      tp = gmp_alloc_limbs (dn);
       gmp_assert_nocarry (mpn_lshift (tp, dp, dn, inv.shift));
       dp = tp;
     }
   mpn_div_qr_preinv (qp, np, nn, dp, dn, &inv);
   if (tp)
-    gmp_free (tp);
+    gmp_free_limbs (tp, dn);
 }
 
 
@@ -1307,29 +1342,26 @@ mpn_set_str_bits (mp_ptr rp, const unsigned char *sp, size_t sn,
 		  unsigned bits)
 {
   mp_size_t rn;
-  size_t j;
+  mp_limb_t limb;
   unsigned shift;
 
-  for (j = sn, rn = 0, shift = 0; j-- > 0; )
+  for (limb = 0, rn = 0, shift = 0; sn-- > 0; )
     {
-      if (shift == 0)
+      limb |= (mp_limb_t) sp[sn] << shift;
+      shift += bits;
+      if (shift >= GMP_LIMB_BITS)
 	{
-	  rp[rn++] = sp[j];
-	  shift += bits;
-	}
-      else
-	{
-	  rp[rn-1] |= (mp_limb_t) sp[j] << shift;
-	  shift += bits;
-	  if (shift >= GMP_LIMB_BITS)
-	    {
-	      shift -= GMP_LIMB_BITS;
-	      if (shift > 0)
-		rp[rn++] = (mp_limb_t) sp[j] >> (bits - shift);
-	    }
+	  shift -= GMP_LIMB_BITS;
+	  rp[rn++] = limb;
+	  /* Next line is correct also if shift == 0,
+	     bits == 8, and mp_limb_t == unsigned char. */
+	  limb = (unsigned int) sp[sn] >> (bits - shift);
 	}
     }
-  rn = mpn_normalized_size (rp, rn);
+  if (limb != 0)
+    rp[rn++] = limb;
+  else
+    rn = mpn_normalized_size (rp, rn);
   return rn;
 }
 
@@ -1417,14 +1449,14 @@ mpz_init2 (mpz_t r, mp_bitcnt_t bits)
 
   r->_mp_alloc = rn;
   r->_mp_size = 0;
-  r->_mp_d = gmp_xalloc_limbs (rn);
+  r->_mp_d = gmp_alloc_limbs (rn);
 }
 
 void
 mpz_clear (mpz_t r)
 {
   if (r->_mp_alloc)
-    gmp_free (r->_mp_d);
+    gmp_free_limbs (r->_mp_d, r->_mp_alloc);
 }
 
 static mp_ptr
@@ -1433,9 +1465,9 @@ mpz_realloc (mpz_t r, mp_size_t size)
   size = GMP_MAX (size, 1);
 
   if (r->_mp_alloc)
-    r->_mp_d = gmp_xrealloc_limbs (r->_mp_d, size);
+    r->_mp_d = gmp_realloc_limbs (r->_mp_d, r->_mp_alloc, size);
   else
-    r->_mp_d = gmp_xalloc_limbs (size);
+    r->_mp_d = gmp_alloc_limbs (size);
   r->_mp_alloc = size;
 
   if (GMP_ABS (r->_mp_size) > size)
@@ -1530,8 +1562,7 @@ mpz_init_set (mpz_t r, const mpz_t x)
 int
 mpz_fits_slong_p (const mpz_t u)
 {
-  return (LONG_MAX + LONG_MIN == 0 || mpz_cmp_ui (u, LONG_MAX) <= 0) &&
-    mpz_cmpabs_ui (u, GMP_NEG_CAST (unsigned long int, LONG_MIN)) <= 0;
+  return mpz_cmp_si (u, LONG_MAX) <= 0 && mpz_cmp_si (u, LONG_MIN) >= 0;
 }
 
 static int
@@ -1554,6 +1585,30 @@ mpz_fits_ulong_p (const mpz_t u)
   return us >= 0 && mpn_absfits_ulong_p (u->_mp_d, us);
 }
 
+int
+mpz_fits_sint_p (const mpz_t u)
+{
+  return mpz_cmp_si (u, INT_MAX) <= 0 && mpz_cmp_si (u, INT_MIN) >= 0;
+}
+
+int
+mpz_fits_uint_p (const mpz_t u)
+{
+  return u->_mp_size >= 0 && mpz_cmpabs_ui (u, UINT_MAX) <= 0;
+}
+
+int
+mpz_fits_sshort_p (const mpz_t u)
+{
+  return mpz_cmp_si (u, SHRT_MAX) <= 0 && mpz_cmp_si (u, SHRT_MIN) >= 0;
+}
+
+int
+mpz_fits_ushort_p (const mpz_t u)
+{
+  return u->_mp_size >= 0 && mpz_cmpabs_ui (u, USHRT_MAX) <= 0;
+}
+
 long int
 mpz_get_si (const mpz_t u)
 {
@@ -1891,9 +1946,8 @@ mpz_neg (mpz_t r, const mpz_t u)
 void
 mpz_swap (mpz_t u, mpz_t v)
 {
-  MP_SIZE_T_SWAP (u->_mp_size, v->_mp_size);
   MP_SIZE_T_SWAP (u->_mp_alloc, v->_mp_alloc);
-  MP_PTR_SWAP (u->_mp_d, v->_mp_d);
+  MPN_PTR_SWAP (u->_mp_d, u->_mp_size, v->_mp_d, v->_mp_size);
 }
 
 
@@ -2676,7 +2730,7 @@ mpz_make_odd (mpz_t r)
 
   assert (r->_mp_size > 0);
   /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
-  shift = mpn_common_scan (r->_mp_d[0], 0, r->_mp_d, 0, 0);
+  shift = mpn_scan1 (r->_mp_d, 0);
   mpz_tdiv_q_2exp (r, r, shift);
 
   return shift;
@@ -2733,9 +2787,13 @@ mpz_gcd (mpz_t g, const mpz_t u, const mpz_t v)
 
 	if (tv->_mp_size == 1)
 	  {
-	    mp_limb_t vl = tv->_mp_d[0];
-	    mp_limb_t ul = mpz_tdiv_ui (tu, vl);
-	    mpz_set_ui (g, mpn_gcd_11 (ul, vl));
+	    mp_limb_t *gp;
+
+	    mpz_tdiv_r (tu, tu, tv);
+	    gp = MPZ_REALLOC (g, 1); /* gp = mpz_limbs_modify (g, 1); */
+	    *gp = mpn_gcd_11 (tu->_mp_d[0], tv->_mp_d[0]);
+
+	    g->_mp_size = *gp != 0; /* mpz_limbs_finish (g, 1); */
 	    break;
 	  }
 	mpz_sub (tu, tu, tv);
@@ -2824,7 +2882,6 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
    * s0 = 0,    s1 = 2^vz
    */
 
-  mpz_setbit (t0, uz);
   mpz_tdiv_qr (t1, tu, tu, tv);
   mpz_mul_2exp (t1, t1, uz);
 
@@ -2835,8 +2892,7 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
     {
       mp_bitcnt_t shift;
       shift = mpz_make_odd (tu);
-      mpz_mul_2exp (t0, t0, shift);
-      mpz_mul_2exp (s0, s0, shift);
+      mpz_setbit (t0, uz + shift);
       power += shift;
 
       for (;;)
@@ -2874,6 +2930,8 @@ mpz_gcdext (mpz_t g, mpz_t s, mpz_t t, const mpz_t u, const mpz_t v)
 	  power += shift;
 	}
     }
+  else
+    mpz_setbit (t0, uz);
 
   /* Now tv = odd part of gcd, and -s0 and t0 are corresponding
      cofactors. */
@@ -3048,7 +3106,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
 
   if (en == 0)
     {
-      mpz_set_ui (r, 1);
+      mpz_set_ui (r, mpz_cmpabs_ui (m, 1));
       return;
     }
 
@@ -3062,7 +3120,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
 	 one, using a *normalized* m. */
       minv.shift = 0;
 
-      tp = gmp_xalloc_limbs (mn);
+      tp = gmp_alloc_limbs (mn);
       gmp_assert_nocarry (mpn_lshift (tp, mp, mn, shift));
       mp = tp;
     }
@@ -3128,7 +3186,7 @@ mpz_powm (mpz_t r, const mpz_t b, const mpz_t e, const mpz_t m)
       tr->_mp_size = mpn_normalized_size (tr->_mp_d, mn);
     }
   if (tp)
-    gmp_free (tp);
+    gmp_free_limbs (tp, mn);
 
   mpz_swap (r, tr);
   mpz_clear (tr);
@@ -3150,6 +3208,7 @@ void
 mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
 {
   int sgn;
+  mp_bitcnt_t bc;
   mpz_t t, u;
 
   sgn = y->_mp_size < 0;
@@ -3168,7 +3227,8 @@ mpz_rootrem (mpz_t x, mpz_t r, const mpz_t y, unsigned long z)
 
   mpz_init (u);
   mpz_init (t);
-  mpz_setbit (t, mpz_sizeinbase (y, 2) / z + 1);
+  bc = (mpz_sizeinbase (y, 2) - 1) / z + 1;
+  mpz_setbit (t, bc);
 
   if (z == 2) /* simplify sqrt loop: z-1 == 1 */
     do {
@@ -3339,13 +3399,15 @@ gmp_jacobi_coprime (mp_limb_t a, mp_limb_t b)
   gmp_ctz(c, a);
   a >>= 1;
 
-  do
+  for (;;)
     {
       a >>= c;
       /* (2/b) = -1 if b = 3 or 5 mod 8 */
       bit ^= c & (b ^ (b >> 1));
       if (a < b)
 	{
+	  if (a == 0)
+	    return bit & 1 ? -1 : 1;
 	  bit ^= a & b;
 	  a = b - a;
 	  b -= a;
@@ -3359,9 +3421,6 @@ gmp_jacobi_coprime (mp_limb_t a, mp_limb_t b)
       gmp_ctz(c, a);
       ++c;
     }
-  while (b > 0);
-
-  return bit & 1 ? -1 : 1;
 }
 
 static void
@@ -3407,7 +3466,7 @@ gmp_lucas_mod (mpz_t V, mpz_t Qk, long Q,
       gmp_lucas_step_k_2k (V, Qk, n);
 
       /* A step k->k+1 is performed if the bit in $n$ is 1	*/
-      /* mpz_tstbit(n,bs) or the the bit is 0 in $n$ but	*/
+      /* mpz_tstbit(n,bs) or the bit is 0 in $n$ but	*/
       /* should be 1 in $n+1$ (bs == b0)			*/
       if (b0 == bs || mpz_tstbit (n, bs))
 	{
@@ -3476,7 +3535,8 @@ gmp_stronglucas (const mpz_t x, mpz_t Qk)
   mpz_init (V);
 
   /* n-(D/n) = n+1 = d*2^{b0}, with d = (n>>b0) | 1 */
-  b0 = mpz_scan0 (n, 0);
+  b0 = mpn_common_scan (~ n->_mp_d[0], 0, n->_mp_d, n->_mp_size, GMP_LIMB_MAX);
+  /* b0 = mpz_scan0 (n, 0); */
 
   /* D= P^2 - 4Q; P = 1; Q = (1-D)/4 */
   Q = (D & 2) ? (long) (D >> 2) + 1 : -(long) (D >> 2);
@@ -3508,11 +3568,6 @@ gmp_millerrabin (const mpz_t n, const mpz_t nm1, mpz_t y,
       mpz_powm_ui (y, y, 2, n);
       if (mpz_cmp (y, nm1) == 0)
 	return 1;
-      /* y == 1 means that the previous y was a non-trivial square root
-	 of 1 (mod n). y == 0 means that n is a power of the base.
-	 In either case, n is not prime. */
-      if (mpz_cmp_ui (y, 1) <= 0)
-	return 0;
     }
   return 0;
 }
@@ -3558,7 +3613,8 @@ mpz_probab_prime_p (const mpz_t n, int reps)
   /* Find q and k, where q is odd and n = 1 + 2**k * q.  */
   mpz_abs (nm1, n);
   nm1->_mp_d[0] -= 1;
-  k = mpz_scan1 (nm1, 0);
+  /* Count trailing zeros, equivalent to mpn_scan1, because we know that there is a 1 */
+  k = mpn_scan1 (nm1->_mp_d, 0);
   mpz_tdiv_q_2exp (q, nm1, k);
 
   /* BPSW test */
@@ -4133,7 +4189,7 @@ mpz_scan0 (const mpz_t u, mp_bitcnt_t starting_bit)
 size_t
 mpz_sizeinbase (const mpz_t u, int base)
 {
-  mp_size_t un;
+  mp_size_t un, tn;
   mp_srcptr up;
   mp_ptr tp;
   mp_bitcnt_t bits;
@@ -4166,20 +4222,21 @@ mpz_sizeinbase (const mpz_t u, int base)
 	 10. */
     }
 
-  tp = gmp_xalloc_limbs (un);
+  tp = gmp_alloc_limbs (un);
   mpn_copyi (tp, up, un);
   mpn_div_qr_1_invert (&bi, base);
 
+  tn = un;
   ndigits = 0;
   do
     {
       ndigits++;
-      mpn_div_qr_1_preinv (tp, tp, un, &bi);
-      un -= (tp[un-1] == 0);
+      mpn_div_qr_1_preinv (tp, tp, tn, &bi);
+      tn -= (tp[tn-1] == 0);
     }
-  while (un > 0);
+  while (tn > 0);
 
-  gmp_free (tp);
+  gmp_free_limbs (tp, un);
   return ndigits;
 }
 
@@ -4189,7 +4246,7 @@ mpz_get_str (char *sp, int base, const mpz_t u)
   unsigned bits;
   const char *digits;
   mp_size_t un;
-  size_t i, sn;
+  size_t i, sn, osn;
 
   digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
   if (base > 1)
@@ -4210,15 +4267,19 @@ mpz_get_str (char *sp, int base, const mpz_t u)
 
   sn = 1 + mpz_sizeinbase (u, base);
   if (!sp)
-    sp = (char *) gmp_xalloc (1 + sn);
-
+    {
+      osn = 1 + sn;
+      sp = (char *) gmp_alloc (osn);
+    }
+  else
+    osn = 0;
   un = GMP_ABS (u->_mp_size);
 
   if (un == 0)
     {
       sp[0] = '0';
-      sp[1] = '\0';
-      return sp;
+      sn = 1;
+      goto ret;
     }
 
   i = 0;
@@ -4237,17 +4298,20 @@ mpz_get_str (char *sp, int base, const mpz_t u)
       mp_ptr tp;
 
       mpn_get_base_info (&info, base);
-      tp = gmp_xalloc_limbs (un);
+      tp = gmp_alloc_limbs (un);
       mpn_copyi (tp, u->_mp_d, un);
 
       sn = i + mpn_get_str_other ((unsigned char *) sp + i, base, &info, tp, un);
-      gmp_free (tp);
+      gmp_free_limbs (tp, un);
     }
 
   for (; i < sn; i++)
     sp[i] = digits[(unsigned char) sp[i]];
 
+ret:
   sp[sn] = '\0';
+  if (osn && osn != sn + 1)
+    sp = (char*) gmp_realloc (sp, osn, sn + 1);
   return sp;
 }
 
@@ -4257,7 +4321,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
   unsigned bits, value_of_a;
   mp_size_t rn, alloc;
   mp_ptr rp;
-  size_t dn;
+  size_t dn, sn;
   int sign;
   unsigned char *dp;
 
@@ -4295,7 +4359,8 @@ mpz_set_str (mpz_t r, const char *sp, int base)
       r->_mp_size = 0;
       return -1;
     }
-  dp = (unsigned char *) gmp_xalloc (strlen (sp));
+  sn = strlen(sp);
+  dp = (unsigned char *) gmp_alloc (sn);
 
   value_of_a = (base > 36) ? 36 : 10;
   for (dn = 0; *sp; sp++)
@@ -4315,7 +4380,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
 
       if (digit >= (unsigned) base)
 	{
-	  gmp_free (dp);
+	  gmp_free (dp, sn);
 	  r->_mp_size = 0;
 	  return -1;
 	}
@@ -4325,7 +4390,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
 
   if (!dn)
     {
-      gmp_free (dp);
+      gmp_free (dp, sn);
       r->_mp_size = 0;
       return -1;
     }
@@ -4349,7 +4414,7 @@ mpz_set_str (mpz_t r, const char *sp, int base)
       rn -= rp[rn-1] == 0;
     }
   assert (rn <= alloc);
-  gmp_free (dp);
+  gmp_free (dp, sn);
 
   r->_mp_size = sign ? - rn : rn;
 
@@ -4367,13 +4432,15 @@ size_t
 mpz_out_str (FILE *stream, int base, const mpz_t x)
 {
   char *str;
-  size_t len;
+  size_t len, n;
 
   str = mpz_get_str (NULL, base, x);
+  if (!str)
+    return 0;
   len = strlen (str);
-  len = fwrite (str, 1, len, stream);
-  gmp_free (str);
-  return len;
+  n = fwrite (str, 1, len, stream);
+  gmp_free (str, len + 1);
+  return n;
 }
 
 
@@ -4462,7 +4529,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
   mp_size_t un;
 
   if (nails != 0)
-    gmp_die ("mpz_import: Nails not supported.");
+    gmp_die ("mpz_export: Nails not supported.");
 
   assert (order == 1 || order == -1);
   assert (endian >= -1 && endian <= 1);
@@ -4477,7 +4544,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
       ptrdiff_t word_step;
       /* The current (partial) limb. */
       mp_limb_t limb;
-      /* The number of bytes left to to in this limb. */
+      /* The number of bytes left to do in this limb. */
       size_t bytes;
       /* The index where the limb was read. */
       mp_size_t i;
@@ -4501,7 +4568,7 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
       count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;
 
       if (!r)
-	r = gmp_xalloc (count * size);
+	r = gmp_alloc (count * size);
 
       if (endian == 0)
 	endian = gmp_detect_endian ();
diff --git a/lib/gmp/mini-gmp.h b/lib/gmp/mini-gmp.h
index 45ec808c1..59c24cf51 100644
--- a/lib/gmp/mini-gmp.h
+++ b/lib/gmp/mini-gmp.h
@@ -1,21 +1,32 @@
 /* mini-gmp, a minimalistic implementation of a GNU GMP subset.
 
-Copyright 2011-2015, 2017, 2019 Free Software Foundation, Inc.
+Copyright 2011-2015, 2017, 2019-2021 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
+it under the terms of either:
+
+  * the GNU Lesser General Public License as published by the Free
+    Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+or
+
+  * the GNU General Public License as published by the Free Software
+    Foundation; either version 2 of the License, or (at your option) any
+    later version.
+
+or both in parallel, as here.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
+You should have received copies of the GNU General Public License and the
+GNU Lesser General Public License along with the GNU MP Library.  If not,
+see https://www.gnu.org/licenses/.  */
 
 /* About mini-gmp: This is a minimal implementation of a subset of the
    GMP interface. It is intended for inclusion into applications which
@@ -233,6 +244,10 @@ mp_bitcnt_t mpz_scan1 (const mpz_t, mp_bitcnt_t);
 
 int mpz_fits_slong_p (const mpz_t);
 int mpz_fits_ulong_p (const mpz_t);
+int mpz_fits_sint_p (const mpz_t);
+int mpz_fits_uint_p (const mpz_t);
+int mpz_fits_sshort_p (const mpz_t);
+int mpz_fits_ushort_p (const mpz_t);
 long int mpz_get_si (const mpz_t);
 unsigned long int mpz_get_ui (const mpz_t);
 double mpz_get_d (const mpz_t);
@@ -280,7 +295,9 @@ int mpz_init_set_str (mpz_t, const char *, int);
   || defined (_MSL_STDIO_H)           /* Metrowerks */          \
   || defined (_STDIO_H_INCLUDED)      /* QNX4 */		\
   || defined (_ISO_STDIO_ISO_H)       /* Sun C++ */		\
-  || defined (__STDIO_LOADED)         /* VMS */
+  || defined (__STDIO_LOADED)         /* VMS */			\
+  || defined (_STDIO)                 /* HPE NonStop */         \
+  || defined (__DEFINED_FILE)         /* musl */
 size_t mpz_out_str (FILE *, int, const mpz_t);
 #endif
 
diff --git a/lib/jsoncpp/json/UPDATING b/lib/jsoncpp/json/UPDATING
index 0893244cf..c96ade51c 100644
--- a/lib/jsoncpp/json/UPDATING
+++ b/lib/jsoncpp/json/UPDATING
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ..
-git clone https://github.com/open-source-parsers/jsoncpp -b 1.9.4 --depth 1
+git clone https://github.com/open-source-parsers/jsoncpp -b 1.9.5 --depth 1
 cd jsoncpp
-python amalgamate.py
+./amalgamate.py
 cp -R dist/json ../json
 cp dist/jsoncpp.cpp ..
diff --git a/lib/jsoncpp/json/json-forwards.h b/lib/jsoncpp/json/json-forwards.h
index 74096ca86..dda924f83 100644
--- a/lib/jsoncpp/json/json-forwards.h
+++ b/lib/jsoncpp/json/json-forwards.h
@@ -94,10 +94,10 @@ license you like.
 // 3. /CMakeLists.txt
 // IMPORTANT: also update the SOVERSION!!
 
-#define JSONCPP_VERSION_STRING "1.9.4"
+#define JSONCPP_VERSION_STRING "1.9.5"
 #define JSONCPP_VERSION_MAJOR 1
 #define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 3
+#define JSONCPP_VERSION_PATCH 5
 #define JSONCPP_VERSION_QUALIFIER
 #define JSONCPP_VERSION_HEXA                                                   \
   ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
@@ -162,11 +162,10 @@ public:
    * Release memory which was allocated for N items at pointer P.
    *
    * The memory block is filled with zeroes before being released.
-   * The pointer argument is tagged as "volatile" to prevent the
-   * compiler optimizing out this critical step.
    */
-  void deallocate(volatile pointer p, size_type n) {
-    std::memset(p, 0, n * sizeof(T));
+  void deallocate(pointer p, size_type n) {
+    // memset_s is used because memset may be optimized away by the compiler
+    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
     // free using "global operator delete"
     ::operator delete(p);
   }
diff --git a/lib/jsoncpp/json/json.h b/lib/jsoncpp/json/json.h
index 916b206a2..b280790a4 100644
--- a/lib/jsoncpp/json/json.h
+++ b/lib/jsoncpp/json/json.h
@@ -93,10 +93,10 @@ license you like.
 // 3. /CMakeLists.txt
 // IMPORTANT: also update the SOVERSION!!
 
-#define JSONCPP_VERSION_STRING "1.9.4"
+#define JSONCPP_VERSION_STRING "1.9.5"
 #define JSONCPP_VERSION_MAJOR 1
 #define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 3
+#define JSONCPP_VERSION_PATCH 5
 #define JSONCPP_VERSION_QUALIFIER
 #define JSONCPP_VERSION_HEXA                                                   \
   ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
@@ -161,11 +161,10 @@ public:
    * Release memory which was allocated for N items at pointer P.
    *
    * The memory block is filled with zeroes before being released.
-   * The pointer argument is tagged as "volatile" to prevent the
-   * compiler optimizing out this critical step.
    */
-  void deallocate(volatile pointer p, size_type n) {
-    std::memset(p, 0, n * sizeof(T));
+  void deallocate(pointer p, size_type n) {
+    // memset_s is used because memset may be optimized away by the compiler
+    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
     // free using "global operator delete"
     ::operator delete(p);
   }
@@ -575,7 +574,7 @@ public:
 // be used by...
 #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 #pragma warning(push)
-#pragma warning(disable : 4251)
+#pragma warning(disable : 4251 4275)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
 #pragma pack(push, 8)
@@ -788,10 +787,10 @@ private:
     CZString(ArrayIndex index);
     CZString(char const* str, unsigned length, DuplicationPolicy allocate);
     CZString(CZString const& other);
-    CZString(CZString&& other);
+    CZString(CZString&& other) noexcept;
     ~CZString();
     CZString& operator=(const CZString& other);
-    CZString& operator=(CZString&& other);
+    CZString& operator=(CZString&& other) noexcept;
 
     bool operator<(CZString const& other) const;
     bool operator==(CZString const& other) const;
@@ -869,13 +868,13 @@ public:
   Value(bool value);
   Value(std::nullptr_t ptr) = delete;
   Value(const Value& other);
-  Value(Value&& other);
+  Value(Value&& other) noexcept;
   ~Value();
 
   /// \note Overwrite existing comments. To preserve comments, use
   /// #swapPayload().
   Value& operator=(const Value& other);
-  Value& operator=(Value&& other);
+  Value& operator=(Value&& other) noexcept;
 
   /// Swap everything.
   void swap(Value& other);
@@ -1160,9 +1159,9 @@ private:
   public:
     Comments() = default;
     Comments(const Comments& that);
-    Comments(Comments&& that);
+    Comments(Comments&& that) noexcept;
     Comments& operator=(const Comments& that);
-    Comments& operator=(Comments&& that);
+    Comments& operator=(Comments&& that) noexcept;
     bool has(CommentPlacement slot) const;
     String get(CommentPlacement slot) const;
     void set(CommentPlacement slot, String comment);
@@ -1443,8 +1442,8 @@ public:
    *  because the returned references/pointers can be used
    *  to change state of the base class.
    */
-  reference operator*() { return deref(); }
-  pointer operator->() { return &deref(); }
+  reference operator*() const { return const_cast<reference>(deref()); }
+  pointer operator->() const { return const_cast<pointer>(&deref()); }
 };
 
 inline void swap(Value& a, Value& b) { a.swap(b); }
@@ -1507,8 +1506,7 @@ namespace Json {
  * \deprecated Use CharReader and CharReaderBuilder.
  */
 
-class JSONCPP_DEPRECATED(
-    "Use CharReader and CharReaderBuilder instead.") JSON_API Reader {
+class JSON_API Reader {
 public:
   using Char = char;
   using Location = const Char*;
@@ -1525,13 +1523,13 @@ public:
   };
 
   /** \brief Constructs a Reader allowing all features for parsing.
+    * \deprecated Use CharReader and CharReaderBuilder.
    */
-  JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead")
   Reader();
 
   /** \brief Constructs a Reader allowing the specified feature set for parsing.
+    * \deprecated Use CharReader and CharReaderBuilder.
    */
-  JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead")
   Reader(const Features& features);
 
   /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
@@ -1798,6 +1796,9 @@ public:
    * - `"allowSpecialFloats": false or true`
    *   - If true, special float values (NaNs and infinities) are allowed and
    *     their values are lossfree restorable.
+   * - `"skipBom": false or true`
+   *   - If true, if the input starts with the Unicode byte order mark (BOM),
+   *     it is skipped.
    *
    * You can examine 'settings_` yourself to see the defaults. You can also
    * write and read them just like any JSON Value.
@@ -2001,6 +2002,8 @@ public:
    *  - Number of precision digits for formatting of real values.
    *  - "precisionType": "significant"(default) or "decimal"
    *  - Type of precision for formatting of real values.
+   *  - "emitUTF8": false or true
+   *  - If true, outputs raw UTF8 strings instead of escaping them.
 
    *  You can examine 'settings_` yourself
    *  to see the defaults. You can also write and read them just like any
@@ -2036,7 +2039,7 @@ public:
 /** \brief Abstract class for writers.
  * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
  */
-class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer {
+class JSON_API Writer {
 public:
   virtual ~Writer();
 
@@ -2056,7 +2059,7 @@ public:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter
+class JSON_API FastWriter
     : public Writer {
 public:
   FastWriter();
@@ -2116,7 +2119,7 @@ private:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API
+class JSON_API
     StyledWriter : public Writer {
 public:
   StyledWriter();
@@ -2185,7 +2188,7 @@ private:
 #pragma warning(push)
 #pragma warning(disable : 4996) // Deriving from deprecated class
 #endif
-class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API
+class JSON_API
     StyledStreamWriter {
 public:
   /**
diff --git a/lib/jsoncpp/jsoncpp.cpp b/lib/jsoncpp/jsoncpp.cpp
index d60fdc66a..2ec052c94 100644
--- a/lib/jsoncpp/jsoncpp.cpp
+++ b/lib/jsoncpp/jsoncpp.cpp
@@ -202,14 +202,18 @@ template <typename Iter> void fixNumericLocaleInput(Iter begin, Iter end) {
  * Return iterator that would be the new end of the range [begin,end), if we
  * were to delete zeros in the end of string, but not the last zero before '.'.
  */
-template <typename Iter> Iter fixZerosInTheEnd(Iter begin, Iter end) {
+template <typename Iter>
+Iter fixZerosInTheEnd(Iter begin, Iter end, unsigned int precision) {
   for (; begin != end; --end) {
     if (*(end - 1) != '0') {
       return end;
     }
     // Don't delete the last zero before the decimal point.
-    if (begin != (end - 1) && *(end - 2) == '.') {
-      return end;
+    if (begin != (end - 1) && begin != (end - 2) && *(end - 2) == '.') {
+      if (precision) {
+        return end;
+      }
+      return end - 2;
     }
   }
   return end;
@@ -338,8 +342,7 @@ bool Reader::parse(std::istream& is, Value& root, bool collectComments) {
 
   // Since String is reference-counted, this at least does not
   // create an extra copy.
-  String doc;
-  std::getline(is, doc, static_cast<char> EOF);
+  String doc(std::istreambuf_iterator<char>(is), {});
   return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
 }
 
@@ -2155,7 +2158,7 @@ bool CharReaderBuilder::validate(Json::Value* invalid) const {
     if (valid_keys.count(key))
       continue;
     if (invalid)
-      (*invalid)[std::move(key)] = *si;
+      (*invalid)[key] = *si;
     else
       return false;
   }
@@ -2670,7 +2673,7 @@ Value::CZString::CZString(const CZString& other) {
   storage_.length_ = other.storage_.length_;
 }
 
-Value::CZString::CZString(CZString&& other)
+Value::CZString::CZString(CZString&& other) noexcept
     : cstr_(other.cstr_), index_(other.index_) {
   other.cstr_ = nullptr;
 }
@@ -2696,7 +2699,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) {
   return *this;
 }
 
-Value::CZString& Value::CZString::operator=(CZString&& other) {
+Value::CZString& Value::CZString::operator=(CZString&& other) noexcept {
   cstr_ = other.cstr_;
   index_ = other.index_;
   other.cstr_ = nullptr;
@@ -2844,7 +2847,7 @@ Value::Value(const Value& other) {
   dupMeta(other);
 }
 
-Value::Value(Value&& other) {
+Value::Value(Value&& other) noexcept {
   initBasic(nullValue);
   swap(other);
 }
@@ -2859,7 +2862,7 @@ Value& Value::operator=(const Value& other) {
   return *this;
 }
 
-Value& Value::operator=(Value&& other) {
+Value& Value::operator=(Value&& other) noexcept {
   other.swap(*this);
   return *this;
 }
@@ -3323,7 +3326,8 @@ void Value::resize(ArrayIndex newSize) {
   if (newSize == 0)
     clear();
   else if (newSize > oldSize)
-    this->operator[](newSize - 1);
+    for (ArrayIndex i = oldSize; i < newSize; ++i)
+      (*this)[i];
   else {
     for (ArrayIndex index = newSize; index < oldSize; ++index) {
       value_.map_->erase(index);
@@ -3784,14 +3788,15 @@ bool Value::isObject() const { return type() == objectValue; }
 Value::Comments::Comments(const Comments& that)
     : ptr_{cloneUnique(that.ptr_)} {}
 
-Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {}
+Value::Comments::Comments(Comments&& that) noexcept
+    : ptr_{std::move(that.ptr_)} {}
 
 Value::Comments& Value::Comments::operator=(const Comments& that) {
   ptr_ = cloneUnique(that.ptr_);
   return *this;
 }
 
-Value::Comments& Value::Comments::operator=(Comments&& that) {
+Value::Comments& Value::Comments::operator=(Comments&& that) noexcept {
   ptr_ = std::move(that.ptr_);
   return *this;
 }
@@ -3807,13 +3812,11 @@ String Value::Comments::get(CommentPlacement slot) const {
 }
 
 void Value::Comments::set(CommentPlacement slot, String comment) {
-  if (!ptr_) {
+  if (slot >= CommentPlacement::numberOfCommentPlacement)
+    return;
+  if (!ptr_)
     ptr_ = std::unique_ptr<Array>(new Array());
-  }
-  // check comments array boundry.
-  if (slot < CommentPlacement::numberOfCommentPlacement) {
-    (*ptr_)[slot] = std::move(comment);
-  }
+  (*ptr_)[slot] = std::move(comment);
 }
 
 void Value::setComment(String comment, CommentPlacement placement) {
@@ -4127,7 +4130,7 @@ Value& Path::make(Value& root) const {
 
 #if !defined(isnan)
 // IEEE standard states that NaN values will not compare to themselves
-#define isnan(x) (x != x)
+#define isnan(x) ((x) != (x))
 #endif
 
 #if !defined(__APPLE__)
@@ -4213,16 +4216,18 @@ String valueToString(double value, bool useSpecialFloats,
 
   buffer.erase(fixNumericLocale(buffer.begin(), buffer.end()), buffer.end());
 
-  // strip the zero padding from the right
-  if (precisionType == PrecisionType::decimalPlaces) {
-    buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end()), buffer.end());
-  }
-
   // try to ensure we preserve the fact that this was given to us as a double on
   // input
   if (buffer.find('.') == buffer.npos && buffer.find('e') == buffer.npos) {
     buffer += ".0";
   }
+
+  // strip the zero padding from the right
+  if (precisionType == PrecisionType::decimalPlaces) {
+    buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end(), precision),
+                 buffer.end());
+  }
+
   return buffer;
 }
 } // namespace
@@ -4329,7 +4334,7 @@ static void appendHex(String& result, unsigned ch) {
   result.append("\\u").append(toHex16Bit(ch));
 }
 
-static String valueToQuotedStringN(const char* value, unsigned length,
+static String valueToQuotedStringN(const char* value, size_t length,
                                    bool emitUTF8 = false) {
   if (value == nullptr)
     return "";
@@ -4407,7 +4412,7 @@ static String valueToQuotedStringN(const char* value, unsigned length,
 }
 
 String valueToQuotedString(const char* value) {
-  return valueToQuotedStringN(value, static_cast<unsigned int>(strlen(value)));
+  return valueToQuotedStringN(value, strlen(value));
 }
 
 // Class Writer
@@ -4456,7 +4461,7 @@ void FastWriter::writeValue(const Value& value) {
     char const* end;
     bool ok = value.getString(&str, &end);
     if (ok)
-      document_ += valueToQuotedStringN(str, static_cast<unsigned>(end - str));
+      document_ += valueToQuotedStringN(str, static_cast<size_t>(end - str));
     break;
   }
   case booleanValue:
@@ -4479,8 +4484,7 @@ void FastWriter::writeValue(const Value& value) {
       const String& name = *it;
       if (it != members.begin())
         document_ += ',';
-      document_ += valueToQuotedStringN(name.data(),
-                                        static_cast<unsigned>(name.length()));
+      document_ += valueToQuotedStringN(name.data(), name.length());
       document_ += yamlCompatibilityEnabled_ ? ": " : ":";
       writeValue(value[name]);
     }
@@ -4525,7 +4529,7 @@ void StyledWriter::writeValue(const Value& value) {
     char const* end;
     bool ok = value.getString(&str, &end);
     if (ok)
-      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str)));
+      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
     else
       pushValue("");
     break;
@@ -4566,7 +4570,7 @@ void StyledWriter::writeValue(const Value& value) {
 }
 
 void StyledWriter::writeArrayValue(const Value& value) {
-  unsigned size = value.size();
+  size_t size = value.size();
   if (size == 0)
     pushValue("[]");
   else {
@@ -4575,7 +4579,7 @@ void StyledWriter::writeArrayValue(const Value& value) {
       writeWithIndent("[");
       indent();
       bool hasChildValue = !childValues_.empty();
-      unsigned index = 0;
+      ArrayIndex index = 0;
       for (;;) {
         const Value& childValue = value[index];
         writeCommentBeforeValue(childValue);
@@ -4598,7 +4602,7 @@ void StyledWriter::writeArrayValue(const Value& value) {
     {
       assert(childValues_.size() == size);
       document_ += "[ ";
-      for (unsigned index = 0; index < size; ++index) {
+      for (size_t index = 0; index < size; ++index) {
         if (index > 0)
           document_ += ", ";
         document_ += childValues_[index];
@@ -4743,7 +4747,7 @@ void StyledStreamWriter::writeValue(const Value& value) {
     char const* end;
     bool ok = value.getString(&str, &end);
     if (ok)
-      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str)));
+      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
     else
       pushValue("");
     break;
@@ -5017,8 +5021,8 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
     char const* end;
     bool ok = value.getString(&str, &end);
     if (ok)
-      pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end - str),
-                                     emitUTF8_));
+      pushValue(
+          valueToQuotedStringN(str, static_cast<size_t>(end - str), emitUTF8_));
     else
       pushValue("");
     break;
@@ -5041,8 +5045,8 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
         String const& name = *it;
         Value const& childValue = value[name];
         writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedStringN(
-            name.data(), static_cast<unsigned>(name.length()), emitUTF8_));
+        writeWithIndent(
+            valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
         *sout_ << colonSymbol_;
         writeValue(childValue);
         if (++it == members.end()) {
@@ -5276,7 +5280,7 @@ bool StreamWriterBuilder::validate(Json::Value* invalid) const {
     if (valid_keys.count(key))
       continue;
     if (invalid)
-      (*invalid)[std::move(key)] = *si;
+      (*invalid)[key] = *si;
     else
       return false;
   }
diff --git a/lib/lua/README.md b/lib/lua/README.md
new file mode 100644
index 000000000..b82e4a652
--- /dev/null
+++ b/lib/lua/README.md
@@ -0,0 +1,6 @@
+## Lua 5.1.5 source
+
+This copy has been patched with Minetest-specific changes (`lua_atccall`)
+so it is *not* interchangeable with upstream PUC Lua.
+
+A patch for CVE-2014-5461 has been applied.
diff --git a/lib/lua/src/lbaselib.c b/lib/lua/src/lbaselib.c
index 2ab550bd4..ed293ebdc 100644
--- a/lib/lua/src/lbaselib.c
+++ b/lib/lua/src/lbaselib.c
@@ -340,13 +340,14 @@ static int luaB_assert (lua_State *L) {
 
 
 static int luaB_unpack (lua_State *L) {
-  int i, e, n;
+  int i, e;
+  unsigned int n;
   luaL_checktype(L, 1, LUA_TTABLE);
   i = luaL_optint(L, 2, 1);
   e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
   if (i > e) return 0;  /* empty range */
-  n = e - i + 1;  /* number of elements */
-  if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
+  n = (unsigned int)e - (unsigned int)i;  /* number of elements minus 1 */
+  if (n > (INT_MAX - 10) || !lua_checkstack(L, ++n))
     return luaL_error(L, "too many results to unpack");
   lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
   while (i++ < e)  /* push arg[i + 1...e] */
diff --git a/lib/lua/src/ldblib.c b/lib/lua/src/ldblib.c
index 628a6c458..2c55edcda 100644
--- a/lib/lua/src/ldblib.c
+++ b/lib/lua/src/ldblib.c
@@ -101,6 +101,7 @@ static int db_getinfo (lua_State *L) {
   int arg;
   lua_State *L1 = getthread(L, &arg);
   const char *options = luaL_optstring(L, arg+2, "flnSu");
+  luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
   if (lua_isnumber(L, arg+1)) {
     if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
       lua_pushnil(L);  /* level out of range */
diff --git a/lib/lua/src/ldo.c b/lib/lua/src/ldo.c
index 7eeea636c..37a7660fd 100644
--- a/lib/lua/src/ldo.c
+++ b/lib/lua/src/ldo.c
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
     CallInfo *ci;
     StkId st, base;
     Proto *p = cl->p;
-    luaD_checkstack(L, p->maxstacksize);
+    luaD_checkstack(L, p->maxstacksize + p->numparams);
     func = restorestack(L, funcr);
     if (!p->is_vararg) {  /* no varargs? */
       base = func + 1;
diff --git a/lib/lua/src/llex.c b/lib/lua/src/llex.c
index d1b179670..5affe7c16 100644
--- a/lib/lua/src/llex.c
+++ b/lib/lua/src/llex.c
@@ -133,7 +133,7 @@ static void inclinenumber (LexState *ls) {
   if (currIsNewline(ls) && ls->current != old)
     next(ls);  /* skip `\n\r' or `\r\n' */
   if (++ls->linenumber >= MAX_INT)
-    luaX_syntaxerror(ls, "chunk has too many lines");
+    luaX_lexerror(ls, "chunk has too many lines", 0);
 }
 
 
diff --git a/lib/lua/src/lvm.c b/lib/lua/src/lvm.c
index a438d7805..60a715a6d 100644
--- a/lib/lua/src/lvm.c
+++ b/lib/lua/src/lvm.c
@@ -209,14 +209,15 @@ static int l_strcmp (const TString *ls, const TString *rs) {
     int temp = strcoll(l, r);
     if (temp != 0) return temp;
     else {  /* strings are equal up to a `\0' */
-      size_t len = strlen(l);  /* index of first `\0' in both strings */
-      if (len == lr)  /* r is finished? */
-        return (len == ll) ? 0 : 1;
-      else if (len == ll)  /* l is finished? */
-        return -1;  /* l is smaller than r (because r is not finished) */
-      /* both strings longer than `len'; go on comparing (after the `\0') */
-      len++;
-      l += len; ll -= len; r += len; lr -= len;
+      size_t zl1 = strlen(l);  /* index of first '\0' in 'l' */
+      size_t zl2 = strlen(r);  /* index of first '\0' in 'r' */
+      if (zl2 == lr)  /* 'r' is finished? */
+        return (zl1 == ll) ? 0 : 1;  /* check 'l' */
+      else if (zl1 == ll)  /* 'l' is finished? */
+        return -1;  /* 'l' is less than 'r' ('r' is not finished) */
+      /* both strings longer than 'zl'; go on comparing after the '\0' */
+      zl1++; zl2++;
+      l += zl1; ll -= zl1; r += zl2; lr -= zl2;
     }
   }
 }
diff --git a/lib/sha256/CMakeLists.txt b/lib/sha256/CMakeLists.txt
new file mode 100644
index 000000000..555cb8ba9
--- /dev/null
+++ b/lib/sha256/CMakeLists.txt
@@ -0,0 +1,14 @@
+project(sha256 C)
+
+add_library(sha256 STATIC sha256.c)
+
+target_include_directories(sha256 INTERFACE .)
+
+INCLUDE(CheckIncludeFiles)
+check_include_files(endian.h HAVE_ENDIAN_H)
+
+configure_file(
+	"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
+	"${PROJECT_BINARY_DIR}/cmake_config.h"
+)
+target_include_directories(sha256 PRIVATE "${PROJECT_BINARY_DIR}")
diff --git a/lib/sha256/cmake_config.h.in b/lib/sha256/cmake_config.h.in
new file mode 100644
index 000000000..1ce07a107
--- /dev/null
+++ b/lib/sha256/cmake_config.h.in
@@ -0,0 +1,5 @@
+// Filled in by the build system
+
+#pragma once
+
+#cmakedefine HAVE_ENDIAN_H
diff --git a/src/util/sha2.h b/lib/sha256/my_sha256.h
similarity index 61%
rename from src/util/sha2.h
rename to lib/sha256/my_sha256.h
index e6afd25d4..40bb040e5 100644
--- a/src/util/sha2.h
+++ b/lib/sha256/my_sha256.h
@@ -1,4 +1,4 @@
-/* crypto/sha/sha.h */
+/* libcrypto/sha/sha.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -50,105 +50,54 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The license and distribution terms for any publicly available version or
+ * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution license
- * [including the GNU Public License.]
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
  */
 
-#pragma once
-
 #include <stddef.h>
 
-#ifdef __cplusplus
+#ifndef HEADER_SHA_H
+#define HEADER_SHA_H
+
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
-#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#error SHA is disabled.
-#endif
-
-#if defined(OPENSSL_FIPS)
-#define FIPS_SHA_SIZE_T size_t
-#endif
-
 /*
-	Compat stuff from OpenSSL land
- */
-
-/* crypto.h */
-
-#define fips_md_init(alg) fips_md_init_ctx(alg, alg)
-
-#define fips_md_init_ctx(alg, cx) int alg##_Init(cx##_CTX *c)
-#define fips_cipher_abort(alg) while (0)
-
-/*-
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
+ * ! SHA_LONG has to be at least 32 bits wide.                    !
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
 
-#if defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
 #define SHA_LONG unsigned int
-#endif
 
-#define SHA_LBLOCK 16
-#define SHA_CBLOCK                                                                       \
-	(SHA_LBLOCK * 4) /* SHA treats input data as a                                   \
-			  * contiguous array of 32 bit wide                              \
-			  * big-endian values. */
-#define SHA_LAST_BLOCK (SHA_CBLOCK - 8)
-#define SHA_DIGEST_LENGTH 20
+#define SHA_LBLOCK	16
+#define SHA_CBLOCK	(SHA_LBLOCK*4)	/* SHA treats input data as a
+					 * contiguous array of 32 bit
+					 * wide big-endian values. */
 
-typedef struct SHAstate_st
-{
-	SHA_LONG h0, h1, h2, h3, h4;
-	SHA_LONG Nl, Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num;
-} SHA_CTX;
+#define SHA256_CBLOCK	(SHA_LBLOCK*4)	/* SHA-256 treats input data as a
+					 * contiguous array of 32 bit
+					 * wide big-endian values. */
+#define SHA256_DIGEST_LENGTH	32
 
-#define SHA256_CBLOCK                                                                    \
-	(SHA_LBLOCK * 4) /* SHA-256 treats input data as a                               \
-			  * contiguous array of 32 bit wide                              \
-			  * big-endian values. */
-#define SHA224_DIGEST_LENGTH 28
-#define SHA256_DIGEST_LENGTH 32
-
-typedef struct SHA256state_st
-{
+typedef struct SHA256state_st {
 	SHA_LONG h[8];
 	SHA_LONG Nl, Nh;
 	SHA_LONG data[SHA_LBLOCK];
 	unsigned int num, md_len;
 } mt_SHA256_CTX;
 
-#ifndef OPENSSL_NO_SHA256
-#ifdef OPENSSL_FIPS
-int private_SHA224_Init(mt_SHA256_CTX *c);
-int private_SHA256_Init(mt_SHA256_CTX *c);
-#endif
-int mt_SHA224_Init(mt_SHA256_CTX *c);
-int mt_SHA224_Update(mt_SHA256_CTX *c, const void *data, size_t len);
-int mt_SHA224_Final(unsigned char *md, mt_SHA256_CTX *c);
-unsigned char *mt_SHA224(const unsigned char *d, size_t n, unsigned char *md);
 int mt_SHA256_Init(mt_SHA256_CTX *c);
 int mt_SHA256_Update(mt_SHA256_CTX *c, const void *data, size_t len);
 int mt_SHA256_Final(unsigned char *md, mt_SHA256_CTX *c);
 unsigned char *mt_SHA256(const unsigned char *d, size_t n, unsigned char *md);
 void mt_SHA256_Transform(mt_SHA256_CTX *c, const unsigned char *data);
-#endif
 
-#define SHA384_DIGEST_LENGTH 48
-#define SHA512_DIGEST_LENGTH 64
-
-#ifdef __cplusplus
+#ifdef  __cplusplus
 }
 #endif
+
+#endif
diff --git a/lib/sha256/sha256.c b/lib/sha256/sha256.c
new file mode 100644
index 000000000..dca9c0ff4
--- /dev/null
+++ b/lib/sha256/sha256.c
@@ -0,0 +1,576 @@
+/* libcrypto/sha/sha256.c */
+/* ====================================================================
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "my_sha256.h"
+
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__)
+#define __attribute__(a)
+#endif
+
+#include "cmake_config.h" /* HAVE_ENDIAN_H */
+
+/** endian.h **/
+/*
+ * Public domain
+ * endian.h compatibility shim
+ */
+
+#if defined(_WIN32)
+
+#define LITTLE_ENDIAN 1234
+#define BIG_ENDIAN 4321
+#define PDP_ENDIAN 3412
+
+/*
+ * Use GCC and Visual Studio compiler defines to determine endian.
+ */
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define BYTE_ORDER LITTLE_ENDIAN
+#else
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+
+#elif defined(HAVE_ENDIAN_H)
+#include <endian.h>
+
+#elif defined(__MACH__) && defined(__APPLE__)
+#include <machine/endian.h>
+
+#elif defined(__sun) || defined(_AIX) || defined(__hpux)
+#include <arpa/nameser_compat.h>
+#include <sys/types.h>
+
+#elif defined(__sgi)
+#include <standards.h>
+#include <sys/endian.h>
+
+#endif
+
+#ifndef __STRICT_ALIGNMENT
+#define __STRICT_ALIGNMENT
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) ||               \
+    defined(__x86_64__) || defined(__s390__) || defined(__s390x__) ||          \
+    defined(__aarch64__) ||                                                    \
+    ((defined(__arm__) || defined(__arm)) && __ARM_ARCH >= 6)
+#undef __STRICT_ALIGNMENT
+#endif
+#endif
+
+#if defined(__APPLE__) && !defined(HAVE_ENDIAN_H)
+#include <libkern/OSByteOrder.h>
+#define be16toh(x) OSSwapBigToHostInt16((x))
+#define htobe16(x) OSSwapHostToBigInt16((x))
+#define le32toh(x) OSSwapLittleToHostInt32((x))
+#define be32toh(x) OSSwapBigToHostInt32((x))
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#endif /* __APPLE__ && !HAVE_ENDIAN_H */
+
+#if defined(_WIN32) && !defined(HAVE_ENDIAN_H)
+#include <winsock2.h>
+
+#define be16toh(x) ntohs((x))
+#define htobe16(x) htons((x))
+#define le32toh(x) (x)
+#define be32toh(x) ntohl((x))
+#define htole32(x) (x)
+#define htobe32(x) ntohl((x))
+#endif /* _WIN32 && !HAVE_ENDIAN_H */
+
+#ifdef __linux__
+#if !defined(betoh16)
+#define betoh16(x) be16toh(x)
+#endif
+#if !defined(betoh32)
+#define betoh32(x) be32toh(x)
+#endif
+#endif /* __linux__ */
+
+#if defined(__FreeBSD__)
+#if !defined(HAVE_ENDIAN_H)
+#include <sys/endian.h>
+#endif
+#if !defined(betoh16)
+#define betoh16(x) be16toh(x)
+#endif
+#if !defined(betoh32)
+#define betoh32(x) be32toh(x)
+#endif
+#endif
+
+#if defined(__NetBSD__)
+#if !defined(betoh16)
+#define betoh16(x) be16toh(x)
+#endif
+#if !defined(betoh32)
+#define betoh32(x) be32toh(x)
+#endif
+#endif
+
+#if defined(__sun)
+#include <sys/byteorder.h>
+#define be16toh(x) BE_16(x)
+#define htobe16(x) BE_16(x)
+#define le32toh(x) LE_32(x)
+#define be32toh(x) BE_32(x)
+#define htole32(x) LE_32(x)
+#define htobe32(x) BE_32(x)
+#endif
+/** **/
+
+/** libcrypto/crypto_internal.h **/
+#define CTASSERT(x) \
+    extern char _ctassert[(x) ? 1 : -1] __attribute__((__unused__))
+
+static inline uint32_t
+crypto_load_be32toh(const uint8_t *src)
+{
+	uint32_t v;
+
+	memcpy(&v, src, sizeof(v));
+
+	return be32toh(v);
+}
+
+static inline void
+crypto_store_htobe32(uint8_t *dst, uint32_t v)
+{
+	v = htobe32(v);
+	memcpy(dst, &v, sizeof(v));
+}
+
+static inline uint32_t
+crypto_ror_u32(uint32_t v, size_t shift)
+{
+	return (v << (32 - shift)) | (v >> shift);
+}
+/** **/
+
+/** libcrypto/hidden/crypto_namespace.h **/
+# define LCRYPTO_UNUSED(x)
+# define LCRYPTO_USED(x)
+# define LCRYPTO_ALIAS1(pre,x)
+# define LCRYPTO_ALIAS(x)
+/** **/
+
+/* Ensure that SHA_LONG and uint32_t are equivalent. */
+CTASSERT(sizeof(SHA_LONG) == sizeof(uint32_t));
+
+static void sha256_block_data_order(mt_SHA256_CTX *ctx, const void *_in, size_t num);
+
+static const SHA_LONG K256[64] = {
+	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
+	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
+	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
+	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
+	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
+	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
+	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
+	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
+	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
+	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
+	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
+	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
+	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL,
+};
+
+static inline SHA_LONG
+Sigma0(SHA_LONG x)
+{
+	return crypto_ror_u32(x, 2) ^ crypto_ror_u32(x, 13) ^
+	    crypto_ror_u32(x, 22);
+}
+
+static inline SHA_LONG
+Sigma1(SHA_LONG x)
+{
+	return crypto_ror_u32(x, 6) ^ crypto_ror_u32(x, 11) ^
+	    crypto_ror_u32(x, 25);
+}
+
+static inline SHA_LONG
+sigma0(SHA_LONG x)
+{
+	return crypto_ror_u32(x, 7) ^ crypto_ror_u32(x, 18) ^ (x >> 3);
+}
+
+static inline SHA_LONG
+sigma1(SHA_LONG x)
+{
+	return crypto_ror_u32(x, 17) ^ crypto_ror_u32(x, 19) ^ (x >> 10);
+}
+
+static inline SHA_LONG
+Ch(SHA_LONG x, SHA_LONG y, SHA_LONG z)
+{
+	return (x & y) ^ (~x & z);
+}
+
+static inline SHA_LONG
+Maj(SHA_LONG x, SHA_LONG y, SHA_LONG z)
+{
+	return (x & y) ^ (x & z) ^ (y & z);
+}
+
+static inline void
+sha256_msg_schedule_update(SHA_LONG *W0, SHA_LONG W1,
+    SHA_LONG W9, SHA_LONG W14)
+{
+	*W0 = sigma1(W14) + W9 + sigma0(W1) + *W0;
+}
+
+static inline void
+sha256_round(SHA_LONG *a, SHA_LONG *b, SHA_LONG *c, SHA_LONG *d,
+    SHA_LONG *e, SHA_LONG *f, SHA_LONG *g, SHA_LONG *h,
+    SHA_LONG Kt, SHA_LONG Wt)
+{
+	SHA_LONG T1, T2;
+
+	T1 = *h + Sigma1(*e) + Ch(*e, *f, *g) + Kt + Wt;
+	T2 = Sigma0(*a) + Maj(*a, *b, *c);
+
+	*h = *g;
+	*g = *f;
+	*f = *e;
+	*e = *d + T1;
+	*d = *c;
+	*c = *b;
+	*b = *a;
+	*a = T1 + T2;
+}
+
+static void
+sha256_block_data_order(mt_SHA256_CTX *ctx, const void *_in, size_t num)
+{
+	const uint8_t *in = _in;
+	const SHA_LONG *in32;
+	SHA_LONG a, b, c, d, e, f, g, h;
+	SHA_LONG X[16];
+	int i;
+
+	while (num--) {
+		a = ctx->h[0];
+		b = ctx->h[1];
+		c = ctx->h[2];
+		d = ctx->h[3];
+		e = ctx->h[4];
+		f = ctx->h[5];
+		g = ctx->h[6];
+		h = ctx->h[7];
+
+		if ((size_t)in % 4 == 0) {
+			/* Input is 32 bit aligned. */
+			in32 = (const SHA_LONG *)in;
+			X[0] = be32toh(in32[0]);
+			X[1] = be32toh(in32[1]);
+			X[2] = be32toh(in32[2]);
+			X[3] = be32toh(in32[3]);
+			X[4] = be32toh(in32[4]);
+			X[5] = be32toh(in32[5]);
+			X[6] = be32toh(in32[6]);
+			X[7] = be32toh(in32[7]);
+			X[8] = be32toh(in32[8]);
+			X[9] = be32toh(in32[9]);
+			X[10] = be32toh(in32[10]);
+			X[11] = be32toh(in32[11]);
+			X[12] = be32toh(in32[12]);
+			X[13] = be32toh(in32[13]);
+			X[14] = be32toh(in32[14]);
+			X[15] = be32toh(in32[15]);
+		} else {
+			/* Input is not 32 bit aligned. */
+			X[0] = crypto_load_be32toh(&in[0 * 4]);
+			X[1] = crypto_load_be32toh(&in[1 * 4]);
+			X[2] = crypto_load_be32toh(&in[2 * 4]);
+			X[3] = crypto_load_be32toh(&in[3 * 4]);
+			X[4] = crypto_load_be32toh(&in[4 * 4]);
+			X[5] = crypto_load_be32toh(&in[5 * 4]);
+			X[6] = crypto_load_be32toh(&in[6 * 4]);
+			X[7] = crypto_load_be32toh(&in[7 * 4]);
+			X[8] = crypto_load_be32toh(&in[8 * 4]);
+			X[9] = crypto_load_be32toh(&in[9 * 4]);
+			X[10] = crypto_load_be32toh(&in[10 * 4]);
+			X[11] = crypto_load_be32toh(&in[11 * 4]);
+			X[12] = crypto_load_be32toh(&in[12 * 4]);
+			X[13] = crypto_load_be32toh(&in[13 * 4]);
+			X[14] = crypto_load_be32toh(&in[14 * 4]);
+			X[15] = crypto_load_be32toh(&in[15 * 4]);
+		}
+		in += SHA256_CBLOCK;
+
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[0], X[0]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[1], X[1]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[2], X[2]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[3], X[3]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[4], X[4]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[5], X[5]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[6], X[6]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[7], X[7]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[8], X[8]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[9], X[9]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[10], X[10]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[11], X[11]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[12], X[12]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[13], X[13]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[14], X[14]);
+		sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[15], X[15]);
+
+		for (i = 16; i < 64; i += 16) {
+			sha256_msg_schedule_update(&X[0], X[1], X[9], X[14]);
+			sha256_msg_schedule_update(&X[1], X[2], X[10], X[15]);
+			sha256_msg_schedule_update(&X[2], X[3], X[11], X[0]);
+			sha256_msg_schedule_update(&X[3], X[4], X[12], X[1]);
+			sha256_msg_schedule_update(&X[4], X[5], X[13], X[2]);
+			sha256_msg_schedule_update(&X[5], X[6], X[14], X[3]);
+			sha256_msg_schedule_update(&X[6], X[7], X[15], X[4]);
+			sha256_msg_schedule_update(&X[7], X[8], X[0], X[5]);
+			sha256_msg_schedule_update(&X[8], X[9], X[1], X[6]);
+			sha256_msg_schedule_update(&X[9], X[10], X[2], X[7]);
+			sha256_msg_schedule_update(&X[10], X[11], X[3], X[8]);
+			sha256_msg_schedule_update(&X[11], X[12], X[4], X[9]);
+			sha256_msg_schedule_update(&X[12], X[13], X[5], X[10]);
+			sha256_msg_schedule_update(&X[13], X[14], X[6], X[11]);
+			sha256_msg_schedule_update(&X[14], X[15], X[7], X[12]);
+			sha256_msg_schedule_update(&X[15], X[0], X[8], X[13]);
+
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 0], X[0]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 1], X[1]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 2], X[2]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 3], X[3]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 4], X[4]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 5], X[5]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 6], X[6]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 7], X[7]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 8], X[8]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 9], X[9]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 10], X[10]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 11], X[11]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 12], X[12]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 13], X[13]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 14], X[14]);
+			sha256_round(&a, &b, &c, &d, &e, &f, &g, &h, K256[i + 15], X[15]);
+		}
+
+		ctx->h[0] += a;
+		ctx->h[1] += b;
+		ctx->h[2] += c;
+		ctx->h[3] += d;
+		ctx->h[4] += e;
+		ctx->h[5] += f;
+		ctx->h[6] += g;
+		ctx->h[7] += h;
+	}
+}
+
+int
+mt_SHA256_Init(mt_SHA256_CTX *c)
+{
+	memset(c, 0, sizeof(*c));
+
+	c->h[0] = 0x6a09e667UL;
+	c->h[1] = 0xbb67ae85UL;
+	c->h[2] = 0x3c6ef372UL;
+	c->h[3] = 0xa54ff53aUL;
+	c->h[4] = 0x510e527fUL;
+	c->h[5] = 0x9b05688cUL;
+	c->h[6] = 0x1f83d9abUL;
+	c->h[7] = 0x5be0cd19UL;
+
+	c->md_len = SHA256_DIGEST_LENGTH;
+
+	return 1;
+}
+LCRYPTO_ALIAS(SHA256_Init);
+
+int
+mt_SHA256_Update(mt_SHA256_CTX *c, const void *data_, size_t len)
+{
+	const unsigned char *data = data_;
+	unsigned char *p;
+	SHA_LONG l;
+	size_t n;
+
+	if (len == 0)
+		return 1;
+
+	l = (c->Nl + (((SHA_LONG)len) << 3)) & 0xffffffffUL;
+	/* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
+	 * Wei Dai <weidai@eskimo.com> for pointing it out. */
+	if (l < c->Nl) /* overflow */
+		c->Nh++;
+	c->Nh += (SHA_LONG)(len >> 29);	/* might cause compiler warning on 16-bit */
+	c->Nl = l;
+
+	n = c->num;
+	if (n != 0) {
+		p = (unsigned char *)c->data;
+
+		if (len >= SHA_CBLOCK || len + n >= SHA_CBLOCK) {
+			memcpy(p + n, data, SHA_CBLOCK - n);
+			sha256_block_data_order(c, p, 1);
+			n = SHA_CBLOCK - n;
+			data += n;
+			len -= n;
+			c->num = 0;
+			memset(p, 0, SHA_CBLOCK);	/* keep it zeroed */
+		} else {
+			memcpy(p + n, data, len);
+			c->num += (unsigned int)len;
+			return 1;
+		}
+	}
+
+	n = len/SHA_CBLOCK;
+	if (n > 0) {
+		sha256_block_data_order(c, data, n);
+		n *= SHA_CBLOCK;
+		data += n;
+		len -= n;
+	}
+
+	if (len != 0) {
+		p = (unsigned char *)c->data;
+		c->num = (unsigned int)len;
+		memcpy(p, data, len);
+	}
+	return 1;
+}
+LCRYPTO_ALIAS(SHA256_Update);
+
+void
+SHA256_Transform(mt_SHA256_CTX *c, const unsigned char *data)
+{
+	sha256_block_data_order(c, data, 1);
+}
+LCRYPTO_ALIAS(SHA256_Transform);
+
+int
+mt_SHA256_Final(unsigned char *md, mt_SHA256_CTX *c)
+{
+	unsigned char *p = (unsigned char *)c->data;
+	size_t n = c->num;
+	unsigned int nn;
+
+	p[n] = 0x80; /* there is always room for one */
+	n++;
+
+	if (n > (SHA_CBLOCK - 8)) {
+		memset(p + n, 0, SHA_CBLOCK - n);
+		n = 0;
+		sha256_block_data_order(c, p, 1);
+	}
+
+	memset(p + n, 0, SHA_CBLOCK - 8 - n);
+	c->data[SHA_LBLOCK - 2] = htobe32(c->Nh);
+	c->data[SHA_LBLOCK - 1] = htobe32(c->Nl);
+
+	sha256_block_data_order(c, p, 1);
+	c->num = 0;
+	memset(p, 0, SHA_CBLOCK);
+
+	/*
+	 * Note that FIPS180-2 discusses "Truncation of the Hash Function Output."
+	 * default: case below covers for it. It's not clear however if it's
+	 * permitted to truncate to amount of bytes not divisible by 4. I bet not,
+	 * but if it is, then default: case shall be extended. For reference.
+	 * Idea behind separate cases for pre-defined lengths is to let the
+	 * compiler decide if it's appropriate to unroll small loops.
+	 */
+	switch (c->md_len) {
+	case SHA256_DIGEST_LENGTH:
+		for (nn = 0; nn < SHA256_DIGEST_LENGTH / 4; nn++) {
+			crypto_store_htobe32(md, c->h[nn]);
+			md += 4;
+		}
+		break;
+
+	default:
+		if (c->md_len > SHA256_DIGEST_LENGTH)
+			return 0;
+		for (nn = 0; nn < c->md_len / 4; nn++) {
+			crypto_store_htobe32(md, c->h[nn]);
+			md += 4;
+		}
+		break;
+	}
+
+	return 1;
+}
+LCRYPTO_ALIAS(SHA256_Final);
+
+unsigned char *
+mt_SHA256(const unsigned char *d, size_t n, unsigned char *md)
+{
+	mt_SHA256_CTX c;
+	static unsigned char m[SHA256_DIGEST_LENGTH];
+
+	if (md == NULL)
+		md = m;
+
+	mt_SHA256_Init(&c);
+	mt_SHA256_Update(&c, d, n);
+	mt_SHA256_Final(md, &c);
+
+	memset(&c, 0, sizeof(c));
+
+	return (md);
+}
+LCRYPTO_ALIAS(SHA256);
diff --git a/misc/freeminer.exe.manifest b/misc/freeminer.exe.manifest
index dcad3fcde..1b8c3ba7b 100644
--- a/misc/freeminer.exe.manifest
+++ b/misc/freeminer.exe.manifest
@@ -10,8 +10,11 @@
     </trustInfo>
     <application xmlns="urn:schemas-microsoft-com:asm.v3">
         <windowsSettings>
+            <!-- https://learn.microsoft.com/en-us/windows/win32/hidpi/setting-the-default-dpi-awareness-for-a-process#setting-default-awareness-with-the-application-manifest -->
             <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
             <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+            <heapType xmlns="http://schemas.microsoft.com/SMI/2020/WindowsSettings">SegmentHeap</heapType>
         </windowsSettings>
     </application>
 </assembly>
diff --git a/misc/irrlichtmt_tag.txt b/misc/irrlichtmt_tag.txt
deleted file mode 100644
index bc035751c..000000000
--- a/misc/irrlichtmt_tag.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.9.0mt13
diff --git a/misc/kubernetes.yml b/misc/kubernetes.yml
deleted file mode 100644
index f2b322b8e..000000000
--- a/misc/kubernetes.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: minetest
-  name: minetest
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: minetest
-  template:
-    metadata:
-      labels:
-        app: minetest
-    spec:
-      containers:
-      - image: registry.gitlab.com/minetest/minetest/server:master
-        name: minetest
-        ports:
-        - containerPort: 30000
-          protocol: UDP
-        volumeMounts:
-        - mountPath: /var/lib/minetest
-          name: minetest-data
-        - mountPath: /etc/minetest
-          name: config
-      restartPolicy: Always
-      volumes:
-      - name: minetest-data
-        persistentVolumeClaim:
-          claimName: minetest-data
-      - configMap:
-          defaultMode: 420
-          name: minetest
-        name: config
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: minetest
-  name: minetest
-  namespace: default
-spec:
-  ports:
-  - name: minetest
-    port: 30000
-    protocol: UDP
-  selector:
-    app: minetest
-  type: NodePort
diff --git a/misc/make_redirects.sh b/misc/make_redirects.sh
new file mode 100755
index 000000000..781afb652
--- /dev/null
+++ b/misc/make_redirects.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -e
+
+rm -rf public
+mkdir public
+
+redirect() {
+    dir=$(dirname "public$1")
+    mkdir -p $dir
+    cp misc/redirect.html "public$1"
+
+    url=${1/\/index.html/\/}
+    sed -i "s|URL|$url|g" "public$1"
+}
+
+redirect /inventory/index.html
+redirect /definition-tables/index.html
+redirect /aliases/index.html
+redirect /items/index.html
+redirect /registered-definitions/index.html
+redirect /colors/index.html
+redirect /decoration-types/index.html
+redirect /hud/index.html
+redirect /index.html
+redirect /spatial-vectors/index.html
+redirect /metadata/index.html
+redirect /perlin-noise/index.html
+redirect /translations/index.html
+redirect /tool-capabilities/index.html
+redirect /l-system-trees/index.html
+redirect /entity-damage-mechanism/index.html
+redirect /escape-sequences/index.html
+redirect /registered-entities/index.html
+redirect /flag-specifier-format/index.html
+redirect /minetest-namespace-reference/index.html
+redirect /ores/index.html
+redirect /search.html
+redirect /representations-of-simple-things/index.html
+redirect /nodes/index.html
+redirect /lua-voxel-manipulator/index.html
+redirect /helper-functions/index.html
+redirect /formspec/index.html
+redirect /games/index.html
+redirect /sounds/index.html
+redirect /textures/index.html
+redirect /map-terminology-and-coordinates/index.html
+redirect /schematics/index.html
+redirect /groups/index.html
+redirect /privileges/index.html
+redirect /class-reference/index.html
+redirect /mods/index.html
+redirect /mapgen-objects/index.html
diff --git a/misc/org.freeminer.freeminer.appdata.xml b/misc/org.freeminer.freeminer.appdata.xml
deleted file mode 100644
index 37d60c3e9..000000000
--- a/misc/org.freeminer.freeminer.appdata.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-	<id>org.freeminer.freeminer.desktop</id>
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>GPL-3 and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
-	<content_rating type="oars-1.0">
-		<content_attribute id="violence-cartoon">mild</content_attribute>
-		<content_attribute id="violence-fantasy">mild</content_attribute>
-		<content_attribute id="social-chat">intense</content_attribute>
-		<content_attribute id="social-info">mild</content_attribute>
-	</content_rating>
-	<name>Freeminer</name>
-	<summary>Multiplayer infinite-world block sandbox game</summary>
-	<summary xml:lang="de">Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten</summary>
-	<description>
-		<p>
-			Freeminer is an infinite-world block sandbox game and game engine.
-		</p><p xml:lang="de">
-			Freeminer ist ein Sandkastenspiel und eine Spielengine mit unendlichen Welten.
-		</p><p>
-			Players can create and destroy various types of blocks in a
-			three-dimensional open world. This allows forming structures in
-			every possible creation, on multiplayer servers or in singleplayer.
-		</p><p xml:lang="de">
-			Spieler können in einer offenen 3D-Welt viele verschiedene Arten von
-			Blöcken platzieren und abbauen. Dies erlaubt das Bauen von vielfältigen
-			Strukturen im Einzelspieler oder auf Mehrspielerservern.
-		</p><p>
-			Freeminer is designed to be simple, stable, and portable.
-			It is lightweight enough to run on fairly old hardware.
-		</p><p xml:lang="de">
-			Minetest wurde entworfen, um einfach, stabil und portabel zu sein.
-			Es ist leichtgewichtig genug, um auf relativ alter Hardware zu laufen.
-		</p><p>
-			Freeminer has many features, including:
-		</p><p xml:lang="de">
-			Freeminer besitzt viele Features, unter anderem:
-		</p>
-		<ul>
-			<li>Ability to walk around, dig, and build in a near-infinite voxel world</li>
-			<li xml:lang="de">Die Möglichkeit, in einer nahezu unendlichen Voxel-Welt herumzulaufen, zu graben und zu bauen</li>
-			<li>Crafting of items from raw materials</li>
-			<li xml:lang="de">Fertigen von Items aus Rohmaterialien</li>
-			<li>Fast and able to run on old and slow hardware</li>
-			<li xml:lang="de">Gute Performance selbst auf älterer und langsamer Hardware</li>
-			<li>A simple modding API that supports many additions and modifications to the game</li>
-			<li xml:lang="de">Eine einfache Modding-API, die viele Ergänzungen und Änderungen am Spiel unterstützt</li>
-			<li>Multiplayer support via servers hosted by users</li>
-			<li xml:lang="de">Mehrspieler auf selber gehosteten Servern</li>
-			<li>Beautiful lightning-fast map generator</li>
-			<li xml:lang="de">Wunderschöner, blitzschneller Kartengenerator</li>
-		</ul>
-	</description>
-	<screenshots>
-		<screenshot type="default">
-			<image>http://www.minetest.net/media/gallery/1.jpg</image>
-		</screenshot>
-		<screenshot>
-			<image>http://www.minetest.net/media/gallery/3.jpg</image>
-		</screenshot>
-		<screenshot>
-			<image>http://www.minetest.net/media/gallery/5.jpg</image>
-		</screenshot>
-	</screenshots>
-	<keywords>
-		<keyword>sandbox</keyword>
-		<keyword>world</keyword>
-		<keyword>mining</keyword>
-		<keyword>multiplayer</keyword>
-	</keywords>
-	<url type="homepage">https://freeminer.org</url>
-	<url type="bugtracker">https://github.com/freeminer/freeminer/issues</url>
-	<url type="translate">https://dev.minetest.net/Translation</url>
-	<url type="donation">https://www.minetest.net/development/#donate</url>
-	<url type="faq">https://wiki.minetest.net/FAQ</url>
-	<url type="help">https://wiki.minetest.net</url>
-	<url type="vcs-browser">https://github.com/freeminer/freeminer</url>
-	<url type="contribute">https://www.minetest.net/get-involved/</url>
-	<provides>
-		<binary>freeminer</binary>
-	</provides>
-	<translation type="gettext">freeminer</translation>
-	<update_contact></update_contact>
-	<releases>
-		<release date="2023-12-04" version="5.8.0"/>
-	</releases>
-</component>
diff --git a/misc/org.freeminer.freeminer.metainfo.xml b/misc/org.freeminer.freeminer.metainfo.xml
new file mode 100644
index 000000000..d2cde3e5f
--- /dev/null
+++ b/misc/org.freeminer.freeminer.metainfo.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>org.freeminer.freeminer</id>
+
+    <name>Freeminer</name>
+    <summary>Block-based multiplayer game platform</summary>
+    <summary xml:lang="de">Blockbasierte Mehrspieler-Spieleplattform</summary>
+    <summary xml:lang="fr">Plate-forme de jeu multijoueurs à base de blocs</summary>
+
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>LGPL-2.1+ AND CC-BY-SA-3.0 AND MIT AND Apache-2.0</project_license>
+
+    <developer id="org.freeminer">
+        <name>Freeminer Team</name>
+    </developer>
+
+    <supports>
+        <control>pointing</control>
+        <control>keyboard</control>
+        <control>touch</control>
+        <internet>offline-only</internet>
+    </supports>
+
+    <requires>
+        <display_length compare="ge">360</display_length>
+    </requires>
+
+    <content_rating type="oars-1.0">
+        <content_attribute id="violence-cartoon">mild</content_attribute>
+        <content_attribute id="violence-fantasy">mild</content_attribute>
+        <content_attribute id="social-chat">intense</content_attribute>
+        <content_attribute id="social-info">mild</content_attribute>
+    </content_rating>
+
+    <description>
+        <p>
+            Minetest is a block-based sandbox game platform.
+        </p>
+        <p xml:lang="de">
+            Minetest ist eine blockbasierte Sandbox-Spielplattform.
+        </p>
+        <p xml:lang="fr">
+            Minetest est une plateforme de jeu de type bac à sable à base de blocs.
+        </p>
+        <p>
+            Players can create and destroy various types of blocks in a
+            three-dimensional open world. This allows forming structures in
+            every possible creation, on multiplayer servers or in singleplayer.
+        </p>
+        <p xml:lang="de">
+            Spieler können in einer offenen 3D-Welt viele verschiedene Arten von
+            Blöcken platzieren und abbauen. Dies erlaubt das Bauen von vielfältigen
+            Strukturen im Einzelspieler oder auf Mehrspielerservern.
+        </p>
+        <p xml:lang="fr">
+            Les joueurs peuvent créer et détruire différents types de blocs dans un
+            monde ouvert tridimensionnel. Cela permet de créer des structures de toutes les
+            formes possibles, sur des serveurs multijoueurs ou en solo.
+        </p>
+        <p>
+            Minetest is designed to be simple, stable, and portable.
+            It is lightweight enough to run on fairly old hardware.
+        </p>
+        <p xml:lang="de">
+            Minetest wurde entworfen, um einfach, stabil und portabel zu sein.
+            Es ist leichtgewichtig genug, um auf relativ alter Hardware zu laufen.
+        </p>
+        <p xml:lang="fr">
+            Minetest est conçu pour être simple, stable et portable.
+            Il est suffisamment léger pour fonctionner sur du matériel relativement ancien.
+        </p>
+        <p>
+            Minetest has many features, including:
+        </p>
+        <p xml:lang="de">
+            Minetest besitzt viele Features, unter anderem:
+        </p>
+        <p xml:lang="fr">
+            Minetest offre de nombreuses fonctionnalités, notamment :
+        </p>
+        <ul>
+            <li>Ability to walk around, dig, and build in a near-infinite voxel world</li>
+            <li xml:lang="de">Die Möglichkeit, in einer nahezu unendlichen Voxel-Welt herumzulaufen, zu graben und zu
+                bauen
+            </li>
+            <li xml:lang="fr">La possibilité de se promener, de creuser et de construire dans un monde voxel quasi-infini
+            </li>
+            <li>Crafting of items from raw materials</li>
+            <li xml:lang="de">Fertigen von Items aus Rohmaterialien</li>
+            <li xml:lang="fr">Fabrication d'objets à partir de matières premières</li>
+            <li>A simple modding API that supports many additions and modifications to the game</li>
+            <li xml:lang="de">Eine einfache Modding-API, die viele Ergänzungen und Änderungen am Spiel unterstützt</li>
+            <li xml:lang="fr">Une API de modding simple qui permet de nombreux ajouts et modifications au jeu</li>
+            <li>Multiplayer support via servers hosted by users</li>
+            <li xml:lang="de">Mehrspieler auf selber gehosteten Servern</li>
+            <li xml:lang="fr">Prise en charge du multijoueur via des serveurs hébergés par les utilisateurs</li>
+            <li>Beautiful lightning-fast map generator</li>
+            <li xml:lang="de">Wunderschöner, blitzschneller Kartengenerator</li>
+            <li xml:lang="fr">Générateur de cartes très rapide</li>
+        </ul>
+    </description>
+
+    <launchable type="desktop-id">net.minetest.minetest.desktop</launchable>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://www.minetest.net/media/gallery/1.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>https://www.minetest.net/media/gallery/3.jpg</image>
+        </screenshot>
+        <screenshot>
+            <image>https://www.minetest.net/media/gallery/5.jpg</image>
+        </screenshot>
+    </screenshots>
+
+    <icon type="stock">minetest</icon>
+
+    <categories>
+        <category>Game</category>
+        <category>Simulation</category>
+    </categories>
+
+    <keywords>
+        <keyword>sandbox</keyword>
+        <keyword>world</keyword>
+        <keyword>mining</keyword>
+        <keyword>crafting</keyword>
+        <keyword>blocks</keyword>
+        <keyword>nodes</keyword>
+        <keyword>multiplayer</keyword>
+        <keyword>roleplaying</keyword>
+    </keywords>
+
+    <url type="homepage">https://freeminer.org</url>
+    <url type="bugtracker">https://www.minetest.net/get-involved/#reporting-issues</url>
+    <url type="translate">https://dev.minetest.net/Translation</url>
+    <url type="donation">https://www.minetest.net/get-involved/#donate</url>
+    <url type="faq">https://wiki.minetest.net/FAQ</url>
+    <url type="help">https://wiki.minetest.net</url>
+    <url type="vcs-browser">https://github.com/freeminer/freeminer</url>
+    <url type="contribute">https://www.minetest.net/get-involved</url>
+
+    <provides>
+        <binary>minetest</binary>
+    </provides>
+
+    <translation type="gettext">minetest</translation>
+
+    <update_contact></update_contact>
+
+    <releases>
+        <release date="2024-08-11" version="5.9.0"/>
+    </releases>
+</component>
diff --git a/misc/redirect.html b/misc/redirect.html
new file mode 100644
index 000000000..e13e4b8a4
--- /dev/null
+++ b/misc/redirect.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>Minetest API documentation</title>
+
+	<link rel="canonical" href="https://api.minetest.netURL">
+	<meta http-equiv="refresh" content="0; url=https://api.minetest.netURL">
+</head>
+<body>
+	<h1>Redirecting&hellip;</h1>
+	<a href="https://api.minetest.netURL">Click here if you are not redirected.</a>
+</body>
+</html>
diff --git a/misc/winresource.rc b/misc/winresource.rc
index be3513b6a..09ada43e3 100644
--- a/misc/winresource.rc
+++ b/misc/winresource.rc
@@ -1,66 +1,66 @@
-#include <windows.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <richedit.h>
-
-#ifndef USE_CMAKE_CONFIG_H
-#define USE_CMAKE_CONFIG_H
-#endif
-#include "config.h"
-#undef USE_CMAKE_CONFIG_H
-
-#if RUN_IN_PLACE
-	#define BUILDMODE "RUN_IN_PLACE=1"
-#else
-	#define BUILDMODE "RUN_IN_PLACE=0"
-#endif
-
-#ifdef __MINGW32__
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"
-#endif
-
-LANGUAGE 0, SUBLANG_NEUTRAL
-130        ICON         "freeminer.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
- PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
- FILEFLAGSMASK 0x3fL
-#ifndef NDEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-    BEGIN
-        VALUE "Comments", ""
-        VALUE "CompanyName", PROJECT_NAME_C " community"
-        VALUE "FileDescription", PROJECT_NAME_C " engine"
-        VALUE "FileVersion", VERSION_STRING
-        VALUE "InternalName", PROJECT_NAME
-        VALUE "LegalCopyright", "(c) 2014-2015"
-        VALUE "LegalTrademarks", """Freeminer"" is the property of the Minetest community, don't use it without permission!"
-        VALUE "OriginalFilename", "freeminer.exe"
-        VALUE "PrivateBuild", VERSION_EXTRA
-        VALUE "ProductName", PROJECT_NAME_C
-        VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        VALUE "SpecialBuild", BUILDMODE
-    END
-END
-BLOCK "VarFileInfo"
-BEGIN
-    VALUE "Translation", 0x409, 1200
-END
-END
-
+#include <windows.h>
+#include <winuser.h>
+#include <commctrl.h>
+#include <richedit.h>
+
+#ifndef USE_CMAKE_CONFIG_H
+#define USE_CMAKE_CONFIG_H
+#endif
+#include "config.h"
+#undef USE_CMAKE_CONFIG_H
+
+#if RUN_IN_PLACE
+	#define BUILDMODE "RUN_IN_PLACE=1"
+#else
+	#define BUILDMODE "RUN_IN_PLACE=0"
+#endif
+
+#ifdef __MINGW32__
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"
+#endif
+
+LANGUAGE 0, SUBLANG_NEUTRAL
+130        ICON         "minetest-icon.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+ PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+ FILEFLAGSMASK 0x3fL
+#ifndef NDEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+    BEGIN
+        VALUE "Comments", ""
+        VALUE "CompanyName", PROJECT_NAME_C " community"
+        VALUE "FileDescription", PROJECT_NAME_C " engine"
+        VALUE "FileVersion", VERSION_STRING
+        VALUE "InternalName", PROJECT_NAME
+        VALUE "LegalCopyright", "(c) 2011-2015"
+        VALUE "LegalTrademarks", """Freeminer"" is the property of the Freeminer community, don't use it without permission!"
+        VALUE "OriginalFilename", "freeminer.exe"
+        VALUE "PrivateBuild", VERSION_EXTRA
+        VALUE "ProductName", PROJECT_NAME_C
+        VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        VALUE "SpecialBuild", BUILDMODE
+    END
+END
+BLOCK "VarFileInfo"
+BEGIN
+    VALUE "Translation", 0x409, 1200
+END
+END
+
diff --git a/po/ar/minetest.po b/po/ar/minetest.po
index 64eeda5b1..547f726a6 100644
--- a/po/ar/minetest.po
+++ b/po/ar/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-01-26 12:51+0000\n"
-"Last-Translator: Ghurir <tamimzain@hotmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-05-21 09:01+0000\n"
+"Last-Translator: Jamil Mohamad Alhussein <jamilmohamadalhoseen@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/minetest/minetest/"
 "ar/>\n"
 "Language: ar\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 4.16-dev\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -33,7 +33,7 @@ msgstr "أمر غير صالح: "
 
 #: builtin/client/chatcommands.lua
 msgid "Issued command: "
-msgstr ""
+msgstr "امر صادر : "
 
 #: builtin/client/chatcommands.lua
 msgid "List online players"
@@ -57,7 +57,7 @@ msgstr "أعِد الإحياء"
 
 #: builtin/client/death_formspec.lua src/client/game.cpp
 msgid "You died"
-msgstr "مِت"
+msgstr "لقد مُتْ"
 
 #: builtin/common/chatcommands.lua
 msgid "Available commands:"
@@ -68,12 +68,12 @@ msgid "Available commands: "
 msgstr "الأوامر المتاحة: "
 
 #: builtin/common/chatcommands.lua
-#, fuzzy
 msgid "Command not available: "
-msgstr "الأوامر غير المتاحة: "
+msgstr "الأمر غير متاح: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "احصل على تعليمات الأوامر"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +83,10 @@ msgstr ""
 "استخدم '.help <cmd>' للحصول على مزيد من المعلومات أو '.help all' لعرض كل شيء."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "موافق"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ليس متاحًا>"
@@ -106,6 +103,10 @@ msgstr "حدث خطأ:"
 msgid "Main menu"
 msgstr "القائمة الرئيسية"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "موافق"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "أعد الإتصال"
@@ -134,19 +135,26 @@ msgstr "نحن ندعم نسخة الميفاق $1فقط."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "نحن ندعم نسخ الميفاق ما بين $1 و $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" موجود مسبقًا. هل تريد الكتابة عليه؟"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "خطأ في تثبيت \"1$\" : 2$"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "الاعتماديتان \"$1\" و $2 ستثبتان."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "فشل تحميل \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 بواسطة $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "فشل تحميل $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "التثبيت: نوع الملف غير مدعوم أو أرشيف تالف"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,158 +162,158 @@ msgstr ""
 "يُنزل $1،\n"
 "$2 في الطابور"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "ينزل $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "يحتاج $1 لكن لم يُعثر عليها."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 سيُثبت، واعتماديات $1 ستُتجاهل."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "كل الحزم"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "مثبت مسبقا"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "عُد للقائمة الرئيسة"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "لا يمكن استخدام ContentDB عند بناء Minetest بدون cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "يحمل..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "الألعاب"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "ثبت"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "يحمل..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "التعديلات"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "تعذر استيراد الحزم"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "بدون نتائج"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "لا توجد تحديثات"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "في الطابور"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "حِزم الإكساء"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "لم يتم العثور على الحزمة 1$."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "أزل"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "حدِث"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "حدِّث الكل [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "اعرض مزيدًا من المعلومات عبر المتصفح"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "You need to install a game before you can install a mod"
+msgstr "يجب عليك تنزيل اللعبة قبل إضافة التعديلات"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "الاعتماديتان \"$1\" و $2 ستثبتان."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 بواسطة $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "يحتاج $1 لكن لم يُعثر عليها."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 سيُثبت، واعتماديات $1 ستُتجاهل."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "مثبت مسبقا"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "اللعبة القاعدية :"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "لا يمكن استخدام ContentDB عند بناء Minetest بدون cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "الإعتماديات:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "يحمل..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "فشل تحميل $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "فشل تحميل $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "التثبيت: نوع الملف غير مدعوم أو هو أرشيف تالف"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "الألعاب"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "ثبت"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "ثبت $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "ثبت الإعتماديات المفقودة"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "يحمل..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "التعديلات"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "تعذر استيراد الحزم"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "بدون نتائج"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "لا توجد تحديثات"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "لم يُعثر عليه"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "اكتب عليه"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "تحقق من صحة اللعبة القاعدية."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "في الطابور"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" موجود مسبقًا. هل تريد الكتابة عليه؟"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "حِزم الإكساء"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "أزل"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "حدِث"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "حدِّث الكل [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "اعرض مزيدًا من المعلومات عبر المتصفح"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "اكتب عليه"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -320,14 +328,12 @@ msgid "Failed to install $1 to $2"
 msgstr "فشل تثبيت $1 في $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "تثبيت تعديل: لا يمكن العصور على اسم مجلد مناسب لحزمة التعديلات $1"
+msgstr "تنزيل: لا يمكن العثور على اسم مجلد مناسب لحزمة التعديلات $1"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "فشل إيجاد تعديل أو حزمة تعديلات صالحة"
+msgstr "فشل إيجاد تعديل, حزمة تعديلات أو لعبة صالحة"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 #, fuzzy
@@ -340,11 +346,11 @@ msgstr "فشل تثبيت $1 كحزمة إكساء"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Enabled, has error)"
-msgstr ""
+msgstr "(مفعل، به خطأ)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr ""
+msgstr "(غير محقق)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
@@ -456,10 +462,20 @@ msgstr "أنشئ"
 msgid "Decorations"
 msgstr "تزيينات"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "\"Development Test\" مُوَجّه للمطورين."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "الزنزانات"
@@ -626,7 +642,7 @@ msgstr "أكد كلمة المرور"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Joining $1"
-msgstr ""
+msgstr "انضمام 1$"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Missing name"
@@ -635,7 +651,7 @@ msgstr "الاسم مفقود"
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
 msgid "Name"
-msgstr "الاسم"
+msgstr "اسم"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
@@ -652,7 +668,7 @@ msgstr "سجل"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "رفض"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -660,16 +676,20 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"لفترة طويلة، كان محرك Minetest مزودًا بلعبة افتراضية تسمى \"Minetest Game\". "
+"منذ Minetest 5.8.0، يتم شحن Minetest بدون لعبة افتراضية."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"إذا كنت تريد الاستمرار في اللعب في عوالم Minetest Game، فأنت بحاجة إلى إعادة "
+"تثبيت Minetest Game."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "لم تعد لعبة Minetest مثبتة بشكل افتراضي"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 #, fuzzy
@@ -693,7 +713,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "A new $1 version is available"
-msgstr ""
+msgstr "إصدار جديد ل 1$ متوفر"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid ""
@@ -702,6 +722,10 @@ msgid ""
 "Visit $3 to find out how to get the newest version and stay up to date with "
 "features and bugfixes."
 msgstr ""
+"الأصدار المثبت: 1$\n"
+"الأصدار الجديد: 2$\n"
+"زر 3$ لمعرفة كيفية الحصول على الإصدار الأحدث والبقاء على اطلاع بالميزات "
+"وإصلاحات الأخطاء."
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Later"
@@ -817,20 +841,16 @@ msgstr "مخفف"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(استخدم لغة النظام)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "إمكانية الوصول"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "عُد"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "غيِر المفاتيح"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -840,17 +860,18 @@ msgstr "دردشة"
 msgid "Clear"
 msgstr "امسح"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "التحكم"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "عام"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Movement"
-msgstr ""
+msgstr "حركة"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 #, fuzzy
@@ -859,7 +880,7 @@ msgstr "إستعِد الإفتراضي"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "إعادة تعيين الإعداد إلى الافتراضي (1$)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -867,7 +888,7 @@ msgstr "إبحث"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "أظهر الاعدادات المتقدمة"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -888,11 +909,11 @@ msgstr "المحتوى: تعديلات"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(ستحتاج اللعبة إلى تمكين الظلال أيضًا)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "مخصص"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -942,7 +963,7 @@ msgstr "المطورون الرئيسيون"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "الفريق الأساسي"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
@@ -970,7 +991,7 @@ msgstr "المطورون الرئيسيون السابقون"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Share debug log"
-msgstr ""
+msgstr "مشاركة سجل التصحيح"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
@@ -1052,6 +1073,17 @@ msgstr "ثبت لعبة"
 msgid "Install games from ContentDB"
 msgstr "ثبت العابا من ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "لم تعد لعبة Minetest مثبتة بشكل افتراضي"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "جديد"
@@ -1085,8 +1117,9 @@ msgid "Start Game"
 msgstr "ابدأ اللعبة"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "ليس لديك لعبة مثبتت."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "يجب عليك تنزيل اللعبة قبل إضافة التعديلات"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1166,18 +1199,10 @@ msgstr "يحمل الإكساء..."
 msgid "Rebuilding shaders..."
 msgstr "يعيد بناء المظلِلات..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "خطأ في الاتصال (انتهاء المهلة؟)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "تعذر العثور على اللعبة أو تحميلها "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "مواصفات اللعبة غير صالحة."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "القائمة الرئيسية"
@@ -1202,7 +1227,11 @@ msgstr "فشل فتح ملف كلمة المرور المدخل: "
 msgid "Provided world path doesn't exist: "
 msgstr "مسار العالم المدخل غير موجود: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "وسائط…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1210,18 +1239,10 @@ msgstr ""
 "\n"
 "راجع debug.txt لمزيد من التفاصيل."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- العنوان: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- النمط: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- المنفذ: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- عام: "
@@ -1257,10 +1278,6 @@ msgstr "المشي التلقائي ممكن"
 msgid "Block bounds hidden"
 msgstr "حدود الكتل مخفية"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "حدود كل الكتل ظاهرة"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "حدود الكتلة الحالية ظاهرة"
@@ -1306,6 +1323,10 @@ msgstr "البرمجة النصية معطلة من جانب العميل"
 msgid "Connecting to server..."
 msgstr "يتصل بالخادوم…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "خطأ في الاتصال (انتهاء المهلة؟)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "فشل الاتصال لسبب مجهول"
@@ -1314,47 +1335,14 @@ msgstr "فشل الاتصال لسبب مجهول"
 msgid "Continue"
 msgstr "تابع"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"أزرار التحكم:\n"
-"- %s: سر للأمام\n"
-"- %s: سر للخلف\n"
-"- %s: سر يسارا\n"
-"- %s: سر يمينا\n"
-"- %s: اقفز/تسلق\n"
-"- %s: احفر/الكم\n"
-"- %s: ضع/استخدم\n"
-"- %s: ازحف/انزل\n"
-"- %s: ارمي عنصر\n"
-"- %s: افتح المخزن\n"
-"- تحريك الفأرة: دوران\n"
-"- عجلة الفأرة: غيير العنصر\n"
-"- -%s: دردشة\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1399,7 +1387,7 @@ msgstr "معلومات التنقيح مرئية"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
+msgstr "معلومات التصحيح ، الرسم البياني لملف التعريف ، والإطار السلكي مخفي"
 
 #: src/client/game.cpp
 #, fuzzy, c-format
@@ -1446,6 +1434,11 @@ msgstr "الضباب معطل"
 msgid "Fog enabled"
 msgstr "الضباب مفعل"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "التكبير معطل من قبل لعبة أو تعديل"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "معلومات اللعبة:"
@@ -1466,10 +1459,6 @@ msgstr "تعريف العنصر…"
 msgid "KiB/s"
 msgstr "كب\\ثا"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "وسائط…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "مب\\ثا"
@@ -1492,7 +1481,7 @@ msgstr "وضع القبات معطل"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr ""
+msgstr "تم تمكين وضع Noclip (ملاحظة: لا يوجد امتياز \"noclip\")"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1567,7 +1556,7 @@ msgstr "تعذر الاتصال بـ %s لأن IPv6 معطلة"
 #: src/client/game.cpp
 #, c-format
 msgid "Unable to listen on %s because IPv6 is disabled"
-msgstr ""
+msgstr "غير قادر على الاستماع إلى %s لأن IPv6 معطل"
 
 #: src/client/game.cpp
 #, fuzzy
@@ -1580,8 +1569,9 @@ msgid "Unlimited viewing range enabled"
 msgstr "مدى الرؤية غير المحدود مفعل"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "تم تمكين نطاق عرض غير محدود، ولكنه محظور بواسطة اللعبة أو التعديلة"
 
 #: src/client/game.cpp
 #, fuzzy, c-format
@@ -1589,9 +1579,11 @@ msgid "Viewing changed to %d (the minimum)"
 msgstr "مدى الرؤية في أدنى حد: %d"
 
 #: src/client/game.cpp
-#, c-format
+#, fuzzy, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"تم تغيير العرض إلى %d (الحد الأدنى)، ولكنه يقتصر على %d حسب اللعبة أو "
+"التعديلة"
 
 #: src/client/game.cpp
 #, c-format
@@ -1604,10 +1596,12 @@ msgid "Viewing range changed to %d (the maximum)"
 msgstr "غُيرَ مدى الرؤية الى %d"
 
 #: src/client/game.cpp
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"تم تغيير نطاق العرض إلى %d (الحد الأقصى)، ولكنه يقتصر على %d حسب اللعبة أو "
+"التعديلة"
 
 #: src/client/game.cpp
 #, fuzzy, c-format
@@ -1627,10 +1621,6 @@ msgstr "تم إظهار الإطار السلكي"
 msgid "Zoom currently disabled by game or mod"
 msgstr "التكبير معطل من قبل لعبة أو تعديل"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "موافق"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1672,7 +1662,7 @@ msgstr "Backspace"
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
 msgid "Break Key"
-msgstr ""
+msgstr "مفتاح الكسر"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
@@ -1694,8 +1684,9 @@ msgid "Delete Key"
 msgstr "إحذف"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Down Arrow"
-msgstr ""
+msgstr "السهم لأسفل"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1703,7 +1694,7 @@ msgstr "End"
 
 #: src/client/keycode.cpp
 msgid "Erase EOF"
-msgstr ""
+msgstr "مسح EOF"
 
 #: src/client/keycode.cpp
 msgid "Execute"
@@ -1801,8 +1792,9 @@ msgid "Numpad +"
 msgstr "Numpad +"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad -"
-msgstr ""
+msgstr "لوحة الأرقام -"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -1908,7 +1900,7 @@ msgstr "Right Control"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "الزر الايمن"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -1958,7 +1950,7 @@ msgstr "Snapshot"
 
 #: src/client/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "مسافة"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -1966,8 +1958,9 @@ msgid "Tab"
 msgstr "Tab"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Up Arrow"
-msgstr ""
+msgstr "سهم للاعلى"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -2002,22 +1995,36 @@ msgstr "الخريطة المصغرة في وضع الأسطح، تكبير x%d"
 msgid "Minimap in texture mode"
 msgstr "الخريطة المصغرة في وضع الاكساء"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "فشل فتح صفحة الويب"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
 msgid "%s is missing:"
-msgstr ""
+msgstr "%s مفقود:"
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Install and enable the required mods, or disable the mods causing errors."
 msgstr ""
+"قم بتثبيت التعديلات المطلوبة وتمكينها، أو قم بتعطيل التعديلات التي تسبب "
+"الأخطاء."
 
 #: src/content/mod_configuration.cpp
+#, fuzzy
 msgid ""
 "Note: this may be caused by a dependency cycle, in which case try updating "
 "the mods."
 msgstr ""
+"ملاحظة: قد يكون السبب في ذلك هو دورة التبعية، وفي هذه الحالة حاول تحديث "
+"التعديلات."
 
 #: src/content/mod_configuration.cpp
 #, fuzzy
@@ -2070,7 +2077,7 @@ msgstr "الأوامر"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "وحدة التحكم"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. range"
@@ -2114,7 +2121,7 @@ msgstr "المفتاح مستخدم مسبقا"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr ""
+msgstr "روابط المفاتيح."
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2122,7 +2129,7 @@ msgstr "يسار"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
-msgstr ""
+msgstr "الأمر المحلي"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
@@ -2193,6 +2200,19 @@ msgstr "كبِر"
 msgid "press key"
 msgstr "اضغط على زر"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "فشل فتح صفحة الويب"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "غيِّر"
@@ -2226,13 +2246,14 @@ msgstr "حجم الصوت: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ar"
 
 #: src/network/clientpackethandler.cpp
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
-msgstr ""
+msgstr "الاسم غير مسجل. لإنشاء حساب على هذا الخادم، انقر فوق \"تسجيل\""
 
 #: src/network/clientpackethandler.cpp
 #, fuzzy
@@ -2382,11 +2403,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr ""
+msgstr "الحد المطلق للكتل في قائمة الانتظار في الظهور"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr "تسارع الطيران"
+msgstr "تسارع في الهواء"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
@@ -2410,17 +2431,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Adds particles when digging a node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
+msgstr "يضيف جزيئات عند حفر العقدة."
 
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
-msgstr ""
+msgstr "اضبط كثافة العرض المكتشفة المستخدمة لقياس عناصر واجهة المستخدم."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2431,6 +2446,12 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"يضبط كثافة طبقة الأرض العائمة.\n"
+"زيادة القيمة لزيادة الكثافة. يمكن أن تكون إيجابية أو سلبية.\n"
+"القيمة = 0.0: 50% من الحجم عبارة عن أرض عائمة.\n"
+"القيمة = 2.0 (يمكن أن تكون أعلى اعتمادًا على \"mgv7_np_floatland\"،اختبار "
+"دائما\n"
+" لتكون متأكداً) ينشئ طبقة صلبة من الأراضي العائمة."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2441,6 +2462,10 @@ msgstr "ضمّن اسم العنصر"
 msgid "Advanced"
 msgstr "متقدم"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -2458,7 +2483,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Always fly fast"
-msgstr ""
+msgstr "دائما طِرْ بسرعة"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
@@ -2470,7 +2495,7 @@ msgstr "تضخيم الوديان."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
-msgstr ""
+msgstr "التصنيف متباين الخواص"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
@@ -2502,6 +2527,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2523,17 +2559,26 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
-msgstr ""
+msgstr "الصوت"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
@@ -2541,7 +2586,7 @@ msgstr "قفز تلقائي فوق العوائق التي ارتفاعها كت
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "الإبلاغ تلقائيا إلى قائمة الخوادم."
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
@@ -2582,7 +2627,7 @@ msgstr "ترشيح خطي ثنائي"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "ربط العنوان"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2593,6 +2638,10 @@ msgstr "مواطن بيئية"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2704,6 +2753,8 @@ msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
+"مركز نطاق تعزيز منحنى الضوء.\n"
+"حيث 0.0 هو الحد الأدنى لمستوى الضوء، 1.0 هو الحد الأقصى لمستوى الضوء."
 
 #: src/settings_translation_file.cpp
 msgid "Chat command time message threshold"
@@ -2720,7 +2771,7 @@ msgstr "حجم خط المحادثة"
 
 #: src/settings_translation_file.cpp
 msgid "Chat log level"
-msgstr ""
+msgstr "مستوى سجل الدردشة"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2768,19 +2819,19 @@ msgstr "عميل وخادم"
 
 #: src/settings_translation_file.cpp
 msgid "Client modding"
-msgstr ""
+msgstr "تعديل العميل"
 
 #: src/settings_translation_file.cpp
 msgid "Client side modding restrictions"
-msgstr ""
+msgstr "قيود التعديل من جانب العميل"
 
 #: src/settings_translation_file.cpp
 msgid "Client-side Modding"
-msgstr ""
+msgstr "التعديل من جانب العميل"
 
 #: src/settings_translation_file.cpp
 msgid "Client-side node lookup range restriction"
-msgstr ""
+msgstr "تقييد نطاق البحث عن العقدة من جانب العميل"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -2796,7 +2847,7 @@ msgstr "سحاب"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client-side effect."
-msgstr ""
+msgstr "الغيوم هي تأثير من جانب العميل."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
@@ -2810,6 +2861,12 @@ msgstr "ضباب ملون"
 msgid "Colored shadows"
 msgstr "ظلال ملونة"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2826,6 +2883,9 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"القائمة المفصولة بالفواصل من التعديلات المسموح لها بالوصول إلى واجهات برمجة "
+"تطبيقات HTTP، والذي\n"
+" يسمح لهم بتحميل وتنزيل البيانات من/إلى الإنترنت."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2875,7 +2935,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr ""
+msgstr "لون وحدة التحكم"
 
 #: src/settings_translation_file.cpp
 msgid "Console height"
@@ -2883,15 +2943,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Content Repository"
-msgstr ""
+msgstr "مخزن المحتوى"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
-msgstr ""
+msgstr "قائمة المحتوى السوداء الخاصة بقاعدة بيانات ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Max Concurrent Downloads"
-msgstr ""
+msgstr "الحد الأقصى للتنزيلات المتزامنة لContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
@@ -2912,14 +2972,16 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"يتحكم في سرعة الغرق في السائل عند الخمول. سوف تسبب\n"
+"القيم السلبية لك أن ترتفع بدلا من ذلك."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "يتحكم في الانحدار/عمق منخفضات البحيرة."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "يتحكم في انحدار/ارتفاع التلال."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2952,10 +3014,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3005,6 +3063,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "يحدد المناطق التي تتواجد بها أشجار التفاح."
@@ -3192,6 +3263,11 @@ msgstr "فعِل الكل"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "مكن الضرر"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3211,6 +3287,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3253,6 +3333,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3276,6 +3360,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3284,12 +3372,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3319,6 +3401,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4143,9 +4238,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4292,10 +4388,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4344,7 +4436,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4379,10 +4473,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4625,6 +4715,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4693,6 +4787,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "حساسية اللمس (بكسل):"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4803,10 +4902,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4819,6 +4914,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4928,6 +5027,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "لا تتطابق نسخ الميفاق. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4943,6 +5051,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5107,9 +5219,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshots"
-msgstr "صوّر الشاشة"
+msgstr "لقطات الشاشة"
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5133,8 +5244,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5256,7 +5367,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5289,6 +5400,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5328,8 +5443,7 @@ msgstr "مُظللات"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5400,13 +5514,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5442,7 +5549,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5463,6 +5570,16 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "الصوت مكتوم"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "قائمة المحتوى السوداء الخاصة بقاعدة بيانات ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5619,17 +5736,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5640,6 +5777,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5666,7 +5809,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5723,6 +5866,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5770,12 +5917,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "حساسية اللمس (بكسل):"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5813,7 +5959,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5911,10 +6059,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6001,12 +6145,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "إبراز العقد"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6243,12 +6400,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- العنوان: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- النمط الإبداعي: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- التضرر: "
 
+#~ msgid "- Port: "
+#~ msgstr "- المنفذ: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6277,6 +6440,13 @@ msgstr ""
 #~ "أدرك أن هذه القيمة ستُتجاوز إذا كان حقل العنوان في القائمة الرئيسية يحوي "
 #~ "عنوانًا."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "اضبط تكوين النقطة في البوصة على شاشتك (الغير X11/Android فقط) على سبيل "
+#~ "المثال. لشاشات 4K."
+
 #~ msgid "All Settings"
 #~ msgstr "كل الإعدادات"
 
@@ -6298,9 +6468,15 @@ msgstr ""
 #~ msgid "Bilinear Filter"
 #~ msgstr "مرشح خطي ثنائي"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "حدود كل الكتل ظاهرة"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "خريطة النتوءات"
 
+#~ msgid "Change Keys"
+#~ msgstr "غيِر المفاتيح"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "غيِر المفاتيح"
@@ -6326,6 +6502,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "زجاج متصل"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "أزرار التحكم:\n"
+#~ "- %s: سر للأمام\n"
+#~ "- %s: سر للخلف\n"
+#~ "- %s: سر يسارا\n"
+#~ "- %s: سر يمينا\n"
+#~ "- %s: اقفز/تسلق\n"
+#~ "- %s: احفر/الكم\n"
+#~ "- %s: ضع/استخدم\n"
+#~ "- %s: ازحف/انزل\n"
+#~ "- %s: ارمي عنصر\n"
+#~ "- %s: افتح المخزن\n"
+#~ "- تحريك الفأرة: دوران\n"
+#~ "- عجلة الفأرة: غيير العنصر\n"
+#~ "- -%s: دردشة\n"
+
 #~ msgid "Creative"
 #~ msgstr "إبداعي"
 
@@ -6508,6 +6716,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "ثبت: الملف: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "مواصفات اللعبة غير صالحة."
+
 #~ msgid "Main"
 #~ msgstr "الرئيسية"
 
@@ -6541,9 +6752,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "بدون خريطة MIP"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "إبراز العقد"
-
 #~ msgid "Node Outlining"
 #~ msgstr "اقتضاب العقد"
 
@@ -6664,8 +6872,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "مِت"
 
+#~ msgid "You have no games installed."
+#~ msgstr "ليس لديك لعبة مثبتت."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "موافق"
diff --git a/po/be/minetest.po b/po/be/minetest.po
index 07290621e..bbc247061 100644
--- a/po/be/minetest.po
+++ b/po/be/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Belarusian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2019-11-19 23:04+0000\n"
 "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n"
 "Language-Team: Belarusian <https://hosted.weblate.org/projects/minetest/"
@@ -80,7 +80,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -89,11 +89,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -112,6 +108,10 @@ msgstr "Адбылася памылка:"
 msgid "Main menu"
 msgstr "Галоўнае меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Перазлучыцца"
@@ -140,183 +140,190 @@ msgstr "Мы падтрымліваем толькі $1 версію прата
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Мы падтрымліваем версіі пратакола паміж $1 і $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Не атрымалася спампаваць $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Не атрымалася спампаваць $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Усталёўка: непадтрымліваемы файл тыпу \"$1\" або сапсаваны архіў"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Загрузка…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Усе пакункі"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Вярнуцца ў галоўнае меню"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Гульні"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Усталяваць"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Мадыфікацыі"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Немагчыма атрымаць пакункі"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Вынікі адсутнічаюць"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Абнавіць"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Пакункі тэкстур"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Выдаліць"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Абнавіць"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Already installed"
 msgstr "Клавіша ўжо выкарыстоўваецца"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Вярнуцца ў галоўнае меню"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "Гуляць (сервер)"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Залежнасці:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "Загрузка…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Не атрымалася спампаваць $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Не атрымалася спампаваць $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Усталёўка: непадтрымліваемы файл тыпу \"$1\" або сапсаваны архіў"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Гульні"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Усталяваць"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Усталяваць"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Неабавязковыя залежнасці:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Загрузка…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Мадыфікацыі"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Немагчыма атрымаць пакункі"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Вынікі адсутнічаюць"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Абнавіць"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Not found"
 msgstr "Выключыць гук"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Пакункі тэкстур"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Выдаліць"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Абнавіць"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -476,12 +483,22 @@ msgstr "Стварыць"
 msgid "Decorations"
 msgstr "Ітэрацыі"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr ""
 "Увага: \"The minimal development test\" прызначаны толькі распрацоўшчыкам."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
@@ -864,10 +881,6 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Змяніць клавішы"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -877,7 +890,8 @@ msgstr "Размова"
 msgid "Clear"
 msgstr "Ачысціць"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Кіраванне"
 
@@ -1093,6 +1107,16 @@ msgstr "Усталяваць"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Новы"
@@ -1127,8 +1151,8 @@ msgid "Start Game"
 msgstr "Пачаць гульню"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "У вас няма ўсталяваных гульняў."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1214,19 +1238,11 @@ msgstr "Загрузка тэкстур…"
 msgid "Rebuilding shaders..."
 msgstr "Перабудова шэйдэраў…"
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Памылка злучэння (таймаут?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Немагчыма знайсці ці загрузіць гульню \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Хібная спецыфікацыя гульні."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Галоўнае меню"
@@ -1251,7 +1267,11 @@ msgstr "Не атрымалася адкрыць пададзены файл п
 msgid "Provided world path doesn't exist: "
 msgstr "Пададзены шлях не існуе: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медыя…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1259,18 +1279,10 @@ msgstr ""
 "\n"
 "Падрабязней у файле debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Адрас: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Рэжым: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Публічны: "
@@ -1306,10 +1318,6 @@ msgstr "Аўтаматычны рух наперад уключаны"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1356,6 +1364,10 @@ msgstr "Кліентскія мадыфікацыі выключаныя"
 msgid "Connecting to server..."
 msgstr "Злучэнне з серверам…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Памылка злучэння (таймаут?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1364,47 +1376,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Працягнуць"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Кіраванне:\n"
-"- %s: ісці ўперад\n"
-"- %s: ісці назад\n"
-"- %s: ісці ўлева\n"
-"- %s: ісці ўправа\n"
-"- %s: скакаць/караскацца\n"
-"- %s: красціся/спускацца\n"
-"- %s: выкінуць прадмет\n"
-"- %s: інвентар\n"
-"- Mouse: круціцца/глядзець\n"
-"- Mouse left: капаць/прабіваць\n"
-"- Mouse right: змясціць/ужыць\n"
-"- Mouse wheel: абраць прадмет\n"
-"- %s: размова\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1496,6 +1475,11 @@ msgstr "Туман адключаны"
 msgid "Fog enabled"
 msgstr "Туман уключаны"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Павелічэнне зараз выключана гульнёй альбо мадыфікацыяй"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Інфармацыя пра гульню:"
@@ -1516,10 +1500,6 @@ msgstr "Апісанне прадметаў…"
 msgid "KiB/s"
 msgstr "КіБ/сек"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Медыя…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "МіБ/сек"
@@ -1678,10 +1658,6 @@ msgstr "Каркас паказваецца"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Павелічэнне зараз выключана гульнёй альбо мадыфікацыяй"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "добра"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -2017,6 +1993,15 @@ msgstr "Мінімапа ў рэжыме паверхні, павелічэнн
 msgid "Minimap in texture mode"
 msgstr "Мінімальны памер тэкстуры"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Не атрымалася спампаваць $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2209,6 +2194,19 @@ msgstr "Павялічыць"
 msgid "press key"
 msgstr "націсніце кнопку"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Не атрымалася спампаваць $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Змяніць"
@@ -2242,6 +2240,7 @@ msgstr "Гучнасць: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "be"
 
@@ -2461,14 +2460,6 @@ msgstr "Адлегласць адпраўлення актыўнага аб'ек
 msgid "Adds particles when digging a node."
 msgstr "Дадае часціцы пры капанні блока."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Наладка DPI (кропак на цалю) на экране\n"
-"(не толькі X11/Android), напрыклад, для 4k-экранаў."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2492,6 +2483,10 @@ msgstr "Дадаваць назвы прадметаў"
 msgid "Advanced"
 msgstr "Пашыраныя"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2548,6 +2543,17 @@ msgstr "Дадаваць назвы прадметаў у выплыўных п
 msgid "Apple trees noise"
 msgstr "Шум яблынь"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Інэрцыя рукі"
@@ -2565,18 +2571,38 @@ msgid "Ask to reconnect after crash"
 msgstr "Прапанаваць перазлучыцца пасля крушэння"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"На гэтай дыстанцыі сервер будзе агрэсіўна аптымізаваць блокі, якія будзе "
+"адпраўляць кліентам.\n"
+"Малыя значэнні патэнцыйна палепшаць працаздольнасць за кошт бачных глюкаў "
+"візуалізацыі.\n"
+"(некаторыя блокі не будуць адлюстроўвацца пад вадой і ў пячорах, а таксама "
+"часам на сушы)\n"
+"Прызначэнне гэтага значэння на больш чым max_block_send_distance адключыць "
+"аптымізацыю.\n"
+"Прызначаецца ў блоках мапы (16 вузлоў)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "На гэтай дыстанцыі сервер будзе агрэсіўна аптымізаваць блокі, якія будзе "
 "адпраўляць кліентам.\n"
@@ -2651,6 +2677,11 @@ msgstr "Шум біёму"
 msgid "Biome noise"
 msgstr "Шум біёму"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Аптымізаваная адлегласць адпраўлення блокаў"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Аптымізаваная адлегласць адпраўлення блокаў"
@@ -2878,6 +2909,12 @@ msgstr "Каляровы туман"
 msgid "Colored shadows"
 msgstr "Каляровы туман"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3025,10 +3062,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI (кропак на цалю)"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Парог памеру файла журнала адладкі"
@@ -3080,6 +3113,24 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Забараніць падлучэнне старых кліентаў.\n"
+"Старыя кліенты — тыя, што не крушацца пры злучэнні\n"
+"з новымі серверамі, але яны могуць не падтрымліваць усе новыя функцыі, што "
+"чакаюцца."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Вызначае вобласці, дзе на дрэвах ёсць яблыкі."
@@ -3276,6 +3327,11 @@ msgstr "Уключыць усё"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Уключыць пашкоджанні"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3297,6 +3353,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Уключыць джойсцікі"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3339,6 +3400,11 @@ msgstr "Уключыць абарону мадыфікацый"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Уключыць выпадковы карыстальніцкі ўвод (толькі для тэставання)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Уключыць выпадковы карыстальніцкі ўвод (толькі для тэставання)."
@@ -3368,6 +3434,11 @@ msgstr ""
 "з новымі серверамі, але яны могуць не падтрымліваць усе новыя функцыі, што "
 "чакаюцца."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Парог сэнсарнага экрана"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3379,12 +3450,6 @@ msgstr ""
 "Адлеглыя серверы даюць магчымасць хутчэй спампоўваць медыяфайлы (напрыклад "
 "тэкстуры) пры злучэнні з серверам."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3420,6 +3485,19 @@ msgstr "Уключае анімацыю прадметаў інвентару."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Уключае кэшаванне павернутых вонкі сетак."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4351,9 +4429,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Працягласць цыкла сервера і інтэрвал, па якім аб'екты, як правіла, "
 "абнаўляюцца па сетцы."
@@ -4536,10 +4615,6 @@ msgstr ""
 "Зрабіць колер туману і неба залежным ад часу сутак (світанак, захад) і "
 "напрамку погляду."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Робіць усе вадкасці непразрыстымі"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4597,11 +4672,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Атрыбуты генерацыі для генератара 5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Атрыбуты генерацыі мапы для генератара мапы 6.\n"
 "Параметр «snowbiomes» (снежныя біёмы) ўключае новую сістэму з 5 біёмамі.\n"
@@ -4645,10 +4723,6 @@ msgstr "Затрымка генерацыі сеткі блокаў мапы"
 msgid "Mapblock mesh generation threads"
 msgstr "Затрымка генерацыі сеткі блокаў мапы"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Памер кэшу блокаў у генератары сетак  у МБ"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Таймаут выгрузкі блокаў мапы"
@@ -4919,6 +4993,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr "Вышыня сканавання мінімапы"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Інтэрвал паўторнай пстрычкі правай кнопкі мышы"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Minimum limit of random number of large caves per mapchunk."
@@ -4992,6 +5071,11 @@ msgstr "Адчувальнасць мышы"
 msgid "Mouse sensitivity multiplier."
 msgstr "Множнік адчувальнасці мышы."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Парог пячор"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Шум бруду"
@@ -5140,10 +5224,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Адсячэнне аклюзіі на баку сервера"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Непразрыстыя вадкасці"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5158,6 +5238,11 @@ msgstr ""
 "Адкрыць меню паўзы калі акно страціла фокус. Не будзе працаваць калі якое-"
 "небудзь меню ўжо адкрыта."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Генератар мапы: адладка"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5281,6 +5366,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Версіі пратакола адрозніваюцца. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5298,6 +5392,10 @@ msgstr "Падымае мясцовасць, каб зрабіць поймы ў
 msgid "Random input"
 msgstr "Выпадковы ўвод"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Надаўнія паведамленні размовы"
@@ -5509,8 +5607,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5653,8 +5751,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Прызначыць мову. Пакіньце пустым, каб выкарыстаць мову сістэмы.\n"
@@ -5695,6 +5794,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5740,11 +5843,11 @@ msgid "Shaders"
 msgstr "Шэйдэры"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Шэйдэры дазваляюць выкарыстоўваць дадатковыя візуальныя эфекты і могуць "
 "павялічыць\n"
@@ -5833,16 +5936,6 @@ msgstr ""
 "Змяняць гэтае значэнне патрэбна толькі ў асаблівых сітуацыях, а ў звычайных "
 "рэкамендуецца пакінуць як ёсць."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Памер кэшу блокаў у генератары сетак. Павелічэнне гэтага значэння\n"
-"павялічыць адсотак пераносу ў кэш, прадухіляючы капіяванне даных\n"
-"з галоўнага патоку гульні, тым самым памяншаючы дрыжанне."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5879,7 +5972,7 @@ msgstr "Мяккае асвятленне"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Плаўнае паварочванне камеры ў кінематаграфічным рэжыме. 0 для выключэння."
 
@@ -5904,6 +5997,15 @@ msgstr "Хуткасць крадкоў у вузлах за секунду."
 msgid "Soft shadow radius"
 msgstr "Празрыстасць цені шрыфту"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Гук"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Чорны спіс сцяжкоў ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6087,6 +6189,12 @@ msgstr ""
 "Прадвызначаны фармат захавання профіляў,\n"
 "пры запуску `/profiler save [format]` без вызначэння фармату."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6094,13 +6202,27 @@ msgid ""
 msgstr ""
 "Шлях да файла адносна каталога свету, у якім будуць захоўвацца профілі."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Ідэнтыфікатар джойсціка для выкарыстання"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Адлегласць у пікселях, з якой пачынаецца ўзаемадзеянне з сэнсарных экранам."
 
@@ -6112,6 +6234,14 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Час у секундах паміж паўторамі падзей пры ўтрыманні правай кнопкі мышы."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Сеткавы інтэрфейс, які праслухоўвае сервер."
@@ -6148,7 +6278,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Рухавік адмалёўкі для Irrlicht.\n"
 "Пасля змены гэтага параметра спатрэбіцца перазупуск.\n"
@@ -6230,6 +6360,10 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Трэці з чатырох 2D-шумоў, якія разам вызначаюць межы вышыні пагоркаў/гор."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6286,15 +6420,15 @@ msgstr "Адчувальнасць мышы"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Множнік адчувальнасці мышы."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Парог сэнсарнага экрана"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Непразрыстыя вадкасці"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6334,7 +6468,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6451,10 +6587,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Вертыкальная сінхранізацыя"
@@ -6546,6 +6678,10 @@ msgstr "Дадатковая кнопка трыгераў віртуальна
 msgid "Volume"
 msgstr "Гучнасць"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6555,6 +6691,16 @@ msgstr ""
 "Уключае паралакснае аклюзіўнае тэкстураванне.\n"
 "Патрабуюцца ўключаныя шэйдэры."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Максімальны FPS, калі гульня прыпыненая."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Мяккае асвятленне"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6841,12 +6987,18 @@ msgstr "Таймаўт cURL"
 msgid "cURL parallel limit"
 msgstr "Ліміт адначасовых злучэнняў cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Адрас: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Творчы рэжым: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Пашкоджанні: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6882,6 +7034,13 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ "Майце на ўвазе, што поле адраса ў галоўным меню перавызначае гэты "
 #~ "параметр."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Наладка DPI (кропак на цалю) на экране\n"
+#~ "(не толькі X11/Android), напрыклад, для 4k-экранаў."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6951,6 +7110,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Цэнтр сярэдняга ўздыму крывой святла."
 
+#~ msgid "Change Keys"
+#~ msgstr "Змяніць клавішы"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Змяніць клавішы"
@@ -7027,6 +7189,38 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgstr ""
 #~ "Кіруе шырынёй тунэляў. Меншае значэнне стварае больш шырокія тунэлі."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Кіраванне:\n"
+#~ "- %s: ісці ўперад\n"
+#~ "- %s: ісці назад\n"
+#~ "- %s: ісці ўлева\n"
+#~ "- %s: ісці ўправа\n"
+#~ "- %s: скакаць/караскацца\n"
+#~ "- %s: красціся/спускацца\n"
+#~ "- %s: выкінуць прадмет\n"
+#~ "- %s: інвентар\n"
+#~ "- Mouse: круціцца/глядзець\n"
+#~ "- Mouse left: капаць/прабіваць\n"
+#~ "- Mouse right: змясціць/ужыць\n"
+#~ "- Mouse wheel: абраць прадмет\n"
+#~ "- %s: размова\n"
+
 #~ msgid "Creative"
 #~ msgstr "Творчасць"
 
@@ -7036,6 +7230,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Колер перакрыжавання (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI (кропак на цалю)"
+
 #~ msgid "Damage"
 #~ msgstr "Пашкоджанні"
 
@@ -7432,6 +7629,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Інструменты"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Хібная спецыфікацыя гульні."
+
 #~ msgid "Inventory key"
 #~ msgstr "Клавіша інвентару"
 
@@ -8130,6 +8330,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ "Прымушае DirectX працаваць з LuaJIT. Выключыце, калі гэта выклікае "
 #~ "праблемы."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Робіць усе вадкасці непразрыстымі"
+
 #~ msgid ""
 #~ "Map generation attributes specific to Mapgen Carpathian.\n"
 #~ "Flags that are not enabled are not modified from the default.\n"
@@ -8159,6 +8362,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ "Нявызначаныя параметры прадвызначана не змяняюцца.\n"
 #~ "Параметры, што пачынаюцца з \"no\", выкарыстоўваюцца для выключэння."
 
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Памер кэшу блокаў у генератары сетак  у МБ"
+
 #~ msgid "Menus"
 #~ msgstr "Меню"
 
@@ -8379,15 +8585,21 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Простае лісце"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Памер кэшу блокаў у генератары сетак. Павелічэнне гэтага значэння\n"
+#~ "павялічыць адсотак пераносу ў кэш, прадухіляючы капіяванне даных\n"
+#~ "з галоўнага патоку гульні, тым самым памяншаючы дрыжанне."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Мяккае асвятленне"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Плаўнае паварочванне камеры. 0 для выключэння."
 
-#~ msgid "Sound"
-#~ msgstr "Гук"
-
 #~ msgid "Special"
 #~ msgstr "Адмысловая"
 
@@ -8447,6 +8659,10 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Сэнсарны парог: (px)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Парог сэнсарнага экрана"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Трылінейны фільтр"
 
@@ -8472,6 +8688,9 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "Use bilinear filtering when scaling textures down."
 #~ msgstr "Выкарыстоўваць білінейную фільтрацыю пры маштабаванні тэкстур."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Варыяцыя вышыні пагоркаў і глыбінь азёр на гладкай мясцовасці лятучых "
@@ -8561,8 +8780,14 @@ msgstr "Ліміт адначасовых злучэнняў cURL"
 #~ msgid "You died."
 #~ msgstr "Вы загінулі"
 
+#~ msgid "You have no games installed."
+#~ msgstr "У вас няма ўсталяваных гульняў."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "добра"
diff --git a/po/bg/minetest.po b/po/bg/minetest.po
index e1db16a95..f83c8e50a 100644
--- a/po/bg/minetest.po
+++ b/po/bg/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-10-24 20:27+0000\n"
 "Last-Translator: 109247019824 <stoyan@gmx.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Недостъпни команди: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Помощ за командите"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "всички команди."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <команда>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Добре"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<няма достъпни>"
@@ -105,6 +103,10 @@ msgstr "Възникна грешка:"
 msgid "Main menu"
 msgstr "Главно меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Добре"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Повторно свързване"
@@ -133,19 +135,27 @@ msgstr "Поддържаме само издание $1 на протокола.
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Поддържаме само изданията на протокола между $1 и $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "„$1“ вече съществува. Да бъде ли презаписан?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Грешка при инсталиране на „$1“: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 и $2 зависимости ще бъдат инсталирани."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Грешка при изтеглянето на „$1“"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 от $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Грешка при изтеглянето на $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Грешка при извличане на „$1“ (неподдържан вид на файл или повреден архив)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +163,159 @@ msgstr ""
 "$1 се изтеглят,\n"
 "$2 изчакват"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 се изтеглят…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 задължителни зависимости не могат да бъдат намерени."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 ще бъдат инсталирани, а $2 зависимости ще бъдат пропуснати."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Всички пакети"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Вече инсталирано"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Главно меню"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"Съдържанието от ContentDB не е налично, когато Minetest е компилиран без cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Изтегляне…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Игри"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Инсталиране"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Зареждане…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Модификации"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Пакетите не могат да бъдат получени"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Няма резултати"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Няма обновяване"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Изчакващи"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Пакети с текстури"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "The package $1 was not found."
+msgstr "Добавката $1/$2 не е намерена."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Премахване"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Обновяване"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Обновяване всички [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Вижте повече в браузъра"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Необходимо е да инсталирате игра преди да инсталирате модификация"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 и $2 зависимости ще бъдат инсталирани."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 от $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 задължителни зависимости не могат да бъдат намерени."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 ще бъдат инсталирани, а $2 зависимости ще бъдат пропуснати."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Вече инсталирано"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Основна игра:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Отказ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"Съдържанието от ContentDB не е налично, когато Minetest е компилиран без cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Зависимости:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Изтегляне…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Грешка при инсталиране на „$1“: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Грешка при изтеглянето на „$1“"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Грешка при изтеглянето на $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Грешка при извличане на „$1“ (неподдържан вид на файл или повреден архив)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Игри"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Инсталиране"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Инсталиране $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Инсталиране на липсващи зависимости"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Зареждане…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Модификации"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Пакетите не могат да бъдат получени"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Няма резултати"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Няма обновяване"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Не е намерено"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Презаписване"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Уверете се, че основната игра е правилна."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Изчакващи"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "„$1“ вече съществува. Да бъде ли презаписан?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Пакети с текстури"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "The package $1 was not found."
-msgstr "Добавката $1/$2 не е намерена."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Премахване"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Обновяване"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Обновяване всички [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Вижте повече в браузъра"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Необходимо е да инсталирате игра преди да инсталирате модификация"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Презаписване"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,10 +464,20 @@ msgstr "Създаване"
 msgid "Decorations"
 msgstr "Декорации"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Тестът за разработка е предназначен за разработчици."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Подземия"
@@ -834,10 +854,6 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Промяна на клавиши"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -847,7 +863,8 @@ msgstr "Разговори"
 msgid "Clear"
 msgstr "Изчистване"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1062,6 +1079,16 @@ msgstr "Инсталиране $1"
 msgid "Install games from ContentDB"
 msgstr "Инсталиране на игри от ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Създаване"
@@ -1095,8 +1122,9 @@ msgid "Start Game"
 msgstr "Създаване на игра"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Няма инсталирани игри."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Необходимо е да инсталирате игра преди да инсталирате модификация"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1177,18 +1205,10 @@ msgstr "Зареждане на текстури…"
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Грешка при свързване (изтекло време?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Играта не може да бъде намерена или заредена: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Главно меню"
@@ -1213,7 +1233,11 @@ msgstr "Файлът с пароли не се отваря: "
 msgid "Provided world path doesn't exist: "
 msgstr "Зададеният път към света не съществува: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медия…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1221,18 +1245,10 @@ msgstr ""
 "\n"
 "Прегледайте debug.txt за повече информация."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Адрес: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Режим: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Обществен: "
@@ -1268,10 +1284,6 @@ msgstr "Автоматичното движение напред е включе
 msgid "Block bounds hidden"
 msgstr "Контурите на блоковете са скрити"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Контурите на всички блокове са видими"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Контурите на текущия блок са видими"
@@ -1319,6 +1331,10 @@ msgstr "Изпълняване на скриптове от страната н
 msgid "Connecting to server..."
 msgstr "Свързване със сървър…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Грешка при свързване (изтекло време?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Грешка във връзката поради неизвестна причина"
@@ -1327,46 +1343,13 @@ msgstr "Грешка във връзката поради неизвестна 
 msgid "Continue"
 msgstr "Продължаване"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Управление:\n"
-"- %s: движение напред\n"
-"- %s: движение назад\n"
-"- %s: движение наляво\n"
-"- %s: движение надясно\n"
-"- %s: скачане/катерене\n"
-"- %s: копаене/удар\n"
-"- %s: поставяне/използване\n"
-"- %s: промъкване/слизане\n"
-"- %s: пускане на предмет\n"
-"- %s: инвентар\n"
-"- мишка: завъртане/разглеждане\n"
-"- колелце мишка: избор на предмет\n"
-"- %s: разговор\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1446,6 +1429,11 @@ msgstr "Мъглата е изключена"
 msgid "Fog enabled"
 msgstr "Мъглата е включена"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Мащабирането е спряно или от играта, или от модификация"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Информация за играта:"
@@ -1466,10 +1454,6 @@ msgstr "Дефиниции на предмети…"
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Медия…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1627,10 +1611,6 @@ msgstr "Показани са телените рамки"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Мащабирането е спряно или от играта, или от модификация"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "добре"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1961,6 +1941,15 @@ msgstr "Картата е в режим на повърхност, мащаб x%
 msgid "Minimap in texture mode"
 msgstr "Картата е в режим на текстура"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Грешка при отваряне на страница"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2151,6 +2140,19 @@ msgstr "Мащабиране"
 msgid "press key"
 msgstr "избор бутон"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Грешка при отваряне на страница"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Променяне"
@@ -2184,6 +2186,7 @@ msgstr "Сила на звука: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "bg"
 
@@ -2370,12 +2373,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr "Добавят се отломки при копане на възел."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2399,6 +2396,10 @@ msgstr "Име на света"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2454,6 +2455,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2475,12 +2487,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2545,6 +2566,10 @@ msgstr "Биоми"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2760,6 +2785,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2895,10 +2926,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2948,6 +2975,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3134,6 +3174,11 @@ msgstr "Включване всички"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Получаване на щети"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3153,6 +3198,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3195,6 +3244,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3218,6 +3271,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Сензорен екран"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3226,12 +3284,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3261,6 +3313,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4058,9 +4123,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4207,10 +4273,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4259,7 +4321,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4294,10 +4358,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr "Брой нишки, създаващи мрежата от блокове"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4540,6 +4600,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4608,6 +4672,11 @@ msgstr "Чувствителност на мишката"
 msgid "Mouse sensitivity multiplier."
 msgstr "Множител на чувствителността на мишката."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Праг на докосване: (px)"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4720,10 +4789,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4736,6 +4801,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4845,6 +4914,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Съотношението на големи пещери, съдържащи течности."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Изданието на протокола не съвпада. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4860,6 +4938,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5050,8 +5132,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5176,7 +5258,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5209,6 +5291,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5248,8 +5334,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5319,13 +5404,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5361,7 +5439,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5382,6 +5460,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Звукът е заглушен"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5538,17 +5625,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5559,6 +5666,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5587,7 +5700,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5644,6 +5757,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5695,12 +5812,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr "Множител на чувствителността на мишката."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Праг на докосване: (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5738,7 +5854,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5836,10 +5954,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Потребителски интерфейси"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5926,12 +6040,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Осветяване на възел"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6168,12 +6295,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Адрес: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Творчески режим: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Щети: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid "3D Clouds"
 #~ msgstr "Тримерни облаци"
 
@@ -6186,6 +6319,12 @@ msgstr ""
 #~ msgid "Autosave Screen Size"
 #~ msgstr "Авт. запазване на размера"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Контурите на всички блокове са видими"
+
+#~ msgid "Change Keys"
+#~ msgstr "Промяна на клавиши"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Промяна на клавиши"
@@ -6199,6 +6338,38 @@ msgstr ""
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Управлява скоростта на потъване в течности."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Управление:\n"
+#~ "- %s: движение напред\n"
+#~ "- %s: движение назад\n"
+#~ "- %s: движение наляво\n"
+#~ "- %s: движение надясно\n"
+#~ "- %s: скачане/катерене\n"
+#~ "- %s: копаене/удар\n"
+#~ "- %s: поставяне/използване\n"
+#~ "- %s: промъкване/слизане\n"
+#~ "- %s: пускане на предмет\n"
+#~ "- %s: инвентар\n"
+#~ "- мишка: завъртане/разглеждане\n"
+#~ "- колелце мишка: избор на предмет\n"
+#~ "- %s: разговор\n"
+
 #~ msgid "Creative"
 #~ msgstr "Творчески"
 
@@ -6287,9 +6458,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Без миникарта"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Осветяване на възел"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Ограждане на възел"
 
@@ -6394,8 +6562,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Умряхте."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Няма инсталирани игри."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "добре"
diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index a59d1a59a..05110e062 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Catalan (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-11-20 05:12+0000\n"
 "Last-Translator: Spurnita <joaquim.puig@upc.edu>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Comanda no disponible: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Obteniu ajuda per a les comandes"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "ho tot."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[tot | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "D'acord"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<cap disponible>"
@@ -106,6 +104,10 @@ msgstr "S'ha produït un error:"
 msgid "Main menu"
 msgstr "Menú principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "D'acord"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Torneu a connectar"
@@ -135,21 +137,30 @@ msgstr "Nosaltres sols suportem la versió $1 del protocol."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Error instal·lant \"$1\": $2"
+
+#: builtin/mainmenu/content/contentdb.lua
 #, fuzzy
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" ja existeix. Vols sobreescriure-la?"
+msgid "Failed to download \"$1\""
+msgstr "Error al instal·lar $1 en $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Les dependències $1 i $2 s'instal·laran ."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
 #, fuzzy
-msgid "$1 by $2"
-msgstr "$1 per $2"
+msgid "Failed to download $1"
+msgstr "Error al instal·lar $1 en $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"\n"
+"Instal·lar mod: Format de arxiu \"$1\" no suportat o arxiu corrupte"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -157,176 +168,174 @@ msgstr ""
 "$1 descarregant,\n"
 "$2 en cua"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Carregant ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 dependències requerides no s'han pogut trobar."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "s'instal·laran $1, i es saltaran $2 dependències."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "All packages"
 msgstr "Tots els paquets"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Already installed"
-msgstr "La tecla s'està utilitzant"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "Back to Main Menu"
 msgstr "Menú principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Base Game:"
-msgstr "Ocultar Joc"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
-#: builtin/mainmenu/dlg_delete_content.lua
-#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
-#: builtin/mainmenu/dlg_rename_modpack.lua
-#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
-msgid "Cancel"
-msgstr "Cancel·lar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB no és disponible quan Minetest s'ha compilat sense cURL"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-msgid "Dependencies:"
-msgstr "Dependències:"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "Downloading..."
 msgstr "Carregant ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Error instal·lant \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Error al instal·lar $1 en $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download $1"
-msgstr "Error al instal·lar $1 en $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
 msgstr ""
-"\n"
-"Instal·lar mod: Format de arxiu \"$1\" no suportat o arxiu corrupte"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Games"
 msgstr "Jocs"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install"
 msgstr "Instal·lar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Install $1"
-msgstr "Instal·lar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Install missing dependencies"
-msgstr "Dependències opcionals:"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
 msgid "Loading..."
 msgstr "Carregant ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Mods"
 msgstr "Mods"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "No packages could be retrieved"
 msgstr "No s'ha pogut obtenir cap paquet"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #: builtin/mainmenu/settings/dlg_settings.lua
 #, fuzzy
 msgid "No results"
 msgstr "Cap resultat"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "No updates"
 msgstr "Cap actualització"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Not found"
-msgstr "No s'ha trobat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sobreescriure"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Please check that the base game is correct."
-msgstr "Si us plau, comproveu que el joc base és correcte."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Queued"
 msgstr "En cua"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "Texture packs"
 msgstr "Textures"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "The package $1 was not found."
 msgstr "El paquet $1/$2 no s'ha trobat."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
 #, fuzzy
 msgid "Uninstall"
 msgstr "Instal·lar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
 msgid "Update"
 msgstr "Actualitza"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Update All [$1]"
 msgstr "Actualització Tot [$1]"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "View more information in a web browser"
 msgstr "Veure més informació en un navegador web"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "You need to install a game before you can install a mod"
 msgstr "Heu d'instal·lar un joc abans d'instal·lar un mod"
 
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Les dependències $1 i $2 s'instal·laran ."
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "$1 by $2"
+msgstr "$1 per $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependències requerides no s'han pogut trobar."
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "s'instal·laran $1, i es saltaran $2 dependències."
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "La tecla s'està utilitzant"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Ocultar Joc"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Dependencies:"
+msgstr "Dependències:"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instal·lar"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Dependències opcionals:"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Not found"
+msgstr "No s'ha trobat"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr "Si us plau, comproveu que el joc base és correcte."
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+#, fuzzy
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" ja existeix. Vols sobreescriure-la?"
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sobreescriure"
+
 #: builtin/mainmenu/content/pkgmgr.lua
 #, fuzzy
 msgid "$1 (Enabled)"
@@ -492,6 +501,10 @@ msgstr "Crear"
 msgid "Decorations"
 msgstr "Informació del mod:"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
@@ -499,6 +512,12 @@ msgstr ""
 "Advertència: El joc \"Minimal development test\" esta dissenyat per a "
 "desenvolupadors."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
@@ -879,10 +898,6 @@ msgstr ""
 msgid "Back"
 msgstr "Enrere"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Configurar Controls"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -892,7 +907,8 @@ msgstr "Xat"
 msgid "Clear"
 msgstr "Netejar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controls"
 
@@ -1112,6 +1128,16 @@ msgstr "Instal·lar"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nou"
@@ -1148,8 +1174,8 @@ msgstr "Ocultar Joc"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
-msgid "You have no games installed."
-msgstr "No tens subjocs instal·lats."
+msgid "You need to install a game before you can create a world."
+msgstr "Heu d'instal·lar un joc abans d'instal·lar un mod"
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1236,19 +1262,11 @@ msgstr "Carregant textures ..."
 msgid "Rebuilding shaders..."
 msgstr "Reconstruint ombreig ..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Error de connexió (¿temps esgotat?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "No es pot trobar o carregar el joc \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "El Joc especificat no és vàlid."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menú principal"
@@ -1273,7 +1291,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr "La ruta del món especificat no existeix: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media ..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1281,20 +1303,10 @@ msgstr ""
 "\n"
 "Comprovi debug.txt per a detalls."
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Address: "
-msgstr "Adreça BIND"
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Port: "
-msgstr "Port"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Public: "
@@ -1333,10 +1345,6 @@ msgstr "Tecla Avançar"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1386,6 +1394,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Connectant al servidor ..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Error de connexió (¿temps esgotat?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1394,44 +1406,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controls predeterminats:\n"
-"- WASD: moure\n"
-"- Espai: botar / pujar\n"
-"- Maj .: puntetes / baixar\n"
-"- Q: deixar anar objecte\n"
-"- I: inventari\n"
-"- Ratolí: girar / mirar\n"
-"- Ratolí esq .: excavar / colpejar\n"
-"- Ratolí dre .: col·locar / utilitzar\n"
-"- Roda ratolí: triar objecte\n"
-"- T: xat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1528,6 +1510,10 @@ msgstr "Desactivat"
 msgid "Fog enabled"
 msgstr "Activat"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1550,10 +1536,6 @@ msgstr "Definicions d'objectes ..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media ..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1714,10 +1696,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "Acceptar"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -2059,6 +2037,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Error al instal·lar $1 en $2"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2261,6 +2248,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "Premsa una tecla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Error al instal·lar $1 en $2"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Canviar"
@@ -2295,6 +2295,7 @@ msgstr "Volum de so: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ca"
 
@@ -2503,14 +2504,6 @@ msgstr "Rang d'enviament de l'objecte actiu"
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajustar la configuració de punts per polsada (dpi) a la teva pantalla (no "
-"X11/Sols Android) Ex. per a pantalles amb 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2534,6 +2527,10 @@ msgstr "Nom del món"
 msgid "Advanced"
 msgstr "Avançat"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2592,6 +2589,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2613,12 +2621,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2686,6 +2703,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2916,6 +2937,12 @@ msgstr "Boira de color"
 msgid "Colored shadows"
 msgstr "Boira de color"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3061,10 +3088,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI (punts per polsada)"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Debug log file size threshold"
@@ -3116,6 +3139,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3305,6 +3341,11 @@ msgstr "Activar tot"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Permetre Danys"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3324,6 +3365,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3366,6 +3411,11 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Habilitar l'entrada aleatòria d'usuari (només utilitzat per testing)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Habilitar l'entrada aleatòria d'usuari (només utilitzat per testing)."
@@ -3389,6 +3439,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Llindar tàctil (px)"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3397,12 +3452,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3432,6 +3481,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4239,9 +4301,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4391,10 +4454,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4443,7 +4502,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4478,10 +4539,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4733,6 +4790,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Interval de repetició del click dret"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4801,6 +4863,11 @@ msgstr "Sensibilitat del ratolí"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplicador de sensibilitat del ratolí."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Llindar tàctil (px)"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4910,10 +4977,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4926,6 +4989,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5037,6 +5104,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Desajust de la versió del protocol. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5052,6 +5128,10 @@ msgstr ""
 msgid "Random input"
 msgstr "Entrada aleatòria"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5246,8 +5326,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5388,7 +5468,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5421,6 +5501,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5461,8 +5545,7 @@ msgstr "Ombres"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5532,13 +5615,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5575,7 +5651,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Suavitza la rotació de la càmera en mode cinematogràfic. 0 per deshabilitar."
 
@@ -5601,6 +5677,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Radi del núvol"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Volum del so"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5758,17 +5843,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5779,6 +5884,15 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"El temps en segons que es pren entre la repetició de clicks drets quan "
+"s'està mantenint el botó dret del ratolí."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5805,7 +5919,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5868,6 +5982,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5917,15 +6035,15 @@ msgstr "Sensibilitat del ratolí"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Multiplicador de sensibilitat del ratolí."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Llindar tàctil (px)"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Moviment de les Fulles"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5961,7 +6079,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6060,10 +6180,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6151,12 +6267,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Node ressaltat"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6401,6 +6530,10 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "- Address: "
+#~ msgstr "Adreça BIND"
+
 #, fuzzy
 #~ msgid "- Creative Mode: "
 #~ msgstr "Mode Creatiu"
@@ -6409,6 +6542,10 @@ msgstr ""
 #~ msgid "- Damage: "
 #~ msgstr "Dany"
 
+#, fuzzy
+#~ msgid "- Port: "
+#~ msgstr "Port"
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6444,6 +6581,13 @@ msgstr ""
 #~ "Tingueu en compte que el camp d'adreça en el menú principal invalida "
 #~ "aquest paràmetre."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajustar la configuració de punts per polsada (dpi) a la teva pantalla (no "
+#~ "X11/Sols Android) Ex. per a pantalles amb 4K."
+
 #, fuzzy
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -6495,6 +6639,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Tecla alternativa per a l'actualització de la càmera"
 
+#~ msgid "Change Keys"
+#~ msgstr "Configurar Controls"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Configurar Controls"
@@ -6536,6 +6683,35 @@ msgstr ""
 #~ msgstr ""
 #~ "Controla l'amplada dels túnels, un valor més petit crea túnels més amples."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controls predeterminats:\n"
+#~ "- WASD: moure\n"
+#~ "- Espai: botar / pujar\n"
+#~ "- Maj .: puntetes / baixar\n"
+#~ "- Q: deixar anar objecte\n"
+#~ "- I: inventari\n"
+#~ "- Ratolí: girar / mirar\n"
+#~ "- Ratolí esq .: excavar / colpejar\n"
+#~ "- Ratolí dre .: col·locar / utilitzar\n"
+#~ "- Roda ratolí: triar objecte\n"
+#~ "- T: xat\n"
+
 #, fuzzy
 #~ msgid "Creative"
 #~ msgstr "Crear"
@@ -6546,6 +6722,9 @@ msgstr ""
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Color del punt de mira (R, G, B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI (punts per polsada)"
+
 #~ msgid "Damage"
 #~ msgstr "Dany"
 
@@ -6638,6 +6817,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Instal·lar mod: Arxiu: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "El Joc especificat no és vàlid."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tecla Inventari"
 
@@ -7237,9 +7419,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Sense MipMap"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Node ressaltat"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Nodes ressaltats"
 
@@ -7375,5 +7554,12 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Has mort."
 
+#, fuzzy
+#~ msgid "You have no games installed."
+#~ msgstr "No tens subjocs instal·lats."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "Acceptar"
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index b8826bac3..5675eb55f 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -2,17 +2,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Czech (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-06-19 10:48+0000\n"
-"Last-Translator: Robinson <simekm@yahoo.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-02 22:09+0000\n"
+"Last-Translator: Honzapkcz <honzapkc@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
 "cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.18.1\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Příkaz není k dispozici: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Získat nápovědu pro příkazy"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "pro celý výpis."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <příkaz>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Dobře"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<nic k dispozici>"
@@ -105,6 +103,10 @@ msgstr "Nastala chyba:"
 msgid "Main menu"
 msgstr "Hlavní nabídka"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Dobře"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Znovu se připojit"
@@ -133,19 +135,28 @@ msgstr "Podporujeme pouze protokol verze $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podporujeme verze protokolů mezi $1 a $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" již existuje. Chcete jej přepsat?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Chyba při instalování $1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Nainstaluje se $1 a $2 závislostí."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Selhalo stažení „$1“"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 od $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Selhalo stažení $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Nepodařilo se rozbalit „$1“ (nepodporovaný typ souboru, nebo poškozený "
+"archiv)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +164,158 @@ msgstr ""
 "$1 se stahuje,\n"
 "$2 čeká ve frontě"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 se stahuje..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 nutných závislostí nebylo nalezeno."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 závislostí bude nainstalováno a $2 bude vynecháno."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Všechny balíčky"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Již nainstalováno"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Zpět do hlavní nabídky"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"ContentDB není přístupná pokud byl Minetest kompilován bez použití cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Stahuji..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Chyba získávání závislostí balíčku"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Hry"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalovat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Načítaní..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mody"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nelze načíst žádný balíček"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Žádné výsledky"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Žádné aktualizace"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Ve frontě"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Balíčky textur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Balíček $1 nebyl nalezen."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Odinstalovat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Aktualizovat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Aktualizovat vše [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Zobrazit více informací v prohlížeči"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Musíš nainstalovat hru před tím než budeš moct instalovat mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Nainstaluje se $1 a $2 závislostí."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 od $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 nutných závislostí nebylo nalezeno."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 závislostí bude nainstalováno a $2 bude vynecháno."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Již nainstalováno"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Základní hra:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"ContentDB není přístupná pokud byl Minetest kompilován bez použití cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Závislosti:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Stahuji..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Chyba při instalování $1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Selhalo stažení „$1“"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Selhalo stažení $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Nepodařilo se rozbalit „$1“ (nepodporovaný typ souboru, nebo poškozený "
-"archiv)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Hry"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalovat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalovat $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalovat chybějící závislosti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Načítaní..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mody"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nelze načíst žádný balíček"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Žádné výsledky"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Žádné aktualizace"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Nenalezeno"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Přepsat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Ověř prosím, zda je základní hra v pořádku."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Ve frontě"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" již existuje. Chcete jej přepsat?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Balíčky textur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Odinstalovat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Aktualizovat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Aktualizovat vše [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Zobrazit více informací v prohlížeči"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Přepsat"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -453,10 +463,22 @@ msgstr "Vytvořit"
 msgid "Decorations"
 msgstr "Dekorace"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Pouštní chrámy"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test je určen pro vývojáře."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Různé varianty žalářů generované v pouštních biomech (pouze když jsou žaláře "
+"povoleny)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Žaláře"
@@ -651,7 +673,7 @@ msgstr "Registrovat"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Odmítnout"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -659,16 +681,20 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Po dlouhou dobu, Minetest engine byl dodáván s výchozí hrou „Minetest hra“. "
+"Od verze 5.8.0 už Minetest s touto hrou dodáván není."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Pokud chceš pokračovat v hraní tvých světů Menetest Hry, tak si ji musíš "
+"přeinstalovat."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Hra už není instalována jako výchozí"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 #, fuzzy
@@ -821,20 +847,16 @@ msgstr "vyhlazení"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Použít jazyk systému)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Přístupnost"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Zpět"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Změnit klávesy"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -844,7 +866,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Ovládání"
 
@@ -864,7 +887,7 @@ msgstr "Obnovit výchozí"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Vrátit nastavení do původního stavu ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -872,7 +895,7 @@ msgstr "Vyhledat"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Zobrazit pokročilé nastavení"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -892,11 +915,11 @@ msgstr "Obsah: mody"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(Hra bude muset také povolit stíny)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Vlastní"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -949,7 +972,7 @@ msgstr "Hlavní členové týmu"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Irrlicht zařízení:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -1054,6 +1077,16 @@ msgstr "Instalovat hru"
 msgid "Install games from ContentDB"
 msgstr "Instalovat hry z ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest není dodáván s výchozí hrou."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nový"
@@ -1087,8 +1120,8 @@ msgid "Start Game"
 msgstr "Spuštění hry"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nemáte nainstalované žádné hry."
+msgid "You need to install a game before you can create a world."
+msgstr "Musíš si nainstalovat hru před tím než si můžeš vytvořit svět."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1167,18 +1200,10 @@ msgstr "Načítám textury..."
 msgid "Rebuilding shaders..."
 msgstr "Sestavuji shadery..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Chyba spojení (vypršel čas?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Hru nebylo možné najít nebo načíst: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Neplatná specifikace hry."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hlavní nabídka"
@@ -1204,7 +1229,11 @@ msgstr "Soubor s heslem nebylo možné otevřít: "
 msgid "Provided world path doesn't exist: "
 msgstr "Uvedená cesta ke světu neexistuje: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Média..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1212,18 +1241,10 @@ msgstr ""
 "\n"
 "Detaily naleznete v souboru debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresa: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mód: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Veřejný: "
@@ -1258,10 +1279,6 @@ msgstr "Automatický posun vpřed povolen"
 msgid "Block bounds hidden"
 msgstr "Ohraničení bloku skryto"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Zobrazit hranice bloku u všech bloků"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Zobrazit hranice bloku u aktuálního bloku"
@@ -1307,6 +1324,10 @@ msgstr "Uživatelské skripty nejsou povoleny"
 msgid "Connecting to server..."
 msgstr "Připojuji se k serveru..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Chyba spojení (vypršel čas?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Spojení selhalo z neznámého důvodu"
@@ -1315,47 +1336,14 @@ msgstr "Spojení selhalo z neznámého důvodu"
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Ovládání:\n"
-"- %s: pohyb dopředu\n"
-"- %s: pohyb dozadu\n"
-"- %s: pohyb doleva\n"
-"- %s: pohyb doprava\n"
-"- %s: skok/výstup\n"
-"- %s: těžit/uhodit\n"
-"- %s: umístit/použít\n"
-"- %s: plížení/sestup\n"
-"- %s: zahození předmětu\n"
-"- %s: inventář\n"
-"- Myš: otáčení/rozhlížení\n"
-"- Kolečko myši: výběr předmětu\n"
-"- %s: chat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1447,6 +1435,11 @@ msgstr "Mlha je zakázána"
 msgid "Fog enabled"
 msgstr "Mlha je povolena"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Přiblížení je aktuálně zakázáno"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informace o hře:"
@@ -1467,10 +1460,6 @@ msgstr "Definice věcí..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Média..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1628,10 +1617,6 @@ msgstr "Obrysy zobrazeny"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Přiblížení je aktuálně zakázáno"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "OK"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chat je zakázaný hrou, nebo modem"
@@ -1696,7 +1681,7 @@ msgstr "Vymazat"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Šipka Dolů"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1932,7 +1917,7 @@ msgstr "Tabulátor"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Šipka Nahoru"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1965,6 +1950,15 @@ msgstr "Minimapa v režimu Povrch, Přiblížení x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapa v režimu Textura"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Nepodařilo se otevřít webovou stránku"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Shadery jsou povoleny ale GLSL není podporovaný driverem."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2157,6 +2151,19 @@ msgstr "Přiblížení"
 msgid "press key"
 msgstr "stiskni klávesu"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Otevřít"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Otevřít odkaz?"
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Nepodařilo se otevřít webovou stránku"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Změnit"
@@ -2190,6 +2197,7 @@ msgstr "Hlasitost: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "cs"
 
@@ -2277,7 +2285,7 @@ msgstr "2D šum, který umisťuje říční koryta a kanály."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2412,14 +2420,6 @@ msgstr "Odesílací rozsah aktivních bloků"
 msgid "Adds particles when digging a node."
 msgstr "Aktivuje částicové efekty při těžení bloku."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Upraví nastavení DPI pro vaši obrazovku (není pro X11/Android). Pro použití "
-"například s 4k obrazovkami."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2449,6 +2449,10 @@ msgstr "Jméno správce"
 msgid "Advanced"
 msgstr "Pokročilé"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Povolí průhledné kapaliny."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2509,6 +2513,17 @@ msgstr "Dodatkový název položky v popisku."
 msgid "Apple trees noise"
 msgstr "Použít stromový šum"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Setrvačnost ruky"
@@ -2526,18 +2541,37 @@ msgid "Ask to reconnect after crash"
 msgstr "Zeptat se na znovupřipojení po havárii"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"V této vzdálenosti bude server razantně optimalizovat výběr bloků,\n"
+"které pošle klientům.\n"
+"Malé hodnoty mohou zlepšit výkon, však mohou také způsobit chyby\n"
+"ve vykreslování (některé bloky, zvláště pod vodou, v jeskyních\n"
+"a někdy i na zemi, nebudou vykresleny).\n"
+"Nastavení této hodnoty vyšší než max_block_send_distance zakáže vypne\n"
+"tuto optimalizaci.\n"
+"Jednotkou je mapblok (16 bloků)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "V této vzdálenosti bude server razantně optimalizovat výběr bloků,\n"
 "které pošle klientům.\n"
@@ -2610,6 +2644,11 @@ msgstr "Biomy"
 msgid "Biome noise"
 msgstr "Šum biomů"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Optimalizace vzdálenosti vysílání bloku"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Optimalizace vzdálenosti vysílání bloku"
@@ -2828,6 +2867,15 @@ msgstr "Barevná mlha"
 msgid "Colored shadows"
 msgstr "Zbarvené stíny"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Čárkou oddělený seznam všech AL a ALC rozšíření které by něměly být použity."
+"\n"
+"Užitečné pro testování. Podívejte se do al_extensions.[h,cpp] pro detaily."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2992,10 +3040,6 @@ msgstr ""
 "Barva zaměřovače (R,G,B).\n"
 "Také určuje barvu zaměřovače"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Práh velikosti souboru s ladícími informacemi"
@@ -3050,6 +3094,24 @@ msgstr ""
 "Simuluje efekt měkkých stínů použitím PCF nebo Poissonova disku,\n"
 "ale také využívá více prostředků počítače."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Zapněte pro zakázání připojení starých klientů.\n"
+"Starší klienti jsou kompatibilní v takovém smyslu, že při připojení k novým "
+"serverům\n"
+"nehavarují, ale nemusí podporovat všechny vlastnosti, které byste očekával/a."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Určuje oblasti, kde stromy nesou plody."
@@ -3250,6 +3312,11 @@ msgstr "Zapnout shader „Bloom“"
 msgid "Enable Bloom Debug"
 msgstr "Povolit ladění shaderu „Bloom“"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Povolit zranění"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3276,6 +3343,11 @@ msgstr ""
 "Pokud je zapnuto, využívá Poissonův disk pro generování \"měkkých stínů\". V "
 "opačném případě je využito filtrování PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Post processing"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Povolit „Raytraced Culling“"
@@ -3325,6 +3397,11 @@ msgstr "Zapnout zabezpečení módů"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Povolit náhodný uživatelský vstup (pouze pro testování)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Povolit náhodný uživatelský vstup (pouze pro testování)."
@@ -3354,6 +3431,11 @@ msgstr ""
 "serverům\n"
 "nehavarují, ale nemusí podporovat všechny vlastnosti, které byste očekával/a."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Dotyková obrazovka"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3365,14 +3447,6 @@ msgstr ""
 "Vzdálené servery nabízejí výrazně rychlejší způsob, jak stáhnout\n"
 "média (např. textury) při připojování k serveru."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Zapnout objekty vyrovnávací paměti vertexů.\n"
-"Toto by mělo výrazně zlepšit grafický výkon."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3411,6 +3485,19 @@ msgstr "Povolí animaci věcí v inventáři."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Zapnout cachování geom. sítí otočených pomocí facedir."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4346,10 +4433,12 @@ msgstr ""
 "-   Neprůhledné: vypne průhlednost"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Délka „tiku“ serveru a interval, ve kterém jsou objekty obecně "
 "aktualizovány \n"
@@ -4526,10 +4615,6 @@ msgstr ""
 "Barva mlhy a oblohy záleží na denní době (svítání/soumrak) a na směru "
 "pohledu."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Udělá všechny kapaliny neprůhledné"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Úroveň komprese mapy pro pevné úložiště"
@@ -4585,11 +4670,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Parametry generování mapy pro Generátor mapy v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Parametry generování mapy pro Generátor mapy v6.\n"
 "Nastavení \"snowbiomes\" umožňuje systém 5 biomů.\n"
@@ -4632,10 +4720,6 @@ msgstr "Prodleva generování sítě mapbloků"
 msgid "Mapblock mesh generation threads"
 msgstr "Vlákna generování sítě mapových bloků"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Velikost cache paměti v MB Generátoru mapy pro Mapbloky"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Časový limit pro vymazání Mapbloku z paměti"
@@ -4907,6 +4991,11 @@ msgstr "Minimální úroveň logování pro zápis do chatu."
 msgid "Minimap scan height"
 msgstr "Výška skenování minimapy"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Interval opakování pro umísťování"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Spodní hranice pro náhodný počet velkých jeskyní na kus mapy."
@@ -4975,6 +5064,11 @@ msgstr "Citlivost myši"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplikátor citlivosti myši."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Práh jeskynních dutin"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Šum bahna"
@@ -5119,10 +5213,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "„Side occlusion culling“ pro server"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Neprůhledné kapaliny"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5138,6 +5228,11 @@ msgstr ""
 "se, pokud je již \n"
 "otevřeno jiné okno (inventář, či jiný „formspec“)."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Ladění Generátoru mapy"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Volitelné přepsání barvy webových odkazů v chatu."
@@ -5271,6 +5366,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Poměr velkých jeskyní s kapalinami."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Neshoda verze protokolu. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5289,6 +5393,10 @@ msgstr "Zvedne terén, aby vytvořil údolí kolem řek."
 msgid "Random input"
 msgstr "Náhodný vstup"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Nedávné zprávy v chatu"
@@ -5503,8 +5611,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5644,8 +5752,9 @@ msgstr ""
 "Rozsah: od -1 do 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Nastavte jazyk. Chcete-li použít systémový jazyk, ponechte prázdné. \n"
@@ -5692,6 +5801,10 @@ msgstr ""
 "Chcete-li povolit efekt „bloom“, nastavte na hodnotu true. \n"
 "Jasné barvy budou přetékat na sousední objekty."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5745,11 +5858,11 @@ msgid "Shaders"
 msgstr "Shadery"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shadery umožňují pokročilé obrazové efekty a mohou zvýšit výkon u některých "
 "grafických \n"
@@ -5839,17 +5952,6 @@ msgstr ""
 "Změna hodnoty je pro zvláštní případy, jinak je doporučeno\n"
 "nechat ji na výchozí hodnotě."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Velikost mezipaměti MapBlock pro generátor sítě. Zvyšování tohoto\n"
-"zvýší podíl přístupů do mezipaměti, čímž se sníží množství dat kopírovaných "
-"z hlavního \n"
-"výpočetního vlákna, tzn. že se snižuje jitter."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5886,7 +5988,7 @@ msgstr "Plynulé osvětlení"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Zklidňuje otáčení kamery ve filmovém režimu. 0 pro deaktivaci."
 
 #: src/settings_translation_file.cpp
@@ -5908,6 +6010,15 @@ msgstr "Rychlost plížení, v blocích za vteřinu."
 msgid "Soft shadow radius"
 msgstr "Poloměr měkkých stínů"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Zvuk (Sound)"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB: Černá listina"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6118,6 +6229,12 @@ msgstr ""
 "Výchozí formát, ve kterém se profily ukládají, \n"
 "při volání `/profiler uložit [formát]` bez formátu."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6125,13 +6242,27 @@ msgid ""
 msgstr ""
 "Cesta pro uložení profilů, uvádí se relativně k místu uložení vašeho světa."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Identifikátor joysticku, který se má použít"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Délka trasy dotyku v pixelech potřebná k zahájení interakce s dotykovou "
 "obrazovkou."
@@ -6150,6 +6281,15 @@ msgstr ""
 "Výchozí hodnota je 1.0 (1/2 uzlu). \n"
 "Vyžaduje, aby byla povoleny vlnící se kapaliny."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Čas ve vteřinách mezi opakovaným umístěním bloku při držení \n"
+"umisťovacího tlačítka."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Síťové rozhraní, na kterém server naslouchá."
@@ -6181,11 +6321,12 @@ msgstr ""
 "To by mělo být nakonfigurováno společně s active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Platforma pro vykreslování. \n"
 "Poznámka: Po změně je vyžadován restart! \n"
@@ -6267,6 +6408,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Třetí ze 4 2D šumů, které společně určují výšku kopců / pohoří."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6323,15 +6468,15 @@ msgstr "Citlivost myši"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Multiplikátor citlivosti myši."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Práh dotykové obrazovky"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Ústupky za výkon"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Neprůhledné kapaliny"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Vzdálenost řazení průhlednosti"
@@ -6369,8 +6514,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL k souboru JSON, který poskytuje informace o nejnovější verzi Minetestu"
 
@@ -6489,10 +6637,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Uživatelská rozhraní"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "„VSync“"
@@ -6583,6 +6727,10 @@ msgstr "Virtuální joystick spouští tlačítko Aux1"
 msgid "Volume"
 msgstr "Hlasitost"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6591,6 +6739,16 @@ msgstr ""
 "Hlasitost všech zvuků. \n"
 "Vyžaduje, aby byl povolen zvukový systém."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Snímky za sekundu (FPS) při pauze či hře běžící na pozadí"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Plynulé osvětlení"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6889,12 +7047,18 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "(game support required)"
 #~ msgstr "(Vyžadována podpora hry)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresa: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreativní mód: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Zranění: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6932,6 +7096,13 @@ msgstr "cURL limit paralelních stahování"
 #~ "Nechte prázdné, pokud chcete spustit místní server.\n"
 #~ "Poznámka: pole adresy v hlavním menu přepisuje toto nastavení."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Upraví nastavení DPI pro vaši obrazovku (není pro X11/Android). Pro "
+#~ "použití například s 4k obrazovkami."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6984,6 +7155,9 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bitová hloubka (bity na pixel) v celoobrazovkovém režimu."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Zobrazit hranice bloku u všech bloků"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump mapping"
 
@@ -7005,6 +7179,9 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Klávesa pro přepínání aktualizace pohledu"
 
+#~ msgid "Change Keys"
+#~ msgstr "Změnit klávesy"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Změnit klávesy"
@@ -7063,6 +7240,38 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Ovládá šířku tunelů, menší hodnota vytváří širší tunely."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Ovládání:\n"
+#~ "- %s: pohyb dopředu\n"
+#~ "- %s: pohyb dozadu\n"
+#~ "- %s: pohyb doleva\n"
+#~ "- %s: pohyb doprava\n"
+#~ "- %s: skok/výstup\n"
+#~ "- %s: těžit/uhodit\n"
+#~ "- %s: umístit/použít\n"
+#~ "- %s: plížení/sestup\n"
+#~ "- %s: zahození předmětu\n"
+#~ "- %s: inventář\n"
+#~ "- Myš: otáčení/rozhlížení\n"
+#~ "- Kolečko myši: výběr předmětu\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativní"
 
@@ -7072,6 +7281,9 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Barva zaměřovače (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Zranění"
 
@@ -7154,6 +7366,13 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Zapnout potvrzení registrace"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Zapnout objekty vyrovnávací paměti vertexů.\n"
+#~ "Toto by mělo výrazně zlepšit grafický výkon."
+
 #~ msgid "Enabled"
 #~ msgstr "Zapnuto"
 
@@ -7456,6 +7675,9 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentace"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Neplatná specifikace hry."
+
 #~ msgid "Inventory key"
 #~ msgstr "Klávesa inventáře"
 
@@ -7996,6 +8218,12 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Main menu style"
 #~ msgstr "Skript hlavní nabídky"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Udělá všechny kapaliny neprůhledné"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Velikost cache paměti v MB Generátoru mapy pro Mapbloky"
+
 #~ msgid "Menus"
 #~ msgstr "Nabídky"
 
@@ -8182,15 +8410,22 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Simple Leaves"
 #~ msgstr "Jednoduché listí"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Velikost mezipaměti MapBlock pro generátor sítě. Zvyšování tohoto\n"
+#~ "zvýší podíl přístupů do mezipaměti, čímž se sníží množství dat "
+#~ "kopírovaných z hlavního \n"
+#~ "výpočetního vlákna, tzn. že se snižuje jitter."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Plynulé osvětlení"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Zklidňuje otáčení kamery. 0 pro deaktivaci."
 
-#~ msgid "Sound"
-#~ msgstr "Zvuk (Sound)"
-
 #~ msgid "Special"
 #~ msgstr "Speciální"
 
@@ -8241,6 +8476,10 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Mez dotyku (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Práh dotykové obrazovky"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineární filtr"
 
@@ -8287,6 +8526,9 @@ msgstr "cURL limit paralelních stahování"
 #~ "Pokud je nastaveno na 0, MSAA je zakázáno. \n"
 #~ "Po změně této možnosti je vyžadován restart."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid ""
 #~ "Version number which was last seen during an update check.\n"
 #~ "\n"
@@ -8350,8 +8592,14 @@ msgstr "cURL limit paralelních stahování"
 #~ msgid "You died."
 #~ msgstr "Zemřel jsi."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nemáte nainstalované žádné hry."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "OK"
diff --git a/po/cy/minetest.po b/po/cy/minetest.po
index 10c0ae9e0..469119626 100644
--- a/po/cy/minetest.po
+++ b/po/cy/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-03-17 11:44+0000\n"
 "Last-Translator: dreigiau <sterilgrimed23@gmail.com>\n"
 "Language-Team: Welsh <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -77,7 +77,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -86,13 +86,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Iawn"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<dim>"
@@ -109,6 +105,10 @@ msgstr ""
 msgid "Main menu"
 msgstr "Prif ddewislen"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Iawn"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Ail-gysylltu"
@@ -137,174 +137,181 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Wrthi'n lawrlwytho $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Pob pecyn"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Wedi ei osod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Wrthi'n lawrlwytho..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Gemau"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Gosod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Wrthi'n llwytho..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Addasiadau"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Dim canlyniadau"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Dim diweddariadau"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Wedi ciwio"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pecynnau adnodd"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Dadosod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Diweddaru"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Wedi ei osod"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Gêm Sylfaenol:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Canslo"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Wrthi'n lawrlwytho..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Gemau"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Gosod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Gosod $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Wrthi'n llwytho..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Addasiadau"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Dim canlyniadau"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Dim diweddariadau"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Heb ei ganfod"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Wedi ciwio"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pecynnau adnodd"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Dadosod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Diweddaru"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -450,10 +457,20 @@ msgstr "Creu"
 msgid "Decorations"
 msgstr "Addurniadau"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Dwnsiynau"
@@ -818,10 +835,6 @@ msgstr ""
 msgid "Back"
 msgstr "Bacio"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Newid Bysellau"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -831,7 +844,8 @@ msgstr "Sgwrs"
 msgid "Clear"
 msgstr "Clirio"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Rheoli"
 
@@ -1037,6 +1051,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Newydd"
@@ -1070,7 +1094,7 @@ msgid "Start Game"
 msgstr "Dechrau Gêm"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1150,18 +1174,10 @@ msgstr "Wrthi'n llwytho gweadau..."
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Prif Ddewislen"
@@ -1186,24 +1202,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Cyfryngau..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1238,10 +1250,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1286,6 +1294,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1294,32 +1306,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Parhau"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1399,6 +1392,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1419,10 +1416,6 @@ msgstr "Diffiniadau eitem..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Cyfryngau..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1578,10 +1571,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "iawn"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1912,6 +1901,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2102,6 +2100,18 @@ msgstr "Chwyddo"
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Newid"
@@ -2135,6 +2145,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "cy"
 
@@ -2320,12 +2331,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2348,6 +2353,10 @@ msgstr ""
 msgid "Advanced"
 msgstr "Uwch"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2401,6 +2410,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2422,12 +2442,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2491,6 +2520,10 @@ msgstr "Bïomau"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2703,6 +2736,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2834,10 +2873,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2887,6 +2922,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3071,6 +3119,11 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Galluogi Difrod"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3090,6 +3143,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3132,6 +3189,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3155,6 +3216,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Sgrîn gyffwrdd"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3163,12 +3229,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3198,6 +3258,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3994,9 +4067,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4142,10 +4216,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4194,7 +4264,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4229,10 +4301,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4474,6 +4542,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4542,6 +4614,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Sgrîn gyffwrdd"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4650,10 +4727,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4666,6 +4739,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4775,6 +4852,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4790,6 +4875,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4977,8 +5066,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5096,7 +5185,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5129,6 +5218,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5168,8 +5261,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5239,13 +5331,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5281,7 +5366,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5302,6 +5387,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Sain"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5458,17 +5551,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5479,6 +5592,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5505,7 +5624,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5562,6 +5681,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5610,12 +5733,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Sgrîn gyffwrdd"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5653,7 +5775,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5751,11 +5875,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync"
@@ -5842,12 +5961,24 @@ msgstr ""
 msgid "Volume"
 msgstr "Lefel"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6102,6 +6233,9 @@ msgstr ""
 #~ msgid "All Settings"
 #~ msgstr "Pob Gosodiad"
 
+#~ msgid "Change Keys"
+#~ msgstr "Newid Bysellau"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Newid Bysellau"
@@ -6109,6 +6243,9 @@ msgstr ""
 #~ msgid "Creative"
 #~ msgstr "Creadigol"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Difrod"
 
@@ -6151,9 +6288,6 @@ msgstr ""
 #~ msgid "Screen:"
 #~ msgstr "Sgrîn:"
 
-#~ msgid "Sound"
-#~ msgstr "Sain"
-
 #~ msgid "Texturing:"
 #~ msgstr "Gweadau:"
 
@@ -6163,6 +6297,10 @@ msgstr ""
 #~ msgid "Up"
 #~ msgstr "I fyny"
 
+#, fuzzy
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "X"
 #~ msgstr "X"
 
@@ -6171,3 +6309,6 @@ msgstr ""
 
 #~ msgid "Z"
 #~ msgstr "Z"
+
+#~ msgid "ok"
+#~ msgstr "iawn"
diff --git a/po/da/minetest.po b/po/da/minetest.po
index d46bb4008..e1ddc1c39 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-01-11 21:48+0000\n"
 "Last-Translator: Kristian <macrofag@protonmail.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Kommando ikke tilgængelig; "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Få hjælp til kommandoer"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "alt."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>j"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ingen tilgængelige>"
@@ -105,6 +103,10 @@ msgstr "Der skete en fejl:"
 msgid "Main menu"
 msgstr "Hovedmenu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Forbind igen"
@@ -133,19 +135,27 @@ msgstr "Vi understøtter kun protokol version $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi understøtter protokol versioner mellem $1 og $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" findes allerede. Vil du overskrive den?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Fejl ved installation af \"$1\":$2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Påkrævet grundlag for $1 og $2 vl blive installeret."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Kunne ikke hente \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 med $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Kunne ikke hente $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Kunne ikke pakke \"$1\" ud (ikke-understøttet filtype eller korrupt arkiv)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +163,159 @@ msgstr ""
 "$1 downloader.\n"
 "$2 i kø"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Henter $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
+msgstr "Alle pakker"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Tilbage til hovedmenuen"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB er ikke tilgængelig når Minetest blev compileret uden cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Henter..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installer"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Indlæser..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Der var ingen pakker at hente"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Der er ingen resultater at vise"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Ingen opdateringer"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Sat i kø"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Teksturpakker"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Afinstaller"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Opdater"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Opdater alle [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Se mere information i en webbrowser"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Påkrævet grundlag for $1 og $2 vl blive installeret."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 med $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 required dependencies could not be found."
 msgstr "Pålrævede grundlag for $1 kunne ikke findes."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 will be installed, and $2 dependencies will be skipped."
 msgstr ""
 "$1 vil blive installeret, og påkrævede grundlag for $2 vil blive sprunget "
 "over."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "All packages"
-msgstr "Alle pakker"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Already installed"
 msgstr "Allerede installeret"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Tilbage til hovedmenuen"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basisspil:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Anuller"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB er ikke tilgængelig når Minetest blev compileret uden cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Afhængigheder:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Henter..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Fejl ved installation af \"$1\":$2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Kunne ikke hente \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Kunne ikke hente $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Kunne ikke pakke \"$1\" ud (ikke-understøttet filtype eller korrupt arkiv)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installer"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installér $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installér manglende grundlag"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Indlæser..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Der var ingen pakker at hente"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Der er ingen resultater at vise"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Ingen opdateringer"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Kontrollér venlist, at basisspillet er korrekt."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Sat i kø"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" findes allerede. Vil du overskrive den?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Teksturpakker"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Afinstaller"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Opdater"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Opdater alle [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Se mere information i en webbrowser"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Overskriv"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,10 +464,20 @@ msgstr "Skab"
 msgid "Decorations"
 msgstr "Udsmykninger"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Udvklingstest er tiltænkt udviklere."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Fangehuller"
@@ -833,10 +853,6 @@ msgstr ""
 msgid "Back"
 msgstr "Tilbage"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Skift tastatur-bindinger"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,7 +862,8 @@ msgstr "Snak"
 msgid "Clear"
 msgstr "Ryd"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Styring"
 
@@ -1056,6 +1073,16 @@ msgstr "Installér et spil"
 msgid "Install games from ContentDB"
 msgstr "Installer spil fra ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Ny"
@@ -1089,8 +1116,8 @@ msgid "Start Game"
 msgstr "Start spil"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Du har ikke installeret nogle spil."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1169,18 +1196,10 @@ msgstr "Indlæser teksturer..."
 msgid "Rebuilding shaders..."
 msgstr "Genbygger dybdeskabere ..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Forbindelses fejl (udløbelse af tidsfrist?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Kunne ikke finde eller indlæse spillet: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Ugyldig spilspecifikationer."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hovedmenu"
@@ -1206,7 +1225,11 @@ msgstr "Angivne kodeordsfil kunne ikke åbnes: "
 msgid "Provided world path doesn't exist: "
 msgstr "Angivne sti til verdenen findes ikke: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medier..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1214,18 +1237,10 @@ msgstr ""
 "\n"
 "Tjek debug.txt for detaljer."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresse: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Tilstand: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Offentlig: "
@@ -1260,10 +1275,6 @@ msgstr "Automatisk viderestilling slået til"
 msgid "Block bounds hidden"
 msgstr "Blokafgrænsning skjult"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blokafgrænsning vist for alle blokke"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blokafgrænsning vist for nuværende blok"
@@ -1309,6 +1320,10 @@ msgstr "Scripting på klientside er slået fra"
 msgid "Connecting to server..."
 msgstr "Forbinder til server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Forbindelses fejl (udløbelse af tidsfrist?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Forbindelsen slog fejl af ukendt årsag"
@@ -1317,45 +1332,14 @@ msgstr "Forbindelsen slog fejl af ukendt årsag"
 msgid "Continue"
 msgstr "Fortsæt"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Styring:\n"
-"- %s: bevæg dig fremad\n"
-"- %s: bevæg dig baglæns\n"
-"- %s: bevæg dig til venstre\n"
-"- %s: bevæg dig til højre\n"
-"- %s: hoppe/klatre\n"
-"- %s: snige/gå nedad\n"
-"- %s: smid genstand\n"
-"- %s: Oppakning\n"
-"- Mus: vend rundt/kig\n"
-"- Musehjul: vælg genstand\n"
-"- %s: skriven (chat)\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1447,6 +1431,11 @@ msgstr "Tåge deaktiveret"
 msgid "Fog enabled"
 msgstr "Tåge aktiveret"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom er i øjeblikket slået fra af spil eller mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spilinfo:"
@@ -1467,10 +1456,6 @@ msgstr "Elementdefinitioner ..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medier..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1628,10 +1613,6 @@ msgstr "Wireramme vist"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom er i øjeblikket slået fra af spil eller mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1966,6 +1947,15 @@ msgstr "Minikort i overfladetilstand, zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minikort i texturtilstand"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Kunne ikke hente hjemmesiden"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2162,6 +2152,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "Tryk på en tast"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Kunne ikke hente hjemmesiden"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Skift"
@@ -2195,6 +2198,7 @@ msgstr "Lydstyrke: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "da"
 
@@ -2405,14 +2409,6 @@ msgstr "Aktivt objektafsendelsesinterval"
 msgid "Adds particles when digging a node."
 msgstr "Tilføjer partikler, når man graver en blok."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Justér DPI-konfigurationen til din skærm (ikke-X11 / kun Android) f.eks. til "
-"4k-skærme."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2436,6 +2432,10 @@ msgstr "Verdens navn"
 msgid "Advanced"
 msgstr "Avanceret"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2494,6 +2494,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr "Æbletræsstøj"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2515,12 +2526,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2591,6 +2611,10 @@ msgstr "Biomer"
 msgid "Biome noise"
 msgstr "Biom støj"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2825,6 +2849,12 @@ msgstr "Farvet tåge"
 msgid "Colored shadows"
 msgstr "Farvet tåge"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2969,10 +2999,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Debug log file size threshold"
@@ -3024,6 +3050,24 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Aktiver for at nægte gamle klienter i at forbinde.\n"
+"Ældre klienter er kompatible på den måde, at de ikke vil stoppe ved "
+"tilkobling\n"
+"til nye servere, men de understøtter ikke alle nye funktioner."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definerer områder, hvor træerne har æbler."
@@ -3222,6 +3266,11 @@ msgstr "Aktivér alle"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Aktivér skade"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3241,6 +3290,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Aktivér joysticks"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3285,6 +3339,11 @@ msgstr "Aktiver mod-sikkerhed"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Aktiver vilkårlig brugerinddata (kun til test)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Aktiver vilkårlig brugerinddata (kun til test)."
@@ -3314,6 +3373,11 @@ msgstr ""
 "tilkobling\n"
 "til nye servere, men de understøtter ikke alle nye funktioner."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Strandstøjtærskel"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3326,12 +3390,6 @@ msgstr ""
 "eks. teksturer\n"
 "ved forbindelse til serveren."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3366,6 +3424,19 @@ msgstr "Aktiverer animation af lagerelementer."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Aktiverer mellemlagring af facedir-roterede mesher."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4284,9 +4355,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Længde på serveraktivering og intervallet som objekter opdateres efter over "
 "netværket."
@@ -4460,10 +4532,6 @@ msgstr ""
 "Tåge- og himmelfarver afhænger af tid på dagen (solopgang/solnedgang) og den "
 "sete retning."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4523,7 +4591,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Tilknyttes Mapgen v6 generation attributter specifikke.\n"
 "'Snowbiomes' flag gør det muligt for det nye 5 biom system.\n"
@@ -4572,11 +4642,6 @@ msgstr "Mapblock mesh generation forsinkelse"
 msgid "Mapblock mesh generation threads"
 msgstr "Mapblock mesh generation forsinkelse"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Mapblock mesh generation forsinkelse"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Tidsudløb for kortblokfjernelse"
@@ -4833,6 +4898,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Joystick-knaps gentagelsesinterval"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4904,6 +4974,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Hule tærskel"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -5014,10 +5089,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5030,6 +5101,11 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Fejlsøgning for Mapgen"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5142,6 +5218,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokol versionerne matchede ikke. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5157,6 +5242,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5358,8 +5447,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5501,7 +5590,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5537,6 +5626,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5587,8 +5680,7 @@ msgstr "Dybdeskabere"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Dybdeskabere tillader avancerede visuelle effekter og kan forøge ydelsen på "
 "nogle videokort.\n"
@@ -5664,13 +5756,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5706,7 +5791,7 @@ msgstr "Blød belysning"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5729,6 +5814,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Alfa for skrifttypeskygge"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Lyd"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5890,17 +5983,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5911,6 +6024,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5937,7 +6056,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5995,6 +6114,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Første af 2 3D-støj, der sammen definerer tunneler."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6043,15 +6166,15 @@ msgstr "Strandstøjtærskel"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Strandstøjtærskel"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Bølgende blade"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6087,7 +6210,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6190,10 +6315,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "VSync"
@@ -6283,6 +6404,10 @@ msgstr ""
 msgid "Volume"
 msgstr "Lydstyrke"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6292,6 +6417,15 @@ msgstr ""
 "Aktiverer parallax-okklusionoversættelse.\n"
 "Kræver at dybdeskabere er aktiveret."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Blød belysning"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6538,12 +6672,18 @@ msgstr ""
 #~ msgid "(game support required)"
 #~ msgstr "(Spilunderstøttelse påkrævet)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresse: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreativ tilstand: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Skade: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6578,6 +6718,13 @@ msgstr ""
 #~ "Lad dette være tomt for at starte en lokal server.\n"
 #~ "Bemærk, at adressefeltet i hovedmenuen tilsidesætter denne indstilling."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Justér DPI-konfigurationen til din skærm (ikke-X11 / kun Android) f.eks. "
+#~ "til 4k-skærme."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6619,6 +6766,9 @@ msgstr ""
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bit per billedpunkt (a.k.a. farvedybde) i fuldskærmtilstand."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blokafgrænsning vist for alle blokke"
+
 #, fuzzy
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump Mapping"
@@ -6630,6 +6780,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Tast til ændring af kameraopdatering"
 
+#~ msgid "Change Keys"
+#~ msgstr "Skift tastatur-bindinger"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Skift tastatur-bindinger"
@@ -6671,6 +6824,36 @@ msgstr ""
 #~ msgstr ""
 #~ "Styrer bredden af tunneller. En lavere værdi giver bredere tunneller."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Styring:\n"
+#~ "- %s: bevæg dig fremad\n"
+#~ "- %s: bevæg dig baglæns\n"
+#~ "- %s: bevæg dig til venstre\n"
+#~ "- %s: bevæg dig til højre\n"
+#~ "- %s: hoppe/klatre\n"
+#~ "- %s: snige/gå nedad\n"
+#~ "- %s: smid genstand\n"
+#~ "- %s: Oppakning\n"
+#~ "- Mus: vend rundt/kig\n"
+#~ "- Musehjul: vælg genstand\n"
+#~ "- %s: skriven (chat)\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativ"
 
@@ -6680,6 +6863,9 @@ msgstr ""
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Crosshair-farve (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Skade"
 
@@ -6937,6 +7123,9 @@ msgstr ""
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentering"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Ugyldig spilspecifikationer."
+
 #~ msgid "Inventory key"
 #~ msgstr "Lagertast"
 
@@ -7678,6 +7867,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Får DirectX til at fungere med LuaJIT. Deaktiver hvis det giver problemer."
 
+#, fuzzy
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Mapblock mesh generation forsinkelse"
+
 #~ msgid "Menus"
 #~ msgstr "Menuer"
 
@@ -7812,9 +8005,6 @@ msgstr ""
 #~ msgid "Smooth Lighting"
 #~ msgstr "Glat belysning"
 
-#~ msgid "Sound"
-#~ msgstr "Lyd"
-
 #, fuzzy
 #~ msgid "Special key"
 #~ msgstr "Snigetast"
@@ -7847,6 +8037,10 @@ msgstr ""
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Berøringstærskel (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Strandstøjtærskel"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Tri-lineær filtréring"
 
@@ -7862,6 +8056,9 @@ msgstr ""
 #~ msgid "Up"
 #~ msgstr "Op"
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #, c-format
 #~ msgid "Viewing range is at maximum: %d"
 #~ msgstr "Sigtbarhed er på maksimum: %d"
@@ -7888,8 +8085,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Du døde"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Du har ikke installeret nogle spil."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 750b7cd81..74380e328 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: German (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-17 00:07+0000\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-12 14:09+0000\n"
 "Last-Translator: Wuzzy <Wuzzy@disroot.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
 "de/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.2\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,8 +71,8 @@ msgid "Command not available: "
 msgstr "Befehl nicht verfügbar: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Hilfe für Befehle erhalten"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Hilfe für Befehle erhalten (-t: Ausgabe im Chat)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -82,12 +82,8 @@ msgstr ""
 "all“ benutzen, um alles aufzulisten."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <Befehl>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <Befehl>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -105,6 +101,10 @@ msgstr "Ein Fehler ist aufgetreten:"
 msgid "Main menu"
 msgstr "Hauptmenü"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Erneut verbinden"
@@ -133,19 +133,27 @@ msgstr "Wir unterstützen nur Protokollversion $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "„$1“ existiert bereits. Wollen Sie es überschreiben?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Fehler bei Installation von „$1“: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 und $2 Abhängigkeiten werden installiert."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Fehler beim Download von „$1“"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 von $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Fehler beim Download von $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Fehler beim Extrahieren von „$1“ (unzureichender Speicherplatz, nicht "
+"unterstützter Dateityp oder kaputtes Archiv)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,160 +161,159 @@ msgstr ""
 "$1 laden herunter,\n"
 "$2 warten"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 laden herunter…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 benötigte Abhängigkeiten konnten nicht gefunden werden."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 wird installiert und $2 Abhängigkeiten werden übersprungen."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Alle Pakete"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Bereits installiert"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Zurück zum Hauptmenü"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"ContentDB ist nicht verfügbar, wenn Minetest ohne cURL kompiliert wurde"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Herunterladen …"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Fehler beim Holen der Abhängigkeiten für Paket"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spiele"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installieren"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laden ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Es konnten keine Pakete abgerufen werden"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Keine Ergebnisse"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Keine Updates"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Eingereiht"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Texturenpakete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Das Paket $1 wurde nicht gefunden."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Deinstallieren"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Updaten"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Alle aktualisieren [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Mehr Informationen im Webbrowser anschauen"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+"Sie müssen ein Spiel installieren, bevor Sie eine Mod installieren können"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 und $2 Abhängigkeiten werden installiert."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 von $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 benötigte Abhängigkeiten konnten nicht gefunden werden."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 wird installiert und $2 Abhängigkeiten werden übersprungen."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Bereits installiert"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basis-Spiel:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"ContentDB ist nicht verfügbar, wenn Minetest ohne cURL kompiliert wurde"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Abhängigkeiten:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Herunterladen …"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Fehler bei Installation von „$1“: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Fehler beim Download von „$1“"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Fehler beim Download von $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Fehler beim Extrahieren von „$1“ (nicht unterstützter Dateityp oder kaputtes "
-"Archiv)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spiele"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installieren"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 installieren"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Fehlende Abhängigkeiten installieren"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laden ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Es konnten keine Pakete abgerufen werden"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Keine Ergebnisse"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Keine Updates"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Überschreiben"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Bitte prüfen Sie, ob das Basis-Spiel korrekt ist."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Eingereiht"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "„$1“ existiert bereits. Wollen Sie es überschreiben?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Texturenpakete"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Das Paket $1 wurde nicht gefunden."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Deinstallieren"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Updaten"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Alle aktualisieren [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Mehr Informationen im Webbrowser anschauen"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
-"Sie müssen ein Spiel installieren, bevor Sie eine Mod installieren können"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Überschreiben"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -455,10 +462,22 @@ msgstr "Erstellen"
 msgid "Decorations"
 msgstr "Dekorationen"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Wüstentempel"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test ist für Entwickler gedacht."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Andere Verliesvariante, die in Wüstenbiomen generiert wird (nur, wenn "
+"Verliese aktiviert sind)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Verliese"
@@ -839,10 +858,6 @@ msgstr "Barrierefreiheit"
 msgid "Back"
 msgstr "Zurück"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Tastenbelegung"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -852,7 +867,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Leeren"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Steuerung"
 
@@ -1057,6 +1073,18 @@ msgstr "Ein Spiel installieren"
 msgid "Install games from ContentDB"
 msgstr "Spiele aus ContentDB installieren"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest wird standardmäßig nicht mehr mit einem Spiel ausgeliefert."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest ist eine Spielerschaffungsplattform, welche es Ihnen ermöglicht, "
+"viele verschiedene Spiele zu spielen."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Neu"
@@ -1090,8 +1118,9 @@ msgid "Start Game"
 msgstr "Spiel starten"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Es sind keine Spiele installiert."
+msgid "You need to install a game before you can create a world."
+msgstr ""
+"Sie müssen ein Spiel installieren, bevor Sie eine Welt erstellen können."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1170,18 +1199,10 @@ msgstr "Lade Texturen …"
 msgid "Rebuilding shaders..."
 msgstr "Shader erneuern …"
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Verbindungsfehler (Zeitüberschreitung?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Spiel konnte nicht gefunden oder geladen werden: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Ungültige Spielspezifikationen"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hauptmenü"
@@ -1206,7 +1227,11 @@ msgstr "Fehler beim Öffnen der angegebenen Passwortdatei: "
 msgid "Provided world path doesn't exist: "
 msgstr "Angegebener Weltpfad existiert nicht: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medien …"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1214,18 +1239,10 @@ msgstr ""
 "\n"
 "Für mehr Details siehe debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresse: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modus: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Öffentlich: "
@@ -1260,10 +1277,6 @@ msgstr "Vorwärtsautomatik aktiviert"
 msgid "Block bounds hidden"
 msgstr "Blockgrenzen verborgen"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blockgrenzen für alle Blöcke angezeigt"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blockgrenzen für aktuellen Block angezeigt"
@@ -1309,6 +1322,10 @@ msgstr "Clientseitige Skripte sind deaktiviert"
 msgid "Connecting to server..."
 msgstr "Mit Server verbinden …"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Verbindungsfehler (Zeitüberschreitung?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Verbindung aus unbekanntem Grund fehlgeschlagen"
@@ -1317,46 +1334,13 @@ msgstr "Verbindung aus unbekanntem Grund fehlgeschlagen"
 msgid "Continue"
 msgstr "Weiter"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Steuerung:\n"
-"- %s: Vorwärts\n"
-"- %s: Rückwärts\n"
-"- %s: Nach links\n"
-"- %s: Nach rechts\n"
-"- %s: Springen/hochklettern\n"
-"- %s: Graben/schlagen/benutzen\n"
-"- %s: Platzieren/benutzen\n"
-"- %s: Kriechen/runterklettern\n"
-"- %s: Gegenstand wegwerfen\n"
-"- %s: Inventar\n"
-"- Maus: Drehen/umschauen\n"
-"- Mausrad: Gegenstand wählen\n"
-"- %s: Chat\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1368,8 +1352,8 @@ msgstr ""
 "Steuerung:\n"
 "Kein Menü sichtbar:\n"
 "- Finger wischen: Umsehen\n"
-"- Antippen: Platzieren/benutzen\n"
-"- Langes antippen: Graben/schlagen/benutzen\n"
+"- Antippen: Platzieren/schlagen/benutzen (Standard)\n"
+"- Langes antippen: Graben/benutzen (Standard)\n"
 "Menü/Inventar offen:\n"
 "- Doppelt antippen (außerhalb):\n"
 " --> schließen\n"
@@ -1448,6 +1432,10 @@ msgstr "Nebel deaktiviert"
 msgid "Fog enabled"
 msgstr "Nebel aktiviert"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Nebel von Spiel oder Mod aktiviert"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spielinfo:"
@@ -1468,10 +1456,6 @@ msgstr "Gegenstandsdefinitionen …"
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medien …"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1632,10 +1616,6 @@ msgstr "Drahtmodell aktiv"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom ist momentan von Spiel oder Mod deaktiviert"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "OK"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chat ist momentan von Spiel oder Mod deaktiviert"
@@ -1956,6 +1936,15 @@ msgstr "Übersichtskarte im Bodenmodus, Zoom ×%d"
 msgid "Minimap in texture mode"
 msgstr "Übersichtskarte im Texturmodus"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Fehler beim Kompilieren des „%s“-Shaders."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Shader sind aktiviert, aber GLSL wird vom Treiber nicht unterstützt."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2149,6 +2138,18 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "Taste drücken"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Öffnen"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "URL öffnen?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "URL konnte nicht geöffnet werden"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Ändern"
@@ -2182,6 +2183,7 @@ msgstr "Tonlautstärke: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "de"
 
@@ -2420,12 +2422,6 @@ msgstr "Reichweite aktiver Objekte"
 msgid "Adds particles when digging a node."
 msgstr "Zeigt Partikel, wenn man einen Block ausgräbt."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr "DPI des Bildschirms (nicht für X11/Android) z.B. für 4K-Bildschirme."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2456,6 +2452,10 @@ msgstr "Admin-Name"
 msgid "Advanced"
 msgstr "Erweitert"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Erlaubt Flüssigkeiten, transluzent zu sein."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2516,6 +2516,25 @@ msgstr "Gegenstandsnamen an Tooltip anhängen."
 msgid "Apple trees noise"
 msgstr "Apfelbaumrauschen"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Dithering anwenden, um Artefakte beim Color-Banding zu reduzieren.\n"
+"Dithering erhöht die Größe der verlustfrei komprimierten Bildschirmfotos\n"
+"signifikant und es funktioniert nicht richtig, falls die Anzeige oder das\n"
+"Betriebssystem zusätzliches Dithering anwendet oder, falls die Farbkanäle\n"
+"nicht auf 8 Bits quantisiert sind.\n"
+"Mit OpenGL ES funktioniert Dithering nur, falls der Shader eine hohe\n"
+"Fließkommazahlenpräzision unterstützt, und das könnte zu höheren\n"
+"Einbußen bei der Performanz führen."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Armträgheit"
@@ -2539,24 +2558,39 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "In dieser Distanz wird der Server die zu den Clients gesendeten Blöcke "
 "aggressiv\n"
 "optimieren.\n"
 "Kleine Werte werden die Performanz möglicherweise stark erhöhen, auf\n"
-"Kosten von sichtbaren Renderfehlern (einige Blöcke werden nicht unter dem "
-"Wasser\n"
-"und in Höhlen gerendert, sowie manchmal auf dem Land).\n"
+"Kosten von sichtbaren Renderfehlern (einige Blöcke können eventuell in "
+"Höhlen\n"
+"nicht korrekt gerendert werden).\n"
 "Wird dieser Wert auf eine Zahl größer als max_block_send_distance gesetzt,\n"
 "wird diese Optimierung deaktiviert.\n"
 "In Kartenblöcken (16 Blöcke) angegeben."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"In dieser Distanz wird der Server einen einfacheren und günstigeren\n"
+"Occlusion-Check machen.\n"
+"Kleine Werte werden die Performanz möglicherweise stark erhöhen, auf\n"
+"Kosten von sichtbaren Renderfehlern (fehlende Blöcke).\n"
+"Dies ist besonders nützlich für eine hohe Sichtweite (über 500).\n"
+"In Kartenblöcken (16 Blöcke) angegeben."
+
 #: src/settings_translation_file.cpp
 msgid "Audio"
 msgstr "Ton"
@@ -2617,6 +2651,10 @@ msgstr "Biom-API"
 msgid "Biome noise"
 msgstr "Biomrauschen"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Block-Cull-Optimierungsdistanz"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distanz für Sendeoptimierungen von Kartenblöcken"
@@ -2833,6 +2871,15 @@ msgstr "Gefärbter Nebel"
 msgid "Colored shadows"
 msgstr "Gefärbte Schatten"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Kommagetrennte Liste von AL- und ALC-Erweiterungen, welche nicht\n"
+"benutzt werden sollen. Nützlich zum Testen. Siehe al_extensions.[h,cpp]\n"
+"für Details."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3003,10 +3050,6 @@ msgstr ""
 "Fadenkreuzfarbe (R,G,B).\n"
 "Gilt auch für das Objektfadenkreuz"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Debugprotokolldateigrößengrenze"
@@ -3062,6 +3105,31 @@ msgstr ""
 "Scheibe angewendet wird,\n"
 "aber dies verbraucht auch mehr Ressourcen."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Hier festlegen, welches die ältesten Clients sind, die sich verbinden dürfen."
+"\n"
+"Ältere Clients sind kompatibel in der Hinsicht, dass sie beim Verbinden zu "
+"neuen\n"
+"Servern nicht abstürzen, aber sie könnten nicht alle neuen Funktionen, die "
+"Sie\n"
+"erwarten, unterstützen.\n"
+"Das ermöglicht eine genauere Kontrolle als strict_protocol_version_checking."
+"\n"
+"Minetest wird immer noch ein internes Minimum erzwingen, und die "
+"Aktivierung\n"
+"von strict_protocol_version_checking wird dies überschreiben."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definiert Gebiete, in denen Bäume Äpfel tragen."
@@ -3271,6 +3339,10 @@ msgstr "Bloom aktivieren"
 msgid "Enable Bloom Debug"
 msgstr "Bloom-Debug aktivieren"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Debanding aktivieren"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3297,6 +3369,10 @@ msgstr ""
 "Falls aktiv, werden Poisson-Scheiben verwendet, um „weiche Schatten“ zu "
 "erzeugen. Ansonsten wird die PCF-Filterung benutzt."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Nachbearbeitung aktivieren"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Raytraced Culling aktivieren"
@@ -3347,6 +3423,10 @@ msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 "Mausradscrollen für die Gegenstandsauswahl in der Schnellleiste aktivieren."
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Schaltet zufälliges Modladen ein (nur zum Testen verwendet)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Schaltet zufällige Steuerung ein (nur zum Testen verwendet)."
@@ -3378,6 +3458,10 @@ msgstr ""
 "Sie\n"
 "erwarten, unterstützen."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Touchscreen aktivieren"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3391,14 +3475,6 @@ msgstr ""
 "Texturen)\n"
 "während des Verbindungsaufbaus zum Server herunterzuladen."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Aktiviert Vertex Buffer Objects.\n"
-"Dies sollte die Grafikperformanz beträchtlich verbessern."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3441,6 +3517,21 @@ msgstr ""
 "Aktiviert das Zwischenspeichern von 3-D-Modellen, die mittels facedir "
 "rotiert werden."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Aktiviert Debug und Fehlerprüfungen im OpenGL-Treiber."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Aktiviert die Nachbearbeitungspipeline."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Aktiviert den Touchscreenmodus. Damit können Sie das Spiel mit einem "
+"Touchscreen spielen."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3490,7 +3581,7 @@ msgstr "Bildwiederholrate"
 
 #: src/settings_translation_file.cpp
 msgid "FPS when unfocused or paused"
-msgstr "Bildwiederholrate bei Bildwiederholrate/Pause"
+msgstr "Bildwiederholrate wenn Fenster im Hintergrund/Spiel pausiert"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
@@ -4411,13 +4502,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Länge eines Servertakts und dem Zeitintervall, in dem Objekte über das "
-"Netzwerk\n"
-"üblicherweise aktualisiert werden; in Sekunden angegeben."
+"Länge eines Servertakts (dem Intervall, wo grundsätzlich alles aktualisiert "
+"wird),\n"
+"in Sekunden.\n"
+"Wirkt sich nicht auf Sitzungen aus, die vom Clientmenü gestartet wurden."
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
@@ -4591,10 +4684,6 @@ msgstr ""
 "Nebel- und Himmelsfarben von der Tageszeit (Sonnenaufgang/Sonnenuntergang) "
 "und Blickrichtung abhängig machen."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Macht alle Flüssigkeiten undurchsichtig"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Kartenkompressionsstufe für Festspeicher"
@@ -4656,12 +4745,18 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Kartengenerierungsattribute speziell für den Kartengenerator v6.\n"
 "Das Flag „snowbiomes“ aktiviert das neue 5-Biom-System.\n"
 "Falls das „snowbiomes“-Flag aktiviert ist, werden Dschungel automatisch "
-"aktiviert und das „jungles“-Flag wird ignoriert."
+"aktiviert und\n"
+"das „jungles“-Flag wird ignoriert.\n"
+"Das „temples“-Flag deaktiviert die Erzeugung von Wüstentempeln. Stattdessen "
+"werden\n"
+"normale Verliese auftauchen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4699,10 +4794,6 @@ msgstr "Kartenblockmesh-Generierungsverzögerung"
 msgid "Mapblock mesh generation threads"
 msgstr "Kartenblockmesh-Generierungsthreads"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Cachegröße des Kartenblock-Meshgenerators in MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Timeout zum Entladen von Kartenblöcken"
@@ -4984,6 +5075,10 @@ msgstr "Minimaler Level des Prokolls, die in den Chat geschrieben werden soll."
 msgid "Minimap scan height"
 msgstr "Abtasthöhe der Übersichtskarte"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "Minimale Grabungswiederholungsrate"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Untergrenze der zufälligen Anzahl großer Höhlen je Mapchunk."
@@ -5052,6 +5147,10 @@ msgstr "Mausempfindlichkeit"
 msgid "Mouse sensitivity multiplier."
 msgstr "Faktor für die Mausempfindlichkeit."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Bewegungsschwellwert"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Schlammrauschen"
@@ -5195,10 +5294,6 @@ msgstr "Occlusion Culler"
 msgid "Occlusion Culling"
 msgstr "Occlusion Culling"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Undurchsichtige Flüssigkeiten"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5215,6 +5310,10 @@ msgstr ""
 "Das Pausemenü öffnen, wenn der Fokus des Fensters verloren geht.\n"
 "Wird nicht pausieren, wenn ein Formspec geöffnet ist."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "OpenGL-Debug"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Optionaler manueller Wert für die Farbe von Chat-Weblinks."
@@ -5350,6 +5449,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Anteil der großen Höhlen, die eine Flüssigkeit enthalten."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Protokollversionsminimum"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Schlaggeste"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5368,6 +5475,10 @@ msgstr "Erhöht das Gelände, um Täler um den Flüssen zu erzeugen."
 msgid "Random input"
 msgstr "Zufällige Steuerung"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Zufällige Modladereihenfolge"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Letzte Chatnachrichten"
@@ -5585,8 +5696,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5605,9 +5716,10 @@ msgstr ""
 "* None – Keine Kantenglättung (Standard)\n"
 "\n"
 "* FSAA – Von der Hardware bereitgestellte Vollbildkantenglättung (nicht\n"
-"kompatibel mit Shadern), auch bekannt als Multi-Sample Antialiasing (MSAA).\n"
-"Glättet Blockkanten aus, beeinträchtigt aber nicht die Innenseiten der "
-"Texturen.\n"
+"kompatibel mit Nachbearbeitung und Unterabtastung), auch bekannt\n"
+"als Multi-Sample Antialiasing (MSAA). Glättet Blockkanten aus, "
+"beeinträchtigt\n"
+"aber nicht die Innenseiten der Texturen.\n"
 "Um diese Option zu ändern, ist ein Neustart erforderlich.\n"
 "\n"
 "* FXAA – Schnelle annähende Kantenglättung (benötigt Shader).\n"
@@ -5617,7 +5729,7 @@ msgstr ""
 "Bildqualität.\n"
 "\n"
 "* SSAA – Super-Sampling-Kantenglättung (benötigt Shader).\n"
-"Rendert ein hochauflösendes Bild der Szene, dann skaliert es nach unten, um\n"
+"Rendert ein hochauflösendes Bild der Szene, dann skaliert es herunter, um\n"
 "die Aliasing-Effekte zu reduzieren. Dies ist die langsamste und genaueste "
 "Methode."
 
@@ -5749,10 +5861,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"Setzt die Sprache. Leer lassen, um Systemsprache zu verwenden.\n"
+"Setzt die Sprache. Standardmäßig wird die Systemsprache zu verwendet.\n"
 "Nach Änderung ist ein Neustart erforderlich."
 
 #: src/settings_translation_file.cpp
@@ -5796,6 +5908,12 @@ msgstr ""
 "Aktivieren, um den Bloomeffekt zu aktivieren.\n"
 "Helle Farben werden sich über die benachbarten Objekte ausbreiten."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+"Auf wahr setzen, um volumetrische Lichteffekte zu aktivieren (auch bekannt "
+"als „Gottesstrahlen“/„Godrays“)."
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Auf „wahr“ setzen, um wehende Blätter zu aktivieren."
@@ -5827,9 +5945,9 @@ msgid ""
 "On false, 16 bits texture will be used.\n"
 "This can cause much more artifacts in the shadow."
 msgstr ""
-"Setzt die Schattentexturqualität auf 32 Bits.\n"
+"Setzt die Schattentexturqualität auf 32 Bit.\n"
 "Falls deaktiviert, werden 16-Bit-Texturen benutzt.\n"
-"Dies kann zu viel mehr Artefakten im Schatten führen."
+"Dies kann zu viel mehr Artefakten in Schatten führen."
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
@@ -5843,13 +5961,11 @@ msgstr "Shader"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shader ermöglichen fortgeschrittene visuelle Effekte und können die "
 "Performanz auf\n"
-"einigen Grafikkarten erhöhen.\n"
-"Das funktioniert nur mit dem OpenGL-Grafik-Backend."
+"einigen Grafikkarten erhöhen."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5861,7 +5977,7 @@ msgstr "Maximale Schattenrenderdistanz von Schattenkarten in Blöcken"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map texture in 32 bits"
-msgstr "Schattenkartentextur in 32 Bits"
+msgstr "Schattenkartentextur mit 32 Bit"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map texture size"
@@ -5936,17 +6052,6 @@ msgstr ""
 "Die Änderung dieses Wertes ist für besondere Verwendungszwecke, es\n"
 "wird empfohlen, ihn unverändert zu lassen."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Größe vom Kartenblock-Cache des Meshgenerators. Wird sie\n"
-"erhöht, wird die Cache-Trefferrate erhöht, was die Anzahl der Daten,\n"
-"die vom Hauptthread kopiert werden, reduziert und somit das Stottern "
-"reduziert."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Himmelskörperorbitneigung"
@@ -5983,10 +6088,10 @@ msgstr "Weiches Licht"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
-"Glättet die Rotation der Kamera im Filmmodus. 0 zum Ausschalten.\n"
-"Der Filmmodus kann aktiviert werden, indem die entsprechende Taste in der "
+"Glättet die Rotation der Kamera im Filmmodus. 0 zum Ausschalten. Der "
+"Filmmodus kann aktiviert werden, indem die entsprechende Taste in der "
 "Tastenbelegung benutzt wird."
 
 #: src/settings_translation_file.cpp
@@ -6009,6 +6114,14 @@ msgstr "Schleichgeschwindigkeit, in Blöcken pro Sekunde."
 msgid "Soft shadow radius"
 msgstr "Weicher-Schatten-Radius"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Ton"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "Schwarze Liste der Sounderweiterungen"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6217,21 +6330,53 @@ msgstr ""
 "Das Standardformat, in dem Profile gespeichert werden,\n"
 "wenn „/profiler save [Format]“ ohne Format aufgerufen wird."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"Die Verzögerung in Millisekunden, nachdem eine Berührungsinteraktion als "
+"langes Antippen zählt."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 "Der Dateipfad relativ zu Ihrem Weltpfad, in dem Profile abgespeichert werden."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"Die Geste für für das Schlagen von Spielern/Entitys.\n"
+"Dies kann von Spielen und Mods überschrieben werden.\n"
+"\n"
+"* short_tap\n"
+"Leicht zu benutzen und bekannt von anderen Spielen, die nicht genannt werden "
+"sollen.\n"
+"\n"
+"* long_tap\n"
+"Bekannt aus der klassischen Mineteststeuerung für mobile Endgeräte.\n"
+"Der Kampf ist mehr oder weniger unmöglich."
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Die Kennung des zu verwendeten Joysticks"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
-"Die Länge in Pixeln, die benötigt wird, damit die Touchscreen-Interaktion "
-"beginnt."
+"Die Länge in Pixeln, die benötigt wird, damit die Touch-Interaktion als "
+"Bewegung zählt."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6245,6 +6390,15 @@ msgstr ""
 "0.0 = Wellen bewegen sich gar nicht.\n"
 "Standard ist 1.0 (1/2 Block)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Die minimale Zeit in Sekunden, die zwischen dem Graben von Blöcken benötigt "
+"wird,\n"
+"wenn die Grabetaste gedrückt gehalten wird."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Die Netzwerkschnittstelle, auf die der Server lauscht."
@@ -6281,13 +6435,13 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Das Renderer-Backend.\n"
 "Anmerkung: Ein Neustart ist nach einer Änderung notwendig!\n"
 "Auf Desktopsystemen ist OpenGL die Standardeinstellung. Bei Android ist "
 "OGLES2 die Standardeinstellung.\n"
-"Shader werden unter OpenGL und OGLES2 (experimentell) unterstützt."
+"Shader werden von allem außer OGLES1 unterstützt."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6368,6 +6522,10 @@ msgstr ""
 "Das dritte von vier 2-D-Rauschen, welche gemeinsam Hügel-/Bergkettenhöhe "
 "definieren."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Schwelle für langes Antippen"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6424,14 +6582,14 @@ msgstr "Touchscreenempfindlichkeit"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Faktor für die Touchscreenempfindlichkeit."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Touchscreenschwellwert"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Kompromisse für Performanz"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Transluzente Flüssigkeiten"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Transparenzsortierungsdistanz"
@@ -6480,10 +6638,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL zu einer JSON-Datei, welche Informationen über das neueste Minetest-"
-"Release enthält"
+"Release enthält\n"
+"Wenn dies leer ist, wird die Engine nie nach Updates suchen."
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6544,9 +6705,8 @@ msgstr ""
 "heraus geschaut wird."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Trilineare Filterung bei der Skalierung von Texturen benutzen."
+msgstr "Bilineare Filterung bei der Skalierung von Texturen benutzen."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6563,13 +6723,12 @@ msgstr ""
 "Objekten gebraucht."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Mipmaps zum Verkleinern von Texturen verwenden. Könnte die Performanz\n"
+"Mipmaps bei der Skalierung von Texturen verwenden. Könnte die Performanz\n"
 "leicht erhöhen, besonders, wenn ein hochauflösendes Texturenpaket benutzt "
 "wird.\n"
 "Eine gammakorrigierte Herunterskalierung wird nicht unterstützt."
@@ -6586,13 +6745,12 @@ msgstr ""
 "für Client-Meshgroßen, die kleiner als 4×4×4 Kartenblöcke große sind."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Trilineare Filterung bei der Herunterskalierung von Texturen benutzen.\n"
+"Trilineare Filterung bei der Skalierung von Texturen benutzen.\n"
 "Falls sowohl die bilineare als auch trilineare Filterung aktiviert sind,\n"
 "wird die trilineare Filterung angewandt."
 
@@ -6610,10 +6768,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Benutzeroberflächen"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync"
@@ -6708,6 +6862,10 @@ msgstr "Virtueller Joystick löst Aux1-Taste aus"
 msgid "Volume"
 msgstr "Tonlautstärke"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Lautstärkenfaktor, wenn das Fenster nicht im Fokus steht."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6716,6 +6874,14 @@ msgstr ""
 "Lautstärke aller Töne.\n"
 "Dafür muss das Tonsystem aktiviert sein."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "Lautstärke außerhalb Fokus"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "Volumetrisches Licht"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -7020,12 +7186,18 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "(game support required)"
 #~ msgstr "(Spielunterstützung benötigt)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresse: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreativmodus: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Schaden: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7063,6 +7235,12 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ "Leer lassen, um einen lokalen Server zu starten.\n"
 #~ "Die Adresse im Hauptmenü überschreibt diese Einstellung."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "DPI des Bildschirms (nicht für X11/Android) z.B. für 4K-Bildschirme."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7133,6 +7311,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bits pro Pixel (Farbtiefe) im Vollbildmodus."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blockgrenzen für alle Blöcke angezeigt"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bumpmapping"
 
@@ -7159,6 +7340,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Mitte der Lichtkurven-Mittenverstärkung."
 
+#~ msgid "Change Keys"
+#~ msgstr "Tastenbelegung"
+
 #~ msgid "Change keys"
 #~ msgstr "Tastenbelegung"
 
@@ -7237,6 +7421,38 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ "Legt die Breite von Tunneln fest; ein kleinerer Wert erzeugt breitere "
 #~ "Tunnel."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Steuerung:\n"
+#~ "- %s: Vorwärts\n"
+#~ "- %s: Rückwärts\n"
+#~ "- %s: Nach links\n"
+#~ "- %s: Nach rechts\n"
+#~ "- %s: Springen/hochklettern\n"
+#~ "- %s: Graben/schlagen/benutzen\n"
+#~ "- %s: Platzieren/benutzen\n"
+#~ "- %s: Kriechen/runterklettern\n"
+#~ "- %s: Gegenstand wegwerfen\n"
+#~ "- %s: Inventar\n"
+#~ "- Maus: Drehen/umschauen\n"
+#~ "- Mausrad: Gegenstand wählen\n"
+#~ "- %s: Chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativ"
 
@@ -7246,6 +7462,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Fadenkreuzfarbe (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Schaden"
 
@@ -7347,6 +7566,13 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Registrierungsbestätigung aktivieren"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Aktiviert Vertex Buffer Objects.\n"
+#~ "Dies sollte die Grafikperformanz beträchtlich verbessern."
+
 #~ msgid "Enabled"
 #~ msgstr "Aktiviert"
 
@@ -7665,6 +7891,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentierung"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Ungültige Spielspezifikationen"
+
 #~ msgid "Inventory key"
 #~ msgstr "Inventartaste"
 
@@ -8362,6 +8591,12 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ "DirectX mit LuaJIT zusammenarbeiten lassen. Deaktivieren Sie dies, falls "
 #~ "es Probleme verursacht."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Macht alle Flüssigkeiten undurchsichtig"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Cachegröße des Kartenblock-Meshgenerators in MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menüs"
 
@@ -8610,15 +8845,22 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Simple Leaves"
 #~ msgstr "Einfache Blätter"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Größe vom Kartenblock-Cache des Meshgenerators. Wird sie\n"
+#~ "erhöht, wird die Cache-Trefferrate erhöht, was die Anzahl der Daten,\n"
+#~ "die vom Hauptthread kopiert werden, reduziert und somit das Stottern "
+#~ "reduziert."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Weiches Licht"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Glättet die Rotation der Kamera. 0 zum Ausschalten."
 
-#~ msgid "Sound"
-#~ msgstr "Ton"
-
 #~ msgid "Special"
 #~ msgstr "Spezial"
 
@@ -8682,6 +8924,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Berührungsempfindlichkeit (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Touchscreenschwellwert"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilinearer Filter"
 
@@ -8736,6 +8981,9 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ "Wenn der Wert auf 0 steht, ist MSAA deaktiviert.\n"
 #~ "Ein Neustart ist erforderlich, nachdem diese Option geändert worden ist."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variierung der Hügelhöhe und Seetiefe in den ruhig verlaufenden\n"
@@ -8843,8 +9091,14 @@ msgstr "cURL-Parallel-Begrenzung"
 #~ msgid "You died."
 #~ msgstr "Sie sind gestorben."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Es sind keine Spiele installiert."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "OK"
diff --git a/po/dv/minetest.po b/po/dv/minetest.po
index 5b4e721cd..5fe66e3b1 100644
--- a/po/dv/minetest.po
+++ b/po/dv/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dhivehi (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2019-11-10 15:04+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Dhivehi <https://hosted.weblate.org/projects/minetest/"
@@ -72,7 +72,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -81,11 +81,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -106,6 +102,10 @@ msgstr "މޮޑެއްފަދަ ލުއޭ ސްކްރިޕްޓެއްގައި މައް
 msgid "Main menu"
 msgstr "maigandu menu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "aa gulhumeh"
@@ -134,179 +134,186 @@ msgstr "އަޅުގަނޑުމެން ހަމައެކަނި ސަޕޯޓްކުރަނީ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "އަޅުގަނޑުމެން 1$ އާއި 2$ އާއި ދެމެދުގެ ޕޮރޮޓޮކޯލް ވާޝަންތައް ސަޕޯޓް ކުރަން."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "$1 ނޭޅުނު"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 ނޭޅުނު"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "ލޯޑްވަނީ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "އެނބުރި މެއިން މެނޫއަށް"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "ލޯޑްވަނީ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "ގޭމްތައް"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "އަޅާ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "ލޯޑްވަނީ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "މޮޑްތައް"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "ފުހެލާ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "ގޭމް ހޮސްޓްކުރޭ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "ކެންސަލް"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "ބަރޯސާވާ(ޑިޕެންޑެންސީޒް):"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "ލޯޑްވަނީ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "$1 ނޭޅުނު"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 ނޭޅުނު"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "ގޭމްތައް"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "އަޅާ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "އަޅާ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "ލާޒިމުނޫން ޑިޕެންޑެންސީތައް:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "ލޯޑްވަނީ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "މޮޑްތައް"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "ފުހެލާ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -463,11 +470,21 @@ msgstr "ހަދާ"
 msgid "Decorations"
 msgstr "މޮޑްގެ މައުލޫލާތު:"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "އިންޒާރު: މިނިމަލް ޑިވެލޮޕްމަންޓް ހާއްސަކުރެވިފައިވަނީ ޑިވެލޮޕަރުންނަށް."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -835,10 +852,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -848,7 +861,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1060,6 +1074,16 @@ msgstr "އަޅާ"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "އައު"
@@ -1095,8 +1119,8 @@ msgid "Start Game"
 msgstr "ގޭމް ހޮސްޓްކުރޭ"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "އެއްވެސް ސަބްގޭމެއް އެޅިފައެއް ނެތް."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1181,18 +1205,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "މެއިން މެނޫ"
@@ -1217,24 +1233,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1271,10 +1283,6 @@ msgstr "އަނިޔާވުން ޖައްސާފައި"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1321,6 +1329,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1329,33 +1341,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1451,6 +1444,10 @@ msgstr "އޮފްކޮށްފަ"
 msgid "Fog enabled"
 msgstr "ޖައްސާފަ"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1471,10 +1468,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1631,10 +1624,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1957,6 +1946,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "$1 ނޭޅުނު"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2149,6 +2147,19 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "$1 ނޭޅުނު"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2182,6 +2193,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "dv"
 
@@ -2367,12 +2379,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2396,6 +2402,10 @@ msgstr "ދުނިޔޭގެ ނަން"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2450,6 +2460,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2471,12 +2492,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2539,6 +2569,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2752,6 +2786,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2884,10 +2924,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2937,6 +2973,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3123,6 +3172,11 @@ msgstr "ހުރިހާއެއްޗެއް ޖައްސާ"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "ގެއްލުން ޖައްސާ"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3142,6 +3196,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3184,6 +3242,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3207,6 +3269,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3215,12 +3281,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3250,6 +3310,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4045,9 +4118,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4193,10 +4267,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4245,7 +4315,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4280,10 +4352,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4531,6 +4599,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4599,6 +4671,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4710,10 +4786,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4726,6 +4798,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4835,6 +4911,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "ޕްރޮޓޮކޯލް ވާޝަން ފުށުއެރުމެއް. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4850,6 +4935,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5039,8 +5128,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5161,7 +5250,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5194,6 +5283,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5233,8 +5326,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5304,13 +5396,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5346,7 +5431,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5367,6 +5452,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5523,17 +5616,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5544,6 +5657,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5570,7 +5689,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5627,6 +5746,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5674,11 +5797,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5716,7 +5839,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5814,10 +5939,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5904,12 +6025,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6263,5 +6396,8 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "މަރުވީ"
 
+#~ msgid "You have no games installed."
+#~ msgstr "އެއްވެސް ސަބްގޭމެއް އެޅިފައެއް ނެތް."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
diff --git a/po/el/minetest.po b/po/el/minetest.po
index 5cb133b4e..7836d1c70 100644
--- a/po/el/minetest.po
+++ b/po/el/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Greek (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-04-10 18:50+0000\n"
-"Last-Translator: Alexandros Koutroulis <monsieuricy@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-01-14 12:31+0000\n"
+"Last-Translator: RRadler <rileyradler@icloud.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/minetest/minetest/"
 "el/>\n"
 "Language: el\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17-dev\n"
+"X-Generator: Weblate 5.4-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Η εντολή δεν είναι διαθέσιμη: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Βοήθεια για τις εντολές"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "'.help all' για την λίστα των εντολών."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <εντολή>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Εντάξει"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<κανένα διαθέσιμο>"
@@ -106,6 +104,10 @@ msgstr "Παρουσιάστηκε σφάλμα:"
 msgid "Main menu"
 msgstr "Κύριο μενού"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Εντάξει"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Επανασύνδεση"
@@ -134,19 +136,28 @@ msgstr "Υποστηρίζουμε μόνο το πρωτόκολλο έκδοσ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Υποστηρίζουμε τις εκδόσεις πρωτοκόλλων μεταξύ της έκδοσης $1 και $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "Το \"$1\" ήδη υπάρχει. Θέλετε να το αντικαταστήσετε;"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Πρόβλημα κατά την εγκατάσταση \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Οι εξαρτήσεις $1 και $2 θα εγκατασταθούν."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Η λήψη του \"$1\" απέτυχε"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 με $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Η λήψη του $1 απέτυχε"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Απέτυχε η εξαγωγή του \"$1\" (Μη υποστηριζόμενος τύπος αρχείου ή "
+"κατεστραμμένο αρχείο)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,159 +165,158 @@ msgstr ""
 "$1 σε λήψη,\n"
 "$2 σε αναμονή"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Λήψη ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Δεν ήταν δυνατή η εύρεση των απαιτούμενων εξαρτήσεων $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "Θα εγκατασταθεί το $1 και οι εξαρτήσεις $2 θα παραβλεφθούν."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Όλα τα Πακέτα"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Ήδη εγκαταστημένο"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Πίσω στο Κύριο Μενού"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"Το ContentDB δεν είναι διαθέσιμο όταν το Minetest μεταγλωττίστηκε χωρίς cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Λήψη ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Παιχνίδια"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Εγκατάσταση"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Φόρτωση..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Τροποποιήσεις"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Δεν ήταν δυνατή η ανάκτηση πακέτων"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Χωρίς αποτελέσματα"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Δεν υπάρχουν ενημερώσεις"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Σε αναμονή"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Πακέτα υφής"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Το πακέτο $1 δεν βρέθηκε."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Απεγκατάσταση"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Αναβάθμιση"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Ενημέρωση Όλων [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Δείτε περισσότερες πληροφορίες σε ένα πρόγραμμα περιήγησης ιστού"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Πρέπει να κατεβάσετε ένα παιχνίδι πριν κατεβάσετε κάποια επέκταση"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Οι εξαρτήσεις $1 και $2 θα εγκατασταθούν."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 με $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Δεν ήταν δυνατή η εύρεση των απαιτούμενων εξαρτήσεων $1."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Θα εγκατασταθεί το $1 και οι εξαρτήσεις $2 θα παραβλεφθούν."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Ήδη εγκαταστημένο"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Βασικό παιχνίδι:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"Το ContentDB δεν είναι διαθέσιμο όταν το Minetest μεταγλωττίστηκε χωρίς cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Εξαρτήσεις:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Λήψη ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Η λήψη του $1 απέτυχε"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Η λήψη του $1 απέτυχε"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Εγκατάσταση: Μη υποστηριζόμενος τύπος αρχείου ή κατεστραμμένο αρχείο"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Παιχνίδια"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Εγκατάσταση"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Εγκατάσταση $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Εγκατάσταση των εξαρτήσεων που λείπουν"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Φόρτωση..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Τροποποιήσεις"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Δεν ήταν δυνατή η ανάκτηση πακέτων"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Χωρίς αποτελέσματα"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Δεν υπάρχουν ενημερώσεις"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Δε βρέθηκε"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Ελέγξτε ότι το βασικό παιχνίδι είναι σωστό."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Σε αναμονή"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "Το \"$1\" ήδη υπάρχει. Θέλετε να το αντικαταστήσετε;"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Πακέτα υφής"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Απεγκατάσταση"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Αναβάθμιση"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Ενημέρωση Όλων [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Δείτε περισσότερες πληροφορίες σε ένα πρόγραμμα περιήγησης ιστού"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -321,21 +331,18 @@ msgid "Failed to install $1 to $2"
 msgstr "Αποτυχία εγκατάστασης $1 έως $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
 msgstr ""
-"Εγκατάσταση Τροποποίησης: Δεν είναι δυνατή η εύρεση του κατάλληλου ονόματος "
-"φακέλου για την τροποποίηση $1"
+"Εγκατάσταση: Δεν είναι δυνατή η εύρεση του κατάλληλου ονόματος φακέλου για "
+"το $1"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "Δεν είναι δυνατή η εύρεση έγκυρης τροποποίησης ή πακέτου τροποποίησης"
+msgstr "Δεν είναι δυνατή η εύρεση έγκυρης επέκτασης, επεκτάσεων, ή παιχνιδιού"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a $1 as a $2"
-msgstr "Δεν είναι δυνατή η εγκατάσταση τροποποίησης ως $1"
+msgstr "Δεν είναι δυνατή η εγκατάσταση του $1 σαν $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -343,11 +350,11 @@ msgstr "Δεν είναι δυνατή η εγκατάσταση $1 ως πακ
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Enabled, has error)"
-msgstr ""
+msgstr "(Ενεργό, έχει σφάλμα)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr ""
+msgstr "(Ανικανοποίητος)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
@@ -440,8 +447,9 @@ msgid "Biome blending"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Biomes"
-msgstr ""
+msgstr "Περιοχές"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
@@ -460,9 +468,18 @@ msgid "Decorations"
 msgstr "Διακοσμήσεις"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
+msgid "Desert temples"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
-msgstr "Προειδοποίηση: Τα Development Test προορίζονται για προγραμματιστές."
+msgstr "Τα τεστ ανάπτυξης προορίζονται για προγραμματιστές."
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
@@ -498,7 +515,7 @@ msgstr "Αύξηση της υγρασίας γύρω από τα ποτάμια
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Install another game"
-msgstr ""
+msgstr "Εγκαταστήτε άλλο παιχνίδι"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
@@ -559,7 +576,7 @@ msgstr "Σπόρος"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Ομαλή αλλαγή μεταξύ περιοχών"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
@@ -636,7 +653,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Missing name"
-msgstr ""
+msgstr "Λοιπές όνομα"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
@@ -650,15 +667,16 @@ msgstr "Κωδικός"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Passwords do not match"
-msgstr ""
+msgstr "Οι κωδικοί δεν ταιριάζουν"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
 msgid "Register"
 msgstr ""
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
+#, fuzzy
 msgid "Dismiss"
-msgstr ""
+msgstr "Απέρριψε"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -666,6 +684,9 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Για μεγάλο χρονικό διάστημα, η μηχανή του Minetest ερχόταν με ένα "
+"προεγκατεστημένο παιχνίδι που λέγεται \"Minetest Παιχνίδι\". Από το Minetest "
+"5.8.0, το Minetest εγκαταστήτε χωρίς προεγκαταστημένο παιχνίδι."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -833,10 +854,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Αλλαγή πλήκτρων"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,7 +863,8 @@ msgstr ""
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1061,6 +1079,16 @@ msgstr "Εγκατάσταση $1"
 msgid "Install games from ContentDB"
 msgstr "Εγκατάσταση παιχνιδιών από το ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Νέο"
@@ -1094,8 +1122,9 @@ msgid "Start Game"
 msgstr "Εκκίνηση Παιχνιδιού"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Δεν έχετε εγκαταστήσει παιχνίδια."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Πρέπει να κατεβάσετε ένα παιχνίδι πριν κατεβάσετε κάποια επέκταση"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1175,18 +1204,10 @@ msgstr "Φόρτωση υφών..."
 msgid "Rebuilding shaders..."
 msgstr "Ανακατασκευή σκίαστρων..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Σφάλμα σύνδεσης (λήξη χρόνου;)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Δεν ήταν δυνατή η εύρεση ή η φόρτωση του παιχνιδιού: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Μη έγκυρη προδιαγραφή παιχνιδιού."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Κύριο μενού"
@@ -1211,7 +1232,11 @@ msgstr "Απέτυχε το άνοιγμα του παρεχόμενου αρχ
 msgid "Provided world path doesn't exist: "
 msgstr "Το αρχείο του Κόσμου δεν υπάρχει: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1219,18 +1244,10 @@ msgstr ""
 "\n"
 "Ελέγξτε το debug.txt για λεπτομέρειες."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Διεύθυνση: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Λειτουργία: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Θήρα: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Δημόσιο: "
@@ -1266,10 +1283,6 @@ msgstr "Η αυτόματη προώθηση είναι ενεργοποιημέ
 msgid "Block bounds hidden"
 msgstr "Αποκλεισμός ορίων κρυφά"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Τα όρια μπλοκ εμφανίζονται για όλα τα μπλοκ"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Εμφανίζονται όρια αποκλεισμού για το τρέχον μπλοκ"
@@ -1317,6 +1330,10 @@ msgstr "Η δέσμη ενεργειών από την πλευρά του πε
 msgid "Connecting to server..."
 msgstr "Σύνδεση με διακομιστή..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Σφάλμα σύνδεσης (λήξη χρόνου;)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Η σύνδεση απέτυχε για άγνωστο λόγο"
@@ -1325,47 +1342,14 @@ msgstr "Η σύνδεση απέτυχε για άγνωστο λόγο"
 msgid "Continue"
 msgstr "Συνέχεια"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Στοιχεία ελέγχου:\n"
-"- %s: κίνηση προς τα εμπρός\n"
-"- %s: κίνηση προς τα πίσω\n"
-"- %s: κίνηση αριστερά\n"
-"- %s: κίνηση δεξιά\n"
-"- %s: άλμα/σκαρφάλωμα\n"
-"- %s: σκάψιμο/διάτρηση\n"
-"- %s: τοποθέτηση/χρήση\n"
-"- %s: ολίσθηση/κατέβασμα\n"
-"- %s: απόθεση αντικειμένου\n"
-"- %s: αποθέματα\n"
-"- Ποντίκι: στροφή/παρακολούθηση\n"
-"- Τροχός ποντικιού: επιλογή στοιχείου\n"
-"- %s: συνομιλία\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1461,6 +1445,11 @@ msgstr "Η ομίχλη απενεργοποιήθηκε"
 msgid "Fog enabled"
 msgstr "Η ομίχλη ενεργοποιήθηκε"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Το ζουμ είναι απενεργοποιημένο από το παιχνίδι ή την τροποποίηση"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Πληροφορίες Παιχνιδιού:"
@@ -1481,10 +1470,6 @@ msgstr "Ορισμοί στοιχείων..."
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1644,10 +1629,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr "Το ζουμ είναι απενεργοποιημένο από το παιχνίδι ή την τροποποίηση"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1977,6 +1958,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2167,6 +2157,18 @@ msgstr "Μεγέθυνση"
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Αλλαγή"
@@ -2200,6 +2202,7 @@ msgstr "Sound Volume: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "el"
 
@@ -2386,12 +2389,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2415,6 +2412,10 @@ msgstr "Όνομα κόσμου"
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2469,6 +2470,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2490,12 +2502,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2559,6 +2580,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2771,6 +2796,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2902,10 +2933,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2955,6 +2982,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3141,6 +3181,11 @@ msgstr "Ενεργοποίηση όλων"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ενεργοποίηση Ζημίας"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3160,6 +3205,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3202,6 +3251,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3225,6 +3278,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Πλήρης οθόνη"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3233,12 +3291,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3268,6 +3320,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4064,9 +4129,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4213,10 +4279,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4265,7 +4327,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4300,10 +4364,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4546,6 +4606,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4615,6 +4679,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Όριο αφής: (px)"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4725,10 +4794,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4741,6 +4806,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4850,6 +4919,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Ασυμφωνία έκδοσης πρωτοκόλλου. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4865,6 +4943,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5054,8 +5136,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5177,7 +5259,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5210,6 +5292,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5249,8 +5335,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5320,13 +5405,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5362,7 +5440,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5383,6 +5461,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Ήχος"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5539,17 +5625,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5560,6 +5666,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5586,7 +5698,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5643,6 +5755,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5692,12 +5808,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Όριο αφής: (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5735,7 +5850,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5833,10 +5950,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5923,12 +6036,25 @@ msgstr ""
 msgid "Volume"
 msgstr "Ένταση"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Επισήμανση Στοιχείων"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6165,6 +6291,12 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr "Παράλληλο όριο cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Διεύθυνση: "
+
+#~ msgid "- Port: "
+#~ msgstr "- Θήρα: "
+
 #~ msgid "3D Clouds"
 #~ msgstr "3D Σύννεφα"
 
@@ -6192,6 +6324,12 @@ msgstr "Παράλληλο όριο cURL"
 #~ msgid "Bilinear Filter"
 #~ msgstr "Διγραμμικό Φίλτρο"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Τα όρια μπλοκ εμφανίζονται για όλα τα μπλοκ"
+
+#~ msgid "Change Keys"
+#~ msgstr "Αλλαγή πλήκτρων"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Αλλαγή πλήκτρων"
@@ -6199,6 +6337,38 @@ msgstr "Παράλληλο όριο cURL"
 #~ msgid "Connect"
 #~ msgstr "Σύνδεση"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Στοιχεία ελέγχου:\n"
+#~ "- %s: κίνηση προς τα εμπρός\n"
+#~ "- %s: κίνηση προς τα πίσω\n"
+#~ "- %s: κίνηση αριστερά\n"
+#~ "- %s: κίνηση δεξιά\n"
+#~ "- %s: άλμα/σκαρφάλωμα\n"
+#~ "- %s: σκάψιμο/διάτρηση\n"
+#~ "- %s: τοποθέτηση/χρήση\n"
+#~ "- %s: ολίσθηση/κατέβασμα\n"
+#~ "- %s: απόθεση αντικειμένου\n"
+#~ "- %s: αποθέματα\n"
+#~ "- Ποντίκι: στροφή/παρακολούθηση\n"
+#~ "- Τροχός ποντικιού: επιλογή στοιχείου\n"
+#~ "- %s: συνομιλία\n"
+
 #~ msgid "Credits"
 #~ msgstr "Μνείες"
 
@@ -6239,15 +6409,15 @@ msgstr "Παράλληλο όριο cURL"
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Εγκατάσταση: αρχείο: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Μη έγκυρη προδιαγραφή παιχνιδιού."
+
 #~ msgid "Name / Password"
 #~ msgstr "Όνομα / Κωδικός"
 
 #~ msgid "No Filter"
 #~ msgstr "Χωρίς Φίλτρο"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Επισήμανση Στοιχείων"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Περίγραμμα Στοιχείων"
 
@@ -6284,9 +6454,6 @@ msgstr "Παράλληλο όριο cURL"
 #~ msgid "Smooth Lighting"
 #~ msgstr "Απαλός Φωτισμός"
 
-#~ msgid "Sound"
-#~ msgstr "Ήχος"
-
 #~ msgid "Special key"
 #~ msgstr "Ειδικό πλήκτρο"
 
@@ -6340,6 +6507,9 @@ msgstr "Παράλληλο όριο cURL"
 #~ msgid "You died."
 #~ msgstr "Πέθανες"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Δεν έχετε εγκαταστήσει παιχνίδια."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index 217b7e1d6..19c22d4c6 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Esperanto (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-10-19 04:10+0000\n"
-"Last-Translator: Tirifto <tirifto@posteo.cz>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-06-23 19:09+0000\n"
+"Last-Translator: Va Milushnikov <va.milushnikov@gmail.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/minetest/"
 "minetest/eo/>\n"
 "Language: eo\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.1\n"
+"X-Generator: Weblate 5.6-rc\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Komando ne uzeblas: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Trovu helpon pri komandoj"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "ĉion."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <komando>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Bone"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<neniu disponebla>"
@@ -105,6 +103,10 @@ msgstr "Eraro okazis:"
 msgid "Main menu"
 msgstr "Ĉefmenuo"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Bone"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Rekonekti"
@@ -133,19 +135,26 @@ msgstr "Ni nur subtenas protokolan version $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ni subtenas protokolajn versiojn inter versioj $1 kaj $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "«$ 1» jam ekzistas. Ĉu superskribi ĝin?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Eraro dum instalo de \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Dependaĵoj $1 kaj $2 estos instalitaj."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Malsukcesis elŝuti «$1»"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 de $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Malsukcesis elŝuti $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Malsukcesis elpaki «$1» (nesubtenata dosierspeco aŭ rompita arĥivo)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,156 +162,157 @@ msgstr ""
 "elŝutante $1,\n"
 "atendante $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Elŝutante $1…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 nepraj dependaĵoj ne estis troveblaj."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$ 1 estos instalita, ignorante $2 dependaĵojn."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Ĉiuj pakaĵoj"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Jam instalita"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Reen al ĉefmenuo"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ne estas disponebla per Minetest kodotradukita sen cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Elŝutante…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Ludoj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instali"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Enlegante…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modifaĵoj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Neniun pakaĵon sukcesis ricevi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Neniuj rezultoj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Neniuj ĝisdatigoj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Atendata"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Teksturaroj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "La pakaĵo $1 estas ne trovita."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Malinstali"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Ĝisdatigi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Ĝisdatigi Ĉiujn [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Vidi pli da informoj per TTT-legilo"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Vi devos instali ludon antaŭ vi povos instali modifaĵon"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Dependaĵoj $1 kaj $2 estos instalitaj."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 de $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 nepraj dependaĵoj ne estis troveblaj."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$ 1 estos instalita, ignorante $2 dependaĵojn."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Jam instalita"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Baza Ludo:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ne estas disponebla per Minetest kodotradukita sen cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependas de:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Elŝutante…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Eraro dum instalo de \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Malsukcesis elŝuti «$1»"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Malsukcesis elŝuti $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Malsukcesis elpaki «$1» (nesubtenata dosierspeco aŭ rompita arĥivo)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Ludoj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instali"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instali $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instali mankantajn dependaĵojn"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Enlegante…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modifaĵoj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Neniujn pakaĵojn eblis ricevi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Neniuj rezultoj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Neniuj ĝisdatigoj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ne trovita"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Superskribi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Bonvolu kontroli, ke la baza ludo estas ĝusta."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Atendata"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$ 1» jam ekzistas. Ĉu superskribi ĝin?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Teksturaroj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Malinstali"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Ĝisdatigi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Ĝisdatigi Ĉiujn [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Vidi pli da informoj per TTT-legilo"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Superskribi"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -451,10 +461,20 @@ msgstr "Krei"
 msgid "Decorations"
 msgstr "Ornamoj"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "La programista testo estas intencita por programistoj."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Forgeskeloj"
@@ -650,7 +670,7 @@ msgstr "Registriĝi"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Lasi"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -658,21 +678,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Dum jaroj, la ludmotoro Minetest instaliĝis kun implicita ludo nomita "
+"«Minetest Game». Ekde Minetest versio 5.8.0, Minetest instaliĝas sen "
+"implicita ludo."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Se vi volus ankoraŭ ludi viajn mondojn de Minetest Game, vi devos reinstali "
+"Minetest Game."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game estas ne plu implicite instalita"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Instali alian ludon"
+msgstr "Reinstali Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -748,9 +772,8 @@ msgid "Select file"
 msgstr "Elekti dosieron"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Elekti"
+msgstr "Agordi"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -819,20 +842,16 @@ msgstr "faciligita"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Uzu lingvon de la sistemo)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Faciluzo"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Reeniri"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Ŝanĝi klavojn"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -842,27 +861,26 @@ msgstr "Babilo"
 msgid "Clear"
 msgstr "Vakigo"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Stirado"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Ĝenerale"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Rapida moviĝo"
+msgstr "Moviĝo"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Restarigi pravaloron"
+msgstr "Reagordi al implicita valoro"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Reagordi al implicita valoro ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -870,7 +888,7 @@ msgstr "Serĉi"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Montri porspertulajn agordojn"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -890,11 +908,11 @@ msgstr "Enhavo: Modifaĵoj"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(La ludo bezonos ŝalti ankaŭ ombrojn)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Propra"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -947,7 +965,7 @@ msgstr "Ĉefaj zorgantoj"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Irrlicht aparato:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -978,18 +996,16 @@ msgid "Browse online content"
 msgstr "Foliumi enretan enhavon"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Foliumi enretan enhavon"
+msgstr "Foliumi ĉeretajn pakaĵojn [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Enhavo"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Enhavo"
+msgstr "Enhavo [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1012,9 +1028,8 @@ msgid "Rename"
 msgstr "Alinomi"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<neniu disponebla>"
+msgstr "Ĉu akireblas ĝisdatigo?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1052,6 +1067,17 @@ msgstr "Instali ludon"
 msgid "Install games from ContentDB"
 msgstr "Instali ludojn de ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game estas ne plu implicite instalita"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nova"
@@ -1085,8 +1111,9 @@ msgid "Start Game"
 msgstr "Ekigi ludon"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Vi havas neniujn instalitajn ludojn."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Vi devos instali ludon antaŭ vi povos instali modifaĵon"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1165,18 +1192,10 @@ msgstr "Enlegante teksturojn…"
 msgid "Rebuilding shaders..."
 msgstr "Refarante ombrigilojn…"
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Konekta eraro (ĉu eltempiĝo?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Ne povis trovi aŭ enlegi ludon: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Nevalida ludspecifo."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Ĉefmenuo"
@@ -1201,7 +1220,11 @@ msgstr "Malsukcesis malfermi donitan pasvortan dosieron: "
 msgid "Provided world path doesn't exist: "
 msgstr "Donita monda dosierindiko ne ekzistas: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Vidaŭdaĵoj…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1209,18 +1232,10 @@ msgstr ""
 "\n"
 "Rigardu dosieron debug.txt por detaloj."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "– Adreso: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "– Reĝimo: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "– Pordo: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "– Publika: "
@@ -1255,10 +1270,6 @@ msgstr "Memaga pluigo ŝaltita"
 msgid "Block bounds hidden"
 msgstr "Bloklimoj kaŝitaj"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Monderlimoj montritaj por ĉiuj blokoj"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Monderlimoj montritaj por nuna mondero"
@@ -1276,7 +1287,6 @@ msgid "Camera update enabled"
 msgstr "Ĝisdatigo de vidpunkto ŝaltita"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
 msgstr "Ne povas montri monderlimojn (malŝaltita de ludo aŭ modifaĵo)"
 
@@ -1304,6 +1314,10 @@ msgstr "Klient-flanka skriptado malŝaltita"
 msgid "Connecting to server..."
 msgstr "Konektante al servilo…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Konekta eraro (ĉu eltempiĝo?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Konekto malsukcesis pro nekonata kialo"
@@ -1312,47 +1326,14 @@ msgstr "Konekto malsukcesis pro nekonata kialo"
 msgid "Continue"
 msgstr "Daŭrigi"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Stirado:\n"
-"– %s: moviĝi antaŭen\n"
-"– %s: moviĝi posten\n"
-"– %s: moviĝi maldekstren\n"
-"– %s: moviĝi dekstren\n"
-"– %s: salti/supreniri\n"
-"- %s: fosi/bati\n"
-"- %s: meti/uzi\n"
-"– %s: kaŝiri/malsupreniri\n"
-"– %s: demeti portaĵojn\n"
-"– %s: portaĵujo\n"
-"– Muso: turniĝi/rigardi\n"
-"– Musrado: elekti portaĵon\n"
-"– %s: babili\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1363,11 +1344,11 @@ msgid ""
 msgstr ""
 "Implicita stirado:\n"
 "Senmenue:\n"
-"- unuobla tuŝeto: aktivigi butonon\n"
-"- duobla tuŝeto: meti/uzi\n"
-"- ŝova fingro: rigardi\n"
-"Videbla menuo/portaĵujo:\n"
-"- duobla tuŝeto (ekstere):\n"
+"- tiri: rigardi ĉirkaŭen\n"
+"- tuŝeti: meti/uzi\n"
+"- longe tuŝeti: fosi/frapi/uzi\n"
+"Menue/portaĵuje:\n"
+"- dufoje tuŝeti (ekstere):\n"
 " -->fermi\n"
 "- tuŝi portaĵaron, tuŝi portaĵingon:\n"
 " --> movi portaĵaron\n"
@@ -1444,6 +1425,11 @@ msgstr "Nebulo malŝaltita"
 msgid "Fog enabled"
 msgstr "Nebulo ŝaltita"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zomado nuntempe malŝaltita de ludo aŭ modifaĵo"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Ludaj informoj:"
@@ -1464,10 +1450,6 @@ msgstr "Objektaj difinoj…"
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Vidaŭdaĵoj…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1568,28 +1550,28 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "Ne povas aŭskulti je %s ĉar IPv6 estas malŝaltita"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Ŝaltis senliman vidodistancon"
+msgstr "Malŝaltis senliman vidodistancon"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
 msgstr "Ŝaltis senliman vidodistancon"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "Senlima vidodistanco ŝaltita, sed ĝin malpermesas ludo aŭ modifaĵo"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "Vidodistanco je la minimumo: %d"
+msgstr "Vidodistanco agordita al %d (la minimumo)"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"Vidodistanco agordita al %d (la minimumo), sed ĝin limigas al %d ludo aŭ "
+"modifaĵo"
 
 #: src/client/game.cpp
 #, c-format
@@ -1597,20 +1579,22 @@ msgid "Viewing range changed to %d"
 msgstr "Vidodistanco agordita al %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "Vidodistanco agordita al %d"
+msgstr "Vidodistanco agordita al %d (la maksimumo)"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"Vidodistanco agordita al %d (la maksimumo), sed ĝin limigas al %d ludo aŭ "
+"modifaĵo"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "Vidodistanco agordita al %d"
+msgstr "Vidodistanco agordita al %d, sed limigas ĝin al %d ludo aŭ modifaĵo"
 
 #: src/client/game.cpp
 #, c-format
@@ -1625,10 +1609,6 @@ msgstr "Dratostaro montrita"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zomado nuntempe malŝaltita de ludo aŭ modifaĵo"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "bone"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Babilado nun estas malŝaltita de ludo aŭ modifaĵo"
@@ -1677,23 +1657,20 @@ msgid "Caps Lock"
 msgstr "Majuskla baskulo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
 msgstr "Vakigo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "Stiro"
+msgstr "Stirklavo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Forigi"
+msgstr "Forigo"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Malsupren"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1740,9 +1717,8 @@ msgid "Insert"
 msgstr "Enmeti"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Maldekstra Stiro"
+msgstr "Maldekstren"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1766,7 +1742,6 @@ msgstr "Maldekstra Vindozo"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
 msgstr "Menuo"
 
@@ -1843,20 +1818,17 @@ msgid "OEM Clear"
 msgstr "OEM Vakigi"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
-msgstr "Paĝon malsupren"
+msgstr "Paĝon suben"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
 msgstr "Paĝon supren"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Haltigo"
+msgstr "Paŭzo"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1868,14 +1840,12 @@ msgid "Print"
 msgstr "Presi"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Enen"
+msgstr "Enigo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Dekstra Stiro"
+msgstr "Dekstren"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1907,7 +1877,6 @@ msgid "Select"
 msgstr "Elekti"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
 msgstr "Majuskligo"
 
@@ -1929,7 +1898,7 @@ msgstr "Tabo"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Supren"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1940,7 +1909,6 @@ msgid "X Button 2"
 msgstr "X-Butono 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
 msgstr "Zomo"
 
@@ -1962,6 +1930,15 @@ msgstr "Mapeto en supraĵa reĝimo, zomo ×%d"
 msgid "Minimap in texture mode"
 msgstr "Mapeto en tekstura reĝimo"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Malsukcesis malfermi retpaĝon"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2155,6 +2132,19 @@ msgstr "Zomo"
 msgid "press key"
 msgstr "premi klavon"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Malsukcesis malfermi retpaĝon"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Ŝanĝi"
@@ -2188,6 +2178,7 @@ msgstr "Laŭteco: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "eo"
 
@@ -2203,9 +2194,9 @@ msgid "Name is taken. Please choose another name"
 msgstr "La nomo jam estas prenita. Bonvolu elekti alian nomon."
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "Malŝaltiĝante…"
+msgstr "%s dum malstarto: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2276,7 +2267,7 @@ msgstr "2d-a bruo, kiu lokas la riverajn valojn kaj kanalojn."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2411,14 +2402,6 @@ msgstr "Aktiva senda amplekso de objektoj"
 msgid "Adds particles when digging a node."
 msgstr "Aldonas partiklojn ĉe fosado de mondero."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ĝustigi punktojn cole al via ekrano (ekster X11/Android), ekzemple por "
-"kvarmilaj ekranoj."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr "Alĝustigi trovitan ekran-densecon, por aligrandigi la fasadon."
@@ -2446,6 +2429,10 @@ msgstr "Nomo de administranto"
 msgid "Advanced"
 msgstr "Specialaj"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2485,14 +2472,12 @@ msgid "Announce to this serverlist."
 msgstr "Anonci al ĉi tiu servillisto."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Glatigo:"
+msgstr "Skalo de glatigo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Glatigo:"
+msgstr "Metodo de glatigo"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2506,6 +2491,17 @@ msgstr "Almeti nomon de portaĵo al ŝpruchelplio."
 msgid "Apple trees noise"
 msgstr "Bruo de pomujoj"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Braka movofirmo"
@@ -2523,18 +2519,37 @@ msgid "Ask to reconnect after crash"
 msgstr "Demandi pri rekonekto fiaskinte"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Je ĉi tiu distanco, la servilo fervore alĝustigos la nombron de monderoj\n"
+"sendataj al klientoj.\n"
+"Malgrandaj valoroj povas multe plibonigi efikecon, je la kosto de videblaj\n"
+"bildigaj eraroj (iuj monderoj ne bildiĝos sub akvo kaj en kavernoj, kaj iam\n"
+"eĉ ne surtere).\n"
+"Valoro pli granda ol tiu de «max_block_send_distance» malŝaltas ĉi tiun\n"
+"plibonigon.\n"
+"Donita en mondopecoj (16 monderoj)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Je ĉi tiu distanco, la servilo fervore alĝustigos la nombron de monderoj\n"
 "sendataj al klientoj.\n"
@@ -2574,9 +2589,8 @@ msgid "Base terrain height."
 msgstr "Baza alteco de tereno."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "Minimuma grandeco de teksturoj"
+msgstr "Baza grandeco de teksturoj"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2599,21 +2613,25 @@ msgid "Bind address"
 msgstr "Bindi adreson"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "Klimatoj"
+msgstr "API de klimatoj"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Klimata bruo"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Optimuma distanco de monder-sendado"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Optimuma distanco de monder-sendado"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr "Lumvastiĝo"
+msgstr "Lumado"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
@@ -2810,9 +2828,8 @@ msgid "Clouds"
 msgstr "Nuboj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
-msgstr "Nuboj kreiĝas klient-flanke."
+msgstr "Nuboj fariĝas klient-flanke."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
@@ -2826,6 +2843,12 @@ msgstr "Kolora nebulo"
 msgid "Colored shadows"
 msgstr "Koloraj ombroj"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2943,6 +2966,8 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"Decidas rapidecon de malsupreniro en fluaĵo sen aktiva moviĝo.\n"
+"Minusaj valoroj kaŭzos supreniron anstataŭe."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -2971,13 +2996,12 @@ msgid "Crosshair alpha"
 msgstr "Travidebleco de celilo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Crosshair alpha (opaqueness, between 0 and 255).\n"
 "This also applies to the object crosshair."
 msgstr ""
 "Travidebleco de celilo (maltravidebleco, inter 0 kaj 255).\n"
-"Ankaŭ determinas la koloron de la celilo de objekto."
+"Ankaŭ decidas la koloron de la celilo de objekto."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
@@ -2991,10 +3015,6 @@ msgstr ""
 "Koloro de celilo (Ruĝo, Verdo, Bluo).\n"
 "Ankaŭ determinas la koloron de la celilo de objekto"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "Punktoj cole"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Sojlo de grandeco de protokola dosiero"
@@ -3049,6 +3069,24 @@ msgstr ""
 "Ĉi tio imitas la efekton de molaj ombroj per PCF aŭ disko de Poisson,\n"
 "sed samtempe bezonas pli da komputaj rimedoj."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Ŝalti por malpermesi konekton de malnovaj klientoj.\n"
+"Malnovaj klientoj estas akordaj tiel, ke ili ne fiaskas konektante al novaj "
+"serviloj,\n"
+"sed eble ili ne subtenos ĉiujn atendatajn funkciojn."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Difinas zonojn kie arboj donas pomojn."
@@ -3250,6 +3288,11 @@ msgstr "Ŝalti ĉiujn"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ŝalti difektadon"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3273,6 +3316,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Ŝalti stirstangojn"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3322,6 +3370,11 @@ msgstr "Ŝalti modifaĵan sekurecon"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Ŝalti hazardan uzulan enigon (nur por testado)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Ŝalti hazardan uzulan enigon (nur por testado)."
@@ -3351,6 +3404,11 @@ msgstr ""
 "serviloj,\n"
 "sed eble ili ne subtenos ĉiujn atendatajn funkciojn."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Sojlo de tuŝekrano"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3362,14 +3420,6 @@ msgstr ""
 "Foraj serviloj prezentas ege pli rapidon manieron elŝuti vidaŭdaĵojn\n"
 "(ekzemple teksturojn) konektante al la servilo."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Ŝalti verticajn bufrajn objektojn.\n"
-"Ĉi tio devus multe plibonigi efikecon de grafiko."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3408,6 +3458,19 @@ msgstr "Ŝaltas movbildojn en portaĵujo."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ŝaltas kaŝmemoradon de maŝoj turnitaj per «facedir»."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3796,7 +3859,7 @@ msgstr "HTTP-modifaĵoj"
 
 #: src/settings_translation_file.cpp
 msgid "HUD"
-msgstr ""
+msgstr "Travida fasado"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4339,9 +4402,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Longeco de servila agociklo, kaj la intervalo dum kiu objektoj ĝenerale "
 "ĝisdatiĝas\n"
@@ -4517,10 +4581,6 @@ msgstr ""
 "Dependigi kolorojn de nebulo kaj ĉielo de tagtempo (sunleviĝo/sunsubiro)\n"
 "kaj direkto de rigardo."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Igas fluaĵojn netravideblaj"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Nivelo de densigo de mondopecoj por konservado sur disko"
@@ -4576,11 +4636,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Mapestigaj ecoj speciale por Mapestigilo v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Mondestigaj ecoj apartaj al Mondestigilo v6.\n"
 "La flago «snowbiomes» ŝaltas la novan 5-klimatan sistemon.\n"
@@ -4625,10 +4688,6 @@ msgstr "Prokrasto de estigo de maŝoj de mondopecoj"
 msgid "Mapblock mesh generation threads"
 msgstr "Prokrasto de estigo de maŝoj de mondopecoj"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Grando (en megabitokoj) de la kaŝmemoro de la estiganto de mondopecoj"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Tempolimo de mallego de mondopecoj"
@@ -4900,6 +4959,11 @@ msgstr "Minimuma nivelo de protokolado skribota al la babilujo."
 msgid "Minimap scan height"
 msgstr "Alteco de mapeta skanado"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Intertempo inter ripetaj metoj"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Minimuma limo de hazarda nombro de grandaj kavernoj en mondoparto."
@@ -4972,6 +5036,11 @@ msgstr "Respondemo de muso"
 msgid "Mouse sensitivity multiplier."
 msgstr "Obligilo por respondeco de muso."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Sojlo de kavernoj"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Bruo de koto"
@@ -5113,10 +5182,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Servilflanka elektado de postkaŝitoj"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Netralumeblaj fluidoj"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5133,6 +5198,11 @@ msgstr ""
 "enluda\n"
 "fenestro estas malfermita."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Mapestigila erarserĉilo"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5277,6 +5347,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proporcio de grandaj kavernoj, kiu enhavas fluaĵon."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokola versia miskongruo. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5294,6 +5373,10 @@ msgstr "Levas terenon por krei valojn ĉirkaŭ la riveroj."
 msgid "Random input"
 msgstr "Hazarda enigo"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Freŝaj mesaĝoj de babilo"
@@ -5504,8 +5587,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5647,8 +5730,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Agordi la lingvon. Lasu malplena por uzi la sisteman.\n"
@@ -5688,6 +5772,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5733,11 +5821,11 @@ msgid "Shaders"
 msgstr "Ombrigiloj"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Ombrigiloj ebligas specialaj vidajn efektojn kaj povas plibonigi efikecon je "
 "kelkaj vidkartoj.\n"
@@ -5824,16 +5912,6 @@ msgstr ""
 "Malpliigo de la valoro plialtigas densecon de kavernoj kaj forgeskeloj.\n"
 "Ŝanĝeblo de la valoro celas specialajn uzojn; senŝanĝo estas rekomendata."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Grandeco de la mondopeca kaŝmemoro de la meŝestigilo. Plialtigo ankaŭ\n"
-"plialtigos la elcenton de kaŝmemoraj trafoj, kaj malpliigos la datenojn\n"
-"kopiatajn de la ĉefa fadeno, malhelpante skuadon."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5870,7 +5948,7 @@ msgstr "Glata lumado"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Glatigas la turnadon de vidpunkto en glita reĝimo. 0 por malŝalti."
 
 #: src/settings_translation_file.cpp
@@ -5892,6 +5970,15 @@ msgstr "Rapido de kaŝirado, en monderoj sekunde."
 msgid "Soft shadow radius"
 msgstr "Radiuso de mola ombro"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Sono"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Malpermesitaj flagoj de ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6090,6 +6177,12 @@ msgstr ""
 "La norma formo, en kiu konserviĝas profiloj, kiam\n"
 "vokiĝas «/profiler save [formo]» sen formo."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6097,13 +6190,27 @@ msgid ""
 msgstr ""
 "La dosierindiko relativa al via mondoindiko, kien konserviĝos profiloj."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Identigilo de la uzota stirstango"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "Longeco (en bilderoj) necesa por komenco de interago kun tuŝekrano."
 
 #: src/settings_translation_file.cpp
@@ -6120,6 +6227,15 @@ msgstr ""
 "La antaŭagordo estas 1.0 (duono de mondero).\n"
 "Bezonas ŝaltitajn ondantajn fluaĵojn."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Tempo (en sekundoj) inter ripetaj metoj de monderoj dum premado de\n"
+"la butono por meti."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "La reta interfaco kie la servilo aŭskultas."
@@ -6158,7 +6274,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "La bildiga internaĵo.\n"
 "Relanĉo necesas post ĉi tiu ŝanĝo.\n"
@@ -6242,6 +6358,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Tria el la 4 3d-aj bruoj, kiuj kune difinas altecon de mont(et)aroj."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6298,15 +6418,15 @@ msgstr "Respondemo de muso"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Obligilo por respondeco de muso."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Sojlo de tuŝekrano"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Netralumeblaj fluidoj"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6345,7 +6465,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6456,10 +6578,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "Vertica bufrobjekto"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Vertikala akordigo"
@@ -6552,6 +6670,10 @@ msgstr "Virtuala stirstango premas specialan klavon"
 msgid "Volume"
 msgstr "Laŭteco"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6560,6 +6682,16 @@ msgstr ""
 "Laŭteco de ĉiuj sonoj\n"
 "Bezonas ŝaltitan sonsistemon."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Maksimuma nombro de kadroj en sekundo dum paŭzo aŭ sen fokuso"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Glata lumado"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6852,12 +6984,18 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(subteno de ludo bezonata)"
 
+#~ msgid "- Address: "
+#~ msgstr "– Adreso: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "– Krea reĝimo: "
 
 #~ msgid "- Damage: "
 #~ msgstr "– Difekto: "
 
+#~ msgid "- Port: "
+#~ msgstr "– Pordo: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6895,6 +7033,13 @@ msgstr "Samtempa limo de cURL"
 #~ "Lasu ĝin malplena por komenci lokan servilon.\n"
 #~ "La adresa kampo en la ĉefmenuo transpasas ĉi tiun agordon."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ĝustigi punktojn cole al via ekrano (ekster X11/Android), ekzemple por "
+#~ "kvarmilaj ekranoj."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6939,6 +7084,9 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bitoj bildere (aŭ kolornombro) en tutekrana reĝimo."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Monderlimoj montritaj por ĉiuj blokoj"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Tubera mapado"
 
@@ -6961,6 +7109,9 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Baskula klavo de ĝisdatigo de vidpunkto"
 
+#~ msgid "Change Keys"
+#~ msgstr "Ŝanĝi klavojn"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Ŝanĝi klavojn"
@@ -7035,6 +7186,38 @@ msgstr "Samtempa limo de cURL"
 #~ "Regas larĝecon de tuneloj; pli malgranda valoro kreas pri larĝajn "
 #~ "tunelojn."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Stirado:\n"
+#~ "– %s: moviĝi antaŭen\n"
+#~ "– %s: moviĝi posten\n"
+#~ "– %s: moviĝi maldekstren\n"
+#~ "– %s: moviĝi dekstren\n"
+#~ "– %s: salti/supreniri\n"
+#~ "- %s: fosi/bati\n"
+#~ "- %s: meti/uzi\n"
+#~ "– %s: kaŝiri/malsupreniri\n"
+#~ "– %s: demeti portaĵojn\n"
+#~ "– %s: portaĵujo\n"
+#~ "– Muso: turniĝi/rigardi\n"
+#~ "– Musrado: elekti portaĵon\n"
+#~ "– %s: babili\n"
+
 #~ msgid "Creative"
 #~ msgstr "Krea"
 
@@ -7044,6 +7227,9 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Koloro de celilo (R,V,B)."
 
+#~ msgid "DPI"
+#~ msgstr "Punktoj cole"
+
 #~ msgid "Damage"
 #~ msgstr "Difekto"
 
@@ -7138,6 +7324,13 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Ŝalti konfirmon de registriĝo"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Ŝalti verticajn bufrajn objektojn.\n"
+#~ "Ĉi tio devus multe plibonigi efikecon de grafiko."
+
 #~ msgid "Enabled"
 #~ msgstr "Ŝaltita"
 
@@ -7441,6 +7634,9 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Ekzamenado"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Nevalida ludspecifo."
+
 #~ msgid "Inventory key"
 #~ msgstr "Klavo de portaĵujo"
 
@@ -8134,6 +8330,13 @@ msgstr "Samtempa limo de cURL"
 #~ "Funkciigas programaron «DirectX» kun «LuaJIT». Malŝaltu okaze de "
 #~ "problemoj."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Igas fluaĵojn netravideblaj"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "Grando (en megabitokoj) de la kaŝmemoro de la estiganto de mondopecoj"
+
 #~ msgid "Menus"
 #~ msgstr "Menuoj"
 
@@ -8362,15 +8565,21 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Simplaj folioj"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Grandeco de la mondopeca kaŝmemoro de la meŝestigilo. Plialtigo ankaŭ\n"
+#~ "plialtigos la elcenton de kaŝmemoraj trafoj, kaj malpliigos la datenojn\n"
+#~ "kopiatajn de la ĉefa fadeno, malhelpante skuadon."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Glata lumado"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Glitigas turnadon de la vidpunkto. 0 por malŝalti."
 
-#~ msgid "Sound"
-#~ msgstr "Sono"
-
 #~ msgid "Special"
 #~ msgstr "Speciala"
 
@@ -8425,6 +8634,10 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Tuŝa sojlo (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Sojlo de tuŝekrano"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineara filtrilo"
 
@@ -8469,6 +8682,9 @@ msgstr "Samtempa limo de cURL"
 #~ "malŝaltita.\n"
 #~ "Vi devas relanĉi post ŝanĝo de ĉi tiu elekteblo."
 
+#~ msgid "VBO"
+#~ msgstr "Vertica bufrobjekto"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variaĵo de alteco de montetoj kaj profundeco de lagoj sur glata tereno de "
@@ -8553,8 +8769,14 @@ msgstr "Samtempa limo de cURL"
 #~ msgid "You died."
 #~ msgstr "Vi mortis."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Vi havas neniujn instalitajn ludojn."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "bone"
diff --git a/po/es/minetest.po b/po/es/minetest.po
index 301a9f7b5..d02783f7b 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spanish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-12-02 05:17+0000\n"
-"Last-Translator: chocomint <silentxe1@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-14 21:23+0000\n"
+"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
 "minetest/es/>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -76,8 +76,8 @@ msgid "Command not available: "
 msgstr "Comando no disponible: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Obtener ayuda para los comandos"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Obtener ayuda para los comandos (-t: salida en el chat)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -87,12 +87,8 @@ msgstr ""
 "todo."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[todo | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Aceptar"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -110,6 +106,10 @@ msgstr "Ha ocurrido un error:"
 msgid "Main menu"
 msgstr "Menú principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Aceptar"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Reconectar"
@@ -138,19 +138,27 @@ msgstr "Solo se soporta la versión de protocolo $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Nosotros soportamos versiones de protocolo entre la versión $1 y $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" ya existe. Quieres remplazarlo?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Error instalando \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 y $2 dependencias serán instaladas."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Fallo al descargar \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 por $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Fallo al descargar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"No se pudo extraer \"$1\" (espacio en disco insuficiente, tipo de archivo no "
+"compatible o archivo dañado)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -158,158 +166,158 @@ msgstr ""
 "$1 descargando,\n"
 "$2 en espera"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 descargando..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 dependencias requeridas no se encuentren."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 será instalado, y $2 dependencias serán ignoradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Todos los paquetes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Ya está instalado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Volver al menú principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"ContentDB no se encuentra disponible cuando Minetest se compiló sin cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Descargando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Error obteniendo dependencias para el paquete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Juegos"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "No se ha podido obtener ningún paquete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Sin resultados"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "No hay actualizaciones"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "En cola"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paq. de texturas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "No se encontró el paquete $1."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Actualizar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Actualizar Todo [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Ver más información en un navegador web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Necesitas instalar un juego antes de que puedas instalar un mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 y $2 dependencias serán instaladas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependencias requeridas no se encuentren."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 será instalado, y $2 dependencias serán ignoradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Ya está instalado"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Juego Base:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"ContentDB no se encuentra disponible cuando Minetest se compiló sin cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependencias:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Descargando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Error instalando \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Fallo al descargar \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Fallo al descargar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Fallo al extraer \"$1\" (Formato de archivo no soportado o archivo corrupto)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Juegos"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalar dependencias faltantes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "No se ha podido obtener ningún paquete"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Sin resultados"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "No hay actualizaciones"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "No encontrado"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sobreescribir"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Por favor verifica que el juego base está bien."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "En cola"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" ya existe. Quieres remplazarlo?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paq. de texturas"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "No se encontró el paquete $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Actualizar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Actualizar Todo [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Ver más información en un navegador web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Necesitas instalar un juego antes de que puedas instalar un mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sobreescribir"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -459,10 +467,22 @@ msgstr "Crear"
 msgid "Decorations"
 msgstr "Decoraciones"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Templos del desierto"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test está destinado para desarrolladores."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Variante de mazmorras diferente generada en biomas de desierto (solo si las "
+"mazmorras están activadas)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Mazmorras"
@@ -846,10 +866,6 @@ msgstr "Accesibilidad"
 msgid "Back"
 msgstr "Atrás"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Configurar teclas"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -859,7 +875,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Limpiar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controles"
 
@@ -1068,6 +1085,18 @@ msgstr "Instalar un juego"
 msgid "Install games from ContentDB"
 msgstr "Instalar juegos desde ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game ya no es instalado por predeterminado."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest es una plataforma de creación de juegos que te permite jugar a "
+"muchos juegos diferentes."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nuevo"
@@ -1101,8 +1130,8 @@ msgid "Start Game"
 msgstr "Empezar juego"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "No tienes juegos instalados."
+msgid "You need to install a game before you can create a world."
+msgstr "Necesitas instalar un juego antes de poder crear un mundo."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1181,18 +1210,10 @@ msgstr "Cargando texturas..."
 msgid "Rebuilding shaders..."
 msgstr "Reconstruyendo sombreadores..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Error de conexión (¿tiempo agotado?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "No se puede encontrar o cargar el juego: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Juego especificado no válido."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menú principal"
@@ -1219,7 +1240,11 @@ msgstr "Fallo para abrir el archivo con la contraseña proveída: "
 msgid "Provided world path doesn't exist: "
 msgstr "La ruta del mundo especificada no existe: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Multimedia..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1227,18 +1252,10 @@ msgstr ""
 "\n"
 "Revisa debug.txt para más detalles."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Dirección: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modo: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Puerto: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Público: "
@@ -1273,10 +1290,6 @@ msgstr "Avance automático activado"
 msgid "Block bounds hidden"
 msgstr "Límites de bloque ocultos"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Límites de bloque mostrados para todos los bloques"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Límites de bloque mostrados para el bloque actual"
@@ -1323,6 +1336,10 @@ msgstr "El Scripting en el lado del cliente está desactivado"
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Error de conexión (¿tiempo agotado?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "La conexión falló por razones desconocidas"
@@ -1332,45 +1349,13 @@ msgid "Continue"
 msgstr "Continuar"
 
 #: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controles:\n"
-"- %s: moverse hacia adelante\n"
-"- %s: moverse hacia atras\n"
-"- %s: moverse a la izquierda\n"
-"- %s: moverse a la derecha\n"
-"- %s: saltar/escalar\n"
-"- %s: excavar/golpear\n"
-"- %s: colocar/usar\n"
-"- %s: agacharse/bajar\n"
-"- %s: soltar objeto\n"
-"- %s: inventario\n"
-"- Ratón: girar/mirar\n"
-"- Rueda del ratón: elegir objeto\n"
-"- %s: chat\n"
-
-#: src/client/game.cpp
+#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1462,6 +1447,11 @@ msgstr "Niebla desactivada"
 msgid "Fog enabled"
 msgstr "Niebla activada"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "El zoom está actualmente desactivado por el juego o un mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Información del juego:"
@@ -1482,10 +1472,6 @@ msgstr "Definiciones de objetos..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Multimedia..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1654,10 +1640,6 @@ msgstr "Estructura alámbricas mostradas"
 msgid "Zoom currently disabled by game or mod"
 msgstr "El zoom está actualmente desactivado por el juego o un mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "Aceptar"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chat deshabilitado por el juego o un mod"
@@ -1713,13 +1695,12 @@ msgid "Control Key"
 msgstr "Tecla de control"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Borrar"
+msgstr "Tecla de borrar"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Flecha por abajo"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1766,9 +1747,8 @@ msgid "Insert"
 msgstr "Insertar"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Control izquierdo"
+msgstr "Control izquerda"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1792,9 +1772,8 @@ msgstr "Win izq"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "Menú"
+msgstr "Tecla de Menú"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1869,20 +1848,17 @@ msgid "OEM Clear"
 msgstr "Limpiar OEM"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
-msgstr "Re. pág"
+msgstr "Página abajo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
-msgstr "Av. pág"
+msgstr "Página arriba"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Pausa"
+msgstr "Tecla de Pausa"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1894,14 +1870,12 @@ msgid "Print"
 msgstr "Captura"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Retorno"
+msgstr "Tecla de retorno"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Control der"
+msgstr "flechas de dirección"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1933,9 +1907,8 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Mayús"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1955,7 +1928,7 @@ msgstr "Tabulador"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Flecha por arriba"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1988,6 +1961,15 @@ msgstr "Minimapa en modo superficie, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapa en modo textura"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Fallo al compilar el shader \"%s\"."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Los shaders están activados pero el driver no soporta GLSL."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2173,6 +2155,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "pulsa una tecla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Abrir URL?"
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Fallo al abrir la página web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Cambiar"
@@ -2206,6 +2201,7 @@ msgstr "Volumen del sonido: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "es"
 
@@ -2302,7 +2298,7 @@ msgstr "Mostrar favoritos"
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2443,14 +2439,6 @@ msgstr "Rango de envío en objetos activos"
 msgid "Adds particles when digging a node."
 msgstr "Añade partículas al excavar un nodo."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajustar la configuración de puntos por pulgada a tu pantalla (no X11/Android "
-"sólo), por ejemplo para pantallas 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2481,6 +2469,10 @@ msgstr "Nombre del administrador"
 msgid "Advanced"
 msgstr "Avanzado"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Permite que los líquidos sean traslúcidos."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2541,6 +2533,17 @@ msgstr "Añadir nombre de objeto a la burbuja informativa."
 msgid "Apple trees noise"
 msgstr "Ruido de manzanos"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inercia de brazo"
@@ -2558,18 +2561,39 @@ msgid "Ask to reconnect after crash"
 msgstr "Preguntar para reconectar tras una caída"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"A esta distancia el servidor optimizará agresivamente qué bloques son "
+"enviados a\n"
+"los clientes.\n"
+"Los valores bajos mejorarán mucho el rendimiento, a costa de \n"
+"errores gráficos visibles (algunos bloques no serán renderizados bajo el "
+"agua y en cuevas,\n"
+"así como ocasionalmente en tierra).\n"
+"Definir esto a un valor mayor que max_block_send_distance deshabilita esta\n"
+"optimización.\n"
+"Fijado en bloques de mapa (16 nodos)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "A esta distancia el servidor optimizará agresivamente qué bloques son "
 "enviados a\n"
@@ -2643,13 +2667,18 @@ msgstr "Biomas"
 msgid "Biome noise"
 msgstr "Ruido de bioma"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Optimizar la distancia del envío de bloques"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Optimizar la distancia del envío de bloques"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr "Destello de lente"
+msgstr "Floración"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
@@ -2861,6 +2890,12 @@ msgstr "Niebla colorida"
 msgid "Colored shadows"
 msgstr "Sombras coloridas"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3030,10 +3065,6 @@ msgstr ""
 "Color del punto de mira (R,G,B).\n"
 "También controla el color del objeto punto de mira"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Umbral del tamaño del archivo de registro de depuración"
@@ -3088,6 +3119,24 @@ msgstr ""
 "Esto simula el efecto de sombras suaves aplicando un PCF o Poisson disk\n"
 "pero tambien utiliza más recursos."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Habilitar para no permitir que clientes antíguos se conecten.\n"
+"Los clientes antíguos son compatibles al punto de conectarse a nueos "
+"servidores,\n"
+"pero pueden no soportar nuevas características."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Define las áreas donde los árboles tienen manzanas."
@@ -3298,6 +3347,11 @@ msgstr "Activar Destello de Lente"
 msgid "Enable Bloom Debug"
 msgstr "Habilitar Debug del Destello de Lente"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Permitir daños"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3324,6 +3378,11 @@ msgstr ""
 "Si el valor es verdadero, utiliza \"poisson disk\" para proyectar sombras "
 "suaves. De otro modo utiliza filtrado PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Posprocesamiento"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Habilitar Culling por Trazado de Rayos"
@@ -3375,6 +3434,11 @@ msgstr ""
 "Habilita la rueda del ratón (Desplazando) para seleccionar los items en la "
 "hotbar."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Habilitar entrada aleatoria (solo usar para pruebas)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Habilitar entrada aleatoria (solo usar para pruebas)."
@@ -3404,6 +3468,11 @@ msgstr ""
 "servidores,\n"
 "pero pueden no soportar nuevas características."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Pantalla táctil"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3415,14 +3484,6 @@ msgstr ""
 "Servidores remotos ofrecen una manera significativamente más rápida de\n"
 "descargar medios (por ej. texturas) cuando se conecta a un servidor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Habilitar los objetos vértices del buffer.\n"
-"Esto debería mejorar enormemente el rendimiento de los gráficos."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3463,6 +3524,20 @@ msgstr "Habilita la animación de objetos en el inventario."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Habilitar cacheado de mallas giradas."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Activa depuración y comprobación de errores en el driver OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Activa el modo de pantalla táctil, permitiendote jugar con pantalla táctil."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3779,7 +3854,6 @@ msgid "Fullscreen mode."
 msgstr "Modo de pantalla completa."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
 msgstr "Interfaz gráfica de usuario"
 
@@ -4418,13 +4492,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Duración de un tick del servidor y el intervalo en el que los objetos se "
-"actualizan generalmente sobre la\n"
-"red, expresada en segundos."
+"Duración de un tick del servidor y el intervalo en\n"
+"el que los objetos se actualizan generalmente\n"
+"sobre la red, expresada en segundos."
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
@@ -4603,10 +4678,6 @@ msgstr ""
 "Hace que la niebla y los colores del cielo dependan de la hora del día "
 "(amanecer / atardecer) y la dirección de vista."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Vuelve opacos a todos los líquidos"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Nivel de comprensión del mapa para almacenamiento de disco"
@@ -4663,11 +4734,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atributos de generación de mapas específicos al generador de mapas v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Atributos específicos para la generación de Mapgen v6.\n"
 "La opción 'snowbiomes' activa el nuevo sistema de generación de 5 biomas.\n"
@@ -4711,11 +4785,6 @@ msgstr "Retraso de generación de la malla del Mapblock"
 msgid "Mapblock mesh generation threads"
 msgstr "Hilos para la generación de la malla del Mapblock"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-"Tamaño de cache en MB del Mapblock del generador de la malla del Mapblock"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Expirado de descarga de Mapblock"
@@ -4992,6 +5061,11 @@ msgstr "Nivel mínimo de logging a ser escrito al chat."
 msgid "Minimap scan height"
 msgstr "Altura de escaneo del minimapa"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Intervalo de repetición para colocar"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Límite mínimo de número aleatorio de cuevas grandes por mapchunk."
@@ -5007,7 +5081,7 @@ msgstr "Mapa mip"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "De todo tipo"
 
 #: src/settings_translation_file.cpp
 msgid "Mod Profiler"
@@ -5061,6 +5135,11 @@ msgstr "Sensibilidad del ratón"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplicador de sensiblidad del ratón."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Límite de caverna"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Ruido del barro"
@@ -5203,10 +5282,6 @@ msgstr "Oclusión de Culler"
 msgid "Occlusion Culling"
 msgstr "Eliminación de oclusión"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Líquidos opacos"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5224,6 +5299,11 @@ msgstr ""
 "un formulario\n"
 "abierto."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Depuración del generador de mapas"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Anulación opcional del color de un enlace web en el chat."
@@ -5358,6 +5438,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proporción de cuevas grandes que contienen líquido."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "La versión del protocolo no coincide"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Gesto para golpear"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5376,6 +5464,10 @@ msgstr "Levanta terreno para hacer valles alrededor de los ríos."
 msgid "Random input"
 msgstr "Entrada aleatoria"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Orden aleatorio de carga de mods"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Mensajes Recientes del Chat"
@@ -5594,13 +5686,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Ver https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5765,8 +5858,9 @@ msgstr ""
 "Rango: de -1 a 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Seleccionar el idioma. Dejar vacío para usar el idioma del sistema.\n"
@@ -5813,6 +5907,10 @@ msgstr ""
 "Establecer como cierto para habilitar el efecto de resplandor (bloom).\n"
 "Los colores brillantes se mezclarán con los objetos circundantes."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Establece en true para permitir la ondulación de hojas."
@@ -5862,13 +5960,12 @@ msgstr "Shaders (Sombreador)"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Los sombreadores permiten efectos visuales avanzados y pueden aumentar el "
-"rendimiento en algunas tarjetas de\n"
-"vídeo.\n"
-"Esto solo funciona con el motor de vídeo OpenGL."
+"rendimiento\n"
+"en algunas tarjetas de vídeo. Esto solo funciona con el motor de vídeo "
+"OpenGL."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5930,6 +6027,14 @@ msgid ""
 "draw calls, benefiting especially high-end GPUs.\n"
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
+"Longitud lateral de un cubo de bloques de mapa que el cliente considerará "
+"juntos\n"
+"al generar mallas.\n"
+"Los valores más grandes aumentan la utilización de la GPU al reducir el "
+"número de\n"
+"llamar, beneficiando especialmente a las GPU de gama alta.\n"
+"Los sistemas con una GPU de gama baja (o sin GPU) se beneficiarían de "
+"valores más pequeños."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5940,41 +6045,44 @@ msgid ""
 "Altering this value is for special usage, leaving it unchanged is\n"
 "recommended."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
+"Tamaño de los mapchunks generados por mapgen, expresado en mapblocks (16 "
+"nodos).\n"
+"ADVERTENCIA: No hay ningún beneficio, y hay varios peligros, en\n"
+"aumentar este valor por encima de 5.\n"
+"Reducir este valor aumenta la densidad de cuevas y mazmorras.\n"
+"Alterar este valor es para uso especial, dejarlo sin cambios es\n"
+"recomendable."
 
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
-msgstr ""
+msgstr "Inclinación orbital del cuerpo celeste"
 
 #: src/settings_translation_file.cpp
 msgid "Slice w"
-msgstr ""
+msgstr "Porción w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
-msgstr ""
+msgstr "La pendiente y el relleno trabajan juntos para modificar las alturas."
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
-msgstr ""
+msgstr "Cantidad máxima de cuevas pequeñas"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave minimum number"
-msgstr ""
+msgstr "Cantidad mínima de cuevas pequeñas"
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale humidity variation for blending biomes on borders."
 msgstr ""
+"Variación de humedad a pequeña escala para mezclar en los límites de los "
+"biomas."
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale temperature variation for blending biomes on borders."
 msgstr ""
+"Variación de temperatura a pequeña escala para mezclar biomas en bordes."
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
@@ -5984,7 +6092,7 @@ msgstr "Iluminación suave"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Suaviza la rotación de la cámara en modo cinematográfico. 0 para desactivar."
 
@@ -6008,6 +6116,15 @@ msgstr "Velocidad agachado, en nodos por segundo."
 msgid "Soft shadow radius"
 msgstr "Radio de sombra suave"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Sonido"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Lista negra de Contenido de la Base de Datos"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6082,7 +6199,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
-msgstr ""
+msgstr "Quitar códigos de color"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6180,19 +6297,56 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"El formato predefinido en que se guardan los perfiles\n"
+"al llamar `/profiler save [format]` sin especificar formato."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"El retraso en milisegundos a partir del cual una interacción táctil es "
+"considerada un toque prolongado."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
+"La ruta de archivos relativa a la ruta de los mundos en la que se guardarán "
+"los perfiles."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"El gesto para golpear jugadores/entidades.\n"
+"Los juegos y mods pueden ignorar esto.\n"
+"\n"
+"* sort_tap\n"
+"Fácil de usar y muy conocido por otros juegos que no se mencionarán.\n"
+"\n"
+"* long_tap\n"
+"Conocido por los controles clásicos para móviles de Minetest.\n"
+"El combate es más o menos imposible."
 
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
-msgstr ""
+msgstr "El identificador del joystick a usar"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
+"La longitud en píxeles a partir de la cual una interacción táctil es "
+"considerada movimiento."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6202,6 +6356,15 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"El tiempo en segundos entre la colocación de cada nodo mientras\n"
+"se mantiene pulsado el botón para colocar."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -6211,6 +6374,9 @@ msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
+"Los privilegios que reciben los usuarios nuevos automaticamente.\n"
+"Véase /privs en el juego para una lista completa en tu servidor y "
+"configuración de mods."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6228,8 +6394,12 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
+"El back-end de renderizado.\n"
+"Nota: ¡se requiere reinicio después de cambiar esto!\n"
+"OpenGL es el predeterminado para PC, y OGLES2 para Android.\n"
+"Los shaders son soportados por todo excepto OGLES1."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6263,6 +6433,8 @@ msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
+"El tiempo en segundos entre eventos repetidos al mantener\n"
+"presionada una combinación de botones del joystick."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6282,6 +6454,10 @@ msgid ""
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
+"La distancia vertical sobre la cuál el calor decae a 20 si 'altitude_chill' "
+"está activo.\n"
+"También, la distancia vertical sobre la cual la humedad decae a 10 si\n"
+"'altitude_dry' está activo."
 
 #: src/settings_translation_file.cpp
 msgid "Third of 4 2D noises that together define hill/mountain range height."
@@ -6289,11 +6465,17 @@ msgstr ""
 "Tercero de 4 ruidos en 2D que juntos definen el rango de altura de colinas y "
 "montañas."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Umbral para toques prolongados"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"Tiempo, en segundos, de vida de las entidades objeto (objetos soltados).\n"
+"Establecerla a -1 desactiva esta característica."
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
@@ -6337,15 +6519,15 @@ msgstr "Sensibilidad del ratón"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Multiplicador de sensiblidad del ratón."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Umbral de la pantalla táctil"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Líquidos opacos"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6384,7 +6566,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6410,15 +6594,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr ""
+msgstr "Liberar datos no usados del servidor"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "Actualizar información de URLs"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
-msgstr ""
+msgstr "Límite Y superior de las mazmorras."
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of floatlands."
@@ -6444,13 +6628,15 @@ msgstr "Usar filtrado bilinear al escalar texturas."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "Usar retícula en pantalla táctil"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
+"Usar la retícula para seleccionar objetos en lugar de usar la pantalla.\n"
+"Si está activo, una retícula se mostrará y se usará para seleccionar objetos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6472,6 +6658,9 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"Usar filtro trilinear al escalar texturas.\n"
+"Si tanto los filtros bilinear y trilinear están activos, se aplica\n"
+"el filtro trilinear."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6488,10 +6677,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfaces de usuario"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Sincronización vertical"
@@ -6522,17 +6707,19 @@ msgstr "Variación de la altura maxima de las montañas (En nodos)."
 
 #: src/settings_translation_file.cpp
 msgid "Variation of number of caves."
-msgstr ""
+msgstr "Variación en el número de cuevas."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Variation of terrain vertical scale.\n"
 "When noise is < -0.55 terrain is near-flat."
 msgstr ""
+"Variación de la escala vertical.\n"
+"Cuando el ruido es < -0.55 el terreno es casi plano."
 
 #: src/settings_translation_file.cpp
 msgid "Varies depth of biome surface nodes."
-msgstr ""
+msgstr "Varía la profundidad de los nodos de la superficie de los biomas."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6553,10 +6740,12 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
+"Sincronización vertical de la pantalla. Tu sistema aún podría forzar la "
+"sincronización vertical incluso si está desactivada."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "Driver de video"
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing factor"
@@ -6578,6 +6767,10 @@ msgstr ""
 msgid "Volume"
 msgstr "Volumen"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Multiplicador de volúmen cuando la ventana está desenfocada."
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6587,6 +6780,16 @@ msgstr ""
 "Volumen de todos los sonidos.\n"
 "Requiere que el sistema de sonido esté habilitado."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS cuando está en segundo plano o pausado"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Iluminación suave"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6607,6 +6810,7 @@ msgstr "Velocidad del caminar"
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
 msgstr ""
+"Velocidad al caminar, volar y escalar en modo rápido, en nodos por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -6614,7 +6818,7 @@ msgstr "Nivel del agua"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Nivel de superficie de agua del mundo."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
@@ -6647,7 +6851,7 @@ msgstr "Movimiento de plantas"
 
 #: src/settings_translation_file.cpp
 msgid "Weblink color"
-msgstr ""
+msgstr "Color de los enlaces web"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6728,11 +6932,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
-msgstr ""
+msgstr "Ancho de las líneas de la caja de selección alrededor de los nodos."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Ventana maximizada"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6785,6 +6989,7 @@ msgstr "\"Y\" del límite superior de las grandes cuevas."
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
 msgstr ""
+"Distancia en Y sobre la cual las cavernas se expanden a su tamaño completo."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6796,7 +7001,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
-msgstr ""
+msgstr "Nivel Y de superficie de terreno promedio."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of cavern upper limit."
@@ -6804,7 +7009,7 @@ msgstr "Nivel Y del límite superior de las cavernas."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of higher terrain that creates cliffs."
-msgstr ""
+msgstr "Nivel Y de terreno más elevado que crea acantilados."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of lower terrain and seabed."
@@ -6833,12 +7038,18 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "(game support required)"
 #~ msgstr "(se requiere soporte de juego)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Dirección: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Modo creativo: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Daño: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Puerto: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6876,6 +7087,13 @@ msgstr "Límite de cURL en paralelo"
 #~ "Dejar esto vacío para iniciar un servidor local.\n"
 #~ "Nótese que el campo de dirección del menú principal anula este ajuste."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajustar la configuración de puntos por pulgada a tu pantalla (no X11/"
+#~ "Android sólo), por ejemplo para pantallas 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6951,6 +7169,9 @@ msgstr "Límite de cURL en paralelo"
 #~ "Bits por píxel (también conocido como profundidad de color) en modo de "
 #~ "pantalla completa."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Límites de bloque mostrados para todos los bloques"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Mapeado de relieve"
 
@@ -6973,6 +7194,9 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Tecla alternativa para la actualización de la cámara"
 
+#~ msgid "Change Keys"
+#~ msgstr "Configurar teclas"
+
 #~ msgid "Change keys"
 #~ msgstr "Cambiar teclas"
 
@@ -7049,6 +7273,38 @@ msgstr "Límite de cURL en paralelo"
 #~ msgstr ""
 #~ "Controla el ancho de los túneles, un valor menor crea túneles más anchos."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controles:\n"
+#~ "- %s: moverse hacia adelante\n"
+#~ "- %s: moverse hacia atras\n"
+#~ "- %s: moverse a la izquierda\n"
+#~ "- %s: moverse a la derecha\n"
+#~ "- %s: saltar/escalar\n"
+#~ "- %s: excavar/golpear\n"
+#~ "- %s: colocar/usar\n"
+#~ "- %s: agacharse/bajar\n"
+#~ "- %s: soltar objeto\n"
+#~ "- %s: inventario\n"
+#~ "- Ratón: girar/mirar\n"
+#~ "- Rueda del ratón: elegir objeto\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Creativo"
 
@@ -7058,6 +7314,9 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Color de la cruz (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Daño"
 
@@ -7147,6 +7406,13 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Habilitar confirmación de registro"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Habilitar los objetos vértices del buffer.\n"
+#~ "Esto debería mejorar enormemente el rendimiento de los gráficos."
+
 #~ msgid "Enabled"
 #~ msgstr "Activado"
 
@@ -7466,6 +7732,9 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentación"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Juego especificado no válido."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tecla Inventario"
 
@@ -8165,6 +8434,13 @@ msgstr "Límite de cURL en paralelo"
 #~ msgstr ""
 #~ "Hace que DirectX funcione con LuaJIT. Desactivar si ocasiona problemas."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Vuelve opacos a todos los líquidos"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "Tamaño de cache en MB del Mapblock del generador de la malla del Mapblock"
+
 #~ msgid "Menus"
 #~ msgstr "Menús"
 
@@ -8367,15 +8643,23 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Simple Leaves"
 #~ msgstr "Hojas simples"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Tamaño de caché del generador de terreno del generador de malla. Esto "
+#~ "hace que\n"
+#~ "aumenta el porcentaje de aciertos de caché al reducir los datos que se "
+#~ "copian del hilo\n"
+#~ "principal, reducindo así la fluctuación."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Iluminación suave"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Suaviza la rotación de la cámara. 0 para desactivar."
 
-#~ msgid "Sound"
-#~ msgstr "Sonido"
-
 #~ msgid "Special"
 #~ msgstr "Especial"
 
@@ -8428,6 +8712,10 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Umbral táctil (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Umbral de la pantalla táctil"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtrado trilineal"
 
@@ -8522,8 +8810,14 @@ msgstr "Límite de cURL en paralelo"
 #~ msgid "You died."
 #~ msgstr "Has muerto."
 
+#~ msgid "You have no games installed."
+#~ msgstr "No tienes juegos instalados."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "Aceptar"
diff --git a/po/et/minetest.po b/po/et/minetest.po
index efc788ea3..b2f48ed1f 100644
--- a/po/et/minetest.po
+++ b/po/et/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Estonian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-10-22 17:18+0000\n"
 "Last-Translator: Janar Leas <janarleas+ubuntuone@googlemail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Käsk pole saadaval: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Leia abi käskude kohta"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "kõik käsud."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <käsk>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Valmis"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<pole saadaval>"
@@ -105,6 +103,10 @@ msgstr "Ilmnes viga:"
 msgid "Main menu"
 msgstr "Peamenüü"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Valmis"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Taasühenda"
@@ -133,19 +135,26 @@ msgstr "Meie toetame ainult protokolli versiooni $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Meie toetame protokolli versioone $1 kuni $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" on juba olemas. Kas sa tahad seda üle kirjutada?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Viga \"$1\" paigaldamisel: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Paigaldatakse sõltuvused $1 ja $2."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "\"$1\" allalaadimine nurjus"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 $2 poolt"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 allalaadimine nurjus"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "\"$1\" eraldamine nurjus (failitüüpi ei toetata või on arhiiv vigane)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,156 +162,157 @@ msgstr ""
 "$1 allalaadimisel,\n"
 "$2 ootel"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 allalaadimine..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 vajaliku sõltuvust polnud leida."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "Installitakse $1 ja $2 sõltuvus jäetakse vahele."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Kõik pakid"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Juba installeeritud"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Tagasi peamenüüsse"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ei ole olemas kui Minetest on kompileeritud ilma cURL'ita"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Allalaadimine..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Mängud"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Paigalda"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laadimine..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod-id"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Ei õnnestunud ühtki pakki vastu võtta"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Tulemused puuduvad"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Värskendusi pole"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Ootel"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Tekstuuripakid"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Eemalda"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Värskenda"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Värskenda kõiki [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Vaata rohkem infot veebibrauseris"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Paigaldatakse sõltuvused $1 ja $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 $2 poolt"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 vajaliku sõltuvust polnud leida."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Installitakse $1 ja $2 sõltuvus jäetakse vahele."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Juba installeeritud"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Põhi Mäng:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Tühista"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ei ole olemas kui Minetest on kompileeritud ilma cURL'ita"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Sõltuvused:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Allalaadimine..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Viga \"$1\" paigaldamisel: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "\"$1\" allalaadimine nurjus"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 allalaadimine nurjus"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "\"$1\" eraldamine nurjus (failitüüpi ei toetata või on arhiiv vigane)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Mängud"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Paigalda"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Paigalda $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Paigalda puuduvad sõltuvused"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laadimine..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod-id"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Ei õnnestunud ühtki pakki vastu võtta"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Tulemused puuduvad"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Värskendusi pole"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Kirjuta üle"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Palun tee kindlaks et põhi mäng on õige."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Ootel"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" on juba olemas. Kas sa tahad seda üle kirjutada?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Tekstuuripakid"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Eemalda"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Värskenda"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Värskenda kõiki [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Vaata rohkem infot veebibrauseris"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Kirjuta üle"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -450,10 +460,20 @@ msgstr "Loo"
 msgid "Decorations"
 msgstr "Ilmestused"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "\"Arendustest\" on mõeldud arendajatele."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Keldrid"
@@ -829,10 +849,6 @@ msgstr ""
 msgid "Back"
 msgstr "Tagasi"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Vaheta klahve"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -842,7 +858,8 @@ msgstr "Jututuba"
 msgid "Clear"
 msgstr "Tühjenda"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Juhtklahvid"
 
@@ -1051,6 +1068,16 @@ msgstr "Paigalda mäng"
 msgid "Install games from ContentDB"
 msgstr "Paigalda mänge sisuvaramust"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Uus"
@@ -1084,8 +1111,8 @@ msgid "Start Game"
 msgstr "Alusta mängu"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Sul pole ühtki mängu paigaldatud."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1164,18 +1191,10 @@ msgstr "Tekstuuride laadimine ..."
 msgid "Rebuilding shaders..."
 msgstr "Varjutajate taasloomine..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Ühenduse viga (Aeg otsas?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Ei suutnud leida või laadida mängu: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Vale mängu ID."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menüü"
@@ -1200,7 +1219,11 @@ msgstr "Salasõnafaili avamine ebaõnnestus: "
 msgid "Provided world path doesn't exist: "
 msgstr "Maailma failiteed pole olemas: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Meedia..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1208,18 +1231,10 @@ msgstr ""
 "\n"
 "Vaata debug.txt info jaoks."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Aadress: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Režiim: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Avalik: "
@@ -1254,10 +1269,6 @@ msgstr "Automaatne edastus lubatud"
 msgid "Block bounds hidden"
 msgstr "Klotsi servade peitmine"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Ääriste kuvamine kõigil klotsidel"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Ääriste kuvamine hoitavale klotsile"
@@ -1303,6 +1314,10 @@ msgstr "Kliendipoolne skriptimine on keelatud"
 msgid "Connecting to server..."
 msgstr "Serveriga ühenduse loomine..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Ühenduse viga (Aeg otsas?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Ühendus nurjus teadmata põhjusel"
@@ -1311,47 +1326,14 @@ msgstr "Ühendus nurjus teadmata põhjusel"
 msgid "Continue"
 msgstr "Jätka"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Klahvid:\n"
-"- %s: liigu edasi\n"
-"- %s: liigu tagasi\n"
-"- %s: liigu vasakule\n"
-"- %s: liigu paremale\n"
-"- %s: hüppa/roni\n"
-"- %s: kaeva/viruta\n"
-"- %s: paigalda/kasuta\n"
-"- %s: hiili/mine alla\n"
-"- %s: viska ese\n"
-"- %s: seljakott\n"
-"- Hiir: keera/vaata\n"
-"- Hiireratas: vali ese\n"
-"- %s: vestlus\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1443,6 +1425,11 @@ msgstr "Udu keelatud"
 msgid "Fog enabled"
 msgstr "Udu lubatud"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Suumimine on praegu mängu või modi tõttu keelatud"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Mängu teave:"
@@ -1463,10 +1450,6 @@ msgstr "Esemete määratlused..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Meedia..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1624,10 +1607,6 @@ msgstr "Raamvõrgustiku paljastus"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Suumimine on praegu mängu või modi tõttu keelatud"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "sobib"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Vestlus on hetkel tõkestatud mängu või mod-i poolt"
@@ -1961,6 +1940,15 @@ msgstr "Pinnakaart, Suurendus ×%d"
 msgid "Minimap in texture mode"
 msgstr "Pisikaart tekstuur-laadis"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Veebilehe avamine ebaõnnestus"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2150,6 +2138,19 @@ msgstr "Suumi"
 msgid "press key"
 msgstr "Vajuta nuppu"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Veebilehe avamine ebaõnnestus"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Muuda"
@@ -2183,6 +2184,7 @@ msgstr "Heli valjus: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "et"
 
@@ -2369,12 +2371,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr "Lendlevad osakesed klotsi kaevandamisel."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2397,6 +2393,10 @@ msgstr "Haldaja nimi"
 msgid "Advanced"
 msgstr "Arenenud sätted"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2452,6 +2452,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2473,12 +2484,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2543,6 +2563,10 @@ msgstr "Loodusvööndid"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2755,6 +2779,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2886,10 +2916,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2939,6 +2965,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3125,6 +3164,11 @@ msgstr "Luba sära"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ellujääja"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3144,6 +3188,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3186,6 +3234,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3209,6 +3261,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Puuteekraan"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3217,12 +3274,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3252,6 +3303,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4053,9 +4117,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4202,10 +4267,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4250,11 +4311,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Maailma-loome v6 spetsiifilised omadused. \n"
 "Lipp 'lumistud' võimaldab uudse 5-e loodusvööndi süsteemi.\n"
@@ -4294,10 +4358,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4540,6 +4600,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4608,6 +4672,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Koobaste läve"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4716,10 +4785,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4732,6 +4797,11 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Maailmaloome: veaproov"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4841,6 +4911,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Ebaühilduv protokolli versioon. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4856,6 +4935,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5043,8 +5126,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5162,7 +5245,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5195,6 +5278,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5234,8 +5321,7 @@ msgstr "Varjutajad"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5305,13 +5391,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5347,7 +5426,7 @@ msgstr "Hajus valgus"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5368,6 +5447,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Heli vaigistatud"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5524,17 +5612,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5545,6 +5653,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5571,7 +5685,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5628,6 +5742,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5675,15 +5793,15 @@ msgstr "Puuteekraan"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Puuteekraani lävi"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Lainetavad vedelikud"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5719,7 +5837,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5820,10 +5940,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5910,12 +6026,25 @@ msgstr ""
 msgid "Volume"
 msgstr "Valjus"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Hajus valgus"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6152,12 +6281,18 @@ msgstr "cURL-i interaktiivne aegumine"
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Aadress: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kujunduslik mängumood: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Valu: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6197,12 +6332,18 @@ msgstr ""
 #~ msgid "Bilinear Filter"
 #~ msgstr "Bi-lineaarne filtreerimine"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Ääriste kuvamine kõigil klotsidel"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Konarlik tapeet"
 
 #~ msgid "Bumpmapping"
 #~ msgstr "Muhkkaardistamine"
 
+#~ msgid "Change Keys"
+#~ msgstr "Vaheta klahve"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Vaheta klahve"
@@ -6234,6 +6375,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Ühendatud klaas"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Klahvid:\n"
+#~ "- %s: liigu edasi\n"
+#~ "- %s: liigu tagasi\n"
+#~ "- %s: liigu vasakule\n"
+#~ "- %s: liigu paremale\n"
+#~ "- %s: hüppa/roni\n"
+#~ "- %s: kaeva/viruta\n"
+#~ "- %s: paigalda/kasuta\n"
+#~ "- %s: hiili/mine alla\n"
+#~ "- %s: viska ese\n"
+#~ "- %s: seljakott\n"
+#~ "- Hiir: keera/vaata\n"
+#~ "- Hiireratas: vali ese\n"
+#~ "- %s: vestlus\n"
+
 #~ msgid "Creative"
 #~ msgstr "Loominguline"
 
@@ -6326,6 +6499,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Paigaldus: fail: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Vale mängu ID."
+
 #~ msgid "Inventory key"
 #~ msgstr "Varustuse klahv"
 
@@ -6484,6 +6660,10 @@ msgstr ""
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Puutelävi (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Puuteekraani lävi"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Tri-lineaar filtreerimine"
 
@@ -6545,8 +6725,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Said otsa."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Sul pole ühtki mängu paigaldatud."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "sobib"
diff --git a/po/eu/minetest.po b/po/eu/minetest.po
index bb86c118f..48782539f 100644
--- a/po/eu/minetest.po
+++ b/po/eu/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-04-29 20:12+0000\n"
 "Last-Translator: JonAnder Oier <jonanderetaoier@gmail.com>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Komandoa ez dago eskuragarri: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Eskuratu laguntza komandoetarako"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "zerrendatzeko."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[guztia | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Ados"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<bat ere ez dago eskuragarri>"
@@ -106,6 +104,10 @@ msgstr "Errore bat gertatu da:"
 msgid "Main menu"
 msgstr "Menu nagusia"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Ados"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Birkonektatu"
@@ -134,19 +136,27 @@ msgstr "$1 bertsioa soilik onartzen dugu."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "$1 eta $2 arteko protokolo bertsioak onartzen ditugu."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" existitzen da. Gainidatzi egin nahi al duzu?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 et $2 mendekotasunak instalatuko dira."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Huts egin du $1 deskargatzean"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 bider $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Huts egin du $1 deskargatzean"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Instalazioa: Fitxategi ez bateragarria edo fitxategi hautsia"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,159 +164,158 @@ msgstr ""
 "$1 deskargatzen,\n"
 "$2 ilaran"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 deskargatzen..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
+msgstr "Pakete guztiak"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Itzuli menu nagusira"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ez dago erabilgarri Minetest cURL gabe konpilatzean"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Deskargatzen..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Jolasak"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalatu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod-ak"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Ezin izan da paketerik eskuratu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Emaitzarik ez"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Eguneraketarik ez"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Ilaran"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "testura paketeak"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstalatu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Eguneratu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Guztia eguneratu [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Ikusi informazio gehiago web nabigatzailean"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 et $2 mendekotasunak instalatuko dira."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 bider $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 required dependencies could not be found."
 msgstr "$1-ek behar dituen mendekotasunak ezin dira aurkitu."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 will be installed, and $2 dependencies will be skipped."
 msgstr ""
 "$1 instalatua izango da, eta $2-ren mendekotasunak baztertu egingo dira."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "All packages"
-msgstr "Pakete guztiak"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Already installed"
 msgstr "Instalaturik jada"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Itzuli menu nagusira"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Oinarri jokoa:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Utzi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ez dago erabilgarri Minetest cURL gabe konpilatzean"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Mendekotasunak:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Deskargatzen..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Huts egin du $1 deskargatzean"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Huts egin du $1 deskargatzean"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Instalazioa: Fitxategi ez bateragarria edo fitxategi hautsia"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Jolasak"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalatu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 Instalatu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Falta diren mendekotasunak instalatu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Kargatzen..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod-ak"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Ezin izan da paketerik eskuratu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Emaitzarik ez"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Eguneraketarik ez"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Gainidatzi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Mesedez, egiaztatu oinarri jokoa zuzena dela."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Ilaran"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" existitzen da. Gainidatzi egin nahi al duzu?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "testura paketeak"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstalatu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Eguneratu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Guztia eguneratu [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Ikusi informazio gehiago web nabigatzailean"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Gainidatzi"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -458,11 +467,21 @@ msgstr "Sortu"
 msgid "Decorations"
 msgstr "Apaingarriak"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Abisua: Garapen Testa garatzaileentzat da."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Leotzak"
@@ -837,10 +856,6 @@ msgstr ""
 msgid "Back"
 msgstr "Atzera"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Aldatu teklak"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -850,7 +865,8 @@ msgstr "Txata"
 msgid "Clear"
 msgstr "Garbi"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1064,6 +1080,16 @@ msgstr "$1 Instalatu"
 msgid "Install games from ContentDB"
 msgstr "Instalatu ContentDB-ko jolasak"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Berria"
@@ -1097,8 +1123,8 @@ msgid "Start Game"
 msgstr "Hasi partida"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Ez duzu jolasik instalatuta."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1180,18 +1206,10 @@ msgstr "Testurak kargatzen..."
 msgid "Rebuilding shaders..."
 msgstr "Itzalgailuak berreraikitzen..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Konexio-errorea (denbora agortua?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Ezin izan da jokoa aurkitu edo kargatu: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Jokoaren espezifikazioa ez da baliozkoa."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu nagusia"
@@ -1216,24 +1234,20 @@ msgstr "Ezin izan da ireki emandako pasahitzaren fitxategia: "
 msgid "Provided world path doesn't exist: "
 msgstr "Zehaztutako munduaren ibilbidea ez da existitzen: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Multimedia..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Helbidea: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modua: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Ataka: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Publikoa: "
@@ -1269,10 +1283,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1317,6 +1327,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Zerbitzarira konektatzen..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Konexio-errorea (denbora agortua?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Konexioak huts egin du arrazoi ezezagun batengatik"
@@ -1325,32 +1339,13 @@ msgstr "Konexioak huts egin du arrazoi ezezagun batengatik"
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1430,6 +1425,10 @@ msgstr "Lainoa desaktibatuta"
 msgid "Fog enabled"
 msgstr "Lainoa gaituta"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Jokoari buruzko informazioa:"
@@ -1450,10 +1449,6 @@ msgstr "Itemen definizioak..."
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Multimedia..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1611,10 +1606,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "Ados"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1948,6 +1939,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Huts egin du $1 deskargatzean"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2139,6 +2139,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "sakatu tekla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Huts egin du $1 deskargatzean"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Aldatu"
@@ -2172,6 +2185,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "eu"
 
@@ -2358,12 +2372,6 @@ msgstr "Objektu aktiboak bidaltzeko barrutia"
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2387,6 +2395,10 @@ msgstr "Munduaren izena"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2442,6 +2454,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2463,12 +2486,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2533,6 +2565,10 @@ msgstr "Biomak"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2747,6 +2783,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2879,10 +2921,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2932,6 +2970,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3120,6 +3171,11 @@ msgstr "Gaitu denak"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Kalteak baimendu"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3139,6 +3195,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3181,6 +3241,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3204,6 +3268,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3216,12 +3284,6 @@ msgstr ""
 "Urruneko zerbitzariek deskarga azkarragoa eskaini dezakete multimedia "
 "deskargatzeko (adib. testurak)."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3251,6 +3313,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4056,9 +4131,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4208,10 +4284,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4260,7 +4332,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4295,10 +4369,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4541,6 +4611,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4610,6 +4684,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4719,10 +4797,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4735,6 +4809,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4844,6 +4922,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokoloaren bertsioen desadostasuna. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4859,6 +4946,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5048,8 +5139,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5171,7 +5262,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5204,6 +5295,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5243,8 +5338,7 @@ msgstr "Itzalgailuak"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5314,13 +5408,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5356,7 +5443,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5377,6 +5464,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5536,17 +5631,37 @@ msgstr ""
 "Profilak gordetzeko lehenetsitako formatua,\n"
 "`/profiler save [format]` formaturik gabe deitzean erabilia."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5557,6 +5672,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5583,7 +5704,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5640,6 +5761,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5690,11 +5815,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5732,7 +5857,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5830,10 +5957,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5920,12 +6043,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Nabarmendu nodoak"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6165,12 +6301,18 @@ msgstr "cURL-en denbora muga"
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Helbidea: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Sormen modua: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Kaltea: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Ataka: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6205,6 +6347,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Kameraren eguneraketa txandakatzeko tekla"
 
+#~ msgid "Change Keys"
+#~ msgstr "Aldatu teklak"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Aldatu teklak"
@@ -6300,6 +6445,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Instalakuntza: fitxategia: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Jokoaren espezifikazioa ez da baliozkoa."
+
 #~ msgid "Inventory key"
 #~ msgstr "Inbentarioa tekla"
 
@@ -6406,9 +6554,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Mipmap gabe"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Nabarmendu nodoak"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Nodoen ingerada"
 
@@ -6520,8 +6665,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Hil zara"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Ez duzu jolasik instalatuta."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "Ados"
diff --git a/po/fa/minetest.po b/po/fa/minetest.po
index ead6b4e4b..6071e15c9 100644
--- a/po/fa/minetest.po
+++ b/po/fa/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/minetest/"
@@ -76,7 +76,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -85,11 +85,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -108,6 +104,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -136,173 +136,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -449,10 +456,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -815,10 +832,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -828,7 +841,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1031,6 +1045,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1064,7 +1088,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1144,18 +1168,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1180,24 +1196,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1232,10 +1244,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1280,6 +1288,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1288,32 +1300,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1393,6 +1386,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1413,10 +1410,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1572,10 +1565,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1896,6 +1885,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2085,6 +2083,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2118,6 +2128,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "fa"
 
@@ -2303,12 +2314,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2331,6 +2336,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2384,6 +2393,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2405,12 +2425,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2473,6 +2502,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2685,6 +2718,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2816,10 +2855,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2869,6 +2904,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3053,6 +3101,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3072,6 +3124,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3114,6 +3170,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3137,6 +3197,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3145,12 +3209,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3180,6 +3238,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3974,9 +4045,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4122,10 +4194,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4174,7 +4242,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4209,10 +4279,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4454,6 +4520,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4522,6 +4592,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4630,10 +4704,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4646,6 +4716,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4755,6 +4829,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4770,6 +4852,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4957,8 +5043,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5076,7 +5162,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5109,6 +5195,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5148,8 +5238,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5219,13 +5308,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5261,7 +5343,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5282,6 +5364,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5438,17 +5528,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5459,6 +5569,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5485,7 +5601,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5542,6 +5658,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5589,11 +5709,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5631,7 +5751,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5729,10 +5851,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5819,12 +5937,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/fi/minetest.po b/po/fi/minetest.po
index a56e08780..4d4adb71a 100644
--- a/po/fi/minetest.po
+++ b/po/fi/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-09-07 21:01+0000\n"
 "Last-Translator: Hraponssi <hraponssi@gmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Komento ei ole käytettävissä: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Ohjeita komentojen käyttöön"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "listataksesi kaiken."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[kaikki | <komento>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ei saatavilla>"
@@ -105,6 +103,10 @@ msgstr "Tapahtui virhe:"
 msgid "Main menu"
 msgstr "Päävalikko"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
@@ -133,19 +135,27 @@ msgstr "Tuemme vain protokollaversiota $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Tuemme protokollaversioita välillä $1 ja $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" on jo olemassa. Haluatko korvata sen?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Riippuvuudet $1 ja $2 asennetaan."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Epäonnistui ladata $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1, tehnyt $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Epäonnistui ladata $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Lataus: Tukematon tiedostotyyppi tai rikkinäinen arkisto"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +163,157 @@ msgstr ""
 "$1 lataa,\n"
 "$2 jonossa"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 latautuu..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 tarvittavaa riippuvuutta ei löytynyt."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 asennetaan, ja $2 riippuvuutta sivuutetaan."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Kaikki paketit"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Asennettu jo"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Palaa päävalikkoon"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ei ole saatavilla, jos Minetest on koottu ilman cURLia"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Ladataan..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Pelit"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Asenna"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modit"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Paketteja ei löydetty"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Ei tuloksia"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Ei päivityksiä"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Jonotettu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Tekstuuripaketit"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Poista"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Päivitä"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Päivitä kaikki [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Katso lisätietoja verkkoselaimessa"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Riippuvuudet $1 ja $2 asennetaan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1, tehnyt $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 tarvittavaa riippuvuutta ei löytynyt."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 asennetaan, ja $2 riippuvuutta sivuutetaan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Asennettu jo"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Peruspeli:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ei ole saatavilla, jos Minetest on koottu ilman cURLia"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Riippuvuudet:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Ladataan..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Epäonnistui ladata $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Epäonnistui ladata $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Lataus: Tukematon tiedostotyyppi tai rikkinäinen arkisto"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Pelit"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Asenna"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Asenna $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Asenna puuttuvat riippuvuudet"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ladataan..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modit"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Paketteja ei löydetty"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Ei tuloksia"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Ei päivityksiä"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ei löytynyt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Ylikirjoita"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Jonotettu"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" on jo olemassa. Haluatko korvata sen?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Tekstuuripaketit"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Poista"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Päivitä"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Päivitä kaikki [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Katso lisätietoja verkkoselaimessa"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Ylikirjoita"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -452,11 +461,21 @@ msgstr "Luo"
 msgid "Decorations"
 msgstr "Koristeet"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Varoitus: Development Test on tarkoitettu kehittäjille."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -827,10 +846,6 @@ msgstr ""
 msgid "Back"
 msgstr "Taakse"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Näppäinasetukset"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -840,7 +855,8 @@ msgstr "Keskustelu"
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Ohjaimet"
 
@@ -1047,6 +1063,16 @@ msgstr "Asenna peli"
 msgid "Install games from ContentDB"
 msgstr "Asenna pelejä ContentDB:stä"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Uusi"
@@ -1080,8 +1106,8 @@ msgid "Start Game"
 msgstr "Aloita peli"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Sinulla ei ole pelejä asennettuna."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1161,18 +1187,10 @@ msgstr "Ladataan tekstuureja..."
 msgid "Rebuilding shaders..."
 msgstr "Rakennetaan uudelleen varjostimia..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Päävalikko"
@@ -1197,24 +1215,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Osoite: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Tila: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Portti: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Julkinen: "
@@ -1250,10 +1264,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1298,6 +1308,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Yhdistetään palvelimeen..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1306,46 +1320,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Jatka"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Ohjaus:\n"
-"- %s: liiku eteenpäin\n"
-"- %s: liiku taaksepäin\n"
-"- %s: liiku vasemmalle\n"
-"- %s: liiku oikealle\n"
-"- %s: hypi/kiipeä ylös\n"
-"- %s: kaiva/lyö\n"
-"- %s: aseta/käytä\n"
-"- %s: hiivi/kiipeä alas\n"
-"- %s: pudota esine\n"
-"- %s: inventaario\n"
-"- Hiiri: käänny/katso\n"
-"- Hiiren rulla: valitse esine \n"
-"- %s: keskustelu\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1425,6 +1406,10 @@ msgstr "Sumu pois käytöstä"
 msgid "Fog enabled"
 msgstr "Sumu käytössä"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Pelin tiedot:"
@@ -1445,10 +1430,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1604,10 +1585,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1934,6 +1911,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr "Pienoiskartta tekstuuritilassa"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Verkkosivun avaaminen epäonnistui"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2124,6 +2110,19 @@ msgstr ""
 msgid "press key"
 msgstr "paina näppäintä"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Verkkosivun avaaminen epäonnistui"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2157,6 +2156,7 @@ msgstr "Äänenvoimakkuus: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "fi"
 
@@ -2344,12 +2344,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2373,6 +2367,10 @@ msgstr "Maailman nimi"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2428,6 +2426,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2449,12 +2458,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2519,6 +2537,10 @@ msgstr "Biomit"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2733,6 +2755,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2864,10 +2892,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2917,6 +2941,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3102,6 +3139,11 @@ msgstr "Ota kaikki käyttöön"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ota vahinko käyttöön"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3121,6 +3163,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Käytä konsoli-ikkunaa"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3163,6 +3210,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3186,6 +3237,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Koko näyttö"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3194,12 +3250,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3229,6 +3279,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4025,9 +4088,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4174,10 +4238,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4226,7 +4286,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4261,10 +4323,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4507,6 +4565,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4576,6 +4638,11 @@ msgstr "Hiiren herkkyys"
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Koko näyttö"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4685,10 +4752,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4701,6 +4764,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4810,6 +4877,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokollaversiot epäyhteensopivat. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4825,6 +4901,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5015,8 +5095,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5138,7 +5218,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5171,6 +5251,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5210,8 +5294,7 @@ msgstr "Varjostimet"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5281,13 +5364,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5323,7 +5399,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5344,6 +5420,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Ääni"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5500,17 +5584,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5521,6 +5625,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5547,7 +5657,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5604,6 +5714,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5654,12 +5768,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr "Hiiren herkkyys"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Koko näyttö"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5697,7 +5810,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5795,10 +5910,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Käyttöliittymät"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5885,12 +5996,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6130,12 +6253,18 @@ msgstr ""
 #~ msgid "(game support required)"
 #~ msgstr "(pelituki vaaditaan)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Osoite: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Luova tila: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Vahinko: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Portti: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6160,6 +6289,9 @@ msgstr ""
 #~ msgid "Bilinear Filter"
 #~ msgstr "Bilineaarinen suodatus"
 
+#~ msgid "Change Keys"
+#~ msgstr "Näppäinasetukset"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Näppäinasetukset"
@@ -6167,6 +6299,38 @@ msgstr ""
 #~ msgid "Connect"
 #~ msgstr "Yhdistä"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Ohjaus:\n"
+#~ "- %s: liiku eteenpäin\n"
+#~ "- %s: liiku taaksepäin\n"
+#~ "- %s: liiku vasemmalle\n"
+#~ "- %s: liiku oikealle\n"
+#~ "- %s: hypi/kiipeä ylös\n"
+#~ "- %s: kaiva/lyö\n"
+#~ "- %s: aseta/käytä\n"
+#~ "- %s: hiivi/kiipeä alas\n"
+#~ "- %s: pudota esine\n"
+#~ "- %s: inventaario\n"
+#~ "- Hiiri: käänny/katso\n"
+#~ "- Hiiren rulla: valitse esine \n"
+#~ "- %s: keskustelu\n"
+
 #~ msgid "Download a game, such as Minetest Game, from minetest.net"
 #~ msgstr "Lataa peli, kuten Minetest Game, minetest.netistä"
 
@@ -6255,9 +6419,6 @@ msgstr ""
 #~ msgid "Smooth Lighting"
 #~ msgstr "Tasainen valaistus"
 
-#~ msgid "Sound"
-#~ msgstr "Ääni"
-
 #~ msgid "Texturing:"
 #~ msgstr "Teksturointi:"
 
@@ -6298,6 +6459,9 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Kuolit."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Sinulla ei ole pelejä asennettuna."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
diff --git a/po/fil/minetest.po b/po/fil/minetest.po
index cecdef67a..51fc54649 100644
--- a/po/fil/minetest.po
+++ b/po/fil/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-06-27 03:16+0000\n"
 "Last-Translator: Marco Santos <enum.scima@gmail.com>\n"
 "Language-Team: Filipino <https://hosted.weblate.org/projects/minetest/"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Di magagamit ang utos: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Humingi ng tulong para sa mga utos"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "o '.help all' para ilista lahat."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <utos>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Sige"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<wala>"
@@ -106,6 +104,10 @@ msgstr "May error:"
 msgid "Main menu"
 msgstr "Main menu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Sige"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Kumonekta uli"
@@ -136,19 +138,27 @@ msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 "Suportado lang po namin ang mga bersyon ng protocol sa pagitan ng $1 at $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "Meron na'ng \"$1\". Gusto mo bang i-overwrite ito?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Ii-install ang mga kailangan na $1 at $2."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Bigong ma-download ang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 ni $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Bigong ma-download ang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "I-install: Di-suportadong file type o sirang archive"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -156,159 +166,158 @@ msgstr ""
 "$1 dina-download,\n"
 "$2 nakapila"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 dina-download..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Di makita ang $1 (na) kailangan."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "Ii-install ang $1, at lalaktawan ang %2."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Lahat ng package"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Naka-install na"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Balik sa Main Menu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"Di magagamit ang ContentDB kapag na-compile ang Minetest nang walang cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Dina-download..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Mga Laro"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "I-install"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Nilo-load..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mga Mod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Walang makuhang mga package"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Walang mga resulta"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Walang mga update"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Nakapila"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Mga Texture Pack"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Burahin"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "I-update"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "I-update Lahat [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Tumingin pa ng mas maraming impormasyon sa web browser"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Ii-install ang mga kailangan na $1 at $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 ni $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Di makita ang $1 (na) kailangan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Ii-install ang $1, at lalaktawan ang %2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Naka-install na"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basehang Laro:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Ikansela"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"Di magagamit ang ContentDB kapag na-compile ang Minetest nang walang cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Mga kailangan:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Dina-download..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Bigong ma-download ang $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Bigong ma-download ang $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "I-install: Di-suportadong file type o sirang archive"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Mga Laro"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "I-install"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "I-install ang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "I-install ang mga nawawalang kailangan"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Nilo-load..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mga Mod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Walang makuhang mga package"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Walang mga resulta"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Walang mga update"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Di nakita"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "I-overwrite"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Siguraduhing tama ang basehang laro."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Nakapila"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "Meron na'ng \"$1\". Gusto mo bang i-overwrite ito?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Mga Texture Pack"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Burahin"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "I-update"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "I-update Lahat [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Tumingin pa ng mas maraming impormasyon sa web browser"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "I-overwrite"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -461,11 +470,21 @@ msgstr "Gumawa"
 msgid "Decorations"
 msgstr "Mga dekorasyon"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Babala: Para sa mga developer ang Development Test."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Mga dungeon"
@@ -841,10 +860,6 @@ msgstr ""
 msgid "Back"
 msgstr "Pabalik"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Baguhin ang mga Key"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -854,7 +869,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Linisin"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1068,6 +1084,16 @@ msgstr "I-install ang $1"
 msgid "Install games from ContentDB"
 msgstr "Mag-install ng mga laro mula sa ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Bago"
@@ -1101,8 +1127,8 @@ msgid "Start Game"
 msgstr "Magsimula"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Wala kang na-install na mga laro."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1183,18 +1209,10 @@ msgstr "Nilo-load ang mga texture..."
 msgid "Rebuilding shaders..."
 msgstr "Rine-rebuild ang mga shader..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Error sa koneksyon (nag-timeout?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Di mahanap o ma-load ang laro: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Invalid na gamespec."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Main Menu"
@@ -1219,7 +1237,11 @@ msgstr "Bigong mabuksan ang binigay na password file: "
 msgid "Provided world path doesn't exist: "
 msgstr "Walang path sa mundo na tumugma sa binigay: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1227,18 +1249,10 @@ msgstr ""
 "\n"
 "Tingnan ang debug.txt para sa mga detalye."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Address: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mode: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Pampubliko: "
@@ -1273,10 +1287,6 @@ msgstr "Nakabukas ang kusang pag-abante"
 msgid "Block bounds hidden"
 msgstr "Nakatago ang mga block bound"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Ipinapakita ang mga block bound para sa lahat ng mga block"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Ipinapakita ang block bound para sa kasalukuyang block"
@@ -1324,6 +1334,10 @@ msgstr "Nakasara ang scripting sa client side"
 msgid "Connecting to server..."
 msgstr "Kumokonekta sa server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Error sa koneksyon (nag-timeout?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Bigong makakonekta dahil sa di matukoy na dahilan"
@@ -1332,47 +1346,14 @@ msgstr "Bigong makakonekta dahil sa di matukoy na dahilan"
 msgid "Continue"
 msgstr "Magpatuloy"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Mga kontrol:\n"
-"- %s: abante paharap\n"
-"- %s: abante patalikod\n"
-"- %s: kumaliwa\n"
-"- %s: kumanan\n"
-"- %s: tumalon/umakyat\n"
-"- %s: maghukay/sumuntok\n"
-"- %s: maglagay/gumamit\n"
-"- %s: dahan-dahan/bumaba\n"
-"- %s: ihulog ang item\n"
-"- %s: inventory\n"
-"- Mouse: umikot/tumingin\n"
-"- Mouse wheel: pumili ng item\n"
-"- %s: chat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1464,6 +1445,11 @@ msgstr "Nakasara ang hamog"
 msgid "Fog enabled"
 msgstr "Nakabukas ang hamog"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Kasalukuyang sinara ng laro o mod ang pag-zoom"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Info ng laro:"
@@ -1484,10 +1470,6 @@ msgstr "Mga definition ng item..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1645,10 +1627,6 @@ msgstr "Ipinapakita ang wireframe"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Kasalukuyang sinara ng laro o mod ang pag-zoom"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "sige"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1982,6 +1960,15 @@ msgstr "Minimap sa surface mode, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimap sa texture mode"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Bigong mabuksan ang webpage"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2172,6 +2159,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "pumindot ng key"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Bigong mabuksan ang webpage"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Baguhin"
@@ -2205,6 +2205,7 @@ msgstr "Volume ng Tunog: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "fil"
 
@@ -2439,14 +2440,6 @@ msgstr "Saklaw na mapapadala sa aktibong bagay"
 msgid "Adds particles when digging a node."
 msgstr "Nagdadagdag ng mga particle habang naghuhukay ng node."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ayusin ang dpi configuration ayon sa screen mo (non X11/Android lang) hal. "
-"para sa mga 4k screen."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2479,6 +2472,10 @@ msgstr "Idagdag ang pangalan ng item"
 msgid "Advanced"
 msgstr "Karagdagan"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2542,6 +2539,17 @@ msgstr "Idagdag ang pangalan ng item sa tooltip."
 msgid "Apple trees noise"
 msgstr "Noise ng mga puno ng mansanas"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inertia ng braso"
@@ -2559,18 +2567,38 @@ msgid "Ask to reconnect after crash"
 msgstr "Tanunging kung kokonekta uli matapos mag-crash"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Sa layong ito, agresibong iooptimisa ng server ang mga\n"
+"block na ipapadala sa client.\n"
+"Posibleng humusay ang performance kapag mababa ang value, pero may mga "
+"makikita lang\n"
+"mga glitch sa pag-render (may mga block na hindi mare-render sa\n"
+"ilalim ng tubig at kweba, paminsan-minsan sa lupa rin).\n"
+"Kung lagpas ang value sa max_block_send_distance,\n"
+"isasara ang pag-ooptimisa.\n"
+"Tinukoy sa mga mapblock (16 na node)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Sa layong ito, agresibong iooptimisa ng server ang mga\n"
 "block na ipapadala sa client.\n"
@@ -2644,6 +2672,11 @@ msgstr "Mga biome"
 msgid "Biome noise"
 msgstr "Noise ng biome"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Layo ng pag-optimisa sa pagpadala ng block"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Layo ng pag-optimisa sa pagpadala ng block"
@@ -2866,6 +2899,12 @@ msgstr "May kulay na hamog"
 msgid "Colored shadows"
 msgstr "Makukulay na anino"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2997,10 +3036,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3050,6 +3085,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3236,6 +3284,11 @@ msgstr "Buksan lahat"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Buksan ang Pinsala"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3255,6 +3308,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3297,6 +3354,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3320,6 +3381,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3328,12 +3393,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3363,6 +3422,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4163,9 +4235,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4312,10 +4385,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4364,7 +4433,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4399,10 +4470,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4645,6 +4712,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4713,6 +4784,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Threshold ng kweba"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4823,10 +4899,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4839,6 +4911,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4948,6 +5024,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Di tumugmang bersyon ng protocol. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4963,6 +5048,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5153,8 +5242,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5276,7 +5365,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5309,6 +5398,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5348,8 +5441,7 @@ msgstr "Mga Shader"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5419,13 +5511,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5461,7 +5546,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5482,6 +5567,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Naka-mute ang tunog"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5638,17 +5732,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5659,6 +5773,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5685,7 +5805,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5742,6 +5862,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5789,12 +5913,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Touchthreshold: (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5832,7 +5955,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5935,10 +6060,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6025,12 +6146,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Pag-highlight sa Node"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6267,6 +6401,12 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Address: "
+
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6292,6 +6432,13 @@ msgstr ""
 #~ "Tandaan na ang ino-override ng pagsasaayos na ito ang address field sa "
 #~ "main menu."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ayusin ang dpi configuration ayon sa screen mo (non X11/Android lang) "
+#~ "hal. para sa mga 4k screen."
+
 #~ msgid "All Settings"
 #~ msgstr "Lahat ng Pagsasaayos"
 
@@ -6317,6 +6464,9 @@ msgstr ""
 #~ msgid "Biome API noise parameters"
 #~ msgstr "Mga parametro sa noise ng temperatura at halumigmig sa Biome API"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Ipinapakita ang mga block bound para sa lahat ng mga block"
+
 #~ msgid ""
 #~ "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 #~ "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -6333,6 +6483,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Toggle key sa pag-update sa kamera"
 
+#~ msgid "Change Keys"
+#~ msgstr "Baguhin ang mga Key"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Baguhin ang mga Key"
@@ -6358,6 +6511,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Konektadong Salamin"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Mga kontrol:\n"
+#~ "- %s: abante paharap\n"
+#~ "- %s: abante patalikod\n"
+#~ "- %s: kumaliwa\n"
+#~ "- %s: kumanan\n"
+#~ "- %s: tumalon/umakyat\n"
+#~ "- %s: maghukay/sumuntok\n"
+#~ "- %s: maglagay/gumamit\n"
+#~ "- %s: dahan-dahan/bumaba\n"
+#~ "- %s: ihulog ang item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: umikot/tumingin\n"
+#~ "- Mouse wheel: pumili ng item\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Disabled unlimited viewing range"
 #~ msgstr "Nakasara ang unlimited na viewing range"
 
@@ -6397,6 +6582,9 @@ msgstr ""
 #~ msgstr ""
 #~ "I-install ang Mod: Bigong mahanap ang tunay na pangalan ng mod ng: $1"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Invalid na gamespec."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6415,9 +6603,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Walang Mipmap"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Pag-highlight sa Node"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Pag-outline sa Node"
 
@@ -6466,6 +6651,10 @@ msgstr ""
 #~ msgid "Tone Mapping"
 #~ msgstr "Tone Mapping"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Touchthreshold: (px)"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilinear Filter"
 
@@ -6516,5 +6705,11 @@ msgstr ""
 #~ "Sumali' para kumpirmahin ang paggawa sa account, o pindutin ang "
 #~ "'Ikansela' para pigilan ito."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Wala kang na-install na mga laro."
+
 #~ msgid "Z"
 #~ msgstr "Z"
+
+#~ msgid "ok"
+#~ msgstr "sige"
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index f340e8b2d..233a963d6 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-12 15:37+0000\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-14 21:24+0000\n"
 "Last-Translator: waxtatect <piero@live.ie>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
 "fr/>\n"
@@ -12,11 +12,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.2-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
-msgstr "Effacer la file de sortie de message du tchat"
+msgstr "Effacer la file de messages du tchat"
 
 #: builtin/client/chatcommands.lua
 msgid "Empty command."
@@ -44,7 +44,7 @@ msgstr "Joueurs en ligne : "
 
 #: builtin/client/chatcommands.lua
 msgid "The out chat queue is now empty."
-msgstr "La file de sortie de message du tchat est maintenant vide."
+msgstr "La file de messages du tchat est maintenant vide."
 
 #: builtin/client/chatcommands.lua
 msgid "This command is disabled by server."
@@ -71,8 +71,8 @@ msgid "Command not available: "
 msgstr "Commande non disponible : "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Obtenir de l'aide pour les commandes"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Obtenir de l'aide pour les commandes (-t : afficher dans le tchat)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -82,12 +82,8 @@ msgstr ""
 "pour tout lister."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -105,13 +101,17 @@ msgstr "Une erreur est survenue :"
 msgid "Main menu"
 msgstr "Menu principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Se reconnecter"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "Le serveur souhaite rétablir une connexion :"
+msgstr "Le serveur a demandé une reconnexion :"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -134,19 +134,27 @@ msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 "Nous prenons en charge seulement les versions du protocole entre $1 et $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "« $1 » existe déjà. Voulez-vous l'écraser ?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Erreur d'installation de « $1 » : $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "« $1 » et $2 dépendances seront installées."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Échec du téléchargement de « $1 »"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "« $1 » de $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Échec du téléchargement de $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Échec de l'extraction de « $1 » (espace disque insuffisant, type de fichier "
+"non pris en charge ou archive endommagée)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,158 +162,157 @@ msgstr ""
 "$1 en téléchargement,\n"
 "$2 mis en attente"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Téléchargement de $1…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 dépendances nécessaires n'ont pas pu être trouvées."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "« $1 » sera installé, et $2 dépendances seront ignorées."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Tous les paquets"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Déjà installé"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Retour au menu principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB n'est pas disponible quand Minetest est compilé sans cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Téléchargement…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Erreur d'obtention des dépendances pour le paquet"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Jeux"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installer"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Chargement…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Aucun paquet n'a pu être récupéré"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Pas de résultat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Aucune mise à jour"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "En attente"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Packs de textures"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Le paquet « $1 » n'a pas été trouvé."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Désinstaller"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Tout mettre à jour [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Voir plus d'informations dans le navigateur web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Vous devez installer un jeu avant d'installer un mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "« $1 » et $2 dépendances seront installées."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "« $1 » de $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dépendances nécessaires n'ont pas pu être trouvées."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "« $1 » sera installé, et $2 dépendances seront ignorées."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Déjà installé"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Jeu de base :"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Annuler"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB n'est pas disponible quand Minetest est compilé sans cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dépend de :"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Téléchargement…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Erreur d'installation de « $1 » : $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Échec du téléchargement de « $1 »"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Échec du téléchargement de $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Échec de l'extraction de « $1 » (type de fichier non pris en charge ou "
-"archive endommagée)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Jeux"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installer"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installer $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installer les dépendances manquantes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Chargement…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Aucun paquet n'a pu être récupéré"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Pas de résultat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Aucune mise à jour"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Non trouvé"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Écraser"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Veuillez vérifier que le jeu de base est correct."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "En attente"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "« $1 » existe déjà. Voulez-vous l'écraser ?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Packs de textures"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Le paquet « $1 » n'a pas été trouvé."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Désinstaller"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Mettre à jour"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Tout mettre à jour [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Voir plus d'informations dans un navigateur web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Vous devez installer un jeu avant d'installer un mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Écraser"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -326,7 +333,7 @@ msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "Impossible de trouver un mod, un modpack ou un jeu valide"
+msgstr "Impossible de trouver un mod, un pack de mods ou un jeu valide"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a $2"
@@ -421,7 +428,7 @@ msgstr "Le monde « $1 » existe déjà"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr "Terrain supplémentaire"
+msgstr "Terrains supplémentaires"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
@@ -433,7 +440,7 @@ msgstr "Faible humidité en altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr "Mélange de biomes"
+msgstr "Transition des biomes"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
@@ -455,10 +462,22 @@ msgstr "Créer"
 msgid "Decorations"
 msgstr "Décorations"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Temples du désert"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "« Development Test » est destiné aux développeurs."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Variante de donjon différente générée dans les biomes désertiques (seulement "
+"si les donjons sont activés)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Donjons"
@@ -502,7 +521,8 @@ msgstr "Lacs"
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
-"Humidité basse et chaleur élevée rendent les rivières peu profondes ou sèches"
+"Humidité faible et chaleur élevée rendent les rivières peu profondes ou "
+"sèches"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -510,11 +530,11 @@ msgstr "Générateur de terrain"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr "Drapeaux de génération de terrain"
+msgstr "Options de génération de terrain"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain"
+msgstr "Options spécifiques au générateur de terrain"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
@@ -597,7 +617,7 @@ msgstr "Varier la profondeur des rivières"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr "Très grandes cavernes profondes souterraines"
+msgstr "Très grandes cavernes loin sous la surface"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -682,7 +702,7 @@ msgstr "Minetest Game n'est plus installé par défaut"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Reinstall Minetest Game"
-msgstr "Reinstaller Minetest Game"
+msgstr "Réinstaller Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -839,10 +859,6 @@ msgstr "Accessibilité"
 msgid "Back"
 msgstr "Retour"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Changer les touches"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -852,7 +868,8 @@ msgstr "Tchat"
 msgid "Clear"
 msgstr "Effacer"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Contrôles"
 
@@ -1020,7 +1037,7 @@ msgstr "Renommer"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Update available?"
-msgstr "Mise à jour disponible ?"
+msgstr "Mise à jour disponible ?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1058,6 +1075,18 @@ msgstr "Installer un jeu"
 msgid "Install games from ContentDB"
 msgstr "Installer des jeux à partir de ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest est livré sans jeu par défaut."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest est une plateforme de création avec laquelle découvrir de nombreux "
+"jeux différents."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nouveau"
@@ -1091,8 +1120,8 @@ msgid "Start Game"
 msgstr "Démarrer"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Vous n'avez pas de jeu installé."
+msgid "You need to install a game before you can create a world."
+msgstr "Vous devez en installer un pour créer un nouveau monde."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1169,20 +1198,12 @@ msgstr "Chargement des textures…"
 
 #: src/client/client.cpp
 msgid "Rebuilding shaders..."
-msgstr "Reconstruction des shaders…"
-
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Erreur de connexion (perte de connexion ?)"
+msgstr "Reconstruction des nuanceurs…"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Impossible de trouver ou charger le jeu : "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Jeu spécifié invalide."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu principal"
@@ -1207,7 +1228,11 @@ msgstr "Le fichier de mot de passe fourni n'a pas pu être ouvert : "
 msgid "Provided world path doesn't exist: "
 msgstr "Le chemin du monde spécifié n'existe pas : "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Média…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1215,18 +1240,10 @@ msgstr ""
 "\n"
 "Voir « debug.txt » pour plus d'informations."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "– Adresse : "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "– Mode : "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "– Port : "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "– Public : "
@@ -1247,7 +1264,7 @@ msgstr "Une erreur de sérialisation est survenue :"
 #: src/client/game.cpp
 #, c-format
 msgid "Access denied. Reason: %s"
-msgstr "Accès refusé. Raison : %s"
+msgstr "Accès refusé. Raison : %s"
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
@@ -1261,10 +1278,6 @@ msgstr "Marche automatique activée"
 msgid "Block bounds hidden"
 msgstr "Limites des blocs cachées"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Limites des blocs affichées pour tous les blocs"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Limites des blocs affichées pour le bloc actuel"
@@ -1310,6 +1323,10 @@ msgstr "Les scripts côté client sont désactivés"
 msgid "Connecting to server..."
 msgstr "Connexion au serveur…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Erreur de connexion (délai expiré ?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "La connexion a échoué pour une raison inconnue"
@@ -1318,46 +1335,13 @@ msgstr "La connexion a échoué pour une raison inconnue"
 msgid "Continue"
 msgstr "Continuer"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Contrôles :\n"
-"– %s : avancer\n"
-"– %s : reculer\n"
-"– %s : à gauche\n"
-"– %s : à droite\n"
-"– %s : sauter/grimper\n"
-"– %s : creuser/taper/utiliser\n"
-"– %s : placer/utiliser\n"
-"– %s : marcher lentement/descendre\n"
-"– %s : lâcher un objet\n"
-"– %s : inventaire\n"
-"– Souris : tourner/regarder\n"
-"– Molette souris : sélectionner un objet\n"
-"– %s : tchat\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1366,15 +1350,15 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Contrôles :\n"
-"Sans menu ouvert :\n"
-"– glissement du doigt : regarder autour\n"
-"– appui : placer/utiliser\n"
-"– appui long : creuser/taper/utiliser\n"
-"Menu/Inventaire ouvert :\n"
-"– double-appui (en dehors) : fermer\n"
-"– appui sur objets dans l'inventaire : déplacer\n"
-"– appui, glissement et appui : pose d'un seul objet par emplacement\n"
+"Contrôles :\n"
+"Sans menu ouvert :\n"
+"– glissement du doigt : regarder autour\n"
+"– appui : placer/frapper/utiliser (par défaut)\n"
+"– appui long : creuser/utiliser (par défaut)\n"
+"Menu/Inventaire ouvert :\n"
+"– double-appui (en dehors) : fermer\n"
+"– appui sur objets dans l'inventaire : déplacer\n"
+"– appui, glissement et appui : pose d'un seul objet par emplacement\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1446,6 +1430,10 @@ msgstr "Brouillard désactivé"
 msgid "Fog enabled"
 msgstr "Brouillard activé"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Brouillard actuellement activé par un jeu ou un mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Infos de jeu :"
@@ -1466,10 +1454,6 @@ msgstr "Définitions des objets…"
 msgid "KiB/s"
 msgstr "Kio/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Média…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "Mio/s"
@@ -1631,10 +1615,6 @@ msgstr "Fils de fer affichés"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom actuellement désactivé par un jeu ou un mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Tchat actuellement désactivé par un jeu ou un mod"
@@ -1955,6 +1935,16 @@ msgstr "Mini-carte en mode surface, zoom ×%d"
 msgid "Minimap in texture mode"
 msgstr "Mini-carte en mode texture"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Échec de la compilation du nuanceur « %s »."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+"Les nuanceurs sont activés mais GLSL n'est pas pris en charge par le pilote."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -1982,7 +1972,7 @@ msgstr "Certains mods ont des dépendances insatisfaites :"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Failed to open webpage"
-msgstr "Échec de l'ouverture de la page Web"
+msgstr "Échec de l'ouverture de la page web"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Opening webpage"
@@ -2148,6 +2138,18 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "Appuyer sur une touche"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Ouvrir"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Ouvrir l'URL ?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "Impossible d'ouvrir l'URL"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Changer"
@@ -2181,6 +2183,7 @@ msgstr "Volume du son : %d %%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "fr"
 
@@ -2341,15 +2344,15 @@ msgid ""
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
 "Prise en charge de la 3D.\n"
-"Actuellement disponible :\n"
-"– aucun : pas de sortie 3D.\n"
-"– anaglyphe : 3D en couleur cyan/magenta.\n"
-"– entrelacé : prise en charge de l'écran avec polarisation basée sur les "
+"Actuellement disponible :\n"
+"– aucun : pas de sortie 3D.\n"
+"– anaglyphe : 3D en couleur cyan/magenta.\n"
+"– entrelacé : prise en charge de l'écran avec polarisation basée sur les "
 "lignes paires/impaires.\n"
-"– haut-bas : partage haut et bas de l'écran.\n"
-"– côte-à-côte : partage côte à côte de l'écran.\n"
-"– vision croisée : vision croisée 3D.\n"
-"Noter que le mode entrelacé nécessite que les shaders soient activés."
+"– haut-bas : partage haut et bas de l'écran.\n"
+"– côte-à-côte : partage côte à côte de l'écran.\n"
+"– vision croisée : vision croisée 3D.\n"
+"Noter que le mode entrelacé nécessite que les nuanceurs soient activés."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2394,7 +2397,7 @@ msgstr "Modificateurs de Blocs Actifs"
 
 #: src/settings_translation_file.cpp
 msgid "Active block management interval"
-msgstr "intervalle de gestion des blocs actifs"
+msgstr "Intervalle de gestion des blocs actifs"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -2408,14 +2411,6 @@ msgstr "Portée des objets actifs envoyés"
 msgid "Adds particles when digging a node."
 msgstr "Ajoute des particules lorsqu'un bloc est creusé."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajuste la configuration des PPP à votre écran (non X11 / Android seulement), "
-"par exemple pour les écrans 4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2446,6 +2441,10 @@ msgstr "Nom de l’administrateur"
 msgid "Advanced"
 msgstr "Avancé"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Permet aux liquides d'être translucides."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2505,6 +2504,26 @@ msgstr "Ajouter un nom d'objet à l'infobulle."
 msgid "Apple trees noise"
 msgstr "Bruit appliqué aux pommiers"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Appliquer le tramage pour réduire les artefacts de bandes de couleur.\n"
+"Le tramage augmente significativement la taille des captures d'écran "
+"compressées sans perte.\n"
+"Ne fonctionne pas correctement si l'affichage ou le système d'exploitation "
+"effectue un tramage supplémentaire ou si les canaux de couleur ne sont pas "
+"quantifiés à 8 bits.\n"
+"Avec OpenGL ES, le tramage fonctionne seulement si les nuanceurs prennent en "
+"charge une précision élevée en virgule flottante et cela peut avoir un "
+"impact plus important sur les performances."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inertie du bras"
@@ -2528,23 +2547,39 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
-"À cette distance le serveur agressivement optimise quels blocs sont envoyés "
-"aux clients.\n"
+"À cette distance le serveur optimise agressivement les blocs envoyés aux "
+"clients.\n"
 "Des valeurs faibles peuvent augmenter fortement la performance du serveur, "
-"mais peut provoquer l'apparition de problèmes de rendu visibles (certains "
-"blocs ne sont pas affichés sous l'eau ou dans les cavernes, ou parfois sur "
-"terre).\n"
+"mais peut provoquer l'apparition de problèmes de rendu (certains blocs "
+"peuvent ne pas être rendus correctement dans les grottes).\n"
 "Une valeur supérieure à « max_block_send_distance » désactive cette "
 "optimisation.\n"
 "Établie en blocs de carte (16 nœuds)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"À cette distance le serveur effectue une vérification d'occlusion plus "
+"simple et moins coûteuse.\n"
+"Des valeurs plus faibles peuvent augmenter la performance du serveur, mais "
+"peut provoquer l'apparition de problèmes de rendu (certains blocs ne sont "
+"pas visibles).\n"
+"Ceci est particulièrement utile pour les très grandes distances de vue (plus "
+"de 500).\n"
+"Établie en blocs de carte (16 nœuds)."
+
 #: src/settings_translation_file.cpp
 msgid "Audio"
 msgstr "Audio"
@@ -2605,6 +2640,10 @@ msgstr "API des biomes"
 msgid "Biome noise"
 msgstr "Bruit des biomes"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Distance d'optimisation de sélection des blocs"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distance d'optimisation d'envoi des blocs"
@@ -2808,7 +2847,7 @@ msgstr "Nuages"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client-side effect."
-msgstr "Les nuages ont un effet sur le client exclusivement."
+msgstr "Activer les nuages côté client."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
@@ -2822,6 +2861,15 @@ msgstr "Brouillard coloré"
 msgid "Colored shadows"
 msgstr "Ombres colorées"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Liste séparée par des virgules des extensions AL et ALC qui ne doivent pas "
+"être utilisées.\n"
+"Utile pour les tests. Voir « al_extensions.[h, cpp] » pour plus de détails."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2832,13 +2880,13 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
-"Liste des drapeaux séparés par des virgules des paquets à cacher du dépôt "
-"des contenus.\n"
+"Liste séparés par des virgules des étiquettes des paquets à cacher du dépôt "
+"de contenus.\n"
 "« nonfree » peut être utilisé pour cacher les paquets non libres, comme "
 "défini par la « Free Software Foundation ».\n"
 "Vous pouvez aussi spécifier des classifications de contenu.\n"
-"Ces drapeaux sont indépendants des versions de Minetest, consulter la liste "
-"complète à l'adresse https://content.minetest.net/help/content_flags/."
+"Ces étiquettes sont indépendants des versions de Minetest, consulter la "
+"liste complète à l'adresse https://content.minetest.net/help/content_flags/."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2913,7 +2961,7 @@ msgstr "Dépôt de contenu"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
-msgstr "Drapeaux de la liste noire de ContentDB"
+msgstr "Étiquettes de la liste noire de ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Max Concurrent Downloads"
@@ -2939,8 +2987,8 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
-"Contrôle la vitesse d'immersion dans un liquide lorsque inactif. Des valeurs "
-"négatives font remonter."
+"Contrôle la vitesse d'enfoncement sans mouvement dans un liquide. Les "
+"valeurs négatives entraînent la montée."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -2987,11 +3035,7 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 "Couleur du réticule (R,V,B).\n"
-"Contrôle également la couleur du réticule de l'objet."
-
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "PPP"
+"Ceci s'applique également à la couleur du réticule de l'objet."
 
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
@@ -3047,6 +3091,27 @@ msgstr ""
 "douces en appliquant un disque PCF ou Poisson mais utilise également plus de "
 "ressources."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Définit les clients les plus anciens autorisés à se connecter.\n"
+"Les anciens clients sont compatibles dans le sens où ils ne s'interrompent "
+"pas lors de la connexion aux serveurs récents,\n"
+"mais ils peuvent ne pas prendre en charge certaines fonctionnalités.\n"
+"Cela permet un contrôle plus précis que « strict_protocol_version_checking »."
+"\n"
+"Minetest applique toujours son propre minimum interne, activer « "
+"strict_protocol_version_checking » le remplace."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Définit des zones où les arbres ont des pommes."
@@ -3137,9 +3202,9 @@ msgid ""
 "Delay between mesh updates on the client in ms. Increasing this will slow\n"
 "down the rate of mesh updates, thus reducing jitter on slower clients."
 msgstr ""
-"Délai entre les mises à jour du maillage sur le client en ms.\n"
+"Délai entre les mises à jour du maillage du client en ms.\n"
 "Augmenter ceci ralentit le taux de mise à jour et réduit donc les "
-"tremblements sur les client lents."
+"tremblements sur les clients lents."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
@@ -3179,8 +3244,8 @@ msgid ""
 "When the 'snowbiomes' flag is enabled, this is ignored."
 msgstr ""
 "Des déserts apparaissent lorsque « np_biome » dépasse cette valeur.\n"
-"Quand le drapeau « snowbiomes » est activé (avec le nouveau système de "
-"biomes), ce paramètre est ignoré."
+"Quand l'option « snowbiomes » est activée (avec le nouveau système de biomes)"
+", ce paramètre est ignoré."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
@@ -3256,6 +3321,10 @@ msgstr "Activer le flou lumineux"
 msgid "Enable Bloom Debug"
 msgstr "Activer le débogage du flou lumineux"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Activer le tramage"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3269,7 +3338,7 @@ msgid ""
 "Enable Lua modding support on client.\n"
 "This support is experimental and API can change."
 msgstr ""
-"Active la prise en charge des mods Lua sur le client.\n"
+"Active la prise en charge des mods Lua du client.\n"
 "Cette option est expérimentale et l'API peut changer."
 
 #: src/settings_translation_file.cpp
@@ -3282,6 +3351,10 @@ msgstr ""
 "Si activé, utilise le disque de Poisson pour créer des « ombres douces ». "
 "Sinon, utilise le filtrage PCF."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Activer le post-traitement"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Activer l'élimination des blocs invisibles par Ray Tracing"
@@ -3318,7 +3391,7 @@ msgstr "Activer les manettes"
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks. Requires a restart to take effect"
-msgstr "Activer les manettes. Nécessite un redémarrage pour prendre effet."
+msgstr "Active les manettes. Nécessite un redémarrage pour prendre effet."
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
@@ -3335,9 +3408,14 @@ msgstr ""
 "de la barre d'inventaire."
 
 #: src/settings_translation_file.cpp
-msgid "Enable random user input (only used for testing)."
+msgid "Enable random mod loading (mainly used for testing)."
 msgstr ""
-"Active l'entrée aléatoire du joueur (seulement utilisé pour des tests)."
+"Active le chargement aléatoire des mods (principalement utilisé pour les "
+"tests)."
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr "Active l'entrée aléatoire du joueur (seulement utilisé pour les tests)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3364,6 +3442,10 @@ msgstr ""
 "pas lors de la connexion aux serveurs récents,\n"
 "mais ils peuvent ne pas prendre en charge certaines fonctionnalités."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Activer l'écran tactile"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3376,14 +3458,6 @@ msgstr ""
 "rapide de télécharger des données média (ex. : textures) lors de la "
 "connexion au serveur."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Active les « vertex buffer objects ».\n"
-"Cela devrait grandement augmenter les performances graphiques."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3424,15 +3498,27 @@ msgstr "Active l'animation des objets de l'inventaire."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Active la mise en cache des mailles orientés « facedir »."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Active le débogage et la vérification des erreurs du pilote OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Active les opérations de post-traitement."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr "Active le mode écran tactile."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
 "at the expense of minor visual glitches that do not impact game playability."
 msgstr ""
-"Active les compromis qui réduisent la charge du CPU ou améliorent les "
+"Active les compromis pour réduire la charge du CPU où améliorer les "
 "performances de rendu.\n"
-"Au détriment de problèmes visuels mineurs qui n'ont pas d'impact sur la "
-"jouabilité."
+"Au détriment de problèmes visuels mineurs sans impact sur la jouabilité."
 
 #: src/settings_translation_file.cpp
 msgid "Engine Profiler"
@@ -3470,11 +3556,11 @@ msgstr "Compensation de l'exposition"
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
-msgstr "FPS"
+msgstr "IPS"
 
 #: src/settings_translation_file.cpp
 msgid "FPS when unfocused or paused"
-msgstr "FPS lorsqu’il n’est pas sélectionné ou mis en pause"
+msgstr "IPS fenêtre non sélectionnée ou jeu mis en pause"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
@@ -3523,7 +3609,7 @@ msgstr "Bruit de profondeur de remplissage"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr "Mappage de tons filmique"
+msgstr "Activer le mappage de tons filmique"
 
 #: src/settings_translation_file.cpp
 msgid "Filtering and Antialiasing"
@@ -3578,7 +3664,7 @@ msgstr "Exposant de l'effilement des terrains flottants"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland tapering distance"
-msgstr "Hauteur de la base des terrains flottants"
+msgstr "Distance d'effilage des terrains flottantes"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland water level"
@@ -3772,10 +3858,10 @@ msgid ""
 "and jungle grass, in all other mapgens this flag controls all decorations."
 msgstr ""
 "Attributs de génération de terrain globaux.\n"
-"Dans le générateur de terrain v6, le drapeau « décorations » contrôle toutes "
+"Dans le générateur de terrain v6, l'option « décorations » contrôle toutes "
 "les décorations sauf les arbres et les herbes de la jungle.\n"
-"Dans tous les autres générateurs de terrains, ce drapeau contrôle toutes les "
-"décorations."
+"Dans tous les autres générateurs de terrains, cette option contrôle toutes "
+"les décorations."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3858,7 +3944,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Heat blend noise"
-msgstr "Bruit de mélange de chaleur"
+msgstr "Bruit de transition de chaleur"
 
 #: src/settings_translation_file.cpp
 msgid "Heat noise"
@@ -3945,8 +4031,9 @@ msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
-"Vitesse de déplacement des ondes de liquides. Plus élevée = plus rapide.\n"
-"Si elle est négative, les ondes de liquides se déplacent en arrière."
+"Vitesse de déplacement des ondulations des liquides. Plus élevée = plus "
+"rapide.\n"
+"Si elle est négative, les ondulations des liquides se déplacent en arrière."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3964,7 +4051,7 @@ msgid ""
 "Decrease this to increase liquid resistance to movement."
 msgstr ""
 "Ralentissement lors du déplacement dans un liquide.\n"
-"Réduire ceci pour augmenter la résistance liquide au mouvement."
+"Réduire ceci pour augmenter la résistance au mouvement."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers."
@@ -3972,7 +4059,7 @@ msgstr "Largeur des rivières."
 
 #: src/settings_translation_file.cpp
 msgid "Humidity blend noise"
-msgstr "Bruit de mélange de l'humidité"
+msgstr "Bruit de transition de l'humidité"
 
 #: src/settings_translation_file.cpp
 msgid "Humidity noise"
@@ -3995,8 +4082,8 @@ msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
-"Si les FPS (nombre d'images par seconde) sont supérieurs à cette valeur.\n"
-"Limite les FPS en les mettant en sommeil pour ne pas gaspiller la puissance "
+"Si le nombre d'images par seconde est supérieur à cette valeur.\n"
+"Limite les IPS en les mettant en sommeil pour ne pas gaspiller la puissance "
 "du CPU sans aucun bénéfice."
 
 #: src/settings_translation_file.cpp
@@ -4031,8 +4118,8 @@ msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
-"Si activé, les actions sont enregistrés pour une restauration éventuelle.\n"
-"Cette option est seulement activé quand le serveur démarre."
+"Si activé, les actions sont enregistrées pour une restauration éventuelle.\n"
+"Cette option est lue seulement au démarrage du serveur."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, disable cheat prevention in multiplayer."
@@ -4377,16 +4464,18 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Durée d'intervalle serveur et intervalle auquel les objets sont généralement "
-"mis à jour sur le réseau, établie en secondes."
+"Durée d'intervalle serveur (intervalle auquel tout est généralement mis à "
+"jour), établie en secondes.\n"
+"Ne s'applique pas aux sessions hébergées à partir du menu client."
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
-msgstr "Longueur des ondes de liquides."
+msgstr "Longueur de l'ondulation des liquides."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4492,7 +4581,7 @@ msgstr "Régularité de la fluidité des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
-msgstr "Itérations maximales pendant la transformation des liquides"
+msgstr "Itérations maximales de transformation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid queue purge time"
@@ -4500,7 +4589,7 @@ msgstr "Délai de nettoyage d'une file de liquide"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid sinking"
-msgstr "Écoulement du liquide"
+msgstr "Enfoncement dans un liquide"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update interval in seconds."
@@ -4557,10 +4646,6 @@ msgstr ""
 "Rendre la couleur du brouillard et du ciel différents selon l'heure du jour "
 "(aube/crépuscule) et la direction du regard."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Rend toutes les liquides opaques."
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Niveau de compression des cartes pour le stockage sur disque"
@@ -4606,11 +4691,11 @@ msgid ""
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
 "Attributs spécifiques au générateur de terrain vallées.\n"
-"« altitude_chill » : réduit la chaleur avec l’altitude.\n"
-"« humid_rivers » : augmente l’humidité autour des rivières.\n"
-"« vary_river_dept » : si activé, une humidité basse et une chaleur élevée "
+"« altitude_chill » : réduit la chaleur avec l’altitude.\n"
+"« humid_rivers » : augmente l’humidité autour des rivières.\n"
+"« vary_river_dept » : si activé, une humidité faible et une chaleur élevée "
 "rendent les rivières moins profondes et parfois sèches.\n"
-"« altitude_dry » : réduit l’humidité avec l’altitude."
+"« altitude_dry » : réduit l’humidité avec l’altitude."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen v5."
@@ -4621,12 +4706,16 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Attributs spécifiques au générateur de terrain v6.\n"
-"Le drapeau « snowbiomes » active le nouveau système à 5 biomes.\n"
-"Lorsque le drapeau « snowbiomes » est activé, les jungles sont "
-"automatiquement activées et le drapeau « jungles » est ignoré."
+"L'option « snowbiomes » active le nouveau système à 5 biomes.\n"
+"Lorsque l'option « snowbiomes » est activée, les jungles sont "
+"automatiquement activées et l'option « jungles » est ignorée.\n"
+"L'option « temples » désactive la génération de temples dans le désert. Des "
+"donjons normaux sont ajoutés à la place."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4636,10 +4725,10 @@ msgid ""
 "'caverns': Giant caves deep underground."
 msgstr ""
 "Attributs spécifiques au générateur de terrain v7.\n"
-"« montagnes » : montagnes.\n"
-"« crêtes » : rivières.\n"
-"« terrains flottants » : vaste terrain flottant dans l'atmosphère.\n"
-"« cavernes » : cavernes immenses souterraines profondes."
+"« montagnes » : montagnes.\n"
+"« crêtes » : rivières.\n"
+"« terrains flottants » : masses de terrains flottants dans l'atmosphère.\n"
+"« cavernes » : cavernes immenses loin sous la surface."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -4665,10 +4754,6 @@ msgstr "Délai de génération du maillage de blocs de carte"
 msgid "Mapblock mesh generation threads"
 msgstr "Fils de génération du maillage de blocs de carte"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Taille du cache de blocs de carte en Mo du générateur de maillage"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Délai d'interruption du déchargement de blocs de carte"
@@ -4679,7 +4764,7 @@ msgstr "Générateur de terrain carpatien"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain carpatien"
+msgstr "Options spécifiques au générateur de terrain carpatien"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat"
@@ -4687,7 +4772,7 @@ msgstr "Générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain plat"
+msgstr "Options spécifiques au générateur de terrain plat"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal"
@@ -4695,7 +4780,7 @@ msgstr "Générateur de terrain fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain fractal"
+msgstr "Options spécifiques au générateur de terrain fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5"
@@ -4703,7 +4788,7 @@ msgstr "Générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5 specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain v5"
+msgstr "Options spécifiques au générateur de terrain v5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6"
@@ -4711,7 +4796,7 @@ msgstr "Générateur de terrain v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6 specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain v6"
+msgstr "Options spécifiques au générateur de terrain v6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7"
@@ -4719,7 +4804,7 @@ msgstr "Générateur de terrain v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7 specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain v7"
+msgstr "Options spécifiques au générateur de terrain v7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
@@ -4727,7 +4812,7 @@ msgstr "Générateur de terrain vallées"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys specific flags"
-msgstr "Drapeaux spécifiques au générateur de terrain vallées"
+msgstr "Options spécifiques au générateur de terrain vallées"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
@@ -4759,13 +4844,13 @@ msgstr "Paquets maximaux par itération"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr "FPS maximum"
+msgstr "IPS maximum"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
-"FPS maximum lorsque la fenêtre n'est pas sélectionnée, ou lorsque le jeu est "
-"en pause."
+"Nombre d'images par seconde maximum lorsque la fenêtre n'est pas "
+"sélectionnée, ou lorsque le jeu est en pause."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum distance to render shadows."
@@ -4794,8 +4879,8 @@ msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
-"Résistance maximale aux liquides. Contrôle la décélération lorsqu'un joueur "
-"entre dans un liquide à haute vitesse."
+"Résistance maximale aux liquides. Contrôle la décélération lors de l'entrée "
+"dans un liquide à haute vitesse."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4837,7 +4922,7 @@ msgid ""
 "be queued.\n"
 "This should be lower than curl_parallel_limit."
 msgstr ""
-"Nombre maximal de téléchargements simultanés. Les téléchargements dépassant "
+"Nombre maximal de téléchargements simultanés. Les téléchargements au-delà de "
 "cette limite sont mis en file d'attente.\n"
 "Ce nombre doit être inférieur à la limite de « curl_parallel_limit »."
 
@@ -4855,9 +4940,10 @@ msgid ""
 "try reducing it, but don't reduce it to a number below double of targeted\n"
 "client number."
 msgstr ""
-"Nombre maximal de paquets envoyés par étape d'envoi. Si vous avez une "
-"connexion lente, essayer de réduire cette valeur, mais ne pas réduire cette "
-"valeur en-dessous du double du nombre de clients maximum sur le serveur."
+"Nombre maximal de paquets envoyés par étape d'envoi.\n"
+"Si vous avez une connexion lente, essayer de réduire cette valeur.\n"
+"Ne pas réduire cette valeur en-dessous du double du nombre de clients "
+"maximum sur le serveur."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can be connected simultaneously."
@@ -4945,6 +5031,10 @@ msgstr "Niveau minimal de journalisation à écrire dans le tchat."
 msgid "Minimap scan height"
 msgstr "Hauteur de balayage de la mini-carte"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "Intervalle de répétition minimale du minage"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -5015,6 +5105,10 @@ msgstr "Sensibilité de la souris"
 msgid "Mouse sensitivity multiplier."
 msgstr "Facteur de sensibilité de la souris."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Sensibilité tactile"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Bruit de boue"
@@ -5131,7 +5225,7 @@ msgid ""
 "This is a trade-off between SQLite transaction overhead and\n"
 "memory consumption (4096=100MB, as a rule of thumb)."
 msgstr ""
-"Nombre de blocs supplémentaires qui peuvent être chargés par « /"
+"Nombre de blocs de carte supplémentaires qui peuvent être chargés par « /"
 "clearobjects » à la fois.\n"
 "C'est un compromis entre la surcharge de transaction SQLite et la "
 "consommation mémoire\n"
@@ -5159,10 +5253,6 @@ msgstr "Occlusion Culler"
 msgid "Occlusion Culling"
 msgstr "Détermination des blocs invisibles"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Liquides opaques"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5178,6 +5268,10 @@ msgstr ""
 "Ouvre le menu pause lorsque la sélection de la fenêtre est perdue. Ne met "
 "pas en pause si un formspec est ouvert."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "Débogage OpenGL"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Remplacement optionnel pour la couleur du lien web du tchat."
@@ -5205,8 +5299,8 @@ msgid ""
 "Path to shader directory. If no path is defined, default location will be "
 "used."
 msgstr ""
-"Répertoire des shaders. Si le chemin n'est pas défini, le chemin par défaut "
-"est utilisé."
+"Répertoire des nuanceurs. Si le chemin n'est pas défini, le chemin par "
+"défaut est utilisé."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5315,6 +5409,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proportion de grandes grottes qui contiennent du liquide."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Version du protocole minimale"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Gestes tactiles"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5333,6 +5435,10 @@ msgstr "Élève le terrain pour former des vallées autour des rivières."
 msgid "Random input"
 msgstr "Entrée aléatoire"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Ordre de chargement aléatoire des mods"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Messages de discussion récents"
@@ -5383,8 +5489,8 @@ msgstr ""
 "Combiner les « byteflags » ci dessous pour restreindre les fonctionnalités "
 "client, ou mettre 0 pour laisser sans restriction :\n"
 "LOAD_CLIENT_MODS : 1 (désactive le chargement des mods client)\n"
-"CHAT_MESSAGES : 2 (désactive l'appel « send_chat_message côté » client)\n"
-"READ_ITEMDEFS : 4 (désactive l'appel « get_item_def côté » client)\n"
+"CHAT_MESSAGES : 2 (désactive l'appel « send_chat_message » côté client)\n"
+"READ_ITEMDEFS : 4 (désactive l'appel « get_item_def » côté client)\n"
 "READ_NODEDEFS : 8 (désactive l'appel « get_node_def » côté client)\n"
 "LOOKUP_NODES_LIMIT : 16 (limite l'appel « get_node » côté client à "
 "« csm_restriction_noderange »)\n"
@@ -5520,8 +5626,8 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
-"Qualité des captures d'écran. Utilisé uniquement pour le format JPEG.\n"
-"1 signifie mauvaise qualité ; 100 signifie la meilleure qualité.\n"
+"Qualité des captures d'écran. Utilisé seulement pour le format JPEG.\n"
+"1 signifie mauvaise qualité ; 100 signifie la meilleure qualité.\n"
 "Utiliser 0 pour la qualité par défaut."
 
 #: src/settings_translation_file.cpp
@@ -5552,8 +5658,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5571,16 +5677,17 @@ msgstr ""
 "\n"
 "* Aucun – Pas d'anticrénelage (par défaut)\n"
 "\n"
-"* FSAA – Anticrénelage de la scène complète (incompatible avec les shaders)\n"
+"* FSAA – Anticrénelage de la scène complète (incompatible avec « Post-"
+"traitement » et « Sous-échantillonnage »)\n"
 "Alias anticrénelage multi-échantillon (MSAA), lisse les bords des blocs mais "
 "n'affecte pas l'intérieur des textures.\n"
 "Un redémarrage est nécessaire pour modifier cette option.\n"
 "\n"
-"* FXAA – Anticrénelage approximatif rapide (nécessite des shaders)\n"
+"* FXAA – Anticrénelage approximatif rapide (nécessite des nuanceurs)\n"
 "Applique un filtre de post-traitement pour détecter et lisser les bords à "
 "contraste élevé, fournit un équilibre entre vitesse et qualité d'image.\n"
 "\n"
-"* SSAA – Anticrénelage par super-échantillonnage (nécessite des shaders)\n"
+"* SSAA – Anticrénelage par super-échantillonnage (nécessite des nuanceurs)\n"
 "Rendu d'une image haute résolution de la scène, puis réduit l'échelle pour "
 "diminuer le crénelage. C'est la méthode la plus lente et la plus précise."
 
@@ -5713,10 +5820,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"Définit la langue. Laisser vide pour utiliser la langue du système.\n"
+"Définit la langue. Par défaut, la langue du système est utilisée.\n"
 "Un redémarrage est nécessaire après cette modification."
 
 #: src/settings_translation_file.cpp
@@ -5760,6 +5867,10 @@ msgstr ""
 "Active le flou lumineux.\n"
 "Les couleurs vives débordent sur les objets voisins."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr "Active l'éclairage volumétrique (parfois appelé « rayons de Dieu »)."
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Active l'ondulation des feuilles."
@@ -5770,7 +5881,7 @@ msgstr "Active l'ondulation des liquides (comme l'eau)."
 
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving plants."
-msgstr "Active l'ondulation des végétaux."
+msgstr "Active l'ondulation des plantes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5797,7 +5908,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
-msgstr "Chemin des shaders"
+msgstr "Chemin des nuanceurs"
 
 #: src/settings_translation_file.cpp
 msgid "Shaders"
@@ -5807,12 +5918,10 @@ msgstr "Nuanceurs"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
-"Les nuanceurs (« shaders ») permettent des effets visuels avancés et peuvent "
-"améliorer les performances de certaines cartes graphiques.\n"
-"Fonctionne seulement avec OpenGL."
+"Les nuanceurs permettent des effets visuels avancés et peuvent améliorer les "
+"performances de certaines cartes graphiques."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5900,23 +6009,13 @@ msgstr ""
 "La modification de cette valeur est réservée à un usage spécial. Il est "
 "conseillé de la laisser inchangée."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Taille du cache de blocs de carte du générateur de maillage. Augmenter ceci "
-"augmente le % d'interception du cache et réduit la copie de données dans le "
-"fil principal, réduisant les tremblements."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Inclinaison de l'orbite du corps du ciel"
 
 #: src/settings_translation_file.cpp
 msgid "Slice w"
-msgstr "Largeur de part"
+msgstr "Tranche w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
@@ -5950,11 +6049,10 @@ msgstr "Lissage de l'éclairage"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Lisse la rotation de la caméra en mode cinématique, 0 pour désactiver.\n"
-"Entrer le mode cinématique en utilisant la touche définie dans « Changer les "
-"touches »."
+"Entrer le mode cinématique en utilisant la touche définie dans « Contrôles »."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5976,6 +6074,14 @@ msgstr "Vitesse de déplacement lent, en nœuds par seconde."
 msgid "Soft shadow radius"
 msgstr "Rayon de l'ombre douce"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Audio"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "Extensions de la liste noire audio"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5983,8 +6089,8 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
-"Spécifie l'URL à laquelle les clients obtiennent les fichiers média au lieu "
-"d'utiliser le port UDP.\n"
+"URL à laquelle les clients obtiennent les fichiers média au lieu d'utiliser "
+"le port UDP.\n"
 "« $filename » doit être accessible depuis « $remote_media$filename » via "
 "cURL (évidemment, « remote_media » doit se terminer par une barre oblique).\n"
 "Les fichiers qui ne sont pas présents sont récupérés de la manière "
@@ -6041,7 +6147,7 @@ msgstr "Bruit d'étalement des plateaux montagneux"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of 3D mode parallax."
-msgstr "Intensité de parallaxe en mode 3D."
+msgstr "Intensité parallaxe en mode 3D."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6172,7 +6278,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
-msgstr "L'URL du dépôt de contenu."
+msgstr "URL du dépôt de contenu."
 
 #: src/settings_translation_file.cpp
 msgid "The dead zone of the joystick"
@@ -6186,6 +6292,14 @@ msgstr ""
 "Format par défaut dans lequel les profils sont enregistrés, lors de l'appel "
 "de « /profiler save [format] » sans format."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"Délai en millisecondes après lequel une interaction tactile est considérée "
+"comme un appui long."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
@@ -6194,14 +6308,37 @@ msgstr ""
 "sauvegardés."
 
 #: src/settings_translation_file.cpp
-msgid "The identifier of the joystick to use"
-msgstr "L'identifiant de la manette à utiliser."
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"Geste pour frapper les joueurs/entités.\n"
+"Il peut être remplacé par les jeux et les mods.\n"
+"\n"
+"* appui bref\n"
+"Facile à utiliser et bien connu dans d'autres jeux.\n"
+"\n"
+"* appui long\n"
+"Connu des contrôles classiques de Minetest mobile.\n"
+"Le combat est plus ou moins impossible."
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid "The identifier of the joystick to use"
+msgstr "Identifiant de la manette à utiliser."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
-"Longueur en pixels nécessaire pour que l'interaction avec l'écran tactile "
-"commence."
+"Longueur en pixels après laquelle une interaction tactile est considérée "
+"comme un mouvement."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6210,14 +6347,22 @@ msgid ""
 "0.0 = Wave doesn't move at all.\n"
 "Default is 1.0 (1/2 node)."
 msgstr ""
-"Hauteur maximale de la surface des liquides ondulants.\n"
+"Hauteur maximale de la surface d'ondulation des liquides.\n"
 "4,0 – la hauteur des vagues est de deux blocs.\n"
 "0,0 – la vague ne bouge pas du tout.\n"
 "Par défaut est de 1,0 (1/2 bloc)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Durée minimale en secondes entre le minage de blocs lors du maintien du "
+"bouton ceuser."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr "L'interface réseau que le serveur écoute."
+msgstr "Interface réseau d'écoute du serveur."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6250,13 +6395,13 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Le moteur de rendu.\n"
-"Remarque : un redémarrage est nécessaire après cette modification !\n"
+"Remarque : un redémarrage est nécessaire après cette modification !\n"
 "OpenGL est la valeur par défaut pour les ordinateurs de bureau et OGLES2 "
 "pour Android.\n"
-"Les shaders sont pris en charge par OpenGL et OGLES2 (expérimental)."
+"Les nuanceurs sont pris en charge par tout sauf OGLES1."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6274,8 +6419,8 @@ msgid ""
 "set to the nearest valid value."
 msgstr ""
 "Intensité (obscurité) de l'ombrage des blocs avec l'occlusion ambiante.\n"
-"Les valeurs plus basses sont plus sombres, les valeurs plus hautes sont plus "
-"claires.\n"
+"Les valeurs plus faibles sont plus sombres, les valeurs plus hautes sont "
+"plus claires.\n"
 "Une plage valide de valeurs pour ceci se situe entre 0,25 et 4,0.\n"
 "Si la valeur est en dehors de cette plage alors elle est définie à la plus "
 "proche des valeurs valides."
@@ -6336,6 +6481,10 @@ msgstr ""
 "Troisième des 4 bruits 2D qui définissent ensemble la hauteur des collines "
 "et des montagnes."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Sensibilité pour les appuis longs"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6392,14 +6541,14 @@ msgstr "Sensibilité de l'écran tactile"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Facteur de sensibilité de l'écran tactile."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Sensibilité de l'écran tactile"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Compromis pour la performance"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Liquides translucides"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Distance de tri de la transparence"
@@ -6448,10 +6597,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL du fichier JSON qui fournit des informations sur la nouvelle version de "
-"Minetest"
+"Minetest.\n"
+"Si ce champ est vide, le moteur ne vérifie pas les mises à jour."
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6503,40 +6655,39 @@ msgstr "Activer les nuages 3D au lieu des nuages 2D (plats)."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
-"Utiliser une animation de nuages pour l'arrière-plan du menu principal."
+msgstr "Utiliser l'animation des nuages pour l'arrière-plan du menu principal."
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when looking at textures from an angle."
 msgstr ""
-"Utilise le filtrage anisotrope lorsque l'on regarde les textures sous un "
+"Utiliser le filtrage anisotrope lorsque l'on regarde les textures sous un "
 "certain angle."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Utilisation du filtrage trilinéaire."
+msgstr ""
+"Utiliser le filtrage bilinéaire lors de la mise à l'échelle des textures."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr "Utiliser le réticule pour l'écran tactile"
+msgstr "Utiliser le réticule"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
-"Utiliser le réticule pour la sélection d'objets au lieu de l'écran entier.\n"
+"Utiliser le réticule pour la sélection d'objets au lieu de l'ensemble de "
+"l'écran.\n"
 "Si activé, un réticule est affiché et utilisé pour la sélection d'objets."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Utilise le mip-mapping lors de la réduction d'échelle des textures.\n"
+"Utiliser le mip-mapping lors de la mise à l'échelle des textures.\n"
 "Peut améliorer légèrement les performances, surtout lors de l'utilisation "
 "d'un pack de textures haute résolution.\n"
 "La réduction d'échelle avec correction gamma n'est pas prise en charge."
@@ -6547,23 +6698,21 @@ msgid ""
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
-"Utiliser l'élimination des blocs invisibles par Ray Tracing dans le nouvel "
+"Utiliser l'élimination des blocs invisibles par Ray Tracing avec le nouvel "
 "algorithme.\n"
-"Ce drapeau active l'utilisation du test d'élimination des blocs invisibles "
+"Cette option active l'utilisation du test d'élimination des blocs invisibles "
 "par Ray Tracing,\n"
-"pour les maillages clients de taille inférieure à 4×4×4 blocs de carte."
+"pour les maillages clients de taille inférieure à 4 × 4 × 4 blocs de carte."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Utilisation du filtrage trilinéaire lors de la réduction d'échelle des "
-"textures.\n"
-"Si le filtrage bilinéaire et le filtrage trilinéaire sont activés, le "
-"filtrage trilinéaire est appliqué."
+"Utiliser le filtrage trilinéaire lors de la mise à l'échelle des textures.\n"
+"Si le filtrage bilinéaire et le filtrage trilinéaire sont tous deux activés, "
+"le filtrage trilinéaire est appliqué."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6571,7 +6720,7 @@ msgid ""
 "If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
 "circle."
 msgstr ""
-"Utilise la manette virtuelle pour déclencher le bouton « Aux1 ».\n"
+"Utiliser la manette virtuelle pour déclencher le bouton « Aux1 ».\n"
 "Si activé, la manette virtuelle appuie également sur le bouton « Aux1 » "
 "lorsqu'en dehors du cercle principal."
 
@@ -6579,10 +6728,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfaces utilisateur"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Synchronisation verticale"
@@ -6633,8 +6778,8 @@ msgid ""
 "Defines the 'persistence' value for terrain_base and terrain_alt noises."
 msgstr ""
 "Variation de la rugosité du terrain.\n"
-"Définit la valeur de « persistance » pour les bruits terrain_base et "
-"terrain_alt."
+"Définit la valeur de « persistance » pour les bruits « terrain_base » et « "
+"terrain_alt »."
 
 #: src/settings_translation_file.cpp
 msgid "Varies steepness of cliffs."
@@ -6676,6 +6821,10 @@ msgstr "Manette virtuelle déclenche le bouton Aux1"
 msgid "Volume"
 msgstr "Volume du son"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Facteur du volume fenêtre non sélectionnée."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6684,6 +6833,14 @@ msgstr ""
 "Volume de tous les sons.\n"
 "Nécessite le son système pour être activé."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "Volume fenêtre non sélectionnée"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "Éclairage volumétrique"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6692,8 +6849,8 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Coordonnée W de la couche 3D de la forme 4D.\n"
-"Détermine la tranche 3D de la forme 4D qui est générée.\n"
+"Coordonnée W de la tranche 3D générée d'une fractale 4D.\n"
+"Détermine la tranche 3D de la forme 4D générée.\n"
 "Transforme la forme de la fractale.\n"
 "N'a aucun effet sur les fractales 3D.\n"
 "La plage est d'environ -2 à 2."
@@ -6725,27 +6882,27 @@ msgstr "Environnement mouvant"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
-msgstr "Feuilles ondulantes"
+msgstr "Ondulation des feuilles"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids"
-msgstr "Liquides ondulants"
+msgstr "Ondulation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave height"
-msgstr "Hauteur des vagues des liquides ondulants"
+msgstr "Hauteur des vagues de l'ondulation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave speed"
-msgstr "Vitesse de déplacement des liquides ondulants"
+msgstr "Vitesse de déplacement de l'ondulation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wavelength"
-msgstr "Longueur d'onde des liquides ondulants"
+msgstr "Longueur d'onde de l'ondulation des liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr "Plantes ondulantes"
+msgstr "Ondulation des plantes"
 
 #: src/settings_translation_file.cpp
 msgid "Weblink color"
@@ -6787,12 +6944,12 @@ msgid ""
 msgstr ""
 "En utilisant le filtrage bilinéaire/trilinéaire/anisotrope, les textures de "
 "basse résolution peuvent être floues.\n"
-"Elles seront donc automatiquement agrandies avec l'interpolation du plus "
-"proche voisin pour préserver des pixels nets.\n"
-"Ceci détermine la taille de la texture minimale pour les textures "
-"agrandies ; les valeurs plus hautes rendent plus détaillées, mais "
-"nécessitent plus de mémoire. Les puissances de 2 sont recommandées.\n"
-"Ce paramètre est appliqué uniquement si le filtrage bilinéaire/trilinéaire/"
+"Elles sont donc agrandies avec l'interpolation au plus proche voisin pour "
+"préserver des pixels nets.\n"
+"Ceci détermine la taille minimale pour les textures agrandies ;\n"
+"les valeurs plus élevées ont un rendu plus net, mais nécessitent plus de "
+"mémoire. Les puissances de 2 sont recommandées.\n"
+"Ce paramètre est appliqué seulement si le filtrage bilinéaire/trilinéaire/"
 "anisotrope est activé.\n"
 "Ceci est également utilisé comme taille de texture de nœud de base pour "
 "l'agrandissement automatique des textures alignées sur le monde."
@@ -6829,8 +6986,7 @@ msgid ""
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
 "S’il faut demander aux clients de se reconnecter après un crash (Lua).\n"
-"Définir sur « Activé » si le serveur est paramétré pour redémarrer "
-"automatiquement."
+"Activer si le serveur est paramétré pour redémarrer automatiquement."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
@@ -6853,7 +7009,7 @@ msgid ""
 "Whether to show the client debug info (has the same effect as hitting F5)."
 msgstr ""
 "Détermine la visibilité des informations de débogage du client (même effet "
-"que taper F5)."
+"que d'appuyer sur F5)."
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
@@ -6874,15 +7030,16 @@ msgid ""
 "Contains the same information as the file debug.txt (default name)."
 msgstr ""
 "Systèmes Windows seulement : démarrer Minetest avec la fenêtre de ligne de "
-"commande en arrière-plan. Contient les mêmes informations que le fichier "
-"« debug.txt » (nom par défaut)."
+"commande en arrière-plan.\n"
+"Contient les mêmes informations que le fichier « debug.txt » (nom par "
+"défaut)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
-"Chemin du monde (tout ce qui relatif au monde est enregistré ici).\n"
+"Chemin du monde (tout ce qui existe dans le monde est enregistré ici).\n"
 "Inutile si démarré depuis le menu."
 
 #: src/settings_translation_file.cpp
@@ -6930,7 +7087,7 @@ msgstr "Limite haute Y des grandes grottes."
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
 msgstr ""
-"Distance Y jusqu'à laquelle les cavernes s'étendent à leur taille maximale."
+"Distance Y sur laquelle les cavernes s'étendent à leur taille maximale."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6939,8 +7096,9 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
-"Hauteur-Y à laquelle les terrains flottants commencent à rétrécir.\n"
-"L'effilage commence à cette distance de la limite en Y.\n"
+"Distance Y sur laquelle les terrains flottants passent d'une densité "
+"maximale à une densité nulle.\n"
+"L'effilage commence à cette distance, depuis la limite en Y.\n"
 "Pour une couche solide de terrain flottant, ceci contrôle la hauteur des "
 "collines et des montagnes.\n"
 "Doit être inférieure ou égale à la moitié de la distance entre les limites Y."
@@ -6984,12 +7142,18 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(support du jeu requis)"
 
+#~ msgid "- Address: "
+#~ msgstr "– Adresse : "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "– Mode créatif : "
 
 #~ msgid "- Damage: "
 #~ msgstr "– Dégâts : "
 
+#~ msgid "- Port: "
+#~ msgstr "– Port : "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7028,6 +7192,13 @@ msgstr "Limite parallèle de cURL"
 #~ "Noter que le champ de l'adresse dans le menu principal remplace ce "
 #~ "paramètre."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajuste la configuration des PPP à votre écran (non X11/Android "
+#~ "seulement), par exemple pour les écrans 4k."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7098,6 +7269,9 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bits par pixel (profondeur de couleur) en mode plein-écran."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Limites des blocs affichées pour tous les blocs"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Placage de relief"
 
@@ -7123,6 +7297,9 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Milieu de la courbe de lumière mi-boost."
 
+#~ msgid "Change Keys"
+#~ msgstr "Changer les touches"
+
 #~ msgid "Change keys"
 #~ msgstr "Changer les touches"
 
@@ -7200,6 +7377,38 @@ msgstr "Limite parallèle de cURL"
 #~ "Contrôle la largeur des tunnels, une valeur plus petite crée des tunnels "
 #~ "plus larges."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Contrôles :\n"
+#~ "– %s : avancer\n"
+#~ "– %s : reculer\n"
+#~ "– %s : à gauche\n"
+#~ "– %s : à droite\n"
+#~ "– %s : sauter/grimper\n"
+#~ "– %s : creuser/frapper/utiliser\n"
+#~ "– %s : placer/utiliser\n"
+#~ "– %s : marcher lentement/descendre\n"
+#~ "– %s : lâcher un objet\n"
+#~ "– %s : inventaire\n"
+#~ "– Souris : tourner/regarder\n"
+#~ "– Molette souris : sélectionner un objet\n"
+#~ "– %s : tchat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Créatif"
 
@@ -7209,6 +7418,9 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Couleur du réticule (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "PPP"
+
 #~ msgid "Damage"
 #~ msgstr "Dégâts"
 
@@ -7297,6 +7509,13 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Activer la confirmation d'enregistrement"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Active les « vertex buffer objects ».\n"
+#~ "Cela devrait grandement augmenter les performances graphiques."
+
 #~ msgid "Enabled"
 #~ msgstr "Activé"
 
@@ -7612,6 +7831,9 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentalisation"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Jeu spécifié invalide."
+
 #~ msgid "Inventory key"
 #~ msgstr "Touche inventaire"
 
@@ -8308,6 +8530,12 @@ msgstr "Limite parallèle de cURL"
 #~ "Rendre DirectX compatible avec LuaJIT. Désactiver si cela cause des "
 #~ "problèmes."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Rend tous les liquides opaques."
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Taille du cache de blocs de carte en Mo du générateur de maillage"
+
 #~ msgid "Menus"
 #~ msgstr "Menus"
 
@@ -8552,15 +8780,21 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Feuilles simples"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Taille du cache de blocs de carte du générateur de maillage.\n"
+#~ "Augmenter ceci augmente le % d'interception du cache et réduit la copie "
+#~ "de données dans le fil principal, réduisant les tremblements."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Lissage de l'éclairage"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Lisse la rotation de la caméra. 0 pour désactiver."
 
-#~ msgid "Sound"
-#~ msgstr "Audio"
-
 #~ msgid "Special"
 #~ msgstr "Spécial"
 
@@ -8626,6 +8860,9 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Sensibilité tactile (px) :"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Sensibilité de l'écran tactile"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtrage trilinéaire"
 
@@ -8680,6 +8917,9 @@ msgstr "Limite parallèle de cURL"
 #~ "Si définie à 0, MSAA est désactivé.\n"
 #~ "Un redémarrage est nécessaire après la modification de cette option."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variation de la hauteur des collines et de la profondeur des lacs sur les "
@@ -8787,8 +9027,14 @@ msgstr "Limite parallèle de cURL"
 #~ msgid "You died."
 #~ msgstr "Vous êtes mort."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Vous n'avez pas de jeu installé."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/ga/minetest.po b/po/ga/minetest.po
index 69737a270..95384a8c1 100644
--- a/po/ga/minetest.po
+++ b/po/ga/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Irish <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -77,7 +77,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -86,11 +86,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -109,6 +105,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Athcheangail"
@@ -137,173 +137,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 ag íoslódáil..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Ag íoslódáil..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Cluichí"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Suiteáil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ag lódáil..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Ag íoslódáil..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Cluichí"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Suiteáil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ag lódáil..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -450,10 +457,20 @@ msgstr "Cruthaigh"
 msgid "Decorations"
 msgstr "Maisiúcháin"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Doinsiúin"
@@ -816,10 +833,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -829,7 +842,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1032,6 +1046,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1065,7 +1089,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1145,18 +1169,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1181,24 +1197,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1233,10 +1245,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1281,6 +1289,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1289,32 +1301,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1394,6 +1387,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1414,10 +1411,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1573,10 +1566,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "togha"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1898,6 +1887,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2087,6 +2085,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2120,6 +2130,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ga"
 
@@ -2305,12 +2316,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2333,6 +2338,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2386,6 +2395,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2407,12 +2427,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2476,6 +2505,10 @@ msgstr "Bithóim"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2688,6 +2721,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2819,10 +2858,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2872,6 +2907,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3056,6 +3104,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3075,6 +3127,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3117,6 +3173,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3140,6 +3200,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3148,12 +3212,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3183,6 +3241,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3977,9 +4048,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4125,10 +4197,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4177,7 +4245,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4212,10 +4282,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4457,6 +4523,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4525,6 +4595,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Tairseach ollphluaise"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4633,10 +4708,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4649,6 +4720,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4758,6 +4833,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4773,6 +4856,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4960,8 +5047,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5079,7 +5166,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5112,6 +5199,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5151,8 +5242,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5222,13 +5312,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5264,7 +5347,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5285,6 +5368,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5441,17 +5532,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5462,6 +5573,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5488,7 +5605,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5545,6 +5662,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5592,12 +5713,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Tairseach ollphluaise"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5635,7 +5755,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5733,10 +5855,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5823,12 +5941,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6071,3 +6201,10 @@ msgstr ""
 
 #~ msgid "Information:"
 #~ msgstr "Eolas:"
+
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Tairseach ollphluaise"
+
+#~ msgid "ok"
+#~ msgstr "togha"
diff --git a/po/gd/minetest.po b/po/gd/minetest.po
index 6a8173f41..946443d6e 100644
--- a/po/gd/minetest.po
+++ b/po/gd/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-08-17 10:48+0000\n"
 "Last-Translator: Eoghan Murray <eoghan@getthere.ie>\n"
 "Language-Team: Gaelic <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -73,7 +73,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -82,11 +82,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -105,6 +101,10 @@ msgstr ""
 msgid "Main menu"
 msgstr "Prìomh chlàr-taice"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -136,175 +136,182 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Stàladh: Faidhle dhen t-seòrsa “$1” ris nach eil taic no tasglann bhriste"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Stàladh: Faidhle dhen t-seòrsa “$1” ris nach eil taic no tasglann bhriste"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -451,10 +458,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -819,10 +836,6 @@ msgstr ""
 msgid "Back"
 msgstr "Backspace"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -832,7 +845,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1036,6 +1050,16 @@ msgstr "Pacaidean air an stàladh:"
 msgid "Install games from ContentDB"
 msgstr "Stàlaich geamannan o ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1069,7 +1093,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1152,18 +1176,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1190,27 +1206,21 @@ msgstr " "
 msgid "Provided world path doesn't exist: "
 msgstr " "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Address: "
-msgstr " "
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Mode: "
 msgstr " "
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Port: "
-msgstr " "
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Public: "
@@ -1248,10 +1258,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1296,6 +1302,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1304,46 +1314,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Stiùireadh:\n"
-"- %s: gluais an comhair a’ bheòil\n"
-"- %s: gluais an comhair a’ chùil\n"
-"- %s: gluais dhan taobh clì\n"
-"- %s: gluais dhan taobh deas\n"
-"- %s: leum/sreap\n"
-"- %s: tàislich/dìrich\n"
-"- %s: leig às nì\n"
-"- %s: an tasgadh\n"
-"- Luchag: tionndaidh/coimhead\n"
-"- Putan clì na luchaige: geàrr/buail\n"
-"- Putan deas na luchaige: cuir ann/cleachd\n"
-"- Cuibhle na luchaige: tagh nì\n"
-"- %s: cabadaich\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1423,6 +1400,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Fiosrachadh mun gheama:"
@@ -1443,10 +1424,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1603,10 +1580,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1930,6 +1903,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2120,6 +2102,18 @@ msgstr ""
 msgid "press key"
 msgstr "brùth air iuchair"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2153,6 +2147,7 @@ msgstr " "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "gd"
 
@@ -2346,12 +2341,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2374,6 +2363,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2433,6 +2426,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2454,12 +2458,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2522,6 +2535,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2740,6 +2757,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2872,10 +2895,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2925,6 +2944,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3111,6 +3143,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3130,6 +3166,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3172,6 +3212,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3195,6 +3239,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3203,12 +3251,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3238,6 +3280,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4071,9 +4126,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4232,10 +4288,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Dèan gach lionn trìd-dhoilleir"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4292,11 +4344,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Buadhan gintinn mapa a tha sònraichte do ghineadair nam mapa v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Buadhan gintinn mapa a tha sònraichte do ghineadair nam mapa  v6.\n"
 "Cuiridh a’ bhratach “snowbiomes” siostam 5 ùr nam bitheom an comas.\n"
@@ -4341,10 +4396,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr "Cuingeachadh gintinn mapa"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4592,6 +4643,10 @@ msgstr "An ìre as lugha dhen loga a thèid a sgrìobhadh dhan chabadaich."
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4662,6 +4717,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4775,10 +4834,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4793,6 +4848,11 @@ msgstr ""
 "Fosgail clàr-taice a’ chuir ’na stad nuair a chailleas an uinneag am fòcas.\n"
 "Cha dèid a chur ’na stad nuair a bhios formspec fosgailte."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Dì-bhugachadh gineadair nam mapa"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4902,6 +4962,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr " "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4919,6 +4988,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5108,8 +5181,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5229,7 +5302,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5262,6 +5335,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5301,8 +5378,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5380,13 +5456,6 @@ msgstr ""
 "mholamaid\n"
 "nach atharraich thu e."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5422,7 +5491,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5443,6 +5512,14 @@ msgstr "Luaths an tàisleachaidh ann an nòd gach diog."
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5615,17 +5692,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5636,6 +5733,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5665,7 +5768,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5722,6 +5825,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5769,11 +5876,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5815,7 +5922,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5913,10 +6022,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6003,12 +6108,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6256,6 +6373,10 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "- Address: "
+#~ msgstr " "
+
 #, fuzzy
 #~ msgid "- Creative Mode: "
 #~ msgstr " "
@@ -6263,6 +6384,10 @@ msgstr ""
 #~ msgid "- Damage: "
 #~ msgstr "– Dochann: "
 
+#, fuzzy
+#~ msgid "- Port: "
+#~ msgstr " "
+
 #~ msgid "Address / Port"
 #~ msgstr "Seòladh / Port"
 
@@ -6270,6 +6395,38 @@ msgstr ""
 #~ msgid "Change keys"
 #~ msgstr "Iuchair an sgiathaidh"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Stiùireadh:\n"
+#~ "- %s: gluais an comhair a’ bheòil\n"
+#~ "- %s: gluais an comhair a’ chùil\n"
+#~ "- %s: gluais dhan taobh clì\n"
+#~ "- %s: gluais dhan taobh deas\n"
+#~ "- %s: leum/sreap\n"
+#~ "- %s: tàislich/dìrich\n"
+#~ "- %s: leig às nì\n"
+#~ "- %s: an tasgadh\n"
+#~ "- Luchag: tionndaidh/coimhead\n"
+#~ "- Putan clì na luchaige: geàrr/buail\n"
+#~ "- Putan deas na luchaige: cuir ann/cleachd\n"
+#~ "- Cuibhle na luchaige: tagh nì\n"
+#~ "- %s: cabadaich\n"
+
 #~ msgid "Debug info toggle key"
 #~ msgstr "Iuchair toglachadh an fhiosrachaidh dì-bhugachaidh"
 
@@ -6792,6 +6949,9 @@ msgstr ""
 #~ "Faic http://irrlicht.sourceforge.net/docu/namespaceirr."
 #~ "html#a54da2a0e231901735e3da1b0edf72eb3"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Dèan gach lionn trìd-dhoilleir"
+
 #~ msgid "Noclip"
 #~ msgstr "Gun bhearradh"
 
diff --git a/po/gl/minetest.po b/po/gl/minetest.po
index 06a171108..2f28367e4 100644
--- a/po/gl/minetest.po
+++ b/po/gl/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2022-11-21 05:47+0000\n"
-"Last-Translator: runs <runspect@yahoo.es>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-20 23:09+0000\n"
+"Last-Translator: ninjum <ninhum@gmx.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/minetest/"
 "minetest/gl/>\n"
 "Language: gl\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,8 +71,8 @@ msgid "Command not available: "
 msgstr "Comando non dispoñible: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Obter axuda para os comandos"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Obteña axuda para os comandos (-t: saída no chat)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -82,12 +82,8 @@ msgstr ""
 "lista completa."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Aceptar"
+msgid "[all | <cmd>] [-t]"
+msgstr "[todo | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -105,6 +101,10 @@ msgstr "Produciuse un erro:"
 msgid "Main menu"
 msgstr "Menú principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Aceptar"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Volver conectar"
@@ -133,19 +133,27 @@ msgstr "Só admítese a versión de protocolo $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Só admítense as versións de protocolo entre $1 e $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" xa existe. Desexa substituílo?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Erro ao instalar \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Instalaranse as dependencias $1 e $2."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Erro ao descargar \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 por $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Erro ao descargar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Non se puido extraer '$1' (espazo en disco insuficiente, tipo de arquivo non "
+"compatible ou arquivo danado)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +161,157 @@ msgstr ""
 "$1 descargando,\n"
 "$2 en cola"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Descargando $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Non se puido atopar as dependencias requeridas para $1 ."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "Instalarase $1 e omitiranse as dependencias de $2."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
-msgstr "Todos os paq."
+msgstr "Todos os paquetes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Xa está instalado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Volver ao menú principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB non está dispoñible cando Minetest compilouse sen cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Descargando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Produciuse un erro ao obter dependencias para o paquete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Xogos"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Non se puido recuperar ningún paquete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Non hai resultados"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Sen actualizacións"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "En cola"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paquetes de texturas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Non se atopou o paquete $1."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Actualizar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Actualizar Todo [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Ver máis información nun navegador web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Precisas instalar un xogo antes de poder instalar un mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Instalaranse as dependencias $1 e $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Non se puido atopar as dependencias requeridas para $1 ."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Instalarase $1 e omitiranse as dependencias de $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Xa está instalado"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Xogo base:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB non está dispoñible cando Minetest compilouse sen cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependencias:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Descargando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Erro ao descargar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Erro ao descargar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Instalación: Formato de ficheiro \"$1\" non compatible ou ficheiro corrupto"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Xogos"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalar dependencias faltantes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Non se puido recuperar ningún paquete"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Non hai resultados"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Sen actualizacións"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Non atopado"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sobrescribir"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Verifica que o xogo base esté correcto."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "En cola"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" xa existe. Desexa substituílo?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paq. de text."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Actualizar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Actualizar Todo [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Ver máis información nun navegador web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sobrescribir"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -320,21 +326,16 @@ msgid "Failed to install $1 to $2"
 msgstr "Error ao instalar $1 en $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr ""
-"Instalación do mod: Non se puido atopar un nome de cartafol adecuado para o "
-"paquete de mods $1"
+msgstr "Instalación: Non se puido atopar un nome de carpeta adecuado para $1"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "Non se puido atopar un mod ou paquete de mods válido"
+msgstr "Non se puido atopar un mod, paquete de mods ou xogo válido"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a $1 as a $2"
-msgstr "Non se puido instalar un mod como $1"
+msgstr "Non se puido instalar un $1 como un $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -346,7 +347,7 @@ msgstr "(Activado, ten erro)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr "(Unsatisfeito)"
+msgstr "(Insatisfeito)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
@@ -458,10 +459,22 @@ msgstr "Crear"
 msgid "Decorations"
 msgstr "Decoracións"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Templos do deserto"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Aviso: O Test de Desenvolvemento está destinado aos desenvolvedores."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Variante de calabozo diferente xerada en biomas do deserto (só se os alxubes "
+"están habilitados)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Calabozos"
@@ -649,7 +662,7 @@ msgstr "Contrasinal"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Passwords do not match"
-msgstr "Os contrasinais non coinciden!"
+msgstr "Os contrasinais non coinciden"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
 msgid "Register"
@@ -657,7 +670,7 @@ msgstr "Rexistrarse"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Descartar"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -665,21 +678,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Durante moito tempo, o motor Minetest incluía un xogo predeterminado chamado "
+"\"Minetest Game\". Dende Minetest 5.8.0, Minetest inclúese sen un xogo "
+"predeterminado."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Se queres seguir xogando nos teus mundos de Minetest, precisarás reinstalar "
+"Minetest Game."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game xa non se instala por defecto"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Instalar outro xogo"
+msgstr "Reinstalar Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -708,6 +725,10 @@ msgid ""
 "Visit $3 to find out how to get the newest version and stay up to date with "
 "features and bugfixes."
 msgstr ""
+"Versión instalada: $1\n"
+"Nova versión: $2\n"
+"Visita $3 para saber como obter a versión máis recente e estar ao día cas "
+"características e correccións de erros."
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Later"
@@ -752,9 +773,8 @@ msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Seleccionar"
+msgstr "Establecer"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -823,20 +843,15 @@ msgstr "Suavizado"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Usar a linguaxe do sistema)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Accesibilidade"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Back"
-msgstr "Atrás"
-
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Configurar teclas"
+msgstr "Voltar"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
@@ -847,7 +862,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Limpar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controis"
 
@@ -856,18 +872,16 @@ msgid "General"
 msgstr "Xeral"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Movemento rápido"
+msgstr "Movemento"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Restaurar"
+msgstr "Restablecer a configuración predeterminada"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Restablecer a configuración predeterminada ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -875,7 +889,7 @@ msgstr "Procurar"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Amosar configuracións avanzadas"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -895,11 +909,11 @@ msgstr "Contido: Mods"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(O xogo tamén precisará activar as sombras)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -948,11 +962,11 @@ msgstr "Desenvolvedores principais"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "Equipo Central"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Dispositivo Irrlicht:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -983,18 +997,16 @@ msgid "Browse online content"
 msgstr "Explorar contido en liña"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Explorar contido en liña"
+msgstr "Navegar polo contido en liña [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Contido"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Contido"
+msgstr "Contido [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1017,9 +1029,8 @@ msgid "Rename"
 msgstr "Renomear"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<Comando non dispoñible>"
+msgstr "¿Actualización dispoñible?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1035,7 +1046,7 @@ msgstr "Ligazón de enderezo"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Creative Mode"
-msgstr "Modo creativo"
+msgstr "Modo Creativo"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
@@ -1057,6 +1068,18 @@ msgstr "Instalar un xogo"
 msgid "Install games from ContentDB"
 msgstr "Instalar xogos do ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest non trae un xogo por defecto."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest é unha plataforma de creación de xogos que che permite xogar a "
+"moitos xogos diferentes."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Novo"
@@ -1090,8 +1113,8 @@ msgid "Start Game"
 msgstr "Xogar só"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Non tes xogos instalados."
+msgid "You need to install a game before you can create a world."
+msgstr "Tes que instalar un xogo antes de poder crear un mundo."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1170,18 +1193,10 @@ msgstr "Cargando texturas..."
 msgid "Rebuilding shaders..."
 msgstr "Reconstruíndo sombreadores..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Erro de conexión (tempo esgotado?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Non se puido atopar ou cargar o xogo: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Especificación do xogo non válida."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menú principal"
@@ -1206,7 +1221,11 @@ msgstr "O ficheiro do contrasinal fornecido non se puido abrir: "
 msgid "Provided world path doesn't exist: "
 msgstr "O camiño do mundo fornecido non existe: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Multimedia..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1214,18 +1233,10 @@ msgstr ""
 "\n"
 "Verifique debug.txt para obter detalles."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Enderezo: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modo: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Porto: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Público: "
@@ -1233,7 +1244,7 @@ msgstr "- Público: "
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr "- PvP: "
+msgstr "- Xogador contra xogador: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
@@ -1260,10 +1271,6 @@ msgstr "Avance automático activado"
 msgid "Block bounds hidden"
 msgstr "Lím. bloques ocultos"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Límites de bloque mostrados para todos os bloques"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Límites de bloques mostrados para o bloque actual"
@@ -1281,10 +1288,9 @@ msgid "Camera update enabled"
 msgstr "Actualización da cámara activada"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
 msgstr ""
-"Non se puido mostrar os límites de bloco (é preciso o permiso 'basic_debug')"
+"Non se poden amosar os límites dos bloques (desactivado polo xogo ou mod)"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1310,6 +1316,10 @@ msgstr "O scripting de cliente está desactivado"
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Erro de conexión (tempo esgotado?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Erro na conexión por un motivo descoñecido"
@@ -1319,46 +1329,12 @@ msgid "Continue"
 msgstr "Continuar"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controis:\n"
-"- %s: ir cara adiante\n"
-"- %s: ir cara atrás\n"
-"- %s: ir cara esquerda\n"
-"- %s: ir cara dereita\n"
-"- %s: saltar/escalar\n"
-"- %s: romper bloque/golpear\n"
-"- %s: colocar/usar\n"
-"- %s: agacharse/abaxaise\n"
-"- %s: soltar obxecto\n"
-"- %s: inventario\n"
-"- Rato: virarse/ver\n"
-"- Roda do rato: seleccionar obxecto\n"
-"- %s: chat\n"
-
-#: src/client/game.cpp
-#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1367,18 +1343,18 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Controis por defecto:\n"
-"Menú oculto:\n"
-"- Un clic: activa botón\n"
-"- Dobre clic: colocar/usar\n"
-"- Deslizar dedo: mirar arredor\n"
-"Menú/inventario visible:\n"
-"- Dobre clic: (fóra do menú/inventario):\n"
-" -->pechar\n"
-"- Clic no obxecto e logo clic nun compartimento:\n"
-" --> mover obxecto\n"
-"- Clic e arrastar, e logo clic con os dous dedos\n"
-" --> colocar un só obxecto\n"
+"Controis:\n"
+"Sen menú aberto:\n"
+"- deslizar o dedo: mirar arredor\n"
+"- toque: colocar/perforar/utilizar (predeterminado)\n"
+"- Toque longo: cavar/utilizar (predeterminado)\n"
+"Menú/inventario aberto:\n"
+"- Dobre toque (exterior):\n"
+" --> pechar\n"
+"- pila táctil, rañura táctil:\n"
+" --> mover pila\n"
+"- toca e arrastra, toca co segundo dedo\n"
+" --> coloca un único elemento na rañura\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1451,6 +1427,10 @@ msgstr "Néboa desactivada"
 msgid "Fog enabled"
 msgstr "Néboa activada"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Néboa habilitada polo xogo ou mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Información do xogo:"
@@ -1471,10 +1451,6 @@ msgstr "Definicións dos obxectos..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Multimedia..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1485,7 +1461,7 @@ msgstr "O minimapa está actualmente desactivado polo xogo ou mod"
 
 #: src/client/game.cpp
 msgid "Multiplayer"
-msgstr "Xogar en liña"
+msgstr "Multixogador"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
@@ -1575,28 +1551,27 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "Non se puido escoitar %s porque o IPv6 está desactivado"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Campo de visión ilimitada activado"
+msgstr "Desactivado o rango de visión ilimitado"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
-msgstr "Campo de visión ilimitada activado"
+msgstr "Rango de visualización ilimitado activado"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "Alcance de visión ilimitado activado, pero prohibido polo xogo ou mod"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "O campo de visión está ao mínimo: %d"
+msgstr "Visualización cambiada a %d (o mínimo)"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"A visualización cambiou a %d (o mínimo), pero limitada a %d polo xogo ou mod"
 
 #: src/client/game.cpp
 #, c-format
@@ -1604,20 +1579,23 @@ msgid "Viewing range changed to %d"
 msgstr "Campo de visión cambiada a %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "Campo de visión cambiada a %d"
+msgstr "O rango de visualización cambiouse a %d (o máximo)"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"O alcance de visión cambiou a %d (o máximo), pero está limitado a %d polo "
+"xogo ou mod"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "Campo de visión cambiada a %d"
+msgstr ""
+"O rango de visión cambiouse a %d, pero está limitado a %d polo xogo ou mod"
 
 #: src/client/game.cpp
 #, c-format
@@ -1632,14 +1610,9 @@ msgstr "Estrutura de arames mostrada"
 msgid "Zoom currently disabled by game or mod"
 msgstr "O zoom está actualmente desactivado polo xogo ou mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
-#, fuzzy
 msgid "Chat currently disabled by game or mod"
-msgstr "O zoom está actualmente desactivado polo xogo ou mod"
+msgstr "Chat actualmente desactivado polo xogo ou mod"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1668,7 +1641,7 @@ msgstr "Análise do mundo visible (páx. %d de %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
-msgstr "Aplicaciones"
+msgstr "Aplicacións"
 
 #: src/client/keycode.cpp
 msgid "Backspace"
@@ -1676,32 +1649,28 @@ msgstr "Retroceso"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "Tecla para agacharse"
+msgstr "Tecla de interrupción"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
 msgstr "Bloq Maiús"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "Limpar"
+msgstr "Tecla de Borrar"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "Control"
+msgstr "Tecla de control"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Eliminar"
+msgstr "Tecla de eliminar"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Frecha abaixo"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1748,9 +1717,8 @@ msgid "Insert"
 msgstr "Inserir"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Ctrl esq."
+msgstr "Frecha esquerda"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1758,7 +1726,7 @@ msgstr "Botón esquerdo"
 
 #: src/client/keycode.cpp
 msgid "Left Control"
-msgstr "Ctrl esq."
+msgstr "Control Esquerdo"
 
 #: src/client/keycode.cpp
 msgid "Left Menu"
@@ -1766,17 +1734,16 @@ msgstr "Menú esquerdo"
 
 #: src/client/keycode.cpp
 msgid "Left Shift"
-msgstr "Shift esq."
+msgstr "Shift esquerdo"
 
 #: src/client/keycode.cpp
 msgid "Left Windows"
-msgstr "Win. esq."
+msgstr "Win. esqueda"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "Menú"
+msgstr "Tecla do menú"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1784,7 +1751,7 @@ msgstr "Botón central"
 
 #: src/client/keycode.cpp
 msgid "Num Lock"
-msgstr "Bloq. núm."
+msgstr "Bloq. Núm"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
@@ -1851,20 +1818,17 @@ msgid "OEM Clear"
 msgstr "Limpar OEM"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
-msgstr "Avance páx."
+msgstr "Páxina abaixo"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
-msgstr "Retroceso pax."
+msgstr "Páxina arriba"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Pausa"
+msgstr "Tecla de pausa"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1873,17 +1837,15 @@ msgstr "Xogar"
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
 msgid "Print"
-msgstr "Impr. pant."
+msgstr "Imprimir"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Enter"
+msgstr "Tecla de retorno"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Ctrl der."
+msgstr "Frecha dereita"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1891,7 +1853,7 @@ msgstr "Botón dereito"
 
 #: src/client/keycode.cpp
 msgid "Right Control"
-msgstr "Ctrl der."
+msgstr "Control dereito"
 
 #: src/client/keycode.cpp
 msgid "Right Menu"
@@ -1899,15 +1861,15 @@ msgstr "Menú dereito"
 
 #: src/client/keycode.cpp
 msgid "Right Shift"
-msgstr "Shift der."
+msgstr "Shift dereito"
 
 #: src/client/keycode.cpp
 msgid "Right Windows"
-msgstr "Win. der."
+msgstr "Windows dereito"
 
 #: src/client/keycode.cpp
 msgid "Scroll Lock"
-msgstr "Bloq. Despr."
+msgstr "Bloqueo de desprazamento"
 
 #. ~ Key name
 #: src/client/keycode.cpp
@@ -1915,9 +1877,8 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Tecla Maiúsculas"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1937,7 +1898,7 @@ msgstr "Tabulador"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Frecha cara arriba"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1948,9 +1909,8 @@ msgid "X Button 2"
 msgstr "X Botón 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
-msgstr "Zoom"
+msgstr "Tecla de zoom"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
@@ -1970,27 +1930,38 @@ msgstr "Minimapa en modo superficie, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapa en modo textura"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Produciuse un erro ao compilar o sombreador \"%s\"."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Os sombreadores están habilitados pero o controlador non admite GLSL."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
 msgid "%s is missing:"
-msgstr ""
+msgstr "%s falta:"
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Install and enable the required mods, or disable the mods causing errors."
 msgstr ""
+"Instala e habilita os mods necesarios, ou desactiva os mods que causan erros."
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Note: this may be caused by a dependency cycle, in which case try updating "
 "the mods."
 msgstr ""
+"Nota: isto pode ser causado por un ciclo de dependencia, nese caso, proba "
+"actualizar os mods."
 
 #: src/content/mod_configuration.cpp
-#, fuzzy
 msgid "Some mods have unsatisfied dependencies:"
-msgstr "Sen dependencias importantes"
+msgstr "Algúns mods teñen dependencias non satisfeitas:"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Failed to open webpage"
@@ -2082,7 +2053,7 @@ msgstr "A tecla xa está en uso"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr "Atallos de teclado"
+msgstr "Atallos de teclado."
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2094,7 +2065,7 @@ msgstr "Comando local"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr "Silenciar"
+msgstr "Acalar"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
@@ -2102,7 +2073,7 @@ msgstr "Seg. obxecto"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Prev. item"
-msgstr "Obxecto ant."
+msgstr "Obxecto anterior"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Range select"
@@ -2118,7 +2089,7 @@ msgstr "Captura"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr "Ir agachado"
+msgstr "Ir Agachado"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
@@ -2160,6 +2131,18 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "Unha tecla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Aberto"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Abrir Enderezo?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "Non se pode abrir o enderezo"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Cambiar"
@@ -2193,6 +2176,7 @@ msgstr "Son: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "gl"
 
@@ -2200,16 +2184,17 @@ msgstr "gl"
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
 msgstr ""
+"O nome non está rexistrado. Para crear unha conta neste servidor, fai clic "
+"en 'Rexistrar'"
 
 #: src/network/clientpackethandler.cpp
-#, fuzzy
 msgid "Name is taken. Please choose another name"
-msgstr "Escolle un nome!"
+msgstr "O nome está en uso. Por favor, escolle outro nome"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "Cerrando..."
+msgstr "%s mentres se apaga: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2283,7 +2268,7 @@ msgstr "Ruído 2D que localiza os vales fluviais e canles dos ríos."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2342,7 +2327,6 @@ msgid "3D noise that determines number of dungeons per mapchunk."
 msgstr "Ruído 3D que determina a cantidade de calabozos por chunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2355,15 +2339,14 @@ msgid ""
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
 "Soporte 3D.\n"
-"Modos admitidos actualmente:\n"
-"-    none: ningún efecto 3D.\n"
-"-    anaglyph: sistema de cor Ciano/Magenta (lentes 3D azul e vermelho).\n"
-"-    interlaced: sistema interlazado (lentes polarizadas).\n"
-"-    topbottom: divide a pantalla en dous: unha encima e a outra debaixo.\n"
-"-    sidebyside: divide a pantalla en dous: lado a lado.\n"
-" -   crossview: 3D de ollos cruzados.\n"
-" -   pageflip: quadbuffer basado en 3D.\n"
-"Ten en conta que o modo interlazado precisa que os sombreadores estean "
+"Soportado actualmente:\n"
+"-    none: sen saída 3D.\n"
+"-    anaglyph: 3D en cor ciano/maxenta.\n"
+"-    interlaced: soporte de pantalla polarizada baseada en liñas par/ímpar.\n"
+"-    topbottom: pantalla dividida superior/inferior.\n"
+"-    sidebyside: pantalla dividida lado a lado.\n"
+" -   crossview: 3D para ver cruzado\n"
+"Teña en conta que o modo entrelazado require cos sombreadores estean "
 "activados."
 
 #: src/settings_translation_file.cpp
@@ -2423,14 +2406,6 @@ msgstr "Rango de envío en obxetos activos"
 msgid "Adds particles when digging a node."
 msgstr "Añade partículas ao excavar un nó."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Axusta a configuración de ppp á túa pantalla (no X11/Android non) p. ex. "
-"para pantallas 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2448,7 +2423,7 @@ msgid ""
 msgstr ""
 "Axusta a densidade da capa flotante.\n"
 "Aumentar o valor para aumentar a densidade. Pode ser positivo ou negativo.\n"
-"Valor = 0,0: o 50 % do volume é terreo flotante.\n"
+"Valor = 0,0: o 50% o do volume é terreo flotante.\n"
 "Valor = 2.0 (pode ser maior dependendo de 'mgv7_np_floatland', probar\n"
 "para estar seguro) crea una capa sólida de terreo flotante."
 
@@ -2460,6 +2435,10 @@ msgstr "Nome de administrador"
 msgid "Advanced"
 msgstr "Avanzado"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Permite que os líquidos sexan translúcidos."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2500,14 +2479,12 @@ msgid "Announce to this serverlist."
 msgstr "Anuncar en esta lista de servidores."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Suavizado:"
+msgstr "Escala de Suavizado (anti-aliasing)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Suavizado:"
+msgstr "Método de suavizado (antialiasing)"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2521,6 +2498,25 @@ msgstr "Añadir nome do obxecto á descripción."
 msgid "Apple trees noise"
 msgstr "Ruído das maceiras"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Aplique tramado para reducir os artefactos de bandas de cor.\n"
+"O tramado aumenta significativamente o tamaño da compresión sen perdas\n"
+"das capturas de pantalla e funciona incorrectamente se a pantalla ou o "
+"sistema operativo\n"
+"realiza un tramado adicional ou se as canles de cor non están cuantificadas\n"
+"a 8 bits.\n"
+"Con OpenGL ES, o tramado só funciona se o sombreador admite alta\n"
+"precisión de punto flotante e pode ter un maior impacto no rendemento."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inercia do brazo"
@@ -2544,24 +2540,39 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
-"A esta distancia, o servidor optimizará de forma agresiva a que bloques se "
+"A esta distancia, o servidor optimizará de forma agresiva que bloques se "
 "envían\n"
-"clientes.\n"
-"Os valores pequenos poden mellorar moito o rendemento, a costa de\n"
-"fallos visibles de renderizado (algúns bloques non se mostrarán baixo a auga "
-"nin nas covas,\n"
-"así como ás veces en chán).\n"
-"Establecer isto nun valor maior que \"max_block_send_distance\" desactiva "
-"isto\n"
+"aos clientes.\n"
+"Os valores pequenos poden mellorar moito o rendemento, a expensas de fallos "
+"visibles\n"
+"na renderización (algúns bloques poden non renderizarse correctamente nas "
+"covas).\n"
+"Establecer isto nun valor maior que max_block_send_distance desactiva esta\n"
 "optimización.\n"
-"Indicado en bloques de mapas (16 nós)."
+"Indicado en MapBlocks (16 nodos)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"A esta distancia o servidor realizará unha comprobación de oclusión máis "
+"sinxela e económica.\n"
+"Valores máis pequenos poden mellorar o rendemento, a costa de fallos de\n"
+"renderización visibles temporalmente (bloques que faltan).\n"
+"Isto é especialmente útil para un rango de visualización moi grande (máis de "
+"500).\n"
+"Expresado en MapBlocks (16 nodos)."
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
@@ -2592,9 +2603,8 @@ msgid "Base terrain height."
 msgstr "Altura base do terreo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "Tamaño mínimo de textura"
+msgstr "Tamaño da textura base"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2617,38 +2627,40 @@ msgid "Bind address"
 msgstr "Vincular enderezo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "Biomas"
+msgstr "API de bioma"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Ruído de bioma"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Distancia de optimización da eliminación de bloques"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distancia de optimización do envío de bloques"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr ""
+msgstr "Resplandor"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
-msgstr ""
+msgstr "Intensidade do resplandor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bloom Radius"
-msgstr "Radio de nubes"
+msgstr "Radio de Resplandor (Bloom)"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
-msgstr ""
+msgstr "Factor de intensidade do resplandor"
 
 #: src/settings_translation_file.cpp
 msgid "Bobbing"
-msgstr ""
+msgstr "Balanceo"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
@@ -2792,7 +2804,7 @@ msgstr "Cliente"
 
 #: src/settings_translation_file.cpp
 msgid "Client Mesh Chunksize"
-msgstr ""
+msgstr "Tamaño dos fragmentos da malla do cliente"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -2807,14 +2819,12 @@ msgid "Client side modding restrictions"
 msgstr "Restricións para modear no lado do cliente"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side Modding"
-msgstr "Personalización do cliente"
+msgstr "Modificación do lado do cliente"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side node lookup range restriction"
-msgstr "Restrición do rango de busca do nodo do lado do cliente"
+msgstr "Restricción do rango de busca de nodos do lado do cliente"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -2829,7 +2839,6 @@ msgid "Clouds"
 msgstr "Nubes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
 msgstr "As nubes son un efecto do lado do cliente."
 
@@ -2845,6 +2854,14 @@ msgstr "Néboa colorida"
 msgid "Colored shadows"
 msgstr "Sombras coloridas"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Lista separada por comas de extensións AL e ALC que non deben usarse.\n"
+"Útil para probas. Vexa al_extensions.[h,cpp] para máis detalles."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2931,9 +2948,8 @@ msgid "Console height"
 msgstr "Altura da consola"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Content Repository"
-msgstr "Contido do repositorio en liña"
+msgstr "Repositorio de contidos"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
@@ -2962,6 +2978,8 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"Controla a velocidade de afundimento no líquido cando estás inactivo\n"
+"Valores negativos farán que subas en vez de baixar."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -3009,10 +3027,6 @@ msgstr ""
 "Cor da cruz (R, G, B)\n"
 "Tamén pasa o mesmo coa cruz do obxecto"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Límite do tamaño do ficheiro de información de depuración"
@@ -3034,11 +3048,12 @@ msgid "Default acceleration"
 msgstr "Aceleración por defecto"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Default maximum number of forceloaded mapblocks.\n"
 "Set this to -1 to disable the limit."
-msgstr "Número máximo de bloques de mapa cargados de maneira forzada."
+msgstr ""
+"Número máximo predeterminado de bloques de mapa cargados forzadamente.\n"
+"Establece en -1 para desactivar o límite."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
@@ -3066,6 +3081,29 @@ msgstr ""
 "Isto simula un efecto de sombras suaves aplicando un PCF ou Poisson disk\n"
 "pero tamén consume máis recursos."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Define os clientes máis antigos aos que se permite conectarse.\n"
+"Os clientes máis antigos son compatibles no sentido de que non fallarán ao "
+"conectarse\n"
+"a novos servidores, pero é posible que non admitan todas as novas "
+"características que esperas.\n"
+"Isto permite un control máis detallado que a verificación estrita da versión "
+"do protocolo.\n"
+"Minetest segue aplicando o seu propio mínimo interno, e habilitar a\n"
+"verificación estrita da versión do protocolo sobreporá efectivamente esta "
+"configuración."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Define as áreas onde as árbores teñen mazás."
@@ -3094,6 +3132,9 @@ msgid ""
 "Smaller values make bloom more subtle\n"
 "Range: from 0.01 to 1.0, default: 0.05"
 msgstr ""
+"Define a cantidade de resplandor que se aplica á imaxe renderizada\n"
+"Os valores máis pequenos fan que o resplandor sexa máis sutil\n"
+"Rango: de 0,01 a 1,0, por defecto: 0,05"
 
 #: src/settings_translation_file.cpp
 msgid "Defines large-scale river channel structure."
@@ -3116,6 +3157,8 @@ msgid ""
 "Defines the magnitude of bloom overexposure.\n"
 "Range: from 0.1 to 10.0, default: 1.0"
 msgstr ""
+"Define a magnitude da sobreexposición do resplandor.\n"
+"Rango: de 0,1 a 10,0, valor predeterminado: 1,0"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -3129,6 +3172,9 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"Define o tamaño da grella de mostraxe para os métodos de antialiás FSAA e "
+"SSAA.\n"
+"Un valor de 2 significa tomar 2x2 = 4 mostras."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3221,6 +3267,10 @@ msgid ""
 "Distance in nodes at which transparency depth sorting is enabled\n"
 "Use this to limit the performance impact of transparency depth sorting"
 msgstr ""
+"Distancia en nodos á que se habilita a ordenación de profundidade de "
+"transparencia\n"
+"Usa isto para limitar o impacto no rendemento da ordenación de profundidade "
+"de transparencia"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
@@ -3252,16 +3302,19 @@ msgstr "Sonido de calabozos"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Automatic Exposure"
-msgstr ""
+msgstr "Activar a exposición automática"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable Bloom"
-msgstr "Activar todo"
+msgstr "Activar o Resplandor"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom Debug"
-msgstr ""
+msgstr "Activar depuración do resplandor"
+
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Habilitar a eliminación de bandas"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3289,9 +3342,13 @@ msgstr ""
 "Utiliza o \"poisson disk\" para proxectar sombras suaves cando o valor sexa "
 "verdadero. Senón, utiliza o filtrado PCF."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Habilitar o postprocesado"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
-msgstr ""
+msgstr "Habilitar a eliminación por rastrexo de raios"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3300,6 +3357,10 @@ msgid ""
 "automatically adjust to the brightness of the scene,\n"
 "simulating the behavior of human eye."
 msgstr ""
+"Activar corrección automática da exposición\n"
+"Cando se activa, o motor de post-procesado axustará\n"
+"automaticamente á luminosidade da escena,\n"
+"simulando o comportamento do ollo humano."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3321,6 +3382,7 @@ msgstr "Activar joysticks"
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks. Requires a restart to take effect"
 msgstr ""
+"Activar pancas de xogo (joysticks). Require un reinicio para facer efecto"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
@@ -3333,6 +3395,12 @@ msgstr "Activar seguridade dos mods"
 #: src/settings_translation_file.cpp
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
+"Activar a roda do rato (scroll) para a selección de elementos na barra de "
+"acceso rápido."
+
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Habilitar a carga aleatoria de mods (principalmente usado para probas)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3348,7 +3416,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable split login/register"
-msgstr ""
+msgstr "Activar o inicio de sesión/rexistro dividido"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3363,6 +3431,10 @@ msgstr ""
 "a novos servidores, pero é posible que non sexan compatibles todas as "
 "funcións novas que esperan."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Habilitar a pantalla táctil"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3375,14 +3447,6 @@ msgstr ""
 "exemplo, texturas)\n"
 "ao conectarse ao servidor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Activar os objectos buffer de vértice.\n"
-"Isto debería mellorar muito o rendimento gráfico."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3421,6 +3485,22 @@ msgstr "Activa a animación de obxetos no inventario."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Activa o rexistro de mallas xiradas."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+"Habilita a depuración e a verificación de erros no controlador de OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Habilita o pipeline de postprocesado."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Habilita o modo de pantalla táctil, permitindo xogar ao xogo cunha pantalla "
+"táctil."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3431,9 +3511,8 @@ msgstr ""
 "a costa de pequenos falllos visuais que non afectan á hora de xogar."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine Profiler"
-msgstr "Perfil do motor do xogo"
+msgstr "Perfilador do Motor"
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -3444,7 +3523,6 @@ msgid "Entity methods"
 msgstr "Métodos de entidade"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Exponent of the floatland tapering. Alters the tapering behavior.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
@@ -3453,18 +3531,20 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
-"Expoñente do estreitamento da terreo flotante. Altera este comportamento.\n"
-"O valor = 1,0 crea un estrechamento uniforme e lineal.\n"
-"Os valores > 1.0 crean un afilamento suave adecuado para a separación "
-"predeterminada\n"
-"cháns flotantes.\n"
-"Os valores < 1,0 (por exemplo 0,25) crean un nivel de superficie máis "
-"definido con\n"
-"cháns baixas máis planas, adecuadas para unha capa sólida de terreo flotante."
+"Expoñente da redución das terras flotantes. Modifica o comportamento da "
+"redución.\n"
+"Valor = 1.0 crea unha redución uniforme e linear.\n"
+"Valores > 1.0 crean unha redución suave axeitada para as terras flotantes "
+"separadas\n"
+"por defecto.\n"
+"Valores < 1.0 (por exemplo 0.25) crean un nivel de superficie máis definido "
+"con\n"
+"terras baixas máis planas, axeitado para unha capa sólida de terras "
+"flotantes."
 
 #: src/settings_translation_file.cpp
 msgid "Exposure compensation"
-msgstr ""
+msgstr "Compensación de exposición"
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
@@ -3525,9 +3605,8 @@ msgid "Filmic tone mapping"
 msgstr "Mapa de tons fílmico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering and Antialiasing"
-msgstr "Suavizado:"
+msgstr "Filtrado e suavizado (Antialiasing)"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3547,14 +3626,13 @@ msgid "Fixed virtual joystick"
 msgstr "Joystick virtual fixo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
-"(Android) Corrixe a posición do joystick virtual.\n"
-"Se está desactivado, o joystick virtual centrarase na posición do primeiro "
-"toque."
+"Corrixe a posición da panca de xogos ( joystick) virtual.\n"
+"Se está desactivado, a panca de xogos virtual centrarase na posición do "
+"primeiro toque."
 
 #: src/settings_translation_file.cpp
 msgid "Floatland density"
@@ -3593,9 +3671,8 @@ msgid "Fog start"
 msgstr "Inicio de néboa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font"
-msgstr "Tamaño da fonte"
+msgstr "Fonte"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
@@ -3738,9 +3815,8 @@ msgid "Fullscreen mode."
 msgstr "Modo de pantalla completa."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
-msgstr "GUIs"
+msgstr "Interface gráfica do usuario (GUI)"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -3823,9 +3899,8 @@ msgid "HUD"
 msgstr "HUD"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HUD scaling"
-msgstr "Escala de IGU"
+msgstr "Escalado do HUD"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3863,11 +3938,8 @@ msgid "Heat noise"
 msgstr "Ruído da calor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
-msgstr ""
-"Componente de altura do tamaño inicial xanela inicial. Ignórase en pantalla "
-"completa."
+msgstr "Componente de altura do tamaño inicial da xanela."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -3931,42 +4003,42 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Enable mouse wheel for selection"
-msgstr ""
+msgstr "Barra acceso rápido: Activar a roda do rato para a selección"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Invert mouse wheel direction"
-msgstr ""
+msgstr "Barra acceso rápido: inverte a dirección da roda do rato"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
 msgstr "Profundidade dos ríos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
-"Velocidade das ondas dos líquidos. Máis alto = máis rápido.\n"
-"Se o valor é negativo, as ondas moveranse cara atrás.\n"
-"É necesario activar a ondulación dos líquidos."
+"A que velocidade se moverán as ondas líquidas. Maior = máis rápido.\n"
+"Se é negativo, as ondas líquidas moveranse cara atrás."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How long the server will wait before unloading unused mapblocks, stated in "
 "seconds.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
-"Tempo de espera do servidor en eliminar bloques non utilizados.\n"
-"Canta maior resolución maior fluidez, aínda que consume máis memoria RAM."
+"Tempo que o servidor esperará antes de descargar os bloques de mapa non "
+"utilizados, expresado en segundos.\n"
+"Un valor máis alto proporciona un funcionamento máis suave, pero utilizará "
+"máis memoria RAM."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How much you are slowed down when moving inside a liquid.\n"
 "Decrease this to increase liquid resistance to movement."
-msgstr "Diminúe isto para aumentar a resistencia do líquido ao movemento."
+msgstr ""
+"Canto se retarda o movemento dentro dun líquido.\n"
+"Reduza isto para aumentar a resistencia ao movemento no líquido."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers."
@@ -4051,39 +4123,35 @@ msgstr ""
 "Actívao só se sabes o que fas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, players cannot join without a password or change theirs to an "
 "empty password."
 msgstr ""
-"Se está activado, os novos xogadores non poderán unirse con contrasinais "
-"baleiros."
+"Se está habilitado, os xogadores non poden unirse sen un contrasinal ou "
+"cambiar o seu contrasinal a un contrasinal baleiro."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, the server will perform map block occlusion culling based on\n"
 "on the eye position of the player. This can reduce the number of blocks\n"
 "sent to the client by 50-80%. Clients will no longer receive most\n"
 "invisible blocks, so that the utility of noclip mode is reduced."
 msgstr ""
-"Se está activado, o servidor realizará a eliminación de oclusión de bloques "
-"de mapa baseándose\n"
+"Se activado, o servidor realizará ocultación de bloques do mapa baseada na\n"
 "na posición dos ollos do xogador. Isto pode reducir o número de bloques\n"
-"enviado ao cliente entre un 50 % e un 80 %. O cliente xa non recibirá o máis "
-"invisible,\n"
-"de xeito que se reduce a utilidade do modo espectador."
+"enviados ao cliente en un 50-80%. Os clientes deixarán de recibir a maioría "
+"\n"
+"dos bloques invisibles, reducindo a utilidade do modo noclip."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place nodes at the position (feet + eye level) where you "
 "stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
-"Se está activado, pode colocar bloques na posición (pés + nivel dos ollos) "
-"onde está.\n"
-"Isto é útil cando se traballa con caixas de nós en áreas pequenas."
+"Se habilitado, podes colocar nodos na posición (altura dos pés + altura "
+"ocular) onde estás.\n"
+"Isto é útil cando traballas con caixas de nodos en áreas pequenas."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4186,9 +4254,8 @@ msgstr ""
 "Intervalo para gardado de cambios importantes no mundo, indicado en segundos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Interval of sending time of day to clients, stated in seconds."
-msgstr "Intervalo de envío da hora do dia aos clientes."
+msgstr "Intervalo de envío da hora do día aos clientes, expresado en segundos."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
@@ -4201,6 +4268,8 @@ msgstr "Inverter rato"
 #: src/settings_translation_file.cpp
 msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
 msgstr ""
+"Inverter a dirección da roda do rato (scroll) para a selección de elementos "
+"na barra de acceso rápido."
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -4342,7 +4411,7 @@ msgstr "Límite de lagos no mapa"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr "Idiomas"
+msgstr "Lingua"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
@@ -4373,46 +4442,48 @@ msgid ""
 msgstr ""
 "Apariencia das follas:\n"
 "-   Detalladas: todas as caras son visibles\n"
-"-   Simples: só vense as caras externas, se se utilizan special_tiles "
+"-   Simples: só vense as caras externas, cando se utilizan special_tiles "
 "definidos\n"
 "-   Opacas: desactiva a transparencia"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Duración do tick do servidor e o intervalo no que os obxetos actualízanse "
-"polo xeral\n"
-"na rede."
+"Duración dun tick de servidor (o intervalo no que xeralmente se actualiza "
+"todo),\n"
+"indicado en segundos.\n"
+"Non se aplica ás sesións aloxadas desde o menú do cliente."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Velocidade de movemento das ondas dos líquidos"
+msgstr "Lonxitude das ondas líquidas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between Active Block Modifier (ABM) execution cycles, stated "
 "in seconds."
-msgstr "Periodo de tempo entre os ciclos de execución dos ABM"
+msgstr ""
+"Duración do tempo entre ciclos de execución de modificadores de bloque "
+"activos (ABM), expresado en segundos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between NodeTimer execution cycles, stated in seconds."
-msgstr "Periodo de tempo entre os ciclos de execución de NodeTimer"
+msgstr ""
+"Duración do tempo entre ciclos de execución de NodeTimer, expresado en "
+"segundos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between active block management cycles, stated in seconds."
-msgstr "Periodo de tempo entre os ciclos de xestión de bloques activos"
+msgstr ""
+"Duración do tempo entre ciclos de xestión activa de bloques, expresado en "
+"segundos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Level of logging to be written to debug.txt:\n"
 "-    <nothing> (no logging)\n"
@@ -4424,14 +4495,15 @@ msgid ""
 "-    verbose\n"
 "-    trace"
 msgstr ""
-"Nivel de rexistro que se gardará en debug.txt:\n"
-"-    <nothing> (sen rexistro)\n"
-"-    none (mensaxes sen nivel)\n"
-"-    error\n"
-"-    warning\n"
-"-    action\n"
-"-    info\n"
-"-    verbose"
+"Nivel de rexistro que se escribirá en debug.txt:\n"
+"-    <nada> (sen rexistro)\n"
+"-    ningún (mensaxes sen nivel)\n"
+"-    erro\n"
+"-   aviso\n"
+"-    acción\n"
+"-    información\n"
+"-    detallado\n"
+"-    traza"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
@@ -4458,9 +4530,8 @@ msgid "Light curve low gradient"
 msgstr "Gradiente baixo da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lighting"
-msgstr "Iluminación suave"
+msgstr "Iluminación"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4481,11 +4552,11 @@ msgid ""
 "Only has an effect if compiled with cURL."
 msgstr ""
 "Limita o número de solicitudes paralelas HTTP. Afecta:\n"
-"- Recuperación de medios se o servidor usa a configuración "
-"\"remote_media\".\n"
+"- Recuperación de medios se o servidor usa a configuración \"remote_media\"."
+"\n"
 "- Descarga da lista de servidores e anuncio do servidor.\n"
 "- Descargas realizadas polo menú principal (por exemplo, xestor de mods).\n"
-"Só ten efecto se se compila con cURL."
+"Só ten efecto cando se compila con cURL."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
@@ -4539,6 +4610,9 @@ msgid ""
 "from the bright objects.\n"
 "Range: from 0.1 to 8, default: 1"
 msgstr ""
+"Valor lóxico que controla ata onde se espalla o efecto de resplandor\n"
+"desde os obxectos brillantes. \n"
+"Rango: de 0.1 a 8, predeterminado: 1"
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of dungeons."
@@ -4559,10 +4633,6 @@ msgstr ""
 "Facer que as cores da néboa e do ceo dependan do día (amencer/posta de sol) "
 "e da dirección da vista."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Fai que todos os líquidos sexan opacos"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Nivel de compresión do mapa para almacenamiento de disco"
@@ -4624,13 +4694,17 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"Atributos de xeración de mundos específicos do xerador de mundos v6.\n"
-"O marcador \"snowbiomes\" activa o novo sistema de 5 biomas.\n"
-"Cando o marcador \"snowbiomes\" está activado, as selvas están habilitadas "
+"Atributos de xeración de mapas específicos de Mapgen v6.\n"
+"A bandeira \"snowbiomes\" activa o novo sistema de 5 biomas.\n"
+"Cando a bandeira 'snowbiomes' está activada, as xunglas están habilitadas "
 "automaticamente e\n"
-"o marcador \"selvas\" é ignorado."
+"a bandeira \"xunglas\" é ignorada.\n"
+"A bandeira \"templos\" desactiva a xeración de templos no deserto. No seu "
+"lugar aparecerán os alxubes normais."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4665,15 +4739,8 @@ msgid "Mapblock mesh generation delay"
 msgstr "Retraso da xeración da malla do mapa de bloques"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generation threads"
-msgstr "Retraso da xeración da malla do mapa de bloques"
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-"Tamaño da caché do mapa de bloques do xerador da malla do mapa de bloques en "
-"MB"
+msgstr "Fíos de xeración da malla do bloque de mapa"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
@@ -4858,8 +4925,8 @@ msgid ""
 msgstr ""
 "Número máximo de paquetes enviados por etapa de envío. Se tes unha conexión "
 "lenta\n"
-"intenta reducilo, pero non ata un número inferior ao dobre do que ten por "
-"obxectivo o cliente."
+"intenta reducilo, pero non ata un número inferior ao dobre do\n"
+"que ten por obxectivo o cliente."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can be connected simultaneously."
@@ -4891,18 +4958,16 @@ msgid "Maximum simultaneous block sends per client"
 msgstr "Número máximo de envíos de bloques simultáneos por cliente"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum size of the outgoing chat queue"
-msgstr "Tamaño máximo da cola de saída do chat"
+msgstr "Tamaño máximo da cola de chat de saída"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum size of the outgoing chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
-"Tamaño máximo da fila de chat de saída.\n"
-"0 para desactivar a cola e -1 para que o tamaño da cola sexa ilimitado."
+"Tamaño máximo da cola de saída de chat.\n"
+"0 para desactivar a cola e -1 para facer que o tamaño da cola sexa ilimitado."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4948,6 +5013,10 @@ msgstr "Nivel mínimo de rexistro para escribir no chat."
 msgid "Minimap scan height"
 msgstr "Altura de escaneo do minimapa"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "Intervalo mínimo de repetición de escavación"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Ruído 3D que determina a cantidade de calabozos por chunk."
@@ -4958,16 +5027,15 @@ msgstr "Límite mínimo do número aleatorio de covas pequenas por chunk."
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr "Mapeado do relieve"
+msgstr "Mapeo de Mip"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscelánea"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Profiler"
-msgstr "Análise do mundo"
+msgstr "Perfilador de mods"
 
 #: src/settings_translation_file.cpp
 msgid "Mod Security"
@@ -5017,6 +5085,10 @@ msgstr "Sensibilidade do rato"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplicador da sensibilidade do rato."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Limiar de movemento"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Ruído do lodo"
@@ -5072,7 +5144,6 @@ msgstr ""
 "Este valor substituirase ao comezar desde o menú principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Networking"
 msgstr "Rede"
 
@@ -5081,9 +5152,8 @@ msgid "New users need to input this password."
 msgstr "Os novos usuarios deben introducir este contrasinal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Node and Entity Highlighting"
-msgstr "Resaltar nodos"
+msgstr "Destacado de nodos e entidades"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
@@ -5137,9 +5207,8 @@ msgstr ""
 "consumo de memoria (4096=100MB, como regra xeral)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
-msgstr "Cantidade de mensaxes que un xogador pode enviar en 10 segundos."
+msgstr "Cantidade de mensaxes que un xogador pode enviar por cada 10 segundos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5147,19 +5216,17 @@ msgid ""
 "Value of 0 (default) will let Minetest autodetect the number of available "
 "threads."
 msgstr ""
+"Número de fíos a usar para xeración de mallas.\n"
+"O valor 0 (predeterminado) permitirá a Minetest detectar automaticamente o "
+"número de fíos dispoñibles."
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr ""
+msgstr "Eliminador de oclusión"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Occlusion Culling"
-msgstr "Determinar bloques invisibles do lado do servidor"
-
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Líquidos opacos"
+msgstr "Eliminación de oclusión"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5178,6 +5245,10 @@ msgstr ""
 "unha especificación de formulario\n"
 "aberto."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "Depuración de OpenGL"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Substitución opcional da cor da ligazón web do chat."
@@ -5256,19 +5327,18 @@ msgstr "Filtrado de Poisson"
 
 #: src/settings_translation_file.cpp
 msgid "Post Processing"
-msgstr ""
+msgstr "Post-procesamento"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Prevent digging and placing from repeating when holding the respective "
 "buttons.\n"
 "Enable this when you dig or place too often by accident.\n"
 "On touchscreens, this only affects digging."
 msgstr ""
-"Evita que a acción de romper e colocar bloques se repitan cando se manteñen "
-"os botóns do rato.\n"
-"Activa isto se rompes ou colocas bloques por accidente moitas veces."
+"Prevén que cavar e colocar se repita ao manter os botóns respectivos.\n"
+"Actívalo cando cavas ou colocas con demasiada frecuencia por accidente.\n"
+"Nos dispositivos táctiles, só afecta á acción de cavar."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -5311,6 +5381,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proporción de covas grandes que conteñen líquido."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Versión mínima do protocolo"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "xesto de golpe"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5329,6 +5407,10 @@ msgstr "Eleva o terreo para facer vales arredor dos ríos."
 msgid "Random input"
 msgstr "Entrada aleatoria"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Orde de carga aleatoria de mods"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Mensaxes do chat recientes"
@@ -5338,9 +5420,8 @@ msgid "Regular font path"
 msgstr "Camiño da fonte regular"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Remember screen size"
-msgstr "Autogardar o tamaño da pantalla"
+msgstr "Lembrar o tamaño da pantalla"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -5376,13 +5457,13 @@ msgid ""
 "READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
 msgstr ""
 "Restrinxe o acceso de algunhas funcións do cliente en servidores.\n"
-"Combine isto de abaixo para restrinxir recursos aos clientes ou coloque 0 "
+"Combine isto de abaixo para restrinxir recursos aos clientes ou coloque 0\n"
 "para que non haxa restriccións:\n"
 "LOAD_CLIENT_MODS: 1 (desactiva a carga de mods no cliente)\n"
 "CHAT_MESSAGES: 2 (desactiva a chamada \"send_chat_message\" no cliente)\n"
 "READ_ITEMDEFS: 4 (desactiva a chamada \"get_item_def\" no cliente)\n"
 "READ_NODEDEFS: 8 (desactiva a chamada \"get_node_def\" no cliente)\n"
-"LOOKUP_NODES_LIMIT: 16 (desactiva a chamada \"get_node\" no cliente para "
+"LOOKUP_NODES_LIMIT: 16 (desactiva a chamada \"get_node\" no cliente para\n"
 "csm_restriction_noderange)\n"
 "READ_PLAYERINFO: 32 (desactiva a chamada \"get_player_names\" no cliente)"
 
@@ -5458,6 +5539,11 @@ msgid ""
 "is maximized is stored in window_maximized.\n"
 "(Autosaving window_maximized only works if compiled with SDL.)"
 msgstr ""
+"Garda o tamaño da xanela automaticamente cando se modifique.\n"
+"Se está activado, o tamaño da pantalla gárdase en screen_w e screen_h, e se "
+"a xanela\n"
+"é maximizada gardarase en window_maximized.\n"
+"(O gardado automático window_maximized só funciona se foi compilado con SDL.)"
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
@@ -5538,8 +5624,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5553,6 +5639,25 @@ msgid ""
 "Renders higher-resolution image of the scene, then scales down to reduce\n"
 "the aliasing effects. This is the slowest and the most accurate method."
 msgstr ""
+"Escolle o método de suavización para aplicar.\n"
+"\n"
+"* Ningún: non hai antialiasing (predeterminado)\n"
+"\n"
+"* FSAA: antialiasing de pantalla completa proporcionado por hardware\n"
+"(incompatible con posprocesamento e submostraxe)\n"
+"A.K.A antialiasing de varias mostras (MSAA)\n"
+"Suaviza os bordos do bloque pero non afecta o interior das texturas.\n"
+"É necesario reiniciar para cambiar esta opción.\n"
+"\n"
+"* FXAA - Antialiasing aproximado rápido (require sombreadores)\n"
+"Aplica un filtro de posprocesamento para detectar e suavizar os bordos de "
+"alto contraste.\n"
+"Ofrece equilibrio entre velocidade e calidade de imaxe.\n"
+"\n"
+"* SSAA - Antialiasing de supermostraxe (require sombreadores)\n"
+"Mostra a imaxe de maior resolución da escena e, a continuación, redúcese "
+"para reducir\n"
+"os efectos de aliasing. Este é o método máis lento e preciso."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5597,7 +5702,7 @@ msgstr ""
 "6 = Conxunto 4D de Julia \"Mandy Cousin\".\n"
 "7 = Conxunto 4D de Mandelbrot \"Variation\".\n"
 "8 = Conxunto 4D de Julia \"Variation\".\n"
-"9 = Conxunto 4D de Mandelbrot \"Mandelbrot/Mandelbar\".\n"
+"9 = Conxunto 4D de Mandelbrot/Mandelbar\" Mandelbrot \".\n"
 "10 = Conxunto 3D de Julia \"Mandelbrot/Mandelbar”.\n"
 "11 = Conxunto 3D de Mandelbrot \"Christmas Tree\".\n"
 "12 = Conxunto 3D de Julia \"Christmas Tree\".\n"
@@ -5609,14 +5714,12 @@ msgstr ""
 "18 = Conxunto 3D de Julia \"Mandelbulb\"."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server"
-msgstr "URL do servidor"
+msgstr "Servidor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server Gameplay"
-msgstr "Nome do servidor"
+msgstr "Xogo do servidor"
 
 #: src/settings_translation_file.cpp
 msgid "Server Security"
@@ -5643,9 +5746,8 @@ msgid "Server port"
 msgstr "Porto do servidor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server-side occlusion culling"
-msgstr "Determinar bloques invisibles do lado do servidor"
+msgstr "Ocultación de oclusión no lado do servidor"
 
 #: src/settings_translation_file.cpp
 msgid "Server/Env Performance"
@@ -5656,24 +5758,22 @@ msgid "Serverlist URL"
 msgstr "URL da lista de servidores"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist and MOTD"
-msgstr "URL da lista de servidores"
+msgstr "Lista de servidores e Mensaxe do Día (MOTD)"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
 msgstr "Ficheiro da lista de servidores"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the default tilt of Sun/Moon orbit in degrees.\n"
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
-"Establece a inclinación da órbita Sol/Lúa en graos.\n"
-"O valor de 0 é sen inclinación/órbita vertical.\n"
-"Valor mínimo: 0,0; valor máximo: 60,0"
+"Establecer a inclinación predeterminada da órbita do Sol/Lúa en graos.\n"
+"Os xogos poden cambiar a inclinación da órbita a través da API.\n"
+"Un valor de 0 significa sen inclinación / órbita vertical."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5681,80 +5781,77 @@ msgid ""
 "Value of 0.0 (default) means no exposure compensation.\n"
 "Range: from -1 to 1.0"
 msgstr ""
+"Axusta a compensación de exposición en unidades EV.\n"
+"O valor de 0.0 (predeterminado) significa que non hai compensación de "
+"exposición.\n"
+"Rango: de -1 a 1.0"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"Establece o idioma. Deixa o campo baleiro para usar o idioma do sistema.\n"
-"É necesario reiniciar despois de cambiar isto."
+"Establece o idioma. Por defecto, utilízase o idioma do sistema.\n"
+"É preciso reiniciar despois de cambiar isto."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the maximum length of a chat message (in characters) sent by clients."
 msgstr ""
-"Establece a lonxitude máxima de caracteres dunha mensaxe de chat enviada "
+"Establecer a lonxitude máxima dunha mensaxe de chat (en caracteres) enviada "
 "polos clientes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the shadow strength gamma.\n"
 "Adjusts the intensity of in-game dynamic shadows.\n"
 "Lower value means lighter shadows, higher value means darker shadows."
 msgstr ""
-"Establece a forza da sombra.\n"
-"Un valor máis baixo son sombras máis claras, un valor máis alto son sombras "
-"máis escuras."
+"Axusta a forza gamma da sombra.\n"
+"Axeita a intensidade das sombras dinámicas no xogo.\n"
+"Un valor menor implica sombras máis claras, mentres que un valor maior "
+"implica sombras máis escuras."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the soft shadow radius size.\n"
 "Lower values mean sharper shadows, bigger values mean softer shadows.\n"
 "Minimum value: 1.0; maximum value: 15.0"
 msgstr ""
-"Establece o tamaño do raio de sombras suaves.\n"
-"Os valores máis baixos son sombras máis nítidas, os valores maiores "
-"significan son máis suaves.\n"
-"Valor mínimo: 1,0; valor máximo: 10,0"
+"Establece o tamaño do radio das sombras suaves.\n"
+"Os valores máis baixos significan sombras máis nítidas, valores maiores "
+"significan sombras máis suaves.\n"
+"Valor mínimo: 1,0; valor máximo: 15,0"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable Shadow Mapping."
-msgstr ""
-"Establece o valor verdadeiro para activar o mapeado de sombras.\n"
-"É necesario que os sombreadores estean activados."
+msgstr "Pon a verdadeiro para activar o Mapeado de Sombras."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable bloom effect.\n"
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
+"Estableza a verdadeiro para activar o efecto de resplandor.\n"
+"As cores brillantes difundiranse sobre os obxectos veciños."
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+"Establece a verdadeiro para habilitar o efecto de iluminación volumétrica ("
+"alcume 'raios de Deus')."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving leaves."
-msgstr ""
-"Establece o valor verdadeiro para activar o movemento das follas.\n"
-"É necesario que os sombreadores estean activados."
+msgstr "Pon a verdadeiro para activar o movemento das follas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving liquids (like water)."
-msgstr ""
-"Establece o valor verdadeiro para activar o movemento dos líquidos (auga, "
-"por exemplo).\n"
-"É necesario que os sombreadores estean activados."
+msgstr "Pon a verdadeiro para activar o movemento dos líquidos (como a auga)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving plants."
-msgstr ""
-"Establece o valor verdadeiro para activar o movemento das plantas.\n"
-"É necesario que os sombreadores estean activados."
+msgstr "Pon a verdadeiro para activar o movemento das plantas."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5763,6 +5860,12 @@ msgid ""
 "top-left - processed base image, top-right - final image\n"
 "bottom-left - raw base image, bottom-right - bloom texture."
 msgstr ""
+"Establecer verdadeiro para renderizar a descomposición de depuración do "
+"efecto de resplandor.\n"
+"No modo de depuración, a pantalla divídese en 4 cuadrantes:\n"
+"arriba á esquerda - imaxe base procesada, arriba á dereita - imaxe final\n"
+"abaixo á esquerda - imaxe base en bruto, abaixo á dereita - textura de "
+"resplandor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5786,13 +5889,11 @@ msgstr "Sombreadores"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Os sombreadores permiten efectos visuais avanzados e poden aumentar o "
 "rendemento nalgunhas\n"
-"tarxetas de vídeo.\n"
-"Isto só funciona con o modo de vídeo OpenGL."
+"tarxetas gráficas."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5819,9 +5920,8 @@ msgstr ""
 "sombra."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow strength gamma"
-msgstr "Intensidade da sombra"
+msgstr "Factor de intensidade de sombra gamma"
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
@@ -5855,9 +5955,14 @@ msgid ""
 "draw calls, benefiting especially high-end GPUs.\n"
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
+"Longo do lado dun cubo de bloques de mapa co cliente considerará xuntos\n"
+"ao xerar as mallas.\n"
+"Valores maiores aumentan a utilización da GPU ao reducir o número de\n"
+"chamadas de debuxo, beneficiando especialmente as GPUs de alta gama.\n"
+"Sistemas con GPUs de baixo rendemento (ou sen GPU) beneficiarían de valores "
+"máis pequenos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
 "WARNING: There is no benefit, and there are several dangers, in\n"
@@ -5866,22 +5971,13 @@ msgid ""
 "Altering this value is for special usage, leaving it unchanged is\n"
 "recommended."
 msgstr ""
-"Tamaño dos chunks que creou o xerador de terreos, indicado en bloques (16 "
-"nós).\n"
-"AVISO!: Non hai ningún beneficio, e hai varios perigos, ao\n"
-"aumentar este valor por riba de 5.\n"
-"Reducir este valor aumenta a densidade de covas e calabozos.\n"
-"Modificar este valor é para uso especial. Recoméndase non modificalo."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Tamaño da caché do xerador de terreos do xerador de malla. Isto fai que\n"
-"aumentae o % de acertos da caché, reducindo os datos que se copian do fío\n"
-"principal, reducindo así a fluctuación."
+"Tamaño dos bloques de mapa (mapchunks) xerados polo xerador de mapas, "
+"expresado en bloques de mapa (16 nodos)\n"
+"AVISO: Non hai beneficio, e hai varios perigos, en\n"
+"aumentar este valor por enriba de 5.\n"
+"Reducir este valor aumenta a densidade de covas e alxubes.\n"
+"Modificar este valor é para uso especial; recoméndase\n"
+"deixalo sen cambios."
 
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
@@ -5918,18 +6014,20 @@ msgid "Smooth lighting"
 msgstr "Iluminación suave"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
-msgstr "Suaviza a rotación da cámara en modo cinemático. 0 para desactivar."
+"cinematic mode by using the key set in Controls."
+msgstr ""
+"Suaviza a rotación da cámara cando está en modo cinemático, 0 para "
+"desactivar. Entra no modo cinemático usando a tecla establecida en Controis."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
-msgstr "Suaviza a rotación da cámara en modo cinemático. 0 para desactivar."
+msgstr ""
+"Suaviza a rotación da cámara, tamén coñecido como suavizado de vista ou "
+"rato. 0 para desactivar."
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed"
@@ -5943,6 +6041,14 @@ msgstr "Velocidade ao se agachar, en nós por segundo."
 msgid "Soft shadow radius"
 msgstr "Radio das sombras suaves"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Son"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "Lista negra de extensións de son"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5967,7 +6073,6 @@ msgstr ""
 "que agrupar algúns (ou todos) os obxectos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread a complete update of shadow map over given number of frames.\n"
 "Higher values might make shadows laggy, lower values\n"
@@ -5976,8 +6081,8 @@ msgid ""
 msgstr ""
 "Distribuír unha actualización completa do mapa de sombras sobre unha "
 "determinada cantidade de fotogramas.\n"
-"Os valores máis altos poden facer que as sombras sexan latentes e os valores "
-"máis baixos\n"
+"Os valores máis altos poden facer cas sombras sexan lentas e os valores máis "
+"baixos\n"
 "consumirán máis recursos.\n"
 "Valor mínimo: 1; Valor máximo 16"
 
@@ -5992,7 +6097,6 @@ msgstr ""
 "A desviación estándar da curva de luz gaussiana aumenta."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Static spawn point"
 msgstr "Punto de aparición estático"
 
@@ -6031,7 +6135,6 @@ msgid "Strip color codes"
 msgstr "Eliminar códigos de cores"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Surface level of optional water placed on a solid floatland layer.\n"
 "Water is disabled by default and will only be placed if this value is set\n"
@@ -6046,9 +6149,9 @@ msgid ""
 msgstr ""
 "Nivel superficial de auga opcional colocado sobre unha capa sólida de terreo "
 "flotante.\n"
-"A auga está desactivada por defecto e só se colocará se se establece este "
-"valor\n"
-"arriba 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (o inicio do\n"
+"A auga está desactivada por defecto e só se colocará se este valor está por "
+"enriba\n"
+"de 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (o inicio do\n"
 "afilamento superior).\n"
 "***ADVERTENCIA, PERIGO POTENCIAL PARA OS MUNDOS E O RENDEMENTO DO "
 "SERVIDOR***:\n"
@@ -6057,9 +6160,9 @@ msgstr ""
 "para ser unha capa sólida configurando 'mgv7_floatland_density' en 2.0 (ou "
 "outro\n"
 "valor necesario en función de 'mgv7_np_floatland'), para evitar\n"
-"fluxo de auga extremo intensivo en servidores e evitar grandes inundacións "
-"do\n"
-"superficie do mundo abaixo."
+"un fluxo de auga extremo intensivo en servidores e evitar grandes "
+"inundacións da\n"
+"superficie do mundo por abaixo."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6159,25 +6262,53 @@ msgstr ""
 "ao chamar a `/profiler save [format]` sen formato."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"O retraso en milisegundos despois do cal unha interacción táctil se "
+"considera un toque prolongado."
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
-"O camiño do ficheiro relativa ao camiño do mundo no que se gardarán os "
-"perfís."
+"O camiño do ficheiro relativa ao camiño do mundo onde se gardarán os perfís."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"O xesto para golpear xogadores/entidades.\n"
+"Isto pode ser anulado por xogos e modificacións.\n"
+"\n"
+"* toque_curto\n"
+"Fácil de usar e coñecido doutros xogos que non deben ser nomeados.\n"
+"\n"
+"* toque_longo\n"
+"Coñecido polos controis móbiles clásicos de Minetest.\n"
+"O combate é máis ou menos imposible."
 
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "O identificador do joystick que se vai utilizar"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
-"A lonxitude en píxeles que tarda en iniciar a interacción da pantalla táctil."
+"A lonxitude en píxeles despois da cal unha interacción táctil se considera "
+"movemento."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The maximum height of the surface of waving liquids.\n"
 "4.0 = Wave height is two nodes.\n"
@@ -6185,10 +6316,18 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 "Altura máxima da superficie de líquidos con ondas.\n"
-"4.0 = Altura da onda é dous nós.\n"
-"0.0 = A onda non se move.\n"
-"Por defecto é 1.0 (medio nó).\n"
-"É necesario activar os líquidos con ondas."
+"4.0 = A altura da onda é de dous nodos.\n"
+"0.0 = A onda non se move en absoluto.\n"
+"O valor por defecto é 1.0 (1/2 nodo)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"O tempo mínimo en segundos que se necesita entre escavar nodos cando se "
+"mantén premido\n"
+"o botón de escavación."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -6221,20 +6360,16 @@ msgstr ""
 "Isto debería configurarse xunto con active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
-"O motor de renderizado.\n"
-"É necesario un reinicio logo de cambiar isto.\n"
-"Nota: en Android, segue con OGLES1 se non está seguro. A aplicación pode non "
-"iniciarse doutro xeito.\n"
-"Noutras plataformas recoméndase OpenGL.\n"
-"Os sombreadores son compatibles con OpenGL (só para escritorio) e OGLES2 "
-"(experimental)"
+"O backend de renderizado.\n"
+"Nota: É preciso reiniciar despois de cambiar isto!\n"
+"OpenGL é o predeterminado para escritorio, e OGLES2 para Android.\n"
+"Os sombreadores son compatibles con todo menos con OGLES1."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6300,21 +6435,25 @@ msgid "The type of joystick"
 msgstr "O tipo de joystick"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
-"A distancia vertical sobre a que a calor cae 20 se é 'altitude_chill'\n"
-"activado. Tamén a distancia vertical na que a humidade cae 10 se\n"
-"'altitude_dry' está activado."
+"A distancia vertical sobre a cal a temperatura cae en 20 se 'altitude_chill' "
+"está\n"
+"habilitado. Tamén a distancia vertical sobre a cal a humidade cae en 10 se\n"
+"'altitude_dry' está habilitado."
 
 #: src/settings_translation_file.cpp
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Terceiro de 4 ruídos 2D que xuntos definen a altura de outeiros/montañas."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Limiar para golpes longos"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6336,11 +6475,10 @@ msgid "Time speed"
 msgstr "Velocidade do tempo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Timeout for client to remove unused map data from memory, in seconds."
 msgstr ""
-"Tempo de espera para que o cliente elimine os datos do mapa non utilizados "
-"da memoria."
+"Tempo limite para que o cliente elimine os datos do mapa non utilizados da "
+"memoria, en segundos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6359,32 +6497,28 @@ msgid "Tooltip delay"
 msgstr "Atraso da información sobre ferramentas"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen"
-msgstr "Límite da pantalla táctil"
+msgstr "Pantalla táctil"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "Sensibilidade do rato"
+msgstr "Sensibilidade da pantalla táctil"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "Multiplicador da sensibilidade do rato."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Límite da pantalla táctil"
+msgstr "Multiplicador de sensibilidade da pantalla táctil."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Compensacións para o rendemento"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Líquidos translúcidos"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
-msgstr ""
+msgstr "Distancia de ordenación de transparencias"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
@@ -6417,11 +6551,23 @@ msgid ""
 "\n"
 "This setting should only be changed if you have performance problems."
 msgstr ""
+"Tipo de eliminador de ocultación\n"
+"\n"
+"\"loops\" é o algoritmo legado con bucles anidados e complexidade O(n³)\n"
+"\"bfs\" é o novo algoritmo baseado en busca en anchura (breadth-first-search)"
+" e eliminación de caras laterais.\n"
+"\n"
+"Esta configuración só debe ser cambiada se tes problemas de rendemento."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
+"Enderezo para ficheiro JSON que proporciona información sobre a versión máis "
+"recente de Minetest\n"
+"Se está baleiro, o motor nunca buscará actualizacións."
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6456,7 +6602,7 @@ msgstr "Eliminar datos do servidor non utilizados"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "Enderezo de información de actualización"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
@@ -6475,36 +6621,35 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "Usa unha animación de nube para o fondo do menú principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when looking at textures from an angle."
-msgstr "Usa o filtro anisótropo ao ver texturas desde un ángulo."
+msgstr "Usar filtrado anisotrópico ao observar texturas desde un ángulo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Usa o filtro trilineal ao escalar texturas."
+msgstr "Usar filtrado bilineal ao escalar texturas."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "Usar retículo para pantalla táctil"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
+"Usar retículo para seleccionar obxectos en vez de toda a pantalla.\n"
+"Se está activado, mostrarase un retículo que se utilizará para seleccionar "
+"obxectos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Usa o mipmapping para escalar texturas. Pode aumentar lixeiramente o "
-"rendemento,\n"
-"sobre todo cando se usa un paquete de texturas de alta resolución.\n"
-"Non se admite a redución de escala correcta gamma."
+"Usar mipmaps ao escalar texturas. Pode aumentar lixeramente o rendemento,\n"
+"especialmente cando se usa un paquete de texturas de alta resolución.\n"
+"O escalado correcto de gamma non está soportado."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6512,6 +6657,9 @@ msgid ""
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
+"Usar eliminación de ocultación por raios no novo eliminador.\n"
+"Esta bandeira permite o uso de proba de eliminación de ocultación por raios\n"
+"para tamaños de malla do cliente menores de 4x4x4 bloques de mapa."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6519,29 +6667,27 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"Usar filtrado trilineal ao escalar texturas.\n"
+"Se están activados tanto o filtrado bilineal como o filtrado trilineal,\n"
+"aplicarase o filtrado trilineal.."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use virtual joystick to trigger \"Aux1\" button.\n"
 "If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
 "circle."
 msgstr ""
-"(Android) Use o joystick virtual para activar o botón \"Aux1\".\n"
-"Se está activado, o joystick virtual tamén tocará o botón \"Aux1\" cando "
-"estea fóra do círculo principal."
+"Usar a panca de xogos ( joystick) virtual para activar o botón \"Aux1\".\n"
+"Se está activado, a panca de xogos virtual tamén tocará o botón \"Aux1\" "
+"cando estea fóra do círculo principal."
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
 msgstr "Interfaces de usuario"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
-msgstr "Sincronizaión vertical"
+msgstr "Sincronización vertical"
 
 #: src/settings_translation_file.cpp
 msgid "Valley depth"
@@ -6605,6 +6751,8 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
+"Sincronización vertical da pantalla. O teu sistema pode forzar a "
+"sincronización vertical aínda que isto estea desactivado."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6630,6 +6778,10 @@ msgstr "O joystick virtual activa o botón Aux1"
 msgid "Volume"
 msgstr "Volume"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Multiplicador de volume cando a xanela non está en foco."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6638,6 +6790,14 @@ msgstr ""
 "Todos os sons.\n"
 "É necesario que o son do sistema estea activado."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "Volume en segundo plano"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "Iluminación volumétrica"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6777,7 +6937,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "Se a xanela está maximizada."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6813,11 +6973,8 @@ msgstr ""
 "mesmo)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
-msgstr ""
-"Componente de largura do tamaño inicial da xanela. Ignórase en pantalla "
-"completa."
+msgstr "Componente de anchura do tamaño inicial da xanela."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
@@ -6825,7 +6982,7 @@ msgstr "Largura das liñas do bloque de selección arredor dos nós."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Xanela maximizada"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6945,6 +7102,12 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(soporte de xogo requirido)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Enderezo: "
+
+#~ msgid "- Port: "
+#~ msgstr "- Porto: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6973,6 +7136,13 @@ msgstr "Límite paralelo de cURL"
 #~ "Teña en conta que o campo de enderezo do menú principal anula esta "
 #~ "configuración."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Axusta a configuración de ppp á túa pantalla (no X11/Android non) p. ex. "
+#~ "para pantallas 4K."
+
 #~ msgid "All Settings"
 #~ msgstr "Toda a configuración"
 
@@ -6998,6 +7168,9 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Biome API noise parameters"
 #~ msgstr "Parámetros de ruído de humidade e temperatura da API de bioma"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Límites de bloque mostrados para todos os bloques"
+
 #~ msgid ""
 #~ "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 #~ "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -7013,6 +7186,9 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Alt. actualización de cámara"
 
+#~ msgid "Change Keys"
+#~ msgstr "Configurar teclas"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Configurar teclas"
@@ -7054,9 +7230,44 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Controla a velocidade de afundimento en líquidos."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controis:\n"
+#~ "- %s: ir cara adiante\n"
+#~ "- %s: ir cara atrás\n"
+#~ "- %s: ir cara esquerda\n"
+#~ "- %s: ir cara dereita\n"
+#~ "- %s: saltar/escalar\n"
+#~ "- %s: romper bloque/golpear\n"
+#~ "- %s: colocar/usar\n"
+#~ "- %s: agacharse/abaxaise\n"
+#~ "- %s: soltar obxecto\n"
+#~ "- %s: inventario\n"
+#~ "- Rato: virarse/ver\n"
+#~ "- Roda do rato: seleccionar obxecto\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Creativo"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Dano"
 
@@ -7109,6 +7320,13 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Activar confirmación de rexistro"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Activar os objectos buffer de vértice.\n"
+#~ "Isto debería mellorar muito o rendimento gráfico."
+
 #~ msgid "Enabled"
 #~ msgstr "Activado"
 
@@ -7335,6 +7553,9 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentación"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Especificación do xogo non válida."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tecla de inventario"
 
@@ -8011,6 +8232,14 @@ msgstr "Límite paralelo de cURL"
 #~ "Lonxitude das ondas de líquidos.\n"
 #~ "É necesario que a ondulación dos líquidos estea activa."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Fai que todos os líquidos sexan opacos"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "Tamaño da caché do mapa de bloques do xerador da malla do mapa de bloques "
+#~ "en MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menús"
 
@@ -8148,15 +8377,22 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Follas simples"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Tamaño da caché do xerador de terreos do xerador de malla. Isto fai que\n"
+#~ "aumentae o % de acertos da caché, reducindo os datos que se copian do "
+#~ "fío\n"
+#~ "principal, reducindo así a fluctuación."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Iluminación suave"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Suaviza a rotación da cámara. 0 para desactivar."
 
-#~ msgid "Sound"
-#~ msgstr "Son"
-
 #~ msgid "Texture path"
 #~ msgstr "Camiño dos packs de textura"
 
@@ -8190,6 +8426,10 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Nivel de sensibilidade ao toque (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Límite da pantalla táctil"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtro trilineal"
 
@@ -8229,6 +8469,9 @@ msgstr "Límite paralelo de cURL"
 #~ "Se se establece en 0, MSAA está desactivado.\n"
 #~ "É necesario reiniciar logo de cambiar esta opción."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "Sincronización de pantalla vertical."
 
@@ -8283,8 +8526,14 @@ msgstr "Límite paralelo de cURL"
 #~ msgid "You died."
 #~ msgstr "Morreches"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Non tes xogos instalados."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/he/minetest.po b/po/he/minetest.po
index 1126b610f..d5b868d41 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hebrew (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2021-04-17 07:27+0000\n"
-"Last-Translator: Omer I.S. <omeritzicschwartz@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-05-04 14:07+0000\n"
+"Last-Translator: jhon game <jhongamepc2@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/minetest/minetest/"
 "he/>\n"
 "Language: he\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
 "n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 4.6-dev\n"
+"X-Generator: Weblate 5.5.3\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
-msgstr ""
+msgstr "נקה את תור הצ'אט"
 
 #: builtin/client/chatcommands.lua
 #, fuzzy
@@ -79,7 +79,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -88,13 +88,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "אישור"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -111,6 +107,10 @@ msgstr "אירעה שגיאה:"
 msgid "Main menu"
 msgstr "תפריט ראשי"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "אישור"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "התחברות מחדש"
@@ -139,19 +139,27 @@ msgstr "אנו תומכים רק בגירסה 1$ של הפרוטוקול."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "אנו תומכים בגרסאות בין 1$ ל-2$ של הפרוטוקול."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" כבר קיים. האם תרצה להחליף אותו?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "התלויות $1 ו $2 יותקנו."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "הורדת $1 נכשלה"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 ליד $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "הורדת $1 נכשלה"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "התקנה: סוג קובץ לא נתמך \"$1\" או שהארכיב פגום"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -159,158 +167,157 @@ msgstr ""
 "$1 מוריד,\n"
 "$2 ממתין"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 כעת בהורדה..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "לא ניתן למצוא תלות חובה של $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 יותקן ו $2 תלויות שידולגו."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "כל החבילות"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "כבר מותקן"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "חזרה לתפריט הראשי"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "בסיס נתוני התוכן לא זמין כאשר מיינטסט מקומפל בלי cUrl"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "כעת בהורדה..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "משחקים"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "התקנה"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "כעת בטעינה..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "שיפורים"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "לא ניתן להביא את החבילות"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "אין תוצאות"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "אין עדכונים"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "נכנס לתור"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "חבילות טקסטורה (מרקם)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "הסרה"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "עדכון"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "עדכן הכל [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "צפה במידע נוסף בדפדפן האינטרנט"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "התלויות $1 ו $2 יותקנו."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 ליד $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "לא ניתן למצוא תלות חובה של $1."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 יותקן ו $2 תלויות שידולגו."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "כבר מותקן"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "משחק בסיסי:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "ביטול"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "בסיס נתוני התוכן לא זמין כאשר מיינטסט מקומפל בלי cUrl"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "תלויות:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "כעת בהורדה..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "הורדת $1 נכשלה"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "הורדת $1 נכשלה"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "התקנה: סוג קובץ לא נתמך \"$1\" או שהארכיב פגום"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "משחקים"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "התקנה"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "התקנת $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "מתקין תלויות חסרות"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "כעת בטעינה..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "שיפורים"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "לא ניתן להביא את החבילות"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "אין תוצאות"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "אין עדכונים"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "לא נמצא"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "דרוס"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "אנא בדוק שמשחק הבסיס תקין."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "נכנס לתור"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" כבר קיים. האם תרצה להחליף אותו?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "חבילות טקסטורה (מרקם)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "הסרה"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "עדכון"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "עדכן הכל [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "צפה במידע נוסף בדפדפן האינטרנט"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "דרוס"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -461,11 +468,21 @@ msgstr "יצירה"
 msgid "Decorations"
 msgstr "קישוטים"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "אזהרה: מצב בדיקת הפיתוח נועד למפתחים."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "מבוכים"
@@ -836,10 +853,6 @@ msgstr ""
 msgid "Back"
 msgstr "אחורה"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "שנה מקשים"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -849,7 +862,8 @@ msgstr "צ'אט"
 msgid "Clear"
 msgstr "נקה"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1063,6 +1077,16 @@ msgstr "התקנת $1"
 msgid "Install games from ContentDB"
 msgstr "התקנת משחק מContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "חדש"
@@ -1096,8 +1120,8 @@ msgid "Start Game"
 msgstr "התחלת המשחק"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "אין לך משחקים מותקנים."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1183,19 +1207,11 @@ msgstr "טוען טקסטורות..."
 msgid "Rebuilding shaders..."
 msgstr "בונה מחדש שיידרים..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "בעיה בחיבור (נגמר זמן ההמתנה?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "לא מצליח למצוא או לטעון משחק \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "הגדרת משחק לא תקינה."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "תפריט ראשי"
@@ -1220,7 +1236,11 @@ msgstr "הסיסמה שניתנה לא פתחה: "
 msgid "Provided world path doesn't exist: "
 msgstr "נתיב העולם שניתן לא קיים: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "מדיה..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1228,18 +1248,10 @@ msgstr ""
 "\n"
 "בדוק את debug.txt לפרטים נוספים."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- כתובת: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- מצב: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- פורט: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- ציבורי: "
@@ -1275,10 +1287,6 @@ msgstr "תנועה קדימה אוטומטית מופעל"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1325,6 +1333,10 @@ msgstr "סקריפטים בצד לקוח מבוטלים"
 msgid "Connecting to server..."
 msgstr "מתחבר לשרת..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "בעיה בחיבור (נגמר זמן ההמתנה?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1333,47 +1345,14 @@ msgstr ""
 msgid "Continue"
 msgstr "המשך"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"פקדים:\n"
-"- %s: כדי לזוז קדימה\n"
-"- %s: כדי לזוז אחורה\n"
-"- %s: כדי לזוז שמאלה\n"
-"- %s: כדי לזוז ימינה\n"
-"- %s: כדי לקפוץ או לטפס למעלה\n"
-"- %s: כדי לחפור או לחבוט\n"
-"- %s: כדי להניח או להשתמש\n"
-"- %s: כדי להתכופף או לטפס למטה\n"
-"- %s: כדי לזרוק פריט\n"
-"- %s: כדי לפתוח את תיק החפצים\n"
-"- עכבר: כדי להסתובב או להסתכל\n"
-"- גלגלת העכבר: כדי לבחור פריט\n"
-"- %s: כדי לפתוח את הצ׳אט\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1465,6 +1444,11 @@ msgstr "ערפל מבוטל"
 msgid "Fog enabled"
 msgstr "ערפל מופעל"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "המבט מקרוב מושבת על ידי המשחק או השיפור"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "מידע על המשחק:"
@@ -1485,10 +1469,6 @@ msgstr "הגדרות פריט..."
 msgid "KiB/s"
 msgstr "‏KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "מדיה..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "מגהבייט/שניה"
@@ -1647,10 +1627,6 @@ msgstr "מסגרת שלדית מוצגת"
 msgid "Zoom currently disabled by game or mod"
 msgstr "המבט מקרוב מושבת על ידי המשחק או השיפור"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "אוקיי"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1984,6 +1960,15 @@ msgstr "מפה קטנה במצב שטח, זום x %d"
 msgid "Minimap in texture mode"
 msgstr "מפה קטנה במצב טקסטורה"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "הורדת $1 נכשלה"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2176,6 +2161,19 @@ msgstr "זום"
 msgid "press key"
 msgstr "לחץ מקש"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "הורדת $1 נכשלה"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "שנה"
@@ -2209,6 +2207,7 @@ msgstr "עוצמת שמע: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "he"
 
@@ -2430,12 +2429,6 @@ msgstr "טווח שליחת אובייקט פעיל"
 msgid "Adds particles when digging a node."
 msgstr "הוסף חלקיקים כשחופרים בקוביה."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr "התאם את תצורת dpi למסך שלך (לא X11 / Android בלבד) למשל. למסכי 4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2464,6 +2457,10 @@ msgstr "הוסף שם פריט"
 msgid "Advanced"
 msgstr "מתקדם"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2525,6 +2522,17 @@ msgstr "הוסף את שם הפריט לטיפ הכלים."
 msgid "Apple trees noise"
 msgstr "רעש עצי תפוחים"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "אינרציה בזרוע"
@@ -2542,18 +2550,37 @@ msgid "Ask to reconnect after crash"
 msgstr "שאל האם להתחבר מחדש לאחר קריסה"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"במרחק זה השרת יעשה אופטימיזציה לאילו בלוקים נשלחים\n"
+"ללקוחות.\n"
+"ערכים קטנים עשויים לשפר ביצועים רבות, על חשבון גלוי\n"
+"עיבוד תקלות (חלק מהבלוקים לא יועברו מתחת למים ובמערות,\n"
+"כמו גם לפעמים ביבשה).\n"
+"הגדרת ערך זה יותר מ- max_block_send_distance מבטלת זאת\n"
+"אופטימיזציה.\n"
+"מצוין במפה (16 קוביות)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "במרחק זה השרת יעשה אופטימיזציה לאילו בלוקים נשלחים\n"
 "ללקוחות.\n"
@@ -2626,6 +2653,11 @@ msgstr "ביומים (צמחיה אקולוגית)"
 msgid "Biome noise"
 msgstr "רעש Biome"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "אופטימיזצית שליחת בלוק"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "אופטימיזצית שליחת בלוק"
@@ -2848,6 +2880,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2979,10 +3017,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3032,6 +3066,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3219,6 +3266,11 @@ msgstr "להפעיל הכול"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "לאפשר חבלה"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3238,6 +3290,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3280,6 +3336,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3303,6 +3363,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3311,12 +3375,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3346,6 +3404,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4148,9 +4219,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4298,10 +4370,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4350,7 +4418,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4385,10 +4455,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4636,6 +4702,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4704,6 +4774,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "סף מערות"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4814,10 +4889,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4830,6 +4901,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4940,6 +5015,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "שגיאה בגרסאות הפרוטוקול. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4955,6 +5039,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5145,8 +5233,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5268,7 +5356,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5304,6 +5392,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5349,8 +5441,7 @@ msgstr "שיידרים"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5420,13 +5511,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5462,7 +5546,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5483,6 +5567,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "שמע מושתק"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5639,17 +5732,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5660,6 +5773,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5686,7 +5805,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5743,6 +5862,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5790,12 +5913,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "סף נגיעה: (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5833,7 +5955,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5935,10 +6059,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6026,6 +6146,10 @@ msgstr "מקש הפעלת ג'ויסטיק וירטואלי"
 msgid "Volume"
 msgstr "ווליום"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6034,6 +6158,15 @@ msgstr ""
 "עוצמת הקול של כל הצלילים.\n"
 "דורש הפעלת מערכת הקול."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "הבלטת קוביות"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6273,12 +6406,18 @@ msgstr "(cURL) מגבלת זמן"
 msgid "cURL parallel limit"
 msgstr "(cURL) מגבלה לפעולות במקביל"
 
+#~ msgid "- Address: "
+#~ msgstr "- כתובת: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- מצב יצירתי: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- חבלה: "
 
+#~ msgid "- Port: "
+#~ msgstr "- פורט: "
+
 #~ msgid "2x"
 #~ msgstr "x2"
 
@@ -6306,6 +6445,11 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ "השאר את זה ריק כדי להפעיל שרת מקומי.\n"
 #~ "שים לב ששדה הכתובת בתפריט הראשי עוקף הגדרה זו."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr "התאם את תצורת dpi למסך שלך (לא X11 / Android בלבד) למשל. למסכי 4k."
+
 #~ msgid "All Settings"
 #~ msgstr "כל ההגדרות"
 
@@ -6349,6 +6493,9 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "Camera update toggle key"
 #~ msgstr "מקש החלפת עדכון המצלמה"
 
+#~ msgid "Change Keys"
+#~ msgstr "שנה מקשים"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "שנה מקשים"
@@ -6377,6 +6524,38 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "Connected Glass"
 #~ msgstr "זכוכיות מחוברות"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "פקדים:\n"
+#~ "- %s: כדי לזוז קדימה\n"
+#~ "- %s: כדי לזוז אחורה\n"
+#~ "- %s: כדי לזוז שמאלה\n"
+#~ "- %s: כדי לזוז ימינה\n"
+#~ "- %s: כדי לקפוץ או לטפס למעלה\n"
+#~ "- %s: כדי לחפור או לחבוט\n"
+#~ "- %s: כדי להניח או להשתמש\n"
+#~ "- %s: כדי להתכופף או לטפס למטה\n"
+#~ "- %s: כדי לזרוק פריט\n"
+#~ "- %s: כדי לפתוח את תיק החפצים\n"
+#~ "- עכבר: כדי להסתובב או להסתכל\n"
+#~ "- גלגלת העכבר: כדי לבחור פריט\n"
+#~ "- %s: כדי לפתוח את הצ׳אט\n"
+
 #~ msgid "Creative"
 #~ msgstr "יצירתי"
 
@@ -6443,6 +6622,9 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "התקנה: מקובץ: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "הגדרת משחק לא תקינה."
+
 #~ msgid "Jump key"
 #~ msgstr "מקש הקפיצה"
 
@@ -6474,9 +6656,6 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "No Mipmap"
 #~ msgstr "בלי מיפמאפ"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "הבלטת קוביות"
-
 #~ msgid "Node Outlining"
 #~ msgstr "הדגשת מסגרת קוביות"
 
@@ -6541,6 +6720,10 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "Tone Mapping"
 #~ msgstr "מיפוי גוונים"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "סף נגיעה: (px)"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "פילטר תלת לינארי"
 
@@ -6611,8 +6794,14 @@ msgstr "(cURL) מגבלה לפעולות במקביל"
 #~ msgid "You died."
 #~ msgstr "מתת"
 
+#~ msgid "You have no games installed."
+#~ msgstr "אין לך משחקים מותקנים."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "אוקיי"
diff --git a/po/hi/minetest.po b/po/hi/minetest.po
index 0bd7eadb9..f9d212294 100644
--- a/po/hi/minetest.po
+++ b/po/hi/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-11-17 00:07+0000\n"
 "Last-Translator: Ritwik <ritwikraghav14@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "अनुपलब्ध आदेश - "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "आदेशों से जुड़ी सहायता पायें"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "सूची देखें।"
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[सभी | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "ठीक है"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<अनुपलब्ध>"
@@ -105,6 +103,10 @@ msgstr "एक त्रुटि हुई :"
 msgid "Main menu"
 msgstr "मुख्य मेन्यु"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ठीक है"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "पुनः जुड़ें"
@@ -133,19 +135,27 @@ msgstr "हम केवल $1 प्रोटोकॉल संस्करण
 msgid "We support protocol versions between version $1 and $2."
 msgstr "हम $1 और $2 के बीच के प्रोटोकॉल संस्करणों से सहयोग करते हैं।"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" पहले से मौजूद है। क्या आप इसे अधिलेखित करना चाहेंगे?"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 और $2 निर्भरतायें स्थापित की जायेंगी।"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "$1 डाउनलोड विफल"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 डाउनलोड विफल"
+
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "संस्थापन : असमर्थित फाइल प्रकार या विकृत अभिलेख"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +163,157 @@ msgstr ""
 "$1 डाउनलोड हो रहा है,\n"
 "$2 कतारबद्ध"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 डाउनलोड हो रहा है ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 आवश्यक निर्भरतायें नहीं मिल सकीं।"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 संस्थापित किया जायेगा, और $2 निर्भरतायें छोड़ दी जायेंगी।"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "सभी संदूक"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "पहले ही संस्थापित है"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "वापस मुख्य पृष्ठ पर जाएं"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "cURL के बिना माइनटेस्ट संकलित किये जाने के कारण ContentDB उपलब्ध नहीं है"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "डाउनलोड हो रहा है ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "खेल"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "संस्थापित करें"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "लोड हो रहा है ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "माॅड"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "कोई संदूक प्राप्त नहीं किया जा सका"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "परिणाम शून्य"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "अद्यतन अनुपलब्ध"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "कतारबद्ध"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "कला संकुल"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "हटाऐं"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "अद्यतन करें"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "सब अद्यतन करें [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "वेब विचरक में अतिरिक्त जानकारी पायें"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 और $2 निर्भरतायें स्थापित की जायेंगी।"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 आवश्यक निर्भरतायें नहीं मिल सकीं।"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 संस्थापित किया जायेगा, और $2 निर्भरतायें छोड़ दी जायेंगी।"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "पहले ही संस्थापित है"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "मूल खेल :"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "रद्द करें"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "cURL के बिना माइनटेस्ट संकलित किये जाने के कारण ContentDB उपलब्ध नहीं है"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "निर्भरतायें :"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "डाउनलोड हो रहा है ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "$1 डाउनलोड विफल"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 डाउनलोड विफल"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "संस्थापन : असमर्थित फाइल प्रकार या विकृत अभिलेख"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "खेल"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "संस्थापित करें"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 संस्थापित करें"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "अनुपस्थित निर्भरतायें संस्थापित करें"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "लोड हो रहा है ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "माॅड"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "कोई संदूक प्राप्त नहीं किया जा सका"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "परिणाम शून्य"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "अद्यतन अनुपलब्ध"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "नहीं मिला"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "ऊपर लिखें"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "जाँच लें कि मूल खेल शुद्ध है।"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "कतारबद्ध"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" पहले से मौजूद है। क्या आप इसे अधिलेखित करना चाहेंगे?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "कला संकुल"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "हटाऐं"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "अद्यतन करें"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "सब अद्यतन करें [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "वेब विचरक में अतिरिक्त जानकारी पायें"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "ऊपर लिखें"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -455,10 +464,20 @@ msgstr "बनायें"
 msgid "Decorations"
 msgstr "अलंकृतियाँ"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "विकाशन परीक्षण विकासकों के लिये है।"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "कालकोठरियां"
@@ -832,10 +851,6 @@ msgstr ""
 msgid "Back"
 msgstr "पीछे"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "की बदलें"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -845,7 +860,8 @@ msgstr "बातें"
 msgid "Clear"
 msgstr "खाली करें"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "कंट्रोल्स"
 
@@ -1056,6 +1072,16 @@ msgstr "एक खेल संस्थापित करें"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "नया"
@@ -1090,8 +1116,8 @@ msgid "Start Game"
 msgstr "खेल शुरू करें"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "आपके पास कोई खेल संस्थापित नहीं है।"
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1177,19 +1203,11 @@ msgstr "कला लोड हो रही है ..."
 msgid "Rebuilding shaders..."
 msgstr "छायाएं वापस बन रहीं हैं ..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "कनेक्शन खराबी (समय अंत?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "खेल ढूंढा ना जा सका या लोड नहीं किया जा सका \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "गलत गेमस्पेक कोड।"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "मुख्य पृ़ष्ठ"
@@ -1214,7 +1232,11 @@ msgstr "पासवर्ड फाईल नहीं खुला :- "
 msgid "Provided world path doesn't exist: "
 msgstr "दुनिया का फाईल पाथ नहीं है : "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "कला एवं आवाज़ें ..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1222,18 +1244,10 @@ msgstr ""
 "\n"
 "अधिक जानकारी के लिए debug.txt देखें।"
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- एड्रेस : "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- तकनीक : "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- पोर्ट : "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- सार्वजनिक : "
@@ -1269,10 +1283,6 @@ msgstr "स्वचाल चालू"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1318,6 +1328,10 @@ msgstr "क्लाइंट की तरफ से स्क्रिप्
 msgid "Connecting to server..."
 msgstr "सर्वर से कनेक्ट हुआ जा रहा है ..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "कनेक्शन खराबी (समय अंत?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1326,47 +1340,14 @@ msgstr ""
 msgid "Continue"
 msgstr "आगे बढ़ें"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"कंट्रोल्स:\n"
-"- %s : आगे बढ़ने के लिए\n"
-"- %s : पीछे जाने के लिए\n"
-"- %s : बाय की ओर चलें\n"
-"- %s : दाएं की ओर चलें\n"
-"- %s : कूदे या चढ़े\n"
-"- %s : उतरे / संभल के चलें\n"
-"- %s : वस्तु गिराएं\n"
-"- %s : वस्तु सूची खोलें\n"
-"- : माउस मुड़े देखें\n"
-"- : माउस बाय : खोदें / मुक्का मारें\n"
-"- : माउस दाहिने : डाले / इस्तेमाल करें\n"
-"- : माउस पहिया : वस्तु चुनें\n"
-"- %s : बात करने के लिए\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1458,6 +1439,11 @@ msgstr "कोहरा रुका हुआ"
 msgid "Fog enabled"
 msgstr "कोहरा चालू"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "खेल या मॉड़ के वजह से इस समय ज़ूम मना है"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "खेल की जानकारी :"
@@ -1478,10 +1464,6 @@ msgstr "वस्तुओं के अर्थ ..."
 msgid "KiB/s"
 msgstr "कि॰बी॰/एस॰"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "कला एवं आवाज़ें ..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "एम॰ आई॰ बी॰/ एस॰"
@@ -1640,10 +1622,6 @@ msgstr "डिब्बे रेखांकित"
 msgid "Zoom currently disabled by game or mod"
 msgstr "खेल या मॉड़ के वजह से इस समय ज़ूम मना है"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ठीक है"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1978,6 +1956,15 @@ msgstr "छोटा नक्शा जमीन मोड, 1 गुना ज
 msgid "Minimap in texture mode"
 msgstr "छोटा नक्शा जमीन मोड, 1 गुना ज़ूम"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "$1 का डाऊनलोड असफल हुआ"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2170,6 +2157,19 @@ msgstr "ज़ूम"
 msgid "press key"
 msgstr "की दबाएं"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "$1 का डाऊनलोड असफल हुआ"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "बदलें"
@@ -2203,6 +2203,7 @@ msgstr "आवाज "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "hi"
 
@@ -2389,12 +2390,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2418,6 +2413,10 @@ msgstr "दुनिया का नाम"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2474,6 +2473,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2495,12 +2505,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2566,6 +2585,10 @@ msgstr "जीवोम"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2781,6 +2804,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2912,10 +2941,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2965,6 +2990,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3151,6 +3189,11 @@ msgstr "सब सक्षम करें"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "हानि व मृत्यु हो सकती है"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3170,6 +3213,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3212,6 +3259,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3235,6 +3286,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3243,12 +3298,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3278,6 +3327,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4084,9 +4146,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4233,10 +4296,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4285,7 +4344,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4320,10 +4381,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4566,6 +4623,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "राइट क्लिक के दोहराने का समय"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4634,6 +4696,11 @@ msgstr "माउस संवेदनशीलता"
 msgid "Mouse sensitivity multiplier."
 msgstr "माउस संवेदनशीलता गुणक।"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "छूने की त्रिज्या : (px)"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4743,10 +4810,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4759,6 +4822,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4869,6 +4936,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "प्रोटोकॉल संस्करण बेमेल है। "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4884,6 +4960,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5073,8 +5153,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5196,7 +5276,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5229,6 +5309,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5268,8 +5352,7 @@ msgstr "छाया बनावट"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5339,13 +5422,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5382,7 +5458,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "सिनेमा मोड में केमरा चिकने तरीके से मुडेगा | मना करने के लिये 0."
 
 #: src/settings_translation_file.cpp
@@ -5404,6 +5480,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "आवाज़ बंद"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5560,17 +5645,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5581,6 +5686,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5607,7 +5718,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5664,6 +5775,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5713,12 +5828,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr "माउस संवेदनशीलता गुणक।"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "छूने की त्रिज्या : (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5756,7 +5870,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5854,10 +5970,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5944,12 +6056,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "डिब्बें उजाले हों"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6186,12 +6311,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- एड्रेस : "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- असीमित साधन "
 
 #~ msgid "- Damage: "
 #~ msgstr "- हानि : "
 
+#~ msgid "- Port: "
+#~ msgstr "- पोर्ट : "
+
 #~ msgid "2x"
 #~ msgstr "दुग्ना"
 
@@ -6225,6 +6356,9 @@ msgstr ""
 #~ msgid "Bump Mapping"
 #~ msgstr "टकराव मैपिंग"
 
+#~ msgid "Change Keys"
+#~ msgstr "की बदलें"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "की बदलें"
@@ -6244,6 +6378,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "जुडे शिशे"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "कंट्रोल्स:\n"
+#~ "- %s : आगे बढ़ने के लिए\n"
+#~ "- %s : पीछे जाने के लिए\n"
+#~ "- %s : बाय की ओर चलें\n"
+#~ "- %s : दाएं की ओर चलें\n"
+#~ "- %s : कूदे या चढ़े\n"
+#~ "- %s : उतरे / संभल के चलें\n"
+#~ "- %s : वस्तु गिराएं\n"
+#~ "- %s : वस्तु सूची खोलें\n"
+#~ "- : माउस मुड़े देखें\n"
+#~ "- : माउस बाय : खोदें / मुक्का मारें\n"
+#~ "- : माउस दाहिने : डाले / इस्तेमाल करें\n"
+#~ "- : माउस पहिया : वस्तु चुनें\n"
+#~ "- %s : बात करने के लिए\n"
+
 #~ msgid "Credits"
 #~ msgstr "आभार सूची"
 
@@ -6317,6 +6483,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "इन्स्टाल : फाईल : \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "गलत गेमस्पेक कोड।"
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6361,9 +6530,6 @@ msgstr ""
 #~ msgid "Noclip"
 #~ msgstr "तरल चाल"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "डिब्बें उजाले हों"
-
 #~ msgid "Node Outlining"
 #~ msgstr "डिब्बों की रूपरेखा"
 
@@ -6515,8 +6681,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "आपकी मौत हो गयी"
 
+#~ msgid "You have no games installed."
+#~ msgstr "आपके पास कोई खेल संस्थापित नहीं है।"
+
 #~ msgid "Z"
 #~ msgstr "जेड"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "ठीक है"
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index 78b50b80f..50ab03fed 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hungarian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-29 21:30+0000\n"
-"Last-Translator: nyommer <jishnu.ifeoluwa@fullangle.org>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-06-28 05:09+0000\n"
+"Last-Translator: Kisbenedek Márton <martonkisbenedek@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/minetest/"
 "minetest/hu/>\n"
 "Language: hu\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "A parancs nem elérhető: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Segítség kérése a parancsokhoz"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "kilistázásához a '.help all' parancsot."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<nincs elérhető>"
@@ -105,6 +103,10 @@ msgstr "Hiba történt:"
 msgid "Main menu"
 msgstr "Főmenü"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Újrakapcsolódás"
@@ -133,19 +135,27 @@ msgstr "Csak $1 protokollverziót támogatjuk."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "$1 és $2 közötti protokollverziókat támogatjuk."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" már létezik. Szeretné felülírni?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Hiba \"$1\" telepítése közben: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 és $2 függőségek telepítve lesznek."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "$1 letöltése nem sikerült"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 az $2-ből"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 letöltése nem sikerült"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"$1 kibontása sikertelen (nem támogatott fájltípus vagy sérült archívum)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +163,158 @@ msgstr ""
 "$1 letöltése,\n"
 "$2 sorba állítva"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
-msgstr "$1 Letöltése…"
+msgstr "$1 letöltése…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Ehhez szükséges függőségek nem találhatók: $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 telepítve lesz, és $2 függőségek ki lesznek hagyva."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Minden csomag"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Már telepítve"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Vissza a főmenübe"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "A ContentDB nem elérhető, ha a Minetest cURL nélkül lett lefordítva"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Letöltés…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Játékok"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Telepítés"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Betöltés…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modok"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "A csomagok nem nyerhetők vissza"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Nincs találat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Nincsenek frissítések"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Sorba állítva"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Textúracsomagok"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "A(z) $1 csomag nem található."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Eltávolítás"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Frissítés"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Összes frissítése [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "További információ megtekintése böngészőben"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Először egy játékot kell telepítened ahhoz, hogy modokat telepíthess"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 és $2 függőségek telepítve lesznek."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 az $2-ből"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Ehhez szükséges függőségek nem találhatók: $1."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 telepítve lesz, és $2 függőségek ki lesznek hagyva."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Már telepítve"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Alapjáték:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Mégse"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "A ContentDB nem elérhető, ha a Minetest cURL nélkül lett lefordítva"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Függőségek:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Letöltés…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Hiba \"$1\" telepítése közben: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "$1 letöltése nem sikerült"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 letöltése nem sikerült"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"$1 kibontása sikertelen (nem támogatott fájltípus vagy sérült archívum)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Játékok"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Telepítés"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 telepítése"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
-msgstr "hiányzó függőségek telepitése"
+msgstr "Hiányzó függőségek telepítése"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Betöltés…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modifikációk \"Modok\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "A csomagok nem nyerhetők vissza"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Nincs találat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Nincsenek frissítések"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Nem található"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr "Kérlek ellenőrizd, hogy az alapjáték megfelelő-e."
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" már létezik. Szeretné felülírni?"
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Please check that the base game is correct."
-msgstr "Az alapjáték ellenörzése szükséges ."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Sorbaállítva"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Textúracsomagok"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "A $1 csomag nem található."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Eltávolítás"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Frissítés"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Összes frissítése [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "További információ megtekintése böngészőben"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Először a játékot kell telepítened, hogy tudj modokat telepíteni"
-
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
 msgstr "$1 (Engedélyezve)"
@@ -319,7 +329,7 @@ msgstr "$1 telepítése meghiúsult ide: $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "Telepítés: nem található megfelelő mappanév ehhez: $1"
+msgstr "Telepítés: nem található megfelelő mappanév $1 számára"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to find a valid mod, modpack, or game"
@@ -327,11 +337,11 @@ msgstr "Nem található érvényes mod, modcsomag vagy játék"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a $2"
-msgstr "Nem lehet telepíteni $1 et $2 ként"
+msgstr "$1 nem telepíthető $2 ként"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
-msgstr "$1 textúracsomag telepítése meghiúsult"
+msgstr "Egy $1 telepítése textúracsomagként meghiúsult"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Enabled, has error)"
@@ -347,7 +357,7 @@ msgstr "Összes letiltása"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Modcsomag letiltása"
+msgstr "Mod csomag letiltása"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -355,7 +365,7 @@ msgstr "Összes engedélyezése"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Modcsomag engedélyezése"
+msgstr "Mod csomag engedélyezése"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -387,7 +397,7 @@ msgstr "Nincsenek kötelező függőségek"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr "Nincs elérhető modcsomag-leírás."
+msgstr "Nincs elérhető mod csomag leírás."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
@@ -425,7 +435,7 @@ msgstr "Hőmérséklet-csökkenés a magassággal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr "Páratartalomcsökkenés a magassággal"
+msgstr "Páratartalom csökkenés a magassággal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
@@ -451,10 +461,20 @@ msgstr "Létrehozás"
 msgid "Decorations"
 msgstr "Dekorációk"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "A Development Test fejlesztők számára készült."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Tömlöcök"
@@ -503,15 +523,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr "Térkép generálás"
+msgstr "Térképgenerálás"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr "Térképgenerátor zászlók"
+msgstr "Térképgenerátor jelzői"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
-msgstr "Térképgenerátor különleges zászlói"
+msgstr "Térképgenerátor saját jelzői"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
@@ -755,7 +775,7 @@ msgstr "Fájl kiválasztása"
 
 #: builtin/mainmenu/settings/components.lua
 msgid "Set"
-msgstr "(be)állít"
+msgstr "Beállít"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -824,20 +844,16 @@ msgstr "könyített"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr "(Használd a rendszer nyelvét)"
+msgstr "(Eszköz nyelve)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr "Megközelíthetőség"
+msgstr "Kényelmes használat"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Vissza"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Gombok megváltoztatása"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -847,7 +863,8 @@ msgstr "Csevegés"
 msgid "Clear"
 msgstr "Törlés"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Irányítás"
 
@@ -861,7 +878,7 @@ msgstr "Mozgások"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default"
-msgstr "Beállítások alaprértelmezettre lévő viszaállítása"
+msgstr "Beállítások viszaállítása alapértelmezettre"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
@@ -873,7 +890,7 @@ msgstr "Keresés"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr "Felsőszintű beállítások mutatása"
+msgstr "Haladó beállítások mutatása"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -893,7 +910,7 @@ msgstr "Tartalom: modok"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr "A játéknak engedélyeznie kell az árnyékokat is)"
+msgstr "(A játéknak engedélyeznie kell az árnyékokat is)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
@@ -930,7 +947,7 @@ msgstr "Nagyon alacsony"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "About"
-msgstr "(valami)ról/ről"
+msgstr "Róla"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Active Contributors"
@@ -950,7 +967,7 @@ msgstr "Csapat magja"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr "Irrlict készülék:"
+msgstr "Irrlicht készülék:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -1043,7 +1060,7 @@ msgstr "Játék megosztása"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Server"
-msgstr "Szerver felállítása"
+msgstr "Szerver készítése"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install a game"
@@ -1053,6 +1070,17 @@ msgstr "Játék telepítése"
 msgid "Install games from ContentDB"
 msgstr "Játékok telepítése ContentDB-ről"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "A Minetest Game már nem települ alapból"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Új"
@@ -1086,8 +1114,9 @@ msgid "Start Game"
 msgstr "Indítás"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nincsenek játékok telepítve."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Először egy játékot kell telepítened ahhoz, hogy modokat telepíthess"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1166,18 +1195,10 @@ msgstr "Textúrák betöltése…"
 msgid "Rebuilding shaders..."
 msgstr "Árnyalók újraépítése…"
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Kapcsolódási hiba (időtúllépés?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Nem található vagy nem betölthető a játék: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Érvénytelen játékmeghatározás."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Főmenü"
@@ -1202,7 +1223,11 @@ msgstr "A megadott jelszófájlt nem sikerült megnyitni: "
 msgid "Provided world path doesn't exist: "
 msgstr "A megadott útvonalon nem létezik világ: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Tartalom..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1210,18 +1235,10 @@ msgstr ""
 "\n"
 "A részletekért tekintsd meg a debug.txt fájlt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Cím: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mód: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Nyilvános: "
@@ -1256,10 +1273,6 @@ msgstr "Önjárás engedélyezve"
 msgid "Block bounds hidden"
 msgstr "Blokkhatárok elrejtve"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blokkhatárok mutatása minden blokk esetén"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blokkhatárok mutatása az aktuális blokk esetén"
@@ -1305,6 +1318,10 @@ msgstr "Kliens oldali szkriptek letiltva"
 msgid "Connecting to server..."
 msgstr "Kapcsolódás szerverhez..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Kapcsolódási hiba (időtúllépés?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Kapcsolat megszakadt ismeretlen okból"
@@ -1314,45 +1331,13 @@ msgid "Continue"
 msgstr "Folytatás"
 
 #: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Irányítás:\n"
-"- %s: mozgás előre\n"
-"- %s: mozgás hátra\n"
-"- %s: mozgás balra\n"
-"- %s: mozgás jobbra\n"
-"- %s: ugrás/mászás\n"
-"- %s: ásás/ütés/használat\n"
-"- %s: letevés/használat\n"
-"- %s: lopakodás/lefelé mászás\n"
-"- %s: tárgy eldobása\n"
-"- %s: leltár\n"
-"- Egér: forgás/nézelődés\n"
-"- Egérgörgő: tárgy kiválasztása\n"
-"- %s: csevegés\n"
-
-#: src/client/game.cpp
+#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1444,6 +1429,11 @@ msgstr "Köd letiltva"
 msgid "Fog enabled"
 msgstr "köd engedélyezve"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Nagyítás letiltva (szerver, vagy mod által)"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Játékinformációk:"
@@ -1454,7 +1444,7 @@ msgstr "Játék szüneteltetve"
 
 #: src/client/game.cpp
 msgid "Hosting server"
-msgstr "Szerver felállítása"
+msgstr "Szerver készítése"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
@@ -1464,17 +1454,13 @@ msgstr "Tárgyak meghatározása…"
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Tartalom..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr "A kistérkép letiltva (szerver, vagy mod által)"
+msgstr "A kistérkép letiltva (szerver vagy mod által)"
 
 #: src/client/game.cpp
 msgid "Multiplayer"
@@ -1629,13 +1615,9 @@ msgstr "Drótváz megjelenítése"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Nagyítás letiltva (szerver, vagy mod által)"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
-msgstr "A chat letiltva (szerver, vagy mod által)"
+msgstr "A csevegést a játék vagy egy mod nem engedélyezi"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1643,15 +1625,15 @@ msgstr "Csevegés elrejtve"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr "Csevegés megjelenítése"
+msgstr "Csevegés látszik"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr "HUD elrejtése"
+msgstr "Műszerfal elrejtve"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr "HUD megjelenítése"
+msgstr "Műszerfal látható"
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
@@ -1937,7 +1919,7 @@ msgstr "Nagyítási gomb"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
-msgstr "Kistérkép letiltva"
+msgstr "Kistérkép elrejtve"
 
 #: src/client/minimap.cpp
 #, c-format
@@ -1947,11 +1929,20 @@ msgstr "Minimap radar módban, Nagyítás x%d"
 #: src/client/minimap.cpp
 #, c-format
 msgid "Minimap in surface mode, Zoom x%d"
-msgstr "Kistérkép terület módban x%d"
+msgstr "Kistérkép terület ódban, zoom x%d"
 
 #: src/client/minimap.cpp
 msgid "Minimap in texture mode"
-msgstr "Kistérkép textúra módban"
+msgstr "Kistérkép textúramódban"
+
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Weblap megnyitása nem sikerült"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
 
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
@@ -2108,7 +2099,7 @@ msgstr "Lopakodás"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr "HUD váltása"
+msgstr "Műszerfal ki-be"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
@@ -2128,7 +2119,7 @@ msgstr "Köd váltása"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle minimap"
-msgstr "Kistérkép váltása"
+msgstr "Kistérkép ki-be"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
@@ -2146,6 +2137,19 @@ msgstr "Nagyítás"
 msgid "press key"
 msgstr "Nyomj meg egy gombot"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Weblap megnyitása nem sikerült"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Megváltoztatás"
@@ -2179,6 +2183,7 @@ msgstr "Hangerő: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "hu"
 
@@ -2186,11 +2191,12 @@ msgstr "hu"
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
 msgstr ""
-"A név nincs regisztrálva. Fiók létrehozásához kattints a Regisztrálásra"
+"A név nincs regisztrálva. Fiók létrehozásához a szerveren kattints a "
+"Regisztrálásra"
 
 #: src/network/clientpackethandler.cpp
 msgid "Name is taken. Please choose another name"
-msgstr "A név már használt! Válassz egy másik nevet"
+msgstr "A nevet már használja valaki. Válassz egy másik nevet"
 
 #: src/server.cpp
 #, c-format
@@ -2323,7 +2329,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr "3D-s zaj, amely meghatározza a tömlöcök számát egy térképdarabkánként."
+msgstr "3D-s zaj, amely meghatározza a tömlöcök számát egy pályadarabkánként."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2345,15 +2351,15 @@ msgstr ""
 "-    felső-alsó: osztott képernyő fent/lent.\n"
 "-    oldaltol-oldalig: osztott képernyő kétoldalt.\n"
 "-    keresztnézet: bandzsítva nézendő 3d\n"
-"Ne feledje, hogy az átlapolt üzemmód, igényli az árnyékolók használatát."
+"Ne feledje, hogy az átlapolt üzemmód, igényli az árnyalók használatát."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
-"Egy választott seed az új térképhez, a véletlenszerűhöz hagyd üresen.\n"
-"Felül lesz írva új világ létrehozásánál a főmenüben."
+"Az új pályához választott seed, ha véletlenszerűt szeretnél, hagyd üresen.\n"
+"Felülíródik, ha új világot hozol létre a főmenüben."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
@@ -2403,14 +2409,6 @@ msgstr "Aktív objektum küldés hatótávolsága"
 msgid "Adds particles when digging a node."
 msgstr "Részecskéket mutat a kockák ásásakor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Dpi konfiguráció igazítása a képernyődhöz (nem X11/csak Android) pl. 4k "
-"képernyőkhöz."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2426,13 +2424,13 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
-"Beállítja az úszó réteg sűrűségét\n"
-"Növelje az értéket a sűrűség növelése érdekében. Lehet pozitív vagy "
+"Beállíja, mennyire legyen összefüggő a lebegő földek rétege.\n"
+"Nagyobb értéknél nagyobb lesz az összefüggő terület. Lehet pozitív vagy "
 "negatív.\n"
-"Érték = 0,0: 50%-a térfogata a lebegő földnek\n"
-"Érték = 2,0 (magasabb is lehet az 'mgv7_np_floatland'-től függően', mindig "
-"teszteljen\n"
-"hogy biztos legyen benne) szilárd úszó réteget hoz létre."
+"Érték = 0,0: a térfogat 50%-a lebegő föld.\n"
+"Érték = 2,0 (magasabb is lehet az 'mgv7_np_floatland'-től függően, mindig "
+"teszteld\n"
+"a biztonság kedvéért) egybefüggő lebegő földréteget hoz létre."
 
 #: src/settings_translation_file.cpp
 msgid "Admin name"
@@ -2442,6 +2440,10 @@ msgstr "Adminisztrátor neve"
 msgid "Advanced"
 msgstr "Haladó"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2500,16 +2502,27 @@ msgstr "Elem nevének hozzáadása az eszköztipphez."
 msgid "Apple trees noise"
 msgstr "Almafa zaj"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr "Kar tehetetlenség"
+msgstr "Karlengés"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
-"A kar tehetetlensége reálisabb mozgást biztosít\n"
+"Karlengés, amely valósághűbb mozgást kölcsönöz\n"
 "a karnak, amikor a kamera mozog."
 
 #: src/settings_translation_file.cpp
@@ -2517,18 +2530,39 @@ msgid "Ask to reconnect after crash"
 msgstr "Összeomlás után újracsatlakozás kérése"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Ennél a távolságnál a szerver agresszívan optimalizálja, hogy melyik "
+"blokkokat\n"
+"küldje a klienseknek.\n"
+"Kis értékek valószínűleg sokat javítanak a teljesítményen, látható "
+"megjelenítési\n"
+"hibák árán. (Néhány víz alatti és barlangokban lévő blokk nem jelenik meg,\n"
+"néha a felszínen lévők sem.)\n"
+"Ha ez az érték nagyobb, mint a \"max_block_send_distance\", akkor nincs\n"
+"optimalizáció.\n"
+"A távolság blokkokban értendő (16 kocka)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Ennél a távolságnál a szerver agresszívan optimalizálja, hogy melyik "
 "blokkokat\n"
@@ -2601,13 +2635,18 @@ msgstr "Biom API"
 msgid "Biome noise"
 msgstr "Biom zaj"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Max blokk küldési távolság"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Max blokk küldési távolság"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr "Virágzik"
+msgstr "Ragyogás"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
@@ -2619,7 +2658,7 @@ msgstr "Ragyogás sugara"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
-msgstr "Ragyogás erősség szorzó"
+msgstr "Ragyogás erősségének mértéke"
 
 #: src/settings_translation_file.cpp
 msgid "Bobbing"
@@ -2723,11 +2762,11 @@ msgstr "Parancsok"
 
 #: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr "Chat betűméret"
+msgstr "Csevegés betűmérete"
 
 #: src/settings_translation_file.cpp
 msgid "Chat log level"
-msgstr "Chat napló szintje"
+msgstr "Csevegésnapló szintje"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2735,15 +2774,15 @@ msgstr "Csevegőüzenetek számának korlátozása"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message format"
-msgstr "Üzenet formátum"
+msgstr "Üzenet formátuma"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
-msgstr "Sivatag zajának küszöbe"
+msgstr "Csevegésüzenetek kitiltási küszöbe"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr "CSevegésüzenet maximális hossza"
+msgstr "Csevegésüzenetek maximális hossza"
 
 #: src/settings_translation_file.cpp
 msgid "Chat weblinks"
@@ -2751,7 +2790,7 @@ msgstr "Internetes linkek a csevegésben"
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr "Térképdarabka (chunk) mérete"
+msgstr "Pályadarabka (chunk) mérete"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2817,6 +2856,12 @@ msgstr "Színezett köd"
 msgid "Colored shadows"
 msgstr "Színezett árnyékok"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2862,7 +2907,7 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
-"A tömörítés foka a térképblokkok lemezre mentéséhez.\n"
+"A tömörítés foka a pályablokkok lemezre mentéséhez.\n"
 "-1 - alapértelmezett tömörítési fok\n"
 "0 - legkisebb tömörítés, leggyorsabb\n"
 "9 - legjobb tömörítés, leglassabb"
@@ -2874,7 +2919,7 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
-"Tömörítés foka a térképblokkok kliensnek küldéséhez.\n"
+"Tömörítés foka a pályablokkok kliensnek küldéséhez.\n"
 "-1 - alapértelmezett tömörítési fok\n"
 "0 - legkisebb tömörítés, leggyorsabb\n"
 "9 - legjobb tömörítés, leglassabb"
@@ -2893,15 +2938,15 @@ msgstr "Üvegfelületek egybeolvasztása, ha a kocka támogatja."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr "Konzol alfa"
+msgstr "Konzol átlátszósága"
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr "Konzol szín"
+msgstr "Konzolszín"
 
 #: src/settings_translation_file.cpp
 msgid "Console height"
-msgstr "Konzol magasság"
+msgstr "Konzolmagasság"
 
 #: src/settings_translation_file.cpp
 msgid "Content Repository"
@@ -2917,7 +2962,7 @@ msgstr "ContentDB egyidejű letöltések maximális száma"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
-msgstr "TartalomDB URL"
+msgstr "ContentDB URL"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2986,10 +3031,6 @@ msgstr ""
 "Célkereszt szín (R,G,B).\n"
 "Az objektum célkereszt színét is állítja"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Hibakeresési naplófájl méretküszöbe"
@@ -3015,8 +3056,8 @@ msgid ""
 "Default maximum number of forceloaded mapblocks.\n"
 "Set this to -1 to disable the limit."
 msgstr ""
-"Az erőltetetten betöltött térképblokkok maximális száma.\n"
-"Állítsd -1-re, hogy megszűntesd a limitet."
+"Az erőltetetten betöltött pályablokkok maximális száma.\n"
+"Állítsd -1-re, ha nem szeretnél korlátot."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
@@ -3044,6 +3085,25 @@ msgstr ""
 "Lágy árnyék effektus szimulálása PCF vagy Poisson disk eljárással,\n"
 "de egyéb erőforrásokat is használ."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Régi verziójú kliensek csatlakozásának tiltása.\n"
+"A régi kliensek kompatibilisek olyan értelemben, hogy nem omlanak össze ha "
+"egy új verziójú\n"
+"szerverhez csatlakoznak, de nem biztos, hogy támogatnak minden elvárt "
+"funkciót."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Azokat a területeket adja meg, ahol a fák almát teremnek."
@@ -3072,8 +3132,8 @@ msgid ""
 "Smaller values make bloom more subtle\n"
 "Range: from 0.01 to 1.0, default: 0.05"
 msgstr ""
-"Meghatározza, hogy mennyire bloomozódjon a renderelt kép.\n"
-"Az alacsonyabb értékek finomabb bloomot eredményeznek.\n"
+"Meghatározza, hogy mennyire ragyogjon a renderelt kép.\n"
+"Az alacsonyabb értékek finomabb ragyogást eredményeznek.\n"
 "Értékhatár: 0.01-től 1.0-ig. Alapértelmezett érték: 0.05"
 
 #: src/settings_translation_file.cpp
@@ -3097,8 +3157,8 @@ msgid ""
 "Defines the magnitude of bloom overexposure.\n"
 "Range: from 0.1 to 10.0, default: 1.0"
 msgstr ""
-"Meghatározza a bloom túlexpozíció mértékét.\n"
-"Értékhetár: 0.1-től 10.0-ig. Alapértelmezett érték: 1.0"
+"Meghatározza a ragyogás túlexponálásának mértékét.\n"
+"Értékhatár: 0.1-től 10.0-ig. Alapértelmezett érték: 1.0"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -3223,7 +3283,7 @@ msgstr "Az ugrás gomb kétszeri megnyomásával lehet repülés módba váltani
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug information."
-msgstr "A térképgenerátor hibakeresési információinak kiírása."
+msgstr "A pályagenerátor hibakeresési információinak kiírása."
 
 #: src/settings_translation_file.cpp
 msgid "Dungeon maximum Y"
@@ -3243,11 +3303,16 @@ msgstr "Automatikus expozíció engedélyezése"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom"
-msgstr "Bloom engedélyezése"
+msgstr "Ragyogás engedélyezése"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom Debug"
-msgstr "Bloom debug engedélyezése"
+msgstr "Hibakeresés engedélyezése ragyogáshoz"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Sérülés engedélyezése"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3275,6 +3340,11 @@ msgstr ""
 "Igazra állítás esetén Poisson disk eljárással képez lágy árnyékokat. "
 "Különben a PCF szűrőt használja."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Utófeldolgozás"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Raytraced Culling engedélyezése"
@@ -3297,7 +3367,7 @@ msgid ""
 "On true translucent nodes cast colored shadows. This is expensive."
 msgstr ""
 "Színes árnyékok engedélyezése.\n"
-"Igaz érték esetén az áttettsző kockák színes árnyékot vetnek. "
+"Igaz érték esetén az áttetsző kockák színes árnyékot vetnek. "
 "Erőforrásigényes."
 
 #: src/settings_translation_file.cpp
@@ -3326,6 +3396,13 @@ msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 "Engedélyezze az egérgörgőt (görgetést) a tárgy kiválasztásához a hotbáron."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+"Véletlenszerű felhasználói bemenet engedélyezése (csak teszteléshez "
+"használható)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3358,6 +3435,11 @@ msgstr ""
 "szerverhez csatlakoznak, de nem biztos, hogy támogatnak minden elvárt "
 "funkciót."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Érintőképernyő"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3369,14 +3451,6 @@ msgstr ""
 "Ezekről jelentősen gyorsabb a média letöltése (pl. textúrák)\n"
 "a szerverhez történő csatlakozáskor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Vertex buffer objektumok engedélyezése.\n"
-"Ez nagyban javíthatja a grafikus teljesítményt."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3416,6 +3490,19 @@ msgstr "Az felszerelésben lévő tárgyak animációjának engedélyezése."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Az elforgatott hálók irányának gyorsítótárazásának engedélyezése."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3473,7 +3560,7 @@ msgstr "Tényezőzaj"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing factor"
-msgstr "Leesés utáni fejrázkódási tényező"
+msgstr "Becsapódási rázkódás mértéke"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font path"
@@ -3534,7 +3621,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr "Fix térkép seed"
+msgstr "Rögzített pálya-seed"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed virtual joystick"
@@ -3607,7 +3694,7 @@ msgstr "Betűtípus árnyék átlátszósága"
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr "Betűtípus mérete"
+msgstr "Betűméret"
 
 #: src/settings_translation_file.cpp
 msgid "Font size divisible by"
@@ -3656,9 +3743,9 @@ msgid ""
 "placeholders:\n"
 "@name, @message, @timestamp (optional)"
 msgstr ""
-"A játékos csevegési üzeneteinek formátuma. A következő karakterláncok "
-"érvényesek:\n"
-"@név, @üzenet, @időbélyeg (opcionális)"
+"A játékos csevegési üzeneteinek formátuma. A következő kódszavak "
+"használhatók:\n"
+"@name, @message, @timestamp (opcionális)"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
@@ -3666,21 +3753,21 @@ msgstr "Képernyőmentések formátuma."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr "Teljes képernyős Formspec panelek háttérszíne"
+msgstr "Teljes képernyő háttérszíne felugró ablakoknál"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr "Teljes képernyős Formspec panelek hátterének átlátszósága"
+msgstr "Teljes képernyő hátterének átlátszatlansága felugró ablakoknál"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background color (R,G,B)."
-msgstr ""
-"Játékon belüli teljes képrenyős kezelőpanelek hátterének színe (R,G,B)."
+msgstr "Teljes képernyő háttérszíne felugró ablakoknál (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background opacity (between 0 and 255)."
 msgstr ""
-"Játékon belüli csevegő konzol hátterének átlátszósága (0 és 255 között)."
+"Teljes képernyő hátterének átlátszatlansága felugró ablakoknál (0 és 255 "
+"között)."
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
@@ -3702,14 +3789,14 @@ msgid ""
 "nodes)."
 msgstr ""
 "Milyen távolságból generálódnak a blokkok a kliensek számára, "
-"térképblokkokban megadva (16 kocka)."
+"pályablokkokban megadva (16 kocka)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
 "Milyen távolságból lesznek elküldve a blokkok a kliens számára, "
-"térképblokkokban megadva (16 kocka)."
+"pályablokkokban megadva (16 kocka)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3719,7 +3806,7 @@ msgid ""
 "to maintain active objects up to this distance in the direction the\n"
 "player is looking. (This can avoid mobs suddenly disappearing from view)"
 msgstr ""
-"Mekkora távolságból észleljék a kliensek az objektumokat, térképblokkokban "
+"Mekkora távolságból észleljék a kliensek az objektumokat, pályablokkokban "
 "mérve (16 kocka).\n"
 "\n"
 "Ha nagyobbra van állítva, mint az active_block_range, akkor a szervert arra "
@@ -3766,10 +3853,10 @@ msgid ""
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and jungle grass, in all other mapgens this flag controls all decorations."
 msgstr ""
-"Globális térképgenerálási jellemzők.\n"
-"A Mapgen v6 térképgenerátorban a 'decorations' jelző szabályozza az összes "
+"Globális pályagenerálási jellemzők.\n"
+"A Mapgen v6 generátorban a 'decorations' jelző szabályozza az összes "
 "dekorációt,\n"
-"kivéve a fákat és a dzsungelfüvet, a többi térképgenerátornál pedig az "
+"kivéve a fákat és a dzsungelfüvet, a többi pályagenerátornál pedig az "
 "összeset."
 
 #: src/settings_translation_file.cpp
@@ -3818,11 +3905,11 @@ msgstr "HTTP Modok"
 
 #: src/settings_translation_file.cpp
 msgid "HUD"
-msgstr "HUD"
+msgstr "Műszerfal"
 
 #: src/settings_translation_file.cpp
 msgid "HUD scaling"
-msgstr "HUD (fej feletti kijelző) méretaránya"
+msgstr "Műszerfal méretaránya"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3951,7 +4038,7 @@ msgid ""
 "Higher value is smoother, but will use more RAM."
 msgstr ""
 "Mennyi ideig vár a szerver, mielőtt eltávolítja a memóriából a nem használt "
-"térképblokkokat.\n"
+"pályablokkokat.\n"
 "A magasabb érték stabilabb, de több RAM-ot használ."
 
 #: src/settings_translation_file.cpp
@@ -4059,11 +4146,10 @@ msgid ""
 "sent to the client by 50-80%. Clients will no longer receive most\n"
 "invisible blocks, so that the utility of noclip mode is reduced."
 msgstr ""
-"Ha engedélyezve van, a szerver kiválogatja a takarásban lévő "
-"térképblokkokat\n"
+"Ha engedélyezve van, a szerver kiválogatja a takarásban lévő pályablokkokat\n"
 "a játékos szemszögének megfelelően. Ezáltal a kliensnek küldött blokkok\n"
 "száma 50-80%-kal csökkenthető. A klines nem kapja ezentúl a legtöbb nem\n"
-"látható blokkot, emiatt a noclip mód kevésbé lesz használható."
+"látható blokkot, emiatt a noclip mód kevésbé lesz hasznos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4073,7 +4159,7 @@ msgid ""
 msgstr ""
 "Ha engedélyezve van, lehelyezhetsz kockákat oda, ahol állsz (láb + "
 "szemmagasság).\n"
-"Ez segít, ha kis területen dolgozol nodeboxokkal."
+"Megkönnyíti a kijelölődobozokkal való munkát kis területen."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4093,7 +4179,7 @@ msgid ""
 msgstr ""
 "Ha egy parancs végrehajtása tovább tart, mint az itt másodpercben megadott "
 "idő,\n"
-"az időadatok hozzá lesznek fűzve a parancs visszajelző üzenetéhez"
+"az időadatok hozzá lesznek fűzve a parancs visszajelző-üzenetéhez"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4119,17 +4205,15 @@ msgstr "Világhibák figyelmen kívül hagyása"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr ""
-"Játékon belüli csevegő konzol hátterének átlátszósága (0 és 255 között)."
+msgstr "Játékon belüli csevegőpanel hátterének átlátszósága (0 és 255 között)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr "Játékon belüli csevegő konzol hátterének színe (R,G,B)."
+msgstr "Játékon belüli csevegőpanel hátterének színe (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
-msgstr ""
-"Játékon belüli csevegéskonzol magassága 0,1 (10%) és 1,0 (100%) között."
+msgstr "Játékon belüli csevegőpanel magassága 0,1 (10%) és 1,0 (100%) között."
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
@@ -4225,7 +4309,7 @@ msgstr ""
 "A rekurzív függvény ismétlései.\n"
 "Ennek növelése növeli a finom részletek mennyiségét és\n"
 "növeli a feldolgozási terhelést.\n"
-" 20 ismétlésnél ez a térképgeneráló hasonló terheléssel rendelkezik, mint a "
+" 20 ismétlésnél ez a pályageneráló hasonló terheléssel rendelkezik, mint a "
 "V7."
 
 #: src/settings_translation_file.cpp
@@ -4374,10 +4458,12 @@ msgstr ""
 "-   opaque: (átlátszatlan) átlátszóság kikapcsolása"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "A szerver jelölés hossza és az időköz, amelyen az objektumokat általában "
 "frissíti\n"
@@ -4462,10 +4548,10 @@ msgid ""
 "Only mapchunks completely within the mapgen limit are generated.\n"
 "Value is stored per-world."
 msgstr ""
-"A térképgenerálás határa, kockákban, mind a 6 irányban a (0, 0, 0) "
-"pozíciótól kezdve.\n"
-"Csak a teljesen a térképgenerálási határon belül lévő térképdarabkák "
-"generálódnak le.\n"
+"A pályagenerálás határa, kockákban, mind a 6 irányban a (0, 0, 0) pozíciótól "
+"kezdve.\n"
+"Csak a teljesen a pályagenerálási határon belül lévő pályadarabkák "
+"generálódnak.\n"
 "Az érték világonként külön tárolódik."
 
 #: src/settings_translation_file.cpp
@@ -4535,7 +4621,7 @@ msgid ""
 "from the bright objects.\n"
 "Range: from 0.1 to 8, default: 1"
 msgstr ""
-"Logikai érték, amely szabályozza, hogy a virágzási hatás meddig terjedjen\n"
+"Logikai érték, amely szabályozza, hogy a ragyogási hatás meddig terjedjen\n"
 "a fényes tárgyaktól.\n"
 "Tartomány: 0,1-8, alapértelmezett: 1"
 
@@ -4558,33 +4644,29 @@ msgstr ""
 "A köd és az ég színe függjön a napszaktól (hajnal/naplemente) és a "
 "látószögtől."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Az összes folyadékot átlátszatlanná teszi"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
-msgstr "A térkép tömörítésének foka merevlemezen való tároláshoz"
+msgstr "A pálya tömörítésének foka merevlemezen való tároláshoz"
 
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Network Transfer"
-msgstr "A térkép tömörítésének foka hálózati átvitelhez"
+msgstr "A pálya tömörítésének foka hálózati átvitelhez"
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
-msgstr "Térkép mappája"
+msgstr "Pálya mappája"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen Carpathian."
-msgstr "A Kárpátok térképgenerátorra vonatkozó térképgenerálási beállítások."
+msgstr "A Kárpátok pályagenerátorra vonatkozó generálási beállítások."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
-"A Lapos térképgenerátor sajátos tulajdonságai.\n"
-"Alkalmanként tavak és dombok hozzáadódhatnak a lapos világhoz."
+"A Lapos pályagenerátor saját generálási jellemzői.\n"
+"Elszórtan tavak és dombok hozzáadhatók a lapos világhoz."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4592,7 +4674,7 @@ msgid ""
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"A Fraktál térképgenerátor sajátos jellemzői.\n"
+"A Fraktál pályagenerátor saját generálási jellemzői.\n"
 "A 'terrain' engedélyezi a nem-fraktál terep generálását,\n"
 "mint az óceán, szigetek és a földalatti részek."
 
@@ -4605,7 +4687,7 @@ msgid ""
 "to become shallower and occasionally dry.\n"
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
-"A Völgyek térképgenerátor sajátos jellemzői.\n"
+"A Völgyek pályagenerátor saját generálási jellemzői.\n"
 "'altitude_chill': csökkenti a hőmérsékletet a magassággal.\n"
 "'humid_rivers': megnöveli a páratartalmat a folyók körül.\n"
 "'vary_river_depth': ha engedélyezve van, az alacsony páratalom és a magas\n"
@@ -4615,20 +4697,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen v5."
-msgstr "A v5 térképgenerátor sajátos tulajdonságai."
+msgstr "A v5 pályagenerátor saját generálási jellemzői."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"A v6 térképgenerátor sajátos jellemzői.\n"
-"A 'snowbiomes' zászló engedélyezi az új 5 biomos rendszert.\n"
-"Amikor a 'snowbiomes' zászló engedélyezett a dzsungelek automatikusan "
-"engedélyezve vannak\n"
-"és a 'jungles' zászló figyelmen kívül van hagyva."
+"A v6 pályagenerátor saját generálási jellemzői.\n"
+"A 'snowbiomes' jelölő engedélyezi az új 5 biomos rendszert.\n"
+"Amikor a 'snowbiomes' jelölő engedélyezett, a dzsungelek automatikusan "
+"engedélyezve lesznek\n"
+"és a 'jungles' jelölő figyelmen kívül lesz hagyva."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4637,106 +4722,102 @@ msgid ""
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"Térkép generálási jellemzők csak a v7 térképgenerátor esetében.\n"
+"A v7 pályagenerátor saját generálási jellemzői.\n"
 "'ridges': folyók.\n"
 "'floatlands': lebegő földtömegek a légkörben.\n"
 "'caverns': óriási barlangok mélyen a föld alatt."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr "Térkép generálási korlát"
+msgstr "Pályagenerálási korlát"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr "Térkép mentésének időköze"
+msgstr "Pályamentés időköze"
 
 #: src/settings_translation_file.cpp
 msgid "Map shadows update frames"
-msgstr "Árnyéktérkép frissítési idő"
+msgstr "Árnyéktérkép frissítési ideje"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr "Térképblokk korlát"
+msgstr "Pályablokk korlát"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generation delay"
-msgstr "Térképblokk háló generálási késleltetés"
+msgstr "Pályablokkrács generálási késleltetése"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generation threads"
-msgstr "Térképblokk-hálógenerálási szálak"
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Térképblokk hálógenerátor MapBlock gyorsítótár mérete MB-ban"
+msgstr "Pályablokkrács-generálási szálak"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr "Térképblokk memóriaürítésének időkorlátja"
+msgstr "Pályablokk memóriaürítésének időkorlátja"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian"
-msgstr "Kárpátok térképgenerátor"
+msgstr "Kárpátok pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian specific flags"
-msgstr "Kárpátok térképgenerátor különleges zászlói"
+msgstr "Kárpátok pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat"
-msgstr "Lapos térképgenerátor"
+msgstr "Lapos pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat specific flags"
-msgstr "Lapos térképgenerátor különleges zászlói"
+msgstr "Lapos pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal"
-msgstr "Fraktál térképgenerátor"
+msgstr "Fraktál pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal specific flags"
-msgstr "Fraktál térképgenerátor domb meredekség"
+msgstr "Fraktál pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5"
-msgstr "V5 térképgenerátor"
+msgstr "V5 pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5 specific flags"
-msgstr "Lapos térképgenerátor különleges zászlók"
+msgstr "V5 pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6"
-msgstr "V6 térképgenerátor"
+msgstr "V6 pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6 specific flags"
-msgstr "V6 térképgenerátor különleges zászlói"
+msgstr "V6 pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7"
-msgstr "V7 térképgenerátor"
+msgstr "V7 pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7 specific flags"
-msgstr "V7 térképgenerátor különleges zászlói"
+msgstr "V7 pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
-msgstr "Völgyek térképgenerátor"
+msgstr "Völgyek pályagenerátor"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys specific flags"
-msgstr "Völgyek térképgenerátor különleges zászlói"
+msgstr "Völgyek pályagenerátor saját jelzői"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
-msgstr "Térképgenerátor hibakereső"
+msgstr "Pályagenerátor-hibakereső"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
-msgstr "Térképgenerátor neve"
+msgstr "Pályagenerátor neve"
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
@@ -4781,13 +4862,13 @@ msgstr "Gyorselérési sáv maximális szélessége"
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
 msgstr ""
-"A véletlenszerűen egy térképdarabkára jutó nagy barlangok számának maximális "
+"A véletlenszerűen egy pályadarabkára jutó nagy barlangok számának maximális "
 "korlátja."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of small caves per mapchunk."
 msgstr ""
-"A véletlenszerűen egy térképdarabkára jutó kis barlangok számának maximális "
+"A véletlenszerűen egy pályadarabkára jutó kis barlangok számának maximális "
 "korlátja."
 
 #: src/settings_translation_file.cpp
@@ -4843,7 +4924,7 @@ msgid ""
 "Maximum number of mapblocks for client to be kept in memory.\n"
 "Set to -1 for unlimited amount."
 msgstr ""
-"Maximum térképblokkok száma, amit a kliens memóriában tárolhat.\n"
+"Maximum pályablokkok száma, amit a kliens memóriában tárolhat.\n"
 "Állítsd -1-re végtelen mennyiségért."
 
 #: src/settings_translation_file.cpp
@@ -4866,11 +4947,11 @@ msgstr "A megjelenítendő csevegésüzenetek maximális száma"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr "Statikusan tárolt objektumok maximális száma egy térképblokkban."
+msgstr "Statikusan tárolt objektumok maximális száma egy pályablokkban."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
-msgstr "Maximum objektumok térképblokkonként"
+msgstr "Objektumok maximális száma pályablokkonként"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4882,7 +4963,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends per client"
-msgstr "Az egyidejűleg a kliensenként küldött térképblokkok maximális száma"
+msgstr "Az egyidejűleg a kliensenként küldött pályablokkok maximális száma"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum size of the outgoing chat queue"
@@ -4894,7 +4975,7 @@ msgid ""
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
 "A kimenő üzenetek sorának maximális mérete.\n"
-"0 letiltja a várolistára helyezést, míg -1 korlátlanná teszi a sor méretét."
+"0 letiltja a várólistára helyezést, míg -1 korlátlanná teszi a sor méretét."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4938,18 +5019,23 @@ msgstr "A naplózás csevegésbe írásának minimális szintje."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr "Kistérkép letapogatási magasság"
+msgstr "Kistérkép-letapogatási magasság"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Lehelyezés-ismétlési időköz"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
-"A véletlenszerűen egy térképdarabkára jutó nagy barlangok számának minimális "
+"A véletlenszerűen egy pályadarabkára jutó nagy barlangok számának minimális "
 "korlátja."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of small caves per mapchunk."
 msgstr ""
-"A véletlenszerűen egy térképdarabkára jutó kis barlangok számának minimális "
+"A véletlenszerűen egy pályadarabkára jutó kis barlangok számának minimális "
 "korlátja."
 
 #: src/settings_translation_file.cpp
@@ -4974,7 +5060,7 @@ msgstr "Mod csatornák"
 
 #: src/settings_translation_file.cpp
 msgid "Modifies the size of the HUD elements."
-msgstr "A HUD elemméretét módosítja."
+msgstr "A műszerfal elemeinek méretét módosítja."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
@@ -5012,6 +5098,11 @@ msgstr "Egér érzékenysége"
 msgid "Mouse sensitivity multiplier."
 msgstr "Egér érzékenységi faktora."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Üreg küszöb"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Iszap zaj"
@@ -5035,9 +5126,9 @@ msgid ""
 "Current mapgens in a highly unstable state:\n"
 "-    The optional floatlands of v7 (disabled by default)."
 msgstr ""
-"Az új világ létrehozásakor használandó térképgenerátor neve.\n"
+"Az új világ létrehozásakor használandó pályagenerátor neve.\n"
 "Új világ főmenüben történő létrehozása felülírja ezt.\n"
-"Jelenleg a következő térképgenerátorok nagyon instabilak:\n"
+"Jelenleg a következő pályagenerátorok nagyon instabilak:\n"
 "-    Az opcionális lebegő földek a v7-ben (alapértelmezés szerint tiltott)."
 
 #: src/settings_translation_file.cpp
@@ -5091,7 +5182,7 @@ msgstr "Zajok"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
-msgstr "A térképblokk betöltő szálak száma"
+msgstr "A pályablokk-betöltő szálak száma"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5106,14 +5197,14 @@ msgid ""
 "processes, especially in singleplayer and/or when running Lua code in\n"
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
-"A térképblokkok betöltésére használt szálak száma.\n"
+"A pályablokkok betöltésére használt szálak száma.\n"
 "Érték 0:\n"
-"-    Automatikus választás. A térképblokkok betöltését végző szálak száma\n"
+"-    Automatikus választás. A pályablokkok betöltését végző szálak száma\n"
 "-    \"processzorok száma - 2\" lesz, de legalább 1.\n"
 "Bármilyen más érték:\n"
-"-    Meghatározza a térképblokkbetöltő szálak számát, amelynek alsó korlátja "
+"-    Meghatározza a pályablokkbetöltő szálak számát, amelynek alsó korlátja "
 "1.\n"
-"FIGYELEM: A térképblokkbetöltő szálak számának növelése növeli a játékmotor "
+"FIGYELEM: A pályablokkbetöltő szálak számának növelése növeli a játékmotor "
 "mapgen\n"
 "folyamatainak sebességét, de csökkentheti a játékteljesítményt azáltal, hogy "
 "más\n"
@@ -5148,15 +5239,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr "Elzáródási selejtező"
+msgstr "Kitakarásfigyelő"
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culling"
-msgstr "Elzáródási selejtezés"
-
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Átlátszatlan folyadékok"
+msgstr "Kitakarás figyelése"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5171,9 +5258,14 @@ msgid ""
 "formspec is\n"
 "open."
 msgstr ""
-"Megnyitja a szünet menüt, ha az ablak kikerül a fókuszból. Nem szünetel, ha "
-"nyitva van\n"
-"egy formspec panel."
+"Megnyitja a szünetelési menüt, mikor az ablak elveszti a fókuszt. Nem "
+"szünetel, ha nyitva van\n"
+"egy felugró ablak."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Pályagenerátor-hibakereső"
 
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
@@ -5314,6 +5406,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Nagy barlangok aránya amelyek folyadékot tartalmaznak."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokollverzió-eltérés. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5331,6 +5432,10 @@ msgstr "Megemeli a terepet, hogy völgyek alakuljanak a folyók körül."
 msgid "Random input"
 msgstr "Véletlenszerű bemenet"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Legutóbbi csevegésüzenetek"
@@ -5353,7 +5458,7 @@ msgid ""
 "Use this to stop players from being able to use color in their messages"
 msgstr ""
 "Színkódok eltávolítása a bejövő csevegésüzenetekből\n"
-"Használd ezt hogy megakadályozd, hogy a játékosok színeket használjanak az "
+"Használd ezt, hogy megakadályozd, hogy a játékosok színeket használjanak az "
 "üzeneteikben"
 
 #: src/settings_translation_file.cpp
@@ -5450,7 +5555,7 @@ msgstr "Homokos partok képződnek, ha az np_beach meghaladja ezt az értéket."
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr "A kliens által fogadott térkép mentése lemezre."
+msgstr "A kliens által fogadott pálya mentése lemezre."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5460,10 +5565,15 @@ msgid ""
 "is maximized is stored in window_maximized.\n"
 "(Autosaving window_maximized only works if compiled with SDL.)"
 msgstr ""
+"Az ablak mérete automatikusan mentve módosításkor.\n"
+"ha igaz, a képméret screen_w és screen_h-ban lesz mentve, és ha az ablak "
+"kinagyítódik,\n"
+"akkor a window_maximized-ben tárolja.\n"
+"(window_maximized auto-mentése csak az SDL-el építve működik)"
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr "A szerverről fogadott térkép mentése"
+msgstr "A szerverről fogadott pálya mentése"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5538,13 +5648,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Lásd: http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5558,18 +5669,37 @@ msgid ""
 "Renders higher-resolution image of the scene, then scales down to reduce\n"
 "the aliasing effects. This is the slowest and the most accurate method."
 msgstr ""
+"válasszon Antialiasing módot az alkalmazásához.\n"
+"\n"
+"*none-nincs (alapértelmezett)\n"
+"\n"
+"*FSAA-hardver általi teljesképernyős antialiasing, nem műkődik "
+"Árnyalókkal(shaders)\n"
+"illetve Többalapos antialiasing (MSAA)\n"
+"Kisimítja a blokkéleket,de nem érinti a textúrák belsejét.\n"
+"alkalmazásához újraindítás szükséges.\n"
+"\n"
+"*FXAA-gyors pontos antialiasing (shaders szükséges)\n"
+"alkalmaz egy post-processing filtert, hogy észlelje és simítsa a "
+"nagykontrasztú éleket.\n"
+"köztes a gyors és minőségi kép közt.\n"
+"\n"
+"*SSAA-Szuper-alapos antialiasing (shaders szükséges)\n"
+"Jobb képminőséget renderel a jelenetről, majd lekicsinyíti, hogy kissebb "
+"legyen\n"
+"az antialiasing effekt. ez a leglassabb és legpontosabb módszer."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr "Kijelölő doboz keret színe (R,G,B)."
+msgstr "Kijelölődoboz keret színe (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr "Kijelölő doboz színe"
+msgstr "Kijelölődoboz színe"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr "Kijelölő doboz szélessége"
+msgstr "Kijelölődoboz szélessége"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5639,16 +5769,15 @@ msgstr "Szerver leírása"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr "Szerver név"
+msgstr "Szervernév"
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
 msgstr "Szerver portja"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server-side occlusion culling"
-msgstr "Takarásban lévő térképblokkok szerveroldali kiválogatása"
+msgstr "Takarásban lévő pályablokkok szerveroldali kiválogatása"
 
 #: src/settings_translation_file.cpp
 msgid "Server/Env Performance"
@@ -5667,15 +5796,14 @@ msgid "Serverlist file"
 msgstr "Szerverlista fájl"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the default tilt of Sun/Moon orbit in degrees.\n"
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
-"A Nap/Hold pályájának fokokban mért döntési szögét szabályozza.\n"
-"A 0 érték azt jelenti, hogy nincs döntés / függőleges a pályájuk.\n"
-"Minimális érték: 0,0; maximális érték: 60,0"
+"Beállítja a Nap/Hold keringési szögét fokokban.\n"
+"Ezt játékok API-val módosíthatják.\n"
+"A 0-s érték döntés nélküli/ függőkeges pályát jelent."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5683,10 +5811,14 @@ msgid ""
 "Value of 0.0 (default) means no exposure compensation.\n"
 "Range: from -1 to 1.0"
 msgstr ""
+"Az exponálási kompenzáció beállítása EV egységekben.\n"
+"A 0.0 (alapértelmezett) érték esetén nincs kompenzáció.\n"
+"Értékhatár: -1-től 1.0-ig"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Nyelv beállítása. Hagyd üresen a rendszer nyelvének használatához.\n"
@@ -5696,7 +5828,7 @@ msgstr ""
 msgid ""
 "Set the maximum length of a chat message (in characters) sent by clients."
 msgstr ""
-"A csevegés maximális szöveghossza (karakterben) amelyet a kliensek "
+"A csevegés maximális szöveghossza (karakterben), amelyet a kliensek "
 "küldhetnek."
 
 #: src/settings_translation_file.cpp
@@ -5720,38 +5852,32 @@ msgstr ""
 "Minimális érték: 1.0; maximális érték: 15.0"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable Shadow Mapping."
-msgstr ""
-"Állítsa igazra az árnyéktérképezés (Shadow Mapping) engedélyezéséhez.\n"
-"Az árnyalók engedélyezése szükséges hozzá."
+msgstr "Állítsa igazra az árnyékleképezés (Shadow Mapping) engedélyezéséhez."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable bloom effect.\n"
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
+"Igaz értékre állítva ragyogási hatás lesz látható.\n"
+"A világos árnyalatok a szomszédos tárgyakra is átterjednek."
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving leaves."
-msgstr ""
-"A \"true\" beállítás engedélyezi a levelek hullámzását.\n"
-"Az árnyalók engedélyezése szükséges hozzá."
+msgstr "engedélyezés esetén a levelek hullámozni fognak."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving liquids (like water)."
-msgstr ""
-"A \"true\" beállítás engedélyezi a víz hullámzását.\n"
-"Az árnyalók engedélyezése szükséges hozzá."
+msgstr "Engedélyezés esetén a folyadékok (PL. víz) hullámzani fognak."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving plants."
-msgstr ""
-"A \"true\" beállítás engedélyezi a növények hullámzását.\n"
-"Az árnyalók engedélyezése szükséges hozzá."
+msgstr "Engedélyezés esetén a növények hullámzani fognak."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5760,6 +5886,10 @@ msgid ""
 "top-left - processed base image, top-right - final image\n"
 "bottom-left - raw base image, bottom-right - bloom texture."
 msgstr ""
+"Igaz értékre állítva a ragyogási hatás hibakereső képernyője jelenik meg.\n"
+"Hibakereső módban a képernyő négyfelé osztódik:\n"
+"bal-felül - feldolgozott kiindulási kép, jobb-felül - végső kép,\n"
+"bal-alul - nyers kiindulási kép, jobb-alul - ragyogás textúrája."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5777,14 +5907,14 @@ msgstr "Árnyaló útvonala"
 
 #: src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr "Árnyékolók"
+msgstr "Árnyalók"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Az árnyalók fejlett vizuális effekteket tesznek lehetővé és növelhetik a "
 "teljesítményt\n"
@@ -5801,11 +5931,11 @@ msgstr "Az árnyéktérkép maximális renderelési távolsága kockákban"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map texture in 32 bits"
-msgstr "32 bites árnyéktérkép textúra"
+msgstr "32 bites árnyéktérkép-textúra"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map texture size"
-msgstr "Árnyéktérkép textúra méret"
+msgstr "Árnyéktérkép textúrájának mérete"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5823,14 +5953,14 @@ msgstr "Hibakereső információ megjelenítése"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr "Entitások kijelölő dobozának megjelenítése"
+msgstr "Entitások kijelölődobozának megjelenítése"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Show entity selection boxes\n"
 "A restart is required after changing this."
 msgstr ""
-"Entitás hitboxok megjelenítése.\n"
+"Entitások kijelölődobozának megjelenítése.\n"
 "A változtatás után a játék újraindítása szükséges."
 
 #: src/settings_translation_file.cpp
@@ -5849,9 +5979,16 @@ msgid ""
 "draw calls, benefiting especially high-end GPUs.\n"
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
+"Oldalirányú hossza annak a pályablokk-kockának amelyet a kliens egynek "
+"tekint,\n"
+"amikor rácsgenerálást végez.\n"
+"A nagyobb értékek növelik a GPU kihasználtságát a rajzolási hívások "
+"csökkentésével,\n"
+"ami előnyös a nagy teljesítményű GPU-k számára.\n"
+"Gyenge GPU-val rendelkező (vagy anélküli) rendszerek számára kissebb értékek "
+"előnyösek."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
 "WARNING: There is no benefit, and there are several dangers, in\n"
@@ -5860,26 +5997,14 @@ msgid ""
 "Altering this value is for special usage, leaving it unchanged is\n"
 "recommended."
 msgstr ""
-"A mapgen által generált térképdarabka mérete térképblokkokban (16 kocka) "
-"mérve.\n"
+"A pályageneráló által generált pályadarabka mérete pályablokkokban (16 "
+"kocka) mérve.\n"
 "FIGYELEM!: Nincs értelme és bizonyos veszélyekkel is jár ennek az értéknek\n"
-"5 fölés emelése.\n"
-"Ha csökkentjük ezt az értéket, gyakrabban fordulnak elő barlangok és "
-"tömlöcök.\n"
+"5 fölé emelése.\n"
+"Ha csökkentjük ezt az értéket, gyakoribbak lesznek a barlangok és tömlöcök.\n"
 "Változtasd meg, ha valami különleges okból kell, de ajánlott\n"
 "változatlanul hagyni."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"A poligonhálót generáló MapBlock cache mérete. Növelése megnöveli a\n"
-"cache kiszolgálási teljesítményét, ezáltal csökken a fő szálból másolt "
-"adatok\n"
-"mennyisége, és ezáltal csökken a szaggatás."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Égitestek pályájának döntése"
@@ -5919,11 +6044,13 @@ msgstr "Lágy megvilágítás"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
-msgstr "A kameraforgást lágyítja operatőr módban. 0 a letiltáshoz."
+"cinematic mode by using the key set in Controls."
+msgstr ""
+"A kameraforgást lágyítja operatőr módban. 0 a letiltáshoz. Az operatőr módra "
+"váltáshoz nyomd meg a gombot, amelyet a Gombok megváltoztatásánál "
+"beállítottál."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
@@ -5941,6 +6068,15 @@ msgstr "Lopakodás sebessége kocka/másodpercben."
 msgid "Soft shadow radius"
 msgstr "Lágy árnyék sugara"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Hang"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB zászló feketelista"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5967,14 +6103,13 @@ msgstr ""
 "kötegek méretét bizonyos vagy az összes tárgy esetén."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread a complete update of shadow map over given number of frames.\n"
 "Higher values might make shadows laggy, lower values\n"
 "will consume more resources.\n"
 "Minimum value: 1; maximum value: 16"
 msgstr ""
-"Az árnyéktérkép firssítését széthúzza a megadott számú képkockára.\n"
+"Az árnyéktérkép firssítését szétterjeszti a megadott számú képkockára.\n"
 "Magasabb érték esetén az árnyékok késhetnek, alacsabb érékek\n"
 "viszont több erőforrást igényelnek.\n"
 "Minimális érték: 1; maximális érték: 16"
@@ -5990,7 +6125,6 @@ msgstr ""
 "A fénygörbe kiemelés Gauss-görbéjének szórása."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Static spawn point"
 msgstr "Statikus újraéledési pont"
 
@@ -6029,7 +6163,6 @@ msgid "Strip color codes"
 msgstr "Színkódok kinyerése"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Surface level of optional water placed on a solid floatland layer.\n"
 "Water is disabled by default and will only be placed if this value is set\n"
@@ -6042,7 +6175,7 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
-"Az egybefüggő lebegő föld rétegre opcionálisan helyezhető vízfelület "
+"Az egybefüggő lebegő földrétegre opcionálisan helyezhető vízfelület "
 "szintje.\n"
 "Alapértelmezésben a víz nem engedélyezett és csak akkor helyezi le, ha ez "
 "az\n"
@@ -6050,10 +6183,9 @@ msgstr ""
 "vékonyítás\n"
 "felső részének kezdete).\n"
 "***FIGYELEM! VESZÉLYES LEHET A VILÁGOKRA ÉS A SZERVERTELJESÍTMÉNYRE***:\n"
-"Ha endgedélyezve van a vízlehelyezés, úgy kell konfigurálni a lebegő "
-"földeket és\n"
-"tesztelni kell, hogy valóban egybefüggő réteget alkosson, az "
-"'mgv7_floatland_density'\n"
+"Ha engedélyezve van a vízlehelyezés, úgy kell konfigurálni és tesztelni a "
+"lebegő földeket,\n"
+"hogy valóban egybefüggő réteget alkosson, az 'mgv7_floatland_density'\n"
 "értékének 2,0-nak (vagy az 'mgv7_np_floatland'-től függően más szükséges "
 "értéknek)\n"
 "kell lenni, hogy elkerülhető legyen a szervert leterhelő extrém vízfolyás és "
@@ -6160,24 +6292,42 @@ msgstr ""
 "formátum nélkül kerül meghívásra a `/profiler save [format]` parancs."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 "A profilok mentésének relatív elérési útja a világod elérési útjához képest."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "A használni kívánt joystick azonosítója"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Az érintőképernyős interakció aktiválódásához szükséges távolság pixelekben."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The maximum height of the surface of waving liquids.\n"
 "4.0 = Wave height is two nodes.\n"
@@ -6187,9 +6337,18 @@ msgstr ""
 "A hullámzó folyadékok felszínének maximális magassága.\n"
 "4,0 = A hullámok magasága két kocka.\n"
 "0,0 = A hullámok egyáltalán nem mozognak.\n"
-"Az alapértelmezett érték 1,0 (1/2 kocka).\n"
+"Az alapértelmezett érték 1,0 (1/2 node/kocka).\n"
 "A hullámzó folyadék engedélyezése szükséges hozzá."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Az az idő másodpercben kifejezve, amely a csomópontok ismételt elhelyezése\n"
+"között telik el, amikor lenyomva tartja az elhelyezés gombot."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "A hálózati interfész, amelyen a szerver figyel."
@@ -6214,7 +6373,7 @@ msgid ""
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
 "A játékosok körüli blokktérfogat sugara, amelyen belül érvényesülnek\n"
-"az aktív blokkok dolgai. Térképblokkban (16 kocka) mérve.\n"
+"az aktív blokkok dolgai. Pályablokkban (16 kocka) mérve.\n"
 "Az aktív blokkokban betöltődnek az objektumok és ABM-ek futnak.\n"
 "Ez egyben az a legkisebb sugár is, amelyen belül az aktív objektumokról "
 "(mobok) gondoskodik a játék.\n"
@@ -6227,15 +6386,15 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "A renderelő háttérprogram.\n"
 "Ha ezt megváltoztatod, újraindítás szükséges.\n"
 "Megjegyzés: Androidon, hagyd OGLES1-en, ha bizonytalan vagy! Lehet, hogy nem "
 "indul az app különben.\n"
 "Más platformokon az OpenGL az ajánlott.\n"
-"Az árnyalókat az OpenGL (csak asztali rendszeren) és OGLES2 (kísérleti) "
-"támogatja"
+"Az árnyalókat (Shaders) az OpenGL (csak asztali rendszeren) és OGLES2 "
+"(kísérleti) támogatja."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6252,7 +6411,7 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
-"A körülvett, illetve takarásban lévő kockák árnyékolásának erőssége "
+"A kockák környezeti megvilágításból fakadó árnyékolásának erőssége "
 "(sötétsége).\n"
 "Alacsonyabb érték sötétebb, magasabb érték világosabb. E beállítás érvényes\n"
 "értéktartománya 0,25-től 4,0-ig terjed. Ha a tartományon kívüli értéket "
@@ -6299,7 +6458,6 @@ msgid "The type of joystick"
 msgstr "A joystick típusa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
@@ -6317,6 +6475,10 @@ msgstr ""
 "A harmadik a négy 2D zajból, amelyek együttesen meghatározzák a dombságok/"
 "hegységek magasságát."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6340,7 +6502,7 @@ msgstr "Idő sebessége"
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory, in seconds."
 msgstr ""
-"A kliens számára a fel nem használt térképadatok memóriából való "
+"A kliens számára a fel nem használt pályaadatok memóriából való "
 "eltávolításának időkorlátja másodpercben."
 
 #: src/settings_translation_file.cpp
@@ -6364,24 +6526,22 @@ msgid "Touchscreen"
 msgstr "Érintőképernyő"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "Egér érzékenysége"
+msgstr "Az érintőképernyő érzékenysége"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "Egér érzékenységi faktora."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Érintőképernyő érzékenysége"
+msgstr "Az érintőképernyő érzékenységi többszörözője."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Teljesítménybeli kompromisszumok"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Átlátszatlan folyadékok"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Átlátszósági rendezési távolság"
@@ -6417,11 +6577,22 @@ msgid ""
 "\n"
 "This setting should only be changed if you have performance problems."
 msgstr ""
+"A kitakarásfigyelő típusa\n"
+"\n"
+"\"loops\" a hagyományos algoritmus egymásba ágyazott ciklusokkal és O(n³) "
+"bonyolultsággal\n"
+"\"bfs\" az új szélességi keresésen és oldalsó kiválogatáson alapuló "
+"algoritmus\n"
+"\n"
+"Ez a beállítás csak teljesítményhibák esetén állítandó át."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
-msgstr ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr "A JSON fájl URL-ja a legújabb Minetest kiadásról"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6456,7 +6627,7 @@ msgstr "A használaton kívüli szerveradatok eltávolítása a memóriából"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "Frissítési információ URL-ja"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
@@ -6475,27 +6646,26 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "Felhő animáció használata a főmenü háttereként."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when looking at textures from an angle."
-msgstr "Anizotróp szűrés használata, ha egy szögből nézzük a textúrákat."
+msgstr "Anizotróp szűrés használata, ha adott szögből nézzük a textúrákat."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Trilineáris szűrés a textúrák méretezéséhez."
+msgstr "Bilineáris szűrés a textúrák méretezéséhez."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "Célkereszt haszálata érintőképernyőn"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
+"Célkereszt használata tárgyak kijelöléséhez a teljes képernyő helyett.\n"
+"engedélyezés esetén egy célkereszt fog objektumokra mutatni a kijelzőn."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
@@ -6511,6 +6681,9 @@ msgid ""
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
+"Sugárkövetés használata az új kitakarásfigyelőhöz.\n"
+"Ez a beállítás engedélyezi a sugárkövetéses kitakarástesztelést\n"
+"a 4x4x4 pályablokknál kisebb térrészekhez a kliensben."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6518,15 +6691,17 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"Trilineáris szűrő használata textúrák méretezésekor.\n"
+"ha a trilineáris és a bilineáris is engedélyezett, a trilineáris\n"
+"fog érvénybe lépni."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use virtual joystick to trigger \"Aux1\" button.\n"
 "If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
 "circle."
 msgstr ""
-"(Android) Használd a virtuális joystickot az \"Aux1\" gomb működtetéséhez.\n"
+"(Android) Használd a virtuális botkormányt az \"Aux1\" gomb működtetéséhez.\n"
 "Ha ez engedélyezve van, akkor a virtuális joystick fő körén kívülre húzáskor "
 "az \"Aux1\" gomb is lenyomódik."
 
@@ -6534,10 +6709,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Felhasználói felületek"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Függőleges szinkron"
@@ -6603,6 +6774,9 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
+"Függőleges képernyő szinkronizálás (VSync). a rendszer\n"
+"akkor is engedélyezettre kényszerítheti, ha itt\n"
+"ki van kapcsolva."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6610,7 +6784,7 @@ msgstr "Videó driver"
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing factor"
-msgstr "Fejbillegési faktor"
+msgstr "Fejbillegés mértéke"
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
@@ -6628,6 +6802,10 @@ msgstr "A virtuális joystick működteti az Aux1 gombot"
 msgid "Volume"
 msgstr "Hangerő"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6636,6 +6814,16 @@ msgstr ""
 "Az összes hang hangereje.\n"
 "A hangrendszer engedélyezésére van szükség hozzá."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS, amikor a játék meg van állítva, vagy nincs fókuszban"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Lágy megvilágítás"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6755,13 +6943,13 @@ msgid ""
 "Mods may still set a background."
 msgstr ""
 "Látszódjon-e a névcédulák háttere alapértelmezésként.\n"
-"A modok ettől még a beállíthatják a hátteret."
+"A modok ettől még beállíthatják a hátteret."
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Legyen-e független a kockák textúraanimációinak időzítése az egyes "
-"térképblokkokban."
+"pályablokkokban."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6773,7 +6961,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "Amikor az ablak teljes képernyős."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6806,18 +6994,16 @@ msgstr ""
 "A hibakereső információ megjelenítése (ugyanaz a hatás, ha F5-öt nyomunk)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
-msgstr ""
-"A kezdőablak szélessége. Teljes képernyős módban nem kerül figyelmbe vételre."
+msgstr "A kezdeti ablakméret szélesség-komponense."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
-msgstr "A kijelölésdoboz vonalainak szélessége a kockák körül."
+msgstr "A kijelölődoboz vonalainak szélessége a kockák körül."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Az ablak már teljes képernyős"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6936,12 +7122,18 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "(game support required)"
 #~ msgstr "(játéktámogatás szükséges)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Cím: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreatív mód: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Sérülés: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6979,6 +7171,13 @@ msgstr "cURL párhuzamossági korlát"
 #~ "Hagyd üresen helyi szerver indításához.\n"
 #~ "Megjegyzés: a cím mező a főmenüben felülírja ezt a beállítást."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Dpi konfiguráció igazítása a képernyődhöz (nem X11/csak Android) pl. 4k "
+#~ "képernyőkhöz."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7031,6 +7230,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bit/pixel (vagyis színmélység) teljes képernyős módban."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blokkhatárok mutatása minden blokk esetén"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump mapping"
 
@@ -7053,6 +7255,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Kamera frissítés váltása gomb"
 
+#~ msgid "Change Keys"
+#~ msgstr "Gombok megváltoztatása"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Gombok megváltoztatása"
@@ -7129,6 +7334,38 @@ msgstr "cURL párhuzamossági korlát"
 #~ "A járatok szélességét határozza meg, alacsonyabb érték szélesebb "
 #~ "járatokat hoz létre."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Irányítás:\n"
+#~ "- %s: mozgás előre\n"
+#~ "- %s: mozgás hátra\n"
+#~ "- %s: mozgás balra\n"
+#~ "- %s: mozgás jobbra\n"
+#~ "- %s: ugrás/mászás\n"
+#~ "- %s: ásás/ütés/használat\n"
+#~ "- %s: letevés/használat\n"
+#~ "- %s: lopakodás/lefelé mászás\n"
+#~ "- %s: tárgy eldobása\n"
+#~ "- %s: leltár\n"
+#~ "- Egér: forgás/nézelődés\n"
+#~ "- Egérgörgő: tárgy kiválasztása\n"
+#~ "- %s: csevegés\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreatív"
 
@@ -7138,6 +7375,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Célkereszt színe (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Sérülés"
 
@@ -7223,6 +7463,13 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Regisztráció megerősítés engedélyezése"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Vertex buffer objektumok engedélyezése.\n"
+#~ "Ez nagyban javíthatja a grafikus teljesítményt."
+
 #~ msgid "Enabled"
 #~ msgstr "Engedélyezve"
 
@@ -7516,6 +7763,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Instrumentation"
 #~ msgstr "Behangolás"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Érvénytelen játékmeghatározás."
+
 #~ msgid "Inventory key"
 #~ msgstr "Felszerelés gomb"
 
@@ -8208,6 +8458,12 @@ msgstr "cURL párhuzamossági korlát"
 #~ "Lehetővé teszi, hogy a DirectX működjön a LuaJIT-tel. Tiltsd le, ha "
 #~ "problémákat okoz."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Az összes folyadékot átlátszatlanná teszi"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Pályablokkrács-generátorok MapBlock-gyorsítótár mérete MB-ban"
+
 #~ msgid "Menus"
 #~ msgstr "Menük"
 
@@ -8408,15 +8664,22 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Simple Leaves"
 #~ msgstr "Egyszerű levelek"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "A poligonhálót generáló MapBlock cache mérete. Növelése megnöveli a\n"
+#~ "cache kiszolgálási teljesítményét, ezáltal csökken a fő szálból másolt "
+#~ "adatok\n"
+#~ "mennyisége, és ezáltal csökken a szaggatás."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Lágy megvilágítás"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Kameraforgás lágyítása. 0 = letiltás."
 
-#~ msgid "Sound"
-#~ msgstr "Hang"
-
 #~ msgid "Special"
 #~ msgstr "Különleges"
 
@@ -8472,6 +8735,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Érintésküszöb (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Érintőképernyő érzékenysége"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineáris szűrés"
 
@@ -8509,6 +8775,9 @@ msgstr "cURL párhuzamossági korlát"
 #~ "engedélyezve. Ha 0-ra van állítva, az MSAA tiltva van.\n"
 #~ "E beállítás megváltoztatása után újraindítás szükséges."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "Függőleges képernyő szinkronizálás."
 
@@ -8584,8 +8853,14 @@ msgstr "cURL párhuzamossági korlát"
 #~ msgid "You died."
 #~ msgstr "Meghaltál."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nincsenek játékok telepítve."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/ia/minetest.po b/po/ia/minetest.po
index 19207e731..8f7ae5d50 100644
--- a/po/ia/minetest.po
+++ b/po/ia/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Interlingua <https://hosted.weblate.org/projects/minetest/"
@@ -76,7 +76,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -85,11 +85,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -108,6 +104,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -136,173 +136,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -449,10 +456,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -815,10 +832,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -828,7 +841,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1031,6 +1045,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1064,7 +1088,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1144,18 +1168,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1180,24 +1196,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1232,10 +1244,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1280,6 +1288,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1288,32 +1300,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1393,6 +1386,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1413,10 +1410,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1572,10 +1565,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1896,6 +1885,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2085,6 +2083,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2118,6 +2128,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ia"
 
@@ -2303,12 +2314,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2331,6 +2336,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2384,6 +2393,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2405,12 +2425,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2473,6 +2502,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2685,6 +2718,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2816,10 +2855,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2869,6 +2904,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3053,6 +3101,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3072,6 +3124,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3114,6 +3170,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3137,6 +3197,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3145,12 +3209,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3180,6 +3238,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3974,9 +4045,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4122,10 +4194,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4174,7 +4242,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4209,10 +4279,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4454,6 +4520,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4522,6 +4592,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4630,10 +4704,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4646,6 +4716,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4755,6 +4829,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4770,6 +4852,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4957,8 +5043,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5076,7 +5162,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5109,6 +5195,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5148,8 +5238,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5219,13 +5308,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5261,7 +5343,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5282,6 +5364,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5438,17 +5528,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5459,6 +5569,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5485,7 +5601,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5542,6 +5658,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5589,11 +5709,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5631,7 +5751,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5729,10 +5851,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5819,12 +5937,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 41b373a2c..d8cd40813 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -2,10 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Indonesian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-29 21:30+0000\n"
-"Last-Translator: Muhammad Rifqi Priyo Susanto "
-"<muhammadrifqipriyosusanto@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-03-29 15:47+0000\n"
+"Last-Translator: Just Playing <aryadhisuma@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
 "minetest/id/>\n"
 "Language: id\n"
@@ -13,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -72,7 +71,8 @@ msgid "Command not available: "
 msgstr "Perintah tidak tersedia: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Dapatkan bantuan untuk perintah-perintah"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +83,10 @@ msgstr ""
 "all' untuk menampilkan semuanya."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[semua | <perintah>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Oke"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<tidak ada yang tersedia>"
@@ -106,6 +103,10 @@ msgstr "Sebuah masalah terjadi:"
 msgid "Main menu"
 msgstr "Menu utama"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Oke"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Sambung ulang"
@@ -134,19 +135,27 @@ msgstr "Kami hanya mendukung protokol versi $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Kami mendukung protokol antara versi $1 dan versi $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" telah ada. Apakah Anda mau menimpanya?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Terjadi masalah saat memasang \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 dan $2 dependensi akan dipasang."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Gagal mengunduh \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 oleh $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Gagal mengunduh $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Gagak mengekstrak \"$1\" (jenis berkas tidak didukung atau arsip rusak)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,157 +163,157 @@ msgstr ""
 "$1 sedang diunduh,\n"
 "$2 dalam antrean"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
-msgstr "$1 diunduh..."
+msgstr "$1 Diunduh..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 memerlukan dependensi yang tidak bisa ditemukan."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 akan dipasang dan $2 dependensi akan dilewatkan."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Semua paket"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Telah terpasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Kembali ke Menu Utama"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB tidak tersedia saat Minetest dikompilasi tanpa cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Mengunduh..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Permainan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Pasang"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Memuat..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Tiada paket yang dapat diambil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Tidak ada hasil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Tiada pembaruan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Diantrekan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paket tekstur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Paket $1 tidak ditemukan."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Copot"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Perbarui"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Perbarui Semua [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Lihat informasi lebih lanjut di peramban web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Anda perlu pasang sebuah permainan sebelum pasang sebuah mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 dan $2 dependensi akan dipasang."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 oleh $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 memerlukan dependensi yang tidak bisa ditemukan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 akan dipasang dan $2 dependensi akan dilewatkan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Telah terpasang"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Permainan Dasar:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Batal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB tidak tersedia saat Minetest dikompilasi tanpa cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependensi:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Mengunduh..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Terjadi masalah saat memasang \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Gagal mengunduh \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Gagal mengunduh $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Gagak mengekstrak \"$1\" (jenis berkas tidak didukung atau arsip rusak)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Permainan"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Pasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Pasang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Pasang dependensi yang kurang"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Memuat..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Tiada paket yang dapat diambil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Tidak ada hasil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Tiada pembaruan"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Tidak ditemukan"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Timpa"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Harap pastikan bahwa permainan dasar telah sesuai."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Diantrekan"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" telah ada. Apakah Anda mau menimpanya?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paket tekstur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Paket $1 tidak ditemukan."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Copot"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Perbarui"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Perbarui Semua [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Lihat informasi lebih lanjut di peramban web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Anda perlu pasang sebuah permainan sebelum pasang sebuah mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Timpa"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -344,7 +353,7 @@ msgstr "(Tidak terpenuhi)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "Matikan semua"
+msgstr "Nonaktifkan semua"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
@@ -452,10 +461,20 @@ msgstr "Buat"
 msgid "Decorations"
 msgstr "Dekorasi"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test ditujukan untuk para pengembang."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Dungeon"
@@ -832,10 +851,6 @@ msgstr "Aksesibilitas"
 msgid "Back"
 msgstr "Kembali"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Ubah Tombol"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -843,9 +858,10 @@ msgstr "Obrolan"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Clear"
-msgstr "Clear"
+msgstr "Bersihkan/Jernih"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Kontrol"
 
@@ -1050,6 +1066,17 @@ msgstr "Pasang permainan"
 msgid "Install games from ContentDB"
 msgstr "Pasang permainan dari ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game tidak lagi dipasang secara bawaan"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Baru"
@@ -1083,8 +1110,9 @@ msgid "Start Game"
 msgstr "Mulai Permainan"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Anda tidak punya permainan yang terpasang."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Anda perlu pasang sebuah permainan sebelum pasang sebuah mod"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1163,18 +1191,10 @@ msgstr "Memuat tekstur..."
 msgid "Rebuilding shaders..."
 msgstr "Membangun ulang shader..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Sambungan bermasalah (terlalu lama?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Tidak dapat mencari atau memuat permainan: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Spesifikasi permainan tidak sah."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu Utama"
@@ -1199,7 +1219,11 @@ msgstr "Berkas kata sandi yang diberikan gagal dibuka: "
 msgid "Provided world path doesn't exist: "
 msgstr "Jalur dunia yang diberikan tidak ada: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1207,18 +1231,10 @@ msgstr ""
 "\n"
 "Periksa debug.txt untuk detail."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Alamat: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mode: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Porta: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Publik: "
@@ -1253,10 +1269,6 @@ msgstr "Maju otomatis dinyalakan"
 msgid "Block bounds hidden"
 msgstr "Batasan blok disembunyikan"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Batasan blok ditampilkan untuk semua blok"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Batasan blok ditampilkan untuk blok saat ini"
@@ -1301,6 +1313,10 @@ msgstr "Skrip sisi klien dimatikan"
 msgid "Connecting to server..."
 msgstr "Menyambung ke server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Sambungan bermasalah (terlalu lama?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Sambungan gagal karena sebab yang tidak diketahui"
@@ -1310,45 +1326,13 @@ msgid "Continue"
 msgstr "Lanjutkan"
 
 #: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kontrol:\n"
-"- %s: maju\n"
-"- %s: mundur\n"
-"- %s: ke kiri\n"
-"- %s: ke kanan\n"
-"- %s: lompat/panjat\n"
-"- %s: gali/pukul/gunakan\n"
-"- %s: taruh/gunakan\n"
-"- %s: menyelinap/turun\n"
-"- %s: jatuhkan barang\n"
-"- %s: inventaris\n"
-"- Tetikus: belok/toleh\n"
-"- Roda tetikus: pilih barang\n"
-"- %s: obrolan\n"
-
-#: src/client/game.cpp
+#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1440,6 +1424,11 @@ msgstr "Kabut dimatikan"
 msgid "Fog enabled"
 msgstr "Kabut dinyalakan"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zum sedang dilarang oleh permainan atau mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informasi permainan:"
@@ -1460,10 +1449,6 @@ msgstr "Definisi barang..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1626,10 +1611,6 @@ msgstr "Rangka kawat ditampilkan"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zum sedang dilarang oleh permainan atau mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "oke"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Obrolan sedang dilarang oleh permainan atau mod"
@@ -1702,7 +1683,7 @@ msgstr "Erase OEF"
 
 #: src/client/keycode.cpp
 msgid "Execute"
-msgstr "Execute"
+msgstr "Menjalankan"
 
 #: src/client/keycode.cpp
 msgid "Help"
@@ -1714,23 +1695,23 @@ msgstr "Home"
 
 #: src/client/keycode.cpp
 msgid "IME Accept"
-msgstr "IME Accept"
+msgstr "IME Terima"
 
 #: src/client/keycode.cpp
 msgid "IME Convert"
-msgstr "IME Convert"
+msgstr "IME Konversi"
 
 #: src/client/keycode.cpp
 msgid "IME Escape"
-msgstr "IME Escape"
+msgstr "IME Pelarian"
 
 #: src/client/keycode.cpp
 msgid "IME Mode Change"
-msgstr "IME Mode Change"
+msgstr "IME Perubahan Mode"
 
 #: src/client/keycode.cpp
 msgid "IME Nonconvert"
-msgstr "IME Nonconvert"
+msgstr "IME Tidak Berkonversi"
 
 #: src/client/keycode.cpp
 msgid "Insert"
@@ -1775,67 +1756,67 @@ msgstr "Num Lock"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
-msgstr "Numpad *"
+msgstr "Papan Angka *"
 
 #: src/client/keycode.cpp
 msgid "Numpad +"
-msgstr "Numpad +"
+msgstr "Papan Angka +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
-msgstr "Numpad -"
+msgstr "Papan Angka -"
 
 #: src/client/keycode.cpp
 msgid "Numpad ."
-msgstr "Numpad ."
+msgstr "Papan Angka ."
 
 #: src/client/keycode.cpp
 msgid "Numpad /"
-msgstr "Numpad /"
+msgstr "Papan Angka /"
 
 #: src/client/keycode.cpp
 msgid "Numpad 0"
-msgstr "Numpad 0"
+msgstr "Papan Angka 0"
 
 #: src/client/keycode.cpp
 msgid "Numpad 1"
-msgstr "Numpad 1"
+msgstr "Papan Angka 1"
 
 #: src/client/keycode.cpp
 msgid "Numpad 2"
-msgstr "Numpad 2"
+msgstr "Papan Angka 2"
 
 #: src/client/keycode.cpp
 msgid "Numpad 3"
-msgstr "Numpad 3"
+msgstr "Papan Angka 3"
 
 #: src/client/keycode.cpp
 msgid "Numpad 4"
-msgstr "Numpad 4"
+msgstr "Papan Angka 4"
 
 #: src/client/keycode.cpp
 msgid "Numpad 5"
-msgstr "Numpad 5"
+msgstr "Papan Angka 5"
 
 #: src/client/keycode.cpp
 msgid "Numpad 6"
-msgstr "Numpad 6"
+msgstr "Papan Angka 6"
 
 #: src/client/keycode.cpp
 msgid "Numpad 7"
-msgstr "Numpad 7"
+msgstr "Papan Angka 7"
 
 #: src/client/keycode.cpp
 msgid "Numpad 8"
-msgstr "Numpad 8"
+msgstr "Papan Angka 8"
 
 #: src/client/keycode.cpp
 msgid "Numpad 9"
-msgstr "Numpad 9"
+msgstr "Papan Angka 9"
 
 #: src/client/keycode.cpp
 msgid "OEM Clear"
-msgstr "OEM Clear"
+msgstr "OEM Bersihkan"
 
 #: src/client/keycode.cpp
 msgid "Page Down"
@@ -1852,12 +1833,12 @@ msgstr "Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
-msgstr "Play"
+msgstr "Main"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
 msgid "Print"
-msgstr "Print"
+msgstr "Cetak"
 
 #: src/client/keycode.cpp
 msgid "Return Key"
@@ -1894,7 +1875,7 @@ msgstr "Scroll Lock"
 #. ~ Key name
 #: src/client/keycode.cpp
 msgid "Select"
-msgstr "Select"
+msgstr "Pilih"
 
 #: src/client/keycode.cpp
 msgid "Shift Key"
@@ -1902,7 +1883,7 @@ msgstr "Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
-msgstr "Sleep"
+msgstr "Tidur"
 
 #: src/client/keycode.cpp
 msgid "Snapshot"
@@ -1950,6 +1931,15 @@ msgstr "Peta mini mode permukaan, Zum %dx"
 msgid "Minimap in texture mode"
 msgstr "Peta mini mode tekstur"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Gagal membuka laman web"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2143,6 +2133,19 @@ msgstr "Zum"
 msgid "press key"
 msgstr "tekan tombol"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Gagal membuka laman web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Ubah"
@@ -2176,6 +2179,7 @@ msgstr "Volume Suara: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "id"
 
@@ -2396,14 +2400,6 @@ msgstr "Batas pengiriman objek aktif"
 msgid "Adds particles when digging a node."
 msgstr "Tambahkan partikel saat menggali nodus."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Atur konfigurasi dpi ke layar Anda (selain X11/Android saja) misalnya untuk "
-"layar 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2433,6 +2429,10 @@ msgstr "Nama pengurus"
 msgid "Advanced"
 msgstr "Lanjutan"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2491,6 +2491,17 @@ msgstr "Sisipkan nama barang pada tooltip."
 msgid "Apple trees noise"
 msgstr "Noise pohon apel"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Kelembaman tangan"
@@ -2508,18 +2519,37 @@ msgid "Ask to reconnect after crash"
 msgstr "Minta untuk menyambung ulang setelah mogok"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Pada jarak ini, server akan melakukan optimasi dengan agresif terhadap\n"
+"blok yang dikirim kepada klien.\n"
+"Nilai yang kecil dapat meningkatkan kinerja dengan glitch pada tampilan\n"
+"(beberapa blok di bawah air dan dalam gua tidak akan digambar,\n"
+"terkadang juga di darat).\n"
+"Nilai yang lebih besar daripada max_block_send_distance mematikan\n"
+"optimasi ini.\n"
+"Dalam satuan blok peta (16 nodus)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Pada jarak ini, server akan melakukan optimasi dengan agresif terhadap\n"
 "blok yang dikirim kepada klien.\n"
@@ -2590,13 +2620,18 @@ msgstr "API Bioma"
 msgid "Biome noise"
 msgstr "Noise bioma"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Jarak optimasi pengiriman blok"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Jarak optimasi pengiriman blok"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr "Bloom"
+msgstr "Bloom(Bunga)"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
@@ -2612,7 +2647,7 @@ msgstr "Pengali Kekuatan Bloom"
 
 #: src/settings_translation_file.cpp
 msgid "Bobbing"
-msgstr "Bobbing"
+msgstr "Bobbing(Terombang-Ambing)"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
@@ -2806,6 +2841,12 @@ msgstr "Kabut berwarna"
 msgid "Colored shadows"
 msgstr "Bayangan berwarna"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2972,10 +3013,6 @@ msgstr ""
 "Warna crosshair (merah,hijau,biru atau R,G,B),\n"
 "sekaligus mengatur warna crosshair objek"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Ambang batas ukuran log awakutu"
@@ -3030,6 +3067,24 @@ msgstr ""
 "Ini menyimulasikan efek bayangan halus dengan menerapkan PCF atau\n"
 "diska Poisson, tetapi menggunakan sumber daya lebih banyak."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Nyalakan untuk melarang sambungan dari klien lawas.\n"
+"Klien lawas dianggap sesuai jika mereka tidak mogok saat menyambung ke "
+"server-\n"
+"server baru, tetapi mungkin tidak mendukung semua fitur baru yang diharapkan."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Menetapkan daerah tempat pohon punya apel."
@@ -3232,6 +3287,11 @@ msgstr "Nyalakan Bloom"
 msgid "Enable Bloom Debug"
 msgstr "Nyalakan Awakutu Bloom"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Nyalakan Kerusakan"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3258,6 +3318,11 @@ msgstr ""
 "Nilai true berarti menggunakan diska Poisson untuk \"bayangan halus\". Nilai "
 "lain berarti menggunakan filter PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Pasca-Pengolahan"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Nyalakan Raytraced Culling"
@@ -3307,6 +3372,11 @@ msgstr "Nyalakan pengamanan mod"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr "Nyalakan roda tetikus (gulir) untuk memilih barang dalam hotbar."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Gunakan masukan pengguna acak (hanya digunakan untuk pengujian)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Gunakan masukan pengguna acak (hanya digunakan untuk pengujian)."
@@ -3336,6 +3406,11 @@ msgstr ""
 "server-\n"
 "server baru, tetapi mungkin tidak mendukung semua fitur baru yang diharapkan."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Layar Sentuh"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3347,14 +3422,6 @@ msgstr ""
 "Server jarak jauh menawarkan cara lebih cepat untuk mengunduh media\n"
 "(misal tekstur) saat tersambung ke server."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Nyalakan vertex buffer object.\n"
-"Ini dapat meningkatkan kinerja grafika."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3393,6 +3460,19 @@ msgstr "Jalankan animasi barang inventaris."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Gunakan tembolok untuk facedir mesh yang diputar."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4318,10 +4398,12 @@ msgstr ""
 "-   Opaque: matikan transparansi"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Lama detikan server dan selang waktu bagi objek secara umum untuk "
 "diperbarui\n"
@@ -4497,10 +4579,6 @@ msgstr ""
 "Buat warna kabut dan langit tergantung pada waktu (fajar/magrib) dan arah "
 "pandangan."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Buat semua cairan buram"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Tingkat Kompresi Peta untuk Penyimpanan Diska"
@@ -4556,11 +4634,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atribut pembuatan peta khusus untuk pembuat peta v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Atribut pembuatan peta khusus untuk pembuat peta v6.\n"
 "Flag \"snowbiomes\" menyalakan sistem 5 bioma yang baru.\n"
@@ -4603,10 +4684,6 @@ msgstr "Jarak waktu pembuatan mesh blok peta"
 msgid "Mapblock mesh generation threads"
 msgstr "Utas pembuatan mesh blok peta"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Ukuran tembolok blok peta dari pembuat mesh blok peta dalam MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Batas waktu pembongkaran blok peta"
@@ -4875,6 +4952,11 @@ msgstr "Tingkat minimal log untuk ditulis ke obrolan."
 msgid "Minimap scan height"
 msgstr "Ketinggian pemindaian peta mini"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Jeda waktu menaruh berulang"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Batas minimal nilai acak untuk gua besar per potongan peta."
@@ -4885,7 +4967,7 @@ msgstr "Batas minimal nilai acak untuk gua kecil per potongan peta."
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr "Mipmapping"
+msgstr "Pemetaan Ulang"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
@@ -4943,6 +5025,11 @@ msgstr "Kepekaan tetikus"
 msgid "Mouse sensitivity multiplier."
 msgstr "Pengali kepekaan tetikus."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Ambang batas gua besar"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Noise lumpur"
@@ -5075,15 +5162,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr "Occlusion Culler"
+msgstr "Oklusi Culler"
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culling"
-msgstr "Occlusion Culling"
-
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Cairan opak"
+msgstr "Pemusnahan Oklusi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5100,6 +5183,11 @@ msgstr ""
 "sedang \n"
 "dibuka."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Awakutu pembuat peta"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Penimpaan opsional untuk warna tautan web pada obrolan."
@@ -5231,6 +5319,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Perbandingan gua besar yang punya cairan."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Versi protokol tidak sesuai. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5248,6 +5345,10 @@ msgstr "Menaikkan medan untuk membuat lembah di sekitar sungai."
 msgid "Random input"
 msgstr "Masukan acak"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Pesan Obrolan Terkini"
@@ -5457,13 +5558,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Lihat https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5623,8 +5725,9 @@ msgstr ""
 "Rentang: dari -1 ke 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Atur bahasa. Biarkan kosong untuk menggunakan bahasa sistem.\n"
@@ -5669,6 +5772,10 @@ msgstr ""
 "Atur ke true untuk menyalakan efek bloom.\n"
 "Warna terang akan merambat ke objek di sekitarnya."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Atur ke true untuk menyalakan daun melambai."
@@ -5712,11 +5819,11 @@ msgid "Shaders"
 msgstr "Shader"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shader membolehkan efek visual tingkat lanjut dan dapat meningkatkan "
 "kinerja\n"
@@ -5807,16 +5914,6 @@ msgstr ""
 "Mengubah nilai ini untuk kegunaan khusus, membiarkannya \n"
 "disarankan."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Ukuran dari tembolok blok peta dari pembuat mesh. Menaikkan ini akan\n"
-"menambah persentase cache hit, mengurangi data yang disalin dari\n"
-"utas utama, sehingga mengurangi jitter."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Kemiringan Orbit Benda Langit"
@@ -5850,9 +5947,10 @@ msgid "Smooth lighting"
 msgstr "Pencahayaan halus"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Menghaluskan rotasi kamera dalam modus sinema, 0 untuk mematikannya. Masuk "
 "mode sinema dengan tombol yang diatur di Ubah Tombol."
@@ -5877,6 +5975,15 @@ msgstr "Kelajuan menyelinap dalam nodus per detik."
 msgid "Soft shadow radius"
 msgstr "Jari-jari bayangan halus"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Suara"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Daftar Hitam Flag ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6078,18 +6185,39 @@ msgstr ""
 "Format bawaan pada berkas untuk menyimpan profil,\n"
 "saat memanggil `/profiler save [format]` tanpa format."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 "Jalur berkas relatif terhadap jalur dunia Anda tempat profil akan disimpan."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Identitas dari joystick yang digunakan"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+#, fuzzy
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Jarak dalam piksel yang diperlukan untuk memulai interaksi layar sentuh."
 
@@ -6105,6 +6233,15 @@ msgstr ""
 "0.0 = Ombak tidak bergerak sama sekali.\n"
 "Bawaannya 1.0 (1/2 nodus)."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Jeda dalam detik antar-penaruhan berulang saat menekan \n"
+"tombol taruh."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Antarmuka jaringan yang server dengarkan."
@@ -6135,11 +6272,12 @@ msgstr ""
 "Ini harus diatur bersama dengan active_object_range."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Penggambar video.\n"
 "Catatan: Mulai ulang diperlukan setelah mengganti ini!\n"
@@ -6219,6 +6357,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Noise 2D ketiga dari empat yang mengatur ketinggian bukit/gunung."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6273,14 +6415,15 @@ msgstr "Kepekaan layar sentuh"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Pengali kepekaan layar sentuh."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Ambang batas layar sentuh"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Pertukaran untuk kinerja"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Cairan opak"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Jarak Pengurutan Transparansi"
@@ -6326,8 +6469,11 @@ msgstr ""
 "Pengaturan ini seharusnya hanya diubah jika Anda mengalami masalah kinerja."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL ke berkas JSON yang memberikan informasi tentang rilis Minetest terbaru"
 
@@ -6337,7 +6483,7 @@ msgstr "URL ke daftar server yang tampil pada Tab Multipemain."
 
 #: src/settings_translation_file.cpp
 msgid "Undersampling"
-msgstr "Undersampling"
+msgstr "Undersampling(Pengambilan sampel yang terlalu rendah)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6386,9 +6532,8 @@ msgstr ""
 "Gunakan pemfilteran anisotropik saat melihat tekstur pada sudut tertentu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Gunakan pemfilteran trilinear saat mengubah ukuran tekstur."
+msgstr "Gunakan pemfilteran bilinear saat mengubah ukuran tekstur."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6404,15 +6549,15 @@ msgstr ""
 "objek."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Gunakan mipmap untuk memperkecil tekstur. Bisa sedikit menaikkan kinerja,\n"
-"terutama pada saat menggunakan paket tekstur beresolusi tinggi.\n"
-"Pengecilan dengan tepat-gamma tidak didukung."
+"Gunakan mipmap untuk mengubah ukuran tekstur.\n"
+"Penggunaan untuk paket tekstur beresolusi tinggi bisa memperlambat kinerja "
+"sistem.\n"
+"Pengecilan dengan gama akurat tidak didukung."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6425,15 +6570,14 @@ msgstr ""
 "untuk ukuran mesh klien yang lebih kecil daripada 4x4x4 blok peta."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Gunakan pemfilteran trilinear saat memperkecil tekstur.\n"
-"Jika pemfilteran bilinear dan trilinear dinyalakan, pemfilteran\n"
-"trilinear yang diterapkan."
+"Gunakan pemfilteran trilinear saat menskalakan tekstur.\n"
+"Jika kedua pemfilteran bilinear dan trilinear dinyalakan bersamaan,\n"
+"pemfilteran trilinear akan digunakan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6449,10 +6593,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Antarmuka Pengguna"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync (penyinkronan vertikal)"
@@ -6545,6 +6685,10 @@ msgstr "Joystick virtual mengetuk tombol Aux1"
 msgid "Volume"
 msgstr "Volume"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6553,6 +6697,16 @@ msgstr ""
 "Volume semua suara.\n"
 "Perlu menyalakan sistem suara."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS saat dijeda atau tidak difokuskan"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Pencahayaan halus"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6842,12 +6996,18 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "(game support required)"
 #~ msgstr "(butuh dukungan permainan)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Alamat: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Mode Kreatif: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Kerusakan: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Porta: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6885,6 +7045,13 @@ msgstr "cURL: batas jumlah paralel"
 #~ "Biarkan kosong untuk memulai sebuah server lokal.\n"
 #~ "Perhatikan bahwa bidang alamat dalam menu utama menimpa pengaturan ini."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Atur konfigurasi dpi ke layar Anda (selain X11/Android saja) misalnya "
+#~ "untuk layar 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6955,6 +7122,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bit per piksel (alias kedalaman warna) dalam mode layar penuh."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Batasan blok ditampilkan untuk semua blok"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump Mapping"
 
@@ -6978,6 +7148,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Titik tengah penguatan tengah kurva cahaya."
 
+#~ msgid "Change Keys"
+#~ msgstr "Ubah Tombol"
+
 #~ msgid "Change keys"
 #~ msgstr "Ubah tombol"
 
@@ -7053,6 +7226,38 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgstr ""
 #~ "Mengatur lebar terowongan, nilai lebih kecil terowongan semakin lebar."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kontrol:\n"
+#~ "- %s: maju\n"
+#~ "- %s: mundur\n"
+#~ "- %s: ke kiri\n"
+#~ "- %s: ke kanan\n"
+#~ "- %s: lompat/panjat\n"
+#~ "- %s: gali/pukul/gunakan\n"
+#~ "- %s: taruh/gunakan\n"
+#~ "- %s: menyelinap/turun\n"
+#~ "- %s: jatuhkan barang\n"
+#~ "- %s: inventaris\n"
+#~ "- Tetikus: belok/toleh\n"
+#~ "- Roda tetikus: pilih barang\n"
+#~ "- %s: obrolan\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreatif"
 
@@ -7062,6 +7267,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Warna crosshair: (merah,hijau,biru) atau (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Kerusakan"
 
@@ -7150,6 +7358,13 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Gunakan konfirmasi pendaftaran"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Nyalakan vertex buffer object.\n"
+#~ "Ini dapat meningkatkan kinerja grafika."
+
 #~ msgid "Enabled"
 #~ msgstr "Dinyalakan"
 
@@ -7464,6 +7679,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentasi"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Spesifikasi permainan tidak sah."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tombol inventaris"
 
@@ -8159,6 +8377,12 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Buat DirectX bekerja dengan LuaJIT. Matikan jika bermasalah."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Buat semua cairan buram"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Ukuran tembolok blok peta dari pembuat mesh blok peta dalam MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menu"
 
@@ -8389,15 +8613,21 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Simple Leaves"
 #~ msgstr "Daun Sederhana"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Ukuran dari tembolok blok peta dari pembuat mesh. Menaikkan ini akan\n"
+#~ "menambah persentase cache hit, mengurangi data yang disalin dari\n"
+#~ "utas utama, sehingga mengurangi jitter."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Pencahayaan Halus"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Penghalusan perputaran kamera. 0 untuk tidak menggunakannya."
 
-#~ msgid "Sound"
-#~ msgstr "Suara"
-
 #~ msgid "Special"
 #~ msgstr "Spesial"
 
@@ -8461,6 +8691,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Batas sentuhan (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Ambang batas layar sentuh"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filter Trilinear"
 
@@ -8510,6 +8743,9 @@ msgstr "cURL: batas jumlah paralel"
 #~ "Jika diatur 0, MSAA dimatikan.\n"
 #~ "Dibutuhkan mulai ulang setelah penggantian pengaturan ini."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variasi dari ketinggian bukit dan kedalaman danau pada medan halus "
@@ -8612,8 +8848,14 @@ msgstr "cURL: batas jumlah paralel"
 #~ msgid "You died."
 #~ msgstr "Anda mati"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Anda tidak punya permainan yang terpasang."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "oke"
diff --git a/po/it/minetest.po b/po/it/minetest.po
index 4d7805101..a88323256 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Italian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-12 15:37+0000\n"
-"Last-Translator: Giov4 <brancacciogiovanni1@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-01-18 07:31+0000\n"
+"Last-Translator: Filippo Alfieri <firealphat0mb@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
 "minetest/it/>\n"
 "Language: it\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.2-dev\n"
+"X-Generator: Weblate 5.4-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Comando non disponibile: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Ottieni aiuto per i comandi"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "digita '.help all' per elencare tutti i comandi."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[tutto | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Conferma"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<nessuno disponibile>"
@@ -105,6 +103,10 @@ msgstr "Si è verificato un errore:"
 msgid "Main menu"
 msgstr "Menu principale"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Conferma"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Riconnettiti"
@@ -133,19 +135,28 @@ msgstr "Supportiamo solo la versione $1 del protocollo."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Supportiamo versioni di protocollo comprese tra la $1 e la $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" esiste già. Vuoi sovrascriverlo?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Errore nell'installare \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Le dipendenze $1 e $2 saranno installate."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Impossibile scaricare \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 con $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Impossibile scaricare $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Impossibile estrarre \"$1\" (tipo di file non supportato o archivio "
+"danneggiato)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +164,157 @@ msgstr ""
 "Scaricando $1,\n"
 "$2 in coda"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Scaricando $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 impossibile trovare le dipendeze necessarie."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 sarà installato, e $2 dipendenze verranno ignorate."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Tutti i contenuti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Già installato"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Torna al Menu Principale"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB non è disponibile quando Minetest viene compilato senza cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Scaricamento..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Giochi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installa"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Caricamento..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Non è stato possibile recuperare alcun contenuto"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Nessun risultato"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Nessun aggiornamento"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "In coda"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pacchetti texture"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Il contenuto $1 non è stato trovato."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Disinstalla"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Aggiorna"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Aggiorna Tutto [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Visualizza ulteriori informazioni in un browser Web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Devi installare un gioco prima di poter installare un mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Le dipendenze $1 e $2 saranno installate."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 con $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 impossibile trovare le dipendeze necessarie."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 sarà installato, e $2 dipendenze verranno ignorate."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Già installato"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Gioco di Base:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Annulla"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB non è disponibile quando Minetest viene compilato senza cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dipendenze:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Scaricamento..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Errore nell'installare \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Impossibile scaricare \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Impossibile scaricare $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Impossibile estrarre \"$1\" (tipo di file non supportato o archivio "
-"danneggiato)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Giochi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installa"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installa $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installa le dipendenze mancanti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Caricamento..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Non è stato possibile recuperare alcun contenuto"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Nessun risultato"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Nessun aggiornamento"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Non trovato"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sovrascrivi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Per favore, controlla che il gioco di base sia corretto."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "In coda"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" esiste già. Vuoi sovrascriverlo?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pacchetti texture"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Il contenuto $1 non è stato trovato."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Disinstalla"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Aggiorna"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Aggiorna Tutto [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Visualizza ulteriori informazioni in un browser Web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Devi installare un gioco prima di poter installare un mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sovrascrivi"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,10 +464,20 @@ msgstr "Crea"
 msgid "Decorations"
 msgstr "Decorazioni"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "\"Development Test\" è progettato per gli sviluppatori."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Sotterranei"
@@ -601,7 +621,7 @@ msgstr "Nome del mondo"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Siete sicuri di volere cancellare \"$1\"?"
+msgstr "Vuoi veramente cancellare \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
@@ -652,7 +672,7 @@ msgstr "Registrati"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Chiudi"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -678,9 +698,8 @@ msgstr ""
 "Il gioco Minetest Game non è più installato per impostazione predefinita"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Installa un altro gioco"
+msgstr "Installa nuovamente Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -757,9 +776,8 @@ msgid "Select file"
 msgstr "Scegli un file"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Selezione"
+msgstr "Seleziona"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -838,10 +856,6 @@ msgstr "Accessibilità"
 msgid "Back"
 msgstr "Indietro"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Cambia i Tasti"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -851,7 +865,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Canc"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controlli"
 
@@ -860,12 +875,10 @@ msgid "General"
 msgstr "Generale"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Movimento rapido"
+msgstr "Movimento"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
 msgstr "Ripristina predefinito"
 
@@ -987,18 +1000,16 @@ msgid "Browse online content"
 msgstr "Esplora i contenuti online"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Esplora i contenuti online"
+msgstr "Esplora i contenuti online [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Contenuto"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Contenuto"
+msgstr "Contenuto [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1021,9 +1032,8 @@ msgid "Rename"
 msgstr "Rinomina"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<nessuno disponibile>"
+msgstr "Aggiornamento disponibile?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1061,6 +1071,18 @@ msgstr "Installa un gioco"
 msgid "Install games from ContentDB"
 msgstr "Installa giochi da ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+"Il gioco Minetest Game non è più installato per impostazione predefinita"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nuovo"
@@ -1094,8 +1116,9 @@ msgid "Start Game"
 msgstr "Gioca"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Non hai nessun gioco installato."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Devi installare un gioco prima di poter installare un mod"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1174,18 +1197,10 @@ msgstr "Caricando le textures..."
 msgid "Rebuilding shaders..."
 msgstr "Ricostruendo le shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Errore di connessione (scaduta?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Impossibile trovare o caricare il gioco: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Requisiti del gioco non validi."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu Principale"
@@ -1210,7 +1225,11 @@ msgstr "Impossibile aprire il file di password fornito: "
 msgid "Provided world path doesn't exist: "
 msgstr "Il percorso del mondo fornito non esiste: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "File multimediali..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1218,18 +1237,10 @@ msgstr ""
 "\n"
 "Controlla debug.txt per i dettagli."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Indirizzo: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modalità: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Porta: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Pubblico: "
@@ -1264,10 +1275,6 @@ msgstr "Avanzamento automatico abilitato"
 msgid "Block bounds hidden"
 msgstr "Limiti del blocco nascosti"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "I limiti del blocco sono mostrati per tutti i blocchi"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "I limiti del blocco sono mostrati per il blocco attuale"
@@ -1313,6 +1320,10 @@ msgstr "Scripting su lato client disabilitato"
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Errore di connessione (scaduta?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Connessione fallita per motivo sconosciuto"
@@ -1321,47 +1332,14 @@ msgstr "Connessione fallita per motivo sconosciuto"
 msgid "Continue"
 msgstr "Continua"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controlli:\n"
-"- %s: avanza\n"
-"- %s: arretra\n"
-"- %s: sinistra\n"
-"- %s: destra\n"
-"- %s: salta/scala su\n"
-"- %s: scava/colpisci\n"
-"- %s: piazza/utilizza\n"
-"- %s: furtivo/scendi\n"
-"- %s: getta via oggetto\n"
-"- %s: inventario\n"
-"- Mouse: girati/guarda\n"
-"- Rotella mouse: scegli oggetto\n"
-"- %s: chat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1453,6 +1431,11 @@ msgstr "Nebbia disattivata"
 msgid "Fog enabled"
 msgstr "Nebbia attivata"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Ingrandimento attualmente disabilitato dal gioco o da un mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informazioni del gioco:"
@@ -1473,10 +1456,6 @@ msgstr "Definizione degli oggetti..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "File multimediali..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1638,10 +1617,6 @@ msgstr "Struttura a fili visualizzata"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Ingrandimento attualmente disabilitato dal gioco o da un mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "va bene"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chat attualmente disabilitata dal gioco o da un mod"
@@ -1975,6 +1950,15 @@ msgstr "Minimappa in modalità superficie, ingrandimento x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimappa in modalità texture"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Impossibile aprire la pagina web"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2167,6 +2151,19 @@ msgstr "Ingrandimento"
 msgid "press key"
 msgstr "premi il tasto"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Impossibile aprire la pagina web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Cambia"
@@ -2200,6 +2197,7 @@ msgstr "Volume suono: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "it"
 
@@ -2433,14 +2431,6 @@ msgstr "Raggio di invio degli oggetti attivi"
 msgid "Adds particles when digging a node."
 msgstr "Aggiunge particelle quando scavi un nodo."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Regolate la configurazione dpi per il vostro schermo (solo non X11/Android) "
-"per es. per schermi 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2472,6 +2462,10 @@ msgstr "Nome amministratore"
 msgid "Advanced"
 msgstr "Avanzate"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2533,6 +2527,17 @@ msgstr "Posponi nome oggetto a suggerimenti."
 msgid "Apple trees noise"
 msgstr "Rumore dei meli"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inerzia del braccio"
@@ -2550,18 +2555,38 @@ msgid "Ask to reconnect after crash"
 msgstr "Chiedi di riconnettersi dopo un crash"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"A questa distanza il server ottimizzerà aggressivamente quali blocchi sono\n"
+"inviati ai client.\n"
+"Potenzialmente valori piccoli migliorano molto le prestazioni, al costo di\n"
+"difetti di disegno visibili (alcuni blocchi non saranno disegnati sott'acqua "
+"e\n"
+"nelle grotte, come a volte sul terreno).\n"
+"Impostarla a un valore maggiore di max_block_send_distance disabilita\n"
+"questa ottimizzazione.\n"
+"Fissata in blocchi mappa (16 nodi)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "A questa distanza il server ottimizzerà aggressivamente quali blocchi sono\n"
 "inviati ai client.\n"
@@ -2635,6 +2660,11 @@ msgstr "Biomi"
 msgid "Biome noise"
 msgstr "Rumore biomi"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Distanza di ottimizzazione dell'invio dei blocchi"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distanza di ottimizzazione dell'invio dei blocchi"
@@ -2857,6 +2887,12 @@ msgstr "Nebbia colorata"
 msgid "Colored shadows"
 msgstr "Ombre colorate"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3028,10 +3064,6 @@ msgstr ""
 "Colore del mirino (R,G,B).\n"
 "Controlla anche il colore del mirino dell'oggetto"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Dimensione del file di debug"
@@ -3087,6 +3119,25 @@ msgstr ""
 "disk\n"
 "ma utilizza più risorse."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Abilitare per impedire ai client obsoleti di connettersi.\n"
+"I client più vecchi sono compatibili nel senso che non andranno in crash "
+"alla connessione\n"
+"ai nuovi server, ma potrebbero non supportare tutte le nuove caratteristiche "
+"che ti aspetti."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definisce aree in cui gli alberi hanno le mele."
@@ -3295,6 +3346,11 @@ msgstr "Attiva Bagliore"
 msgid "Enable Bloom Debug"
 msgstr "Attiva Debug per il Bagliore"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Abilita il Ferimento"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3321,6 +3377,11 @@ msgstr ""
 "Se abilitato si hanno le \\\"ombre morbide\\\". Altrimenti utilizza il "
 "filtraggio PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Post-elaborazione"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Attiva Culling con Ray Tracing"
@@ -3371,6 +3432,13 @@ msgstr ""
 "Abilita lo scorrimento della rotellina del mouse per la selezione degli "
 "oggetti nella hotbar."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+"Abilita l'ingresso di dati casuali da parte dell'utente (utilizzato solo per "
+"i test)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3403,6 +3471,11 @@ msgstr ""
 "ai nuovi server, ma potrebbero non supportare tutte le nuove caratteristiche "
 "che ti aspetti."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Touch screen"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3416,14 +3489,6 @@ msgstr ""
 "scaricare\n"
 "contenuti multimediali (es. textures) quando ci si connette al server."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Attivare gli oggetti tampone per i vertici.\n"
-"Questo dovrebbe migliorare notevolmente le prestazioni grafiche."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3464,6 +3529,19 @@ msgstr "Attiva l'animazione degli oggetti dell'inventario."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Attiva la cache delle mesh ruotate con facedir."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4435,10 +4513,12 @@ msgstr ""
 "-   Opache: disabilita la trasparenza"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Durata di un tick del server e intervallo con cui gli oggetti sono "
 "generalmente\n"
@@ -4623,10 +4703,6 @@ msgstr ""
 "Far sì che i colori di nebbia e cielo dipendano da ora del giorno (alba/"
 "tramonto) e direzione della visuale."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Rende opachi tutti i liquidi"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Livello di compressione della mappa per l'archiviazione su disco"
@@ -4688,11 +4764,14 @@ msgstr ""
 "Attributi di generazione della mappa specifici del generatore di mappe v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Attributi di generazione della mappa specifici del generatore di mappe v6.\n"
 "Il valore \"snowbiomes\" abilita il nuovo sistema di 5 biomi.\n"
@@ -4735,10 +4814,6 @@ msgstr "Ritardo di generazione della mesh del blocco mappa"
 msgid "Mapblock mesh generation threads"
 msgstr "Thread per la generazione delle mesh dei blocchi mappa"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Dimensione in MB del generatore mesh del blocco mappa"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Scadenza dello scaricamento del blocco mappa"
@@ -5016,6 +5091,11 @@ msgstr "Livello di registro minimo da scriversi nell'area di messaggistica."
 msgid "Minimap scan height"
 msgstr "Altezza di scansione della minimappa"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Intervallo di ripetizione per il piazzamento"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -5085,6 +5165,11 @@ msgstr "Sensibilità del mouse"
 msgid "Mouse sensitivity multiplier."
 msgstr "Moltiplicatore della sensibilità del mouse."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Soglia della caverna"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Rumore del fango"
@@ -5231,10 +5316,6 @@ msgstr "Occlusion Culler"
 msgid "Occlusion Culling"
 msgstr "Occlusion culling su lato server"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Liquidi opachi"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5250,6 +5331,11 @@ msgstr ""
 "Apre il menu di pausa quando si perde la messa a fuoco della finestra. Non\n"
 "mette in pausa se è aperta una finestra di dialogo."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Debug del generatore mappa"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Sovrascrittura opzionale per i colori dei link web in chat."
@@ -5389,6 +5475,15 @@ msgid "Proportion of large caves that contain liquid."
 msgstr ""
 "Proporzione delle grotte di grandi dimensioni che contiene del liquido."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "La versione del protocollo non coincide. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5407,6 +5502,10 @@ msgstr "Solleva il terreno per creare vallate attorno ai fiumi."
 msgid "Random input"
 msgstr "Dati in ingresso casuali"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Messaggi di chat recenti"
@@ -5600,7 +5699,6 @@ msgstr ""
 "Usa 0 per la qualità predefinita."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshots"
 msgstr "Screenshot"
 
@@ -5623,13 +5721,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Si veda http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5794,8 +5893,9 @@ msgstr ""
 "Intervallo: da -1 a 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Imposta la Lingua. Lascia vuoto per usare la Lingua di sistema.\n"
@@ -5845,6 +5945,10 @@ msgstr ""
 "Imposta su vero per abilitare l'effetto bagliore.\n"
 "I colori brillanti brilleranno sugli oggetti vicini."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5900,11 +6004,11 @@ msgid "Shaders"
 msgstr "Shader"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Gli shader permettono l'utilizzo di effetti visivi avanzati e potrebbero "
 "aumentare\n"
@@ -5998,16 +6102,6 @@ msgstr ""
 "L'alterazione di questo valore è per uso speciale, si raccomanda di\n"
 "lasciarlo invariato."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Dimensione della cache del blocco mappa del generatore della mesh.\n"
-"Aumentandola si incrementerà l'impatto percentuale sulla cache, diminuendo\n"
-"i dati copiati dal thread principale, riducendo così lo sfarfallio."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Inclinazione dell'orbita di un corpo celeste"
@@ -6047,7 +6141,7 @@ msgstr "Illuminazione uniforme"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Rende fluida la rotazione della telecamera in modalità cinematic. 0 per "
 "disattivare."
@@ -6073,6 +6167,15 @@ msgstr "Velocità furtiva, in nodi al secondo."
 msgid "Soft shadow radius"
 msgstr "Raggio dell'ombra morbida"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Audio"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Contenuti esclusi da ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6286,6 +6389,12 @@ msgstr ""
 "Il formato predefinito in cui si salvano i profili,\n"
 "quando si chiama \"/profiler save [format]\" senza formato."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6294,13 +6403,27 @@ msgstr ""
 "Il percorso del file relativo al percorso del vostro mondo in cui saranno "
 "salvati i profili."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "L'identificatore del joystick da usare"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "La distanza in pixel richiesta per avviare l'interazione touch screen."
 
 #: src/settings_translation_file.cpp
@@ -6317,6 +6440,16 @@ msgstr ""
 "Il valore predefinito è 1.0 (1/2 nodo).\n"
 "Richiede l'abilitazione dei liquidi ondulanti."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Il tempo in secondi che intercorre tra il piazzamento dei nodi quando si "
+"tiene\n"
+"premuto il pulsante piazza."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Su quale interfaccia di rete sarà in ascolto il server."
@@ -6349,11 +6482,12 @@ msgstr ""
 "active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Il rendering di back-end.\n"
 "Dopo averlo cambiato è necessario un riavvio.\n"
@@ -6442,6 +6576,10 @@ msgstr ""
 "Terzo di 4 rumori 2D che insieme definiscono l'intervallo di altezza "
 "collinare/montuoso."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6500,15 +6638,15 @@ msgstr "Sensibilità del mouse"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Moltiplicatore della sensibilità del mouse."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Soglia del touch screen"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Compromessi per migliorare le prestazioni"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Liquidi opachi"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Distanza di Ordinamento della Trasparenza"
@@ -6554,8 +6692,11 @@ msgstr ""
 "prestazioni."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL del file JSON che fornisce informazioni sulla versione più recente di "
 "Minetest"
@@ -6687,10 +6828,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfacce utente"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Sincronia verticale"
@@ -6784,6 +6921,10 @@ msgstr "Il joystick virtuale aziona il pulsante \"Speciale\""
 msgid "Volume"
 msgstr "Volume"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6792,6 +6933,16 @@ msgstr ""
 "Volume dei suoni.\n"
 "Necessita l'attivazione dell'audio."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS quando il gioco è in pausa o in secondo piano"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Illuminazione uniforme"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -7102,12 +7253,18 @@ msgstr "Limite parallelo cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(è richiesto il supporto del gioco)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Indirizzo: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Modalità creativa: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Ferimento: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Porta: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7147,6 +7304,13 @@ msgstr "Limite parallelo cURL"
 #~ "Si noti che il campo indirizzo nel menu principale sovrascrive questa "
 #~ "impostazione."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Regolate la configurazione dpi per il vostro schermo (solo non X11/"
+#~ "Android) per es. per schermi 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7204,6 +7368,9 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bit per pixel (o profondità di colore) in modalità schermo intero."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "I limiti del blocco sono mostrati per tutti i blocchi"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump Mapping"
 
@@ -7228,6 +7395,9 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro dell'aumento mediano della curva della luce."
 
+#~ msgid "Change Keys"
+#~ msgstr "Cambia i Tasti"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Cambia i Tasti"
@@ -7304,6 +7474,38 @@ msgstr "Limite parallelo cURL"
 #~ "Controlla la larghezza delle gallerie, un valore più piccolo crea "
 #~ "gallerie più larghe."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controlli:\n"
+#~ "- %s: avanza\n"
+#~ "- %s: arretra\n"
+#~ "- %s: sinistra\n"
+#~ "- %s: destra\n"
+#~ "- %s: salta/scala su\n"
+#~ "- %s: scava/colpisci\n"
+#~ "- %s: piazza/utilizza\n"
+#~ "- %s: furtivo/scendi\n"
+#~ "- %s: getta via oggetto\n"
+#~ "- %s: inventario\n"
+#~ "- Mouse: girati/guarda\n"
+#~ "- Rotella mouse: scegli oggetto\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Creativa"
 
@@ -7313,6 +7515,9 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Colore del mirino (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Ferimento"
 
@@ -7407,6 +7612,13 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Abilita conferma registrazione"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Attivare gli oggetti tampone per i vertici.\n"
+#~ "Questo dovrebbe migliorare notevolmente le prestazioni grafiche."
+
 #~ msgid "Enabled"
 #~ msgstr "Abilitato"
 
@@ -7716,6 +7928,9 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Predisposizione"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Requisiti del gioco non validi."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tasto inventario"
 
@@ -8413,6 +8628,12 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Fa lavorare DirectX con LuaJIT. Disabilitare se provoca problemi."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Rende opachi tutti i liquidi"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Dimensione in MB del generatore mesh del blocco mappa"
+
 #~ msgid "Menus"
 #~ msgstr "Menu"
 
@@ -8651,15 +8872,22 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Foglie Semplici"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Dimensione della cache del blocco mappa del generatore della mesh.\n"
+#~ "Aumentandola si incrementerà l'impatto percentuale sulla cache, "
+#~ "diminuendo\n"
+#~ "i dati copiati dal thread principale, riducendo così lo sfarfallio."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Illuminazione Uniforme"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Rende fluida la rotazione della telecamera. 0 per disattivare."
 
-#~ msgid "Sound"
-#~ msgstr "Audio"
-
 #~ msgid "Special"
 #~ msgstr "Speciale"
 
@@ -8724,6 +8952,10 @@ msgstr "Limite parallelo cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Soglia del tocco: (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Soglia del touch screen"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtro Trilineare"
 
@@ -8779,6 +9011,9 @@ msgstr "Limite parallelo cURL"
 #~ "Se impostato a 0, MSAA è disabilitato.\n"
 #~ "È necessario riavviare dopo aver modificato questa opzione."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variazione dell'altezza delle colline, e della profondità dei laghi sul\n"
@@ -8884,8 +9119,14 @@ msgstr "Limite parallelo cURL"
 #~ msgid "You died."
 #~ msgstr "Sei morto"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Non hai nessun gioco installato."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "va bene"
diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index 85ef71947..bd49a0230 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeminer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-22 00:17+0000\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-08 13:09+0000\n"
 "Last-Translator: BreadW <toshiharu.uno@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
 "minetest/ja/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.2\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,8 +71,8 @@ msgid "Command not available: "
 msgstr "コマンドは使用できません： "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "コマンドのヘルプを表示する"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "コマンドのヘルプを表示 (-t: チャットで出力)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -82,12 +82,8 @@ msgstr ""
 "べてを一覧表示します。"
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -105,6 +101,10 @@ msgstr "エラーが発生しました:"
 msgid "Main menu"
 msgstr "メインメニュー"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "再接続"
@@ -133,19 +133,26 @@ msgstr "プロトコルはバージョン$1のみをサポートしています
 msgid "We support protocol versions between version $1 and $2."
 msgstr "バージョン$1から$2までのプロトコルをサポートしています。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "「$1」はすでに存在します。上書きしますか？"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "「$1」をインストール中にエラー: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 と依存MOD $2 がインストールされます。"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "「$1」のダウンロードに失敗"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1のダウンロードに失敗"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "「$1」の展開に失敗 (ディスク容量の不足、サポートされていないファイルタイプま"
+"たは壊れたアーカイブ)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,157 +160,157 @@ msgstr ""
 "$1 ダウンロード中、\n"
 "$2 ダウンロード待機中"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 ダウンロード中..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 つの必要な依存MODが見つかりませんでした。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 がインストールされ、依存MOD $2 はスキップされます。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "すべて"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "インストール済み"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "メインメニューへ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "MinetestがcURLなしでコンパイルされた場合、コンテンツDBは使用できません"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "ダウンロード中..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "パッケージの依存関係を取得するエラー"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "ゲーム"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "入手"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "読み込み中..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "MOD"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "パッケージを取得できませんでした"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "見つかりませんでした"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "更新なし"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "待機中"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "テクスチャパック"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "パッケージ $1 が見つかりませんでした。"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "削除"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "更新"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "すべて更新 [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Webブラウザで詳細を見る"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "MODをインストールする前に、ゲームをインストールする必要があります"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 と依存MOD $2 がインストールされます。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 by $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 つの必要な依存MODが見つかりませんでした。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 がインストールされ、依存MOD $2 はスキップされます。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "インストール済み"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "基盤ゲーム："
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "MinetestがcURLなしでコンパイルされた場合、コンテンツDBは使用できません"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "依存MOD:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "ダウンロード中..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "「$1」をインストール中にエラー: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "「$1」のダウンロードに失敗"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1のダウンロードに失敗"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"「$1」の展開に失敗 (サポートされていないファイル形式または壊れたアーカイブ)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "ゲーム"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "入手"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 のインストール"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "不足依存MODインストール"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "読み込み中..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "MOD"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "パッケージを取得できませんでした"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "見つかりませんでした"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "更新なし"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "見つかりません"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "上書き"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "基盤となるゲームが正しいかどうか確認してください。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "待機中"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "「$1」はすでに存在します。上書きしますか？"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "テクスチャパック"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "パッケージ $1 が見つかりませんでした。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "削除"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "更新"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "すべて更新 [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Webブラウザで詳細を見る"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "MODをインストールする前に、ゲームをインストールする必要があります"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "上書き"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -451,10 +458,21 @@ msgstr "作成"
 msgid "Decorations"
 msgstr "デコレーション"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "砂漠の寺院"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Testは開発者用です。"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr "砂漠のバイオームで生成された異なるダンジョンのバリエーション(ダンジョンが有効"
+"になっている場合のみ)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "ダンジョン"
@@ -640,7 +658,7 @@ msgstr "パスワード"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Passwords do not match"
-msgstr "パスワードが一致しない"
+msgstr "パスワードが一致しません"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
 msgid "Register"
@@ -828,10 +846,6 @@ msgstr "アクセシビリティ"
 msgid "Back"
 msgstr "戻る"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "キー変更"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -841,9 +855,10 @@ msgstr "チャット"
 msgid "Clear"
 msgstr "Clear"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
-msgstr "操作"
+msgstr "キー割り当て"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
@@ -924,7 +939,7 @@ msgstr "とても弱く"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "About"
-msgstr "情報"
+msgstr "ContentDBについて"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Active Contributors"
@@ -1046,6 +1061,17 @@ msgstr "ゲームをインストール"
 msgid "Install games from ContentDB"
 msgstr "コンテンツDBからゲームをインストール"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest は初期状態でゲームが付属していません。"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr "Minetestは、さまざまなゲームで遊ぶことを可能にするゲーム制作プラットフォーム"
+"です."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "新規作成"
@@ -1079,8 +1105,8 @@ msgid "Start Game"
 msgstr "ゲームスタート"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "ゲームがインストールされていません。"
+msgid "You need to install a game before you can create a world."
+msgstr "ワールドを作る前に、ゲームをインストールする必要があります。"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1159,18 +1185,10 @@ msgstr "テクスチャを読み込み中..."
 msgid "Rebuilding shaders..."
 msgstr "シェーダーを再構築中..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "接続エラー (タイムアウト？)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "ゲームが見つからないか読み込めません: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "無効なゲーム情報です。"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "メインメニュー"
@@ -1195,7 +1213,11 @@ msgstr "パスワードファイルを開けませんでした: "
 msgid "Provided world path doesn't exist: "
 msgstr "ワールドが存在しません: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "メディアを受信中..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1203,18 +1225,10 @@ msgstr ""
 "\n"
 "詳細はdebug.txtを確認してください。"
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- アドレス: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- モード: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- ポート: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- 公開サーバー: "
@@ -1249,10 +1263,6 @@ msgstr "自動前進 有効"
 msgid "Block bounds hidden"
 msgstr "ブロック境界線を非表示"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "すべてのブロックにブロック境界線を表示"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "現在のブロックにブロック境界を表示"
@@ -1279,11 +1289,11 @@ msgstr "パスワード変更"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
-msgstr "映画風モード 無効"
+msgstr "シネマティックモード 無効"
 
 #: src/client/game.cpp
 msgid "Cinematic mode enabled"
-msgstr "映画風モード 有効"
+msgstr "シネマティックモード 有効"
 
 #: src/client/game.cpp
 msgid "Client disconnected"
@@ -1297,6 +1307,10 @@ msgstr "クライアント側のスクリプトは無効"
 msgid "Connecting to server..."
 msgstr "サーバーに接続中..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "接続エラー (タイムアウト？)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "未知の理由で接続に失敗しました"
@@ -1305,46 +1319,13 @@ msgstr "未知の理由で接続に失敗しました"
 msgid "Continue"
 msgstr "再開"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"操作方法:\n"
-"- %s: 前進\n"
-"- %s: 後退\n"
-"- %s: 左移動\n"
-"- %s: 右移動\n"
-"- %s: ジャンプ/登る\n"
-"- %s: 掘る/パンチ/使う\n"
-"- %s: 置く/使う\n"
-"- %s: スニーク/降りる\n"
-"- %s: アイテムを落とす\n"
-"- %s: インベントリ\n"
-"- マウス: 振り向く/見る\n"
-"- マウスホイール: アイテム選択\n"
-"- %s: チャット\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1356,15 +1337,15 @@ msgstr ""
 "操作方法:\n"
 "メニューなし:\n"
 "- スライド: 見回す\n"
-"- タップ: 置く/使う\n"
-"- ロングタップ: 掘る/パンチ/使う　　ブロックの破壊- ダブルタップ: 設置/使用\n"
-"メニュー/インベントリの操作:\n"
+"- タップ: 置く/パンチ/使う(基本)\n"
+"- ロングタップ: 掘る/使う(基本)\n"
+"メニュー/インベントリを開く:\n"
 "- ダブルタップ (メニューの外):\n"
 " --> 閉じる\n"
 "- アイテムをタッチし、スロットをタッチ:\n"
 " --> アイテムを移動\n"
 "- タッチしてドラッグし、二本目の指でタップ:\n"
-" --> アイテムを1つスロットに置く\n"
+" --> スロットにアイテムを1つ置く\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1443,6 +1424,10 @@ msgstr "「使用」で降りる"
 msgid "Fog enabled"
 msgstr "霧 有効"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "霧はゲームやMODによって有効化されている"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "ゲーム情報:"
@@ -1463,10 +1448,6 @@ msgstr "アイテムを定義中..."
 msgid "KiB/s"
 msgstr "KiB/秒"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "メディアを受信中..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/秒"
@@ -1622,10 +1603,6 @@ msgstr "ワイヤーフレーム 表示"
 msgid "Zoom currently disabled by game or mod"
 msgstr "ズームはゲームやMODによって無効化されている"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "決定"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "チャットはゲームやMODによって無効化されている"
@@ -1946,6 +1923,15 @@ msgstr "ミニマップ 表面モード、ズーム x%d"
 msgid "Minimap in texture mode"
 msgstr "ミニマップ テクスチャモード"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "「%s」シェーダーをコンパイルできませんでした。"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "シェーダーは有効ですが、このドライバはGLSLをサポートしていません。"
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2061,7 +2047,7 @@ msgstr "キーが重複しています"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr "キーに対する機能の割り当て。"
+msgstr "キーに対する機能の割り当てです。"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2139,6 +2125,18 @@ msgstr "ズーム"
 msgid "press key"
 msgstr "キー入力待ち"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "開く"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "URLを開く?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "URLを開くことができない"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "変更"
@@ -2172,6 +2170,7 @@ msgstr "音量: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ja"
 
@@ -2390,13 +2389,6 @@ msgstr "アクティブなオブジェクトの送信範囲"
 msgid "Adds particles when digging a node."
 msgstr "ノードを掘る際にパーティクルを追加します。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。"
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2425,6 +2417,10 @@ msgstr "管理者名"
 msgid "Advanced"
 msgstr "詳細"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "液体が半透明になることを可能にします。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2483,6 +2479,28 @@ msgstr "ツールチップにアイテム名を付け加えます。"
 msgid "Apple trees noise"
 msgstr "リンゴの木のノイズ"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"色帯状のアーティファクトを減らすためにディザリングを適用します。\n"
+"ディザリングにより、可逆圧縮されたスクリーンショットのサイズが大幅に増加しま"
+"す。\n"
+"また、ディスプレイまたはオペレーティング "
+"システムが追加のディザリングを実行する場合、\n"
+"またはカラー チャネルが 8 ビットに量子化されていない場合、"
+"ディザリングは正しく動作\n"
+"しません。\n"
+"OpenGL ES では、"
+"ディザリングはシェーダーが高い浮動小数点精度をサポートしている場合に\n"
+"のみ機能し、パフォーマンスに大きな影響を与える可能性があります。"
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "腕の惰性"
@@ -2506,22 +2524,36 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "この距離でサーバーはどのブロックをクライアントへ送信するかを積極的に\n"
 "最適化します。\n"
 "小さい値に設定すると、描画の視覚的な不具合を犠牲にして、\n"
 "パフォーマンスが大幅に向上する可能性があります(いくつかのブロックは\n"
-"水中や洞窟、時には陸の上でも描画されません)。\n"
+"洞窟で正しく描画されません)。\n"
 "max_block_send_distance より大きい値に設定すると、この最適化は\n"
 "無効になります。 \n"
 "マップブロック(16ノード)で表記。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"この距離でサーバーはよりシンプルで安価なオクルージョンチェックを行います。\n"
+"小さい値に設定すると、描画の視覚的な不具合(不足するブロック)を一時的に\n"
+"犠牲にして、パフォーマンスが向上する可能性があります。\n"
+"これは特に非常に広い視野(500以上)に有用です。\n"
+"マップブロック(16ノード)で表記。"
+
 #: src/settings_translation_file.cpp
 msgid "Audio"
 msgstr "オーディオ"
@@ -2582,6 +2614,10 @@ msgstr "バイオームAPI"
 msgid "Biome noise"
 msgstr "バイオームノイズ"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "ブロックカリングの最適化距離"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "ブロック送信最適化距離"
@@ -2640,7 +2676,7 @@ msgstr "カメラの滑らかさ"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr "映画風モードでのカメラの滑らかさ"
+msgstr "シネマティックモードでのカメラの滑らかさ"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
@@ -2798,6 +2834,14 @@ msgstr "色つきの霧"
 msgid "Colored shadows"
 msgstr "色つきの影"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"使用されるべきでない拡張子ALおよびALCのカンマ区切りリストです。\n"
+"テストのために有用です。 詳細は al_extensions.[h,cpp] を参照してください。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2961,10 +3005,6 @@ msgstr ""
 "十字カーソルの色 (R,G,B)。\n"
 "オブジェクト十字カーソルの色も制御"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "デバッグログファイルのサイズのしきい値"
@@ -3020,6 +3060,27 @@ msgstr ""
 "レートするものです。\n"
 "しかし、より多くのリソースを消費します。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"接続を許可する最も古いクライアントを定義します。\n"
+"古いクライアントは、"
+"新しいサーバーに接続するときにクラッシュしないという意味では\n"
+"互換性がありますが、期待されるすべての新機能をサポートしているわけではない可"
+"能性があります。\n"
+"これにより、strict_protocol_version_checking よりも細かい管理ができます。\n"
+"Minetest は依然として独自の内部最小値を強制しており、\n"
+"strict_protocol_version_checking はこれをが効果的に上書きします。"
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "木にリンゴがある地域を定義します。"
@@ -3218,6 +3279,10 @@ msgstr "ブルームを有効化"
 msgid "Enable Bloom Debug"
 msgstr "ブルームデバッグを有効化"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "バンディング除去有効"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3244,6 +3309,10 @@ msgstr ""
 "有効にするとポアソンディスクを使用して「やわらない影」を作ります。それ以外の"
 "ときはPCFフィルタリングを使用します。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "後処理有効"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "レイトレース カリングの有効化"
@@ -3291,6 +3360,10 @@ msgstr "MODのセキュリティを有効化"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr "ホットバーの項目選択のためのマウスホイール(スクロール)を有効にします。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "ランダムなMODの読み込みを有効にします(主にテストに使用されます)。"
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "ランダムなユーザー入力を有効にします (テストにのみ使用)。"
@@ -3320,6 +3393,10 @@ msgstr ""
 "意味で互換性がありますが、期待しているすべての新機能をサポート\n"
 "しているわけではありません。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "タッチスクリーン有効"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3332,14 +3409,6 @@ msgstr ""
 "リモートサーバはサーバーに接続するときにメディア (例えば、テクスチャ) を\n"
 "ダウンロードするための非常に高速な方法を提供します。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"頂点バッファオブジェクトを有効にします。\n"
-"これにより、グラフィックスのパフォーマンスが大幅に向上します。"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3378,6 +3447,20 @@ msgstr "インベントリのアイテムのアニメーションを有効にし
 msgid "Enables caching of facedir rotated meshes."
 msgstr "facedir回転メッシュのキャッシングを有効にします。"
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "OpenGL ドライバでデバッグとエラーチェックを有効にします。"
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "後処理パイプラインを有効にします。"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr "タッチスクリーンモードを有効にし、タッチスクリーンでゲームを遊ぶことができま"
+"す。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4300,12 +4383,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"サーバーが時を刻む間隔とオブジェクトが通常ネットワーク上で更新される間隔を\n"
-"秒単位で定めます。"
+"サーバーが時を刻む長さ (通常、すべてが更新される間隔) を秒単位で定めます。\n"
+"クライアント メニューからホストされるセッションには適用されません。"
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
@@ -4475,10 +4559,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "霧と空の色を日中(夜明け/日没)と視線方向に依存させます。"
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "すべての液体を不透明にする"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "ディスクストレージのマップ圧縮レベル"
@@ -4538,12 +4618,16 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "マップジェネレータ v6 に固有のマップ生成属性。\n"
 "'snowbiomes' フラグは新しい5つのバイオームシステムを有効にします。\n"
 "'snowbiomes' フラグを有効にすると、ジャングルが自動的に有効になり、\n"
-"'jungles' フラグは無視されます。"
+"'jungles' フラグは無視されます。\n"
+"'temples' フラグは砂漠の寺院の生成を無効にします。代わりに通常のダンジョンが"
+"生成されます。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4581,10 +4665,6 @@ msgstr "マップブロックのメッシュ生成遅延"
 msgid "Mapblock mesh generation threads"
 msgstr "マップブロックメッシュ生成スレッド数"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "メッシュ生成のマップブロックキャッシュサイズ(MB)"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "マップブロック破棄タイムアウト"
@@ -4851,6 +4931,10 @@ msgstr "チャットに書き込まれる最小限のログレベル。"
 msgid "Minimap scan height"
 msgstr "ミニマップのスキャン高さ"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "繰り返し掘る最小間隔"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "マップチャンクあたりの大きな洞窟の乱数の最小値。"
@@ -4919,6 +5003,10 @@ msgstr "マウスの感度"
 msgid "Mouse sensitivity multiplier."
 msgstr "マウス感度の倍率。"
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "動きのしきい値"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "泥ノイズ"
@@ -5055,10 +5143,6 @@ msgstr "オクルージョンカラー"
 msgid "Occlusion Culling"
 msgstr "オクルージョンカリング"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "不透明な液体"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5073,6 +5157,10 @@ msgstr ""
 "ウィンドウのフォーカスが失われたときにポーズメニューを開きます。\n"
 "フォームスペックが開かれているときはポーズメニューを開きません。"
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "OpenGLのデバッグ"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "チャットのウェブリンクの色を上書きするオプションです。"
@@ -5203,6 +5291,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "大きな洞窟の液体を含む割合です。"
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "プロトコルバージョンの最小限"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "パンチのジェスチャー"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5220,6 +5316,10 @@ msgstr "川の周りに谷を作るために地形を上げます。"
 msgid "Random input"
 msgstr "ランダム入力"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "MODのランダム読み込み"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "最近のチャットメッセージ"
@@ -5432,8 +5532,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5451,8 +5551,8 @@ msgstr ""
 "\n"
 "* 必須なし - アンチエイリアシングなし (既定)\n"
 "\n"
-"* FSAA - ハードウェア認証フルスクリーンアンチエイリアシング(シェーダーと互換"
-"性なし)\n"
+"* FSAA - ハードウェアによるフルスクリーンアンチエイリアシング\n"
+"(後処理およびアンダーサンプリングと互換性なし)\n"
 "別名 マルチサンプルアンチエイリアシング(MSAA)\n"
 "ブロックの縁を滑らかにしますが、テクスチャの内部には影響しません。\n"
 "このオプションを変更するには再起動が必要です。\n"
@@ -5463,8 +5563,8 @@ msgstr ""
 "処理速度と画質のバランスをとります。\n"
 "\n"
 "* SSAA - スーパーサンプリングアンチエイリアシング(シェーダーが必要)\n"
-"シーンの高解像度画像をレンダリングした後、スケールダウンしてエイリアシング効"
-"果を\n"
+"シーンの高解像度画像をレンダリングした後、"
+"スケールダウンしてエイリアシング効果を\n"
 "軽減します。これは最も遅く、最も正確な方式です。"
 
 #: src/settings_translation_file.cpp
@@ -5595,11 +5695,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"言語を設定してください。システム言語を使用するには空のままにします。\n"
-"変更後は再起動が必要です。"
+"言語を設定してください。初期状態ではシステム言語が使用されます。\n"
+"変更後の再起動が必要です。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5639,6 +5739,11 @@ msgstr ""
 "有効にするとブルーム効果が有効になります。\n"
 "明るい色が隣接するオブジェクトににじみます。"
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr "true "
+"に設定すると、ボリュームライティング効果(別名「Godrays」)が有効になります。"
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "有効にすると葉が揺れるようになります。"
@@ -5685,12 +5790,10 @@ msgstr "シェーダー"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
-"シェーダーは高度な視覚効果を可能にし、ビデオカードによっては\n"
-"パフォーマンスが向上する可能性があります。\n"
-"これはOpenGLビデオバックエンドでのみ機能します。"
+"シェーダーにより高度な視覚効果が可能になり、一部のビデオ カードの\n"
+"パフォーマンスが向上する場合があります。"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5774,16 +5877,6 @@ msgstr ""
 "この値を変更するのは特別な用途のためです。変更しないで\n"
 "おくことをお勧めします。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"メッシュ生成のマップブロックキャッシュサイズ。これを大きくすると、\n"
-"キャッシュヒット率が上がり、メインスレッドからコピーされるデータが\n"
-"減るため、ジッタが減少します。"
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "天体の軌道傾斜角"
@@ -5819,10 +5912,10 @@ msgstr "滑らかな照明"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
-"映画風モードでのカメラの旋回を滑らかにします。無効にするには 0。キー変更で設"
-"定されたキーを使用して映画風モードに切替えます。"
+"シネマティックモードでのカメラの旋回を滑らかにし、0 で無効にします。\n"
+"キー割り当てで設定されたキーを使用してシネマティックモードに切替えます。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5844,6 +5937,14 @@ msgstr "スニーク時の速度、1秒あたりのノード数です。"
 msgid "Soft shadow radius"
 msgstr "やわらない影半径"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "サウンド"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "音声拡張子のブラックリスト"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6045,18 +6146,47 @@ msgstr ""
 "観測記録が保存されている既定のファイル形式、\n"
 "`/profiler save [format]`がファイル形式なしで呼び出されたときに使われます。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr "タッチ操作がロングタップとみなされるまでのミリ秒単位の遅延。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr "観測記録が保存されるワールドパスに対する相対的なファイルパスです。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"プレイヤー/エンティティをパンチするためのジェスチャーです。\n"
+"これはゲームやMODによって上書きされる可能性があります。\n"
+"\n"
+"* ショートタップ\n"
+"使いやすく、名前は挙げませんが他のゲームでもよく知られています。\n"
+"\n"
+"* ロングタップ\n"
+"古典的な Minetest のモバイル版操作として知られています。\n"
+"戦闘はほぼ不可能です。"
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "使用するジョイスティックの識別子"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
-msgstr "タッチスクリーン操作が開始されるまでにかかるピクセル単位の長さ。"
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr "タッチ操作が動きと見なされるまでのピクセル単位の長さです。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6070,6 +6200,14 @@ msgstr ""
 "0.0 = 波はまったく動きません。\n"
 "既定は 1.0 (1/2 ノード) です。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"掘削ボタンを押したときにノードを掘る間にかかる秒単位の\n"
+"最小時間です。"
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "サーバーが待機しているネットワークインターフェース。"
@@ -6104,12 +6242,12 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "レンダリングのバックエンドです。\n"
-"注：これを変更した後は再起動が必要です。\n"
+"注：これを変更した後は再起動が必要です！\n"
 "デスクトップでは OpenGL が、Android では OGLES2 が規定です。\n"
-"シェーダーは OpenGL と OGLES2 (実験的) でサポートされています。"
+"シェーダーは OGLES1 以外のすべてでサポートされています。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6177,6 +6315,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "一緒に丘陵/山岳地帯の高さを定義する2Dノイズ4つのうちの3番目です。"
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "ロングタップのしきい値"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6230,14 +6372,14 @@ msgstr "タッチスクリーンの感度"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "タッチスクリーン感度の倍率。"
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "タッチスクリーンのしきい値"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "パフォーマンスのためのトレードオフ"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "半透明な液体"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "透明度の並べ替え距離"
@@ -6282,8 +6424,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
-msgstr "最新のMinetestリリースに関する情報を提供するJSONファイルへのURL"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr ""
+"最新の Minetest リリースに関する情報を提供する JSON ファイルへの URL\n"
+"これが空の場合、エンジンは更新をチェックしません。"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6339,9 +6485,8 @@ msgid "Use anisotropic filtering when looking at textures from an angle."
 msgstr "ある角度からテクスチャを見るときに異方性フィルタリングを使用します。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "テクスチャを拡大縮小する場合はトライリニアフィルタリングを使用します。"
+msgstr "テクスチャを拡大縮小するときはバイリニアフィルタリングを使用します。"
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6356,15 +6501,14 @@ msgstr ""
 "有効にすると、十字カーソルが表示されオブジェクトの選択に使用されます。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"テクスチャを縮小するときにミップマッピングを使用します。特に高解像度の\n"
-"テクスチャパックを使用するときにパフォーマンスがわずかに向上する\n"
-"可能性があります。ガンマ補正の縮小はサポートされていません。"
+"テクスチャを拡大縮小するときにミップマッピングを使用します。\n"
+"特に高解像度のテクスチャパックを使用するときにパフォーマンスがわずかに\n"
+"向上する可能性があります。ガンマ補正の縮小はサポートされていません。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6377,13 +6521,12 @@ msgstr ""
 "対するレイトレースオクルージョンカリング テストの使用を有効にします。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"テクスチャを縮小するときはトリリニアフィルタリングを使用します。\n"
+"テクスチャを拡大縮小するときはトリリニアフィルタリングを使用します。\n"
 "バイリニアフィルタリングとトリリニアフィルタリングの両方が有効な場合、\n"
 "トリリニアフィルタリングが適用されます。"
 
@@ -6401,10 +6544,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "ユーザーインターフェース"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSYNC"
@@ -6497,6 +6636,10 @@ msgstr "バーチャルパッドで Aux1 ボタン動作"
 msgid "Volume"
 msgstr "音量"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "ウィンドウがフォーカスされていないときの音量乗数です。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6505,6 +6648,14 @@ msgstr ""
 "すべての音の音量。\n"
 "サウンド システムを有効にする必要があります。"
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "フォーカスされていないときの音量"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "ボリュームライティング"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6801,12 +6952,18 @@ msgstr "cURL並行処理制限"
 #~ msgid "(game support required)"
 #~ msgstr "(ゲームサポート必須)"
 
+#~ msgid "- Address: "
+#~ msgstr "- アドレス: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- クリエイティブモード: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- ダメージ: "
 
+#~ msgid "- Port: "
+#~ msgstr "- ポート: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6844,6 +7001,12 @@ msgstr "cURL並行処理制限"
 #~ "ローカルサーバーを起動する際は空白に設定してください。\n"
 #~ "メインメニューのアドレス欄はこの設定を上書きすることに注意してください。"
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。"
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6912,6 +7075,9 @@ msgstr "cURL並行処理制限"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "フルスクリーンモードでのビット数(色深度)。"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "すべてのブロックにブロック境界線を表示"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "バンプマッピング"
 
@@ -6936,6 +7102,9 @@ msgstr "cURL並行処理制限"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "光度曲線ミッドブーストの中心。"
 
+#~ msgid "Change Keys"
+#~ msgstr "キー変更"
+
 #~ msgid "Change keys"
 #~ msgstr "キー変更"
 
@@ -7009,6 +7178,38 @@ msgstr "cURL並行処理制限"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "トンネルの幅を制御、小さい方の値ほど広いトンネルを生成します。"
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "操作方法:\n"
+#~ "- %s: 前進\n"
+#~ "- %s: 後退\n"
+#~ "- %s: 左移動\n"
+#~ "- %s: 右移動\n"
+#~ "- %s: ジャンプ/登る\n"
+#~ "- %s: 掘る/パンチ/使う\n"
+#~ "- %s: 置く/使う\n"
+#~ "- %s: スニーク/降りる\n"
+#~ "- %s: アイテムを落とす\n"
+#~ "- %s: インベントリ\n"
+#~ "- マウス: 振り向く/見る\n"
+#~ "- マウスホイール: アイテム選択\n"
+#~ "- %s: チャット\n"
+
 #~ msgid "Creative"
 #~ msgstr "クリエイティブ"
 
@@ -7018,6 +7219,9 @@ msgstr "cURL並行処理制限"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "照準線の色 (R,G,B)。"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "ダメージ"
 
@@ -7116,6 +7320,13 @@ msgstr "cURL並行処理制限"
 #~ msgid "Enable register confirmation"
 #~ msgstr "登録確認を有効化"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "頂点バッファオブジェクトを有効にします。\n"
+#~ "これにより、グラフィックスのパフォーマンスが大幅に向上します。"
+
 #~ msgid "Enabled"
 #~ msgstr "有効"
 
@@ -7426,6 +7637,9 @@ msgstr "cURL並行処理制限"
 #~ msgid "Instrumentation"
 #~ msgstr "計測器"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "無効なゲーム情報です。"
+
 #~ msgid "Inventory key"
 #~ msgstr "インベントリキー"
 
@@ -8121,6 +8335,12 @@ msgstr "cURL並行処理制限"
 #~ msgstr ""
 #~ "DirectX を LuaJIT と連携させます。問題がある場合は無効にしてください。"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "すべての液体を不透明にする"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "メッシュ生成のマップブロックキャッシュサイズ(MB)"
+
 #~ msgid "Menus"
 #~ msgstr "メニュー"
 
@@ -8362,15 +8582,21 @@ msgstr "cURL並行処理制限"
 #~ msgid "Simple Leaves"
 #~ msgstr "シンプルな葉"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "メッシュ生成のマップブロックキャッシュサイズ。これを大きくすると、\n"
+#~ "キャッシュヒット率が上がり、メインスレッドからコピーされるデータが\n"
+#~ "減るため、ジッタが減少します。"
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "滑らかな光"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "カメラの回転を滑らかにします。無効にする場合は 0。"
 
-#~ msgid "Sound"
-#~ msgstr "サウンド"
-
 #~ msgid "Special"
 #~ msgstr "スペシャル"
 
@@ -8434,6 +8660,9 @@ msgstr "cURL並行処理制限"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "タッチのしきい値 (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "タッチスクリーンのしきい値"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "トライリニアフィルタ"
 
@@ -8483,6 +8712,9 @@ msgstr "cURL並行処理制限"
 #~ "0 に設定すると、MSAAは無効になります。\n"
 #~ "このオプションを変更した場合、再起動が必要です。"
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr "浮遊大陸の滑らかな地形における丘の高さと湖の深さの変動。"
 
@@ -8584,8 +8816,14 @@ msgstr "cURL並行処理制限"
 #~ msgid "You died."
 #~ msgstr "あなたは死にました。"
 
+#~ msgid "You have no games installed."
+#~ msgstr "ゲームがインストールされていません。"
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "決定"
diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po
index bea978812..927b0f307 100644
--- a/po/jbo/minetest.po
+++ b/po/jbo/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Lojban (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2021-02-13 08:50+0000\n"
-"Last-Translator: Wuzzy <almikes@aol.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-10 01:09+0000\n"
+"Last-Translator: Qimar <jbobaukensylitru@gmail.com>\n"
 "Language-Team: Lojban <https://hosted.weblate.org/projects/minetest/minetest/"
 "jbo/>\n"
 "Language: jbo\n"
@@ -12,16 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
-msgstr ""
+msgstr "kutygau le casnu liste"
 
 #: builtin/client/chatcommands.lua
-#, fuzzy
 msgid "Empty command."
-msgstr "minde"
+msgstr "minde fi noda"
 
 #: builtin/client/chatcommands.lua
 #, fuzzy
@@ -29,31 +28,28 @@ msgid "Exit to main menu"
 msgstr "sisti tu'a le se kelci"
 
 #: builtin/client/chatcommands.lua
-#, fuzzy
 msgid "Invalid command: "
-msgstr "minde"
+msgstr "smucau minde fi tu'a zo'oi "
 
 #: builtin/client/chatcommands.lua
 msgid "Issued command: "
-msgstr ""
+msgstr "minde fi tu'a zo'oi "
 
 #: builtin/client/chatcommands.lua
-#, fuzzy
 msgid "List online players"
-msgstr "nonselkansa"
+msgstr "jarco loka kelci liste"
 
 #: builtin/client/chatcommands.lua
-#, fuzzy
 msgid "Online players: "
-msgstr "nonselkansa"
+msgstr "lo'i kelci cu se cmima "
 
 #: builtin/client/chatcommands.lua
 msgid "The out chat queue is now empty."
-msgstr ""
+msgstr "le bartu casnu liste ca ku kunti"
 
 #: builtin/client/chatcommands.lua
 msgid "This command is disabled by server."
-msgstr ""
+msgstr "le ti te minde cu na se curmi le samtcise'u"
 
 #: builtin/client/death_formspec.lua src/client/game.cpp
 msgid "Respawn"
@@ -64,22 +60,21 @@ msgid "You died"
 msgstr ".i do morsi"
 
 #: builtin/common/chatcommands.lua
-#, fuzzy
 msgid "Available commands:"
-msgstr "minde"
+msgstr "lo'i cumki te minde cu se cmima"
 
 #: builtin/common/chatcommands.lua
-#, fuzzy
 msgid "Available commands: "
-msgstr "minde"
+msgstr "lo'i cumki te minde cu se cmima "
 
 #: builtin/common/chatcommands.lua
 msgid "Command not available: "
-msgstr ""
+msgstr "le minde na ka'e se pilno "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr ""
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
+msgstr "cpedu lo sidju be fi tu'a lo se minde"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -87,13 +82,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "fitytu'i"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -113,6 +104,10 @@ msgstr ".i da nabmi"
 msgid "Main menu"
 msgstr "ralju liste"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "je'e"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "za'u re'u samjo'e"
@@ -143,181 +138,188 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr ".i ca'o samymo'i"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "se cmima ro bakfu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "xruti fi tu'a le ralju liste"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ".i ca'o cpacu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "se kelci"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "samtcise'a"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ".i ca'o samymo'i"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "se samtcise'a"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ".i na kakne le ka kibycpa pa bakfu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ".i no da ckaji lo se sisku"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "noda cnino"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Queued"
+msgstr "mo'u jmina ko'a le se liste"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Texture packs"
+msgstr "jvinu bakfu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "to'e samtcise'a"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "ningau"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "tcidu tu'a lo drata lo kibro"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "sarcu fa lonu cpacu lo se kelci vau lonu samtcise'a"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "ba'o se ci'erse'a"
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "cfari fa lo nu kelci"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr "fitytoltu'i"
+msgstr "je'enai"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "jai se nitcu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr ".i ca'o samymo'i"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "se kelci"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "samtcise'a"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "samtcise'a"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
-msgstr "na'e se nitcu"
+msgstr "cpacu lo se nitcu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ".i ca'o samymo'i"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "se samtcise'a"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ".i na kakne le ka kibycpa pa bakfu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ".i no da ckaji lo se sisku"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
-msgstr ""
+msgstr "facki fi noda"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Please check that the base game is correct."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
-msgid "Texture packs"
-msgstr "jvinu bakfu"
+msgid "Please check that the base game is correct."
+msgstr "e'o ko cipcta lo jicmu se kelci loka drani"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "to'e samtcise'a"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "basti"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -358,23 +360,23 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr ""
+msgstr "na banzu"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "ro co'e cu ganda"
+msgstr "ganda roda"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "le se samtcise'a bakfu cu ganda"
+msgstr "ganda le se samtcise'a bakfu"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr "ro co'e cu katci"
+msgstr "katci roda"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "le se samtcise'a bakfu cu katci"
+msgstr "katci le se samtcise'a bakfu"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -384,7 +386,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "sisku loka drata vau lo'i samtcise'a"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -409,19 +411,18 @@ msgid "No modpack description provided."
 msgstr "to'i no da ve skicu le se samtcise'a bakfu toi"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No optional dependencies"
-msgstr "na'e se nitcu"
+msgstr "noda se nitcu"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr "na'e se nitcu"
+msgstr "no'e se nitcu"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr "co'a vreji"
+msgstr "rejgau"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
@@ -437,45 +438,53 @@ msgstr ".i zoi zoi. $1 .zoi xa'o cmene pa munje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "ziljmina tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "nilga'u lenku"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "nilga'u sudga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "timymo'a mixre"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "timymo'a"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "kevna ciste"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr "kevzda"
+msgstr "kevna"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "cupra"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "datni"
+msgstr "jadni"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Development Test is meant for developers."
-msgstr ".i la'o zoi. Minimal development test .zoi na'o selpli lo favgau .o'i"
+msgstr ".i la'o zoi. Development Test .zoi na'o selpli lo favgau .o'i"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
@@ -483,16 +492,15 @@ msgstr "kevdi'u"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "plita tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr "lo tumla cu fulta lo tsani"
+msgstr "tsani fulta tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "fulta tumla"
+msgstr "fulta tumla o'isai"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
@@ -500,27 +508,27 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "cmama'a"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "rirxe vi lo cilmo tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "zenba loka cilmo vi lo rirxe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Install another game"
-msgstr ""
+msgstr "cpacu lo drata se kelci"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "lalxu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "lonu sudga je glare vacri cu rinka lonu caxno ja sudga rirxe"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 #, fuzzy
@@ -529,11 +537,11 @@ msgstr "te cupra le munje"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "tcita lo te cupra be le munje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
-msgstr ""
+msgstr "tcita lo te cupra be le steci munje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
@@ -541,11 +549,11 @@ msgstr "cmana"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "derpesxu flecu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "stura so'i kevlu'a"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -553,11 +561,11 @@ msgstr ".i do cuxna no se kelci"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "nilga'u lenku"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "nilga'u sudga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
@@ -565,7 +573,7 @@ msgstr "rirxe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "xamsi nilga'u rirxe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
@@ -584,7 +592,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "tumla jadni to na'o tricu je spati toi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
@@ -600,19 +608,19 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "nu sraku le tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "tricu je cicricfoi srasu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "vrici rirxe bo nilcoi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "mutce barda ke condi tumsfeni'a kevna"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -845,10 +853,6 @@ msgstr ""
 msgid "Back"
 msgstr "xruti"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -858,7 +862,8 @@ msgstr "tavla"
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -912,7 +917,7 @@ msgstr ""
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "steci"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -921,27 +926,27 @@ msgstr "ganda"
 #: builtin/mainmenu/settings/shadows_component.lua
 #: src/settings_translation_file.cpp
 msgid "Dynamic shadows"
-msgstr ""
+msgstr "cenba ctino"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "High"
-msgstr ""
+msgstr "mutce"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Low"
-msgstr ""
+msgstr "milxe"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Medium"
-msgstr ""
+msgstr "no'e mutce"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Very High"
-msgstr ""
+msgstr "tcetce"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Very Low"
-msgstr ""
+msgstr "mlimli"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "About"
@@ -957,11 +962,11 @@ msgstr ""
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Developers"
-msgstr ""
+msgstr "liste lo'i ralju zbapla"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "liste lo'i ralju bende"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
@@ -984,7 +989,7 @@ msgstr "liste lu'i ro pu je nai ca gunka"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Previous Core Developers"
-msgstr ""
+msgstr "liste lo'i ba'o ralju zbapla"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Share debug log"
@@ -992,7 +997,7 @@ msgstr ""
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr ""
+msgstr "catlu lo kibro"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content [$1]"
@@ -1009,9 +1014,8 @@ msgid "Content [$1]"
 msgstr "kakne le ka se samtcise'a"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Disable Texture Pack"
-msgstr "le jvinu bakfu cu ganda"
+msgstr "gandygau le jvinu bakfu"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Installed Packages:"
@@ -1028,7 +1032,7 @@ msgstr "to'i no da ve skicu le bakfu toi"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
-msgstr "basti fi le ka cmene"
+msgstr "basygau fi le cmene"
 
 #: builtin/mainmenu/tab_content.lua
 #, fuzzy
@@ -1037,7 +1041,7 @@ msgstr "ti'orkemsamtci to na kakne toi"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
-msgstr ""
+msgstr "pilno le jvinu bakfu"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
@@ -1053,7 +1057,7 @@ msgstr "finti se kelci"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "pilno lo selxai"
+msgstr "cumgau lonu xrani"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
@@ -1065,12 +1069,21 @@ msgid "Host Server"
 msgstr "co'a samtcise'u"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Install a game"
-msgstr "samtcise'a"
+msgstr "samtcise'a lo se kelci"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
+msgstr "samtcise'a lo se kelci ra'i la'oi ContentDB"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -1079,7 +1092,7 @@ msgstr "cnino"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "No world created or selected!"
-msgstr ".i do no munje cu cupra ja cu cuxna"
+msgstr ".i do na cupra ja cuxna lo munje"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
@@ -1090,13 +1103,12 @@ msgid "Port"
 msgstr "judrnporte"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Select Mods"
-msgstr ".i ko cuxna fi lu'i le munje"
+msgstr "cuxna fi lo'i se samtcise'a"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
-msgstr ".i ko cuxna fi lu'i le munje"
+msgstr "cuxna fi lo'i munje"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Server Port"
@@ -1107,13 +1119,13 @@ msgid "Start Game"
 msgstr "co'a kelci"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr ".i do samtcise'a no se kelci"
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "sarcu fa lonu cpacu lo se kelci vau lonu samtcise'a"
 
 #: builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Address"
-msgstr "- judri: "
+msgstr "judri"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
@@ -1122,7 +1134,7 @@ msgstr "finti se kelci"
 #. ~ PvP = Player versus Player
 #: builtin/mainmenu/tab_online.lua
 msgid "Damage / PvP"
-msgstr ""
+msgstr "cumki fa lonu simxu lonu xrani"
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1197,12 +1209,6 @@ msgstr ".i ca'o samymo'i le tengu datnyvei"
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-".i da nabmi fi le nu co'a jorne to la'a cu'i le temci cu dukse le ka clani "
-"toi"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
@@ -1210,10 +1216,6 @@ msgstr ""
 ".i na cumki fa le nu le se kelci cu jai se facki je cu se samymo'i .i ky. du "
 "la'o zoi."
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ".i le se kelci ve skicu vreji na drani"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "ralju liste"
@@ -1238,7 +1240,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1246,18 +1252,10 @@ msgstr ""
 "\n"
 ".i sarcu fa le nu do cipcta la'o zoi. debug.txt .zoi kei tu'a le tcila"
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- judri: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- judrnporte: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- gubni: "
@@ -1296,10 +1294,6 @@ msgstr "za'i ca'u muvdu"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1347,6 +1341,12 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ".i ca'o samjo'e le samse'u"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+".i da nabmi fi le nu co'a jorne to la'a cu'i le temci cu dukse le ka clani "
+"toi"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1355,32 +1355,13 @@ msgstr ""
 msgid "Continue"
 msgstr "ranji"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1430,38 +1411,40 @@ msgstr "sisti tu'a le samtci"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr ""
+msgstr "na sutra klama kakne"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr ""
+msgstr "sutra klama kakne"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
+msgstr "sutra klama na'e kakne ki'u lonu na curmi"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr ""
+msgstr "na vofli kakne"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fly mode enabled"
-msgstr "selpli"
+msgstr "vofli kakne"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
+msgstr "vofli na'e kakne ki'u lonu na curmi"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fog disabled"
-msgstr "selpli"
+msgstr "se mipri bumru"
+
+#: src/client/game.cpp
+msgid "Fog enabled"
+msgstr "jarco bumru"
 
 #: src/client/game.cpp
 #, fuzzy
-msgid "Fog enabled"
-msgstr "selpli"
+msgid "Fog enabled by game or mod"
+msgstr "na curmi lonu jbiji'u"
 
 #: src/client/game.cpp
 msgid "Game info:"
@@ -1484,10 +1467,6 @@ msgstr ".i ca'o samymo'i tu'a le dacti"
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1503,15 +1482,15 @@ msgstr "nonselkansa"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
-msgstr ""
+msgstr "na pagre be roda kakne"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled"
-msgstr ""
+msgstr "pagre be roda kakne"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr ""
+msgstr "na pagre be roda na'e kakne ki'u lonu na curmi"
 
 #: src/client/game.cpp
 #, fuzzy
@@ -1559,9 +1538,8 @@ msgid "Sound Volume"
 msgstr "ni sance"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Sound muted"
-msgstr "lo ni sance "
+msgstr "smaji"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
@@ -1572,9 +1550,8 @@ msgid "Sound system is not supported on this build"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Sound unmuted"
-msgstr "lo ni sance "
+msgstr "ba'o smaji"
 
 #: src/client/game.cpp
 #, c-format
@@ -1593,15 +1570,15 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range disabled"
-msgstr ""
+msgstr "jvinu jimte"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled"
-msgstr ""
+msgstr "na jvinu jimte"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "lonu claxu lo jvinu jimte cu na se curmi"
 
 #: src/client/game.cpp
 #, c-format
@@ -1641,19 +1618,15 @@ msgstr ".i fe lo ni sance cu cenba fi li %d ce'i"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr ""
+msgstr "ca'o jarco lo munje greku"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "ok"
-msgstr "je'e"
+msgstr "na curmi lonu jbiji'u"
 
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
-msgstr ""
+msgstr "na curmi lonu tavla"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1686,38 +1659,36 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Backspace"
-msgstr ""
+msgstr "prula'i vimcu tekla"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "za'i masno cadzu"
+msgstr "dicra tekla"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
-msgstr ""
+msgstr "lerfu stela tekla"
 
 #: src/client/keycode.cpp
 msgid "Clear Key"
-msgstr ""
+msgstr "romei vimcu tekla"
 
 #: src/client/keycode.cpp
 msgid "Control Key"
-msgstr ""
+msgstr "kontrol zei tekla"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "vimcu"
+msgstr "bavla'i vimcu tekla"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "dizlo tekla"
 
 #: src/client/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "fanmo tekla"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -1730,7 +1701,7 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "sidju"
 
 #: src/client/keycode.cpp
 msgid "Home"
@@ -1760,19 +1731,19 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "setca tekla"
 
 #: src/client/keycode.cpp
 msgid "Left Arrow"
-msgstr ""
+msgstr "zunle tekla"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
-msgstr "zulselpevysmacu"
+msgstr "zunle sma'acu bo tekla"
 
 #: src/client/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "zunle kontrol zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Left Menu"
@@ -1780,11 +1751,11 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "zunle cift zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "zunle uindos zei tekla"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
@@ -1793,11 +1764,11 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
-msgstr "mijyselpevysmacu"
+msgstr "midju sma'acu bo tekla"
 
 #: src/client/keycode.cpp
 msgid "Num Lock"
-msgstr ""
+msgstr "namcu stela tekla"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
@@ -1866,16 +1837,16 @@ msgstr "la'o gy.OEM Clear.gy."
 
 #: src/client/keycode.cpp
 msgid "Page Down"
-msgstr ""
+msgstr "papri dizlo tekla"
 
 #: src/client/keycode.cpp
 msgid "Page Up"
-msgstr ""
+msgstr "papri galtu tekla"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
 msgid "Pause Key"
-msgstr ""
+msgstr "denpa tekla"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1888,20 +1859,19 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Return Key"
-msgstr ""
+msgstr "gasnu tekla"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "ri'u muvdu"
+msgstr "pritu tekla"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
-msgstr "prityselpevysmacu"
+msgstr "pritu sma'acu bo tekla"
 
 #: src/client/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "pritu kontrol zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Right Menu"
@@ -1909,15 +1879,15 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "pritu cift zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "pritu uindos zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Scroll Lock"
-msgstr ""
+msgstr "muvdu stela tekla"
 
 #. ~ Key name
 #: src/client/keycode.cpp
@@ -1926,7 +1896,7 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Shift Key"
-msgstr ""
+msgstr "cift zei tekla"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1938,15 +1908,15 @@ msgstr ""
 
 #: src/client/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "se ragve tekla"
 
 #: src/client/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "pagyca'o tekla"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "galtu tekla"
 
 #: src/client/keycode.cpp
 #, fuzzy
@@ -1980,6 +1950,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2108,7 +2087,7 @@ msgstr "minde"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr ""
+msgstr "sance fanta"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
@@ -2175,13 +2154,26 @@ msgstr "mu'e co'a jonai mo'u sutra"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "jbiji'u"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "press key"
 msgstr ".i ko da'ergau pa batke"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr ".i da nabmi fi le nu kibycpa la'o zoi. $1 .zoi"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "basti"
@@ -2218,6 +2210,7 @@ msgstr "lo ni sance "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "jbo"
 
@@ -2405,12 +2398,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2434,6 +2421,10 @@ msgstr "cmene le munje"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2488,6 +2479,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2509,12 +2511,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2578,6 +2589,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2799,6 +2814,12 @@ msgstr "le bumgapci cu skari"
 msgid "Colored shadows"
 msgstr "le bumgapci cu skari"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2933,10 +2954,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2986,6 +3003,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3173,6 +3203,11 @@ msgstr "ro co'e cu katci"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "cumgau lonu xrani"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3192,6 +3227,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3234,6 +3273,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3257,6 +3300,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3265,12 +3312,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3300,6 +3341,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4097,9 +4151,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4248,10 +4303,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4300,7 +4351,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4335,10 +4388,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4580,6 +4629,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4648,6 +4701,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4758,10 +4815,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4774,6 +4827,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4884,6 +4941,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "le ve judrnporte favatcini na mapti "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4899,6 +4965,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5088,8 +5158,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5213,7 +5283,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5246,6 +5316,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5285,8 +5359,7 @@ msgstr "ti'orkemsamtci"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5356,13 +5429,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5399,7 +5465,7 @@ msgstr "lo xutla se gusni"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5421,6 +5487,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "smaji"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5577,17 +5652,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5598,6 +5693,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5624,7 +5725,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5681,6 +5782,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5728,12 +5833,13 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
-msgstr ""
+#, fuzzy
+msgid "Translucent liquids"
+msgstr ".i ca'o samymo'i lo me la'o gy.node.gy."
 
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
@@ -5771,7 +5877,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5869,10 +5977,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5959,12 +6063,25 @@ msgstr ""
 msgid "Volume"
 msgstr "lo ni sance"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "lo xutla se gusni"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6208,9 +6325,15 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- judri: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- finti se kelci: "
 
+#~ msgid "- Port: "
+#~ msgstr "- judrnporte: "
+
 #~ msgid "3D Clouds"
 #~ msgstr "cibyca'u dilnu"
 
@@ -6317,6 +6440,9 @@ msgstr ""
 #~ msgid "Information:"
 #~ msgstr "datni"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr ".i le se kelci ve skicu vreji na drani"
+
 #, fuzzy
 #~ msgid "Inventory key"
 #~ msgstr "lo dacti uidje"
@@ -6462,5 +6588,11 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr ".i do morsi"
 
+#~ msgid "You have no games installed."
+#~ msgstr ".i do samtcise'a no se kelci"
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "je'e"
diff --git a/po/jv/minetest.po b/po/jv/minetest.po
index d9888c73f..4ea01af34 100644
--- a/po/jv/minetest.po
+++ b/po/jv/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-11-17 00:07+0000\n"
 "Last-Translator: Muhammad Rifqi Priyo Susanto "
 "<muhammadrifqipriyosusanto@gmail.com>\n"
@@ -77,7 +77,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -86,13 +86,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Oke"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -109,6 +105,10 @@ msgstr "Wonten kasalahan:"
 msgid "Main menu"
 msgstr "Menu utama"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Oke"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Sambet Malih"
@@ -137,19 +137,25 @@ msgstr "Kami namung saged protokol versi $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Kami namung saged protokol versi antawis $1 kaliyan $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Salah pasang \"$1\": $2"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Gagal ngundhuh \"$1\""
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Gagal ngundhuh $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 kaliyan $2 dependensi badhe dipunpasang."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 dening $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -157,156 +163,157 @@ msgstr ""
 "$1 dipunundhuh,\n"
 "$2 dipunantreaken"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 dipunundhuh..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Sedaya paket"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Sampung dipunpasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Balik dhateng menu utama"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Ngundhuh..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Dolanan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Pasang"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ngewrat..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Boten wonten paket ingkang saget dipundhut"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Tanpa asil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Tanpa pangenggalan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Dipunantreaken"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paket tekstur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Paket $1 boten kepanggih."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Copot"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Enggalaken"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Enggalaken Sedaya [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 kaliyan $2 dependensi badhe dipunpasang."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 dening $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Sampung dipunpasang"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Dolanan Dhasar:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Batal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependensi:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Ngundhuh..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Salah pasang \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Gagal ngundhuh \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Gagal ngundhuh $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Dolanan"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Pasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Pasang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ngewrat..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Boten wonten paket ingkang saget dipundhut"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Tanpa asil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Tanpa pangenggalan"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Boten kepanggih"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Tindhih"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Dipunantreaken"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paket tekstur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Paket $1 boten kepanggih."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Copot"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Enggalaken"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Enggalaken Sedaya [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Tindhih"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -452,10 +459,20 @@ msgstr "Damel"
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -818,10 +835,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Gantos Tombol"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -831,7 +844,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1034,6 +1048,16 @@ msgstr "Pasang dolanan"
 msgid "Install games from ContentDB"
 msgstr "Pasang dolanan saking ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Enggal"
@@ -1067,8 +1091,8 @@ msgid "Start Game"
 msgstr "Wiwit Dolanan"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Panjenengan boten gadhah dolanan ingkang dipunpasang."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1147,18 +1171,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu Utama"
@@ -1183,7 +1199,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1191,18 +1211,10 @@ msgstr ""
 "\n"
 "Priksa debug.txt kagem peprincen."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1237,10 +1249,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1285,6 +1293,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1293,32 +1305,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Nerusaken"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1398,6 +1391,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1418,10 +1415,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1577,10 +1570,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "oke"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1901,6 +1890,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2090,6 +2088,18 @@ msgstr ""
 msgid "press key"
 msgstr "pencet tombol"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Gantos"
@@ -2123,6 +2133,7 @@ msgstr "Volume Swanten: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "jv"
 
@@ -2310,12 +2321,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2338,6 +2343,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2391,6 +2400,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2412,12 +2432,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2480,6 +2509,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2692,6 +2725,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2823,10 +2862,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2876,6 +2911,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3060,6 +3108,11 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ngagem Karisakan"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3079,6 +3132,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3121,6 +3178,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3144,6 +3205,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3152,12 +3217,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3187,6 +3246,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3981,9 +4053,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4129,10 +4202,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4181,7 +4250,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4216,10 +4287,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4461,6 +4528,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4529,6 +4600,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4637,10 +4712,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4653,6 +4724,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4762,6 +4837,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Versi protokol boten cocog. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4777,6 +4861,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4964,8 +5052,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5083,7 +5171,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5116,6 +5204,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5155,8 +5247,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5226,13 +5317,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5268,7 +5352,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5289,6 +5373,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Swanten"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5445,17 +5537,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5466,6 +5578,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5492,7 +5610,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5549,6 +5667,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5596,11 +5718,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5638,7 +5760,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5736,10 +5860,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5826,12 +5946,24 @@ msgstr ""
 msgid "Volume"
 msgstr "Volume"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6068,11 +6200,17 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "Change Keys"
+#~ msgstr "Gantos Tombol"
+
 #~ msgid "Change keys"
 #~ msgstr "Gantos tombol"
 
-#~ msgid "Sound"
-#~ msgstr "Swanten"
-
 #~ msgid "Uninstall Package"
 #~ msgstr "Copot Paket"
+
+#~ msgid "You have no games installed."
+#~ msgstr "Panjenengan boten gadhah dolanan ingkang dipunpasang."
+
+#~ msgid "ok"
+#~ msgstr "oke"
diff --git a/po/kk/minetest.po b/po/kk/minetest.po
index 45ec93c41..b93a16b3b 100644
--- a/po/kk/minetest.po
+++ b/po/kk/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kazakh (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2020-09-09 01:23+0000\n"
 "Last-Translator: Fontan 030 <pomanfedurin@gmail.com>\n"
 "Language-Team: Kazakh <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -74,7 +74,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -83,11 +83,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -106,6 +102,10 @@ msgstr "Қате кездесті:"
 msgid "Main menu"
 msgstr "Басты мәзір"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -134,176 +134,183 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Жүктелуде..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Ойындар"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Жүктелуде..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Модтар"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Жаңарту"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Жою"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Жаңарту"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Болдырмау"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Ойындар"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Жою"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Жүктелуде..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Модтар"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Жаңарту"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Жою"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Жаңарту"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -450,10 +457,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -817,10 +834,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -830,7 +843,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1034,6 +1048,16 @@ msgstr "Жою"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Жаңа"
@@ -1067,7 +1091,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1147,18 +1171,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Басты мәзір"
@@ -1183,24 +1199,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1236,10 +1248,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1284,6 +1292,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1292,32 +1304,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Жалғастыру"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1397,6 +1390,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr "Тұман қосылды"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1417,10 +1414,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1577,10 +1570,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1903,6 +1892,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2092,6 +2090,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2125,6 +2135,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "kk"
 
@@ -2310,12 +2321,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2338,6 +2343,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2391,6 +2400,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr "Алма ағаштары шуы"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Қол инерциясы"
@@ -2412,12 +2432,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2480,6 +2509,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2694,6 +2727,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2825,10 +2864,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2878,6 +2913,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3062,6 +3110,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3081,6 +3133,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3123,6 +3179,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3146,6 +3206,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3154,12 +3218,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3189,6 +3247,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3987,9 +4058,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4135,10 +4207,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4187,7 +4255,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4222,10 +4292,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4467,6 +4533,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4535,6 +4605,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4643,10 +4717,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4659,6 +4729,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4768,6 +4842,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4783,6 +4865,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4970,8 +5056,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5089,7 +5175,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5122,6 +5208,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5161,8 +5251,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5232,13 +5321,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5274,7 +5356,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5295,6 +5377,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5451,17 +5541,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5472,6 +5582,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5498,7 +5614,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5555,6 +5671,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5602,11 +5722,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5644,7 +5764,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5742,10 +5864,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5832,12 +5950,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/kn/minetest.po b/po/kn/minetest.po
index 0ec29a58a..c64e7c8ff 100644
--- a/po/kn/minetest.po
+++ b/po/kn/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kannada (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2021-01-02 07:29+0000\n"
 "Last-Translator: Tejaswi Hegde <tejaswihegde1@gmail.com>\n"
 "Language-Team: Kannada <https://hosted.weblate.org/projects/minetest/"
@@ -72,7 +72,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -81,13 +81,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "ಸರಿ"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -104,6 +100,10 @@ msgstr "ದೋಷ ವೊಂದು ಸಂಭವಿಸಿದೆ:"
 msgid "Main menu"
 msgstr "ಮುಖ್ಯ ಮೆನು"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ಸರಿ"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "ಮರುಸಂಪರ್ಕಿಸು"
@@ -132,178 +132,185 @@ msgstr "ನಾವು $ 1 ಪ್ರೋಟೋಕಾಲ್ ಆವೃತ್ತಿಯ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "ಆವೃತ್ತಿ $1 ಮತ್ತು $2 ನಡುವಿನ ಪ್ರೋಟೋಕಾಲ್ ಆವೃತ್ತಿಯನ್ನು ನಾವು ಬೆಂಬಲಿಸುತ್ತೇವೆ."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "ಡೌನ್ ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "ಎಲ್ಲಾ ಪ್ಯಾಕೇಜುಗಳು"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "ಮುಖ್ಯ ಮೆನುಗೆ ಹಿಂತಿರುಗಿ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "cURL ಇಲ್ಲದೆ ಮೈನ್ ಟೆಸ್ಟ್ ಅನ್ನು ಕಂಪೈಲ್ ಮಾಡಿದಾಗ ContentDB ಲಭ್ಯವಿಲ್ಲ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "ಡೌನ್ ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "ಆಟಗಳು"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "ಇನ್ಸ್ಟಾಲ್"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "ಮಾಡ್‍ಗಳು"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "ಯಾವುದೇ ಪ್ಯಾಕೇಜ್ ಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "ಫಲಿತಾಂಶಗಳಿಲ್ಲ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "ನವೀಕರಿಸಿ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "ಟೆಕ್‍ಸ್ಚರ್ ಪ್ಯಾಕ್ಗಳು"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "ಅನ್ಇನ್ಸ್ಟಾಲ್"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "ನವೀಕರಿಸಿ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "ರದ್ದುಮಾಡಿ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "cURL ಇಲ್ಲದೆ ಮೈನ್ ಟೆಸ್ಟ್ ಅನ್ನು ಕಂಪೈಲ್ ಮಾಡಿದಾಗ ContentDB ಲಭ್ಯವಿಲ್ಲ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "ಅವಲಂಬನೆಗಳು:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "ಡೌನ್ ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "ಆಟಗಳು"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "ಇನ್ಸ್ಟಾಲ್"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "ಇನ್ಸ್ಟಾಲ್"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "ಐಚ್ಛಿಕ ಅವಲಂಬನೆಗಳು:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "ಲೋಡ್ ಆಗುತ್ತಿದೆ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "ಮಾಡ್‍ಗಳು"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "ಯಾವುದೇ ಪ್ಯಾಕೇಜ್ ಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "ಫಲಿತಾಂಶಗಳಿಲ್ಲ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "ನವೀಕರಿಸಿ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "ಟೆಕ್‍ಸ್ಚರ್ ಪ್ಯಾಕ್ಗಳು"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "ಅನ್ಇನ್ಸ್ಟಾಲ್"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "ನವೀಕರಿಸಿ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -457,10 +464,20 @@ msgstr "ರಚಿಸು"
 msgid "Decorations"
 msgstr "ಅಲಂಕಾರಗಳು"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
@@ -834,10 +851,6 @@ msgstr ""
 msgid "Back"
 msgstr "ಹಿಂದೆ"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -847,7 +860,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1051,6 +1065,16 @@ msgstr "ಇನ್ಸ್ಟಾಲ್"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1084,7 +1108,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1165,18 +1189,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1201,24 +1217,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1254,10 +1266,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1302,6 +1310,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1310,32 +1322,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1415,6 +1408,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1435,10 +1432,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1594,10 +1587,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1918,6 +1907,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2109,6 +2107,19 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "$1 ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಆಗಿಲ್ಲ"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2142,6 +2153,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "kn"
 
@@ -2327,12 +2339,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2355,6 +2361,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2408,6 +2418,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2429,12 +2450,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2498,6 +2528,10 @@ msgstr "ಪ್ರದೇಶಗಳು"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2710,6 +2744,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2841,10 +2881,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2894,6 +2930,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3080,6 +3129,11 @@ msgstr "ಎಲ್ಲವನ್ನೂ ಸಕ್ರಿಯಗೊಳಿಸಿ"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "ಎಲ್ಲವನ್ನೂ ಸಕ್ರಿಯಗೊಳಿಸಿ"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3099,6 +3153,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3141,6 +3199,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3164,6 +3226,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3172,12 +3238,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3207,6 +3267,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4002,9 +4075,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4150,10 +4224,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4202,7 +4272,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4237,10 +4309,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4482,6 +4550,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4550,6 +4622,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4658,10 +4734,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4674,6 +4746,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4783,6 +4859,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "ಪ್ರೋಟೋಕಾಲ್ ಆವೃತ್ತಿ ಹೊಂದಿಕೆಯಾಗಿಲ್ಲ. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4798,6 +4883,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4985,8 +5074,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5105,7 +5194,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5138,6 +5227,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5177,8 +5270,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5248,13 +5340,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5290,7 +5375,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5311,6 +5396,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5467,17 +5560,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5488,6 +5601,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5514,7 +5633,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5571,6 +5690,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5618,11 +5741,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5660,7 +5783,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5758,10 +5883,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5848,12 +5969,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 7ea40bc62..09b215697 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Korean (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2022-05-08 00:22+0000\n"
-"Last-Translator: Han So Ri <2_0_2_0_@naver.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-01-11 09:06+0000\n"
+"Last-Translator: dog <dog808657@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/minetest/minetest/"
 "ko/>\n"
 "Language: ko\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1\n"
+"X-Generator: Weblate 5.4-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,25 +71,24 @@ msgstr "지역 명령어"
 
 #: builtin/common/chatcommands.lua
 msgid "Command not available: "
-msgstr ""
+msgstr "사용할수 없는 명령어: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr ""
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
+msgstr "명령어 도움말 보기"
 
 #: builtin/common/chatcommands.lua
 msgid ""
 "Use '.help <cmd>' to get more information, or '.help all' to list everything."
 msgstr ""
+"자세한 정보를 얻으려면 '.help <cmd>'를 사용하고, 모든 것을 나열하려면 '.help "
+"all'을 사용하십시오."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "확인"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -106,6 +105,10 @@ msgstr "오류가 발생했습니다:"
 msgid "Main menu"
 msgstr "메인 메뉴"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "확인"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "재연결"
@@ -134,181 +137,190 @@ msgstr "프로토콜 버전 $1만 제공합니다."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "프로토콜 버전 $1와(과) $2 사이의 버전을 제공합니다."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "$1을 다운로드하는 데에 실패했습니다"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1을 다운로드하는 데에 실패했습니다"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"모드 설치: \"$1\"는(은) 지원 되지 않는 파일 형식 이거나 손상된 압축 파일입니"
+"다"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
+"$1 다운로드중,\n"
+"$2 대기중"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "다운 받는 중..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "모든 패키지"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "이미 설치됨"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "주 메뉴로 돌아가기"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "cURL 없이 Minetest를 컴파일한 경우 ContentDB를 사용할 수 없습니다"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "다운 받는 중..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "게임"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "설치"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "모드"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "검색할 수 있는 패키지가 없습니다"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "결과 없음"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "업데이트 없음"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "텍스처 팩"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "제거"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "업데이트"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 과 $2 종속품이 설치됩니다."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "이미 설치됨"
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "호스트 게임"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "취소"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "cURL 없이 Minetest를 컴파일한 경우 ContentDB를 사용할 수 없습니다"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "의존:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "다운 받는 중..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "$1을 다운로드하는 데에 실패했습니다"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1을 다운로드하는 데에 실패했습니다"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"모드 설치: \"$1\"는(은) 지원 되지 않는 파일 형식 이거나 손상된 압축 파일입니"
-"다"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "게임"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "설치"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "설치"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "종속성 선택:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "불러오는 중..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "모드"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "검색할 수 있는 패키지가 없습니다"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "결과 없음"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "업데이트 없음"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "찾을 수 없음"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\"은 이미 존재합니다. 덮어쓰기 하시겠습니까?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "텍스처 팩"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "제거"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "업데이트"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -460,11 +472,21 @@ msgstr "만들기"
 msgid "Decorations"
 msgstr "장식"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "경고: Development Test는 개발자를 위한 모드입니다."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "던전"
@@ -837,10 +859,6 @@ msgstr ""
 msgid "Back"
 msgstr "뒤로"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "키 변경"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -850,7 +868,8 @@ msgstr "채팅"
 msgid "Clear"
 msgstr "지우기"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "컨트롤"
 
@@ -1066,6 +1085,16 @@ msgstr "설치"
 msgid "Install games from ContentDB"
 msgstr "ContentDB에서 게임 설치"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "새로 만들기"
@@ -1100,8 +1129,8 @@ msgid "Start Game"
 msgstr "게임 시작"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "게임이 설치되어 있지 않습니다."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1187,19 +1216,11 @@ msgstr "텍스쳐 로딩중..."
 msgid "Rebuilding shaders..."
 msgstr "쉐이더 개축중..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "연결 오류 (시간초과)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "게임을 찾지 못했거나 로딩할 수 없습니다\""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "인식할 수 없는 게임 사양입니다."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "주 메뉴"
@@ -1224,7 +1245,11 @@ msgstr "패스워드 파일을 여는데 실패했습니다: "
 msgid "Provided world path doesn't exist: "
 msgstr "월드 경로가 존재하지 않습니다: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "미디어..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1232,18 +1257,10 @@ msgstr ""
 "\n"
 "자세한 내용은 debug.txt을 확인 합니다."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- 주소: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- 모드: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- 포트: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- 공개: "
@@ -1279,10 +1296,6 @@ msgstr "자동 전진 활성화"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1329,6 +1342,10 @@ msgstr "클라이언트 스크립트가 비활성화됨"
 msgid "Connecting to server..."
 msgstr "서버 연결중..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "연결 오류 (시간초과)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1337,47 +1354,14 @@ msgstr ""
 msgid "Continue"
 msgstr "계속"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"조작:\n"
-"-%s: 앞으로 이동\n"
-"-%s:뒤로 이동\n"
-"-%s:왼쪽으로 이동\n"
-"-%s:오른쪽으로 이동\n"
-"-%s: 점프/오르기\n"
-"-%s:조용히 걷기/내려가기\n"
-"-%s:아이템 버리기\n"
-"-%s:인벤토리\n"
-"-마우스: 돌기/보기\n"
-"-마우스 왼쪽 클릭: 땅파기/펀치\n"
-"-마우스 오른쪽 클릭: 두기/사용하기\n"
-"-마우스 휠:아이템 선택\n"
-"-%s: 채팅\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1469,6 +1453,11 @@ msgstr "안개 비활성화"
 msgid "Fog enabled"
 msgstr "안개 활성화"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "게임 또는 모드에 의해 현재 확대 비활성화"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "게임 정보:"
@@ -1489,10 +1478,6 @@ msgstr "아이템 정의중..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "미디어..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1651,10 +1636,6 @@ msgstr "선 표면 보이기"
 msgid "Zoom currently disabled by game or mod"
 msgstr "게임 또는 모드에 의해 현재 확대 비활성화"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "확인"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1990,6 +1971,15 @@ msgstr "표면 모드의 미니맵, 1배 확대"
 msgid "Minimap in texture mode"
 msgstr "최소 텍스처 크기"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "$1을 다운로드하는 데에 실패했습니다"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2182,6 +2172,19 @@ msgstr "확대/축소"
 msgid "press key"
 msgstr "키를 누르세요"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "$1을 다운로드하는 데에 실패했습니다"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "변경"
@@ -2215,6 +2218,7 @@ msgstr "볼륨 조절: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ko"
 
@@ -2436,13 +2440,6 @@ msgstr "객체 전달 범위 활성화"
 msgid "Adds particles when digging a node."
 msgstr "node를 부술 때의 파티클 효과를 추가합니다."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"화면에 맞게 dpi 구성을 조정합니다 (X11 미지원 / Android 만 해당). 4k 화면 용."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2471,6 +2468,10 @@ msgstr "아이템 이름 추가"
 msgid "Advanced"
 msgstr "고급"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2532,6 +2533,17 @@ msgstr "툴팁에 아이템 이름 추가."
 msgid "Apple trees noise"
 msgstr "사과 나무 노이즈"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "팔 관성"
@@ -2549,18 +2561,37 @@ msgid "Ask to reconnect after crash"
 msgstr "충돌 후 재연결 요청"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"이 거리에서 서버는 클라이언트로 전송되는 블록의 최적화를\n"
+"활성화합니다.\n"
+"작은 값은 눈에 띄는 렌더링 결함을 통해 \n"
+"잠재적으로 성능을 크게 향상시킵니다 \n"
+"(일부 블록은 수중과 동굴, 때로는 육지에서도 렌더링되지 않습니다).\n"
+"이 값을 max_block_send_distance보다 큰 값으로 설정하면 \n"
+"최적화가 비활성화됩니다.\n"
+"맵 블록 (16 개 노드)에 명시되어 있습니다."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "이 거리에서 서버는 클라이언트로 전송되는 블록의 최적화를\n"
 "활성화합니다.\n"
@@ -2634,6 +2665,11 @@ msgstr "생물 군계"
 msgid "Biome noise"
 msgstr "Biome 노이즈"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "블록 전송 최적화 거리"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "블록 전송 최적화 거리"
@@ -2857,6 +2893,12 @@ msgstr "색깔있는 안개"
 msgid "Colored shadows"
 msgstr "색깔있는 안개"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3007,10 +3049,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "감도(DPI)"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "디버그 로그 파일 크기 임계치"
@@ -3060,6 +3098,24 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"오래된 클라이언트 연결을 허락하지 않는것을 사용.\n"
+"이전 클라이언트는 서버에서 당신이 기대하는 새로운 특징들을 지원하지 않는다"
+"면 \n"
+"새로운 서버로 연결할 때 충돌하지 않을 것입니다."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "나무에 사과가 있는 영역 정의."
@@ -3246,6 +3302,11 @@ msgstr "모두 활성화"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "데미지 활성화"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3265,6 +3326,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "조이스틱 활성화"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3307,6 +3373,11 @@ msgstr "모드 보안 적용"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "랜덤 사용자 입력 (테스트에 사용)를 사용 합니다."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "랜덤 사용자 입력 (테스트에 사용)를 사용 합니다."
@@ -3334,6 +3405,11 @@ msgstr ""
 "면 \n"
 "새로운 서버로 연결할 때 충돌하지 않을 것입니다."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "터치임계값 (픽셀)"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3345,12 +3421,6 @@ msgstr ""
 "원격 서버들은 서버에 연결할 때 매우 빠르게 미디어를\n"
 "다운로드 할 수 있도록 제공합니다.(예: 텍스처)"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3385,6 +3455,19 @@ msgstr "인벤토리 아이템의 애니메이션 적용."
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4206,9 +4289,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4359,10 +4443,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "모든 액체를 불투명하게 만들기"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4411,7 +4491,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4447,10 +4529,6 @@ msgstr "맵 블록 생성 지연"
 msgid "Mapblock mesh generation threads"
 msgstr "맵 블록 생성 지연"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Mapblock 메시 생성기의 MapBlock 캐시 크기 (MB)"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4698,6 +4776,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr "미니맵 스캔 높이"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "오른쪽 클릭 반복 간격"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4769,6 +4852,11 @@ msgstr "마우스 감도"
 msgid "Mouse sensitivity multiplier."
 msgstr "마우스 감도 멀티플라이어."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "동굴 임계치"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4885,10 +4973,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "불투명한 액체"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4901,6 +4985,11 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "맵젠 디버그"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5015,6 +5104,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "프로토콜 버전이 알맞지 않습니다. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5032,6 +5130,10 @@ msgstr "강 주변에 계곡을 만들기 위해 지형을 올립니다."
 msgid "Random input"
 msgstr "임의 입력"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5225,8 +5327,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5367,8 +5469,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "언어 설정. 시스템 언어를 사용하려면 비워두세요.\n"
@@ -5406,6 +5509,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5451,11 +5558,11 @@ msgid "Shaders"
 msgstr "쉐이더"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "쉐이더는 확장된 시각 효과를 제공하고 몇몇 비디오 카드의 성능이 증가할 수도 있"
 "습니다.\n"
@@ -5534,13 +5641,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5577,7 +5677,7 @@ msgstr "부드러운 조명효과"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "시네마틱 모드에서 카메라의 회전을 매끄럽게 만듭니다. 사용 하지 않으려면 0을 "
 "입력하세요."
@@ -5604,6 +5704,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "글꼴 그림자 투명도"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "사운드"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "콘텐츠DB 블랙리스트 플래그"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5761,17 +5870,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5782,6 +5911,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5811,7 +5946,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5868,6 +6003,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5924,15 +6063,15 @@ msgstr "마우스 감도"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "마우스 감도 멀티플라이어."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "터치임계값 (픽셀)"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "불투명한 액체"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5971,7 +6110,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6075,10 +6216,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "수직동기화 V-Sync"
@@ -6165,6 +6302,10 @@ msgstr ""
 msgid "Volume"
 msgstr "볼륨"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6173,6 +6314,16 @@ msgstr ""
 "시차 교합 맵핑 적용.\n"
 "쉐이더를 활성화 해야 합니다."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "게임이 일시정지될때의 최대 FPS."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "부드러운 조명효과"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6430,12 +6581,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- 주소: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- 크리에이티브 모드: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- 데미지: "
 
+#~ msgid "- Port: "
+#~ msgstr "- 포트: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6470,6 +6627,13 @@ msgstr ""
 #~ "로컬 서버를 시작하려면 공백으로 두십시오.\n"
 #~ "주 메뉴의 주소 공간은 이 설정에 중복됩니다."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "화면에 맞게 dpi 구성을 조정합니다 (X11 미지원 / Android 만 해당). 4k 화면 "
+#~ "용."
+
 #~ msgid "All Settings"
 #~ msgstr "모든 설정"
 
@@ -6523,6 +6687,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "카메라 업데이트 토글 키"
 
+#~ msgid "Change Keys"
+#~ msgstr "키 변경"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "키 변경"
@@ -6586,6 +6753,38 @@ msgstr ""
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "터널 너비를 조절, 작은 수치는 넓은 터널을 만듭니다."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "조작:\n"
+#~ "-%s: 앞으로 이동\n"
+#~ "-%s:뒤로 이동\n"
+#~ "-%s:왼쪽으로 이동\n"
+#~ "-%s:오른쪽으로 이동\n"
+#~ "-%s: 점프/오르기\n"
+#~ "-%s:조용히 걷기/내려가기\n"
+#~ "-%s:아이템 버리기\n"
+#~ "-%s:인벤토리\n"
+#~ "-마우스: 돌기/보기\n"
+#~ "-마우스 왼쪽 클릭: 땅파기/펀치\n"
+#~ "-마우스 오른쪽 클릭: 두기/사용하기\n"
+#~ "-마우스 휠:아이템 선택\n"
+#~ "-%s: 채팅\n"
+
 #~ msgid "Creative"
 #~ msgstr "창의적인"
 
@@ -6595,6 +6794,9 @@ msgstr ""
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "십자선 색 (빨, 초, 파)."
 
+#~ msgid "DPI"
+#~ msgstr "감도(DPI)"
+
 #~ msgid "Damage"
 #~ msgstr "데미지"
 
@@ -6797,6 +6999,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "모드 설치: 파일: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "인식할 수 없는 게임 사양입니다."
+
 #~ msgid "Inventory key"
 #~ msgstr "인벤토리 키"
 
@@ -7467,6 +7672,12 @@ msgstr ""
 #~ msgid "Main menu style"
 #~ msgstr "주 메뉴 스크립트"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "모든 액체를 불투명하게 만들기"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Mapblock 메시 생성기의 MapBlock 캐시 크기 (MB)"
+
 #~ msgid "Menus"
 #~ msgstr "메뉴"
 
@@ -7679,9 +7890,6 @@ msgstr ""
 #~ msgstr ""
 #~ "카메라의 회전을 매끄럽게 만듭니다. 사용 하지 않으려면 0을 입력하세요."
 
-#~ msgid "Sound"
-#~ msgstr "사운드"
-
 #~ msgid "Special"
 #~ msgstr "특별함"
 
@@ -7738,6 +7946,10 @@ msgstr ""
 #~ msgid "Touch threshold (px):"
 #~ msgstr "터치 임계값: (픽셀)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "터치임계값 (픽셀)"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "선형 필터"
 
@@ -7821,8 +8033,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "사망했습니다"
 
+#~ msgid "You have no games installed."
+#~ msgstr "게임이 설치되어 있지 않습니다."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "확인"
diff --git a/po/kv/minetest.po b/po/kv/minetest.po
new file mode 100644
index 000000000..d815cb5fe
--- /dev/null
+++ b/po/kv/minetest.po
@@ -0,0 +1,6229 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: minetest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-06 19:09+0000\n"
+"Last-Translator: Mićadźoridź <otto.grotovel@gmail.com>\n"
+"Language-Team: Komi <https://hosted.weblate.org/projects/minetest/minetest/"
+"kv/>\n"
+"Language: kv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.7-dev\n"
+
+#: builtin/client/chatcommands.lua
+msgid "Clear the out chat queue"
+msgstr "Чат лёдз чышкыны"
+
+#: builtin/client/chatcommands.lua
+msgid "Empty command."
+msgstr "Куш команда."
+
+#: builtin/client/chatcommands.lua
+msgid "Exit to main menu"
+msgstr "Медшӧр менюӧ петны"
+
+#: builtin/client/chatcommands.lua
+msgid "Invalid command: "
+msgstr "Торксьӧм команда: "
+
+#: builtin/client/chatcommands.lua
+msgid "Issued command: "
+msgstr "Гижӧм команда: "
+
+#: builtin/client/chatcommands.lua
+msgid "List online players"
+msgstr "Везйын ворсысьяслӧн лыддьӧг"
+
+#: builtin/client/chatcommands.lua
+msgid "Online players: "
+msgstr "Ворсысьяс везйын: "
+
+#: builtin/client/chatcommands.lua
+msgid "The out chat queue is now empty."
+msgstr "Чат лёдз ӧні тыртӧм."
+
+#: builtin/client/chatcommands.lua
+msgid "This command is disabled by server."
+msgstr "Сервер тайӧ командасӧ кусӧдіс."
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Ловзьыны"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Кулінныд"
+
+#: builtin/common/chatcommands.lua
+msgid "Available commands:"
+msgstr "Восьса командаяс:"
+
+#: builtin/common/chatcommands.lua
+msgid "Available commands: "
+msgstr "Восьса командаяс: "
+
+#: builtin/common/chatcommands.lua
+msgid "Command not available: "
+msgstr "Командаыс сиптӧма: "
+
+#: builtin/common/chatcommands.lua
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Командаяс йылысь юӧр босьтны (-t: чатӧ гижӧм)"
+
+#: builtin/common/chatcommands.lua
+msgid ""
+"Use '.help <cmd>' to get more information, or '.help all' to list everything."
+msgstr "Гиж «.help <cmd>» содтӧд юӧрла али «.help all» — тыр лыддьӧгла."
+
+#: builtin/common/chatcommands.lua
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <команда>] [-t]"
+
+#: builtin/fstk/ui.lua
+msgid "<none available>"
+msgstr "<сиптӧма>"
+
+#: builtin/fstk/ui.lua
+msgid "An error occurred in a Lua script:"
+msgstr "Lua скриптын торксьӧм лоис:"
+
+#: builtin/fstk/ui.lua
+msgid "An error occurred:"
+msgstr "Торксьӧм лоис:"
+
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr "Медшӧр меню"
+
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ОК"
+
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr "Выльысь йитчыны"
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr "Сервер корис выльысь йитчыны:"
+
+#: builtin/mainmenu/common.lua
+msgid "Protocol version mismatch. "
+msgstr "Протоколлӧн версияыс оз лӧсяв. "
+
+#: builtin/mainmenu/common.lua
+msgid "Server enforces protocol version $1. "
+msgstr "Серверыс корӧ $1 версия. "
+
+#: builtin/mainmenu/common.lua
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr "Серверыс протоколлӧн $1-сянь $2-ӧдз версияын уджалӧ. "
+
+#: builtin/mainmenu/common.lua
+msgid "We only support protocol version $1."
+msgstr "Ми сӧмын протоколлӧн $1 версияын уджалам."
+
+#: builtin/mainmenu/common.lua
+msgid "We support protocol versions between version $1 and $2."
+msgstr "Ми сӧмын протоколлӧн $1-сянь $2-ӧдз версияын уджалам."
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "«$1» пуктӧмигӧн тӧрксьӧм лоис: $2"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "«$1» бӧсьтӧм эз артмы"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 бӧсьтӧм эз артмы"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"«$1» перйыны эз артмы (дискын пуктанін этша, уджавтӧм файл сикас али жугалӧм "
+"топӧдӧм файл)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 бӧсьтчӧ,\n"
+"$2 виччысьӧ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "$1 downloading..."
+msgstr "$1 бӧсьтчӧ…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
+msgstr "Став содтӧдъяс"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Медшӧр менюӧ бӧр"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB оз уджав, Minetest cURL-тӧг кӧ компиляторӧн тэчӧма"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Босьтсьӧм..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Ворсӧмъяс"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Пуктыны"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Тэчсьӧм..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Модъяс"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Содтӧдъяс босьтны эз артмы"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Нинӧм абу аддзӧма"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Выльмӧдӧмъяс абуӧсь"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Лёдзын"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Текстура чукӧр"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "$1 содтӧдыс абу аддзӧма."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Бырӧдны"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Выльмӧдны"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Выльмӧдны ставсӧ [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Видзӧдны ӧтуввезын содтӧм юӧр"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Мод пуктытӧдз тіянлы колӧ ворсӧм пуктыны"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$2-ысь $1"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Нин пуктӧма"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Base Game:"
+msgstr "Медшӧр ворсӧм:"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
+msgid "Cancel"
+msgstr "Дугӧдны"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Dependencies:"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install $1"
+msgstr "Пуктыны $1"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Not found"
+msgstr "Абу аддзӧма"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$1» нин эм. Выльысь гижны?"
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Выльысь гижны"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "$1 (Enabled)"
+msgstr "$1 (Ӧзтӧма)"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "$1 mods"
+msgstr "$1 мод"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Failed to install $1 to $2"
+msgstr "$2-ӧ $1 пуктыны эз артмы"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Install: Unable to find suitable folder name for $1"
+msgstr "Пуктӧм: $1-лы шогмана ним аддзыны эз артмы"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to find a valid mod, modpack, or game"
+msgstr "Колана мод видзан куд, мод чукӧр али вӧрсӧм аддзыны эз артмы"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to install a $1 as a $2"
+msgstr "$2 моз $1 пуктыны эз артмы"
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to install a $1 as a texture pack"
+msgstr "Текстура чукӧр моз $1 пуктыны эз артмы"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "(Enabled, has error)"
+msgstr "(Ӧзтӧма, торксьӧмъяс эмӧсь)"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "(Unsatisfied)"
+msgstr "(Лёка)"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable all"
+msgstr "Ставсӧ кусӧдны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable modpack"
+msgstr "Мод чукӧр кусӧдны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable all"
+msgstr "Ставсӧ ӧзтыны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable modpack"
+msgstr "Мод чукӧр ӧзтыны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid ""
+"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
+"characters [a-z0-9_] are allowed."
+msgstr ""
+"«$1» модасӧ ӧзтыны эз артмы, сыын позьтӧм пасъяс эмӧсь. Позьӧ гижны сӧмын "
+"татшӧм пасъясыс: [a-z0-9_]."
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Find More Mods"
+msgstr "Унджык мод аддзыны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr "Мод:"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No (optional) dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No game description provided."
+msgstr "Ворсӧм йывсьыс юӧр видзӧдлыны оз позь."
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No hard dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No modpack description provided."
+msgstr "Мод чукӧр йывсыс юӧр видзӧдлыны оз позь."
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No optional dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Optional dependencies:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr "Видзны"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr "Енкӧла:"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr "ӧзтӧма"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "A world named \"$1\" already exists"
+msgstr "«$1» нима енкӧла нин эм"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Additional terrain"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Altitude chill"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Altitude dry"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Biome blending"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Biomes"
+msgstr "Биомъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Caverns"
+msgstr "Рудӧгувъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Caves"
+msgstr "Рудӧгъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr "Вӧчны"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Decorations"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Development Test is meant for developers."
+msgstr "Development Test артмӧдысьяслы вӧчӧма."
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Dungeons"
+msgstr "Муувъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Flat terrain"
+msgstr "Тшӧтшкӧсін"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Floating landmasses in the sky"
+msgstr "Енэжвывса діяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Floatlands (experimental)"
+msgstr "Енэжвывса діяс (экспериментӧн)"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Generate non-fractal terrain: Oceans and underground"
+msgstr "Вӧчны фракталтӧм ин: саридзьяс да муувъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Hills"
+msgstr "Мылькъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Humid rivers"
+msgstr "Юяслӧн васӧдлун"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Increases humidity around rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Install another game"
+msgstr "Мӧд вӧрсӧмсӧ пуктыны"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Lakes"
+msgstr "Тыяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Low humidity and high heat causes shallow or dry rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr "Мапген"
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mapgen-specific flags"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mountains"
+msgstr "Керӧсъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mud flow"
+msgstr "Ызгысь шор"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Network of tunnels and caves"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "No game selected"
+msgstr "Ворсӧмыс абу бӧрйӧма"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Reduces heat with altitude"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Reduces humidity with altitude"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Rivers"
+msgstr "Юяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Sea level rivers"
+msgstr "Саридз веркӧс судта юяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Seed"
+msgstr "Сид"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Smooth transition between biomes"
+msgstr "Биомъяс костын лайкыд вуджӧм"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Structures appearing on the terrain (no effect on trees and jungle grass "
+"created by v6)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Structures appearing on the terrain, typically trees and plants"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert"
+msgstr "Шӧр климата ин, Лыааин"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert, Jungle"
+msgstr "Шӧр климата ин, Лыааин, Джунгли"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert, Jungle, Tundra, Taiga"
+msgstr "Шӧр климата ин, Лыааин, Джунгли, Тундра, Парма"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Terrain surface erosion"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Trees and jungle grass"
+msgstr "Пуяс да тропик турунъяс"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Vary river depth"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Very large caverns deep in the underground"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr "Енкӧлалӧн нимыс"
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "Are you sure you want to delete \"$1\"?"
+msgstr "Инаысь-ӧ кӧсъянныд «$1» бырӧдны?"
+
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
+msgid "Delete"
+msgstr "Бырӧдны"
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "pkgmgr: failed to delete \"$1\""
+msgstr "pkgmgr: «$1» бырӧдны эз артмы"
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "pkgmgr: invalid path \"$1\""
+msgstr "pkgmgr: торксьӧм «$1» туйыс"
+
+#: builtin/mainmenu/dlg_delete_world.lua
+msgid "Delete World \"$1\"?"
+msgstr "«$1» енкӧла бырӧдны?"
+
+#: builtin/mainmenu/dlg_register.lua src/gui/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr "Гусякывтӧ вынсьӧд"
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Joining $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Missing name"
+msgstr "Нимыс абу"
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
+#: builtin/mainmenu/tab_online.lua
+msgid "Name"
+msgstr "Ним"
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
+#: builtin/mainmenu/tab_online.lua
+msgid "Password"
+msgstr "Гусякыв"
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Passwords do not match"
+msgstr "Гусякывъясыс эз ӧтлаасьны"
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
+msgid "Register"
+msgstr "Регистрация"
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Dismiss"
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid ""
+"For a long time, the Minetest engine shipped with a default game called "
+"\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
+"game."
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid ""
+"If you want to continue playing in your Minetest Game worlds, you need to "
+"reinstall Minetest Game."
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Minetest Game is no longer installed by default"
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Reinstall Minetest Game"
+msgstr "Minetest Game выльысь пуктыны"
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Accept"
+msgstr "Босьтны"
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr "Мод чукӧрлы выль ним сетны:"
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid ""
+"This modpack has an explicit name given in its modpack.conf which will "
+"override any renaming here."
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "A new $1 version is available"
+msgstr "Выль $1 версия восьтӧма"
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid ""
+"Installed version: $1\n"
+"New version: $2\n"
+"Visit $3 to find out how to get the newest version and stay up to date with "
+"features and bugfixes."
+msgstr ""
+"Пуктӧм версия: $1\n"
+"Выль версия: $2\n"
+"Медвыль версия босьтӧм да выль функцияяс али лӧсьӧдӧмъяс йылысь тӧдмалӧм "
+"могысь пырӧй $3-ӧ."
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Later"
+msgstr "Бӧрынджык"
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Never"
+msgstr "Некор"
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Visit website"
+msgstr "Сайтӧ пырны"
+
+#: builtin/mainmenu/init.lua
+msgid "Settings"
+msgstr "Лӧсьӧданін"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr "Восьса серверъяслӧн лыддьӧгныс кусӧдӧма"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Видлӧй восьса серверъяслысь лыддьӧгнысӧ выльмӧдны да видлӧй ӧтуввезкӧд "
+"йитчӧмсӧ."
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Browse"
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Edit"
+msgstr "Вежны"
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Select directory"
+msgstr "Куд бӧрйыны"
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Select file"
+msgstr "Файл бӧрйыны"
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Set"
+msgstr "Индыны"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "(No description of setting given)"
+msgstr "(Лӧсьӧдӧм йывсьыс юӧр абу)"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "2D Noise"
+msgstr "2D шувгӧм"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Lacunarity"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Octaves"
+msgstr "Октавъяс"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/settings_translation_file.cpp
+msgid "Offset"
+msgstr "Вештӧм"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Persistence"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/settings_translation_file.cpp
+msgid "Scale"
+msgstr "Бердӧг"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "X spread"
+msgstr "X кузя разалӧм"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Y spread"
+msgstr "Y кузя разалӧм"
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Z spread"
+msgstr "Z паськалӧм"
+
+#. ~ "absvalue" is a noise parameter flag.
+#. It is short for "absolute value".
+#. It can be enabled in noise settings in
+#. the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "absvalue"
+msgstr ""
+
+#. ~ "defaults" is a noise parameter flag.
+#. It describes the default processing options
+#. for noise settings in the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "defaults"
+msgstr "подув ногӧн"
+
+#. ~ "eased" is a noise parameter flag.
+#. It is used to make the map smoother and
+#. can be enabled in noise settings in
+#. the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "eased"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "(Use system language)"
+msgstr "(Системалӧн кывйыс)"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Accessibility"
+msgstr "Восьсалун"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Back"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
+#: src/settings_translation_file.cpp
+msgid "Chat"
+msgstr "Чат"
+
+#: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
+msgid "Clear"
+msgstr "Чышкыны"
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr "Веськӧдлӧм"
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+msgid "General"
+msgstr "Медшӧр"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Movement"
+msgstr "Вуджӧм"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Reset setting to default"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Reset setting to default ($1)"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
+msgid "Search"
+msgstr "Корсьны"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Show advanced settings"
+msgstr "Унджык лӧсьӧдӧм петкӧдлыны"
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Show technical names"
+msgstr "Техника нимъяс петкӧдлыны"
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Client Mods"
+msgstr "Клиентъяслӧн модъяс"
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Content: Games"
+msgstr "Содтӧдъяс: ворсӧмъяс"
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Content: Mods"
+msgstr "Содтӧдъяс: модъяс"
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "(The game will need to enable shadows as well)"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Custom"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Disabled"
+msgstr "Кусӧдӧма"
+
+#: builtin/mainmenu/settings/shadows_component.lua
+#: src/settings_translation_file.cpp
+msgid "Dynamic shadows"
+msgstr "Динамикаа вуджӧръяс"
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "High"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Low"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Medium"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Very High"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Very Low"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "About"
+msgstr "Унджык"
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Active Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Active renderer:"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Core Developers"
+msgstr "Медшӧр артмӧдысьяс"
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Core Team"
+msgstr "Медшӧр котыр"
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Irrlicht device:"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Open User Data Directory"
+msgstr "Вӧдитчысьлысь мыччӧдсӧ видзан куд восьтыны"
+
+#: builtin/mainmenu/tab_about.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
+msgstr ""
+"Восьтӧ файл веськӧдланінын вӧдитчысьлӧн енкӧлаяс, ворсӧмъяс, модъяс\n"
+"да текстура чукӧр видзан кудсӧ."
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Previous Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Previous Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Share debug log"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Browse online content"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Browse online content [$1]"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Content"
+msgstr "Содтӧдъяс"
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Content [$1]"
+msgstr "Содтӧдъяс [$1]"
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Disable Texture Pack"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Installed Packages:"
+msgstr "Пуктӧм содтӧдъяс:"
+
+#: builtin/mainmenu/tab_content.lua
+msgid "No dependencies."
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "No package description available"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Rename"
+msgstr "Выль ним сетны"
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Update available?"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Use Texture Pack"
+msgstr "Текстура чукӧрсӧ ӧзтыны"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Announce Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Bind Address"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Creative Mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Enable Damage"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Host Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Host Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Install a game"
+msgstr "Ворсӧм пуктыны"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Install games from ContentDB"
+msgstr "ContentDB-ысь вӧрсӧмъяс пуктыны"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "New"
+msgstr "Выль"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "No world created or selected!"
+msgstr "Енкӧла абу бӧрйӧма/абу вӧчӧма!"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Play Game"
+msgstr "Ворсны"
+
+#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_online.lua
+msgid "Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Модъяс бӧрйӧм"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Select World:"
+msgstr "Енкӧла бӧрйыны:"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Server Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Start Game"
+msgstr "Ворсны кутны"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "You need to install a game before you can create a world."
+msgstr "Енкӧла вӧчтӧдз тіянлы колӧ пуктыны ворсӧм."
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Address"
+msgstr "Инпас"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Creative mode"
+msgstr ""
+
+#. ~ PvP = Player versus Player
+#: builtin/mainmenu/tab_online.lua
+msgid "Damage / PvP"
+msgstr "Доймӧм / PvP"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Favorites"
+msgstr "Бӧрйӧмъяс"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Incompatible Servers"
+msgstr "Ӧта-мӧдкӧд лӧсявтӧм серверъясыс"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Join Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Login"
+msgstr "Пырны"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Ping"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Public Servers"
+msgstr "Восьса серверъяс"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Refresh"
+msgstr "Выльмӧдны"
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Remove favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Server Description"
+msgstr "Сервер йывсьыс юӧр"
+
+#: src/client/client.cpp
+msgid "Connection aborted (protocol error?)."
+msgstr ""
+
+#: src/client/client.cpp src/client/game.cpp
+msgid "Connection timed out."
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Done!"
+msgstr "Дась!"
+
+#: src/client/client.cpp
+msgid "Initializing nodes"
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Initializing nodes..."
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Loading textures..."
+msgstr "Текстураяс тэчӧм..."
+
+#: src/client/client.cpp
+msgid "Rebuilding shaders..."
+msgstr "Шейдӧръяс тэчӧм..."
+
+#: src/client/clientlauncher.cpp
+msgid "Could not find or load game: "
+msgstr "Ворсӧмсӧ аддзыны/пуктыны эз артмы: "
+
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr "Медшӧр Меню"
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr "Енкӧла абу бӧрйӧма да инпас абу индӧма. Нинӧм вӧчны."
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr "Ворсысьлӧн нимыс вывті кузь."
+
+#: src/client/clientlauncher.cpp
+msgid "Please choose a name!"
+msgstr "Ен могысь, ним бӧрйӧй!"
+
+#: src/client/clientlauncher.cpp
+msgid "Provided password file failed to open: "
+msgstr "Сетӧм гусякыла файлсӧ восьтны эз артмы: "
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr ""
+
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медия файлъяс..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
+msgid ""
+"\n"
+"Check debug.txt for details."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "- Mode: "
+msgstr ""
+
+#: src/client/game.cpp
+msgid "- Public: "
+msgstr "- Восьса: "
+
+#. ~ PvP = Player versus Player
+#: src/client/game.cpp
+msgid "- PvP: "
+msgstr "- РvP: "
+
+#: src/client/game.cpp
+msgid "- Server Name: "
+msgstr "- Серверлӧн ним: "
+
+#: src/client/game.cpp
+msgid "A serialization error occurred:"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Access denied. Reason: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Automatic forward disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Automatic forward enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds hidden"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds shown for current block"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds shown for nearby blocks"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Camera update disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Camera update enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Can't show block bounds (disabled by game or mod)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Change Password"
+msgstr "Гусякывсӧ вежны"
+
+#: src/client/game.cpp
+msgid "Cinematic mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Cinematic mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Client disconnected"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Client side scripting is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connecting to server..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connection failed for unknown reason"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Continue"
+msgstr ""
+
+#: src/client/game.cpp
+msgid ""
+"Controls:\n"
+"No menu open:\n"
+"- slide finger: look around\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
+"Menu/inventory open:\n"
+"- double tap (outside):\n"
+" --> close\n"
+"- touch stack, touch slot:\n"
+" --> move stack\n"
+"- touch&drag, tap 2nd finger\n"
+" --> place single item to slot\n"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Couldn't resolve address: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Creating client..."
+msgstr "Клиентӧс вӧчӧм..."
+
+#: src/client/game.cpp
+msgid "Creating server..."
+msgstr "Сервер вӧчӧм..."
+
+#: src/client/game.cpp
+msgid "Debug info and profiler graph hidden"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Debug info shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Debug info, profiler graph, and wireframe hidden"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Error creating client: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Exit to Menu"
+msgstr "Менюӧ петны"
+
+#: src/client/game.cpp
+msgid "Exit to OS"
+msgstr "Вӧрсӧмсьыс петны"
+
+#: src/client/game.cpp
+msgid "Fast mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fast mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fast mode enabled (note: no 'fast' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode enabled (note: no 'fly' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Game info:"
+msgstr "Ворсӧм йывсьыс юӧр:"
+
+#: src/client/game.cpp
+msgid "Game paused"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Hosting server"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Item definitions..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "KiB/s"
+msgstr "КиБ/с"
+
+#: src/client/game.cpp
+msgid "MiB/s"
+msgstr "МиБ/с"
+
+#: src/client/game.cpp
+msgid "Minimap currently disabled by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Multiplayer"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode enabled (note: no 'noclip' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Node definitions..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Off"
+msgstr "Кусӧдӧма"
+
+#: src/client/game.cpp
+msgid "On"
+msgstr "Ӧзтӧма"
+
+#: src/client/game.cpp
+msgid "Pitch move mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Pitch move mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Profiler graph shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Remote server"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Resolving address..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Shutting down..."
+msgstr "Помасьӧм..."
+
+#: src/client/game.cpp
+msgid "Singleplayer"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound Volume"
+msgstr "Шы горалун"
+
+#: src/client/game.cpp
+msgid "Sound muted"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound system is disabled"
+msgstr "Шы система кусӧдӧма"
+
+#: src/client/game.cpp
+msgid "Sound system is not supported on this build"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound unmuted"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "The server is probably running a different version of %s."
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Unable to connect to %s because IPv6 is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Unable to listen on %s because IPv6 is disabled"
+msgstr "IPv6 кусӧдӧма, сы вӧсна %s кывзыны эз артмы"
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range enabled, but forbidden by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing changed to %d (the minimum)"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d (the maximum)"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid ""
+"Viewing range changed to %d (the maximum), but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d, but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Volume changed to %d%%"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Wireframe shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Zoom currently disabled by game or mod"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat currently disabled by game or mod"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat shown"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "HUD hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "HUD shown"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Profiler hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+#, c-format
+msgid "Profiler shown (page %d of %d)"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Apps"
+msgstr "Уджтасъяс"
+
+#: src/client/keycode.cpp
+msgid "Backspace"
+msgstr "Shift"
+
+#. ~ Usually paired with the Pause key
+#: src/client/keycode.cpp
+msgid "Break Key"
+msgstr "Break"
+
+#: src/client/keycode.cpp
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: src/client/keycode.cpp
+msgid "Clear Key"
+msgstr "Clear"
+
+#: src/client/keycode.cpp
+msgid "Control Key"
+msgstr "Ctrl"
+
+#: src/client/keycode.cpp
+msgid "Delete Key"
+msgstr "Delete"
+
+#: src/client/keycode.cpp
+msgid "Down Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "End"
+msgstr "End"
+
+#: src/client/keycode.cpp
+msgid "Erase EOF"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Execute"
+msgstr "Вӧчны"
+
+#: src/client/keycode.cpp
+msgid "Help"
+msgstr "Help"
+
+#: src/client/keycode.cpp
+msgid "Home"
+msgstr "Home"
+
+#: src/client/keycode.cpp
+msgid "IME Accept"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Convert"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Escape"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Mode Change"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Nonconvert"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Insert"
+msgstr "Insert"
+
+#: src/client/keycode.cpp
+msgid "Left Arrow"
+msgstr "Шуйгалань"
+
+#: src/client/keycode.cpp
+msgid "Left Button"
+msgstr "Шуйга личкантор"
+
+#: src/client/keycode.cpp
+msgid "Left Control"
+msgstr "Шуйга Ctrl"
+
+#: src/client/keycode.cpp
+msgid "Left Menu"
+msgstr "Шуйга Alt"
+
+#: src/client/keycode.cpp
+msgid "Left Shift"
+msgstr "Шуйга Shift"
+
+#: src/client/keycode.cpp
+msgid "Left Windows"
+msgstr "Шуйга Win"
+
+#. ~ Key name, common on Windows keyboards
+#: src/client/keycode.cpp
+msgid "Menu Key"
+msgstr "Menu"
+
+#: src/client/keycode.cpp
+msgid "Middle Button"
+msgstr "Шӧр личкантор"
+
+#: src/client/keycode.cpp
+msgid "Num Lock"
+msgstr "Num Lock"
+
+#: src/client/keycode.cpp
+msgid "Numpad *"
+msgstr "Numpad вывса *"
+
+#: src/client/keycode.cpp
+msgid "Numpad +"
+msgstr "Numpad вывса +"
+
+#: src/client/keycode.cpp
+msgid "Numpad -"
+msgstr "Numpad вывса -"
+
+#: src/client/keycode.cpp
+msgid "Numpad ."
+msgstr "Numpad вывса ."
+
+#: src/client/keycode.cpp
+msgid "Numpad /"
+msgstr "Numpad вывса /"
+
+#: src/client/keycode.cpp
+msgid "Numpad 0"
+msgstr "Numpad вывса 0"
+
+#: src/client/keycode.cpp
+msgid "Numpad 1"
+msgstr "Numpad вывса 1"
+
+#: src/client/keycode.cpp
+msgid "Numpad 2"
+msgstr "Numpad вывса 2"
+
+#: src/client/keycode.cpp
+msgid "Numpad 3"
+msgstr "Numpad вывса 3"
+
+#: src/client/keycode.cpp
+msgid "Numpad 4"
+msgstr "Numpad вывса 4"
+
+#: src/client/keycode.cpp
+msgid "Numpad 5"
+msgstr "Numpad вывса 5"
+
+#: src/client/keycode.cpp
+msgid "Numpad 6"
+msgstr "Numpad вывса 6"
+
+#: src/client/keycode.cpp
+msgid "Numpad 7"
+msgstr "Numpad вывса 7"
+
+#: src/client/keycode.cpp
+msgid "Numpad 8"
+msgstr "Numpad вывса 8"
+
+#: src/client/keycode.cpp
+msgid "Numpad 9"
+msgstr "Numpad вывса 9"
+
+#: src/client/keycode.cpp
+msgid "OEM Clear"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Page Down"
+msgstr "Page Down"
+
+#: src/client/keycode.cpp
+msgid "Page Up"
+msgstr "Page Up"
+
+#. ~ Usually paired with the Break key
+#: src/client/keycode.cpp
+msgid "Pause Key"
+msgstr "Pause"
+
+#: src/client/keycode.cpp
+msgid "Play"
+msgstr "Ворсны"
+
+#. ~ "Print screen" key
+#: src/client/keycode.cpp
+msgid "Print"
+msgstr "Print Screen"
+
+#: src/client/keycode.cpp
+msgid "Return Key"
+msgstr "Enter"
+
+#: src/client/keycode.cpp
+msgid "Right Arrow"
+msgstr "Веськыдлань"
+
+#: src/client/keycode.cpp
+msgid "Right Button"
+msgstr "Веськыд личкантор"
+
+#: src/client/keycode.cpp
+msgid "Right Control"
+msgstr "Веськыд Ctrl"
+
+#: src/client/keycode.cpp
+msgid "Right Menu"
+msgstr "Веськыд Alt"
+
+#: src/client/keycode.cpp
+msgid "Right Shift"
+msgstr "Веськыд Shift"
+
+#: src/client/keycode.cpp
+msgid "Right Windows"
+msgstr "Веськыд Win"
+
+#: src/client/keycode.cpp
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#. ~ Key name
+#: src/client/keycode.cpp
+msgid "Select"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Shift Key"
+msgstr "Shift"
+
+#: src/client/keycode.cpp
+msgid "Sleep"
+msgstr "Узьны"
+
+#: src/client/keycode.cpp
+msgid "Snapshot"
+msgstr "Snapshot"
+
+#: src/client/keycode.cpp
+msgid "Space"
+msgstr "Space"
+
+#: src/client/keycode.cpp
+msgid "Tab"
+msgstr "Tab"
+
+#: src/client/keycode.cpp
+msgid "Up Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "X Button 1"
+msgstr "Медводдза X личкантор"
+
+#: src/client/keycode.cpp
+msgid "X Button 2"
+msgstr "Мӧд X личкантор"
+
+#: src/client/keycode.cpp
+msgid "Zoom Key"
+msgstr "Zoom"
+
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
+#. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
+#: src/content/mod_configuration.cpp
+#, c-format
+msgid "%s is missing:"
+msgstr "%s абу:"
+
+#: src/content/mod_configuration.cpp
+msgid ""
+"Install and enable the required mods, or disable the mods causing errors."
+msgstr ""
+
+#: src/content/mod_configuration.cpp
+msgid ""
+"Note: this may be caused by a dependency cycle, in which case try updating "
+"the mods."
+msgstr ""
+
+#: src/content/mod_configuration.cpp
+msgid "Some mods have unsatisfied dependencies:"
+msgstr ""
+
+#: src/gui/guiChatConsole.cpp
+msgid "Failed to open webpage"
+msgstr ""
+
+#: src/gui/guiChatConsole.cpp
+msgid "Opening webpage"
+msgstr ""
+
+#: src/gui/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "\"Aux1\" = climb down"
+msgstr "«Aux1» = лэччӧм"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Autoforward"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Automatic jumping"
+msgstr "Автоматӧн чеччыштӧм"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Aux1"
+msgstr "Aux1"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Backward"
+msgstr "Бӧрӧ"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Block bounds"
+msgstr "Мапблоклӧн доръяс"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Change camera"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Command"
+msgstr "Команда"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Console"
+msgstr "Консоль"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Dec. range"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Dec. volume"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Double tap \"jump\" to toggle fly"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Drop"
+msgstr "Чӧвтны"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr "Водзӧ"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inc. range"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inc. volume"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr "Чеччыштны"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Keybindings."
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Left"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Local command"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Mute"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Next item"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Prev. item"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr "Тыдалан диапазон"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Right"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Screenshot"
+msgstr "Скриншот"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr "Кыйксьӧдны"
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle HUD"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle chat log"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fog"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle minimap"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle noclip"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle pitchmove"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Zoom"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr "личканторсӧ личкӧй"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Change"
+msgstr "Вежны"
+
+#: src/gui/guiPasswordChange.cpp
+msgid "New Password"
+msgstr "Выль гусякыв"
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr "Важ гусякыв"
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Passwords do not match!"
+msgstr "Гусякывъясыс эз ӧтлаасьны!"
+
+#: src/gui/guiVolumeChange.cpp
+msgid "Exit"
+msgstr "Пӧдлавны"
+
+#: src/gui/guiVolumeChange.cpp
+msgid "Muted"
+msgstr ""
+
+#: src/gui/guiVolumeChange.cpp
+#, c-format
+msgid "Sound Volume: %d%%"
+msgstr "Шы горалун: %d%%"
+
+#. ~ DO NOT TRANSLATE THIS LITERALLY!
+#. This is a special string which needs to contain the translation's
+#. language code (e.g. "de" for German).
+#: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
+msgid "LANG_CODE"
+msgstr "kv"
+
+#: src/network/clientpackethandler.cpp
+msgid ""
+"Name is not registered. To create an account on this server, click 'Register'"
+msgstr ""
+
+#: src/network/clientpackethandler.cpp
+msgid "Name is taken. Please choose another name"
+msgstr ""
+
+#: src/server.cpp
+#, c-format
+msgid "%s while shutting down: "
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
+"Can be used to move a desired point to (0, 0) to create a\n"
+"suitable spawn point, or to allow 'zooming in' on a desired\n"
+"point by increasing 'scale'.\n"
+"The default is tuned for a suitable spawn point for Mandelbrot\n"
+"sets with default parameters, it may need altering in other\n"
+"situations.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) scale of fractal in nodes.\n"
+"Actual fractal size will be 2 to 3 times larger.\n"
+"These numbers can be made very large, the fractal does\n"
+"not have to fit inside the world.\n"
+"Increase these to 'zoom' into the detail of the fractal.\n"
+"Default is for a vertically-squashed shape suitable for\n"
+"an island, set all 3 numbers equal for the raw shape."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of ridged mountains."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of rolling hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of step mountains."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of rolling hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of step mountain ranges."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that locates the river valleys and channels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D"
+msgstr "3D"
+
+#: src/settings_translation_file.cpp
+msgid "3D clouds"
+msgstr "3D кымӧръяс"
+
+#: src/settings_translation_file.cpp
+msgid "3D mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D mode parallax strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining giant caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D noise defining mountain structure and height.\n"
+"Also defines structure of floatland mountain terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D noise defining structure of floatlands.\n"
+"If altered from the default, the noise 'scale' (0.7 by default) may need\n"
+"to be adjusted, as floatland tapering functions best when this noise has\n"
+"a value range of approximately -2.0 to 2.0."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining structure of river canyon walls."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise that determines number of dungeons per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D support.\n"
+"Currently supported:\n"
+"-    none: no 3d output.\n"
+"-    anaglyph: cyan/magenta color 3d.\n"
+"-    interlaced: odd/even line based polarization screen support.\n"
+"-    topbottom: split screen top/bottom.\n"
+"-    sidebyside: split screen side by side.\n"
+"-    crossview: Cross-eyed 3d\n"
+"Note that the interlaced mode requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server crashes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server shuts down."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ABM interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Absolute limit of queued blocks to emerge"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration in air"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration of gravity, in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block management interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active object send range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Adds particles when digging a node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Adjust the detected display density, used for scaling UI elements."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, c-format
+msgid ""
+"Adjusts the density of the floatland layer.\n"
+"Increase value to increase density. Can be positive or negative.\n"
+"Value = 0.0: 50% of volume is floatland.\n"
+"Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
+"to be sure) creates a solid floatland layer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Admin name"
+msgstr "Веськӧдлысьлӧн ним"
+
+#: src/settings_translation_file.cpp
+msgid "Advanced"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Alters the light curve by applying 'gamma correction' to it.\n"
+"Higher values make middle and lower light levels brighter.\n"
+"Value '1.0' leaves the light curve unaltered.\n"
+"This only has significant effect on daylight and artificial\n"
+"light, it has very little effect on natural night light."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Always fly fast"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ambient occlusion gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Amplifies the valleys."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anisotropic filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce to this serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anti-aliasing scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Antialiasing method"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Append item name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Append item name to tooltip."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Apple trees noise"
+msgstr "Улмӧ пулӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Arm inertia"
+msgstr "Довкъялысь ки"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Arm inertia, gives a more realistic movement of\n"
+"the arm when the camera moves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ask to reconnect after crash"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will aggressively optimize which blocks are sent "
+"to\n"
+"clients.\n"
+"Small values potentially improve performance a lot, at the expense of "
+"visible\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
+"Setting this to a value greater than max_block_send_distance disables this\n"
+"optimization.\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Audio"
+msgstr "Шы"
+
+#: src/settings_translation_file.cpp
+msgid "Automatically jump up single-node obstacles."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Automatically report to the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Autoscaling mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Aux1 key for climbing/descending"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base texture size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic privileges"
+msgstr "Панас инӧдъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Beach noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Beach noise threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bind address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Biome API"
+msgstr "Биомлӧн API"
+
+#: src/settings_translation_file.cpp
+msgid "Biome noise"
+msgstr "Биомлӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Block send optimize distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom"
+msgstr "Югъялӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Intensity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Strength Factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bobbing"
+msgstr "Лайкъялӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Bold and italic font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold and italic monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Build inside player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera"
+msgstr "Камера"
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing in cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise"
+msgstr "Рудӧглӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #1"
+msgstr "Рудӧглӧн шувгӧм #1"
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #2"
+msgstr "Рудӧглӧн шувгӧм #2"
+
+#: src/settings_translation_file.cpp
+msgid "Cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave1 noise"
+msgstr "Рудӧглӧн медводдза шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Cave2 noise"
+msgstr "Рудӧглӧн мӧд шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Cavern limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern noise"
+msgstr "Рудӧгувлӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Cavern taper"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern upper limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Center of light curve boost range.\n"
+"Where 0.0 is minimum light level, 1.0 is maximum light level."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat command time message threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat commands"
+msgstr "Чатлӧн командаяс"
+
+#: src/settings_translation_file.cpp
+msgid "Chat font size"
+msgstr "Чатса шрифтлӧн ыджда"
+
+#: src/settings_translation_file.cpp
+msgid "Chat log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message count limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message kick threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message max length"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat weblinks"
+msgstr "Чатын ыстӧгъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Chunk size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console "
+"output."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client"
+msgstr "Клиент"
+
+#: src/settings_translation_file.cpp
+msgid "Client Mesh Chunksize"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr "Клиент да сервер"
+
+#: src/settings_translation_file.cpp
+msgid "Client modding"
+msgstr "Артмӧдысьяслы"
+
+#: src/settings_translation_file.cpp
+msgid "Client side modding restrictions"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client-side Modding"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client-side node lookup range restriction"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr "Кымӧръяс"
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client-side effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr "Менюын кымӧръяс"
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr "Рӧма руалӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Colored shadows"
+msgstr "Рӧма вуджӧръяс"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of flags to hide in the content repository.\n"
+"\"nonfree\" can be used to hide packages which do not qualify as 'free "
+"software',\n"
+"as defined by the Free Software Foundation.\n"
+"You can also specify content ratings.\n"
+"These flags are independent from Minetest versions,\n"
+"so see a full list at https://content.minetest.net/help/content_flags/"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Compression level to use when saving mapblocks to disk.\n"
+"-1 - use default compression level\n"
+"0 - least compression, fastest\n"
+"9 - best compression, slowest"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Compression level to use when sending mapblocks to the client.\n"
+"-1 - use default compression level\n"
+"0 - least compression, fastest\n"
+"9 - best compression, slowest"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr "Ӧтлаалӧм стеклӧяс"
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr "Консольлӧн сӧдзлун"
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr "Консольлӧн рӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Console height"
+msgstr "Консольлӧн судта"
+
+#: src/settings_translation_file.cpp
+msgid "Content Repository"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Flag Blacklist"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB URL"
+msgstr "ContentDB-лӧн инпас"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples:\n"
+"72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls sinking speed in liquid when idling. Negative values will cause\n"
+"you to rise instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls width of tunnels, a smaller value creates wider tunnels.\n"
+"Value >= 10.0 completely disables generation of tunnels and avoids the\n"
+"intensive noise calculations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"This also applies to the object crosshair."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr "Витанторлӧн рӧм"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log file size threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debugging"
+msgstr "Лӧсьӧдӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default maximum number of forceloaded mapblocks.\n"
+"Set this to -1 to disable the limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr "Подув гусякыв"
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr "Подув инӧдъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default stack size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define shadow filtering quality.\n"
+"This simulates the soft shadows effect by applying a PCF or Poisson disk\n"
+"but also uses more resources."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines areas where trees have apples."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines areas with sandy beaches."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines distribution of higher terrain and steepness of cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines distribution of higher terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines full size of caverns, smaller values create larger caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines how much bloom is applied to the rendered image\n"
+"Smaller values make bloom more subtle\n"
+"Range: from 0.01 to 1.0, default: 0.05"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines large-scale river channel structure."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines location and terrain of optional hills and lakes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the base ground level."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the depth of the river channel."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines the magnitude of bloom overexposure.\n"
+"Range: from 0.1 to 10.0, default: 1.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines the size of the sampling grid for FSAA and SSAA antialiasing "
+"methods.\n"
+"Value of 2 means taking 2x2 = 4 samples."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the width of the river channel."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the width of the river valley."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines tree areas and tree density."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Delay between mesh updates on the client in ms. Increasing this will slow\n"
+"down the rate of mesh updates, thus reducing jitter on slower clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find giant caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desert noise threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Deserts occur when np_biome exceeds this value.\n"
+"When the 'snowbiomes' flag is enabled, this is ignored."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Developer Options"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Digging particles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr "Анти-чит кусӧдны"
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr "Кушӧн гусякывсӧ кольны оз позь"
+
+#: src/settings_translation_file.cpp
+msgid "Display Density Scaling Factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Distance in nodes at which transparency depth sorting is enabled\n"
+"Use this to limit the performance impact of transparency depth sorting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug information."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon maximum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon minimum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon noise"
+msgstr "Муувлӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Enable Automatic Exposure"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Bloom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Bloom Debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Лӧсьӧдӧм ӧзтыны"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable IPv6 support (for both client and server).\n"
+"Required for IPv6 connections to work at all."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable Lua modding support on client.\n"
+"This support is experimental and API can change."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable Poisson disk filtering.\n"
+"On true uses Poisson disk to make \"soft shadows\". Otherwise uses PCF "
+"filtering."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Содтӧд эффектъяслысь вӧччӧм ӧзтыны"
+
+#: src/settings_translation_file.cpp
+msgid "Enable Raytraced Culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable automatic exposure correction\n"
+"When enabled, the post-processing engine will\n"
+"automatically adjust to the brightness of the scene,\n"
+"simulating the behavior of human eye."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable colored shadows.\n"
+"On true translucent nodes cast colored shadows. This is expensive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable console window"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable joysticks"
+msgstr "Контроллерсӧ ӧзтыны"
+
+#: src/settings_translation_file.cpp
+msgid "Enable joysticks. Requires a restart to take effect"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod channels support."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mouse wheel (scroll) for item selection in hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable split login/register"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable view bobbing and amount of view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.\n"
+"Ignored if bind_address is set.\n"
+"Needs enable_ipv6 to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables Hable's 'Uncharted 2' filmic tone mapping.\n"
+"Simulates the tone curve of photographic film and how this approximates the\n"
+"appearance of high dynamic range images. Mid-range contrast is slightly\n"
+"enhanced, highlights and shadows are gradually compressed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables tradeoffs that reduce CPU load or increase rendering performance\n"
+"at the expense of minor visual glitches that do not impact game playability."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Exponent of the floatland tapering. Alters the tapering behavior.\n"
+"Value = 1.0 creates a uniform, linear tapering.\n"
+"Values > 1.0 create a smooth tapering suitable for the default separated\n"
+"floatlands.\n"
+"Values < 1.0 (for example 0.25) create a more defined surface level with\n"
+"flatter lowlands, suitable for a solid floatland layer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Exposure compensation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS when unfocused or paused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Factor noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the\n"
+"Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler depth noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filtering and Antialiasing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "First of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "First of two 3D noises that together define tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed virtual joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fixes the position of virtual joystick.\n"
+"If disabled, virtual joystick will center to first-touch's position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland density"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland maximum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland minimum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland noise"
+msgstr "Енэжвывса ділӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Floatland taper exponent"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland tapering distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr "Ру"
+
+#: src/settings_translation_file.cpp
+msgid "Fog start"
+msgstr "Руалӧмлӧн доръяс"
+
+#: src/settings_translation_file.cpp
+msgid "Font"
+msgstr "Шрифт"
+
+#: src/settings_translation_file.cpp
+msgid "Font bold by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font italic by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr "Шрифтлӧн ыджда"
+
+#: src/settings_translation_file.cpp
+msgid "Font size divisible by"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size of the default font where 1 unit = 1 pixel at 96 DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size of the monospace font where 1 unit = 1 pixel at 96 DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Font size of the recent chat text and chat prompt in point (pt).\n"
+"Value 0 will use the default font size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"For pixel-style fonts that do not scale well, this ensures that font sizes "
+"used\n"
+"with this font will always be divisible by this value, in pixels. For "
+"instance,\n"
+"a pixel font 16 pixels tall should have this set to 16, so it will only ever "
+"be\n"
+"sized 16, 32, 48, etc., so a mod requesting a size of 25 will get 32."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Format of player chat messages. The following strings are valid "
+"placeholders:\n"
+"@name, @message, @timestamp (optional)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr "Скриншотлӧн ыджда."
+
+#: src/settings_translation_file.cpp
+msgid "Formspec Full-Screen Background Color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec Full-Screen Background Opacity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec full-screen background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec full-screen background opacity (between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fourth of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fractal type"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fraction of the visible distance at which fog starts to be rendered"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes).\n"
+"\n"
+"Setting this larger than active_block_range will also cause the server\n"
+"to maintain active objects up to this distance in the direction the\n"
+"player is looking. (This can avoid mobs suddenly disappearing from view)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI"
+msgstr "Графикаа интерфейс"
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gamepads"
+msgstr "Ворсан контроллеръяс"
+
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and jungle grass, in all other mapgens this flag controls all decorations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Gradient of light curve at maximum light level.\n"
+"Controls the contrast of the highest light levels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Gradient of light curve at minimum light level.\n"
+"Controls the contrast of the lowest light levels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr "Графика"
+
+#: src/settings_translation_file.cpp
+msgid "Graphics Effects"
+msgstr "Графика эффектъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Graphics and Audio"
+msgstr "Графика да шы"
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ground noise"
+msgstr "Мулӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "HTTP mods"
+msgstr "HTTP модъяс"
+
+#: src/settings_translation_file.cpp
+msgid "HUD"
+msgstr "Ворсан интерфейс"
+
+#: src/settings_translation_file.cpp
+msgid "HUD scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated Lua API calls:\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Heat blend noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Heat noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height select noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hill threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness1 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness2 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness3 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness4 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal acceleration in air when jumping or falling,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal and vertical acceleration in fast mode,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal and vertical acceleration on ground or when climbing,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hotbar: Enable mouse wheel for selection"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hotbar: Invert mouse wheel direction"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How fast liquid waves will move. Higher = faster.\n"
+"If negative, liquid waves will move backwards."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How long the server will wait before unloading unused mapblocks, stated in "
+"seconds.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much you are slowed down when moving inside a liquid.\n"
+"Decrease this to increase liquid resistance to movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity blend noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity variation for biomes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr "IPv6"
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr "IPv6 сервер"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled, \"Aux1\" key is used to fly fast if both fly and fast mode are\n"
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"Aux1\" key instead of \"Sneak\" key is used for climbing down "
+"and\n"
+"descending."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, account registration is separate from login in the UI.\n"
+"If disabled, new accounts will be registered automatically when logging in."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, players cannot join without a password or change theirs to an "
+"empty password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, the server will perform map block occlusion culling based on\n"
+"on the eye position of the player. This can reduce the number of blocks\n"
+"sent to the client by 50-80%. Clients will no longer receive most\n"
+"invisible blocks, so that the utility of noclip mode is reduced."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place nodes at the position (feet + eye level) where you "
+"stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the CSM restriction for node range is enabled, get_node calls are "
+"limited\n"
+"to this distance from the player to the node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the execution of a chat command takes longer than this specified time in\n"
+"seconds, add the time information to the chat command message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the file size of debug.txt exceeds the number of megabytes specified in\n"
+"this setting when it is opened, the file is moved to debug.txt.1,\n"
+"deleting an older debug.txt.1 if it exists.\n"
+"debug.txt is only moved if this setting is positive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Initial vertical speed when jumping, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chat commands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Italic font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Italic monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Iterations of the recursive function.\n"
+"Increasing this increases the amount of fine detail, but also\n"
+"increases processing load.\n"
+"At iterations = 20 this mapgen has a similar load to mapgen V7."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick ID"
+msgstr "Контроллерлӧн ID-ыс"
+
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick dead zone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick type"
+msgstr "Контроллер сикас"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"W component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"X component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"Y component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"Z component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Julia w"
+msgstr "Жулия w"
+
+#: src/settings_translation_file.cpp
+msgid "Julia x"
+msgstr "Жулия x"
+
+#: src/settings_translation_file.cpp
+msgid "Julia y"
+msgstr "Жулия y"
+
+#: src/settings_translation_file.cpp
+msgid "Julia z"
+msgstr "Жулия z"
+
+#: src/settings_translation_file.cpp
+msgid "Jumping speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Keyboard and Mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Kick players who sent more than X messages per 10 seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lake steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lake threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Language"
+msgstr "Кыв"
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave maximum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave minimum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave proportion flooded"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of liquid waves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of time between Active Block Modifier (ABM) execution cycles, stated "
+"in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of time between active block management cycles, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Level of logging to be written to debug.txt:\n"
+"-    <nothing> (no logging)\n"
+"-    none (messages with no level)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose\n"
+"-    trace"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost center"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost spread"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve high gradient"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve low gradient"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lighting"
+msgstr "Югдӧдӧм"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\n"
+"Only mapchunks completely within the mapgen limit are generated.\n"
+"Value is stored per-world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limits number of parallel HTTP requests. Affects:\n"
+"-    Media fetch if server uses remote_media setting.\n"
+"-    Serverlist download and server announcement.\n"
+"-    Downloads performed by main menu (e.g. mod manager).\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid loop max"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid queue purge time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid sinking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update interval in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Logical value that controls how far the bloom effect spreads\n"
+"from the bright objects.\n"
+"Range: from 0.1 to 8, default: 1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lower Y limit of dungeons."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lower Y limit of floatlands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr "Медшӧр менюлӧн скрипт"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr "Мусерпасъяс видзан куд"
+
+#: src/settings_translation_file.cpp
+msgid "Map generation attributes specific to Mapgen Carpathian."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Flat.\n"
+"Occasional lakes and hills can be added to the flat world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Fractal.\n"
+"'terrain' enables the generation of non-fractal terrain:\n"
+"ocean, islands and underground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"'altitude_chill': Reduces heat with altitude.\n"
+"'humid_rivers': Increases humidity around rivers.\n"
+"'vary_river_depth': If enabled, low humidity and high heat causes rivers\n"
+"to become shallower and occasionally dry.\n"
+"'altitude_dry': Reduces humidity with altitude."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation attributes specific to Mapgen v5."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v6.\n"
+"The 'snowbiomes' flag enables the new 5 biome system.\n"
+"When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"'ridges': Rivers.\n"
+"'floatlands': Floating land masses in the atmosphere.\n"
+"'caverns': Giant caves deep underground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map shadows update frames"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock mesh generation delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock mesh generation threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Carpathian"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Carpathian specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Flat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Flat specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Fractal specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V5"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V5 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V6"
+msgstr "V6 мапген"
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V6 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V7"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V7 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block generate distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block send distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max liquids processed per step."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. clearobjects extra blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. packets per iteration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum distance to render shadows."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum forceloaded blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum hotbar width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum limit of random number of large caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum limit of random number of small caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum liquid resistance. Controls deceleration when entering liquid at\n"
+"high speed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks that are simultaneously sent per client.\n"
+"The maximum total count is calculated dynamically:\n"
+"max_total = ceil((#clients + max_users) * per_client / 4)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that can be queued for loading."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be generated.\n"
+"This limit is enforced per player."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"This limit is enforced per player."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of players that can be connected simultaneously."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of recent chat messages to show"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneous block sends per client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum size of the outgoing chat queue"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum size of the outgoing chat queue.\n"
+"0 to disable queueing and -1 to make the queue size unlimited."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum time a file download (e.g. a mod download) may take, stated in "
+"milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum time an interactive request (e.g. server list fetch) may take, "
+"stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr "Мешлӧн кеш"
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimal level of logging to be written to chat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum limit of random number of large caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum limit of random number of small caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod channels"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modifies the size of the HUD elements."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size divisible by"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain height noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain noise"
+msgstr "Керӧслӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Mountain variation noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain zero level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Вуджан тагӧс"
+
+#: src/settings_translation_file.cpp
+msgid "Mud noise"
+msgstr "Няйтлӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mute sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this.\n"
+"Current mapgens in a highly unstable state:\n"
+"-    The optional floatlands of v7 (disabled by default)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the player.\n"
+"When running a server, clients connecting with this name are admins.\n"
+"When starting from the main menu, this is overridden."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Networking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr "Выль пырысьяслы тайӧ гусякывсӧ колӧ гижны."
+
+#: src/settings_translation_file.cpp
+msgid "Node and Entity Highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr "Шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use.\n"
+"Value 0:\n"
+"-    Automatic selection. The number of emerge threads will be\n"
+"-    'number of processors - 2', with a lower limit of 1.\n"
+"Any other value:\n"
+"-    Specifies the number of emerge threads, with a lower limit of 1.\n"
+"WARNING: Increasing the number of emerge threads increases engine mapgen\n"
+"speed, but this may harm game performance by interfering with other\n"
+"processes, especially in singleplayer and/or when running Lua code in\n"
+"'on_generated'. For many users the optimum setting may be '1'."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between SQLite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of messages a player may send per 10 seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of threads to use for mesh generation.\n"
+"Value of 0 (default) will let Minetest autodetect the number of available "
+"threads."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Occlusion Culler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Occlusion Culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Open the pause menu when the window's focus is lost. Does not pause if a "
+"formspec is\n"
+"open."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Optional override for chat weblink color."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path of the fallback font. Must be a TrueType font.\n"
+"This font will be used for certain languages or if the default font is "
+"unavailable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to save screenshots at. Can be an absolute or relative path.\n"
+"The folder will be created if it doesn't already exist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to shader directory. If no path is defined, default location will be "
+"used."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to the default font. Must be a TrueType font.\n"
+"The fallback font will be used if the font cannot be loaded."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to the monospace font. Must be a TrueType font.\n"
+"This font is used for e.g. the console and profiler screen."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Pause on lost window focus"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Per-player limit of queued blocks load from disk"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Per-player limit of queued blocks to generate"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr "Физика"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Poisson filtering"
+msgstr "Пуассон серти разӧдӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Post Processing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Prevent digging and placing from repeating when holding the respective "
+"buttons.\n"
+"Enable this when you dig or place too often by accident.\n"
+"On touchscreens, this only affects digging."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds).\n"
+"0 = disable. Useful for developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler"
+msgstr "Профайлер"
+
+#: src/settings_translation_file.cpp
+msgid "Prometheus listener address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Prometheus listener address.\n"
+"If Minetest is compiled with ENABLE_PROMETHEUS option enabled,\n"
+"enable metrics listener for Prometheus on that address.\n"
+"Metrics can be fetched on http://127.0.0.1:30000/metrics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Proportion of large caves that contain liquid."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Протоколлӧн медічӧт версия"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Recent Chat Messages"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Regular font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remember screen size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Remove color codes from incoming chat messages\n"
+"Use this to stop players from being able to use color in their messages"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Restricts the access of certain client-side functions on servers.\n"
+"Combine the byteflags below to restrict client-side features, or set to 0\n"
+"for no restrictions:\n"
+"LOAD_CLIENT_MODS: 1 (disable loading client-provided mods)\n"
+"CHAT_MESSAGES: 2 (disable send_chat_message call client-side)\n"
+"READ_ITEMDEFS: 4 (disable get_item_def call client-side)\n"
+"READ_NODEDEFS: 8 (disable get_node_def call client-side)\n"
+"LOOKUP_NODES_LIMIT: 16 (limits get_node call client-side to\n"
+"csm_restriction_noderange)\n"
+"READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge mountain spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge underwater noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridged mountain size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River channel depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River channel width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise"
+msgstr "Юлӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "River size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River valley width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rolling hill size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rolling hills spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Safe digging and placing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sandy beaches occur when np_beach exceeds this value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Save window size automatically when modified.\n"
+"If true, screen size is saved in screen_w and screen_h, and whether the "
+"window\n"
+"is maximized is stored in window_maximized.\n"
+"(Autosaving window_maximized only works if compiled with SDL.)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale GUI by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen"
+msgstr "Экран"
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr "Скриншота куд"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr "Скриншотлӧн ыджда"
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr "Скриншотлӧн бурлун тшупӧд"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshots"
+msgstr "Скриншотъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Seabed noise"
+msgstr "Саридз пыдӧслӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Second of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Second of two 3D noises that together define tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Select the antialiasing method to apply.\n"
+"\n"
+"* None - No antialiasing (default)\n"
+"\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
+"A.K.A multi-sample antialiasing (MSAA)\n"
+"Smoothens out block edges but does not affect the insides of textures.\n"
+"A restart is required to change this option.\n"
+"\n"
+"* FXAA - Fast approximate antialiasing (requires shaders)\n"
+"Applies a post-processing filter to detect and smoothen high-contrast "
+"edges.\n"
+"Provides balance between speed and image quality.\n"
+"\n"
+"* SSAA - Super-sampling antialiasing (requires shaders)\n"
+"Renders higher-resolution image of the scene, then scales down to reduce\n"
+"the aliasing effects. This is the slowest and the most accurate method."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Selects one of 18 fractal types.\n"
+"1 = 4D \"Roundy\" Mandelbrot set.\n"
+"2 = 4D \"Roundy\" Julia set.\n"
+"3 = 4D \"Squarry\" Mandelbrot set.\n"
+"4 = 4D \"Squarry\" Julia set.\n"
+"5 = 4D \"Mandy Cousin\" Mandelbrot set.\n"
+"6 = 4D \"Mandy Cousin\" Julia set.\n"
+"7 = 4D \"Variation\" Mandelbrot set.\n"
+"8 = 4D \"Variation\" Julia set.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" Mandelbrot set.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" Julia set.\n"
+"11 = 3D \"Christmas Tree\" Mandelbrot set.\n"
+"12 = 3D \"Christmas Tree\" Julia set.\n"
+"13 = 3D \"Mandelbulb\" Mandelbrot set.\n"
+"14 = 3D \"Mandelbulb\" Julia set.\n"
+"15 = 3D \"Cosine Mandelbulb\" Mandelbrot set.\n"
+"16 = 3D \"Cosine Mandelbulb\" Julia set.\n"
+"17 = 4D \"Mandelbulb\" Mandelbrot set.\n"
+"18 = 4D \"Mandelbulb\" Julia set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server"
+msgstr "Сервер"
+
+#: src/settings_translation_file.cpp
+msgid "Server Gameplay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr "Серверлӧн инпас"
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr "Серверлӧн домен"
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr "Серверлӧн ним"
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server-side occlusion culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server/Env Performance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist and MOTD"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the default tilt of Sun/Moon orbit in degrees.\n"
+"Games may change orbit tilt via API.\n"
+"Value of 0 means no tilt / vertical orbit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the exposure compensation in EV units.\n"
+"Value of 0.0 (default) means no exposure compensation.\n"
+"Range: from -1 to 1.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the language. By default, the system language is used.\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the maximum length of a chat message (in characters) sent by clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the shadow strength gamma.\n"
+"Adjusts the intensity of in-game dynamic shadows.\n"
+"Lower value means lighter shadows, higher value means darker shadows."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the soft shadow radius size.\n"
+"Lower values mean sharper shadows, bigger values mean softer shadows.\n"
+"Minimum value: 1.0; maximum value: 15.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable Shadow Mapping."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true to enable bloom effect.\n"
+"Bright colors will bleed over the neighboring objects."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving leaves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving liquids (like water)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving plants."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true to render debugging breakdown of the bloom effect.\n"
+"In debug mode, the screen is split into 4 quadrants:\n"
+"top-left - processed base image, top-right - final image\n"
+"bottom-left - raw base image, bottom-right - bloom texture."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Sets shadow texture quality to 32 bits.\n"
+"On false, 16 bits texture will be used.\n"
+"This can cause much more artifacts in the shadow."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shader path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr "Шейдӧръяс"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shaders allow advanced visual effects and may increase performance on some "
+"video\n"
+"cards."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow filter quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map max distance in nodes to render shadows"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map texture in 32 bits"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map texture size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
+"drawn."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow strength gamma"
+msgstr "Вуджӧрлӧн гамма"
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show name tag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Side length of a cube of map blocks that the client will consider together\n"
+"when generating meshes.\n"
+"Larger values increase the utilization of the GPU by reducing the number of\n"
+"draw calls, benefiting especially high-end GPUs.\n"
+"Systems with a low-end GPU (or no GPU) would benefit from smaller values."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
+"WARNING: There is no benefit, and there are several dangers, in\n"
+"increasing this value above 5.\n"
+"Reducing this value increases cave and dungeon density.\n"
+"Altering this value is for special usage, leaving it unchanged is\n"
+"recommended."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sky Body Orbit Tilt"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small cave maximum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small cave minimum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small-scale humidity variation for blending biomes on borders."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small-scale temperature variation for blending biomes on borders."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
+"cinematic mode by using the key set in Controls."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths rotation of camera, also called look or mouse smoothing. 0 to "
+"disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneaking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneaking speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Soft shadow radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies the default stack size of nodes, items and tools.\n"
+"Note that mods or games may explicitly set a stack for certain (or all) "
+"items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Spread a complete update of shadow map over given number of frames.\n"
+"Higher values might make shadows laggy, lower values\n"
+"will consume more resources.\n"
+"Minimum value: 1; maximum value: 16"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Spread of light curve boost range.\n"
+"Controls the width of the range to be boosted.\n"
+"Standard deviation of the light curve boost Gaussian."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Static spawn point"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Steepness noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Step mountain size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Step mountain spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of 3D mode parallax."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Strength of light curve boost.\n"
+"The 3 'boost' parameters define a range of the light\n"
+"curve that is boosted in brightness."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strip color codes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Surface level of optional water placed on a solid floatland layer.\n"
+"Water is disabled by default and will only be placed if this value is set\n"
+"to above 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (the start of the\n"
+"upper tapering).\n"
+"***WARNING, POTENTIAL DANGER TO WORLDS AND SERVER PERFORMANCE***:\n"
+"When enabling water placement, floatlands must be configured and tested\n"
+"to be a solid layer by setting 'mgv7_floatland_density' to 2.0 (or other\n"
+"required value depending on 'mgv7_np_floatland'), to avoid\n"
+"server-intensive extreme water flow and to avoid vast flooding of the\n"
+"world surface below."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Temperature variation for biomes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain alternative noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain base noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain higher noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain persistence noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Texture size to render the shadow map on.\n"
+"This must be a power of two.\n"
+"Bigger numbers create better shadows but it is also more expensive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Textures on a node may be aligned either to the node or to the world.\n"
+"The former mode suits better things like machines, furniture, etc., while\n"
+"the latter makes stairs and microblocks fit surroundings better.\n"
+"However, as this possibility is new, thus may not be used by older servers,\n"
+"this option allows enforcing it for certain node types. Note though that\n"
+"that is considered EXPERIMENTAL and may not work properly."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The URL for the content repository"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The dead zone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your world path in which profiles will be saved to."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The identifier of the joystick to use"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The maximum height of the surface of waving liquids.\n"
+"4.0 = Wave height is two nodes.\n"
+"0.0 = Wave doesn't move at all.\n"
+"Default is 1.0 (1/2 node)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The radius of the volume of blocks around every player that is subject to "
+"the\n"
+"active block stuff, stated in mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run.\n"
+"This is also the minimum range in which active objects (mobs) are "
+"maintained.\n"
+"This should be configured together with active_object_send_range_blocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The rendering back-end.\n"
+"Note: A restart is required after changing this!\n"
+"OpenGL is the default for desktop, and OGLES2 for Android.\n"
+"Shaders are supported by everything but OGLES1."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"in-game view frustum around."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The type of joystick"
+msgstr "Контроллер сикасыс"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
+"enabled. Also, the vertical distance over which humidity drops by 10 if\n"
+"'altitude_dry' is enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Third of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time of day when a new world is started, in millihours (0-23999)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory, in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tradeoffs for performance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Сӧдзов кизьӧрторъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Transparency Sorting Distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trees noise"
+msgstr "Пулӧн шувгӧм"
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Usable to make minimap smoother on slower machines."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Type of occlusion_culler\n"
+"\n"
+"\"loops\" is the legacy algorithm with nested loops and O(n³) complexity\n"
+"\"bfs\" is the new algorithm based on breadth-first-search and side culling\n"
+"\n"
+"This setting should only be changed if you have performance problems."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Undersampling"
+msgstr "Субдискретизация"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Undersampling is similar to using a lower screen resolution, but it applies\n"
+"to the game world only, keeping the GUI intact.\n"
+"It should give a significant performance boost at the cost of less detailed "
+"image.\n"
+"Higher values result in a less detailed image."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Update information URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Upper Y limit of dungeons."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Upper Y limit of floatlands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr "Менюын шуньгысь кымӧръяс."
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when looking at textures from an angle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use crosshair for touch screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use crosshair to select object instead of whole screen.\n"
+"If enabled, a crosshair will be shown and will be used for selecting object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use mipmaps when scaling textures. May slightly increase performance,\n"
+"especially when using a high-resolution texture pack.\n"
+"Gamma-correct downscaling is not supported."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use raytraced occlusion culling in the new culler.\n"
+"This flag enables use of raytraced occlusion culling test for\n"
+"client mesh sizes smaller than 4x4x4 map blocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use trilinear filtering when scaling textures.\n"
+"If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
+"is applied."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use virtual joystick to trigger \"Aux1\" button.\n"
+"If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
+"circle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "User Interfaces"
+msgstr "Интерфейсъяс"
+
+#: src/settings_translation_file.cpp
+msgid "VSync"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley slope"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of biome filler depth."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of maximum mountain height (in nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of number of caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Variation of terrain vertical scale.\n"
+"When noise is < -0.55 terrain is near-flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Varies depth of biome surface nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Varies roughness of terrain.\n"
+"Defines the 'persistence' value for terrain_base and terrain_alt noises."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Varies steepness of cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Vertical climbing speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Vertical screen synchronization. Your system may still force VSync on even "
+"if this is disabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr "Видеодрайвер"
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View distance in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Virtual joystick triggers Aux1 button"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr "Горалун"
+
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Volume of all sounds.\n"
+"Requires the sound system to be enabled."
+msgstr ""
+"Шыяслӧн горалунныс.\n"
+"Шы система ӧзтыны колӧ."
+
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W coordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Alters the shape of the fractal.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking and flying speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr "Ва веркӧс"
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr "Лайкъялысь коръяс"
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids"
+msgstr "Гыалысь кизьӧрторъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wave height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wave speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wavelength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr "Лайкъялысь быдмӧгъяс"
+
+#: src/settings_translation_file.cpp
+msgid "Weblink color"
+msgstr "Ыстӧглӧн рӧм"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"properly support downloading textures back from hardware."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels. This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory. Powers of 2 are recommended. This setting is ONLY applied if\n"
+"bilinear/trilinear/anisotropic filtering is enabled.\n"
+"This is also used as the base node texture size for world-aligned\n"
+"texture autoscaling."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether name tag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether the window is maximized."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to mute sounds. You can unmute sounds at any time, unless the\n"
+"sound system is disabled (enable_sound=false).\n"
+"In-game, you can toggle the mute state with the mute key or by using the\n"
+"pause menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selection box lines around nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Window maximized"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Windows systems only: Start Minetest with the command line window in the "
+"background.\n"
+"Contains the same information as the file debug.txt (default name)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "World start time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World-aligned textures may be scaled to span several nodes. However,\n"
+"the server may not send the scale you want, especially if you use\n"
+"a specially-designed texture pack; with this option, the client tries\n"
+"to determine the scale automatically basing on the texture size.\n"
+"See also texture_min_size.\n"
+"Warning: This option is EXPERIMENTAL!"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "World-aligned textures mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Y of mountain density gradient zero level. Used to shift mountains "
+"vertically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-distance over which caverns expand to full size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Y-distance over which floatlands taper from full density to nothing.\n"
+"Tapering starts at this distance from the Y limit.\n"
+"For a solid floatland layer, this controls the height of hills/mountains.\n"
+"Must be less than or equal to half the distance between the Y limits."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of average terrain surface."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of cavern upper limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of higher terrain that creates cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of lower terrain and seabed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of seabed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL"
+msgstr "URL"
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL interactive timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr ""
+
+#~ msgid "- Address: "
+#~ msgstr "- Инпас: "
+
+#~ msgid "- Port: "
+#~ msgstr "- Йитанін: "
+
+#~ msgid "Change Keys"
+#~ msgstr "Личканъяс вежны"
+
+#~ msgid "DPI"
+#~ msgstr "DPI (дюйм вылӧ чут лыд)"
+
+#~ msgid "Invalid gamespec."
+#~ msgstr "Торксьӧм ворсан конфигурацияыс."
+
+#~ msgid "You have no games installed."
+#~ msgstr "Тіянлӧн пуктӧм ворсӧмъяс абуӧсь."
+
+#~ msgid "ok"
+#~ msgstr "ок"
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index e623a8ead..f3a3e0692 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kyrgyz (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2019-11-10 15:04+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Kyrgyz <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -79,7 +79,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -88,11 +88,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -112,6 +108,10 @@ msgstr ""
 msgid "Main menu"
 msgstr "Башкы меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 #, fuzzy
 msgid "Reconnect"
@@ -141,181 +141,188 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Дүйнөнү инициалдаштыруу катасы"
+
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download $1"
+msgstr "Дүйнөнү инициалдаштыруу катасы"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Жүктөлүүдө..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "Back to Main Menu"
 msgstr "Башкы меню"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "Жүктөлүүдө..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Games"
+msgstr "Оюн"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Жүктөлүүдө..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "Оюн"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Жокко чыгаруу"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 #, fuzzy
 msgid "Dependencies:"
 msgstr "көз карандылыктары:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "Жүктөлүүдө..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Дүйнөнү инициалдаштыруу катасы"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download $1"
-msgstr "Дүйнөнү инициалдаштыруу катасы"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Games"
-msgstr "Оюн"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Жүктөлүүдө..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -475,10 +482,20 @@ msgstr "Жаратуу"
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -848,11 +865,6 @@ msgstr ""
 msgid "Back"
 msgstr "Артка"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-#, fuzzy
-msgid "Change Keys"
-msgstr "Баскычтарды өзгөртүү"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -862,7 +874,8 @@ msgstr "Маек"
 msgid "Clear"
 msgstr "Тазалоо"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Controls"
 msgstr "Ctrl"
@@ -1075,6 +1088,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Жаңы"
@@ -1111,7 +1134,7 @@ msgid "Start Game"
 msgstr "Оюн"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1201,19 +1224,11 @@ msgstr "Жүктөлүүдө..."
 msgid "Rebuilding shaders..."
 msgstr "Дареги чечилүүдө..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Туташтыруу катасы (убактыңыз өтүп кеттиби?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Оюнду табуу же жүктөө мүмкүн эмес \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Башкы меню"
@@ -1238,7 +1253,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1246,19 +1265,10 @@ msgstr ""
 "\n"
 "Толугураак маалымат үчүн, debug.txt'ти текшериңиз."
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Address: "
-msgstr "Дареги/порту"
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Public: "
@@ -1296,10 +1306,6 @@ msgstr "Алга"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1347,6 +1353,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Серверге туташтырылууда..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Туташтыруу катасы (убактыңыз өтүп кеттиби?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1355,43 +1365,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Улантуу"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Жарыяланбас башкаруу:\n"
-"- WASD: басуу\n"
-"- Боштугу: секирүү/өйдө чыгуу\n"
-"- Shift: уурданып басуу/ылдый түшүү\n"
-"- Q: буюмду таштоо\n"
-"- I: мүлк-шайман\n"
-"- Чычканы: бурулуу/кароо\n"
-"- Сол чычкан баскычы: казуу/согуу\n"
-"- Оң чычкан баскычы: коюу/колдонуу\n"
-"- Чычкан дөңгөлөгү: буюмду тандоо\n"
-"- T: маек\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1478,6 +1458,10 @@ msgstr "Баарын өчүрүү"
 msgid "Fog enabled"
 msgstr "күйгүзүлгөн"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1501,10 +1485,6 @@ msgstr "Буюм текстуралары..."
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1665,10 +1645,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -2006,6 +1982,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Дүйнөнү инициалдаштыруу катасы"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2208,6 +2193,19 @@ msgstr "Масштаб"
 msgid "press key"
 msgstr "баскычты басыңыз"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Дүйнөнү инициалдаштыруу катасы"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Өзгөртүү"
@@ -2242,6 +2240,7 @@ msgstr "Үн көлөмү: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ky"
 
@@ -2428,12 +2427,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2457,6 +2450,10 @@ msgstr "Дүйнө аты"
 msgid "Advanced"
 msgstr "Кошумча"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2511,6 +2508,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2532,12 +2540,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2602,6 +2619,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2820,6 +2841,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2957,10 +2984,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3011,6 +3034,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3198,6 +3234,11 @@ msgstr "Баарын күйгүзүү"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Убалды күйгүзүү"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3217,6 +3258,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3259,6 +3304,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3282,6 +3331,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3290,12 +3343,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3325,6 +3372,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4121,9 +4181,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4272,10 +4333,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4324,7 +4381,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4359,10 +4418,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4604,6 +4659,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4673,6 +4732,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4782,10 +4845,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4798,6 +4857,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4908,6 +4971,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4923,6 +4994,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5117,8 +5192,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5241,7 +5316,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5274,6 +5349,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5314,8 +5393,7 @@ msgstr "Көлөкөлөгүчтөр"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5386,13 +5464,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5429,7 +5500,7 @@ msgstr "Тегиз жарык"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5451,6 +5522,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Үн көлөмү"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5607,17 +5687,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5628,6 +5728,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5654,7 +5760,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5711,6 +5817,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5758,12 +5868,13 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
-msgstr ""
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Кооз бактар"
 
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
@@ -5801,7 +5912,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5899,10 +6012,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5990,12 +6099,25 @@ msgstr ""
 msgid "Volume"
 msgstr "Үн көлөмү"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Тегиз жарык"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6238,6 +6360,10 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "- Address: "
+#~ msgstr "Дареги/порту"
+
 #, fuzzy
 #~ msgid "- Creative Mode: "
 #~ msgstr "Жаратуу режими"
@@ -6286,6 +6412,10 @@ msgstr ""
 #~ msgid "Bumpmapping"
 #~ msgstr "Mip-текстуралоо"
 
+#, fuzzy
+#~ msgid "Change Keys"
+#~ msgstr "Баскычтарды өзгөртүү"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Баскычтарды өзгөртүү"
@@ -6324,6 +6454,35 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Туташуу"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Жарыяланбас башкаруу:\n"
+#~ "- WASD: басуу\n"
+#~ "- Боштугу: секирүү/өйдө чыгуу\n"
+#~ "- Shift: уурданып басуу/ылдый түшүү\n"
+#~ "- Q: буюмду таштоо\n"
+#~ "- I: мүлк-шайман\n"
+#~ "- Чычканы: бурулуу/кароо\n"
+#~ "- Сол чычкан баскычы: казуу/согуу\n"
+#~ "- Оң чычкан баскычы: коюу/колдонуу\n"
+#~ "- Чычкан дөңгөлөгү: буюмду тандоо\n"
+#~ "- T: маек\n"
+
 #, fuzzy
 #~ msgid "Creative"
 #~ msgstr "Жаратуу"
diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 9aec66bdc..d214648f9 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Lithuanian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2022-09-21 14:22+0000\n"
-"Last-Translator: Bright Geyser <sirkfcpepsi@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-05-01 12:07+0000\n"
+"Last-Translator: EditaNEmilis <ramanauskiene.edita@gmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
 "minetest/lt/>\n"
 "Language: lt\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
 "19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
 "1 : 2);\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 5.5.3-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -77,7 +77,7 @@ msgstr "Komanda negalima: "
 
 #: builtin/common/chatcommands.lua
 #, fuzzy
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Gauti komandų pagalbą"
 
 #: builtin/common/chatcommands.lua
@@ -88,13 +88,9 @@ msgstr ""
 "parodyti visas komandas."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -111,6 +107,10 @@ msgstr "Įvyko klaida:"
 msgid "Main menu"
 msgstr "Pagrindinis meniu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Prisijungti iš naujo"
@@ -139,180 +139,187 @@ msgstr "Mes palaikome tik $1 protokolo versiją."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Mes palaikome protokolo versijas tarp $1 ir $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Nepavyko parsiųsti $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Nepavyko parsiųsti $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Papildinio diegimas: nepalaikomas failo tipas „$1“ arba sugadintas archyvas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 atsiunčiama..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
-msgstr ""
+msgstr "Visi paketai"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Jau įdiegta"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Atgal į Pagrindinį Meniu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB nėra prieinama, kai Minetest sukompiliuojamas be cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Siunčiama..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Žaidimai"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Įdiegti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Įkeliama..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Papildiniai"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Atnaujinti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Texture packs"
+msgstr "Tekstūrų paketai"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Išdiegti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Atnaujinti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 po $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Jau įdiegta"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Pagrindinis Žaidimas:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB nėra prieinama, kai Minetest sukompiliuojamas be cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Priklauso nuo:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Siunčiama..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Nepavyko parsiųsti $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Nepavyko parsiųsti $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Papildinio diegimas: nepalaikomas failo tipas „$1“ arba sugadintas archyvas"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Žaidimai"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Įdiegti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Įdiegti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Inicijuojami mazgai"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Įkeliama..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Papildiniai"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Atnaujinti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Texture packs"
-msgstr "Tekstūrų paketai"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Išdiegti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Atnaujinti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -471,11 +478,21 @@ msgstr "Sukurti"
 msgid "Decorations"
 msgstr "Dekoracijos"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Dėmesio: Minimalus kūrimo bandymas yra skirtas vystytojams."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -852,10 +869,6 @@ msgstr ""
 msgid "Back"
 msgstr "Atgal"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Nustatyti klavišus"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -865,7 +878,8 @@ msgstr "Susirašinėti"
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Controls"
 msgstr "Kairysis Control"
@@ -1082,6 +1096,16 @@ msgstr "Įdiegti žaidimą"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Naujas"
@@ -1118,9 +1142,8 @@ msgid "Start Game"
 msgstr "Slėpti vidinius"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
-msgid "You have no games installed."
-msgstr "Neturite įdiegę sub žaidimų."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1207,19 +1230,11 @@ msgstr "Įkeliamos tekstūros..."
 msgid "Rebuilding shaders..."
 msgstr "Perstatomi šešėliavimai..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Ryšio klaida (baigėsi prijungimo laikas?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Nepavyko rasti ar įkelti žaidimo „"
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Klaidingi žaidimo nustatymai."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Pagrindinis meniu"
@@ -1245,7 +1260,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr "Pateiktas pasaulio kelias neegzistuoja: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medija..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1253,18 +1272,10 @@ msgstr ""
 "\n"
 "Patikrinkite debug.txt dėl papildomos informacijos."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresas: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Prievadas: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Viešas: "
@@ -1302,10 +1313,6 @@ msgstr "Pirmyn"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1354,6 +1361,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Ryšio klaida (baigėsi prijungimo laikas?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1362,47 +1373,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Tęsti"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Numatytas valdymas:\n"
-"- %s: judėti į priekį\n"
-"- %s: judėti atgal\n"
-"- %s: judėti į kairę\n"
-"- %s: judėti į dešinę\n"
-"- %s: šokti/lipti\n"
-"- %s: leistis/eiti žemyn\n"
-"- %s: išmesti daiktą\n"
-"- %s: inventorius\n"
-"- Pelė: sukti/žiūrėti\n"
-"- Pelės kairys: kasti/smugiuoti\n"
-"- Pelės dešinys: padėti/naudoti\n"
-"- Pelės ratukas: pasirinkti elementą\n"
-"- %s: kalbėtis\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1500,6 +1478,10 @@ msgstr "Išjungti papildinį"
 msgid "Fog enabled"
 msgstr "įjungtas"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1521,10 +1503,6 @@ msgstr "Elemento apibrėžimai..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medija..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1684,10 +1662,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "gerai"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -2028,6 +2002,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Nepavyko parsiųsti $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2230,6 +2213,19 @@ msgstr "Pritraukti"
 msgid "press key"
 msgstr "paspauskite klavišą"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Nepavyko parsiųsti $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Pakeisti"
@@ -2264,6 +2260,7 @@ msgstr "Garso lygis: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "lt"
 
@@ -2450,12 +2447,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2479,6 +2470,10 @@ msgstr "Pasaulio pavadinimas"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2533,6 +2528,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2554,12 +2560,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2624,6 +2639,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2845,6 +2864,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2979,10 +3004,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3034,6 +3055,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3221,6 +3255,11 @@ msgstr "Įjungti visus"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Leisti sužeidimus"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3240,6 +3279,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3283,6 +3326,10 @@ msgstr "Papildiniai internete"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3306,6 +3353,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3314,12 +3365,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3349,6 +3394,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4146,9 +4204,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4297,10 +4356,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4349,7 +4404,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4384,10 +4441,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4638,6 +4691,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4707,6 +4764,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4816,10 +4877,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4832,6 +4889,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4941,6 +5002,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Neatitinka protokolo versija. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4956,6 +5026,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5145,8 +5219,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5276,7 +5350,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5309,6 +5383,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5349,8 +5427,7 @@ msgstr "Šešėliavimai"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5420,13 +5497,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5463,7 +5533,7 @@ msgstr "Apšvietimo efektai"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5485,6 +5555,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Garso lygis"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5641,17 +5720,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5662,6 +5761,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5688,7 +5793,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5745,6 +5850,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5792,12 +5901,13 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
-msgstr ""
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Nepermatomi lapai"
 
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
@@ -5834,7 +5944,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5932,10 +6044,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6022,12 +6130,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Apšvietimo efektai"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6269,12 +6390,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresas: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kūrybinis režimas "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Sužeidimai: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Prievadas: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6315,6 +6442,9 @@ msgstr ""
 #~ msgid "Bilinear Filter"
 #~ msgstr "„Bilinear“ filtras"
 
+#~ msgid "Change Keys"
+#~ msgstr "Nustatyti klavišus"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Nustatyti klavišus"
@@ -6352,6 +6482,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Jungtis"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Numatytas valdymas:\n"
+#~ "- %s: judėti į priekį\n"
+#~ "- %s: judėti atgal\n"
+#~ "- %s: judėti į kairę\n"
+#~ "- %s: judėti į dešinę\n"
+#~ "- %s: šokti/lipti\n"
+#~ "- %s: leistis/eiti žemyn\n"
+#~ "- %s: išmesti daiktą\n"
+#~ "- %s: inventorius\n"
+#~ "- Pelė: sukti/žiūrėti\n"
+#~ "- Pelės kairys: kasti/smugiuoti\n"
+#~ "- Pelės dešinys: padėti/naudoti\n"
+#~ "- Pelės ratukas: pasirinkti elementą\n"
+#~ "- %s: kalbėtis\n"
+
 #, fuzzy
 #~ msgid "Creative"
 #~ msgstr "Sukurti"
@@ -6438,6 +6600,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Įdiegti papildinį: failas: „$1“"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Klaidingi žaidimo nustatymai."
+
 #, fuzzy
 #~ msgid "Inventory key"
 #~ msgstr "Inventorius"
@@ -6595,5 +6760,12 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Jūs numirėte"
 
+#, fuzzy
+#~ msgid "You have no games installed."
+#~ msgstr "Neturite įdiegę sub žaidimų."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "gerai"
diff --git a/po/lv/minetest.po b/po/lv/minetest.po
index eb03c1e41..f5896af89 100644
--- a/po/lv/minetest.po
+++ b/po/lv/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2022-07-14 11:16+0000\n"
-"Last-Translator: Cow Boy <cowboylv@tutanota.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-01-22 21:01+0000\n"
+"Last-Translator: Uko Koknevics <TheZeus121@gmail.com>\n"
 "Language-Team: Latvian <https://hosted.weblate.org/projects/minetest/"
 "minetest/lv/>\n"
 "Language: lv\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
 "19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 4.14-dev\n"
+"X-Generator: Weblate 5.4-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -78,7 +78,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -87,11 +87,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -110,6 +106,10 @@ msgstr "Radās kļūme:"
 msgid "Main menu"
 msgstr "Galvenā izvēlne"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Atjaunot savienojumu"
@@ -138,183 +138,190 @@ msgstr "Mēs atbalstam tikai protokola versiju $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Mēs atbalstam protokola versijas starp $1 un $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Neizdevās lejuplādēt $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Neizdevās lejuplādēt $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Instalācija: Neatbalstīts faila tips “$1” vai arī sabojāts arhīvs"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Ielāde..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Visi papildinājumi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Atpakaļ uz Galveno Izvēlni"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "Ielāde..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spēles"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalēt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ielāde..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nevarēja iegūt papildinājumus"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Nav rezultātu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Atjaunot"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Tekstūru komplekti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Atinstalēt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+#, fuzzy
+msgid "Update"
+msgstr "Atjaunināt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Already installed"
 msgstr "Šis taustiņš jau tiek izmantots"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Atpakaļ uz Galveno Izvēlni"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "Spēlēt (kā serveris)"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Atkarības:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "Ielāde..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Neizdevās lejuplādēt $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Neizdevās lejuplādēt $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Instalācija: Neatbalstīts faila tips “$1” vai arī sabojāts arhīvs"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spēles"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalēt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Instalēt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Neobligātās atkarības:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ielāde..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nevarēja iegūt papildinājumus"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Nav rezultātu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Atjaunot"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Tekstūru komplekti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Atinstalēt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-#, fuzzy
-msgid "Update"
-msgstr "Atjaunināt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -469,12 +476,22 @@ msgstr "Izveidot"
 msgid "Decorations"
 msgstr "Dekorācijas"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr ""
 "Uzmanību: “Minimal development test” ir domāts priekš spēles izstrādātājiem."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -846,10 +863,6 @@ msgstr ""
 msgid "Back"
 msgstr "Atpakaļ"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Nomainīt kontroles"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -859,7 +872,8 @@ msgstr "Čats"
 msgid "Clear"
 msgstr "Notīrīt"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Vadība"
 
@@ -1072,6 +1086,16 @@ msgstr "Instalēt"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Jauns"
@@ -1106,8 +1130,8 @@ msgid "Start Game"
 msgstr "Sākt spēli"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Jums nav instalēta neviena spēle."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1193,19 +1217,11 @@ msgstr "Ielādē tekstūras..."
 msgid "Rebuilding shaders..."
 msgstr "Pārbūvē šeiderus..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Savienojuma kļūme (noildze?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Nevarēja atrast vai ielādēt spēli \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Nederīga spēles specifikācija."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Galvenā izvēlne"
@@ -1230,7 +1246,11 @@ msgstr "Neizdevās atvērt iestatīto paroļu failu: "
 msgid "Provided world path doesn't exist: "
 msgstr "Sniegtā pasaules atrašanās vieta neeksistē: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Mēdiji..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1238,18 +1258,10 @@ msgstr ""
 "\n"
 "Vairāk informācijas failā debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adrese: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Režīms: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Ports: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Publisks: "
@@ -1285,10 +1297,6 @@ msgstr "Automātiskā pārvietošanās ieslēgta"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1334,6 +1342,10 @@ msgstr "Klienta puses skriptēšana ir atspējota"
 msgid "Connecting to server..."
 msgstr "Savienojas ar serveri..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Savienojuma kļūme (noildze?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1342,47 +1354,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Turpināt"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kontroles:\n"
-"- %s: uz priekšu\n"
-"- %s: uz atpakaļu\n"
-"- %s: pa kreisi\n"
-"- %s: pa labi\n"
-"- %s: lekt/kāpt\n"
-"- %s: lavīties/nolaisties\n"
-"- %s: nomest priekšmetu\n"
-"- %s: inventārs\n"
-"- Pele: griezties/skatīties\n"
-"- Peles kreisā poga: rakt/sist\n"
-"- Peles labā poga: likt/izmantot\n"
-"- Peles rullītis: izvēlēties priekšmetu\n"
-"- %s: čats\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1475,6 +1454,11 @@ msgstr "Migla atspējota"
 msgid "Fog enabled"
 msgstr "Migla iespējota"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Tuvināšana šobrīd atspējota vai nu spēlei, vai modam"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spēles informācija:"
@@ -1495,10 +1479,6 @@ msgstr "Priekšmetu apraksti..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Mēdiji..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1657,10 +1637,6 @@ msgstr "Karkasattēlojums iespējots"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Tuvināšana šobrīd atspējota vai nu spēlei, vai modam"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1995,6 +1971,15 @@ msgstr "Minikarte virsmas režīmā, palielinājums x1"
 msgid "Minimap in texture mode"
 msgstr "Minikarte virsmas režīmā, palielinājums x1"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Neizdevās lejuplādēt $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2187,6 +2172,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "nospiediet pogu"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Neizdevās lejuplādēt $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Nomainīt"
@@ -2220,6 +2218,7 @@ msgstr "Skaņas skaļums: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "lv"
 
@@ -2406,12 +2405,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2435,6 +2428,10 @@ msgstr "Pasaules nosaukums"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2490,6 +2487,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2511,12 +2519,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2580,6 +2597,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2795,6 +2816,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2926,10 +2953,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2979,6 +3002,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3165,6 +3201,11 @@ msgstr "Iespējot visus"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Iespējot bojājumus"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3184,6 +3225,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3226,6 +3271,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3249,6 +3298,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3257,12 +3310,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3292,6 +3339,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4092,9 +4152,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4241,10 +4302,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4293,7 +4350,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4328,10 +4387,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4573,6 +4628,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4641,6 +4700,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Pieskārienslieksnis: (px)"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4750,10 +4814,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4766,6 +4826,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4875,6 +4939,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokola versiju neatbilstība. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4890,6 +4963,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5079,8 +5156,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5202,7 +5279,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5235,6 +5312,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5274,8 +5355,7 @@ msgstr "Šeideri"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5345,13 +5425,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5387,7 +5460,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5408,6 +5481,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Skaņa izslēgta"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5564,17 +5646,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5585,6 +5687,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5611,7 +5719,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5668,6 +5776,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5715,12 +5827,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Pieskārienslieksnis: (px)"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5758,7 +5869,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5856,10 +5969,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5946,12 +6055,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Bloku izcelšana"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6188,12 +6310,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Adrese: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Radošais režīms: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Bojājumi: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Ports: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6229,6 +6357,9 @@ msgstr ""
 #~ msgid "Bump Mapping"
 #~ msgstr "“Bump Mapping”"
 
+#~ msgid "Change Keys"
+#~ msgstr "Nomainīt kontroles"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Nomainīt kontroles"
@@ -6245,6 +6376,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Savienots stikls"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kontroles:\n"
+#~ "- %s: uz priekšu\n"
+#~ "- %s: uz atpakaļu\n"
+#~ "- %s: pa kreisi\n"
+#~ "- %s: pa labi\n"
+#~ "- %s: lekt/kāpt\n"
+#~ "- %s: lavīties/nolaisties\n"
+#~ "- %s: nomest priekšmetu\n"
+#~ "- %s: inventārs\n"
+#~ "- Pele: griezties/skatīties\n"
+#~ "- Peles kreisā poga: rakt/sist\n"
+#~ "- Peles labā poga: likt/izmantot\n"
+#~ "- Peles rullītis: izvēlēties priekšmetu\n"
+#~ "- %s: čats\n"
+
 #~ msgid "Credits"
 #~ msgstr "Pateicības"
 
@@ -6312,6 +6475,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Instalācija: fails: “$1”"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Nederīga spēles specifikācija."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6354,9 +6520,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Bez “mipmap”"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Bloku izcelšana"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Bloku konturēšana"
 
@@ -6491,8 +6654,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Jūs nomirāt"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Jums nav instalēta neviena spēle."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/lzh/minetest.po b/po/lzh/minetest.po
index 38ea9e541..0a6fabcb4 100644
--- a/po/lzh/minetest.po
+++ b/po/lzh/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Chinese (Literary) <https://hosted.weblate.org/projects/"
@@ -71,7 +71,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -80,11 +80,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -103,6 +99,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -131,173 +131,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -444,10 +451,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -810,10 +827,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -823,7 +836,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1026,6 +1040,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1059,7 +1083,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1139,18 +1163,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1175,24 +1191,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1227,10 +1239,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1275,6 +1283,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1283,32 +1295,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1388,6 +1381,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1408,10 +1405,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1567,10 +1560,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1891,6 +1880,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2080,6 +2078,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2113,6 +2123,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "lzh"
 
@@ -2298,12 +2309,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2326,6 +2331,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2379,6 +2388,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2400,12 +2420,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2468,6 +2497,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2680,6 +2713,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2811,10 +2850,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2864,6 +2899,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3048,6 +3096,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3067,6 +3119,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3109,6 +3165,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3132,6 +3192,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3140,12 +3204,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3175,6 +3233,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3969,9 +4040,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4117,10 +4189,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4169,7 +4237,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4204,10 +4274,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4449,6 +4515,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4517,6 +4587,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4625,10 +4699,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4641,6 +4711,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4750,6 +4824,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4765,6 +4847,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4952,8 +5038,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5071,7 +5157,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5104,6 +5190,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5143,8 +5233,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5214,13 +5303,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5256,7 +5338,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5277,6 +5359,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "消音"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5433,17 +5524,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5454,6 +5565,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5480,7 +5597,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5537,6 +5654,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5584,11 +5705,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5626,7 +5747,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5724,10 +5847,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5814,12 +5933,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/mi/minetest.po b/po/mi/minetest.po
index 838efc8ac..8d40925d7 100644
--- a/po/mi/minetest.po
+++ b/po/mi/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Maori <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -76,7 +76,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -85,11 +85,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -108,6 +104,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -136,173 +136,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -449,10 +456,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -815,10 +832,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Huri i nga key"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -828,7 +841,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1032,6 +1046,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Hou"
@@ -1065,7 +1089,7 @@ msgid "Start Game"
 msgstr "Tīmata Kēmu"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1145,18 +1169,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1181,24 +1197,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1233,10 +1245,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1281,6 +1289,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1289,46 +1301,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Haere Tonu"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Whakamaramatanga o nga neke hanga:\n"
-"- %s: whakamua\n"
-"- %s: whakamuri\n"
-"- %s: māui\n"
-"- %s: katau\n"
-"- %s: peke\n"
-"- %s: keri\n"
-"- %s: whakamahī\n"
-"- %s: konihi\n"
-"- %s: whakataka\n"
-"- %s: ketetaputapu\n"
-"- Mouse: tirohanga\n"
-"- Mouse wheel: ti pako\n"
-"- %s: korero\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1408,6 +1387,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1428,10 +1411,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1587,10 +1566,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1914,6 +1889,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2103,6 +2087,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2136,6 +2132,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "mi"
 
@@ -2321,12 +2318,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2349,6 +2340,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2402,6 +2397,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2423,12 +2429,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2491,6 +2506,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2703,6 +2722,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2834,10 +2859,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2887,6 +2908,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3071,6 +3105,11 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Taea te kino"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3090,6 +3129,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3132,6 +3175,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3155,6 +3202,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3163,12 +3214,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3198,6 +3243,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3992,9 +4050,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4140,10 +4199,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4192,7 +4247,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4227,10 +4284,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4472,6 +4525,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4540,6 +4597,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4648,10 +4709,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4664,6 +4721,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4773,6 +4834,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4788,6 +4857,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4975,8 +5048,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5094,7 +5167,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5127,6 +5200,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5166,8 +5243,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5237,13 +5313,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5279,7 +5348,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5300,6 +5369,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5456,17 +5533,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5477,6 +5574,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5503,7 +5606,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5560,6 +5663,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5607,11 +5714,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5649,7 +5756,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5747,10 +5856,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5837,12 +5942,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6079,9 +6196,44 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "Change Keys"
+#~ msgstr "Huri i nga key"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Huri i nga key"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Whakamaramatanga o nga neke hanga:\n"
+#~ "- %s: whakamua\n"
+#~ "- %s: whakamuri\n"
+#~ "- %s: māui\n"
+#~ "- %s: katau\n"
+#~ "- %s: peke\n"
+#~ "- %s: keri\n"
+#~ "- %s: whakamahī\n"
+#~ "- %s: konihi\n"
+#~ "- %s: whakataka\n"
+#~ "- %s: ketetaputapu\n"
+#~ "- Mouse: tirohanga\n"
+#~ "- Mouse wheel: ti pako\n"
+#~ "- %s: korero\n"
+
 #~ msgid "Information:"
 #~ msgstr "Nga Korero:"
diff --git a/po/minetest.pot b/po/minetest.pot
index ba9477754..918545824 100644
--- a/po/minetest.pot
+++ b/po/minetest.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,14 +79,14 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
+#: builtin/fstk/ui.lua
 msgid "OK"
 msgstr ""
 
@@ -134,175 +134,182 @@ msgstr ""
 msgid "Protocol version mismatch. "
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "All packages"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
 msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
 msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
 msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Not found"
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Please check that the base game is correct."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Base Game:"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-msgid "Dependencies:"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install missing dependencies"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
-#: builtin/mainmenu/dlg_delete_content.lua
-#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
-#: builtin/mainmenu/dlg_rename_modpack.lua
-#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
-msgid "Cancel"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "You need to install a game before you can install a mod"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "The package $1 was not found."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
 msgid "Loading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "No packages could be retrieved"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "No updates"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Update All [$1]"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "No results"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
 msgid "Update"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
 msgid "Uninstall"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "View more information in a web browser"
 msgstr ""
 
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Dependencies:"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
+msgid "Cancel"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr ""
+
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
 msgstr ""
@@ -499,6 +506,16 @@ msgstr ""
 msgid "Terrain surface erosion"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
 msgstr ""
@@ -801,27 +818,24 @@ msgstr ""
 msgid "(No description of setting given)"
 msgstr ""
 
+#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
 #: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
+#: src/settings_translation_file.cpp
+msgid "Controls"
 msgstr ""
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
-msgid "General"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
-msgid "Controls"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Movement"
 msgstr ""
@@ -1002,7 +1016,17 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -1146,10 +1170,6 @@ msgstr ""
 msgid "Main Menu"
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
 msgstr ""
@@ -1174,8 +1194,8 @@ msgstr ""
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
 msgstr ""
 
 #: src/client/game.cpp
@@ -1247,10 +1267,6 @@ msgstr ""
 msgid "Node definitions..."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "KiB/s"
 msgstr ""
@@ -1284,10 +1300,6 @@ msgstr ""
 msgid "Sound system is not supported on this build"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Fly mode enabled"
 msgstr ""
@@ -1356,10 +1368,6 @@ msgstr ""
 msgid "Block bounds shown for nearby blocks"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
 msgstr ""
@@ -1373,13 +1381,17 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Fog disabled"
+msgid "Fog enabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog disabled"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Debug info shown"
 msgstr ""
@@ -1460,8 +1472,8 @@ msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1471,25 +1483,6 @@ msgid ""
 " --> place single item to slot\n"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Continue"
 msgstr ""
@@ -1522,20 +1515,12 @@ msgstr ""
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Remote server"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Hosting server"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "- Port: "
+msgid "Remote server"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1568,12 +1553,16 @@ msgstr ""
 msgid "A serialization error occurred:"
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/gameui.cpp
 msgid "Chat shown"
 msgstr ""
@@ -1894,6 +1883,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
 #: src/content/mod_configuration.cpp
 msgid "Some mods have unsatisfied dependencies:"
 msgstr ""
@@ -2083,6 +2081,18 @@ msgstr ""
 msgid "Toggle fog"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
 msgstr ""
@@ -2125,6 +2135,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr ""
 
@@ -2150,7 +2161,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2203,6 +2214,16 @@ msgid ""
 "the place button."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
 msgstr ""
@@ -2260,11 +2281,12 @@ msgid "Touchscreen"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Enable touchscreen"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2275,6 +2297,25 @@ msgstr ""
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
 msgstr ""
@@ -2306,6 +2347,23 @@ msgid ""
 "circle."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Graphics and Audio"
 msgstr ""
@@ -2432,11 +2490,11 @@ msgid "Graphics Effects"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Opaque liquids"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
+msgid "Allows liquids to be translucent."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2771,8 +2829,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -2835,8 +2893,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3012,6 +3069,14 @@ msgstr ""
 msgid "Post Processing"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
 msgstr ""
@@ -3047,6 +3112,21 @@ msgid ""
 "Range: from -1 to 1.0"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Bloom"
 msgstr ""
@@ -3105,6 +3185,14 @@ msgid ""
 "Range: from 0.1 to 8, default: 1"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Audio"
 msgstr ""
@@ -3119,6 +3207,14 @@ msgid ""
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
 msgstr ""
@@ -3141,7 +3237,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -3403,7 +3499,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3531,6 +3629,23 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Remote media"
 msgstr ""
@@ -4124,7 +4239,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4960,6 +5077,14 @@ msgstr ""
 msgid "Enable random user input (only used for testing)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
 msgstr ""
@@ -5122,7 +5247,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5135,16 +5260,6 @@ msgid ""
 "Use this to limit the performance impact of transparency depth sorting"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
 msgstr ""
@@ -5193,17 +5308,6 @@ msgid ""
 "threads."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
 msgstr ""
@@ -5272,6 +5376,28 @@ msgid ""
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Font"
 msgstr ""
@@ -5601,9 +5727,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5781,12 +5908,10 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5801,6 +5926,21 @@ msgid ""
 "invisible blocks, so that the utility of noclip mode is reduced."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
 msgstr ""
@@ -5910,16 +6050,6 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Display Density Scaling Factor"
 msgstr ""
diff --git a/po/mn/minetest.po b/po/mn/minetest.po
index 2d11ab853..dc7292d72 100644
--- a/po/mn/minetest.po
+++ b/po/mn/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Mongolian <https://hosted.weblate.org/projects/minetest/"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Тушаал өгөх боломжгүй: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Тушаалуудад тусламж авах"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,9 @@ msgstr ""
 "мэдээллийг гаргана."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "За"
-
 #: builtin/fstk/ui.lua
 #, fuzzy
 msgid "<none available>"
@@ -107,6 +104,10 @@ msgstr "Алдаа үүссэн:"
 msgid "Main menu"
 msgstr "Үндсэн цэс"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "За"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Дахин холбогдох"
@@ -135,173 +136,180 @@ msgstr "Бид зөвхөн $1 хувилбарын протокол дэмжд
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Бид $1 болон $2 хоорондох хувилбарын протокол дэмждэг."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -448,10 +456,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -818,10 +836,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -831,7 +845,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1035,6 +1050,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1068,7 +1093,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1148,18 +1173,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1184,24 +1201,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1236,10 +1249,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1284,6 +1293,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1292,32 +1305,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1397,6 +1391,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1417,10 +1415,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1576,10 +1570,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1900,6 +1890,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2089,6 +2088,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2122,6 +2133,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "mn"
 
@@ -2307,12 +2319,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2335,6 +2341,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2388,6 +2398,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2409,12 +2430,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2477,6 +2507,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2689,6 +2723,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2820,10 +2860,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2873,6 +2909,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3057,6 +3106,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3076,6 +3129,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3118,6 +3175,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3141,6 +3202,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3149,12 +3214,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3184,6 +3243,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3978,9 +4050,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4126,10 +4199,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4178,7 +4247,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4213,10 +4284,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4459,6 +4526,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4527,6 +4598,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4635,10 +4710,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4651,6 +4722,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4760,6 +4835,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Протоколын хувилбар таарсангүй. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4775,6 +4859,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4962,8 +5050,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5081,7 +5169,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5114,6 +5202,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5153,8 +5245,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5224,13 +5315,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5266,7 +5350,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5287,6 +5371,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5443,17 +5535,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5464,6 +5576,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5490,7 +5608,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5547,6 +5665,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5594,11 +5716,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5636,7 +5758,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5734,10 +5858,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5824,12 +5944,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/mr/minetest.po b/po/mr/minetest.po
index 7b91461d5..c2b352f07 100644
--- a/po/mr/minetest.po
+++ b/po/mr/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/minetest/"
@@ -72,7 +72,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -81,13 +81,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "ठीक आहे"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -104,6 +100,10 @@ msgstr "एक त्रुटी आली:"
 msgid "Main menu"
 msgstr "मुख्य पान"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ठीक आहे"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "पुन्हा सामील व्हा"
@@ -132,175 +132,182 @@ msgstr "आम्ही केवळ आवृत्ती $1 चे समर
 msgid "We support protocol versions between version $1 and $2."
 msgstr "आम्ही केवळ आवृत्ती $1 आणि आवृत्ती $2 चे समर्थन करतो."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "$१ आधीच डाउन्लोआडेड आहे. आपण ते अधिलिखित करू इच्छिता?"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 $2 करून"
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "$१ डाउनलोड करू नाही शकत"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$१ डाउनलोड करू नाही शकत"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 डाउनलोड होत आहे..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "सर्व संकुले"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "आधीच स्थापित"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "मुख्य पानावर परत जा"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "जेव्हा मिनटेस्ट सीआरएलशिवाय संकलित केले होते तेव्हा सामग्री डीबी उपलब्ध नाही"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "डाउनलोड करत आहे..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "खेळ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "डाउनलोड"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "मॉड"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "काहीच सापडत नाही"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "कोणतीही गोष्ट नाहीत"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "अपडेट नाहीत"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "रांगेत लागले आहेत"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "टेक्सचर पॅक"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "काढा"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "अपडेट"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "सर्व अपडेट करा [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "अंतर्जाल शोधक वर माहिती काढा"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 $2 करून"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "आधीच स्थापित"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "मुख्य खेळ:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "रद्द करा"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "जेव्हा मिनटेस्ट सीआरएलशिवाय संकलित केले होते तेव्हा सामग्री डीबी उपलब्ध नाही"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "अवलंबित्व:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "डाउनलोड करत आहे..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "$१ डाउनलोड करू नाही शकत"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$१ डाउनलोड करू नाही शकत"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "खेळ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "डाउनलोड"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "डाउनलोड $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "गहाळ अवलंबित्व डाउनलोड करा"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "मॉड"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "काहीच सापडत नाही"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "कोणतीही गोष्ट नाहीत"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "अपडेट नाहीत"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "सापडले नाही"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "अधिलिखित"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "कृपया मुख्य खेळ योग्य आहे याची तपासणी करा."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "रांगेत लागले आहेत"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "$१ आधीच डाउन्लोआडेड आहे. आपण ते अधिलिखित करू इच्छिता?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "टेक्सचर पॅक"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "काढा"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "अपडेट"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "सर्व अपडेट करा [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "अंतर्जाल शोधक वर माहिती काढा"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "अधिलिखित"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -446,11 +453,21 @@ msgstr "तयार करा"
 msgid "Decorations"
 msgstr "सजावट"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "चेतावणी: Development Test विकासकांसाठी आहे."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "अंधारकोठडी"
@@ -813,10 +830,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -826,7 +839,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1030,6 +1044,16 @@ msgstr "डाउनलोड $1"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1063,8 +1087,8 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "आपल्याकडे कोणताही खेळ नाही."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1144,18 +1168,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1180,24 +1196,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1233,10 +1245,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1281,6 +1289,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1289,32 +1301,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1394,6 +1387,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1414,10 +1411,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1573,10 +1566,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1898,6 +1887,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "$१ डाउनलोड करू नाही शकत"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2089,6 +2087,19 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "$१ डाउनलोड करू नाही शकत"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2122,6 +2133,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "mr"
 
@@ -2307,12 +2319,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2336,6 +2342,10 @@ msgstr "जगाचे नाव"
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2389,6 +2399,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2410,12 +2431,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2479,6 +2509,10 @@ msgstr "भिन्न हवामान आणि आपत्ती"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2691,6 +2725,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2822,10 +2862,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2875,6 +2911,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3061,6 +3110,11 @@ msgstr "सर्व वापरा"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "सर्व वापरा"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3080,6 +3134,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3122,6 +3180,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3145,6 +3207,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3153,12 +3219,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3188,6 +3248,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3983,9 +4056,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4131,10 +4205,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4183,7 +4253,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4218,10 +4290,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4463,6 +4531,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4531,6 +4603,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4639,10 +4715,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4655,6 +4727,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4764,6 +4840,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "सर्व्हरची आवृत्ती जुळत नाही "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4779,6 +4864,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4966,8 +5055,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5086,7 +5175,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5119,6 +5208,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5158,8 +5251,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5229,13 +5321,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5271,7 +5356,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5292,6 +5377,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5448,17 +5541,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5469,6 +5582,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5495,7 +5614,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5552,6 +5671,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5599,11 +5722,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5641,7 +5764,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5739,10 +5864,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5829,12 +5950,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6086,3 +6219,6 @@ msgstr ""
 #, fuzzy
 #~ msgid "You died."
 #~ msgstr "तू मेलास"
+
+#~ msgid "You have no games installed."
+#~ msgstr "आपल्याकडे कोणताही खेळ नाही."
diff --git a/po/ms/minetest.po b/po/ms/minetest.po
index a71646720..0eefd8642 100644
--- a/po/ms/minetest.po
+++ b/po/ms/minetest.po
@@ -2,10 +2,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Malay (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-12-02 05:17+0000\n"
-"Last-Translator: Nisa Syazwani <nisasyazwani@users.noreply.hosted.weblate."
-"org>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2023-12-04 21:13+0000\n"
+"Last-Translator: \"Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat "
+"Yasuyoshi\" <translation@mnh48.moe>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/minetest/minetest/"
 "ms/>\n"
 "Language: ms\n"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Perintah tidak tersedia: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Dapatkan bantuan untuk perintah"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "untuk senaraikan kesemuanya."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <perintah>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<tiada yang tersedia>"
@@ -106,6 +104,10 @@ msgstr "Telah berlakunya ralat:"
 msgid "Main menu"
 msgstr "Menu utama"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Sambung semula"
@@ -134,19 +136,27 @@ msgstr "Kami hanya menyokong protokol versi $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Kami menyokong protokol versi $1 hingga $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" sudah wujud. Adakah anda ingin tulis gantinya?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Ralat ketika memasang \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Kebergantungan $1 dan $2 akan dipasangkan."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Gagal untuk memuat turun \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 oleh $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Gagal memuat turun $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Gagal untuk menyari \"$1\" (jenis fail tidak disokong atau arkib rosak)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,157 +164,157 @@ msgstr ""
 "$1 sedang muat turun,\n"
 "$2 menunggu giliran"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 dimuat turun..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 memerlukan kebergantungan yang tidak dijumpai."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 akan dipasangkan, dan $2 kebergantungan akan dilangkau."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Semua pakej"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Sudah dipasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Kembali ke Menu Utama"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB tidak tersedia apabila Minetest dikompil tanpa cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Memuat turun..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Permainan"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Pasang"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Memuatkan..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Tiada pakej yang boleh diambil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Tiada hasil"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Tiada kemas kini"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Menunggu giliran"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pek tekstur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Pakej $1 tidak dijumpai."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Nyahpasang"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Kemas kini"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Kemas Kini Semua [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Lihat maklumat lanjut dalam pelayar sesawang"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Anda perlu pasang permainan sebelum anda boleh pasang mods"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Kebergantungan $1 dan $2 akan dipasangkan."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 oleh $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 memerlukan kebergantungan yang tidak dijumpai."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 akan dipasangkan, dan $2 kebergantungan akan dilangkau."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Sudah dipasang"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Permainan Asas:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Batal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB tidak tersedia apabila Minetest dikompil tanpa cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Kebergantungan:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Memuat turun..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Ralat ketika memasang \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Gagal untuk memuat turun \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Gagal memuat turun $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Gagal untuk menyari \"$1\" (jenis fail tidak disokong atau arkib rosak)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Permainan"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Pasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Pasang $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Pasang kebergantungan yang hilang"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Memuatkan..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Tiada pakej yang boleh diambil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Tiada hasil"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Tiada kemas kini"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Tidak dijumpai"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Tulis ganti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Sila periksa dan pastikan permainan asas itu betul."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Menunggu giliran"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" sudah wujud. Adakah anda ingin tulis gantinya?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pek tekstur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Pakej $1 tidak dijumpai."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Nyahpasang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Kemas kini"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Kemas Kini Semua [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Lihat maklumat lanjut dalam pelayar sesawang"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Anda perlu pasang permainan sebelum anda boleh pasang mods"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Tulis ganti"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -452,10 +462,20 @@ msgstr "Cipta"
 msgid "Decorations"
 msgstr "Hiasan"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test hanyalah untuk kegunaan pembangun."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Kurungan bawah tanah"
@@ -833,10 +853,6 @@ msgstr "Ketercapaian"
 msgid "Back"
 msgstr "Kembali"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Tukar Kekunci"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,7 +862,8 @@ msgstr "Sembang"
 msgid "Clear"
 msgstr "Padam"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Kawalan"
 
@@ -1051,6 +1068,17 @@ msgstr "Pasang suatu permainan"
 msgid "Install games from ContentDB"
 msgstr "Pasangkan permainan daripada ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game sudah tidak dipasang secara lalainya"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Buat Baru"
@@ -1084,8 +1112,9 @@ msgid "Start Game"
 msgstr "Mulakan Permainan"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Anda tidak memasang sebarang permainan."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Anda perlu pasang permainan sebelum anda boleh pasang mods"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1164,18 +1193,10 @@ msgstr "Sedang memuatkan tekstur..."
 msgid "Rebuilding shaders..."
 msgstr "Sedang membina semula pembayang..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Ralat dalam penyambungan (tamat tempoh?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Tidak jumpa atau tidak boleh muatkan permainan: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Spesifikasi permainan tidak sah."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu Utama"
@@ -1201,7 +1222,11 @@ msgstr "Fail kata laluan yang disediakan gagal dibuka: "
 msgid "Provided world path doesn't exist: "
 msgstr "Laluan dunia diberi tidak wujud: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Sedang memuatkan media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1209,18 +1234,10 @@ msgstr ""
 "\n"
 "Periksa fail debug.txt untuk maklumat lanjut."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Alamat: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mod: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Awam: "
@@ -1255,10 +1272,6 @@ msgstr "Pergerakan automatik dibolehkan"
 msgid "Block bounds hidden"
 msgstr "Batas blok disembunyikan"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Batas blok ditunjukkan untuk semua blok"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Batas blok ditunjukkan untuk blok semasa"
@@ -1303,6 +1316,10 @@ msgstr "Skrip pihak klien dilumpuhkan"
 msgid "Connecting to server..."
 msgstr "Sedang menyambung kepada pelayan..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Ralat dalam penyambungan (tamat tempoh?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Sambungan gagal untuk sebab yang tidak diketahui"
@@ -1312,45 +1329,13 @@ msgid "Continue"
 msgstr "Teruskan"
 
 #: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kawalan:\n"
-"- %s: bergerak ke depan\n"
-"- %s: bergerak ke belakang\n"
-"- %s: bergerak ke kiri\n"
-"- %s: bergerak ke kanan\n"
-"- %s: lompat/naik atas\n"
-"- %s: gali/ketuk/guna\n"
-"- %s: letak/guna\n"
-"- %s: selinap/turun bawah\n"
-"- %s: jatuhkan item\n"
-"- %s: inventori\n"
-"- Tetikus: pusing/lihat sekeliling\n"
-"- Roda tetikus: pilih item\n"
-"- %s: sembang\n"
-
-#: src/client/game.cpp
+#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1444,6 +1429,11 @@ msgstr "Kabut dilumpuhkan"
 msgid "Fog enabled"
 msgstr "Kabut dibolehkan"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zum dilumpuhkan oleh permainan atau mods ketika ini"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Maklumat permainan:"
@@ -1464,10 +1454,6 @@ msgstr "Sedang mentakrifkan item..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Sedang memuatkan media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1629,10 +1615,6 @@ msgstr "Rangka dawai ditunjukkan"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zum dilumpuhkan oleh permainan atau mods ketika ini"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Sembang dilumpuhkan oleh permainan atau mods ketika ini"
@@ -1953,6 +1935,15 @@ msgstr "Peta mini dalam mod permukaan, Zum x%d"
 msgid "Minimap in texture mode"
 msgstr "Peta mini dalam mod tekstur"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Gagal buka laman sesawang"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2146,6 +2137,19 @@ msgstr "Zum"
 msgid "press key"
 msgstr "tekan kekunci"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Gagal buka laman sesawang"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Tukar"
@@ -2179,6 +2183,7 @@ msgstr "Kekuatan Bunyi: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ms"
 
@@ -2399,14 +2404,6 @@ msgstr "Jarak penghantaran objek aktif"
 msgid "Adds particles when digging a node."
 msgstr "Menambah partikel apabila menggali nod."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Laraskan konfigurasi DPI ke skrin anda (bukan X11/Android sahaja) cth. untuk "
-"skrin 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2438,6 +2435,10 @@ msgstr "Nama pentadbir"
 msgid "Advanced"
 msgstr "Lanjutan"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2496,6 +2497,17 @@ msgstr "Tambah nama item ke tip alatan."
 msgid "Apple trees noise"
 msgstr "Hingar pokok epal"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inersia lengan"
@@ -2513,18 +2525,39 @@ msgid "Ask to reconnect after crash"
 msgstr "Minta sambung semula selepas keruntuhan"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Pada jarak ini, pelayan akan mengoptimumkan secara agresif blok yang mana\n"
+"akan dihantar kepada klien.\n"
+"Nilai lebih kecil berkemungkinan boleh meningkatkan prestasi dengan banyak,\n"
+"dengan mengorbankan glic kemas gabung tampak (sesetengah blok tidak akan\n"
+"dikemas gabung di bawah air dan dalam gua, kekadang turut berlaku atas "
+"daratan).\n"
+"Menetapkan nilai ini lebih besar daripada nilai max_block_send_distance "
+"akan\n"
+"melumpuhkan pengoptimuman ini.\n"
+"Nyatakan dalam unit blokpeta (16 nod)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Pada jarak ini, pelayan akan mengoptimumkan secara agresif blok yang mana\n"
 "akan dihantar kepada klien.\n"
@@ -2597,6 +2630,11 @@ msgstr "API Biom"
 msgid "Biome noise"
 msgstr "Hingar biom"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Jarak optimum penghantaran blok"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Jarak optimum penghantaran blok"
@@ -2813,6 +2851,12 @@ msgstr "Kabut berwarna"
 msgid "Colored shadows"
 msgstr "Bayang berwarna"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2980,10 +3024,6 @@ msgstr ""
 "Warna rerambut silang (R,G,B).\n"
 "Juga mengawal warna rerambut silang objek"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Nilai ambang saiz fail log nyahpepijat"
@@ -3038,6 +3078,25 @@ msgstr ""
 "Tetapan ini menyelakukan kesan bayang lembut dengan menerapkan\n"
 "PCF atau cakera Poisson tetapi turut menggunakan lebih banyak sumber."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Bolehkan tetapan untuk melarang klien lama daripada menyambung.\n"
+"Klien lama masih sesuai digunakan jika mereka tidak runtuh (crash) apabila "
+"cuba untuk menyambung ke pelayan baharu,\n"
+"tetapi mereka mungkin tidak mampu menyokong semua sifat baharu yang anda "
+"sangkakan."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Mentakrifkan kawasan di mana pokok mempunyai epal."
@@ -3243,6 +3302,11 @@ msgstr "Membolehkan Seri"
 msgid "Enable Bloom Debug"
 msgstr "Membolehkan Nyahpepijat Seri"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Boleh Cedera"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3269,6 +3333,11 @@ msgstr ""
 "Jika dibenarkan, gunakan cakera Poisson untuk membuat \"bayang lembut\". "
 "Jika tidak, gunakan penapisan PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Pascapemprosesan"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Membolehkan Penakaian Surihan Sinar"
@@ -3318,6 +3387,11 @@ msgstr "Membolehkan keselamatan mods"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr "Membolehkan roda tetikus (tatal) untuk pemilihan item dalam hotbar."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Membolehkan input pengguna secara rawak (hanya untuk percubaan)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Membolehkan input pengguna secara rawak (hanya untuk percubaan)."
@@ -3348,6 +3422,11 @@ msgstr ""
 "tetapi mereka mungkin tidak mampu menyokong semua sifat baharu yang anda "
 "sangkakan."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Skrin Sentuh"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3361,14 +3440,6 @@ msgstr ""
 "tekstur)\n"
 "apabila menyambung ke pelayan permainan."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Membolehkan objek penimbal bucu.\n"
-"Ini patut meningkatkan prestasi grafik dengan banyak."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3407,6 +3478,19 @@ msgstr "Membolehkan animasi item dalam inventori."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Membolehkan pengagregatan jejaring yang diputar di paksi Y (facedir)."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4353,10 +4437,12 @@ msgstr ""
 "-   Legap: melumpuhkan lut sinar"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Panjang setiap detik pelayan dan selang masa ketika mana objek-objek "
 "selalunya\n"
@@ -4535,10 +4621,6 @@ msgstr ""
 "Buatkan warna kabut dan langit bergantung kepada waktu (fajar/matahari "
 "terbenam) dan arah pandang."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Buatkan semua cecair menjadi legap"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Tahap Pemampatan Peta untuk Simpanan Cakera"
@@ -4594,11 +4676,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atribut penjanaan peta khusus untuk janapeta v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Atribut penjanaan peta khusus untuk Janapeta v6.\n"
 "Bendera 'snowbiomes' membolehkan sistem 5 biom baharu.\n"
@@ -4641,10 +4726,6 @@ msgstr "Lengah masa penjanaan jejaring blok peta"
 msgid "Mapblock mesh generation threads"
 msgstr "Bebenang penjanaan jejaring BlokPeta"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Saiz cache BlokPeta untuk penjana jejaring blokpeta dalam unit MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Had masa nyahmuat blok peta"
@@ -4915,6 +4996,11 @@ msgstr "Tahap pengelogan minimum untuk ditulis ke sembang."
 msgid "Minimap scan height"
 msgstr "Ketinggian imbasan peta mini"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Selang pengulangan perbuatan letak"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Had minimum jumlah rawak gua besar per ketulan peta."
@@ -4983,6 +5069,11 @@ msgstr "Kepekaan tetikus"
 msgid "Mouse sensitivity multiplier."
 msgstr "Pendarab kepekaan tetikus."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Nilai ambang gua"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Hingar lumpur"
@@ -5127,10 +5218,6 @@ msgstr "Penakai Oklusi"
 msgid "Occlusion Culling"
 msgstr "Penakaian Oklusi"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Cecair legap"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5145,6 +5232,11 @@ msgstr ""
 "Buka menu jeda apabila fokus tetingkap hilang.\n"
 "Tidak jeda jika formspec dibuka."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Nyahpepijat janapeta"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Pilihan mengatasi warna pautan sesawang di sembang."
@@ -5280,6 +5372,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Perkadaran gua besar yang mengandungi cecair."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Versi protokol tidak serasi. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5298,6 +5399,10 @@ msgstr "Menaikkan rupa bumi untuk membuat lembah di sekitar sungai."
 msgid "Random input"
 msgstr "Input rawak"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Mesej Sembang Terkini"
@@ -5511,13 +5616,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Lihat http://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5679,8 +5785,9 @@ msgstr ""
 "Julat: dari -1 ke 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Menetapkan bahasa. Biarkan kosong untuk menggunakan bahasa sistem.\n"
@@ -5727,6 +5834,10 @@ msgstr ""
 "Tetapkan kepada \"true\" untuk membolehkan kesan seri.\n"
 "Warna yang terang akan menyantak ke objek di sekitarnya."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Tetapkan kepada \"true\" untuk membolehkan daun bergoyang."
@@ -5772,11 +5883,11 @@ msgid "Shaders"
 msgstr "Pembayang"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Pembayang membolehkan kesan visual lanjutan dan boleh meningkatkan prestasi\n"
 "untuk sesetengah kad video.\n"
@@ -5866,16 +5977,6 @@ msgstr ""
 "ketumpatan gua dan kurungan bawah tanah. Perubahan nilai ini adalah\n"
 "untuk kegunaan istimewa, lebih baik biarkannya tidak berubah."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Saiz cache blokpeta untuk penjana jejaring. Menaikkan nilai ini akan\n"
-"meningkatkan jumlah % hit cache, mengurangkan data yang perlu disalin\n"
-"daripada jalur utama, lalu mengurangkan ketaran."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Kecondongan Orbit Badan Angkasa"
@@ -5910,9 +6011,10 @@ msgid "Smooth lighting"
 msgstr "Pencahayaan lembut"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Melembutkan pemutaran kamera ketika dalam mod sinematik, nilai 0 untuk "
 "melumpuhkannya. Masuk mod sinematik menggunakan kekunci yang ditetapkan "
@@ -5938,6 +6040,15 @@ msgstr "Kelajuan menyelinap, dalam unit nod per saat."
 msgid "Soft shadow radius"
 msgstr "Jejari bayang lembut"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Bunyi"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Senarai Hitam Bendera ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6148,6 +6259,12 @@ msgstr ""
 "Format lalai di untuk menyimpan profil,\n"
 "apabila memanggil `/profiler save [format]` tanpa format."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
@@ -6155,12 +6272,27 @@ msgstr ""
 "Laluan fail yang relatif kepada laluan dunia anda di mana profil akan "
 "disimpankan."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Pengenal pasti kayu bedik yang digunakan"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+#, fuzzy
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Panjang dalam piksel yang diperlukan untuk interaksi skrin sentuh dimulakan."
 
@@ -6176,6 +6308,15 @@ msgstr ""
 "0.0 = Gelora tidak bergerak langsung.\n"
 "Nilai lalainya 1.0 (1/2 nod)."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Jumlah masa dalam saat diambil untuk meletakan nod yang berulang apabila\n"
+"pemain menekan butang letak tanpa melepaskannya."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Antaramuka rangkaian yang pelayan dengar."
@@ -6207,11 +6348,12 @@ msgstr ""
 "Nilai ini patut ditetapkan bersama nilai active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Bahagian belakang pengemas gabung.\n"
 "Nota: Mula semula diperlukan selepas mengubah tetapan ini!\n"
@@ -6294,6 +6436,10 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Hingar 2D ketiga daripada empat yang mentakrifkan ketinggian bukit/gunung."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6350,14 +6496,15 @@ msgstr "Kepekaan skrin sentuh"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Pendarab kepekaan skrin sentuh."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Nilai ambang skrin sentuh"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Keseimbangan untuk prestasi"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Cecair legap"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Jarak Pengisihan Lut Sinar"
@@ -6403,8 +6550,11 @@ msgstr ""
 "Tetapan ini hanya patut diubah jika anda mempunyai masalah prestasi."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL kepada fail JSON yang menyediakan maklumat mengenai terbitan Minetest "
 "terbaru"
@@ -6467,9 +6617,8 @@ msgstr ""
 "Gunakan penapisan anisotropik apabila melihat tekstur dari suatu sudut."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Gunakan penapisan trilinear apabila menyesuaikan tekstur."
+msgstr "Gunakan penapisan bilinear apabila menyesuaikan tekstur."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6485,13 +6634,12 @@ msgstr ""
 "memilih objek."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Gunakan pemetaan mip untuk menyesuaiturunkan tekstur. Boleh meningkatkan\n"
+"Gunakan pemetaan mip apabila menyesuaikan tekstur. Boleh meningkatkan\n"
 "sedikit prestasi, terutamanya apabila menggunakan pek tekstur leraian "
 "tinggi.\n"
 "Penyesuaiturunan secara tepat-gama tidak disokong."
@@ -6507,13 +6655,12 @@ msgstr ""
 "untuk jejaring klien dengan saiz lebih kecil daripada blok peta 4x4x4."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Gunakan penapisan trilinear apabila menyesuaiturunkan tekstur.\n"
+"Gunakan penapisan trilinear apabila menyesuaikan tekstur.\n"
 "Sekiranya kedua-dua penapisan bilinear dan trilinear dibolehkan,\n"
 "maka penapisan trilinear yang akan diterapkan."
 
@@ -6531,10 +6678,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Antara Muka Pengguna"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Segerak Menegak"
@@ -6628,6 +6771,10 @@ msgstr "Kayu bedik maya memicu butang Aux1"
 msgid "Volume"
 msgstr "Kekuatan bunyi"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6636,6 +6783,16 @@ msgstr ""
 "Kekuatan semua bunyi.\n"
 "Memerlukan sistem bunyi dibolehkan."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Bingkai per saat (FPS) apabila permainan hilang fokus atau dijedakan"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Pencahayaan lembut"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6943,12 +7100,18 @@ msgstr "Had cURL selari"
 #~ msgid "(game support required)"
 #~ msgstr "(sokongan permainan diperlukan)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Alamat: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Mod Kreatif: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Boleh cedera: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6987,6 +7150,13 @@ msgstr "Had cURL selari"
 #~ "Ambil perhatian bahawa medan alamat dalam menu utama mengatasi tetapan "
 #~ "ini."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Laraskan konfigurasi DPI ke skrin anda (bukan X11/Android sahaja) cth. "
+#~ "untuk skrin 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7058,6 +7228,9 @@ msgstr "Had cURL selari"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bit per piksel (atau kedalaman warna) dalam mod skrin penuh."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Batas blok ditunjukkan untuk semua blok"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Pemetaan Bertompok"
 
@@ -7083,6 +7256,9 @@ msgstr "Had cURL selari"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Titik tengah tolakan-tengah lengkung cahaya."
 
+#~ msgid "Change Keys"
+#~ msgstr "Tukar Kekunci"
+
 #~ msgid "Change keys"
 #~ msgstr "Tukar kekunci"
 
@@ -7159,6 +7335,38 @@ msgstr "Had cURL selari"
 #~ msgstr ""
 #~ "Mengawal lebar terowong, nilai lebih kecil mencipta terowong lebih lebar."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kawalan:\n"
+#~ "- %s: bergerak ke depan\n"
+#~ "- %s: bergerak ke belakang\n"
+#~ "- %s: bergerak ke kiri\n"
+#~ "- %s: bergerak ke kanan\n"
+#~ "- %s: lompat/naik atas\n"
+#~ "- %s: gali/ketuk/guna\n"
+#~ "- %s: letak/guna\n"
+#~ "- %s: selinap/turun bawah\n"
+#~ "- %s: jatuhkan item\n"
+#~ "- %s: inventori\n"
+#~ "- Tetikus: pusing/lihat sekeliling\n"
+#~ "- Roda tetikus: pilih item\n"
+#~ "- %s: sembang\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreatif"
 
@@ -7168,6 +7376,9 @@ msgstr "Had cURL selari"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Warna bagi kursor rerambut silang (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Boleh cedera"
 
@@ -7265,6 +7476,13 @@ msgstr "Had cURL selari"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Bolehkan pengesahan pendaftaran"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Membolehkan objek penimbal bucu.\n"
+#~ "Ini patut meningkatkan prestasi grafik dengan banyak."
+
 #~ msgid "Enabled"
 #~ msgstr "Dibolehkan"
 
@@ -7580,6 +7798,9 @@ msgstr "Had cURL selari"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentasi"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Spesifikasi permainan tidak sah."
+
 #~ msgid "Inventory key"
 #~ msgstr "Kekunci inventori"
 
@@ -8277,6 +8498,12 @@ msgstr "Had cURL selari"
 #~ "Membuatkan DirectX bekerja dengan LuaJIT. Lumpuhkan tetapan jika "
 #~ "bermasalah."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Buatkan semua cecair menjadi legap"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Saiz cache BlokPeta untuk penjana jejaring blokpeta dalam unit MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menu"
 
@@ -8518,15 +8745,21 @@ msgstr "Had cURL selari"
 #~ msgid "Simple Leaves"
 #~ msgstr "Daun Ringkas"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Saiz cache blokpeta untuk penjana jejaring. Menaikkan nilai ini akan\n"
+#~ "meningkatkan jumlah % hit cache, mengurangkan data yang perlu disalin\n"
+#~ "daripada jalur utama, lalu mengurangkan ketaran."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Pencahayaan Lembut"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Melembutkan pemutaran kamera. Set sebagai 0 untuk melumpuhkannya."
 
-#~ msgid "Sound"
-#~ msgstr "Bunyi"
-
 #~ msgid "Special"
 #~ msgstr "Istimewa"
 
@@ -8590,6 +8823,9 @@ msgstr "Had cURL selari"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Nilai ambang sentuhan (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Nilai ambang skrin sentuh"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Penapisan Trilinear"
 
@@ -8643,6 +8879,9 @@ msgstr "Had cURL selari"
 #~ "Jika ditetapkan ke 0, MSAA akan dilumpuhkan.\n"
 #~ "Anda perlu mulakan semula selepas mengubah pilihan ini."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variasi ketinggian bukit dan kedalaman tasik rupa bumi lembut tanah "
@@ -8747,8 +8986,14 @@ msgstr "Had cURL selari"
 #~ msgid "You died."
 #~ msgstr "Anda telah meninggal."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Anda tidak memasang sebarang permainan."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/ms_Arab/minetest.po b/po/ms_Arab/minetest.po
index cf09c6aef..1fb480365 100644
--- a/po/ms_Arab/minetest.po
+++ b/po/ms_Arab/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-11-12 13:14+0000\n"
 "Last-Translator: \"Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat "
 "Yasuyoshi\" <translation@mnh48.moe>\n"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "ڤرينته تيدق ترسديا: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "داڤتکن بنتوان اونتوق ڤرينته"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "سنارايکن کسمواڽ."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <ڤرينته>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<تياد يڠ ترسديا>"
@@ -106,6 +104,10 @@ msgstr "تله برلاکوڽ رالت:"
 msgid "Main menu"
 msgstr "مينو اوتام"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "سامبوڠ سمولا"
@@ -134,19 +136,26 @@ msgstr "کامي هاي مڽوکوڠ ڤروتوکول ۏرسي $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "کامي مڽوکوڠ ڤروتوکول ۏرسي $1 هيڠݢ $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "”$1‟ سوده وجود. اداکه اندا ايڠين توليس ݢنتيڽ؟"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "رالت کتيک مماسڠ ”$1‟: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "کبرݢنتوڠن $1 دان $2 اکن دڤاسڠکن."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "ݢاݢل اونتوق مموات تورون ”$1‟"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 اوليه $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "ݢاݢل مموات تورون $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "ݢاݢل اونتوق مڽاري ”$1‟ (جنيس فاٴيل تيدقدسوکوڠ اتاو ارکيب روسق)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,156 +163,157 @@ msgstr ""
 "$1 سدڠ موات تورون⹁\n"
 "$2 منوڠݢو ݢيليرن"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 دموات تورون..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 ممرلوکن کبرݢنتوڠن يڠ تيدق دجومڤاٴي."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 اکن دڤاسڠکن⹁ دان $2 کبرݢنتوڠن اکن دلڠکاو."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "سموا ڤاکيج"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "سوده دڤاسڠ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "کمبالي کمينو اوتام"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB تيدق ترسديا اڤابيلا ماٴينتيس‌ت دکومڤيل تنڤا cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "مموات تورون..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "ڤرماٴينن"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "ڤاسڠ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "ممواتکن..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "مودس"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "تياد ڤاکيج يڠ بوليه دأمبيل"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "تياد حاصيل"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "تياد کمس کيني"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "منوڠݢو ݢيليرن"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "ڤيک تيکستور"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "ڤاکيج $1 تيدق دجومڤاٴي."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "ڽهڤاسڠ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "کمس کيني"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "کمس کيني سموا [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "ليهت معلومت لنجوت دالم ڤلاير سساوڠ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "اندا ڤرلو ڤاسڠ ڤرماٴينن سبلوم اندا بوليه ڤاسڠ مودس"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "کبرݢنتوڠن $1 دان $2 اکن دڤاسڠکن."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 اوليه $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 ممرلوکن کبرݢنتوڠن يڠ تيدق دجومڤاٴي."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 اکن دڤاسڠکن⹁ دان $2 کبرݢنتوڠن اکن دلڠکاو."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "سوده دڤاسڠ"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "ڤرماٴينن اساس:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "بطل"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB تيدق ترسديا اڤابيلا ماٴينتيس‌ت دکومڤيل تنڤا cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "کبرݢنتوڠن:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "مموات تورون..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "رالت کتيک مماسڠ ”$1‟: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "ݢاݢل اونتوق مموات تورون ”$1‟"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "ݢاݢل مموات تورون $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "ݢاݢل اونتوق مڽاري ”$1‟ (جنيس فاٴيل تيدقدسوکوڠ اتاو ارکيب روسق)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "ڤرماٴينن"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "ڤاسڠ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "ڤاسڠ $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "ڤاسڠ کبرݢنتوڠن يڠ هيلڠ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "ممواتکن..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "مودس"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "تياد ڤاکيج يڠ بوليه دأمبيل"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "تياد حاصيل"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "تياد کمس کيني"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "تيدق دجومڤاٴي"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "توليس ݢنتي"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "سيلا ڤريقسا دان ڤستيکن ڤرماٴينن اساس ايت بتول."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "منوڠݢو ݢيليرن"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "”$1‟ سوده وجود. اداکه اندا ايڠين توليس ݢنتيڽ؟"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "ڤيک تيکستور"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "ڤاکيج $1 تيدق دجومڤاٴي."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "ڽهڤاسڠ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "کمس کيني"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "کمس کيني سموا [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "ليهت معلومت لنجوت دالم ڤلاير سساوڠ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "اندا ڤرلو ڤاسڠ ڤرماٴينن سبلوم اندا بوليه ڤاسڠ مودس"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "توليس ݢنتي"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -451,10 +461,20 @@ msgstr "چيڤتا"
 msgid "Decorations"
 msgstr "هياسن"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test هاڽاله اونتوق کݢوناٴن ڤمباڠون."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "کوروڠن باوه تانه"
@@ -828,10 +848,6 @@ msgstr ""
 msgid "Back"
 msgstr "کبلاکڠ"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "توکر ککونچي"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -841,7 +857,8 @@ msgstr "سيمبڠ"
 msgid "Clear"
 msgstr "ڤادم"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "کاولن"
 
@@ -1056,6 +1073,16 @@ msgstr "ڤاسڠ سواتو ڤرماٴينن"
 msgid "Install games from ContentDB"
 msgstr "ڤاسڠکن ڤرماٴينن درڤد ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "بوات بارو"
@@ -1090,8 +1117,9 @@ msgid "Start Game"
 msgstr "مولاکن ڤرماٴينن"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "اندا تيدق مماسڠ سبارڠ ڤرماٴينن."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "اندا ڤرلو ڤاسڠ ڤرماٴينن سبلوم اندا بوليه ڤاسڠ مودس"
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1177,19 +1205,11 @@ msgstr "سدڠ ممواتکن تيکستور..."
 msgid "Rebuilding shaders..."
 msgstr "سدڠ ممبينا سمولا ڤمبايڠ..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "رالت دالم ڤڽمبوڠن (تامت تيمڤوه؟)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "تيدق جومڤ اتاو تيدق بوليه مواتکن ڤرماٴينن \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "سڤيسيفيکاسي ڤرماٴينن تيدق صح."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "مينو اوتام"
@@ -1214,7 +1234,11 @@ msgstr "فاٴيل کات لالوان يڠ دسدياکن ݢاݢل دبوک: "
 msgid "Provided world path doesn't exist: "
 msgstr "لالوان دنيا دبري تيدق وجود: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "سدڠ ممواتکن ميديا..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1222,18 +1246,10 @@ msgstr ""
 "\n"
 "ڤريقسا فاٴيل debug.txt اونتوق معلومت لنجوت."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- علامت: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- مود: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- ڤورت: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- عوام: "
@@ -1269,10 +1285,6 @@ msgstr "ڤرݢرقن اٴوتوماتيک دبوليهکن"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1319,6 +1331,10 @@ msgstr "سکريڤ ڤيهق کليئن دلومڤوهکن"
 msgid "Connecting to server..."
 msgstr "سدڠ مڽمبوڠ کڤد ڤلاين..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "رالت دالم ڤڽمبوڠن (تامت تيمڤوه؟)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1327,47 +1343,14 @@ msgstr ""
 msgid "Continue"
 msgstr "تروسکن"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"کاولن:\n"
-"- %s: برݢرق کدڤن\n"
-"- %s: برݢرق کبلاکڠ\n"
-"- %s: برݢرق ککيري\n"
-"- %s: برݢرق ککانن\n"
-"- %s: لومڤت\\ناٴيق اتس\n"
-"- %s: سلينڤ\\تورون باواه\n"
-"- %s: جاتوهکن ايتم\n"
-"- %s: اينۏينتوري\n"
-"- تتيکوس: ڤوسيڠ\\ليهت سکليليڠ\n"
-"- تتيکوس کيري: ݢالي\\کتوق\n"
-"- تتيکوس کانن: لتق\\ݢونا\n"
-"- رودا تتيکوس: ڤيليه ايتم\n"
-"- %s: سيمبڠ\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1459,6 +1442,11 @@ msgstr "کابوت دلومڤوهکن"
 msgid "Fog enabled"
 msgstr "کابوت دبوليهکن"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "زوم سدڠ دلومڤوهکن اوليه ڤرماٴينن اتاو مودس"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "معلومت ڤرماٴينن:"
@@ -1479,10 +1467,6 @@ msgstr "سدڠ منتعريفکن ايتم..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "سدڠ ممواتکن ميديا..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1641,10 +1625,6 @@ msgstr "رڠک داواي دتونجوقکن"
 msgid "Zoom currently disabled by game or mod"
 msgstr "زوم سدڠ دلومڤوهکن اوليه ڤرماٴينن اتاو مودس"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "اوکي"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1979,6 +1959,15 @@ msgstr "ڤتا ميني دالم مود ڤرموکاٴن⹁ زوم 1x"
 msgid "Minimap in texture mode"
 msgstr "ڤتا ميني دالم مود تيکستور"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "ݢاݢل ممبوک لامن سساوڠ"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2170,6 +2159,19 @@ msgstr "زوم"
 msgid "press key"
 msgstr "تکن ککونچي"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "ݢاݢل ممبوک لامن سساوڠ"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "توکر"
@@ -2203,6 +2205,7 @@ msgstr "ککواتن بوڽي: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ms_Arab"
 
@@ -2410,14 +2413,6 @@ msgstr "جارق ڤڠهنترن اوبجيک اکتيف"
 msgid "Adds particles when digging a node."
 msgstr "منمبه ڤرتيکل اڤابيلا مڠݢالي نود."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"لارسکن کونفيݢوراسي DPI کسکرين اندا (بوکن X11/Android سهاج) چونتوه اونتوق "
-"سکرين 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2441,6 +2436,10 @@ msgstr "تمبه نام ايتم"
 msgid "Advanced"
 msgstr "تتڤن مندالم"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2502,6 +2501,17 @@ msgstr "تمبه نام ايتم کتيڤ التن."
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "اينرسيا لڠن"
@@ -2525,12 +2535,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2596,6 +2615,10 @@ msgstr "بيوم"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2818,6 +2841,12 @@ msgstr "کابوت برورنا"
 msgid "Colored shadows"
 msgstr "کابوت برورنا"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2954,10 +2983,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3008,6 +3033,24 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"بوليهکن تتڤن اونتوق ملارڠ کليئن لام درڤد مڽمبوڠ.\n"
+"کليئن لام ماسيه سسواي دݢوناکن جک مريک تيدق رونتوه (کريش) اڤابيلا چوبا اونتوق "
+"مڽمبوڠ کڤلاين بهارو⹁\n"
+"تتاڤي مريک موڠکين تيدق ممڤو مڽوکوڠ سموا صيفت بهارو يڠ اندا سڠکاکن."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3201,6 +3244,11 @@ msgstr "ممبوليهکن سموا"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "بوليه چدرا"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3222,6 +3270,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "ممبوليهکن کايو بديق"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3264,6 +3317,11 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "ممبوليهکن اينڤوت ڤڠݢونا سچارا راوق (هاڽ اونتوق ڤرچوباٴن)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "ممبوليهکن اينڤوت ڤڠݢونا سچارا راوق (هاڽ اونتوق ڤرچوباٴن)."
@@ -3293,6 +3351,11 @@ msgstr ""
 "مڽمبوڠ کڤلاين بهارو⹁\n"
 "تتاڤي مريک موڠکين تيدق ممڤو مڽوکوڠ سموا صيفت بهارو يڠ اندا سڠکاکن."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "نيلاي امبڠ سکرين سنتوه"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3305,14 +3368,6 @@ msgstr ""
 "تيکستور)\n"
 "اڤابيلا مڽمبوڠ کڤلاين ڤرماٴينن."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"ممبوليهکن اوبجيک ڤنيمبل بوچو.\n"
-"اين ڤاتوت منيڠکتکن ڤريستاسي ݢرافيک دڠن باڽق."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3352,6 +3407,19 @@ msgstr "ممبوليهکن انيماسي ايتم دالم اينۏينتوري
 msgid "Enables caching of facedir rotated meshes."
 msgstr "ممبوليهکن ڤڠاݢريݢتن ججاريڠ يڠ دڤوتر دڤکسي Y ايايت (facedir)."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4211,9 +4279,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4362,10 +4431,6 @@ msgid ""
 msgstr ""
 "بواتکن ورنا کابوت دان لاڠيت برݢنتوڠ کڤد وقتو (فجر\\ماتاهاري) دان اره ڤندڠ."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "بواتکن سموا چچاٴير منجادي لݢڤ"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4414,7 +4479,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4450,11 +4517,6 @@ msgstr "لڠه ماس ڤنجاناٴن ججاريڠ بلوک ڤتا"
 msgid "Mapblock mesh generation threads"
 msgstr "لڠه ماس ڤنجاناٴن ججاريڠ بلوک ڤتا"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-"ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ بلوکڤتا دالم اونيت ميݢاباٴيت (MB)"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "حد ماس ڽهموات بلوک ڤتا"
@@ -4712,6 +4774,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr "کتيڠݢين ايمبسن ڤتا ميني"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "سلڠ ڤڠاولڠن کليک کانن"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4780,6 +4847,11 @@ msgstr "کڤيکاٴن تتيکوس"
 msgid "Mouse sensitivity multiplier."
 msgstr "ڤندارب کڤيکاٴن تتيکوس."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "نيلاي امبڠ سکرين سنتوه"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4897,10 +4969,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "چچاٴير لݢڤ"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4915,6 +4983,10 @@ msgstr ""
 "بوک مينو جيدا اڤابيلا فوکوس تتيڠکڤ هيلڠ.\n"
 "تيدق جيدا جيک فورمسڤيک دبوک."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5055,6 +5127,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "ۏرسي ڤروتوکول تيدق سراسي. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5072,6 +5153,10 @@ msgstr ""
 msgid "Random input"
 msgstr "اينڤوت راوق"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "ميسيج سيمبڠ ترکيني"
@@ -5272,8 +5357,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5396,7 +5481,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5433,6 +5518,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5478,11 +5567,11 @@ msgid "Shaders"
 msgstr "ڤمبايڠ"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "ڤمبايڠ ممبوليهکن کسن ۏيسوال مندالم دان بوليه منيڠکتکن\n"
 "ڤريستاسي اونتوق سستڠه کد ۏيديو.\n"
@@ -5558,16 +5647,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ. مناٴيقکن نيلاي اين\n"
-"اکن منيڠکتکن جومله % هيت کيش⹁ مڠورڠکن داتا يڠ ڤرلو دسالين\n"
-"درڤد جالور اوتام⹁ لالو مڠورڠکن کترن."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5604,7 +5683,7 @@ msgstr "ڤنچهاياٴن لمبوت"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "ملمبوتکن ڤموترن کاميرا دالم مود سينماتيک. سيت سباݢاي 0 اونتوق ملومڤوهکنڽ."
 
@@ -5629,6 +5708,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "نيلاي الفا بايڠ فون"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "بوڽي"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5806,18 +5893,38 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "ڤڠنل ڤستي کايو بديق يڠ دݢوناکن"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "ڤنجڠ دالم ڤيکسيل اونتوق ممولاکن اينتراکسي سکرين سنتوه."
 
 #: src/settings_translation_file.cpp
@@ -5834,6 +5941,15 @@ msgstr ""
 "نيلاي اصلڽ 1.0 (1/2 نود).\n"
 "ممرلوکن تتڤن چچاٴير برݢلورا دبوليهکن."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"جومله ماس دالم ساٴت دامبيل اونتوق ملاکوکن کليک کانن يڠ براولڠ اڤابيلا\n"
+"ڤماٴين منکن بوتڠ تتيکوس کانن تنڤ ملڤسکنڽ."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "انتاراموک رڠکاين يڠ ڤلاين دڠر."
@@ -5864,11 +5980,12 @@ msgstr ""
 "نيلاي اين ڤاتوت دتتڤکن برسام نيلاي active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "بهاݢين بلاکڠ ڤڠمس ݢابوڠ.\n"
 "نوتا: مولا سمولا دڤرلوکن سلڤس مڠوبه تتڤن اين!\n"
@@ -5941,6 +6058,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5997,15 +6118,15 @@ msgstr "کڤيکاٴن تتيکوس"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "ڤندارب کڤيکاٴن تتيکوس."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "نيلاي امبڠ سکرين سنتوه"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "چچاٴير لݢڤ"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6044,7 +6165,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6156,10 +6279,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync"
@@ -6247,6 +6366,10 @@ msgstr "کايو بديق ماي مميچو بوتڠ aux"
 msgid "Volume"
 msgstr "کقواتن بوڽي"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6255,6 +6378,16 @@ msgstr ""
 "کقواتن سموا بوڽي.\n"
 "ممرلوکن سيستم بوڽي دبوليهکن."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "بيڠکاي ڤر ساٴت (FPS) مکسيما اڤابيلا ڤرماٴينن دجيداکن."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "ڤنچهاياٴن لمبوت"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6528,12 +6661,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- علامت: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- مود کرياتيف: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- بوليه چدرا "
 
+#~ msgid "- Port: "
+#~ msgstr "- ڤورت: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6568,6 +6707,13 @@ msgstr ""
 #~ "بيار کوسوڠ اونتوق ممولاکن ڤلاين ڤرماٴينن تمڤتن.\n"
 #~ "امبيل ڤرهاتيان بهاوا ميدن علامت دالم مينو اوتام مڠاتسي تتڤن اين."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "لارسکن کونفيݢوراسي DPI کسکرين اندا (بوکن X11/Android سهاج) چونتوه اونتوق "
+#~ "سکرين 4K."
+
 #~ msgid "All Settings"
 #~ msgstr "سموا تتڤن"
 
@@ -6616,6 +6762,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "ککونچي توݢول کمس کيني کاميرا"
 
+#~ msgid "Change Keys"
+#~ msgstr "توکر ککونچي"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "توکر ککونچي"
@@ -6660,6 +6809,38 @@ msgstr ""
 #~ "ڤرݢرقن کدڤن برتروسن⹁ دتوݢول اوليه ککونچي أوتوڤرݢرقن.\n"
 #~ "تکن ککونچي أوتوڤرݢرقن لاݢي اتاو ڤرݢرقن کبلاکڠ اونتوق ملومڤوهکنڽ."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "کاولن:\n"
+#~ "- %s: برݢرق کدڤن\n"
+#~ "- %s: برݢرق کبلاکڠ\n"
+#~ "- %s: برݢرق ککيري\n"
+#~ "- %s: برݢرق ککانن\n"
+#~ "- %s: لومڤت\\ناٴيق اتس\n"
+#~ "- %s: سلينڤ\\تورون باواه\n"
+#~ "- %s: جاتوهکن ايتم\n"
+#~ "- %s: اينۏينتوري\n"
+#~ "- تتيکوس: ڤوسيڠ\\ليهت سکليليڠ\n"
+#~ "- تتيکوس کيري: ݢالي\\کتوق\n"
+#~ "- تتيکوس کانن: لتق\\ݢونا\n"
+#~ "- رودا تتيکوس: ڤيليه ايتم\n"
+#~ "- %s: سيمبڠ\n"
+
 #~ msgid "Creative"
 #~ msgstr "کرياتيف"
 
@@ -6669,6 +6850,9 @@ msgstr ""
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "ورنا باݢي کورسور ررمبوت سيلڠ (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "بوليه چدرا"
 
@@ -6734,6 +6918,13 @@ msgstr ""
 #~ msgid "Enable register confirmation"
 #~ msgstr "بوليهکن ڤڠصحن ڤندفترن"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "ممبوليهکن اوبجيک ڤنيمبل بوچو.\n"
+#~ "اين ڤاتوت منيڠکتکن ڤريستاسي ݢرافيک دڠن باڽق."
+
 #~ msgid "Enabled"
 #~ msgstr "دبوليهکن"
 
@@ -7015,6 +7206,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "ڤاسڠ: فايل: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "سڤيسيفيکاسي ڤرماٴينن تيدق صح."
+
 #~ msgid "Inventory key"
 #~ msgstr "ککونچي اينۏينتوري"
 
@@ -7690,6 +7884,13 @@ msgstr ""
 #~ msgid "Main"
 #~ msgstr "اوتام"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "بواتکن سموا چچاٴير منجادي لݢڤ"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ بلوکڤتا دالم اونيت ميݢاباٴيت (MB)"
+
 #~ msgid "Menus"
 #~ msgstr "مينو"
 
@@ -7887,15 +8088,21 @@ msgstr ""
 #~ msgid "Simple Leaves"
 #~ msgstr "داون ريڠکس"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ. مناٴيقکن نيلاي اين\n"
+#~ "اکن منيڠکتکن جومله % هيت کيش⹁ مڠورڠکن داتا يڠ ڤرلو دسالين\n"
+#~ "درڤد جالور اوتام⹁ لالو مڠورڠکن کترن."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "ڤنچهاياٴن لمبوت"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "ملمبوتکن ڤموترن کاميرا. سيت سباݢاي 0 اونتوق ملومڤوهکنڽ."
 
-#~ msgid "Sound"
-#~ msgstr "بوڽي"
-
 #~ msgid "Special"
 #~ msgstr "ايستيميوا"
 
@@ -7962,6 +8169,9 @@ msgstr ""
 #~ msgid "Use bilinear filtering when scaling textures down."
 #~ msgstr "ݢوناکن ڤناڤيسن بيلينيار اڤابيلا مڽسوايکن تيکستور."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "ڤڽݢرقن منݢق سکرين."
 
@@ -8030,8 +8240,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "اندا تله منيڠݢل"
 
+#~ msgid "You have no games installed."
+#~ msgstr "اندا تيدق مماسڠ سبارڠ ڤرماٴينن."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "اوکي"
diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index c8eed900c..508c1a9f6 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Norwegian Bokmål (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-10-22 17:18+0000\n"
-"Last-Translator: ROllerozxa <rollerozxa@voxelmanip.se>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-05-04 14:07+0000\n"
+"Last-Translator: XqcD445 <xhjckw2934.evolve678@passinbox.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
 "minetest/minetest/nb_NO/>\n"
 "Language: nb\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.1\n"
+"X-Generator: Weblate 5.5.3\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Ikke tilgjengelig kommando: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Få hjelp med kommandoer"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "liste opp alt."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <kommando>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ingen tilgjengelig>"
@@ -105,6 +103,10 @@ msgstr "Det oppstod en feil:"
 msgid "Main menu"
 msgstr "Hovedmeny"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Koble til på nytt"
@@ -133,19 +135,27 @@ msgstr "Vi støtter kun protokollversjon $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi støtter protokollversjoner mellom versjon $1 og $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "«$1» eksisterer allerede. Ønsker du å skrive over den?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Feil ved installering av \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 og $2 pakker blir installert."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Kunne ikke laste ned \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 av $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Kunne ikke laste ned $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Klarte ikke å ekstrakte \"$1\" (Ikke-støttet filtype eller ødelagt pakke)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,157 +163,157 @@ msgstr ""
 "$1 laster ned,\n"
 "$2 i kø"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 laster ned..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 påkrevd pakke manglet."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 blir installert, and $2 pakker blir hoppet over."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Alle pakker"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Allerede installert"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Tilbake til hovedmeny"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB er ikke tilgjengelig når Minetest kompileres uten cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Laster ned..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spill"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installere"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laster inn..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modder"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Kunne ikke hente pakker"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Ingen resultater"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Ingen oppdateringer"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Satt i kø"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Teksturpakker"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Pakken $1 ble ikke funnet."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Avinstallere"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Oppdatere"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Oppdatere Alle [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Se mer informasjon i en nettleser"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Du må installere ett spill før du kan installere en modifikasjon"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 og $2 pakker blir installert."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 av $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 påkrevd pakke manglet."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 blir installert, and $2 pakker blir hoppet over."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Allerede installert"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Grunnspill:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB er ikke tilgjengelig når Minetest kompileres uten cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Pakker:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Laster ned..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Kunne ikke laste ned \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Kunne ikke laste ned $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Installasjon: Ikke-støttet filtype eller ødelagt pakke"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spill"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installere"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installere $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installasjon mangler pakker"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laster inn..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modder"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Kunne ikke hente pakker"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Ingen resultater"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Ingen oppdateringer"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Vennligst sjekk at grunnspillet er riktig."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Satt i kø"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$1» eksisterer allerede. Ønsker du å skrive over den?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Teksturpakker"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Avinstallere"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Oppdatere"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Oppdatere Alle [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Se mer informasjon i nettleseren"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Overskriv"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -311,20 +321,20 @@ msgstr "$1 (Aktivert)"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 mods"
-msgstr "$1 mods"
+msgstr "$1 modifikasjoner"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Failed to install $1 to $2"
 msgstr "Kunne ikke installere $1 til $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "Install Mod: Kan ikke finne passende mappenavn for modpack $1"
+msgstr ""
+"Installering: Kan ikke finne passende mappenavn for modifikasjonspakke $1"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "Kan ikke finne en gyldig mod, modpakke eller spill"
+msgstr "Kan ikke finne en gyldig modifikasjon, modifikasjonspakke eller spill"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a $2"
@@ -336,11 +346,11 @@ msgstr "Kan ikke installere en $1 som en teksturpakke"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Enabled, has error)"
-msgstr ""
+msgstr "(Aktivert, har feil)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr ""
+msgstr "(Ufornøyd)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
@@ -348,7 +358,7 @@ msgstr "Deaktivere alle"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Deaktiver modpakke"
+msgstr "Deaktiver modifikasjonspakke"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -356,15 +366,15 @@ msgstr "Aktiver alle"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Aktiver modpakke"
+msgstr "Aktiver modifikasjonspakke"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"Kunne ikke aktivere modden \"$1\" inneholder ugyldige tegn. Kun tegnene [a-"
-"z0-9_] er tillatt."
+"Feilet til å aktivere modifikasjonen \"$1\" siden det inneholder ugyldige "
+"tegn. Kun tegnene [a-z0-9_] er tillatt."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
@@ -372,7 +382,7 @@ msgstr "Finn Flere Mods"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr "Mod:"
+msgstr "Modifikasjon:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
@@ -380,24 +390,23 @@ msgstr "Ingen (valgfrie) pakker"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
-msgstr "Mangler spillbeskrivelse."
+msgstr "Ingen spillbeskrivelse oppgitt."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "Krever ingen andre modder"
+msgstr "Krever ingen andre avhengigheter"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr "Ingen modpakke-beskrivelse tilgjengelig."
+msgstr "Ingen modifikasjonspakke-beskrivelse tilgjengelig."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
-msgstr "Ingen valgfrie pakker"
+msgstr "Ingen valgfrie avhengigheter"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr "Valgfrie behov:"
+msgstr "Valgfrie avhengigheter:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
@@ -453,9 +462,19 @@ msgstr "Opprett"
 msgid "Decorations"
 msgstr "Dekorasjoner"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
-msgstr "Utviklingstesten er tiltenkt utviklere."
+msgstr "Utviklingstesten er tiltenkt for utviklere."
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
@@ -491,7 +510,7 @@ msgstr "Øker fuktigheten rundt elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Install another game"
-msgstr ""
+msgstr "Last et annet spill"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
@@ -499,23 +518,23 @@ msgstr "Innsjøer"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr "Lav fuktighet og høy varme fører til små eller tørre elver"
+msgstr "Lav fuktighet og høy varme fører til grunne eller tørre elver"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr "Mapgen"
+msgstr "Kartgenerasjon"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr "Mapgen-flagg"
+msgstr "Kartgenerasjon-flagg"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
-msgstr "Mapgen-spesifikke flagg"
+msgstr "Kartgenerasjon-spesifikke flagg"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr "Fjell"
+msgstr "Fjeller"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
@@ -552,7 +571,7 @@ msgstr "Frø"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr "Glatt overgang mellom biotoper"
+msgstr "Jevn overgang mellom biotoper"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
@@ -580,7 +599,7 @@ msgstr "Temperert, Ørken, Jungel, Tundra, Taiga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr "Terrengoverflate Erosjon"
+msgstr "Terrengoverflate erosjon"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
@@ -625,11 +644,11 @@ msgstr "Bekreft passord"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Joining $1"
-msgstr ""
+msgstr "Blir med $1"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Missing name"
-msgstr ""
+msgstr "Mangler navn"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
@@ -651,7 +670,7 @@ msgstr "Registrer"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Avvis"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -659,20 +678,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"I lang tid ble Minetest-spillmotoren levert med et standardspill kalt "
+"\"Minetest Game\". Siden Minetest 5.8.0, leveres Minetest uten et "
+"standardspill."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Hvis du vil fortsette å spille i Minetest Game-verdenene dine, må du "
+"installere Minetest-spillet på nytt."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game er ikke lenger installert på forhånd"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Reinstall Minetest Game"
-msgstr ""
+msgstr "Reinstaller Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -692,7 +716,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "A new $1 version is available"
-msgstr ""
+msgstr "En ny $1 versjon er tilgjengelig"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid ""
@@ -701,18 +725,22 @@ msgid ""
 "Visit $3 to find out how to get the newest version and stay up to date with "
 "features and bugfixes."
 msgstr ""
+"Installert versjon: $1\n"
+"Ny versjon: $2\n"
+"Besøk $3 for å finne ut hvordan du får den nyeste versjonen og holder deg "
+"oppdatert med funksjoner og feilrettinger."
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Later"
-msgstr ""
+msgstr "Senere"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Never"
-msgstr ""
+msgstr "Aldri"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Visit website"
-msgstr ""
+msgstr "Besøk nettsted"
 
 #: builtin/mainmenu/init.lua
 msgid "Settings"
@@ -815,20 +843,16 @@ msgstr "myknet"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Bruk systemspråk)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Tilgjengelighet"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Tilbake"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Endre taster"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -838,27 +862,26 @@ msgstr "Chatte"
 msgid "Clear"
 msgstr "Tøm"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Kontroller"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Generelt"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Rask bevegelse"
+msgstr "Bevegelse"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Gjenopprette standard"
+msgstr "Tilbakestill til standard"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Tilbakestill til standard ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -866,7 +889,7 @@ msgstr "Søk"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Vis avanserte innstillinger"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -887,11 +910,11 @@ msgstr "Innhold: Mods"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(Spillet må også aktivere skygger)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Tilpasset"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -940,7 +963,7 @@ msgstr "Kjerneutviklere"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "Kjerneteam"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
@@ -1009,9 +1032,8 @@ msgid "Rename"
 msgstr "Gi nytt navn"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<ingen tilgjengelig>"
+msgstr "Oppdatering tilgjengelig?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1049,6 +1071,17 @@ msgstr "Installere et spill"
 msgid "Install games from ContentDB"
 msgstr "Installer spill fra ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game er ikke lenger installert på forhånd"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Ny"
@@ -1082,8 +1115,9 @@ msgid "Start Game"
 msgstr "Start spill"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Du har ingen spill installert."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Du må installere ett spill før du kan installere en modifikasjon"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1112,11 +1146,11 @@ msgstr "Ta del i spill"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Login"
-msgstr ""
+msgstr "Logg på"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Ping"
-msgstr "Latens"
+msgstr "Forsinkelse"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Public Servers"
@@ -1162,18 +1196,10 @@ msgstr "Laster inn teksturer..."
 msgid "Rebuilding shaders..."
 msgstr "Gjenoppbygger shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Tilkoblingsfeil (tidsavbrudd?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Kunne ikke finne eller laste inn spillet: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Ugyldig spillspesifikasjon."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hovedmeny"
@@ -1198,7 +1224,11 @@ msgstr "Den oppgitte passordfilen kunne ikke åpnes: "
 msgid "Provided world path doesn't exist: "
 msgstr "Angitt sti til verdenen finnes ikke: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1206,18 +1236,10 @@ msgstr ""
 "\n"
 "Sjekk debug.txt for detaljer."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresse: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modus: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Offentlig: "
@@ -1252,10 +1274,6 @@ msgstr "Automatisk forover slått på"
 msgid "Block bounds hidden"
 msgstr "Block bounds gjemt"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Block bounds vist for alle blokker"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Block bounds vist for gjeldende blokk"
@@ -1300,6 +1318,10 @@ msgstr "Skripting på klientsiden er deaktivert"
 msgid "Connecting to server..."
 msgstr "Kobler til tjener…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Tilkoblingsfeil (tidsavbrudd?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Tilkoblingen mislyktes av ukjent årsak"
@@ -1308,47 +1330,14 @@ msgstr "Tilkoblingen mislyktes av ukjent årsak"
 msgid "Continue"
 msgstr "Fortsett"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kontroller:\n"
-"- %s: flytt forover\n"
-"- %s: flytt bakover\n"
-"- %s: flytt mot venstre\n"
-"- %s: flytt mot høyre\n"
-"- %s: hopp/klatre oppover\n"
-"- %s: grav/slå\n"
-"- %s: plasser/bruk\n"
-"- %s: snik/klatre nedover\n"
-"- %s: slipp ting\n"
-"- %s: inventar\n"
-"- Mus: snu/se\n"
-"- Musehjul: velg ting\n"
-"- %s: chat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1410,35 +1399,40 @@ msgstr "Avslutt til operativsystem"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr "Rask modus deaktivert"
+msgstr "Hurtigmodus slått av"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr "Hurtigmodus aktivert"
+msgstr "Hurtigmodus slått på"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr "Hurtigmodus aktivert (merk: ingen \"rask\"-rettigheter)"
+msgstr "Hurtigmodus slått på (merk: ingen «hurtig»-rettigheter)"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr "Flymodus deaktivert"
+msgstr "Flymodus slått av"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled"
-msgstr "Flymodus aktivert"
+msgstr "Flymodus slått på"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr "Flymodus aktivert (merk: ingen 'fly'-privilegium)"
+msgstr "Flymodus slått på (merk: ingen 'fly'-rettigheter)"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
-msgstr "Tåke deaktivert"
+msgstr "Tåke slått av"
 
 #: src/client/game.cpp
 msgid "Fog enabled"
-msgstr "Tåke aktivert"
+msgstr "Tåke slått på"
+
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom er for øyeblikket deaktivert av spill eller mod"
 
 #: src/client/game.cpp
 msgid "Game info:"
@@ -1460,10 +1454,6 @@ msgstr "Gjenstandsdefinisjoner…"
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1619,10 +1609,6 @@ msgstr "Kantlinjer vises"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom er for øyeblikket deaktivert av spill eller mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1868,9 +1854,8 @@ msgid "Return Key"
 msgstr "Return"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Høyre Ctrl"
+msgstr "Pil høyre"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1924,7 +1909,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Pil opp"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1957,6 +1942,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Klarte ikke laste ned $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -1975,9 +1969,8 @@ msgid ""
 msgstr ""
 
 #: src/content/mod_configuration.cpp
-#, fuzzy
 msgid "Some mods have unsatisfied dependencies:"
-msgstr "Krever ingen andre modder"
+msgstr "Noen modder har utilfredstilte avhengigheter:"
 
 #: src/gui/guiChatConsole.cpp
 #, fuzzy
@@ -1986,7 +1979,7 @@ msgstr "Klarte ikke laste ned $1"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Opening webpage"
-msgstr ""
+msgstr "Åpner nettside"
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
@@ -2071,7 +2064,7 @@ msgstr "Tast allerede i bruk"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr ""
+msgstr "Tastebindinger."
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2149,6 +2142,19 @@ msgstr "Forstørrelse"
 msgid "press key"
 msgstr "trykk tast"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Klarte ikke laste ned $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Endre"
@@ -2182,6 +2188,7 @@ msgstr "Lydstyrke: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "nb"
 
@@ -2189,11 +2196,12 @@ msgstr "nb"
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
 msgstr ""
+"Navnet er ikke registrert. For å lage en konto på denne tjeneren, klikk "
+"'Registrer'"
 
 #: src/network/clientpackethandler.cpp
-#, fuzzy
 msgid "Name is taken. Please choose another name"
-msgstr "Vennligst velg et navn!"
+msgstr "Navnet er tatt. Vennligst velg et annet navn"
 
 #: src/server.cpp
 #, c-format
@@ -2270,7 +2278,7 @@ msgstr "2D-støytall som plasserer elvedaler og elveleier."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2402,14 +2410,6 @@ msgstr "Område for sending av aktive objekt"
 msgid "Adds particles when digging a node."
 msgstr "Legger på partikler når man graver ut en blokk."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Justér skjermens DPI-innstilling (ikke for X11/kun Android), f. eks. for 4k-"
-"skjermer."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2425,14 +2425,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Admin name"
-msgstr "Legg til elementnavn"
+msgstr "Administratornavn"
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
 msgstr "Avansert"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2448,9 +2451,8 @@ msgstr ""
 "belysning - det har lite å si for naturlig nattelys."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Always fly fast"
-msgstr "Alltid flymodus og rask forflytning"
+msgstr "Alltid fly raskt"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
@@ -2473,14 +2475,12 @@ msgid "Announce to this serverlist."
 msgstr "Offentliggjør for denne serverlisten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Kantutjevning:"
+msgstr "Kantutgjevningsskala"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Kantutjevning:"
+msgstr "Kantutjevningsmetode"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2494,6 +2494,17 @@ msgstr "Legg elementnavn til infoboble."
 msgid "Apple trees noise"
 msgstr "Støytall for epletrær"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Treghet i armer"
@@ -2511,18 +2522,37 @@ msgid "Ask to reconnect after crash"
 msgstr "Spør om å koble til igjen etter krasj"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"På denne avstanden vil serveren utføre en kraftig optimalisering\n"
+"av hvilke blokker som sendes til klienten.\n"
+"En lav verdi kan potensielt føre til en kraftig forbedring i ytelsen, \n"
+"på bekostning av synlige gjengivelsesfeil (det kan skje at blokker ikke\n"
+"gjengis under vann og i huler, tidvis heller ikke på land).\n"
+"Angi denne verdien til høyere enn max_block_send_distance\n"
+"for å slå av denne optimaliseringen.\n"
+"Målenheten er «mapblocks» (en enhet på 16x16 blokker)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "På denne avstanden vil serveren utføre en kraftig optimalisering\n"
 "av hvilke blokker som sendes til klienten.\n"
@@ -2535,7 +2565,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
@@ -2596,6 +2626,11 @@ msgstr "Biomer"
 msgid "Biome noise"
 msgstr "Biotoplyd"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Avstand for optimalizering av mapblocksending"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Avstand for optimalizering av mapblocksending"
@@ -2760,6 +2795,8 @@ msgid ""
 "Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console "
 "output."
 msgstr ""
+"Klikkbare nettkoblinger (midtklikk eller Ctrl+venstreklikk) aktivert i "
+"tekstpratkonsollens utdata."
 
 #: src/settings_translation_file.cpp
 msgid "Client"
@@ -2821,6 +2858,12 @@ msgstr "Farget tåke"
 msgid "Colored shadows"
 msgstr "Farget tåke"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2969,10 +3012,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI (skjermoppløsning)"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Størrelsesterskel for feilsøkingsloggfil"
@@ -3023,6 +3062,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definerer område der trær har epler."
@@ -3211,6 +3263,11 @@ msgstr "Aktiver alle"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Aktiver skade"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3230,6 +3287,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Bruk joystick"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3272,6 +3334,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3295,6 +3361,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Strandlydsterskel"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3303,12 +3374,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3338,6 +3403,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3428,9 +3506,8 @@ msgid "Filmic tone mapping"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering and Antialiasing"
-msgstr "Kantutjevning:"
+msgstr "Filtrering og kantutjevning"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3699,9 +3776,8 @@ msgid "HUD"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HUD scaling"
-msgstr "HUD vist"
+msgstr "HUD skalering"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3814,11 +3890,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How much you are slowed down when moving inside a liquid.\n"
 "Decrease this to increase liquid resistance to movement."
-msgstr "Reduksjon av denne verdien øker bevegelsesmotstanden i væsker."
+msgstr ""
+"Hvor mye du bremses når du beveger deg gjennom væsker.\n"
+"Reduksjon av denne verdien øker bevegelsesmotstanden i væsker."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers."
@@ -4109,7 +4186,7 @@ msgstr "Hoppehastighet"
 
 #: src/settings_translation_file.cpp
 msgid "Keyboard and Mouse"
-msgstr ""
+msgstr "Tastatur og mus"
 
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
@@ -4161,15 +4238,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Bølgende blader"
+msgstr "Lengden på flytende bølger."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4313,10 +4390,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4365,7 +4438,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4400,10 +4475,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4578,7 +4649,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can be connected simultaneously."
-msgstr ""
+msgstr "Maksimalt antall spillere som kan kobles til samtidig."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of recent chat messages to show"
@@ -4655,6 +4726,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4725,6 +4800,11 @@ msgstr "Pekerfølsomhet"
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Grotteterskel"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4837,10 +4917,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Ikke-synlige blokker blir ikke sendt videre av serveren"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4853,6 +4929,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4963,6 +5043,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Avvikende protokollversjon. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4978,6 +5067,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5111,9 +5204,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screen"
-msgstr "Skjerm:"
+msgstr "Skjerm"
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
@@ -5169,8 +5261,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5312,8 +5404,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Angi språk. La stå tom for å bruke operativsystemets språk.\n"
@@ -5352,6 +5445,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5400,8 +5497,7 @@ msgstr "Shaders"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5475,13 +5571,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5517,7 +5606,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5540,6 +5629,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Skriftskygge"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Lyd"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDBs svarteliste"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5706,17 +5804,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5733,6 +5851,12 @@ msgstr ""
 "Forvalgt verdi er 1,0 (1/2 blokk).\n"
 "Krever at væskebølger er påslått."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5759,7 +5883,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5816,6 +5940,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5861,19 +5989,18 @@ msgid "Touchscreen sensitivity"
 msgstr "Pekerfølsomhet"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "Pekerfølsomhet"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Strandlydsterskel"
+msgstr "Berøringsskjermfølsomhetsfaktor."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Bølgende blader"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5912,7 +6039,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6015,10 +6144,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync"
@@ -6105,6 +6230,10 @@ msgstr ""
 msgid "Volume"
 msgstr "Volum"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6113,6 +6242,16 @@ msgstr ""
 "Volum på all lyd. \n"
 "Krever påslått lydsystem."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Maks FPS når spillet ikke har fokus eller er pauset"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Knutepunktsframheving"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6361,12 +6500,18 @@ msgstr "cURL-tidsgrense"
 msgid "cURL parallel limit"
 msgstr "Maksimal parallellisering i cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresse: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreativ modus: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Skade: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6395,6 +6540,13 @@ msgstr "Maksimal parallellisering i cURL"
 #~ "Vær klar over at adressen i feltet i hovedmenyen overkjører denne "
 #~ "innstillingen."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Justér skjermens DPI-innstilling (ikke for X11/kun Android), f. eks. for "
+#~ "4k-skjermer."
+
 #~ msgid "All Settings"
 #~ msgstr "Alle innstillinger"
 
@@ -6428,6 +6580,9 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Biter per piksel (dvs. fargedybde) i fullskjermsmodus."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Block bounds vist for alle blokker"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Teksturtilføyning"
 
@@ -6449,6 +6604,9 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Av/på-tast for visningsoppdatning"
 
+#~ msgid "Change Keys"
+#~ msgstr "Endre taster"
+
 #~ msgid "Change keys"
 #~ msgstr "Endre taster"
 
@@ -6511,6 +6669,38 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Bestemmer synkehastigheten i væsker."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kontroller:\n"
+#~ "- %s: flytt forover\n"
+#~ "- %s: flytt bakover\n"
+#~ "- %s: flytt mot venstre\n"
+#~ "- %s: flytt mot høyre\n"
+#~ "- %s: hopp/klatre oppover\n"
+#~ "- %s: grav/slå\n"
+#~ "- %s: plasser/bruk\n"
+#~ "- %s: snik/klatre nedover\n"
+#~ "- %s: slipp ting\n"
+#~ "- %s: inventar\n"
+#~ "- Mus: snu/se\n"
+#~ "- Musehjul: velg ting\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativ"
 
@@ -6520,6 +6710,9 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Trådkorsfarge (R, G, B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI (skjermoppløsning)"
+
 #~ msgid "Damage"
 #~ msgstr "Skade"
 
@@ -6748,6 +6941,9 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentering"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Ugyldig spillspesifikasjon."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tast for beholdning"
 
@@ -7288,9 +7484,6 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "No Mipmap"
 #~ msgstr "Mangler mipmap"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Knutepunktsframheving"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Knutepunktsomriss"
 
@@ -7378,9 +7571,6 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Smooth Lighting"
 #~ msgstr "Jevn belysning"
 
-#~ msgid "Sound"
-#~ msgstr "Lyd"
-
 #~ msgid "Special"
 #~ msgstr "Spesial"
 
@@ -7412,6 +7602,10 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Berøringsterskel: (px)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Strandlydsterskel"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Tri-lineært filter"
 
@@ -7476,8 +7670,14 @@ msgstr "Maksimal parallellisering i cURL"
 #~ msgid "You died."
 #~ msgstr "Du døde."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Du har ingen spill installert."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index e05f470de..b79887a17 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dutch (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-10-22 17:18+0000\n"
 "Last-Translator: Bas Huis <bassimhuis@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Instructie niet beschikbaar: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Krijg hulp voor instructies"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "alles weer te geven."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <commando>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Oke"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<geen beschikbaar>"
@@ -105,6 +103,10 @@ msgstr "Er is een fout opgetreden:"
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Oke"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Opnieuw verbinding maken"
@@ -133,19 +135,27 @@ msgstr "Wij ondersteunen enkel protocol versie $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wij ondersteunen protocol versies $1 tot en met $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" bestaat al. Wilt u het overschrijven ?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Afhankelijkheden $1 en $2 zullen geïnstalleerd worden."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Installeren van mod $1 is mislukt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 door $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Installeren van mod $1 is mislukt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Installeren: Niet ondersteund bestandstype of defect archief"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,160 +163,159 @@ msgstr ""
 "$1 is aan het downloaden,\n"
 "$2 is ingepland"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 is aan het downloaden..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
+msgstr "Alle pakketten"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Terug naar hoofdmenu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"ContentDB is niet beschikbaar wanneer Minetest compileert is zonder cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Downloaden..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spellen"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installeren"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Bezig met laden..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Er konden geen pakketten geladen worden"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Geen resultaten"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Geen updates"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Ingepland"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Textuur verzamelingen"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Verwijder"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Update"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Allemaal bijwerken [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Bekijk meer informatie in een webbrowser"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Afhankelijkheden $1 en $2 zullen geïnstalleerd worden."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 door $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 required dependencies could not be found."
 msgstr "$1 benodigde afhankelijkheden werden niet gevonden."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "$1 will be installed, and $2 dependencies will be skipped."
 msgstr ""
 "$1 zal worden geïnstalleerd, en $2 afhankelijkheden worden overgeslagen."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "All packages"
-msgstr "Alle pakketten"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Already installed"
 msgstr "Reeds geïnstalleerd"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Terug naar hoofdmenu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basis Spel:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"ContentDB is niet beschikbaar wanneer Minetest compileert is zonder cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Afhankelijkheden:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Downloaden..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Installeren van mod $1 is mislukt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Installeren van mod $1 is mislukt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Installeren: Niet ondersteund bestandstype of defect archief"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spellen"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installeren"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installeer $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installeer ontbrekende afhankelijkheden"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Bezig met laden..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Er konden geen pakketten geladen worden"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Geen resultaten"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Geen updates"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Overschrijven"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Controleer of het basis spel correct is, aub."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Ingepland"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" bestaat al. Wilt u het overschrijven ?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Textuur verzamelingen"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Verwijder"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Update"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Allemaal bijwerken [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Bekijk meer informatie in een webbrowser"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Overschrijven"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -458,6 +467,10 @@ msgstr "Maken"
 msgid "Decorations"
 msgstr "Decoraties"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
@@ -465,6 +478,12 @@ msgstr ""
 "Waarschuwing: Het minimale ontwikkellaars-test-spel is bedoeld voor "
 "ontwikkelaars."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Kerkers"
@@ -837,10 +856,6 @@ msgstr ""
 msgid "Back"
 msgstr "Terug"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Toetsen aanpassen"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -850,7 +865,8 @@ msgstr "Chatten"
 msgid "Clear"
 msgstr "Wissen"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Besturing"
 
@@ -1066,6 +1082,16 @@ msgstr "Installeer $1"
 msgid "Install games from ContentDB"
 msgstr "Installeer spellen van ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nieuw"
@@ -1099,8 +1125,8 @@ msgid "Start Game"
 msgstr "Start spel"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Je hebt geen spellen geïnstalleerd."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1181,18 +1207,10 @@ msgstr "Texturen laden..."
 msgid "Rebuilding shaders..."
 msgstr "Shaders herbouwen..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Fout bij verbinden (time out?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Kan het spel niet vinden of laden: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Onjuiste spel-spec."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hoofdmenu"
@@ -1217,7 +1235,11 @@ msgstr "Opgegeven wachtwoordbestand kan niet worden geopend: "
 msgid "Provided world path doesn't exist: "
 msgstr "Het gespecificeerde wereld-pad bestaat niet: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1225,18 +1247,10 @@ msgstr ""
 "\n"
 "Kijk in debug.txt voor details."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adres: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mode(creatief/overleving): "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Poort: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Openbaar: "
@@ -1271,10 +1285,6 @@ msgstr "Automatisch vooruit ingeschakeld"
 msgid "Block bounds hidden"
 msgstr "Blokgrenzen verborgen"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blokgrenzen getoond voor alle blokken"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blokgrenzen getoond voor huidige blok"
@@ -1320,6 +1330,10 @@ msgstr "Client-side scripting is uitgeschakeld"
 msgid "Connecting to server..."
 msgstr "Verbinding met de server wordt gemaakt..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Fout bij verbinden (time out?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Verbinding mislukt om onbekende reden"
@@ -1328,47 +1342,14 @@ msgstr "Verbinding mislukt om onbekende reden"
 msgid "Continue"
 msgstr "Verder spelen"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Besturing: \n"
-"-%s: ga vooruit \n"
-"-%s: ga achteruit \n"
-"-%s: ga naar links \n"
-"-%s: ga naar rechts \n"
-"-%s: springen / klimmen \n"
-"-%s: graaf/duw\n"
-"-%s: plaats/gebruik \n"
-"-%s: sluip / ga naar beneden \n"
-"-%s: drop item \n"
-"-%s: inventaris \n"
-"- Muis: draaien / kijken \n"
-"- Muiswiel: item selecteren \n"
-"-%s: chat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1460,6 +1441,11 @@ msgstr "Mist uitgeschakeld"
 msgid "Fog enabled"
 msgstr "Mist ingeschakeld"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom momenteel uitgeschakeld door game of mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spel info:"
@@ -1480,10 +1466,6 @@ msgstr "Voorwerpdefinities..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1641,10 +1623,6 @@ msgstr "Draadframe weergegeven"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom momenteel uitgeschakeld door game of mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "oké"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1979,6 +1957,15 @@ msgstr "Minimap in oppervlaktemodus, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimap textuur modus"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Openen van webpagina mislukt"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2169,6 +2156,19 @@ msgstr "Zoomen"
 msgid "press key"
 msgstr "druk op toets"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Openen van webpagina mislukt"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Veranderen"
@@ -2202,6 +2202,7 @@ msgstr "Geluidsvolume: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "nl"
 
@@ -2431,14 +2432,6 @@ msgstr "Bereik waarbinnen actieve objecten gestuurd worden"
 msgid "Adds particles when digging a node."
 msgstr "Voeg opvliegende deeltjes toe bij het graven."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Pas de dpi-configuratie aan op uw scherm (alleen niet X11 / Android), b.v. "
-"voor 4k-schermen."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2471,6 +2464,10 @@ msgstr "Voeg itemnaam toe"
 msgid "Advanced"
 msgstr "Geavanceerd"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2532,6 +2529,17 @@ msgstr "Voeg itemnaam toe aan knopinfo."
 msgid "Apple trees noise"
 msgstr "Appel boom geluid"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Arm traagheid"
@@ -2549,18 +2557,41 @@ msgid "Ask to reconnect after crash"
 msgstr "verbinding herstellen na een server-crash"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Op deze afstand zal de server agressief optimaliseren naar welke blokken "
+"gestuurd worden \n"
+"gebruikers. \n"
+"Kleine waarden kunnen de prestaties mogelijk aanzienlijk verbeteren, ten "
+"koste van zichtbaar \n"
+"rendering glitches (sommige blokken worden niet onder water en in grotten "
+"weergegeven, \n"
+"evenals soms op het land). \n"
+"Als u dit instelt op een waarde die groter is dan max_block_send_distance, "
+"wordt dit uitgeschakeld \n"
+"optimalisatie. \n"
+"Vermeld in mapblocks (16 blokken)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Op deze afstand zal de server agressief optimaliseren naar welke blokken "
 "gestuurd worden \n"
@@ -2637,6 +2668,11 @@ msgstr "Vegetaties"
 msgid "Biome noise"
 msgstr "Biome-ruis"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Blok verzend optimalisatie afstand"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Blok verzend optimalisatie afstand"
@@ -2858,6 +2894,12 @@ msgstr "Gekleurde mist"
 msgid "Colored shadows"
 msgstr "Gekleurde schaduwen"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3027,10 +3069,6 @@ msgstr ""
 "Draadkruis kleur (R,G,B).\n"
 "Controleert ook het object draadkruis kleur"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "Scherm DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Debug logbestand drempel"
@@ -3084,6 +3122,25 @@ msgstr ""
 "Dit simuleert zachte schaduwen d.m.v. een PCF of Poisson-schijf\n"
 "maar is ook gebruiksintensiever."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Zet dit aan om verbindingen van oudere cliënten te weigeren.\n"
+"Oudere cliënten zijn compatibel, in de zin dat ze niet crashen als ze "
+"verbinding \n"
+"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle nieuwere "
+"mogelijkheden."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Bepaalt gebieden met appels in de bomen."
@@ -3280,6 +3337,11 @@ msgstr "Alles aanzetten"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Verwondingen inschakelen"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3306,6 +3368,11 @@ msgstr ""
 "Indien ingeschakeld, wordt een Poisson-schijf gebruikt om zachte schaduwen "
 "te genereren. In het andere geval wordt PCF-filteren toegepast."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Schakel joysticks in"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3351,6 +3418,11 @@ msgstr "Veilige modus voor mods aanzetten"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Schakel willkeurige invoer aan (enkel voor testen)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Schakel willkeurige invoer aan (enkel voor testen)."
@@ -3381,6 +3453,11 @@ msgstr ""
 "maken met nieuwere servers, maar ze ondersteunen wellicht niet alle nieuwere "
 "mogelijkheden."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Gevoeligheid van het aanraakscherm"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3393,14 +3470,6 @@ msgstr ""
 "Het gebruik van externe media-servers versnelt het downloaden van media\n"
 "(bijv. texturen) aanzienlijk bij het maken van een verbinding met een server."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Vertex-bufferobjecten inschakelen. \n"
-"Dit zou de grafische prestaties aanzienlijk moeten verbeteren."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3443,6 +3512,19 @@ msgstr "Schakelt animatie van inventaris items aan."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Schakelt caching van facedir geroteerde meshes."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4400,9 +4482,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Lengte van server stap, en interval waarin objecten via het netwerk\n"
 "ververst worden."
@@ -4580,10 +4663,6 @@ msgstr ""
 "Mist en hemelkleur afhankelijk van tijd van de dag (zonsopkomst/ondergang) "
 "en kijkrichting."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Maak alle vloeistoffen ondoorzichtig"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Map compressie niveau voor het bewaren op de harde schijf"
@@ -4639,11 +4718,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Wereldgenerator instellingen specifiek voor Mapgen V5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Wereldgenerator instellingen specifiek voor generator v6.\n"
 "De sneeuwgebieden optie, activeert de nieuwe 5 vegetaties systeem.\n"
@@ -4688,10 +4770,6 @@ msgstr "Mapblock maas generatie vertraging"
 msgid "Mapblock mesh generation threads"
 msgstr "Mapblock maas generatie vertraging"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Mapblock maas generator's MapBlock cache grootte in MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Wereldblok vergeet-tijd"
@@ -4973,6 +5051,11 @@ msgstr "Minimaal aantal loggegevens in de chat weergeven."
 msgid "Minimap scan height"
 msgstr "Mini-kaart scan-hoogte"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Plaats (Rechts-klik) herhalingsinterval"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Minimumlimiet van willekeurig aantal grote grotten per mapchunk."
@@ -5044,6 +5127,11 @@ msgstr "Muis-gevoeligheid"
 msgid "Mouse sensitivity multiplier."
 msgstr "Muis-gevoeligheidsfactor."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Grot drempel"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Modder ruis"
@@ -5194,10 +5282,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Door server worden onzichtbare nodes niet doorgegeven"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Ondoorzichtige vloeistoffen"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5214,6 +5298,11 @@ msgstr ""
 "Pauzemenu openen als het venster focus verliest. Pauzeert niet als er\n"
 "een formspec geopend is."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Wereldgenerator debug"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Optionele overschrijving van de kleur van weblinks in chat."
@@ -5363,6 +5452,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Aandeel grote grotten die vloeistof bevatten."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protocol versie stemt niet overeen. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5380,6 +5478,10 @@ msgstr "Verhoogt het terrein om rond de rivieren valleien te maken."
 msgid "Random input"
 msgstr "Willekeurige invoer"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Recente chatberichten"
@@ -5594,8 +5696,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5741,8 +5843,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Stel de taal in. De systeem-taal wordt gebruikt indien leeg.\n"
@@ -5789,6 +5892,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5837,11 +5944,11 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shaders maken bijzondere visuele effecten mogelijk, en kunnen op sommige\n"
 "videokaarten de prestaties verbeteren.\n"
@@ -5928,16 +6035,6 @@ msgstr ""
 "ongewijzigd \n"
 "aanbevolen."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Grootte van de MapBlock cache voor de maas generator. Dit verhogen vergroot\n"
-"de kans op een cache hit, waardoor minder data van de main thread\n"
-"wordt gekopieerd waardoor flikkeren verminderd."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Tilt baan hemellichaam"
@@ -5974,7 +6071,7 @@ msgstr "Vloeiende verlichting"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Maakt camera-rotatie vloeiender in cintematic modus. 0 om uit te zetten."
 
@@ -5998,6 +6095,15 @@ msgstr "Sluipsnelheid, in blokken per seconde."
 msgid "Soft shadow radius"
 msgstr "Radius zachte schaduwen"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Geluid"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB optie: verborgen pakketten lijst"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6213,6 +6319,12 @@ msgstr ""
 "Het standaardformaat waarin profileringsgegevens worden bewaard,\n"
 " als '/profiler save' wordt aangeroepen zonder expliciet formaat."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6221,13 +6333,27 @@ msgstr ""
 "Het bestand pad ten opzichte van de wereldfolder waar profilerings-gegevens "
 "worden opgeslagen."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "De identificatie van de stuurknuppel die u gebruikt"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "De lengte in pixels die nodig is om een touchscreeninteractie te starten."
 
@@ -6245,6 +6371,16 @@ msgstr ""
 "De standaardwaarde is 1,0 (1/2 blok). \n"
 "Vereist dat golvende vloeistoffen zijn ingeschakeld."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"De tijd in seconden tussen herhaalde rechts-klikken als de plaats knop "
+"(rechter muisknop)\n"
+"ingedrukt gehouden wordt."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Het netwerk-adres waar de server op verbindingen wacht."
@@ -6282,7 +6418,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Back-end om mee te renderen.\n"
 "Een herstart is vereist om dit definitief te wijzigen.\n"
@@ -6371,6 +6507,10 @@ msgstr ""
 "Derde van vier 2D geluiden die samen voor heuvel/bergketens hoogte "
 "definiëren."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6430,15 +6570,15 @@ msgstr "Muis-gevoeligheid"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Muis-gevoeligheidsfactor."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Gevoeligheid van het aanraakscherm"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Ondoorzichtige vloeistoffen"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6477,7 +6617,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6591,10 +6733,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Vertikale synchronisatie (VSync)"
@@ -6685,6 +6823,10 @@ msgstr "Virtuele joystick activeert Aux1-toets"
 msgid "Volume"
 msgstr "Geluidsniveau"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6693,6 +6835,16 @@ msgstr ""
 "Volume van alle geluiden.\n"
 "Dit vereist dat het geluidssysteem aanstaat."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS als het spel gepauzeerd of niet gefocussed is"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Vloeiende verlichting"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6995,12 +7147,18 @@ msgstr "cURL interactieve time-out"
 msgid "cURL parallel limit"
 msgstr "Maximaal parallellisme in cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adres: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Creatieve Modus: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Verwondingen: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Poort: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7035,6 +7193,13 @@ msgstr "Maximaal parallellisme in cURL"
 #~ "Indien leeg, wordt een lokale server gestart.\n"
 #~ "In het hoofdmenu kan een ander adres opgegeven worden."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Pas de dpi-configuratie aan op uw scherm (alleen niet X11 / Android), b."
+#~ "v. voor 4k-schermen."
+
 #, fuzzy
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7076,6 +7241,9 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blokgrenzen getoond voor alle blokken"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bumpmapping"
 
@@ -7097,6 +7265,9 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Toets voor het aan of uit schakelen van cameraverversing"
 
+#~ msgid "Change Keys"
+#~ msgstr "Toetsen aanpassen"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Toetsen aanpassen"
@@ -7172,6 +7343,38 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgstr ""
 #~ "Bepaalt breedte van tunnels, een kleinere waarde maakt bredere tunnels."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Besturing: \n"
+#~ "-%s: ga vooruit \n"
+#~ "-%s: ga achteruit \n"
+#~ "-%s: ga naar links \n"
+#~ "-%s: ga naar rechts \n"
+#~ "-%s: springen / klimmen \n"
+#~ "-%s: graaf/duw\n"
+#~ "-%s: plaats/gebruik \n"
+#~ "-%s: sluip / ga naar beneden \n"
+#~ "-%s: drop item \n"
+#~ "-%s: inventaris \n"
+#~ "- Muis: draaien / kijken \n"
+#~ "- Muiswiel: item selecteren \n"
+#~ "-%s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Creatief"
 
@@ -7181,6 +7384,9 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Draadkruis-kleur (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "Scherm DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Verwondingen/schade"
 
@@ -7267,6 +7473,13 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Registerbevestiging inschakelen"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Vertex-bufferobjecten inschakelen. \n"
+#~ "Dit zou de grafische prestaties aanzienlijk moeten verbeteren."
+
 #~ msgid "Enabled"
 #~ msgstr "Ingeschakeld"
 
@@ -7579,6 +7792,9 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Per soort"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Onjuiste spel-spec."
+
 #~ msgid "Inventory key"
 #~ msgstr "Inventaristoets"
 
@@ -8273,6 +8489,12 @@ msgstr "Maximaal parallellisme in cURL"
 #~ "Maakt dat DirectX werkt met LuaJIT. Schakel dit uit als het problemen "
 #~ "geeft."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Maak alle vloeistoffen ondoorzichtig"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Mapblock maas generator's MapBlock cache grootte in MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menu's"
 
@@ -8502,15 +8724,22 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Eenvoudige bladeren"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Grootte van de MapBlock cache voor de maas generator. Dit verhogen "
+#~ "vergroot\n"
+#~ "de kans op een cache hit, waardoor minder data van de main thread\n"
+#~ "wordt gekopieerd waardoor flikkeren verminderd."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Vloeiende verlichting"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Maakt camera-rotatie vloeiender. O om uit te zetten."
 
-#~ msgid "Sound"
-#~ msgstr "Geluid"
-
 #~ msgid "Special"
 #~ msgstr "Speciaal"
 
@@ -8566,6 +8795,10 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Toetsgrenswaarde (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Gevoeligheid van het aanraakscherm"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineair filteren"
 
@@ -8612,6 +8845,9 @@ msgstr "Maximaal parallellisme in cURL"
 #~ "Als de waarde op 0 staat, is MSAA uitgeschakeld.\n"
 #~ "Een herstart is nodig om deze wijziging te laten functioneren."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variatie van de heuvel hoogte en vijver diepte op drijvend egaal terrein."
@@ -8702,8 +8938,14 @@ msgstr "Maximaal parallellisme in cURL"
 #~ msgid "You died."
 #~ msgstr "Je bent gestorven."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Je hebt geen spellen geïnstalleerd."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "oké"
diff --git a/po/nn/minetest.po b/po/nn/minetest.po
index 8b42f54ab..67d7e4f2d 100644
--- a/po/nn/minetest.po
+++ b/po/nn/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Norwegian Nynorsk (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-12-03 17:17+0000\n"
-"Last-Translator: Krock <mk939@ymail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-02-27 22:01+0000\n"
+"Last-Translator: jhh <johshh@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Norwegian Nynorsk <https://hosted.weblate.org/projects/"
 "minetest/minetest/nn/>\n"
 "Language: nn\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Kommandoen er ikkje tilgjengeleg: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Få hjelp med kommandoar"
 
 #: builtin/common/chatcommands.lua
@@ -82,20 +83,17 @@ msgstr ""
 "liste opp alt."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all [ <føresegn>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ingen tilgjengeleg>"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
-msgstr "Ein feil oppstod i eit LUA-skript:"
+msgstr "Ein feil oppstod i eit Lua-skript:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred:"
@@ -105,6 +103,10 @@ msgstr "Det har skjedd ein feil:"
 msgid "Main menu"
 msgstr "Hovudmeny"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Kople til igjen"
@@ -133,19 +135,27 @@ msgstr "Me støtter berre protokoll versjon $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Me støtter protokollversjonar mellom $1 og $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "«$1» eksisterer allereie. Vil du overskrive den?"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 og $2 avhengigheiter vil verte installerte."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Klarte ikkje å laste ned $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Klarte ikkje å laste ned $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Installasjon: Filtypen er ikkje støtta, eller arkivet er korrupt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +163,158 @@ msgstr ""
 "$1 lastar ned,\n"
 "$2 i kø"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 lastar ned …"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 obligatoriske avhengigheiter vart ikkje funne."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 vil verte installert, og $2 avhengigheiter vil verte hoppa over."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Alle pakker"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Allereie installert"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Attende til hovudmeny"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB er ikkje tilgjengeleg når Minetest vart kompilert utan cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Lastar ned …"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spel"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installer"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laster.."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Ingen pakkar kunne verte henta"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Ingen resultat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Ingen oppdateringar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "I kø"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Teksturpakkar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Avinstaller"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Oppdater"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Oppdater alt [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Sjå meir informasjon i ein nettlesar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 og $2 avhengigheiter vil verte installerte."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 obligatoriske avhengigheiter vart ikkje funne."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 vil verte installert, og $2 avhengigheiter vil verte hoppa over."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Allereie installert"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basisspel:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB er ikkje tilgjengeleg når Minetest vart kompilert utan cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Avhengigheiter:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Lastar ned …"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Klarte ikkje å laste ned $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Klarte ikkje å laste ned $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Installasjon: Filtypen er ikkje støtta, eller arkivet er korrupt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spel"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installer"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installer $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installer manglande avhengigheiter"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Lastar …"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modifikasjonar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Ingen pakkar kunne verte henta"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Ingen resultat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Ingen oppdateringar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Ikkje funnen"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Ver venleg å sjekke at basisspelet er korrekt."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "I kø"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$1» eksisterer allereie. Vil du overskrive den?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Teksturpakkar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Avinstaller"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Oppdater"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Oppdater alt [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Sjå meir informasjon i ein nettlesar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Overskriv"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -451,16 +461,26 @@ msgstr "Hòler"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr "Skap"
+msgstr "Opprett"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Decorations"
 msgstr "Dekorasjonar"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Skaparrøynet er meint for skaparar."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Fangehól"
@@ -643,15 +663,15 @@ msgstr "Namn"
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
 msgid "Password"
-msgstr "Passord"
+msgstr "Lykelord"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Passwords do not match"
-msgstr "Passorda er ikkje like"
+msgstr "Lykelord samsvarer ikkje"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
 msgid "Register"
-msgstr "Lag ein konto"
+msgstr "Registrer deg"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
@@ -743,7 +763,7 @@ msgstr "Bla gjennom"
 
 #: builtin/mainmenu/settings/components.lua
 msgid "Edit"
-msgstr "Endre"
+msgstr "Rediger"
 
 #: builtin/mainmenu/settings/components.lua
 msgid "Select directory"
@@ -835,10 +855,6 @@ msgstr ""
 msgid "Back"
 msgstr "Attende"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Endre nykeler"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -848,7 +864,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Rydd til side"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Styring"
 
@@ -1055,6 +1072,16 @@ msgstr "legg inn eit spel"
 msgid "Install games from ContentDB"
 msgstr "Installer spel frå ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Ny"
@@ -1088,8 +1115,8 @@ msgid "Start Game"
 msgstr "Start spel"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Du har ikkje lagt inn noko spel."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1118,7 +1145,7 @@ msgstr "Bli med i spel"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Login"
-msgstr ""
+msgstr "Innlogging"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Ping"
@@ -1169,18 +1196,10 @@ msgstr "Lastar teksturar …"
 msgid "Rebuilding shaders..."
 msgstr "Gjenoppbyggjer skuggeleggjarar..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Tilkoplingsfeil (Tidsavbrot?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Kunne ikkje finne eller laste spel: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Ugyldig spel-spesifikasjonar."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hovudmeny"
@@ -1205,7 +1224,11 @@ msgstr "Greidde ikkje å opne passordfila du gav: "
 msgid "Provided world path doesn't exist: "
 msgstr "Verdsruta du gav finst ikkje: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medier..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1213,18 +1236,10 @@ msgstr ""
 "\n"
 "Sjekk problemsøkjar.txt for detaljar."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresse: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- modus: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Offentleg: "
@@ -1259,10 +1274,6 @@ msgstr "Automatiske framsteg er i gang"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1286,7 +1297,7 @@ msgstr "Zoom er for tiden deaktivert tå spelet eller ein modifikasjon"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr "Byt kodeord"
+msgstr "Endre lykelord"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
@@ -1308,6 +1319,10 @@ msgstr "Klient side-skildring er av"
 msgid "Connecting to server..."
 msgstr "Kopler til tenarmaskin..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Tilkoplingsfeil (Tidsavbrot?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Tilkoplinga feila av ein ukjent grunn"
@@ -1316,47 +1331,14 @@ msgstr "Tilkoplinga feila av ein ukjent grunn"
 msgid "Continue"
 msgstr "Fortset"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Styring:\n"
-"- %s: gå framover\n"
-"- %s: gå bakover\n"
-"- %s: gå mot venstre\n"
-"- %s: gå mot høgre\n"
-"- %s: hopp/klatre opp\n"
-"- %s: grav/slå\n"
-"- %s: plasser/nytt\n"
-"- %s: snik/klatre ned\n"
-"- %s: slepp ting\n"
-"- %s: inventar\n"
-"- Mus: snu deg/sjå\n"
-"- Musehjul: vel ting\n"
-"- %s: nettprat\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1448,6 +1430,11 @@ msgstr "Tåke er deaktivert"
 msgid "Fog enabled"
 msgstr "Tåke er aktivert"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom er for tiden deaktivert tå spelet eller ein modifikasjon"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spel info:"
@@ -1468,10 +1455,6 @@ msgstr "Definerér gjennstander..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medier..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1630,10 +1613,6 @@ msgstr "Jern-tråd-ramma er vist"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom er for tiden deaktivert tå spelet eller ein modifikasjon"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1968,6 +1947,15 @@ msgstr "Minikart i overflatemodus, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minikart i overflate modus, Zoom x1"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Klarte ikkje å opne nettside"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2158,6 +2146,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "berør knapp"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Klarte ikkje å opne nettside"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Byt"
@@ -2191,6 +2192,7 @@ msgstr "Lydstyrke: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "nn"
 
@@ -2381,14 +2383,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Juster dpi-konfigurasjonen for din skjem (kun system utan X11/Android), f."
-"eks. for 4K-skjermar."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2414,6 +2408,10 @@ msgstr "Verdsnamn"
 msgid "Advanced"
 msgstr "Avansert"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2469,6 +2467,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Armtreigheit"
@@ -2492,12 +2501,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2562,6 +2580,10 @@ msgstr "Biom"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2776,6 +2798,12 @@ msgstr "Farga tåke"
 msgid "Colored shadows"
 msgstr "Farga skuggar"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2910,10 +2938,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2963,6 +2987,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definerer område der tre har eple."
@@ -3150,6 +3187,11 @@ msgstr "Aktiver alt"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Aktivér skading"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3171,6 +3213,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3213,6 +3259,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3236,6 +3286,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Touchskjerm"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3244,12 +3299,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3279,6 +3328,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4077,9 +4139,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4229,10 +4292,6 @@ msgstr ""
 "Gjer at tåke- og himmelfargen er avhengig av tida på dagen (morgongry/"
 "solnedgang) og retninga ein er orientert mot."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4281,7 +4340,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4316,10 +4377,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4562,6 +4619,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4630,6 +4691,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Fingerrøringsterskel (px):"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4740,10 +4806,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4756,6 +4818,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4865,6 +4931,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protkoll versjon bommert. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4880,6 +4955,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5046,9 +5125,8 @@ msgstr ""
 "Bruk 0 for standard kvalitet."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshots"
-msgstr "Skjermbilde"
+msgstr "Skjermbilete"
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5072,8 +5150,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5198,7 +5276,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5231,6 +5309,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5270,8 +5352,7 @@ msgstr "Skuggeleggjarar"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5341,13 +5422,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5383,7 +5457,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5405,6 +5479,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Skyradius"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Lyd e dempa"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5561,18 +5644,38 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "Lengda, i pikslar, det tek før touchskjerminteraksjonen startar."
 
 #: src/settings_translation_file.cpp
@@ -5583,6 +5686,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5609,7 +5718,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5666,6 +5775,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5713,15 +5826,15 @@ msgstr "Touchskjerm"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Fingerrøringsterskel (px):"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Raslende lauv"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5757,7 +5870,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5855,10 +5970,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Brukargrensesnitt"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5945,6 +6056,10 @@ msgstr ""
 msgid "Volume"
 msgstr "Volum"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -5953,6 +6068,15 @@ msgstr ""
 "Volumet på alle lydar.\n"
 "Krev at lydsystemet er slått på."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Knutepunktsframheving"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6193,6 +6317,9 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresse: "
+
 #, fuzzy
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Gude løyving: "
@@ -6200,6 +6327,9 @@ msgstr ""
 #~ msgid "- Damage: "
 #~ msgstr "- Skade: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6227,6 +6357,13 @@ msgstr ""
 #~ "La dette vere tomt for å starte ein lokal tenar.\n"
 #~ "Merk at adressefeltet i hovudmenyen overkøyrer denne innstillinga."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Juster dpi-konfigurasjonen for din skjem (kun system utan X11/Android), f."
+#~ "eks. for 4K-skjermar."
+
 #~ msgid "All Settings"
 #~ msgstr "Alle innstillingar"
 
@@ -6251,6 +6388,9 @@ msgstr ""
 #~ msgid "Bump Mapping"
 #~ msgstr "Dunke kartlegging"
 
+#~ msgid "Change Keys"
+#~ msgstr "Endre nykeler"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Endre nykeler"
@@ -6279,12 +6419,47 @@ msgstr ""
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Kontrollerer kor raskt ting synk i væske."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Styring:\n"
+#~ "- %s: gå framover\n"
+#~ "- %s: gå bakover\n"
+#~ "- %s: gå mot venstre\n"
+#~ "- %s: gå mot høgre\n"
+#~ "- %s: hopp/klatre opp\n"
+#~ "- %s: grav/slå\n"
+#~ "- %s: plasser/nytt\n"
+#~ "- %s: snik/klatre ned\n"
+#~ "- %s: slepp ting\n"
+#~ "- %s: inventar\n"
+#~ "- Mus: snu deg/sjå\n"
+#~ "- Musehjul: vel ting\n"
+#~ "- %s: nettprat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativ"
 
 #~ msgid "Credits"
 #~ msgstr "Medvirkende"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Skade"
 
@@ -6350,6 +6525,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Installer: fil: «$1»"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Ugyldig spel-spesifikasjonar."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6392,10 +6570,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Ingen Mipkart"
 
-#, fuzzy
-#~ msgid "Node Highlighting"
-#~ msgstr "Knutepunktsframheving"
-
 #, fuzzy
 #~ msgid "Node Outlining"
 #~ msgstr "Knute-utlinjing"
@@ -6531,8 +6705,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Du døydde"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Du har ikkje lagt inn noko spel."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/oc/minetest.po b/po/oc/minetest.po
index 757aababb..a23e35ec2 100644
--- a/po/oc/minetest.po
+++ b/po/oc/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Occitan <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Comanda pas disponibla: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Ajuda per las comandas"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "listar."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "D'accòrdi"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<pas gis disponible>"
@@ -105,6 +103,10 @@ msgstr "Se presenta una error:"
 msgid "Main menu"
 msgstr "Menú principau"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "D'accòrdi"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Tornar Conectar"
@@ -133,19 +135,28 @@ msgstr "Suportem mas la version $1 dau protocòl."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Suportem de versions dau protocòl entre $1 e $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" exista dejà. Voletz l'espotir?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Error per installar \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Las dependéncias $1 e $2 van s'installar."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Error per lo descharjament de \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 per $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Error per lo descharjament de $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"A pas capitat de traire \"$1\" (tipe de fichèir pas supportat o archiva "
+"cassada)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +164,157 @@ msgstr ""
 "$1 en descharjament,\n"
 "$2 en espeita"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Descharjament de $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Las dependéncias que fan besonh per $1 pòdon pas se trobar."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 sera installat, e las dependéncias de $2 seràn ignoradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Tot los paquets"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Dejá installat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Tornar au Menú Principau"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB es pas disponible quand Minetest es compilat sens cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Descharjament..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Juòcs"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Charjament..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mòds"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Pas gis de paquets poguèron èsser quèrre"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Pas de resultats"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Pas de mesas a jorn"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "En espeita"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pacs de textura"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstallar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Mesa a jorn"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Tot metre a jorn [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Espiar mai d'informacions dins un navegador wèb"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Las dependéncias $1 e $2 van s'installar."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 per $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Las dependéncias que fan besonh per $1 pòdon pas se trobar."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 sera installat, e las dependéncias de $2 seràn ignoradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Dejá installat"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Juòc de Basa:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Annular"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB es pas disponible quand Minetest es compilat sens cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependéncias:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Descharjament..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Error per installar \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Error per lo descharjament de \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Error per lo descharjament de $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"A pas capitat de traire \"$1\" (tipe de fichèir pas supportat o archiva "
-"cassada)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Juòcs"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installar las dependéncias mancantas"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Charjament..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mòds"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Pas gis de paquets poguèron èsser quèrre"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Pas de resultats"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Pas de mesas a jorn"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Pas trobat"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Espotir"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Verifiatz que lo juòc de basa es corrèct."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "En espeita"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" exista dejà. Voletz l'espotir?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pacs de textura"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstallar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Mesa a jorn"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Tot metre a jorn [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Espiar mai d'informacions dins un navegador wèb"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Espotir"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,10 +464,20 @@ msgstr "Crear"
 msgid "Decorations"
 msgstr "Decoracions"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Test de Desvelopament es per los desvelopair·e·a·s."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Donjons"
@@ -832,10 +852,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Chanjar las Tòchas"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -845,7 +861,8 @@ msgstr ""
 msgid "Clear"
 msgstr "Espotir"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1054,6 +1071,16 @@ msgstr "Installar un juòc"
 msgid "Install games from ContentDB"
 msgstr "Installar de juòcs de ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Novèl"
@@ -1087,8 +1114,8 @@ msgid "Start Game"
 msgstr "Començar le Juòc"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Avètz pas gis de juòc installat."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1167,18 +1194,10 @@ msgstr "Charjament de las texturas..."
 msgid "Rebuilding shaders..."
 msgstr "Tornat construcion daus shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Error de connecion (perduda?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Se pòt pas trobar o charjar le juòc: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Lo juòc specifiat es pas valide."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menú Principau"
@@ -1203,7 +1222,11 @@ msgstr "Lo fichèir de senhau prepausat a pas capitat de dobrir. "
 msgid "Provided world path doesn't exist: "
 msgstr "Lo chamin de monde prepausat exista pas: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1211,18 +1234,10 @@ msgstr ""
 "\n"
 "Espiar debug.txt per los detalhs."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adreça: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mòda: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Pòrt: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Public: "
@@ -1257,10 +1272,6 @@ msgstr "Marcha automatica activada"
 msgid "Block bounds hidden"
 msgstr "Liams daus Blòcs escònduts"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Liams daus blòcs mostrats per totas los blòcs"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Liams daus blòcs mostrats per aqueste blòc"
@@ -1307,6 +1318,10 @@ msgstr "Lo scriptatge dau costat dau client es desactivat"
 msgid "Connecting to server..."
 msgstr "Connexion au servidor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Error de connecion (perduda?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Connexion pas capitada per una rason pas coneguda"
@@ -1315,46 +1330,13 @@ msgstr "Connexion pas capitada per una rason pas coneguda"
 msgid "Continue"
 msgstr "Contunhar"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Contratròles:\n"
-"- %s: bojar davant\n"
-"- %s: bojar darrèir\n"
-"- %s: bojar a gaucha\n"
-"- %s: bojar a dreita\n"
-"- %s: sautar/grimpar en naut\n"
-"- %s: curar/tustar\n"
-"- %s: plaçar/utilizar\n"
-"- %s: s'aclatar/grimpar en bàs\n"
-"- %s: tombar l'objèct\n"
-"- %s: inventari\n"
-"- Mouse: virar/espiar\n"
-"- Mouse wheel: seleccionar un objèct\n"
-"- %s: parlar\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1434,6 +1416,12 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr ""
+"Se pòt pas mostrar los liams de blòcs (desactivat per un mòd o un juòc)"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1454,10 +1442,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1613,10 +1597,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1940,6 +1920,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2130,6 +2119,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2163,6 +2164,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "oc"
 
@@ -2348,12 +2350,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2376,6 +2372,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2431,6 +2431,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2452,12 +2463,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2522,6 +2542,10 @@ msgstr "Biòms"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2734,6 +2758,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2865,10 +2895,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2918,6 +2944,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3103,6 +3142,11 @@ msgstr "Tot activar"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Activar los Degats"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3122,6 +3166,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3164,6 +3212,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3187,6 +3239,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3195,12 +3251,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3230,6 +3280,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4024,9 +4087,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4172,10 +4236,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4224,7 +4284,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4259,10 +4321,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4505,6 +4563,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4573,6 +4635,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Sensibilitat tactila (px):"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4681,10 +4748,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4697,6 +4760,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4806,6 +4873,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "La version dau protocòl correspònda pas. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4821,6 +4897,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5008,8 +5088,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5127,7 +5207,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5160,6 +5240,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5199,8 +5283,7 @@ msgstr "Shaders"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5270,13 +5353,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5312,7 +5388,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5333,6 +5409,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5489,17 +5573,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5510,6 +5614,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5536,7 +5646,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5593,6 +5703,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5640,12 +5754,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Sensibilitat tactila (px):"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5683,7 +5796,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5781,10 +5896,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5871,12 +5982,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Sobrelusança daus Blòcs"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6116,6 +6240,12 @@ msgstr ""
 #~ msgid "(game support required)"
 #~ msgstr "(supòrt dau juòc necessari)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adreça: "
+
+#~ msgid "- Port: "
+#~ msgstr "- Pòrt: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6140,6 +6270,12 @@ msgstr ""
 #~ msgid "Bilinear Filter"
 #~ msgstr "Colador Bilinear"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Liams daus blòcs mostrats per totas los blòcs"
+
+#~ msgid "Change Keys"
+#~ msgstr "Chanjar las Tòchas"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Chanjar las Tòchas"
@@ -6147,6 +6283,38 @@ msgstr ""
 #~ msgid "Connected Glass"
 #~ msgstr "Veire conectat"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Contratròles:\n"
+#~ "- %s: bojar davant\n"
+#~ "- %s: bojar darrèir\n"
+#~ "- %s: bojar a gaucha\n"
+#~ "- %s: bojar a dreita\n"
+#~ "- %s: sautar/grimpar en naut\n"
+#~ "- %s: curar/tustar\n"
+#~ "- %s: plaçar/utilizar\n"
+#~ "- %s: s'aclatar/grimpar en bàs\n"
+#~ "- %s: tombar l'objèct\n"
+#~ "- %s: inventari\n"
+#~ "- Mouse: virar/espiar\n"
+#~ "- Mouse wheel: seleccionar un objèct\n"
+#~ "- %s: parlar\n"
+
 #~ msgid "Dynamic shadows:"
 #~ msgstr "Ombras dinamicas:"
 
@@ -6163,6 +6331,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Installar un Mòd: Pas possible de trobar lo nom reau dau mòd per: $1"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Lo juòc specifiat es pas valide."
+
 #~ msgid "Mipmap"
 #~ msgstr "Mipmapa"
 
@@ -6175,9 +6346,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Pas de Mipmapa"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Sobrelusança daus Blòcs"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Sobrelinhament daus Blòcs"
 
@@ -6253,5 +6421,8 @@ msgstr ""
 #~ msgid "Y"
 #~ msgstr "Y"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Avètz pas gis de juòc installat."
+
 #~ msgid "Z"
 #~ msgstr "Z"
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 7cc2ec821..8ad317f2a 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -2,18 +2,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-09-08 10:04+0000\n"
-"Last-Translator: Jakub Z <mrkubax10@onet.pl>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-11 15:14+0000\n"
+"Last-Translator: nauta-turbidus <wiktor-t@hotmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
 "pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0.1-dev\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -72,8 +72,8 @@ msgid "Command not available: "
 msgstr "Polecenie nie jest dostępne: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Uzyskaj pomoc dotyczącą poleceń"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Uzyskaj pomoc dotyczącą poleceń (-t: wyjście na czacie)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -83,12 +83,8 @@ msgstr ""
 "wyświetlić wszystko."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[wszystko | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[wszystko | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -106,6 +102,10 @@ msgstr "Wystąpił błąd:"
 msgid "Main menu"
 msgstr "Menu główne"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Połącz ponownie"
@@ -134,19 +134,27 @@ msgstr "Wspieramy wyłącznie protokół w wersji $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wspieramy protokoły w wersji od $1 do $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" aktualnie istnieje. Czy chcesz go nadpisać?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Błąd instalowania \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Zostaną zainstalowane zależności $1 i $2."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Nie udało się pobrać \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 przez $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Pobieranie $1 do $2 nie powiodło się :("
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Nie udało się wypakować \"$1\" (za mało miejsca na dysku, niewspierany typ "
+"pliku lub uszkodzone archiwum)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,158 +162,157 @@ msgstr ""
 "$1 pobieranych,\n"
 "$2 w kolejce"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Pobieranie $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 wymaga zależności, które nie zostały znalezione."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 zostanie zainstalowany, a zależności $2 zostaną pominięte."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Wszystkie zasoby"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Już zainstalowany"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Powrót do menu głównego"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB nie jest dostępne gdy Minetest był zbudowany bez cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Pobieranie..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Błąd przy pobieraniu zależności dla pakietu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Gry"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instaluj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ładowanie..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modyfikacje"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nie można pobrać pakietów"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Brak wyników"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Brak aktualizacji"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "W kolejce"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paczki zasobów"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Paczka $1 nie została znaleziona."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Odinstaluj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Zaktualizuj wszystko [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Pokaż więcej informacji w przeglądarce"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Musisz zainstalować grę, zanim zainstalujesz mody"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Zostaną zainstalowane zależności $1 i $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 przez $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 wymaga zależności, które nie zostały znalezione."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 zostanie zainstalowany, a zależności $2 zostaną pominięte."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Już zainstalowany"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Gra podstawowa:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB nie jest dostępne gdy Minetest był zbudowany bez cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Zależności:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Pobieranie..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Błąd instalowania \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Nie udało się pobrać \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Pobieranie $1 do $2 nie powiodło się :("
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Nie udało się wypakować \"$1\" (niewspierany typ pliku lub uszkodzone "
-"archiwum)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Gry"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instaluj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Zainstaluj $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Zainstaluj brakujące zależności"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ładowanie..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modyfikacje"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nie można pobrać pakietów"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Brak wyników"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Brak aktualizacji"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Nie znaleziono"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Nadpisz"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Proszę sprawdzić, czy gra podstawowa jest poprawnie zainstalowana."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "W kolejce"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" aktualnie istnieje. Czy chcesz go nadpisać?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paczki zasobów"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Odinstaluj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Aktualizuj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Zaktualizuj wszystko [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Pokaż więcej informacji w przeglądarce"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Nadpisz"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -453,10 +460,22 @@ msgstr "Utwórz"
 msgid "Decorations"
 msgstr "Dekoracje"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Pustynne świątynie"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test jest przeznaczony dla programistów."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Osobny wariant lochu generowany w biomach pustynnych (tylko jeśli lochy "
+"włączone)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Lochy"
@@ -653,7 +672,7 @@ msgstr "Zarejestruj się"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Odrzuć"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -661,21 +680,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Przez dłuższy czas, razem z silnikiem Minetest dostarczana była domyślna gra "
+"o nazwie \"Minetest Game\". Od wersji 5.8.0, Minetest jest rozpowszechniany "
+"bez domyślnej gry."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Jeżeli chcesz kontynuować zabawę w Twoich światach Minetest Game, musisz ją "
+"teraz zainstalować."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "\"Minetest Game\" nie jest już domyślnie instalowana"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Zainstaluj inną grę"
+msgstr "Zainstaluj ponownie \"Minetest Game\""
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -752,13 +775,12 @@ msgid "Select file"
 msgstr "Wybierz plik"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Wybierz"
+msgstr "Ustaw"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
-msgstr "(brak opisu)"
+msgstr "(Brak opisu ustawienia)"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "2D Noise"
@@ -766,7 +788,7 @@ msgstr "Szum 2d"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "Lacunarity"
-msgstr "Lunarność"
+msgstr "Lakunarność"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "Octaves"
@@ -823,20 +845,16 @@ msgstr "wygładzony"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Użyj języka systemowego)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Dostępność"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Backspace"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Zmień klawisze"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,7 +864,8 @@ msgstr "Czat"
 msgid "Clear"
 msgstr "Delete"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Sterowanie"
 
@@ -855,18 +874,16 @@ msgid "General"
 msgstr "Ogólne"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Szybkie poruszanie"
+msgstr "Poruszanie się"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Przywróć domyślne"
+msgstr "Przywróć wartość domyślną"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Przywróć wartość domyślną ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -874,7 +891,7 @@ msgstr "Wyszukaj"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Pokaż ustawienia zaawansowane"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -894,11 +911,11 @@ msgstr "Zawartość: Mody"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(Gra również musi obsługiwać cienie)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Niestandardowe"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -951,7 +968,7 @@ msgstr "Główny zespół"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Urządzenie Irrlicht:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -983,18 +1000,16 @@ msgid "Browse online content"
 msgstr "Przeglądaj zawartość online"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Przeglądaj zawartość online"
+msgstr "Przeglądaj zawartość online [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Zawartość"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Zawartość"
+msgstr "Zawartość [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1017,9 +1032,8 @@ msgid "Rename"
 msgstr "Zmień nazwę"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<niedostępne>"
+msgstr "Aktualizacja dostępna?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1057,6 +1071,18 @@ msgstr "Zainstaluj grę"
 msgid "Install games from ContentDB"
 msgstr "Instaluj gry z ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest nie ma domyślnie zainstalowanej gry."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest to platforma tworzenia gier, która pozwala Ci grać w wiele różnych "
+"gier."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nowy"
@@ -1090,8 +1116,8 @@ msgid "Start Game"
 msgstr "Rozpocznij grę"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nie zainstalowano żadnych trybów gry."
+msgid "You need to install a game before you can create a world."
+msgstr "Musisz zainstalować grę, zanim będziesz mógł stworzyć świat."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1170,18 +1196,10 @@ msgstr "Ładowanie tekstur..."
 msgid "Rebuilding shaders..."
 msgstr "Przebudowywanie shaderów..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Błąd połączenia (brak odpowiedzi?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Nie można znaleźć lub załadować gry: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Nieprawidłowa specyfikacja trybu gry."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu główne"
@@ -1206,7 +1224,11 @@ msgstr "Nie udało się otworzyć dostarczonego pliku z hasłem "
 msgid "Provided world path doesn't exist: "
 msgstr "Podana ścieżka świata nie istnieje: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1214,18 +1236,10 @@ msgstr ""
 "\n"
 "Sprawdź plik debug.txt by uzyskać więcej informacji."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "Adres "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Tryb: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Publiczne: "
@@ -1260,10 +1274,6 @@ msgstr "Automatyczne chodzenie do przodu włączone"
 msgid "Block bounds hidden"
 msgstr "Ukryte granice bloków"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Granice bloków pokazane dla wszystkich bloków"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Granice bloku wyświetlane dla bieżącego bloku"
@@ -1281,9 +1291,8 @@ msgid "Camera update enabled"
 msgstr "Aktualizowanie kamery włączone"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
-msgstr "Nie można wyświetlić granic bloków (wyłączone przez mod lub grę)"
+msgstr "Nie można wyświetlić granic bloków (wyłączone przez grę lub mod)"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1309,6 +1318,10 @@ msgstr "Skryptowanie po stronie klienta jest wyłączone"
 msgid "Connecting to server..."
 msgstr "Łączenie z serwerem..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Błąd połączenia (brak odpowiedzi?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Połączenie nie powiodło się z nieznanego powodu"
@@ -1318,46 +1331,12 @@ msgid "Continue"
 msgstr "Kontynuuj"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Sterowanie:\n"
-"- %s: idź do przodu\n"
-"- %s: przesuń się do tyłu\n"
-"- %s: przesuń się w lewo\n"
-"- %s: przesuń w prawo\n"
-"- %s: skok/wspinaj się\n"
-"- %s: kopanie/cios\n"
-"- %s: połóż/użyj\n"
-"- %s: skradanie się/schodzenie w dół\n"
-"- %s: upuść przedmiot\n"
-"- %s: ekwipunek\n"
-"- Mysz: obróć / spójrz\n"
-"- Kółko myszy: wybierz element\n"
-"- %s: czat\n"
-
-#: src/client/game.cpp
-#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1368,16 +1347,16 @@ msgid ""
 msgstr ""
 "Domyślne sterowanie:\n"
 "Brak widocznego menu:\n"
-"- pojedyncze dotknięcie: aktywacja\n"
-"- podwójne dotknięcie: postaw/użyj\n"
 "- przejechanie palcem: rozglądanie się\n"
+"- dotknięcie: postaw/uderz/użyj (domyślnie)\n"
+"- długie dotknięcie: kop/użyj (domyślnie)\n"
 "Menu/Ekwipunek widoczny:\n"
 "- potwójne dotknięcie poza menu:\n"
 " -->zamknij\n"
-"- dotknięcie stacka, dotknięcie slota:\n"
-" --> przenieś stack\n"
+"- dotknięcie stosu, dotknięcie miejsca:\n"
+" --> przenieś stos\n"
 "- dotknięcie i przeciągnięcie, dotknięcie drugim palcem\n"
-" --> umieść pojedynczy item w slocie\n"
+" --> umieść pojedynczy przedmiot w miejscu\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1449,6 +1428,10 @@ msgstr "Mgła wyłączona"
 msgid "Fog enabled"
 msgstr "Mgła włączona"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Mgła włączona przez grę lub mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informacje o grze:"
@@ -1469,10 +1452,6 @@ msgstr "Definicje przedmiotów..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1573,49 +1552,53 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "Nie można nasłuchiwać na %s, ponieważ IPv6 jest wyłączony"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Włączono nieskończony zasięg widoczności"
+msgstr "Nieograniczony zasięg widoczności wyłączony"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
-msgstr "Włączono nieskończony zasięg widoczności"
+msgstr "Nieograniczony zasięg widoczności włączony"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
 msgstr ""
+"Nieograniczony zasięg widoczności włączony, ale niedozwolony przez grę lub "
+"moda"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "Zasięg widoczności na minimum: %d1"
+msgstr "Zasięg widoczności zmieniony na %d (minimum)"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"Zasięg widoczności zmieniony na %d (minimum), ale ograniczony do %d przez "
+"grę lub moda"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr "Zmieniono zasięg widoczności na %d%%"
+msgstr "Zasięg widoczności zmieniony na %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "Zmieniono zasięg widoczności na %d%%"
+msgstr "Zmieniono zasięg widoczności na %d (maksymalny)"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"Zasięg widoczności zmieniony na %d (maksimum), ale gra lub mod ogranicza go "
+"do %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "Zmieniono zasięg widoczności na %d%%"
+msgstr "Zmieniono zasięg widoczności na %d, ale gra lub mod ogranicza go do %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1630,10 +1613,6 @@ msgstr "Siatka widoczna"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Powiększenie jest obecnie wyłączone przez grę lub mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Czat jest obecnie wyłączony przez grę lub mod"
@@ -1673,32 +1652,28 @@ msgstr "Backspace"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "Skradanie"
+msgstr "Break"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
 msgstr "Klawisz Caps Lock"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
+msgstr "Clear"
+
+#: src/client/keycode.cpp
+msgid "Control Key"
+msgstr "Ctrl"
+
+#: src/client/keycode.cpp
+msgid "Delete Key"
 msgstr "Delete"
 
-#: src/client/keycode.cpp
-#, fuzzy
-msgid "Control Key"
-msgstr "Control"
-
-#: src/client/keycode.cpp
-#, fuzzy
-msgid "Delete Key"
-msgstr "Usuń"
-
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Strzałka w dół"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1745,9 +1720,8 @@ msgid "Insert"
 msgstr "Insert"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Lewy Control"
+msgstr "Strzałka w lewo"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1771,7 +1745,6 @@ msgstr "Lewy Windows"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
 msgstr "Menu"
 
@@ -1848,18 +1821,15 @@ msgid "OEM Clear"
 msgstr "OEM Clear"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
-msgstr "Page down"
+msgstr "Page Down"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
-msgstr "Page up"
+msgstr "Page Up"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
 msgstr "Pause"
 
@@ -1873,14 +1843,12 @@ msgid "Print"
 msgstr "Drukuj"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
 msgstr "Enter"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Prawy Control"
+msgstr "Strzałka w prawo"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1912,7 +1880,6 @@ msgid "Select"
 msgstr "Wybierz"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
 msgstr "Shift"
 
@@ -1934,7 +1901,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Strzałka w górę"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1945,9 +1912,8 @@ msgid "X Button 2"
 msgstr "Przycisk X 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
-msgstr "Zoom"
+msgstr "Klawisz Zoom"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
@@ -1967,6 +1933,15 @@ msgstr "Minimapa w trybie powierzchniowym, powiększenie x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapa w trybie teksturowym"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Nie udało się skompilować shadera \"%s\""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Shadery są włączone, ale GLSL nie jest wspierany przez sterownik."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2160,6 +2135,18 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "naciśnij klawisz"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Otwórz"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Otworzyć URL?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "Nie udało się otworzyć adresu URL"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Zmień"
@@ -2193,6 +2180,7 @@ msgstr "Głośność: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "pl"
 
@@ -2208,9 +2196,9 @@ msgid "Name is taken. Please choose another name"
 msgstr "Nazwa jest zajęta. Wybierz inną nazwę"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "Wyłączanie..."
+msgstr "%s podczas wyłączania: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2282,7 +2270,7 @@ msgstr "Szum 2D lokalizuje doliny i kanały rzeczne."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2315,7 +2303,7 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
-"Szum 3D określający strukturę terenów pływających.\n"
+"Szum 3D określający strukturę latających wysp.\n"
 "Jeśli wartość domyślna zostanie zmieniona, konieczne będzie dostosowanie "
 "\"skali\" szumu (domyślnie 0,7), \n"
 "ponieważ zwężanie terenów pływających działa najlepiej, \n"
@@ -2338,7 +2326,6 @@ msgid "3D noise that determines number of dungeons per mapchunk."
 msgstr "Szum 3D, który wpływa na liczbę lochów na jeden mapchunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2353,10 +2340,11 @@ msgstr ""
 "Wsparcie 3D\n"
 "Aktualnie wspierane:\n"
 "-    none: bez wyjścia 3d.\n"
-"-    anaglyph: Niebieski/karmazynowy kolor 3d.\n"
-"-    interlaced: bazujący na polaryzacji parzystej/nieparzystej linii.\n"
+"-    anaglyph: 3d poprzez kolory cyjan/magenta\n"
+"-    interlaced: wsparcie ekranów z parzystą/nieparzystą polaryzacją "
+"liniową\n"
 "-    topbottom: podzielony ekran góra/dół.\n"
-"-    sidebyside: podzielony obok siebie.\n"
+"-    sidebyside: podzielony ekran obok siebie.\n"
 "-    crossview: obuoczne 3d\n"
 "Zauważ, że tryb interlaced wymaga włączenia shaderów."
 
@@ -2419,14 +2407,6 @@ msgstr "Zasięg wysyłania aktywnego obiektu"
 msgid "Adds particles when digging a node."
 msgstr "Dodaje efekty cząstkowe podczas wykopywania bloków."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ustaw konfiguracje DPI dla twojego ekranu (nie X11/Tylko Android) np. dla "
-"ekranów 4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2456,6 +2436,10 @@ msgstr "Nazwa administratora"
 msgid "Advanced"
 msgstr "Zaawansowane"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Pozwala na przejrzyste płyny."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2495,14 +2479,12 @@ msgid "Announce to this serverlist."
 msgstr "Rozgłoś listę serwerów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Antyaliasing:"
+msgstr "Skala antyaliasingu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Antyaliasing:"
+msgstr "Metoda antyaliasingu"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2516,6 +2498,24 @@ msgstr "Dołącz nazwę przedmiotu do jego opisu."
 msgid "Apple trees noise"
 msgstr "Szum jabłoni"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Zastosuj dithering, żeby zmniejszyć artefakty bandingu.\n"
+"Dithering znacząco zwiększa rozmiar bezstratnie skompresowanych\n"
+"zrzutów ekranu i działa nieprawidłowo, jeśli system operacyjny\n"
+"wykonuje dodatkowy dithering lub jeśli kanały kolorów\n"
+"nie są skwantowane na 8 bitów.\n"
+"Z OpenGL ES, dithering działa tylko jeśli shader wspiera wysoką precyzję\n"
+"liczb zmiennoprzecinkowych i może mieć większy wpływ na wydajność."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Bezwładność ramion"
@@ -2539,24 +2539,38 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "W tej odległości serwer agresywnie zoptymalizuje, które bloki są wysyłane "
 "do\n"
 "klientów.\n"
 "Małe wartości potencjalnie znacznie poprawiają wydajność, kosztem "
 "widocznych\n"
-"trzaski renderowania (niektóre bloki nie będą renderowane pod wodą i w "
-"jaskiniach,\n"
-"jak również czasami na lądzie).\n"
-"Ustawienie tego na wartość większą niż max_block_send_distance wyłącza to\n"
-"optymalizacja.\n"
-"Podane w mapblocks (16 węzłów)."
+"błędów renderowania (niektóre bloki mogą nie być renderowane poprawnie w "
+"jaskiniach).\n"
+"Ustawienie tego na wartość większą niż max_block_send_distance wyłącza te\n"
+"optymalizacje.\n"
+"Wyrażone w MapBlocks (16 węzłów)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"W tej odległości serwer wykona prostsze i tańsze sprawdzenie przesłonięcia.\n"
+"Mniejsze wartości potencjalnie poprawiają wydajność, kosztem tymczasowych\n"
+"błędów renderowania (brakujące bloki).\n"
+"To jest szczególnie użyteczne przy bardzo dużych zasięgach widoczności ("
+"powyżej 500).\n"
+"Wyrażone w MapBlocks (16 nodes)."
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
@@ -2587,9 +2601,8 @@ msgid "Base terrain height."
 msgstr "Bazowa wysokość terenu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "Minimalna wielkość tekstury dla filtrów"
+msgstr "Podstawowy rozmiar tekstury"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2612,14 +2625,17 @@ msgid "Bind address"
 msgstr "Sprawdzanie adresu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "Biomy"
+msgstr "API biomów"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Szum biomu"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Dystans optymalizacji pomijania bloków"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Dystans optymalizacji wysyłanych bloków"
@@ -2786,7 +2802,7 @@ msgstr "Klient"
 
 #: src/settings_translation_file.cpp
 msgid "Client Mesh Chunksize"
-msgstr ""
+msgstr "Rozmiar modelu chunka na kliencie"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -2805,9 +2821,8 @@ msgid "Client-side Modding"
 msgstr "Modyfikacje po stronie klienta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side node lookup range restriction"
-msgstr "Ograniczenie zakresu wyszukiwania węzłów po stronie klienta"
+msgstr "Ograniczenie zasięgu wyszukiwania node'ów po stronie klienta"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -2822,7 +2837,6 @@ msgid "Clouds"
 msgstr "Chmury 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
 msgstr "Chmury są efektem po stronie klienta."
 
@@ -2838,6 +2852,15 @@ msgstr "Kolorowa mgła"
 msgid "Colored shadows"
 msgstr "Kolorowe cienie"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Lista wymienionych po przecinku rozszerzeń AL i ALC, które nie powinny być "
+"użyte.\n"
+"Przydatne do testowania. Sprawdź al_extensions.[h,cpp] po szczegóły."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3002,10 +3025,6 @@ msgstr ""
 "Kolor celownika (kanał czerwony, zielony, niebieski).\n"
 "Wpływa również na kolor obiektu celownika"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Próg rozmiaru pliku dziennika debugowania"
@@ -3061,6 +3080,28 @@ msgstr ""
 "Poissona,\n"
 "ale także zużywa więcej zasobów."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Wyznacz najstarsze klienty, które mogą połączyć się z serwerem.\n"
+"Starsze klienty mogą być kompatybilne w tym sensie, że nie będą się "
+"zawieszać,\n"
+"kiedy łączą się z nowym serwerem, ale mogą nie wspierać wszystkich nowych "
+"funkcjonalności., których się spodziewasz.\n"
+"To pozwala na bardziej szczegółowe rozróżnianie niż "
+"strict_protocol_version_checking.\n"
+"Minetest i tak wymusza swoje własne, wewnętrzne minimum, a włączenie\n"
+"strict_protocol_version_checking efektywnie nadpisze skutki tego ustawienia."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Określa obszary na których drzewa mają jabłka."
@@ -3127,6 +3168,8 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"Zdefiniuj rozmiar siatki próbkowania dla metod antyaliasingu FSAA i SSAA.\n"
+"Wartość 2 oznacza branie 2x2 = 4 próbek."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3252,7 +3295,7 @@ msgstr "Szum generowania lochów"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Automatic Exposure"
-msgstr ""
+msgstr "Włącz automatyczną regulację ekspozycji"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom"
@@ -3262,6 +3305,10 @@ msgstr "Włącz efekt bloom"
 msgid "Enable Bloom Debug"
 msgstr "Włącz debug efektu bloom"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Włącz Debanding"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3288,9 +3335,13 @@ msgstr ""
 "Jeśli włączone, używa dysku Poisson do \"miękkich cieni\", w przeciwnym "
 "razie używa filtrowania PCF."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Włącz Post Processing"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
-msgstr ""
+msgstr "Włącz culling oparty o śledzenie promieni"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3299,6 +3350,10 @@ msgid ""
 "automatically adjust to the brightness of the scene,\n"
 "simulating the behavior of human eye."
 msgstr ""
+"Włącz automatyczną poprawę ekspozycji.\n"
+"Kiedy włączone, silnik post-processingu automatycznie\n"
+"dostosuje jasność sceny, symulując zachowanie\n"
+"oka ludzkiego."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3331,7 +3386,11 @@ msgstr "Włącz tryb mod security"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
-msgstr ""
+msgstr "Włącz szybki wybór przedmiotów na hotbarze kółkiem myszy (scrollem)."
+
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Włącz losową kolejność ładowania modów (głównie do testowania)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3363,6 +3422,10 @@ msgstr ""
 "kiedy łączą sę z nowym serwerem, ale mogą nie wspierać wszystkich nowych "
 "spodziewanych funkcjonalności."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Włącz ekran dotykowy"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3375,14 +3438,6 @@ msgstr ""
 "tekstur)\n"
 "jeżeli następuje połączenie z serwerem."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Zezwala na korzystanie z VBO (obiektów bufora wierzchołków).\n"
-"Powinno to znacznie polepszyć wydajność karty graficznej."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3422,6 +3477,21 @@ msgstr "Włącz animację inwentarza przedmiotów."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Włącza cachowanie facedir obracanych meshów."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Włącza debug i sprawdzanie błędów w sterowniku OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Włącza potok post-processimgu."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Włącza tryb ekranu dotykowego, pozwalając grać w grę z użyciem ekranu "
+"dotykowego."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3432,7 +3502,6 @@ msgstr ""
 "kosztem drobnych usterek wizualnych, które nie wpływają na grywalność gry."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine Profiler"
 msgstr "Profiler silnika"
 
@@ -3453,18 +3522,17 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
-"Wykładnik zwężenia pływającej wyspy. Zmienia zachowanie zwężenia.\n"
+"Wykładnik zwężenia latającej wyspy. Zmienia zachowanie zwężenia.\n"
 "Wartość = 1.0 tworzy jednolite, liniowe zwężenie.\n"
 "Wartości > 1.0 tworzą gładkie zwężenie odpowiednie dla domyślnie "
 "odseparowanych\n"
-"floatlands.\n"
+"latających wysp.\n"
 "Wartości < 1.0 (np. 0.25) tworzą bardziej zdefiniowany poziom powierzchni z\n"
-"płaskimi nizinami, odpowiednimi dla jednolitej warstwy pływających wysp."
+"płaskimi nizinami, odpowiednimi dla jednolitej warstwy latającego lądu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Exposure compensation"
-msgstr "Współczynnik naświetlenia"
+msgstr "Kompensacja ekspozycji"
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
@@ -3546,12 +3614,11 @@ msgid "Fixed virtual joystick"
 msgstr "Ustaw wirtualny joystick"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
-"(Android) Mocuje pozycję wirtualnego joysticka.\n"
+"Mocuje pozycję wirtualnego joysticka.\n"
 "Gdy jest wyłączona, wirtualny joystick przestawi się do miejsca pierwszego "
 "dotknięcia."
 
@@ -3741,9 +3808,8 @@ msgid "Fullscreen mode."
 msgstr "Tryb pełnoekranowy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
-msgstr "Interfejsy użytkownika"
+msgstr "Interfejs graficzny"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -3850,10 +3916,10 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
-"Spraw by profiler instruował się samoczynnie:\n"
-"*instruowanie pustych funkcji.\n"
-"To estymuje narzut, który instrumentacja dodaje (+1 wywołanie funkcji).\n"
-"*instruowanie samplera będącego w użyciu do zaktualizowania statystyk."
+"Spraw by profiler zmierzył się sam:\n"
+"* Zmierz pustą funkcję.\n"
+"To szacuje narzut, który pomiar dodaje (+1 wywołanie funkcji).\n"
+"* Zmierz samplera będącego w użyciu do aktualizowania statystyk."
 
 #: src/settings_translation_file.cpp
 msgid "Heat blend noise"
@@ -3864,10 +3930,8 @@ msgid "Heat noise"
 msgstr "Szum gorąca"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
-msgstr ""
-"Wysokość początkowego rozmiaru okna. Ignorowana w trybie pełnoekranowym."
+msgstr "Komponent wysokościowy początkowego rozmiaru okna."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -3931,25 +3995,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Enable mouse wheel for selection"
-msgstr ""
+msgstr "Hotbar: Włącz użycie kółka myszy do wyboru"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Invert mouse wheel direction"
-msgstr ""
+msgstr "Hotbar: Odwróć kierunek kółka myszy"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
 msgstr "Jak głębokie tworzyć rzeki."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
 "Jak szybko fale cieczy będą się poruszać. Wyższa = szybciej.\n"
-"Wartość ujemna, fale cieczy będą poruszać się do tyłu.\n"
-"Wymaga włączenia falowania cieczy."
+"Wartość ujemna, fale cieczy będą poruszać się do tyłu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4057,32 +4119,29 @@ msgstr ""
 "swojego hasła na puste."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, the server will perform map block occlusion culling based on\n"
 "on the eye position of the player. This can reduce the number of blocks\n"
 "sent to the client by 50-80%. Clients will no longer receive most\n"
 "invisible blocks, so that the utility of noclip mode is reduced."
 msgstr ""
-"Jeśli opcja jest włączona, serwer przeprowadzi usuwanie bloków mapy na "
-"podstawie\n"
-"pozycji gracza. Zredukuje to o 50-80% liczbę bloków\n"
-"wysyłanych na serwer. Klient nie będzie już widział większości ukrytych "
-"bloków,\n"
+"Jeśli opcja jest włączona, serwer przeprowadzi pomijanie przesłoniętych "
+"bloków mapy\n"
+"na podstawie pozycji gracza. To może zredukować o 50-80% liczbę bloków "
+"wysyłanych\n"
+"do klienta. Klient nie będzie już widział większości zakrytych bloków,\n"
 "więc przydatność trybu noclip zostanie ograniczona."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place nodes at the position (feet + eye level) where you "
 "stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
-"Jeżeli włączone, możesz położyć bloki w pozycji gdzie stoisz.\n"
+"Jeżeli włączone, możesz stawiać bloki w pozycji, gdzie stoisz.\n"
 "Pomocne gdy pracujesz na małych powierzchniach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If the CSM restriction for node range is enabled, get_node calls are "
 "limited\n"
@@ -4101,7 +4160,6 @@ msgstr ""
 "informacja o czasie zostanie dodana do komunikatu polecenia czatu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If the file size of debug.txt exceeds the number of megabytes specified in\n"
 "this setting when it is opened, the file is moved to debug.txt.1,\n"
@@ -4109,9 +4167,10 @@ msgid ""
 "debug.txt is only moved if this setting is positive."
 msgstr ""
 "Jeśli rozmiar pliku debug.txt przekroczy liczbę megabajtów określoną w tym "
-"ustawieniu, plik zostanie przeniesiony do pliku debug.txt.1.\n"
-"w tym ustawieniu, plik jest przenoszony do debug.txt.1,\n"
-"usuwając starszy debug.txt.1, jeśli taki istnieje.\n"
+"ustawieniu\n"
+"podczas otwierania, plik zostanie przeniesiony do pliku debug.txt.1, w tym "
+"usuwając\n"
+"starszy debug.txt.1, jeśli taki istnieje.\n"
 "debug.txt jest przenoszony tylko wtedy, gdy wartość tego ustawienia jest "
 "dodatnia."
 
@@ -4136,58 +4195,54 @@ msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
 msgstr "Przeźroczystość konsoli w grze (od 0.0 do 1.0)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Initial vertical speed when jumping, in nodes per second."
-msgstr ""
-"Początkowa prędkość pionowa podczas skoku, w blokach na sekundę do kwadratu."
+msgstr "Początkowa prędkość pionowa podczas skoku, w blokach na sekundę."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
-"Instrument wbudowany.\n"
-"Najczęściej potrzebny tylko dla osób pracujących nad jądrem"
+"Mierz kod wbudowany.\n"
+"Najczęściej potrzebny tylko dla osób pracujących nad silnikiem"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument chat commands on registration."
-msgstr "Instrument poleceń czatu przy rejestracji."
+msgstr "Mierz polecenia czatu przy rejestracji."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
-"Poinstruuj globalne funkcje zwrotne przy rejestracji \n"
+"Mierz globalne funkcje zwrotne przy rejestracji.\n"
 "(wszystko co prześlesz do funkcji minetest.register_*() )"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
 msgstr ""
-"Poinstruuj działanie funkcji aktywnych modyfikatorów bloków przy rejestracji."
+"Mierz działanie funkcji modyfikatorów aktywnych bloków (ABM) przy "
+"rejestracji."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
 msgstr ""
-"Poinstruuj działanie funkcji ładowania modyfikatorów bloków przy rejestracji."
+"Mierz działanie funkcji modyfikatorów ładowania bloków (LBM) przy "
+"rejestracji."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr "Poinstruuj metody jednostkowe przy rejestracji."
+msgstr "Mierz metody bytów przy rejestracji."
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr "Interwał zapisywania ważnych zmian w świecie, w sekundach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Interval of sending time of day to clients, stated in seconds."
-msgstr "Interwał wysyłania czasu gry do klientów."
+msgstr "Interwał wysyłania czasu gry do klientów, w sekundach."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
@@ -4200,20 +4255,20 @@ msgstr "Odwróć mysz"
 #: src/settings_translation_file.cpp
 msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
 msgstr ""
+"Odwróć kierunek kółka myszy (przewijania) przy wyborze przedmiotów w "
+"hotbarze."
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
 msgstr "Odwróć pionowy ruch myszy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic font path"
-msgstr "Ścieżka czcionki typu Monospace"
+msgstr "Ścieżka czcionki kursywnej"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic monospace font path"
-msgstr "Ścieżka czcionki typu Monospace"
+msgstr "Ścieżka czcionki kursywnej typu Monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
@@ -4224,7 +4279,6 @@ msgid "Iterations"
 msgstr "Iteracje"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Iterations of the recursive function.\n"
 "Increasing this increases the amount of fine detail, but also\n"
@@ -4245,21 +4299,18 @@ msgid "Joystick button repetition interval"
 msgstr "Interwał powtarzania przycisku joysticka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick dead zone"
-msgstr "Typ Joysticka"
+msgstr "Strefa martwa joysticka"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Czułość drgania joysticka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick type"
 msgstr "Typ Joysticka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "W component of hypercomplex constant.\n"
@@ -4269,12 +4320,11 @@ msgid ""
 msgstr ""
 "Wyłącznie dla Zbioru Julii: \n"
 "komponent W stałej hiperzespolonej, \n"
-"która determinuje fraktali.\n"
+"która determinuje kształt fraktali.\n"
 "Nie ma wpływu na fraktale trójwymiarowe.\n"
 "Zakres to w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "X component of hypercomplex constant.\n"
@@ -4287,7 +4337,6 @@ msgstr ""
 "Zakres to w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Y component of hypercomplex constant.\n"
@@ -4299,7 +4348,6 @@ msgstr ""
 "Zakres to w przybliżeniu -2 do 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Z component of hypercomplex constant.\n"
@@ -4336,7 +4384,6 @@ msgid "Keyboard and Mouse"
 msgstr "Klawiatura i mysz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Kick players who sent more than X messages per 10 seconds."
 msgstr ""
 "Wyrzuca graczy, którzy wysłali więcej niż X wiadomości w ciągu 10 sekund."
@@ -4358,19 +4405,16 @@ msgid "Large cave depth"
 msgstr "Głębia dużej jaskini"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large cave maximum number"
 msgstr "Maksymalna liczba dużych jaskiń"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large cave minimum number"
 msgstr "Minimalna liczba dużych jaskiń"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large cave proportion flooded"
-msgstr "Duża część jaskini zalana"
+msgstr "Zalana część dużej jaskini"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -4389,32 +4433,34 @@ msgstr ""
 "-   Opaque: wyłącza przeźroczystość"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Długość interwału czasowego serwera w trakcie którego obiekty są ogólnie "
-"aktualizowane \n"
-"przez sieć."
+"Długość interwału czasowego serwera (w trakcie którego wszystko jest na "
+"ogół\n"
+"aktualizowane), wyrażony w sekundach.\n"
+"Nie ma zastosowania w sesjach hostowanych z menu klienta."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Szybkość fal wodnych"
+msgstr "Szybkość fal płynów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between Active Block Modifier (ABM) execution cycles, stated "
 "in seconds."
-msgstr "Długość czasu pomiędzy wykonywanymi cyklami ABM"
+msgstr ""
+"Długość czasu pomiędzy cyklami wykonywania modyfikatorów aktywnych bloków "
+"(ABM), wyrażona w sekundach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between NodeTimer execution cycles, stated in seconds."
-msgstr "Długość czasu pomiędzy wykonywanymi cyklami NodeTimer"
+msgstr ""
+"Długość czasu pomiędzy cyklami wykonywania NodeTimer'ów, wyrażona w "
+"sekundach."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4423,7 +4469,6 @@ msgstr ""
 "Czas pomiędzy cyklami zarządzania aktywnymi blokami, podany w sekundach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Level of logging to be written to debug.txt:\n"
 "-    <nothing> (no logging)\n"
@@ -4442,31 +4487,28 @@ msgstr ""
 "-   warning\n"
 "-   action\n"
 "-   info\n"
-"-   verbose"
+"-   verbose\n"
+"-   trace"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost"
-msgstr "Przyśpieszenie środkowe krzywej światła"
+msgstr "Wzmocnienie krzywej światła"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost center"
 msgstr "Centrum środkowego przyśpieszenia krzywej światła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost spread"
-msgstr "Rozrzut przyśpieszenia środkowego krzywej światła"
+msgstr "Rozrzut wzmocnienia krzywej światła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve gamma"
-msgstr "Przyśpieszenie środkowe krzywej światła"
+msgstr "Gamma krzywej światła"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve high gradient"
-msgstr "Przyśpieszenie środkowe krzywej światła"
+msgstr "Górny gradient krzywej światła"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve low gradient"
@@ -4517,7 +4559,6 @@ msgid "Liquid queue purge time"
 msgstr "Czas kolejki czyszczenia cieczy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Liquid sinking"
 msgstr "Zanurzanie w cieczy"
 
@@ -4544,9 +4585,8 @@ msgstr ""
 " Przydatne dla twórców modów i operatorów serwerów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Loading Block Modifiers"
-msgstr "Interwał modyfikatora aktywnego bloku"
+msgstr "Modyfikatory Ładowania Bloków (LBM)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4563,9 +4603,8 @@ msgid "Lower Y limit of dungeons."
 msgstr "Zmniejsz limit Y dla lochów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "Zmniejsz limit Y dla lochów."
+msgstr "Dolny limit Y dla latających wysp."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
@@ -4579,27 +4618,20 @@ msgstr ""
 "kierunku patrzenia."
 
 #: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Zmienia ciecze w nieprzeźroczyste"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map Compression Level for Disk Storage"
-msgstr "Poziom kompresji mapy dla pamięci masowej dysku"
+msgstr "Poziom kompresji mapy dla pamięci masowej na dysku"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map Compression Level for Network Transfer"
-msgstr "Poziom kompresji map dla transferu sieciowego"
+msgstr "Poziom kompresji mapy dla transferu sieciowego"
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Katalog map"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map generation attributes specific to Mapgen Carpathian."
-msgstr "Właściwości generowania mapy określające Mapgen Carpathian."
+msgstr "Właściwości generowania mapy specyficzne dla generatora Carpathian."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4610,18 +4642,16 @@ msgstr ""
 "Do płaskiego świata mogą być dodane przypadkowe jeziora i wzgórza."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"Właściwości generowania mapy określające Mapgen v7.\n"
-"\"grzbiety\" aktywują tworzenie niefraktalnego terenu:\n"
+"Właściwości generowania mapy specyficzne dla generatora Fractal.\n"
+"\"terrain\" aktywuje tworzenie niefraktalnego terenu:\n"
 "oceanu, wysp oraz podziemi."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Valleys.\n"
 "'altitude_chill': Reduces heat with altitude.\n"
@@ -4630,7 +4660,7 @@ msgid ""
 "to become shallower and occasionally dry.\n"
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
-"Atrybuty generowania mapy specyficzne dla dolin Mapgen.\n"
+"Atrybuty generowania mapy specyficzne dla generatora Valleys.\n"
 "'altitude_chill': Zmniejsza ciepło wraz z wysokością nad poziomem morza.\n"
 "'humid_rivers': Zwiększa wilgotność wokół rzek.\n"
 "'vary_river_depth': Jeżeli włączone, niska wilgotność i wysoka temperatura "
@@ -4639,22 +4669,24 @@ msgstr ""
 "'altitude_dry': Zmniejsza wilgotność wraz z wysokością."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map generation attributes specific to Mapgen v5."
-msgstr "Właściwości generowania mapy określające Mapgen v5."
+msgstr "Właściwości generowania mapy specyficzne dla generatora v5."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"Atrybuty generowania map specyficzne dla Generatora map v6.\n"
-"Flaga „biomów śnieżnych” włącza nowy system 5 biomów.\n"
-"Gdy flaga „biomy śnieżne” jest włączona, dżungle są automatycznie włączane "
-"i\n"
-"flaga „dżungli” jest ignorowana."
+"Właściwości generowania map specyficzne dla generatora v6.\n"
+"Flaga 'snowbiomes' włącza nowy system 5 biomów.\n"
+"Gdy flaga 'snowbiomes' jest włączona, dżungle są automatycznie włączane i\n"
+"flaga 'jungles' jest ignorowana.\n"
+"Flaga 'temples' wyłącza generowanie świątyń pustynnych. Zwykłe lochy będą "
+"pojawiać się zamiast tego."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4677,9 +4709,8 @@ msgid "Map save interval"
 msgstr "Interwał zapisu mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map shadows update frames"
-msgstr "Interwał czasowy aktualizacji cieczy"
+msgstr "Klatki aktualizacji cieni mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
@@ -4690,87 +4721,68 @@ msgid "Mapblock mesh generation delay"
 msgstr "Opóźnienie generacji siatki bloków Mapblock"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generation threads"
-msgstr "Opóźnienie generacji siatki bloków Mapblock"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Wielkość pamięci podręcznej generatora siatki bloków Mapblock w MB"
+msgstr "Wątki generowania modelu bloku mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Przekroczenie czasu wyładowania bloków mapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian"
-msgstr "Generator mapy fractal"
+msgstr "Generator mapy Carpathian"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian specific flags"
-msgstr "Specyficzne flagi dla generatora Mapgen flat"
+msgstr "Specyficzne flagi dla generatora Carpathian"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat"
-msgstr "Generator mapy flat"
+msgstr "Generator mapy Płaski"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat specific flags"
-msgstr "Specyficzne flagi dla generatora Mapgen flat"
+msgstr "Specyficzne flagi dla generatora Płaskiego"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal"
-msgstr "Generator mapy fractal"
+msgstr "Generator mapy Fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Specyficzne flagi dla generatora Mapgen flat"
+msgstr "Specyficzne flagi dla generatora Fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5"
-msgstr "Generator mapy v5"
+msgstr "Generator mapy V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5 specific flags"
-msgstr "Generator mapy flat flagi"
+msgstr "Flagi specyficzne dla generatora mapy V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6"
-msgstr "Generator mapy v6"
+msgstr "Generator mapy V6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6 specific flags"
-msgstr "Generator mapy flat flagi"
+msgstr "Flagi specyficzne dla generatora mapy V6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7"
-msgstr "Generator mapy v7"
+msgstr "Generator mapy V7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7 specific flags"
-msgstr "Specyficzne flagi Mapgen v7"
+msgstr "Flagi specyficzne dla generatora mapy V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
 msgstr "Generator mapy Valleys"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys specific flags"
-msgstr "Specyficzne flagi dla generatora Mapgen flat"
+msgstr "Specyficzne flagi dla generatora Valleys"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
@@ -4805,51 +4817,45 @@ msgid "Maximum FPS"
 msgstr "Maksymalny FPS"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum FPS when the window is not focused, or when the game is paused."
-msgstr "Maksymalny FPS gdy gra spauzowana."
+msgstr "Maksymalny FPS gdy przełączono poza okno gry lub gra jest zapauzowana."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum distance to render shadows."
-msgstr "Maksymalna odległość do renderowania cieni."
+msgstr "Maksymalna odległość dla renderowania cieni."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
 msgstr "Maksymalna ilość bloków załadowanych w sposób wymuszony"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum hotbar width"
-msgstr "Maksymalna długość hotbar"
+msgstr "Maksymalna długość hotbara"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum limit of random number of large caves per mapchunk."
-msgstr "Maksymalny limit losowej liczby dużych jaskiń na mapchunk."
+msgstr "Górna granica losowej liczby dużych jaskiń na mapchunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum limit of random number of small caves per mapchunk."
-msgstr "Maksymalny limit losowej liczby małych jaskiń na mapchunk."
+msgstr "Górna granica losowej liczby małych jaskiń na mapchunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
-"Maksymalny opór cieczy. Wpływa na spowolnienie przy wejściu w ciecz \n"
+"Maksymalny opór cieczy. Wpływa na spowolnienie przy wejściu w ciecz\n"
 "z dużą prędkością."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks that are simultaneously sent per client.\n"
 "The maximum total count is calculated dynamically:\n"
 "max_total = ceil((#clients + max_users) * per_client / 4)"
 msgstr ""
-"Maksymalna ilość bloków, które są jednocześnie wysyłane na jednego klienta.\n"
+"Maksymalna liczba bloków, które są jednocześnie wysyłane na jednego klienta."
+"\n"
 "Maksymalna łączna liczba jest obliczana dynamicznie:\n"
 "max_total = ceil((#clients + max_users) * per_client / 4)"
 
@@ -4859,25 +4865,22 @@ msgstr ""
 "Maksymalna liczba bloków, które mogą być skolejkowane podczas wczytywania."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
 "Maksymalna liczba bloków do skolejkowania, które mają być wygenerowane.\n"
-"Pozostaw puste a odpowiednia liczba zostanie dobrana automatycznie."
+"Ten limit jest egzekwowany na gracza."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
 "Maksymalna liczba bloków do skolejkowania które mają być wczytane z pliku.\n"
-"Pozostaw puste a odpowiednia liczba zostanie dobrana automatycznie."
+"Ten limit jest egzekwowany na gracza."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of concurrent downloads. Downloads exceeding this limit will "
 "be queued.\n"
@@ -4885,7 +4888,7 @@ msgid ""
 msgstr ""
 "Maksymalna liczba jednocześnie pobieranych plików. Pobieranie przekraczające "
 "ten limit zostanie umieszczone w kolejce.\n"
-"Powinien być niższy niż curl_parallel_limit."
+"To powinno być niższe niż curl_parallel_limit."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4908,7 +4911,6 @@ msgstr ""
 "numer klienta."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of players that can be connected simultaneously."
 msgstr "Maksymalna liczba graczy, która może się jednocześnie połączyć."
 
@@ -4937,34 +4939,30 @@ msgid "Maximum simultaneous block sends per client"
 msgstr "Maksymalny jednoczesny blok wysłany, na każdego klienta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum size of the outgoing chat queue"
-msgstr "Maksymalny rozmiar kolejki wiadomości czatu"
+msgstr "Maksymalny rozmiar kolejki wychodzących wiadomości czatu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum size of the outgoing chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
-"Maksymalny rozmiar kolejki wiadomości czatu\n"
-"Wartość 0, wyłącza kolejkę, -1 to nieograniczony rozmiar kolejki."
+"Maksymalny rozmiar kolejki wychodzących wiadomości czatu\n"
+"Wartość 0 wyłącza kolejkę, -1 to nieograniczony rozmiar kolejki."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum time a file download (e.g. a mod download) may take, stated in "
 "milliseconds."
-msgstr "Maksymalny czas na pobranie pliku (np.: moda) w ms."
+msgstr "Maksymalny czas na pobranie pliku (np. moda) w milisekundach."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum time an interactive request (e.g. server list fetch) may take, "
 "stated in milliseconds."
 msgstr ""
-"Maksymalny czas, jaki może zająć interaktywne żądanie (np. pobranie listy z "
-"serwera), podany w milisekundach."
+"Maksymalny czas, jaki może zająć interaktywne żądanie (np. pobranie listy "
+"serwerów), podany w milisekundach."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
@@ -4987,7 +4985,6 @@ msgid "Method used to highlight selected object."
 msgstr "Metoda użyta do podświetlenia wybranego obiektu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimal level of logging to be written to chat."
 msgstr "Minimalny poziom logowania, który ma być zapisywany na czacie."
 
@@ -4996,14 +4993,16 @@ msgid "Minimap scan height"
 msgstr "Wysokość skanowania minimapy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Minimalna przerwa pomiędzy powtórzeniem kopania"
+
+#: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
-msgstr "Szum 3D, który wpływa na liczbę lochów na jeden mapchunk."
+msgstr "Dolna granica losowej liczby dużych jaskiń na mapchunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimum limit of random number of small caves per mapchunk."
-msgstr "Minimalny limit losowej liczby małych jaskiń na mapchunk."
+msgstr "Dolna granica losowej liczby małych jaskiń na mapchunk."
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -5011,26 +5010,23 @@ msgstr "Mip-Mappowanie"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Różne"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Profiler"
-msgstr "Profiler"
+msgstr "Profiler modów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Security"
-msgstr "Bezpieczeństwo"
+msgstr "Bezpieczeństwo modów"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
 msgstr "Kanały modów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Modifies the size of the HUD elements."
-msgstr "Modyfikuje rozmiar elementów paska HUD."
+msgstr "Modyfikuje rozmiar elementów HUD."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
@@ -5041,9 +5037,8 @@ msgid "Monospace font size"
 msgstr "Rozmiar czcionki Monospace"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Monospace font size divisible by"
-msgstr "Rozmiar czcionki Monospace"
+msgstr "Rozmiar czcionki Monospace podzielny przez"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain height noise"
@@ -5054,14 +5049,12 @@ msgid "Mountain noise"
 msgstr "Szum góry"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mountain variation noise"
-msgstr "Szum wysokości góry"
+msgstr "Szum zróżnicowania gór"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mountain zero level"
-msgstr "Szum góry"
+msgstr "Poziom zerowy gór"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
@@ -5071,6 +5064,10 @@ msgstr "Czułość myszy"
 msgid "Mouse sensitivity multiplier."
 msgstr "Mnożnik czułości myszy."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Próg ruchu"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Szum błota"
@@ -5088,7 +5085,6 @@ msgid "Mute sound"
 msgstr "Wycisz dźwięk"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Name of map generator to be used when creating a new world.\n"
 "Creating a world in the main menu will override this.\n"
@@ -5097,8 +5093,8 @@ msgid ""
 msgstr ""
 "Nazwa generatora map, który ma być użyty podczas tworzenia nowego świata.\n"
 "Tworzenie świata w menu głównym nadpisze tę wartość.\n"
-"Obecne mapgeny są w bardzo niestabilnym stanie:\n"
-"- Opcjonalne floatlands z v7 (domyślnie wyłączone)."
+"Obecne mapgeny w bardzo niestabilnym stanie:\n"
+"- Opcjonalne latające wyspy z v7 (domyślnie wyłączone)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5153,7 +5149,6 @@ msgid "Number of emerge threads"
 msgstr "Liczba powstających wątków"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of emerge threads to use.\n"
 "Value 0:\n"
@@ -5175,7 +5170,7 @@ msgstr ""
 "OSTRZEŻENIE: Zwiększenie liczby wątków emerge zwiększa szybkość mapgena "
 "silnika,\n"
 "ale może to wpłynąć na wydajność gry przez zakłócanie innych\n"
-"procesami, szczególnie w grze dla pojedynczego gracza i/lub podczas "
+"procesów, szczególnie w grze dla pojedynczego gracza i/lub podczas "
 "uruchamiania kodu Lua w\n"
 "'on_generated'. Dla wielu użytkowników optymalnym ustawieniem może być '1'."
 
@@ -5191,7 +5186,6 @@ msgstr ""
 "konsumpcją pamięci (4096=100MB, praktyczna zasada)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
 msgstr "Dozwolona liczba wiadomości wysłanych przez gracza w ciągu 10 sekund."
 
@@ -5201,22 +5195,19 @@ msgid ""
 "Value of 0 (default) will let Minetest autodetect the number of available "
 "threads."
 msgstr ""
+"Liczba wątków do użycia do generacji modeli.\n"
+"Wartość 0 (domyślna) sprawi, że Minetest automatycznie wykryje liczbę "
+"dostępnych wątków."
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr ""
+msgstr "Occlusion Culler"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Occlusion Culling"
-msgstr "Occulusion culling po stronie serwera"
+msgstr "Pomijanie przesłoniętych modeli po stronie serwera"
 
 #: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Nieprzeźroczyste ciecze"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
 msgstr ""
@@ -5234,9 +5225,12 @@ msgstr ""
 "otwarty."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "OpenGL debug"
+msgstr "Debug OpenGL"
+
+#: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
-msgstr "Opcjonalna zmiana koloru łącza internetowego czatu."
+msgstr "Opcjonalna zmiana koloru łącza internetowego na czacie."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5249,12 +5243,11 @@ msgstr ""
 "jest niedostępna."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
-"Ścieżka w której zapisywane są zrzuty ekranu. Może być bezwzględna lub "
+"Ścieżka, w której zapisywane są zrzuty ekranu. Może być bezwzględna lub "
 "względna.\n"
 "Folder zostanie utworzony, jeśli jeszcze nie istnieje."
 
@@ -5287,40 +5280,34 @@ msgid "Pause on lost window focus"
 msgstr "Pauza, gdy okno jest nieaktywne"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks load from disk"
-msgstr "Limit załadowanych bloków z dysku na jednego gracza"
+msgstr "Limit bloków zakolejkowanych do załadowania z dysku na jednego gracza"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "Limit kolejek oczekujących do wytworzenia"
+msgstr "Limit bloków zakolejkowanych do wygenerowania na jednego gracza"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
 msgstr "Fizyka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Place repetition interval"
-msgstr "Interwał powtórzenia prawego kliknięcia myszy"
+msgstr "Interwał powtórzenia stawiania"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
 msgstr "Odległość przesyłania graczy"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Poisson filtering"
-msgstr "Filtrowanie dwuliniowe"
+msgstr "Filtrowanie Poissona"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Post Processing"
-msgstr "Przetwarzanie końcowe"
+msgstr "Post Processing"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Prevent digging and placing from repeating when holding the respective "
 "buttons.\n"
@@ -5329,7 +5316,8 @@ msgid ""
 msgstr ""
 "Zapobiegaj powtarzaniu kopania i stawiania bloków podczas przytrzymania "
 "przycisków myszy.\n"
-"Włącz to jeśli zbyt często kopiesz lub stawiasz obiekty przez przypadek."
+"Włącz to jeśli zbyt często kopiesz lub stawiasz obiekty przez przypadek.\n"
+"Na ekranach dotykowych, to wpływa tylko na kopanie."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -5356,25 +5344,31 @@ msgstr "Profiler"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Prometheus listener address"
-msgstr "Adres słuchacza Prometheusa"
+msgstr "Adres nasłuchiwacza Prometheusa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Prometheus listener address.\n"
 "If Minetest is compiled with ENABLE_PROMETHEUS option enabled,\n"
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetched on http://127.0.0.1:30000/metrics"
 msgstr ""
-"Adres listenera Prometheus.\n"
+"Adres listenera Prometheusa.\n"
 "Jeśli Minetest jest skompilowany z włączoną opcją ENABLE_PROMETHEUS,\n"
-"włącz słuchanie metryk dla Prometheusa na tym adresie.\n"
-"Metryki mogą być pobierane na stronie http://127.0.0.1:30000/metrics"
+"włącz listener metryk dla Prometheusa na tym adresie.\n"
+"Metryki mogą być ładowane na http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Proportion of large caves that contain liquid."
-msgstr "Proporcja dużych jaskiń, które zawierają ciecz."
+msgstr "Część dużych jaskiń, która zawiera ciecz."
+
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Minimalna wersja protokołu"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Gest uderzenia"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5393,6 +5387,10 @@ msgstr "Podwyższa teren by stworzyć doliny wokół rzek."
 msgid "Random input"
 msgstr "Losowe wejście"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Losowa kolejność ładowania modów"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Najnowsze wiadomości czatu"
@@ -5619,8 +5617,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5768,8 +5766,9 @@ msgstr ""
 "Zakres: od 0.1 do 10.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Ustaw język. Zostaw puste pole, aby użyć języka systemowego.\n"
@@ -5820,6 +5819,10 @@ msgstr ""
 "Ustaw na prawda aby włączyć efekt bloom.\n"
 "Jasne kolory będą rozmywać się na sąsiednich obiektach."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5869,11 +5872,11 @@ msgid "Shaders"
 msgstr "Shadery"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shadery pozwalają na zaawansowane efekty wizualne, mogą również zwiększyć "
 "wydajność niektórych kart\n"
@@ -5965,16 +5968,6 @@ msgstr ""
 "Zmiana tej wartości ma specjalne zastosowanie, zalecane jest pozostawienie\n"
 "jej nietkniętą."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Rozmiar pamięci bloków mapy generatora siatki. Zwiększenie\n"
-"zmieni rozmiar % pamięci, ograniczając dane kopiowane z głównego wątku\n"
-"oraz ilość drgań."
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Sky Body Orbit Tilt"
@@ -6015,7 +6008,7 @@ msgstr "Płynne oświetlenie"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Wygładza obracanie widoku kamery w trybie kinowym. Wartość 0 wyłącza tą "
 "funkcję."
@@ -6043,6 +6036,15 @@ msgstr "Prędkość skradania, w blokach na sekundę."
 msgid "Soft shadow radius"
 msgstr "Przeźroczystość cienia czcionki"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Dźwięk"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Flaga czarnej listy ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6132,7 +6134,6 @@ msgid "Strip color codes"
 msgstr "Usuń kody kolorów"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Surface level of optional water placed on a solid floatland layer.\n"
 "Water is disabled by default and will only be placed if this value is set\n"
@@ -6151,12 +6152,12 @@ msgstr ""
 "wartość ta jest ustawiona\n"
 "powyżej 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (początek\n"
 "górnego zwężenia).\n"
-"***OSTRZEŻENIE, POTENCJALNE ZAGROŻENIE DLA ŚWIATÓW I WYDAJNOŚCI "
-"SERWERÓW***:\n"
-"Przy włączonym umieszczaniu wody, tereny pływające muszą być ustawione i "
+"***OSTRZEŻENIE, POTENCJALNE ZAGROŻENIE DLA ŚWIATÓW I WYDAJNOŚCI SERWERÓW***:"
+"\n"
+"Przy włączonym umieszczaniu wody, latające wyspy muszą być skonfigurowane i "
 "przetestowane\n"
-"oraz być warstwą stałą poprzez ustawienie 'mgv7_floatland_density' na 2.0 "
-"(lub innej\n"
+"oraz być warstwą stałą poprzez ustawienie 'mgv7_floatland_density' na 2.0 ("
+"lub innej\n"
 "wymaganej wartości w zależności od 'mgv7_np_floatland'), \n"
 "aby uniknąć intensywnego przepływu wody na serwerze oraz ogromnego zalania\n"
 "powierzchni świata poniżej."
@@ -6263,6 +6264,12 @@ msgstr ""
 "Domyślny format w jakim są zapisywane profile,\n"
 "gdy wpisujemy `/ profiler save [format]` bez określonego formatu."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6271,13 +6278,27 @@ msgstr ""
 "Ścieżka pliku zbliżona ścieżce twojego świata, w której zapisywane będą "
 "profile."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Identyfikator użycia joysticka"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Długość w pikselach wymagana do wejścia w interakcję z ekranem dotykowym."
 
@@ -6295,6 +6316,15 @@ msgstr ""
 "Wartość domyślna to 1.0 (1/2 węzła).\n"
 "Wymaga włączenia falujących cieczy."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Czas w sekundach między kolejnymi położeniem węzłów po przytrzymaniu\n"
+"przycisku umieszczania.."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Interfejs sieciowy używany na serwerze."
@@ -6330,7 +6360,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Zaplecze renderowania.\n"
 "Po zmianie wymagane jest ponowne uruchomienie.\n"
@@ -6420,6 +6450,10 @@ msgstr ""
 "Pierwsze z czterech szumów 2D, które razem określają wysokość gór/łańcuchów "
 "górskich."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6475,15 +6509,15 @@ msgstr "Czułość myszy"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Mnożnik czułości myszy."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Próg ekranu dotykowego"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Kompromisy dla wydajności"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Nieprzeźroczyste ciecze"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Odległość sortowania przezroczystości"
@@ -6522,9 +6556,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
+"Link do pliku JSON zawierającego informacje o najnowszym wydaniu Minetest"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6558,16 +6596,15 @@ msgstr "Usuń nieużywane dane serwera"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "Zaktualizuj adres URL informacji"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
 msgstr "Górna granica Y lochów."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "Górna granica Y lochów."
+msgstr "Górna granica Y latających wysp."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -6589,7 +6626,7 @@ msgstr "Użyj filtrowania tri-linearnego podczas skalowania tekstur."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "Użyj celownika do ekranu dotykowego"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6638,10 +6675,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfejsy użytkownika"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Synchronizacja pionowa"
@@ -6734,6 +6767,10 @@ msgstr "Joystick wirtualny aktywuje przycisk aux"
 msgid "Volume"
 msgstr "Głośność"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6743,6 +6780,16 @@ msgstr ""
 "Włącza mapowanie paralaksy.\n"
 "Wymaga włączenia shaderów."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Maksymalna ilość klatek na sekundę gdy gra zapauzowana bądź nieaktywna"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Płynne oświetlenie"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6888,7 +6935,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "Kiedy okno jest zmaksymalizowane"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6933,7 +6980,7 @@ msgstr "Szerokość linii zaznaczenia bloków."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Okno zmaksymalizowane"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7006,10 +7053,10 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
-"Odległość Y, na której pływające tereny zwężają się od pełnej gęstości do "
-"zera.\n"
+"Odległość Y, na której latające wyspy zwężają się od pełnej gęstości do zera."
+"\n"
 "Zbieżność rozpoczyna się w tej odległości od granicy Y.\n"
-"W przypadku litej warstwy pływów kontroluje wysokość wzgórz/gór.\n"
+"W przypadku litej warstwy latającego lądu kontroluje wysokość wzgórz/gór.\n"
 "Musi być mniejsza lub równa połowie odległości między granicami Y."
 
 #: src/settings_translation_file.cpp
@@ -7052,12 +7099,18 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(wymagana obsługa gry)"
 
+#~ msgid "- Address: "
+#~ msgstr "Adres "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "Tryb kreatywny "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Obrażenia: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7095,6 +7148,13 @@ msgstr "Limit żądań równoległych cURL"
 #~ "Pozostaw pusty aby utworzyć lokalny serwer.\n"
 #~ "Zauważ że pole adresu w głównym menu nadpisuje te ustawienie."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ustaw konfiguracje DPI dla twojego ekranu (nie X11/Tylko Android) np. dla "
+#~ "ekranów 4k."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7169,6 +7229,9 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bity na piksel (głębia koloru) w trybie pełnoekranowym."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Granice bloków pokazane dla wszystkich bloków"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Mapowanie wypukłości"
 
@@ -7195,6 +7258,9 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centrum przyśpieszenia środkowego krzywej światła."
 
+#~ msgid "Change Keys"
+#~ msgstr "Zmień klawisze"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Zmień klawisze"
@@ -7268,6 +7334,38 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgstr ""
 #~ "Kontroluje szerokość tuneli, mniejsze wartości tworzą szersze tunele."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Sterowanie:\n"
+#~ "- %s: idź do przodu\n"
+#~ "- %s: przesuń się do tyłu\n"
+#~ "- %s: przesuń się w lewo\n"
+#~ "- %s: przesuń w prawo\n"
+#~ "- %s: skok/wspinaj się\n"
+#~ "- %s: kopanie/cios\n"
+#~ "- %s: połóż/użyj\n"
+#~ "- %s: skradanie się/schodzenie w dół\n"
+#~ "- %s: upuść przedmiot\n"
+#~ "- %s: ekwipunek\n"
+#~ "- Mysz: obróć / spójrz\n"
+#~ "- Kółko myszy: wybierz element\n"
+#~ "- %s: czat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreatywny"
 
@@ -7277,6 +7375,9 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Kolor celownika (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Włącz obrażenia"
 
@@ -7364,6 +7465,13 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Włącz potwierdzanie rejestracji"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Zezwala na korzystanie z VBO (obiektów bufora wierzchołków).\n"
+#~ "Powinno to znacznie polepszyć wydajność karty graficznej."
+
 #~ msgid "Enabled"
 #~ msgstr "Włączone"
 
@@ -7703,6 +7811,9 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrukcja"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Nieprawidłowa specyfikacja trybu gry."
+
 #~ msgid "Inventory key"
 #~ msgstr "Ekwipunek"
 
@@ -8444,6 +8555,13 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgstr ""
 #~ "Sprawia, że DirectX działa z LuaJIT. Wyłącz jeśli występują kłopoty."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Zmienia ciecze w nieprzeźroczyste"
+
+#, fuzzy
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Wielkość pamięci podręcznej generatora siatki bloków Mapblock w MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menu"
 
@@ -8677,15 +8795,21 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Proste liście"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Rozmiar pamięci bloków mapy generatora siatki. Zwiększenie\n"
+#~ "zmieni rozmiar % pamięci, ograniczając dane kopiowane z głównego wątku\n"
+#~ "oraz ilość drgań."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Płynne oświetlenie"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Wygładza obracanie widoku kamery. Wartość 0 wyłącza tą funkcję."
 
-#~ msgid "Sound"
-#~ msgstr "Dźwięk"
-
 #~ msgid "Special"
 #~ msgstr "Specialne"
 
@@ -8745,6 +8869,10 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Próg dotyku (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Próg ekranu dotykowego"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtrowanie trójliniowe"
 
@@ -8790,6 +8918,9 @@ msgstr "Limit żądań równoległych cURL"
 #~ "Jeśli jest ustawiony na 0, MSAA jest wyłączone.\n"
 #~ "Po zmianie tej opcji wymagane jest ponowne uruchomienie."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Zmienność wysokości wzgórz oraz głębokości jezior na gładkim terenie "
@@ -8879,8 +9010,14 @@ msgstr "Limit żądań równoległych cURL"
 #~ msgid "You died."
 #~ msgstr "Umarłeś."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nie zainstalowano żadnych trybów gry."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index e119a1c3d..287b89825 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Portuguese (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-08-15 22:23+0000\n"
-"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-01-30 16:01+0000\n"
+"Last-Translator: Alexsandro Vítor <alexsandro.vitor97@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
 "minetest/pt/>\n"
 "Language: pt\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.4-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -36,7 +36,7 @@ msgstr "Comando emitido: "
 
 #: builtin/client/chatcommands.lua
 msgid "List online players"
-msgstr "Liste os jogadores online"
+msgstr "Listar os jogadores online"
 
 #: builtin/client/chatcommands.lua
 msgid "Online players: "
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Comando não disponível: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Obtenha ajuda para comandos"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "tudo."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all| <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<Comando não disponível>"
@@ -105,6 +103,10 @@ msgstr "Ocorreu um erro:"
 msgid "Main menu"
 msgstr "Menu principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Reconectar"
@@ -133,19 +135,26 @@ msgstr "Nós suportamos apenas o protocolo versão $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Nós suportamos as versões de protocolo entre $1 e $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Erro na instalação \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "As dependências de $1 e $2 serão instaladas."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Erro ao baixar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 por $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Falhou em descarregar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Erro na extração: \"$1\" (Tipo de arquivo não suportado ou corrompido)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,156 +162,157 @@ msgstr ""
 "A descarregar $1,\n"
 "$2 na fila"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "A descarregar $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 dependências necessárias não foram encontradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 serão instalados e $2 dependências serão ignoradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Todos os pacotes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Já instalado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Voltar ao menu principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "A descarregar..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Jogos"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "A carregar..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nenhum pacote pode ser recuperado"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Sem resultados"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Sem atualizações"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Enfileirado"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pacotes de texturas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "O pacote $1 não foi encontrado."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Atualizar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Atualizar tudo [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Exibir mais informações num navegador da Web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Você precisa instalar um jogo antes de poder instalar um mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "As dependências de $1 e $2 serão instaladas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependências necessárias não foram encontradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 serão instalados e $2 dependências serão ignoradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Já instalado"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Jogo base:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependências:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "A descarregar..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Erro na instalação \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Erro ao baixar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Falhou em descarregar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Erro na extração: \"$1\" (Tipo de arquivo não suportado ou corrompido)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Jogos"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalar dependências ausentes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "A carregar..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nenhum pacote pode ser recuperado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Sem resultados"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Sem atualizações"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sobrescrever"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Verifique se o jogo base está correto."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Enfileirado"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pacotes de texturas"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Atualizar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Atualizar tudo [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Exibir mais informações num navegador da Web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sobrescrever"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -452,10 +462,20 @@ msgstr "Criar"
 msgid "Decorations"
 msgstr "Decorações"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "O Development Test destina-se apenas a programadores."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Masmorras"
@@ -650,7 +670,7 @@ msgstr "Registe-se"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Ignorar"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -658,21 +678,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Por muito tempo, a engine Minetest foi publicada com um jogo padrão chamado "
+"\"Minetest Game\". Desde o Minetest 5.8.0, Minetest agora é publicado sem um "
+"jogo padrão."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Se quiser continuar jogando em seus mundos de Minetest Game, você precisa "
+"reinstalar o Minetest Game."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game não vem mais instalado por padrão"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Instalar outro jogo"
+msgstr "Reinstalar Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -749,9 +773,8 @@ msgid "Select file"
 msgstr "Selecione o ficheiro"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Seleccionar"
+msgstr "Selecionar"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -820,20 +843,16 @@ msgstr "amenizado"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Usar idioma do sistema)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Acessibilidade"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Voltar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Mudar teclas"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -843,7 +862,8 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Limpar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controles"
 
@@ -852,18 +872,16 @@ msgid "General"
 msgstr "Em geral"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Modo rápido"
+msgstr "Movimento"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Restaurar valores por defeito"
+msgstr "Restaurar valores padrão"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Restaurar valores padrão ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -871,7 +889,7 @@ msgstr "Procurar"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Exibir configurações avançadas"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -890,12 +908,14 @@ msgid "Content: Mods"
 msgstr "Conteúdo: Mods"
 
 #: builtin/mainmenu/settings/shadows_component.lua
+#, fuzzy
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(O jogo precisará habilitar sombras também)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
+#, fuzzy
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -979,18 +999,16 @@ msgid "Browse online content"
 msgstr "Procurar conteúdo online"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Procurar conteúdo online"
+msgstr "Procurar conteúdo online [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Conteúdo"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Conteúdo"
+msgstr "Conteúdo [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1013,9 +1031,8 @@ msgid "Rename"
 msgstr "Renomear"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<Comando não disponível>"
+msgstr "Atualização disponível?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1053,6 +1070,17 @@ msgstr "Instalar um jogo"
 msgid "Install games from ContentDB"
 msgstr "Instalar jogos do ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game não vem mais instalado por padrão"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Novo"
@@ -1086,8 +1114,9 @@ msgid "Start Game"
 msgstr "Iniciar o jogo"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Você não possui jogos instalados."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Você precisa instalar um jogo antes de poder instalar um mod"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1166,18 +1195,10 @@ msgstr "A carregar texturas..."
 msgid "Rebuilding shaders..."
 msgstr "A reconstruir sombras..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Erro de ligação (excedeu tempo?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Não foi possível localizar ou carregar jogo "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Especificação de jogo inválida."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu Principal"
@@ -1202,7 +1223,11 @@ msgstr "Ficheiro de palavra-passe fornecido falhou em abrir : "
 msgid "Provided world path doesn't exist: "
 msgstr "O caminho fornecido do mundo não existe: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1210,18 +1235,10 @@ msgstr ""
 "\n"
 "Consulte debug.txt para mais detalhes."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Endereço: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modo: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "-Porta: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Público: "
@@ -1256,10 +1273,6 @@ msgstr "Avanço automático para frente ativado"
 msgid "Block bounds hidden"
 msgstr "Limites de bloco ocultos"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Limites de bloco mostrados para todos os blocos"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Limites de bloco mostrados para o bloco atual"
@@ -1277,13 +1290,12 @@ msgid "Camera update enabled"
 msgstr "Atualização da camera habilitada"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
 msgstr "Não é possível mostrar limites de bloco (desativado por mod ou jogo)"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr "Mudar palavra-passe"
+msgstr "Mudar Senha"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
@@ -1305,6 +1317,10 @@ msgstr "O scripting de cliente está desativado"
 msgid "Connecting to server..."
 msgstr "A conectar ao servidor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Erro de ligação (excedeu tempo?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "A conexão falhou por motivo desconhecido"
@@ -1313,47 +1329,14 @@ msgstr "A conexão falhou por motivo desconhecido"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controles:\n"
-"- %s: mover para a frente\n"
-"- %s: mover para trás\n"
-"- %s: mover para a esquerda\n"
-"- %s: mover para a direita\n"
-"- %s: saltar/escalar\n"
-"- %s: cavar/socar\n"
-"- %s: colocar/usar\n"
-"- %s: esgueirar/descer\n"
-"- %s: soltar item\n"
-"- %s: inventário\n"
-"- Rato: virar/ver\n"
-"- Roda do rato: selecionar item\n"
-"- %s: bate-papo\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1445,6 +1428,11 @@ msgstr "Névoa desativada"
 msgid "Fog enabled"
 msgstr "Névoa habilitada"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom atualmente desativado por jogo ou mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Info do jogo:"
@@ -1465,10 +1453,6 @@ msgstr "Definições dos Itens..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1626,10 +1610,6 @@ msgstr "Mostrar wireframe"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom atualmente desativado por jogo ou mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Conversa atualmente desativada por jogo ou mod"
@@ -1963,6 +1943,15 @@ msgstr "Minimapa em modo de superfície, ampliação %dx"
 msgid "Minimap in texture mode"
 msgstr "Minimapa em modo de textura"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Falha ao abrir página da web"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2156,6 +2145,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "pressione a tecla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Falha ao abrir página da web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Mudar"
@@ -2189,6 +2191,7 @@ msgstr "Volume do som: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "pt"
 
@@ -2204,9 +2207,9 @@ msgid "Name is taken. Please choose another name"
 msgstr "Este nome já foi escolhido. Por favor, escolha outro nome"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "A desligar..."
+msgstr "%s enquanto fechava: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2418,14 +2421,6 @@ msgstr "Distância de envio de objetos ativos"
 msgid "Adds particles when digging a node."
 msgstr "Adiciona partículas quando escava um node."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajustar configuração de dpi ao seu ecrã (não aplicável a X11/Android) ex: "
-"para ecrãs 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2455,6 +2450,10 @@ msgstr "Nome do administrador"
 msgid "Advanced"
 msgstr "Avançado"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2494,14 +2493,12 @@ msgid "Announce to this serverlist."
 msgstr "Anuncie para esta lista de servidor."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Antialiasing:"
+msgstr "Escala de antiserrilhamento"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Antialiasing:"
+msgstr "Método de antiserrilhamento"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2515,6 +2512,17 @@ msgstr "Concatenar nome do item a descrição."
 msgid "Apple trees noise"
 msgstr "Ruído de Macieiras"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inercia dos braços"
@@ -2532,18 +2540,40 @@ msgid "Ask to reconnect after crash"
 msgstr "Pedir para reconectar após de bloqueio de sistema"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Nesta distância, o servidor otimizará agressivamente quais blocos são "
+"enviados aos \n"
+"clientes.\n"
+"Pequenos valores potencialmente melhoram muito o desempenho, à custa de \n"
+"falhas de renderização visíveis (alguns blocos não serão processados debaixo "
+"da \n"
+"água e nas cavernas, bem como às vezes em terra).\n"
+"Configure isso como um valor maior do que a "
+"distância_máxima_de_envio_do_bloco \n"
+"para desativar essa otimização.\n"
+"Especificado em barreiras do mapa (16 nós)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Nesta distância, o servidor otimizará agressivamente quais blocos são "
 "enviados aos \n"
@@ -2619,6 +2649,11 @@ msgstr "Biomas"
 msgid "Biome noise"
 msgstr "Ruído da Biome"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Distância otimizada de envio de bloco"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distância otimizada de envio de bloco"
@@ -2632,9 +2667,8 @@ msgid "Bloom Intensity"
 msgstr "Intensidade da floração"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bloom Radius"
-msgstr "Bloom Radius"
+msgstr "Raio de Bloom"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
@@ -2838,6 +2872,12 @@ msgstr "Névoa colorida"
 msgid "Colored shadows"
 msgstr "Sombra colorida"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3007,10 +3047,6 @@ msgstr ""
 "Cor da cruz (R, G, B).\n"
 "Também controla a cor da cruz do objeto"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Limite do tamanho do ficheiro de log de depuração"
@@ -3065,6 +3101,25 @@ msgstr ""
 "Isso simula um efeito de sombras suaves aplicando um PCF ou um Poisson disk\n"
 "mas também usa mais recursos."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Ativar para impedir a conexão de clientes antigos.\n"
+"Clientes antigos são compatíveis no sentido em que não bloquearão quando "
+"conectam \n"
+"a servidores recentes, mas poderão não suportar todos as funcionalidades "
+"esperadas."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Define áreas onde árvores têm maçãs."
@@ -3271,6 +3326,11 @@ msgstr "Ativar Bloom"
 msgid "Enable Bloom Debug"
 msgstr "Ativar Bloom Debug"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Ativar Dano"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3297,6 +3357,11 @@ msgstr ""
 "Quando em true usa o Poisson disk para fazer \"sombras suaves\". Caso "
 "contrário, usa filtragem PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Pós-processamento"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3342,6 +3407,11 @@ msgstr "Ativar segurança de extras"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Ativa a entrada de comandos aleatória (apenas usado para testes)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Ativa a entrada de comandos aleatória (apenas usado para testes)."
@@ -3372,6 +3442,11 @@ msgstr ""
 "a servidores recentes, mas poderão não suportar todos as funcionalidades "
 "esperadas."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Tela sensível ao toque"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3384,14 +3459,6 @@ msgstr ""
 "Servidores remotos oferecem uma maneira mais rápida de descarregar media\n"
 "(ex. texturas) quando se estiver a conectar ao servidor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Ativar os objectos buffer de vértice.\n"
-"Isto deve melhorar muito o desempenho gráfico."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3432,6 +3499,19 @@ msgstr "Ativa animação de itens no inventário."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ativar armazenamento em cache para os meshes das faces."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3955,14 +4035,12 @@ msgid "How deep to make rivers."
 msgstr "Quão profundo serão os rios."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
 "A velocidade com que as ondas líquidas se movem. Maior = mais rápido.\n"
-"Se negativo, as ondas líquidas se moverão para trás.\n"
-"Requer que a ondulação de líquidos esteja ativada."
+"Se negativo, as ondas líquidas se moverão para trás."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4394,19 +4472,20 @@ msgstr ""
 "-   Opaque: desativa transparência"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Duração de um tick do servidor e o intervalo no qual os objetos são "
 "geralmente atualizados ao longo\n"
 "rede, declarada em segundos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Velocidade de balanço da água"
+msgstr "Tamanho das ondas na água."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4577,10 +4656,6 @@ msgstr ""
 "Fazer cores de névoa e céu dependerem do dia (amanhecer/pôr do sol) e exibir "
 "a direção."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Torna todos os líquidos opacos"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Nível de Compressão de Mapa no Armazenamento em Disco"
@@ -4636,11 +4711,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atributos de geração de mapa específicos ao gerador V5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Atributos de geração de mapas específicos do Mapgen v6.\n"
 "A marcação \"snowbiomes\" ativa o novo sistema de 5 biomas.\n"
@@ -4685,12 +4763,6 @@ msgstr "Limite de geração de mapa"
 msgid "Mapblock mesh generation threads"
 msgstr "Limite de geração de mapa"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-"Tamanho em MB da memória cache de MapBlock para o gerador de Malha de "
-"Mapblock"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Tempo limite de descarregamento do mapblock"
@@ -4966,6 +5038,11 @@ msgstr "Nível mínimo de registo a ser impresso no chat."
 msgid "Minimap scan height"
 msgstr "Altura de varredura do mini-mapa"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Intervalo de repetição da ação pôr"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -5036,6 +5113,11 @@ msgstr "Sensibilidade do rato"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplicador de sensibilidade do rato."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Limite da caverna"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Ruído de Lama"
@@ -5178,10 +5260,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Separação de oclusão no lado do servidor"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Líquidos Opacos"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5197,6 +5275,11 @@ msgstr ""
 "formspec está\n"
 "aberto."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Depuração do gerador de mapa"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Substituição opcional da cor de ligações do bate-papo."
@@ -5330,6 +5413,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proporção de cavernas grandes que contém líquido."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "A versão do protocolo não coincide. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5347,6 +5439,10 @@ msgstr "Eleva o terreno para fazer vales em torno dos rios."
 msgid "Random input"
 msgstr "Entrada aleatória"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Mensagens de chat recentes"
@@ -5557,8 +5653,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5681,15 +5777,14 @@ msgid "Serverlist file"
 msgstr "Ficheiro da lista de servidores"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the default tilt of Sun/Moon orbit in degrees.\n"
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
-"Defina a inclinação da órbita do Sol/Lua em graus\n"
-"Valor 0 significa sem inclinação/ órbita vertical.\n"
-"Valor mínimo de 0.0 e máximo de 60.0"
+"Defina a inclinação da órbita do Sol/Lua em graus.\n"
+"Jogos podem mudar a órbita por API.\n"
+"Valor 0 significa sem inclinação / órbita vertical."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -5705,8 +5800,9 @@ msgstr ""
 "Faixa: de 0,1 a 10,0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Defina o idioma. Deixe vazio para usar a linguagem do sistema.\n"
@@ -5756,6 +5852,10 @@ msgstr ""
 "Defina como true para ativar o efeito bloom.\n"
 "Cores brilhantes vão sangrar sobre os objetos vizinhos."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5810,11 +5910,11 @@ msgid "Shaders"
 msgstr "Sombras"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Sombreadores permitem efeitos visuais avançados e podem aumentar a "
 "performance em algumas placas de\n"
@@ -5899,18 +5999,6 @@ msgstr ""
 "Alterar este valor é para uso especial, é recomendado deixar\n"
 "inalterado."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Tamanho da memória cache do MapBlock do gerador de malha. Aumentar isso "
-"aumentará\n"
-"o percentual de hit do cache %, a reduzir os dados que são copiados do "
-"encadeamento principal,\n"
-"e assim reduz o jitter."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Inclinação Da Órbita Do Céu"
@@ -5949,7 +6037,7 @@ msgstr "Iluminação suave"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Suaviza a rotação da câmara no modo cinemático. 0 para desativar."
 
 #: src/settings_translation_file.cpp
@@ -5971,6 +6059,15 @@ msgstr "Velocidade furtiva, em nós por segundo."
 msgid "Soft shadow radius"
 msgstr "Raio das sombras suaves"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Som"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Lista negra de flags do ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6181,6 +6278,12 @@ msgstr ""
 "O formato padrão no qual as análises estão a ser gravadas,\n"
 "Quando chamado `/profiler save [formato]` sem formato."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6189,13 +6292,27 @@ msgstr ""
 "O caminho de ficheiro relativo ao sua pasta do mundo no qual as analises "
 "serão salvas."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "O identificador do joystick para usar"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "A largura em pixels necessária para a interação de ecrã de toque começar."
 
@@ -6213,6 +6330,15 @@ msgstr ""
 "O padrão é 1.0 (meio nó).\n"
 "Requer ondas em líquidos ativada."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"O tempo em segundos que leva entre as colocações de nó repetidas ao segurar\n"
+"o botão de pôr."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "A interface de rede no qual o servidor escuta (aguarda conexão)."
@@ -6249,14 +6375,12 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "O back-end de renderização.\n"
-"É necessário reiniciar após alterar isso.\n"
-"Nota: No Android, use OGLES1 se não tiver certeza! A app pode falhar ao "
-"iniciar de outra forma.\n"
-"Em outras plataformas, OpenGL é recomendado.\n"
-"Shaders são suportados por OpenGL (somente desktop) e OGLES2 (experimental)"
+"Nota: É necessário reiniciar após mudar isso!\n"
+"OpenGL é o padrão para desktop, e OGLES2 para Android.\n"
+"Shaders são suportados por OpenGL e OGLES2 (experimental)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6335,6 +6459,10 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Terceiro de 4 ruídos 2D que juntos definem a altura de colinas/montanhas."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6390,15 +6518,15 @@ msgstr "Sensibilidade do rato"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Multiplicador de sensibilidade do rato."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Limiar o ecrã de toque"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Trocas por desempenho"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Líquidos Opacos"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Distância de classificação de transparência"
@@ -6436,8 +6564,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL para o arquivo JSON que fornece informações sobre a versão mais recente "
 "do Minetest"
@@ -6556,10 +6687,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfaces de Usuário"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Sincronização Vertical"
@@ -6651,6 +6778,10 @@ msgstr "Joystick virtual ativa botão especial"
 msgid "Volume"
 msgstr "Volume do som"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6659,6 +6790,16 @@ msgstr ""
 "Volume de todos os sons.\n"
 "Requer que o sistema de som esteja ativado."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS quando desfocado ou pausado"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Iluminação suave"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6963,12 +7104,18 @@ msgstr "limite paralelo de cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(Suporte de jogo necessário)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Endereço: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "Modo Criativo: "
 
 #~ msgid "- Damage: "
 #~ msgstr "-Dano: "
 
+#~ msgid "- Port: "
+#~ msgstr "-Porta: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -7007,6 +7154,13 @@ msgstr "limite paralelo de cURL"
 #~ "Note que o campo de endereço no menu principal sobrescreve esta "
 #~ "configuração."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajustar configuração de dpi ao seu ecrã (não aplicável a X11/Android) ex: "
+#~ "para ecrãs 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7081,6 +7235,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bits por pixel (profundidade de cor) no modo de ecrã inteiro."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Limites de bloco mostrados para todos os blocos"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump mapping"
 
@@ -7104,6 +7261,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro do aumento da curva de luz."
 
+#~ msgid "Change Keys"
+#~ msgstr "Mudar teclas"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Mudar teclas"
@@ -7177,6 +7337,38 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Controla a largura dos túneis, um valor menor cria túneis maiores."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controles:\n"
+#~ "- %s: mover para a frente\n"
+#~ "- %s: mover para trás\n"
+#~ "- %s: mover para a esquerda\n"
+#~ "- %s: mover para a direita\n"
+#~ "- %s: saltar/escalar\n"
+#~ "- %s: cavar/socar/usar\n"
+#~ "- %s: colocar/usar\n"
+#~ "- %s: esgueirar/descer\n"
+#~ "- %s: soltar item\n"
+#~ "- %s: inventário\n"
+#~ "- Rato: virar/ver\n"
+#~ "- Roda do rato: selecionar item\n"
+#~ "- %s: bate-papo\n"
+
 #~ msgid "Creative"
 #~ msgstr "Criar"
 
@@ -7186,6 +7378,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Cor do cursor (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Ativar dano"
 
@@ -7280,6 +7475,13 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Ativar registo de confirmação"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Ativar os objectos buffer de vértice.\n"
+#~ "Isto deve melhorar muito o desempenho gráfico."
+
 #~ msgid "Enabled"
 #~ msgstr "Ativado"
 
@@ -7590,6 +7792,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Monitorização"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Especificação de jogo inválida."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tecla de inventário"
 
@@ -8284,6 +8489,14 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Faz o DirectX trabalhar com LuaJIT. Desative se causa problemas."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Torna todos os líquidos opacos"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "Tamanho em MB da memória cache de MapBlock para o gerador de Malha de "
+#~ "Mapblock"
+
 #~ msgid "Menus"
 #~ msgstr "Opções para menus"
 
@@ -8516,15 +8729,23 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Folhas simples"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Tamanho da memória cache do MapBlock do gerador de malha. Aumentar isso "
+#~ "aumentará\n"
+#~ "o percentual de hit do cache %, a reduzir os dados que são copiados do "
+#~ "encadeamento principal,\n"
+#~ "e assim reduz o jitter."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Iluminação Suave"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Suaviza a rotação da câmara. 0 para desativar."
 
-#~ msgid "Sound"
-#~ msgstr "Som"
-
 #~ msgid "Special"
 #~ msgstr "Especial"
 
@@ -8584,6 +8805,10 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Nível de sensibilidade ao toque (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Limiar o ecrã de toque"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtro trilinear"
 
@@ -8639,6 +8864,9 @@ msgstr "limite paralelo de cURL"
 #~ "Se definido como 0, MSAA é desativado.\n"
 #~ "É necessário reiniciar após alterar esta opção."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variação da altura da colina e profundidade do lago no terreno liso da "
@@ -8746,8 +8974,14 @@ msgstr "limite paralelo de cURL"
 #~ msgid "You died."
 #~ msgstr "Você morreu"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Você não possui jogos instalados."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 93ef3de25..5e8c4974c 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Portuguese (Brazil) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-10-16 04:19+0000\n"
 "Last-Translator: Jorge Batista Ramos Junior <jorgebramosjr@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Comando não disponível: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Obtenha ajuda para comandos"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "tudo."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all| <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Ok"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<Comando não disponível>"
@@ -105,6 +103,10 @@ msgstr "Ocorreu um erro:"
 msgid "Main menu"
 msgstr "Menu principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Ok"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Reconectar"
@@ -133,19 +135,28 @@ msgstr "Nós só suportamos a versão do protocolo $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Suportamos protocolos com versões entre $1 e $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Erro ao instalar \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "As dependências $1 e $2 serão instaladas."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Falha ao baixar \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 por $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Falha ao baixar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Não foi possível extrair \"$1\" (tipo de arquivo não suportado ou arquivo "
+"corrompido)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +164,157 @@ msgstr ""
 "$1 baixando,\n"
 "$2 na fila"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 baixando..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 dependências obrigatórias não puderam ser encontradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 será instalado, e $2 dependências serão ignoradas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Todos os pacotes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Já instalado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Voltar ao menu principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Baixando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Jogos"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nenhum pacote pôde ser recuperado"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Sem resultados"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Sem atualizações"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Na fila"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pacotes de texturas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Desinstalar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Atualização"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Atualizar tudo [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Veja mais informações em um navegador da web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "As dependências $1 e $2 serão instaladas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependências obrigatórias não puderam ser encontradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 será instalado, e $2 dependências serão ignoradas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Já instalado"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Jogo Base:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependências:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Baixando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Erro ao instalar \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Falha ao baixar \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Falha ao baixar $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Não foi possível extrair \"$1\" (tipo de arquivo não suportado ou arquivo "
-"corrompido)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Jogos"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalar $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalar dependências ausentes"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Carregando..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nenhum pacote pôde ser recuperado"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Sem resultados"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Sem atualizações"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Sobrescrever"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Verifique se o jogo base está correto."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Na fila"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pacotes de texturas"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Desinstalar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Atualização"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Atualizar tudo [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Veja mais informações em um navegador da web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Sobrescrever"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,10 +464,20 @@ msgstr "Criar"
 msgid "Decorations"
 msgstr "Decorações"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test é para uso dos desenvolvedores."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Masmorras (Dungeons)"
@@ -832,10 +852,6 @@ msgstr ""
 msgid "Back"
 msgstr "Backspace"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Mudar teclas"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -845,7 +861,8 @@ msgstr "Bate-papo"
 msgid "Clear"
 msgstr "Limpar"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Controles"
 
@@ -1055,6 +1072,16 @@ msgstr "Instalar um jogo"
 msgid "Install games from ContentDB"
 msgstr "Instalar jogos do ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Novo"
@@ -1088,8 +1115,8 @@ msgid "Start Game"
 msgstr "Iniciar Jogo"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Você não possui jogos instalados."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1168,18 +1195,10 @@ msgstr "Carregando texturas..."
 msgid "Rebuilding shaders..."
 msgstr "Reconstruindo sombreadores..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Erro de conexão (tempo excedido?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Não foi possível localizar ou carregar jogo "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Especificação do jogo inválida."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menu principal"
@@ -1205,7 +1224,11 @@ msgstr "Arquivo de senha fornecido falhou em abrir : "
 msgid "Provided world path doesn't exist: "
 msgstr "Caminho informado para o mundo não existe: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Mídia..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1213,18 +1236,10 @@ msgstr ""
 "\n"
 "Verifique o debug.txt para mais detalhes."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Endereço: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modo: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "-Porta: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Público: "
@@ -1259,10 +1274,6 @@ msgstr "Avanço automático para frente habilitado"
 msgid "Block bounds hidden"
 msgstr "Limites de bloco ocultos"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Limites de bloco mostrados para todos os blocos"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Limites de bloco mostrados para o bloco atual"
@@ -1310,6 +1321,10 @@ msgstr "Scripting de cliente está desabilitado"
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Erro de conexão (tempo excedido?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "A conexão falhou por motivo desconhecido"
@@ -1318,47 +1333,14 @@ msgstr "A conexão falhou por motivo desconhecido"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controles:\n"
-"- %s: mover para frente\n"
-"- %s: mover para trás\n"
-"- %s: mover para esquerda\n"
-"- %s: mover para direita\n"
-"- %s: pular/subir\n"
-"- %s: cavar/socar\n"
-"- %s: colocar/usar\n"
-"- %s: andar furtivamente/descer\n"
-"- %s: soltar item\n"
-"- %s: inventário\n"
-"- Mouse: virar/olhar\n"
-"- Roda do mouse: selecionar item\n"
-"- %s: bate-papo\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1450,6 +1432,11 @@ msgstr "Névoa desabilitada"
 msgid "Fog enabled"
 msgstr "Névoa habilitada"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom atualmente desabilitado por jogo ou mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informação do jogo:"
@@ -1470,10 +1457,6 @@ msgstr "Carregando itens..."
 msgid "KiB/s"
 msgstr "KB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Mídia..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MB/s"
@@ -1631,10 +1614,6 @@ msgstr "Mostrar wireframe"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom atualmente desabilitado por jogo ou mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "Ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Bate-papo atualmente desativado por jogo ou mod"
@@ -1968,6 +1947,15 @@ msgstr "Minimapa em modo de superfície, Zoom %dx"
 msgid "Minimap in texture mode"
 msgstr "Minimapa em modo de textura"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Falha ao abrir página da web"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2160,6 +2148,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "pressione uma tecla"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Falha ao abrir página da web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Alterar"
@@ -2193,6 +2194,7 @@ msgstr "Volume do som: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "pt_BR"
 
@@ -2426,14 +2428,6 @@ msgstr "Alcance para envio de objetos ativos"
 msgid "Adds particles when digging a node."
 msgstr "Adiciona partículas quando cavando um node."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajustar configuração de dpi (profundidade de cor) para sua tela (apenas para "
-"quem não usa X11/Android) Ex para telas 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2463,6 +2457,10 @@ msgstr "Nome do Admin"
 msgid "Advanced"
 msgstr "Avançado"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2524,6 +2522,17 @@ msgstr "Concatenar nome do item a descrição."
 msgid "Apple trees noise"
 msgstr "Ruído de Árvores de Macieira"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inercia dos braços"
@@ -2541,18 +2550,41 @@ msgid "Ask to reconnect after crash"
 msgstr "Peça para reconectar depois de queda"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Nesta distância, o servidor otimizará agressivamente quais blocos serão "
+"enviados\n"
+"aos clientes.\n"
+"Pequenos valores potencialmente melhoram muito o desempenho, à custa de "
+"falhas\n"
+"de renderização visíveis (alguns blocos não serão processados debaixo da "
+"água e nas\n"
+"cavernas, bem como às vezes em terra).\n"
+"Configurando isso para um valor maior do que a "
+"distância_máxima_de_envio_do_bloco\n"
+"para desabilitar essa otimização.\n"
+"Especificado em barreiras do mapa (16 nodes)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Nesta distância, o servidor otimizará agressivamente quais blocos serão "
 "enviados\n"
@@ -2629,6 +2661,11 @@ msgstr "Biomas"
 msgid "Biome noise"
 msgstr "Ruído do bioma"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Distância otimizada de envio de bloco"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distância otimizada de envio de bloco"
@@ -2847,6 +2884,12 @@ msgstr "Névoa colorida"
 msgid "Colored shadows"
 msgstr "Sombra colorida"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3012,10 +3055,6 @@ msgstr ""
 "Cor da cruz (R, G, B).\n"
 "Também controla a cor da cruz do objeto"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "dpi"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Limite de tamanho do arquivo de log de depuração"
@@ -3071,6 +3110,25 @@ msgstr ""
 "Isso simula um efeito de sombras suaves aplicando um PCF ou um Poisson disk\n"
 "mas também usa mais recursos."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Habilitar recurso de não permitir que jogadores usando versões antigas do "
+"cliente possam se conectar.\n"
+"Essas versões são compatíveis no sentido de não travar quando conectam a "
+"servidores com versões mais atuais,\n"
+"porém eles podem não suportar todos os recursos que você está esperando."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Define áreas onde na árvores têm maçãs."
@@ -3275,6 +3333,11 @@ msgstr "Habilitar floração"
 msgid "Enable Bloom Debug"
 msgstr "Habilitar depuração da floração"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Habilitar Dano"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3301,6 +3364,11 @@ msgstr ""
 "Quando em true usa o Poisson disk para fazer \"sombras suaves\". Caso "
 "contrário, usa filtragem PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Pós-processamento"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3350,6 +3418,11 @@ msgstr "Habilitar Mod Security (Segurança nos mods)"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Habilitar entrada de comandos aleatórios (apenas usado para testes)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Habilitar entrada de comandos aleatórios (apenas usado para testes)."
@@ -3380,6 +3453,11 @@ msgstr ""
 "servidores com versões mais atuais,\n"
 "porém eles podem não suportar todos os recursos que você está esperando."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Tela sensível ao toque"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3392,14 +3470,6 @@ msgstr ""
 "para fazer o download de mídia (por exemplo texturas) ao se conectar ao "
 "servidor."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Ativa vertex buffer objects.\n"
-"Isso deve melhorar muito a performance gráfica."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3439,6 +3509,19 @@ msgstr "Habilita itens animados no inventário."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ativar armazenamento em cache de direção de face girada das malhas."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4397,10 +4480,12 @@ msgstr ""
 "-   Opaque: desativar transparência"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Tamanho do tick do servidor e o intervalo no qual os objetos geralmente são "
 "atualizados na\n"
@@ -4581,10 +4666,6 @@ msgstr ""
 "Fazer cores de névoa e céu dependerem do dia (amanhecer/pôr do sol) e exibir "
 "a direção."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Torna todos os líquidos opacos"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Nível de Compressão de Mapa no Armazenamento em Disco"
@@ -4641,11 +4722,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atributos de geração de mapa específicos ao gerador V5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Atributos de geração de mapas específicos para Gerador de mapas v6.\n"
 "A opção 'snowbiomes' habilita o novo sistema de 5 biomas.\n"
@@ -4690,12 +4774,6 @@ msgstr "Intervalo de geração de mapa"
 msgid "Mapblock mesh generation threads"
 msgstr "Intervalo de geração de mapa"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-"Tamanho em MB da memória cache de MapBlock para o gerador de Malha de "
-"Mapblock"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Tempo limite de descarregamento do mapblock"
@@ -4968,6 +5046,11 @@ msgstr "Nível mínimo de registro a ser impresso no chat."
 msgid "Minimap scan height"
 msgstr "Altura de escaneamento do minimapa"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Intervalo de repetição da ação colocar"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Limite mínimo do número aleatório de grandes cavernas por mapchunk."
@@ -5036,6 +5119,11 @@ msgstr "Sensibilidade do mouse"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplicador de sensibilidade do mouse."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Limite da caverna"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Ruído de Lama"
@@ -5181,10 +5269,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Separação de oclusão no lado do servidor"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Líquidos Opacos"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5200,6 +5284,11 @@ msgstr ""
 "formspec está\n"
 "aberto."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Debug do mapgen"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Substituição opcional da cor do link do bate-papo."
@@ -5333,6 +5422,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Proporção de cavernas grandes que contém líquido."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Versão do protocolo incompatível. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5351,6 +5449,10 @@ msgstr "Eleva o terreno para fazer vales em torno dos rios."
 msgid "Random input"
 msgstr "Entrada aleatória"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Mensagens de chat recentes"
@@ -5563,8 +5665,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5708,8 +5810,9 @@ msgstr ""
 "Intervalo: de -1 até 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Defina o idioma. Deixe vazio para usar a linguagem do sistema.\n"
@@ -5756,6 +5859,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5804,11 +5911,11 @@ msgid "Shaders"
 msgstr "Sombreadores"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Sombreadores permitem efeitos visuais avançados e podem aumentar a "
 "performance em algumas\n"
@@ -5893,18 +6000,6 @@ msgstr ""
 "Alterar este valor é para uso especial, é recomendado deixar\n"
 "inalterado."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Tamanho da memória cache do MapBlock do gerador de malha. Aumentar isso "
-"aumentará\n"
-"o percentual de hit do cache, reduzindo os dados sendo copiados do "
-"encadeamento principal\n"
-", reduzindo assim o jitter."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Inclinação Da Órbita Do Céu"
@@ -5943,7 +6038,7 @@ msgstr "Iluminação suave"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Suaviza a rotação da câmera no modo cinemático. 0 para desativar."
 
 #: src/settings_translation_file.cpp
@@ -5965,6 +6060,15 @@ msgstr "Velocidade ao esgueirar-se, em nós (blocos) por segundo."
 msgid "Soft shadow radius"
 msgstr "Raio das sombras suaves"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Som"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Lista negra de flags do ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6176,6 +6280,12 @@ msgstr ""
 "O formato padrão no qual as analises estão sendo salvas,\n"
 "Quando chamado `/profiler save [formato]` sem formato."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6184,13 +6294,27 @@ msgstr ""
 "O caminho de arquivo relativo ao sua pasta do mundo no qual as analises "
 "serão salvas."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "O identificador do joystick para usar"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "A largura em pixels necessária para interação de tela de toque começar."
 
@@ -6208,6 +6332,15 @@ msgstr ""
 "O padrão é 1.0 (meio nó).\n"
 "Requer ondas em líquidos habilitada."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"O tempo em segundos que leva entre as colocações de nó repetidas ao segurar\n"
+"o botão de colocar."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "A interface de rede no qual o servidor escuta (aguarda conexão)."
@@ -6239,11 +6372,12 @@ msgstr ""
 "Isso deve ser configurado junto com active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "O back-end de renderização.\n"
 "Nota: É necessário reiniciar depois de alterar.\n"
@@ -6327,6 +6461,10 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Terceiro de 4 ruídos 2D que juntos definem a altura de colinas/montanhas."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6383,15 +6521,15 @@ msgstr "Sensibilidade do mouse"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Multiplicador de sensibilidade do mouse."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Limiar a tela de toque"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Compensações para o desempenho"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Líquidos Opacos"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Distância para o Ordenamento de Transparência"
@@ -6429,8 +6567,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL do arquivo JSON que fornece informações sobre o mais novo lançamento do "
 "Minetest"
@@ -6547,10 +6688,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Interfaces de Usuário"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Sincronização Vertical"
@@ -6642,6 +6779,10 @@ msgstr "Joystick virtual ativa botão especial"
 msgid "Volume"
 msgstr "Volume do som"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6650,6 +6791,16 @@ msgstr ""
 "Volume de todos os sons.\n"
 "Requer que o sistema de som esteja ativado."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS quando o jogo é pausado ou perde o foco"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Iluminação suave"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6952,12 +7103,18 @@ msgstr "limite paralelo de cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(necessário suporte ao jogo)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Endereço: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Modo Criativo: "
 
 #~ msgid "- Damage: "
 #~ msgstr "-Dano: "
 
+#~ msgid "- Port: "
+#~ msgstr "-Porta: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6996,6 +7153,13 @@ msgstr "limite paralelo de cURL"
 #~ "Note que o campo de endereço no menu principal sobrescreve essa "
 #~ "configuração."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajustar configuração de dpi (profundidade de cor) para sua tela (apenas "
+#~ "para quem não usa X11/Android) Ex para telas 4K."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -7055,6 +7219,9 @@ msgstr "limite paralelo de cURL"
 #~ "Bits por pixel (Também conhecido como profundidade de cor) no modo de "
 #~ "tela cheia."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Limites de bloco mostrados para todos os blocos"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump mapping"
 
@@ -7079,6 +7246,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro do aumento da curva de luz."
 
+#~ msgid "Change Keys"
+#~ msgstr "Mudar teclas"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Mudar teclas"
@@ -7152,6 +7322,38 @@ msgstr "limite paralelo de cURL"
 #~ msgstr ""
 #~ "Controla a largura dos túneis, um valor menor cria túneis mais largos."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controles:\n"
+#~ "- %s: mover para frente\n"
+#~ "- %s: mover para trás\n"
+#~ "- %s: mover para esquerda\n"
+#~ "- %s: mover para direita\n"
+#~ "- %s: pular/subir\n"
+#~ "- %s: cavar/socar\n"
+#~ "- %s: colocar/usar\n"
+#~ "- %s: andar furtivamente/descer\n"
+#~ "- %s: soltar item\n"
+#~ "- %s: inventário\n"
+#~ "- Mouse: virar/olhar\n"
+#~ "- Roda do mouse: selecionar item\n"
+#~ "- %s: bate-papo\n"
+
 #~ msgid "Creative"
 #~ msgstr "Criativo"
 
@@ -7161,6 +7363,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Cor do cursor (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "dpi"
+
 #~ msgid "Damage"
 #~ msgstr "Dano"
 
@@ -7246,6 +7451,13 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Habilitar registro de confirmação"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Ativa vertex buffer objects.\n"
+#~ "Isso deve melhorar muito a performance gráfica."
+
 #~ msgid "Enabled"
 #~ msgstr "Habilitado"
 
@@ -7555,6 +7767,9 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Monitorização"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Especificação do jogo inválida."
+
 #~ msgid "Inventory key"
 #~ msgstr "Inventário"
 
@@ -8253,6 +8468,14 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Faz o DirectX trabalhar com LuaJIT. Desative se causa problemas."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Torna todos os líquidos opacos"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr ""
+#~ "Tamanho em MB da memória cache de MapBlock para o gerador de Malha de "
+#~ "Mapblock"
+
 #~ msgid "Menus"
 #~ msgstr "Opções para menus"
 
@@ -8497,15 +8720,23 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Folhas Simples"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Tamanho da memória cache do MapBlock do gerador de malha. Aumentar isso "
+#~ "aumentará\n"
+#~ "o percentual de hit do cache, reduzindo os dados sendo copiados do "
+#~ "encadeamento principal\n"
+#~ ", reduzindo assim o jitter."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Iluminação suave"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Suaviza a rotação da câmera. 0 para desativar."
 
-#~ msgid "Sound"
-#~ msgstr "Som"
-
 #~ msgid "Special"
 #~ msgstr "Especial"
 
@@ -8565,6 +8796,10 @@ msgstr "limite paralelo de cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Nível de sensibilidade ao toque (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Limiar a tela de toque"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtragem tri-linear"
 
@@ -8620,6 +8855,9 @@ msgstr "limite paralelo de cURL"
 #~ "Se definido como 0, MSAA é desativado.\n"
 #~ "É necessário reiniciar após alterar esta opção."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Variação da altura da colina e profundidade do lago no terreno liso da "
@@ -8724,8 +8962,14 @@ msgstr "limite paralelo de cURL"
 #~ msgid "You died."
 #~ msgstr "Você morreu."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Você não possui jogos instalados."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "Ok"
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index c57e8a235..3421fb593 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Romanian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-25 14:13+0000\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-27 04:09+0000\n"
 "Last-Translator: AlexTECPlayz <alextec70@outlook.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/minetest/"
 "minetest/ro/>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.2.1-rc\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -72,8 +72,8 @@ msgid "Command not available: "
 msgstr "Comandă indisponibilă: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Obține ajutor pentru comenzi"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Obțineți ajutor pentru comenzi (-t: răspuns în chat)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -83,12 +83,8 @@ msgstr ""
 "complete."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <cmd>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -106,6 +102,10 @@ msgstr "A apărut o eroare:"
 msgid "Main menu"
 msgstr "Meniul principal"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Reconectare"
@@ -134,19 +134,25 @@ msgstr "Permitem doar versiunea de protocol $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Acceptăm versiuni de protocol între versiunea 1$ și 2$."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "„$1” există deja. Doriți s-o suprascrieți?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Eroare la instalarea \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Dependențele $1 și $2 vor fi instalate."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Nu s-a putut descărca \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1, de $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Nu s-a putut descărca $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Eroare în extragerea „$1” (fișier incompatibil sau arhivă coruptă)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,164 +160,165 @@ msgstr ""
 "$1 în descărcare,\n"
 "$2 în așteptare"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 se descarcă..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 are dependințe care nu sunt disponibile."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 va fi instalat, iar $2 dependințe vor fi ignorate."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Toate pachetele"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Deja instalată"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Meniul principal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB nu este disponibil când Minetest e compilat fără cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Descărcare..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Eroare la obținerea dependențelor pentru pachet"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Jocuri"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalează"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Se încarcă..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modificări"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nu s-au putut prelua pachete"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Fără rezultate"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Nu există actualizări"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "În așteptare"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pachete de texturi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Pachetul $1 nu a fost găsit."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Dezinstalare"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Actualizare"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Actualizează tot [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Vezi detalii într-un navigator web"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Trebuie să instalezi un joc înainte să poți instala un mod"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Dependențele $1 și $2 vor fi instalate."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1, de $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 are dependințe care nu sunt disponibile."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 va fi instalat, iar $2 dependințe vor fi ignorate."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Deja instalată"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Jocul de bază:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulare"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB nu este disponibilă când Minetest e compilat fără cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependențe:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Descărcare..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Eroare la instalarea \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Nu s-a putut descărca \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Nu s-a putut descărca $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Eroare la despachetarea „$1” (fișier incompatibil sau arhivă defectă)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Jocuri"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalează"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Instalează $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Instalează dependințele opționale"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Se încarcă..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modificări"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nu s-au putut prelua pachete"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Fără rezultate"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Nu există actualizări"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Indisponibile"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr "Te rugăm să verifici dacă jocul de bază este corect."
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "„$1” există deja. Dorești să o suprascrii?"
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
 msgid "Overwrite"
 msgstr "Suprascrie"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Please check that the base game is correct."
-msgstr "Verificați dacă jocul de bază este corect."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "În așteptare"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pachete de texturi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Dezinstalare"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Actualizare"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Actualizează tot [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Vezi detalii într-un navigator web"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
-
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
 msgstr "$1 (Activat)"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 mods"
-msgstr "$1 moduri"
+msgstr "$1 modificări"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Failed to install $1 to $2"
@@ -319,7 +326,7 @@ msgstr "Eșuare la instalarea $1 în $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "Instalare: Nu se găsește un nume de director potrivit pentru $1"
+msgstr "Instalare: Nu se poate găsi un nume de folder adecvat pentru $1"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to find a valid mod, modpack, or game"
@@ -362,8 +369,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"Nu a reușit activarea modului „$ 1”, deoarece conține caractere "
-"neautorizate. Doar caracterele [a-z0-9_] sunt permise."
+"Nu a reușit activarea modului „$1”, deoarece conține caractere neautorizate. "
+"Doar caracterele [a-z0-9_] sunt permise."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
@@ -383,11 +390,11 @@ msgstr "Nu este oferită nicio descriere a jocului."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr "Nu există dependențe dure"
+msgstr "Nu există dependențe obligatorii"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr "Nici o descriere a pachetului de moduri nu este furnizată."
+msgstr "Nu este furnizată nicio descriere a pachetului de moduri."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
@@ -451,10 +458,20 @@ msgstr "Creează"
 msgid "Decorations"
 msgstr "Decorațiuni"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Temple în deșert"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "„Development Test” este destinat dezvoltatorilor."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr "Variantă diferită de temniță generată în ecosisteme deșertice"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Temnițe"
@@ -650,7 +667,7 @@ msgstr "Înregistrează-te"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Respinge"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -658,21 +675,24 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Pentru mult timp, motorul Minetest a venit cu un joc implicit pe nume "
+"„Minetest Game”. Din Minetest 5.8.0, Minetest nu mai vine cu un joc implicit."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Dacă dorești să joci în continuare pe lumile tale Minetest Game, trebuie să "
+"reinstalezi Minetest Game."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game nu mai este instalat în mod implicit"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Instalează un alt joc"
+msgstr "Reinstalați jocul Minetest"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -749,9 +769,8 @@ msgid "Select file"
 msgstr "Selectează fila"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Selectează"
+msgstr "Selectați"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -820,20 +839,16 @@ msgstr "uşura"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Folosește limba sistemului)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Accesibilitate"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Înapoi"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Modifică tastele"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -843,26 +858,26 @@ msgstr "Chat"
 msgid "Clear"
 msgstr "Șterge"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Comenzi"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Movement"
-msgstr ""
+msgstr "Mișscare"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Restabilește valori implicite"
+msgstr "Restabiliți la valorile implicite"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Resetează setarea la valoarea prestabilită ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -870,7 +885,7 @@ msgstr "Caută"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Afișează setări avansate"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -890,11 +905,11 @@ msgstr "Conținut: Modificări"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(Jocul va trebui să activeze și umbrele)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Personalizat"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -947,7 +962,7 @@ msgstr "Echipa principală"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Dispozitiv Irrlicht:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -978,18 +993,16 @@ msgid "Browse online content"
 msgstr "Căutați conținut online"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Căutați conținut online"
+msgstr "Explorați conținut online [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Conţinut"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Conţinut"
+msgstr "Conţinut [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1012,9 +1025,8 @@ msgid "Rename"
 msgstr "Redenumiți"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<indisponibilă>"
+msgstr "Actualizare disponibilă?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1052,6 +1064,18 @@ msgstr "Instalează un joc"
 msgid "Install games from ContentDB"
 msgstr "Instalarea jocurilor din ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest nu vine cu un joc preinstalat."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest este o platformă de creare de jocuri care vă permite să jucați "
+"multe jocuri diferite."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nou"
@@ -1085,8 +1109,8 @@ msgid "Start Game"
 msgstr "Începe Jocul"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nu aveți jocuri instalate."
+msgid "You need to install a game before you can create a world."
+msgstr "Trebuie să instalați un joc înainte să puteți crea o lume."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1165,18 +1189,10 @@ msgstr "Se încarcă texturi ..."
 msgid "Rebuilding shaders..."
 msgstr "Reconstruirea shaderelor..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Eroare de conexiune (timeout?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Nu se poate găsi sau încărca jocul: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Jocul este nevalid."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Meniul Principal"
@@ -1201,7 +1217,11 @@ msgstr "Fișierul cu parolă nu a putut fi deschis: "
 msgid "Provided world path doesn't exist: "
 msgstr "Calea aprovizionată a lumii nu există: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1209,18 +1229,10 @@ msgstr ""
 "\n"
 "Verifică deug.txt pentru detalii."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresa: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Modul: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Public: "
@@ -1255,10 +1267,6 @@ msgstr "Redirecționare automată activată"
 msgid "Block bounds hidden"
 msgstr "Limite blocuri ascunse"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Limite blocuri afișate pentru toate blocurile"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Limite blocuri afișate pentru blocul curent"
@@ -1276,10 +1284,8 @@ msgid "Camera update enabled"
 msgstr "Actualizarea camerei este activată"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
-msgstr ""
-"Nu se pot afișa limitele blocurilor (dezactivate de modificare sau joc)"
+msgstr "Nu se pot afișa limitele blocurilor (dezactivate de mod sau joc)"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1305,6 +1311,10 @@ msgstr "Scripturile din partea clientului sunt dezactivate"
 msgid "Connecting to server..."
 msgstr "Se conectează la server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Eroare de conexiune (timeout?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Conexiune eșuată din motiv necunoscut"
@@ -1314,46 +1324,12 @@ msgid "Continue"
 msgstr "Continuă"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Controale:\n"
-"- %s: deplasare înainte\n"
-"- %s: deplasare înapoi\n"
-"- %s: deplasare stânga\n"
-"- %s: deplasare dreapta\n"
-"- %s: salt/urcare\n"
-"- %s: săpare/lovire\n"
-"- %s: plasare/utilizare\n"
-"- %s: furișare/coborâre\n"
-"- %s: aruncare obiect\n"
-"- %s: inventar\n"
-"- Maus: rotire/privire\n"
-"- Roata mausului: selectare obiect\n"
-"- %s: chat\n"
-
-#: src/client/game.cpp
-#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1362,18 +1338,18 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Controale implicite:\n"
-"Niciun meniu vizibil:\n"
-"- apăsare unică: activare buton\n"
-"- apăsare dublă: plasare / utilizare\n"
-"- deget glisant: privește în jur\n"
-"Meniu / Inventar vizibil:\n"
-"- apăsare dublă (exterior):\n"
-" -> close\n"
-"- touch stack, slot pentru atingere:\n"
-" -> mută stiva\n"
-"- atingeți și trageți, atingeți al doilea deget\n"
-" -> plasați un singur element în slot\n"
+"Controale:\n"
+"Niciun meniu deschis:\n"
+"- glisați degetul: priviți în jur\n"
+"- apăsați: plasați/perforați/utilizați (implicit)\n"
+"- apăsați lung: săpați/utilizați (implicit)\n"
+"Meniu/inventar deschis:\n"
+"- dublă apăsare (în exterior):\n"
+" --> închideți\n"
+"- atingeți grămada, atingeți slotul:\n"
+" --> mutați grămada\n"
+"- atingeți și trageți, apăsați cu un al doilea deget\n"
+" --> plasați un singur articol în slot\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1445,6 +1421,10 @@ msgstr "Ceață dezactivată"
 msgid "Fog enabled"
 msgstr "Ceață activată"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Ceață activată de joc sau mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informatii despre joc:"
@@ -1465,10 +1445,6 @@ msgstr "Definițiile obiectelor..."
 msgid "KiB/s"
 msgstr "KiB / s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB / s"
@@ -1569,28 +1545,27 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "Ascultarea pe %s nu este posibilă pentru că IPv6 este dezactivat"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Interval de vizualizare nelimitat activat"
+msgstr "Distanță de vizibilitate nelimitată dezactivată"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
-msgstr "Interval de vizualizare nelimitat activat"
+msgstr "Distanță de vizibilitate nelimitată activată"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "Rază infinită de vedere activată. dar interzisă de joc sau mod"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "Intervalul de vizualizare este cel puțin: %d"
+msgstr "Distanța de vizibilitate schimbată la %d (minimă)"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"Vederea schimbată la %d (minimul), dar limitată la %d de către joc sau mod"
 
 #: src/client/game.cpp
 #, c-format
@@ -1598,20 +1573,22 @@ msgid "Viewing range changed to %d"
 msgstr "Intervalul de vizualizare s-a modificat la %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "Intervalul de vizualizare s-a modificat la %d"
+msgstr "Distanța de vizibilitate schimbată la %d (maximă)"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"Vederea schimbată la %d (maximul), dar limitată la %d de către joc sau mod"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "Intervalul de vizualizare s-a modificat la %d"
+msgstr ""
+"Distanța de vizibilitate schimbată la %d, dar limitată la %d de joc sau mod"
 
 #: src/client/game.cpp
 #, c-format
@@ -1626,10 +1603,6 @@ msgstr "Cadru de sârmă afișat"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom dezactivat în prezent de joc sau mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "O.K"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chatul este dezactivat de un joc sau o modificare"
@@ -1669,32 +1642,28 @@ msgstr "Înapoi"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "Cheie pentru furiș"
+msgstr "Tasta de pauză"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
 msgstr "Majuscule"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "Șterge"
+msgstr "Tasta de eliminare"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "Control"
+msgstr "Tasta Control"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Șterge"
+msgstr "Tasta de ștergere"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Săgeată jos"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1741,9 +1710,8 @@ msgid "Insert"
 msgstr "Insert"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Ctrl Stânga"
+msgstr "Săgeată stânga"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1767,9 +1735,8 @@ msgstr "Windows Stânga"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "Meniu"
+msgstr "Tastă Meniu"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1844,20 +1811,17 @@ msgid "OEM Clear"
 msgstr "Curățare OEM"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
-msgstr "Pagină în jos"
+msgstr "Pagină jos"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
 msgstr "Pagină sus"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Pauză"
+msgstr "Tasta Pauză"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1869,14 +1833,12 @@ msgid "Print"
 msgstr "Imprimare"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Înapoi"
+msgstr "Tasta Retur"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Ctrl Dreapta"
+msgstr "Săgeată dreapta"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1908,9 +1870,8 @@ msgid "Select"
 msgstr "Selectează"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Tasta Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1930,7 +1891,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Săgeată sus"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1941,9 +1902,8 @@ msgid "X Button 2"
 msgstr "X Butonul 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
-msgstr "Mărire"
+msgstr "Tasta Mărire"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
@@ -1963,6 +1923,15 @@ msgstr "Mini hartă în modul de suprafață, Zoom %dx"
 msgid "Minimap in texture mode"
 msgstr "Mini hartă în modul de textură"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Eroare la compilarea shaderului \"%s\"."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Shaderele sunt activate dar GLSL nu este suportat de driver."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2078,7 +2047,7 @@ msgstr "Tastă deja folosită"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr ""
+msgstr "Legături tastatură."
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2156,6 +2125,18 @@ msgstr "Mărire"
 msgid "press key"
 msgstr "apasă o tastă"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Deschideți"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Deschideți URL?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "URL nu s-a putut deschide"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Schimbă"
@@ -2189,6 +2170,7 @@ msgstr "Volum sunet: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ro"
 
@@ -2196,15 +2178,17 @@ msgstr "ro"
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
 msgstr ""
+"Numele nu este înregistrat. Pentru a crea un cont pe acest server, dă click "
+"pe „Înregistrare”"
 
 #: src/network/clientpackethandler.cpp
 msgid "Name is taken. Please choose another name"
 msgstr "Numele este folosit. Vă rugăm să alegeți altul"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "Se închide..."
+msgstr "%s în timp ce se închide: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2278,7 +2262,7 @@ msgstr "Zgomot 2D, care localizează văile râurilor și canalelor."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2382,7 +2366,7 @@ msgstr "Interval ABM"
 
 #: src/settings_translation_file.cpp
 msgid "ABM time budget"
-msgstr ""
+msgstr "Buget de timp ABM"
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
@@ -2416,17 +2400,11 @@ msgstr "Interval de trimitere obiect e activ"
 msgid "Adds particles when digging a node."
 msgstr "Adăuga particule atunci când săpați un nod."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ajustați configurația dpi pe ecran (numai pentru x11/Android), de exemplu "
-"pentru ecrane 4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
+"Ajustează densitatea detectată a ecranului, folosită pentru scalarea "
+"elementelor UI."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2453,6 +2431,10 @@ msgstr "Nume administrator"
 msgid "Advanced"
 msgstr "Avansat"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Permiteți lichidelor să fie transparente."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2515,6 +2497,17 @@ msgstr "Adăugați numele articolului la sugestia de instrumente."
 msgid "Apple trees noise"
 msgstr "Zgomotul merilor"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Inerție braț"
@@ -2532,18 +2525,40 @@ msgid "Ask to reconnect after crash"
 msgstr "Solicitați să vă reconectați după cădere"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"La această distanță serverul va optimiza agresiv care blocuri sunt trimise "
+"la\n"
+"clienți.\n"
+"Valorile mici pot îmbunătăți performanța foarte mult, cu costul afișării "
+"unor\n"
+"defecte de randare (unele blocuri nu vor fi redate sub apă și în peșteri,\n"
+"precum și, uneori, pe teren).\n"
+"Setarea acesteia la o valoare mai mare decât max_block_send_distance "
+"dezactivează această\n"
+"optimizare.\n"
+"Menționate în mapblocks (16 noduri)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "La această distanță serverul va optimiza agresiv care blocuri sunt trimise "
 "la\n"
@@ -2559,7 +2574,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
-msgstr ""
+msgstr "Sunet"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
@@ -2575,7 +2590,7 @@ msgstr "Mod scalare automată"
 
 #: src/settings_translation_file.cpp
 msgid "Aux1 key for climbing/descending"
-msgstr ""
+msgstr "Tasta Aux1 pentru urcare/coborâre"
 
 #: src/settings_translation_file.cpp
 msgid "Base ground level"
@@ -2619,6 +2634,11 @@ msgstr "Biomuri"
 msgid "Biome noise"
 msgstr "Biome zgomot"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Distanță de optimizare trimitere bloc"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distanță de optimizare trimitere bloc"
@@ -2629,7 +2649,7 @@ msgstr "Strălucire"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
-msgstr ""
+msgstr "Intensitate Bloom"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Radius"
@@ -2637,11 +2657,11 @@ msgstr "Raza strălucirii (bloom)"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
-msgstr ""
+msgstr "Factor de putere Bloom"
 
 #: src/settings_translation_file.cpp
 msgid "Bobbing"
-msgstr ""
+msgstr "Mișcare"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
@@ -2776,6 +2796,8 @@ msgid ""
 "Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console "
 "output."
 msgstr ""
+"Activare link-uri care se pot deschide (click mijlociu sau Ctrl+click "
+"stânga) în ieșirea consolei din chat."
 
 #: src/settings_translation_file.cpp
 msgid "Client"
@@ -2783,7 +2805,7 @@ msgstr "Client"
 
 #: src/settings_translation_file.cpp
 msgid "Client Mesh Chunksize"
-msgstr ""
+msgstr "Dimensiune Mesh Chunk de client"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -2835,6 +2857,12 @@ msgstr "Ceaţă colorată"
 msgid "Colored shadows"
 msgstr "Umbre colorate"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2867,6 +2895,10 @@ msgid ""
 "Comma-separated list of trusted mods that are allowed to access insecure\n"
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
+"Listă de mod-uri de încredere, separate prin virgulă, cărora li se permite "
+"accesul \n"
+"la funcții nesigure chiar și atunci când securitatea modurilor este activată "
+"(prin request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2875,6 +2907,10 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
+"Nivelul de compresie folosit la salvarea mapblock-urilor pe disk\n"
+"-1 - utilizare nivel implicit de compresie\n"
+"0 - compresie minimă, cea mai rapidă\n"
+"9 - compresie maximă, cea mai lentă"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2883,6 +2919,10 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
+"Nivelul de compresie folosit la trimiterea mapblock-urilor la client\n"
+"-1 - utilizare nivel implicit de compresie\n"
+"0 - compresie minimă, cea mai rapidă\n"
+"9 - compresie maximă, cea mai lentă"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
@@ -2910,11 +2950,11 @@ msgstr "Înalţime consolă"
 
 #: src/settings_translation_file.cpp
 msgid "Content Repository"
-msgstr ""
+msgstr "Depozit de conținut"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
-msgstr ""
+msgstr "Listă neagră a etichetelor pe ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Max Concurrent Downloads"
@@ -2930,20 +2970,25 @@ msgid ""
 "Examples:\n"
 "72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
 msgstr ""
+"Controlează lungimea ciclului de zi/noapte\n"
+"Exemple:\n"
+"72 = 20min, 360 = 4min, 1 = 24ore, 0 = zi/noapte/orice rămâne neschimbat."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"Controlează viteza de scufundare în lichid la staționare. Valorile negative\n"
+"te vor face să te ridici în schimb."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Controlează abruptul/profunditatea depresiunilor lacurilor."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Controlează abruptul/înălțimea dealurilor."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2951,60 +2996,66 @@ msgid ""
 "Value >= 10.0 completely disables generation of tunnels and avoids the\n"
 "intensive noise calculations."
 msgstr ""
+"Controlează lățimea tunelelor, o valoare mai scăzută va crea tunele mai "
+"late.\n"
+"Valorile >= dezactivează complet generarea tunelelor și evită calcule\n"
+"de zgomot intensive."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "Mesaj de eroare"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Transparență țintă"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Crosshair alpha (opaqueness, between 0 and 255).\n"
 "This also applies to the object crosshair."
 msgstr ""
+"Transparență țintă (între 0 și 255).\n"
+"Aceasta se aplică și țintei obiectelor."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "Culoarea țintei"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Crosshair color (R,G,B).\n"
 "Also controls the object crosshair color"
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
+"Culoare țintei (R,G,B)\n"
+"Aceasta controlează și culoarea țintei obiectelor"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
-msgstr ""
+msgstr "Pragul dimensiunii fișierului de jurnal pentru depanare"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
-msgstr ""
+msgstr "Nivelul jurnalului de depanare"
 
 #: src/settings_translation_file.cpp
 msgid "Debugging"
-msgstr ""
+msgstr "Depanare"
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
-msgstr ""
+msgstr "Pasul serverului dedicat"
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "Accelerare implicită"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default maximum number of forceloaded mapblocks.\n"
 "Set this to -1 to disable the limit."
 msgstr ""
+"Numărul maxim implicit de mapblock-uri încărcate forțat.\n"
+"Setează la -1 pentru a dezactiva limita."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
@@ -3012,11 +3063,11 @@ msgstr "Parolă implicită"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Privilegii implicite"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Format de raport implicit"
 
 #: src/settings_translation_file.cpp
 msgid "Default stack size"
@@ -3028,26 +3079,45 @@ msgid ""
 "This simulates the soft shadows effect by applying a PCF or Poisson disk\n"
 "but also uses more resources."
 msgstr ""
+"Definește calitatea filtrării umbrelor.\n"
+"Aceasta simulează și umbre netede aplicând un filtru PCF sau un Poission "
+"disk\n"
+"dar utilizează mai multe resurse."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
-msgstr ""
+msgstr "Definește zonele unde copacii pot avea mere."
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas with sandy beaches."
-msgstr ""
+msgstr "Definește zone cu plaje nisipoase."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain and steepness of cliffs."
-msgstr ""
+msgstr "Definește distribuția de teren înalt și înclinația stâncilor."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain."
-msgstr ""
+msgstr "Definește distribuția de teren înalt."
 
 #: src/settings_translation_file.cpp
 msgid "Defines full size of caverns, smaller values create larger caverns."
 msgstr ""
+"Definește mărimea totală a cavernelor, valori mai mici vor crea caverne mai "
+"mari."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3058,25 +3128,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Defines large-scale river channel structure."
-msgstr ""
+msgstr "Definește structura canalelor de scală mare."
 
 #: src/settings_translation_file.cpp
 msgid "Defines location and terrain of optional hills and lakes."
-msgstr ""
+msgstr "Definește locația și terenul dealurilor și lacurilor opționale."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
-msgstr ""
+msgstr "Definește nivelul de bază al solului."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the depth of the river channel."
-msgstr ""
+msgstr "Definește adâncimea canalul unui râu."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Defines the magnitude of bloom overexposure.\n"
 "Range: from 0.1 to 10.0, default: 1.0"
 msgstr ""
+"Definește magnitudinea supraexpunerii la strălucire.\n"
+"Interval: de la 0.1 la 10.0, implicit: 1.0"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -3213,6 +3285,11 @@ msgstr "Activează strălucirea (bloom)"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Activează Daune"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3232,6 +3309,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3274,6 +3355,10 @@ msgstr "Activați securitatea modului"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3297,6 +3382,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Ecran tactil"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3305,12 +3395,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3340,6 +3424,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4139,9 +4236,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4288,10 +4386,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4340,7 +4434,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4375,10 +4471,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4621,6 +4713,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4689,6 +4785,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Pragul cavernelor"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4798,10 +4899,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4814,6 +4911,11 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Debug Mapgen"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4923,6 +5025,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Nepotrivire versiune protocol. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4938,6 +5049,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5126,8 +5241,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5245,7 +5360,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5278,6 +5393,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5317,8 +5436,7 @@ msgstr "Shadere"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5388,13 +5506,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5430,7 +5541,7 @@ msgstr "Lumină fină"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5451,6 +5562,16 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Raza umbrelor fine"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Sunet dezactivat"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Listă neagră a etichetelor pe ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5607,17 +5728,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5628,6 +5769,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5654,7 +5801,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5711,6 +5858,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5758,15 +5909,15 @@ msgstr "Ecran tactil"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Prag ecran tactil"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Fluturarea lichidelor"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5802,7 +5953,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5904,10 +6057,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5994,12 +6143,25 @@ msgstr ""
 msgid "Volume"
 msgstr "Volum"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Lumină fină"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6239,12 +6401,18 @@ msgstr ""
 #~ msgid "(game support required)"
 #~ msgstr "(necesită suportul jocului)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresa: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Modul creativ: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Daune: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6280,6 +6448,13 @@ msgstr ""
 #~ "Rețineți că, câmpul de adresă din meniul principal suprascrie această "
 #~ "setare."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ajustați configurația dpi pe ecran (numai pentru x11/Android), de exemplu "
+#~ "pentru ecrane 4k."
+
 #~ msgid "All Settings"
 #~ msgstr "Toate setările"
 
@@ -6311,6 +6486,9 @@ msgstr ""
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Biți per pixel (aka adâncime de culoare) în modul ecran complet."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Limite blocuri afișate pentru toate blocurile"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Cartografiere cu denivelări"
 
@@ -6333,6 +6511,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Tasta de comutare a actualizării camerei"
 
+#~ msgid "Change Keys"
+#~ msgstr "Modifică tastele"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Modifică tastele"
@@ -6385,12 +6566,47 @@ msgstr ""
 #~ msgid "Continuous forward"
 #~ msgstr "În continuare înainte"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Controale:\n"
+#~ "- %s: deplasare înainte\n"
+#~ "- %s: deplasare înapoi\n"
+#~ "- %s: deplasare stânga\n"
+#~ "- %s: deplasare dreapta\n"
+#~ "- %s: salt/urcare\n"
+#~ "- %s: săpare/lovire\n"
+#~ "- %s: plasare/utilizare\n"
+#~ "- %s: furișare/coborâre\n"
+#~ "- %s: aruncare obiect\n"
+#~ "- %s: inventar\n"
+#~ "- Maus: rotire/privire\n"
+#~ "- Roata mausului: selectare obiect\n"
+#~ "- %s: chat\n"
+
 #~ msgid "Creative"
 #~ msgstr "Creativ"
 
 #~ msgid "Credits"
 #~ msgstr "Credite"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Daune"
 
@@ -6476,6 +6692,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Instalare: fișier: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Jocul este nevalid."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tasta pentru inventar"
 
@@ -6642,6 +6861,10 @@ msgstr ""
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Pragul atingerii (px):"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Prag ecran tactil"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Filtrare Triliniară"
 
@@ -6702,8 +6925,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Ai murit."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nu aveți jocuri instalate."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "O.K"
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index c72aa7407..047cd70fe 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -2,19 +2,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Russian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-12 13:14+0000\n"
-"Last-Translator: Nanashi Mumei <nanashi.mumei@users.noreply.hosted.weblate."
-"org>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-16 12:09+0000\n"
+"Last-Translator: BlackImpostor <SkyBuilderOFFICAL@yandex.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
 "minetest/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.2-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -73,8 +72,8 @@ msgid "Command not available: "
 msgstr "Команда недоступна: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Получить справку по командам"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Получить справку по командам (-t: вывод в чат)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -84,12 +83,8 @@ msgstr ""
 "help all» для вывода всего списка."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <команда>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "ОК"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <команда>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -107,6 +102,10 @@ msgstr "Произошла ошибка:"
 msgid "Main menu"
 msgstr "Главное меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ОК"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Переподключиться"
@@ -135,19 +134,27 @@ msgstr "Мы поддерживаем только протокол версии
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Мы поддерживаем только протоколы версий с $1 по $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "«$1» уже существует. Перезаписать?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Ошибка установки «$1»: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Зависимости $1 и $2 будут установлены."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Не удалось загрузить «$1»"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 из $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Не удалось загрузить $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Не удалось извлечь «$1» (недостаточно места на диске, неподдерживаемый тип "
+"файла или поврежденный архив)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -155,157 +162,157 @@ msgstr ""
 "$1 скачивается,\n"
 "$2 в очереди"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 скачивается…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Не удалось найти требуемые зависимости $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "Будет установлен $1, а зависимости $2 будут пропущены."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Все дополнения"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Уже установлено"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Назад в главное меню"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB недоступен, когда Minetest скомпилирован без cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Ошибка при получении зависимостей для дополнения"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Игры"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Установить"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Дополнения"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Дополнения не могут быть получены"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Нет результатов"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Нет обновлений"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "В очереди"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Наборы текстур"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Дополнение $1 не найдено."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Удалить"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Обновить"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Обновить всё [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Посетить страницу в сети"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Вам нужно установить игру, прежде чем вы сможете установить мод"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Зависимости $1 и $2 будут установлены."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 из $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Не удалось найти требуемые зависимости $1."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Будет установлен $1, а зависимости $2 будут пропущены."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Уже установленно"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Основная игра:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Отмена"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB недоступен, когда Minetest скомпилирован без cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Зависимости:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Загрузка…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Ошибка установки «$1»: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Не удалось загрузить «$1»"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Не удалось загрузить $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Не удалось извлечь «$1» (неподдерживаемый тип файла или повреждённый архив)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Игры"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Установить"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Установить $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Установить недостающие зависимости"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Загрузка…"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Моды"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Дополнения не могут быть получены"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Нет результатов"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Нет обновлений"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Не найдено"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Убедитесь что основная игра корректна."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "В очереди"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$1» уже существует. Перезаписать?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Наборы текстур"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Дополнение $1 не найдено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Удалить"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Обновить"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Обновить всё [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Посетить страницу в сети"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Вам нужно установить игру, прежде чем вы сможете установить мод"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Перезаписать"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -453,10 +460,22 @@ msgstr "Создать"
 msgid "Decorations"
 msgstr "Декорации"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Пустынные храмы"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test предназначен для разработчиков."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Другой вариант данжей, генерируемый в биомах пустыни (только если включены "
+"сами данжи)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Подземелья"
@@ -549,7 +568,7 @@ msgstr "Реки на уровне моря"
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "Seed"
-msgstr "Зерно"
+msgstr "Сид"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
@@ -755,7 +774,7 @@ msgstr "Выбрать файл"
 
 #: builtin/mainmenu/settings/components.lua
 msgid "Set"
-msgstr "Выбрать"
+msgstr "Назначить"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -834,10 +853,6 @@ msgstr "Доступность"
 msgid "Back"
 msgstr "Назад"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Изменить управление"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -847,7 +862,8 @@ msgstr "Чат"
 msgid "Clear"
 msgstr "Очистить"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Управление"
 
@@ -885,11 +901,11 @@ msgstr "Клиентские моды"
 
 #: builtin/mainmenu/settings/settingtypes.lua
 msgid "Content: Games"
-msgstr "Дополнения: игры"
+msgstr "Контент: Игры"
 
 #: builtin/mainmenu/settings/settingtypes.lua
 msgid "Content: Mods"
-msgstr "Дополнения: моды"
+msgstr "Контент: Дополнения"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
@@ -930,7 +946,7 @@ msgstr "Очень низкие"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "About"
-msgstr "Об игре"
+msgstr "Подробнее"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Active Contributors"
@@ -938,7 +954,7 @@ msgstr "Активные участники"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Active renderer:"
-msgstr "Используемый отрисовщик:"
+msgstr "Активный рендер:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Developers"
@@ -978,19 +994,19 @@ msgstr "Поделиться журналом отладки"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr "Поиск дополнений в сети"
+msgstr "Поиск онлайн контента"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content [$1]"
-msgstr "Поиск дополнений в сети [$1]"
+msgstr "Поиск онлайн контента [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
-msgstr "Дополнения"
+msgstr "Контент"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content [$1]"
-msgstr "Дополнения [$1]"
+msgstr "Контент [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1050,7 +1066,19 @@ msgstr "Установить игру"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "Установить игры из ContentDB"
+msgstr "Установить игры с ContentDB"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game больше не стоит по умолчанию."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest - это платформа для создания модификаций, которая позволяет вам "
+"играть во множество различных игр и устанавливать дополнения."
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -1062,7 +1090,7 @@ msgstr "Мир не создан или не выбран!"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
-msgstr "Играть"
+msgstr "Играть в Игру"
 
 #: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_online.lua
 msgid "Port"
@@ -1085,8 +1113,8 @@ msgid "Start Game"
 msgstr "Начать игру"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "У вас не установлено ни одной игры."
+msgid "You need to install a game before you can create a world."
+msgstr "Вам требуется установить игру, прежде чем вы сможете создать мир."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1165,18 +1193,10 @@ msgstr "Загрузка текстур…"
 msgid "Rebuilding shaders..."
 msgstr "Сборка шейдеров…"
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Ошибка соединения (время вышло?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Не удалось найти или загрузить игру: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Неправильная конфигурация игры."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Главное меню"
@@ -1201,7 +1221,11 @@ msgstr "Не удалось открыть указанный файл с пар
 msgid "Provided world path doesn't exist: "
 msgstr "По этому пути мира нет: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медиафайлы…"
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1209,18 +1233,10 @@ msgstr ""
 "\n"
 "Подробности в debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Адрес: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Режим: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Публичность: "
@@ -1255,10 +1271,6 @@ msgstr "Автобег включён"
 msgid "Block bounds hidden"
 msgstr "Границы мапблока скрыты"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Границы показаны для всех мапблоков"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Границы показаны для текущего мапблока"
@@ -1303,6 +1315,10 @@ msgstr "Пользовательские моды отключены"
 msgid "Connecting to server..."
 msgstr "Подключение к серверу…"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Ошибка соединения (время вышло?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Сбой соединения по неизвестной причине"
@@ -1311,46 +1327,13 @@ msgstr "Сбой соединения по неизвестной причине
 msgid "Continue"
 msgstr "Продолжить"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Управление:\n"
-"- %s: вперёд\n"
-"- %s: назад\n"
-"- %s: влево\n"
-"- %s: вправо\n"
-"- %s: прыжок/подъём\n"
-"- %s: копать/удар/применить\n"
-"- %s: разместить/применить\n"
-"- %s: красться/спуск\n"
-"- %s: бросить предмет\n"
-"- %s: инвентарь\n"
-"- Мышь: поворот/обзор\n"
-"- Колесо мыши: выбор предмета\n"
-"- %s: чат\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1359,17 +1342,17 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"Управление по умолчанию:\n"
-"Меню скрыто:\n"
+"Управление:\n"
+"Нет открытых меню:\n"
 "- провести пальцем: осмотреться\n"
 "- нажатие: разместить/применить\n"
 "- долгое нажатие: копать/удар/применить\n"
-"В меню/инвентаре:\n"
+"В открытом меню:\n"
 "- двойное нажатие (вне меню)\n"
 " --> закрыть меню\n"
 "- нажать на стак, затем на слот:\n"
 " --> передвинуть стак\n"
-"- потащить стак, нажать вторым пальцем:\n"
+"- нажать и потащить стак, нажать вторым пальцем:\n"
 " --> положить один предмет в слот\n"
 
 #: src/client/game.cpp
@@ -1408,7 +1391,7 @@ msgstr "Выйти в меню"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
-msgstr "Выйти в ОС"
+msgstr "Выйти из игры"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
@@ -1442,6 +1425,10 @@ msgstr "Туман отключён"
 msgid "Fog enabled"
 msgstr "Туман включён"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Туман включён игрой или модом"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Сведения об игре:"
@@ -1462,10 +1449,6 @@ msgstr "Описания предметов…"
 msgid "KiB/s"
 msgstr "КиБ/с"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Медиафайлы…"
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "МиБ/с"
@@ -1623,10 +1606,6 @@ msgstr "Отображение каркаса включено"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Приближение на данный момент отключено игрой или модом"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ок"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Чат на данный момент отключён игрой или модом"
@@ -1658,7 +1637,7 @@ msgstr "Профилировщик (страница %d из %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
-msgstr "Apps"
+msgstr "Приложения"
 
 #: src/client/keycode.cpp
 msgid "Backspace"
@@ -1695,11 +1674,11 @@ msgstr "End"
 
 #: src/client/keycode.cpp
 msgid "Erase EOF"
-msgstr "Erase EOF"
+msgstr "Стереть EOF"
 
 #: src/client/keycode.cpp
 msgid "Execute"
-msgstr "Execute"
+msgstr "Выполнить"
 
 #: src/client/keycode.cpp
 msgid "Help"
@@ -1711,23 +1690,23 @@ msgstr "Home"
 
 #: src/client/keycode.cpp
 msgid "IME Accept"
-msgstr "IME Accept"
+msgstr "Принять IME"
 
 #: src/client/keycode.cpp
 msgid "IME Convert"
-msgstr "IME Convert"
+msgstr "Конвертировать IME"
 
 #: src/client/keycode.cpp
 msgid "IME Escape"
-msgstr "IME Escape"
+msgstr "Выйти IME"
 
 #: src/client/keycode.cpp
 msgid "IME Mode Change"
-msgstr "IME Mode Change"
+msgstr "Режим изменения IME"
 
 #: src/client/keycode.cpp
 msgid "IME Nonconvert"
-msgstr "IME Nonconvert"
+msgstr "Несконвертуемый IME"
 
 #: src/client/keycode.cpp
 msgid "Insert"
@@ -1772,67 +1751,67 @@ msgstr "Num Lock"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
-msgstr "Numpad *"
+msgstr "Номерная плитка *"
 
 #: src/client/keycode.cpp
 msgid "Numpad +"
-msgstr "Numpad +"
+msgstr "Номерная плитка +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
-msgstr "Numpad -"
+msgstr "Номерная плитка -"
 
 #: src/client/keycode.cpp
 msgid "Numpad ."
-msgstr "Numpad ."
+msgstr "Номерная плитка ."
 
 #: src/client/keycode.cpp
 msgid "Numpad /"
-msgstr "Numpad /"
+msgstr "Номерная плитка /"
 
 #: src/client/keycode.cpp
 msgid "Numpad 0"
-msgstr "Numpad 0"
+msgstr "Номерная плитка 0"
 
 #: src/client/keycode.cpp
 msgid "Numpad 1"
-msgstr "Numpad 1"
+msgstr "Номерная плитка 1"
 
 #: src/client/keycode.cpp
 msgid "Numpad 2"
-msgstr "Numpad 2"
+msgstr "Номерная плитка 2"
 
 #: src/client/keycode.cpp
 msgid "Numpad 3"
-msgstr "Numpad 3"
+msgstr "Номерная плитка 3"
 
 #: src/client/keycode.cpp
 msgid "Numpad 4"
-msgstr "Numpad 4"
+msgstr "Номерная плитка 4"
 
 #: src/client/keycode.cpp
 msgid "Numpad 5"
-msgstr "Numpad 5"
+msgstr "Номерная плитка 5"
 
 #: src/client/keycode.cpp
 msgid "Numpad 6"
-msgstr "Numpad 6"
+msgstr "Номерная плитка 6"
 
 #: src/client/keycode.cpp
 msgid "Numpad 7"
-msgstr "Numpad 7"
+msgstr "Номерная плитка 7"
 
 #: src/client/keycode.cpp
 msgid "Numpad 8"
-msgstr "Numpad 8"
+msgstr "Номерная плитка 8"
 
 #: src/client/keycode.cpp
 msgid "Numpad 9"
-msgstr "Numpad 9"
+msgstr "Номерная плитка 9"
 
 #: src/client/keycode.cpp
 msgid "OEM Clear"
-msgstr "OEM Clear"
+msgstr "OEM Очистка"
 
 #: src/client/keycode.cpp
 msgid "Page Down"
@@ -1849,7 +1828,7 @@ msgstr "Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
-msgstr "Play"
+msgstr "Играть"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
@@ -1891,7 +1870,7 @@ msgstr "Scroll Lock"
 #. ~ Key name
 #: src/client/keycode.cpp
 msgid "Select"
-msgstr "Select"
+msgstr "Выбрать"
 
 #: src/client/keycode.cpp
 msgid "Shift Key"
@@ -1899,7 +1878,7 @@ msgstr "Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
-msgstr "Sleep"
+msgstr "Спать"
 
 #: src/client/keycode.cpp
 msgid "Snapshot"
@@ -1947,6 +1926,15 @@ msgstr "Миникарта в ландшафтном режиме, увелич
 msgid "Minimap in texture mode"
 msgstr "Миникарта в текстурном режиме"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Не удалось скомпилировать шейдер «%s»."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Шейдеры включены, но GLSL не поддерживается драйвером."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2139,6 +2127,18 @@ msgstr "Приближение"
 msgid "press key"
 msgstr "нажмите клавишу"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Открыто"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Открыть URL-адрес?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "Не удается открыть URL-адрес"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Изменить"
@@ -2172,6 +2172,7 @@ msgstr "Громкость звука: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "ru"
 
@@ -2345,7 +2346,7 @@ msgid ""
 "A chosen map seed for a new map, leave empty for random.\n"
 "Will be overridden when creating a new world in the main menu."
 msgstr ""
-"Выбранное зерно для новой карты, оставьте пустым для случайного.\n"
+"Выбранный сид для нового мира, оставьте пустым для случайного.\n"
 "Будет переопределено при создании нового мира в главном меню."
 
 #: src/settings_translation_file.cpp
@@ -2396,14 +2397,6 @@ msgstr "Дальность отправляемого активного объ
 msgid "Adds particles when digging a node."
 msgstr "Добавляет частицы при копании ноды."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Настройка dpi (плотности точек на дюйм) для вашего экрана (не для X11, "
-"только для Android). Например для мониторов с разрешением в 4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2434,6 +2427,10 @@ msgstr "Имя админа"
 msgid "Advanced"
 msgstr "Дополнительно"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Позволяет жидкостям быть прозрачными."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2492,6 +2489,27 @@ msgstr "Добавлять названия предметов во всплыв
 msgid "Apple trees noise"
 msgstr "Шум яблонь"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Примените сглаживание, чтобы уменьшить искажения цветовых полос.\n"
+"Сглаживание значительно увеличивает размер\n"
+"скриншотов, сжатых без потерь, и работает некорректно, если дисплей или "
+"операционная система\n"
+"выполняют дополнительное сглаживание или если цветовые каналы не квантованы\n"
+"до 8 бит.\n"
+"В OpenGL ES сглаживание работает только в том случае, если шейдер "
+"поддерживает высокую\n"
+"точность с плавающей запятой, и это может оказать более высокое влияние на "
+"производительность."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Покачивание руки"
@@ -2515,21 +2533,40 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
-"На этом расстоянии сервер будет агрессивно оптимизировать то, какие\n"
-"мапблоки будут отправлены клиентам.\n"
-"Малые значения могут увеличить производительность за счёт заметных\n"
-"проблем визуализации (некоторые фрагменты не будут отрисовываться\n"
-"под водой, в пещерах, а иногда и на суше).\n"
-"Установка этого значения больше, чем max_block_send_distance\n"
-"отключит эту оптимизацию.\n"
-"Указывается в мапблоках карты (16 нод)."
+"На таком расстоянии сервер будет активно оптимизировать, какие блоки будут "
+"отправляться\n"
+"клиентам.\n"
+"Небольшие значения потенциально значительно повышают производительность за "
+"счет видимых\n"
+"сбоев в рендеринге (некоторые блоки могут отображаться некорректно в шахтах)."
+"\n"
+"Установка значения, превышающего значение max_block_send_distance, отключает "
+"эту\n"
+"оптимизацию.\n"
+"Указано в MapBlocks (16 нод)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"На таком расстоянии сервер выполнит более простую и дешевую проверку "
+"окклюзии.\n"
+"Меньшие значения потенциально повышают производительность за счет временно "
+"заметных\n"
+"сбоев в рендеринге (пропущенных блоков).\n"
+"Это особенно полезно при очень большом диапазоне просмотра (более 500).\n"
+"Указано в MapBlocks (16 узлов)."
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
@@ -2585,12 +2622,16 @@ msgstr "Адрес привязки"
 
 #: src/settings_translation_file.cpp
 msgid "Biome API"
-msgstr "Biome API"
+msgstr "API биомов"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Шум биомов"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Отбраковка блоков оптимизирует расстояние"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Дистанция оптимизирования отправки мапблока"
@@ -2807,6 +2848,16 @@ msgstr "Цветной туман"
 msgid "Colored shadows"
 msgstr "Цветные тени"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Список разделенных запятыми расширений AL и ALC, которые не следует "
+"использовать.\n"
+"Полезно для тестирования. Подробности смотрите в разделе "
+"al_extensions.[h,cpp]."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2893,7 +2944,7 @@ msgstr "Высота консоли"
 
 #: src/settings_translation_file.cpp
 msgid "Content Repository"
-msgstr "Репозиторий дополнений"
+msgstr "Репозиторий Контента"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
@@ -2901,11 +2952,11 @@ msgstr "Чёрный список меток ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Max Concurrent Downloads"
-msgstr "Максимум одновременных загрузок ContentDB"
+msgstr "Максимум Одновременных Скачиваний ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
-msgstr "Адрес ContentDB"
+msgstr "Ссылка ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2973,10 +3024,6 @@ msgstr ""
 "Цвет прицела (R,G,B).\n"
 "Также контролирует цвет объекта прицела"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Порог размера файла журнала отладки"
@@ -3031,6 +3078,29 @@ msgstr ""
 "Это имитирует эффект мягких теней, применяя PCF или диск Пуассона,\n"
 "но также использует больше ресурсов."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Определите, к каким самым старым клиентам разрешено подключаться.\n"
+"Старые клиенты совместимы в том смысле, что они не будут выходить из строя "
+"при подключении\n"
+"к новым серверам, но они могут поддерживать не все новые функции, которые вы "
+"ожидаете.\n"
+"Это позволяет осуществлять более детальный контроль, чем "
+"strict_protocol_version_checking.\n"
+"Minetest по-прежнему применяет свой собственный внутренний минимум, и "
+"включение\n"
+"strict_protocol_version_checking эффективно отменит это."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Определяет области, где у деревьев есть яблоки."
@@ -3168,7 +3238,7 @@ msgstr "Рассинхронизация анимации нод"
 
 #: src/settings_translation_file.cpp
 msgid "Developer Options"
-msgstr "Настройки для разработчиков"
+msgstr "Для разработчиков"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
@@ -3234,6 +3304,10 @@ msgstr "Включить эффект свечения (блум)"
 msgid "Enable Bloom Debug"
 msgstr "Включить отладку свечения"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Включить Дебандинг"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3260,6 +3334,10 @@ msgstr ""
 "Если включена использует диск Пуассона для создания «мягких теней». В "
 "противном случае используется фильтрация PCF."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Включить Постобработку"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Включить лучевое окклюзивное отсечение"
@@ -3309,6 +3387,11 @@ msgstr "Включить безопасность модов"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr "Включает колёсико мыши (прокрутку) для выбора предмета в хотбаре."
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+"Включите случайную загрузку модов (в основном используемых для тестирования)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Включить случайный ввод пользователя (только для тестов)."
@@ -3339,6 +3422,10 @@ msgstr ""
 "к новым серверам, однако они могут не поддерживать всех новых функций, "
 "которые вы ожидаете."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Включить сенсорный экран"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3352,14 +3439,6 @@ msgstr ""
 "текстуры)\n"
 "во время подключения к серверу."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Включить объекты буфера вершин.\n"
-"Это должно значительно улучшить графическую производительность."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3398,6 +3477,21 @@ msgstr "Включить анимацию предметов в инвентар
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Включает кэширование повёрнутых мешей."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Включает отладку и проверку ошибок в драйвере OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Включает конвейер последующей обработки."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Включает сенсорный режим, позволяющий играть в игру с помощью сенсорного "
+"экрана."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3482,7 +3576,7 @@ msgid ""
 "the\n"
 "Multiplayer Tab."
 msgstr ""
-"Файл в папке client/serverlist/, содержащий ваши избранные серверы\n"
+"Файл в папке client/serverlist/, содержащий ваши избранные сервера\n"
 "из вкладки Мультиплеер."
 
 #: src/settings_translation_file.cpp
@@ -3511,7 +3605,7 @@ msgstr "Первый из двух 3D-шумов, которые вместе о
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr "Фиксированное зерно мира"
+msgstr "Почининный сид мира"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed virtual joystick"
@@ -4194,7 +4288,7 @@ msgstr "Чувствительность джойстика"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick type"
-msgstr "Тип контроллера"
+msgstr "Тип Джойстика"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4320,12 +4414,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Длительность шага сервера и интервал, с которым объекты обычно\n"
-"обновляются по сети, в секундах."
+"Длительность тика сервера (интервал, с которым обычно все обновляется),\n"
+"указанная в секундах.\n"
+"Не применяется к сеансам, размещенным из клиентского меню."
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
@@ -4498,10 +4594,6 @@ msgstr ""
 "Включить зависимость цвета тумана и облаков от времени суток (рассвет/закат) "
 "и направления взгляда."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Сделать все жидкости непрозрачными"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Уровень сжатия карты для дискового хранилища"
@@ -4561,12 +4653,16 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"Атрибуты генерации для мапгена v6.\n"
-"Параметр «snowbiomes» (снежные биомы) включает новую систему с 5 биомами.\n"
-"Если «snowbiomes» включён, то автоматически активируются джунгли,\n"
-"а флаг «jungles» не учитывается."
+"Атрибуты создания карт, специфичные для Mapgen v6.\n"
+"Флаг «snowbiomes» включает новую систему 5 биомов.\n"
+"При включенном флаге «snowbiomes» автоматически включаются джунгли, а\n"
+"флаг «jungles» игнорируется.\n"
+"Флаг «temples» отключает создание храмов в пустыне. Вместо них появятся "
+"обычные данжи."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4604,10 +4700,6 @@ msgstr "Задержка в генерации мешей мапблока"
 msgid "Mapblock mesh generation threads"
 msgstr "Потоки генерации мешей мапблоков"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Размер кэша мапблоков в генераторе мешей мапблоков в мегабайтах"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Время ожидания выгрузки мапблоков"
@@ -4875,6 +4967,10 @@ msgstr "Минимальный уровень журналирования дл
 msgid "Minimap scan height"
 msgstr "Высота сканирования миникарты"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "Минимальный интервал повторения раскопок"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Минимум случайных больших пещер на мапчанк."
@@ -4943,6 +5039,10 @@ msgstr "Чувствительность мыши"
 msgid "Mouse sensitivity multiplier."
 msgstr "Множитель чувствительности мыши."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Порог перемещения"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Шум грязи"
@@ -5081,10 +5181,6 @@ msgstr "Метод окклюзивного отсечения"
 msgid "Occlusion Culling"
 msgstr "Окклюзивное отсечение"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Непрозрачные жидкости"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5099,6 +5195,10 @@ msgstr ""
 "Открыть меню паузы при потере окном фокуса.\n"
 "Не срабатывает, если какая-либо форма уже открыта."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "Отладка OpenGL"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Опциональное переопределение цвета ссылки в чате."
@@ -5232,6 +5332,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Соотношение больших пещер, которые содержат жидкости."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Минимальная версия протокола"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Жест удара кулаком"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5249,6 +5357,10 @@ msgstr "Поднимает ландшафт, чтобы образовывать
 msgid "Random input"
 msgstr "Случайный ввод"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Случайный порядок загрузки мода"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Недавние сообщения чата"
@@ -5395,10 +5507,11 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
-"Масштабировать интерфейс, используя заданное значение.\n"
+"Масштабируйте интерфейс, используя заданное значение.\n"
 "Использует фильтр ближайшего сглаживания, чтобы масштабировать интерфейс.\n"
-"Это сгладит острые углы и смешает пиксели при уменьшении масштаба,\n"
-"за счёт размывания пикселей на гранях при масштабировании на нецелые размеры."
+"Это сгладит острые углы и смешает пиксели при\n"
+"уменьшении размера за счёт размывания пикселей на гранях\n"
+"при масштабировании на нецелые размеры."
 
 #: src/settings_translation_file.cpp
 msgid "Screen"
@@ -5436,7 +5549,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Screenshots"
-msgstr "Скриншоты"
+msgstr "Снимки экрана"
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5462,8 +5575,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5479,22 +5592,25 @@ msgid ""
 msgstr ""
 "Выберите метод сглаживания, который необходимо применить.\n"
 "\n"
-"* None - сглаживание отсутствует (по умолчанию)\n"
+"* * Нет - сглаживание отсутствует (по умолчанию).\n"
 "\n"
-"* FSAA - аппаратное полноэкранное сглаживание (несовместимое с шейдерами)\n"
-", известное как сглаживание с несколькими выборками (MSAA)\n"
+"* FSAA - Аппаратное полноэкранное сглаживание\n"
+"(несовместимое с постобработкой и недостаточной дискретизацией)\n"
+", аналогичное сглаживанию с несколькими выборками (MSAA)\n"
 "Сглаживает края блоков, но не влияет на внутреннюю часть текстур.\n"
 "Для изменения этого параметра требуется перезагрузка.\n"
 "\n"
-"* FXAA - быстрое приблизительное сглаживание (требуются шейдеры)\n"
-"Применяет фильтр постобработки для обнаружения и сглаживания "
+"* FXAA - Быстрое приблизительное сглаживание (требуется использование "
+"шейдеров)\n"
+"Применяется фильтр последующей обработки для обнаружения и сглаживания "
 "высококонтрастных краев.\n"
 "Обеспечивает баланс между скоростью и качеством изображения.\n"
 "\n"
-"* SSAA - сглаживание с супер-выборкой (требуются шейдеры)\n"
-"Рендерит изображение сцены с более высоким разрешением, затем уменьшает "
-"масштаб,\n"
-"чтобы уменьшить эффекты наложения. Это самый медленный и точный метод."
+"* SSAA - сглаживание с использованием суперсэмплирования (требуются шейдеры)"
+"\n"
+"Визуализирует изображение сцены с более высоким разрешением, затем уменьшает "
+"масштаб, чтобы уменьшить\n"
+"эффекты наложения. Это самый медленный и точный метод."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5624,11 +5740,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"Устанавливает язык. Оставьте пустым, чтобы использовать системный язык.\n"
-"Требует перезапуска после изменения."
+"Установит язык. По умолчанию используется язык системы.\n"
+"После изменения этого параметра требуется перезагрузка."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5668,6 +5784,12 @@ msgstr ""
 "Включает эффект свечения.\n"
 "Яркие цвета будут переливаться через соседние предметы."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+"Установите значение true, чтобы включить эффект объемного освещения (он же "
+"\"Божественные лучи\")."
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Включает покачивание листвы."
@@ -5716,13 +5838,11 @@ msgstr "Шейдеры"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
-"Шейдеры позволяют использовать дополнительные визуальные эффекты и могут "
-"увеличить\n"
-"производительность некоторых видеоплат.\n"
-"Работают только с движком отрисовки OpenGL."
+"Шейдеры позволяют создавать расширенные визуальные эффекты и могут повысить "
+"производительность некоторых\n"
+"видеокарт."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5810,16 +5930,6 @@ msgstr ""
 "Изменять его нужно только в особых ситуациях, рекомендуется\n"
 "оставить как есть."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Размер кэша мапблоков карты в генераторе мешей. Увеличение этого значения\n"
-"увеличит процент попаданий в кэш, предотвращая копирование информации\n"
-"из основного потока игры, тем самым уменьшая колебания кадровой частоты."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Наклон орбиты небесных тел"
@@ -5855,11 +5965,11 @@ msgstr "Мягкое освещение"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
-"Плавное вращение камеры в кинематографичном режиме, 0 для отключения. "
-"Включите кинематографичный режим клавишей, определённой в настройках "
-"управления."
+"Сглаживает поворот камеры в кинематографическом режиме, 0 для отключения. "
+"Войдите в кинематографический режим, используя клавишу, установленную в "
+"элементах управления."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5881,6 +5991,14 @@ msgstr "Скорость ходьбы украдкой, в нодах в сек
 msgid "Soft shadow radius"
 msgstr "Радиус мягкой тени"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Звук"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "Черный список Расширений Звука"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5982,8 +6100,8 @@ msgstr ""
 "островов.\n"
 "Вода по умолчанию отключена и будет размещена только в том случае, если это "
 "значение\n"
-"будет установлено выше «mgv7_floatland_ymax» - "
-"«mgv7_floatland_taper» (начало\n"
+"будет установлено выше «mgv7_floatland_ymax» - «mgv7_floatland_taper» "
+"(начало\n"
 "верхнего сужения).\n"
 "*** ПРЕДУПРЕЖДЕНИЕ, ВЕРОЯТНАЯ ОПАСНОСТЬ ДЛЯ МИРОВ И РАБОТЫ СЕРВЕРА ***:\n"
 "При включении размещения воды парящих островов должны быть сконфигурированы "
@@ -6076,7 +6194,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
-msgstr "Адрес сетевого хранилища"
+msgstr "Адрес источника дополнения"
 
 #: src/settings_translation_file.cpp
 msgid "The dead zone of the joystick"
@@ -6090,20 +6208,52 @@ msgstr ""
 "Формат по умолчанию, в котором профили будут сохранены,\n"
 "когда вызывают «/profiler save [формат]» без формата."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"Задержка в миллисекундах, после которой сенсорное взаимодействие считается "
+"длительным нажатием."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 "Путь к файлу, куда будут сохранены профили, относительно пути к вашему миру."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"Жест, обозначающий удар по игроку/объекту.\n"
+"Его можно изменить в играх и модах.\n"
+"\n"
+"* короткий удар\n"
+"Прост в использовании и хорошо известен по другим играм, названия которых не "
+"указываются.\n"
+"\n"
+"* длинный удар\n"
+"Известен по классическому мобильному элементу управления Minetest.\n"
+"Сражение более или менее невозможно."
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Идентификатор используемого контроллера"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
-"Расстояние в пикселях, с которого начинается действие от сенсорного экрана."
+"Длина в пикселях, после которой сенсорное взаимодействие считается движением."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6117,6 +6267,15 @@ msgstr ""
 "0.0 = волна не двигается вообще.\n"
 "Значение по умолчанию — 1.0 (1/2 ноды)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Минимальное время в секундах, которое требуется между копающими узлами при "
+"удерживании\n"
+"кнопки копать."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Сетевой интерфейс который слушает сервер."
@@ -6152,12 +6311,13 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
-"Движок отрисовки.\n"
-"Примечение: после изменения этой настройки требуется перезапуск!\n"
-"OpenGL по умолчанию для компьютеров и OGLES2 для Android.\n"
-"Шейдеры поддерживаются OpenGL и OGLES2 (экспериментально)."
+"Серверная часть рендеринга.\n"
+"Примечание: После изменения этого параметра требуется перезагрузка!\n"
+"По умолчанию для настольных компьютеров используется OpenGL, а для Android - "
+"OGLES2.\n"
+"Шейдеры поддерживаются всеми, кроме OGLES1."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6235,6 +6395,10 @@ msgstr ""
 "Третий из четырёх 2D-шумов, которые вместе определяют диапазон высот холмов "
 "и гор."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Порог для длинных нажатий"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6289,14 +6453,14 @@ msgstr "Чувствительность сенсорного экрана"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Множитель чувствительности сенсорного экрана."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Порог сенсорного экрана"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Компромиссы для производительности"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Полупрозрачные жидкости"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Дальность сортировки по прозрачности"
@@ -6343,10 +6507,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
-"Адрес к файлу JSON, который предоставляет сведения о последнем выпуске "
-"Minetest"
+"URL-адрес файла JSON, который предоставляет информацию о последней версии "
+"Minetest\n"
+"Если поле не заполнено, движок никогда не будет проверять наличие обновлений."
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6405,9 +6572,8 @@ msgstr ""
 "Использовать анизотропную фильтрацию при взгляде на текстуры под углом."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Использовать трилинейную фильтрацию для масштабирования текстур."
+msgstr "Использовать билинейную фильтрацию для масштабирования текстур."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6423,15 +6589,15 @@ msgstr ""
 "выбора предмета."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Использовать MIP-текстурирование для текстур в уменьшенном масштабе.\n"
-"Может немного увеличить производительность, особенно при использовании "
-"набора текстур высокого разрешения.\n"
+"Использовать MIP-текстурирование для масштабирования текстур. Может немного "
+"увеличить\n"
+"производительность, особенно при использовании пакета текстур высокого "
+"разрешения.\n"
 "Гамма-коррекция при уменьшении масштаба не поддерживается."
 
 #: src/settings_translation_file.cpp
@@ -6445,13 +6611,12 @@ msgstr ""
 "для клиентских мешей меньше чем 4x4x4 мапблоков."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Используйте трехлинейную фильтрацию при уменьшении масштаба текстур.\n"
+"Использовать трилинейную фильтрацию при масштабировании текстур.\n"
 "Если включены как билинейная, так и трилинейная фильтрация,\n"
 "применяется трилинейная фильтрация."
 
@@ -6467,11 +6632,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
-msgstr "Пользовательские интерфейсы"
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "Объекты буфера вершин (VBO)"
+msgstr "Интерфейсы"
 
 #: src/settings_translation_file.cpp
 msgid "VSync"
@@ -6565,6 +6726,10 @@ msgstr "Виртуальный джойстик нажимает кнопку Au
 msgid "Volume"
 msgstr "Громкость"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Увеличивается громкость, когда окно не сфокусировано."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6573,6 +6738,14 @@ msgstr ""
 "Громкость всех звуков.\n"
 "Требует включенной звуковой системы."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "Громкость при расфокусировке"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "Объемное освещение"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6680,7 +6853,7 @@ msgstr ""
 "интерполяцией для сохранения четкости пикселей. Это устанавливает "
 "минимальный размер текстуры\n"
 "для увеличенных текстур; большие значения выглядят чётче, но требуют больше\n"
-"памяти. Рекомендуются степени числа 2. Эта настройки применяется только "
+"памяти. Рекомендуются степени числа 2. Эта настройки применяется ТОЛЬКО "
 "если\n"
 "билинейный/трилинейный/анизотропный фильтр включен.\n"
 "Это также используется для автомасштабирования как основной размер для\n"
@@ -6768,7 +6941,7 @@ msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
-"Папка мира (всё в мире хранится в ней).\n"
+"Директория с миром (всё в мире хранится в ней).\n"
 "Не требуется при запуске из главного меню."
 
 #: src/settings_translation_file.cpp
@@ -6852,15 +7025,15 @@ msgstr "Y-уровень морского дна."
 
 #: src/settings_translation_file.cpp
 msgid "cURL"
-msgstr "cURL"
+msgstr "URL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
-msgstr "Таймаут загрузки файла с помощью cURL"
+msgstr "Таймаут загрузки файла cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL interactive timeout"
-msgstr "Таймаут взаимодействия с cURL"
+msgstr "Таймаут взаимодействия cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
@@ -6869,12 +7042,18 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(требуется поддержка игры)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Адрес: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Режим творчества: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Урон: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6912,6 +7091,13 @@ msgstr "Лимит одновременных соединений cURL"
 #~ "Оставьте это поле пустым, чтобы запустить локальный сервер.\n"
 #~ "Заметьте, что поле адреса в главном меню перезапишет эту настройку."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Настройка dpi (плотности точек на дюйм) для вашего экрана (не для X11, "
+#~ "только для Android). Например для мониторов с разрешением в 4k."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6982,6 +7168,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Бит на пиксель (глубина цвета) в полноэкранном режиме."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Границы показаны для всех мапблоков"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Бампмаппинг"
 
@@ -7007,6 +7196,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Центр среднего подъёма кривой света."
 
+#~ msgid "Change Keys"
+#~ msgstr "Сменить клавиши"
+
 #~ msgid "Change keys"
 #~ msgstr "Изменить управление"
 
@@ -7082,6 +7274,38 @@ msgstr "Лимит одновременных соединений cURL"
 #~ "Контролирует ширину тоннелей. Меньшие значения создают более широкие "
 #~ "тоннели."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Управление:\n"
+#~ "- %s: вперёд\n"
+#~ "- %s: назад\n"
+#~ "- %s: влево\n"
+#~ "- %s: вправо\n"
+#~ "- %s: прыжок/подъём\n"
+#~ "- %s: копать/удар/применить\n"
+#~ "- %s: разместить/применить\n"
+#~ "- %s: красться/спуск\n"
+#~ "- %s: бросить предмет\n"
+#~ "- %s: инвентарь\n"
+#~ "- Мышь: поворот/обзор\n"
+#~ "- Колесо мыши: выбор предмета\n"
+#~ "- %s: чат\n"
+
 #~ msgid "Creative"
 #~ msgstr "Творческий"
 
@@ -7091,6 +7315,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Цвет перекрестия (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Урон"
 
@@ -7190,6 +7417,13 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Включить подтверждение регистрации"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Включить объекты буфера вершин.\n"
+#~ "Это должно значительно улучшить графическую производительность."
+
 #~ msgid "Enabled"
 #~ msgstr "Включено"
 
@@ -7504,6 +7738,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Замеры"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Неправильная конфигурация игры."
+
 #~ msgid "Inventory key"
 #~ msgstr "Кнопка открытия инвентаря"
 
@@ -8201,6 +8438,12 @@ msgstr "Лимит одновременных соединений cURL"
 #~ "Заставляет DirectX работать с LuaJIT. Отключите, если это вызывает "
 #~ "проблемы."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Сделать все жидкости непрозрачными"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Размер кэша мапблоков в генераторе мешей мапблоков в мегабайтах"
+
 #~ msgid "Menus"
 #~ msgstr "Меню"
 
@@ -8441,15 +8684,22 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Упрощённая листва"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Размер кэша мапблоков карты в генераторе мешей. Увеличение этого "
+#~ "значения\n"
+#~ "увеличит процент попаданий в кэш, предотвращая копирование информации\n"
+#~ "из основного потока игры, тем самым уменьшая колебания кадровой частоты."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Мягкое освещение"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Плавное вращение камеры. 0 для отключения."
 
-#~ msgid "Sound"
-#~ msgstr "Звук"
-
 #~ msgid "Special"
 #~ msgstr "Особенный"
 
@@ -8513,6 +8763,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Чувствительность (в точках):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Порог сенсорного экрана"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Трилинейный фильтр"
 
@@ -8567,6 +8820,9 @@ msgstr "Лимит одновременных соединений cURL"
 #~ "Если установлено значение 0, MSAA отключено.\n"
 #~ "После изменения этой настройки требуется перезагрузка."
 
+#~ msgid "VBO"
+#~ msgstr "Объекты буфера вершин (VBO)"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Вариация высоты холмов и глубин озёр на гладкой местности парящих "
@@ -8668,8 +8924,14 @@ msgstr "Лимит одновременных соединений cURL"
 #~ msgid "You died."
 #~ msgstr "Ты умер."
 
+#~ msgid "You have no games installed."
+#~ msgstr "У вас не установлено ни одной игры."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ок"
diff --git a/po/sk/minetest.po b/po/sk/minetest.po
index a6663d806..b32577c18 100644
--- a/po/sk/minetest.po
+++ b/po/sk/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-10-20 20:44+0000\n"
-"Last-Translator: BRN Systems <brnsystems123@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2023-12-17 18:35+0000\n"
+"Last-Translator: Marian <daretmavi@gmail.com>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/minetest/minetest/"
 "sk/>\n"
 "Language: sk\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.1\n"
+"X-Generator: Weblate 5.3\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Príkaz nie je k dispozícií: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Zobraz pomocníka k príkazom"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "zobrazenie všetkého."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <príkaz>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "V poriadku"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<nie je k dispozícií>"
@@ -105,6 +103,10 @@ msgstr "Objavila sa chyba:"
 msgid "Main menu"
 msgstr "Hlavná ponuka"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "V poriadku"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Znova pripojiť"
@@ -133,19 +135,28 @@ msgstr "Podporujeme iba protokol verzie $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podporujeme verzie protokolov medzi $1 a $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" už exituje. Chcel by si ho prepísať?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Chyba inštalácie \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Nevyhnutné doplnky $1 a $2 budú nainštalované."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Nepodarilo sa stiahnuť \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 od $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Nepodarilo sa stiahnuť $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Nepodarilo sa rozbaliť \"$1\" (nepodporovaný typ súboru, alebo poškodený "
+"archív)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,158 +164,157 @@ msgstr ""
 "$1 sa sťahuje,\n"
 "$2 čaká v rade"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 sťahujem..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 požadované nevyhnutné doplnky nie je možné nájsť."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 bude nainštalovaný a $2 nevyhnutné doplnky budú vynechané."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Všetky balíky"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Už nainštalované"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Späť na Hlavnú ponuku"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB nie je k dispozícií ak bol Minetest skompilovaný bez cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Sťahujem..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Hry"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Nainštalovať"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Načítavam..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Rozšírenia"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nepodarilo sa stiahnuť žiadne balíčky"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Bez výsledkov"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Bez aktualizácií"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Čaká v rade"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Balíky textúr"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Balíček $1 nebol nájdený."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Odinštalovať"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Aktualizácia"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Aktualizovať všetky [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Pozri si viac informácií vo webovom prehliadači"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Pred inštaláciou rozšírenia musíš nainštalovať hru"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Nevyhnutné doplnky $1 a $2 budú nainštalované."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 od $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 požadované nevyhnutné doplnky nie je možné nájsť."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 bude nainštalovaný a $2 nevyhnutné doplnky budú vynechané."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Už nainštalované"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Základná hra:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB nie je k dispozícií ak bol Minetest skompilovaný bez cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Nevyhnutné doplnky:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Sťahujem..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Chyba inštalácie \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Nepodarilo sa stiahnuť \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Nepodarilo sa stiahnuť $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Nepodarilo sa rozbaliť \"$1\" (nepodporovaný typ súboru, alebo poškodený "
-"archív)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Hry"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Nainštalovať"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Nainštalovať $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Nainštalovať chýbajúce závislosti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Načítavam..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Rozšírenia"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nepodarilo sa stiahnuť žiadne balíčky"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Bez výsledkov"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Bez aktualizácií"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Nenájdené"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Prepísať"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Prosím skontroluj či je základná hra v poriadku."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Čaká v rade"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" už exituje. Chcel by si ho prepísať?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Balíky textúr"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Odinštalovať"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Aktualizácia"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Aktualizovať všetky [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Pozri si viac informácií vo webovom prehliadači"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Prepísať"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -452,10 +462,20 @@ msgstr "Vytvoriť"
 msgid "Decorations"
 msgstr "Dekorácie"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Vývojový Test je určený vývojárom."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Kobky"
@@ -652,7 +672,7 @@ msgstr "Registrovať sa"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Odmietnuť"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -660,21 +680,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Po dlhú dobu sa engine Minetest dodával s predinštalovanou hrou s názvom "
+"\"Minetest Game\". Od verzie 5.8.0 sa Minetest dodáva bez predinštalovanej "
+"hry."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Ak chceš pokračovať v hraní svojich svetov v hre Minetest Game, musíš si hru "
+"Minetest Game znova nainštalovať."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Hra Minetest už nie je predvolene nainštalovaná"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Nainštalovať inú hru"
+msgstr "Preinštaluj hru Minetest Game"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -751,9 +775,8 @@ msgid "Select file"
 msgstr "Zvoľ súbor"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "Vybrať"
+msgstr "Nastav"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -822,20 +845,15 @@ msgstr "zjemnené (eased)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Použiť systémový jazyk)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Dostupnosť"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Back"
-msgstr "Vzad"
-
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Zmeň ovládacie klávesy"
+msgstr "Späť"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
@@ -846,7 +864,8 @@ msgstr "Komunikácia"
 msgid "Clear"
 msgstr "Zmaž"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Ovládanie"
 
@@ -855,18 +874,16 @@ msgid "General"
 msgstr "Všeobecné"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Rýchly pohyb"
+msgstr "Pohyb"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Obnov štand. hodnoty"
+msgstr "Obnov štand. nastavenia"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Obnoviť predvolené nastavenie ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -874,7 +891,7 @@ msgstr "Hľadaj"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Zobraziť rozšírené nastavenia"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -894,11 +911,11 @@ msgstr "Doplnky: Rozšírenia (módy)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(V hre bude potrebné povoliť aj tiene)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Vlastné"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -951,7 +968,7 @@ msgstr "Jadro tímu"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Zariadenie Irrlicht:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -982,18 +999,16 @@ msgid "Browse online content"
 msgstr "Hľadaj nový obsah na internete"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Hľadaj nový obsah na internete"
+msgstr "Prezeranie online obsahu [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "Doplnky"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "Doplnky"
+msgstr "Obsah [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1016,9 +1031,8 @@ msgid "Rename"
 msgstr "Premenuj"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<nie je k dispozícií>"
+msgstr "Je k dispozícii aktualizácia?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1056,6 +1070,17 @@ msgstr "Nainštalovať hru"
 msgid "Install games from ContentDB"
 msgstr "Inštaluj hry z ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Hra Minetest už nie je predvolene nainštalovaná"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Nový"
@@ -1089,8 +1114,9 @@ msgid "Start Game"
 msgstr "Spusti hru"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nie je nainštalovaná žiadna hra."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Pred inštaláciou rozšírenia musíš nainštalovať hru"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1169,18 +1195,10 @@ msgstr "Nahrávam textúry..."
 msgid "Rebuilding shaders..."
 msgstr "Obnovujem shadery..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Chyba spojenia (časový limit?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Nie je možné nájsť alebo nahrať hru: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Chybná špec. hry."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Hlavné menu"
@@ -1205,7 +1223,11 @@ msgstr "Dodaný súbor s heslom nie je možné otvoriť: "
 msgid "Provided world path doesn't exist: "
 msgstr "Zadaná cesta k svetu neexistuje: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Média..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1213,18 +1235,10 @@ msgstr ""
 "\n"
 "Pozri detaily v debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adresa: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Mode: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Verejný: "
@@ -1259,10 +1273,6 @@ msgstr "Automatický pohyb vpred je aktivovaný"
 msgid "Block bounds hidden"
 msgstr "Hranice bloku sú skryté"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Hranice bloku sú zobrazené pre všetky bloky"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Hranice bloku sú zobrazené pre aktuálny blok"
@@ -1280,9 +1290,8 @@ msgid "Camera update enabled"
 msgstr "Aktualizácia kamery je aktivovaná"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
-msgstr "Hranice bloku nie je možné zobraziť (zakázané rozšírením, alebo hrou)"
+msgstr "Hranice bloku nie je možné zobraziť (zakázané hrou, alebo rozšírením)"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1308,6 +1317,10 @@ msgstr "Skriptovanie na strane klienta je zakázané"
 msgid "Connecting to server..."
 msgstr "Pripájam sa k serveru..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Chyba spojenia (časový limit?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Spojenie sa z neznámeho dôvodu nepodarilo"
@@ -1316,47 +1329,14 @@ msgstr "Spojenie sa z neznámeho dôvodu nepodarilo"
 msgid "Continue"
 msgstr "Pokračuj"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Ovládanie:\n"
-"- %s: pohyb vpred\n"
-"- %s: pohyb vzad\n"
-"- %s: pohyb doľava\n"
-"- %s: pohyb doprava\n"
-"- %s: skoč/vylez\n"
-"- %s: kop/udri\n"
-"- %s: polož/použi\n"
-"- %s: zakrádaj sa/choď dole\n"
-"- %s: odhoď vec\n"
-"- %s: inventár\n"
-"- Myš: otoč sa/obzeraj sa\n"
-"- Myš koliesko: zvoľ si vec\n"
-"- %s: komunikácia\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1373,10 +1353,10 @@ msgstr ""
 "Menu/Inventár je zobrazené/ý:\n"
 "- dvojklik (mimo):\n"
 " -->zatvor\n"
-"- klik na kôpku, klik na pozíciu:\n"
+"- klik na kôpku, klik na miesto:\n"
 " --> presuň kôpku \n"
 "- chyť a prenes, klik druhým prstom\n"
-" --> polož jednu vec na pozíciu\n"
+" --> polož jednu vec na miesto\n"
 
 #: src/client/game.cpp
 #, c-format
@@ -1448,6 +1428,11 @@ msgstr "Hmla je vypnutá"
 msgid "Fog enabled"
 msgstr "Hmla je aktivovaná"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zväčšenie je zakázané hrou, alebo rozšírením"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informácie o hre:"
@@ -1468,10 +1453,6 @@ msgstr "Definície vecí..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Média..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1573,28 +1554,28 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "Nemôžem sa spojiť s %s, lebo IPv6 je zakázané"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Neobmedzená dohľadnosť je aktivovaná"
+msgstr "Neobmedzená dohľadnosť je vypnutá"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
 msgstr "Neobmedzená dohľadnosť je aktivovaná"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "Neobmedzená dohľadnosť je povolená, ale zakázaná hrou alebo rozšírením"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "Dohľadnosť je na minime: %d"
+msgstr "Dohľadnosť zmenená na: %d (minimum)"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"Dohľadnosť zmenená na: %d (minimum), ale je obmedzená na %d hrou, alebo "
+"rozšírením"
 
 #: src/client/game.cpp
 #, c-format
@@ -1602,20 +1583,23 @@ msgid "Viewing range changed to %d"
 msgstr "Dohľadnosť je zmenená na %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "Dohľadnosť je zmenená na %d"
+msgstr "Dohľadnosť zmenená na: %d (maximum)"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"Dohľadnosť zmenená na: %d (maximum), ale je obmedzená na %d hrou, alebo "
+"rozšírením"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "Dohľadnosť je zmenená na %d"
+msgstr ""
+"Dohľadnosť je zmenená na %d, ale je obmedzená na %d hrou, alebo rozšírením"
 
 #: src/client/game.cpp
 #, c-format
@@ -1630,10 +1614,6 @@ msgstr "Obrysy zobrazené"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zväčšenie je zakázané hrou, alebo rozšírením"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chat je zakázaný hrou, alebo rozšírením"
@@ -1673,32 +1653,28 @@ msgstr "Backspace"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "Tlačidlo zakrádania sa"
+msgstr "Klávesa Break"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "Zmaž"
+msgstr "Klávesa Clear"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "CTRL"
+msgstr "Klávesa CTRL"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Vymazať"
+msgstr "Klávesa Del"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Šípka dole"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1745,9 +1721,8 @@ msgid "Insert"
 msgstr "Vlož"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Ľavý CRTL"
+msgstr "Ľavá šípka"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1771,9 +1746,8 @@ msgstr "Ľavá klávesa Windows"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "Menu"
+msgstr "Klávesa Menu"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1848,20 +1822,17 @@ msgid "OEM Clear"
 msgstr "OEM Clear"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
 msgstr "Page down"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
 msgstr "Page up"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Pause"
+msgstr "Klávesa Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1873,14 +1844,12 @@ msgid "Print"
 msgstr "PrtSc"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Enter"
+msgstr "Klávesa Enter"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Pravý CRTL"
+msgstr "Pravá šípka"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1912,9 +1881,8 @@ msgid "Select"
 msgstr "Vybrať"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Klávesa Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1934,7 +1902,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Šípka hore"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1945,9 +1913,8 @@ msgid "X Button 2"
 msgstr "X tlačidlo 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
-msgstr "Priblíž"
+msgstr "Klávesa Zoom"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
@@ -1967,6 +1934,15 @@ msgstr "Minimapa v povrchovom režime, priblíženie x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapa v móde textúry"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Nepodarilo sa otvoriť web stránku"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2160,6 +2136,19 @@ msgstr "Priblíž"
 msgid "press key"
 msgstr "stlač klávesu"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Nepodarilo sa otvoriť web stránku"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Zmeniť"
@@ -2193,6 +2182,7 @@ msgstr "Hlasitosť: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sk"
 
@@ -2208,9 +2198,9 @@ msgid "Name is taken. Please choose another name"
 msgstr "Meno už je použité. Prosím zvoľ si iné meno"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "Vypínam..."
+msgstr "%s počas vypínania: "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2280,7 +2270,7 @@ msgstr "2D šum, ktorý určuje údolia a kanály riek."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2336,7 +2326,6 @@ msgid "3D noise that determines number of dungeons per mapchunk."
 msgstr "3D šum definujúci počet kobiek na časť mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2415,14 +2404,6 @@ msgstr "Zasielaný rozsah aktívnych objektov"
 msgid "Adds particles when digging a node."
 msgstr "Pridá časticové efekty pri vykopávaní kocky."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Nastav dpi konfiguráciu podľa svojej obrazovky (nie pre X11/len pre Android) "
-"napr. pre 4k obrazovky."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2453,6 +2434,10 @@ msgstr "Meno správcu"
 msgid "Advanced"
 msgstr "Pokročilé"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2492,14 +2477,12 @@ msgid "Announce to this serverlist."
 msgstr "Zverejni v zozname serverov."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Vyhladzovanie:"
+msgstr "Rozsah vyhladzovania:"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Vyhladzovanie:"
+msgstr "Metóda vyhladzovania:"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2513,6 +2496,17 @@ msgstr "Pridaj názov veci do popisku."
 msgid "Apple trees noise"
 msgstr "Šum jabloní"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Zotrvačnosť ruky"
@@ -2530,18 +2524,38 @@ msgid "Ask to reconnect after crash"
 msgstr "Ponúkni obnovu pripojenia po páde"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"V tento vzdialenosti bude server agresívne optimalizovať, ktoré\n"
+"bloky pošle klientovi.\n"
+"Malé hodnoty potenciálne výrazne zvýšia výkon, za cenu viditeľných\n"
+"chýb renderovania (niektoré bloky nebudú vyrenderované pod vodou a v "
+"jaskyniach,\n"
+"prípadne niekedy aj na súši).\n"
+"Nastavenie hodnoty vyššej ako max_block_send_distance deaktivuje túto\n"
+"optimalizáciu.\n"
+"Udávane v blokoch mapy (16 kociek)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "V tento vzdialenosti bude server agresívne optimalizovať, ktoré\n"
 "bloky pošle klientovi.\n"
@@ -2582,9 +2596,8 @@ msgid "Base terrain height."
 msgstr "Základná výška terénu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "Minimálna veľkosť textúry"
+msgstr "Základná veľkosť textúry"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2607,14 +2620,18 @@ msgid "Bind address"
 msgstr "Spájacia adresa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "Ekosystémy"
+msgstr "API pre biómy"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Šum biómu"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Vzdialenosť pre optimalizáciu posielania blokov"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Vzdialenosť pre optimalizáciu posielania blokov"
@@ -2800,7 +2817,6 @@ msgid "Client-side Modding"
 msgstr "Úpravy (módovanie) na strane klienta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side node lookup range restriction"
 msgstr "Obmedzenie vyhľadávania dosahu kociek na strane klienta"
 
@@ -2817,7 +2833,6 @@ msgid "Clouds"
 msgstr "Mraky"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
 msgstr "Mraky sú efektom na strane klienta."
 
@@ -2833,6 +2848,12 @@ msgstr "Farebná hmla"
 msgid "Colored shadows"
 msgstr "Farebné tiene"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2996,10 +3017,6 @@ msgstr ""
 "Farba zameriavača (R,G,B).\n"
 "Nastavuje farbu objektu zameriavača"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Hraničná veľkosť ladiaceho log súboru"
@@ -3054,6 +3071,23 @@ msgstr ""
 "Toto simuluje efekt jemných tieňov použitím PCF alebo poisson disk\n"
 "zároveň ale spotrebováva viac zdrojov."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Aktivuj zakázanie pripojenia starých klientov.\n"
+"Starší klienti sú kompatibilný v tom zmysle, že nepadnú pri pripájaní\n"
+"k novým serverom, ale nemusia podporovať nové funkcie, ktoré očakávaš."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definuje oblasti, kde stromy majú jablká."
@@ -3119,6 +3153,8 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"Definuje veľkosť mriežky vzorkovania pre metódy antialiasingu FSAA a SSAA.\n"
+"Hodnota 2 znamená, že sa použijú 2x2 = 4 vzorky."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3253,6 +3289,11 @@ msgstr "Povoliť žiaru"
 msgid "Enable Bloom Debug"
 msgstr "Povoliť ladenie žiary"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Aktivuj zranenie"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3279,6 +3320,11 @@ msgstr ""
 "Ak je aktivované použije poisson disk pre vytvorenie \"mäkkých tieňov\". V "
 "opačnom prípade sa použije PCF filtrovanie."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Následné spracovanie"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Povoliť Raytraced Culling"
@@ -3325,7 +3371,12 @@ msgstr "Aktivuj rozšírenie pre zabezpečenie"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
-msgstr ""
+msgstr "Povolenie kolieska myši (posúvanie) pre výber položky v hlavnej lište."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Aktivuje náhodný užívateľský vstup (používa sa len pre testovanie)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3355,6 +3406,11 @@ msgstr ""
 "Starší klienti sú kompatibilný v tom zmysle, že nepadnú pri pripájaní\n"
 "k novým serverom, ale nemusia podporovať nové funkcie, ktoré očakávaš."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Dotyková obrazovka"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3367,14 +3423,6 @@ msgstr ""
 "(napr. textúr)\n"
 "pri pripojení na server."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Aktivuj \"vertex buffer objects\".\n"
-"Toto by malo viditeľne zvýšiť grafický výkon."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3413,6 +3461,19 @@ msgstr "Aktivuje animáciu vecí v inventári."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Aktivuje ukladanie tvárou rotovaných Mesh objektov do medzipamäti."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3422,9 +3483,8 @@ msgstr ""
 "za cenu drobných vizuálnych chýb, ktoré neovplyvnia hrateľnosť."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine Profiler"
-msgstr "Profil enginu"
+msgstr "Profilovač enginu"
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -3533,12 +3593,11 @@ msgid "Fixed virtual joystick"
 msgstr "Pevný virtuálny joystick"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
-"(Android) Zafixuje pozíciu virtuálneho joysticku.\n"
+"Zafixuje pozíciu virtuálneho joysticku.\n"
 "Ak je vypnuté, virtuálny joystick sa vycentruje na pozícií prvého dotyku."
 
 #: src/settings_translation_file.cpp
@@ -3725,7 +3784,6 @@ msgid "Fullscreen mode."
 msgstr "Režim celej obrazovky."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
 msgstr "Užívateľské rozhrania"
 
@@ -3848,9 +3906,8 @@ msgid "Heat noise"
 msgstr "Teplotný šum"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
-msgstr "Výška okna po spustení. Ignorované v móde plnej obrazovky."
+msgstr "Komponent výšky počiatočnej veľkosti okna."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -3914,25 +3971,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Enable mouse wheel for selection"
-msgstr ""
+msgstr "Hlavná lišta: Povolenie kolieska myši pre výber"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Invert mouse wheel direction"
-msgstr ""
+msgstr "Hlavná lišta: Obrátenie smeru kolieska myši"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
 msgstr "Aké hlboké majú byť rieky."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
 "Ako rýchlo sa budú pohybovať vlny tekutín. Vyššia hodnota = rýchlejšie.\n"
-"Ak je záporná, tekutina sa bude pohybovať naspäť.\n"
-"Požaduje, aby boli aktivované vlniace sa tekutiny."
+"Ak je záporná, tekutina sa bude pohybovať naspäť."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4040,7 +4095,6 @@ msgstr ""
 "nemôžu heslo vymazať."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, the server will perform map block occlusion culling based on\n"
 "on the eye position of the player. This can reduce the number of blocks\n"
@@ -4050,11 +4104,10 @@ msgstr ""
 "Ak je aktivovaný, server bude realizovať occlusion culling blokov mapy "
 "založený\n"
 "na pozícií oka hráča. Toto môže znížiť počet blokov posielaných klientovi\n"
-"o 50-80%. Klient už nebude dostávať takmer neviditeľné bloky,\n"
-"takže funkčnosť režim prechádzania stenami je obmedzená."
+"o 50-80%. Klient už nebude dostávať väčšinu neviditeľných blokov,\n"
+"takže funkčnosť v režime prechádzania stenami je obmedzená."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place nodes at the position (feet + eye level) where you "
 "stand.\n"
@@ -4170,6 +4223,7 @@ msgstr "Obrátiť smer myši"
 #: src/settings_translation_file.cpp
 msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
 msgstr ""
+"Obrátenie smeru kolieska myši (posúvania) pri výbere položky v hlavnej lište."
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -4347,18 +4401,19 @@ msgstr ""
 "-   Nepriehľadné: vypne priehliadnosť"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Dĺžka kroku servera a interval v ktorom sú objekty štandardne aktualizované\n"
 "cez sieť, uvedené v sekundách."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Rýchlosť vlny tekutín"
+msgstr "Dĺžka vlnenia kvapaliny."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4530,10 +4585,6 @@ msgid ""
 msgstr ""
 "Prispôsob farbu hmly a oblohy dennej dobe (svitanie/súmrak) a uhlu pohľadu."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Všetky tekutiny budú nepriehľadné"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Úroveň kompresie mapy pre diskové úložisko"
@@ -4589,11 +4640,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Príznaky pre generovanie špecifické pre generátor V5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Špecifické atribúty pre generátor V6.\n"
 "Príznak 'snowbiomes' aktivuje nový systém 5 biómov.\n"
@@ -4636,10 +4690,6 @@ msgstr "Oneskorenie generovania Mesh blokov"
 msgid "Mapblock mesh generation threads"
 msgstr "Vlákna generovania siete mapblock"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Medzipamäť Mapblock Mesh generátora blokov v MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Čas odstránenia bloku mapy"
@@ -4854,12 +4904,10 @@ msgid "Maximum simultaneous block sends per client"
 msgstr "Maximum súčasných odoslaní bloku na klienta"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum size of the outgoing chat queue"
 msgstr "Maximálna veľkosť výstupnej komunikačnej fronty"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum size of the outgoing chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
@@ -4911,6 +4959,11 @@ msgstr "Minimálna úroveň záznamov, ktoré budú vypísané do komunikačnéh
 msgid "Minimap scan height"
 msgstr "Minimapa výška skenovania"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Interval opakovania pokladania"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4927,7 +4980,7 @@ msgstr "Mip-mapovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Rôzne"
 
 #: src/settings_translation_file.cpp
 msgid "Mod Profiler"
@@ -4981,6 +5034,11 @@ msgstr "Citlivosť myši"
 msgid "Mouse sensitivity multiplier."
 msgstr "Multiplikátor citlivosti myši."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Hraničná hodnota dutín"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Šum bahna"
@@ -5096,7 +5154,6 @@ msgstr ""
 "a spotrebou pamäti (4096=100MB, ako približné pravidlo)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
 msgstr "Počet správ, ktoré môže hráč poslať za 10 sekúnd."
 
@@ -5112,16 +5169,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr ""
+msgstr "Occlusion Culler"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Occlusion Culling"
-msgstr "Occlusion culling na strane servera"
-
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Nepriehľadné tekutiny"
+msgstr "Occlusion Culling"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5137,6 +5189,11 @@ msgstr ""
 "Otvorí menu pozastavenia, ak aktuálne okno hry nie je vybrané.\n"
 "Nepozastaví sa ak je otvorený formspec."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Ladenie generátora máp"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Voliteľná zmena farby webového odkazu v komunikačnej konzole."
@@ -5213,20 +5270,20 @@ msgid "Poisson filtering"
 msgstr "Poisson filtrovanie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Post Processing"
-msgstr "Post processing"
+msgstr "Následné spracovanie"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Prevent digging and placing from repeating when holding the respective "
 "buttons.\n"
 "Enable this when you dig or place too often by accident.\n"
 "On touchscreens, this only affects digging."
 msgstr ""
-"Zabráni opakovanému kopaniu a ukladaniu blokov pri držaní tlačítka myši.\n"
-"Aktivuj, ak príliš často omylom niečo vykopeš, alebo položíš blok."
+"Zabráni opakovanému kopaniu a ukladaniu blokov pri držaní určeného "
+"tlačítka.\n"
+"Aktivuj, ak príliš často omylom niečo vykopeš, alebo položíš blok.\n"
+"Na dotykových obrazovkách to ovplyvňuje len kopanie."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -5270,6 +5327,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Pomer častí veľkých jaskýň, ktoré obsahujú tekutinu."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Verzie protokolov sa nezhodujú. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5287,6 +5353,10 @@ msgstr "Zvýši terén aby vznikli údolia okolo riek."
 msgid "Random input"
 msgstr "Náhodný vstup"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Posledné správy v komunikácií"
@@ -5296,7 +5366,6 @@ msgid "Regular font path"
 msgstr "Štandardná cesta k písmam"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Remember screen size"
 msgstr "Pamätať si veľkosť obrazovky"
 
@@ -5416,6 +5485,12 @@ msgid ""
 "is maximized is stored in window_maximized.\n"
 "(Autosaving window_maximized only works if compiled with SDL.)"
 msgstr ""
+"Automatické ukladanie veľkosti okna pri úprave.\n"
+"Ak je to povolené, veľkosť obrazovky sa uloží do screen_w a screen_h a či je "
+"okno\n"
+"maximalizované, sa uloží do window_maximized.\n"
+"(Automatické ukladanie window_maximized funguje len vtedy, ak je "
+"skompilované s SDL.)"
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
@@ -5490,13 +5565,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Viď. https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5510,6 +5586,24 @@ msgid ""
 "Renders higher-resolution image of the scene, then scales down to reduce\n"
 "the aliasing effects. This is the slowest and the most accurate method."
 msgstr ""
+"Vyber metódu vyhladzovania, ktorá sa má použiť.\n"
+"\n"
+"* Žiadna - žiadne vyhladzovanie (predvolené)\n"
+"\n"
+"* FSAA - hardvérové celoobrazovkové vyhladzovanie (nekompatibilné so "
+"shadermi)\n"
+"Známe aj ako multi-sample antialiasing (MSAA)\n"
+"Vyhladzuje okraje blokov, ale nemá vplyv na vnútro textúr.\n"
+"Na zmenu tejto možnosti je potrebný reštart.\n"
+"\n"
+"* FXAA - rýchle približné vyhladzovanie (vyžaduje shadery)\n"
+"Aplikuje filter následného spracovania na detekciu a vyhladenie "
+"vysokokontrastných hrán.\n"
+"Ponúka rovnováhu medzi rýchlosťou a kvalitou obrazu.\n"
+"\n"
+"* SSAA - Super-sampling antialiasing (vyžaduje shadery)\n"
+"Vykresľuje obraz scény s vyšším rozlíšením, potom ho zmenší, aby sa znížil\n"
+"aliasingové efekty. Ide o najpomalšiu a najpresnejšiu metódu."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5598,7 +5692,6 @@ msgid "Server port"
 msgstr "Port servera"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server-side occlusion culling"
 msgstr "Occlusion culling na strane servera"
 
@@ -5619,15 +5712,14 @@ msgid "Serverlist file"
 msgstr "Súbor so zoznamom serverov"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the default tilt of Sun/Moon orbit in degrees.\n"
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
-"Nastav sklon orbity slnka/mesiaca v stupňoch\n"
-"Hodnota 0 znamená bez vertikálneho sklonu orbity.\n"
-"Minimálna hodnota: 0.0; max. hodnota: 60.0"
+"Nastav sklon obežnej dráhy slnka/mesiaca v stupňoch\n"
+"Hry môžu meniť sklon obežnej dráhy prostredníctvom rozhrania API.\n"
+"Hodnota 0 znamená bez vertikálneho sklonu obežnej dráhy ."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5640,8 +5732,9 @@ msgstr ""
 "Rozsah: od -1 do 1.0"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Nastav jazyk. Ponechaj prázdne pre systémové nastavenie.\n"
@@ -5674,11 +5767,8 @@ msgstr ""
 "Minimálna hodnota: 1.0; Maximálna hodnota: 15.0"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable Shadow Mapping."
-msgstr ""
-"Nastav true pre povolenie mapovania tieňov.\n"
-"Požaduje aby boli aktivované shadery."
+msgstr "Nastav pre povolenie mapovania tieňov."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5689,25 +5779,20 @@ msgstr ""
 "Rozžiarené farby sa prelejú na susedné objekty."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
-msgstr ""
-"Nastav true pre povolenie vlniacich sa listov.\n"
-"Požaduje aby boli aktivované shadery."
+msgstr "Nastav pre povolenie vlniacich sa listov."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving liquids (like water)."
-msgstr ""
-"Nastav true pre aktivovanie vlniacich sa tekutín (ako napr. voda).\n"
-"Požaduje aby boli aktivované shadery."
+msgstr "Nastav pre aktivovanie vlniacich sa tekutín (ako napr. voda)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving plants."
-msgstr ""
-"Nastav true pre aktivovanie vlniacich sa rastlín.\n"
-"Požaduje aby boli aktivované shadery."
+msgstr "Nastav pre aktivovanie vlniacich sa rastlín."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5740,11 +5825,11 @@ msgid "Shaders"
 msgstr "Tieňovanie"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shadery umožňujú pokročilé vizuálne efekty a na niektorých grafických "
 "kartách\n"
@@ -5819,7 +5904,6 @@ msgstr ""
 "Systémy so slabým GPU (alebo bez GPU) viac profitujú z menších hodnôt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
 "WARNING: There is no benefit, and there are several dangers, in\n"
@@ -5836,16 +5920,6 @@ msgstr ""
 "Zmena tejto hodnoty slúži k špeciálnym účelom, odporúča sa ponechať\n"
 "to nezmenené."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Veľkosť medzipamäte blokov v Mesh generátori.\n"
-"Zvýšenie zvýši využitie medzipamäte %, zníži sa množstvo dát kopírovaných\n"
-"z hlavnej vetvy a tým sa zníži chvenie."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Sklon orbity na oblohe"
@@ -5882,15 +5956,19 @@ msgstr "Jemné osvetlenie"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
-msgstr "Zjemní rotáciu kamery vo filmovom režime. 0 je pre vypnuté."
+"cinematic mode by using the key set in Controls."
+msgstr ""
+"Zjemní rotáciu kamery vo filmovom režime. 0 je pre vypnuté. Do filmového "
+"režimu vstúpiš pomocou tlačidla nastaveného v nastaveniach Zmeň ovládacie "
+"klávesy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
-msgstr "Zjemní rotáciu kamery vo filmovom režime. 0 je pre vypnuté."
+msgstr ""
+"Vyhladzuje otáčanie kamery, nazývané aj vyhladzovanie vzhľadu alebo pohybu "
+"myši. 0 je pre vypnuté."
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed"
@@ -5904,6 +5982,15 @@ msgstr "Rýchlosť zakrádania sa, v kockách za sekundu."
 msgid "Soft shadow radius"
 msgstr "Dosah mäkkých tieňov"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Zvuk"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "Čierna listina príznakov z ContentDB"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5927,7 +6014,6 @@ msgstr ""
 "určité (alebo všetky) typy."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread a complete update of shadow map over given number of frames.\n"
 "Higher values might make shadows laggy, lower values\n"
@@ -5950,9 +6036,8 @@ msgstr ""
 "Štandardné gausovo rozdelenie odchýlky svetelnej krivky."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Static spawn point"
-msgstr "Pevný bod obnovy"
+msgstr "Pevný bod oživenia"
 
 #: src/settings_translation_file.cpp
 msgid "Steepness noise"
@@ -5989,7 +6074,6 @@ msgid "Strip color codes"
 msgstr "Odstráň farby"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Surface level of optional water placed on a solid floatland layer.\n"
 "Water is disabled by default and will only be placed if this value is set\n"
@@ -6006,15 +6090,15 @@ msgstr ""
 "krajiny.\n"
 "Štandardne je voda deaktivovaná a bude umiestnená len ak je táto voľba "
 "nastavená\n"
-"nad 'mgv7_floatland_ymax' - 'mgv7_floatland_taper'\n"
-"(štart horného zašpicaťovania).\n"
+"na 'mgv7_floatland_ymax' - 'mgv7_floatland_taper'\n"
+"(štart horného zužovania).\n"
 "***VAROVANIE, POTENCIÁLNE RIZIKO PRE VÝKON SVETOV A SERVEROV***:\n"
 "Pri aktivovaní vody na lietajúcich pevninách musí byť nastavený\n"
 "a otestovaný pevný povrch nastavením 'mgv7_floatland_density' na 2.0 ( alebo "
 "inú\n"
 "požadovanú hodnotu v závislosti na 'mgv7_np_floatland'), aby sa zabránilo\n"
 "pre server náročnému extrémnemu toku vody a rozsiahlym záplavám\n"
-"na svet pod nimi."
+"na svete pod nimi."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6111,11 +6195,30 @@ msgstr ""
 "pri volaní `/profiler save [format]` bez udania formátu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
-"Relatívna cesta k súboru vzhľadom na svet z ktorého budú profily uložené."
+"Relatívna cesta k súboru vzhľadom na cestu k súborom sveta, do ktorého budú "
+"profily uložené."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
@@ -6123,12 +6226,12 @@ msgstr "Identifikátor joysticku na použitie"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
-"Dĺžka v pixloch, ktorú potrebuje dotyková obrazovka pre začiatok interakcie."
+"Dĺžka v pixeloch, ktorú potrebuje dotyková obrazovka pre začiatok interakcie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The maximum height of the surface of waving liquids.\n"
 "4.0 = Wave height is two nodes.\n"
@@ -6138,8 +6241,16 @@ msgstr ""
 "Maximálna výška povrchu vlniacich sa tekutín.\n"
 "4.0 = Výška vlny sú dve kocky.\n"
 "0.0 = Vlna sa vôbec nehýbe.\n"
-"Štandardná hodnota je 1.0 (1/2 kocky).\n"
-"Požaduje, aby boli aktivované vlniace sa tekutiny."
+"Štandardná hodnota je 1.0 (1/2 kocky)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Čas v sekundách pre opakované položenie kocky\n"
+"ak je držané tlačítko pokladania."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -6172,11 +6283,12 @@ msgstr ""
 "Malo by to byť konfigurované spolu s active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Renderovací back-end.\n"
 "Poznámka: Po zmene je vyžadovaný reštart!\n"
@@ -6242,7 +6354,6 @@ msgid "The type of joystick"
 msgstr "Typ joysticku"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
@@ -6256,6 +6367,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Tretí zo 4 2D šumov, ktoré spolu definujú rozsah výšok kopcov/hôr."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6301,24 +6416,22 @@ msgid "Touchscreen"
 msgstr "Dotyková obrazovka"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "Citlivosť myši"
+msgstr "Citlivosť dotykovej obrazovky"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "Multiplikátor citlivosti myši."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Prah citlivosti dotykovej obrazovky"
+msgstr "Multiplikátor citlivosti dotykovej obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Kompromisy za výkon"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Nepriehľadné tekutiny"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Vzdialenosť spracovania priehľadnosti"
@@ -6354,10 +6467,20 @@ msgid ""
 "\n"
 "This setting should only be changed if you have performance problems."
 msgstr ""
+"Typ occlusion_culler\n"
+"\n"
+"\"loops\" je starší algoritmus s vnorenými slučkami a zložitosťou O(n³)\n"
+"\"bfs\" je nový algoritmus založený na vyhľadávaní v šírke a bočnom "
+"vylučovaní\n"
+"\n"
+"Toto nastavenie by sa malo meniť len v prípade problémov s výkonom."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 "URL na súbor JSON, ktorý sprostredkúva informácie o najnovšej verzií "
 "Minetestu"
@@ -6413,14 +6536,12 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "Použi animáciu mrakov pre pozadie hlavného menu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when looking at textures from an angle."
 msgstr "Použi anisotropné filtrovanie pri pohľade na textúry zo strany."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Použi trilineárne filtrovanie pri zmene mierky textúr."
+msgstr "Použi bilineárne filtrovanie pri zmene veľkosti textúr."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6436,7 +6557,6 @@ msgstr ""
 "objektu."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
@@ -6447,14 +6567,14 @@ msgstr ""
 "Gama korektné podvzorkovanie nie je podporované."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use raytraced occlusion culling in the new culler.\n"
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
-"Použite raytraced occlusion culling v novom culleri.\n"
-"Tento príznak umožňuje použiť raytraced occlusion culling test"
+"Použi raytraced occlusion culling v novom culleri.\n"
+"Tento príznak umožňuje použiť raytraced occlusion culling test pre\n"
+"veľkosti klientskej siete menšie ako 4x4x4 bloky mapy."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6462,26 +6582,24 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"Pri zmene veľkosti textúr použi trilineárne filtrovanie.\n"
+"Ak je povolené bilineárne aj trilineárne filtrovanie,\n"
+"použije sa trilineárne filtrovanie."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use virtual joystick to trigger \"Aux1\" button.\n"
 "If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
 "circle."
 msgstr ""
-"(Android) Použije virtuálny joystick na stlačenie tlačidla \"Aux1\".\n"
-"Ak je aktivované, virtuálny joystick stlačí tlačidlo \"Aux1\" keď je mimo "
-"hlavný kruh."
+"Použi virtuálny joystick na stlačenie tlačidla \"Aux1\".\n"
+"Ak je aktivované, virtuálny joystick tiež stlačí tlačidlo \"Aux1\", keď je "
+"mimo hlavný kruh."
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
 msgstr "Užívateľské rozhranie"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Vertikálna synchronizácia"
@@ -6547,6 +6665,8 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
+"Vertikálna synchronizácia obrazovky. Systém môže vynútiť zapnutie funkcie "
+"VSync, aj keď je táto funkcia vypnutá."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6572,6 +6692,10 @@ msgstr "Virtuálny joystick aktivuje tlačidlo Aux1"
 msgid "Volume"
 msgstr "Hlasitosť"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6580,6 +6704,16 @@ msgstr ""
 "Hlasitosť všetkých zvukov.\n"
 "Požaduje aby bol zvukový systém aktivovaný."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS ak je hra nezameraná, alebo pozastavená"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Jemné osvetlenie"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6713,7 +6847,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "Či je okno maximalizované."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6745,9 +6879,8 @@ msgid ""
 msgstr "Zobrazenie ladiaceho okna na klientovi (má rovnaký efekt ako F5)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
-msgstr "Šírka okna po spustení. Ignorované v móde celej obrazovky."
+msgstr "Šírka okna po spustení."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
@@ -6755,7 +6888,7 @@ msgstr "Šírka línií obrysu kocky."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Maximalizované okno"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6871,12 +7004,18 @@ msgstr "Paralelný limit cURL"
 #~ msgid "(game support required)"
 #~ msgstr "(vyžaduje sa podpora hry)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adresa: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreatívny mód: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Poškodenie: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6914,6 +7053,13 @@ msgstr "Paralelný limit cURL"
 #~ "Ponechaj prázdne pre spustenie lokálneho servera.\n"
 #~ "Adresné políčko v hlavnom menu prepíše toto nastavenie."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Nastav dpi konfiguráciu podľa svojej obrazovky (nie pre X11/len pre "
+#~ "Android) napr. pre 4k obrazovky."
+
 #~ msgid ""
 #~ "Adjust the saturation (or vividness) of the scene\n"
 #~ "Values\n"
@@ -6974,6 +7120,9 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Počet bitov na pixel (farebná hĺbka) v režime celej obrazovky."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Hranice bloku sú zobrazené pre všetky bloky"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Bump Mapping (Ilúzia nerovnosti)"
 
@@ -6994,6 +7143,9 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Tlačidlo Aktualizácia pohľadu"
 
+#~ msgid "Change Keys"
+#~ msgstr "Zmeň ovládacie klávesy"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Zmeň ovládacie klávesy"
@@ -7057,6 +7209,38 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Riadi rýchlosť ponárania v tekutinách."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Ovládanie:\n"
+#~ "- %s: pohyb vpred\n"
+#~ "- %s: pohyb vzad\n"
+#~ "- %s: pohyb doľava\n"
+#~ "- %s: pohyb doprava\n"
+#~ "- %s: skoč/vylez hore\n"
+#~ "- %s: kop/udri\n"
+#~ "- %s: polož/použi\n"
+#~ "- %s: zakrádaj sa/zlez dole\n"
+#~ "- %s: odhoď vec\n"
+#~ "- %s: inventár\n"
+#~ "- Myš: otoč sa/obzeraj sa\n"
+#~ "- Myš koliesko: zvoľ vec\n"
+#~ "- %s: komunikácia (chat)\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreatívny režim"
 
@@ -7066,6 +7250,9 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Farba zameriavača (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Zranenie"
 
@@ -7135,6 +7322,13 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Aktivuj potvrdenie registrácie"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Aktivuj \"vertex buffer objects\".\n"
+#~ "Toto by malo viditeľne zvýšiť grafický výkon."
+
 #~ msgid "Enabled"
 #~ msgstr "Aktivované"
 
@@ -7429,6 +7623,9 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Instrumentation"
 #~ msgstr "Výstroj"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Chybná špec. hry."
+
 #~ msgid "Inventory key"
 #~ msgstr "Tlačidlo Inventár"
 
@@ -8116,6 +8313,12 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Umožní DirectX pracovať s LuaJIT. Vypni ak to spôsobuje problémy."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Všetky tekutiny budú nepriehľadné"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Medzipamäť Mapblock Mesh generátora blokov v MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menu"
 
@@ -8334,15 +8537,22 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Jednoduché listy"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Veľkosť medzipamäte blokov v Mesh generátori.\n"
+#~ "Zvýšenie zvýši využitie medzipamäte %, zníži sa množstvo dát "
+#~ "kopírovaných\n"
+#~ "z hlavnej vetvy a tým sa zníži chvenie."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Jemné osvetlenie"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Zjemní rotáciu kamery. 0 je pre vypnuté."
 
-#~ msgid "Sound"
-#~ msgstr "Zvuk"
-
 #~ msgid "Special"
 #~ msgstr "Špeciál"
 
@@ -8392,6 +8602,9 @@ msgstr "Paralelný limit cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Dotykový prah (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Prah citlivosti dotykovej obrazovky"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineárny filter"
 
@@ -8438,6 +8651,9 @@ msgstr "Paralelný limit cURL"
 #~ "Ak sú nastavené na 0, MSAA je zakázané.\n"
 #~ "Po zmene tohto nastavenia je požadovaný reštart."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid ""
 #~ "Version number which was last seen during an update check.\n"
 #~ "\n"
@@ -8516,8 +8732,14 @@ msgstr "Paralelný limit cURL"
 #~ msgid "You died."
 #~ msgstr "Zomrel si."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nie je nainštalovaná žiadna hra."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/sl/minetest.po b/po/sl/minetest.po
index a7850ca0e..15cc3de55 100644
--- a/po/sl/minetest.po
+++ b/po/sl/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slovenian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2020-09-30 19:41+0000\n"
 "Last-Translator: Iztok Bajcar <iztok.bajcar@gmail.com>\n"
 "Language-Team: Slovenian <https://hosted.weblate.org/projects/minetest/"
@@ -78,7 +78,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -87,13 +87,9 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "V redu"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr ""
@@ -110,6 +106,10 @@ msgstr "Prišlo je do napake:"
 msgid "Main menu"
 msgstr "Glavni meni"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "V redu"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Ponovna povezava"
@@ -138,182 +138,189 @@ msgstr "Podporta je le različica protokola $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podprte so različice protokolov med $1 in $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Prenos $1 je spodletel"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Prenos $1 je spodletel"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Nameščanje: nepodprta vrsta datoteke \"$1\" oziroma okvarjen arhiv"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Poteka nalaganje ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Vsi paketi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr "Nazaj na glavni meni"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ni na voljo, če je bil Minetest narejen brez podpore cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "Poteka nalaganje ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Igre"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Namesti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Poteka nalaganje ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Prilagoditve (mods)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Ni mogoče pridobiti nobenega paketa"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Ni rezultatov"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Posodobi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Paketi tekstur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Odstrani"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Posodobi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Already installed"
 msgstr "Tipka je že v uporabi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr "Nazaj na glavni meni"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "Gosti igro"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ni na voljo, če je bil Minetest narejen brez podpore cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Odvisnosti:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "Poteka nalaganje ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Prenos $1 je spodletel"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Prenos $1 je spodletel"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Nameščanje: nepodprta vrsta datoteke \"$1\" oziroma okvarjen arhiv"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Igre"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Namesti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Namesti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Izbirne možnosti:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Poteka nalaganje ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Prilagoditve (mods)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Ni mogoče pridobiti nobenega paketa"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Ni rezultatov"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Posodobi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Paketi tekstur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Odstrani"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Posodobi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -475,11 +482,21 @@ msgstr "Ustvari"
 msgid "Decorations"
 msgstr "Dekoracije"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Opozorilo: okrnjena razvojna različica je namenjena razvijalcem."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
@@ -863,10 +880,6 @@ msgstr ""
 msgid "Back"
 msgstr "Nazaj"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Spremeni tipke"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -876,7 +889,8 @@ msgstr "Klepet"
 msgid "Clear"
 msgstr "Počisti"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Controls"
 msgstr "Kontrole"
@@ -1091,6 +1105,16 @@ msgstr "Namesti"
 msgid "Install games from ContentDB"
 msgstr "Namesti igre iz ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Novo"
@@ -1125,8 +1149,8 @@ msgid "Start Game"
 msgstr "Začni igro"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Ni nameščenih iger."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1212,19 +1236,11 @@ msgstr "Poteka nalaganje tekstur ..."
 msgid "Rebuilding shaders..."
 msgstr "Preračunavanje senčenja ..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Napaka povezave (ali je dejanje časovno preteklo?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Ni mogoče najti oziroma naložiti igre »"
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Neveljavna določila igre."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Glavni Meni"
@@ -1251,7 +1267,11 @@ msgstr "Ni bilo mogoče odpreti datoteke z geslom: "
 msgid "Provided world path doesn't exist: "
 msgstr "Podana pot do sveta ne obstaja: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medij..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1259,18 +1279,10 @@ msgstr ""
 "\n"
 "Več podrobnosti je zapisanih v datoteki debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "– Naslov: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "– Način: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "– Vrata: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "– Javno: "
@@ -1306,10 +1318,6 @@ msgstr "Samodejno premikanje naprej je omogočeno"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1355,6 +1363,10 @@ msgstr "Skriptiranje s strani odjemalca je onemogočeno"
 msgid "Connecting to server..."
 msgstr "Poteka povezovanje s strežnikom ..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Napaka povezave (ali je dejanje časovno preteklo?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1363,47 +1375,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Tipkovne bližnjice:\n"
-"- %s 1: premakne se naprej\n"
-"- %s 2: premakne se nazaj\n"
-"- %s 3: premakne se levo\n"
-"- %s 4: premakne se desno\n"
-"- %s 5: skakanje / plezanje\n"
-"- %s 6: plazenje / premikanje dol\n"
-"- %s 7: vrže predmet stran\n"
-"- %s 8: pokaže zalogo\n"
-"- Miška: obrne / pogleda\n"
-"- levi gumb miške: koplje / udari\n"
-"- desni gumb miške: postavi/uporabi\n"
-"- kolesce miške: izbere orodje iz  zaloge\n"
-"- %s 9: omogoči klepet\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1497,6 +1476,11 @@ msgstr "Megla onemogočena"
 msgid "Fog enabled"
 msgstr "Megla omogočena"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Približanje (zoom) je trenutno onemogočen zaradi igre ali prilagoditve"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Podrobnosti o igri:"
@@ -1517,10 +1501,6 @@ msgstr "Določila predmetov ..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medij..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1684,10 +1664,6 @@ msgstr "Žičnati prikaz omogočen"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Približanje (zoom) je trenutno onemogočen zaradi igre ali prilagoditve"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "v redu"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -2029,6 +2005,15 @@ msgstr "Zemljevid (minimap) je v načinu prikazovanja površja, Zoom x1"
 msgid "Minimap in texture mode"
 msgstr "Zemljevid (minimap) je v načinu prikazovanja površja, Zoom x1"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Prenos $1 je spodletel"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2222,6 +2207,19 @@ msgstr "Približanje"
 msgid "press key"
 msgstr "pritisni tipko"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Prenos $1 je spodletel"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Spremeni"
@@ -2255,6 +2253,7 @@ msgstr "Glasnost zvoka: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sl"
 
@@ -2473,14 +2472,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr "Doda partikle pri kopanju kocke."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Nastavite dpi konfiguracijo (gostoto prikaza) svojemu ekranu (samo za ne-X11/"
-"Android), npr. za 4K ekrane."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2504,6 +2495,10 @@ msgstr "Dodaj ime elementa"
 msgid "Advanced"
 msgstr "Naprednejše"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2561,6 +2556,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr "Šum jablan"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Vztrajnost roke"
@@ -2578,18 +2584,38 @@ msgid "Ask to reconnect after crash"
 msgstr "Vprašaj za ponovno povezavo po sesutju"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Na tej razdalji bo strežnik agresivno optimiziral, kateri bloki bodo "
+"poslani\n"
+"igralcem.\n"
+"Manjše vrednosti lahko močno pospešijo delovanje na račun napak\n"
+"pri izrisovanju (nekateri bloki se ne bodo izrisali pod vodo in v jamah,\n"
+"včasih pa tudi na kopnem).\n"
+"Nastavljanje na vrednost, večjo od max_block_send_distance, onemogoči to\n"
+"optimizacijo.\n"
+"Navedena vrednost ima enoto 'mapchunk' (16 blokov)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Na tej razdalji bo strežnik agresivno optimiziral, kateri bloki bodo "
 "poslani\n"
@@ -2667,6 +2693,10 @@ msgstr "Biomi"
 msgid "Biome noise"
 msgstr "Šum bioma"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2895,6 +2925,12 @@ msgstr "Barvna megla"
 msgid "Colored shadows"
 msgstr "Barvna megla"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3028,10 +3064,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -3082,6 +3114,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Določa območja, kjer imajo drevesa jabolka."
@@ -3271,6 +3316,11 @@ msgstr "Omogoči vse"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Omogoči poškodbe"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3290,6 +3340,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Omogoči joystick"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3332,6 +3387,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3355,6 +3414,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Celozaslonski način"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3363,12 +3427,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3398,6 +3456,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4224,9 +4295,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4374,10 +4446,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4426,7 +4494,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4461,10 +4531,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4707,6 +4773,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4775,6 +4845,11 @@ msgstr "Občutljivost miške"
 msgid "Mouse sensitivity multiplier."
 msgstr "Števnik občutljivosti premikanja miške."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Vhod v jamo"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4885,10 +4960,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4901,6 +4972,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5011,6 +5086,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Različice protokola niso skladne. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5026,6 +5110,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5217,8 +5305,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5340,7 +5428,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5373,6 +5461,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5412,8 +5504,7 @@ msgstr "Senčenje"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5483,13 +5574,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5526,7 +5610,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 "Možnost omogoča glajenje pogleda kamere med obračanjem v filmskem načinu. "
 "Vrednost 0 možnost onemogoči."
@@ -5553,6 +5637,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Senca pisave"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Zvok je utišan"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5709,17 +5802,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5730,6 +5843,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5756,7 +5875,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5813,6 +5932,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5862,15 +5985,15 @@ msgstr "Občutljivost miške"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Števnik občutljivosti premikanja miške."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Občutljivost dotika (v pikslih):"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Valovanje tekočin"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5906,7 +6029,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6008,10 +6133,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6098,12 +6219,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Poudarjanje vozlišč"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6344,12 +6478,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "– Naslov: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "– Ustvarjalni način: "
 
 #~ msgid "- Damage: "
 #~ msgstr "– Poškodbe: "
 
+#~ msgid "- Port: "
+#~ msgstr "– Vrata: "
+
 #, fuzzy
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
@@ -6385,6 +6525,13 @@ msgstr ""
 #~ "Pustite prazno za zagon lokalnega strežnika.\n"
 #~ "Polje za vpis naslova v glavnem meniju povozi to nastavitev."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Nastavite dpi konfiguracijo (gostoto prikaza) svojemu ekranu (samo za ne-"
+#~ "X11/Android), npr. za 4K ekrane."
+
 #~ msgid "All Settings"
 #~ msgstr "Vse nastavitve"
 
@@ -6427,6 +6574,9 @@ msgstr ""
 #~ "procesorjih.\n"
 #~ "0.1 = privzeto, 0.25 = dobra vrednost za šibkejše naprave"
 
+#~ msgid "Change Keys"
+#~ msgstr "Spremeni tipke"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Spremeni tipke"
@@ -6483,6 +6633,38 @@ msgstr ""
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "Nadzira hitrost potapljanja v tekočinah."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Tipkovne bližnjice:\n"
+#~ "- %s 1: premakne se naprej\n"
+#~ "- %s 2: premakne se nazaj\n"
+#~ "- %s 3: premakne se levo\n"
+#~ "- %s 4: premakne se desno\n"
+#~ "- %s 5: skakanje / plezanje\n"
+#~ "- %s 6: plazenje / premikanje dol\n"
+#~ "- %s 7: vrže predmet stran\n"
+#~ "- %s 8: pokaže zalogo\n"
+#~ "- Miška: obrne / pogleda\n"
+#~ "- levi gumb miške: koplje / udari\n"
+#~ "- desni gumb miške: postavi/uporabi\n"
+#~ "- kolesce miške: izbere orodje iz  zaloge\n"
+#~ "- %s 9: omogoči klepet\n"
+
 #~ msgid "Creative"
 #~ msgstr "Ustvarjalen"
 
@@ -6756,6 +6938,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Namesti: datoteka: »$1«"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Neveljavna določila igre."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6801,9 +6986,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Brez zemljevida (minimap)"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Poudarjanje vozlišč"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Obrobljanje vozlišč"
 
@@ -6909,6 +7091,10 @@ msgstr ""
 #~ msgid "Tone Mapping"
 #~ msgstr "Barvno preslikavanje"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Občutljivost dotika (v pikslih):"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilinearni filter"
 
@@ -6973,8 +7159,14 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Umrl si"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Ni nameščenih iger."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "v redu"
diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index 2e67b67a0..c54f42825 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Serbian (cyrillic) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-07-12 16:18+0000\n"
 "Last-Translator: OrbitalPetrol <ccorporation981@gmail.com>\n"
 "Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/"
@@ -72,7 +72,8 @@ msgid "Command not available: "
 msgstr "Команда није доступна: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Нађите помоћ за команде"
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +84,10 @@ msgstr ""
 "да бисте све набројали."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <команда>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "У реду"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ни једна није доступна>"
@@ -106,6 +104,10 @@ msgstr "Догодила се грешка:"
 msgid "Main menu"
 msgstr "Главни мени"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "У реду"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Поновно повезивање"
@@ -134,19 +136,27 @@ msgstr "Ми подржавамо само $1 верзију протокола.
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ми подржавамо верзије протокола између верзије $1 и $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" већ постоји. Да ли желите да га препишете?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 и $2 зависности ће бити инсталиране."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Неуспело преузимање $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 од $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Неуспело преузимање $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Инсталирај мод: неподржан тип фајла \"$1\" или оштећена архива"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,159 +164,158 @@ msgstr ""
 "$1 се преузима,\n"
 "$2 чекају преузимање"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 се преузима..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 неопходних зависности није могло бити нађено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 зависности ће бити инсталирано, и $2 зависности ће бити прескочено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Сви пакети"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Већ инсталирано"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Назад у главни мени"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+"ContentDB није доступан када је Minetest компајлиран без cURL библиотеке"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Преузимање..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Игре"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Инсталирај"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Учитавање..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Модови"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Ниједан пакет није било могуће преузети"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Нема резултата"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Нема ажурирања"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "На чекању"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Сетови текстура"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Деинсталирај"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Ажурирај"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Ажурирај све [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Погледај још информација у веб претраживачу"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 и $2 зависности ће бити инсталиране."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 од $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 неопходних зависности није могло бити нађено."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 зависности ће бити инсталирано, и $2 зависности ће бити прескочено."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Већ инсталирано"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Основна игра:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Прекини"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-"ContentDB није доступан када је Minetest компајлиран без cURL библиотеке"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Зависи од:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Преузимање..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Неуспело преузимање $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Неуспело преузимање $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Инсталирај мод: неподржан тип фајла \"$1\" или оштећена архива"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Игре"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Инсталирај"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Инсталирај $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Инсталирај недостајуће зависности"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Учитавање..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Модови"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Ниједан пакет није било могуће преузети"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Нема резултата"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Нема ажурирања"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Није пронађено"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Препиши"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Молим проверите да ли је основна игра исправна."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "На чекању"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" већ постоји. Да ли желите да га препишете?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Сетови текстура"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Деинсталирај"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Ажурирај"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Ажурирај све [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Погледај још информација у веб претраживачу"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Препиши"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 #, fuzzy
@@ -464,11 +473,21 @@ msgstr "Направи"
 msgid "Decorations"
 msgstr "Украси"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Упозорење: Минимални развојни тест је намењен развијачима."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Тамнице"
@@ -845,10 +864,6 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Подеси контроле"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -858,7 +873,8 @@ msgstr "Чет"
 msgid "Clear"
 msgstr "Очисти"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Контроле"
 
@@ -1076,6 +1092,16 @@ msgstr "Инсталирај $1"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Нови"
@@ -1112,8 +1138,8 @@ msgid "Start Game"
 msgstr "Направи игру"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Нема инсталираних подигара."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1200,19 +1226,11 @@ msgstr "Учитавам текстуре..."
 msgid "Rebuilding shaders..."
 msgstr "Обнављам шејдере..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Грешка у конекцији (истекло време?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Немогу пронаћи или учитати игру \""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Неважећи gamespec."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Главни мени"
@@ -1238,7 +1256,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr "Дата локација света не постоји: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медија..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1246,18 +1268,10 @@ msgstr ""
 "\n"
 "Проверите debug.txt за више детаља."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Адреса: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Мод: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Јавни: "
@@ -1295,10 +1309,6 @@ msgstr "Кључ за синематски мод"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1348,6 +1358,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Повезујем се на сервер..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Грешка у конекцији (истекло време?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1356,47 +1370,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Настави"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Уобичајене контроле:\n"
-"- %s: иди напред\n"
-"- %s: иди назад\n"
-"- %s: иди лево\n"
-"- %s: иди десно\n"
-"- %s: скакање/пењање\n"
-"- %s: шуњање/силажење\n"
-"- %s: баци ставку\n"
-"- %s: инвентар\n"
-"- Миш: окретање/гледање\n"
-"- Леви клик: копање/ударање\n"
-"- Десни клик: постављање/коришћење\n"
-"- Точкић миша: одабирање ставке\n"
-"- %s: причање\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1493,6 +1474,10 @@ msgstr "Онемогућено"
 msgid "Fog enabled"
 msgstr "укључено"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Информације о игри:"
@@ -1513,10 +1498,6 @@ msgstr "Дефиниције предмета..."
 msgid "KiB/s"
 msgstr "КиБ/с"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Медија..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "МиБ/с"
@@ -1676,10 +1657,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "уреду"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -2014,6 +1991,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Неуспело преузимање $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2214,6 +2200,19 @@ msgstr "Зумирај"
 msgid "press key"
 msgstr "притисните дугме"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Неуспело преузимање $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Промени"
@@ -2248,6 +2247,7 @@ msgstr "Јачина звука: "
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sr_Cyrl"
 
@@ -2454,14 +2454,6 @@ msgstr "Даљина слања активног блока"
 msgid "Adds particles when digging a node."
 msgstr "Додаје честице када се блок ископа."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Подеси dpi конфигурацију за твој екран (само за оне који нису X11/Android) "
-"нпр. за 4k екране."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2485,6 +2477,10 @@ msgstr "Име света"
 msgid "Advanced"
 msgstr "Напредно"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2542,6 +2538,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr "Насумично семе за генерисање јабукових дрвећа"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2564,12 +2571,31 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"При овој раздаљини сервер ће агресивно оптимизовати који блокови се шаљу "
+"клијенту\n"
+"Мање вредности ће потенцијално пролично побољшати преформансе, по цену "
+"видљивих грешака на приказаној слици.\n"
+"(неки блокови се неће приказивати под водом и у пећинама, као ни понеки на "
+"земљи)\n"
+"Постављање овога на вредност већу од max_block_send_distance искључује ову "
+"оптимизацију.\n"
+"Постављено у мапа-блоковима (16 блокова)"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "При овој раздаљини сервер ће агресивно оптимизовати који блокови се шаљу "
 "клијенту\n"
@@ -2645,6 +2671,10 @@ msgstr "Биоми"
 msgid "Biome noise"
 msgstr "Семе биома"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2871,6 +2901,12 @@ msgstr "Обојена магла"
 msgid "Colored shadows"
 msgstr "Обојена магла"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3015,10 +3051,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Debug log file size threshold"
@@ -3070,6 +3102,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3258,6 +3303,11 @@ msgstr "Укључи све"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Омогући оштећење"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3277,6 +3327,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3319,6 +3373,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3342,6 +3400,11 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Граница семена за плаже"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3350,12 +3413,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3385,6 +3442,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4187,9 +4257,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4338,10 +4409,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4390,7 +4457,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4425,10 +4494,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4676,6 +4741,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4744,6 +4813,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Граница пећине"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4853,10 +4927,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4869,6 +4939,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4979,6 +5053,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Неслагање верзија протокола. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4994,6 +5077,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5186,8 +5273,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5329,7 +5416,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5362,6 +5449,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5402,8 +5493,7 @@ msgstr "Шејдери"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5473,13 +5563,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5515,7 +5598,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5538,6 +5621,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Величина облака"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Јачина звука"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5694,17 +5786,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5715,6 +5827,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5741,7 +5859,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5798,6 +5916,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5846,15 +5968,15 @@ msgstr "Граница семена за плаже"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Граница семена за плаже"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Лепршајуће лишће"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5890,7 +6012,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5989,10 +6113,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6079,12 +6199,25 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Истицање блокова"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6327,12 +6460,18 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#~ msgid "- Address: "
+#~ msgstr "- Адреса: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Слободни мод: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Оштећење: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6367,6 +6506,13 @@ msgstr ""
 #~ "Оставите ово празно за локални сервер.\n"
 #~ "Пазите да поље за адресу у менију преписује ово подешавање."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Подеси dpi конфигурацију за твој екран (само за оне који нису X11/"
+#~ "Android) нпр. за 4k екране."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6415,6 +6561,9 @@ msgstr ""
 #~ msgid "Camera update toggle key"
 #~ msgstr "Кључ за укључивање/искључивање освежавања камере"
 
+#~ msgid "Change Keys"
+#~ msgstr "Подеси контроле"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Подеси контроле"
@@ -6463,6 +6612,38 @@ msgstr ""
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Контролише ширину тунела, мања вредност ствара шире тунеле."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Уобичајене контроле:\n"
+#~ "- %s: иди напред\n"
+#~ "- %s: иди назад\n"
+#~ "- %s: иди лево\n"
+#~ "- %s: иди десно\n"
+#~ "- %s: скакање/пењање\n"
+#~ "- %s: шуњање/силажење\n"
+#~ "- %s: баци ставку\n"
+#~ "- %s: инвентар\n"
+#~ "- Миш: окретање/гледање\n"
+#~ "- Леви клик: копање/ударање\n"
+#~ "- Десни клик: постављање/коришћење\n"
+#~ "- Точкић миша: одабирање ставке\n"
+#~ "- %s: причање\n"
+
 #~ msgid "Creative"
 #~ msgstr "Креативни мод"
 
@@ -6472,6 +6653,9 @@ msgstr ""
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Боја нишана (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Штета"
 
@@ -6540,6 +6724,9 @@ msgstr ""
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Инсталирај мод: фајл: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Неважећи gamespec."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6574,9 +6761,6 @@ msgstr ""
 #~ msgid "No Mipmap"
 #~ msgstr "Без Mipmap-а"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Истицање блокова"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Обцртавање блокова"
 
@@ -6671,6 +6855,10 @@ msgstr ""
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Праг додиривања (px)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Граница семена за плаже"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Трилинеарни филтер"
 
@@ -6705,5 +6893,11 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Умро/ла си."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Нема инсталираних подигара."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "уреду"
diff --git a/po/sr_Latn/minetest.po b/po/sr_Latn/minetest.po
index d1524c8dc..c4e63c55b 100644
--- a/po/sr_Latn/minetest.po
+++ b/po/sr_Latn/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-05-06 20:50+0000\n"
 "Last-Translator: Sava Kujundžić <savakujunszic@gmail.com>\n"
 "Language-Team: Serbian (latin) <https://hosted.weblate.org/projects/minetest/"
@@ -73,7 +73,8 @@ msgid "Command not available: "
 msgstr "Komanda je nedostupna: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Dobij pomoć u vezi komanda"
 
 #: builtin/common/chatcommands.lua
@@ -84,13 +85,10 @@ msgstr ""
 "pogledaš listu svega."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<nijedan/na/no nije dostupno >"
@@ -107,6 +105,10 @@ msgstr "Doslo je do greske:"
 msgid "Main menu"
 msgstr "Glavni meni"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Ponovno povezivanje"
@@ -135,178 +137,185 @@ msgstr "Mi samo podrzavamo protokol verzije $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Mi podrzavamo protokol verzija izmedju verzije $1 i $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Neuspelo preuzimanje $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Neuspelo preuzimanje $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Preuzimanje..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Svi paketi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Nazad na Glavni meni"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB je nedostupan kada je Minetest sastavljen bez cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Preuzimanje..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Igre"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Instalirati"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ucitavanje..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modovi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Nema paketa za preuzeti"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Bez rezultata"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Azuriranje"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Pakovanja tekstura"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Deinstaliraj"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Azuriranje"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Ponisti"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB je nedostupan kada je Minetest sastavljen bez cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Zavisnosti:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Preuzimanje..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Neuspelo preuzimanje $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Neuspelo preuzimanje $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Igre"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Instalirati"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Instalirati"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Neobavezne zavisnosti:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Ucitavanje..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modovi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Nema paketa za preuzeti"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Bez rezultata"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "No updates"
-msgstr "Azuriranje"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Pakovanja tekstura"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Deinstaliraj"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Azuriranje"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -455,10 +464,20 @@ msgstr ""
 msgid "Decorations"
 msgstr "Dekoracije"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Tamnice"
@@ -825,10 +844,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -838,7 +853,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1043,6 +1059,16 @@ msgstr "Instalirati"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1076,8 +1102,8 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Nema instaliranih igara."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1157,18 +1183,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1193,24 +1211,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1246,10 +1260,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1294,6 +1304,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1302,32 +1316,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1407,6 +1402,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1427,10 +1426,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1586,10 +1581,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1910,6 +1901,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Neuspelo preuzimanje $1"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2101,6 +2101,19 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Neuspelo preuzimanje $1"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2134,6 +2147,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sr_Latn"
 
@@ -2319,12 +2333,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2347,6 +2355,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2400,6 +2412,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2421,12 +2444,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2490,6 +2522,10 @@ msgstr "Biomi"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2702,6 +2738,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2833,10 +2875,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2886,6 +2924,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3072,6 +3123,11 @@ msgstr "Omoguci sve"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Omoguci sve"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3091,6 +3147,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3133,6 +3193,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3156,6 +3220,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3164,12 +3232,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3199,6 +3261,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3994,9 +4069,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4142,10 +4218,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4194,7 +4266,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4229,10 +4303,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4475,6 +4545,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4543,6 +4617,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4651,10 +4729,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4667,6 +4741,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4776,6 +4854,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokol verzija neuskladjena. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4791,6 +4878,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4978,8 +5069,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5098,7 +5189,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5131,6 +5222,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5170,8 +5265,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5241,13 +5335,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5283,7 +5370,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5304,6 +5391,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5460,17 +5555,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5481,6 +5596,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5507,7 +5628,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5564,6 +5685,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5611,11 +5736,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5653,7 +5778,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5751,10 +5878,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5841,12 +5964,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6097,5 +6232,8 @@ msgstr ""
 #~ msgid "You died."
 #~ msgstr "Umro/la si."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Nema instaliranih igara."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
diff --git a/po/sv/minetest.po b/po/sv/minetest.po
index bbde33475..58ecd1e72 100644
--- a/po/sv/minetest.po
+++ b/po/sv/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Swedish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-10-22 17:19+0000\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-06-08 08:09+0000\n"
 "Last-Translator: ROllerozxa <rollerozxa@voxelmanip.se>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/minetest/"
 "minetest/sv/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.1\n"
+"X-Generator: Weblate 5.6-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Kommando inte tillgängligt: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Få hjälp med kommandon"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "visa allt."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<inget tillgängligt>"
@@ -105,6 +103,10 @@ msgstr "Ett fel uppstod:"
 msgid "Main menu"
 msgstr "Huvudmeny"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Återanslut"
@@ -133,19 +135,28 @@ msgstr "Vi stöder endast protokollversion $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi stöder protokollversioner mellan version $1 och $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" finns redan. Vill du skriva över den?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Fel vid installation av \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 och $2 beroende paket kommer installeras."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Misslyckades att ladda ner \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 till $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Misslyckades ladda ner $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Misslyckades med att extrahera \"$1\" (filtyp som inte stöds eller trasigt "
+"arkiv)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +164,158 @@ msgstr ""
 "$1 laddas ner,\n"
 "$2 köad"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 laddas ner..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 nödvändiga beroenden kunde inte hittas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 kommer att installeras och $2 beroenden hoppas över."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Alla paket"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Redan installerad"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Tillbaka till huvudmeny"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB är inte tillgänglig när Minetest är kompilerad utan cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Laddar ner..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Spel"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Installera"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laddar..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Moddar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Inga paket kunde hämtas"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Inga resultat"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Inga uppdateringar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Köad"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Texturpaket"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "The package $1 was not found."
+msgstr "Paketet $1/$2 kunde inte hittas."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Avnstallera"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Uppdatera"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Uppdatera Alla [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Visa mer information i en webbläsare"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Du behöver installera ett spel innan du kan installera en modd"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 och $2 beroende paket kommer installeras."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 till $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 nödvändiga beroenden kunde inte hittas."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 kommer att installeras och $2 beroenden hoppas över."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Redan installerad"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Basspel:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB är inte tillgänglig när Minetest är kompilerad utan cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Beroenden:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Laddar ner..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Fel vid installation av \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Misslyckades att ladda ner \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Misslyckades ladda ner $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Misslyckades med att extrahera \"$1\" (filtyp som inte stöds eller trasigt "
-"arkiv)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Spel"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Installera"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Installera $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Installera saknade beroenden"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laddar..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Moddar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Inga paket kunde hämtas"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Inga resultat"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Inga uppdateringar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Skriv över"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Var snäll se att basspelet är korrekt."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Köad"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" finns redan. Vill du skriva över den?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Texturpaket"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "The package $1 was not found."
-msgstr "Paketet $1/$2 kunde inte hittas."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Avnstallera"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Uppdatera"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Uppdatera Alla [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Visa mer information i en webbläsare"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Du behöver installera ett spel innan du kan installera en modd"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Skriv över"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -345,7 +355,7 @@ msgstr "(Ej nöjd)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "Avaktivera alla"
+msgstr "Inaktivera allt"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
@@ -453,10 +463,20 @@ msgstr "Skapa"
 msgid "Decorations"
 msgstr "Dekorationer"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Development Test är avsett för utvecklare."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Fängelsehålor"
@@ -833,10 +853,6 @@ msgstr ""
 msgid "Back"
 msgstr "Tillbaka"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Ändra Tangenter"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,7 +862,8 @@ msgstr "Chatta"
 msgid "Clear"
 msgstr "Rensa"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Kontrollerar"
 
@@ -1055,6 +1072,17 @@ msgstr "Installera ett spel"
 msgid "Install games from ContentDB"
 msgstr "Installera spel från ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game är inte längre installerat som standard"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Ny"
@@ -1088,8 +1116,9 @@ msgid "Start Game"
 msgstr "Starta spel"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Du har inga spel installerade."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Du behöver installera ett spel innan du kan installera en modd"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1168,18 +1197,10 @@ msgstr "Laddar texturer..."
 msgid "Rebuilding shaders..."
 msgstr "Rekonstruerar shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Anslutningsfel (tidsgräns nådd?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Kunde inte hitta eller ladda spel: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Ogiltig spelspecifikation."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Huvudmeny"
@@ -1204,7 +1225,11 @@ msgstr "Den angivna lösenordsfilen kunde inte öppnas: "
 msgid "Provided world path doesn't exist: "
 msgstr "Angiven världssökväg existerar inte: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Media..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1212,18 +1237,10 @@ msgstr ""
 "\n"
 "Se debug.txt för detaljer."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Bindningsadress: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Läge: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "Offentlig "
@@ -1258,10 +1275,6 @@ msgstr "Automatiskt framåt aktiverat"
 msgid "Block bounds hidden"
 msgstr "Blockgränser dolda"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blockgränser visas för alla block"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blockgränser visas för det aktuella blocket"
@@ -1306,6 +1319,10 @@ msgstr "Klientsidiga skriptar är inaktiverade"
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Anslutningsfel (tidsgräns nådd?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Anslutningen misslyckades av okänd anledning"
@@ -1315,45 +1332,13 @@ msgid "Continue"
 msgstr "Fortsätt"
 
 #: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kontroller:\n"
-"- %s: rör dig framåt\n"
-"- %s: rör dig bakåt\n"
-"- %s: rör dig åt vänster\n"
-"- %s: rör dig åt höger\n"
-"- %s: hoppa/klättra\n"
-"- %s: gräv/slå/använd\n"
-"- %s: placera/använd\n"
-"- %s: smyg/rör dig nedåt\n"
-"- %s: släpp föremål\n"
-"- %s: förråd\n"
-"- Mus: vänd/titta\n"
-"- Mushjul: välj föremål\n"
-"- %s: chatt\n"
-
-#: src/client/game.cpp
+#, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1445,6 +1430,11 @@ msgstr "Dimma inaktiverad"
 msgid "Fog enabled"
 msgstr "Dimma aktiverat"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Zoom är för närvarande inaktiverad av spel eller modd"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spelinformation:"
@@ -1465,10 +1455,6 @@ msgstr "Föremålsdefinitioner..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Media..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1630,10 +1616,6 @@ msgstr "Wireframe visas"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom är för närvarande inaktiverad av spel eller modd"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ok"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Chatt är för närvarande inaktiverad av spel eller modd"
@@ -1966,6 +1948,15 @@ msgstr "Minimapp i ytläge, Zoom x%d"
 msgid "Minimap in texture mode"
 msgstr "Minimapp i texturläge"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Misslyckades att öppna hemsida"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2069,7 +2060,7 @@ msgstr "Öka volym"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr "Förråd"
+msgstr "Lagring"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Jump"
@@ -2159,6 +2150,19 @@ msgstr "Zoom"
 msgid "press key"
 msgstr "tryck på knapp"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Misslyckades att öppna hemsida"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Ändra"
@@ -2192,6 +2196,7 @@ msgstr "Ljudvolym: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sv"
 
@@ -2414,14 +2419,6 @@ msgstr "Aktivt avstånd för objektsändning"
 msgid "Adds particles when digging a node."
 msgstr "Lägger till partiklar när en nod grävs."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Justera dpi-konfigurationen för din skärm (endast icke X11/Android) t.ex. "
-"för 4k-skärmar."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2451,6 +2448,10 @@ msgstr "Administratörsnamn"
 msgid "Advanced"
 msgstr "Avancerat"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2510,6 +2511,17 @@ msgstr "Infoga objektnamn till verktygstips."
 msgid "Apple trees noise"
 msgstr "Äppelträdlojud"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Armtröghet"
@@ -2527,18 +2539,41 @@ msgid "Ask to reconnect after crash"
 msgstr "Förfråga att återkoppla efter krash"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Vid detta avstånd kommer servern att aggressivt optimera vilka block som "
+"skickas till\n"
+"klienterna.\n"
+"Små värden kan potentiellt förbättra prestandan avsevärt, på bekostnaden av "
+"synliga\n"
+"renderingsglitchar (vissa block kommer inte att renderas under vatten och i "
+"grottor,\n"
+"ibland även på land).\n"
+"Sätts detta till ett värde större än max_block_send_distance inaktiveras "
+"denna\n"
+"optimering.\n"
+"Angiven i mapblocks (16 noder)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Vid detta avstånd kommer servern att aggressivt optimera vilka block som "
 "skickas till\n"
@@ -2614,6 +2649,11 @@ msgstr "Biotoper"
 msgid "Biome noise"
 msgstr "Biotopoljud"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Distans för optimering av blockskickning"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Distans för optimering av blockskickning"
@@ -2832,6 +2872,12 @@ msgstr "Färgad dimma"
 msgid "Colored shadows"
 msgstr "Färgad dimma"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2998,10 +3044,6 @@ msgstr ""
 "Hårkorsfärg (R,G,B).\n"
 "Styr även hårkorsets färg på objektet"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Felsökningslogg storlekströskel"
@@ -3057,6 +3099,24 @@ msgstr ""
 "Poisson-skiva\n"
 "men använder också mer resurser."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Aktivera för att hindra gamla klienter från att ansluta.\n"
+"Äldre klienter är kompatibla i och med att de inte krashar när de ansluter\n"
+"till nya servrar, men de kanske inte stöder alla nya funktioner du förväntar "
+"dig."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Definierar områden där träd har äpplen."
@@ -3258,6 +3318,11 @@ msgstr "Aktivera bloom"
 msgid "Enable Bloom Debug"
 msgstr "Aktivera bloomavlusning"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Aktivera skada"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3284,6 +3349,11 @@ msgstr ""
 "När aktiverad används Poisson-disk för att göra \"mjuka skuggor\". Annars "
 "används PCF-filtrering."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Aktivera joysticks"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3328,6 +3398,11 @@ msgstr "Aktivera modsäkerhet"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Aktivera slumpmässig användarinmatning (används endast för testning)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Aktivera slumpmässig användarinmatning (används endast för testning)."
@@ -3357,6 +3432,11 @@ msgstr ""
 "till nya servrar, men de kanske inte stöder alla nya funktioner du förväntar "
 "dig."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Pekskärm"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3369,14 +3449,6 @@ msgstr ""
 "texturer)\n"
 "när du ansluter till servern."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Aktivera vertexbuffertobjekt.\n"
-"Detta bör avsevärt förbättra grafikprestandan."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3415,6 +3487,19 @@ msgstr "Aktiverar animering av lagerföremål."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Aktiverar cachning av facedirroterade mesher."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3711,9 +3796,8 @@ msgid "Fullscreen mode."
 msgstr "Fullskärmsläge."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
-msgstr "GUIs"
+msgstr "GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -4232,7 +4316,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr ""
+msgstr "Språk"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
@@ -4264,9 +4348,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4412,10 +4497,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4464,7 +4545,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4499,10 +4582,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4745,6 +4824,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4813,6 +4896,11 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Grottröskel"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4922,10 +5010,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4938,6 +5022,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5047,6 +5135,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokollversionen matchar inte. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5062,6 +5159,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5249,8 +5350,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5387,7 +5488,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5420,6 +5521,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5459,8 +5564,7 @@ msgstr "Shaders"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5530,13 +5634,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5572,7 +5669,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5593,6 +5690,16 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Radie för mjuk skugga"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Ljudvolym avstängd"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB Flaggsvartlista"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5749,17 +5856,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5770,6 +5897,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5796,7 +5929,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5853,6 +5986,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5899,14 +6036,15 @@ msgstr "Pekskärmskänslighet"
 msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Tröskelvärde för pekskärm"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Vajande vätskor"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -5942,7 +6080,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6043,10 +6183,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -6133,12 +6269,26 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS när ofokuserad eller pausad"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Nodmarkering"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6378,12 +6528,18 @@ msgstr "cURL parallellgräns"
 #~ msgid "(game support required)"
 #~ msgstr "(kräver spelstöd)"
 
+#~ msgid "- Address: "
+#~ msgstr "- Bindningsadress: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Kreativt läge: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Aktivera skada: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6422,6 +6578,13 @@ msgstr "cURL parallellgräns"
 #~ "Notera att adressen i fältet på huvudmenyn gör att denna inställning "
 #~ "ignoreras."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Justera dpi-konfigurationen för din skärm (endast icke X11/Android) t.ex. "
+#~ "för 4k-skärmar."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6471,6 +6634,9 @@ msgstr "cURL parallellgräns"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Bits per pixel (dvs färgdjup) i fullskärmsläge."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blockgränser visas för alla block"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Stötkartläggning"
 
@@ -6492,6 +6658,9 @@ msgstr "cURL parallellgräns"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Växeltagent för kamerauppdatering"
 
+#~ msgid "Change Keys"
+#~ msgstr "Ändra Tangenter"
+
 #~ msgid "Change keys"
 #~ msgstr "Ändra tangenter"
 
@@ -6555,6 +6724,38 @@ msgstr "cURL parallellgräns"
 #~ msgstr ""
 #~ "Kontrollerar bredd av tunnlar, mindre värden skapar bredare tunnlar."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kontroller:\n"
+#~ "- %s: rör dig framåt\n"
+#~ "- %s: rör dig bakåt\n"
+#~ "- %s: rör dig åt vänster\n"
+#~ "- %s: rör dig åt höger\n"
+#~ "- %s: hoppa/klättra\n"
+#~ "- %s: gräv/slå/använd\n"
+#~ "- %s: placera/använd\n"
+#~ "- %s: smyg/rör dig nedåt\n"
+#~ "- %s: släpp föremål\n"
+#~ "- %s: förråd\n"
+#~ "- Mus: vänd/titta\n"
+#~ "- Mushjul: välj föremål\n"
+#~ "- %s: chatt\n"
+
 #~ msgid "Creative"
 #~ msgstr "Kreativt"
 
@@ -6564,6 +6765,9 @@ msgstr "cURL parallellgräns"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Hårkorsförg (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Skada"
 
@@ -6640,6 +6844,13 @@ msgstr "cURL parallellgräns"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Aktivera registreringsbekräftelse"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Aktivera vertexbuffertobjekt.\n"
+#~ "Detta bör avsevärt förbättra grafikprestandan."
+
 #~ msgid "Enabled"
 #~ msgstr "Aktiverad"
 
@@ -6756,6 +6967,9 @@ msgstr "cURL parallellgräns"
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Installera: fil: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Ogiltig spelspecifikation."
+
 #~ msgid ""
 #~ "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 #~ msgstr ""
@@ -6790,9 +7004,6 @@ msgstr "cURL parallellgräns"
 #~ msgid "No Mipmap"
 #~ msgstr "Ingen Mipmap"
 
-#~ msgid "Node Highlighting"
-#~ msgstr "Nodmarkering"
-
 #~ msgid "Node Outlining"
 #~ msgstr "Nodkontur"
 
@@ -6880,6 +7091,9 @@ msgstr "cURL parallellgräns"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Touch-tröskel (px):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Tröskelvärde för pekskärm"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilinjärt filter"
 
@@ -6940,8 +7154,14 @@ msgstr "cURL parallellgräns"
 #~ msgid "You died."
 #~ msgstr "Du dog."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Du har inga spel installerade."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "ok"
diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index 88681384a..3b53f318f 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Swahili (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili <https://hosted.weblate.org/projects/minetest/"
@@ -78,7 +78,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -87,11 +87,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -112,6 +108,10 @@ msgstr "Kosa limetokea:"
 msgid "Main menu"
 msgstr "Menyu kuu"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Unganisha upya"
@@ -140,187 +140,194 @@ msgstr "Sisi tu mkono itifaki toleo la $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Imeshindwa kusakinisha $1 hadi $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr ""
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download $1"
+msgstr "Imeshindwa kusakinisha $1 hadi $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"\n"
+"Sakinisha Moduli: filetype visivyotegemezwa \"$1\" au nyaraka kuvunjwa"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "$1 downloading..."
 msgstr "Inapakia..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Already installed"
-msgstr "Muhimu tayari katika matumizi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 #, fuzzy
 msgid "Back to Main Menu"
 msgstr "Menyu kuu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Downloading..."
+msgstr "Inapakia..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Michezo"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Sakinisha"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Inapakia..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mods"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Texture packs"
+msgstr "Texturepacks"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+#, fuzzy
+msgid "Uninstall"
+msgstr "Sakinisha"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Muhimu tayari katika matumizi"
+
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Base Game:"
 msgstr "Ficha mchezo"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Katisha"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Mategemezi:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Downloading..."
-msgstr "Inapakia..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Imeshindwa kusakinisha $1 hadi $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download $1"
-msgstr "Imeshindwa kusakinisha $1 hadi $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"\n"
-"Sakinisha Moduli: filetype visivyotegemezwa \"$1\" au nyaraka kuvunjwa"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Michezo"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Sakinisha"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install $1"
 msgstr "Sakinisha"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #, fuzzy
 msgid "Install missing dependencies"
 msgstr "Inaanzilisha fundo"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Inapakia..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Texture packs"
-msgstr "Texturepacks"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-#, fuzzy
-msgid "Uninstall"
-msgstr "Sakinisha"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -489,11 +496,21 @@ msgstr "Kuunda"
 msgid "Decorations"
 msgstr "Instrumentation"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Tahadhari: Mtihani wa maendeleo ndogo ni maana kwa watengenezaji."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
@@ -877,10 +894,6 @@ msgstr ""
 msgid "Back"
 msgstr "Nyuma"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Badilisha funguo"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -890,7 +903,8 @@ msgstr "Kuzungumza"
 msgid "Clear"
 msgstr "Wazi"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Vidhibiti"
 
@@ -1112,6 +1126,16 @@ msgstr "Sakinisha"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Mpya"
@@ -1148,9 +1172,8 @@ msgid "Start Game"
 msgstr "Ficha mchezo"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
-msgid "You have no games installed."
-msgstr "Una subgames hakuna imewekwa."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 #, fuzzy
@@ -1237,19 +1260,11 @@ msgstr "Kupakia unamu..."
 msgid "Rebuilding shaders..."
 msgstr "Kuijenga upya shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Kosa la muunganisho (wakati muafaka?)"
-
 #: src/client/clientlauncher.cpp
 #, fuzzy
 msgid "Could not find or load game: "
 msgstr "Haikuweza kupata wala kupakia mchezo\""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Gamespec batili."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Menyu kuu"
@@ -1275,7 +1290,11 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr "Njia ya dunia iliyotolewa haipo:"
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Vyombo vya habari..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1283,20 +1302,10 @@ msgstr ""
 "\n"
 "Angalia debug.txt kwa maelezo."
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Address: "
-msgstr "Kumfunga anwani"
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Port: "
-msgstr "Bandari"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Public: "
@@ -1336,10 +1345,6 @@ msgstr "Ufunguo wa mbele"
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1389,6 +1394,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Inaunganisha seva..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Kosa la muunganisho (wakati muafaka?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1397,44 +1406,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Kuendelea"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Vidhibiti vya chaguo-msingi:\n"
-"-WASD: hoja\n"
-"- nafasi: kuruka/kupanda\n"
-"- Hamisha:taarifa/kwenda chini\n"
-"- q: tone kipengee\n"
-"- nikasema hesabu\n"
-"- kipanya: kugeuka/kuangalia\n"
-"- kipanya kushoto: kuchimba/punch\n"
-"- kipanya kulia: mahali/matumizi\n"
-"- kipanya gurudumu: Teua kipengee\n"
-"- T: mazungumzo\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1531,6 +1510,10 @@ msgstr "Walemavu"
 msgid "Fog enabled"
 msgstr "kuwezeshwa"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1553,10 +1536,6 @@ msgstr "Fasili ya kipengele..."
 msgid "KiB/s"
 msgstr "Kibu/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Vyombo vya habari..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1718,10 +1697,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "Sawa kabisa"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -2066,6 +2041,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr "Unamu wa kima cha chini cha ukubwa wa Vichujio"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Imeshindwa kusakinisha $1 hadi $2"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2270,6 +2254,19 @@ msgstr "Kuza"
 msgid "press key"
 msgstr "Bonyeza Kibonye"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Imeshindwa kusakinisha $1 hadi $2"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Mabadiliko"
@@ -2304,6 +2301,7 @@ msgstr "Kiwango sauti:"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "sw"
 
@@ -2512,14 +2510,6 @@ msgstr "Kiolwa amilifu Tuma masafa"
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Rekebisha usakinishaji wa dpi kwenye kiwamba chako (yasiyo X11/Android tu) "
-"mfano kwa 4 k skrini."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2543,6 +2533,10 @@ msgstr "Jina la ulimwengu"
 msgid "Advanced"
 msgstr "Pevu"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2601,6 +2595,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2622,12 +2627,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2698,6 +2712,11 @@ msgstr "Kelele za mto"
 msgid "Biome noise"
 msgstr "Kelele za mto"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Umbo la Max Tuma umbali"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Block send optimize distance"
@@ -2936,6 +2955,12 @@ msgstr "Ukungu wa rangi"
 msgid "Colored shadows"
 msgstr "Ukungu wa rangi"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -3079,10 +3104,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Debug log file size threshold"
@@ -3135,6 +3156,24 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Wezesha Usiruhusu wateja wa zamani kutoka kuunganisha.\n"
+"Wateja wakubwa ni patanifu katika maana ya kwamba wao si mapenzi ajali "
+"wakati wa kuunganisha kwenye seva mpya, lakini inaweza kusaidia nduni zote "
+"mpya ambayo ni kutarajia."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3328,6 +3367,11 @@ msgstr "Wezesha yote"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Wezesha uharibifu"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3347,6 +3391,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Wezesha vifimbocheza"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3391,6 +3440,11 @@ msgstr "Kuwezesha usalama Moduli"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Wezesha ingizo la mtumiaji nasibu (kutumika tu kwa ajili ya kupima)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Wezesha ingizo la mtumiaji nasibu (kutumika tu kwa ajili ya kupima)."
@@ -3420,6 +3474,11 @@ msgstr ""
 "wakati wa kuunganisha kwenye seva mpya, lakini inaweza kusaidia nduni zote "
 "mpya ambayo ni kutarajia."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Touchthreshold (px)"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3431,12 +3490,6 @@ msgstr ""
 "Seva ya mbali kutoa njia kwa kiasi kikubwa kasi ya kupakua midia (k.m unamu) "
 "wakati wa kuunganisha kwenye seva."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3473,6 +3526,19 @@ msgstr "Huwezesha uhuishaji wa vitu inventering."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Huwezesha uwekaji kache kwa facedir Iliyozungushwa meshes."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4383,9 +4449,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Urefu wa alama ya tiki seva na nafasi ambayo vitu ni kwa ujumla kusasaishwa "
 "kwenye mtandao."
@@ -4554,10 +4621,6 @@ msgstr ""
 "Kufanya rangi wa ukungu na anga hutegemea mchana (alfajiri/machweo) na "
 "kuonyesha mwelekeo."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4619,7 +4682,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Ramani kizazi sifa maalum ya Mwandishi ramani v6.\n"
 "Wakati snowbiomes vimewezeshwa misitu otomatiki imewezeshwa, bendera ya "
@@ -4669,11 +4734,6 @@ msgstr "Kikomo cha kizazi cha ramani"
 msgid "Mapblock mesh generation threads"
 msgstr "Kikomo cha kizazi cha ramani"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Kikomo cha kizazi cha ramani"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Mkatiko Muda Mapblock wakipakua"
@@ -4949,6 +5009,11 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr "Ramani tambazo urefu"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Bofya kulia marudio nafasi"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -5023,6 +5088,11 @@ msgstr "Unyeti wa kipanya"
 msgid "Mouse sensitivity multiplier."
 msgstr "Mengi ya unyeti wa kipanya."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Kilele cha mlima gorofa Mwandishi ramani"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -5146,10 +5216,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5162,6 +5228,11 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Utatuaji wa Mwandishi ramani"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -5277,6 +5348,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Itifaki ya toleo haifanani."
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5296,6 +5376,10 @@ msgstr "Huwafufua ardhi kufanya mabonde kuzunguka mito"
 msgid "Random input"
 msgstr "Ingizo la nasibu"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5506,8 +5590,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5649,8 +5733,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Seti lugha. Acha tupu kwa kutumia lugha ya mfumo.\n"
@@ -5688,6 +5773,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5738,8 +5827,7 @@ msgstr "Shaders"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shaders kuruhusu athari pevu onekana na inaweza kuongeza utendaji wa baadhi "
 "ya kadi ya video.\n"
@@ -5818,13 +5906,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5862,7 +5943,7 @@ msgstr "Taa laini"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Smooths mzunguko wa kamera katika hali-tumizi cinematic. 0 kulemaza."
 
 #: src/settings_translation_file.cpp
@@ -5886,6 +5967,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr "Fonti kivuli Alfa"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Sauti"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6064,6 +6153,12 @@ msgstr ""
 "Umbizo wa chaguo-msingi ambayo maumbo ni kuokoka, wakati wito '/ profiler\n"
 "Hifadhi [umbizo]' bila umbizo."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6071,12 +6166,26 @@ msgid ""
 msgstr ""
 "Kijia cha faili jamaa yako worldpath ambayo maumbo utaakibishwa kwenye.\n"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6087,6 +6196,15 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Wakati katika sekunde inachukua kati ya vibonyezo mara kwa mara sahihi "
+"wakati wa kufanya kitufe cha kulia."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Interface mtandao kwamba seva husikiliza juu."
@@ -6116,7 +6234,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6186,6 +6304,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6243,15 +6365,15 @@ msgstr "Unyeti wa kipanya"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Mengi ya unyeti wa kipanya."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Touchthreshold (px)"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Waving fundo"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6290,7 +6412,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6392,10 +6516,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "VSync"
@@ -6492,6 +6612,10 @@ msgstr ""
 msgid "Volume"
 msgstr "Kiasi"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6501,6 +6625,16 @@ msgstr ""
 "Huwezesha parallax occlusion uramanishi.\n"
 "Inahitaji shaders kwa kuwezeshwa."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Taa laini"
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
@@ -6774,6 +6908,10 @@ msgstr "muda wa kuisha wa cURL"
 msgid "cURL parallel limit"
 msgstr "cURL kikomo sambamba"
 
+#, fuzzy
+#~ msgid "- Address: "
+#~ msgstr "Kumfunga anwani"
+
 #, fuzzy
 #~ msgid "- Creative Mode: "
 #~ msgstr "Hali ya ubunifu"
@@ -6782,6 +6920,10 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "- Damage: "
 #~ msgstr "Uharibifu"
 
+#, fuzzy
+#~ msgid "- Port: "
+#~ msgstr "Bandari"
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6813,6 +6955,13 @@ msgstr "cURL kikomo sambamba"
 #~ "Acha hii wazi kuanzisha seva ya ndani.\n"
 #~ "Kumbuka kwamba uga wa anwani katika Menyu kuu Puuza kipimo hiki."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Rekebisha usakinishaji wa dpi kwenye kiwamba chako (yasiyo X11/Android "
+#~ "tu) mfano kwa 4 k skrini."
+
 #, fuzzy
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -6863,6 +7012,9 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Kibonye guro Usasishaji wa kamera"
 
+#~ msgid "Change Keys"
+#~ msgstr "Badilisha funguo"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Badilisha funguo"
@@ -6904,6 +7056,35 @@ msgstr "cURL kikomo sambamba"
 #~ msgstr ""
 #~ "Vidhibiti vya upana wa vichuguu, thamani ndogo huunda vichuguu pana."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Vidhibiti vya chaguo-msingi:\n"
+#~ "-WASD: hoja\n"
+#~ "- nafasi: kuruka/kupanda\n"
+#~ "- Hamisha:taarifa/kwenda chini\n"
+#~ "- q: tone kipengee\n"
+#~ "- nikasema hesabu\n"
+#~ "- kipanya: kugeuka/kuangalia\n"
+#~ "- kipanya kushoto: kuchimba/punch\n"
+#~ "- kipanya kulia: mahali/matumizi\n"
+#~ "- kipanya gurudumu: Teua kipengee\n"
+#~ "- T: mazungumzo\n"
+
 #, fuzzy
 #~ msgid "Creative"
 #~ msgstr "Kuunda"
@@ -6914,6 +7095,9 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Rangi ya crosshair (R, G, B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Uharibifu"
 
@@ -7164,6 +7348,9 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Instrumentation"
 #~ msgstr "Instrumentation"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Gamespec batili."
+
 #~ msgid "Inventory key"
 #~ msgstr "Ufunguo wa hesabu"
 
@@ -7903,6 +8090,10 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "Hufanya DirectX kazi na LuaJIT. Lemaza ikiwa husababisha matatizo."
 
+#, fuzzy
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Kikomo cha kizazi cha ramani"
+
 #~ msgid "Menus"
 #~ msgstr "Menyu"
 
@@ -8112,9 +8303,6 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Smooths mzunguko wa kamera. 0 kulemaza."
 
-#~ msgid "Sound"
-#~ msgstr "Sauti"
-
 #, fuzzy
 #~ msgid "Special key"
 #~ msgstr "Zawadi muhimu"
@@ -8172,6 +8360,10 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Touchthreshold (px)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Touchthreshold (px)"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Kichujio trilinear"
 
@@ -8194,6 +8386,9 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "Use bilinear filtering when scaling textures down."
 #~ msgstr "Tumia uchujaji bilinear wakati upimaji unamu."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "Ulandanishi wa kiwamba wima."
 
@@ -8242,5 +8437,12 @@ msgstr "cURL kikomo sambamba"
 #~ msgid "You died."
 #~ msgstr "Umekufa."
 
+#, fuzzy
+#~ msgid "You have no games installed."
+#~ msgstr "Una subgames hakuna imewekwa."
+
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "Sawa kabisa"
diff --git a/po/th/minetest.po b/po/th/minetest.po
index 913c5eaa5..ff44d072f 100644
--- a/po/th/minetest.po
+++ b/po/th/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thai (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-03-18 01:05+0000\n"
 "Last-Translator: Thomas Wiegand <weblate.org@wiegand.info>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "ไม่มีคำสั่ง: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "รับความช่วยเหลือสำหรับการพิมพ์คำสั่ง"
 
 #: builtin/common/chatcommands.lua
@@ -81,13 +82,10 @@ msgstr ""
 "ใช้ '.help <cmd>' เพื่อรับข้อมูลเพิ่มเติม หรือใช้ '.help all' เพื่อแสดงรายการคำสั่งทั้งหมด"
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[ทั้งหมด | <cmd>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "ตกลง"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<ไม่มี>"
@@ -104,6 +102,10 @@ msgstr "เกิดข้อผิดพลาดขึ้น:"
 msgid "Main menu"
 msgstr "เมนูหลัก"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "ตกลง"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "เชื่อมต่อใหม่"
@@ -132,19 +134,27 @@ msgstr "เราสนับสนุนโพรโทคอลเวอร์
 msgid "We support protocol versions between version $1 and $2."
 msgstr "เราสนับสนุนโพรโทคอลระหว่างเวอร์ชัน $1 และ $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "มี \"$1\" อยู่แล้ว คุณต้องการเขียนทับหรือไม่ ?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "การอ้างอิง $1 และ $2 จะถูกติดตั้ง."
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "ไม่สามารถดาวน์โหลด $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 โดย $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "ไม่สามารถดาวน์โหลด $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "ติดตั้ง: ประเภทไฟล์ที่ไม่รองรับหรือไฟล์เก็บถาวรที่ใช้งานไม่ได้"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -152,158 +162,157 @@ msgstr ""
 "$1 กำลังดาวน์โหลด,\n"
 "$2 เข้าคิว"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 โหลด ..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 ไม่พบการพึ่งพาที่จำเป็น."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 จะถูกติดตั้ง และการขึ้นต่อกัน $2 จะถูกข้ามไป."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "แพคเกจทั้งหมด"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "ติดตั้งแล้ว"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "กลับไปยังเมนูหลัก"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB ไม่พร้อมใช้งานเมื่อรวบรวม Minetest โดยไม่มี cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "โหลด ..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "เกม"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "กำลังโหลด..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "ม็อด"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "ไม่สามารถเรียกแพคเกจได้"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "ไม่มีผลลัพธ์"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "ไม่มีการปรับปรุง"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "เข้าคิว"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "เทกซ์เจอร์แพ็ค"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "ถอนการติดตั้ง"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "อัปเดต"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "อัปเดต All [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "ดูข้อมูลเพิ่มเติมในเว็บเบราว์เซอร์"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "การอ้างอิง $1 และ $2 จะถูกติดตั้ง."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 โดย $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 ไม่พบการพึ่งพาที่จำเป็น."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 จะถูกติดตั้ง และการขึ้นต่อกัน $2 จะถูกข้ามไป."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "ติดตั้งแล้ว"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "เกมพื้นฐาน:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB ไม่พร้อมใช้งานเมื่อรวบรวม Minetest โดยไม่มี cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "ไฟล์อ้างอิง:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "โหลด ..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "ไม่สามารถดาวน์โหลด $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "ไม่สามารถดาวน์โหลด $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "ติดตั้ง: ประเภทไฟล์ที่ไม่รองรับหรือไฟล์เก็บถาวรที่ใช้งานไม่ได้"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "เกม"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "ติดตั้ง"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "ติดตั้ง $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "ไฟล์อ้างอิงที่เลือกใช้ได้"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "กำลังโหลด..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "ม็อด"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "ไม่สามารถเรียกแพคเกจได้"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "ไม่มีผลลัพธ์"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "ไม่มีการปรับปรุง"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "ไม่พบ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "เขียนทับ"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "โปรดตรวจสอบว่าเกมหลักถูกต้อง."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "เข้าคิว"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "มี \"$1\" อยู่แล้ว คุณต้องการเขียนทับหรือไม่ ?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "เทกซ์เจอร์แพ็ค"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "ถอนการติดตั้ง"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "อัปเดต"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "อัปเดต All [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "ดูข้อมูลเพิ่มเติมในเว็บเบราว์เซอร์"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "เขียนทับ"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -454,11 +463,21 @@ msgstr "สร้าง"
 msgid "Decorations"
 msgstr "ของตกแต่ง"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "คำเตือน: การทดสอบพัฒนาน้อยที่สุดมีความหมายสำหรับนักพัฒนา."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "ดันเจี้ยน"
@@ -826,10 +845,6 @@ msgstr ""
 msgid "Back"
 msgstr "หลัง"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "เปลี่ยนคีย์"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -839,7 +854,8 @@ msgstr "แช"
 msgid "Clear"
 msgstr "ล้าง"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "ควบคุม"
 
@@ -1055,6 +1071,16 @@ msgstr "ติดตั้ง $1"
 msgid "Install games from ContentDB"
 msgstr "ติดตั้งเกมจาก ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "ใหม่"
@@ -1088,8 +1114,8 @@ msgid "Start Game"
 msgstr "เริ่มเกม"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "คุณไม่มีเกมที่ติดตั้ง"
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1170,18 +1196,10 @@ msgstr "โหลดพื้นผิว..."
 msgid "Rebuilding shaders..."
 msgstr "บูรณะ shaders..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "ข้อผิดพลาดการเชื่อมต่อ (หมดเวลา?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "ไม่พบหรือโหลดเกม: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "ข้อมูลจำเพาะเกี่ยวกับเกม ไม่ถูกต้อง."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "เมนูหลัก"
@@ -1206,7 +1224,11 @@ msgstr "รหัสผ่านให้ไฟล์ไม่สามารถ
 msgid "Provided world path doesn't exist: "
 msgstr "โลกมีเส้นไม่มี: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "สื่อ..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1214,18 +1236,10 @@ msgstr ""
 "\n"
 "ตรวจสอบรายละเอียด debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "-ที่อยู่: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "-โหมด: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "-พอร์ต: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "-ประชาชน: "
@@ -1260,10 +1274,6 @@ msgstr "เปิดใช้งานการส่งต่ออัตโน
 msgid "Block bounds hidden"
 msgstr "บล็อกขอบเขตที่ซ่อนอยู่"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "แสดงขอบเขตบล็อกสำหรับบล็อกทั้งหมด"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "ขอบเขตบล็อกที่แสดงสำหรับบล็อกปัจจุบัน"
@@ -1309,6 +1319,10 @@ msgstr "การเขียนสคริปต์ฝั่งไคลเอ
 msgid "Connecting to server..."
 msgstr "เชื่อมต่อกับเซิร์ฟเวอร์"
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "ข้อผิดพลาดการเชื่อมต่อ (หมดเวลา?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "การเชื่อมต่อล้มเหลวโดยไม่ทราบสาเหตุ"
@@ -1317,47 +1331,14 @@ msgstr "การเชื่อมต่อล้มเหลวโดยไม
 msgid "Continue"
 msgstr "ต่อ"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"การควบคุม:\n"
-"- %s: เคลื่อนที่ไปข้างหน้า\n"
-"- %s: เคลื่อนที่ไปข้างหลัง\n"
-"- %s: เคลื่อนที่ไปทางซ้าย\n"
-"- %s: เคลื่อนที่ไปทางขวา\n"
-"- %s: กระโดด/ปีนขึ้น\n"
-"- %s: ขุด/ชก\n"
-"- %s: วาง/ใช้\n"
-"- %s: ช่องเก็บของ\n"
-"- %s: เมาส์: หัน/มอง\n"
-"- %s: เมาส์ซ้าย: ขุด/ชก\n"
-"- เมาส์ขวา: วาง/ใช้\n"
-"- ลูกกลิ้งเมาส์: เลือกไอเทม\n"
-"- %s: เปิดช่องแชท\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1449,6 +1430,11 @@ msgstr "หมอกปิดการใช้งาน"
 msgid "Fog enabled"
 msgstr "หมอกเปิดใช้งาน"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "ซูมถูกปิดใช้งานในปัจจุบันโดยเกมหรือตัวดัดแปลง"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "ข้อมูลเกม:"
@@ -1469,10 +1455,6 @@ msgstr "ข้อกำหนดของสินค้า..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "สื่อ..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1630,10 +1612,6 @@ msgstr "แสดงโครงลวด"
 msgid "Zoom currently disabled by game or mod"
 msgstr "ซูมถูกปิดใช้งานในปัจจุบันโดยเกมหรือตัวดัดแปลง"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ตกลง"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1968,6 +1946,15 @@ msgstr "แผนที่ย่อในโหมด surface, ซูม x%d"
 msgid "Minimap in texture mode"
 msgstr "แผนที่ย่อในโหมดพื้นผิว"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "ไม่สามารถเปิดหน้าเว็บ"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2158,6 +2145,19 @@ msgstr "ซูม"
 msgid "press key"
 msgstr "กดปุ่ม"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "ไม่สามารถเปิดหน้าเว็บ"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "เปลี่ยน"
@@ -2191,6 +2191,7 @@ msgstr "ระดับเสียง: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "th"
 
@@ -2412,14 +2413,6 @@ msgstr "ช่วงการส่งวัตถุที่ใช้งาน
 msgid "Adds particles when digging a node."
 msgstr "เพิ่มอนุภาคเมื่อขุดโหนด."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"ปรับการกำหนดค่า dpi ให้กับหน้าจอของคุณ (ไม่ใช่ X11 / Android เท่านั้น) เช่น สำหรับหน้าจอ "
-"4k."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr "ปรับความหนาแน่นของการแสดงผลที่ตรวจพบ ซึ่งใช้สำหรับปรับขนาดองค์ประกอบ UI"
@@ -2448,6 +2441,10 @@ msgstr "ผนวกชื่อรายการ"
 msgid "Advanced"
 msgstr "สูง"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2509,6 +2506,17 @@ msgstr "ต่อท้ายชื่อรายการในคำแนะ
 msgid "Apple trees noise"
 msgstr "เสียงต้นแอปเปิ้ล"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "แขนเฉื่อย"
@@ -2526,18 +2534,37 @@ msgid "Ask to reconnect after crash"
 msgstr "ขอให้เชื่อมต่ออีกครั้งหลังจากเกิดข้อผิดพลาด"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"ในระยะนี้เซิร์ฟเวอร์จะปรับให้เหมาะสมที่สุดว่าจะส่งบล็อกใดบ้าง\n"
+"ลูกค้า.\n"
+"ค่าเล็กน้อยอาจช่วยปรับปรุงประสิทธิภาพได้มาก โดยที่ค่าใช้จ่ายที่มองเห็นได้\n"
+"ข้อผิดพลาดในการแสดงผล (บางช่วงจะไม่แสดงใต้น้ำและในถ้ำ\n"
+"และบางครั้งบนบก).\n"
+"การตั้งค่านี้เป็นค่าที่มากกว่า max_block_send_distance ปิดการใช้งานนี้\n"
+"การเพิ่มประสิทธิภาพ.\n"
+"ระบุไว้ใน mapblocks (16 โหนด)."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "ในระยะนี้เซิร์ฟเวอร์จะปรับให้เหมาะสมที่สุดว่าจะส่งบล็อกใดบ้าง\n"
 "ลูกค้า.\n"
@@ -2610,6 +2637,11 @@ msgstr "ไบโอมส์"
 msgid "Biome noise"
 msgstr "เสียงไบโอม"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "บล็อกส่งระยะทางเพิ่มประสิทธิภาพ"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "บล็อกส่งระยะทางเพิ่มประสิทธิภาพ"
@@ -2829,6 +2861,12 @@ msgstr "หมอกสี"
 msgid "Colored shadows"
 msgstr "หมอกสี"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2990,10 +3028,6 @@ msgstr ""
 "สีเป้า (R,G,B).\n"
 "ยังควบคุมสีเป้าเล็งของวัตถุ"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "เกณฑ์ขนาดไฟล์บันทึกการดีบัก"
@@ -3047,6 +3081,23 @@ msgstr ""
 "สิ่งนี้จำลองเอฟเฟกต์เงาอ่อนโดยใช้ PCF หรือดิสก์ปัวซอง\n"
 "แต่ยังใช้ทรัพยากรมากขึ้น"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"เปิดใช้งานเพื่อไม่อนุญาตให้ลูกค้าเก่าเชื่อมต่อ.\n"
+"ลูกค้าที่เก่ากว่าเข้ากันได้ในแง่ที่ว่าพวกเขาจะไม่ผิดพลาดเมื่อเชื่อมต่อ.\n"
+"ไปยังเซิร์ฟเวอร์ใหม่ แต่อาจไม่รองรับคุณสมบัติใหม่ทั้งหมดที่คุณคาดหวัง."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "กำหนดพื้นที่ที่ต้นไม้มีแอปเปิ้ล."
@@ -3237,6 +3288,11 @@ msgstr "เปิดใช้งานทั้งหมด"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "เปิดใช้งานความเสียหาย"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3262,6 +3318,11 @@ msgstr ""
 "เปิดใช้งานการกรองดิสก์ปัวซอง.\n"
 "บนทรูใช้ดิสก์ปัวซองเพื่อสร้าง \"เงาอ่อน\" มิฉะนั้นจะใช้การกรอง PCF."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "เปิดใช้งานจอยสติ๊ก"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3306,6 +3367,11 @@ msgstr "เปิดใช้งานการรักษาความปล
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "เปิดใช้งานการป้อนข้อมูลผู้ใช้แบบสุ่ม (ใช้สำหรับการทดสอบเท่านั้น)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "เปิดใช้งานการป้อนข้อมูลผู้ใช้แบบสุ่ม (ใช้สำหรับการทดสอบเท่านั้น)."
@@ -3334,6 +3400,11 @@ msgstr ""
 "ลูกค้าที่เก่ากว่าเข้ากันได้ในแง่ที่ว่าพวกเขาจะไม่ผิดพลาดเมื่อเชื่อมต่อ.\n"
 "ไปยังเซิร์ฟเวอร์ใหม่ แต่อาจไม่รองรับคุณสมบัติใหม่ทั้งหมดที่คุณคาดหวัง."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "ขีด จำกัด หน้าจอสัมผัส"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3345,14 +3416,6 @@ msgstr ""
 "เซิร์ฟเวอร์ระยะไกลนำเสนอวิธีดาวน์โหลดสื่อที่รวดเร็วยิ่งขึ้น (เช่นพื้นผิว)\n"
 "เมื่อเชื่อมต่อกับเซิร์ฟเวอร์"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"เปิดใช้งานวัตถุบัฟเฟอร์จุดยอด.\n"
-"สิ่งนี้ควรปรับปรุงประสิทธิภาพกราฟิกอย่างมาก."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3391,6 +3454,19 @@ msgstr "เปิดใช้งานภาพเคลื่อนไหวข
 msgid "Enables caching of facedir rotated meshes."
 msgstr "เปิดใช้งานการแคชของตาข่ายที่หมุนได้."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4310,9 +4386,10 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "ความยาวของขีดเซิร์ฟเวอร์และช่วงเวลาที่อ็อบเจ็กต์โดยทั่วไปจะอัปเดตมากกว่า\n"
 "เครือข่าย"
@@ -4486,10 +4563,6 @@ msgid ""
 msgstr ""
 "ทำให้หมอกและสีของท้องฟ้าขึ้นอยู่กับเวลากลางวัน (รุ่งอรุณ / พระอาทิตย์ตก) และทิศทางการดู."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "ทำให้ของเหลวทั้งหมดขุ่น"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "ระดับการบีบอัดแผนที่สำหรับการจัดเก็บดิสก์"
@@ -4545,11 +4618,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "แอตทริบิวต์การสร้างแผนที่เฉพาะสำหรับ Mapgen v5."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "แอตทริบิวต์การสร้างแผนที่เฉพาะสำหรับ Mapgen v6.\n"
 "ธง 'สโนว์ไบโอม' เปิดใช้งาน 5 ระบบไบโอมใหม่.\n"
@@ -4593,10 +4669,6 @@ msgstr "การสร้างตาข่าย Mapblock ล่าช้า"
 msgid "Mapblock mesh generation threads"
 msgstr "การสร้างตาข่าย Mapblock ล่าช้า"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "ขนาดแคช MapBlock ของตัวสร้างตาข่าย Mapblock เป็น MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Mapblock ยกเลิกการโหลดหมดเวลา"
@@ -4862,6 +4934,11 @@ msgstr "ระดับการบันทึกขั้นต่ำที่
 msgid "Minimap scan height"
 msgstr "ความสูงการสแกนแผนที่ขั้นต่ำ"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "กระแทกซ้ำช่วง"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "ขีดจำกัดขั้นต่ำของการสุ่มจำนวนถ้ำขนาดใหญ่ต่อ mapchunk."
@@ -4932,6 +5009,11 @@ msgstr "ความไวของเมาส์"
 msgid "Mouse sensitivity multiplier."
 msgstr "คูณความไวเมาส์."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "ธรณีประตูถ้ำ"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "เสียงโคลน"
@@ -5068,10 +5150,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "การคัดแยกการบดเคี้ยวทางฝั่งเซิร์ฟเวอร์"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "ของเหลวทึบแสง"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5086,6 +5164,11 @@ msgstr ""
 "เปิดเมนูหยุดชั่วคราวเมื่อโฟกัสของหน้าต่างหายไป ไม่หยุดถ้า formspec เป็น\n"
 "เปิด."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "ดีบัก Mapgen"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "ตัวเลือกการแทนที่สำหรับสีของเว็บลิงค์แชท."
@@ -5212,6 +5295,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "สัดส่วนของถ้ำขนาดใหญ่ที่มีของเหลว."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "เวอร์ชันโปรโทคอลไม่ตรงกัน "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5229,6 +5321,10 @@ msgstr "ยกระดับภูมิประเทศให้เป็น
 msgid "Random input"
 msgstr "อินพุตสุ่ม"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "ข้อความแชทล่าสุด"
@@ -5439,8 +5535,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5586,8 +5682,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "ตั้งค่าภาษา เว้นว่างไว้เพื่อใช้ภาษาของระบบ.\n"
@@ -5633,6 +5730,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5681,11 +5782,11 @@ msgid "Shaders"
 msgstr "เฉดสี"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Shaders อนุญาตเอฟเฟกต์ภาพขั้นสูงและอาจเพิ่มประสิทธิภาพในวิดีโอบางรายการ\n"
 "บัตร\n"
@@ -5768,16 +5869,6 @@ msgstr ""
 "การเปลี่ยนแปลงค่านี้มีไว้เพื่อการใช้งานพิเศษ ไม่เปลี่ยนแปลงคือ\n"
 "ที่แนะนำ.."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"ขนาดของแคช MapBlock ของตัวสร้างตาข่าย การเพิ่มความประสงค์นี้\n"
-"เพิ่มแคชการเข้าชม% ลดการคัดลอกข้อมูลจากหลัก\n"
-"ด้ายจึงลดกระวนกระวายใจ"
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "วงโคจรของท้องฟ้าเอียง"
@@ -5814,7 +5905,7 @@ msgstr "แสงที่ราบรื่น"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "มากการหมุนของกล้องในโหมดโรงภาพยนตร์ 0 เพื่อปิดใช้งาน."
 
 #: src/settings_translation_file.cpp
@@ -5836,6 +5927,15 @@ msgstr "ความเร็วในการด้อม ในโหนด
 msgid "Soft shadow radius"
 msgstr "ตัวอักษรเงาอัลฟา"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "เสียง"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB ตั้งค่าสถานะบัญชีดำ"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6038,19 +6138,39 @@ msgstr ""
 "รูปแบบเริ่มต้นที่จะบันทึกโปรไฟล์,\n"
 "เมื่อเรียก `/profiler save [รูปแบบ]` โดยไม่มีรูปแบบ."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr "เส้นทางของไฟล์ที่สัมพันธ์กับ worldpath ของคุณซึ่งโปรไฟล์จะถูกบันทึกไว้."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "ตัวระบุของจอยสติ๊กที่จะใช้"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "ความยาวเป็นพิกเซลที่ใช้ในการเริ่มทำงานบนหน้าจอสัมผัส."
 
 #: src/settings_translation_file.cpp
@@ -6067,6 +6187,15 @@ msgstr ""
 "ค่าเริ่มต้นคือ 1.0 (1/2 โหนด).\n"
 "ต้องเปิดใช้งานโบกของเหลว."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"เวลาเป็นวินาทีที่ใช้ระหว่างตำแหน่งโหนดที่เกิดซ้ำเมื่อกดค้างไว้\n"
+"ปุ่มสถานที่"
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "อินเทอร์เฟซเครือข่ายที่เซิร์ฟเวอร์ฟัง."
@@ -6101,7 +6230,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "แบ็กเอนด์การเรนเดอร์.\n"
 "จำเป็นต้องรีสตาร์ทหลังจากเปลี่ยนแปลงสิ่งนี้.\n"
@@ -6182,6 +6311,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "เสียง 2D จำนวน 3 จาก 4 เสียงที่ร่วมกันกำหนดความสูงของช่วงเนินเขา/ภูเขา."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6236,15 +6369,15 @@ msgstr "ความไวของเมาส์"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "คูณความไวเมาส์."
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "ขีด จำกัด หน้าจอสัมผัส"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "การประนีประนอมเพื่อประสิทธิภาพ"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "ของเหลวทึบแสง"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6283,7 +6416,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6394,10 +6529,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "VSync / การซิงโครไนซ์แนวตั้ง"
@@ -6488,6 +6619,10 @@ msgstr "จอยสติกเสมือนเรียกใช้ปุ่
 msgid "Volume"
 msgstr "ปริมาณ"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6496,6 +6631,16 @@ msgstr ""
 "เปิดใช้งานการแมปการบดเคี้ยวของรัลแลกซ์.\n"
 "ต้องมี shaders เพื่อเปิดใช้งาน."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "เฟรมต่อวินาที (FPS) สูงสุดเมื่อเกมหยุดชั่วคราว"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "แสงที่ราบรื่น"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6777,12 +6922,18 @@ msgstr "cURL หมดเวลาโต้ตอบ"
 msgid "cURL parallel limit"
 msgstr "cURL ขีด จำกัด ขนาน"
 
+#~ msgid "- Address: "
+#~ msgstr "-ที่อยู่: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "-โหมดสร้างสรรค์: "
 
 #~ msgid "- Damage: "
 #~ msgstr "-ความเสียหาย: "
 
+#~ msgid "- Port: "
+#~ msgstr "-พอร์ต: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6817,6 +6968,13 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ "เว้นว่างไว้เพื่อเริ่มเซิร์ฟเวอร์ภายใน\n"
 #~ "โปรดทราบว่าฟิลด์ที่อยู่ในเมนูหลักจะแทนที่การตั้งค่านี้"
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "ปรับการกำหนดค่า dpi ให้กับหน้าจอของคุณ (ไม่ใช่ X11 / Android เท่านั้น) เช่น "
+#~ "สำหรับหน้าจอ 4k."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6856,6 +7014,9 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "บิตต่อพิกเซล (ความลึกของสี aka) ในโหมดเต็มหน้าจอ."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "แสดงขอบเขตบล็อกสำหรับบล็อกทั้งหมด"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "การแม็ป ชน"
 
@@ -6880,6 +7041,9 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "กึ่งกลางของเส้นโค้งแสง - กลางเพิ่ม"
 
+#~ msgid "Change Keys"
+#~ msgstr "เปลี่ยนคีย์"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "เปลี่ยนคีย์"
@@ -6927,6 +7091,38 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Controls sinking speed in liquid."
 #~ msgstr "ควบคุมความเร็วการจมในของเหลว."
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "การควบคุม:\n"
+#~ "- %s: เคลื่อนที่ไปข้างหน้า\n"
+#~ "- %s: เคลื่อนที่ไปข้างหลัง\n"
+#~ "- %s: เคลื่อนที่ไปทางซ้าย\n"
+#~ "- %s: เคลื่อนที่ไปทางขวา\n"
+#~ "- %s: กระโดด/ปีนขึ้น\n"
+#~ "- %s: ขุด/ชก\n"
+#~ "- %s: วาง/ใช้\n"
+#~ "- %s: ช่องเก็บของ\n"
+#~ "- %s: เมาส์: หัน/มอง\n"
+#~ "- %s: เมาส์ซ้าย: ขุด/ชก\n"
+#~ "- เมาส์ขวา: วาง/ใช้\n"
+#~ "- ลูกกลิ้งเมาส์: เลือกไอเทม\n"
+#~ "- %s: เปิดช่องแชท\n"
+
 #~ msgid "Creative"
 #~ msgstr "ความคิดสร้างสรรค์"
 
@@ -6936,6 +7132,9 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "สีของครอสแฮร์ (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "ความเสียหาย"
 
@@ -7008,6 +7207,13 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Enable register confirmation"
 #~ msgstr "เปิดใช้งานการยืนยันการลงทะเบียน"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "เปิดใช้งานวัตถุบัฟเฟอร์จุดยอด.\n"
+#~ "สิ่งนี้ควรปรับปรุงประสิทธิภาพกราฟิกอย่างมาก."
+
 #~ msgid "Enabled"
 #~ msgstr "เปิดใช้งานแล้ว"
 
@@ -7294,6 +7500,9 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Instrumentation"
 #~ msgstr "เครื่องมือวัด"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "ข้อมูลจำเพาะเกี่ยวกับเกม ไม่ถูกต้อง."
+
 #~ msgid "Inventory key"
 #~ msgstr "รหัสสินค้าคงคลัง"
 
@@ -7971,6 +8180,12 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Main"
 #~ msgstr "หลัก"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "ทำให้ของเหลวทั้งหมดขุ่น"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "ขนาดแคช MapBlock ของตัวสร้างตาข่าย Mapblock เป็น MB"
+
 #~ msgid "Menus"
 #~ msgstr "เมนู"
 
@@ -8188,15 +8403,21 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Simple Leaves"
 #~ msgstr "ใบเรียบง่าย"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "ขนาดของแคช MapBlock ของตัวสร้างตาข่าย การเพิ่มความประสงค์นี้\n"
+#~ "เพิ่มแคชการเข้าชม% ลดการคัดลอกข้อมูลจากหลัก\n"
+#~ "ด้ายจึงลดกระวนกระวายใจ"
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "โคมไฟเรียบ"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "มากการหมุนของกล้อง 0 เพื่อปิดใช้งาน"
 
-#~ msgid "Sound"
-#~ msgstr "เสียง"
-
 #~ msgid "Special"
 #~ msgstr "พิเศษ"
 
@@ -8255,6 +8476,10 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "ขีด จำกัด: (px)"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "ขีด จำกัด หน้าจอสัมผัส"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "กรอง trilinear"
 
@@ -8292,6 +8517,9 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ "หากตั้งค่าเป็น 0 MSAA จะถูกปิดใช้งาน.\n"
 #~ "จำเป็นต้องรีสตาร์ทหลังจากเปลี่ยนตัวเลือกนี้."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "การซิงโครไนซ์หน้าจอแนวตั้ง"
 
@@ -8361,8 +8589,14 @@ msgstr "cURL ขีด จำกัด ขนาน"
 #~ msgid "You died."
 #~ msgstr "คุณตายแล้ว"
 
+#~ msgid "You have no games installed."
+#~ msgstr "คุณไม่มีเกมที่ติดตั้ง"
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "ตกลง"
diff --git a/po/tok/minetest.po b/po/tok/minetest.po
new file mode 100644
index 000000000..5fa9991f0
--- /dev/null
+++ b/po/tok/minetest.po
@@ -0,0 +1,6196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: minetest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-06-09 15:09+0000\n"
+"Last-Translator: SergioFLS <sergioflsgd@hotmail.com>\n"
+"Language-Team: Toki Pona <https://hosted.weblate.org/projects/minetest/"
+"minetest/tok/>\n"
+"Language: tok\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.6-dev\n"
+
+#: builtin/client/chatcommands.lua
+msgid "Clear the out chat queue"
+msgstr "o weka e linja toki"
+
+#: builtin/client/chatcommands.lua
+#, fuzzy
+msgid "Empty command."
+msgstr "toki lawa sina li weka."
+
+#: builtin/client/chatcommands.lua
+msgid "Exit to main menu"
+msgstr "o tawa"
+
+#: builtin/client/chatcommands.lua
+msgid "Invalid command: "
+msgstr "ni li toki lawa ala: "
+
+#: builtin/client/chatcommands.lua
+msgid "Issued command: "
+msgstr ""
+
+#: builtin/client/chatcommands.lua
+msgid "List online players"
+msgstr "o lukin e jan mute lon"
+
+#: builtin/client/chatcommands.lua
+msgid "Online players: "
+msgstr "jan mute lon "
+
+#: builtin/client/chatcommands.lua
+msgid "The out chat queue is now empty."
+msgstr "tenpo ni la linja toki li weka."
+
+#: builtin/client/chatcommands.lua
+msgid "This command is disabled by server."
+msgstr "ilo lawa li lawa e ni: toki lawa ni li ken ala."
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "o kama sin"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "sina moli"
+
+#: builtin/common/chatcommands.lua
+msgid "Available commands:"
+msgstr ""
+
+#: builtin/common/chatcommands.lua
+msgid "Available commands: "
+msgstr "toki lawa mute ni li lon: "
+
+#: builtin/common/chatcommands.lua
+msgid "Command not available: "
+msgstr ""
+
+#: builtin/common/chatcommands.lua
+msgid "Get help for commands (-t: output in chat)"
+msgstr ""
+
+#: builtin/common/chatcommands.lua
+msgid ""
+"Use '.help <cmd>' to get more information, or '.help all' to list everything."
+msgstr ""
+"sina sona ala e toki lawa la o sitelen e ni: '.help <cmd>'. anu la sina wile "
+"sona e toki lawa ale la o sitelen e ni: '.help all'."
+
+#: builtin/common/chatcommands.lua
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <toki lawa>]"
+
+#: builtin/fstk/ui.lua
+msgid "<none available>"
+msgstr "<lon ala>"
+
+#: builtin/fstk/ui.lua
+msgid "An error occurred in a Lua script:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "An error occurred:"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "Main menu"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "pona"
+
+#: builtin/fstk/ui.lua
+msgid "Reconnect"
+msgstr ""
+
+#: builtin/fstk/ui.lua
+msgid "The server has requested a reconnect:"
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Protocol version mismatch. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server enforces protocol version $1. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "Server supports protocol versions between $1 and $2. "
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We only support protocol version $1."
+msgstr ""
+
+#: builtin/mainmenu/common.lua
+msgid "We support protocol versions between version $1 and $2."
+msgstr ""
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr ""
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr ""
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "$1 downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "All packages"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Back to Main Menu"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "musi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Base Game:"
+msgstr "musi lawa:"
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
+#: builtin/mainmenu/dlg_rename_modpack.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
+msgid "Cancel"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Dependencies:"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Not found"
+msgstr "ala lon"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "$1 (Enabled)"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "$1 mods"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Failed to install $1 to $2"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Install: Unable to find suitable folder name for $1"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to find a valid mod, modpack, or game"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to install a $1 as a $2"
+msgstr ""
+
+#: builtin/mainmenu/content/pkgmgr.lua
+msgid "Unable to install a $1 as a texture pack"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "(Enabled, has error)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "(Unsatisfied)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable all"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Disable modpack"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable all"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Enable modpack"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid ""
+"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
+"characters [a-z0-9_] are allowed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Find More Mods"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "Mod:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No (optional) dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No game description provided."
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No hard dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No modpack description provided."
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "No optional dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+msgid "Optional dependencies:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Save"
+msgstr ""
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "World:"
+msgstr "ma:"
+
+#: builtin/mainmenu/dlg_config_world.lua
+msgid "enabled"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "A world named \"$1\" already exists"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Additional terrain"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Altitude chill"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Altitude dry"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Biome blending"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Biomes"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Caverns"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Caves"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Create"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Decorations"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Development Test is meant for developers."
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Dungeons"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Flat terrain"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Floating landmasses in the sky"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Floatlands (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Generate non-fractal terrain: Oceans and underground"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Hills"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Humid rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Increases humidity around rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Install another game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Lakes"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Low humidity and high heat causes shallow or dry rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+msgid "Mapgen flags"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mapgen-specific flags"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mountains"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Mud flow"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Network of tunnels and caves"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "No game selected"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Reduces heat with altitude"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Reduces humidity with altitude"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Sea level rivers"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Seed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Smooth transition between biomes"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Structures appearing on the terrain (no effect on trees and jungle grass "
+"created by v6)"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Structures appearing on the terrain, typically trees and plants"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert, Jungle"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Temperate, Desert, Jungle, Tundra, Taiga"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Terrain surface erosion"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Trees and jungle grass"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Vary river depth"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Very large caverns deep in the underground"
+msgstr ""
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "World name"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "Are you sure you want to delete \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_content.lua
+#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
+msgid "Delete"
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "pkgmgr: failed to delete \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_content.lua
+msgid "pkgmgr: invalid path \"$1\""
+msgstr ""
+
+#: builtin/mainmenu/dlg_delete_world.lua
+msgid "Delete World \"$1\"?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua src/gui/guiPasswordChange.cpp
+msgid "Confirm Password"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Joining $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Missing name"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
+#: builtin/mainmenu/tab_online.lua
+msgid "Name"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
+#: builtin/mainmenu/tab_online.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua
+msgid "Passwords do not match"
+msgstr ""
+
+#: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
+msgid "Register"
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Dismiss"
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid ""
+"For a long time, the Minetest engine shipped with a default game called "
+"\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
+"game."
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid ""
+"If you want to continue playing in your Minetest Game worlds, you need to "
+"reinstall Minetest Game."
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Minetest Game is no longer installed by default"
+msgstr ""
+
+#: builtin/mainmenu/dlg_reinstall_mtg.lua
+msgid "Reinstall Minetest Game"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Accept"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid "Rename Modpack:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_rename_modpack.lua
+msgid ""
+"This modpack has an explicit name given in its modpack.conf which will "
+"override any renaming here."
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "A new $1 version is available"
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid ""
+"Installed version: $1\n"
+"New version: $2\n"
+"Visit $3 to find out how to get the newest version and stay up to date with "
+"features and bugfixes."
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Later"
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Never"
+msgstr ""
+
+#: builtin/mainmenu/dlg_version_info.lua
+msgid "Visit website"
+msgstr ""
+
+#: builtin/mainmenu/init.lua
+msgid "Settings"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Browse"
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Edit"
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Select directory"
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Select file"
+msgstr ""
+
+#: builtin/mainmenu/settings/components.lua
+msgid "Set"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "(No description of setting given)"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "2D Noise"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Lacunarity"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Octaves"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/settings_translation_file.cpp
+msgid "Offset"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Persistence"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+#: src/settings_translation_file.cpp
+msgid "Scale"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "X spread"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Y spread"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "Z spread"
+msgstr ""
+
+#. ~ "absvalue" is a noise parameter flag.
+#. It is short for "absolute value".
+#. It can be enabled in noise settings in
+#. the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "absvalue"
+msgstr ""
+
+#. ~ "defaults" is a noise parameter flag.
+#. It describes the default processing options
+#. for noise settings in the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "defaults"
+msgstr ""
+
+#. ~ "eased" is a noise parameter flag.
+#. It is used to make the map smoother and
+#. can be enabled in noise settings in
+#. the settings menu.
+#: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+msgid "eased"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "(Use system language)"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Accessibility"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Back"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
+#: src/settings_translation_file.cpp
+msgid "Chat"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
+msgid "Clear"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
+msgid "Controls"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+msgid "General"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Movement"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Reset setting to default"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Reset setting to default ($1)"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Show advanced settings"
+msgstr ""
+
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "Show technical names"
+msgstr ""
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Client Mods"
+msgstr ""
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Content: Games"
+msgstr ""
+
+#: builtin/mainmenu/settings/settingtypes.lua
+msgid "Content: Mods"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "(The game will need to enable shadows as well)"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Custom"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Disabled"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+#: src/settings_translation_file.cpp
+msgid "Dynamic shadows"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "High"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Low"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Medium"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Very High"
+msgstr ""
+
+#: builtin/mainmenu/settings/shadows_component.lua
+msgid "Very Low"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "About"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Active Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Active renderer:"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Core Team"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Irrlicht device:"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Previous Contributors"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Previous Core Developers"
+msgstr ""
+
+#: builtin/mainmenu/tab_about.lua
+msgid "Share debug log"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Browse online content"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Browse online content [$1]"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Content"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Content [$1]"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Disable Texture Pack"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Installed Packages:"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "No dependencies."
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "No package description available"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Rename"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Update available?"
+msgstr ""
+
+#: builtin/mainmenu/tab_content.lua
+msgid "Use Texture Pack"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Announce Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Bind Address"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Creative Mode"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Enable Damage"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Host Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Host Server"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Install a game"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Install games from ContentDB"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "New"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "No world created or selected!"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Play Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_online.lua
+msgid "Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Select World:"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Server Port"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Start Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "You need to install a game before you can create a world."
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Address"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Creative mode"
+msgstr ""
+
+#. ~ PvP = Player versus Player
+#: builtin/mainmenu/tab_online.lua
+msgid "Damage / PvP"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Favorites"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Incompatible Servers"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Join Game"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Login"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Ping"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Public Servers"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Refresh"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Remove favorite"
+msgstr ""
+
+#: builtin/mainmenu/tab_online.lua
+msgid "Server Description"
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Connection aborted (protocol error?)."
+msgstr ""
+
+#: src/client/client.cpp src/client/game.cpp
+msgid "Connection timed out."
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Done!"
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Initializing nodes"
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Initializing nodes..."
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Loading textures..."
+msgstr ""
+
+#: src/client/client.cpp
+msgid "Rebuilding shaders..."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Could not find or load game: "
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Main Menu"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "No world selected and no address provided. Nothing to do."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Player name too long."
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Please choose a name!"
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Provided password file failed to open: "
+msgstr ""
+
+#: src/client/clientlauncher.cpp
+msgid "Provided world path doesn't exist: "
+msgstr ""
+
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
+msgid ""
+"\n"
+"Check debug.txt for details."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "- Mode: "
+msgstr ""
+
+#: src/client/game.cpp
+msgid "- Public: "
+msgstr ""
+
+#. ~ PvP = Player versus Player
+#: src/client/game.cpp
+msgid "- PvP: "
+msgstr ""
+
+#: src/client/game.cpp
+msgid "- Server Name: "
+msgstr ""
+
+#: src/client/game.cpp
+msgid "A serialization error occurred:"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Access denied. Reason: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Automatic forward disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Automatic forward enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds hidden"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds shown for current block"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Block bounds shown for nearby blocks"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Camera update disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Camera update enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Can't show block bounds (disabled by game or mod)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Change Password"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Cinematic mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Cinematic mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Client disconnected"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Client side scripting is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connecting to server..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Connection failed for unknown reason"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Continue"
+msgstr ""
+
+#: src/client/game.cpp
+msgid ""
+"Controls:\n"
+"No menu open:\n"
+"- slide finger: look around\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
+"Menu/inventory open:\n"
+"- double tap (outside):\n"
+" --> close\n"
+"- touch stack, touch slot:\n"
+" --> move stack\n"
+"- touch&drag, tap 2nd finger\n"
+" --> place single item to slot\n"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Couldn't resolve address: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Creating client..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Creating server..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Debug info and profiler graph hidden"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Debug info shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Debug info, profiler graph, and wireframe hidden"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Error creating client: %s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Exit to Menu"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Exit to OS"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fast mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fast mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fast mode enabled (note: no 'fast' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fly mode enabled (note: no 'fly' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Game info:"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Game paused"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Hosting server"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Item definitions..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "KiB/s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "MiB/s"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Minimap currently disabled by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Multiplayer"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Noclip mode enabled (note: no 'noclip' privilege)"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Node definitions..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Off"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "On"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Pitch move mode disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Pitch move mode enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Profiler graph shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Remote server"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Resolving address..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Shutting down..."
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Singleplayer"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound Volume"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound muted"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound system is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound system is not supported on this build"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Sound unmuted"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "The server is probably running a different version of %s."
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Unable to connect to %s because IPv6 is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Unable to listen on %s because IPv6 is disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range disabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range enabled"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Unlimited viewing range enabled, but forbidden by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing changed to %d (the minimum)"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d (the maximum)"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid ""
+"Viewing range changed to %d (the maximum), but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Viewing range changed to %d, but limited to %d by game or mod"
+msgstr ""
+
+#: src/client/game.cpp
+#, c-format
+msgid "Volume changed to %d%%"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Wireframe shown"
+msgstr ""
+
+#: src/client/game.cpp
+msgid "Zoom currently disabled by game or mod"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat currently disabled by game or mod"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Chat shown"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "HUD hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "HUD shown"
+msgstr ""
+
+#: src/client/gameui.cpp
+msgid "Profiler hidden"
+msgstr ""
+
+#: src/client/gameui.cpp
+#, c-format
+msgid "Profiler shown (page %d of %d)"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Apps"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Backspace"
+msgstr ""
+
+#. ~ Usually paired with the Pause key
+#: src/client/keycode.cpp
+msgid "Break Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Caps Lock"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Clear Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Control Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Delete Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Down Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "End"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Erase EOF"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Execute"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Help"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Home"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Accept"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Convert"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Escape"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Mode Change"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "IME Nonconvert"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Insert"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Button"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Control"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Menu"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Shift"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Left Windows"
+msgstr ""
+
+#. ~ Key name, common on Windows keyboards
+#: src/client/keycode.cpp
+msgid "Menu Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Middle Button"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Num Lock"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad *"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad +"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad -"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad ."
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad /"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 0"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 1"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 2"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 3"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 4"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 5"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 6"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 7"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 8"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Numpad 9"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "OEM Clear"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Page Down"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Page Up"
+msgstr ""
+
+#. ~ Usually paired with the Break key
+#: src/client/keycode.cpp
+msgid "Pause Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Play"
+msgstr ""
+
+#. ~ "Print screen" key
+#: src/client/keycode.cpp
+msgid "Print"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Return Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Button"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Control"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Menu"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Shift"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Right Windows"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Scroll Lock"
+msgstr ""
+
+#. ~ Key name
+#: src/client/keycode.cpp
+msgid "Select"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Shift Key"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Sleep"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Snapshot"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Space"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Tab"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Up Arrow"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "X Button 1"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "X Button 2"
+msgstr ""
+
+#: src/client/keycode.cpp
+msgid "Zoom Key"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
+#. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
+#: src/content/mod_configuration.cpp
+#, c-format
+msgid "%s is missing:"
+msgstr ""
+
+#: src/content/mod_configuration.cpp
+msgid ""
+"Install and enable the required mods, or disable the mods causing errors."
+msgstr ""
+
+#: src/content/mod_configuration.cpp
+msgid ""
+"Note: this may be caused by a dependency cycle, in which case try updating "
+"the mods."
+msgstr ""
+
+#: src/content/mod_configuration.cpp
+msgid "Some mods have unsatisfied dependencies:"
+msgstr ""
+
+#: src/gui/guiChatConsole.cpp
+msgid "Failed to open webpage"
+msgstr ""
+
+#: src/gui/guiChatConsole.cpp
+msgid "Opening webpage"
+msgstr ""
+
+#: src/gui/guiFormSpecMenu.cpp
+msgid "Proceed"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "\"Aux1\" = climb down"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Autoforward"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
+msgid "Automatic jumping"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Aux1"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Backward"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Block bounds"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Change camera"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Command"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Console"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Dec. range"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Dec. volume"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Double tap \"jump\" to toggle fly"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Drop"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Forward"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inc. range"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inc. volume"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Jump"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Key already in use"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Keybindings."
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Left"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Local command"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Mute"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Next item"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Prev. item"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Range select"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Right"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Screenshot"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Sneak"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle HUD"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle chat log"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fast"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fly"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle fog"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle minimap"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle noclip"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Toggle pitchmove"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "Zoom"
+msgstr ""
+
+#: src/gui/guiKeyChangeMenu.cpp
+msgid "press key"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Change"
+msgstr ""
+
+#: src/gui/guiPasswordChange.cpp
+msgid "New Password"
+msgstr ""
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Old Password"
+msgstr ""
+
+#: src/gui/guiPasswordChange.cpp
+msgid "Passwords do not match!"
+msgstr ""
+
+#: src/gui/guiVolumeChange.cpp
+msgid "Exit"
+msgstr ""
+
+#: src/gui/guiVolumeChange.cpp
+msgid "Muted"
+msgstr ""
+
+#: src/gui/guiVolumeChange.cpp
+#, c-format
+msgid "Sound Volume: %d%%"
+msgstr ""
+
+#. ~ DO NOT TRANSLATE THIS LITERALLY!
+#. This is a special string which needs to contain the translation's
+#. language code (e.g. "de" for German).
+#: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
+msgid "LANG_CODE"
+msgstr ""
+
+#: src/network/clientpackethandler.cpp
+msgid ""
+"Name is not registered. To create an account on this server, click 'Register'"
+msgstr ""
+
+#: src/network/clientpackethandler.cpp
+msgid "Name is taken. Please choose another name"
+msgstr ""
+
+#: src/server.cpp
+#, c-format
+msgid "%s while shutting down: "
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
+"Can be used to move a desired point to (0, 0) to create a\n"
+"suitable spawn point, or to allow 'zooming in' on a desired\n"
+"point by increasing 'scale'.\n"
+"The default is tuned for a suitable spawn point for Mandelbrot\n"
+"sets with default parameters, it may need altering in other\n"
+"situations.\n"
+"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"(X,Y,Z) scale of fractal in nodes.\n"
+"Actual fractal size will be 2 to 3 times larger.\n"
+"These numbers can be made very large, the fractal does\n"
+"not have to fit inside the world.\n"
+"Increase these to 'zoom' into the detail of the fractal.\n"
+"Default is for a vertically-squashed shape suitable for\n"
+"an island, set all 3 numbers equal for the raw shape."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of ridged mountains."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of rolling hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the shape/size of step mountains."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of rolling hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that controls the size/occurrence of step mountain ranges."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "2D noise that locates the river valleys and channels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D mode parallax strength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining giant caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D noise defining mountain structure and height.\n"
+"Also defines structure of floatland mountain terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D noise defining structure of floatlands.\n"
+"If altered from the default, the noise 'scale' (0.7 by default) may need\n"
+"to be adjusted, as floatland tapering functions best when this noise has\n"
+"a value range of approximately -2.0 to 2.0."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining structure of river canyon walls."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise defining terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "3D noise that determines number of dungeons per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"3D support.\n"
+"Currently supported:\n"
+"-    none: no 3d output.\n"
+"-    anaglyph: cyan/magenta color 3d.\n"
+"-    interlaced: odd/even line based polarization screen support.\n"
+"-    topbottom: split screen top/bottom.\n"
+"-    sidebyside: split screen side by side.\n"
+"-    crossview: Cross-eyed 3d\n"
+"Note that the interlaced mode requires shaders to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"A chosen map seed for a new map, leave empty for random.\n"
+"Will be overridden when creating a new world in the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server crashes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "A message to be displayed to all clients when the server shuts down."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ABM interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Absolute limit of queued blocks to emerge"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration in air"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Acceleration of gravity, in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block management interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active block range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Active object send range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Adds particles when digging a node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Adjust the detected display density, used for scaling UI elements."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, c-format
+msgid ""
+"Adjusts the density of the floatland layer.\n"
+"Increase value to increase density. Can be positive or negative.\n"
+"Value = 0.0: 50% of volume is floatland.\n"
+"Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
+"to be sure) creates a solid floatland layer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Admin name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Advanced"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Alters the light curve by applying 'gamma correction' to it.\n"
+"Higher values make middle and lower light levels brighter.\n"
+"Value '1.0' leaves the light curve unaltered.\n"
+"This only has significant effect on daylight and artificial\n"
+"light, it has very little effect on natural night light."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Always fly fast"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ambient occlusion gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Amplifies the valleys."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anisotropic filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Announce to this serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Anti-aliasing scale"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Antialiasing method"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Append item name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Append item name to tooltip."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Apple trees noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Arm inertia"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Arm inertia, gives a more realistic movement of\n"
+"the arm when the camera moves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ask to reconnect after crash"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will aggressively optimize which blocks are sent "
+"to\n"
+"clients.\n"
+"Small values potentially improve performance a lot, at the expense of "
+"visible\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
+"Setting this to a value greater than max_block_send_distance disables this\n"
+"optimization.\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Audio"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Automatically jump up single-node obstacles."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Automatically report to the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Autoscaling mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Aux1 key for climbing/descending"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base terrain height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Base texture size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Basic privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Beach noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Beach noise threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bind address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Biome API"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Biome noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Block send optimize distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Intensity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bloom Strength Factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bobbing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold and italic font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold and italic monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Bold monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Build inside player"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Builtin"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Camera smoothing in cinematic mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave noise #2"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave1 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cave2 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern taper"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cavern upper limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Center of light curve boost range.\n"
+"Where 0.0 is minimum light level, 1.0 is maximum light level."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat command time message threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat commands"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message count limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message kick threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat message max length"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chat weblinks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Chunk size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console "
+"output."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client Mesh Chunksize"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client and Server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client modding"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client side modding restrictions"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client-side Modding"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Client-side node lookup range restriction"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Climbing speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Cloud radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds are a client-side effect."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Clouds in menu"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Colored fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Colored shadows"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of flags to hide in the content repository.\n"
+"\"nonfree\" can be used to hide packages which do not qualify as 'free "
+"software',\n"
+"as defined by the Free Software Foundation.\n"
+"You can also specify content ratings.\n"
+"These flags are independent from Minetest versions,\n"
+"so see a full list at https://content.minetest.net/help/content_flags/"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
+"allow them to upload and download data to/from the internet."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of trusted mods that are allowed to access insecure\n"
+"functions even when mod security is on (via request_insecure_environment())."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Compression level to use when saving mapblocks to disk.\n"
+"-1 - use default compression level\n"
+"0 - least compression, fastest\n"
+"9 - best compression, slowest"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Compression level to use when sending mapblocks to the client.\n"
+"-1 - use default compression level\n"
+"0 - least compression, fastest\n"
+"9 - best compression, slowest"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect glass"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connect to external media server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Connects glass if supported by node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Console height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Content Repository"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Flag Blacklist"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls length of day/night cycle.\n"
+"Examples:\n"
+"72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls sinking speed in liquid when idling. Negative values will cause\n"
+"you to rise instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/depth of lake depressions."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Controls steepness/height of hills."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Controls width of tunnels, a smaller value creates wider tunnels.\n"
+"Value >= 10.0 completely disables generation of tunnels and avoids the\n"
+"intensive noise calculations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crash message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"This also applies to the object crosshair."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log file size threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debug log level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Debugging"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dedicated server step"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Default maximum number of forceloaded mapblocks.\n"
+"Set this to -1 to disable the limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default password"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default privileges"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default report format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Default stack size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define shadow filtering quality.\n"
+"This simulates the soft shadows effect by applying a PCF or Poisson disk\n"
+"but also uses more resources."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines areas where trees have apples."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines areas with sandy beaches."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines distribution of higher terrain and steepness of cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines distribution of higher terrain."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines full size of caverns, smaller values create larger caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines how much bloom is applied to the rendered image\n"
+"Smaller values make bloom more subtle\n"
+"Range: from 0.01 to 1.0, default: 0.05"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines large-scale river channel structure."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines location and terrain of optional hills and lakes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the base ground level."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the depth of the river channel."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines the magnitude of bloom overexposure.\n"
+"Range: from 0.1 to 10.0, default: 1.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Defines the size of the sampling grid for FSAA and SSAA antialiasing "
+"methods.\n"
+"Value of 2 means taking 2x2 = 4 samples."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the width of the river channel."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines the width of the river valley."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Defines tree areas and tree density."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Delay between mesh updates on the client in ms. Increasing this will slow\n"
+"down the rate of mesh updates, thus reducing jitter on slower clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay in sending blocks after building"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Delay showing tooltips, stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Deprecated Lua API handling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find giant caverns."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Depth below which you'll find large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Description of server, to be displayed when players join and in the "
+"serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desert noise threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Deserts occur when np_biome exceeds this value.\n"
+"When the 'snowbiomes' flag is enabled, this is ignored."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Desynchronize block animation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Developer Options"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Digging particles"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disable anticheat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Disallow empty passwords"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Display Density Scaling Factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Distance in nodes at which transparency depth sorting is enabled\n"
+"Use this to limit the performance impact of transparency depth sorting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Domain name of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double tap jump for fly"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Double-tapping the jump key toggles fly mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dump the mapgen debug information."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon maximum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon minimum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Dungeon noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Automatic Exposure"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Bloom"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Bloom Debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable IPv6 support (for both client and server).\n"
+"Required for IPv6 connections to work at all."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable Lua modding support on client.\n"
+"This support is experimental and API can change."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable Poisson disk filtering.\n"
+"On true uses Poisson disk to make \"soft shadows\". Otherwise uses PCF "
+"filtering."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable Raytraced Culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable automatic exposure correction\n"
+"When enabled, the post-processing engine will\n"
+"automatically adjust to the brightness of the scene,\n"
+"simulating the behavior of human eye."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable colored shadows.\n"
+"On true translucent nodes cast colored shadows. This is expensive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable console window"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable joysticks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable joysticks. Requires a restart to take effect"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod channels support."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mod security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable mouse wheel (scroll) for item selection in hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable random user input (only used for testing)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable smooth lighting with simple ambient occlusion.\n"
+"Disable for speed or for different looks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable split login/register"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable to disallow old clients from connecting.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable usage of remote media server (if provided by server).\n"
+"Remote servers offer a significantly faster way to download media (e.g. "
+"textures)\n"
+"when connecting to the server."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable view bobbing and amount of view bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enable/disable running an IPv6 server.\n"
+"Ignored if bind_address is set.\n"
+"Needs enable_ipv6 to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables Hable's 'Uncharted 2' filmic tone mapping.\n"
+"Simulates the tone curve of photographic film and how this approximates the\n"
+"appearance of high dynamic range images. Mid-range contrast is slightly\n"
+"enhanced, highlights and shadows are gradually compressed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables animation of inventory items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables caching of facedir rotated meshes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables tradeoffs that reduce CPU load or increase rendering performance\n"
+"at the expense of minor visual glitches that do not impact game playability."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Engine profiling data print interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Entity methods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Exponent of the floatland tapering. Alters the tapering behavior.\n"
+"Value = 1.0 creates a uniform, linear tapering.\n"
+"Values > 1.0 create a smooth tapering suitable for the default separated\n"
+"floatlands.\n"
+"Values < 1.0 (for example 0.25) create a more defined surface level with\n"
+"flatter lowlands, suitable for a solid floatland layer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Exposure compensation"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "FPS when unfocused or paused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Factor noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fall bobbing factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fallback font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode acceleration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fast mode speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Field of view in degrees."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"File in client/serverlist/ that contains your favorite servers displayed in "
+"the\n"
+"Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filler depth noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filmic tone mapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Filtering and Antialiasing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "First of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "First of two 3D noises that together define tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed map seed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fixed virtual joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Fixes the position of virtual joystick.\n"
+"If disabled, virtual joystick will center to first-touch's position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland density"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland maximum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland minimum Y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland taper exponent"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland tapering distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Floatland water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fog start"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font bold by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font italic by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font shadow alpha"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size divisible by"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size of the default font where 1 unit = 1 pixel at 96 DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Font size of the monospace font where 1 unit = 1 pixel at 96 DPI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Font size of the recent chat text and chat prompt in point (pt).\n"
+"Value 0 will use the default font size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"For pixel-style fonts that do not scale well, this ensures that font sizes "
+"used\n"
+"with this font will always be divisible by this value, in pixels. For "
+"instance,\n"
+"a pixel font 16 pixels tall should have this set to 16, so it will only ever "
+"be\n"
+"sized 16, 32, 48, etc., so a mod requesting a size of 25 will get 32."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Format of player chat messages. The following strings are valid "
+"placeholders:\n"
+"@name, @message, @timestamp (optional)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Format of screenshots."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec Full-Screen Background Color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec Full-Screen Background Opacity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec full-screen background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Formspec full-screen background opacity (between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fourth of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fractal type"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fraction of the visible distance at which fog starts to be rendered"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are generated for clients, stated in mapblocks (16 "
+"nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"From how far clients know about objects, stated in mapblocks (16 nodes).\n"
+"\n"
+"Setting this larger than active_block_range will also cause the server\n"
+"to maintain active objects up to this distance in the direction the\n"
+"player is looking. (This can avoid mobs suddenly disappearing from view)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Full screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Fullscreen mode."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "GUI scaling filter txr2img"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gamepads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Global callbacks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Global map generation attributes.\n"
+"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
+"and jungle grass, in all other mapgens this flag controls all decorations."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Gradient of light curve at maximum light level.\n"
+"Controls the contrast of the highest light levels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Gradient of light curve at minimum light level.\n"
+"Controls the contrast of the lowest light levels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics Effects"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Graphics and Audio"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Gravity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ground level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ground noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HTTP mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HUD"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "HUD scaling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Handling for deprecated Lua API calls:\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
+"-    error: abort on usage of deprecated call (suggested for mod developers)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Have the profiler instrument itself:\n"
+"* Instrument an empty function.\n"
+"This estimates the overhead, that instrumentation is adding (+1 function "
+"call).\n"
+"* Instrument the sampler being used to update the statistics."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Heat blend noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Heat noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Height select noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hill steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hill threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness1 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness2 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness3 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hilliness4 noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Homepage of server, to be displayed in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal acceleration in air when jumping or falling,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal and vertical acceleration in fast mode,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Horizontal and vertical acceleration on ground or when climbing,\n"
+"in nodes per second per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hotbar: Enable mouse wheel for selection"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Hotbar: Invert mouse wheel direction"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How deep to make rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How fast liquid waves will move. Higher = faster.\n"
+"If negative, liquid waves will move backwards."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How long the server will wait before unloading unused mapblocks, stated in "
+"seconds.\n"
+"Higher value is smoother, but will use more RAM."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"How much you are slowed down when moving inside a liquid.\n"
+"Decrease this to increase liquid resistance to movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "How wide to make rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity blend noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Humidity variation for biomes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "IPv6 server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If FPS would go higher than this, limit it by sleeping\n"
+"to not waste CPU power for no benefit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If disabled, \"Aux1\" key is used to fly fast if both fly and fast mode are\n"
+"enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, \"Aux1\" key instead of \"Sneak\" key is used for climbing down "
+"and\n"
+"descending."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, account registration is separate from login in the UI.\n"
+"If disabled, new accounts will be registered automatically when logging in."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, actions are recorded for rollback.\n"
+"This option is only read when server starts."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If enabled, disable cheat prevention in multiplayer."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, invalid world data won't cause the server to shut down.\n"
+"Only enable this if you know what you are doing."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, players cannot join without a password or change theirs to an "
+"empty password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, the server will perform map block occlusion culling based on\n"
+"on the eye position of the player. This can reduce the number of blocks\n"
+"sent to the client by 50-80%. Clients will no longer receive most\n"
+"invisible blocks, so that the utility of noclip mode is reduced."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If enabled, you can place nodes at the position (feet + eye level) where you "
+"stand.\n"
+"This is helpful when working with nodeboxes in small areas."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the CSM restriction for node range is enabled, get_node calls are "
+"limited\n"
+"to this distance from the player to the node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the execution of a chat command takes longer than this specified time in\n"
+"seconds, add the time information to the chat command message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"If the file size of debug.txt exceeds the number of megabytes specified in\n"
+"this setting when it is opened, the file is moved to debug.txt.1,\n"
+"deleting an older debug.txt.1 if it exists.\n"
+"debug.txt is only moved if this setting is positive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "If this is set, players will always (re)spawn at the given position."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ignore world errors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console background color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Initial vertical speed when jumping, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument builtin.\n"
+"This is usually only needed by core/builtin contributors"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument chat commands on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument global callback functions on registration.\n"
+"(anything you pass to a minetest.register_*() function)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Active Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Instrument the action function of Loading Block Modifiers on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Instrument the methods of entities on registration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of saving important changes in the world, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Interval of sending time of day to clients, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Inventory items animations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Invert vertical mouse movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Italic font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Italic monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Item entity TTL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Iterations"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Iterations of the recursive function.\n"
+"Increasing this increases the amount of fine detail, but also\n"
+"increases processing load.\n"
+"At iterations = 20 this mapgen has a similar load to mapgen V7."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick ID"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick button repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick dead zone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick frustum sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Joystick type"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"W component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"X component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"Y component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Julia set only.\n"
+"Z component of hypercomplex constant.\n"
+"Alters the shape of the fractal.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Julia w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Julia x"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Julia y"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Julia z"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Jumping speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Keyboard and Mouse"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Kick players who sent more than X messages per 10 seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lake steepness"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lake threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Language"
+msgstr "toki"
+
+#: src/settings_translation_file.cpp
+msgid "Large cave depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave maximum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave minimum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Large cave proportion flooded"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Leaves style"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Leaves style:\n"
+"-   Fancy:  all faces visible\n"
+"-   Simple: only outer faces, if defined special_tiles are used\n"
+"-   Opaque: disable transparency"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of liquid waves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of time between Active Block Modifier (ABM) execution cycles, stated "
+"in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Length of time between NodeTimer execution cycles, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Length of time between active block management cycles, stated in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Level of logging to be written to debug.txt:\n"
+"-    <nothing> (no logging)\n"
+"-    none (messages with no level)\n"
+"-    error\n"
+"-    warning\n"
+"-    action\n"
+"-    info\n"
+"-    verbose\n"
+"-    trace"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost center"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve boost spread"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve high gradient"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Light curve low gradient"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\n"
+"Only mapchunks completely within the mapgen limit are generated.\n"
+"Value is stored per-world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Limits number of parallel HTTP requests. Affects:\n"
+"-    Media fetch if server uses remote_media setting.\n"
+"-    Serverlist download and server announcement.\n"
+"-    Downloads performed by main menu (e.g. mod manager).\n"
+"Only has an effect if compiled with cURL."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid fluidity smoothing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid loop max"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid queue purge time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid sinking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update interval in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Liquid update tick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Load the game profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Load the game profiler to collect game profiling data.\n"
+"Provides a /profiler command to access the compiled profile.\n"
+"Useful for mod developers and server operators."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Loading Block Modifiers"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Logical value that controls how far the bloom effect spreads\n"
+"from the bright objects.\n"
+"Range: from 0.1 to 8, default: 1"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lower Y limit of dungeons."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Lower Y limit of floatlands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Main menu script"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation attributes specific to Mapgen Carpathian."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Flat.\n"
+"Occasional lakes and hills can be added to the flat world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Fractal.\n"
+"'terrain' enables the generation of non-fractal terrain:\n"
+"ocean, islands and underground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen Valleys.\n"
+"'altitude_chill': Reduces heat with altitude.\n"
+"'humid_rivers': Increases humidity around rivers.\n"
+"'vary_river_depth': If enabled, low humidity and high heat causes rivers\n"
+"to become shallower and occasionally dry.\n"
+"'altitude_dry': Reduces humidity with altitude."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation attributes specific to Mapgen v5."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v6.\n"
+"The 'snowbiomes' flag enables the new 5 biome system.\n"
+"When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Map generation attributes specific to Mapgen v7.\n"
+"'ridges': Rivers.\n"
+"'floatlands': Floating land masses in the atmosphere.\n"
+"'caverns': Giant caves deep underground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map generation limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map save interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map shadows update frames"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock limit"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock mesh generation delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock mesh generation threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapblock unload timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Carpathian"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Carpathian specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Flat"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Flat specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Fractal"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Fractal specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V5"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V5 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V6"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V6 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V7"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen V7 specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen Valleys specific flags"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mapgen name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block generate distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max block send distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max liquids processed per step."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. clearobjects extra blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Max. packets per iteration"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum distance to render shadows."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum forceloaded blocks"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum hotbar width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum limit of random number of large caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum limit of random number of small caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum liquid resistance. Controls deceleration when entering liquid at\n"
+"high speed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks that are simultaneously sent per client.\n"
+"The maximum total count is calculated dynamically:\n"
+"max_total = ceil((#clients + max_users) * per_client / 4)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of blocks that can be queued for loading."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be generated.\n"
+"This limit is enforced per player."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of blocks to be queued that are to be loaded from file.\n"
+"This limit is enforced per player."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of mapblocks for client to be kept in memory.\n"
+"Set to -1 for unlimited amount."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of packets sent per send step, if you have a slow connection\n"
+"try reducing it, but don't reduce it to a number below double of targeted\n"
+"client number."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of players that can be connected simultaneously."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of recent chat messages to show"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of statically stored objects in a block."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum objects per block"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum proportion of current window to be used for hotbar.\n"
+"Useful if there's something to be displayed right or left of hotbar."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum simultaneous block sends per client"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum size of the outgoing chat queue"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum size of the outgoing chat queue.\n"
+"0 to disable queueing and -1 to make the queue size unlimited."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum time a file download (e.g. a mod download) may take, stated in "
+"milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum time an interactive request (e.g. server list fetch) may take, "
+"stated in milliseconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Maximum users"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mesh cache"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Message of the day displayed to players connecting."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Method used to highlight selected object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimal level of logging to be written to chat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimap scan height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum limit of random number of large caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Minimum limit of random number of small caves per mapchunk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mipmapping"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mod channels"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Modifies the size of the HUD elements."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Monospace font size divisible by"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain height noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain variation noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mountain zero level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mouse sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mud noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Multiplier for fall bobbing.\n"
+"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Mute sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of map generator to be used when creating a new world.\n"
+"Creating a world in the main menu will override this.\n"
+"Current mapgens in a highly unstable state:\n"
+"-    The optional floatlands of v7 (disabled by default)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the player.\n"
+"When running a server, clients connecting with this name are admins.\n"
+"When starting from the main menu, this is overridden."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Name of the server, to be displayed when players join and in the serverlist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Network port to listen (UDP).\n"
+"This value will be overridden when starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Networking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "New users need to input this password."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node and Entity Highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Node highlighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "NodeTimer interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Noises"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of emerge threads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of emerge threads to use.\n"
+"Value 0:\n"
+"-    Automatic selection. The number of emerge threads will be\n"
+"-    'number of processors - 2', with a lower limit of 1.\n"
+"Any other value:\n"
+"-    Specifies the number of emerge threads, with a lower limit of 1.\n"
+"WARNING: Increasing the number of emerge threads increases engine mapgen\n"
+"speed, but this may harm game performance by interfering with other\n"
+"processes, especially in singleplayer and/or when running Lua code in\n"
+"'on_generated'. For many users the optimum setting may be '1'."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of extra blocks that can be loaded by /clearobjects at once.\n"
+"This is a trade-off between SQLite transaction overhead and\n"
+"memory consumption (4096=100MB, as a rule of thumb)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Number of messages a player may send per 10 seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Number of threads to use for mesh generation.\n"
+"Value of 0 (default) will let Minetest autodetect the number of available "
+"threads."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Occlusion Culler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Occlusion Culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Open the pause menu when the window's focus is lost. Does not pause if a "
+"formspec is\n"
+"open."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Optional override for chat weblink color."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path of the fallback font. Must be a TrueType font.\n"
+"This font will be used for certain languages or if the default font is "
+"unavailable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to save screenshots at. Can be an absolute or relative path.\n"
+"The folder will be created if it doesn't already exist."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to shader directory. If no path is defined, default location will be "
+"used."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to the default font. Must be a TrueType font.\n"
+"The fallback font will be used if the font cannot be loaded."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Path to the monospace font. Must be a TrueType font.\n"
+"This font is used for e.g. the console and profiler screen."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Pause on lost window focus"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Per-player limit of queued blocks load from disk"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Per-player limit of queued blocks to generate"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Physics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Poisson filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Post Processing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Prevent digging and placing from repeating when holding the respective "
+"buttons.\n"
+"Enable this when you dig or place too often by accident.\n"
+"On touchscreens, this only affects digging."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prevent mods from doing insecure things like running shell commands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Print the engine's profiling data in regular intervals (in seconds).\n"
+"0 = disable. Useful for developers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Privileges that players with basic_privs can grant"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Profiler"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Prometheus listener address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Prometheus listener address.\n"
+"If Minetest is compiled with ENABLE_PROMETHEUS option enabled,\n"
+"enable metrics listener for Prometheus on that address.\n"
+"Metrics can be fetched on http://127.0.0.1:30000/metrics"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Proportion of large caves that contain liquid."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Radius of cloud area stated in number of 64 node cloud squares.\n"
+"Values larger than 26 will start to produce sharp cutoffs at cloud area "
+"corners."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Raises terrain to make valleys around the rivers."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random input"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Recent Chat Messages"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Regular font path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remember screen size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Remote media"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Remove color codes from incoming chat messages\n"
+"Use this to stop players from being able to use color in their messages"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Replaces the default main menu with a custom one."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Report path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Restricts the access of certain client-side functions on servers.\n"
+"Combine the byteflags below to restrict client-side features, or set to 0\n"
+"for no restrictions:\n"
+"LOAD_CLIENT_MODS: 1 (disable loading client-provided mods)\n"
+"CHAT_MESSAGES: 2 (disable send_chat_message call client-side)\n"
+"READ_ITEMDEFS: 4 (disable get_item_def call client-side)\n"
+"READ_NODEDEFS: 8 (disable get_node_def call client-side)\n"
+"LOOKUP_NODES_LIMIT: 16 (limits get_node call client-side to\n"
+"csm_restriction_noderange)\n"
+"READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge mountain spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridge underwater noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Ridged mountain size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River channel depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River channel width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "River valley width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rollback recording"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rolling hill size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Rolling hills spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Safe digging and placing"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sandy beaches occur when np_beach exceeds this value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Save the map received by the client on disk."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Save window size automatically when modified.\n"
+"If true, screen size is saved in screen_w and screen_h, and whether the "
+"window\n"
+"is maximized is stored in window_maximized.\n"
+"(Autosaving window_maximized only works if compiled with SDL.)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Saving map received from server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Scale GUI by a user specified value.\n"
+"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
+"This will smooth over some of the rough edges, and blend\n"
+"pixels when scaling down, at the cost of blurring some\n"
+"edge pixels when images are scaled by non-integer sizes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screen width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot folder"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot format"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshot quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Screenshot quality. Only used for JPEG format.\n"
+"1 means worst quality; 100 means best quality.\n"
+"Use 0 for default quality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Screenshots"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Seabed noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Second of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Second of two 3D noises that together define tunnels."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Select the antialiasing method to apply.\n"
+"\n"
+"* None - No antialiasing (default)\n"
+"\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
+"A.K.A multi-sample antialiasing (MSAA)\n"
+"Smoothens out block edges but does not affect the insides of textures.\n"
+"A restart is required to change this option.\n"
+"\n"
+"* FXAA - Fast approximate antialiasing (requires shaders)\n"
+"Applies a post-processing filter to detect and smoothen high-contrast "
+"edges.\n"
+"Provides balance between speed and image quality.\n"
+"\n"
+"* SSAA - Super-sampling antialiasing (requires shaders)\n"
+"Renders higher-resolution image of the scene, then scales down to reduce\n"
+"the aliasing effects. This is the slowest and the most accurate method."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box border color (R,G,B)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Selection box width"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Selects one of 18 fractal types.\n"
+"1 = 4D \"Roundy\" Mandelbrot set.\n"
+"2 = 4D \"Roundy\" Julia set.\n"
+"3 = 4D \"Squarry\" Mandelbrot set.\n"
+"4 = 4D \"Squarry\" Julia set.\n"
+"5 = 4D \"Mandy Cousin\" Mandelbrot set.\n"
+"6 = 4D \"Mandy Cousin\" Julia set.\n"
+"7 = 4D \"Variation\" Mandelbrot set.\n"
+"8 = 4D \"Variation\" Julia set.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" Mandelbrot set.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" Julia set.\n"
+"11 = 3D \"Christmas Tree\" Mandelbrot set.\n"
+"12 = 3D \"Christmas Tree\" Julia set.\n"
+"13 = 3D \"Mandelbulb\" Mandelbrot set.\n"
+"14 = 3D \"Mandelbulb\" Julia set.\n"
+"15 = 3D \"Cosine Mandelbulb\" Mandelbrot set.\n"
+"16 = 3D \"Cosine Mandelbulb\" Julia set.\n"
+"17 = 4D \"Mandelbulb\" Mandelbrot set.\n"
+"18 = 4D \"Mandelbulb\" Julia set."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server Gameplay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server Security"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server address"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server description"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server name"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server port"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server-side occlusion culling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Server/Env Performance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist and MOTD"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Serverlist file"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the default tilt of Sun/Moon orbit in degrees.\n"
+"Games may change orbit tilt via API.\n"
+"Value of 0 means no tilt / vertical orbit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the exposure compensation in EV units.\n"
+"Value of 0.0 (default) means no exposure compensation.\n"
+"Range: from -1 to 1.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the language. By default, the system language is used.\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the maximum length of a chat message (in characters) sent by clients."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the shadow strength gamma.\n"
+"Adjusts the intensity of in-game dynamic shadows.\n"
+"Lower value means lighter shadows, higher value means darker shadows."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set the soft shadow radius size.\n"
+"Lower values mean sharper shadows, bigger values mean softer shadows.\n"
+"Minimum value: 1.0; maximum value: 15.0"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable Shadow Mapping."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true to enable bloom effect.\n"
+"Bright colors will bleed over the neighboring objects."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving leaves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving liquids (like water)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable waving plants."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Set to true to render debugging breakdown of the bloom effect.\n"
+"In debug mode, the screen is split into 4 quadrants:\n"
+"top-left - processed base image, top-right - final image\n"
+"bottom-left - raw base image, bottom-right - bloom texture."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Sets shadow texture quality to 32 bits.\n"
+"On false, 16 bits texture will be used.\n"
+"This can cause much more artifacts in the shadow."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shader path"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shaders"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shaders allow advanced visual effects and may increase performance on some "
+"video\n"
+"cards."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow filter quality"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map max distance in nodes to render shadows"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map texture in 32 bits"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow map texture size"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
+"drawn."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shadow strength gamma"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show debug info"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show entity selection boxes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show name tag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Shutdown message"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Side length of a cube of map blocks that the client will consider together\n"
+"when generating meshes.\n"
+"Larger values increase the utilization of the GPU by reducing the number of\n"
+"draw calls, benefiting especially high-end GPUs.\n"
+"Systems with a low-end GPU (or no GPU) would benefit from smaller values."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
+"WARNING: There is no benefit, and there are several dangers, in\n"
+"increasing this value above 5.\n"
+"Reducing this value increases cave and dungeon density.\n"
+"Altering this value is for special usage, leaving it unchanged is\n"
+"recommended."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sky Body Orbit Tilt"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slice w"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Slope and fill work together to modify the heights."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small cave maximum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small cave minimum number"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small-scale humidity variation for blending biomes on borders."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Small-scale temperature variation for blending biomes on borders."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Smooth lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
+"cinematic mode by using the key set in Controls."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Smooths rotation of camera, also called look or mouse smoothing. 0 to "
+"disable."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneaking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sneaking speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Soft shadow radius"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies URL from which client fetches media instead of using UDP.\n"
+"$filename should be accessible from $remote_media$filename via cURL\n"
+"(obviously, remote_media should end with a slash).\n"
+"Files that are not present will be fetched the usual way."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Specifies the default stack size of nodes, items and tools.\n"
+"Note that mods or games may explicitly set a stack for certain (or all) "
+"items."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Spread a complete update of shadow map over given number of frames.\n"
+"Higher values might make shadows laggy, lower values\n"
+"will consume more resources.\n"
+"Minimum value: 1; maximum value: 16"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Spread of light curve boost range.\n"
+"Controls the width of the range to be boosted.\n"
+"Standard deviation of the light curve boost Gaussian."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Static spawn point"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Steepness noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Step mountain size noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Step mountain spread noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strength of 3D mode parallax."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Strength of light curve boost.\n"
+"The 3 'boost' parameters define a range of the light\n"
+"curve that is boosted in brightness."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strict protocol checking"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Strip color codes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Surface level of optional water placed on a solid floatland layer.\n"
+"Water is disabled by default and will only be placed if this value is set\n"
+"to above 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (the start of the\n"
+"upper tapering).\n"
+"***WARNING, POTENTIAL DANGER TO WORLDS AND SERVER PERFORMANCE***:\n"
+"When enabling water placement, floatlands must be configured and tested\n"
+"to be a solid layer by setting 'mgv7_floatland_density' to 2.0 (or other\n"
+"required value depending on 'mgv7_np_floatland'), to avoid\n"
+"server-intensive extreme water flow and to avoid vast flooding of the\n"
+"world surface below."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Synchronous SQLite"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Temperature variation for biomes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain alternative noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain base noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain higher noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for hills.\n"
+"Controls proportion of world area covered by hills.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Terrain noise threshold for lakes.\n"
+"Controls proportion of world area covered by lakes.\n"
+"Adjust towards 0.0 for a larger proportion."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Terrain persistence noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Texture size to render the shadow map on.\n"
+"This must be a power of two.\n"
+"Bigger numbers create better shadows but it is also more expensive."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Textures on a node may be aligned either to the node or to the world.\n"
+"The former mode suits better things like machines, furniture, etc., while\n"
+"the latter makes stairs and microblocks fit surroundings better.\n"
+"However, as this possibility is new, thus may not be used by older servers,\n"
+"this option allows enforcing it for certain node types. Note though that\n"
+"that is considered EXPERIMENTAL and may not work properly."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The URL for the content repository"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The dead zone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The default format in which profiles are being saved,\n"
+"when calling `/profiler save [format]` without format."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The file path relative to your world path in which profiles will be saved to."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The identifier of the joystick to use"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The maximum height of the surface of waving liquids.\n"
+"4.0 = Wave height is two nodes.\n"
+"0.0 = Wave doesn't move at all.\n"
+"Default is 1.0 (1/2 node)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The network interface that the server listens on."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The privileges that new users automatically get.\n"
+"See /privs in game for a full list on your server and mod configuration."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The radius of the volume of blocks around every player that is subject to "
+"the\n"
+"active block stuff, stated in mapblocks (16 nodes).\n"
+"In active blocks objects are loaded and ABMs run.\n"
+"This is also the minimum range in which active objects (mobs) are "
+"maintained.\n"
+"This should be configured together with active_object_send_range_blocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The rendering back-end.\n"
+"Note: A restart is required after changing this!\n"
+"OpenGL is the default for desktop, and OGLES2 for Android.\n"
+"Shaders are supported by everything but OGLES1."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The sensitivity of the joystick axes for moving the\n"
+"in-game view frustum around."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The strength (darkness) of node ambient-occlusion shading.\n"
+"Lower is darker, Higher is lighter. The valid range of values for this\n"
+"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
+"set to the nearest valid value."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time (in seconds) that the liquids queue may grow beyond processing\n"
+"capacity until an attempt is made to decrease its size by dumping old queue\n"
+"items.  A value of 0 disables the functionality."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated events\n"
+"when holding down a joystick button combination."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The type of joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
+"enabled. Also, the vertical distance over which humidity drops by 10 if\n"
+"'altitude_dry' is enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Third of 4 2D noises that together define hill/mountain range height."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Time in seconds for item entity (dropped items) to live.\n"
+"Setting it to -1 disables the feature."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time of day when a new world is started, in millihours (0-23999)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time send interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Time speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Timeout for client to remove unused map data from memory, in seconds."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"To reduce lag, block transfers are slowed down when a player is building "
+"something.\n"
+"This determines how long they are slowed down after placing or removing a "
+"node."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tooltip delay"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen sensitivity"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Touchscreen sensitivity multiplier."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Tradeoffs for performance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Transparency Sorting Distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trees noise"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trilinear filtering"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"True = 256\n"
+"False = 128\n"
+"Usable to make minimap smoother on slower machines."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Trusted mods"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Type of occlusion_culler\n"
+"\n"
+"\"loops\" is the legacy algorithm with nested loops and O(n³) complexity\n"
+"\"bfs\" is the new algorithm based on breadth-first-search and side culling\n"
+"\n"
+"This setting should only be changed if you have performance problems."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "URL to the server list displayed in the Multiplayer Tab."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Undersampling"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Undersampling is similar to using a lower screen resolution, but it applies\n"
+"to the game world only, keeping the GUI intact.\n"
+"It should give a significant performance boost at the cost of less detailed "
+"image.\n"
+"Higher values result in a less detailed image."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unlimited player transfer distance"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Unload unused server data"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Update information URL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Upper Y limit of dungeons."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Upper Y limit of floatlands."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use 3D cloud look instead of flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use a cloud animation for the main menu background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use anisotropic filtering when looking at textures from an angle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use bilinear filtering when scaling textures."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Use crosshair for touch screen"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use crosshair to select object instead of whole screen.\n"
+"If enabled, a crosshair will be shown and will be used for selecting object."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use mipmaps when scaling textures. May slightly increase performance,\n"
+"especially when using a high-resolution texture pack.\n"
+"Gamma-correct downscaling is not supported."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use raytraced occlusion culling in the new culler.\n"
+"This flag enables use of raytraced occlusion culling test for\n"
+"client mesh sizes smaller than 4x4x4 map blocks."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use trilinear filtering when scaling textures.\n"
+"If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
+"is applied."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Use virtual joystick to trigger \"Aux1\" button.\n"
+"If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
+"circle."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "User Interfaces"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "VSync"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley depth"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley fill"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley profile"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Valley slope"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of biome filler depth."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of maximum mountain height (in nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Variation of number of caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Variation of terrain vertical scale.\n"
+"When noise is < -0.55 terrain is near-flat."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Varies depth of biome surface nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Varies roughness of terrain.\n"
+"Defines the 'persistence' value for terrain_base and terrain_alt noises."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Varies steepness of cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Vertical climbing speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Vertical screen synchronization. Your system may still force VSync on even "
+"if this is disabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Video driver"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View bobbing factor"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "View distance in nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Viewing range"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Virtual joystick triggers Aux1 button"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Volume of all sounds.\n"
+"Requires the sound system to be enabled."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"W coordinate of the generated 3D slice of a 4D fractal.\n"
+"Determines which 3D slice of the 4D shape is generated.\n"
+"Alters the shape of the fractal.\n"
+"Has no effect on 3D fractals.\n"
+"Range roughly -2 to 2."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking and flying speed, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water level"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Water surface level of the world."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving Nodes"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving leaves"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wave height"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wave speed"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving liquids wavelength"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Waving plants"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Weblink color"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter is true, all GUI images need to be\n"
+"filtered in software, but some images are generated directly\n"
+"to hardware (e.g. render-to-texture for nodes in inventory)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When gui_scaling_filter_txr2img is true, copy those images\n"
+"from hardware to software for scaling.  When false, fall back\n"
+"to the old scaling method, for video drivers that don't\n"
+"properly support downloading textures back from hardware."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
+"can be blurred, so automatically upscale them with nearest-neighbor\n"
+"interpolation to preserve crisp pixels. This sets the minimum texture size\n"
+"for the upscaled textures; higher values look sharper, but require more\n"
+"memory. Powers of 2 are recommended. This setting is ONLY applied if\n"
+"bilinear/trilinear/anisotropic filtering is enabled.\n"
+"This is also used as the base node texture size for world-aligned\n"
+"texture autoscaling."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether name tag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether players are shown to clients without any range limit.\n"
+"Deprecated, use the setting player_transfer_distance instead."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether the window is maximized."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to ask clients to reconnect after a (Lua) crash.\n"
+"Set this to true if your server is set up to restart automatically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Whether to fog out the end of the visible area."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to mute sounds. You can unmute sounds at any time, unless the\n"
+"sound system is disabled (enable_sound=false).\n"
+"In-game, you can toggle the mute state with the mute key or by using the\n"
+"pause menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether to show the client debug info (has the same effect as hitting F5)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width component of the initial window size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Width of the selection box lines around nodes."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Window maximized"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Windows systems only: Start Minetest with the command line window in the "
+"background.\n"
+"Contains the same information as the file debug.txt (default name)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World directory (everything in the world is stored here).\n"
+"Not needed if starting from the main menu."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "World start time"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"World-aligned textures may be scaled to span several nodes. However,\n"
+"the server may not send the scale you want, especially if you use\n"
+"a specially-designed texture pack; with this option, the client tries\n"
+"to determine the scale automatically basing on the texture size.\n"
+"See also texture_min_size.\n"
+"Warning: This option is EXPERIMENTAL!"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "World-aligned textures mode"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of flat ground."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Y of mountain density gradient zero level. Used to shift mountains "
+"vertically."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y of upper limit of large caves."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-distance over which caverns expand to full size."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Y-distance over which floatlands taper from full density to nothing.\n"
+"Tapering starts at this distance from the Y limit.\n"
+"For a solid floatland layer, this controls the height of hills/mountains.\n"
+"Must be less than or equal to half the distance between the Y limits."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of average terrain surface."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of cavern upper limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of higher terrain that creates cliffs."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of lower terrain and seabed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Y-level of seabed."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL interactive timeout"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr ""
diff --git a/po/tr/minetest.po b/po/tr/minetest.po
index 384dfce8a..c8cc43b5d 100644
--- a/po/tr/minetest.po
+++ b/po/tr/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Turkish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-05-22 21:48+0000\n"
-"Last-Translator: Furkan Baytekin <furkanbaytekin@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-03-24 17:01+0000\n"
+"Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/minetest/"
 "minetest/tr/>\n"
 "Language: tr\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.5-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Komut kullanılamıyor: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Komutlar için yardım alın"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "help all' kullanın."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <komut>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Tamam"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<mevcut değil>"
@@ -105,6 +103,10 @@ msgstr "Bir hata oluştu:"
 msgid "Main menu"
 msgstr "Ana menü"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Tamam"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Bağlan"
@@ -133,19 +135,26 @@ msgstr "Yalnızca $1 protokol sürümü desteklenmektedir."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Yalnızca $1 ve $2 arası protokol sürümleri desteklenmektedir."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" zaten var.Değiştirilsin mi?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "\"$1\" yüklenirken hata oluştu: $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$ 1 ve $ 2 destek dosyaları yüklenecek."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "\"$1\" indirilemedi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 'e $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "$1 indirilemedi"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "\"$1\" ayıklanamadı (desteklenmeyen dosya türü veya bozuk arşiv)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,156 +162,157 @@ msgstr ""
 "$1 indiriliyor,\n"
 "$2 sırada"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 indiriliyor..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 için destek dosyaları bulanamadı."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 indirilecek, ve $2 destek dosyaları atlanacak."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Tüm paketler"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Zaten kuruldu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Ana Menüye Dön"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "Minetest cURL olmadan derlendiğinde ContentDB kullanılamaz"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "İndiriliyor..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Oyunlar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Kur"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Modlar"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Paket alınamadı"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Sonuç yok"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Güncelleme yok"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Sıraya alındı"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Doku paketleri"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "$1 paketi bulunamadı."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Kaldır"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Güncelleme"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Hepsini güncelle [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Tarayıcı'da daha fazla bilgi edinin"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Bir mod kurabilmeniz için önce bir oyun kurmanız gerekir"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$ 1 ve $ 2 destek dosyaları yüklenecek."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 'e $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 için destek dosyaları bulanamadı."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 indirilecek, ve $2 destek dosyaları atlanacak."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Zaten kuruldu"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Yerel oyun:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "İptal"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "Minetest cURL olmadan derlendiğinde ContentDB kullanılamaz"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Gereklilikler:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "İndiriliyor..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "\"$1\" yüklenirken hata oluştu: $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "\"$1\" indirilemedi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "$1 indirilemedi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "\"$1\" ayıklanamadı (desteklenmeyen dosya türü veya bozuk arşiv)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Oyunlar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Kur"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 kur"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Eksik bağımlılıkları kur"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Yükleniyor..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Modlar"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Paket alınamadı"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Sonuç yok"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Güncelleme yok"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Bulunamadı"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Üzerine yaz"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Lütfen asıl oyunun doğru olup olmadığını gözden geçirin."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Sıraya alındı"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" zaten var.Değiştirilsin mi?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Doku paketleri"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Kaldır"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Güncelleme"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Hepsini güncelle [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Tarayıcı'da daha fazla bilgi edinin"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Üzerine yaz"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -322,14 +332,12 @@ msgid "Install: Unable to find suitable folder name for $1"
 msgstr "Mod Kur:$1 mod paketi için uygun bir klasör adı bulunamadı"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "Geçerli bir mod veya mod paketi bulunamadı"
+msgstr "Geçerli bir mod, mod paketi veya oyun bulunamadı"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a $1 as a $2"
-msgstr "Bir mod bir $1 olarak kurulamadı"
+msgstr "$1, bir $2 olarak kurulamadı"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -341,11 +349,11 @@ msgstr "(Etkinleştirildi, hata var)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "(Unsatisfied)"
-msgstr ""
+msgstr "(Karşılanmadı)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "Hepsini devre dışı bırak"
+msgstr "Tümünü devre dışı bırak"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
@@ -453,10 +461,20 @@ msgstr "Oluştur"
 msgid "Decorations"
 msgstr "Dekorasyonlar"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Geliştirme Testi, geliştiriciler içindir."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Zindanlar"
@@ -625,12 +643,11 @@ msgstr "Parolayı Doğrula"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Joining $1"
-msgstr ""
+msgstr "$1'e katılıyor"
 
 #: builtin/mainmenu/dlg_register.lua
-#, fuzzy
 msgid "Missing name"
-msgstr "Mapgen adı"
+msgstr "Eksik ad"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
@@ -652,7 +669,7 @@ msgstr "Kaydol"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "Kapat"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -660,21 +677,25 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"Minetest motoru uzun bir süre boyunca \"Minetest Game\" adında öntanımlı bir "
+"oyunla birlikte geliyordu. Minetest 5.8.0 sürümünden bu yana, Minetest "
+"öntanımlı bir oyun olmadan gelmektedir."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"Minetest Game dünyalarınızda oynamaya devam etmek istiyorsanız, Minetest "
+"Game'i yeniden kurmanız gerekir."
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game artık öntanımlı olarak kurulu değil"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "Başka bir oyun yükleyin"
+msgstr "Minetest Game'i yeniden kur"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -694,20 +715,19 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "A new $1 version is available"
-msgstr ""
+msgstr "Yeni bir $1 sürümü var"
 
 #: builtin/mainmenu/dlg_version_info.lua
-#, fuzzy
 msgid ""
 "Installed version: $1\n"
 "New version: $2\n"
 "Visit $3 to find out how to get the newest version and stay up to date with "
 "features and bugfixes."
 msgstr ""
-"İndirili versiyon: $1\n"
-"Yeni versiyon: $2\n"
-"$3'ü ziyaret et ve nasıl en yeni versiyona geçebileceğini ve en yeni "
-"özellikler ve ayıklanmış hatalarla güncel kalabileceğini öğren."
+"Kurulu sürüm: $1\n"
+"Yeni sürüm: $2\n"
+"En yeni sürümü nasıl edinebileceğinizi öğrenmek ve özellikler ve hata "
+"düzeltmeleriyle güncel kalmak için $3 adresini ziyaret edin."
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Later"
@@ -823,20 +843,16 @@ msgstr "rahat"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "(Sistem dilini kullan)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "Erişilebilirlik"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "Geri"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Tuşları değiştir"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -846,27 +862,26 @@ msgstr "Sohbet"
 msgid "Clear"
 msgstr "Temizle"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Kontroller"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "Genel"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "Hızlı hareket"
+msgstr "Hareket"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "Öntanımlıyı Geri Yükle"
+msgstr "Ayarı öntanımlıya sıfırla"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "Ayarı öntanımlı değere sıfırla ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -874,34 +889,31 @@ msgstr "Ara"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "Gelişmiş ayarları göster"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
 msgstr "Teknik adları göster"
 
 #: builtin/mainmenu/settings/settingtypes.lua
-#, fuzzy
 msgid "Client Mods"
-msgstr "Mod seçin"
+msgstr "İstemci Modları"
 
 #: builtin/mainmenu/settings/settingtypes.lua
-#, fuzzy
 msgid "Content: Games"
-msgstr "İçerik"
+msgstr "İçerik: Oyunlar"
 
 #: builtin/mainmenu/settings/settingtypes.lua
-#, fuzzy
 msgid "Content: Mods"
-msgstr "İçerik"
+msgstr "İçerik: Modlar"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "(Oyunun gölgeleri de etkinleştirmesi gerekecektir)"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "Özel"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -951,11 +963,11 @@ msgstr "Çekirdek Geliştiriciler"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "Çekirdek Takım"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Irrlicht aygıtı:"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -978,27 +990,24 @@ msgid "Previous Core Developers"
 msgstr "Önceki Çekirdek Geliştiriciler"
 
 #: builtin/mainmenu/tab_about.lua
-#, fuzzy
 msgid "Share debug log"
-msgstr "Hata ayıklama bilgisini göster"
+msgstr "Hata ayıklama günlüğünü paylaş"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Çevrim içi içeriğe göz at"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "Çevrim içi içeriğe göz at"
+msgstr "Çevrim içi içeriğe göz at [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "İçerik"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "İçerik"
+msgstr "İçerik [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1021,9 +1030,8 @@ msgid "Rename"
 msgstr "Yeniden adlandır"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<mevcut değil>"
+msgstr "Güncelleme var mı?"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1061,6 +1069,17 @@ msgstr "Bir oyun yükleyin"
 msgid "Install games from ContentDB"
 msgstr "ContentDB'den oyunlar yükle"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game artık öntanımlı olarak kurulu değil"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Yeni"
@@ -1094,8 +1113,9 @@ msgid "Start Game"
 msgstr "Oyun Başlat"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Kurulu oyununuz yok."
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "Bir mod kurabilmeniz için önce bir oyun kurmanız gerekir"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1148,9 +1168,8 @@ msgid "Server Description"
 msgstr "Sunucu Açıklaması"
 
 #: src/client/client.cpp
-#, fuzzy
 msgid "Connection aborted (protocol error?)."
-msgstr "Bağlantı hatası (zaman aşımı?)"
+msgstr "Bağlantı iptal edildi (protokol hatası?)."
 
 #: src/client/client.cpp src/client/game.cpp
 msgid "Connection timed out."
@@ -1176,18 +1195,10 @@ msgstr "Dokular yükleniyor..."
 msgid "Rebuilding shaders..."
 msgstr "Gölgelemeler yeniden oluşturuluyor..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Bağlantı hatası (zaman aşımı?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Oyun bulunamadı veya yüklenemedi: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Geçersiz oyun özellikleri."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Ana Menü"
@@ -1212,7 +1223,11 @@ msgstr "Sağlanan parola dosyası açılamadı: "
 msgid "Provided world path doesn't exist: "
 msgstr "Belirtilen dünya konumu yok: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Medya..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1220,18 +1235,10 @@ msgstr ""
 "\n"
 "Hata ayrıntıları için debug.txt dosyasına bakın."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Adres: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Kip: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Port: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Herkese Açık: "
@@ -1266,10 +1273,6 @@ msgstr "Kendiliğinden ileri etkin"
 msgid "Block bounds hidden"
 msgstr "Blok sınırları gizli"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Blok sınırları tüm bloklar için gösteriliyor"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Blok sınırları geçerli blok için gösteriliyor"
@@ -1315,6 +1318,10 @@ msgstr "İstemci tarafı betik devre dışı"
 msgid "Connecting to server..."
 msgstr "Sunucuya bağlanılıyor..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Bağlantı hatası (zaman aşımı?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Bilinmeyen bir nedenle bağlantı başarısız oldu"
@@ -1323,47 +1330,14 @@ msgstr "Bilinmeyen bir nedenle bağlantı başarısız oldu"
 msgid "Continue"
 msgstr "Devam et"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Kontroller:\n"
-"- %s: ileri hareket\n"
-"- %s: geri hareket\n"
-"- %s: sola hareket\n"
-"- %s: sağa hareket\n"
-"- %s: zıpla/tırman\n"
-"- %s: kaz/vur\n"
-"- %s: yerleştir/kullan\n"
-"- %s: sız/aşağı in\n"
-"- %s: ögeyi at\n"
-"- %s: envanter\n"
-"- Fare: dön/bak\n"
-"- Fare tekerleği: öge seç\n"
-"- %s: sohbet\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1411,9 +1385,9 @@ msgid "Debug info, profiler graph, and wireframe hidden"
 msgstr "Hata ayıklama bilgisi, profilci grafiği ve tel kafes gizli"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating client: %s"
-msgstr "İstemci yaratılıyor..."
+msgstr "İstemci oluşturulurken hata: %s"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
@@ -1455,6 +1429,11 @@ msgstr "Sis devre dışı"
 msgid "Fog enabled"
 msgstr "Sis etkin"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Yakınlaştırma şu anda oyun veya mod tarafından devre dışı"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Oyun Bilgisi:"
@@ -1475,10 +1454,6 @@ msgstr "Öge tanımları..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Medya..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1579,18 +1554,18 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "IPv6 devre dışı bırakıldığından %s adresinde dinlenemiyor"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "Sınırsız görüntüleme uzaklığı etkin"
+msgstr "Sınırsız görüntüleme uzaklığı devre dışı"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
 msgstr "Sınırsız görüntüleme uzaklığı etkin"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
 msgstr ""
+"Sınırsız görüntüleme uzaklığı etkinleştirildi, ancak oyun veya mod "
+"tarafından yasaklandı"
 
 #: src/client/game.cpp
 #, fuzzy, c-format
@@ -1601,6 +1576,8 @@ msgstr "Görüntüleme uzaklığı minimumda: %d"
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
 msgstr ""
+"Görüntüleme %d ( en düşük) olarak değiştirildi, ancak oyun veya mod "
+"tarafından %d ile sınırlandırıldı"
 
 #: src/client/game.cpp
 #, c-format
@@ -1617,6 +1594,8 @@ msgstr "Görüntüleme uzaklığı değişti: %d"
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
 msgstr ""
+"Görüntüleme uzaklığı %d ( en yüksek) olarak değiştirildi, ancak oyun veya "
+"mod tarafından %d ile sınırlandırıldı"
 
 #: src/client/game.cpp
 #, fuzzy, c-format
@@ -1636,14 +1615,9 @@ msgstr "Telkafes gösteriliyor"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Yakınlaştırma şu anda oyun veya mod tarafından devre dışı"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "tamam"
-
 #: src/client/gameui.cpp
-#, fuzzy
 msgid "Chat currently disabled by game or mod"
-msgstr "Yakınlaştırma şu anda oyun veya mod tarafından devre dışı"
+msgstr "Sohbet şu anda oyun veya mod tarafından devre dışı"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1689,23 +1663,20 @@ msgid "Caps Lock"
 msgstr "Caps Lock"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "Temizle"
+msgstr "Temizle Tuşu"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "CTRL"
+msgstr "Kontrol Tuşu"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "Sil"
+msgstr "Sil Tuşu"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "Aşağı Ok"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1752,9 +1723,8 @@ msgid "Insert"
 msgstr "Ekle"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "Sol CTRL"
+msgstr "Sol Ok"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1778,9 +1748,8 @@ msgstr "Sol Windows"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "Menü"
+msgstr "Menü Tuşu"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1866,9 +1835,8 @@ msgstr "Sayfa yukarı"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Duraklat"
+msgstr "Duraklat Tuşu"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1880,14 +1848,12 @@ msgid "Print"
 msgstr "Yazdır"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
-msgstr "Return"
+msgstr "Return Tuşu"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "Sağ CTRL"
+msgstr "Sağ Ok"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1919,9 +1885,8 @@ msgid "Select"
 msgstr "Seç"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Shift Tuşu"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1941,7 +1906,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "Yukarı Ok"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1952,9 +1917,8 @@ msgid "X Button 2"
 msgstr "X Düğme 2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
-msgstr "Yakınlaştır"
+msgstr "Yakınlaştır Tuşu"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
@@ -1974,27 +1938,39 @@ msgstr "Yüzey kipinde mini harita, Yakınlaştırma x%d"
 msgid "Minimap in texture mode"
 msgstr "Doku kipinde mini harita"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Web sayfası açılamadı"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
 msgid "%s is missing:"
-msgstr ""
+msgstr "%s eksik:"
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Install and enable the required mods, or disable the mods causing errors."
 msgstr ""
+"Gerekli modları kurun ve etkinleştirin veya hataya neden olan modları devre "
+"dışı bırakın."
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Note: this may be caused by a dependency cycle, in which case try updating "
 "the mods."
 msgstr ""
+"Not: Bu bir bağımlılık döngüsünden kaynaklanıyor olabilir, bu durumda "
+"modları güncellemeyi deneyin."
 
 #: src/content/mod_configuration.cpp
-#, fuzzy
 msgid "Some mods have unsatisfied dependencies:"
-msgstr "Katı bağımlılık yok"
+msgstr "Bazı modların karşılanmayan bağımlılıkları var:"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Failed to open webpage"
@@ -2086,7 +2062,7 @@ msgstr "Tuş zaten kullanımda"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr ""
+msgstr "Tuş atamaları."
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2164,6 +2140,19 @@ msgstr "Yakınlaştır"
 msgid "press key"
 msgstr "tuşa bas"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Web sayfası açılamadı"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Değiştir"
@@ -2197,6 +2186,7 @@ msgstr "Ses Seviyesi: %%%d"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "tr"
 
@@ -2204,11 +2194,12 @@ msgstr "tr"
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
 msgstr ""
+"Ad kayıtlı değil. Bu sunucuda bir hesap oluşturmak için 'Kaydol' düğmesine "
+"tıklayın"
 
 #: src/network/clientpackethandler.cpp
-#, fuzzy
 msgid "Name is taken. Please choose another name"
-msgstr "Lütfen bir ad seçin!"
+msgstr "Ad alındı. Lütfen başka bir ad seçin"
 
 #: src/server.cpp
 #, fuzzy, c-format
@@ -2283,7 +2274,7 @@ msgstr "Nehir vadilerini ve kanallarını belirleyen 2B gürültü."
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3B"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2419,14 +2410,6 @@ msgstr "Etkin nesne gönderme uzaklığı"
 msgid "Adds particles when digging a node."
 msgstr "Nodları kazarken parçacıklar ekler."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Ekranınızın (yalnızca Android/X11 olmayan) dpi yapılandırmasını ayarlayın "
-"ör: 4k ekranlar için."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2449,14 +2432,17 @@ msgstr ""
 "için her zaman test edin) katı yüzenkara katmanı yaratır."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Admin name"
-msgstr "Öge adını ekle"
+msgstr "Yönetici adı"
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
 msgstr "Gelişmiş"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2472,9 +2458,8 @@ msgstr ""
 "doğal gece ışığı üzerinde çok az etkisi vardır."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Always fly fast"
-msgstr "Daima uçma ve hızlı"
+msgstr "Her zaman hızlı uç"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
@@ -2497,14 +2482,12 @@ msgid "Announce to this serverlist."
 msgstr "Bu sunucu listesine duyur."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "Düzgünleştirme:"
+msgstr "Düzgünleştirme ölçeği"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "Düzgünleştirme:"
+msgstr "Düzgünleştirme yöntemi"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2518,6 +2501,17 @@ msgstr "Öge adını araç ipucuna ekle."
 msgid "Apple trees noise"
 msgstr "Elma ağaçları gürültüsü"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Kol eylemsizliği"
@@ -2535,18 +2529,39 @@ msgid "Ask to reconnect after crash"
 msgstr "Çökmeden sonra yeniden bağlanmak için sor"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"Bu uzaklıkta sunucu istemcilere gönderilecek blokları agresifçe\n"
+"iyileştirecektir.\n"
+"Küçük değerler potansiyel olarak görülebilir işleyici hataları pahasına "
+"(bazı bloklar\n"
+"su altında, mağaralarda ve de bazen karada işlenmeyecek) performansı "
+"oldukça\n"
+"iyileştirecektir. \n"
+"Bu değeri max_block_send_distance değerinden yükseğe ayarlamak bu\n"
+"iyileştirmeyi devre dışı kılar.\n"
+"Harita bloğu (16 nod) cinsinden."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "Bu uzaklıkta sunucu istemcilere gönderilecek blokları agresifçe\n"
 "iyileştirecektir.\n"
@@ -2561,7 +2576,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
-msgstr ""
+msgstr "Ses"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
@@ -2588,9 +2603,8 @@ msgid "Base terrain height."
 msgstr "Taban arazi yüksekliği."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "Minimum doku boyutu"
+msgstr "Temel doku boyutu"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2613,14 +2627,18 @@ msgid "Bind address"
 msgstr "Bağlı adres"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "Biyomlar"
+msgstr "Biyom API"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "Biyom Gürültüsü"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "Blok gönderme iyileştirme uzaklığı"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Blok gönderme iyileştirme uzaklığı"
@@ -2671,9 +2689,8 @@ msgid "Builtin"
 msgstr "Yerleşik"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Camera"
-msgstr "Kamera değiştir"
+msgstr "Kamera"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2804,9 +2821,8 @@ msgid "Client side modding restrictions"
 msgstr "İstemci tarafı modlama kısıtlamaları"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side Modding"
-msgstr "İstemci modlama"
+msgstr "İstemci tarafı modlama"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2842,6 +2858,12 @@ msgstr "Renkli sis"
 msgid "Colored shadows"
 msgstr "Renkli gölgeler"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2927,9 +2949,8 @@ msgid "Console height"
 msgstr "Konsol yüksekliği"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Content Repository"
-msgstr "Çevrim İçi İçerik Deposu"
+msgstr "İçerik Deposu"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
@@ -2958,6 +2979,8 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"Boştayken sıvı içinde batma hızını belirler. Negatif değerler batmak\n"
+"yerine yükselmenize neden olur."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -2993,7 +3016,7 @@ msgid ""
 "This also applies to the object crosshair."
 msgstr ""
 "Artı saydamlığı (solukluk, 0 ile 255 arasında).\n"
-"Ayrıca nesne artı rengi için de geçerlidir"
+"Ayrıca nesne artı rengi için de geçerlidir."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
@@ -3007,10 +3030,6 @@ msgstr ""
 "Artı rengi (R,G,B).\n"
 "Ayrıca nesne artı rengini de değiştirir"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Hata ayıklama günlük dosyası boyut eşiği"
@@ -3021,7 +3040,7 @@ msgstr "Hata ayıklama günlük düzeyi"
 
 #: src/settings_translation_file.cpp
 msgid "Debugging"
-msgstr ""
+msgstr "Hata ayıklama"
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
@@ -3065,6 +3084,23 @@ msgstr ""
 "eder,\n"
 "ancak aynı zamanda daha fazla kaynak kullanır."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Eski istemcilerin bağlanmasına izin vermemek için etkinleştirin.\n"
+"Eski istemciler yeni sunuculara bağlanırken çökmeyecek kadar uyumludur,\n"
+"ancak beklediğiniz tüm yeni özellikleri desteklemiyor olabilir."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Ağaçların elması olacağı alanları belirler."
@@ -3128,6 +3164,9 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"FSAA ve SSAA düzgünleştirme yöntemleri için örnekleme ızgarasının boyutunu "
+"tanımlar.\n"
+"2 değeri 2x2 = 4 örnek alınması anlamına gelir."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3196,9 +3235,8 @@ msgid "Desynchronize block animation"
 msgstr "Blok animasyonlarını eşzamansız yap"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Developer Options"
-msgstr "Dekorasyonlar"
+msgstr "Geliştirici Seçenekleri"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
@@ -3263,6 +3301,11 @@ msgstr "Hepsini etkinleştir"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Hasar Etkin"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3289,6 +3332,11 @@ msgstr ""
 "Doğru ise \"yumuşak gölgeler\" yapmak için Poisson diski kullanır. Değilse "
 "PCF filtreleme kullanır."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Joystick'leri etkinleştir"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3320,7 +3368,7 @@ msgstr "Joystick'leri etkinleştir"
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks. Requires a restart to take effect"
-msgstr ""
+msgstr "Joystick'leri etkinleştir. Etkili olması için yeniden başlatma gerekir"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
@@ -3334,6 +3382,11 @@ msgstr "Mod güvenliğini etkinleştir"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Rastgele kullanıcı girişini etkinleştir (yalnızca test için)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Rastgele kullanıcı girişini etkinleştir (yalnızca test için)."
@@ -3348,7 +3401,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable split login/register"
-msgstr ""
+msgstr "Ayrı oturum açmayı/kaydolmayı etkinleştir"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3362,6 +3415,11 @@ msgstr ""
 "Eski istemciler yeni sunuculara bağlanırken çökmeyecek kadar uyumludur,\n"
 "ancak beklediğiniz tüm yeni özellikleri desteklemiyor olabilir."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "Dokunmatik ekran"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3373,14 +3431,6 @@ msgstr ""
 "Sunucuya bağlanırken uzak sunucular medya (ör: dokular) indirmek için daha\n"
 "hızlı bir yol sunar."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Köşe arabellek nesnelerini etkinleştirin.\n"
-"Bu grafik performansını büyük ölçüde artırır."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3420,6 +3470,19 @@ msgstr "Envanter ögelerinin animasyonunu etkinleştirir."
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Yüz yönü döndürülmüş kafeslerin önbelleklenmesini etkinleştirir."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3463,7 +3526,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
-msgstr ""
+msgstr "FPS"
 
 #: src/settings_translation_file.cpp
 msgid "FPS when unfocused or paused"
@@ -3519,9 +3582,8 @@ msgid "Filmic tone mapping"
 msgstr "Filmsel ton eşleme"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering and Antialiasing"
-msgstr "Düzgünleştirme:"
+msgstr "Filtreleme ve Düzgünleştirme"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3585,9 +3647,8 @@ msgid "Fog start"
 msgstr "Sis başlangıcı"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font"
-msgstr "Yazı tipi boyutu"
+msgstr "Yazı tipi"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
@@ -3725,7 +3786,7 @@ msgstr "Tam ekran kipi."
 
 #: src/settings_translation_file.cpp
 msgid "GUI"
-msgstr ""
+msgstr "Grafiksel arayüz"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -3781,14 +3842,12 @@ msgid "Graphics"
 msgstr "Grafik"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Graphics Effects"
-msgstr "Grafik"
+msgstr "Grafik Efektleri"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Graphics and Audio"
-msgstr "Grafik"
+msgstr "Grafikler ve Ses"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
@@ -3808,7 +3867,7 @@ msgstr "HTTP modları"
 
 #: src/settings_translation_file.cpp
 msgid "HUD"
-msgstr ""
+msgstr "HUD"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3851,10 +3910,8 @@ msgid "Heat noise"
 msgstr "Isı gürültüsü"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
-msgstr ""
-"İlk pencere boyutunun yükseklik bileşeni. Tam ekran kipinde yok sayılır."
+msgstr "İlk pencere boyutunun yükseklik bileşeni."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -4305,7 +4362,7 @@ msgstr "Zıplama hızı"
 
 #: src/settings_translation_file.cpp
 msgid "Keyboard and Mouse"
-msgstr ""
+msgstr "Klavye ve Fare"
 
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
@@ -4358,17 +4415,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "Sunucunun tık uzunluğu ve nesnelerin genellikle ağ üzerinden güncelleneceği\n"
 "aralık."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "Dalgalanan sıvılar dalga hızı"
+msgstr "Sıvı dalgalarının uzunluğu."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4435,9 +4492,8 @@ msgid "Light curve low gradient"
 msgstr "Işık eğrisi düşük gradyan"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lighting"
-msgstr "Yumuşak Aydınlatma"
+msgstr "Aydınlatma"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4535,10 +4591,6 @@ msgstr ""
 "Sis ve gökyüzü renklerini gün saatine (şafak/günbatımı) ve bakış yönüne "
 "bağlı değiştir."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Tüm sıvıları opak yapar"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "Hafıza deposu için harita sıkıştırma düzeyi"
@@ -4594,11 +4646,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Mapgen v5'e özgü harita üretim değerleri."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "Mapgen v6'ya özgü harita üretim değerleri.\n"
 "'snowbiomes' bayrağı yeni 5 biyom sistemini etkinleştirir.\n"
@@ -4644,10 +4699,6 @@ msgstr "Harita bloğu ızgara üretim gecikmesi"
 msgid "Mapblock mesh generation threads"
 msgstr "Harita bloğu ızgara üretim gecikmesi"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Harita Bloğu ızgara üretecinin Harita Bloğu önbellek boyutu MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "Harita bloğu boşaltma zaman aşımı"
@@ -4917,6 +4968,11 @@ msgstr "Sohbete yazılacak en az günlük düzeyi."
 msgid "Minimap scan height"
 msgstr "Mini harita tarama yüksekliği"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "Yerleştirme tekrarlama aralığı"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Her harita yığını için rastgele büyük mağara sayısının alt sınırı."
@@ -4931,7 +4987,7 @@ msgstr "Mip eşleme"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Çeşitli"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4939,9 +4995,8 @@ msgid "Mod Profiler"
 msgstr "Profilci"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Security"
-msgstr "Güvenlik"
+msgstr "Mod Güvenliği"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
@@ -4988,6 +5043,11 @@ msgstr "Fare hassasiyeti"
 msgid "Mouse sensitivity multiplier."
 msgstr "Fare hassasiyet çarpanı."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Oyuk eşiği"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Çamur gürültüsü"
@@ -5041,7 +5101,6 @@ msgstr ""
 "Bu değer ana menüden başlatırken geçersiz kılınır."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Networking"
 msgstr "Ağ"
 
@@ -5107,7 +5166,6 @@ msgstr ""
 "arasında bir dengedir."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
 msgstr "Bir oyuncunun her 10 saniyede bir gönderebileceği ileti sayısı."
 
@@ -5127,10 +5185,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr "Sunucu tarafı oklüzyon ayırma"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Opak sıvılar"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5147,9 +5201,14 @@ msgstr ""
 "Pencere odağı kaybolduğunda duraklat menüsünü aç. Bir formspec açıksa\n"
 "duraklamaz."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "OpenGL debug"
+msgstr "Mapgen hata ayıklama"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
-msgstr ""
+msgstr "Sohbet web bağlantısı rengi için isteğe bağlı geçersiz kılma."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -5288,6 +5347,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Sıvı içeren büyük mağaraların oranı."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Protokol sürümü uyumsuz. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5306,6 +5374,10 @@ msgstr "Nehirler etrafında vadiler yapmak için araziyi yükseltir."
 msgid "Random input"
 msgstr "Rasgele giriş"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Son Sohbet İletileri"
@@ -5315,7 +5387,6 @@ msgid "Regular font path"
 msgstr "Normal yazı tipi konumu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Remember screen size"
 msgstr "Ekran boyutunu hatırla"
 
@@ -5455,9 +5526,8 @@ msgstr ""
 "ölçeklendiğinde bazı kenar piksellerde bulanıklığa neden olur."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screen"
-msgstr "Ekran:"
+msgstr "Ekran"
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
@@ -5490,9 +5560,8 @@ msgstr ""
 "Öntanımlı kalite için 0 kullanın."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshots"
-msgstr "Ekran yakala"
+msgstr "Ekran görüntüleri"
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5517,8 +5586,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5588,9 +5657,8 @@ msgstr ""
 "18 = 4D \"Mandelbulb\" Julia seti."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server"
-msgstr "Sunucu URL'si"
+msgstr "Sunucu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -5598,9 +5666,8 @@ msgid "Server Gameplay"
 msgstr "Sunucu adı"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server Security"
-msgstr "Sunucu Açıklaması"
+msgstr "Sunucu Güvenliği"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
@@ -5664,8 +5731,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 "Dili ayarlayın. Sistem dilini kullanmak için boş bırakın.\n"
@@ -5715,6 +5783,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Set to true to enable waving leaves."
@@ -5763,11 +5835,11 @@ msgid "Shaders"
 msgstr "Gölgelemeler"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "Gölgelemeler gelişmiş görsel efektlere izin verir ve bazı ekran kartlarında "
 "performansı\n"
@@ -5853,16 +5925,6 @@ msgstr ""
 "Bu değeri düşürmek mağara ve zindan yoğunluğunu azaltır.\n"
 "Bu değerin, değiştirilmesi özel kullanım içindir, değiştirilmemesi önerilir."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Izgara üretecinin Harita Bloğu önbellek boyutu. Bunu artırmak önbellek\n"
-"vuruş yüzdesini artırır, ana işlem parçasından kopyalanan veriyi azaltır,\n"
-"sonuç olarak yırtılmayı azaltır."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Gökyüzü Gövdesi Yörünge Eğimi"
@@ -5899,7 +5961,7 @@ msgstr "Yumuşak aydınlatma"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "Sinematik kipte kamera dönüşünü yumuşatır. 0 devre dışı bırakır."
 
 #: src/settings_translation_file.cpp
@@ -5921,6 +5983,15 @@ msgstr "Sızma hızı, saniye başına nod cinsinden."
 msgid "Soft shadow radius"
 msgstr "Yumuşak gölge yarıçapı"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Ses"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB: Kara Liste"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -6128,19 +6199,39 @@ msgstr ""
 "`/profiler save [biçim]` biçim olmadan çağırıldığında,\n"
 "profillerin kayıt edileceği öntanımlı biçim."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr "Profillerin içine kaydedileceği, dünya konumuna bağlı dosya konumu."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Kullanılacak joystick'in tanımlayıcısı"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 "Dokunmatik ekran etkileşiminin başlaması için gereken piksel cinsinde "
 "uzunluk."
@@ -6159,6 +6250,16 @@ msgstr ""
 "Öntanımlı 1.0'dır (1/2 nod).\n"
 "Dalgalanan sıvılar etkin kılınmalıdır."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Yerleştirme tuşuna basılı tutarken tekrarlanan düğüm yerleşimleri arasında "
+"geçen\n"
+"saniye cinsinden süre."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Sunucunun dinlediği ağ arayüzü."
@@ -6195,7 +6296,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "İşleme arka ucu.\n"
 "Bunu değiştirdikten sonra yeniden başlatma gerekir.\n"
@@ -6283,6 +6384,10 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 "Birlikte tepe/dağ aralık yüksekliğini belirleyen 4 2D gürültüden üçüncüsü."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6328,29 +6433,26 @@ msgid "Tooltip delay"
 msgstr "İpucu gecikmesi"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen"
-msgstr "Dokunmatik ekran eşiği"
+msgstr "Dokunmatik ekran"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "Fare hassasiyeti"
+msgstr "Dokunmatik ekran hassasiyeti"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "Fare hassasiyet çarpanı."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Dokunmatik ekran eşiği"
+msgstr "Dokunmatik ekran hassasiyet çarpanı."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Translucent liquids"
+msgstr "Opak sıvılar"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr ""
@@ -6388,9 +6490,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
-msgstr ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr "En yeni Minetest sürümü hakkında bilgi sağlayan JSON dosyasının URL'si"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6500,11 +6605,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
+msgstr "Kullanıcı Arayüzleri"
 
 #: src/settings_translation_file.cpp
 msgid "VSync"
@@ -6571,6 +6672,8 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
+"Dikey ekran eşzamanlaması. Bu devre dışı bırakılsa bile sisteminiz VSync'i "
+"açmaya zorlayabilir."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6596,6 +6699,10 @@ msgstr "Sanal joystick Aux1 düğmesini tetikler"
 msgid "Volume"
 msgstr "Ses"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6604,6 +6711,16 @@ msgstr ""
 "Tüm seslerin yüksekliği.\n"
 "Ses sistemi etkin kılınmalıdır."
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "Odaklanmadığında veya duraklatıldığında FPS"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Yumuşak aydınlatma"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6743,7 +6860,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "Pencerenin büyütülüp büyütülmeyeceği."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6779,10 +6896,8 @@ msgstr ""
 "ile aynı etkiye sahiptir)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
-msgstr ""
-"İlk pencere boyutunun genişlik bileşeni. Tam ekran kipinde yok sayılır."
+msgstr "İlk pencere boyutunun genişlik bileşeni."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
@@ -6790,7 +6905,7 @@ msgstr "Nodlar etrafındaki seçim kutusu çizgilerinin genişliği."
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "Pencere büyütüldü"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6888,7 +7003,7 @@ msgstr "Deniz yatağının Y-seviyesi."
 
 #: src/settings_translation_file.cpp
 msgid "cURL"
-msgstr ""
+msgstr "cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
@@ -6902,12 +7017,18 @@ msgstr "cURL etkileşimli zaman aşımı"
 msgid "cURL parallel limit"
 msgstr "cURL paralel sınırı"
 
+#~ msgid "- Address: "
+#~ msgstr "- Adres: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Yaratıcı Kip: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Hasar: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Port: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6942,6 +7063,13 @@ msgstr "cURL paralel sınırı"
 #~ "Yerel bir sunucu başlatmak için bunu boş bırakın.\n"
 #~ "Ana menüdeki adres alanının bu ayarı geçersiz kılacağını unutmayın."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Ekranınızın (yalnızca Android/X11 olmayan) dpi yapılandırmasını ayarlayın "
+#~ "ör: 4k ekranlar için."
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6987,6 +7115,9 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Tam ekran kipinde piksel başına bit (renk derinliği)."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Blok sınırları tüm bloklar için gösteriliyor"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Tümsek Eşleme"
 
@@ -7012,6 +7143,9 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Işık eğrisi orta-artırmanın merkezi."
 
+#~ msgid "Change Keys"
+#~ msgstr "Tuşları değiştir"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Tuşları değiştir"
@@ -7085,6 +7219,38 @@ msgstr "cURL paralel sınırı"
 #~ "Tünellerin genişliğini denetler, daha küçük bir değer daha geniş tüneller "
 #~ "yaratır."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Kontroller:\n"
+#~ "- %s: ileri hareket\n"
+#~ "- %s: geri hareket\n"
+#~ "- %s: sola hareket\n"
+#~ "- %s: sağa hareket\n"
+#~ "- %s: zıpla/tırman\n"
+#~ "- %s: kaz/vur/kullan\n"
+#~ "- %s: yerleştir/kullan\n"
+#~ "- %s: sız/aşağı in\n"
+#~ "- %s: ögeyi at\n"
+#~ "- %s: envanter\n"
+#~ "- Fare: dön/bak\n"
+#~ "- Fare tekerleği: öge seç\n"
+#~ "- %s: sohbet\n"
+
 #~ msgid "Creative"
 #~ msgstr "Yaratıcı"
 
@@ -7094,6 +7260,9 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "Artı rengi (R,G,B)."
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Hasar"
 
@@ -7189,6 +7358,13 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Enable register confirmation"
 #~ msgstr "Kayıt onayını etkinleştir"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Köşe arabellek nesnelerini etkinleştirin.\n"
+#~ "Bu grafik performansını büyük ölçüde artırır."
+
 #~ msgid "Enabled"
 #~ msgstr "Etkin"
 
@@ -7498,6 +7674,9 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Instrumentation"
 #~ msgstr "Belgeleme"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Geçersiz oyun özellikleri."
+
 #~ msgid "Inventory key"
 #~ msgstr "Envanter tuşu"
 
@@ -8191,6 +8370,12 @@ msgstr "cURL paralel sınırı"
 #~ "DirectX'in LuaJIT ile çalışmasını sağlar. Sorunlara neden olursa devre "
 #~ "dışı bırakın."
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Tüm sıvıları opak yapar"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Harita Bloğu ızgara üretecinin Harita Bloğu önbellek boyutu MB"
+
 #~ msgid "Menus"
 #~ msgstr "Menüler"
 
@@ -8429,15 +8614,22 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Simple Leaves"
 #~ msgstr "Basit Yapraklar"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Izgara üretecinin Harita Bloğu önbellek boyutu. Bunu artırmak önbellek\n"
+#~ "vuruş yüzdesini artırır, ana işlem parçasından kopyalanan veriyi "
+#~ "azaltır,\n"
+#~ "sonuç olarak yırtılmayı azaltır."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Yumuşak Aydınlatma"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "Kamera dönüşünü yumuşatır. 0 devre dışı bırakır."
 
-#~ msgid "Sound"
-#~ msgstr "Ses"
-
 #~ msgid "Special"
 #~ msgstr "Özel"
 
@@ -8497,6 +8689,9 @@ msgstr "cURL paralel sınırı"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Dokunuş eşiği: (px)"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Dokunmatik ekran eşiği"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Trilineer Filtre"
 
@@ -8541,6 +8736,9 @@ msgstr "cURL paralel sınırı"
 #~ "0'da ise düzgünleştirme kapalıdır.\n"
 #~ "Ayarları değiştirdikten sonra yenileme gereklidir."
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr ""
 #~ "Tepe yüksekliğinin ve göl derinliğinin yüzenkara düz arazide değişimi."
@@ -8632,8 +8830,14 @@ msgstr "cURL paralel sınırı"
 #~ msgid "You died."
 #~ msgstr "Öldün."
 
+#~ msgid "You have no games installed."
+#~ msgstr "Kurulu oyununuz yok."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "tamam"
diff --git a/po/tt/minetest.po b/po/tt/minetest.po
index b6773dca5..0541722b9 100644
--- a/po/tt/minetest.po
+++ b/po/tt/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-10-29 05:22+0000\n"
 "Last-Translator: Timur Seber <seber.tatsoft@gmail.com>\n"
 "Language-Team: Tatar <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -73,7 +73,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -83,13 +83,9 @@ msgstr ""
 
 #: builtin/common/chatcommands.lua
 #, fuzzy
-msgid "[all | <cmd>]"
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <команда>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Ярар"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<мөмкин түгел>"
@@ -108,6 +104,10 @@ msgstr "Хата килеп чыкты:"
 msgid "Main menu"
 msgstr "Төп меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Ярар"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Яңадан тоташу"
@@ -137,174 +137,181 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Төп менюга кире кайту"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Уеннар"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Урнаштыру"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Йөкләнә..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Модлар"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Яңартулар юк"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Бетерү"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Яңарту"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Баш тарту"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 #, fuzzy
 msgid "Dependencies:"
 msgstr "Бәйләнешләр:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Уеннар"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Урнаштыру"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "$1 урнаштыру"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Йөкләнә..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Модлар"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Яңартулар юк"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Табылмады"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Бетерү"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Яңарту"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -452,10 +459,20 @@ msgstr "Булдыру"
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -818,10 +835,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -832,7 +845,8 @@ msgstr "Чат"
 msgid "Clear"
 msgstr "Чистарту"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1036,6 +1050,16 @@ msgstr "Уен урнаштыру"
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Яңа"
@@ -1070,7 +1094,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1151,18 +1175,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Төп меню"
@@ -1187,27 +1203,21 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Медиа-файллар..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Address: "
-msgstr "- Адрес: "
-
 #: src/client/game.cpp
 #, fuzzy
 msgid "- Mode: "
 msgstr "- Режим: "
 
-#: src/client/game.cpp
-#, fuzzy
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1242,10 +1252,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1290,6 +1296,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1298,32 +1308,13 @@ msgstr ""
 msgid "Continue"
 msgstr "Дәвам итү"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1403,6 +1394,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1423,10 +1418,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr "КБ/с"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Медиа-файллар..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "МБ/с"
@@ -1582,10 +1573,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "ярар"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1912,6 +1899,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2103,6 +2099,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Үзгәртү"
@@ -2136,6 +2144,7 @@ msgstr "Тавыш көче: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "tt"
 
@@ -2321,12 +2330,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2349,6 +2352,10 @@ msgstr ""
 msgid "Advanced"
 msgstr "Өстәмә"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2402,6 +2409,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2423,12 +2441,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2492,6 +2519,10 @@ msgstr "Биомнар"
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2706,6 +2737,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2837,11 +2874,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2891,6 +2923,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3075,6 +3120,11 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Барысын да кабызу"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3094,6 +3144,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3136,6 +3190,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3159,6 +3217,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3167,12 +3229,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3202,6 +3258,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4004,9 +4073,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4152,10 +4222,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4204,7 +4270,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4239,10 +4307,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4484,6 +4548,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4552,6 +4620,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4660,10 +4732,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4676,6 +4744,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4785,6 +4857,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4800,6 +4880,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4988,8 +5072,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5107,7 +5191,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5140,6 +5224,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5179,8 +5267,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5250,13 +5337,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5292,7 +5372,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5313,6 +5393,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5469,17 +5557,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5490,6 +5598,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5516,7 +5630,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5573,6 +5687,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5620,11 +5738,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5662,7 +5780,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5760,10 +5880,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5850,12 +5966,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6092,15 +6220,30 @@ msgstr ""
 msgid "cURL parallel limit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "- Address: "
+#~ msgstr "- Адрес: "
+
+#, fuzzy
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid "3d"
 #~ msgstr "өч үлчәмле"
 
 #~ msgid "Creative"
 #~ msgstr "Иҗади"
 
+#, fuzzy
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Зыян"
 
 #, fuzzy
 #~ msgid "You died."
 #~ msgstr "Сез үлдегез"
+
+#~ msgid "ok"
+#~ msgstr "ярар"
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 5567affc3..045a723e7 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -2,18 +2,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ukrainian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-12-02 05:17+0000\n"
-"Last-Translator: YearOfFuture <prikolnanozkaz@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-04 22:09+0000\n"
+"Last-Translator: Yof <Yof@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
 "minetest/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -72,8 +72,8 @@ msgid "Command not available: "
 msgstr "Команда недоступна: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "Отримати довідку щодо команд"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "Отримати довідку щодо команд (-t: вивести у чаті)"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -83,12 +83,8 @@ msgstr ""
 "all', щоб перелічити все."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <команда>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "Добре"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <команда>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -106,6 +102,10 @@ msgstr "Виникла помилка:"
 msgid "Main menu"
 msgstr "Головне меню"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "Добре"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Перепідключення"
@@ -134,19 +134,27 @@ msgstr "Ми підтримуємо лише протокол версії $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ми підтримуємо протокол між версіями $1 і $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" вже існує. Бажаєте перезаписати?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "Помилка встановлення \"$1\": $2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Будє встановлено залежності $1 та $2."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "Не вдалося завантажити \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 з $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Не вдалося завантажити $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+"Не вдалося витягти \"$1\" (недостатнє місце на диску, непідтримуваний тип "
+"файлу або пошкоджений архів)"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -154,157 +162,157 @@ msgstr ""
 "$1 завантажується,\n"
 "$2 у черзі"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "$1 завантажується..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "$1 необхідних залежностей не знайдено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 буде встановлено, а $2 залежностей буде пропущено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Усі пакунки"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Вже встановлено"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Назад до головного меню"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB недоступний, якщо Minetest було скомпільовано без cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Завантаження..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "Помилка при отриманні залежностей для пакунку"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Ігри"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Встановити"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Завантаження..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Моди"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Не вдалося отримати пакунки"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Нічого не знайдено"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Немає оновлень"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "У черзі"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Набори текстур"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "Пакунок $1/$2 не знайдено."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Видалити"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Оновити"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Оновити все [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Переглянути більше інформації у веб-браузері"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "Вам потрібно встановити гру перед тим, як встановлювати мод"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Буде встановлено залежності $1 та $2."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 з $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 необхідних залежностей не знайдено."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 буде встановлено, а $2 залежностей буде пропущено."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Вже встановлено"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Основна гра:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB недоступний, якщо Minetest було скомпільовано без cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Залежності:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Завантаження..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "Помилка встановлення \"$1\": $2"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr "Не вдалося завантажити \"$1\""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Не вдалося завантажити $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-"Не вдалося витягти \"$1\" (непідтримуваний тип файлу або пошкоджений архів)"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Ігри"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Встановити"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Встановити $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Встановити відсутні залежності"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Завантаження..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Моди"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Не вдалося отримати пакунки"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Нічого не знайдено"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Оновлення відсутні"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Перезаписати"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Будь ласка, перевірте коректність основної гри."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "У черзі"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" вже існує. Бажаєте перезаписати?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Набори текстур"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr "Пакунок $1/$2 не знайдено."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Видалити"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Оновити"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Оновити все [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Переглянути більше інформації у веб-браузері"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "Вам потрібно встановити гру перед тим, як встановлювати мод"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Перезаписати"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -368,7 +376,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr "Знайти більше модів"
+msgstr "Більше модів"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -452,10 +460,22 @@ msgstr "Створити"
 msgid "Decorations"
 msgstr "Декорації"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr "Храми пустель"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "Тестова розробка призначена для розробників."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+"Інший варіант підземель, що генерується у біомах пустелі (тільки якщо "
+"увімкнені підземелля)"
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Підземелля"
@@ -567,15 +587,15 @@ msgstr "Споруди, що з’являються на місцевості,
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr "Помірний клімат, пустеля"
+msgstr "Помірний, пустеля"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr "Помірний клімат, пустелі, джунглі"
+msgstr "Помірний, пустелі, джунглі"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr "Помірний клімат, пустеля, джунглі, тундра, тайга"
+msgstr "Помірний, пустеля, джунглі, тундра, тайга"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
@@ -646,7 +666,7 @@ msgstr "Паролі не збігаються"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
 msgid "Register"
-msgstr "Зареєструватися"
+msgstr "Реєстрація"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
@@ -753,7 +773,7 @@ msgstr "Виберіть файл"
 
 #: builtin/mainmenu/settings/components.lua
 msgid "Set"
-msgstr "Налаштувати"
+msgstr "Задати"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -832,10 +852,6 @@ msgstr "Доступність"
 msgid "Back"
 msgstr "Назад"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Змінити клавіші"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -845,7 +861,8 @@ msgstr "Чат"
 msgid "Clear"
 msgstr "Очистити"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Керування"
 
@@ -972,7 +989,7 @@ msgstr "Попередні основні розробники"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Share debug log"
-msgstr "Ділитися даними зневадження"
+msgstr "Ділитися зневадженням"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
@@ -1032,7 +1049,7 @@ msgstr "Творчий режим"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "Дозволити пошкодження"
+msgstr "Пошкодження"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
@@ -1050,6 +1067,17 @@ msgstr "Встановити гру"
 msgid "Install games from ContentDB"
 msgstr "Встановити ігри з ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest більше не встановлювається з грою."
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+"Minetest – це ігрова платформа, що дозволяє вам грати у багато різних ігор."
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Новий"
@@ -1060,7 +1088,7 @@ msgstr "Світ не створено або не обрано!"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
-msgstr "Грати гру"
+msgstr "Грати в гру"
 
 #: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_online.lua
 msgid "Port"
@@ -1083,8 +1111,8 @@ msgid "Start Game"
 msgstr "Почати гру"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Ви не маєте встановлених ігор."
+msgid "You need to install a game before you can create a world."
+msgstr "Вам потрібно встановити гру перед ти, як створювати світ."
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1097,7 +1125,7 @@ msgstr "Творчий режим"
 #. ~ PvP = Player versus Player
 #: builtin/mainmenu/tab_online.lua
 msgid "Damage / PvP"
-msgstr "Пошкодження / ГпГ"
+msgstr "Пошкодження / PvP"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Favorites"
@@ -1163,18 +1191,10 @@ msgstr "Завантаження текстур..."
 msgid "Rebuilding shaders..."
 msgstr "Перебудова відтінювачів..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Помилка зʼєднання (час вийшов?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Неможливо знайти або завантажити гру: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "Помилкова конфігурація gamespec."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Основне меню"
@@ -1199,7 +1219,11 @@ msgstr "Не вдалося відкрити файл паролю: "
 msgid "Provided world path doesn't exist: "
 msgstr "Вказаний шлях до світу не існує: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "Ресурси..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1207,18 +1231,10 @@ msgstr ""
 "\n"
 "Подробиці у файлі debug.txt."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Адреса: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Режим: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Порт: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Публічний: "
@@ -1253,10 +1269,6 @@ msgstr "Автоматичний рух вперед увімкнено"
 msgid "Block bounds hidden"
 msgstr "Межі блоків приховані"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Межі показуються в усіх блоків"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Межі показуються у поточного блоку"
@@ -1301,6 +1313,10 @@ msgstr "Сценарії на боці клієнта вимкнено"
 msgid "Connecting to server..."
 msgstr "Підключення до сервера..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Помилка зʼєднання (час вийшов?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Невдале зʼєднання з невідомих причин"
@@ -1309,46 +1325,13 @@ msgstr "Невдале зʼєднання з невідомих причин"
 msgid "Continue"
 msgstr "Продовжити"
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Керування:\n"
-"- %s: рухатися вперед\n"
-"- %s: рухатися назад\n"
-"- %s: рухатися вліво\n"
-"- %s: рухатися вправо\n"
-"- %s: стрибати/лізти вгору\n"
-"- %s: копати/вдарити/використати\n"
-"- %s: поставити/використати\n"
-"- %s: крастися/лізти вниз\n"
-"- %s: кинути предмет\n"
-"- %s: інвентар\n"
-"- Миша: поворот/дивитися\n"
-"- Коліщатко миші: вибір предмета\n"
-"- %s: чат\n"
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1358,16 +1341,16 @@ msgid ""
 " --> place single item to slot\n"
 msgstr ""
 "Керування:\n"
-"Коли меню не відображається:\n"
-"- провести пальцем: роззирнутися\n"
-"- дотик: встановити/використати\n"
-"- довгий дотик: копати/вдарити/використати\n"
-"Коли відображається меню або інвертар:\n"
-"- дотикнутися двічі (поза межами):\n"
+"Коли немає відкритих меню:\n"
+"- проведення пальцем: роззирнутися\n"
+"- дотик: встановити/вдарити/використати\n"
+"- довгий дотик: копати/використати\n"
+"У відкритому меню або інвертарі:\n"
+"- подвійний дотик (поза межами):\n"
 " --> закрити\n"
-"- Торкнутися купи, торкнутися комірки:\n"
+"- доторкання купи, доторкання комірки\n"
 " --> перемістити купу\n"
-"- Торкнутися і тягнути, дотикнутися другим пальцем\n"
+"- доторкання і перетягування, дотик другим пальцем\n"
 " --> помістити один предмет у комірку\n"
 
 #: src/client/game.cpp
@@ -1440,6 +1423,10 @@ msgstr "Туман вимкнено"
 msgid "Fog enabled"
 msgstr "Туман увімкнено"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "Туман увімкнено грою або модом"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Інформація про гру:"
@@ -1460,10 +1447,6 @@ msgstr "Визначення предметів..."
 msgid "KiB/s"
 msgstr "КіБ/сек"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "Ресурси..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "МіБ/сек"
@@ -1619,10 +1602,6 @@ msgstr "Показ трикутників"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Наближення (бінокль) вимкнено грою або модифікацією"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "добре"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "Чат зараз вимкнено грою або модом"
@@ -1887,7 +1866,7 @@ msgstr "Scroll Lock"
 #. ~ Key name
 #: src/client/keycode.cpp
 msgid "Select"
-msgstr "Вибрати"
+msgstr "Select"
 
 #: src/client/keycode.cpp
 msgid "Shift Key"
@@ -1943,6 +1922,15 @@ msgstr "Мінімапа в режимі поверхні. Наближення
 msgid "Minimap in texture mode"
 msgstr "Мінімапа в текстурному режимі"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Не вдалося скомпілювати шейдер \"%s\"."
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "Відтінювачі увімкнені, але GLSL не підтримується драйвером."
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2136,6 +2124,18 @@ msgstr "Збільшити"
 msgid "press key"
 msgstr "натисніть клавішу"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "Відкрити"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "Відкрити URL?"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "Не вдалося відкрити URL"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Змінити"
@@ -2169,6 +2169,7 @@ msgstr "Гучність звуку: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "uk"
 
@@ -2199,13 +2200,13 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) зміщення фракталу від центру світа у одиницях 'масшабу'. \n"
-"Використовується для пересування бажаної точки до (0, 0) щоб \n"
-"створити придатну точку переродження або для 'наближення' \n"
-"до бажаної точки шляхом збільшення 'масштабу'. Значення за \n"
-"замовчанням налаштоване для придатної точки переродження \n"
-"для множин Мандельбро з параметрами за замовчанням; може \n"
-"потребувати зміни у інших ситуаціях. Діапазон приблизно від -2 \n"
+"(X,Y,Z) зміщення фракталу від центру світа у одиницях 'масшабу'.\n"
+"Використовується для пересування бажаної точки до (0, 0) щоб\n"
+"створити придатну точку переродження або для 'наближення'\n"
+"до бажаної точки шляхом збільшення 'масштабу'. Значення за\n"
+"замовчанням налаштоване для придатної точки переродження\n"
+"для множин Мандельбро з параметрами за замовчанням; може\n"
+"потребувати зміни у інших ситуаціях. Діапазон приблизно від -2\n"
 "до 2. Помножте на 'масштаб' щоб отримати зміщення у блоках."
 
 #: src/settings_translation_file.cpp
@@ -2219,11 +2220,11 @@ msgid ""
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
 "(X,Y,Z) масштаб фракталу у блоках.\n"
-"Фактичний розмір фракталу буде у 2-3 рази більшим. Ці \n"
-"числа можуть бути дуже великими, фрактал не обов'язково \n"
-"має поміститися у світі. Збільшіть їх щоб 'наблизити' деталі \n"
-"фракталу. Числа за замовчанням підходять для вертикально \n"
-"стисненої форми, придатної для острова, встановіть усі три \n"
+"Фактичний розмір фракталу буде у 2-3 рази більшим. Ці\n"
+"числа можуть бути дуже великими, фрактал не обов'язково\n"
+"має поміститися у світі. Збільшіть їх щоб 'наблизити' деталі\n"
+"фракталу. Числа за замовчанням підходять для вертикально\n"
+"стисненої форми, придатної для острова, встановіть усі три\n"
 "числа рівними для форми без трансформації."
 
 #: src/settings_translation_file.cpp
@@ -2359,7 +2360,7 @@ msgstr "Обмеження часу ABM"
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Абсолютний ліміт відображення блоків з черги"
+msgstr "Абс. ліміт відображення блоків з черги"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2389,19 +2390,10 @@ msgstr "Діапазон надсилання активних об'єктів"
 msgid "Adds particles when digging a node."
 msgstr "Додавати часточки при копанні блока."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Налаштувати dpi на вашому екрані (тільки не X11/Android), напр. для 4k-"
-"екранів."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
-"Налаштування виявленої щільності дисплея, використовується для масштабування "
-"елементів інтерфейсу."
+"Налаштуйте виявлену щільність дисплея для масштабування елементів інтерфейсу."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2428,6 +2420,10 @@ msgstr "Ім'я адміністратора"
 msgid "Advanced"
 msgstr "Додатково"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "Дозволяє рідинам бути напівпрозорими."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2436,9 +2432,9 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
-"Змінює криву світла застосовуючи до неї 'гамма-корекцію'.\n"
+"Змінює криву світла застосовуючи до неї \"гамма-корекцію\".\n"
 "Більше значення робить середній і нижчий рівень яскравості освітлення.\n"
-"Значення '1.0' залишає криву світла незмінною.\n"
+"Значення \"1.0\" залишає криву світла незмінною.\n"
 "Це впливає лише на денне і штучне світло,\n"
 "воно мало впливає на природне нічне світло."
 
@@ -2486,6 +2482,24 @@ msgstr "Додавати назви предметів до підказок."
 msgid "Apple trees noise"
 msgstr "Шум яблунь"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+"Застосуйте згладжування, щоб зменшити кількість артефактів кольорових смуг.\n"
+"Згладжування значно збільшує розмір знімків екрана, стиснутих без втрат,\n"
+"і працює некоректно, якщо екран або операційна система виконує\n"
+"додаткове згладжування або якщо кольорові канали не квантуються\n"
+"до 8 бітів.\n"
+"З OpenGL ES згладжування працює лише якщо відтінювач підтримує високу\n"
+"точність чисел з плаваючою комою й може більше впливати на продуктивність."
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Інерція руки"
@@ -2509,20 +2523,34 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
-"На цій відстані сервер буде агресивно оптимізувати те, які блоки\n"
-"надсилаються клієнтам.\n"
-"Маленькі значення можуть значно покращити продуктивність, за\n"
-"рахунок проблем відображення (деякі блоки не будуть\n"
-"відображені під водою й у печерах, а також иноді на поверхні).\n"
-"Виставлення цього до значення, що більше, ніж\n"
-"max_block_send_distance, вимикає цю оптимізацію.\n"
+"На цій відстані сервер буде агресивно оптимізувати, які блоки\n"
+"надсилатимуться клієнтам.\n"
+"Меньші значення потенційно значно підвищують продуктивність за рахунок\n"
+"проблем промальовування (блоки можуть неправильно відображатися у печерах).\n"
+"Виставлення цього до значення більше за max_block_send_distance вимикає\n"
+"цю оптимізацію.\n"
+"Зазначається у блоках мапи (16 блоків)."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"На цій відстані сервер буде виконувати простіше й дешевше перевірку "
+"затінення.\n"
+"Меньші значення потенційно підвищують продуктивність, за рахунок тимчасово\n"
+"видимих проблем відображення (зниклі блоки).\n"
+"Це особливо корисно для дуже великого діапазону огляду (понад 500).\n"
 "Зазначається у блоках мапи (16 блоків)."
 
 #: src/settings_translation_file.cpp
@@ -2585,6 +2613,10 @@ msgstr "API біомів"
 msgid "Biome noise"
 msgstr "Шум біому"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr "Відстань оптимізації вибракування блоків"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "Оптимальна відстань надсилання блока"
@@ -2770,7 +2802,7 @@ msgstr "Моди з боку клієнта"
 
 #: src/settings_translation_file.cpp
 msgid "Client-side node lookup range restriction"
-msgstr "Обмеження діапазону пошуку блоків на боці клієнта"
+msgstr "Обмеження відстані пошуку блоків клієнта"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -2800,6 +2832,15 @@ msgstr "Кольоровий туман"
 msgid "Colored shadows"
 msgstr "Кольорові тіні"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+"Розділений комами перелік розширень AL і ALC, які не повинно використовувати."
+"\n"
+"Корисно для тестування. Подробиці у файлах al_extensions.[h,cpp]."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2810,9 +2851,9 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
-"Розділений комами перелік міток, які треба приховувати у репозиторії "
-"вмісту.\n"
-"\"nonfree\" використовується для приховання пакетів, що не є \"вільним "
+"Розділений комами перелік міток, які треба приховувати у репозиторії вмісту."
+"\n"
+"\"nonfree\" використовується для приховання пакунків, що не є \"вільним "
 "програмним\n"
 "забезпеченням\", як визначено Фондом вільного програмного забезпечення.\n"
 "Ви також можете вказувати оцінки вмісту.\n"
@@ -2877,7 +2918,7 @@ msgstr "З'єднує скло, якщо підтримується блоком
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr "Прозорість консолі"
+msgstr "Нерозорість консолі"
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
@@ -2968,10 +3009,6 @@ msgstr ""
 "Колір перехрестя (R,G,B).\n"
 "Також впливає на колір об'єктного перехрестя"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "Розмірний поріг файлу журналу зневадження"
@@ -3026,6 +3063,27 @@ msgstr ""
 "Це імітує ефект легких тіней, застосовуючи PCF або пуасоновський\n"
 "диск, але також використовує більше ресурсів."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Визначте найстаріші клієнти, яким дозволено під'єднуватися.\n"
+"Старіші клієнти сумісні у тому сенсі, що вони не зазнаватимуть збою при "
+"підключенні\n"
+"до нових серверів, але можуть не підтримувати усі нові функції, на які ви "
+"очікуєте.\n"
+"Це дозволяє детальніший контроль, ніж strict_protocol_version_checking.\n"
+"Minetest все ще примушує свій внутрішній мінімум, і включення\n"
+"strict_protocol_version_checking перевизначить це ефективно."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "Визначає області, де дерева мають яблука."
@@ -3118,7 +3176,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr "Затримка надсилання блоків після будування"
+msgstr "Затримка надсилання будування блоками"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
@@ -3161,7 +3219,7 @@ msgstr "Розсинхронізація анімації блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Developer Options"
-msgstr "Налаштування для розробників"
+msgstr "Розробницькі налаштування"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
@@ -3177,7 +3235,7 @@ msgstr "Заборонити порожні паролі"
 
 #: src/settings_translation_file.cpp
 msgid "Display Density Scaling Factor"
-msgstr "Коефіцієнт масштабування щільності відображення"
+msgstr "Масштабування щільності відображення"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3227,6 +3285,10 @@ msgstr "Увімкнути світіння"
 msgid "Enable Bloom Debug"
 msgstr "Увімкнути зневадження світіння"
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr "Увімкнути дебандинг"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3253,6 +3315,10 @@ msgstr ""
 "Якщо увімкнено, використовує пуасоновський диск для створення \"м'яких "
 "тіней\". Інакше використовується PCF."
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "Увімкнути постобробку"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr "Увімкнути проминеве оклюзивне відсікання"
@@ -3303,6 +3369,10 @@ msgstr ""
 "Увімкнути коліщатко миші (прокрутку) для вибору предмету на панелі швидкого "
 "доступу."
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Увімкнути випадкове завантаження модів (в основному для тестування)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Увімкнути випадкове введення користувача (тільки для тестування)."
@@ -3332,6 +3402,10 @@ msgstr ""
 "підключенні до нових серверів, але вони можуть не підтримувати усі нові "
 "функції, на які ви очікуєте."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "Увімкнути сенсорний екран"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3343,14 +3417,6 @@ msgstr ""
 "Віддалені сервери пропонують набагато бистріше завантажувати медіафайли\n"
 "(наприклад текстури) під час підключення до серверу."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"Увімкнути об'єкти буферу вершин.\n"
-"Це повинно значно покращити графічну продуктивність."
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3376,7 +3442,7 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
-"Вмикає кінематографічне тональне відображення Hable's «Uncharted 2».\n"
+"Вмикає кінематографічне тональне відображення \"Uncharted 2\".\n"
 "Імітує криву тона фотоплівки й наближає\n"
 "зображення до більшого динамічного діапазону. Середній контраст злегка\n"
 "посилюється, відблиски й тіні поступово стискається."
@@ -3389,6 +3455,20 @@ msgstr "Дозволити анімацію предметів інвентар
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Вмикає кешування мешів, яких повернули."
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr "Вмикає зневадження й перевірку помилок у драйвері OpenGL."
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr "Вмикає конвеєр постобробки."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+"Вмикає режим сенсорного екрану, дозволяючи вам грати з сенсорним екраном."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3437,7 +3517,7 @@ msgstr "FPS"
 
 #: src/settings_translation_file.cpp
 msgid "FPS when unfocused or paused"
-msgstr "FPS, коли призупинено або поза фокусом"
+msgstr "FPS, при паузі або поза фокусом"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
@@ -3593,7 +3673,7 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
-"Розмір шрифта останніх повідомлень чату й ввода у точках (pt).\n"
+"Розмір шрифта останніх повідомлень чату й ввода у пунктах (pt).\n"
 "Значення 0 використовуватиме звичайний розмір шрифта."
 
 #: src/settings_translation_file.cpp
@@ -3626,11 +3706,11 @@ msgstr "Формат знімків екрана."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr "Колір фону форми у повноекранному режимі"
+msgstr "Колір повноекранного фону форми"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr "Непрозорість фону форми у повноекранному режимі"
+msgstr "Непрозорість повноекранного фону форми"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background color (R,G,B)."
@@ -3710,7 +3790,7 @@ msgstr "Фільтр масштабування інтерфейсу txr2img"
 
 #: src/settings_translation_file.cpp
 msgid "Gamepads"
-msgstr "Контролер"
+msgstr "Контролери"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
@@ -4060,7 +4140,7 @@ msgstr "Ігнорувати помилки світу"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr "Непрозорість фону консоли в грі (між 0 і 255)."
+msgstr "Альфа-канал фону консолі чату в грі (непрозорість, між 0 і 255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
@@ -4287,7 +4367,7 @@ msgstr "Найменьша кількість великих печер"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr "Співвідношення затоплення великих печер"
+msgstr "Співвідношення затоплення печер"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -4308,12 +4388,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
-"Довжина кроку серверу й інтервал, з яким об'єкти загалом оновлюються по\n"
-"мережі, зазначається у секундах."
+"Довжина кроку серверу (інтервал, з яким все зазвичай оновлюються),\n"
+"зазначається у секундах.\n"
+"Не застовується до сесій, які запущено з клієнтського меню."
 
 #: src/settings_translation_file.cpp
 msgid "Length of liquid waves."
@@ -4324,19 +4406,17 @@ msgid ""
 "Length of time between Active Block Modifier (ABM) execution cycles, stated "
 "in seconds."
 msgstr ""
-"Довжина часу між циклами виконання модифікатора активного блоку (ABM), "
-"зазначається у секундах."
+"Час між циклами виконання модифікатора активного блоку (ABM), зазначається у "
+"секундах."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles, stated in seconds."
-msgstr "Довжина часу між циклами виконання NodeTimer, зазначається у секундах."
+msgstr "Час між циклами виконання NodeTimer, зазначається у секундах."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Length of time between active block management cycles, stated in seconds."
-msgstr ""
-"Довжина часу між циклами керування активними блоками, зазначається у "
-"секундах."
+msgstr "Час між циклами керування активними блоками, зазначається у секундах."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4490,17 +4570,13 @@ msgstr ""
 "Зробити кольори туману й неба залежними від частини доби (світанок/захід) і "
 "напрямка погляду."
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "Робить усі рідини непрозорими"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
-msgstr "Рівень стискання мап для місця на диску"
+msgstr "Рівень стискання мап для місця диску"
 
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Network Transfer"
-msgstr "Рівень стискання мап для передачі мережею"
+msgstr "Рівень стиск. мап для передачі мережею"
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
@@ -4553,12 +4629,16 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"Спеціальні атрибути генерації для генератору світу V6.\n"
+"Спеціальні атрибути генерації для генератору світу v6.\n"
 "Мітка \"snowbiomes\" вмикає нову систему з 5 біомами.\n"
-"Коли мітку \"snowbiomes\" увімкнено, автоматично увімкаються джунглі,\n"
-"ігноруючи мітку \"jungles\"."
+"Коли мітку \"snowbiomes\" увімкнено, автоматично увімкаються джунглі й\n"
+"мітка \"jungles\" ігнорується.\n"
+"Мітка \"temples\" вимикає генерацію храмів пустель. Замість них "
+"з'являтимуться звичайні підземелля."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4596,13 +4676,9 @@ msgstr "Затримка генерації мешів блоків мапи"
 msgid "Mapblock mesh generation threads"
 msgstr "Потоки генерації сітки блоків мапи"
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Розмір кешу блоків мапи генератору мешів блоків мапи в мегабайтах"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr "Час очікування вивантаження блоків мапи"
+msgstr "Час очікування видалення блоків мапи"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian"
@@ -4622,7 +4698,7 @@ msgstr "Спеціальні мітки генератору світу Площ
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal"
-msgstr "Генератор світу: фрактальний"
+msgstr "Генератор світу Фрактал"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal specific flags"
@@ -4674,7 +4750,7 @@ msgstr "Максимальна відстань генерації блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Max block send distance"
-msgstr "Максимальна відстань надсилання блоків"
+msgstr "Макс. відстань надсилання блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
@@ -4702,7 +4778,7 @@ msgstr "Максимальна відстань для промальовува
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr "Максимум примусово завантажених блоків мапи"
+msgstr "Макс. примусово завантажених блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
@@ -4760,8 +4836,8 @@ msgid ""
 "be queued.\n"
 "This should be lower than curl_parallel_limit."
 msgstr ""
-"Найбільша кількість одночасних завантажень. Завантаження, що перевищують цей "
-"ліміт, будуть у черзі.\n"
+"Максимум одночасних завантажень. Перевищуючи цей ліміт, завантаження "
+"опиняються у черзі.\n"
 "Це повинно бути менше за curl_parallel_limit."
 
 #: src/settings_translation_file.cpp
@@ -4813,7 +4889,7 @@ msgstr "Максимум одночасних надсилань блоків н
 
 #: src/settings_translation_file.cpp
 msgid "Maximum size of the outgoing chat queue"
-msgstr "Максимальний розмір черги вихідних повідомлень у чаті"
+msgstr "Макс. розмір черги вихідн. повідомлень"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4836,8 +4912,8 @@ msgid ""
 "Maximum time an interactive request (e.g. server list fetch) may take, "
 "stated in milliseconds."
 msgstr ""
-"Максимальний час запиту взаємодії (наприклад отримання списку серверів), "
-"зазначається у міллісекундах."
+"Найбільший час запиту взаємодії (наприклад отримання переліку серверів), у "
+"міллісекундах."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
@@ -4867,6 +4943,10 @@ msgstr "Мінімальний рівень журналювання для за
 msgid "Minimap scan height"
 msgstr "Висота сканування мінімапи"
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr "Мінімальний інтервал повторення копання"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "Мінимум випадкового числа великих печер на фрагмент мапи."
@@ -4909,7 +4989,7 @@ msgstr "Розмір моноширного шрифту"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size divisible by"
-msgstr "Розмір моноширинного шрифта подільний на"
+msgstr "Кратність розм. моношир. шрифта"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain height noise"
@@ -4935,6 +5015,10 @@ msgstr "Чутливість миші"
 msgid "Mouse sensitivity multiplier."
 msgstr "Множник чутливості миші."
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "Поріг переміщення"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "Шум бруду"
@@ -5060,8 +5144,8 @@ msgid ""
 "threads."
 msgstr ""
 "Кількість потоків, що використовуються для генерації мешів.\n"
-"Значення 0 (за замовчуванням) дозволить Minetest автоматично визначати "
-"кількість доступних потоків."
+"Значення 0 (звичайне) дозволить Minetest автоматично визначати кількість "
+"доступних потоків."
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
@@ -5071,10 +5155,6 @@ msgstr "Метод оклюзивного відсікання"
 msgid "Occlusion Culling"
 msgstr "Оклюзивне відсікання"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "Непрозорі рідини"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5090,6 +5170,10 @@ msgstr ""
 "Відкривати меню паузі при втраті фокуса вікна.\n"
 "Не відкриває, якщо будь-яка форму вже відкрито."
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "Зневадження OpenGL"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "Необов'язкове перевизначення кольору посилання у чаті."
@@ -5143,11 +5227,11 @@ msgstr "Пауза при втраті фокусу"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
-msgstr "Обмеження кожного гравця на завантаження блоків з диску в черзі"
+msgstr "Ліміт гравця на завантаж. блоків черги з диску"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks to generate"
-msgstr "Обмеження кожного гравця на генерацію блоків у черзі"
+msgstr "Ліміт гравця на генерацію блоків з черги"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
@@ -5221,6 +5305,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "Співвідношення великих печер, що містять рідину."
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "Мінімальна версія протоколу"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr "Жест удару"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5238,6 +5330,10 @@ msgstr "Піднімає місцевість, щоб робити долини
 msgid "Random input"
 msgstr "Випадковий ввід"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "Випадковий порядок завантаження модів"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "Останні повідомлення чату"
@@ -5451,8 +5547,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5470,9 +5566,9 @@ msgstr ""
 "\n"
 "* None - без згладжування (за замовчуванням)\n"
 "\n"
-"* FSAA - апаратне повноекранне згладжування (несумісно із відтінювачами),\n"
-"також відоме як згладжування з декількома вибірками (multi-sample "
-"antialiasing, MSAA)\n"
+"* FSAA - апаратне повноекранне згладжування\n"
+"(несумісне з пост-обробкою й субдискретизацією),\n"
+"також відоме як multi-sample antialiasing (MSAA)\n"
 "Згладжує кути блоків, але не впливає на внутрішню частину текстур.\n"
 "Для змінення цього вибору потребується перезавантаження.\n"
 "\n"
@@ -5482,9 +5578,8 @@ msgstr ""
 "Забезпечує баланс між швидкістю і якістю зображення.\n"
 "\n"
 "* SSAA - згладжування із супер-вибіркою (потребує відтінювачів)\n"
-"Промальовує зображення сцени з вищою роздільністю, потім зменьшує масштаб, "
-"для зменьшення\n"
-"ефектів накладення. Це найповільніший і найточніший метод."
+"Промальовує зображення сцени з вищою роздільністю, потім зменьшує масштаб,\n"
+"для зменшення ефектів накладення. Це найповільніший і найточніший метод."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5614,11 +5709,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"Вказати мову. Залиште порожнім, щоб використовувати системну мову.\n"
-"Потрібен перезапуск після цієї зміни."
+"Вкажіть мову. За замовчування використовується системна мова.\n"
+"Після зміни цього потрібен перезапуск."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5659,6 +5754,10 @@ msgstr ""
 "Вмикає ефект світіння.\n"
 "Яскраві кольори переливатиметься через сусідні об'єкти."
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr "Увімкніть ефект об'ємного освітлення (також відомий як \"Godrays\")."
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr "Вмикає похитування листя."
@@ -5707,12 +5806,10 @@ msgstr "Відтінювачі"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
-"Відтінювачі дозволяють додаткові визуальні ефекти й можуть збільшити\n"
-"продуктивність на деяких відеокартах.\n"
-"Це працює тільки з двигуном промальовування OpenGL."
+"Відтінювачі дозволяють просунуті визуальні ефекти й можуть збільшити\n"
+"продуктивність на деяких відеокартах."
 
 #: src/settings_translation_file.cpp
 msgid "Shadow filter quality"
@@ -5801,16 +5898,6 @@ msgstr ""
 "його незміненим\n"
 "рекомендується."
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"Розмір кешу блоків мапи в генераторі мешів. Збільшення цього\n"
-"збільшить % попадання в кеш, зменшуючи дані, що копіються з\n"
-"головного потоку, тим самим зменшуючи тремтіння."
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "Нахил орбіти небесних тіл"
@@ -5846,19 +5933,18 @@ msgstr "Згладжене освітлення"
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
-"Робить обертання камери плавним у кінематографічному режимі, 0 для "
-"відключення. Входіть у кінематографічний режім клавішою, визначеною у "
-"Змінити клавіші."
+"Згладжує обертання камери у кінематографічному режимі, 0 для відключення. "
+"Входьте у кінематографічний режім клавішою, визначеною у Керування."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
 msgstr ""
-"Робить обертання камери плавним, також називається згладжуванням миші або "
-"погляду. 0 для вікдлючення."
+"Плавне обертання камери, також називається згладжуванням миші або погляду. 0 "
+"для вікдлючення."
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed"
@@ -5872,6 +5958,14 @@ msgstr "Швидкість підкрадання, в блоках в секун
 msgid "Soft shadow radius"
 msgstr "Радіус легких тіней"
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "Звук"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr "Чорний список розширень звуку"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5971,8 +6065,8 @@ msgstr ""
 "островів.\n"
 "Вода вимкнена за замовчуванням і буде розміщена лише у тому випадку, якщо це "
 "значення\n"
-"буде встановлено вище за \"mgv7_floatland_ymax\" - "
-"\"mgv7_floatland_taper\" (початок\n"
+"буде встановлено вище за \"mgv7_floatland_ymax\" - \"mgv7_floatland_taper\" "
+"(початок\n"
 "верхнього звуження).\n"
 "***УВАГА, ПОТЕНЦІЙНА ЗАГРОЗА СВІТАМ І ПРОДУКТИВНОСТІ СЕРВЕРУ***:\n"
 "При увімкненні розміщення води висячі острови повинні бути налаштовані й "
@@ -6042,7 +6136,7 @@ msgid ""
 "Bigger numbers create better shadows but it is also more expensive."
 msgstr ""
 "Розмір текстури для промальовування мапи тіней.\n"
-"Це повинно бути число, що кратне двом.\n"
+"Це має бути число, що є одним із ступенів двох.\n"
 "Більші числа створюють кращі тіні, але також більш витратні."
 
 #: src/settings_translation_file.cpp
@@ -6081,19 +6175,51 @@ msgstr ""
 "Звичайний формат, в якому зберігаються профайли,\n"
 "коли виконується `/profiler save [формат]` без формату."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+"Затримка в мілісекундах, після якої сенсорна взаємодія вважається довгим "
+"дотиком."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 "Шлях до файла відносно до вашого шляху світу, де зберігатимуться профайли."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+"Жест, що означає удар по гравцю або сутності.\n"
+"Це перевизначатися іграми або модами.\n"
+"\n"
+"* short_tap (короткий дотик)\n"
+"Простий у використанні й відомий за іншими іграми, які не повинні бути "
+"названі.\n"
+"\n"
+"* long_tap (довгий дотик)\n"
+"Відомий за класичному мобільному управлінні Minetest.\n"
+"Бої більш-менш неможливі."
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "Ідентифікатор джойстика, що використовується"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
-msgstr "Довжина в пікселях, з якої починається дія з сенсорним екраном."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr "Довжина в пікселях, після якої сенсорна взаємодія вважається рухом."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6107,6 +6233,14 @@ msgstr ""
 "0.0 = хвилі не рухається взагалі.\n"
 "За замовчуванням – 1.0 (1/2 блоки)."
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"Мінімальний час у секундах у перервах на копання блоків при\n"
+"затисканні кнопки копання."
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr "Мережевий інтерфейс, що використовується сервером."
@@ -6142,12 +6276,12 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 "Двигун промальовування.\n"
 "Примітка: після змінення цього потрібен перезапуск!\n"
 "За замовчуванням OpenGL для ПК, й OGLES2 для Android.\n"
-"Відтінювачі підтримуються OpenGL і OGLES2 (експериментально)."
+"Відтінювачі підтримуються усіма крім OGLES1."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6192,7 +6326,7 @@ msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
-"Затримка в секундах між подіями, що повторюються,\n"
+"Затримка в секундах між подіями, що повторюються\n"
 "при затисканні комбінації кнопок джойстику."
 
 #: src/settings_translation_file.cpp
@@ -6221,6 +6355,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "Третій з 4 шумів 2D що разом визначають діапазон висоти пагорбів/гір."
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr "Поріг для довгих дотиків"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6275,14 +6413,14 @@ msgstr "Чутливість дотику"
 msgid "Touchscreen sensitivity multiplier."
 msgstr "Множник чутливості дотику."
 
-#: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
-msgstr "Поріг дотику"
-
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "Домовленності для продуктивності"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "Напівпрозорі рідини"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
 msgstr "Дальність сортування за прозорістю"
@@ -6329,9 +6467,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
-"Адреса файлу JSON, що забезпечує інформацію про найновіший реліз Minetest"
+"URL до файлу JSON, що забезпечує інформацію про найновіший реліз Minetest\n"
+"Якщо ще порожнє, рушій ніколи не перевірятиме оновлення."
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6361,7 +6502,7 @@ msgstr "Необмежена відстань передачі гравця"
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr "Вивантаження невикористаних сервером даних"
+msgstr "Видаляти невикористані дані сервера"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
@@ -6389,9 +6530,8 @@ msgstr ""
 "Використовувати анізотропну фільтрацію при погляді на текстури під кутом."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Використовувати білінійну фільтрацію для зменшених текстур."
+msgstr "Використовувати білінійну фільтрацію при масштабуванні текстур."
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
@@ -6406,13 +6546,12 @@ msgstr ""
 "Якщо увімкнено, перехрестя буде показано та використано для вибору об'єкта."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use mipmaps when scaling textures. May slightly increase performance,\n"
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
-"Використовувати міп-текстурування при зменшенні масштабу текстур. Може трохи "
+"Використовувати міп-текстурування при зміненні масштабу текстур. Може трохи "
 "збільшити\n"
 "продуктивність, особливо при використанні набору текстур високої "
 "роздільності.\n"
@@ -6429,13 +6568,12 @@ msgstr ""
 "для розмірів сітки клієнта менше за 4x4x4 блоків мапи."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use trilinear filtering when scaling textures.\n"
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
-"Використовувати трилінійну фільтрацію при зменьшенні масштабу текстур.\n"
+"Використовувати трилінійну фільтрацію при зміненні масштабу текстур.\n"
 "Якщо обидві білінійна й трилінійна фільтрації увімкнено, застосовується\n"
 "трилінійна фільтрація."
 
@@ -6453,10 +6591,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr "Інтерфейси"
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr "Вертикальна синхронізація"
@@ -6522,8 +6656,8 @@ msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
 msgstr ""
-"Вертикальна синхронізація екрану. Ваша система все ще може увімкати VSync "
-"навіть якщо це вимкнено."
+"Вертикальна синхронізація. Ваша система все ще може увімкати VSync навіть "
+"якщо це вимкнено."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6549,6 +6683,10 @@ msgstr "Віртуальний джойстик натискає кнопку Au
 msgid "Volume"
 msgstr "Гучність"
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr "Множник гучності, коли вікно не сфокусовано."
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
@@ -6557,6 +6695,14 @@ msgstr ""
 "Гучність усіх звуків.\n"
 "Вимагає увімкнення системи звуку."
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr "Гучність поза фокусом"
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr "Об'ємне освітлення"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6660,6 +6806,19 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
+"При використанні білінійних/трилінійних/анізотропних фільтрів, текстури "
+"низької\n"
+"роздільності можуть бути розмитими, тому вони автоматично збільшуються за "
+"методом\n"
+"найближчого сусіда для збереження чіткості пікселей. Це встановлює "
+"найменший\n"
+"розмір текстури для збільшених текстур, вищі значення виглядають чіткіше, "
+"але\n"
+"потребують більше пам'яті. Ступені 2 рекомендуються. Це налаштування\n"
+"застосовується ТІЛЬКИ якщо білінійну/трилінійну/анізотропну фільтрацію "
+"увімкнено.\n"
+"Це також використовується як основний розмір текстури блоку для\n"
+"автомасштабування текстур, вирівняних за світом."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6833,22 +6992,28 @@ msgstr "cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
-msgstr "Час очікування завантаження файлів через cURL"
+msgstr "Таймаут завантаження файлів через cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL interactive timeout"
-msgstr "Час очікування під час взаємодії через cURL"
+msgstr "Час очікування під час взаємодії із cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
 msgstr "Обмеження одночасних з'єднань cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Адреса: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Творчість: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Ушкодження: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Порт: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6887,6 +7052,13 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ "Зауважте що поле адреси у головному меню має пріоритет над цим "
 #~ "налаштуванням."
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Налаштувати dpi на вашому екрані (тільки не X11/Android), напр. для 4k-"
+#~ "екранів."
+
 #~ msgid ""
 #~ "Affects mods and texture packs in the Content and Select Mods menus, as "
 #~ "well as\n"
@@ -6928,6 +7100,9 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "Бітів на піксель (глибина кольору) в повноекранному режимі."
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Межі показуються в усіх блоків"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "Бамп-маппінг"
 
@@ -6937,6 +7112,9 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Camera update toggle key"
 #~ msgstr "Контроль оновлення камери"
 
+#~ msgid "Change Keys"
+#~ msgstr "Змінити клавіші"
+
 #~ msgid "Change keys"
 #~ msgstr "Змінити клавіші"
 
@@ -6983,12 +7161,47 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Controlled by a checkbox in the settings menu."
 #~ msgstr "Керується прапорцем у меню налаштувань."
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Керування:\n"
+#~ "- %s: рухатися вперед\n"
+#~ "- %s: рухатися назад\n"
+#~ "- %s: рухатися вліво\n"
+#~ "- %s: рухатися вправо\n"
+#~ "- %s: стрибати/лізти вгору\n"
+#~ "- %s: копати/вдарити/використати\n"
+#~ "- %s: поставити/використати\n"
+#~ "- %s: крастися/лізти вниз\n"
+#~ "- %s: кинути предмет\n"
+#~ "- %s: інвентар\n"
+#~ "- Миша: поворот/дивитися\n"
+#~ "- Коліщатко миші: вибір предмета\n"
+#~ "- %s: чат\n"
+
 #~ msgid "Creative"
 #~ msgstr "Творчість"
 
 #~ msgid "Credits"
 #~ msgstr "Подяки"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Поранення"
 
@@ -7050,6 +7263,13 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Enable players getting damage and dying."
 #~ msgstr "Увімкнути отримання гравцями урону і їх смерть."
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "Увімкнути об'єкти буферу вершин.\n"
+#~ "Це повинно значно покращити графічну продуктивність."
+
 #~ msgid "Enabled"
 #~ msgstr "Увімкнено"
 
@@ -7228,6 +7448,9 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Install: file: \"$1\""
 #~ msgstr "Встановлення: файл: \"$1\""
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "Помилкова конфігурація gamespec."
+
 #~ msgid "Inventory key"
 #~ msgstr "Клавіша інвентаря"
 
@@ -7507,6 +7730,12 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Main menu style"
 #~ msgstr "Стиль головного меню"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "Робить усі рідини непрозорими"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "Розмір кешу блоків мапи генератору мешів у МБ"
+
 #~ msgid "Menus"
 #~ msgstr "Меню"
 
@@ -7653,12 +7882,18 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Simple Leaves"
 #~ msgstr "Просте листя"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "Розмір кешу блоків мапи в генераторі мешів. Збільшення цього\n"
+#~ "збільшить % попадання в кеш, зменшуючи дані, що копіються з\n"
+#~ "головного потоку, тим самим зменшуючи тремтіння."
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "Згладжене освітлення"
 
-#~ msgid "Sound"
-#~ msgstr "Звук"
-
 #~ msgid "Special"
 #~ msgstr "Спеціальна"
 
@@ -7698,6 +7933,9 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "Чутливість дотику (пкс):"
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "Поріг дотику"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "Трилінійна фільтрація"
 
@@ -7713,6 +7951,9 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "Up"
 #~ msgstr "Вгору"
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid ""
 #~ "Version number which was last seen during an update check.\n"
 #~ "\n"
@@ -7769,8 +8010,14 @@ msgstr "Обмеження одночасних з'єднань cURL"
 #~ msgid "You died."
 #~ msgstr "Ви загинули"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Ви не маєте встановлених ігор."
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "no"
+
+#~ msgid "ok"
+#~ msgstr "добре"
diff --git a/po/vi/minetest.po b/po/vi/minetest.po
index 73bb4ec04..960724779 100644
--- a/po/vi/minetest.po
+++ b/po/vi/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vietnamese (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2022-08-26 10:18+0000\n"
 "Last-Translator: Văn Chí <chiv8331@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/minetest/"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "Lệnh không có sẵn: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "Trợ giúp về lệnh"
 
 #: builtin/common/chatcommands.lua
@@ -82,13 +83,10 @@ msgstr ""
 "help all' để xem danh sách về những câu lệnh có sẵn."
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
+#, fuzzy
+msgid "[all | <cmd>] [-t]"
 msgstr "[all | <câu lệnh>]"
 
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
-
 #: builtin/fstk/ui.lua
 msgid "<none available>"
 msgstr "<không có sẵn>"
@@ -105,6 +103,10 @@ msgstr "Đã xảy ra lỗi:"
 msgid "Main menu"
 msgstr "Màn hình chính"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "Kết nối lại"
@@ -133,19 +135,27 @@ msgstr "Chúng tôi chỉ hỗ trợ phiên bản giao thức $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Chúng tôi hỗ trợ các phiên bản giao thức giữa phiên bản $1 đến $2."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\" đã tồn tại. Bạn có muốn ghi đè nó không?"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "Phần phụ thuộc $1 và $2 sẽ được cài đặt."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid "Failed to download \"$1\""
+msgstr "Đã xảy ra lỗi khi tải xuống $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "Đã xảy ra lỗi khi tải xuống $1"
+
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "Cài đặt: Loại tệp không được hỗ trợ hoặc tệp lưu trữ bị hỏng"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -153,159 +163,158 @@ msgstr ""
 "$1 đang tải xuống,\n"
 "$2 đã thêm vào hàng chờ"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "Đang tải xuống $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "Không tìm thấy phần phụ thuộc cần cho $1."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 sẽ được cài đặt, phần phụ thuộc $2 sẽ bị bỏ qua."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "Tất cả các gói"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "Đã được cài đặt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "Trở về màn hình chính"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "ContentDB không có sẵn khi Minetest được biên dịch mà không có cURL"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "Đang tải xuống..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "Trò chơi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "Cài đặt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Đang tải..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Mods"
+msgstr "Sửa đổi"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "Không nhận được gói nào"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "Không có kết quả"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "Không có cập nhật mới"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "Đã thêm vào hàng chờ"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "Gói kết cấu"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "Gỡ cài đặt"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "Cập nhật"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "Cập nhật tất cả [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "Xem thêm thông tin trên trình duyệt web của bạn"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Phần phụ thuộc $1 và $2 sẽ được cài đặt."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Không tìm thấy phần phụ thuộc cần cho $1."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 sẽ được cài đặt, phần phụ thuộc $2 sẽ bị bỏ qua."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "Đã được cài đặt"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "Trò chơi cơ bản:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "Hủy"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "ContentDB không có sẵn khi Minetest được biên dịch mà không có cURL"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Phụ thuộc:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "Đang tải xuống..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "Đã xảy ra lỗi khi tải xuống $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "Đã xảy ra lỗi khi tải xuống $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "Cài đặt: Loại tệp không được hỗ trợ hoặc tệp lưu trữ bị hỏng"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "Trò chơi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "Cài đặt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "Cài đặt $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "Cài đặt phần phụ thuộc bị thiếu"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Đang tải..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Mods"
-msgstr "Sửa đổi"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "Không nhận được gói nào"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "Không có kết quả"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "Không có cập nhật mới"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "Không tìm thấy"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "Ghi đè"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "Vui lòng kiểm tra xem trò chơi này có đúng không."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "Đã thêm vào hàng chờ"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" đã tồn tại. Bạn có muốn ghi đè nó không?"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "Gói kết cấu"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "Gỡ cài đặt"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "Cập nhật"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "Cập nhật tất cả [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "Xem thêm thông tin trên trình duyệt web của bạn"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "Ghi đè"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -456,11 +465,21 @@ msgstr "Tạo ra"
 msgid "Decorations"
 msgstr "Vật trang trí"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Development Test is meant for developers."
 msgstr "Cảnh báo: Kiểm tra Phát triển chỉ dành cho các nhà phát triển."
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "Ngục tối"
@@ -838,10 +857,6 @@ msgstr ""
 msgid "Back"
 msgstr "Lùi xuống"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "Thay đổi khóa"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -851,7 +866,8 @@ msgstr "Trò chuyện"
 msgid "Clear"
 msgstr "Xóa"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "Điều khiển"
 
@@ -1062,6 +1078,16 @@ msgstr "Cài đặt một trò chơi"
 msgid "Install games from ContentDB"
 msgstr "Cài đặt trò chơi từ ContentDB"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "Mới"
@@ -1095,8 +1121,8 @@ msgid "Start Game"
 msgstr "Bắt đầu trò chơi"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "Bạn chưa cài đặt trò chơi nào."
+msgid "You need to install a game before you can create a world."
+msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1177,19 +1203,10 @@ msgstr "Đang tải kết cấu..."
 msgid "Rebuilding shaders..."
 msgstr "Đang xây dựng lại trình đổ bóng..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "Lỗi kết nối (hết thời gian chờ?)"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "Không tìm thấy hoặc tải trò chơi: "
 
-#: src/client/clientlauncher.cpp
-#, fuzzy
-msgid "Invalid gamespec."
-msgstr "Gamespec không hợp lệ."
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "Màn hình chính"
@@ -1216,7 +1233,11 @@ msgstr "Không mở được tệp mật khẩu được cung cấp: "
 msgid "Provided world path doesn't exist: "
 msgstr "Đường dẫn thế giới được cung cấp không tồn tại: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1224,18 +1245,10 @@ msgstr ""
 "\n"
 "Hãy kiểm tra debug.txt để có thông tin chi tiết."
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- Địa chỉ: "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- Chế độ: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- Cổng: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- Công cộng: "
@@ -1270,10 +1283,6 @@ msgstr "Tự động chuyển tiếp đã bật"
 msgid "Block bounds hidden"
 msgstr "Các ranh giới khối đã ẩn"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "Đã hiển thị ranh giới cho tất cả các khối"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "Đã hiển thị ranh giới hiển thị cho khối hiện tại"
@@ -1320,6 +1329,10 @@ msgstr "Chạy kịch bản phía máy khách đã tắt"
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới máy chủ..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "Lỗi kết nối (hết thời gian chờ?)"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "Kết nối không thành công vì lý do không xác định"
@@ -1328,47 +1341,14 @@ msgstr "Kết nối không thành công vì lý do không xác định"
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"Điền khiển:\n"
-"- %s: tiến lên\n"
-"- %s: lùi xuống\n"
-"- %s: sang trái\n"
-"- %s: sang phải\n"
-"- %s: nhảy / leo lên\n"
-"- %s: đào / đấm\n"
-"- %s: đặt khối / sử dụng\n"
-"- %s: đi rón rén / leo xuống\n"
-"- %s: thả vật phẩm\n"
-"- %s: túi đồ\n"
-"- Di chuột: xoay / nhìn\n"
-"- Lăn chuột: chọn vật phẩm\n"
-"- %s: trò chuyện\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1460,6 +1440,11 @@ msgstr "Sương mù đã tắt"
 msgid "Fog enabled"
 msgstr "Sương mù đã bật"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "Thu phóng đã bị vô hiệu bởi trò chơi hoặc mod"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "Thông tin trò chơi:"
@@ -1480,10 +1465,6 @@ msgstr "Định nghĩa vật phẩm..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1641,10 +1622,6 @@ msgstr "Hiện khung dây"
 msgid "Zoom currently disabled by game or mod"
 msgstr "Thu phóng đã bị vô hiệu bởi trò chơi hoặc mod"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "OK"
-
 #: src/client/gameui.cpp
 #, fuzzy
 msgid "Chat currently disabled by game or mod"
@@ -1978,6 +1955,15 @@ msgstr "Minimap ở chế độ mặt nền, mức thu phóng %dx"
 msgid "Minimap in texture mode"
 msgstr "Minimap ở chế độ kết cấu"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "Đã xảy ra lỗi khi mở trang web"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2168,6 +2154,19 @@ msgstr "Thu phóng"
 msgid "press key"
 msgstr "bấm phím"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "Đã xảy ra lỗi khi mở trang web"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "Thay đổi"
@@ -2201,6 +2200,7 @@ msgstr "Âm lượng: %d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "vi"
 
@@ -2394,14 +2394,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-"Điều chỉnh cấu hình DPI cho màn hình của bạn (chỉ cho Android/không phải "
-"X11), VD: cho màn hình 4K."
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2425,6 +2417,10 @@ msgstr "Tên quản trị viên"
 msgid "Advanced"
 msgstr "Nâng cao"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2480,6 +2476,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr "Nhiễu cho các cây táo"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "Quán tính của cánh tay"
@@ -2503,12 +2510,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2573,6 +2589,10 @@ msgstr "Quần xã"
 msgid "Biome noise"
 msgstr "Nhiễu quần xã"
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2787,6 +2807,12 @@ msgstr "Sương mù có màu"
 msgid "Colored shadows"
 msgstr "Bóng có màu"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2925,10 +2951,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2978,6 +3000,26 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"Kích hoạt để ngăn các máy khách sử dụng phiên bản cũ kết nối. Các máy "
+"khách \n"
+"cũ hơn tương thích trong trường hợp chúng không gặp sự cố khi kết nối vàomáy "
+"chủ mới,\n"
+"tuy nhiên chúng có thể không hỗ trợ tất cả các tính năng mới như bạn mong "
+"đợi."
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3165,6 +3207,11 @@ msgstr "Kích hoạt tất cả"
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "Kích hoạt sát thương"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3188,6 +3235,11 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "Kích hoạt joystick"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3230,6 +3282,11 @@ msgstr "Kích hoạt bảo mật mod"
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "Kích hoạt dữ liệu nhập ngẫu nhiên (chỉ cho việc thử nghiệm)."
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr "Kích hoạt dữ liệu nhập ngẫu nhiên (chỉ cho việc thử nghiệm)."
@@ -3259,6 +3316,10 @@ msgstr ""
 "tuy nhiên chúng có thể không hỗ trợ tất cả các tính năng mới như bạn mong "
 "đợi."
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3267,12 +3328,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3302,6 +3357,19 @@ msgstr "Kích hoạt hoạt ảnh của các vật phẩm trong túi đồ."
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -4100,9 +4168,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4249,10 +4318,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4301,7 +4366,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4336,10 +4403,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4585,6 +4648,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4653,6 +4720,11 @@ msgstr "Độ nhạy chuột"
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "Ngưỡng chạm (px):"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4763,10 +4835,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4779,6 +4847,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4888,6 +4960,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "Phiên bản giao thức không khớp. "
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4903,6 +4984,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -5092,8 +5177,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5215,7 +5300,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5248,6 +5333,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5287,8 +5376,7 @@ msgstr "Trình đổ bóng"
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5358,13 +5446,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5400,7 +5481,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5421,6 +5502,15 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound"
+msgstr "Đã tắt tiếng"
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5581,17 +5671,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5602,6 +5712,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5628,7 +5744,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5685,6 +5801,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5734,12 +5854,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr "Độ nhạy chuột"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "Ngưỡng chạm (px):"
+msgid "Tradeoffs for performance"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5777,7 +5896,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5879,10 +6000,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5969,12 +6086,26 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "FPS khi cửa sổ đang hiện hoạt hoặc tạm dừng"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "Đánh dấu node"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
@@ -6211,12 +6342,18 @@ msgstr "Hết thời gian tương tác với cURL"
 msgid "cURL parallel limit"
 msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 
+#~ msgid "- Address: "
+#~ msgstr "- Địa chỉ: "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- Chế độ sáng tạo: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- Tổn hại: "
 
+#~ msgid "- Port: "
+#~ msgstr "- Cổng: "
+
 #~ msgid "2x"
 #~ msgstr "2x"
 
@@ -6235,6 +6372,13 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "< Back to Settings page"
 #~ msgstr "< Về trang Cài đặt"
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr ""
+#~ "Điều chỉnh cấu hình DPI cho màn hình của bạn (chỉ cho Android/không phải "
+#~ "X11), VD: cho màn hình 4K."
+
 #~ msgid "All Settings"
 #~ msgstr "Tất cả cài đặt"
 
@@ -6253,9 +6397,15 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "Bilinear Filter"
 #~ msgstr "Bộ lọc song tuyến"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "Đã hiển thị ranh giới cho tất cả các khối"
+
 #~ msgid "Camera update toggle key"
 #~ msgstr "Nút chuyển đổi cập nhật máy ảnh"
 
+#~ msgid "Change Keys"
+#~ msgstr "Thay đổi khóa"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "Thay đổi khóa"
@@ -6284,9 +6434,44 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "Connected Glass"
 #~ msgstr "Kính kết nối với nhau"
 
+#, fuzzy, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "Điền khiển:\n"
+#~ "- %s: tiến lên\n"
+#~ "- %s: lùi xuống\n"
+#~ "- %s: sang trái\n"
+#~ "- %s: sang phải\n"
+#~ "- %s: nhảy / leo lên\n"
+#~ "- %s: đào / đấm\n"
+#~ "- %s: đặt khối / sử dụng\n"
+#~ "- %s: đi rón rén / leo xuống\n"
+#~ "- %s: thả vật phẩm\n"
+#~ "- %s: túi đồ\n"
+#~ "- Di chuột: xoay / nhìn\n"
+#~ "- Lăn chuột: chọn vật phẩm\n"
+#~ "- %s: trò chuyện\n"
+
 #~ msgid "Creative"
 #~ msgstr "Sáng tạo"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "Sát thương"
 
@@ -6378,6 +6563,10 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "Install Mod: Unable to find real mod name for: $1"
 #~ msgstr "Cài đặt mod: Không thể tìm thấy tên mod thật cho: $1"
 
+#, fuzzy
+#~ msgid "Invalid gamespec."
+#~ msgstr "Gamespec không hợp lệ."
+
 #~ msgid "Mipmap"
 #~ msgstr "Mipmap"
 
@@ -6390,10 +6579,6 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "No Mipmap"
 #~ msgstr "Không dùng Mipmap"
 
-#, fuzzy
-#~ msgid "Node Highlighting"
-#~ msgstr "Đánh dấu node"
-
 #, fuzzy
 #~ msgid "Node Outlining"
 #~ msgstr "Phác thảo node"
@@ -6487,5 +6672,11 @@ msgstr "Gặp giới hạn số lượng tệp tải xuống trong cURL"
 #~ msgid "You died."
 #~ msgstr "Bạn đã chết"
 
+#~ msgid "You have no games installed."
+#~ msgstr "Bạn chưa cài đặt trò chơi nào."
+
 #~ msgid "Z"
 #~ msgstr "Z"
+
+#~ msgid "ok"
+#~ msgstr "OK"
diff --git a/po/yue/minetest.po b/po/yue/minetest.po
index 27524c5d1..d2bbeb882 100644
--- a/po/yue/minetest.po
+++ b/po/yue/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
 "PO-Revision-Date: 2023-12-03 17:17+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Yue (Traditional) <https://hosted.weblate.org/projects/"
@@ -71,7 +71,7 @@ msgid "Command not available: "
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+msgid "Get help for commands (-t: output in chat)"
 msgstr ""
 
 #: builtin/common/chatcommands.lua
@@ -80,11 +80,7 @@ msgid ""
 msgstr ""
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr ""
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
+msgid "[all | <cmd>] [-t]"
 msgstr ""
 
 #: builtin/fstk/ui.lua
@@ -103,6 +99,10 @@ msgstr ""
 msgid "Main menu"
 msgstr ""
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr ""
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr ""
@@ -131,173 +131,180 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
 msgstr ""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/content/pkgmgr.lua
@@ -444,10 +451,20 @@ msgstr ""
 msgid "Decorations"
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr ""
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr ""
@@ -810,10 +827,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -823,7 +836,8 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr ""
 
@@ -1026,6 +1040,16 @@ msgstr ""
 msgid "Install games from ContentDB"
 msgstr ""
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr ""
@@ -1059,7 +1083,7 @@ msgid "Start Game"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
+msgid "You need to install a game before you can create a world."
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
@@ -1139,18 +1163,10 @@ msgstr ""
 msgid "Rebuilding shaders..."
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr ""
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr ""
@@ -1175,24 +1191,20 @@ msgstr ""
 msgid "Provided world path doesn't exist: "
 msgstr ""
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr ""
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr ""
@@ -1227,10 +1239,6 @@ msgstr ""
 msgid "Block bounds hidden"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr ""
@@ -1275,6 +1283,10 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr ""
@@ -1283,32 +1295,13 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-
 #: src/client/game.cpp
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1388,6 +1381,10 @@ msgstr ""
 msgid "Fog enabled"
 msgstr ""
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr ""
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
@@ -1408,10 +1405,6 @@ msgstr ""
 msgid "KiB/s"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr ""
@@ -1567,10 +1560,6 @@ msgstr ""
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr ""
@@ -1891,6 +1880,15 @@ msgstr ""
 msgid "Minimap in texture mode"
 msgstr ""
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr ""
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr ""
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
@@ -2080,6 +2078,18 @@ msgstr ""
 msgid "press key"
 msgstr ""
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr ""
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr ""
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr ""
@@ -2113,6 +2123,7 @@ msgstr ""
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "yue_Hant"
 
@@ -2298,12 +2309,6 @@ msgstr ""
 msgid "Adds particles when digging a node."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr ""
@@ -2326,6 +2331,10 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2379,6 +2388,17 @@ msgstr ""
 msgid "Apple trees noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr ""
@@ -2400,12 +2420,21 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2468,6 +2497,10 @@ msgstr ""
 msgid "Biome noise"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Block cull optimize distance"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr ""
@@ -2680,6 +2713,12 @@ msgstr ""
 msgid "Colored shadows"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2811,10 +2850,6 @@ msgid ""
 "Also controls the object crosshair color"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr ""
@@ -2864,6 +2899,19 @@ msgid ""
 "but also uses more resources."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr ""
@@ -3048,6 +3096,10 @@ msgstr ""
 msgid "Enable Bloom Debug"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Debanding"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
@@ -3067,6 +3119,10 @@ msgid ""
 "filtering."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
 msgstr ""
@@ -3109,6 +3165,10 @@ msgstr ""
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
 msgstr ""
@@ -3132,6 +3192,10 @@ msgid ""
 "expecting."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3140,12 +3204,6 @@ msgid ""
 "when connecting to the server."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3175,6 +3233,19 @@ msgstr ""
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3969,9 +4040,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4117,10 +4189,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr ""
@@ -4169,7 +4237,9 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4204,10 +4274,6 @@ msgstr ""
 msgid "Mapblock mesh generation threads"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr ""
@@ -4449,6 +4515,10 @@ msgstr ""
 msgid "Minimap scan height"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Minimum dig repetition interval"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
@@ -4517,6 +4587,10 @@ msgstr ""
 msgid "Mouse sensitivity multiplier."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr ""
@@ -4625,10 +4699,6 @@ msgstr ""
 msgid "Occlusion Culling"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -4641,6 +4711,10 @@ msgid ""
 "open."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr ""
@@ -4750,6 +4824,14 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -4765,6 +4847,10 @@ msgstr ""
 msgid "Random input"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
@@ -4952,8 +5038,8 @@ msgid ""
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5071,7 +5157,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
 
@@ -5104,6 +5190,10 @@ msgid ""
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Set to true to enable waving leaves."
 msgstr ""
@@ -5143,8 +5233,7 @@ msgstr ""
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5214,13 +5303,6 @@ msgid ""
 "recommended."
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr ""
@@ -5256,7 +5338,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5277,6 +5359,14 @@ msgstr ""
 msgid "Soft shadow radius"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Sound Extensions Blacklist"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Specifies URL from which client fetches media instead of using UDP.\n"
@@ -5433,17 +5523,37 @@ msgid ""
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5454,6 +5564,12 @@ msgid ""
 "Default is 1.0 (1/2 node)."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
 msgstr ""
@@ -5480,7 +5596,7 @@ msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5537,6 +5653,10 @@ msgstr ""
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -5584,11 +5704,11 @@ msgid "Touchscreen sensitivity multiplier."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Touchscreen threshold"
+msgid "Tradeoffs for performance"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Tradeoffs for performance"
+msgid "Translucent liquids"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5626,7 +5746,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5724,10 +5846,6 @@ msgstr ""
 msgid "User Interfaces"
 msgstr ""
 
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid "VSync"
 msgstr ""
@@ -5814,12 +5932,24 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
 
+#: src/settings_translation_file.cpp
+msgid "Volume when unfocused"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Volumetric lighting"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index 6326e1f3d..556e9fbf6 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-11-17 00:07+0000\n"
-"Last-Translator: milewood <2598175722@qq.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-07-31 22:09+0000\n"
+"Last-Translator: y5nw <y5nw@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "minetest/minetest/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.2\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -20,7 +20,7 @@ msgstr "清除聊天发送队列"
 
 #: builtin/client/chatcommands.lua
 msgid "Empty command."
-msgstr "空命令。"
+msgstr "空命令."
 
 #: builtin/client/chatcommands.lua
 msgid "Exit to main menu"
@@ -71,7 +71,8 @@ msgid "Command not available: "
 msgstr "命令不可用： "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
+#, fuzzy
+msgid "Get help for commands (-t: output in chat)"
 msgstr "获取命令帮助"
 
 #: builtin/common/chatcommands.lua
@@ -81,12 +82,8 @@ msgstr ""
 "使用 '.help <cmd>' 获取该命令的更多信息，或使用 '.help all' 列出所有内容。"
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <命令>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <命令>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -104,6 +101,10 @@ msgstr "发生了错误："
 msgid "Main menu"
 msgstr "主菜单"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "重新连接"
@@ -132,177 +133,185 @@ msgstr "我们只支持协议版本 $1。"
 msgid "We support protocol versions between version $1 and $2."
 msgstr "我们支持的协议版本为 $1 至 $2。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "\"$1\"已经存在，你要覆盖它吗？"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "在安装 \"$1\": $2 时发生错误"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 和 $2 依赖项将被安装."
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "无法下载 $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 作者： $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "下载 $1 失败"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "无法解压\"$1\"：存储空间不足、文件类型不支持或压缩包已损坏"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
 msgstr ""
-"$1 正在下载,\n"
-"$2 排队中"
+"正在下载$1\n"
+"准备下载$2"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
-msgstr "正在下载 $1 ……"
+msgstr "正在下载 $1…"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "有$1个依赖项没有找到。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "$1 将被安装, $2 依赖项将被跳过."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "所有包"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "已安装"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "返回主菜单"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "在没有cURL的情况下编译Minetest时，ContentDB不可用"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "下载中..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#, fuzzy
+msgid "Error getting dependencies for package"
+msgstr "无法获取这个包的依赖项"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "子游戏"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "安装"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "加载中..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "Mod"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "无法检索任何包"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "无结果"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "没有更新"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "已加入队列"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "材质包"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "找不到包 “$1”。"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "卸载"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "更新"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "更新所有 [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "在网络浏览器中查看更多信息"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "在安装mod前，你需要先安装一个子游戏"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 和 $2 依赖项将被安装."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 作者： $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "有 $1 个依赖项没有找到。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 将被安装, $2 依赖项将被跳过."
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "已安装"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "基础游戏："
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "取消"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "在没有cURL的情况下编译Minetest时，ContentDB不可用"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "依赖项："
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "下载中..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr "在安装 \"$1\": $2 时发生错误"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "下载 $1 失败"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "下载 $1 失败"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "安装：\"$1\" 的文件类型不支持或压缩包已损坏"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "子游戏"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "安装"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "安装$1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "安装缺失的依赖项"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "加载中..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mod"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "无法检索任何包"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "无结果"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "没有更新"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "未找到"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "覆写"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "请查看游戏是否正确。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "已加入队列"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\"已经存在，你要覆盖它吗？"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "材质包"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "卸载"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "更新"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "更新所有 [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "在网络浏览器中查看更多信息"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr "在安装mod前，你需要先安装一个子游戏"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "覆写"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -317,14 +326,12 @@ msgid "Failed to install $1 to $2"
 msgstr "无法把$1安装到$2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "安装mod：无法找到mod包$1的合适文件夹名"
+msgstr "安装mod：无法找到mod包 $1 的合适文件夹名"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "无法找到mod或mod包"
+msgstr "找不到有效的 Mod、整合包或者子游戏"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a $2"
@@ -348,7 +355,7 @@ msgstr "全部禁用"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "禁用 mod 包"
+msgstr "禁用整合包"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -356,7 +363,7 @@ msgstr "全部启用"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "启用 mod 包"
+msgstr "启用整合包"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -382,11 +389,11 @@ msgstr "未提供游戏描述。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr "无依赖项"
+msgstr "无硬性依赖"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr "未提供 mod 包描述。"
+msgstr "未提供整合包描述。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
@@ -450,10 +457,20 @@ msgstr "创建"
 msgid "Decorations"
 msgstr "装饰"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid "Desert temples"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
 msgstr "开发测试版适用于开发者。"
 
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr ""
+
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
 msgstr "地窖"
@@ -654,21 +671,24 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"一直以来，Minetest 游戏引擎默认已经自带了“Minetest Game”这个子游戏。但是从 "
+"Minetest 5.8.0 版本起，Minetest 将不再自带任何子游戏。"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"如果还要继续在已有的 Minetest Game 世界中游玩，请重新安装 Minetest Game 子游"
+"戏。"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "Minetest Game 不再是默认自带的子游戏了"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
-#, fuzzy
 msgid "Reinstall Minetest Game"
-msgstr "安装另一个子游戏"
+msgstr "重新安装 Minetest Game 子游戏"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -676,18 +696,18 @@ msgstr "接受"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "重命名MOD包："
+msgstr "重命名整合包："
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
-"此 mod 包在它的 modpack.conf 中有一个明确的名称，它将覆盖这里的任何重命名。"
+"此整合包在它的 modpack.conf 中有一个明确的名称，它将覆盖这里的任何重命名。"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "A new $1 version is available"
-msgstr "新的 $1 版本可用"
+msgstr "有新的 $1 版本可用"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid ""
@@ -741,9 +761,8 @@ msgid "Select file"
 msgstr "选择文件"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "选择键"
+msgstr "设置"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -767,7 +786,6 @@ msgid "Offset"
 msgstr "补偿"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#, fuzzy
 msgid "Persistence"
 msgstr "持续性"
 
@@ -813,20 +831,16 @@ msgstr "缓解"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "（使用系统语言）"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "辅助功能"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "后退"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "更改键位设置"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -836,7 +850,8 @@ msgstr "聊天"
 msgid "Clear"
 msgstr "Clear键"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "控制"
 
@@ -845,18 +860,16 @@ msgid "General"
 msgstr "通用"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "快速移动"
+msgstr "移动"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
-msgstr "恢复初始设置"
+msgstr "恢复默认设置"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "恢复默认设置 ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -864,7 +877,7 @@ msgstr "搜索"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "显示高级设置"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
@@ -884,11 +897,11 @@ msgstr "内容：模组"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "（子游戏需要支持阴影才能生效）"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "自定义"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -941,7 +954,7 @@ msgstr "核心团队"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "Irrlicht 渲染设备："
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -972,18 +985,16 @@ msgid "Browse online content"
 msgstr "浏览在线内容"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "浏览在线内容"
+msgstr "浏览在线内容 [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "内容"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "内容"
+msgstr "内容 [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1006,9 +1017,8 @@ msgid "Rename"
 msgstr "重命名"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<无可用命令>"
+msgstr "有更新可用？"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1046,6 +1056,17 @@ msgstr "安装子游戏"
 msgid "Install games from ContentDB"
 msgstr "从 ContentDB 安装游戏"
 
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Minetest doesn't come with a game by default."
+msgstr "Minetest Game 不再是默认自带的子游戏了"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "新建"
@@ -1079,8 +1100,9 @@ msgid "Start Game"
 msgstr "启动游戏"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "你没有安装任何子游戏。"
+#, fuzzy
+msgid "You need to install a game before you can create a world."
+msgstr "您需要先安装一个子游戏才能创建新的世界。"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1113,7 +1135,7 @@ msgstr "登录"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Ping"
-msgstr "应答速度"
+msgstr "ping值"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Public Servers"
@@ -1159,18 +1181,10 @@ msgstr "载入材质..."
 msgid "Rebuilding shaders..."
 msgstr "重建着色器..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "连接出错（超时？）"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "找不到子游戏或者无法载入子游戏： "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "非法游戏信息。"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "主菜单"
@@ -1195,7 +1209,11 @@ msgstr "提供的密码文件无法打开: "
 msgid "Provided world path doesn't exist: "
 msgstr "提供的世界路径不存在: "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "媒体..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1203,18 +1221,10 @@ msgstr ""
 "\n"
 "查看 debug.txt 以获得详细信息。"
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- 地址： "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- 模式: "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- 端口: "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- 公共服务器: "
@@ -1249,10 +1259,6 @@ msgstr "自动前进已启用"
 msgid "Block bounds hidden"
 msgstr "已隐藏方块边界"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "已为所有方块描边"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "已为当前方块描边"
@@ -1270,9 +1276,8 @@ msgid "Camera update enabled"
 msgstr "已启用镜头更新"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
-msgstr "无法显示方块的边界 （需要“basic_debug”权限）"
+msgstr "无法显示方块边界（已被子游戏或者 Mod 禁用）"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1298,6 +1303,10 @@ msgstr "客户端脚本已禁用"
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "连接出错（超时？）"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "连接失败，原因不明"
@@ -1306,47 +1315,14 @@ msgstr "连接失败，原因不明"
 msgid "Continue"
 msgstr "继续"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"控制：\n"
-"- %s：向前移动\n"
-"- %s：向后移动\n"
-"- %s：向左移动\n"
-"- %s：向右移动\n"
-"- %s：跳/向上(攀爬)\n"
-"- %s：挖/打\n"
-"- %s：放/使用\n"
-"- %s：潜行/向下(攀爬)\n"
-"- %s：丢弃物品\n"
-"- %s：物品清单\n"
-"- 鼠标:转身/环顾\n"
-"- 鼠标滚轮: 选择物品\n"
-"- %s：聊天\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1355,11 +1331,11 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
-"默认控制:\n"
+"控制指南:\n"
 "菜单不可见时:\n"
-"- 单击: 激活按钮\n"
-"- 双击: 放置/使用\n"
-"- 滑动手指: 改变视角\n"
+"- 长安: 挖/按压/使用\n"
+"- 单击: 放置/使用\n"
+"- 滑动手指: 环顾四周\n"
 "菜单/物品栏可见时:\n"
 "- 双击 (界面区域外):\n"
 " --> 关闭\n"
@@ -1438,6 +1414,11 @@ msgstr "雾气已禁用"
 msgid "Fog enabled"
 msgstr "雾气已启用"
 
+#: src/client/game.cpp
+#, fuzzy
+msgid "Fog enabled by game or mod"
+msgstr "雾被当前子游戏或 mod 启用"
+
 #: src/client/game.cpp
 msgid "Game info:"
 msgstr "游戏信息:"
@@ -1458,10 +1439,6 @@ msgstr "物品定义..."
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "媒体..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/s"
@@ -1549,7 +1526,7 @@ msgstr "已取消静音"
 #: src/client/game.cpp
 #, c-format
 msgid "The server is probably running a different version of %s."
-msgstr "此服务器运行的可能是别的版本，%s。"
+msgstr "此服务器运行的可能是另一版本的 %s。"
 
 #: src/client/game.cpp
 #, c-format
@@ -1562,28 +1539,26 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "无法监听 %s，因为 IPv6 已禁用"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "启用无限视野"
+msgstr "无限视野已禁用"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
-msgstr "启用无限视野"
+msgstr "无限视野已启用"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "无限视野已启用，但是受子游戏或者 Mod 限制"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "视野范围已达到最小：%d"
+msgstr "视野范围被变为%d（最小范围）"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
-msgstr ""
+msgstr "视野被调至 %d（最小）,但是受%d的约束因为游戏或者模组"
 
 #: src/client/game.cpp
 #, c-format
@@ -1591,20 +1566,20 @@ msgid "Viewing range changed to %d"
 msgstr "视野范围已改变至%d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "视野范围已改变至%d"
+msgstr "视野范围已改变至%d（最大）"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
-msgstr ""
+msgstr "查看范围更改为 %d（最大值），但游戏或模组限制为 %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "视野范围已改变至%d"
+msgstr "视野范围已改变至 %d，但是被子游戏或 Mod 限制为 %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1619,10 +1594,6 @@ msgstr "线框已显示"
 msgid "Zoom currently disabled by game or mod"
 msgstr "缩放被当前子游戏或 mod 禁用"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "确定"
-
 #: src/client/gameui.cpp
 msgid "Chat currently disabled by game or mod"
 msgstr "无法聊天：可能原因：被游戏或mod禁用"
@@ -1662,32 +1633,28 @@ msgstr "退格"
 
 #. ~ Usually paired with the Pause key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Break Key"
-msgstr "潜行键"
+msgstr "取消键"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
 msgstr "大写锁定键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "Clear键"
+msgstr "清除键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "Ctrl键"
+msgstr "控制键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "删除"
+msgstr "删除键"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "⇩"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1734,9 +1701,8 @@ msgid "Insert"
 msgstr "Insert键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "左Control键"
+msgstr "⇦"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1760,9 +1726,8 @@ msgstr "左Windows键"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "菜单"
+msgstr "菜单键"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1837,20 +1802,17 @@ msgid "OEM Clear"
 msgstr "OEM Clear键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Down"
 msgstr "下一页"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Page Up"
 msgstr "上一页"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "Pause键"
+msgstr "暂停键"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1862,14 +1824,12 @@ msgid "Print"
 msgstr "打印"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Return Key"
 msgstr "回车键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Right Arrow"
-msgstr "右Control键"
+msgstr "⇨"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1901,7 +1861,6 @@ msgid "Select"
 msgstr "选择键"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
 msgstr "Shift键"
 
@@ -1923,7 +1882,7 @@ msgstr "Tab键"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "⇧"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1934,7 +1893,6 @@ msgid "X Button 2"
 msgstr "X键2"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Zoom Key"
 msgstr "缩放"
 
@@ -1956,11 +1914,21 @@ msgstr "地表模式小地图, 放大至%d倍"
 msgid "Minimap in texture mode"
 msgstr "材质模式小地图"
 
+#: src/client/shader.cpp
+#, fuzzy, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "无法编译“%s”着色器。"
+
+#: src/client/shader.cpp
+#, fuzzy
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "着色器已启用，但是驱动程序不支持 GLSL。"
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
 msgid "%s is missing:"
-msgstr "缺失的模组： %s"
+msgstr "%s 模组缺失以下依赖："
 
 #: src/content/mod_configuration.cpp
 msgid ""
@@ -2145,6 +2113,20 @@ msgstr "缩放"
 msgid "press key"
 msgstr "按键"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "打开"
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Open URL?"
+msgstr "是否打开网页？"
+
+#: src/gui/guiOpenURL.cpp
+#, fuzzy
+msgid "Unable to open URL"
+msgstr "无法打开网页"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "更改"
@@ -2178,6 +2160,7 @@ msgstr "音量：%d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "zh_CN"
 
@@ -2191,9 +2174,9 @@ msgid "Name is taken. Please choose another name"
 msgstr "名称已被占用。请选择其他名称"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "关闭中..."
+msgstr "关闭过程中出现 %s 错误： "
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2263,7 +2246,7 @@ msgstr "确定河谷及河道位置的2D噪声。"
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2318,7 +2301,6 @@ msgid "3D noise that determines number of dungeons per mapchunk."
 msgstr "确定每个地图块的地窖数量的3D噪声。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2332,14 +2314,13 @@ msgid ""
 msgstr ""
 "3D 支持。\n"
 "目前已支持：\n"
-"-    无(none): 无 3D 输出。\n"
-"-    立体影片(anaglyph)：青红/品红色彩色 3D。\n"
-"-    交错(interlaced)：基于奇偶行的偏振屏支持。\n"
-"-    顶底(topbottom)：上下分屏。\n"
-"-    并列(sidebyside)：左右分屏。\n"
-"-    内斜视(crossview)：内斜视左右分屏3D。\n"
-"-    翻页(pageflip)：基于四重缓冲的 3D。\n"
-"注意交错模式需要启用着色器。"
+"-    无 (none): 无 3D 输出。\n"
+"-    立体影片 (anaglyph)：青红/品红色彩色 3D。\n"
+"-    交错 (interlaced)：基于奇偶行的偏振屏支持。\n"
+"-    顶底 (topbottom)：上下分屏。\n"
+"-    并列 (sidebyside)：左右分屏。\n"
+"-    内斜视 (crossview)：内斜视左右分屏 3D。\n"
+"请注意，交错模式需要启用着色器才能使用。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2398,13 +2379,6 @@ msgid "Adds particles when digging a node."
 msgstr "挖方块时添加粒子。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr "为支持4K等屏幕，调节像素点密度（非 X11/Android 环境才有效）。"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr "调整检测到的显示密度，用来缩放 UI 元素。"
 
@@ -2431,6 +2405,10 @@ msgstr "管理员名称"
 msgid "Advanced"
 msgstr "高级"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2470,14 +2448,12 @@ msgid "Announce to this serverlist."
 msgstr "向服务器表公开服务器。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "抗锯齿："
+msgstr "抗锯齿比例"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "抗锯齿："
+msgstr "抗锯齿方法"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2491,6 +2467,17 @@ msgstr "添加物品名称至工具栏。"
 msgid "Apple trees noise"
 msgstr "苹果树噪声"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "手臂惯性"
@@ -2508,18 +2495,37 @@ msgid "Ask to reconnect after crash"
 msgstr "崩溃后询问重新连接"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "At this distance the server will aggressively optimize which blocks are sent "
 "to\n"
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"在此距离下，服务器将积极优化将哪些块发送到客户端。\n"
+"小数值可能会极大地提高性能，\n"
+"却会造成可见的渲染故障。\n"
+"（有些方块将不会在水和洞穴中呈现，\n"
+"有时在陆地上也不会呈现）\n"
+"将其设置为大于 max_block_send_distance 的值\n"
+"将禁用此优化。\n"
+"在 mapblocks中声明（16 个节点）。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
 "在此距离下，服务器将积极优化将哪些块发送到客户端。\n"
 "小数值可能会极大地提高性能，\n"
@@ -2552,16 +2558,15 @@ msgstr "用于攀登/降落的Aux1键"
 
 #: src/settings_translation_file.cpp
 msgid "Base ground level"
-msgstr "平地级别"
+msgstr "地图生成器平地级别"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height."
 msgstr "基础地形高度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "最小材质大小"
+msgstr "基础材质大小"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2584,14 +2589,18 @@ msgid "Bind address"
 msgstr "绑定地址"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "生物群系"
+msgstr "生物群系 API"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "生物群系噪声"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "最优方块发送距离"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "最优方块发送距离"
@@ -2605,9 +2614,8 @@ msgid "Bloom Intensity"
 msgstr "泛光强度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bloom Radius"
-msgstr "云半径"
+msgstr "泛光半径"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
@@ -2651,7 +2659,7 @@ msgstr "镜头平滑"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr "电影模式下镜头平滑"
+msgstr "电影模式中的镜头平滑"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
@@ -2777,7 +2785,6 @@ msgid "Client-side Modding"
 msgstr "客户端修改"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side node lookup range restriction"
 msgstr "客户端方块查询范围限制"
 
@@ -2794,7 +2801,6 @@ msgid "Clouds"
 msgstr "云彩"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
 msgstr "云是客户端效果。"
 
@@ -2810,6 +2816,12 @@ msgstr "彩色雾"
 msgid "Colored shadows"
 msgstr "彩色阴影"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2952,7 +2964,6 @@ msgid "Crosshair alpha"
 msgstr "准星透明"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Crosshair alpha (opaqueness, between 0 and 255).\n"
 "This also applies to the object crosshair."
@@ -2972,10 +2983,6 @@ msgstr ""
 "准星颜色(R,G,B).\n"
 "还控制对象准星颜色"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "沙漠噪声阈值"
@@ -3030,6 +3037,23 @@ msgstr ""
 "使用 PCF 或 泊松盘（Poisson disk）算法模拟软阴影效果\n"
 "但也会使用更多的硬件资源。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"启用禁止旧版客户端连接模式。\n"
+"兼容旧版客户端是指它们不会在连接新版服务器时\n"
+"崩溃，但可能不支持某些您所期望的新特性。"
+
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
 msgstr "定义树上长苹果的区域."
@@ -3056,6 +3080,9 @@ msgid ""
 "Smaller values make bloom more subtle\n"
 "Range: from 0.01 to 1.0, default: 0.05"
 msgstr ""
+"定义对渲染图像的晕染程度\n"
+"数值越小，晕染越细腻\n"
+"范围：0.01 至 1.0，默认值：0.05"
 
 #: src/settings_translation_file.cpp
 msgid "Defines large-scale river channel structure."
@@ -3078,6 +3105,8 @@ msgid ""
 "Defines the magnitude of bloom overexposure.\n"
 "Range: from 0.1 to 10.0, default: 1.0"
 msgstr ""
+"定义泛光的程度。\n"
+"范围：0.1 至 10.0，默认值：1.0"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -3089,6 +3118,8 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"定义 FSAA 和 SSAA 抗锯齿方法的采样网格大小。\n"
+"值为 2 表示取 2x2 = 4 个样本。"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3177,6 +3208,8 @@ msgid ""
 "Distance in nodes at which transparency depth sorting is enabled\n"
 "Use this to limit the performance impact of transparency depth sorting"
 msgstr ""
+"启用透明度深度排序的节点距离\n"
+"用于限制透明度深度排序对性能的影响"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
@@ -3208,16 +3241,20 @@ msgstr "地窖噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Automatic Exposure"
-msgstr ""
+msgstr "启用自动曝光"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable Bloom"
-msgstr "全部启用"
+msgstr "启用泛光"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom Debug"
-msgstr ""
+msgstr "启用泛光调试"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "开启伤害"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3244,9 +3281,14 @@ msgstr ""
 "启用泊松盘（Poisson disk）滤镜。\n"
 "使用泊松盘算法来产生“软阴影”。不启用的话就会使用 PCF 滤镜。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Post Processing"
+msgstr "后期处理"
+
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
-msgstr ""
+msgstr "启用光线追踪剔除"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3255,6 +3297,10 @@ msgid ""
 "automatically adjust to the brightness of the scene,\n"
 "simulating the behavior of human eye."
 msgstr ""
+"启用自动曝光校正\n"
+"启用后，后期处理引擎将\n"
+"自动调整场景亮度、\n"
+"模拟人眼的行为。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3286,7 +3332,12 @@ msgstr "启用 mod 安全"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
-msgstr ""
+msgstr "启用鼠标滚轮（滚动），以便在热栏中选择项目。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "使用随机顺序加载 mod（主要用于测试）。"
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3302,7 +3353,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable split login/register"
-msgstr ""
+msgstr "启用分页登录/注册"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3316,6 +3367,11 @@ msgstr ""
 "兼容旧版客户端是指它们不会在连接新版服务器时\n"
 "崩溃，但可能不支持某些您所期望的新特性。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable touchscreen"
+msgstr "触摸屏"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3327,14 +3383,6 @@ msgstr ""
 "连接到服务器时，远程服务器会提供一种更快的方式\n"
 "下载媒体信息 (如材质)。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-"启用顶点缓冲对象。\n"
-"这会极大改善图像性能。"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3373,6 +3421,20 @@ msgstr "启用物品清单动画。"
 msgid "Enables caching of facedir rotated meshes."
 msgstr "启用翻转网状物facedir的缓存。"
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr "启用触摸屏模式。启用后您可以使用触摸屏玩游戏。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
@@ -3380,7 +3442,6 @@ msgid ""
 msgstr "允许不影响可玩性的轻微视觉错误，以此减少 CPU 负载，或提高渲染性能。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine Profiler"
 msgstr "引擎性能分析"
 
@@ -3393,7 +3454,6 @@ msgid "Entity methods"
 msgstr "实体方法"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Exponent of the floatland tapering. Alters the tapering behavior.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
@@ -3404,13 +3464,14 @@ msgid ""
 msgstr ""
 "悬空岛锥度的指数，更改锥度的行为。\n"
 "值等于1.0，创建一个统一的，线性锥度。\n"
-"值大于1.0，创建一个平滑的、合适的锥度，默认分隔的悬空岛。\n"
+"值大于1.0，创建一个平滑的、合适的锥度，默认分隔的\n"
+"悬空岛。\n"
 "值小于1.0，（例如0.25）创建一个带有平坦低地的更加轮廓分明的表面级别，\n"
 "适用于固体悬空岛层。"
 
 #: src/settings_translation_file.cpp
 msgid "Exposure compensation"
-msgstr ""
+msgstr "曝光补偿"
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
@@ -3490,7 +3551,6 @@ msgid "Fixed virtual joystick"
 msgstr "固定虚拟摇杆"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
@@ -3560,7 +3620,7 @@ msgstr "字体大小"
 
 #: src/settings_translation_file.cpp
 msgid "Font size divisible by"
-msgstr ""
+msgstr "字体大小被整除因为"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font where 1 unit = 1 pixel at 96 DPI"
@@ -3588,6 +3648,10 @@ msgid ""
 "be\n"
 "sized 16, 32, 48, etc., so a mod requesting a size of 25 will get 32."
 msgstr ""
+"对于不能很好缩放的像素风字体，该值可确保与该字体一起使用的字体大小\n"
+"的字体大小总是能被该值除以像素。例如\n"
+"高 16 像素的像素字体应将此值设为 16，这样它的字体大小就只能是\n"
+"大小为 16、32、48 等，因此要求 25 大小的模式将得到 32。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3664,7 +3728,6 @@ msgid "Fullscreen mode."
 msgstr "全屏模式。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "GUI"
 msgstr "界面"
 
@@ -3720,7 +3783,7 @@ msgstr "图形"
 
 #: src/settings_translation_file.cpp
 msgid "Graphics Effects"
-msgstr "图形效果"
+msgstr "图形"
 
 #: src/settings_translation_file.cpp
 msgid "Graphics and Audio"
@@ -3784,7 +3847,6 @@ msgid "Heat noise"
 msgstr "热噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
 msgstr "初始窗口高度，全屏模式下忽略该值。"
 
@@ -3850,25 +3912,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Enable mouse wheel for selection"
-msgstr ""
+msgstr "快捷栏：启用鼠标滚轮用来选择"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Invert mouse wheel direction"
-msgstr ""
+msgstr "快捷栏：反转鼠标滚轮方向"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
 msgstr "生成河流多深。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
-"液体波移动多快。更高值=更快。\n"
-"如果为负，液体波向后移动。\n"
-"需要波动液体启用。"
+"液体波移动有多快。值越高代表移动越快。\n"
+"如果值为负，则液体波将反向移动。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3969,7 +4029,6 @@ msgid ""
 msgstr "如果启用，玩家将无法在没有密码的情况下加入或修改密码为空密码。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, the server will perform map block occlusion culling based on\n"
 "on the eye position of the player. This can reduce the number of blocks\n"
@@ -3979,10 +4038,9 @@ msgstr ""
 "如果启用，服务器会根据玩家的视野遮挡\n"
 "剔除地图区块。这可以减少向客户端发送\n"
 "的 50-80% 的区块。客户端将不会收到最\n"
-"不可见的内容，降低 noclip 模式的实用性。"
+"不可见的内容，降低穿墙模式的实用性。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place nodes at the position (feet + eye level) where you "
 "stand.\n"
@@ -4053,7 +4111,6 @@ msgstr ""
 "通常只有核心／内部构建者需要"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument chat commands on registration."
 msgstr "登录时的聊天命令。"
 
@@ -4097,7 +4154,7 @@ msgstr "反转鼠标"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
-msgstr ""
+msgstr "为快捷栏中选择物品反转鼠标滚轮(滚动)方向."
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
@@ -4276,38 +4333,34 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
 msgstr ""
 "服务器时钟节拍长度，通常也是对象通过网络更新的\n"
 "时间间隔。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "波动液体波动速度"
+msgstr "波动液体波动速度."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between Active Block Modifier (ABM) execution cycles, stated "
 "in seconds."
-msgstr "ABM执行循环时长"
+msgstr "ABM执行循环时长."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between NodeTimer execution cycles, stated in seconds."
-msgstr "NodeTimer执行循环时长"
+msgstr "NodeTimer执行循环时长."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between active block management cycles, stated in seconds."
-msgstr "活动方块管理循环时长"
+msgstr "活动方块管理循环时长."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Level of logging to be written to debug.txt:\n"
 "-    <nothing> (no logging)\n"
@@ -4319,14 +4372,15 @@ msgid ""
 "-    verbose\n"
 "-    trace"
 msgstr ""
-"写入debug.txt的日志等级：\n"
-"-    <无>（无日志）\n"
-"-    无等级（none）（无等级的消息）\n"
+"写入 debug.txt 文件的日志等级：\n"
+"-    <无>（不记录日志）\n"
+"-    无等级（none）\n"
 "-    错误（error）\n"
 "-    警告（warning）\n"
 "-    行为（action）\n"
 "-    信息（info）\n"
-"-    冗长调试信息（verbose）"
+"-    详细（verbose）\n"
+"-    追逐（trace）"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
@@ -4432,6 +4486,9 @@ msgid ""
 "from the bright objects.\n"
 "Range: from 0.1 to 8, default: 1"
 msgstr ""
+"逻辑值，用于控制泛光效果\n"
+"从明亮物体扩散的距离。\n"
+"范围：0.1 至 8，默认：1"
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of dungeons."
@@ -4450,10 +4507,6 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "使雾和天空颜色依赖于一天中的时间（黎明/傍晚）和视线方向。"
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "使所有液体不透明"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
 msgstr "磁盘存储的映射压缩级别"
@@ -4509,11 +4562,14 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "针对v5地图生成器的属性。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
 "针对v6地图生成器的属性。\n"
 "'snowboimes'启用新版5生物群系系统。\n"
@@ -4541,9 +4597,8 @@ msgid "Map save interval"
 msgstr "地图保存间隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map shadows update frames"
-msgstr "液体更新时钟间隔"
+msgstr "地图阴影更新帧率"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
@@ -4554,13 +4609,8 @@ msgid "Mapblock mesh generation delay"
 msgstr "地图生成延时"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generation threads"
-msgstr "地图生成延时"
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "地图生成缓存大小"
+msgstr "区块网格生成线程"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
@@ -4722,8 +4772,8 @@ msgid ""
 "be queued.\n"
 "This should be lower than curl_parallel_limit."
 msgstr ""
-"最大并发下载数。 超过此限制的下载将排队。 这应该低于 curl_parallel_limit（卷"
-"曲平行限制）。"
+"最大并发下载数。 超过此限制的下载将会排队等待。\n"
+"这个值应该低于 curl_parallel_limit。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4772,12 +4822,10 @@ msgid "Maximum simultaneous block sends per client"
 msgstr "给每个客户端发送方块的最大次数"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum size of the outgoing chat queue"
 msgstr "显示最大聊天记录的行度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum size of the outgoing chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
@@ -4825,6 +4873,11 @@ msgstr "写入聊天的最小日志级别。"
 msgid "Minimap scan height"
 msgstr "小地图扫描高度"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "放置重复间隔"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr "每个地图块的随机大型洞穴数的上限。"
@@ -4839,7 +4892,7 @@ msgstr "Mip 贴图"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "杂项"
 
 #: src/settings_translation_file.cpp
 msgid "Mod Profiler"
@@ -4866,7 +4919,6 @@ msgid "Monospace font size"
 msgstr "等宽字体大小"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Monospace font size divisible by"
 msgstr "等宽字体大小"
 
@@ -4894,6 +4946,11 @@ msgstr "鼠标灵敏度"
 msgid "Mouse sensitivity multiplier."
 msgstr "鼠标灵敏度倍数。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Movement threshold"
+msgstr "大型洞穴阈值"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "泥土噪声"
@@ -4998,7 +5055,6 @@ msgstr ""
 "佳值为'1'。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of extra blocks that can be loaded by /clearobjects at once.\n"
 "This is a trade-off between SQLite transaction overhead and\n"
@@ -5009,7 +5065,6 @@ msgstr ""
 "（4096=100MB，按经验法则）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
 msgstr "每10秒发送给玩家的消息量。"
 
@@ -5019,20 +5074,17 @@ msgid ""
 "Value of 0 (default) will let Minetest autodetect the number of available "
 "threads."
 msgstr ""
+"用于生成网格的线程数。\n"
+"默认值为 0 时，Minetest 会自动检测可用线程数。"
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr ""
+msgstr "摔落保护"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Occlusion Culling"
 msgstr "服务器端遮挡删除"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "不透明液体"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
@@ -5047,6 +5099,10 @@ msgstr ""
 "当窗口焦点丢失是打开暂停菜单。如果游戏内窗口打开，\n"
 "则不暂停。"
 
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "OpenGL 调试"
+
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
 msgstr "替换聊天网页链接的颜色，可用可不用。"
@@ -5115,24 +5171,23 @@ msgid "Player transfer distance"
 msgstr "玩家转移距离"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Poisson filtering"
 msgstr "双线性过滤"
 
 #: src/settings_translation_file.cpp
 msgid "Post Processing"
-msgstr ""
+msgstr "后期处理"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Prevent digging and placing from repeating when holding the respective "
 "buttons.\n"
 "Enable this when you dig or place too often by accident.\n"
 "On touchscreens, this only affects digging."
 msgstr ""
-"按住鼠标时，防止重复破坏和重复放置。 \n"
-"当您意外地频繁破坏或放置方块时启用此功能。"
+"防止按住鼠标按键时反复破坏或者放置。\n"
+"启用此功能可以避免意外地破坏或者放置。\n"
+"在触摸屏设备上，这个选项只会影响破坏。"
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -5174,6 +5229,15 @@ msgstr ""
 msgid "Proportion of large caves that contain liquid."
 msgstr "包含液体的大洞穴的比例。"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Protocol version minimum"
+msgstr "最低协议版本"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Radius of cloud area stated in number of 64 node cloud squares.\n"
@@ -5191,6 +5255,11 @@ msgstr "抬高地形使河流周围形成山谷。"
 msgid "Random input"
 msgstr "随机输入"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Random mod load order"
+msgstr "使用随机顺序加载 Mod"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "最近聊天消息"
@@ -5200,7 +5269,6 @@ msgid "Regular font path"
 msgstr "常规字体路径"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Remember screen size"
 msgstr "自动保存屏幕大小"
 
@@ -5254,7 +5322,7 @@ msgstr "山脊扩散噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge noise"
-msgstr "山脊噪声"
+msgstr "河流噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge underwater noise"
@@ -5320,6 +5388,10 @@ msgid ""
 "is maximized is stored in window_maximized.\n"
 "(Autosaving window_maximized only works if compiled with SDL.)"
 msgstr ""
+"修改时自动保存窗口大小.\n"
+"如果为 \"true\"，屏幕尺寸会保存在 screen_w 和 screen_h 中，窗口是否最大化会\n"
+"保存在 window_maximized 中.\n"
+"(自动保存 window_maximized 仅在与 SDL 一起编译时有效.）"
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
@@ -5394,13 +5466,14 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "见 https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5414,6 +5487,22 @@ msgid ""
 "Renders higher-resolution image of the scene, then scales down to reduce\n"
 "the aliasing effects. This is the slowest and the most accurate method."
 msgstr ""
+"选择要应用的抗锯齿方法。\n"
+"\n"
+"* 无 - 无反锯齿（默认值）\n"
+"\n"
+"* FSAA - 硬件提供的全屏抗锯齿（与着色器不兼容）\n"
+"又称多重采样抗锯齿 (MSAA)\n"
+"平滑块边缘，但不影响纹理内部。\n"
+"更改此选项需要重新启动。\n"
+"\n"
+"* FXAA - 快速近似抗锯齿（需要着色器）\n"
+"应用后处理滤镜来检测和平滑高对比度边缘。\n"
+"在速度和图像质量之间取得平衡。\n"
+"\n"
+"* SSAA - 超级采样抗锯齿（需要着色器）\n"
+"渲染更高分辨率的场景图像，然后缩放以减少锯齿效果。\n"
+"抗锯齿效果。这是最缓慢也是最精确的方法。"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5474,7 +5563,6 @@ msgid "Server"
 msgstr "服务器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server Gameplay"
 msgstr "服务器名称"
 
@@ -5503,38 +5591,34 @@ msgid "Server port"
 msgstr "服务器端口"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server-side occlusion culling"
 msgstr "服务器端遮挡删除"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server/Env Performance"
-msgstr "服务器端口"
+msgstr "服务器/Env 性能"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
 msgstr "服务器列表 URL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist and MOTD"
-msgstr "服务器列表 URL"
+msgstr "服务器列表以及 MOTD 问候信息"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
 msgstr "服务器列表文件"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the default tilt of Sun/Moon orbit in degrees.\n"
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
-"以度为单位设置太阳/月亮轨道的倾斜度\n"
-"值 0 表示没有倾斜/垂直轨道。\n"
-"最小值 0.0 和最大值 60.0"
+"设置太阳/月亮轨道的倾斜度，以度为单位。\n"
+"子游戏可能会通过 API 修改该设置。\n"
+"值设为 0 表示没有倾斜（即垂直轨道）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5542,33 +5626,35 @@ msgid ""
 "Value of 0.0 (default) means no exposure compensation.\n"
 "Range: from -1 to 1.0"
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set the language. Leave empty to use the system language.\n"
-"A restart is required after changing this."
-msgstr ""
-"设定语言。留空以使用系统语言。\n"
-"变更后须重新启动。"
+"以 EV 为单位设置曝光补偿。\n"
+"0.0（默认值）表示无曝光补偿。\n"
+"范围：-1.0 至 1.0"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Set the language. By default, the system language is used.\n"
+"A restart is required after changing this."
+msgstr ""
+"设定语言。默认使用系统语言。\n"
+"变更后须重新启动。"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Set the maximum length of a chat message (in characters) sent by clients."
 msgstr "设定客户端传送的聊天讯息的最大字符长度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the shadow strength gamma.\n"
 "Adjusts the intensity of in-game dynamic shadows.\n"
 "Lower value means lighter shadows, higher value means darker shadows."
 msgstr ""
-"设置阴影强度。\n"
-"较低的值表示较亮的阴影，较高的值表示较暗的阴影。"
+"设置阴影强度.\n"
+"较低的值表示较亮的阴影.\n"
+"较高的值表示较暗的阴影."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the soft shadow radius size.\n"
 "Lower values mean sharper shadows, bigger values mean softer shadows.\n"
@@ -5576,41 +5662,35 @@ msgid ""
 msgstr ""
 "设置软阴影半径大小。\n"
 "较低的值意味着更清晰的阴影更大的值更柔和。\n"
-"最小值 1.0 和最大值 10.0"
+"最小值 1.0 和最大值 15.0"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable Shadow Mapping."
-msgstr ""
-"设置为真以启用飘动树叶。\n"
-"需要启用着色器。"
+msgstr "设置为真以启用阴影贴图。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable bloom effect.\n"
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
+"设置为 \"true \"可启用泛光效果.\n"
+"邻近的物体会被明亮的色彩会渗入."
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving leaves."
-msgstr ""
-"设置为真以启用飘动树叶。\n"
-"需要启用着色器。"
+msgstr "设置为真以启用飘动树叶。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving liquids (like water)."
-msgstr ""
-"设置为真以启用摇动流体（例如水）。\n"
-"需要启用着色器。"
+msgstr "设置为真以启用摇动流体（例如水）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving plants."
-msgstr ""
-"设置为真以启用摆动植物。\n"
-"需要启用着色器。"
+msgstr "设置为真以启用摆动植物。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5619,6 +5699,10 @@ msgid ""
 "top-left - processed base image, top-right - final image\n"
 "bottom-left - raw base image, bottom-right - bloom texture."
 msgstr ""
+"设为 true 时，将呈现 Bloom 效果的调试分解。\n"
+"在调试模式下，屏幕会分成 4 个象限：\n"
+"左上角--处理后的基础图像，右上角--最终图像\n"
+"左下角--原始基础图像，右下角--泛光材质。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5639,20 +5723,19 @@ msgid "Shaders"
 msgstr "着色器"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
 "着色器允许高级视觉效果并且在一些显卡上可能会提高\n"
 "性能。\n"
 "仅用于OpenGL视频后端。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow filter quality"
-msgstr "截图品质"
+msgstr "阴影过滤质量"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map max distance in nodes to render shadows"
@@ -5663,9 +5746,8 @@ msgid "Shadow map texture in 32 bits"
 msgstr "32 位阴影贴图纹理"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow map texture size"
-msgstr "最小材质大小"
+msgstr "阴影贴图纹理尺寸"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5674,7 +5756,6 @@ msgid ""
 msgstr "默认字体阴影偏移（单位为像素），0 表示不绘制阴影。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow strength gamma"
 msgstr "阴影强度"
 
@@ -5687,16 +5768,14 @@ msgid "Show entity selection boxes"
 msgstr "显示实体选择框"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Show entity selection boxes\n"
 "A restart is required after changing this."
 msgstr ""
-"设定语言。留空以使用系统语言。\n"
-"变更后须重新启动。"
+"显示实体选择框\n"
+"修改后需要重新启动才能生效。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Show name tag backgrounds by default"
 msgstr "默认显示名称标签背景"
 
@@ -5712,9 +5791,13 @@ msgid ""
 "draw calls, benefiting especially high-end GPUs.\n"
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
+"客户端在生成网格时将一并\n"
+"考虑的立方体地图块的边长。\n"
+"数值越大，GPU 的利用率越高，因为它可以减少\n"
+"绘制调用次数，从而提高 GPU 的利用率，这对高端 GPU 尤为有利。\n"
+"使用低端 GPU（或无 GPU）的系统则可从较小的数值中获益。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
 "WARNING: There is no benefit, and there are several dangers, in\n"
@@ -5730,16 +5813,6 @@ msgstr ""
 "修改此值适用于特殊用途，建议不改变\n"
 "此值。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"网格生成器的地图区块缓存大小。增加此值将会\n"
-"增加缓存命中率，减少从主线程复制数据，从而\n"
-"减少抖动。"
-
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
 msgstr "天体轨道倾斜"
@@ -5750,7 +5823,7 @@ msgstr "切片 w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
-msgstr "斜率和填充共同工作来修改高度。"
+msgstr "斜率和坡度共同工作来修改高度。"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
@@ -5776,11 +5849,10 @@ msgstr "平滑光照"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
+"cinematic mode by using the key set in Controls."
 msgstr "在电影模式中让摄影机旋转变流畅。设为 0 以停用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
@@ -5795,9 +5867,17 @@ msgid "Sneaking speed, in nodes per second."
 msgstr "潜行速度，以方块每秒为单位。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Soft shadow radius"
-msgstr "字体阴影透明度"
+msgstr "软阴影半径"
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "音效"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB标签黑名单"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5821,7 +5901,6 @@ msgstr ""
 "请注意，mod或游戏可能会为某些（或所有）项目明确设置堆栈。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread a complete update of shadow map over given number of frames.\n"
 "Higher values might make shadows laggy, lower values\n"
@@ -5844,7 +5923,6 @@ msgstr ""
 "光曲线的标准偏差可提升高斯。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Static spawn point"
 msgstr "静态重生点"
 
@@ -5883,7 +5961,6 @@ msgid "Strip color codes"
 msgstr "条形颜色代码"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Surface level of optional water placed on a solid floatland layer.\n"
 "Water is disabled by default and will only be placed if this value is set\n"
@@ -5978,13 +6055,18 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
+"节点上的纹理可以与节点对齐，也可以与世界对齐。\n"
+"前一种模式适合机器，家具等更好的东西，而\n"
+"后者使楼梯和微区块更适合周围环境。\n"
+"但是，由于这种可能性是新的，因此较旧的服务器可能不会使用，\n"
+"此选项允许对某些节点类型强制实施。注意尽管\n"
+"被认为是实验性的，可能无法正常工作。"
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
 msgstr "内容存储库的 URL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "The dead zone of the joystick"
 msgstr "摇杆的无效区"
 
@@ -5993,19 +6075,41 @@ msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"保存配置文件的默认格式，\n"
+"调用 `/profiler save [format]`时不带格式。"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
+msgstr "相对于将配置文件保存到的世界路径的文件路径."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
-msgstr ""
+msgstr "使用手柄的标识符"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "The length in pixels it takes for touchscreen interaction to start."
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
 msgstr "开始触摸屏交互所需的长度（以像素为单位）。"
 
 #: src/settings_translation_file.cpp
@@ -6015,6 +6119,19 @@ msgid ""
 "0.0 = Wave doesn't move at all.\n"
 "Default is 1.0 (1/2 node)."
 msgstr ""
+"波动液体表面的最大高度。\n"
+"4.0 = 波浪高度为两个方块。\n"
+"0.0 = 波浪完全不动。\n"
+"默认值为 1.0（1/2 方块）。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"按住放置按钮时，\n"
+"会重复放置方块。"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -6038,14 +6155,24 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
+"每一个玩家周围的区块体积的半径，是受\n"
+"活动块的东西，用地图区块（16个节点）表示。\n"
+"在活动块中，对象被加载，ABMs运行。\n"
+"这也是活跃对象（mobs）被维护的最小范围。\n"
+"这应该和 active_object_send_range_blocks 一起配置。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end.\n"
 "Note: A restart is required after changing this!\n"
 "OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
+"Shaders are supported by everything but OGLES1."
 msgstr ""
+"用于渲染的后端引擎\n"
+"注：更改之后要重启游戏！\n"
+"OpenGL是默认的电脑端渲染引擎，OGLES2是用于安卓的.\n"
+"除了OGLES1之外的后端引擎都支持着色器"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6062,6 +6189,10 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"方块环境闭塞阴影的强度（亮度）。\n"
+"越低越暗，越高越亮。此设置的有效值范围\n"
+"为 0.25 至 4.0（含 4.0）。如果数值超出范围，将\n"
+"设置为最接近的有效值。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6069,45 +6200,56 @@ msgid ""
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
+"液体队列可能超出处理时间的时间（以秒为单位）\n"
+"直到尝试通过转储旧队列项目来减小其大小为止。\n"
+"值为0将禁用该功能。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time budget allowed for ABMs to execute on each step\n"
 "(as a fraction of the ABM Interval)"
 msgstr ""
+"abms允许的时间预算在每一步上执行\n"
+"（作为ABM间隔的一小部分）"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
+"按住操纵手柄按钮组合时，\n"
+"重复事件之间的时间（以秒为单位）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated node placements when holding\n"
 "the place button."
 msgstr ""
+"按住放置按钮时，\n"
+"会重复放置方块。"
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
 msgstr "摇杆类型"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
-"如果'altitude_chill'开启，则热量下降20的垂直距离\n"
+"如果'高度寒冷(altitude_chill)'开启，则热量下降20的垂直距离\n"
 "已启用。如果湿度下降的垂直距离也是10\n"
-"已启用“ altitude_dry”。"
+"已启用“高度干燥(altitude_dry)”。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "定义tunnels的最初2个3D噪音。"
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6129,7 +6271,6 @@ msgid "Time speed"
 msgstr "速度时间"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Timeout for client to remove unused map data from memory, in seconds."
 msgstr "客户端从内存中移除未用地图数据的超时。"
 
@@ -6140,38 +6281,36 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"为了减少延迟，当一个玩家正在构建某个东西时，阻塞传输会减慢。\n"
+"这决定了放置或删除方块后它们的速度减慢的时间。"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
 msgstr "工具提示延迟"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen"
-msgstr "触屏阈值"
+msgstr "触摸屏"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "鼠标灵敏度"
+msgstr "灵敏度（触摸屏）"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "鼠标灵敏度倍数。"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "触屏阈值"
+msgstr "触摸屏灵敏度倍增器."
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
 msgstr "性能权衡"
 
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "半透明液体"
+
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
-msgstr ""
+msgstr "透明度排序距离"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
@@ -6204,11 +6343,20 @@ msgid ""
 "\n"
 "This setting should only be changed if you have performance problems."
 msgstr ""
+"闭塞剔除器类型\n"
+"\n"
+"\"loops \"是传统算法，带有嵌套循环，复杂度为 O(n³)\n"
+"\"bfs \"是基于广度优先搜索和边剔除的新算法\n"
+"\n"
+"只有在出现性能问题时，才应更改此设置。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
-msgstr ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr "提供最新 Minetest 版本信息的 JSON 文件的 URL"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6226,6 +6374,10 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
+"欠采样类似于使用较低的屏幕分辨率，但是它适用\n"
+"仅限于游戏世界，保持GUI完整。\n"
+"它应该以不那么详细的图像为代价显着提高性能。\n"
+"较高的值会导致图像不太清晰。"
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -6237,7 +6389,7 @@ msgstr "卸载未用服务器数据"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "更新有信息的链接"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
@@ -6256,24 +6408,24 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "主菜单背景使用云动画。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when looking at textures from an angle."
 msgstr "缩放材质时使用三线过滤。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use bilinear filtering when scaling textures."
 msgstr "缩放材质时使用双线过滤。"
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "在触摸屏上使用准星操控"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
+"用准星选择物体而不是整个屏幕.\n"
+"如果启用，准星会被展示并且用于选择物体."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6281,6 +6433,9 @@ msgid ""
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
+"缩放纹理时使用 mipmaps。可能会略微提高性能、\n"
+"尤其是在使用高分辨率纹理包时。\n"
+"不支持伽玛校正降频。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6288,6 +6443,9 @@ msgid ""
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
+"在新剔除器中使用光线追踪遮挡剔除。\n"
+"此标记可启用光线追踪遮挡剔除测试，用于\n"
+"客户端网格尺寸小于 4x4x4 的贴图块。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6295,9 +6453,11 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"缩放纹理时使用三线性过滤。\n"
+"如果同时启用了双线性和三线性滤波，则会应用三线性滤波。\n"
+"会被应用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Use virtual joystick to trigger \"Aux1\" button.\n"
 "If enabled, virtual joystick will also tap \"Aux1\" button when out of main "
@@ -6308,11 +6468,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
+msgstr "用户界面"
 
 #: src/settings_translation_file.cpp
 msgid "VSync"
@@ -6323,9 +6479,8 @@ msgid "Valley depth"
 msgstr "山谷深度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley fill"
-msgstr "山谷弥漫"
+msgstr "山谷填充"
 
 #: src/settings_translation_file.cpp
 msgid "Valley profile"
@@ -6352,31 +6507,34 @@ msgid ""
 "Variation of terrain vertical scale.\n"
 "When noise is < -0.55 terrain is near-flat."
 msgstr ""
+"地形垂直比例的变化。\n"
+"当噪声< -0.55 地形接近平坦。"
 
 #: src/settings_translation_file.cpp
 msgid "Varies depth of biome surface nodes."
-msgstr ""
+msgstr "变化生物群落表面节点的深度。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Varies roughness of terrain.\n"
 "Defines the 'persistence' value for terrain_base and terrain_alt noises."
 msgstr ""
+"改变地形的粗糙度。\n"
+"定义 terrain_base 和 terrain_alt 噪音的 \"持久性 \"值。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Varies steepness of cliffs."
-msgstr "控制山丘的坡度/高度。"
+msgstr "因情况设置的山丘的陡度"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical climbing speed, in nodes per second."
-msgstr ""
+msgstr "垂直爬升速度（方块/秒）."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
-msgstr ""
+msgstr "垂直屏幕同步。即使禁用了此功能，系统仍可能强制开启 VSync。"
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6388,7 +6546,7 @@ msgstr "视野晃动系数"
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
-msgstr "可视距离（以节点方块为单位）。"
+msgstr "节点间可视距离。(最小 = 20)."
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
@@ -6396,20 +6554,33 @@ msgstr "可视范围"
 
 #: src/settings_translation_file.cpp
 msgid "Virtual joystick triggers Aux1 button"
-msgstr ""
+msgstr "虚拟操纵杆触发 Aux1 按钮"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
 msgstr "音量"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"启用视差闭塞映射。\n"
-"需要着色器已启用。"
+"所有声音的音量.\n"
+"需要启用声音系统."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volume when unfocused"
+msgstr "游戏暂停时的音量"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "平滑光照"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6419,6 +6590,11 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"生成的 4D 分形 3D 切片的 W 坐标。\n"
+"确定生成的 4D 形状的 3D 切片。\n"
+"更改分形的形状。\n"
+"对 3D 分形没有影响。\n"
+"范围大约 -2 到 2。"
 
 #: src/settings_translation_file.cpp
 msgid "Walking and flying speed, in nodes per second."
@@ -6437,9 +6613,8 @@ msgid "Water level"
 msgstr "水位"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Water surface level of the world."
-msgstr "世界水平面级别。"
+msgstr "世界水平面高度。"
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
@@ -6470,9 +6645,8 @@ msgid "Waving plants"
 msgstr "摇动植物"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Weblink color"
-msgstr "选择框颜色"
+msgstr "网页链接颜色"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6480,6 +6654,9 @@ msgid ""
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"当gui_scaling_filter为 true 时，所有 GUI 映像都需要\n"
+"在软件中过滤，但一些图像是直接生成的\n"
+"硬件（例如，库存中材质的渲染到纹理）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6488,6 +6665,10 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
+"当gui_scaling_filter_txr2img为 true 时，复制这些图像\n"
+"从硬件到软件进行扩展。 当 false 时，回退\n"
+"到旧的缩放方法，对于不\n"
+"正确支持从硬件下载纹理。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6500,26 +6681,38 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
+"使用双线性/三线性/各向异性滤镜时\n"
+"低分辨率材质\n"
+"可能会变得模糊，因此会自动使用最近邻插值\n"
+"对材质进行放大，以保留清晰的像素。这将为放大后的材质设置最小纹理尺寸；\n"
+"数值越大，看起来越清晰，但需要的内存也越大。\n"
+"建议使用 2 的幂。\n"
+"只有在启用双线性/三线性/各向异性过滤时，才会应用此设置。\n"
+"这也是世界对齐纹理自动缩放的基本方块纹理尺寸。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether name tag backgrounds should be shown by default.\n"
 "Mods may still set a background."
 msgstr ""
+"无论默认情况下应显示名称标签背景.\n"
+"模组都可能仍然设置一个背景."
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
-msgstr ""
+msgstr "方块材质动画是否应按地图块同步，否则取消同步。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
+"玩家是否显示给客户端没有任何范围限制。\n"
+"已弃用，请player_transfer_distance设置来替代。"
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "这个窗口是否会被放大."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6540,6 +6733,10 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"是否将声音静音。您可随时取消静音声音，除非\n"
+"音响系统已禁用（enable_sound=false）。\n"
+"在游戏中，您可以使用静音键切换静音状态，或者使用\n"
+"暂停菜单。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6547,18 +6744,16 @@ msgid ""
 msgstr "是否显示客户端调试信息（与按 F5 的效果相同）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
 msgstr "初始窗口大小的宽度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width of the selection box lines around nodes."
 msgstr "结点周围的选择框的线宽。"
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "窗口放大"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6566,6 +6761,8 @@ msgid ""
 "background.\n"
 "Contains the same information as the file debug.txt (default name)."
 msgstr ""
+"仅适用于 Windows 系统：在命令行中窗口中启动 Minetest.\n"
+"与 debug.txt（默认名称）文件包含相同的信息."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6588,10 +6785,16 @@ msgid ""
 "See also texture_min_size.\n"
 "Warning: This option is EXPERIMENTAL!"
 msgstr ""
+"世界对齐的纹理可以缩放以跨越多个节点。 然而,\n"
+"服务器可能不会同意您想要的请求，特别是如果您使用\n"
+"专门设计的纹理包； 使用此选项，客户端尝试\n"
+"根据纹理大小自动确定比例.\n"
+"另请参见材质最小尺寸(texture_min_size).\n"
+"警告：此选项是实验性的！"
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr ""
+msgstr "世界对齐纹理模式"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
@@ -6601,16 +6804,15 @@ msgstr "平地的 Y。"
 msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
-msgstr ""
+msgstr "Y的山地密度梯度为零。用于垂直移动山脉。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of upper limit of large caves."
-msgstr "大型随机洞穴的Y轴最大值。"
+msgstr "大型随机洞穴的Y轴最大值."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
-msgstr ""
+msgstr "洞穴扩大到最大尺寸的Y轴距离。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6619,18 +6821,22 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"悬空岛从最大密度到无密度区域的Y 轴距离。\n"
+"锥形从 Y 轴界限开始。\n"
+"对于实心浮地图层，这控制山/山的高度。\n"
+"必须小于或等于 Y 限制之间一半的距离。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
-msgstr ""
+msgstr "地表平均Y坐标。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of cavern upper limit."
-msgstr ""
+msgstr "大型洞穴上限的Y坐标。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of higher terrain that creates cliffs."
-msgstr ""
+msgstr "形成悬崖的更高地形的Y坐标。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of lower terrain and seabed."
@@ -6638,18 +6844,17 @@ msgstr "较低地形与海底的Y坐标。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of seabed."
-msgstr "海底的Y坐标。"
+msgstr "河床的Y坐标。"
 
 #: src/settings_translation_file.cpp
 msgid "cURL"
-msgstr ""
+msgstr "cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL 文件下载超时"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL interactive timeout"
 msgstr "cURL 超时"
 
@@ -6660,12 +6865,18 @@ msgstr "cURL 并发限制"
 #~ msgid "(game support required)"
 #~ msgstr "（需要子游戏支持）"
 
+#~ msgid "- Address: "
+#~ msgstr "- 地址： "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- 创造模式: "
 
 #~ msgid "- Damage: "
 #~ msgstr "- 伤害: "
 
+#~ msgid "- Port: "
+#~ msgstr "- 端口: "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6703,6 +6914,11 @@ msgstr "cURL 并发限制"
 #~ "留空则启动一个本地服务器。\n"
 #~ "注意，主菜单的地址栏将会覆盖这里的设置。"
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr "为支持4K等屏幕，调节像素点密度（非 X11/Android 环境才有效）。"
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6742,6 +6958,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "全屏模式中的位每像素（又称色彩深度）。"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "已为所有方块描边"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "凹凸贴图"
 
@@ -6762,6 +6981,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Camera update toggle key"
 #~ msgstr "镜头更新启用/禁用键"
 
+#~ msgid "Change Keys"
+#~ msgstr "更改键位设置"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "更改键位设置"
@@ -6833,6 +7055,38 @@ msgstr "cURL 并发限制"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "控制隧道宽度，较小的值创建更宽的隧道。"
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "控制：\n"
+#~ "- %s：向前移动\n"
+#~ "- %s：向后移动\n"
+#~ "- %s：向左移动\n"
+#~ "- %s：向右移动\n"
+#~ "- %s：跳/向上攀爬\n"
+#~ "- %s：挖/打/使用\n"
+#~ "- %s：放/使用\n"
+#~ "- %s：潜行/向下攀爬\n"
+#~ "- %s：丢弃物品\n"
+#~ "- %s：物品栏\n"
+#~ "- 鼠标：转身/环顾\n"
+#~ "- 鼠标滚轮：选择物品\n"
+#~ "- %s：聊天\n"
+
 #~ msgid "Creative"
 #~ msgstr "创造"
 
@@ -6842,6 +7096,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "准星颜色（红,绿,蓝）。"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "伤害"
 
@@ -6928,6 +7185,13 @@ msgstr "cURL 并发限制"
 #~ msgid "Enable register confirmation"
 #~ msgstr "启用注册确认"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "启用顶点缓冲对象。\n"
+#~ "这会极大改善图像性能。"
+
 #~ msgid "Enabled"
 #~ msgstr "启用"
 
@@ -7223,6 +7487,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Instrumentation"
 #~ msgstr "计数器"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "非法游戏信息。"
+
 #~ msgid "Inventory key"
 #~ msgstr "物品清单键"
 
@@ -7910,6 +8177,12 @@ msgstr "cURL 并发限制"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "使DirectX和LuaJIT一起工作。如果这导致了问题禁用它。"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "使所有液体不透明"
+
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "地图生成缓存大小"
+
 #~ msgid "Menus"
 #~ msgstr "菜单"
 
@@ -8145,15 +8418,21 @@ msgstr "cURL 并发限制"
 #~ msgid "Simple Leaves"
 #~ msgstr "简单树叶"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "网格生成器的地图区块缓存大小。增加此值将会\n"
+#~ "增加缓存命中率，减少从主线程复制数据，从而\n"
+#~ "减少抖动。"
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "平滑光照"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "让旋转摄影机时较流畅。设为 0 以停用。"
 
-#~ msgid "Sound"
-#~ msgstr "音效"
-
 #~ msgid "Special"
 #~ msgstr "特殊"
 
@@ -8209,6 +8488,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "触控阈值（像素）："
 
+#~ msgid "Touchscreen threshold"
+#~ msgstr "触屏阈值"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "三线性过滤"
 
@@ -8224,6 +8506,9 @@ msgstr "cURL 并发限制"
 #~ msgid "Up"
 #~ msgstr "向上"
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Vertical screen synchronization."
 #~ msgstr "屏幕垂直同步。"
 
@@ -8287,8 +8572,14 @@ msgstr "cURL 并发限制"
 #~ msgid "You died."
 #~ msgstr "您已经死亡."
 
+#~ msgid "You have no games installed."
+#~ msgstr "你没有安装任何子游戏。"
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "确定"
diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index 07c2f3aad..8f9298bf5 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Traditional) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-03 18:48+0100\n"
-"PO-Revision-Date: 2023-08-17 10:48+0000\n"
-"Last-Translator: Yic95 <0Luke.Luke0@gmail.com>\n"
+"POT-Creation-Date: 2024-07-11 15:14+0200\n"
+"PO-Revision-Date: 2024-08-10 06:09+0000\n"
+"Last-Translator: hugoalh <hugoalh@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "minetest/minetest/zh_Hant/>\n"
 "Language: zh_TW\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: builtin/client/chatcommands.lua
 msgid "Clear the out chat queue"
@@ -71,8 +71,8 @@ msgid "Command not available: "
 msgstr "指令無法使用: "
 
 #: builtin/common/chatcommands.lua
-msgid "Get help for commands"
-msgstr "取得指令的說明"
+msgid "Get help for commands (-t: output in chat)"
+msgstr "取得指令幫助（-t：輸出至聊天中）"
 
 #: builtin/common/chatcommands.lua
 msgid ""
@@ -80,12 +80,8 @@ msgid ""
 msgstr "使用「.help <cmd>」來取得更多資訊，或使用「.help all」來列出所有指令。"
 
 #: builtin/common/chatcommands.lua
-msgid "[all | <cmd>]"
-msgstr "[all | <cmd>]"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr "OK"
+msgid "[all | <cmd>] [-t]"
+msgstr "[all | <指令>] [-t]"
 
 #: builtin/fstk/ui.lua
 msgid "<none available>"
@@ -103,6 +99,10 @@ msgstr "發生錯誤："
 msgid "Main menu"
 msgstr "主選單"
 
+#: builtin/fstk/ui.lua
+msgid "OK"
+msgstr "OK"
+
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
 msgstr "重新連線"
@@ -131,19 +131,26 @@ msgstr "我們只支援協定版本 $1。"
 msgid "We support protocol versions between version $1 and $2."
 msgstr "我們支援協定版本 $1 到 $2。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "\"$1\" already exists. Would you like to overwrite it?"
-msgstr "“$1”已經存在。您要覆蓋它嗎？"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Error installing \"$1\": $2"
+msgstr "在安裝 \"$1\": $2 時發生錯誤"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 and $2 dependencies will be installed."
-msgstr "$1 和他的 $2 個依賴將會被安裝。"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download \"$1\""
+msgstr "無法下載 \"$1\""
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 by $2"
-msgstr "$1 作者： $2"
+#: builtin/mainmenu/content/contentdb.lua
+msgid "Failed to download $1"
+msgstr "無法下載 $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/contentdb.lua
+#, fuzzy
+msgid ""
+"Failed to extract \"$1\" (insufficient disk space, unsupported file type or "
+"broken archive)"
+msgstr "無法提取“$1”（不支援的文件類型或損壞的存檔）"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid ""
 "$1 downloading,\n"
 "$2 queued"
@@ -151,158 +158,157 @@ msgstr ""
 "$1 個正在下載，\n"
 "$2 個正在等待"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "$1 downloading..."
 msgstr "正在下載 $1..."
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 required dependencies could not be found."
-msgstr "找不到 $1 所需的依賴項。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "$1 will be installed, and $2 dependencies will be skipped."
-msgstr "將安裝 $1，並且將跳過他的 $2 個依賴項。"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "All packages"
 msgstr "所有套件"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Already installed"
-msgstr "已安裝"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
 msgid "Back to Main Menu"
 msgstr "返回主選單"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "在沒有 cURL 的情況下編譯 Minetest 時，ContentDB 不可用"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Downloading..."
+msgstr "正在下載..."
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Error getting dependencies for package"
+msgstr "獲取套件的相依元件時發生錯誤"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Games"
+msgstr "遊戲"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Install"
+msgstr "安裝"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "載入中…"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Mods"
+msgstr "模組"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No packages could be retrieved"
+msgstr "無法取得套件"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+#: builtin/mainmenu/settings/dlg_settings.lua
+msgid "No results"
+msgstr "無結果"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "No updates"
+msgstr "無更新"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Queued"
+msgstr "已排程"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Texture packs"
+msgstr "材質包"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "The package $1 was not found."
+msgstr "未找到 $1的包裹。"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Uninstall"
+msgstr "解除安裝"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua builtin/mainmenu/tab_content.lua
+msgid "Update"
+msgstr "更新"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "Update All [$1]"
+msgstr "全部更新 [$1]"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "View more information in a web browser"
+msgstr "在網絡瀏覽器中查看更多信息"
+
+#: builtin/mainmenu/content/dlg_contentdb.lua
+msgid "You need to install a game before you can install a mod"
+msgstr "您需要先安裝遊戲才能安裝模組"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 和他的 $2 個依賴將會被安裝。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 by $2"
+msgstr "$1 作者： $2"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 required dependencies could not be found."
+msgstr "找不到 $1 所需的依賴項。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "將安裝 $1，並且將跳過他的 $2 個依賴項。"
+
+#: builtin/mainmenu/content/dlg_install.lua
+msgid "Already installed"
+msgstr "已安裝"
+
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Base Game:"
 msgstr "主遊戲:"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
+#: builtin/mainmenu/content/dlg_overwrite.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/dlg_register.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#: src/gui/guiKeyChangeMenu.cpp src/gui/guiPasswordChange.cpp
+#: src/gui/guiKeyChangeMenu.cpp src/gui/guiOpenURL.cpp
+#: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
 msgstr "取消"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr "在沒有 cURL 的情況下編譯 Minetest 時，ContentDB 不可用"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "相依元件："
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr "正在下載..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Error installing \"$1\": $2"
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to download \"$1\""
-msgstr "無法下載 $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr "無法下載 $1"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#, fuzzy
-msgid "Failed to extract \"$1\" (unsupported file type or broken archive)"
-msgstr "安裝：檔案類型不支援，或是封存檔損壞"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Games"
-msgstr "遊戲"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Install"
-msgstr "安裝"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install $1"
 msgstr "安裝 $1"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Install missing dependencies"
 msgstr "安裝缺少的依賴"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "正在載入..."
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Mods"
-msgstr "Mods"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr "無法取得套件"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/settings/dlg_settings.lua
-msgid "No results"
-msgstr "無結果"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "No updates"
-msgstr "無更新"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Not found"
 msgstr "找不到"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Overwrite"
-msgstr "覆蓋"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
+#: builtin/mainmenu/content/dlg_install.lua
 msgid "Please check that the base game is correct."
 msgstr "請檢查基礎遊戲是否正確。"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Queued"
-msgstr "已排程"
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "“$1”已經存在。您要覆蓋它嗎？"
 
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr "材質包"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "The package $1 was not found."
-msgstr ""
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall"
-msgstr "解除安裝"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-#: builtin/mainmenu/tab_content.lua
-msgid "Update"
-msgstr "更新"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "Update All [$1]"
-msgstr "全部更新 [$1]"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "View more information in a web browser"
-msgstr "在網絡瀏覽器中查看更多信息"
-
-#: builtin/mainmenu/content/dlg_contentstore.lua
-msgid "You need to install a game before you can install a mod"
-msgstr ""
+#: builtin/mainmenu/content/dlg_overwrite.lua
+msgid "Overwrite"
+msgstr "覆蓋"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -317,19 +323,16 @@ msgid "Failed to install $1 to $2"
 msgstr "無法安裝 $1 至 $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unable to find suitable folder name for $1"
-msgstr "安裝 Mod：找不到 $1 Mod 包適合的資料夾名稱"
+msgstr "安裝：無法找到適合 $1 的資料夾名稱"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod, modpack, or game"
-msgstr "找不到有效的 Mod 或 Mod 包"
+msgstr "無法找到有效的模組、模組包或遊戲"
 
 #: builtin/mainmenu/content/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a $1 as a $2"
-msgstr "無法將 Mod 安裝為 $1"
+msgstr "無法將 $1 安裝為 $2"
 
 #: builtin/mainmenu/content/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -424,19 +427,16 @@ msgid "Altitude chill"
 msgstr "寒冷海拔"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "寒冷海拔"
+msgstr "高海拔乾燥"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "生物雜訊"
+msgstr "生物群系混合"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "生物雜訊"
+msgstr "生物群系"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
@@ -455,9 +455,18 @@ msgid "Decorations"
 msgstr "裝飾物"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
+msgid "Desert temples"
+msgstr "沙漠聖殿"
+
+#: builtin/mainmenu/dlg_create_world.lua
 msgid "Development Test is meant for developers."
-msgstr "警告：Development Test 僅供開發者使用。"
+msgstr "開發測試是針對開發人員的。"
+
+#: builtin/mainmenu/dlg_create_world.lua
+msgid ""
+"Different dungeon variant generated in desert biomes (only if dungeons "
+"enabled)"
+msgstr "在沙漠生物群落中生成不同的地牢變體（僅當啟用地牢時）"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
@@ -468,9 +477,8 @@ msgid "Flat terrain"
 msgstr "超平坦世界"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "浮地山密度"
+msgstr "天空中漂浮的陸地"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
@@ -494,7 +502,7 @@ msgstr "增加河流周圍的濕度"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Install another game"
-msgstr ""
+msgstr "安裝另一個子遊戲"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
@@ -626,17 +634,16 @@ msgstr "確認密碼"
 
 #: builtin/mainmenu/dlg_register.lua
 msgid "Joining $1"
-msgstr ""
+msgstr "加入 $1"
 
 #: builtin/mainmenu/dlg_register.lua
-#, fuzzy
 msgid "Missing name"
-msgstr "Mapgen 名稱"
+msgstr "缺少名稱"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
 msgid "Name"
-msgstr "名字"
+msgstr "名稱"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_local.lua
 #: builtin/mainmenu/tab_online.lua
@@ -644,18 +651,16 @@ msgid "Password"
 msgstr "密碼"
 
 #: builtin/mainmenu/dlg_register.lua
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "密碼不符合！"
+msgstr "密碼不符合"
 
 #: builtin/mainmenu/dlg_register.lua builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Register"
-msgstr "註冊並加入"
+msgstr "註冊"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Dismiss"
-msgstr ""
+msgstr "忽略"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
@@ -663,20 +668,23 @@ msgid ""
 "\"Minetest Game\". Since Minetest 5.8.0, Minetest ships without a default "
 "game."
 msgstr ""
+"長期以來，Minetest 引擎附帶了一個名為「Minetest Game」的預設遊戲。 自 "
+"Minetest 5.8.0 起，Minetest 不再提供預設遊戲。"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid ""
 "If you want to continue playing in your Minetest Game worlds, you need to "
 "reinstall Minetest Game."
 msgstr ""
+"如果您想繼續在 Minetest Game 世界中玩遊戲，您需要重新安裝 Minetest Game。"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Minetest Game is no longer installed by default"
-msgstr ""
+msgstr "預設不再安裝 Minetest 遊戲"
 
 #: builtin/mainmenu/dlg_reinstall_mtg.lua
 msgid "Reinstall Minetest Game"
-msgstr ""
+msgstr "重新安裝 Minetest 遊戲"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -694,7 +702,7 @@ msgstr "這個 Mod 包有在其 modpack.conf 提供明確的名稱，會覆蓋
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "A new $1 version is available"
-msgstr ""
+msgstr "一個新的 $1 版本可用"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid ""
@@ -709,7 +717,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Later"
-msgstr "稍後提醒"
+msgstr "稍後"
 
 #: builtin/mainmenu/dlg_version_info.lua
 msgid "Never"
@@ -748,9 +756,8 @@ msgid "Select file"
 msgstr "選擇檔案"
 
 #: builtin/mainmenu/settings/components.lua
-#, fuzzy
 msgid "Set"
-msgstr "選擇"
+msgstr "設定"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 msgid "(No description of setting given)"
@@ -765,9 +772,8 @@ msgid "Lacunarity"
 msgstr "空隙"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
-#, fuzzy
 msgid "Octaves"
-msgstr "倍頻程"
+msgstr "八音"
 
 #: builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
 #: src/settings_translation_file.cpp
@@ -820,20 +826,16 @@ msgstr "緩解 (eased)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "(Use system language)"
-msgstr ""
+msgstr "（使用系統語言）"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Accessibility"
-msgstr ""
+msgstr "無障礙"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Back"
 msgstr "返回"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr "變更按鍵"
-
 #: builtin/mainmenu/settings/dlg_settings.lua src/gui/guiKeyChangeMenu.cpp
 #: src/settings_translation_file.cpp
 msgid "Chat"
@@ -843,27 +845,26 @@ msgstr "聊天"
 msgid "Clear"
 msgstr "清除"
 
-#: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
+#: builtin/mainmenu/settings/dlg_settings.lua src/client/game.cpp
+#: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "控制"
 
 #: builtin/mainmenu/settings/dlg_settings.lua src/settings_translation_file.cpp
 msgid "General"
-msgstr ""
+msgstr "通用"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Movement"
-msgstr "快速移動"
+msgstr "移動"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
-#, fuzzy
 msgid "Reset setting to default"
 msgstr "還原至預設值"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Reset setting to default ($1)"
-msgstr ""
+msgstr "將設定重設為預設值 ($1)"
 
 #: builtin/mainmenu/settings/dlg_settings.lua builtin/mainmenu/tab_online.lua
 msgid "Search"
@@ -871,16 +872,15 @@ msgstr "搜尋"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show advanced settings"
-msgstr ""
+msgstr "顯示進階設定"
 
 #: builtin/mainmenu/settings/dlg_settings.lua
 msgid "Show technical names"
 msgstr "顯示技術名稱"
 
 #: builtin/mainmenu/settings/settingtypes.lua
-#, fuzzy
 msgid "Client Mods"
-msgstr "選擇模組："
+msgstr "客戶端模組"
 
 #: builtin/mainmenu/settings/settingtypes.lua
 msgid "Content: Games"
@@ -892,11 +892,11 @@ msgstr "內容：模組"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "(The game will need to enable shadows as well)"
-msgstr ""
+msgstr "（遊戲還需要啟用陰影）"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Custom"
-msgstr ""
+msgstr "自定"
 
 #: builtin/mainmenu/settings/shadows_component.lua
 msgid "Disabled"
@@ -920,7 +920,6 @@ msgid "Medium"
 msgstr "中"
 
 #: builtin/mainmenu/settings/shadows_component.lua
-#, fuzzy
 msgid "Very High"
 msgstr "超高"
 
@@ -937,9 +936,8 @@ msgid "Active Contributors"
 msgstr "活躍的貢獻者"
 
 #: builtin/mainmenu/tab_about.lua
-#, fuzzy
 msgid "Active renderer:"
-msgstr "活動目標傳送範圍"
+msgstr "活動渲染器："
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Developers"
@@ -947,11 +945,11 @@ msgstr "核心開發者"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Core Team"
-msgstr ""
+msgstr "核心團隊"
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Irrlicht device:"
-msgstr ""
+msgstr "照明設備："
 
 #: builtin/mainmenu/tab_about.lua
 msgid "Open User Data Directory"
@@ -974,27 +972,24 @@ msgid "Previous Core Developers"
 msgstr "先前的核心開發者"
 
 #: builtin/mainmenu/tab_about.lua
-#, fuzzy
 msgid "Share debug log"
-msgstr "顯示除錯資訊"
+msgstr "分享除錯日誌"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "瀏覽線上內容"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Browse online content [$1]"
-msgstr "瀏覽線上內容"
+msgstr "瀏覽線上內容 [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
 msgstr "內容"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content [$1]"
-msgstr "內容"
+msgstr "內容 [$1]"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -1017,9 +1012,8 @@ msgid "Rename"
 msgstr "重新命名"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Update available?"
-msgstr "<沒有可用的>"
+msgstr "可以更新嗎？"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
@@ -1050,14 +1044,23 @@ msgid "Host Server"
 msgstr "主機伺服器"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Install a game"
-msgstr "安裝 $1"
+msgstr "安裝遊戲"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
 msgstr "從 ContentDB 安裝遊戲"
 
+#: builtin/mainmenu/tab_local.lua
+msgid "Minetest doesn't come with a game by default."
+msgstr "預設不再安裝 Minetest 遊戲。"
+
+#: builtin/mainmenu/tab_local.lua
+msgid ""
+"Minetest is a game-creation platform that allows you to play many different "
+"games."
+msgstr "Minetest 是一個遊戲創建平台，可以讓你遊玩許多不同的遊戲。"
+
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
 msgstr "新增"
@@ -1076,7 +1079,7 @@ msgstr "連線埠"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Select Mods"
-msgstr "選擇模組："
+msgstr "選擇模組"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
@@ -1091,8 +1094,8 @@ msgid "Start Game"
 msgstr "開始遊戲"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "You have no games installed."
-msgstr "您未安裝任何遊戲。"
+msgid "You need to install a game before you can create a world."
+msgstr "您需要先安裝遊戲才能安裝模組。"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address"
@@ -1121,7 +1124,7 @@ msgstr "加入遊戲"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Login"
-msgstr "登錄"
+msgstr "登入"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Ping"
@@ -1136,18 +1139,16 @@ msgid "Refresh"
 msgstr "重新整理"
 
 #: builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Remove favorite"
-msgstr "遠端埠"
+msgstr "移除收藏"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Server Description"
 msgstr "伺服器描述"
 
 #: src/client/client.cpp
-#, fuzzy
 msgid "Connection aborted (protocol error?)."
-msgstr "連線錯誤（逾時？）"
+msgstr "連線中止（協定錯誤？）。"
 
 #: src/client/client.cpp src/client/game.cpp
 msgid "Connection timed out."
@@ -1173,18 +1174,10 @@ msgstr "正在載入材質..."
 msgid "Rebuilding shaders..."
 msgstr "正在重新組建著色器..."
 
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr "連線錯誤（逾時？）"
-
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game: "
 msgstr "找不到或無法載入遊戲: "
 
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr "遊戲規格無效。"
-
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
 msgstr "主選單"
@@ -1209,7 +1202,11 @@ msgstr "無法開啟提供的密碼檔案： "
 msgid "Provided world path doesn't exist: "
 msgstr "提供的世界路徑不存在： "
 
-#: src/client/game.cpp src/server.cpp
+#: src/client/clientmedia.cpp src/client/game.cpp
+msgid "Media..."
+msgstr "媒體..."
+
+#: src/client/game.cpp src/client/shader.cpp src/server.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
@@ -1217,18 +1214,10 @@ msgstr ""
 "\n"
 "檢視 debug.txt 以取得更多資訊。"
 
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr "- 地址： "
-
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr "- 模式： "
 
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr "- 連線埠： "
-
 #: src/client/game.cpp
 msgid "- Public: "
 msgstr "- 公開： "
@@ -1263,10 +1252,6 @@ msgstr "已啟用自動前進"
 msgid "Block bounds hidden"
 msgstr "區塊邊界隱藏"
 
-#: src/client/game.cpp
-msgid "Block bounds shown for all blocks"
-msgstr "區塊邊界顯示所有區塊"
-
 #: src/client/game.cpp
 msgid "Block bounds shown for current block"
 msgstr "區塊邊界顯示目前區塊"
@@ -1284,9 +1269,8 @@ msgid "Camera update enabled"
 msgstr "已啟用相機更新"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Can't show block bounds (disabled by game or mod)"
-msgstr "不能顯示區塊邊界 (需要「basic_debug」權限)"
+msgstr "無法顯示區塊邊界（被遊戲或模組停用）"
 
 #: src/client/game.cpp
 msgid "Change Password"
@@ -1312,6 +1296,10 @@ msgstr "已停用用戶端指令稿"
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
+#: src/client/game.cpp
+msgid "Connection error (timed out?)"
+msgstr "連線錯誤（逾時？）"
+
 #: src/client/game.cpp
 msgid "Connection failed for unknown reason"
 msgstr "連線失敗，原因不明"
@@ -1320,47 +1308,14 @@ msgstr "連線失敗，原因不明"
 msgid "Continue"
 msgstr "繼續"
 
-#: src/client/game.cpp
-#, fuzzy, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb up\n"
-"- %s: dig/punch/use\n"
-"- %s: place/use\n"
-"- %s: sneak/climb down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-msgstr ""
-"控制：\n"
-"- %s：向前移動\n"
-"- %s：向後移動\n"
-"- %s：向左移動\n"
-"- %s：向右移動\n"
-"- %s：跳躍／向上攀爬\n"
-"- %s：挖／打\n"
-"- %s：放置／使用\n"
-"- %s：潛行／向下攀爬\n"
-"- %s：丟棄物品\n"
-"- %s：物品欄\n"
-"- 滑鼠：旋轉／觀看\n"
-"- 滑鼠滾輪：選取物品\n"
-"- %s：聊天\n"
-
 #: src/client/game.cpp
 #, fuzzy
 msgid ""
 "Controls:\n"
 "No menu open:\n"
 "- slide finger: look around\n"
-"- tap: place/use\n"
-"- long tap: dig/punch/use\n"
+"- tap: place/punch/use (default)\n"
+"- long tap: dig/use (default)\n"
 "Menu/inventory open:\n"
 "- double tap (outside):\n"
 " --> close\n"
@@ -1452,9 +1407,13 @@ msgstr "已停用霧氣"
 msgid "Fog enabled"
 msgstr "已啟用霧氣"
 
+#: src/client/game.cpp
+msgid "Fog enabled by game or mod"
+msgstr "霧已由遊戲或模組啟用"
+
 #: src/client/game.cpp
 msgid "Game info:"
-msgstr "遊戲資訊："
+msgstr "遊戲資訊:"
 
 #: src/client/game.cpp
 msgid "Game paused"
@@ -1472,17 +1431,13 @@ msgstr "定義物品..."
 msgid "KiB/s"
 msgstr "KiB/秒"
 
-#: src/client/game.cpp
-msgid "Media..."
-msgstr "媒體..."
-
 #: src/client/game.cpp
 msgid "MiB/s"
 msgstr "MiB/秒"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr "迷你地圖目前已被遊戲或 Mod 停用"
+msgstr "迷你地圖目前已被遊戲或模組停用"
 
 #: src/client/game.cpp
 msgid "Multiplayer"
@@ -1576,28 +1531,26 @@ msgid "Unable to listen on %s because IPv6 is disabled"
 msgstr "無法聽取 %s 因為 IPv6 已停用"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range disabled"
-msgstr "已啟用無限視野"
+msgstr "已停用無限視野"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Unlimited viewing range enabled"
 msgstr "已啟用無限視野"
 
 #: src/client/game.cpp
 msgid "Unlimited viewing range enabled, but forbidden by game or mod"
-msgstr ""
+msgstr "啟用無限觀看範圍，但被遊戲或模組禁止"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing changed to %d (the minimum)"
-msgstr "視野已為最小值：%d"
+msgstr "視野更改為：%d（最小值）"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing changed to %d (the minimum), but limited to %d by game or mod"
-msgstr ""
+msgstr "觀看次數改為 %d（最少），但受遊戲或模組限制為 %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1605,20 +1558,20 @@ msgid "Viewing range changed to %d"
 msgstr "已調整視野至 %d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d (the maximum)"
-msgstr "已調整視野至 %d"
+msgstr "已調整視野至 %d（最大值）"
 
 #: src/client/game.cpp
 #, c-format
 msgid ""
 "Viewing range changed to %d (the maximum), but limited to %d by game or mod"
-msgstr ""
+msgstr "觀看範圍改為%d（最大），但受遊戲或模組限制為%d"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d, but limited to %d by game or mod"
-msgstr "已調整視野至 %d"
+msgstr "觀看範圍改為 %d，但被遊戲或模組限制為 %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1633,14 +1586,9 @@ msgstr "已顯示線框"
 msgid "Zoom currently disabled by game or mod"
 msgstr "遠近調整目前已被遊戲或模組停用"
 
-#: src/client/game.cpp
-msgid "ok"
-msgstr "確定"
-
 #: src/client/gameui.cpp
-#, fuzzy
 msgid "Chat currently disabled by game or mod"
-msgstr "遠近調整目前已被遊戲或模組停用"
+msgstr "目前聊天已被遊戲或模組停用"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1686,23 +1634,20 @@ msgid "Caps Lock"
 msgstr "大寫鎖定鍵"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Clear Key"
-msgstr "清除"
+msgstr "清除鍵"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Control Key"
-msgstr "Control"
+msgstr "控制鍵"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Delete Key"
-msgstr "刪除"
+msgstr "刪除鍵"
 
 #: src/client/keycode.cpp
 msgid "Down Arrow"
-msgstr ""
+msgstr "向下箭頭"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1718,7 +1663,7 @@ msgstr "執行"
 
 #: src/client/keycode.cpp
 msgid "Help"
-msgstr "說明"
+msgstr "幫助"
 
 #: src/client/keycode.cpp
 msgid "Home"
@@ -1749,9 +1694,8 @@ msgid "Insert"
 msgstr "插入"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Left Arrow"
-msgstr "左 Control"
+msgstr "左箭頭"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1775,9 +1719,8 @@ msgstr "左 Windows 鍵"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Menu Key"
-msgstr "選單"
+msgstr "選單鍵"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1863,9 +1806,8 @@ msgstr "Page up"
 
 #. ~ Usually paired with the Break key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause Key"
-msgstr "暫停"
+msgstr "暫停鍵"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1916,9 +1858,8 @@ msgid "Select"
 msgstr "選擇"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Shift Key"
-msgstr "Shift"
+msgstr "Shift 鍵"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
@@ -1938,7 +1879,7 @@ msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up Arrow"
-msgstr ""
+msgstr "向上箭頭"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
@@ -1955,7 +1896,7 @@ msgstr "遠近調整"
 
 #: src/client/minimap.cpp
 msgid "Minimap hidden"
-msgstr "已隱藏迷你地圖"
+msgstr "迷你地圖已隱藏"
 
 #: src/client/minimap.cpp
 #, c-format
@@ -1971,27 +1912,35 @@ msgstr "表面模式的迷你地圖，放大 %d 倍"
 msgid "Minimap in texture mode"
 msgstr "材質模式的迷你地圖"
 
+#: src/client/shader.cpp
+#, c-format
+msgid "Failed to compile the \"%s\" shader."
+msgstr "無法編譯「%s」著色器。"
+
+#: src/client/shader.cpp
+msgid "Shaders are enabled but GLSL is not supported by the driver."
+msgstr "著色器已啟用，但是驅動程式不支援 GLSL。"
+
 #. ~ Error when a mod is missing dependencies. Ex: "Mod Title is missing: mod1, mod2, mod3"
 #: src/content/mod_configuration.cpp
 #, c-format
 msgid "%s is missing:"
-msgstr ""
+msgstr "%s 模组丟失："
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Install and enable the required mods, or disable the mods causing errors."
-msgstr ""
+msgstr "安裝並啟用所需的 mod，或停用導致錯誤的 mod。"
 
 #: src/content/mod_configuration.cpp
 msgid ""
 "Note: this may be caused by a dependency cycle, in which case try updating "
 "the mods."
-msgstr ""
+msgstr "注意：這可能是由依賴循環引起的，在這種情況下請嘗試更新 mod。"
 
 #: src/content/mod_configuration.cpp
-#, fuzzy
 msgid "Some mods have unsatisfied dependencies:"
-msgstr "沒有強制相依元件"
+msgstr "有些mod有未滿足的依賴:"
 
 #: src/gui/guiChatConsole.cpp
 msgid "Failed to open webpage"
@@ -2083,7 +2032,7 @@ msgstr "已使用此按鍵"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings."
-msgstr ""
+msgstr "鍵綁定。"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
@@ -2161,6 +2110,18 @@ msgstr "遠近調整"
 msgid "press key"
 msgstr "按下按鍵"
 
+#: src/gui/guiOpenURL.cpp
+msgid "Open"
+msgstr "開啟"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Open URL?"
+msgstr "開啟網址？"
+
+#: src/gui/guiOpenURL.cpp
+msgid "Unable to open URL"
+msgstr "無法開啟網址"
+
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
 msgstr "變更"
@@ -2194,26 +2155,25 @@ msgstr "音量：%d%%"
 #. This is a special string which needs to contain the translation's
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
+#: src/script/lua_api/l_mainmenu.cpp
 msgid "LANG_CODE"
 msgstr "zh_TW"
 
 #: src/network/clientpackethandler.cpp
 msgid ""
 "Name is not registered. To create an account on this server, click 'Register'"
-msgstr ""
+msgstr "名稱未註冊。 要在此伺服器上建立帳戶，請按一下“註冊”"
 
 #: src/network/clientpackethandler.cpp
-#, fuzzy
 msgid "Name is taken. Please choose another name"
-msgstr "請選擇名稱！"
+msgstr "名字已被佔用。 請選擇其他名稱"
 
 #: src/server.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "%s while shutting down: "
-msgstr "正在關閉..."
+msgstr "%s 正在關閉時： "
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
 "Can be used to move a desired point to (0, 0) to create a\n"
@@ -2224,10 +2184,14 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"在「比例尺」中單位的 (X,Y,Z) 偏移。\n"
-"用於移動適合的低地生成區域靠近 (0, 0)。\n"
-"預設值適合曼德博集合，若要用於朱利亞集合則必須修改。\n"
-"範圍大約在 -2 至 2 間。乘以節點的偏移值。"
+"(X,Y,Z) 分形相對於世界中心的偏移量，以「比例」為單位。\n"
+"可用於將所需點移至 (0, 0) 以建立\n"
+"合適的生成點，或允許“放大”所需的位置\n"
+"透過增加“規模”來強調這一點。\n"
+"預設值已調整為適合 Mandelbrot 的生成點\n"
+"設定為預設參數，可能需要更改其他參數\n"
+"情況。\n"
+"範圍大致為 -2 到 2。乘以“scale”作為節點中的偏移量。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2239,6 +2203,13 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
+"(X,Y,Z) 節點中分形的尺度。\n"
+"實際分形大小將大 2 至 3 倍。\n"
+"這些數字可以變得非常大，分形確實如此\n"
+"不必適應這個世界。\n"
+"增加這些以“放大”分形的細節。\n"
+"預設值是垂直擠壓的形狀，適合\n"
+"一個島嶼，將原始形狀的所有 3 個數字設為相等。"
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2261,9 +2232,8 @@ msgid "2D noise that controls the size/occurrence of rolling hills."
 msgstr "控制波狀丘陵地之大小或產狀的 2D 雜訊值。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr "控制 Step mountains 範圍之形狀或大小的 2D 雜訊值。"
+msgstr "控制階梯山脈的大小/出現的 2D 雜訊。"
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
@@ -2271,7 +2241,7 @@ msgstr "定位河谷及河道的 2D 雜訊值。"
 
 #: src/settings_translation_file.cpp
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2282,9 +2252,8 @@ msgid "3D mode"
 msgstr "3D 模式"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "法線貼圖強度"
+msgstr "3D模式視差強度"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2305,6 +2274,10 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"懸空島的3D雜訊定義結構。\n"
+"如果改變了預設值，雜訊「scale」(預設為0.7)可能需要\n"
+"調整，因為當這個噪波的值範圍大約是-2.0到2.0時，\n"
+"懸空島逐漸變窄的函數最好。"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2323,7 +2296,6 @@ msgid "3D noise that determines number of dungeons per mapchunk."
 msgstr "決定每個地圖區塊中地城數量的 3D 雜訊值。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2343,8 +2315,7 @@ msgstr ""
 "-    topbottom：將螢幕分成頂／底部。\n"
 "-    sidebyside：將螢幕分離為一邊一個。\n"
 "-    crossview: 鬥雞眼式 3D\n"
-"-    pageflip：基於四重緩衝的 3D。\n"
-"註：interlaced 模式需要啟用著色器。"
+"註：隔行掃描模式需要啟用著色器。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2371,9 +2342,8 @@ msgid "ABM time budget"
 msgstr "ABM 時間預算"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "發生佇列的絕對限制"
+msgstr "出現的排隊區塊的絕對限制"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2403,12 +2373,6 @@ msgstr "活動目標傳送範圍"
 msgid "Adds particles when digging a node."
 msgstr "當挖掘節點時加入一些粒子。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr "調整您螢幕的 DPI 設定（並不只有 X11/Android）例如 4K 螢幕。"
-
 #: src/settings_translation_file.cpp
 msgid "Adjust the detected display density, used for scaling UI elements."
 msgstr "調整偵測到的顯示密度，用來縮放 UI 元件。"
@@ -2422,16 +2386,24 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"調整浮空島層的密度。\n"
+"增加數值以增加密度。可以是正值或負值。\n"
+"值 = 0.0：50% 的體積是浮空島。\n"
+"值 = 2.0（可以更高，取決於「mgv7_np_floatland」，總是進行測試以確定）建立一個"
+"堅固的浮空島層。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Admin name"
-msgstr "將物品名稱加至末尾"
+msgstr "管理員名稱"
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
 msgstr "進階"
 
+#: src/settings_translation_file.cpp
+msgid "Allows liquids to be translucent."
+msgstr "允許液體呈半透明狀。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Alters the light curve by applying 'gamma correction' to it.\n"
@@ -2440,11 +2412,15 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"透過應用「伽瑪校正」來改變光變曲線。\n"
+"較高的值使中間和較低的光照水平更亮。\n"
+"值“1.0”使光變曲線保持不變。\n"
+"這只對日光和人造光有顯著影響\n"
+"在夜晚的自然光照下作用很小。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Always fly fast"
-msgstr "總是啟用飛行與快速模式"
+msgstr "總是快速飛行"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
@@ -2467,14 +2443,12 @@ msgid "Announce to this serverlist."
 msgstr "公佈至此伺服器清單。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Anti-aliasing scale"
-msgstr "反鋸齒："
+msgstr "反鋸齒"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Antialiasing method"
-msgstr "反鋸齒："
+msgstr "反鋸齒"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2488,6 +2462,17 @@ msgstr "將物品名稱加至工具提示的末尾。"
 msgid "Apple trees noise"
 msgstr "蘋果樹雜訊"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Apply dithering to reduce color banding artifacts.\n"
+"Dithering significantly increases the size of losslessly-compressed\n"
+"screenshots and it works incorrectly if the display or operating system\n"
+"performs additional dithering or if the color channels are not quantized\n"
+"to 8 bits.\n"
+"With OpenGL ES, dithering only works if the shader supports high\n"
+"floating-point precision and it may have a higher performance impact."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
 msgstr "慣性手臂"
@@ -2512,22 +2497,43 @@ msgid ""
 "clients.\n"
 "Small values potentially improve performance a lot, at the expense of "
 "visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
+"rendering glitches (some blocks might not be rendered correctly in caves).\n"
 "Setting this to a value greater than max_block_send_distance disables this\n"
 "optimization.\n"
-"Stated in mapblocks (16 nodes)."
+"Stated in MapBlocks (16 nodes)."
 msgstr ""
-"在這樣的距離下，伺服器將積極最佳化那些要傳送給用戶端的方塊。\n"
-"較小的值可能會提升效能，但代價是一些可見的彩現問題。\n"
-"（有一些在水中與洞穴中的方塊將不會被彩現，以及有時在陸地上）\n"
-"將此值設定為大於 max_block_send_distance 將會停用這個最佳化。\n"
-"在地圖區塊中顯示（16 個節點）"
+"在這個距離上，伺服器將積極優化發送到哪些區塊\n"
+"客戶。\n"
+"小值可能會大大提高效能，但會犧牲可見的效能\n"
+"渲染故障（某些方塊不會在水下和洞穴中渲染，\n"
+"以及有時在陸地上）。\n"
+"將其設為大於 max_block_send_distance 的值會停用此功能\n"
+"最佳化.\n"
+"以地圖塊（16 個節點）表示。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"At this distance the server will perform a simpler and cheaper occlusion "
+"check.\n"
+"Smaller values potentially improve performance, at the expense of "
+"temporarily visible\n"
+"rendering glitches (missing blocks).\n"
+"This is especially useful for very large viewing range (upwards of 500).\n"
+"Stated in MapBlocks (16 nodes)."
+msgstr ""
+"在這個距離上，伺服器將積極優化發送到哪些區塊\n"
+"客戶。\n"
+"小值可能會大大提高效能，但會犧牲可見的效能\n"
+"渲染故障（某些方塊不會在水下和洞穴中渲染，\n"
+"以及有時在陸地上）。\n"
+"將其設為大於 max_block_send_distance 的值會停用此功能\n"
+"最佳化.\n"
+"以地圖塊（16 個節點）表示。"
 
 #: src/settings_translation_file.cpp
 msgid "Audio"
-msgstr ""
+msgstr "聲音"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
@@ -2554,9 +2560,8 @@ msgid "Base terrain height."
 msgstr "基礎地形高度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base texture size"
-msgstr "過濾器的最大材質大小"
+msgstr "基礎材質大小"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2579,38 +2584,41 @@ msgid "Bind address"
 msgstr "綁定地址"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome API"
-msgstr "生物雜訊"
+msgstr "生物群落 API"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
 msgstr "生物雜訊"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Block cull optimize distance"
+msgstr "區塊傳送最佳化距離"
+
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
 msgstr "區塊傳送最佳化距離"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom"
-msgstr ""
+msgstr "泛光"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Intensity"
-msgstr ""
+msgstr "泛光強度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bloom Radius"
-msgstr "雲朵範圍"
+msgstr "泛光半徑"
 
 #: src/settings_translation_file.cpp
 msgid "Bloom Strength Factor"
-msgstr ""
+msgstr "泛光强度因子"
 
 #: src/settings_translation_file.cpp
 msgid "Bobbing"
-msgstr ""
+msgstr "擺動"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
@@ -2637,9 +2645,8 @@ msgid "Builtin"
 msgstr "內建"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Camera"
-msgstr "變更相機"
+msgstr "相機"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2698,11 +2705,12 @@ msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
+"光變曲線中心增強範圍。\n"
+"其中 0.0 是最小光照級別，1.0 是最大光照級別。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat command time message threshold"
-msgstr "聊天訊息踢出閾值"
+msgstr "聊天命令時間訊息閾值"
 
 #: src/settings_translation_file.cpp
 msgid "Chat commands"
@@ -2752,7 +2760,7 @@ msgstr "用戶端"
 
 #: src/settings_translation_file.cpp
 msgid "Client Mesh Chunksize"
-msgstr ""
+msgstr "客戶端網格區塊大小"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -2767,12 +2775,10 @@ msgid "Client side modding restrictions"
 msgstr "用戶端修改限制"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side Modding"
 msgstr "用戶端修改"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client-side node lookup range restriction"
 msgstr "用戶端節點查詢範圍限制"
 
@@ -2789,7 +2795,6 @@ msgid "Clouds"
 msgstr "雲朵"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clouds are a client-side effect."
 msgstr "雲朵是用戶端的特效。"
 
@@ -2805,6 +2810,12 @@ msgstr "彩色迷霧"
 msgid "Colored shadows"
 msgstr "彩色陰影"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"Comma-separated list of AL and ALC extensions that should not be used.\n"
+"Useful for testing. See al_extensions.[h,cpp] for details."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of flags to hide in the content repository.\n"
@@ -2815,6 +2826,12 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
+"逗號分隔用於在倉庫中隱藏內容的標籤清單。\n"
+"\"nonfree\"可用於隱藏根據自由軟體基金會\n"
+"不符合「自由軟體」標準的套件。\n"
+"你也可以為倉庫內容指定評分。\n"
+"這些評分獨立於Minetest版本，\n"
+"完整清單請見https://content.minetest.net/help/content_flags/"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2839,6 +2856,10 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
+"將地圖區塊儲存到磁碟時使用的壓縮等級。\n"
+"-1 - 使用預設壓縮級別\n"
+"0 - 最小壓縮，最快\n"
+"9 - 最佳壓縮，最慢"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2847,6 +2868,10 @@ msgid ""
 "0 - least compression, fastest\n"
 "9 - best compression, slowest"
 msgstr ""
+"將地圖區塊發送到客戶端時使用的壓縮等級。\n"
+"-1 - 使用預設壓縮級別\n"
+"0 - 最小壓縮，最快\n"
+"9 - 最佳壓縮，最慢"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
@@ -2874,7 +2899,7 @@ msgstr "終端機高度"
 
 #: src/settings_translation_file.cpp
 msgid "Content Repository"
-msgstr ""
+msgstr "內容儲存庫"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
@@ -2886,7 +2911,7 @@ msgstr "ContentDB 最大並行下載數"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
-msgstr "ContentDB URL"
+msgstr "ContentDB網址"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2903,6 +2928,8 @@ msgid ""
 "Controls sinking speed in liquid when idling. Negative values will cause\n"
 "you to rise instead."
 msgstr ""
+"控制空轉時在液體中的下沉速度。\n"
+" 負值會導致你上升。"
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -2950,10 +2977,6 @@ msgstr ""
 "十字準線顏色（R，G，B）。\n"
 "還控制物件的十字線顏色"
 
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr "DPI"
-
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
 msgstr "除錯紀錄檔案大小閾值"
@@ -2964,7 +2987,7 @@ msgstr "除錯記錄等級"
 
 #: src/settings_translation_file.cpp
 msgid "Debugging"
-msgstr ""
+msgstr "调试"
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
@@ -2975,11 +2998,12 @@ msgid "Default acceleration"
 msgstr "預設加速"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Default maximum number of forceloaded mapblocks.\n"
 "Set this to -1 to disable the limit."
-msgstr "強制載入地圖區塊的最大數量。"
+msgstr ""
+"強制載入地圖區塊的預設最大數量。\n"
+"將其設為 -1 以停用限制。"
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
@@ -3003,6 +3027,28 @@ msgid ""
 "This simulates the soft shadows effect by applying a PCF or Poisson disk\n"
 "but also uses more resources."
 msgstr ""
+"定義陰影過濾品質。\n"
+"這透過應用 PCF 或泊松盤來模擬軟陰影效果\n"
+"但也使用更多的資源。"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Define the oldest clients allowed to connect.\n"
+"Older clients are compatible in the sense that they will not crash when "
+"connecting\n"
+"to new servers, but they may not support all new features that you are "
+"expecting.\n"
+"This allows for more fine-grained control than "
+"strict_protocol_version_checking.\n"
+"Minetest still enforces its own internal minimum, and enabling\n"
+"strict_protocol_version_checking will effectively override this."
+msgstr ""
+"定義允許連線的最早的客戶端。\n"
+"較舊的客戶端是相容的，因為它們在連接時不會崩潰\n"
+"到新伺服器，但它們可能不支援您期望的所有新功能。\n"
+"這允許比 strict_protocol_version_checking 更細粒度的控制。\n"
+"Minetest 仍然強制執行其自己的內部最低限度，並啟用\n"
+"strict_protocol_version_checking 將有效地覆蓋這一點。"
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
@@ -3013,14 +3059,12 @@ msgid "Defines areas with sandy beaches."
 msgstr "定義沙灘區。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines distribution of higher terrain and steepness of cliffs."
-msgstr "定義較高的地形區（懸崖頂部）並影響懸崖的陡峭程度。"
+msgstr "定義較高地形的分佈和懸崖的陡度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines distribution of higher terrain."
-msgstr "定義 'terrain_higher'（懸崖頂部地形）的區域。"
+msgstr "定義較高地形的分佈。"
 
 #: src/settings_translation_file.cpp
 msgid "Defines full size of caverns, smaller values create larger caverns."
@@ -3032,6 +3076,9 @@ msgid ""
 "Smaller values make bloom more subtle\n"
 "Range: from 0.01 to 1.0, default: 0.05"
 msgstr ""
+"定義對渲染影像套用多少光暈\n"
+"較小的值使光暈更加微妙\n"
+"範圍：從 0.01 到 1.0，預設值：0.05"
 
 #: src/settings_translation_file.cpp
 msgid "Defines large-scale river channel structure."
@@ -3054,6 +3101,8 @@ msgid ""
 "Defines the magnitude of bloom overexposure.\n"
 "Range: from 0.1 to 10.0, default: 1.0"
 msgstr ""
+"定義光暈過度曝光的程度。\n"
+"範圍：從 0.1 到 10.0，預設值：1.0"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -3065,6 +3114,8 @@ msgid ""
 "methods.\n"
 "Value of 2 means taking 2x2 = 4 samples."
 msgstr ""
+"定義 FSAA 和 SSAA 抗鋸齒方法的取樣網格的大小。\n"
+"值 2 表示採集 2x2 = 4 個樣本。"
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3099,9 +3150,8 @@ msgid "Deprecated Lua API handling"
 msgstr "不推薦使用 Lua API 處理"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Depth below which you'll find giant caverns."
-msgstr "您會發現大型洞穴的深度。"
+msgstr "在其深度之下你會發現巨大的洞穴。"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
@@ -3130,9 +3180,8 @@ msgid "Desynchronize block animation"
 msgstr "異步化方塊動畫"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Developer Options"
-msgstr "裝飾物"
+msgstr "開發者選項"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
@@ -3155,6 +3204,8 @@ msgid ""
 "Distance in nodes at which transparency depth sorting is enabled\n"
 "Use this to limit the performance impact of transparency depth sorting"
 msgstr ""
+"啟用透明度深度排序的節點距離\n"
+"使用它來限制透明度深度排序對效能的影響"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
@@ -3169,9 +3220,8 @@ msgid "Double-tapping the jump key toggles fly mode."
 msgstr "輕擊兩次跳躍鍵以切換成飛行模式。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dump the mapgen debug information."
-msgstr "轉儲 mapgen 的除錯資訊。"
+msgstr "轉儲地圖生成器調試資訊。"
 
 #: src/settings_translation_file.cpp
 msgid "Dungeon maximum Y"
@@ -3187,16 +3237,20 @@ msgstr "地城雜訊"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Automatic Exposure"
-msgstr ""
+msgstr "啟用自動曝光"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable Bloom"
-msgstr "全部啟用"
+msgstr "啟用泛光"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Bloom Debug"
-msgstr ""
+msgstr "啟用泛光調試"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable Debanding"
+msgstr "啟用傷害"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3220,10 +3274,16 @@ msgid ""
 "On true uses Poisson disk to make \"soft shadows\". Otherwise uses PCF "
 "filtering."
 msgstr ""
+"啟用泊松盤（Poisson disk）濾鏡。\n"
+"使用泊松盤演算法來產生“軟陰影”。 不啟用的話就會使用 PCF 濾鏡。"
+
+#: src/settings_translation_file.cpp
+msgid "Enable Post Processing"
+msgstr "啟用後製處理"
 
 #: src/settings_translation_file.cpp
 msgid "Enable Raytraced Culling"
-msgstr ""
+msgstr "啟用光線追蹤剔除"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3232,12 +3292,18 @@ msgid ""
 "automatically adjust to the brightness of the scene,\n"
 "simulating the behavior of human eye."
 msgstr ""
+"啟用自動曝光校正\n"
+"啟用後，後處理引擎將\n"
+"自動調節場景亮度，\n"
+"模擬人眼的行為。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable colored shadows.\n"
 "On true translucent nodes cast colored shadows. This is expensive."
 msgstr ""
+"啟用彩色陰影。\n"
+"在真正的半透明節點上投射彩色陰影。 這很貴。"
 
 #: src/settings_translation_file.cpp
 msgid "Enable console window"
@@ -3249,7 +3315,7 @@ msgstr "啟用搖桿"
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks. Requires a restart to take effect"
-msgstr ""
+msgstr "啟用操縱桿。 需要重新啟動才能生效"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
@@ -3261,7 +3327,12 @@ msgstr "啟用 mod 安全性"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mouse wheel (scroll) for item selection in hotbar."
-msgstr ""
+msgstr "啟用滑鼠滾輪（滾動）以在熱欄中選擇項目。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Enable random mod loading (mainly used for testing)."
+msgstr "啟用隨機使用者輸入（僅供測試使用）。"
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3277,7 +3348,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable split login/register"
-msgstr ""
+msgstr "啟用分割登入/註冊"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3291,6 +3362,10 @@ msgstr ""
 "較舊的用戶端在這個意義上相容，它們不會在連線至\n"
 "新伺服器時當掉，但它們可能會不支援一些您預期會有的新功能。"
 
+#: src/settings_translation_file.cpp
+msgid "Enable touchscreen"
+msgstr "啟用觸控螢幕"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable usage of remote media server (if provided by server).\n"
@@ -3302,12 +3377,6 @@ msgstr ""
 "當連線到伺服器時，遠端伺服器提供了一個\n"
 "顯著較快的下載媒體（如材質）的方式。"
 
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
@@ -3333,6 +3402,10 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
+"開啟Hable的「神秘海域2」電影式的色調映射。\n"
+"模擬電影色調曲線及其實現高動態範圍影像的方式。\n"
+"略微改善中等範圍對比。\n"
+"逐步壓縮高亮和陰影。"
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
@@ -3342,16 +3415,30 @@ msgstr "啟用物品欄物品動畫。"
 msgid "Enables caching of facedir rotated meshes."
 msgstr "啟用面旋轉方向的網格快取。"
 
+#: src/settings_translation_file.cpp
+msgid "Enables debug and error-checking in the OpenGL driver."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Enables the post processing pipeline."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Enables touchscreen mode, allowing you to play the game with a touchscreen."
+msgstr "啟用觸控螢幕模式，讓你可以使用觸控螢幕玩遊戲。"
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Enables tradeoffs that reduce CPU load or increase rendering performance\n"
 "at the expense of minor visual glitches that do not impact game playability."
 msgstr ""
+"實現減少 CPU 負載或提高渲染效能的權衡\n"
+"以不影響遊戲可玩性的輕微視覺損失為代價。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Engine Profiler"
-msgstr "山谷分析"
+msgstr "引擎分析儀"
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -3370,19 +3457,24 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"floatland 錐度的指數。 改變錐形行為。\n"
+"值 = 1.0 建立均勻的線性錐形。\n"
+"值 > 1.0 建立適合預設分隔的平滑錐度\n"
+"浮地。\n"
+"值 < 1.0（例如 0.25）可建立更明確的表面水平\n"
+"平坦的低地，適合堅實的浮地層。"
 
 #: src/settings_translation_file.cpp
 msgid "Exposure compensation"
-msgstr ""
+msgstr "曝光補償"
 
 #: src/settings_translation_file.cpp
 msgid "FPS"
-msgstr ""
+msgstr "FPS"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "FPS when unfocused or paused"
-msgstr "當遊戲暫停時的最高 FPS。"
+msgstr "遊戲暫停時最高 FPS"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
@@ -3393,9 +3485,8 @@ msgid "Fall bobbing factor"
 msgstr "墜落晃動因素"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font path"
-msgstr "備用字型"
+msgstr "後備字體路徑"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
@@ -3414,16 +3505,15 @@ msgid "Field of view in degrees."
 msgstr "以度計算的視野。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the\n"
 "Multiplayer Tab."
 msgstr ""
-"在 用戶端/伺服器清單/ 中的檔案包含了顯示在多人遊戲分頁中您最愛的伺服器。"
+"客戶端/伺服器清單/ 中的文件，包含顯示在「多人遊戲」標籤中的您\n"
+"收藏的伺服器。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filler depth"
 msgstr "填充深度"
 
@@ -3436,9 +3526,8 @@ msgid "Filmic tone mapping"
 msgstr "電影色調映射"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering and Antialiasing"
-msgstr "反鋸齒："
+msgstr "過濾和抗鋸齒"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3454,51 +3543,43 @@ msgstr "固定的地圖種子"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed virtual joystick"
-msgstr ""
+msgstr "固定虛擬搖桿"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
-"(Android) 修正虛擬搖桿的位置。\n"
-"如停用，虛擬搖桿將會置中於第一個觸碰的位置。"
+"修復虛擬搖桿的位置。\n"
+"若停用，虛擬操縱桿將以首次觸碰的位置為中心。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "浮地山密度"
+msgstr "浮島密度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "浮地山高度"
+msgstr "懸空島最大Y座標"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "浮地山高度"
+msgstr "懸空島最小Y座標"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "浮地基礎噪音"
+msgstr "懸空島噪音"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "浮地山密度"
+msgstr "懸空島尖銳指數"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "浮地基礎噪音"
+msgstr "懸空島尖銳距離"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "浮地高度"
+msgstr "懸空島水位"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
@@ -3509,17 +3590,16 @@ msgid "Fog start"
 msgstr "霧氣開始"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Font"
-msgstr "字型大小"
+msgstr "字體"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
-msgstr ""
+msgstr "預設字體為粗體"
 
 #: src/settings_translation_file.cpp
 msgid "Font italic by default"
-msgstr ""
+msgstr "預設字體為斜體"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
@@ -3535,21 +3615,23 @@ msgstr "字型大小"
 
 #: src/settings_translation_file.cpp
 msgid "Font size divisible by"
-msgstr ""
+msgstr "字體大小除以"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font where 1 unit = 1 pixel at 96 DPI"
-msgstr ""
+msgstr "在 96 DPI 下預設字體大小 1 unit = 1 pixel"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the monospace font where 1 unit = 1 pixel at 96 DPI"
-msgstr ""
+msgstr "等寬字體的字體大小，其中 1 單位 = 1 像素（96 DPI）"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"最近聊天文字和聊天提示的字體大小，以磅 (pt) 為單位。\n"
+"值為 0 將使用預設字體大小。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3561,6 +3643,10 @@ msgid ""
 "be\n"
 "sized 16, 32, 48, etc., so a mod requesting a size of 25 will get 32."
 msgstr ""
+"對於無法很好縮放的像素樣式字體，這可以確保使用的字體大小\n"
+"使用此字體將始終能被此值（以像素為單位）整除。 例如，\n"
+"16 像素高的像素字體應該將其設為 16，因此它只會是\n"
+"尺寸為 16、32、48 等，因此請求尺寸為 25 的 mod 將得到 32。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3577,21 +3663,19 @@ msgstr "螢幕截圖的格式。"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr ""
+msgstr "視窗全螢幕背景色"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr ""
+msgstr "視窗全螢幕背景不透明度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background color (R,G,B)."
 msgstr "遊戲內聊天視窗背景顏色 (R,G,B)。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background opacity (between 0 and 255)."
-msgstr "遊戲內聊天視窗背景 alpha 值（不透明度，介於 0 到 255 間）。"
+msgstr "窗口全螢幕背景不透明度（0 到 255 之間）。"
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
@@ -3624,6 +3708,11 @@ msgid ""
 "to maintain active objects up to this distance in the direction the\n"
 "player is looking. (This can avoid mobs suddenly disappearing from view)"
 msgstr ""
+"客戶端對物件的了解程度，在地圖區塊（16 個節點）中說明。\n"
+"\n"
+"設定這個大於active_block_range也會導致伺服器\n"
+"保持活動物體在該方向的距離\n"
+"玩家正在尋找。 （這樣可以避免怪物突然從視野中消失）"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -3635,7 +3724,7 @@ msgstr "全螢幕模式。"
 
 #: src/settings_translation_file.cpp
 msgid "GUI"
-msgstr ""
+msgstr "圖形使用者介面"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
@@ -3650,52 +3739,50 @@ msgid "GUI scaling filter txr2img"
 msgstr "圖形使用者介面縮放比例過濾器 txr2img"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Gamepads"
-msgstr "遊戲"
+msgstr "遊戲手把"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "全域回呼"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and jungle grass, in all other mapgens this flag controls all decorations."
 msgstr ""
-"全域地圖產生屬性。\n"
-"在 Mapgen v6 中，「decorations」旗標控制所有除了樹木\n"
-"與叢林以外的裝飾，在其他所有的 mapgen 中，這個旗標控制所有裝飾。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"全域地圖生成屬性。\n"
+"在 Mapgen v6 中，「裝飾」標誌控制除樹木之外的所有裝飾\n"
+"和叢林草，在所有其他地圖生成中，此標誌控制所有裝飾。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Gradient of light curve at maximum light level.\n"
 "Controls the contrast of the highest light levels."
 msgstr ""
+"最大光照水平下的光曲線梯度。\n"
+"控制最高亮度等級的對比。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Gradient of light curve at minimum light level.\n"
 "Controls the contrast of the lowest light levels."
 msgstr ""
+"最低光照水平下的光曲線梯度。\n"
+"控制最低光照水平的對比。"
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
 msgstr "圖形"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Graphics Effects"
-msgstr "圖形"
+msgstr "圖形效果"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Graphics and Audio"
-msgstr "圖形"
+msgstr "圖形和音頻"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
@@ -3710,18 +3797,16 @@ msgid "Ground noise"
 msgstr "地面雜訊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP mods"
-msgstr "HTTP Mod"
+msgstr "HTTP mods"
 
 #: src/settings_translation_file.cpp
 msgid "HUD"
-msgstr ""
+msgstr "HUD"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HUD scaling"
-msgstr "圖形使用者介面縮放比例"
+msgstr "圖形使用者介面縮放"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3758,9 +3843,8 @@ msgid "Heat noise"
 msgstr "熱 雜訊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height component of the initial window size."
-msgstr "初始視窗大小的高度組件。"
+msgstr "初始視窗大小的高度分量。"
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -3803,40 +3887,46 @@ msgid ""
 "Horizontal acceleration in air when jumping or falling,\n"
 "in nodes per second per second."
 msgstr ""
+"跳躍或墜落時空氣中的水平加速度，\n"
+"以每秒節點數為單位。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration in fast mode,\n"
 "in nodes per second per second."
 msgstr ""
+"快速模式的水平和垂直加速度，\n"
+"以每秒節點數為單位。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration on ground or when climbing,\n"
 "in nodes per second per second."
 msgstr ""
+"行走或攀爬的水平和垂直加速度。\n"
+"單位為方塊每二次方秒。"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Enable mouse wheel for selection"
-msgstr ""
+msgstr "熱鍵欄：啟用滑鼠滾輪進行選擇"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar: Invert mouse wheel direction"
-msgstr ""
+msgstr "Hotbar：反轉滑鼠滾輪方向"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How deep to make rivers."
-msgstr "河流多深"
+msgstr "生成的河流多深。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How fast liquid waves will move. Higher = faster.\n"
 "If negative, liquid waves will move backwards."
 msgstr ""
+"液體波移動的速度有多快。 更高=更快。\n"
+"如果為負值，液體波將會向後移動。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How long the server will wait before unloading unused mapblocks, stated in "
 "seconds.\n"
@@ -3846,16 +3936,16 @@ msgstr ""
 "較高的值會較平滑，但會使用更多的記憶體。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "How much you are slowed down when moving inside a liquid.\n"
 "Decrease this to increase liquid resistance to movement."
-msgstr "減少此值可增加液體的運動阻力。"
+msgstr ""
+"當你在液體中移動時，你的速度會減慢多少。\n"
+"減少此值可增加液體對運動的阻力。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How wide to make rivers."
-msgstr "河流多寬"
+msgstr "生成河流多寬。"
 
 #: src/settings_translation_file.cpp
 msgid "Humidity blend noise"
@@ -3886,22 +3976,23 @@ msgstr ""
 "以避免無謂的浪費 CPU 的電力。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If disabled, \"Aux1\" key is used to fly fast if both fly and fast mode are\n"
 "enabled."
-msgstr "若停用，在飛行與快速模式皆啟用時，「使用」鍵將用於快速飛行。"
+msgstr ""
+"如果停用，「Aux1」鍵用於快速飛行（如果飛行模式和快速模式同時存在）\n"
+"已啟用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, \"Aux1\" key instead of \"Sneak\" key is used for climbing down "
 "and\n"
 "descending."
-msgstr "若啟用，向下爬與下降將使用「使用」鍵而非「潛行」鍵。"
+msgstr ""
+"如果啟用，「Aux1」鍵將取代潛行鍵的向下攀爬和\n"
+"下降。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, account registration is separate from login in the UI.\n"
 "If disabled, new accounts will be registered automatically when logging in."
@@ -3930,11 +4021,10 @@ msgstr ""
 "只在您知道您在幹嘛時才啟用這個選項。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, players cannot join without a password or change theirs to an "
 "empty password."
-msgstr "若啟用，新玩家將無法以空密碼加入。"
+msgstr "如果啟用，玩家在沒有密碼的情況下無法加入或將密碼變更為空密碼。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3950,14 +4040,13 @@ msgstr ""
 "不可能看見的內容，而使穿牆模式的效用降低。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place nodes at the position (feet + eye level) where you "
 "stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
-"若啟用，您可以在您站立的位置（腳與眼睛的高度）放置方塊。當在小區域裡與節點盒"
-"一同工作時非常有用。"
+"如果啟用，您可以將節點放置在您站立的位置（腳+眼睛水平）。\n"
+"這在小區域內使用節點盒時非常有用。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3965,12 +4054,16 @@ msgid ""
 "limited\n"
 "to this distance from the player to the node."
 msgstr ""
+"如果啟用了節點範圍的 CSM 限制，則 get_node 呼叫將受到限制\n"
+"從玩家到節點的距離。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If the execution of a chat command takes longer than this specified time in\n"
 "seconds, add the time information to the chat command message"
 msgstr ""
+"如果聊天指令的執行時間比指定的時間長\n"
+"秒，將時間訊息加入聊天命令訊息中"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3979,6 +4072,10 @@ msgid ""
 "deleting an older debug.txt.1 if it exists.\n"
 "debug.txt is only moved if this setting is positive."
 msgstr ""
+"如果 debug.txt 檔案大小超過指定的兆位元組數\n"
+"此設定開啟時，檔案被移到debug.txt.1，\n"
+"刪除較舊的 debug.txt.1（如果存在）。\n"
+"僅當此設定為正時，才會移動 debug.txt。"
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
@@ -4002,7 +4099,7 @@ msgstr "遊戲中的聊天終端機高度，介於 0.1 (10%) 至 1.0 (100%) 間
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
-msgstr ""
+msgstr "跳躍時的初始垂直速度，以每秒節點為單位。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4013,7 +4110,6 @@ msgstr ""
 "這通常僅被核心／內建貢獻者需要"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Instrument chat commands on registration."
 msgstr "分析登錄的聊天指令。"
 
@@ -4044,9 +4140,8 @@ msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr "儲存世界中的重要變更的間隔，以秒計。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Interval of sending time of day to clients, stated in seconds."
-msgstr "傳送當日時間至用戶端的間隔。"
+msgstr "向客戶端發送一天中的時間間隔，以秒為單位。"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
@@ -4058,21 +4153,19 @@ msgstr "滑鼠反相"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse wheel (scroll) direction for item selection in hotbar."
-msgstr ""
+msgstr "反轉滑鼠滾輪（滾動）方向以在熱欄中選擇項目。"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
 msgstr "反轉滑鼠移動的方向。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic font path"
-msgstr "等寬字型路徑"
+msgstr "斜體字體路徑"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic monospace font path"
-msgstr "等寬字型路徑"
+msgstr "斜體等寬字體路徑"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
@@ -4089,6 +4182,10 @@ msgid ""
 "increases processing load.\n"
 "At iterations = 20 this mapgen has a similar load to mapgen V7."
 msgstr ""
+"遞歸函數的迭代。\n"
+"增加此值會增加精細細節的數量，但也會增加\n"
+"增加處理負荷。\n"
+"在迭代次數 = 20 時，此 mapgen 具有與 mapgen V7 類似的負載。"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick ID"
@@ -4099,21 +4196,18 @@ msgid "Joystick button repetition interval"
 msgstr "搖桿按鈕重覆間隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick dead zone"
-msgstr "搖桿類型"
+msgstr "搖桿死區"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "搖桿靈敏度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick type"
 msgstr "搖桿類型"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "W component of hypercomplex constant.\n"
@@ -4121,61 +4215,63 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"僅朱利亞集合：可交換超複數的 W 元素決定了 朱利亞形狀。\n"
-"在 3D 碎形上沒有效果。\n"
-"範圍約在 -2 至 2 間。"
+"僅朱莉婭集合。\n"
+"超複數常數的W成分。\n"
+"改變分形圖形形狀。\n"
+"對3D分形無影響。\n"
+"大致在-2到2之間。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "X component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"僅朱利亞集合：可交換超複數的 X 元素決定了 朱利亞形狀。\n"
-"在 3D 碎形上沒有效果。\n"
-"範圍約在 -2 至 2 間。"
+"朱莉婭只設置。\n"
+"超複常數的 X 分量。\n"
+"改變分形的形狀。\n"
+"範圍大致為 -2 到 2。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Y component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"僅朱利亞集合：可交換超複數的 Y 元素決定了 朱利亞形狀。\n"
-"在 3D 碎形上沒有效果。\n"
-"範圍約在 -2 至 2 間。"
+"朱莉婭只設置。\n"
+"超複常數的 X 分量。\n"
+"改變分形的形狀。\n"
+"範圍大致為 -2 到 2。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Z component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"僅朱利亞集合：可交換超複數的 Z 元素決定了 朱利亞形狀。\n"
-"在 3D 碎形上沒有效果。\n"
-"範圍約在 -2 至 2 間。"
+"朱莉婭只設置。\n"
+"超複常數的 Z 分量。\n"
+"改變分形的形狀。\n"
+"範圍大致為 -2 到 2。"
 
 #: src/settings_translation_file.cpp
 msgid "Julia w"
-msgstr "Julia w"
+msgstr "朱莉婭w"
 
 #: src/settings_translation_file.cpp
 msgid "Julia x"
-msgstr "Julia x"
+msgstr "朱莉婭x"
 
 #: src/settings_translation_file.cpp
 msgid "Julia y"
-msgstr "Julia y"
+msgstr "茱莉亞y"
 
 #: src/settings_translation_file.cpp
 msgid "Julia z"
-msgstr "Julia z"
+msgstr "茱莉亞z"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
@@ -4183,11 +4279,11 @@ msgstr "跳躍速度"
 
 #: src/settings_translation_file.cpp
 msgid "Keyboard and Mouse"
-msgstr ""
+msgstr "鍵盤和滑鼠"
 
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
-msgstr ""
+msgstr "踢出每 10 秒發送超過 X 則訊息的玩家。"
 
 #: src/settings_translation_file.cpp
 msgid "Lake steepness"
@@ -4207,15 +4303,15 @@ msgstr "大型洞穴深度"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave maximum number"
-msgstr ""
+msgstr "大洞穴最大數量"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave minimum number"
-msgstr ""
+msgstr "大洞穴最少數量"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr ""
+msgstr "大洞穴被淹沒比例"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -4236,36 +4332,34 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network, stated in seconds."
-msgstr "伺服器 tick 的長度與相關物件的間隔通常透過網路更新。"
+"Length of a server tick (the interval at which everything is generally "
+"updated),\n"
+"stated in seconds.\n"
+"Does not apply to sessions hosted from the client menu."
+msgstr ""
+"伺服器週期的長度和物件更新的時間間隔\n"
+"網絡，以秒為單位。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of liquid waves."
-msgstr "波動的水速度"
+msgstr "波動的水速度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between Active Block Modifier (ABM) execution cycles, stated "
 "in seconds."
-msgstr "在 ABM 執行循環間的時間長度"
+msgstr "在 ABM 執行循環間的時間長度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between NodeTimer execution cycles, stated in seconds."
-msgstr "在 Node 計時器執行循環間的時間長度"
+msgstr "在 Node 計時器執行循環間的時間長度。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of time between active block management cycles, stated in seconds."
-msgstr "在活躍方塊管理循環的時間中間"
+msgstr "在活躍方塊管理循環的時間中間。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Level of logging to be written to debug.txt:\n"
 "-    <nothing> (no logging)\n"
@@ -4277,43 +4371,43 @@ msgid ""
 "-    verbose\n"
 "-    trace"
 msgstr ""
-"要被寫入到 debug.txt 的紀錄等級：\n"
-"-    <nothing> （不記錄）\n"
-"-    none（無等級的訊息）\n"
-"-    error\n"
-"-    warning\n"
-"-    action\n"
-"-    info\n"
-"-    verbose"
+"要寫入 debug.txt 的日誌記錄等級：\n"
+"- <無>（不記錄）\n"
+"- 無（沒有等級的消息）\n"
+"- 錯誤\n"
+"- 警告\n"
+"- 行動\n"
+"- 資訊\n"
+"- 详细\n"
+"- 追逐"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
-msgstr ""
+msgstr "亮度曲線提升"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost center"
-msgstr ""
+msgstr "亮度曲線提升中心"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost spread"
-msgstr ""
+msgstr "亮度曲線提升點差"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve gamma"
-msgstr ""
+msgstr "亮度曲線伽瑪"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve high gradient"
-msgstr ""
+msgstr "亮度曲線高梯度"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve low gradient"
-msgstr ""
+msgstr "亮度曲線低梯度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lighting"
-msgstr "平滑光線"
+msgstr "光照"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4356,7 +4450,6 @@ msgid "Liquid queue purge time"
 msgstr "液體佇列清除時間"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Liquid sinking"
 msgstr "液體下沉"
 
@@ -4392,15 +4485,17 @@ msgid ""
 "from the bright objects.\n"
 "Range: from 0.1 to 8, default: 1"
 msgstr ""
+"控制暈效果傳播多遠的邏輯值\n"
+"來自明亮的物體。\n"
+"範圍：0.1 到 8，預設值：1"
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of dungeons."
-msgstr ""
+msgstr "地下城的 Y 下限。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "大型偽隨機洞穴的 Y 上限。"
+msgstr "懸空島的 Y 下限。"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
@@ -4411,17 +4506,13 @@ msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "讓霧與天空的顏色取決於時間（黎明／日落）與觀看方向。"
 
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr "讓所有的液體不透明"
-
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Disk Storage"
-msgstr ""
+msgstr "磁碟儲存的映射壓縮級別"
 
 #: src/settings_translation_file.cpp
 msgid "Map Compression Level for Network Transfer"
-msgstr ""
+msgstr "網路傳輸的映射壓縮級別"
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
@@ -4429,30 +4520,25 @@ msgstr "地圖目錄"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen Carpathian."
-msgstr ""
+msgstr "針對Carpathian地圖產生器的屬性。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
-"專用於 Mapgen flat 的地圖生成屬性。\n"
-"可能會有少數的湖泊或是丘陵會在扁平的世界中生成。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"Flat地圖 特有的地圖生成屬性。\n"
+"偶爾的湖泊和山丘可以添加到平坦的世界。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"專用於 Mapgen flat 的地圖生成屬性。\n"
-"可能會有少數的湖泊或是丘陵會在扁平的世界中生成。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"Mapgen Fractal 特有的地圖生成屬性。\n"
+"'terrain' 能夠產生非分形地形：\n"
+"海洋、島嶼和地下。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4463,10 +4549,16 @@ msgid ""
 "to become shallower and occasionally dry.\n"
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
+"針對Valley地圖產生器的屬性。\n"
+"'altitude_chill'：隨海拔高度減少熱量。\n"
+"'humid_rivers'：增加河流周圍的濕度。\n"
+"'vary_river_depth'：如果啟用，高熱量低濕度導致河流\n"
+"變淺甚至乾枯。\n"
+"'altitude_dry'：隨海拔高度減少濕度。"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen v5."
-msgstr ""
+msgstr "Mapgen v5 特有的地圖生成屬性。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4474,27 +4566,26 @@ msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
+"the 'jungles' flag is ignored.\n"
+"The 'temples' flag disables generation of desert temples. Normal dungeons "
+"will appear instead."
 msgstr ""
-"專用於 Mapgen v6 的地圖生成屬性。\n"
-"'snowbiomes' 旗標啟用了五個新的生態系。\n"
-"當新的生態系啟用時，叢林生態系會自動啟用，\n"
-"而 'jungles' 會被忽略。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"Mapgen v6 特有的地圖生成屬性。\n"
+"「雪生物群落」標誌啟用新的 5 個生物群落系統。\n"
+"當「雪生物群落」標誌啟用時，叢林會自動啟用並且\n"
+"'jungles' 標誌被忽略。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"專用於 Mapgen flat 的地圖生成屬性。\n"
-"可能會有少數的湖泊或是丘陵會在扁平的世界中生成。\n"
-"未在旗標字串中指定的旗標將不會自預設值修改。\n"
-"以「no」開頭的旗標字串將會用於明確的停用它們。"
+"針對v7地圖產生器的屬性。\n"
+"'ridges'：启用河流。\n"
+"'floatlands'：漂浮於大氣中的陸塊。\n"
+"'caverns'：地下深處的巨大洞穴。"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -4505,9 +4596,8 @@ msgid "Map save interval"
 msgstr "地圖儲存間隔"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Map shadows update frames"
-msgstr "液體更新 tick"
+msgstr "地圖陰影更新幀"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
@@ -4522,11 +4612,6 @@ msgstr "地圖區塊網格生成延遲"
 msgid "Mapblock mesh generation threads"
 msgstr "地圖區塊網格生成延遲"
 
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "地圖區塊網格生成器的地圖區塊快取大小 MB"
-
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
 msgstr "地圖區塊卸除逾時"
@@ -4542,17 +4627,14 @@ msgid "Mapgen Carpathian specific flags"
 msgstr "Mapgen flat 特別旗標"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat"
-msgstr "Mapgen flat"
+msgstr "地圖產生器Flat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat specific flags"
-msgstr "Mapgen flat 特別旗標"
+msgstr "地圖產生器平地標籤"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal"
 msgstr "地圖產生器分形"
 
@@ -4562,9 +4644,8 @@ msgid "Mapgen Fractal specific flags"
 msgstr "Mapgen flat 特別旗標"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5"
-msgstr "Mapgen v5"
+msgstr "地圖產生器 v5"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4572,17 +4653,14 @@ msgid "Mapgen V5 specific flags"
 msgstr "Mapgen v5 特別旗標"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6"
-msgstr "Mapgen v6"
+msgstr "地圖產生器 v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6 specific flags"
-msgstr "Mapgen v6 特別旗標"
+msgstr "地圖產生器 v6 標籤"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7"
 msgstr "地圖產生器 v7"
 
@@ -4633,13 +4711,12 @@ msgid "Maximum FPS"
 msgstr "最高 FPS"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum FPS when the window is not focused, or when the game is paused."
-msgstr "當遊戲暫停時的最高 FPS。"
+msgstr "視窗未對焦或遊戲暫停時的最大 FPS。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum distance to render shadows."
-msgstr ""
+msgstr "渲染陰影的最大距離。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -4651,17 +4728,19 @@ msgstr "快捷列最大寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
-msgstr ""
+msgstr "每個地圖區塊的大型洞穴隨機數量的最大限制。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of small caves per mapchunk."
-msgstr ""
+msgstr "每個地圖區塊的小洞穴隨機數量的最大限制。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
+"最大液體阻力。 控制進入液體時的減速度\n"
+"高速。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4669,19 +4748,21 @@ msgid ""
 "The maximum total count is calculated dynamically:\n"
 "max_total = ceil((#clients + max_users) * per_client / 4)"
 msgstr ""
+"每個客戶端同時發送的最大區塊數。\n"
+"最大總計數是動態計算的：\n"
+"max_total = ceil((#clients + max_users) * per_client / 4)"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
 msgstr "可被放進佇列內等待載入的最大區塊數。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
-"可被放進佇列內等待生成的最大區塊數。\n"
-"將其設定留空則會自動選擇適當的值。"
+"要產生的要排隊的最大區塊數。\n"
+"此限制是針對每個玩家強制執行的。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4698,6 +4779,8 @@ msgid ""
 "be queued.\n"
 "This should be lower than curl_parallel_limit."
 msgstr ""
+"最大同時下載數。 超過此限制的下載將排隊。\n"
+"這應該低於curl_parallel_limit。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4756,6 +4839,8 @@ msgid ""
 "Maximum size of the outgoing chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
+"傳出聊天佇列的最大大小。\n"
+"0 禁用佇列，-1 使隊列大小不受限制。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4768,7 +4853,7 @@ msgstr "檔案下載（例如下載 mod）可花費的最大時間，以毫秒
 msgid ""
 "Maximum time an interactive request (e.g. server list fetch) may take, "
 "stated in milliseconds."
-msgstr ""
+msgstr "交互請求（例如伺服器清單取得）可能花費的最長時間，以毫秒為單位。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
@@ -4792,19 +4877,24 @@ msgstr "用於突顯物件的方法。"
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "要寫入聊天的最低層級的日誌記錄。"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
 msgstr "迷你地圖掃描高度"
 
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Minimum dig repetition interval"
+msgstr "放置重複間隔"
+
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
-msgstr ""
+msgstr "每個地圖區塊的大型洞穴隨機數量的最小限制。"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of small caves per mapchunk."
-msgstr ""
+msgstr "每個地圖區塊的小洞穴隨機數量的最小限制。"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -4812,21 +4902,19 @@ msgstr "映射貼圖"
 
 #: src/settings_translation_file.cpp
 msgid "Miscellaneous"
-msgstr ""
+msgstr "各種的"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Profiler"
-msgstr "分析器"
+msgstr "模組分析器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mod Security"
-msgstr "安全"
+msgstr "模組安全"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
-msgstr ""
+msgstr "模組頻道"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4871,6 +4959,10 @@ msgstr "滑鼠靈敏度"
 msgid "Mouse sensitivity multiplier."
 msgstr "滑鼠靈敏度倍數。"
 
+#: src/settings_translation_file.cpp
+msgid "Movement threshold"
+msgstr "移動閾值"
+
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
 msgstr "泥土雜訊"
@@ -4885,7 +4977,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
-msgstr ""
+msgstr "靜音"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4894,6 +4986,10 @@ msgid ""
 "Current mapgens in a highly unstable state:\n"
 "-    The optional floatlands of v7 (disabled by default)."
 msgstr ""
+"建立新世界時要使用的地圖產生器的名稱。\n"
+"在主選單中創建一個世界將覆蓋它。\n"
+"目前mapgens處於高度不穩定狀態：\n"
+"-    v7 的可選浮動區域（預設為停用）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4919,7 +5015,6 @@ msgstr ""
 "當從主選單啟動時，這個值將會被覆寫。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Networking"
 msgstr "網路"
 
@@ -4961,6 +5056,16 @@ msgid ""
 "processes, especially in singleplayer and/or when running Lua code in\n"
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
+"要使用的emerge 執行緒數。\n"
+"值 0：\n"
+"- 自動選擇。 出現的線程數將為\n"
+"-“處理器數量 - 2”，下限為 1。\n"
+"任何其他值：\n"
+"- 指定emerge執行緒數，下限為1。\n"
+"警告：增加emerge線程的數量會增加引擎mapgen\n"
+"速度，但這可能會幹擾其他內容，從而損害遊戲效能\n"
+"進程，尤其是在單人遊戲中和/或在以下環境中運行 Lua 程式碼時\n"
+"'on_generate'。 對於許多用戶來說，最佳設定可能是“1”。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4974,9 +5079,8 @@ msgstr ""
 "記憶體耗費（根據經驗，4096=100MB）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Number of messages a player may send per 10 seconds."
-msgstr "玩家每 10 秒能傳送的訊息量"
+msgstr "玩家每 10 秒能傳送的訊息量。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4984,24 +5088,22 @@ msgid ""
 "Value of 0 (default) will let Minetest autodetect the number of available "
 "threads."
 msgstr ""
+"用於網格產生的線程數。\n"
+"值 0（預設）將讓 Minetest 自動偵測可用執行緒的數量。"
 
 #: src/settings_translation_file.cpp
 msgid "Occlusion Culler"
-msgstr ""
+msgstr "剔除閉塞"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Occlusion Culling"
 msgstr "伺服器端遮擋剔除"
 
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr "不透明液體"
-
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
+msgstr "預設字體後面的陰影的不透明度 (alpha)，介於 0 到 255 之間。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5009,10 +5111,16 @@ msgid ""
 "formspec is\n"
 "open."
 msgstr ""
+"當視窗失去焦點時開啟暫停選單。 如果表單規格是則不暫停\n"
+"打開。"
+
+#: src/settings_translation_file.cpp
+msgid "OpenGL debug"
+msgstr "OpenGL 偵錯"
 
 #: src/settings_translation_file.cpp
 msgid "Optional override for chat weblink color."
-msgstr ""
+msgstr "聊天網站連結顏色的可選覆蓋。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5020,12 +5128,16 @@ msgid ""
 "This font will be used for certain languages or if the default font is "
 "unavailable."
 msgstr ""
+"後備字體的路徑。 必須是 TrueType 字型。\n"
+"此字體將用於某些語言或預設字體不可用時。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"儲存螢幕截圖的路徑。 可以是絕對路徑或相對路徑。\n"
+"如果該資料夾尚不存在，則會建立該資料夾。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5038,34 +5150,36 @@ msgid ""
 "Path to the default font. Must be a TrueType font.\n"
 "The fallback font will be used if the font cannot be loaded."
 msgstr ""
+"預設字體的路徑。 必須是 TrueType 字型。\n"
+"如果無法載入字體，將使用後備字體。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to the monospace font. Must be a TrueType font.\n"
 "This font is used for e.g. the console and profiler screen."
 msgstr ""
+"等寬字體的路徑。 必須是 TrueType 字型。\n"
+"該字體用於例如 控制台和分析器螢幕。"
 
 #: src/settings_translation_file.cpp
 msgid "Pause on lost window focus"
-msgstr ""
+msgstr "失去視窗焦點時暫停"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
-msgstr ""
+msgstr "每個玩家從磁碟加載的排隊塊限制"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "要生成的出現佇列的限制"
+msgstr "每個玩家產生的排隊區塊的限制"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
 msgstr "物理"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Place repetition interval"
-msgstr "右鍵點擊重覆間隔"
+msgstr "放置重複間隔"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
@@ -5078,7 +5192,7 @@ msgstr "雙線性過濾器"
 
 #: src/settings_translation_file.cpp
 msgid "Post Processing"
-msgstr ""
+msgstr "後製處理"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5087,17 +5201,21 @@ msgid ""
 "Enable this when you dig or place too often by accident.\n"
 "On touchscreens, this only affects digging."
 msgstr ""
+"防止按住對應按鈕時重複挖掘和放置。\n"
+"當您意外地頻繁挖掘或放置時啟用此功能。\n"
+"在觸控螢幕上，這只會影響挖掘。"
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr "避免 mod 做出不安全的舉動，像是執行 shell 指令等。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds).\n"
 "0 = disable. Useful for developers."
-msgstr "引擎性能資料印出間隔的秒數。0 = 停用。對開發者有用。"
+msgstr ""
+"定期（以秒為單位）列印引擎的分析數據。\n"
+"0 = 禁用。 對開發人員有用。"
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
@@ -5109,7 +5227,7 @@ msgstr "分析器"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Prometheus 監聽器位址"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5118,9 +5236,21 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetched on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Prometheus 監聽器地址。\n"
+"如果Minetest在編輯時啓用了ENABLE_PROMETHEUS選項，\n"
+"在該地址上為 Prometheus 啓用指標偵聽器。\n"
+"可以從 http://127.0.0.1:30000/metrics 獲取指標"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
+msgstr "含有液體的大型洞穴的比例。"
+
+#: src/settings_translation_file.cpp
+msgid "Protocol version minimum"
+msgstr "協定版本不符合"
+
+#: src/settings_translation_file.cpp
+msgid "Punch gesture"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5133,25 +5263,26 @@ msgstr ""
 "大於 26 的值將會在雲的角落有銳角的產生。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Raises terrain to make valleys around the rivers."
-msgstr "提升地形以讓山谷在河流周圍"
+msgstr "提升地形以讓山谷在河流周圍。"
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
 msgstr "隨機輸入"
 
+#: src/settings_translation_file.cpp
+msgid "Random mod load order"
+msgstr "依隨機順序載入 mod"
+
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr "最近聊天訊息"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
-msgstr "報告路徑"
+msgstr "常規字型路徑"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Remember screen size"
 msgstr "自動儲存視窗大小"
 
@@ -5188,6 +5319,16 @@ msgid ""
 "csm_restriction_noderange)\n"
 "READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
 msgstr ""
+"在伺服器上限制一些客戶端上的功能。\n"
+"將下面的標誌位結合來限制客戶端功能，設定為0為\n"
+"無限制：\n"
+"LOAD_CLIENT_MODS：1（禁止載入客戶端 mod）\n"
+"CHAT_MESSAGES：2（禁止客戶端呼叫 send_chat_message）\n"
+"READ_ITEMDEFS：4（禁止客戶端呼叫 get_item_def）\n"
+"READ_NODEDEFS：8（禁止客戶端呼叫 get_node_def）\n"
+"LOOKUP_NODES_LIMIT：16（禁止客戶端 get_node 呼叫限制為\n"
+"csm_restriction_noderange）\n"
+"READ_PLAYERINFO：32（禁止客戶端呼叫 get_player_names）"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge mountain spread noise"
@@ -5206,17 +5347,14 @@ msgid "Ridged mountain size noise"
 msgstr "山脊大小雜訊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel depth"
 msgstr "河流深度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel width"
-msgstr "河流深度"
+msgstr "河流寬度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River depth"
 msgstr "河流深度"
 
@@ -5225,14 +5363,12 @@ msgid "River noise"
 msgstr "河流雜訊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River size"
 msgstr "河流大小"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River valley width"
-msgstr "河流深度"
+msgstr "河谷寬度"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -5248,7 +5384,7 @@ msgstr "波狀丘陵地展開雜訊"
 
 #: src/settings_translation_file.cpp
 msgid "Safe digging and placing"
-msgstr ""
+msgstr "安全挖掘和放置"
 
 #: src/settings_translation_file.cpp
 msgid "Sandy beaches occur when np_beach exceeds this value."
@@ -5266,13 +5402,16 @@ msgid ""
 "is maximized is stored in window_maximized.\n"
 "(Autosaving window_maximized only works if compiled with SDL.)"
 msgstr ""
+"修改時自動儲存視窗大小。\n"
+"如果為 true，則螢幕尺寸會儲存在 screen_w 和 screen_h 中，以及視窗是否\n"
+"最大化儲存在window_maximized中。\n"
+"（自動儲存 window_maximized 僅在使用 SDL 編譯時才有效。）"
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
 msgstr "儲存從伺服器接收到的地圖"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Scale GUI by a user specified value.\n"
 "Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
@@ -5280,16 +5419,15 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
-"由使用者指定一個值來作為放大圖形使用者介面的比例。\n"
-"使用最近相鄰與反鋸齒過濾器以放大圖形使用者介面。\n"
-"這將可以讓一些粗糙的邊緣變得較圓滑，並當\n"
-"比例縮小時會混合像素，代價是在模糊一些\n"
-"邊緣的像素時會以非整數的大小縮放。"
+"依使用者指定的值縮放 GUI。\n"
+"使用最近鄰抗混疊過濾器來縮放 GUI。\n"
+"這將平滑一些粗糙的邊緣，並混合\n"
+"縮小時的像素，代價是模糊一些\n"
+"當影像以非整數大小縮放時的邊緣像素。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screen"
-msgstr "螢幕："
+msgstr "螢幕"
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
@@ -5322,9 +5460,8 @@ msgstr ""
 "使用 0 來使用預設品質。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshots"
-msgstr "螢幕擷取"
+msgstr "螢幕截圖"
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5339,18 +5476,18 @@ msgid "Second of two 3D noises that together define tunnels."
 msgstr "二之二 一同定義隧道的 3D 雜訊。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr "請見 http://www.sqlite.org/pragma.html#pragma_synchronous"
+msgstr "請見 https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Select the antialiasing method to apply.\n"
 "\n"
 "* None - No antialiasing (default)\n"
 "\n"
-"* FSAA - Hardware-provided full-screen antialiasing (incompatible with "
-"shaders)\n"
+"* FSAA - Hardware-provided full-screen antialiasing\n"
+"(incompatible with Post Processing and Undersampling)\n"
 "A.K.A multi-sample antialiasing (MSAA)\n"
 "Smoothens out block edges but does not affect the insides of textures.\n"
 "A restart is required to change this option.\n"
@@ -5364,6 +5501,22 @@ msgid ""
 "Renders higher-resolution image of the scene, then scales down to reduce\n"
 "the aliasing effects. This is the slowest and the most accurate method."
 msgstr ""
+"選擇要應用的抗鋸齒方法。\n"
+"\n"
+"* 無 - 無抗鋸齒（預設）\n"
+"\n"
+"* FSAA - 硬體提供的全螢幕抗鋸齒（與著色器不相容）\n"
+"又稱多樣本抗鋸齒 (MSAA)\n"
+"平滑塊邊緣，但不影響紋理的內部。\n"
+"需要重新啟動才能變更此選項。\n"
+"\n"
+"* FXAA - 快速近似抗鋸齒（需著色器）\n"
+"應用後處理濾鏡來偵測和平滑高對比度邊緣。\n"
+"提供速度和影像品質之間的平衡。\n"
+"\n"
+"* SSAA - 超級採樣抗鋸齒（需要著色器）\n"
+"渲染場景的更高解析度影像，然後按比例縮小以減少\n"
+"混疊效應。 這是最慢且最準確的方法。"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
@@ -5421,19 +5574,16 @@ msgstr ""
 "18 = 4D \"Mandelbulb\" julia set."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server"
-msgstr "伺服器 URL"
+msgstr "伺服器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server Gameplay"
-msgstr "伺服器名稱"
+msgstr "遊戲伺服器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server Security"
-msgstr "伺服器描述"
+msgstr "伺服器安全"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
@@ -5456,23 +5606,20 @@ msgid "Server port"
 msgstr "伺服器埠"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server-side occlusion culling"
 msgstr "伺服器端遮擋剔除"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server/Env Performance"
-msgstr "伺服器埠"
+msgstr "伺服器/環境效能"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
 msgstr "伺服器清單 URL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist and MOTD"
-msgstr "伺服器清單 URL"
+msgstr "伺服器列表和 MOTD"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
@@ -5484,6 +5631,9 @@ msgid ""
 "Games may change orbit tilt via API.\n"
 "Value of 0 means no tilt / vertical orbit."
 msgstr ""
+"設定太陽/月球軌道的預設傾斜度（以度為單位）。\n"
+"遊戲可能會透過 API 改變軌道傾斜度。\n"
+"0 值表示無傾斜/垂直軌道。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5491,20 +5641,22 @@ msgid ""
 "Value of 0.0 (default) means no exposure compensation.\n"
 "Range: from -1 to 1.0"
 msgstr ""
+"以 EV 單位設定曝光補償。\n"
+"值 0.0（預設）表示無曝光補償。\n"
+"範圍：從-1到1.0"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Set the language. Leave empty to use the system language.\n"
+"Set the language. By default, the system language is used.\n"
 "A restart is required after changing this."
 msgstr ""
-"設定語言。留空以使用系統語言。\n"
-"變更後必須重新啟動以使其生效。"
+"設定語言。預設情況下，使用系統語言。\n"
+"變更後需要重新啟動。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set the maximum length of a chat message (in characters) sent by clients."
-msgstr "設定用戶端傳送之聊天訊息的最大字元長度。"
+msgstr "設定客戶端發送的聊天訊息的最大長度（以字元為單位）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5512,6 +5664,9 @@ msgid ""
 "Adjusts the intensity of in-game dynamic shadows.\n"
 "Lower value means lighter shadows, higher value means darker shadows."
 msgstr ""
+"設定陰影強度伽瑪。\n"
+"調整遊戲中動態陰影的強度。\n"
+"較低的值意味著較淺的陰影，較高的值意味著較暗的陰影。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5519,40 +5674,37 @@ msgid ""
 "Lower values mean sharper shadows, bigger values mean softer shadows.\n"
 "Minimum value: 1.0; maximum value: 15.0"
 msgstr ""
+"設定軟陰影半徑大小。\n"
+"較低的值意味著更清晰的陰影，更大的值意味著更柔和的陰影。\n"
+"最小值：1.0； 最大值：15.0"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable Shadow Mapping."
-msgstr ""
-"設定為真以啟用擺動的樹葉。\n"
-"必須同時啟用著色器。"
+msgstr "設定為 true 以啟用陰影貼圖。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable bloom effect.\n"
 "Bright colors will bleed over the neighboring objects."
 msgstr ""
+"設定為 true 以啟用光暈效果。\n"
+"明亮的顏色會滲透到鄰近的物體上。"
+
+#: src/settings_translation_file.cpp
+msgid "Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\")."
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving leaves."
-msgstr ""
-"設定為真以啟用擺動的樹葉。\n"
-"必須同時啟用著色器。"
+msgstr "設定為 true 以啟用揮舞的葉子。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving liquids (like water)."
-msgstr ""
-"設定為真以啟用波動的水。\n"
-"必須同時啟用著色器。"
+msgstr "設定為 true 以啟用波動液體（如水）。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Set to true to enable waving plants."
-msgstr ""
-"設定為真以啟用擺動的植物。\n"
-"必須同時啟用著色器。"
+msgstr "設定為 true 以啟用波浪植物。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5561,6 +5713,10 @@ msgid ""
 "top-left - processed base image, top-right - final image\n"
 "bottom-left - raw base image, bottom-right - bloom texture."
 msgstr ""
+"設定為 true 以渲染光暈效果的調試細分。\n"
+"在調試模式下，螢幕分為 4 個象限：\n"
+"左上 - 處理後的基礎影像，右上 - 最終影像\n"
+"左下角 - 原始基礎影像，右下角 - 綻放紋理。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5568,6 +5724,9 @@ msgid ""
 "On false, 16 bits texture will be used.\n"
 "This can cause much more artifacts in the shadow."
 msgstr ""
+"將陰影紋理品質設定為 32 位元。\n"
+"如果為 false，將使用 16 位元紋理。\n"
+"這可能會在陰影中產生更多偽影。"
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
@@ -5578,44 +5737,39 @@ msgid "Shaders"
 msgstr "著色器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
+"cards."
 msgstr ""
-"著色器讓您可以有進階視覺效果並可能會在某些顯示卡上增強效能。\n"
-"這僅在 OpenGL 視訊後端上才能運作。"
+"著色器允許實現高級視覺效果，\n"
+"並可能提高某些顯示卡的性能。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow filter quality"
-msgstr "螢幕截圖品質"
+msgstr "陰影濾鏡質量"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map max distance in nodes to render shadows"
-msgstr ""
+msgstr "陰影貼圖節點中渲染陰影的最大距離"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow map texture in 32 bits"
-msgstr ""
+msgstr "32 位元陰影貼圖紋理"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shadow map texture size"
-msgstr "過濾器的最大材質大小"
+msgstr "陰影貼圖紋理大小"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
-msgstr "字型陰影偏移，若為 0 則陰影將不會被繪製。"
+msgstr "預設字體的陰影偏移（以像素為單位）。 如果為 0，則不會繪製陰影。"
 
 #: src/settings_translation_file.cpp
 msgid "Shadow strength gamma"
-msgstr ""
+msgstr "陰影強度伽馬"
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
@@ -5626,17 +5780,16 @@ msgid "Show entity selection boxes"
 msgstr "顯示物體選取方塊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Show entity selection boxes\n"
 "A restart is required after changing this."
 msgstr ""
-"設定語言。留空以使用系統語言。\n"
-"變更後必須重新啟動以使其生效。"
+"顯示實體選擇框\n"
+"更改後需要重新啟動。"
 
 #: src/settings_translation_file.cpp
 msgid "Show name tag backgrounds by default"
-msgstr ""
+msgstr "預設顯示名稱標籤背景"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -5650,6 +5803,11 @@ msgid ""
 "draw calls, benefiting especially high-end GPUs.\n"
 "Systems with a low-end GPU (or no GPU) would benefit from smaller values."
 msgstr ""
+"客戶端將一起考慮的地圖塊立方體的邊長\n"
+"生成網格時。\n"
+"較大的值透過減少 GPU 的數量來提高 GPU 的利用率\n"
+"繪製調用，尤其有利於高階 GPU。\n"
+"具有低端 GPU（或沒有 GPU）的系統將受益於較小的值。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5660,37 +5818,32 @@ msgid ""
 "Altering this value is for special usage, leaving it unchanged is\n"
 "recommended."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-"網格生成器的地圖區塊快取大小。增加這個將會\n"
-"增加快取命中率，減少從主執行緒複製資料，從\n"
-"而減少抖動。"
+"由mapgen產生的mapchunk的大小，以mapblocks（16個節點）表示。\n"
+"警告：這樣做沒有任何好處，而且存在一些危險\n"
+"將該數值增加到 5 以上。\n"
+"減少該值會增加洞穴和地牢的密度。\n"
+"改變這個值是為了特殊用途，保持不變是\n"
+"受到推崇的。"
 
 #: src/settings_translation_file.cpp
 msgid "Sky Body Orbit Tilt"
-msgstr ""
+msgstr "天體軌道傾斜"
 
 #: src/settings_translation_file.cpp
 msgid "Slice w"
 msgstr "切片 w"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Slope and fill work together to modify the heights."
-msgstr "坡度與填充一同運作來修改高度"
+msgstr "坡度與填充一同運作來修改高度。"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
-msgstr ""
+msgstr "小洞穴最大數量"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave minimum number"
-msgstr ""
+msgstr "小洞穴最少數量"
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale humidity variation for blending biomes on borders."
@@ -5708,29 +5861,36 @@ msgstr "平滑光"
 #, fuzzy
 msgid ""
 "Smooths rotation of camera when in cinematic mode, 0 to disable. Enter "
-"cinematic mode by using the key set in Change Keys."
-msgstr "在電影模式中讓攝影機旋轉變流暢。設為 0 以停用。"
+"cinematic mode by using the key set in Controls."
+msgstr ""
+"在電影模式下平滑相機的旋轉，0 表示停用。 使用“更改鍵”中設定的鍵進入電影模式。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths rotation of camera, also called look or mouse smoothing. 0 to "
 "disable."
-msgstr "在電影模式中讓攝影機旋轉變流暢。設為 0 以停用。"
+msgstr "平滑相機的旋轉，也稱為外觀或滑鼠平滑。 0 禁用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneaking speed"
-msgstr "走路速度"
+msgstr "潜行速度"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed, in nodes per second."
-msgstr ""
+msgstr "潛行速度，以方塊每秒為單位。"
+
+#: src/settings_translation_file.cpp
+msgid "Soft shadow radius"
+msgstr "軟陰影半徑"
+
+#: src/settings_translation_file.cpp
+msgid "Sound"
+msgstr "聲音"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Soft shadow radius"
-msgstr "字型陰影 alpha 值"
+msgid "Sound Extensions Blacklist"
+msgstr "ContentDB 旗標黑名單列表"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5750,6 +5910,8 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"指定節點、項目和工具的預設堆疊大小。\n"
+"請注意，模組或遊戲可能會明確為某些（或所有）項目設定堆疊。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5758,6 +5920,10 @@ msgid ""
 "will consume more resources.\n"
 "Minimum value: 1; maximum value: 16"
 msgstr ""
+"在給定數量的幀上傳播陰影貼圖的完整更新。\n"
+"較高的值可能會使陰影滯後，較低的值\n"
+"會消耗更多的資源。\n"
+"最小值：1； 最大值：16"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5765,30 +5931,29 @@ msgid ""
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
+"光變曲線增強範圍的擴展。\n"
+"控制要提升的範圍的寬度。\n"
+"光變曲線的標準差增強高斯。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Static spawn point"
-msgstr "靜態重生點"
+msgstr "靜態生成點"
 
 #: src/settings_translation_file.cpp
 msgid "Steepness noise"
 msgstr "坡度雜訊"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain size noise"
-msgstr "山雜訊"
+msgstr "階梯山大小的噪音"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain spread noise"
-msgstr "山雜訊"
+msgstr "單步山峰廣度噪音"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
-msgstr "視差強度。"
+msgstr "3D 模式視差的強度。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5796,6 +5961,9 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"光曲線增強的強度。\n"
+"3 個「增強」參數定義了光的範圍\n"
+"亮度增強的曲線。"
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
@@ -5803,7 +5971,7 @@ msgstr "嚴格協議檢查"
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
-msgstr ""
+msgstr "條帶顏色代碼"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5818,6 +5986,16 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"可選水的表面水平放置在固體漂浮層上。\n"
+"預設情況下禁用水，只有設定此值後才會放置水\n"
+"到上面的“mgv7_floatland_ymax”-“mgv7_floatland_taper”（\n"
+"上部逐漸變細）。\n"
+"***警告，對世界和伺服器效能的潛在危險***：\n"
+"啟用水放置時，必須配置和測試浮地\n"
+"透過將“mgv7_floatland_密度”設定為 2.0（或其他\n"
+"所需值取決於“mgv7_np_floatland”），以避免\n"
+"伺服器密集型極端水流並避免大量洪水\n"
+"下面的世界表面。"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -5836,7 +6014,6 @@ msgid "Terrain base noise"
 msgstr "地形基礎高度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain height"
 msgstr "地形高度"
 
@@ -5878,6 +6055,9 @@ msgid ""
 "This must be a power of two.\n"
 "Bigger numbers create better shadows but it is also more expensive."
 msgstr ""
+"用於渲染陰影貼圖的紋理大小。\n"
+"這必須是二的冪。\n"
+"數字越大，陰影效果越好，但運算成本也越高。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5888,15 +6068,20 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
+"節點上的紋理可以與節點或世界對齊。\n"
+"前一種模式更適合機器、家具等東西，而前一種模式更適合機器、家具等。\n"
+"後者使樓梯和微塊更適應周圍環境。\n"
+"然而，由於這種可能性是新的，因此舊伺服器可能無法使用，\n"
+"此選項允許對某些節點類型強制執行。 但請注意\n"
+"這被認為是實驗性的，可能無法正常工作。"
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
-msgstr ""
+msgstr "內容儲存庫的 URL"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "The dead zone of the joystick"
-msgstr "要使用的搖桿的識別碼"
+msgstr "搖桿死區"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5907,18 +6092,38 @@ msgstr ""
 "當呼叫「/profiler save [格式]」但不包含格式時。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"The delay in milliseconds after which a touch interaction is considered a "
+"long tap."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your world path in which profiles will be saved to."
 msgstr "設定檔將儲存於相對於您的全域路徑的檔案路徑。"
 
+#: src/settings_translation_file.cpp
+msgid ""
+"The gesture for for punching players/entities.\n"
+"This can be overridden by games and mods.\n"
+"\n"
+"* short_tap\n"
+"Easy to use and well-known from other games that shall not be named.\n"
+"\n"
+"* long_tap\n"
+"Known from the classic Minetest mobile controls.\n"
+"Combat is more or less impossible."
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
 msgstr "要使用的搖桿的識別碼"
 
 #: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touchscreen interaction to start."
-msgstr ""
+#, fuzzy
+msgid ""
+"The length in pixels after which a touch interaction is considered movement."
+msgstr "觸控螢幕互動開始所需的長度（以像素為單位）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5927,6 +6132,19 @@ msgid ""
 "0.0 = Wave doesn't move at all.\n"
 "Default is 1.0 (1/2 node)."
 msgstr ""
+"波動液體表面的最大高度。\n"
+"4.0 = 波高為兩個節點。\n"
+"0.0 = 波浪根本不移動。\n"
+"預設值為 1.0（1/2 節點）。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"The minimum time in seconds it takes between digging nodes when holding\n"
+"the dig button."
+msgstr ""
+"按住時重複放置節點之間所花費的時間（以秒為單位）\n"
+"地點按鈕。"
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -5950,23 +6168,32 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The rendering back-end.\n"
-"Note: A restart is required after changing this!\n"
-"OpenGL is the default for desktop, and OGLES2 for Android.\n"
-"Shaders are supported by OpenGL and OGLES2 (experimental)."
-msgstr ""
+"每位玩家周圍方塊體積的半徑\n"
+"活動塊內容，在地圖塊（16 個節點）中說明。\n"
+"在活動區塊中載入物件並運行 ABM。\n"
+"這也是活動物體（生物）維持的最小範圍。\n"
+"這應該與 active_object_send_range_blocks 一起配置。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"The rendering back-end.\n"
+"Note: A restart is required after changing this!\n"
+"OpenGL is the default for desktop, and OGLES2 for Android.\n"
+"Shaders are supported by everything but OGLES1."
+msgstr ""
+"渲染後端。\n"
+"注意：修改後需要重啟！\n"
+"OpenGL 是桌面的預設設置，Android 的預設設定是 OGLES2。\n"
+"OpenGL 和 OGLES2（實驗性）支援著色器。"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "in-game view frustum around."
 msgstr ""
-"在遊戲中，視野四處移動時的\n"
-"搖桿靈敏度。"
+"操縱桿軸移動的靈敏度\n"
+"遊戲中的視錐體周圍。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5995,6 +6222,8 @@ msgid ""
 "The time budget allowed for ABMs to execute on each step\n"
 "(as a fraction of the ABM Interval)"
 msgstr ""
+"ABM 執行每個步驟所需的時間預算\n"
+"（作為 ABM 間隔的一部分）"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6005,11 +6234,12 @@ msgstr ""
 "當按住搖桿的組合。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The time in seconds it takes between repeated node placements when holding\n"
 "the place button."
-msgstr "當按住滑鼠右鍵時，重覆右鍵點選的間隔以秒計。"
+msgstr ""
+"按住時重複放置節點之間所花費的時間（以秒為單位）\n"
+"地點按鈕。"
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6021,11 +6251,18 @@ msgid ""
 "enabled. Also, the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
+"如果「altitude_chill」為，則熱量下降 20 的垂直距離\n"
+"已啟用。 此外，濕度下降 10 的垂直距離，如果\n"
+"“altitude_dry”已啟用。"
 
 #: src/settings_translation_file.cpp
 msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr "四之三 一同定義山丘範圍高度的 2D 雜訊。"
 
+#: src/settings_translation_file.cpp
+msgid "Threshold for long taps"
+msgstr ""
+
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
@@ -6036,7 +6273,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
-msgstr ""
+msgstr "一天中開始新世界的時間，以毫秒為單位 (0-23999)。"
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
@@ -6066,32 +6303,28 @@ msgid "Tooltip delay"
 msgstr "工具提示延遲"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen"
-msgstr "海灘雜訊閾值"
+msgstr "觸控螢幕"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity"
-msgstr "滑鼠靈敏度"
+msgstr "觸控螢幕靈敏度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touchscreen sensitivity multiplier."
-msgstr "滑鼠靈敏度倍數。"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Touchscreen threshold"
-msgstr "海灘雜訊閾值"
+msgstr "觸控螢幕靈敏度倍數。"
 
 #: src/settings_translation_file.cpp
 msgid "Tradeoffs for performance"
-msgstr ""
+msgstr "性能的權衡"
+
+#: src/settings_translation_file.cpp
+msgid "Translucent liquids"
+msgstr "半透明液體"
 
 #: src/settings_translation_file.cpp
 msgid "Transparency Sorting Distance"
-msgstr ""
+msgstr "透明分選距離"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
@@ -6102,7 +6335,6 @@ msgid "Trilinear filtering"
 msgstr "三線性過濾器"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
@@ -6110,7 +6342,7 @@ msgid ""
 msgstr ""
 "True = 256\n"
 "False = 128\n"
-"對於讓迷你地圖在較慢的機器上變得流暢有效。"
+"使迷你地圖在速度較慢的機器上更加平滑。"
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
@@ -6125,11 +6357,20 @@ msgid ""
 "\n"
 "This setting should only be changed if you have performance problems."
 msgstr ""
+"occlusion_culler 類型\n"
+"\n"
+"「loops」是具有巢狀循環和 O(n³) 複雜度的遺留演算法\n"
+"「bfs」是基於廣度優先搜尋和側面剔除的新演算法\n"
+"\n"
+"僅當出現效能問題時才應變更此設定。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"URL to JSON file which provides information about the newest Minetest release"
-msgstr ""
+"URL to JSON file which provides information about the newest Minetest "
+"release\n"
+"If this is empty the engine will never check for updates."
+msgstr "JSON 檔案的 URL，提供有關最新 Minetest 版本的信息"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
@@ -6137,10 +6378,9 @@ msgstr "會在多人遊戲分頁中顯示的伺服器清單的 URL。"
 
 #: src/settings_translation_file.cpp
 msgid "Undersampling"
-msgstr "Undersampling"
+msgstr "欠取樣"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Undersampling is similar to using a lower screen resolution, but it applies\n"
 "to the game world only, keeping the GUI intact.\n"
@@ -6148,9 +6388,10 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
-"Undersampling 類似於較低的螢幕解析度，但其\n"
-"僅適用於遊戲世界，保持圖形使用者介面完好無損。\n"
-"它應該有顯著的效能提升，代價是細節較差的圖片。"
+"欠採樣與使用較低的螢幕解析度類似，但它適用\n"
+"僅適用於遊戲世界，保持 GUI 完整。\n"
+"它應該會以不太詳細的圖像為代價顯著提高性能。\n"
+"數值越高，影像的細節越少。"
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -6162,16 +6403,15 @@ msgstr "卸除未使用的伺服器資料"
 
 #: src/settings_translation_file.cpp
 msgid "Update information URL"
-msgstr ""
+msgstr "更新資訊網址"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
-msgstr ""
+msgstr "地下城的 Y 值上限。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "大型偽隨機洞穴的 Y 上限。"
+msgstr "懸空島的 Y 上限。"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -6193,13 +6433,15 @@ msgstr "當縮放材質時使用三線性過濾。"
 
 #: src/settings_translation_file.cpp
 msgid "Use crosshair for touch screen"
-msgstr ""
+msgstr "使用十字準線觸控螢幕"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Use crosshair to select object instead of whole screen.\n"
 "If enabled, a crosshair will be shown and will be used for selecting object."
 msgstr ""
+"使用十字線選擇物件而不是整個螢幕。\n"
+"如果啟用，將顯示十字線並將其用於選擇物件。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6207,6 +6449,9 @@ msgid ""
 "especially when using a high-resolution texture pack.\n"
 "Gamma-correct downscaling is not supported."
 msgstr ""
+"縮放紋理時使用 mipmap。 可能會稍微提高性能，\n"
+"尤其是在使用高解析度材質包時。\n"
+"不支援伽瑪校正縮小。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6214,6 +6459,9 @@ msgid ""
 "This flag enables use of raytraced occlusion culling test for\n"
 "client mesh sizes smaller than 4x4x4 map blocks."
 msgstr ""
+"在新剔除器中使用光線追蹤遮擋剔除。\n"
+"該標誌允許使用光線追蹤遮擋剔除測試\n"
+"客戶端網格尺寸小於 4x4x4 地圖塊。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6221,6 +6469,9 @@ msgid ""
 "If both bilinear and trilinear filtering are enabled, trilinear filtering\n"
 "is applied."
 msgstr ""
+"縮放紋理時使用三線性過濾。\n"
+"如果同時啟用雙線性和三線性過濾，則三線性過濾被申請\n"
+"被應用。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6234,24 +6485,17 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "User Interfaces"
-msgstr ""
+msgstr "使用者介面"
 
 #: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr "VBO"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "VSync"
 msgstr "垂直同步"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley depth"
 msgstr "山谷深度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley fill"
 msgstr "山谷填充"
 
@@ -6261,7 +6505,6 @@ msgid "Valley profile"
 msgstr "山谷分析"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley slope"
 msgstr "山谷坡度"
 
@@ -6303,13 +6546,13 @@ msgstr "懸崖坡度變化。"
 
 #: src/settings_translation_file.cpp
 msgid "Vertical climbing speed, in nodes per second."
-msgstr ""
+msgstr "垂直攀登速度，以每秒節點為單位。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Vertical screen synchronization. Your system may still force VSync on even "
 "if this is disabled."
-msgstr ""
+msgstr "垂直螢幕同步。 即使停用垂直同步，您的系統仍可能強制啟用垂直同步。"
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -6329,23 +6572,35 @@ msgstr "視野"
 
 #: src/settings_translation_file.cpp
 msgid "Virtual joystick triggers Aux1 button"
-msgstr ""
+msgstr "虛擬操縱桿觸發 Aux1 按鈕"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
 msgstr "音量"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "Volume multiplier when the window is unfocused."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"啟用視差遮蔽貼圖。\n"
-"必須啟用著色器。"
+"所有聲音的音量。\n"
+"需要啟用音響系統。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Volume when unfocused"
+msgstr "遊戲暫停時最高 FPS"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Volumetric lighting"
+msgstr "平滑光"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
@@ -6353,14 +6608,15 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"4D 碎形生成的 3D 切片的 W 座標。\n"
-"決定了會生成怎樣的 4D 形狀的 3D 切片。\n"
-"對 3D 碎形沒有影響。\n"
-"範圍約在 -2 至 2 間。"
+"產生的 4D 分形 3D 切片的 W 座標。\n"
+"確定產生 4D 形狀的哪一個 3D 切片。\n"
+"改變分形的形狀。\n"
+"對 3D 分形沒有影響。\n"
+"範圍大致為 -2 到 2。"
 
 #: src/settings_translation_file.cpp
 msgid "Walking and flying speed, in nodes per second."
-msgstr ""
+msgstr "步行和飛行速度，單位為方塊每秒。"
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
@@ -6368,7 +6624,7 @@ msgstr "走路速度"
 
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
-msgstr ""
+msgstr "快速模式的步行、飛行和攀爬速度，單位為方塊每秒。"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -6387,9 +6643,8 @@ msgid "Waving leaves"
 msgstr "葉子擺動"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "擺動節點"
+msgstr "波動的液體"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6402,18 +6657,16 @@ msgid "Waving liquids wave speed"
 msgstr "波動的水速度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "波動的水長度"
+msgstr "波動液體的波長"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
 msgstr "植物擺動"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Weblink color"
-msgstr "色彩選取框"
+msgstr "網路連結顏色"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6438,7 +6691,6 @@ msgstr ""
 "來軟體支援不佳的顯示卡驅動程式使用。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -6449,19 +6701,22 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
-"當使用雙線性／三線性／各向異性過濾器時，低解析度材質\n"
-"會被模糊，所以會自動將大小縮放至最近的內插值\n"
-"以讓像素保持清晰。這會設定最小材質大小\n"
-"供放大材質使用；較高的值看起來較銳利，但需要更多的\n"
-"記憶體。建議為 2 的次方。將這個值設定高於 1 不會\n"
-"有任何視覺效果，除非雙線性／三線性／各向異性過濾\n"
-"已啟用。"
+"使用雙線性/三線性/各向異性濾鏡時，低解析度紋理\n"
+"可以被模糊，所以自動用最近鄰來升級它們\n"
+"插值以保留清晰的像素。 這設定了最小紋理尺寸\n"
+"用於升級紋理； 數值越高看起來越清晰，但需要更多\n"
+"記憶。 建議使用 2 的冪。 僅當以下情況時才應用此設置\n"
+"雙線性/三線性/各向異性過濾已啟用。\n"
+"這也用作世界對齊的基本節點紋理大小\n"
+"紋理自動縮放。"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether name tag backgrounds should be shown by default.\n"
 "Mods may still set a background."
 msgstr ""
+"預設是否應顯示名稱標籤背景。\n"
+"模組可能仍會設定背景。"
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
@@ -6477,7 +6732,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether the window is maximized."
-msgstr ""
+msgstr "視窗是否最大化。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6498,6 +6753,10 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"是否靜音。 您可以隨時取消靜音，除非\n"
+"聲音系統被停用（enable_sound=false）。\n"
+"在遊戲中，您可以使用靜音鍵或使用\n"
+"暫停選單。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6516,7 +6775,7 @@ msgstr "選取框在節點周邊的選取框線。"
 
 #: src/settings_translation_file.cpp
 msgid "Window maximized"
-msgstr ""
+msgstr "視窗最大化"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6536,9 +6795,8 @@ msgstr ""
 "若從主選單啟動則不需要。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "World start time"
-msgstr "世界遊戲"
+msgstr "世界開始時間"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6549,10 +6807,16 @@ msgid ""
 "See also texture_min_size.\n"
 "Warning: This option is EXPERIMENTAL!"
 msgstr ""
+"世界對齊的紋理可以縮放以跨越多個節點。 然而，\n"
+"伺服器可能不會發送您想要的比例，特別是如果您使用\n"
+"專門設計的材質包； 使用此選項，客戶端嘗試\n"
+"根據紋理大小自動決定比例。\n"
+"另請參閱texture_min_size。\n"
+"警告：此選項是實驗性的！"
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr ""
+msgstr "世界對齊紋理模式"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
@@ -6562,7 +6826,7 @@ msgstr "扁平地面的 Y。"
 msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
-msgstr ""
+msgstr "Y 山體密度梯度為0級。 用於垂直移動山脈。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6580,6 +6844,10 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"浮動地逐漸從全密度逐漸縮小為零的Y距離。\n"
+"錐度在距Y極限的距離處開始。\n"
+"對於堅實的浮地層，這可控制丘陵/山脈的高度。\n"
+"必須小於或等於兩個Y極限距離的一半。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -6605,16 +6873,15 @@ msgstr "海底的 Y 高度。"
 
 #: src/settings_translation_file.cpp
 msgid "cURL"
-msgstr ""
+msgstr "cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL 檔案下載逾時"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "cURL interactive timeout"
-msgstr "cURL 逾時"
+msgstr "cURL互動超時"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
@@ -6623,12 +6890,18 @@ msgstr "cURL 並行限制"
 #~ msgid "(game support required)"
 #~ msgstr "(需遊戲支援)"
 
+#~ msgid "- Address: "
+#~ msgstr "- 地址： "
+
 #~ msgid "- Creative Mode: "
 #~ msgstr "- 創造模式： "
 
 #~ msgid "- Damage: "
 #~ msgstr "- 傷害： "
 
+#~ msgid "- Port: "
+#~ msgstr "- 連線埠： "
+
 #~ msgid ""
 #~ "0 = parallax occlusion with slope information (faster).\n"
 #~ "1 = relief mapping (slower, more accurate)."
@@ -6663,6 +6936,11 @@ msgstr "cURL 並行限制"
 #~ "把這個留空以啟動本機伺服器。\n"
 #~ "注意在主選單中的地址欄會覆寫這個設定。"
 
+#~ msgid ""
+#~ "Adjust dpi configuration to your screen (non X11/Android only) e.g. for "
+#~ "4k screens."
+#~ msgstr "調整您螢幕的 DPI 設定（並不只有 X11/Android）例如 4K 螢幕。"
+
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
 #~ "brighter.\n"
@@ -6702,6 +6980,9 @@ msgstr "cURL 並行限制"
 #~ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 #~ msgstr "全螢幕模式中的位元／像素（又稱色彩深度）。"
 
+#~ msgid "Block bounds shown for all blocks"
+#~ msgstr "區塊邊界顯示所有區塊"
+
 #~ msgid "Bump Mapping"
 #~ msgstr "映射貼圖"
 
@@ -6711,6 +6992,9 @@ msgstr "cURL 並行限制"
 #~ msgid "Camera update toggle key"
 #~ msgstr "攝影機切換更新按鍵"
 
+#~ msgid "Change Keys"
+#~ msgstr "變更按鍵"
+
 #, fuzzy
 #~ msgid "Change keys"
 #~ msgstr "變更按鍵"
@@ -6769,6 +7053,38 @@ msgstr "cURL 並行限制"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "控制隧道的寬度，較小的值會創造出較寬的隧道。"
 
+#, c-format
+#~ msgid ""
+#~ "Controls:\n"
+#~ "- %s: move forwards\n"
+#~ "- %s: move backwards\n"
+#~ "- %s: move left\n"
+#~ "- %s: move right\n"
+#~ "- %s: jump/climb up\n"
+#~ "- %s: dig/punch/use\n"
+#~ "- %s: place/use\n"
+#~ "- %s: sneak/climb down\n"
+#~ "- %s: drop item\n"
+#~ "- %s: inventory\n"
+#~ "- Mouse: turn/look\n"
+#~ "- Mouse wheel: select item\n"
+#~ "- %s: chat\n"
+#~ msgstr ""
+#~ "控制：\n"
+#~ "- %s：向前移動\n"
+#~ "- %s：向後移動\n"
+#~ "- %s：向左移動\n"
+#~ "- %s：向右移動\n"
+#~ "- %s：跳躍／向上攀爬\n"
+#~ "- %s：挖／打\n"
+#~ "- %s：放置／使用\n"
+#~ "- %s：潛行／向下攀爬\n"
+#~ "- %s：丟棄物品\n"
+#~ "- %s：物品欄\n"
+#~ "- 滑鼠：旋轉／觀看\n"
+#~ "- 滑鼠滾輪：選取物品\n"
+#~ "- %s：聊天\n"
+
 #~ msgid "Creative"
 #~ msgstr "創造"
 
@@ -6778,6 +7094,9 @@ msgstr "cURL 並行限制"
 #~ msgid "Crosshair color (R,G,B)."
 #~ msgstr "十字色彩 (R,G,B)。"
 
+#~ msgid "DPI"
+#~ msgstr "DPI"
+
 #~ msgid "Damage"
 #~ msgstr "傷害"
 
@@ -6864,6 +7183,13 @@ msgstr "cURL 並行限制"
 #~ msgid "Enable register confirmation"
 #~ msgstr "啟用註冊確認"
 
+#~ msgid ""
+#~ "Enable vertex buffer objects.\n"
+#~ "This should greatly improve graphics performance."
+#~ msgstr ""
+#~ "啟用頂點緩衝區物件。\n"
+#~ "這應該會大大提高圖形性能。"
+
 #~ msgid "Enabled"
 #~ msgstr "已啟用"
 
@@ -7141,6 +7467,9 @@ msgstr "cURL 並行限制"
 #~ msgid "Instrumentation"
 #~ msgstr "儀表"
 
+#~ msgid "Invalid gamespec."
+#~ msgstr "遊戲規格無效。"
+
 #~ msgid "Inventory key"
 #~ msgstr "物品欄按鍵"
 
@@ -7833,6 +8162,13 @@ msgstr "cURL 並行限制"
 #~ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 #~ msgstr "讓 DirectX 與 LuaJIT 一同運作。若其造成麻煩則請停用。"
 
+#~ msgid "Makes all liquids opaque"
+#~ msgstr "讓所有的液體不透明"
+
+#, fuzzy
+#~ msgid "Mapblock mesh generator's MapBlock cache size in MB"
+#~ msgstr "地圖區塊網格生成器的地圖區塊快取大小 MB"
+
 #~ msgid "Menus"
 #~ msgstr "選單"
 
@@ -8046,15 +8382,21 @@ msgstr "cURL 並行限制"
 #~ msgid "Simple Leaves"
 #~ msgstr "簡易葉子"
 
+#~ msgid ""
+#~ "Size of the MapBlock cache of the mesh generator. Increasing this will\n"
+#~ "increase the cache hit %, reducing the data being copied from the main\n"
+#~ "thread, thus reducing jitter."
+#~ msgstr ""
+#~ "網格生成器的地圖區塊快取大小。增加這個將會\n"
+#~ "增加快取命中率，減少從主執行緒複製資料，從\n"
+#~ "而減少抖動。"
+
 #~ msgid "Smooth Lighting"
 #~ msgstr "平滑光線"
 
 #~ msgid "Smooths rotation of camera. 0 to disable."
 #~ msgstr "讓旋轉攝影機時較流暢。設為 0 以停用。"
 
-#~ msgid "Sound"
-#~ msgstr "聲音"
-
 #~ msgid "Special"
 #~ msgstr "特殊"
 
@@ -8112,6 +8454,10 @@ msgstr "cURL 並行限制"
 #~ msgid "Touch threshold (px):"
 #~ msgstr "觸控閾值：（像素）"
 
+#, fuzzy
+#~ msgid "Touchscreen threshold"
+#~ msgstr "海灘雜訊閾值"
+
 #~ msgid "Trilinear Filter"
 #~ msgstr "三線性過濾器"
 
@@ -8136,6 +8482,9 @@ msgstr "cURL 並行限制"
 #~ msgid "Use bilinear filtering when scaling textures down."
 #~ msgstr "當縮放材質時使用雙線性過濾。"
 
+#~ msgid "VBO"
+#~ msgstr "VBO"
+
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr "在平整浮地地形的山丘高度與湖泊深度變化。"
 
@@ -8219,8 +8568,14 @@ msgstr "cURL 並行限制"
 #~ msgid "You died."
 #~ msgstr "您已死亡"
 
+#~ msgid "You have no games installed."
+#~ msgstr "您未安裝任何遊戲。"
+
 #~ msgid "Z"
 #~ msgstr "Z"
 
 #~ msgid "needs_fallback_font"
 #~ msgstr "yes"
+
+#~ msgid "ok"
+#~ msgstr "確定"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e11ac197..085e719c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,7 +94,7 @@ if(NOT MSVC)
         set(ENABLE_SYSTEM_JSONCPP 0)
 	endif()
 
-	option(ENABLE_TCMALLOC "Enable tcmalloc" 1)
+	# FMTODO option(ENABLE_TCMALLOC "Enable tcmalloc" 1)
 
 	if(ENABLE_GPERF OR ENABLE_TCMALLOC)
 		set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -189,10 +189,15 @@ mark_as_advanced(
 	CMAKE_CXX_FLAGS_SEMIDEBUG
 	CMAKE_C_FLAGS_SEMIDEBUG
 )
+set(SUPPORTED_BUILD_TYPES None Release Debug SemiDebug RelWithDebInfo MinSizeRel)
 set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
-	"Choose the type of build. Options are: None Debug SemiDebug RelWithDebInfo MinSizeRel."
+	"Choose the type of build. Options are: ${SUPPORTED_BUILD_TYPES}."
 	FORCE
 )
+if(NOT (CMAKE_BUILD_TYPE IN_LIST SUPPORTED_BUILD_TYPES))
+	message(WARNING
+			"Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}. Options are: ${SUPPORTED_BUILD_TYPES}.")
+endif()
 
 
 # Set some random things default to not being visible in the GUI
@@ -206,11 +211,30 @@ if(NOT (BUILD_CLIENT OR BUILD_SERVER OR NO_BUILD))
 endif()
 
 
+option(PRECOMPILE_HEADERS "Precompile some headers (experimental; requires CMake 3.16 or later)" FALSE)
+set(PRECOMPILED_HEADERS_PATH "" CACHE FILEPATH "Path to a file listing all headers to precompile")
+
+if(PRECOMPILE_HEADERS)
+	if(${CMAKE_VERSION} VERSION_LESS 3.16)
+		message(FATAL_ERROR "PRECOMPILE_HEADERS is on, but precompiled headers require at least CMake 3.16.")
+	endif()
+	if(PRECOMPILED_HEADERS_PATH)
+		set(PRECOMPILED_HEADERS ${PRECOMPILED_HEADERS_PATH})
+	else()
+		set(PRECOMPILED_HEADERS "${CMAKE_SOURCE_DIR}/src/precompiled_headers.txt")
+	endif()
+	message(STATUS "Reading headers to precompile from: ${PRECOMPILED_HEADERS}")
+	# ignore lines that begin with # and empty lines
+	file(STRINGS ${PRECOMPILED_HEADERS} PRECOMPILED_HEADERS_LIST REGEX "^[^#].*$")
+	set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PRECOMPILED_HEADERS})
+endif()
+
+
 option(ENABLE_CURL "Enable cURL support for fetching media" TRUE)
 set(USE_CURL FALSE)
 
 if(ENABLE_CURL)
-	find_package(CURL)
+	find_package(CURL 7.28.0)
 	if (CURL_FOUND)
 		message(STATUS "cURL support enabled.")
 		set(USE_CURL TRUE)
@@ -290,11 +314,6 @@ if(ENABLE_SOUND AND BUILD_CLIENT)
 	endif()
 endif()
 
-option(ENABLE_TOUCH "Enable Touchscreen support" FALSE)
-if(ENABLE_TOUCH)
-	add_definitions(-DHAVE_TOUCHSCREENGUI)
-endif()
-
 if(BUILD_CLIENT)
 	find_package(Freetype REQUIRED)
 
@@ -560,9 +579,14 @@ if(WIN32)
 	if(NOT VCPKG_APPLOCAL_DEPS)
 		set(ZLIB_DLL "" CACHE FILEPATH "Path to Zlib DLL for installation (optional)")
 		set(ZSTD_DLL "" CACHE FILEPATH "Path to Zstd DLL for installation (optional)")
-		if(ENABLE_SOUND)
-			set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
-			set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
+		if(BUILD_CLIENT)
+			set(PNG_DLL "" CACHE FILEPATH "Path to libpng DLL for installation (optional)")
+			set(JPEG_DLL "" CACHE FILEPATH "Path to libjpeg DLL for installation (optional)")
+			set(SDL2_DLL "" CACHE FILEPATH "Path to SDL2 DLL for installation (optional)")
+		endif()
+		if(BUILD_CLIENT AND ENABLE_SOUND)
+			set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL DLL for installation (optional)")
+			set(OGG_DLL "" CACHE FILEPATH "Path to Ogg DLL for installation (optional)")
 			set(VORBIS_DLL "" CACHE FILEPATH "Path to Vorbis DLLs for installation (optional)")
 		endif()
 		if(USE_GETTEXT)
@@ -595,14 +619,33 @@ else()
 	endif()
 
 	if (ANDROID)
-		include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
-		add_library(native_app_glue OBJECT ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
-		set(PLATFORM_LIBS ${PLATFORM_LIBS} native_app_glue)
-
 		set(PLATFORM_LIBS ${PLATFORM_LIBS} android log)
 	endif()
 endif()
 
+# On clang and gcc, some functionalities of std::atomic require -latomic.
+# See <https://en.cppreference.com/w/cpp/atomic/atomic#Notes>.
+# Note that find_library does not reliably find it so we have to resort to this.
+# Also, passing -latomic is not always the same as adding atomic to the library list.
+include(CheckCSourceCompiles)
+if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+	set(CMAKE_REQUIRED_LIBRARIES "-latomic")
+	check_c_source_compiles("int main(){}" HAVE_LINK_ATOMIC)
+	set(CMAKE_REQUIRED_LIBRARIES "")
+	if(HAVE_LINK_ATOMIC)
+		set(PLATFORM_LIBS ${PLATFORM_LIBS} "-latomic")
+	endif()
+endif()
+
+include(CheckSymbolExists)
+check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
+
+if(UNIX)
+	check_symbol_exists(malloc_trim "malloc.h" HAVE_MALLOC_TRIM)
+else()
+	set(HAVE_MALLOC_TRIM FALSE)
+endif()
+
 check_include_files(endian.h HAVE_ENDIAN_H)
 
 if(HAVE_ENDIAN_H)
@@ -660,7 +703,7 @@ if(ENABLE_WEBSOCKET OR ENABLE_WEBSOCKET_SCTP)
 			message(STATUS "Using websocket: ${CMAKE_CURRENT_SOURCE_DIR}/external/websocketpp")
 			find_package(OpenSSL)
 			set(WEBSOCKETPP_LIBRARY ${WEBSOCKETPP_LIBRARY} OpenSSL::SSL)
-			set(USE_WEBSOCKET 1 CACHE BOOL "")
+			# MERGE FMTODO: set(USE_WEBSOCKET 1 CACHE BOOL "")
 			#TODO:
 			# set(USE_WEBSOCKET_SCTP 1 CACHE BOOL "")
 		endif()
@@ -798,9 +841,8 @@ set(common_SRCS
 	${mapgen_SRCS}
 	${server_SRCS}
 	${content_SRCS}
-	ban.cpp
 	chat.cpp
-	clientiface.cpp
+	clientdynamicinfo.cpp
 	collision.cpp
 	content_mapnode.cpp
 	content_nodemeta.cpp
@@ -845,12 +887,11 @@ set(common_SRCS
 	raycast.cpp
 	reflowscan.cpp
 	remoteplayer.cpp
-	rollback.cpp
 	rollback_interface.cpp
 	serialization.cpp
 	server.cpp
 	serverenvironment.cpp
-	serverlist.cpp
+	servermap.cpp
 	settings.cpp
 	staticobject.cpp
 	terminal_chat_console.cpp
@@ -881,6 +922,10 @@ if(BUILD_BENCHMARKS)
 	set(common_SRCS ${common_SRCS} ${BENCHMARK_SRCS})
 endif()
 
+if(BUILD_UNITTESTS OR BUILD_BENCHMARKS)
+	set(common_SRCS ${common_SRCS} catch.cpp)
+endif()
+
 # This gives us the icon and file version information
 if(WIN32)
 	set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc")
@@ -956,6 +1001,9 @@ include_directories(SYSTEM
 	${GMP_INCLUDE_DIR}
 	${JSON_INCLUDE_DIR}
 	${LUA_BIT_INCLUDE_DIR}
+	# on Android, Minetest depends on SDL2 directly
+	# on other platforms, only IrrlichtMt depends on SDL2
+	"$<$<PLATFORM_ID:Android>:${SDL2_INCLUDE_DIRS}>"
 )
 
 #freeminer includes:
@@ -1018,7 +1066,11 @@ if(BUILD_CLIENT)
 		${OSMIUM_LIRARY}
 
 		${LUA_BIT_LIBRARY}
+		sha256
 		${FREETYPE_LIBRARY}
+		# on Android, Minetest depends on SDL2 directly
+		# on other platforms, only IrrlichtMt depends on SDL2
+		"$<$<PLATFORM_ID:Android>:${SDL2_LIBRARIES}>"
 	)
 	if(NOT USE_LUAJIT)
 		set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -1069,8 +1121,12 @@ if(BUILD_CLIENT)
 	if (USE_SPATIAL)
 		target_link_libraries(${PROJECT_NAME} ${SPATIAL_LIBRARY})
 	endif()
-	if(BUILD_BENCHMARKS)
-		target_link_libraries(${PROJECT_NAME} catch2)
+	if(BUILD_UNITTESTS OR BUILD_BENCHMARKS)
+		target_link_libraries(${PROJECT_NAME} Catch2::Catch2)
+	endif()
+
+	if(PRECOMPILE_HEADERS)
+		target_precompile_headers(${PROJECT_NAME} PRIVATE ${PRECOMPILED_HEADERS_LIST})
 	endif()
 
 	target_link_libraries(${PROJECT_NAME} ${PLATFORM_LIBS})
@@ -1100,6 +1156,7 @@ if(BUILD_SERVER)
 
 		${LUA_LIBRARY}
 		${LUA_BIT_LIBRARY}
+		sha256
 		${GMP_LIBRARY}
 	)
 	set_target_properties(${PROJECT_NAME}server PROPERTIES
@@ -1143,8 +1200,12 @@ if(BUILD_SERVER)
 		)
 	endif()
 	set_target_properties(${PROJECT_NAME}server PROPERTIES COMPILE_DEFINITIONS "SERVER")
-	if(BUILD_BENCHMARKS)
-		target_link_libraries(${PROJECT_NAME}server catch2)
+	if(BUILD_UNITTESTS OR BUILD_BENCHMARKS)
+		target_link_libraries(${PROJECT_NAME}server Catch2::Catch2)
+	endif()
+
+	if(PRECOMPILE_HEADERS)
+		target_precompile_headers(${PROJECT_NAME}server PRIVATE ${PRECOMPILED_HEADERS_LIST})
 	endif()
 
 	target_link_libraries(${PROJECT_NAME}server ${PLATFORM_LIBS})
@@ -1172,15 +1233,16 @@ endif()
 # Set some optimizations and tweaks
 
 include(CheckCSourceCompiles)
-include(CheckSymbolExists)
 
 set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
 if(USE_LUAJIT)
-	set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY})
+	# libm usually required if statically linking
+	set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY} m)
 	# LuaJIT provides exactly zero ways to determine how recent it is (the version
 	# is unchanged since 2017), however it happens that string buffers were added
 	# after the changes which we care about so that works as an indicator.
 	# (https://github.com/LuaJIT/LuaJIT/commit/4c6b669 March 2021)
+	# Note: This is no longer true as of August 2023, but we're keeping the old check.
 	unset(HAVE_RECENT_LJ CACHE)
 	check_symbol_exists(luaopen_string_buffer "lualib.h" HAVE_RECENT_LJ)
 	if(NOT HAVE_RECENT_LJ)
@@ -1257,7 +1319,9 @@ else()
 	endif()
 
 	if(MINGW)
-		set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
+		if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+			set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads")
+		endif()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0601 -DWIN32_LEAN_AND_MEAN")
 	endif()
 
@@ -1297,7 +1361,7 @@ else()
 	endif()
 
 	if(MINGW)
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mwindows")
+		set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-mwindows")
 	endif()
 
 endif()
@@ -1339,6 +1403,20 @@ if(WIN32 AND NOT STATIC_BUILD)
 				install(FILES ${VORBIS_DLL} DESTINATION ${BINDIR})
 			endif()
 		endif()
+		if(BUILD_CLIENT)
+			if(PNG_DLL)
+				install(FILES ${PNG_DLL} DESTINATION ${BINDIR})
+			endif()
+			if(JPEG_DLL)
+				install(FILES ${JPEG_DLL} DESTINATION ${BINDIR})
+			endif()
+			if(SDL2_DLL)
+				install(FILES ${SDL2_DLL} DESTINATION ${BINDIR})
+			endif()
+			if(FREETYPE_DLL)
+				install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
+			endif()
+		endif()
 		if(CURL_DLL)
 			install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
 		endif()
@@ -1348,9 +1426,6 @@ if(WIN32 AND NOT STATIC_BUILD)
 		if(ZSTD_DLL)
 			install(FILES ${ZSTD_DLL} DESTINATION ${BINDIR})
 		endif()
-		if(BUILD_CLIENT AND FREETYPE_DLL)
-			install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
-		endif()
 		if(SQLITE3_DLL)
 			install(FILES ${SQLITE3_DLL} DESTINATION ${BINDIR})
 		endif()
@@ -1364,10 +1439,6 @@ if(WIN32 AND NOT STATIC_BUILD)
 			install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
 		endif()
 	endif()
-
-	if(BUILD_CLIENT AND IRRLICHT_DLL)
-		install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
-	endif()
 endif()
 
 if(BUILD_CLIENT AND NOT ANDROID)
diff --git a/src/activeobject.h b/src/activeobject.h
index f3022413e..fbc067991 100644
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -24,8 +24,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "irr_aabb3d.h"
 #include "irr_v3d.h"
+#include <memory>
 #include <optional>
+#include <quaternion.h>
 #include <string>
+#include <unordered_map>
 
 
 enum ActiveObjectType {
@@ -51,7 +54,7 @@ enum ActiveObjectType {
 
 struct ActiveObjectMessage
 {
-	ActiveObjectMessage(u16 id_, bool reliable_=true, const std::string &data_ = "", std::optional<v3f> skip_by_pos_ = {}) :
+	ActiveObjectMessage(u16 id_, bool reliable_=true, std::string_view data_ = "", std::optional<v3f> skip_by_pos_ = {}) :
 		id(id_),
 		reliable(reliable_),
 		datastring(data_)
@@ -82,6 +85,78 @@ enum ActiveObjectCommand {
 	AO_CMD_SET_ANIMATION_SPEED
 };
 
+struct BoneOverride
+{
+	struct PositionProperty
+	{
+		v3f previous;
+		v3f vector;
+		bool absolute = false;
+		f32 interp_timer = 0;
+	} position;
+
+	v3f getPosition(v3f anim_pos) const {
+		f32 progress = dtime_passed / position.interp_timer;
+		if (progress > 1.0f || position.interp_timer == 0.0f)
+			progress = 1.0f;
+		return position.vector.getInterpolated(position.previous, progress)
+				+ (position.absolute ? v3f() : anim_pos);
+	}
+
+	struct RotationProperty
+	{
+		core::quaternion previous;
+		core::quaternion next;
+		bool absolute = false;
+		f32 interp_timer = 0;
+	} rotation;
+
+	v3f getRotationEulerDeg(v3f anim_rot_euler) const {
+		core::quaternion rot;
+
+		f32 progress = dtime_passed / rotation.interp_timer;
+		if (progress > 1.0f || rotation.interp_timer == 0.0f)
+			progress = 1.0f;
+		rot.slerp(rotation.previous, rotation.next, progress);
+		if (!rotation.absolute) {
+			core::quaternion anim_rot(anim_rot_euler * core::DEGTORAD);
+			rot = rot * anim_rot; // first rotate by anim. bone rot., then rot.
+		}
+
+		v3f rot_euler;
+		rot.toEuler(rot_euler);
+		return rot_euler * core::RADTODEG;
+	}
+
+	struct ScaleProperty
+	{
+		v3f previous;
+		v3f vector{1, 1, 1};
+		bool absolute = false;
+		f32 interp_timer = 0;
+	} scale;
+
+	v3f getScale(v3f anim_scale) const {
+		f32 progress = dtime_passed / scale.interp_timer;
+		if (progress > 1.0f || scale.interp_timer == 0.0f)
+			progress = 1.0f;
+		return scale.vector.getInterpolated(scale.previous, progress)
+				* (scale.absolute ? v3f(1) : anim_scale);
+	}
+
+	f32 dtime_passed = 0;
+
+	bool isIdentity() const
+	{
+		return !position.absolute && position.vector == v3f()
+				&& !rotation.absolute && rotation.next == core::quaternion()
+				&& !scale.absolute && scale.vector == v3f(1);
+	}
+};
+
+typedef std::unordered_map<std::string, BoneOverride> BoneOverrideMap;
+
+
 /*
 	Parent class for ServerActiveObject and ClientActiveObject
 */
@@ -140,3 +215,5 @@ public:
 protected:
 	u16 m_id; // 0 is invalid, "no id"
 };
+
+using ActiveObjectPtr = std::shared_ptr<ActiveObject>;
diff --git a/src/activeobjectmgr.h b/src/activeobjectmgr.h
index 34db97be6..02e8213b9 100644
--- a/src/activeobjectmgr.h
+++ b/src/activeobjectmgr.h
@@ -19,10 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <map>
 #include <memory>
-#include <vector>
 #include "debug.h"
+#include "util/container.h"
 #include "irrlichttypes.h"
 #include "util/basic_macros.h"
 #include "threading/concurrent_unordered_map.h"
@@ -33,7 +32,6 @@ class TestServerActiveObjectMgr;
 template <typename T>
 class ActiveObjectMgr
 {
-	friend class ::TestClientActiveObjectMgr;
 	friend class ::TestServerActiveObjectMgr;
 
 public:
@@ -55,25 +53,20 @@ public:
 
 	void clear()
 	{
-		while (!m_active_objects.empty())
-			removeObject(m_active_objects.begin()->first);
+		// on_destruct could add new objects so this has to be a loop
+		do {
+			for (auto &it : m_active_objects.iter()) {
+				if (!it.second)
+					continue;
+				m_active_objects.remove(it.first);
+			}
+		} while (!m_active_objects.empty());
 	}
 
 	TPtr getActiveObject(u16 id)
 	{
-		const auto lock = m_active_objects.lock_shared_rec(); //prelock
-		const auto it = m_active_objects.find(id);
-		return it != m_active_objects.end() ? it->second : TPtr{};
-	}
-
-	std::vector<u16> getAllIds() const
-	{
-		std::vector<u16> ids;
-		ids.reserve(m_active_objects.size());
-		for (auto &it : m_active_objects) {
-			ids.push_back(it.first);
-		}
-		return ids;
+		//const auto lock = m_active_objects.lock_shared_rec(); //prelock
+		return m_active_objects.get(id);
 	}
 
 protected:
@@ -92,15 +85,15 @@ protected:
 
 	bool isFreeId(u16 id) const
 	{
-		const auto lock = m_active_objects.lock_shared_rec(); // prelock
-		return id != 0 && m_active_objects.find(id) == m_active_objects.end();
+		//const auto lock = m_active_objects.lock_shared_rec(); // prelock
+		return id != 0 && !m_active_objects.get(id);
 	}
 
-	// ordered to fix #10985
-	// Note: ActiveObjects can access the ActiveObjectMgr. Only erase objects using
-	// removeObject()!
-	//std::map<u16, std::unique_ptr<T>> m_active_objects;
+	// Note that this is ordered to fix #10985
+	ModifySafeMap<u16, std::shared_ptr<T>> m_active_objects;
 
-	concurrent_shared_unordered_map<u16, TPtr> m_active_objects;
+
+//	concurrent_shared_unordered_map<u16, TPtr> m_active_objects;
 	std::vector<TPtr> m_active_objects_deleted;
+
 };
diff --git a/src/benchmark/CMakeLists.txt b/src/benchmark/CMakeLists.txt
index 787bbcee4..f79fcf1ef 100644
--- a/src/benchmark/CMakeLists.txt
+++ b/src/benchmark/CMakeLists.txt
@@ -1,7 +1,10 @@
 set (BENCHMARK_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_activeobjectmgr.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_lighting.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_serialize.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_mapblock.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/benchmark_mapmodify.cpp
 	PARENT_SCOPE)
 
 set (BENCHMARK_CLIENT_SRCS
diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp
index 0bc2af368..8b7077703 100644
--- a/src/benchmark/benchmark.cpp
+++ b/src/benchmark/benchmark.cpp
@@ -19,14 +19,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "benchmark/benchmark.h"
 
-// This must be set in just this file
-#define CATCH_CONFIG_RUNNER
-#include "benchmark_setup.h"
+#define CATCH_CONFIG_ENABLE_BENCHMARKING
+#include "catch.h"
 
-int run_benchmarks()
+bool run_benchmarks(const char *arg)
 {
-	int argc = 1;
-	const char *argv[] = { "MinetestBenchmark", NULL };
+	const char *const argv[] = {
+		"MinetestBenchmark", arg, nullptr
+	};
+	const int argc = arg ? 2 : 1;
 	int errCount = Catch::Session().run(argc, argv);
-	return errCount ? 1 : 0;
+	return errCount == 0;
 }
diff --git a/src/benchmark/benchmark.h b/src/benchmark/benchmark.h
index 45dd9b6a4..3726c3925 100644
--- a/src/benchmark/benchmark.h
+++ b/src/benchmark/benchmark.h
@@ -22,5 +22,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 
 #if BUILD_BENCHMARKS
-extern int run_benchmarks();
+extern bool run_benchmarks(const char *arg = nullptr);
 #endif
diff --git a/src/benchmark/benchmark_activeobjectmgr.cpp b/src/benchmark/benchmark_activeobjectmgr.cpp
new file mode 100644
index 000000000..d9036c632
--- /dev/null
+++ b/src/benchmark/benchmark_activeobjectmgr.cpp
@@ -0,0 +1,111 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "catch.h"
+#include "server/activeobjectmgr.h"
+#include "util/numeric.h"
+
+namespace {
+
+class TestObject : public ServerActiveObject {
+public:
+	TestObject(v3f pos) : ServerActiveObject(nullptr, pos)
+	{}
+
+	ActiveObjectType getType() const {
+		return ACTIVEOBJECT_TYPE_TEST;
+	}
+	bool getCollisionBox(aabb3f *toset) const {
+		return false;
+	}
+	bool getSelectionBox(aabb3f *toset) const {
+		return false;
+	}
+	bool collideWithObjects() const {
+		return true;
+	}
+};
+
+constexpr float POS_RANGE = 2001;
+
+inline v3f randpos()
+{
+	return v3f(myrand_range(-POS_RANGE, POS_RANGE),
+		myrand_range(-20, 60),
+		myrand_range(-POS_RANGE, POS_RANGE));
+}
+
+inline void fill(server::ActiveObjectMgr &mgr, size_t n)
+{
+	mgr.clear();
+	for (size_t i = 0; i < n; i++) {
+		auto obj = std::make_unique<TestObject>(randpos());
+		bool ok = mgr.registerObject(std::move(obj));
+		REQUIRE(ok);
+	}
+}
+
+}
+
+template <size_t N>
+void benchGetObjectsInsideRadius(Catch::Benchmark::Chronometer &meter)
+{
+	server::ActiveObjectMgr mgr;
+	size_t x;
+	std::vector<ServerActiveObject*> result;
+
+	auto cb = [&x] (ServerActiveObject *obj) -> bool {
+		x += obj->m_static_exists ? 0 : 1;
+		return false;
+	};
+	fill(mgr, N);
+	meter.measure([&] {
+		x = 0;
+		mgr.getObjectsInsideRadius(randpos(), 30.0f, result, cb);
+		return x;
+	});
+	REQUIRE(result.empty());
+
+	mgr.clear(); // implementation expects this
+}
+
+template <size_t N>
+void benchGetObjectsInArea(Catch::Benchmark::Chronometer &meter)
+{
+	server::ActiveObjectMgr mgr;
+	size_t x;
+	std::vector<ServerActiveObject*> result;
+
+	auto cb = [&x] (ServerActiveObject *obj) -> bool {
+		x += obj->m_static_exists ? 0 : 1;
+		return false;
+	};
+	fill(mgr, N);
+	meter.measure([&] {
+		x = 0;
+		v3f pos = randpos();
+		v3f off(50, 50, 50);
+		off[myrand_range(0, 2)] = 10;
+		mgr.getObjectsInArea({pos, pos + off}, result, cb);
+		return x;
+	});
+	REQUIRE(result.empty());
+
+	mgr.clear(); // implementation expects this
+}
+
+#define BENCH_INSIDE_RADIUS(_count) \
+	BENCHMARK_ADVANCED("inside_radius_" #_count)(Catch::Benchmark::Chronometer meter) \
+	{ benchGetObjectsInsideRadius<_count>(meter); };
+
+#define BENCH_IN_AREA(_count) \
+	BENCHMARK_ADVANCED("in_area_" #_count)(Catch::Benchmark::Chronometer meter) \
+	{ benchGetObjectsInArea<_count>(meter); };
+
+TEST_CASE("ActiveObjectMgr") {
+	BENCH_INSIDE_RADIUS(200)
+	BENCH_INSIDE_RADIUS(1450)
+
+	BENCH_IN_AREA(200)
+	BENCH_IN_AREA(1450)
+}
diff --git a/src/benchmark/benchmark_lighting.cpp b/src/benchmark/benchmark_lighting.cpp
index 498553715..1ca2d441a 100644
--- a/src/benchmark/benchmark_lighting.cpp
+++ b/src/benchmark/benchmark_lighting.cpp
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "benchmark_setup.h"
+#include "catch.h"
 #include "voxelalgorithms.h"
 #include "dummygamedef.h"
 #include "dummymap.h"
diff --git a/src/benchmark/benchmark_mapblock.cpp b/src/benchmark/benchmark_mapblock.cpp
new file mode 100644
index 000000000..0b3f7c921
--- /dev/null
+++ b/src/benchmark/benchmark_mapblock.cpp
@@ -0,0 +1,187 @@
+/*
+Minetest
+Copyright (C) 2023 Minetest Authors
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "catch.h"
+#include "mapblock.h"
+#include <vector>
+
+typedef std::vector<MapBlock*> MBContainer;
+
+static void allocateSome(MBContainer &vec, u32 n)
+{
+	vec.reserve(vec.size() + n);
+	for (u32 i = 0; i < n; i++) {
+		auto *mb = new MapBlock(v3s16(i & 0xff, 0, (i >> 8) & S16_MAX), nullptr);
+		vec.push_back(mb);
+	}
+}
+
+static void freeSome(MBContainer &vec, u32 n)
+{
+	// deallocate from end since that has no cost moving data inside the vector
+	u32 start_i = 0;
+	if (vec.size() > n)
+		start_i = vec.size() - n;
+	for (u32 i = start_i; i < vec.size(); i++)
+		delete vec[i];
+	vec.resize(start_i);
+}
+
+static inline void freeAll(MBContainer &vec) { freeSome(vec, vec.size()); }
+
+// usage patterns inspired by ClientMap::updateDrawList()
+static void workOnMetadata(const MBContainer &vec)
+{
+	for (MapBlock *block : vec) {
+#ifndef SERVER
+		bool foo = !!block->mesh;
+#else
+		bool foo = true;
+#endif
+
+		if (block->refGet() > 2)
+			block->refDrop();
+
+		v3s16 pos = block->getPos() * MAP_BLOCKSIZE;
+		if (foo)
+			pos += v3s16(MAP_BLOCKSIZE / 2);
+
+		if (pos.getDistanceFrom(v3s16(0)) > 30000)
+			continue;
+
+		block->resetUsageTimer();
+		block->refGrab();
+	}
+}
+
+// usage patterns inspired by LBMManager::applyLBMs()
+static u32 workOnNodes(const MBContainer &vec)
+{
+	u32 foo = 0;
+	for (MapBlock *block : vec) {
+		block->resetUsageTimer();
+
+		if (block->isOrphan())
+			continue;
+
+		v3s16 pos_of_block = block->getPosRelative();
+		v3s16 pos;
+		MapNode n;
+		for (pos.X = 0; pos.X < MAP_BLOCKSIZE; pos.X++) {
+			for (pos.Y = 0; pos.Y < MAP_BLOCKSIZE; pos.Y++) {
+				for (pos.Z = 0; pos.Z < MAP_BLOCKSIZE; pos.Z++) {
+					n = block->getNodeNoCheck(pos);
+
+					if (n.getContent() == CONTENT_AIR) {
+						auto p = pos + pos_of_block;
+						foo ^= p.X + p.Y + p.Z;
+					}
+				}
+			}
+		}
+	}
+	return foo;
+}
+
+// usage patterns inspired by ABMHandler::apply()
+// touches both metadata and node data at the same time
+static u32 workOnBoth(const MBContainer &vec)
+{
+	int foo = 0;
+	for (MapBlock *block : vec) {
+		block->contents.clear();
+
+		bool want_contents_cached = block->contents.empty() && !block->do_not_cache_contents;
+
+		v3s16 p0;
+		for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
+		for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++)
+		for(p0.Z=0; p0.Z<MAP_BLOCKSIZE; p0.Z++)
+		{
+			MapNode n = block->getNodeNoCheck(p0);
+			content_t c = n.getContent();
+
+			if (want_contents_cached && !CONTAINS(block->contents, c)) {
+				if (block->contents.size() >= 10) {
+					want_contents_cached = false;
+					block->do_not_cache_contents = true;
+					block->contents.clear();
+					block->contents.shrink_to_fit();
+				} else {
+					block->contents.push_back(c);
+				}
+			}
+		}
+
+		foo += block->contents.size();
+	}
+	return foo;
+}
+
+#define BENCH1(_count) \
+	BENCHMARK_ADVANCED("allocate_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		MBContainer vec; \
+		const u32 pcount = _count / meter.runs(); \
+		meter.measure([&] { \
+			allocateSome(vec, pcount); \
+			return vec.size(); \
+		}); \
+		freeAll(vec); \
+	}; \
+	BENCHMARK_ADVANCED("testCase1_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		MBContainer vec; \
+		allocateSome(vec, _count); \
+		meter.measure([&] { \
+			workOnMetadata(vec); \
+		}); \
+		freeAll(vec); \
+	}; \
+	BENCHMARK_ADVANCED("testCase2_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		MBContainer vec; \
+		allocateSome(vec, _count); \
+		meter.measure([&] { \
+			return workOnNodes(vec); \
+		}); \
+		freeAll(vec); \
+	}; \
+	BENCHMARK_ADVANCED("testCase3_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		MBContainer vec; \
+		allocateSome(vec, _count); \
+		meter.measure([&] { \
+			return workOnBoth(vec); \
+		}); \
+		freeAll(vec); \
+	}; \
+	BENCHMARK_ADVANCED("free_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		MBContainer vec; \
+		allocateSome(vec, _count); \
+		/* catch2 does multiple runs so we have to be careful to not dealloc too many */ \
+		const u32 pcount = _count / meter.runs(); \
+		meter.measure([&] { \
+			freeSome(vec, pcount); \
+			return vec.size(); \
+		}); \
+		freeAll(vec); \
+	};
+
+TEST_CASE("benchmark_mapblock") {
+	BENCH1(900)
+	BENCH1(2200)
+	BENCH1(7500) // <- default client_mapblock_limit
+}
diff --git a/src/benchmark/benchmark_mapmodify.cpp b/src/benchmark/benchmark_mapmodify.cpp
new file mode 100644
index 000000000..2ce346fb7
--- /dev/null
+++ b/src/benchmark/benchmark_mapmodify.cpp
@@ -0,0 +1,152 @@
+/*
+Minetest
+Copyright (C) 2023 sfan5
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "catch.h"
+#include "util/container.h"
+
+// Testing the standard library is not useful except to compare
+//#define TEST_STDLIB
+
+using TestMap = ModifySafeMap<u16, void*>;
+
+static inline void fill(TestMap &map, size_t n)
+{
+	map.clear();
+	for (size_t i = 0; i < n; i++)
+		map.put(i, reinterpret_cast<TestMap::mapped_type>(0x40000U + i));
+}
+
+static inline void pollute(TestMap &map)
+{
+	auto dummy = reinterpret_cast<TestMap::mapped_type>(123);
+	// produce some garbage to avoid best case behaviour
+	map.put(0xffff, dummy);
+	for (auto it : map.iter()) {
+		(void)it;
+		map.remove(0xffff);
+		break;
+	}
+}
+
+static inline void remove(TestMap &map, size_t offset, size_t count)
+{
+	for (size_t i = 0; i < count; i++)
+		map.remove(static_cast<TestMap::key_type>(i + offset));
+}
+
+#define BENCH_ITERATE_(_label, _count, _best) \
+	BENCHMARK_ADVANCED(_label)(Catch::Benchmark::Chronometer meter) { \
+		TestMap map; \
+		fill(map, _count); \
+		if (!_best) pollute(map); \
+		meter.measure([&] { \
+			size_t x = map.size(); \
+			for (auto &it : map.iter()) { \
+				if (!it.second) \
+					continue; \
+				x ^= reinterpret_cast<intptr_t>(it.second); \
+			} \
+			return x; \
+		}); \
+	};
+
+#define BENCH_ITERATE(_count) \
+	BENCH_ITERATE_("iterate_" #_count, _count, 0) \
+	BENCH_ITERATE_("iterate_bestcase_" #_count, _count, 1)
+
+#define BENCH_REMOVE(_count) \
+	BENCHMARK_ADVANCED("remove_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		TestMap map; \
+		fill(map, _count); \
+		meter.measure([&] { \
+			for (auto it : map.iter()) { \
+				(void)it; \
+				remove(map, (_count) / 7, (_count) / 2); /* delete half */ \
+				break; \
+			} \
+		}); \
+	};
+
+TEST_CASE("ModifySafeMap") {
+	BENCH_ITERATE(50)
+	BENCH_ITERATE(400)
+	BENCH_ITERATE(1000)
+
+	BENCH_REMOVE(50)
+	BENCH_REMOVE(400)
+	BENCH_REMOVE(1000)
+}
+
+using TestMap2 = std::map<u16, void*>;
+
+static inline void fill2(TestMap2 &map, size_t n)
+{
+	map.clear();
+	for (size_t i = 0; i < n; i++)
+		map.emplace(i, reinterpret_cast<TestMap2::mapped_type>(0x40000U + i));
+}
+
+static inline void remove2(TestMap2 &map, size_t offset, size_t count)
+{
+	for (size_t i = 0; i < count; i++)
+		map.erase(static_cast<TestMap2::key_type>(i + offset));
+}
+
+#define BENCH2_ITERATE(_count) \
+	BENCHMARK_ADVANCED("iterate_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		TestMap2 map; \
+		fill2(map, _count); \
+		meter.measure([&] { \
+			size_t x = map.size(); \
+			/* mirrors what ActiveObjectMgr::step used to do */ \
+			std::vector<TestMap2::key_type> keys; \
+			keys.reserve(x); \
+			for (auto &it : map) \
+				keys.push_back(it.first); \
+			for (auto key : keys) { \
+				auto it = map.find(key); \
+				if (it == map.end()) \
+					continue; \
+				x ^= reinterpret_cast<intptr_t>(it->second); \
+			} \
+			return x; \
+		}); \
+	};
+
+#define BENCH2_REMOVE(_count) \
+	BENCHMARK_ADVANCED("remove_" #_count)(Catch::Benchmark::Chronometer meter) { \
+		TestMap2 map; \
+		fill2(map, _count); \
+		meter.measure([&] { \
+			/* no overhead so no fake iteration */ \
+			remove2(map, (_count) / 7, (_count) / 2); \
+		}); \
+	};
+
+#ifdef TEST_STDLIB
+TEST_CASE("std::map") {
+	BENCH2_ITERATE(50)
+	BENCH2_ITERATE(400)
+	BENCH2_ITERATE(1000)
+
+	BENCH2_REMOVE(50)
+	BENCH2_REMOVE(400)
+	BENCH2_REMOVE(1000)
+}
+#endif
diff --git a/src/benchmark/benchmark_serialize.cpp b/src/benchmark/benchmark_serialize.cpp
index 97cc7d59d..649d4b43a 100644
--- a/src/benchmark/benchmark_serialize.cpp
+++ b/src/benchmark/benchmark_serialize.cpp
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "benchmark_setup.h"
+#include "catch.h"
 #include "util/serialize.h"
 #include <sstream>
 #include <ios>
diff --git a/src/catch.cpp b/src/catch.cpp
new file mode 100644
index 000000000..d4ebcc141
--- /dev/null
+++ b/src/catch.cpp
@@ -0,0 +1,18 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "catch.h"
+
+#include "log.h"
+
+namespace Catch {
+	std::ostream& cout() {
+		return rawstream;
+	}
+	std::ostream& clog() {
+		return rawstream;
+	}
+	std::ostream& cerr() {
+		return rawstream;
+	}
+}
diff --git a/src/catch.h b/src/catch.h
new file mode 100644
index 000000000..7faa0de2a
--- /dev/null
+++ b/src/catch.h
@@ -0,0 +1,14 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+// We want to have catch write to rawstream (stderr) instead of stdout.
+// This should be included instead of <catch_amalgamated.hpp>
+// to patch the output streams accordingly.
+#define CATCH_CONFIG_NOSTDOUT
+#include <catch_amalgamated.hpp>
+
+namespace Catch {
+	std::ostream& cout();
+	std::ostream& clog();
+	std::ostream& cerr();
+}
diff --git a/src/chat.cpp b/src/chat.cpp
index e74935eb0..7f0054b40 100644
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -381,6 +381,13 @@ u32 ChatBuffer::formatChatLine(const ChatLine &line, u32 cols,
 					tempchar = linestring[in_pos+frag_length];
 				}
 
+				// Remove tailing punctuation characters
+				static const std::wstring tailing_chars = L",.";
+				tempchar = linestring[in_pos+frag_length - 1];
+				if (tailing_chars.find(tempchar) != std::wstring::npos) {
+					frag_length--;
+				}
+
 				space_pos = frag_length - 1;
 				// This frag may need to be force-split. That's ok, urls aren't "words"
 				if (frag_length >= remaining_in_output) {
@@ -589,6 +596,7 @@ void ChatPrompt::historyNext()
 
 void ChatPrompt::nickCompletion(const std::set<std::string> &names, bool backwards)
 {
+	const std::wstring_view line(getLineRef());
 	// Two cases:
 	// (a) m_nick_completion_start == m_nick_completion_end == 0
 	//     Then no previous nick completion is active.
@@ -598,7 +606,6 @@ void ChatPrompt::nickCompletion(const std::set<std::string> &names, bool backwar
 	//     m_nick_completion_start..m_nick_completion_end are the
 	//     interval where the originally used prefix was. Cycle
 	//     through the list of completions of that prefix.
-	const std::wstring &line = getLineRef();
 	u32 prefix_start = m_nick_completion_start;
 	u32 prefix_end = m_nick_completion_end;
 	bool initial = (prefix_end == 0);
@@ -614,7 +621,7 @@ void ChatPrompt::nickCompletion(const std::set<std::string> &names, bool backwar
 		if (prefix_start == prefix_end)
 			return;
 	}
-	std::wstring prefix = line.substr(prefix_start, prefix_end - prefix_start);
+	auto prefix = line.substr(prefix_start, prefix_end - prefix_start);
 
 	// find all names that start with the selected prefix
 	std::vector<std::wstring> completions;
@@ -637,7 +644,7 @@ void ChatPrompt::nickCompletion(const std::set<std::string> &names, bool backwar
 	{
 		while (word_end < line.size() && !std::iswspace(line[word_end]))
 			++word_end;
-		std::wstring word = line.substr(prefix_start, word_end - prefix_start);
+		auto word = line.substr(prefix_start, word_end - prefix_start);
 
 		// cycle through completions
 		for (u32 i = 0; i < completions.size(); ++i)
@@ -653,7 +660,7 @@ void ChatPrompt::nickCompletion(const std::set<std::string> &names, bool backwar
 			}
 		}
 	}
-	std::wstring replacement = completions[replacement_index];
+	const auto &replacement = completions[replacement_index];
 	if (word_end < line.size() && std::iswspace(line[word_end]))
 		++word_end;
 
@@ -789,10 +796,9 @@ void ChatPrompt::clampView()
 
 
 ChatBackend::ChatBackend():
-	m_console_buffer(500),
-	//m_recent_buffer(g_settings->getU16("chat_buffer_size")),
+	m_console_buffer(1500),
 	m_recent_buffer(6),
-	m_prompt(L"]", 500)
+	m_prompt(L"]", 1500)
 {
 }
 
diff --git a/src/circuit_element.cpp b/src/circuit_element.cpp
index e9c15fb0d..0fe9c99db 100644
--- a/src/circuit_element.cpp
+++ b/src/circuit_element.cpp
@@ -252,7 +252,7 @@ void CircuitElement::findConnectedWithFace(std::vector <std::pair <std::list<Cir
 	u8 real_face_id = FACE_TO_SHIFT(real_face);
 
 	if(current_node_features.is_wire || current_node_features.is_wire_connector) {
-		q.push(std::make_pair(current_pos, current_node_features.wire_connections[real_face_id]));
+		q.emplace(current_pos, current_node_features.wire_connections[real_face_id]);
 
 		while(!q.empty()) {
 			current_pos = q.front().first;
@@ -286,7 +286,7 @@ void CircuitElement::findConnectedWithFace(std::vector <std::pair <std::list<Cir
 						if(node_features.is_circuit_element) {
 							connected.emplace_back(pos_to_iterator[next_pos], next_real_shift);
 						} else {
-							q.push(std::make_pair(next_pos, node_features.wire_connections[next_real_shift]));
+							q.emplace(next_pos, node_features.wire_connections[next_real_shift]);
 						}
 
 						if(next_used_iterator != used.end()) {
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 547bca341..91a48637b 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -2,6 +2,7 @@ set(sound_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/sound.cpp)
 
 if(USE_SOUND)
 	set(sound_SRCS ${sound_SRCS}
+		${CMAKE_CURRENT_SOURCE_DIR}/sound/al_extensions.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/sound/al_helpers.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/sound/ogg_file.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/sound/playing_sound.cpp
@@ -69,6 +70,9 @@ set(client_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/shader.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/sky.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/texturepaths.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/texturesource.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/imagesource.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadows.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadowsrender.cpp
diff --git a/src/client/activeobjectmgr.cpp b/src/client/activeobjectmgr.cpp
index 33a1f9f92..f01f66c64 100644
--- a/src/client/activeobjectmgr.cpp
+++ b/src/client/activeobjectmgr.cpp
@@ -37,30 +37,16 @@ ActiveObjectMgr::~ActiveObjectMgr()
 void ActiveObjectMgr::step(
 		float dtime, const std::function<void(const ClientActiveObjectPtr&)> &f)
 {
-	g_profiler->avg("ActiveObjectMgr: CAO count [#]", m_active_objects.size());
-
-	// Same as in server activeobjectmgr.
-	std::vector<u16> ids = getAllIds();
-
-	for (u16 id : ids) {
-		auto it = getActiveObject(id);
-		if (!it) {
+	size_t count = 0;
+	for (auto &ao_it : m_active_objects.iter()) {
+		if (!ao_it.second)
 			continue;
-		}
-		f(it);
-
-		/*
-		auto it = m_active_objects.find(id);
-		if (it == m_active_objects.end())
-			continue; // obj was removed
-		f(it->second);
-		*/
+		count++;
+		f(ao_it.second);
 	}
-
-	m_active_objects_deleted.clear();
+	g_profiler->avg("ActiveObjectMgr: CAO count [#]", count);
 }
 
-// clang-format off
 bool ActiveObjectMgr::registerObject(std::shared_ptr<ClientActiveObject> obj)
 {
 	assert(obj); // Pre-condition
@@ -82,7 +68,7 @@ bool ActiveObjectMgr::registerObject(std::shared_ptr<ClientActiveObject> obj)
 	}
 	infostream << "Client::ActiveObjectMgr::registerObject(): "
 			<< "added (id=" << obj->getId() << ")" << std::endl;
-	m_active_objects.insert_or_assign(obj->getId(), obj);
+	m_active_objects.put(obj->getId(), std::move(obj));
 	return true;
 }
 
@@ -90,29 +76,25 @@ void ActiveObjectMgr::removeObject(u16 id)
 {
 	verbosestream << "Client::ActiveObjectMgr::removeObject(): "
 			<< "id=" << id << std::endl;
-	auto obj = getActiveObject(id);
+
+	auto obj = m_active_objects.take(id);
 	if (!obj) {
 		infostream << "Client::ActiveObjectMgr::removeObject(): "
 				<< "id=" << id << " not found" << std::endl;
 		return;
 	}
 
-	m_active_objects_deleted.emplace_back(obj);
-
-	//std::unique_ptr<ClientActiveObject> obj = std::move(it->second);
-	m_active_objects.erase(id);
-
 	obj->removeFromScene(true);
-	
 }
 
-// clang-format on
 void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d,
 		std::vector<DistanceSortedActiveObject> &dest)
 {
 	f32 max_d2 = max_d * max_d;
-	for (auto &ao_it : m_active_objects) {
-		const auto obj = ao_it.second;
+	for (auto &ao_it : m_active_objects.iter()) {
+		auto obj = ao_it.second;
+		if (!obj)
+			continue;
 
 		f32 d2 = (obj->getPosition() - origin).getLengthSQ();
 
@@ -129,8 +111,10 @@ std::vector<DistanceSortedActiveObject> ActiveObjectMgr::getActiveSelectableObje
 	f32 max_d = shootline.getLength();
 	v3f dir = shootline.getVector().normalize();
 
-	for (auto &ao_it : m_active_objects) {
+	for (auto &ao_it : m_active_objects.iter()) {
 		auto obj = ao_it.second;
+		if (!obj)
+			continue;
 
 		aabb3f selection_box;
 		if (!obj->getSelectionBox(&selection_box))
diff --git a/src/client/camera.cpp b/src/client/camera.cpp
index 9dfd4a142..e4b69f40b 100644
--- a/src/client/camera.cpp
+++ b/src/client/camera.cpp
@@ -110,38 +110,21 @@ void Camera::notifyFovChange()
 
 	PlayerFovSpec spec = player->getFov();
 
-	/*
-	 * Update m_old_fov_degrees first - it serves as the starting point of the
-	 * upcoming transition.
-	 *
-	 * If an FOV transition is already active, mark current FOV as the start of
-	 * the new transition. If not, set it to the previous transition's target FOV.
-	 */
-	if (m_fov_transition_active)
-		m_old_fov_degrees = m_curr_fov_degrees;
-	else
-		m_old_fov_degrees = m_server_sent_fov ? m_target_fov_degrees : m_cache_fov;
+	// Remember old FOV in case a transition is wanted
+	f32 m_old_fov_degrees = m_fov_transition_active
+		? m_curr_fov_degrees // FOV is overridden with transition
+		: m_server_sent_fov
+			? m_target_fov_degrees // FOV is overridden without transition
+			: m_cache_fov; // FOV is not overridden
 
-	/*
-	 * Update m_server_sent_fov next - it corresponds to the target FOV of the
-	 * upcoming transition.
-	 *
-	 * Set it to m_cache_fov, if server-sent FOV is 0. Otherwise check if
-	 * server-sent FOV is a multiplier, and multiply it with m_cache_fov instead
-	 * of overriding.
-	 */
-	if (spec.fov == 0.0f) {
-		m_server_sent_fov = false;
-		m_target_fov_degrees = m_cache_fov;
-	} else {
-		m_server_sent_fov = true;
-		m_target_fov_degrees = spec.is_multiplier ? m_cache_fov * spec.fov : spec.fov;
-	}
+	m_server_sent_fov = spec.fov > 0.0f;
+	m_target_fov_degrees = m_server_sent_fov
+		? spec.is_multiplier
+			? m_cache_fov * spec.fov // apply multiplier to client-set FOV
+			: spec.fov // absolute override
+		: m_cache_fov; // reset to client-set FOV
 
-	if (spec.transition_time > 0.0f)
-		m_fov_transition_active = true;
-
-	// If FOV smooth transition is active, initialize required variables
+	m_fov_transition_active = spec.transition_time > 0.0f;
 	if (m_fov_transition_active) {
 		m_transition_time = spec.transition_time;
 		m_fov_diff = m_target_fov_degrees - m_old_fov_degrees;
@@ -151,8 +134,8 @@ void Camera::notifyFovChange()
 // Returns the fractional part of x
 inline f32 my_modf(f32 x)
 {
-	double dummy;
-	return modf(x, &dummy);
+	float dummy;
+	return std::modf(x, &dummy);
 }
 
 void Camera::step(f32 dtime)
@@ -420,10 +403,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 		f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0;
 
 		f32 bobknob = 1.2;
-		f32 bobtmp = sin(pow(bobfrac, bobknob) * M_PI);
+		f32 bobtmp = std::sin(std::pow(bobfrac, bobknob) * M_PI);
 
 		v3f bobvec = v3f(
-			0.3 * bobdir * sin(bobfrac * M_PI),
+			0.3 * bobdir * std::sin(bobfrac * M_PI),
 			-0.28 * bobtmp * bobtmp,
 			0.);
 
@@ -560,11 +543,9 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 		addArmInertia(yaw);
 
 	// Position the wielded item
-	//v3f wield_position = v3f(45, -35, 65);
 	v3f wield_position = v3f(m_wieldmesh_offset.X, m_wieldmesh_offset.Y, 65);
-	//v3f wield_rotation = v3f(-100, 120, -100);
 	v3f wield_rotation = v3f(-100, 120, -100);
-	wield_position.Y += fabs(m_wield_change_timer)*320 - 40;
+	wield_position.Y += std::abs(m_wield_change_timer)*320 - 40;
 	if(m_digging_anim < 0.05 || m_digging_anim > 0.5)
 	{
 		f32 frac = 1.0;
@@ -572,33 +553,29 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 			frac = 2.0 * (m_digging_anim - 0.5);
 		// This value starts from 1 and settles to 0
 		f32 ratiothing = std::pow((1.0f - tool_reload_ratio), 0.5f);
-		//f32 ratiothing2 = pow(ratiothing, 0.5f);
 		f32 ratiothing2 = (easeCurve(ratiothing*0.5))*2.0;
-		wield_position.Y -= frac * 25.0 * pow(ratiothing2, 1.7f);
-		//wield_position.Z += frac * 5.0 * ratiothing2;
-		wield_position.X -= frac * 35.0 * pow(ratiothing2, 1.1f);
-		wield_rotation.Y += frac * 70.0 * pow(ratiothing2, 1.4f);
-		//wield_rotation.X -= frac * 15.0 * pow(ratiothing2, 1.4f);
-		//wield_rotation.Z += frac * 15.0 * pow(ratiothing2, 1.0f);
+		wield_position.Y -= frac * 25.0f * std::pow(ratiothing2, 1.7f);
+		wield_position.X -= frac * 35.0f * std::pow(ratiothing2, 1.1f);
+		wield_rotation.Y += frac * 70.0f * std::pow(ratiothing2, 1.4f);
 	}
 	if (m_digging_button != -1)
 	{
 		f32 digfrac = m_digging_anim;
-		wield_position.X -= 50 * sin(pow(digfrac, 0.8f) * M_PI);
-		wield_position.Y += 24 * sin(digfrac * 1.8 * M_PI);
+		wield_position.X -= 50 * std::sin(std::pow(digfrac, 0.8f) * M_PI);
+		wield_position.Y += 24 * std::sin(digfrac * 1.8 * M_PI);
 		wield_position.Z += 25 * 0.5;
 
 		// Euler angles are PURE EVIL, so why not use quaternions?
 		core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
 		core::quaternion quat_end(v3f(80, 30, 100) * core::DEGTORAD);
 		core::quaternion quat_slerp;
-		quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * M_PI));
+		quat_slerp.slerp(quat_begin, quat_end, std::sin(digfrac * M_PI));
 		quat_slerp.toEuler(wield_rotation);
 		wield_rotation *= core::RADTODEG;
 	} else {
 		f32 bobfrac = my_modf(m_view_bobbing_anim);
-		wield_position.X -= sin(bobfrac*M_PI*2.0) * 3.0;
-		wield_position.Y += sin(my_modf(bobfrac*2.0)*M_PI) * 3.0;
+		wield_position.X -= std::sin(bobfrac*M_PI*2.0) * 3.0;
+		wield_position.Y += std::sin(my_modf(bobfrac*2.0)*M_PI) * 3.0;
 	}
 	m_wieldnode->setPosition(wield_position);
 	m_wieldnode->setRotation(wield_rotation);
@@ -612,8 +589,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 	// If the player is walking, swimming, or climbing,
 	// view bobbing is enabled and free_move is off,
 	// start (or continue) the view bobbing animation.
-	const bool movement_XZ = hypot(speed.X, speed.Z) > BS;
-	const bool movement_Y = fabs(speed.Y) > BS;
+	const bool movement_XZ = std::hypot(speed.X, speed.Z) > BS;
+	const bool movement_Y = std::abs(speed.Y) > BS;
 
 	const bool walking = movement_XZ && player->touching_ground;
 	const bool swimming = (movement_XZ || player->swimming_vertical) && player->in_liquid;
diff --git a/src/client/camera.h b/src/client/camera.h
index 2768b0fa0..75e60b732 100644
--- a/src/client/camera.h
+++ b/src/client/camera.h
@@ -22,9 +22,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
-#include "client/tile.h"
+#include "util/numeric.h"
 #include "client/localplayer.h"
 #include <ICameraSceneNode.h>
 #include <ISceneNode.h>
@@ -244,7 +243,7 @@ private:
 
 	// Server-sent FOV variables
 	bool m_server_sent_fov = false;
-	f32 m_curr_fov_degrees, m_old_fov_degrees, m_target_fov_degrees;
+	f32 m_curr_fov_degrees, m_target_fov_degrees;
 
 	// FOV transition variables
 	bool m_fov_transition_active = false;
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 469652646..db82d2bb6 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -37,7 +37,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/gameui.h"
 #include "client/renderingengine.h"
 #include "client/sound.h"
-#include "client/tile.h"
+#include "client/texturepaths.h"
 #include "client/mesh_generator_thread.h"
 #include "client/particles.h"
 #include "client/localplayer.h"
@@ -101,8 +101,10 @@ u32 PacketCounter::sum() const
 void PacketCounter::print(std::ostream &o) const
 {
 	for (const auto &it : m_packets) {
-		auto name = it.first >= TOCLIENT_NUM_MSG_TYPES ? "?"
+		auto name = it.first >= TOCLIENT_NUM_MSG_TYPES ? nullptr
 			: toClientCommandTable[it.first].name;
+		if (!name)
+			name = "?";
       if (it.second)
 		o << "cmd " << it.first << " (" << name << ") count "
 			<< it.second << std::endl;
@@ -118,7 +120,6 @@ Client::Client(
 
 		const char *playername,
 		const std::string &password,
-		const std::string &address_name,
 		MapDrawControl &control,
 		IWritableTextureSource *tsrc,
 		IWritableShaderSource *shsrc,
@@ -127,7 +128,6 @@ Client::Client(
 		ISoundManager *sound,
 		MtEventManager *event,
 		RenderingEngine *rendering_engine,
-		bool ipv6,
 		GameUI *game_ui,
 		ELoginRegister allow_login_or_register
 ):
@@ -145,8 +145,6 @@ Client::Client(
 		tsrc, this
 	),
 	m_particle_manager(std::make_unique<ParticleManager>(&m_env)),
-	m_con(new con_use::Connection(PROTOCOL_ID, is_simple_singleplayer_game ? MAX_PACKET_SIZE_SINGLEPLAYER : MAX_PACKET_SIZE, CONNECTION_TIMEOUT, ipv6, this)),
-	m_address_name(address_name),
 	m_allow_login_or_register(allow_login_or_register),
 	m_server_ser_ver(SER_FMT_VER_INVALID),
 	m_last_chat_message_sent(time(NULL)),
@@ -306,9 +304,7 @@ void Client::scanModSubfolder(const std::string &mod_name, const std::string &mo
 				<< "\" as \"" << vfs_path << "\"." << std::endl;
 
 		std::string contents;
-		if (!fs::ReadFile(real_path, contents)) {
-			errorstream << "Client::scanModSubfolder(): Can't read file \""
-					<< real_path << "\"." << std::endl;
+		if (!fs::ReadFile(real_path, contents, true)) {
 			continue;
 		}
 
@@ -367,7 +363,8 @@ bool Client::isShutdown()
 Client::~Client()
 {
 	m_shutdown = true;
-	m_con->Disconnect();
+	if (m_con)
+		m_con->Disconnect();
 
 	deleteAuthData();
 
@@ -411,13 +408,32 @@ Client::~Client()
 	m_sounds_client_to_server.clear();
 }
 
-void Client::connect(Address address, bool is_local_server)
+void Client::connect(const Address &address, const std::string &address_name,
+	bool is_local_server)
 {
-	initLocalMapSaving(address, m_address_name, is_local_server);
+	if (m_con) {
+		// can't do this if the connection has entered auth phase
+		sanity_check(m_state == LC_Created && m_proto_ver == 0);
+		infostream << "Client connection will be recreated" << std::endl;
+
+		m_access_denied = false;
+		m_access_denied_reconnect = false;
+		m_access_denied_reason.clear();
+	}
+
+	m_address_name = address_name;
+	m_con.reset(new con_use::Connection(PROTOCOL_ID, is_simple_singleplayer_game ? MAX_PACKET_SIZE_SINGLEPLAYER : MAX_PACKET_SIZE, CONNECTION_TIMEOUT,
+		address.isIPv6(), this));
+
+	infostream << "Connecting to server at ";
+	address.print(infostream);
+	infostream << std::endl;
 
 	// Since we use TryReceive() a timeout here would be ineffective anyway
 	//? m_con->SetTimeoutMs(0);
 	m_con->Connect(address);
+
+	initLocalMapSaving(address, m_address_name, is_local_server);
 }
 
 void Client::step(float dtime)
@@ -425,8 +441,8 @@ void Client::step(float dtime)
 	m_uptime += dtime;
 
 	// Limit a bit
-	if (dtime > 2.0)
-		dtime = 2.0;
+	if (dtime > DTIME_LIMIT)
+		dtime = DTIME_LIMIT;
 
 	m_animation_time += dtime;
 	if(m_animation_time > 60.0)
@@ -870,7 +886,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 		video::IVideoDriver *vdrv = m_rendering_engine->get_video_driver();
 
 		io::IReadFile *rfile = irrfs->createMemoryReadFile(
-				data.c_str(), data.size(), "_tempreadfile");
+				data.c_str(), data.size(), filename.c_str());
 
 		FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");
 
@@ -1001,6 +1017,10 @@ void Client::initLocalMapSaving(const Address &address,
 	if (!g_settings->getBool("enable_local_map_saving") || is_local_server) {
 		return;
 	}
+	if (m_localdb) {
+		infostream << "Local map saving already running" << std::endl;
+		return;
+	}
 
 	m_localdb = nullptr;
 
@@ -1059,6 +1079,8 @@ void Client::ReceiveAll()
 	NetworkPacket pkt;
 	u64 start_ms = porting::getTimeMs();
 	const u64 budget = 10 + (overload ? 30 : 0);
+
+	FATAL_ERROR_IF(!m_con, "Networking not initialized");
 	for(;;) {
 		// Limit time even if there would be huge amounts of data to
 		// process
@@ -1119,27 +1141,25 @@ void Client::ProcessData(NetworkPacket *pkt)
 #endif
 
 	ToClientCommand command = (ToClientCommand) pkt->getCommand();
-	u32 sender_peer_id = pkt->getPeerId();
 
-	//infostream<<"Client: received command="<<command<<std::endl;
-	m_packetcounter.add((u16)command);
+	m_packetcounter.add(static_cast<u16>(command));
 	g_profiler->graphAdd("client_received_packets", 1);
 
 	/*
 		If this check is removed, be sure to change the queue
 		system to know the ids
 	*/
-	if(sender_peer_id != PEER_ID_SERVER) {
+	if (pkt->getPeerId() != PEER_ID_SERVER) {
 		infostream << "Client::ProcessData(): Discarding data not "
-			"coming from server: peer_id=" << sender_peer_id << " command=" << pkt->getCommand()
-			<< std::endl;
+			"coming from server: peer_id=" << static_cast<int>(pkt->getPeerId())
+			<< " command=" << static_cast<unsigned>(command) << std::endl;
 		return;
 	}
 
 	// Command must be handled into ToClientCommandHandler
 	if (command >= TOCLIENT_NUM_MSG_TYPES) {
 		infostream << "Client: Ignoring unknown command "
-			<< command << std::endl;
+			<< static_cast<unsigned>(command) << std::endl;
 		return;
 	}
 
@@ -1163,22 +1183,18 @@ void Client::ProcessData(NetworkPacket *pkt)
 	 * But we must use the new ToClientConnectionState in the future,
 	 * as a byte mask
 	 */
-	if(toClientCommandTable[command].state == TOCLIENT_STATE_NOT_CONNECTED) {
+	if (toClientCommandTable[command].state == TOCLIENT_STATE_NOT_CONNECTED) {
 		handleCommand(pkt);
 		return;
 	}
 
-	if(m_server_ser_ver == SER_FMT_VER_INVALID) {
+	if (m_server_ser_ver == SER_FMT_VER_INVALID) {
 		infostream << "Client: Server serialization"
-				" format invalid or not initialized."
-				" Skipping incoming command=" << command << std::endl;
+				" format invalid. Skipping incoming command "
+				<< static_cast<unsigned>(command) << std::endl;
 		return;
 	}
 
-	/*
-	  Handle runtime commands
-	*/
-
 	handleCommand(pkt);
 }
 
@@ -1206,12 +1222,11 @@ void Client::Send(NetworkPacket* pkt)
 				<< "] state=" << (int)toServerCommandTable[pkt->getCommand()].state
 				<< " size=" << pkt->getSize() << std::endl;
 #endif
-
 	g_profiler->add("Client::Send", 1);
-	m_con->Send(PEER_ID_SERVER,
-		serverCommandFactoryTable[pkt->getCommand()].channel,
-		pkt,
-		serverCommandFactoryTable[pkt->getCommand()].reliable);
+
+	auto &scf = serverCommandFactoryTable[pkt->getCommand()];
+	FATAL_ERROR_IF(!scf.name, "packet type missing in table");
+	m_con->Send(PEER_ID_SERVER, scf.channel, pkt, scf.reliable);
 }
 #endif
 
@@ -1637,6 +1652,7 @@ void Client::sendUpdateClientInfo(const ClientDynamicInfo& info)
 	pkt << info.real_gui_scaling;
 	pkt << info.real_hud_scaling;
 	pkt << (f32)info.max_fs_size.X << (f32)info.max_fs_size.Y;
+	pkt << info.touch_controls;
 
 	Send(&pkt);
 }
@@ -2033,7 +2049,7 @@ ClientEvent *Client::getClientEvent()
 
 const Address Client::getServerAddress()
 {
-	return m_con->GetPeerAddress(PEER_ID_SERVER);
+	return m_con ? m_con->GetPeerAddress(PEER_ID_SERVER) : Address();
 }
 
 float Client::mediaReceiveProgress()
@@ -2044,6 +2060,11 @@ float Client::mediaReceiveProgress()
 	return 1.0; // downloader only exists when not yet done
 }
 
+void Client::drawLoadScreen(const std::wstring &text, float dtime, int percent) {
+	m_rendering_engine->run();
+	m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, dtime, percent);
+}
+
 struct TextureUpdateArgs {
 	gui::IGUIEnvironment *guienv;
 	u64 last_time_ms;
@@ -2055,7 +2076,7 @@ struct TextureUpdateArgs {
 void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progress)
 {
 		TextureUpdateArgs* targs = (TextureUpdateArgs*) args;
-		u16 cur_percent = ceil(progress / (double) max_progress * 100.);
+		u16 cur_percent = std::ceil(progress / max_progress * 100.f);
 
 		// update the loading menu -- if necessary
 		bool do_draw = false;
@@ -2152,11 +2173,13 @@ void Client::afterContentReceived()
 
 float Client::getRTT()
 {
+	assert(m_con);
 	return m_con->getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
 }
 
 float Client::getCurRate()
 {
+	assert(m_con);
 	return (m_con->getLocalStat(con::CUR_INC_RATE) +
 			m_con->getLocalStat(con::CUR_DL_RATE));
 }
@@ -2200,8 +2223,7 @@ void Client::makeScreenshot(const std::string & name)
 
 	while (serial < SCREENSHOT_MAX_SERIAL_TRIES) {
 		filename = filename_base + (serial > 0 ? ("_" + itos(serial)) : "") + filename_ext;
-		std::ifstream tmp(filename.c_str());
-		if (!tmp.good())
+		if (!fs::PathExists(filename))
 			break;	// File did not apparently exist, we'll go with it
 		serial++;
 	}
@@ -2232,21 +2254,11 @@ void Client::makeScreenshot(const std::string & name)
 	raw_image->drop();
 }
 
-bool Client::shouldShowMinimap() const
-{
-	return !m_minimap_disabled_by_server;
-}
-
 void Client::pushToEventQueue(ClientEvent *event)
 {
 	m_client_event_queue.push(event);
 }
 
-void Client::showMinimap(const bool show)
-{
-	m_game_ui->showMinimap(show);
-}
-
 // IGameDef interface
 // Under envlock
 IItemDefManager* Client::getItemDefManager()
diff --git a/src/client/client.h b/src/client/client.h
index a52c10e3b..5ce433e49 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -23,7 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 //fm:
-#include "map_settings_manager.h"
+#include "../map_settings_manager.h"
 #include "msgpack_fix.h"
 #include "network/fm_connection_use.h"
 
@@ -46,9 +46,12 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "network/peerhandler.h"
 #include "gameparams.h"
 #include "clientdynamicinfo.h"
-#include <fstream>
 #include "util/numeric.h"
 
+#ifdef SERVER
+#error Do not include in server builds
+#endif
+
 #define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f
 
 class Server;
@@ -137,7 +140,6 @@ public:
 
 			const char *playername,
 			const std::string &password,
-			const std::string &address_name,
 			MapDrawControl &control,
 			IWritableTextureSource *tsrc,
 			IWritableShaderSource *shsrc,
@@ -146,7 +148,6 @@ public:
 			ISoundManager *sound,
 			MtEventManager *event,
 			RenderingEngine *rendering_engine,
-			bool ipv6,
 			GameUI *game_ui,
 			ELoginRegister allow_login_or_register
 	);
@@ -170,11 +171,8 @@ public:
 
 	bool isShutdown();
 
-	/*
-		The name of the local player should already be set when
-		calling this, as it is sent in the initialization.
-	*/
-	void connect(Address address, bool is_local_server);
+	void connect(const Address &address, const std::string &address_name,
+		bool is_local_server);
 
 	/*
 		Stuff that references the environment is valid only as
@@ -212,6 +210,7 @@ public:
 	void handleCommand_Breath(NetworkPacket* pkt);
 	void handleCommand_MovePlayer(NetworkPacket* pkt);
 	void handleCommand_PunchPlayer(NetworkPacket* pkt);
+	void handleCommand_MovePlayerRel(NetworkPacket* pkt);
 	void handleCommand_DeathScreen(NetworkPacket* pkt);
 	void handleCommand_AnnounceMedia(NetworkPacket* pkt);
 	void handleCommand_Media(NetworkPacket* pkt);
@@ -372,18 +371,23 @@ public:
 	{ return m_activeobjects_received; }
 */
 
-	u16 getProtoVersion()
+	u16 getProtoVersion() const
 	{ return m_proto_ver; }
 
 	bool m_simple_singleplayer_mode;
 
 	float mediaReceiveProgress();
 
+	void drawLoadScreen(const std::wstring &text, float dtime, int percent);
 	void afterContentReceived();
 	void showUpdateProgressTexture(void *args, u32 progress, u32 max_progress);
 
 	float getRTT();
 	float getCurRate();
+	// has the server ever replied to us, used for connection retry/fallback
+	bool hasServerReplied() const {
+		return getProtoVersion() != 0; // (set in TOCLIENT_HELLO)
+	}
 
 	Minimap* getMinimap() { return m_minimap; }
 	void setCamera(Camera* camera) { m_camera = camera; }
@@ -391,8 +395,6 @@ public:
 	Camera* getCamera () { return m_camera; }
 	scene::ISceneManager *getSceneManager();
 
-	bool shouldShowMinimap() const;
-
 	// IGameDef interface
 	IItemDefManager* getItemDefManager() override;
 	const NodeDefManager* getNodeDefManager() override;
@@ -436,10 +438,10 @@ public:
 
 	void pushToEventQueue(ClientEvent *event);
 
-	void showMinimap(bool show = true);
-
+	// IP and port we're connected to
 	const Address getServerAddress();
 
+	// Hostname of the connected server (but can also be a numerical IP)
 	const std::string &getAddressName() const
 	{
 		return m_address_name;
@@ -524,7 +526,6 @@ private:
 	ELoginRegister m_allow_login_or_register = ELoginRegister::Any;
 	Camera *m_camera = nullptr;
 	Minimap *m_minimap = nullptr;
-	bool m_minimap_disabled_by_server = false;
 
 	// Server serialization version
 	u8 m_server_ser_ver;
diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index 528d8ad7e..2aba7d67f 100644
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -40,56 +40,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <algorithm>
 #include "client/renderingengine.h"
 
-/*
-	CAOShaderConstantSetter
-*/
-
-//! Shader constant setter for passing material emissive color to the CAO object_shader
-class CAOShaderConstantSetter : public IShaderConstantSetter
-{
-public:
-	CAOShaderConstantSetter():
-			m_emissive_color_setting("emissiveColor")
-	{}
-
-	~CAOShaderConstantSetter() override = default;
-
-	void onSetConstants(video::IMaterialRendererServices *services) override
-	{
-		// Ambient color
-		video::SColorf emissive_color(m_emissive_color);
-
-		float as_array[4] = {
-			emissive_color.r,
-			emissive_color.g,
-			emissive_color.b,
-			emissive_color.a,
-		};
-		m_emissive_color_setting.set(as_array, services);
-	}
-
-	void onSetMaterial(const video::SMaterial& material) override
-	{
-		m_emissive_color = material.EmissiveColor;
-	}
-
-private:
-	video::SColor m_emissive_color;
-	CachedPixelShaderSetting<float, 4> m_emissive_color_setting;
-};
-
-class CAOShaderConstantSetterFactory : public IShaderConstantSetterFactory
-{
-public:
-	CAOShaderConstantSetterFactory()
-	{}
-
-	virtual IShaderConstantSetter* create()
-	{
-		return new CAOShaderConstantSetter();
-	}
-};
-
 /*
 	ClientEnvironment
 */
@@ -101,8 +51,6 @@ ClientEnvironment::ClientEnvironment(ClientMap *map,
 	m_texturesource(texturesource),
 	m_client(client)
 {
-	auto *shdrsrc = m_client->getShaderSource();
-	shdrsrc->addShaderConstantSetterFactory(new CAOShaderConstantSetterFactory());
 }
 
 ClientEnvironment::~ClientEnvironment()
@@ -202,7 +150,7 @@ void ClientEnvironment::step(f32 dtime, double uptime, unsigned int max_cycle_ms
 	const auto lend_ms = porting::getTimeMs() + max_cycle_ms;
 	u32 loopcount = 0;
 
-	u32 steps = ceil(dtime / dtime_max_increment);
+	u32 steps = std::ceil(dtime / dtime_max_increment);
 	f32 dtime_part = dtime / steps;
 	for (; steps > 0; --steps) {
 		/*
@@ -547,7 +495,8 @@ ClientEnvEvent ClientEnvironment::getClientEnvEvent()
 
 void ClientEnvironment::getSelectedActiveObjects(
 	const core::line3d<f32> &shootline_on_map,
-	std::vector<PointedThing> &objects)
+	std::vector<PointedThing> &objects,
+	const std::optional<Pointabilities> &pointabilities)
 {
 	auto allObjects = m_ao_manager.getActiveSelectableObjects(shootline_on_map);
 	const v3f line_vector = shootline_on_map.getVector();
@@ -574,9 +523,23 @@ void ClientEnvironment::getSelectedActiveObjects(
 			current_raw_normal = current_normal;
 		}
 		if (collision) {
-			current_intersection += obj->getPosition();
-			objects.emplace_back(obj->getId(), current_intersection, current_normal, current_raw_normal,
-				(current_intersection - shootline_on_map.start).getLengthSQ());
+			PointabilityType pointable;
+			if (pointabilities) {
+				if (gcao->isPlayer()) {
+					pointable = pointabilities->matchPlayer(gcao->getGroups()).value_or(
+							gcao->getProperties().pointable);
+				} else {
+					pointable = pointabilities->matchObject(gcao->getName(),
+							gcao->getGroups()).value_or(gcao->getProperties().pointable);
+				}
+			} else {
+				pointable = gcao->getProperties().pointable;
+			}
+			if (pointable != PointabilityType::POINTABLE_NOT) {
+				current_intersection += obj->getPosition();
+				objects.emplace_back(obj->getId(), current_intersection, current_normal, current_raw_normal,
+					(current_intersection - shootline_on_map.start).getLengthSQ(), pointable);
+			}
 		}
 	}
 }
diff --git a/src/client/clientenvironment.h b/src/client/clientenvironment.h
index 366569ca9..d26edd6d2 100644
--- a/src/client/clientenvironment.h
+++ b/src/client/clientenvironment.h
@@ -24,6 +24,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "activeobjectmgr.h" // client::ActiveObjectMgr
 #include <set>
 
+#ifdef SERVER
+#error Do not include in server builds
+#endif
+
 class ClientSimpleObject;
 class ClientMap;
 class ClientScripting;
@@ -138,7 +142,8 @@ public:
 
 	virtual void getSelectedActiveObjects(
 		const core::line3d<f32> &shootline_on_map,
-		std::vector<PointedThing> &objects
+		std::vector<PointedThing> &objects,
+		const std::optional<Pointabilities> &pointabilities
 	);
 
 	const std::set<std::string> &getPlayerNames() { return m_player_names; }
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index ecd33ebeb..effa3b6cb 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -17,8 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "../server/serverlist.h"
 #include "gui/mainmenumanager.h"
 #include "clouds.h"
+#include "gui/touchscreengui.h"
 #include "server.h"
 #include "filesys.h"
 #include "gui/guiMainMenu.h"
@@ -27,13 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "chat.h"
 #include "gettext.h"
 #include "profiler.h"
-#include "serverlist.h"
 #include "gui/guiEngine.h"
 #include "fontengine.h"
 #include "clientlauncher.h"
 #include "version.h"
 #include "renderingengine.h"
 #include "network/networkexceptions.h"
+#include <IGUISpriteBank.h>
+#include <ICameraSceneNode.h>
+#include <unordered_map>
 
 #if USE_SOUND
 	#include "sound/sound_openal.h"
@@ -47,11 +51,6 @@ gui::IGUIEnvironment *guienv = nullptr;
 gui::IGUIStaticText *guiroot = nullptr;
 MainMenuManager g_menumgr;
 
-bool isMenuActive()
-{
-	return g_menumgr.menuCount() != 0;
-}
-
 // Passed to menus to allow disconnecting and exiting
 MainGameCallback *g_gamecallback = nullptr;
 
@@ -73,14 +72,23 @@ static void dump_start_data(const GameStartData &data)
 ClientLauncher::~ClientLauncher()
 {
 	delete input;
-
-	delete receiver;
+	g_settings->deregisterChangedCallback("dpi_change_notifier", setting_changed_callback, this);
+	g_settings->deregisterChangedCallback("gui_scaling", setting_changed_callback, this);
 
 	delete g_fontengine;
+	g_fontengine = nullptr;
 	delete g_gamecallback;
+	g_gamecallback = nullptr;
+
+	guiroot = nullptr;
+	guienv = nullptr;
+	assert(g_menumgr.menuCount() == 0);
 
 	delete m_rendering_engine;
 
+	// delete event receiver only after all Irrlicht stuff is gone
+	delete receiver;
+
 #if USE_SOUND
 	g_sound_manager_singleton.reset();
 #endif
@@ -103,31 +111,17 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 		g_sound_manager_singleton = createSoundManagerSingleton();
 #endif
 
-	if (!init_engine()) {
-		errorstream << "Could not initialize game engine." << std::endl;
+	if (!init_engine())
 		return false;
-	}
 
-	// Speed tests (done after irrlicht is loaded to get timer)
-	if (cmd_args.getFlag("speedtests")) {
-		dstream << "Running speed tests" << std::endl;
-		speed_tests();
-		return true;
-	}
-
-	if (m_rendering_engine->get_video_driver() == NULL) {
+	if (!m_rendering_engine->get_video_driver()) {
 		errorstream << "Could not initialize video driver." << std::endl;
 		return false;
 	}
 
 	m_rendering_engine->setupTopLevelWindow();
 
-	/*
-		This changes the minimum allowed number of vertices in a VBO.
-		Default is 500.
-	*/
-	//driver->setMinHardwareBufferVertexCount(50);
-	m_rendering_engine->getVideoDriver()->setMinHardwareBufferVertexCount(100);
+	//m_rendering_engine->getVideoDriver()->setMinHardwareBufferVertexCount(100);
 
 	// Create game callback for menus
 	g_gamecallback = new MainGameCallback();
@@ -140,51 +134,17 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 		setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
 
 	guienv = m_rendering_engine->get_gui_env();
-	skin = guienv->getSkin();
-	skin->setColor(gui::EGDC_WINDOW_SYMBOL, video::SColor(255, 255, 255, 255));
-	skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255));
-	skin->setColor(gui::EGDC_3D_LIGHT, video::SColor(0, 0, 0, 0));
-	skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255, 30, 30, 30));
-	skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255, 0, 0, 0));
-	skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 56, 121, 65));
-	skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255));
-
-	float density = rangelim(g_settings->getFloat("gui_scaling"), 0.5, 20) *
-		RenderingEngine::getDisplayDensity();
-	skin->setSize(gui::EGDS_CHECK_BOX_WIDTH, (s32)(17.0f * density));
-	skin->setSize(gui::EGDS_SCROLLBAR_SIZE, (s32)(14.0f * density));
-	skin->setSize(gui::EGDS_WINDOW_BUTTON_WIDTH, (s32)(15.0f * density));
-	if (density > 1.5f) {
-		std::string sprite_path = porting::path_share + "/textures/base/pack/";
-		if (density > 3.5f)
-			sprite_path.append("checkbox_64.png");
-		else if (density > 2.0f)
-			sprite_path.append("checkbox_32.png");
-		else
-			sprite_path.append("checkbox_16.png");
-		// Texture dimensions should be a power of 2
-		gui::IGUISpriteBank *sprites = skin->getSpriteBank();
-		video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
-		video::ITexture *sprite_texture = driver->getTexture(sprite_path.c_str());
-		if (sprite_texture) {
-			s32 sprite_id = sprites->addTextureAsSprite(sprite_texture);
-			if (sprite_id != -1)
-				skin->setIcon(gui::EGDI_CHECK_BOX_CHECKED, sprite_id);
-		}
-	}
+	config_guienv();
+	g_settings->registerChangedCallback("dpi_change_notifier", setting_changed_callback, this);
+	g_settings->registerChangedCallback("gui_scaling", setting_changed_callback, this);
 
 	g_fontengine = new FontEngine(guienv);
-	FATAL_ERROR_IF(g_fontengine == NULL, "Font engine creation failed.");
-
-	// Irrlicht 1.8 input colours
-	skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128));
-	skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 97, 173, 109));
 
 	// Create the menu clouds
-	if (!g_menucloudsmgr)
-		g_menucloudsmgr = m_rendering_engine->get_scene_manager()->createNewSceneManager();
-	if (!g_menuclouds)
-		g_menuclouds = new Clouds(g_menucloudsmgr, -1, rand());
+	// This is only global so it can be used by RenderingEngine::draw_load_screen().
+	assert(!g_menucloudsmgr && !g_menuclouds);
+	g_menucloudsmgr = m_rendering_engine->get_scene_manager()->createNewSceneManager();
+	g_menuclouds = new Clouds(g_menucloudsmgr, nullptr, -1, rand());
 	g_menuclouds->setHeight(100.0f);
 	g_menuclouds->update(v3f(0, 0, 0), video::SColor(255, 240, 240, 255));
 	scene::ICameraSceneNode* camera;
@@ -217,13 +177,18 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 	while (m_rendering_engine->run() && !*kill &&
 		!g_gamecallback->shutdown_requested) {
 		// Set the window caption
+		auto driver_name = m_rendering_engine->getVideoDriver()->getName();
+		std::string caption = std::string(PROJECT_NAME_C) +
+			" " + g_version_hash +
+			" [" + gettext("Main Menu") + "]" +
+			" [" + driver_name + "]";
+
 		m_rendering_engine->get_raw_device()->
-			setWindowCaption((utf8_to_wide(PROJECT_NAME_C) +
-			L" " + utf8_to_wide(g_version_hash) +
-			L" [" + wstrgettext("Main Menu") + L"]").c_str());
-
-		try {	// This is used for catching disconnects
+			setWindowCaption(utf8_to_wide(caption).c_str());
 
+#ifdef NDEBUG
+		try {
+#endif
 			m_rendering_engine->get_gui_env()->clear();
 
 			/*
@@ -234,7 +199,7 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 			guiroot = m_rendering_engine->get_gui_env()->addStaticText(L"",
 				core::rect<s32>(0, 0, 10000, 10000));
 
-			bool game_has_run = launch_game(error_message, reconnect_requested,
+			bool should_run_game = launch_game(error_message, reconnect_requested,
 				start_data, cmd_args);
 
 			// Reset the reconnect_requested flag
@@ -243,30 +208,18 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 			// If skip_main_menu, we only want to startup once
 			if (skip_main_menu && !first_loop)
 				break;
-
 			first_loop = false;
 
-			if (!game_has_run) {
+			if (!should_run_game) {
 				if (skip_main_menu)
 					break;
-
 				continue;
 			}
 
 			// Break out of menu-game loop to shut down cleanly
-			if (!m_rendering_engine->run() || *kill) {
-				if (!g_settings_path.empty())
-					g_settings->updateConfigFile(g_settings_path.c_str());
+			if (!m_rendering_engine->run() || *kill)
 				break;
-			}
 
-			m_rendering_engine->get_video_driver()->setTextureCreationFlag(
-					video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
-
-#ifdef HAVE_TOUCHSCREENGUI
-			receiver->m_touchscreengui = new TouchScreenGUI(m_rendering_engine->get_raw_device(), receiver);
-			g_touchscreengui = receiver->m_touchscreengui;
-#endif
 			int tries = start_data.isSinglePlayer() ? 1 : g_settings->getU16("reconnects");
 			int n = 0;
 
@@ -286,14 +239,8 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 				errorstream << "Reconnecting "<< n << "/" << tries << " ..." << '\n';
 			}
 
-		} //try
-		catch (con::PeerNotFoundException &e) {
-			error_message = _("Connection error (timed out?)");
-			errorstream << error_message << std::endl;
-		}
-
 #if !EXCEPTION_DEBUG
-		catch (std::exception &e) {
+		} catch (std::exception &e) {
 			error_message = "Some exception: ";
 			error_message.append(debug_describe_exc(e));
 			errorstream << error_message << std::endl;
@@ -302,25 +249,42 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 
 		m_rendering_engine->get_scene_manager()->clear();
 
-#ifdef HAVE_TOUCHSCREENGUI
-		delete g_touchscreengui;
-		g_touchscreengui = NULL;
-		receiver->m_touchscreengui = NULL;
-#endif
+		if (g_touchscreengui) {
+			delete g_touchscreengui;
+			g_touchscreengui = NULL;
+		}
+
+		/* Save the settings when leaving the game.
+		 * This makes sure that setting changes made in-game are persisted even
+		 * in case of a later unclean exit from the mainmenu.
+		 * This is especially useful on Android because closing the app from the
+		 * "Recents screen" results in an unclean exit.
+		 * Caveat: This means that the settings are saved twice when exiting Minetest.
+		 */
+		if (!g_settings_path.empty())
+			g_settings->updateConfigFile(g_settings_path.c_str());
 
 		// If no main menu, show error and exit
 		if (skip_main_menu) {
-			if (!error_message.empty()) {
-				verbosestream << "error_message = "
-				              << error_message << std::endl;
+			if (!error_message.empty())
 				retval = false;
-			}
 			break;
 		}
 	} // Menu-game loop
 
-	g_menuclouds->drop();
+	// If profiler was enabled print it one last time
+	if (g_settings->getFloat("profiler_print_interval") > 0) {
+		infostream << "Profiler:" << std::endl;
+		g_profiler->print(infostream);
+		g_profiler->clear();
+	}
+
+	assert(g_menucloudsmgr->getReferenceCount() == 1);
 	g_menucloudsmgr->drop();
+	g_menucloudsmgr = nullptr;
+	assert(g_menuclouds->getReferenceCount() == 1);
+	g_menuclouds->drop();
+	g_menuclouds = nullptr;
 
 #ifdef _IRR_COMPILE_WITH_LEAK_HUNTER_
 	auto objects = LeakHunter::getReferenceCountedObjects();
@@ -365,8 +329,12 @@ void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_ar
 bool ClientLauncher::init_engine()
 {
 	receiver = new MyEventReceiver();
-	m_rendering_engine = new RenderingEngine(receiver);
-	return m_rendering_engine->get_raw_device() != nullptr;
+	try {
+		m_rendering_engine = new RenderingEngine(receiver);
+	} catch (std::exception &e) {
+		errorstream << e.what() << std::endl;
+	}
+	return !!m_rendering_engine;
 }
 
 void ClientLauncher::init_input()
@@ -396,6 +364,65 @@ void ClientLauncher::init_input()
 	}
 }
 
+void ClientLauncher::setting_changed_callback(const std::string &name, void *data)
+{
+	static_cast<ClientLauncher*>(data)->config_guienv();
+}
+
+void ClientLauncher::config_guienv()
+{
+	gui::IGUISkin *skin = guienv->getSkin();
+
+	skin->setColor(gui::EGDC_WINDOW_SYMBOL, video::SColor(255, 255, 255, 255));
+	skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255));
+	skin->setColor(gui::EGDC_3D_LIGHT, video::SColor(0, 0, 0, 0));
+	skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255, 30, 30, 30));
+	skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255, 0, 0, 0));
+	//skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 70, 120, 50));
+	skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 56, 121, 65));
+	skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255));
+	skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128));
+	//skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 96, 134, 49));
+	skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 97, 173, 109));
+
+	float density = rangelim(g_settings->getFloat("gui_scaling"), 0.5f, 20) *
+		RenderingEngine::getDisplayDensity();
+	skin->setScale(density);
+	skin->setSize(gui::EGDS_CHECK_BOX_WIDTH, (s32)(17.0f * density));
+	skin->setSize(gui::EGDS_SCROLLBAR_SIZE, (s32)(21.0f * density));
+	skin->setSize(gui::EGDS_WINDOW_BUTTON_WIDTH, (s32)(15.0f * density));
+
+	static u32 orig_sprite_id = skin->getIcon(gui::EGDI_CHECK_BOX_CHECKED);
+	static std::unordered_map<std::string, u32> sprite_ids;
+
+	if (density > 1.5f) {
+		// Texture dimensions should be a power of 2
+		std::string path = porting::path_share + "/textures/base/pack/";
+		if (density > 3.5f)
+			path.append("checkbox_64.png");
+		else if (density > 2.0f)
+			path.append("checkbox_32.png");
+		else
+			path.append("checkbox_16.png");
+
+		auto cached_id = sprite_ids.find(path);
+		if (cached_id != sprite_ids.end()) {
+			skin->setIcon(gui::EGDI_CHECK_BOX_CHECKED, cached_id->second);
+		} else {
+			gui::IGUISpriteBank *sprites = skin->getSpriteBank();
+			video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
+			video::ITexture *texture = driver->getTexture(path.c_str());
+			s32 id = sprites->addTextureAsSprite(texture);
+			if (id != -1) {
+				skin->setIcon(gui::EGDI_CHECK_BOX_CHECKED, id);
+				sprite_ids.emplace(path, id);
+			}
+		}
+	} else {
+		skin->setIcon(gui::EGDI_CHECK_BOX_CHECKED, orig_sprite_id);
+	}
+}
+
 bool ClientLauncher::launch_game(std::string &error_message,
 		bool reconnect_requested, GameStartData &start_data,
 		const Settings &cmd_args)
@@ -410,7 +437,7 @@ bool ClientLauncher::launch_game(std::string &error_message,
 	if (cmd_args.exists("password-file")) {
 		std::ifstream passfile(cmd_args.get("password-file"));
 		if (passfile.good()) {
-			getline(passfile, start_data.password);
+			std::getline(passfile, start_data.password);
 		} else {
 			error_message = gettext("Provided password file "
 					"failed to open: ")
@@ -467,8 +494,6 @@ bool ClientLauncher::launch_game(std::string &error_message,
 
 		int world_index = menudata.selected_world;
 		if (world_index >= 0 && world_index < (int)worldspecs.size()) {
-			g_settings->set("selected_world_path",
-					worldspecs[world_index].path);
 			start_data.world_spec = worldspecs[world_index];
 		}
 
@@ -562,15 +587,7 @@ bool ClientLauncher::launch_game(std::string &error_message,
 			return false;
 		}
 
-		if (porting::signal_handler_killstatus())
-			return true;
-
-		if (!start_data.game_spec.isValid()) {
-			error_message = _("Invalid gamespec.");
-			error_message += " (world.gameid=" + worldspec.gameid + ")";
-			errorstream << error_message << std::endl;
-			return false;
-		}
+		return true;
 	}
 
 	start_data.world_path = start_data.world_spec.path;
@@ -595,13 +612,13 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
 	}
 	infostream << "Waited for other menus" << std::endl;
 
-#ifndef ANDROID
-	// Cursor can be non-visible when coming from the game
-	m_rendering_engine->get_raw_device()->getCursorControl()->setVisible(true);
-
-	// Set absolute mouse mode
-	m_rendering_engine->get_raw_device()->getCursorControl()->setRelativeMode(false);
-#endif
+	auto *cur_control = m_rendering_engine->get_raw_device()->getCursorControl();
+	if (cur_control) {
+		// Cursor can be non-visible when coming from the game
+		cur_control->setVisible(true);
+		// Set absolute mouse mode
+		cur_control->setRelativeMode(false);
+	}
 
 	/* show main menu */
 	GUIEngine mymenu(&input->joystick, guiroot, m_rendering_engine, &g_menumgr, menudata, *kill);
@@ -610,108 +627,16 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
 	m_rendering_engine->get_scene_manager()->clear();
 
 	ServerList::lan_adv_client.stop();
-}
 
-void ClientLauncher::speed_tests()
-{
-	// volatile to avoid some potential compiler optimisations
-	volatile static s16 temp16;
-	volatile static f32 tempf;
-	// Silence compiler warning
-	(void)temp16;
-	static v3f tempv3f1;
-	static v3f tempv3f2;
-	static std::string tempstring;
-	static std::string tempstring2;
-
-	tempv3f1 = v3f();
-	tempv3f2 = v3f();
-	tempstring.clear();
-	tempstring2.clear();
-
-	{
-		infostream << "The following test should take around 20ms." << std::endl;
-		TimeTaker timer("Testing std::string speed");
-		const u32 jj = 10000;
-		for (u32 j = 0; j < jj; j++) {
-			tempstring.clear();
-			tempstring2.clear();
-			const u32 ii = 10;
-			for (u32 i = 0; i < ii; i++) {
-				tempstring2 += "asd";
-			}
-			for (u32 i = 0; i < ii+1; i++) {
-				tempstring += "asd";
-				if (tempstring == tempstring2)
-					break;
-			}
-		}
-	}
-
-	infostream << "All of the following tests should take around 100ms each."
-	           << std::endl;
-
-	{
-		TimeTaker timer("Testing floating-point conversion speed");
-		tempf = 0.001;
-		for (u32 i = 0; i < 4000000; i++) {
-			temp16 += tempf;
-			tempf += 0.001;
-		}
-	}
-
-	{
-		TimeTaker timer("Testing floating-point vector speed");
-
-		tempv3f1 = v3f(1, 2, 3);
-		tempv3f2 = v3f(4, 5, 6);
-		for (u32 i = 0; i < 10000000; i++) {
-			tempf += tempv3f1.dotProduct(tempv3f2);
-			tempv3f2 += v3f(7, 8, 9);
-		}
-	}
-
-	{
-		TimeTaker timer("Testing std::map speed");
-
-		std::map<v2s16, f32> map1;
-		tempf = -324;
-		const s16 ii = 300;
-		for (s16 y = 0; y < ii; y++) {
-			for (s16 x = 0; x < ii; x++) {
-				map1[v2s16(x, y)] =  tempf;
-				tempf += 1;
-			}
-		}
-		for (s16 y = ii - 1; y >= 0; y--) {
-			for (s16 x = 0; x < ii; x++) {
-				tempf = map1[v2s16(x, y)];
-			}
-		}
-	}
-
-	{
-		infostream << "Around 5000/ms should do well here." << std::endl;
-		TimeTaker timer("Testing mutex speed");
-		timer.start();
-		
-		std::mutex m;
-		u32 n = 0;
-		u32 i = 0;
-		do {
-			n += 10000;
-			for (; i < n; i++) {
-				m.lock();
-				m.unlock();
-			}
-		}
-		// Do at least 10ms
-		while(timer.getTimerTime() < 10);
-
-		u32 dtime = timer.stop();
-		u32 per_ms = n / dtime;
-		infostream << "Done. " << dtime << "ms, " << per_ms << "/ms" << std::endl;
-	}
+	/* Save the settings when leaving the mainmenu.
+	 * This makes sure that setting changes made in the mainmenu are persisted
+	 * even in case of a later unclean exit from the game.
+	 * This is especially useful on Android because closing the app from the
+	 * "Recents screen" results in an unclean exit.
+	 * Caveat: This means that the settings are saved twice when exiting Minetest.
+	 */
+	if (!g_settings_path.empty())
+		g_settings->updateConfigFile(g_settings_path.c_str());
 }
 
 //freeminer:
diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index 2d0ce184d..894236439 100644
--- a/src/client/clientlauncher.h
+++ b/src/client/clientlauncher.h
@@ -35,25 +35,26 @@ public:
 	bool run(GameStartData &start_data, const Settings &cmd_args);
 
 private:
+	// freminer:
+	void wait_data();
+	unsigned int autoexit {};
+	// == 
+
 	void init_args(GameStartData &start_data, const Settings &cmd_args);
 	bool init_engine();
 	void init_input();
 
+	static void setting_changed_callback(const std::string &name, void *data);
+	void config_guienv();
+
 	bool launch_game(std::string &error_message, bool reconnect_requested,
 		GameStartData &start_data, const Settings &cmd_args);
 
 	void main_menu(MainMenuData *menudata);
 
-	void speed_tests();
-
 	bool skip_main_menu = false;
 	bool random_input = false;
 	RenderingEngine *m_rendering_engine = nullptr;
 	InputHandler *input = nullptr;
 	MyEventReceiver *receiver = nullptr;
-	gui::IGUISkin *skin = nullptr;
-
-	//freminer:
-	void wait_data();
-	unsigned int autoexit;
 };
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
index b4e6429ff..a8d4185d6 100644
--- a/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@ -17,9 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "client/fm_far_calc.h"
+
 #include "clientmap.h"
 #include "client.h"
-#include "client/fm_far_calc.h"
 #include "client/mesh.h"
 #include "mapblock_mesh.h"
 #include <IMaterialRenderer.h>
@@ -35,33 +36,43 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <queue>
 
-// struct MeshBufListList
-void MeshBufListList::clear()
-{
-	for (auto &list : lists)
-		list.clear();
-}
+namespace {
+	// A helper struct
+	struct MeshBufListMaps
+	{
+		struct MaterialHash
+		{
+			size_t operator()(const video::SMaterial &m) const noexcept
+			{
+				// Only hash first texture. Simple and fast.
+				return std::hash<video::ITexture *>{}(m.TextureLayers[0].Texture);
+			}
+		};
 
-void MeshBufListList::add(scene::IMeshBuffer *buf, v3s16 position, u8 layer)
-{
-	// Append to the correct layer
-	std::vector<MeshBufList> &list = lists[layer];
-	const video::SMaterial &m = buf->getMaterial();
-	for (MeshBufList &l : list) {
-		// comparing a full material is quite expensive so we don't do it if
-		// not even first texture is equal
-		if (l.m.TextureLayers[0].Texture != m.TextureLayers[0].Texture)
-			continue;
+		using MeshBufListMap = std::unordered_map<
+				video::SMaterial,
+				std::vector<std::pair<v3s16, scene::IMeshBuffer *>>,
+				MaterialHash>;
 
-		if (l.m == m) {
-			l.bufs.emplace_back(position, buf);
-			return;
+		std::array<MeshBufListMap, MAX_TILE_LAYERS> maps;
+
+		void clear()
+		{
+			for (auto &map : maps)
+				map.clear();
 		}
-	}
-	MeshBufList l;
-	l.m = m;
-	l.bufs.emplace_back(position, buf);
-	list.emplace_back(l);
+
+		void add(scene::IMeshBuffer *buf, v3s16 position, u8 layer)
+		{
+			assert(layer < MAX_TILE_LAYERS);
+
+			// Append to the correct layer
+			auto &map = maps[layer];
+			const video::SMaterial &m = buf->getMaterial();
+			auto &bufs = map[m]; // default constructs if non-existent
+			bufs.emplace_back(position, buf);
+		}
+	};
 }
 
 void MapDrawControl::fm_init()
@@ -356,7 +367,7 @@ void ClientMap::updateDrawList(float dtime, unsigned int max_cycle_ms)
 		MapBlockVect sectorblocks;
 
 		for (auto &sector_it : m_sectors) {
-			MapSector *sector = sector_it.second;
+			const MapSector *sector = sector_it.second;
 			v2s16 sp = sector->getPos();
 
 			blocks_loaded += sector->size();
@@ -366,14 +377,9 @@ void ClientMap::updateDrawList(float dtime, unsigned int max_cycle_ms)
 					continue;
 			}
 
-
-
-
-			sectorblocks.clear();
-			sector->getBlocks(sectorblocks);
-
 			// Loop through blocks in sector
-			for (MapBlock *block : sectorblocks) {
+			for (const auto &entry : sector->getBlocks()) {
+				MapBlock *block = entry.second.get();
 				MapBlockMesh *mesh = block->mesh;
 */
 			{
@@ -382,7 +388,7 @@ void ClientMap::updateDrawList(float dtime, unsigned int max_cycle_ms)
 				v3f mesh_sphere_center;
 				f32 mesh_sphere_radius;
 
-				v3s16 block_pos_nodes = block->getPos() * MAP_BLOCKSIZE;
+				v3s16 block_pos_nodes = block->getPosRelative();
 
 				if (mesh) {
 					mesh_sphere_center = intToFloat(block_pos_nodes, BS)
@@ -695,7 +701,7 @@ void ClientMap::touchMapBlocks()
 
 /*
 	for (const auto &sector_it : m_sectors) {
-		MapSector *sector = sector_it.second;
+		const MapSector *sector = sector_it.second;
 		v2s16 sp = sector->getPos();
 
 		blocks_loaded += sector->size();
@@ -704,24 +710,23 @@ void ClientMap::touchMapBlocks()
 					sp.Y < p_blocks_min.Z || sp.Y > p_blocks_max.Z)
 				continue;
 		}
-
-		MapBlockVect sectorblocks;
-		sector->getBlocks(sectorblocks);
 */
 		/*
 			Loop through blocks in sector
 		*/
-	{
 		for (auto & [key, block] : m_blocks) {
-		//for (MapBlock *block : sectorblocks) {
-		//	MapBlockMesh *mesh = block->mesh;
 			const auto mesh = block->getLodMesh(0, true);
+/*
+		for (const auto &entry : sector->getBlocks()) {
+			MapBlock *block = entry.second.get();
+			MapBlockMesh *mesh = block->mesh;
+*/
 
 			// Calculate the coordinates for range and frustum culling
 			v3f mesh_sphere_center;
 			f32 mesh_sphere_radius;
 
-			v3s16 block_pos_nodes = block->getPos() * MAP_BLOCKSIZE;
+			v3s16 block_pos_nodes = block->getPosRelative();
 
 			if (mesh) {
 				mesh_sphere_center = intToFloat(block_pos_nodes, BS)
@@ -743,7 +748,8 @@ void ClientMap::touchMapBlocks()
 			block->resetUsageTimer();
 			blocks_in_range_with_mesh++;
 		}
-	}
+
+	//}
 
 	g_profiler->avg("MapBlock meshes in range [#]", blocks_in_range_with_mesh);
 	g_profiler->avg("MapBlocks loaded [#]", blocks_loaded);
@@ -1213,7 +1219,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 		Draw the selected MapBlocks
 	*/
 
-	MeshBufListList grouped_buffers;
+	MeshBufListMaps grouped_buffers;
 	std::vector<DrawDescriptor> draw_order;
 	video::SMaterial previous_material;
 
@@ -1288,7 +1294,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 		}
 		else {
 			// otherwise, group buffers across meshes
-			// using MeshBufListList
+			// using MeshBufListMaps
 			for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) {
 				scene::IMesh *mesh = block_mesh->getMesh(layer);
 				assert(mesh);
@@ -1314,11 +1320,11 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 	}
 
 	// Capture draw order for all solid meshes
-	for (auto &lists : grouped_buffers.lists) {
-		for (MeshBufList &list : lists) {
+	for (auto &map : grouped_buffers.maps) {
+		for (auto &list : map) {
 			// iterate in reverse to draw closest blocks first
-			for (auto it = list.bufs.rbegin(); it != list.bufs.rend(); ++it) {
-				draw_order.emplace_back(it->first, it->second, it != list.bufs.rbegin());
+			for (auto it = list.second.rbegin(); it != list.second.rend(); ++it) {
+				draw_order.emplace_back(it->first, it->second, it != list.second.rbegin());
 			}
 		}
 	}
@@ -1599,7 +1605,7 @@ void ClientMap::renderMapShadows(video::IVideoDriver *driver,
 	u32 drawcall_count = 0;
 	u32 vertex_count = 0;
 
-	MeshBufListList grouped_buffers;
+	MeshBufListMaps grouped_buffers;
 	std::vector<DrawDescriptor> draw_order;
 
 
@@ -1645,9 +1651,11 @@ void ClientMap::renderMapShadows(video::IVideoDriver *driver,
 		}
 		else {
 			// otherwise, group buffers across meshes
-			// using MeshBufListList
-			//auto mapBlockMesh = block->mesh;
-			//assert(mapBlockMesh);
+			// using MeshBufListMaps
+/*
+			MapBlockMesh *mapBlockMesh = block->mesh;
+			assert(mapBlockMesh);
+*/
 
 			for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) {
 				scene::IMesh *mesh = mapBlockMesh->getMesh(layer);
@@ -1668,18 +1676,18 @@ void ClientMap::renderMapShadows(video::IVideoDriver *driver,
 	}
 
 	u32 buffer_count = 0;
-	for (auto &lists : grouped_buffers.lists)
-		for (MeshBufList &list : lists)
-			buffer_count += list.bufs.size();
+	for (auto &map : grouped_buffers.maps)
+		for (auto &list : map)
+			buffer_count += list.second.size();
 
 	draw_order.reserve(draw_order.size() + buffer_count);
 
 	// Capture draw order for all solid meshes
-	for (auto &lists : grouped_buffers.lists) {
-		for (MeshBufList &list : lists) {
+	for (auto &map : grouped_buffers.maps) {
+		for (auto &list : map) {
 			// iterate in reverse to draw closest blocks first
-			for (auto it = list.bufs.rbegin(); it != list.bufs.rend(); ++it)
-				draw_order.emplace_back(it->first, it->second, it != list.bufs.rbegin());
+			for (auto it = list.second.rbegin(); it != list.second.rend(); ++it)
+				draw_order.emplace_back(it->first, it->second, it != list.second.rbegin());
 		}
 	}
 
@@ -1741,11 +1749,6 @@ void ClientMap::updateDrawListShadow(v3f shadow_light_pos, v3f shadow_light_dir,
 {
 	ScopeProfiler sp(g_profiler, "CM::updateDrawListShadow()", SPT_AVG);
 
-	v3s16 cam_pos_nodes = floatToInt(shadow_light_pos, BS);
-	v3s16 p_blocks_min;
-	v3s16 p_blocks_max;
-	getBlocksInViewRange(cam_pos_nodes, &p_blocks_min, &p_blocks_max, radius + length);
-
 	for (auto &i : m_drawlist_shadow) {
 		MapBlock *block = i.second;
 		block->refDrop();
@@ -1759,24 +1762,22 @@ void ClientMap::updateDrawListShadow(v3f shadow_light_pos, v3f shadow_light_dir,
 
 /*
 	for (auto &sector_it : m_sectors) {
-		MapSector *sector = sector_it.second;
+		const MapSector *sector = sector_it.second;
 		if (!sector)
 			continue;
 		blocks_loaded += sector->size();
-
-		MapBlockVect sectorblocks;
-		sector->getBlocks(sectorblocks);
-
 */
 		/*
 			Loop through blocks in sector
 		*/
+
 		for (const auto & [key, block] : m_blocks) {
 			++blocks_loaded;
-			
 			const auto mesh = block->getLodMesh(getLodStep(m_control, getNodeBlockPos(m_camera_position_node), block->getPos()), true);
+
 /*
-		for (MapBlock *block : sectorblocks) {
+		for (const auto &entry : sector->getBlocks()) {
+			MapBlock *block = entry.second.get();
 			MapBlockMesh *mesh = block->mesh;
 */
 			if (!mesh) {
@@ -1784,7 +1785,7 @@ void ClientMap::updateDrawListShadow(v3f shadow_light_pos, v3f shadow_light_dir,
 				continue;
 			}
 
-			v3f block_pos = intToFloat(block->getPos() * MAP_BLOCKSIZE, BS) + mesh->getBoundingSphereCenter();
+			v3f block_pos = intToFloat(block->getPosRelative(), BS) + mesh->getBoundingSphereCenter();
 			v3f projection = shadow_light_pos + shadow_light_dir * shadow_light_dir.dotProduct(block_pos - shadow_light_pos);
 			if (projection.getDistanceFrom(block_pos) > (radius + mesh->getBoundingRadius()))
 				continue;
@@ -1817,7 +1818,7 @@ void ClientMap::updateTransparentMeshBuffers()
 	ScopeProfiler sp(g_profiler, "CM::updateTransparentMeshBuffers", SPT_AVG);
 	u32 sorted_blocks = 0;
 	u32 unsorted_blocks = 0;
-	f32 sorting_distance_sq = pow(m_cache_transparency_sorting_distance * BS, 2.0f);
+	f32 sorting_distance_sq = std::pow(m_cache_transparency_sorting_distance * BS, 2.0f);
 
 
 	// Update the order of transparent mesh buffers in each mesh
diff --git a/src/client/clientmap.h b/src/client/clientmap.h
index 49022333f..f74365f23 100644
--- a/src/client/clientmap.h
+++ b/src/client/clientmap.h
@@ -69,25 +69,6 @@ struct MapDrawControl
 	bool show_wireframe = false;
 };
 
-struct MeshBufList
-{
-	video::SMaterial m;
-	std::vector<std::pair<v3s16,scene::IMeshBuffer*>> bufs;
-};
-
-struct MeshBufListList
-{
-	/*!
-	 * Stores the mesh buffers of the world.
-	 * The array index is the material's layer.
-	 * The vector part groups vertices by material.
-	 */
-	std::vector<MeshBufList> lists[MAX_TILE_LAYERS];
-
-	void clear();
-	void add(scene::IMeshBuffer *buf, v3s16 position, u8 layer);
-};
-
 class Client;
 class ITextureSource;
 class PartialMeshBuffer;
@@ -108,18 +89,11 @@ public:
 			s32 id
 	);
 
-	virtual ~ClientMap();
-
 	bool maySaveBlocks() override
 	{
 		return false;
 	}
 
-	void drop() override
-	{
-		ISceneNode::drop(); // calls destructor
-	}
-
 	void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset, video::SColor light_color);
 
 	/*
@@ -176,6 +150,9 @@ public:
 	void onSettingChanged(const std::string &name);
 
 protected:
+	// use drop() instead
+	virtual ~ClientMap();
+
 	void reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks) override;
 private:
 	bool isMeshOccluded(MapBlock *mesh_block, u16 mesh_size, v3s16 cam_pos_nodes);
diff --git a/src/client/clientmedia.cpp b/src/client/clientmedia.cpp
index 9d9f90e38..f0280e92a 100644
--- a/src/client/clientmedia.cpp
+++ b/src/client/clientmedia.cpp
@@ -21,6 +21,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "clientmedia.h"
+#include "gettext.h"
 #include "httpfetch.h"
 #include "client.h"
 #include "filecache.h"
@@ -32,6 +33,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/serialize.h"
 #include "util/sha1.h"
 #include "util/string.h"
+#include <sstream>
 
 static std::string getMediaCacheDir()
 {
@@ -44,7 +46,16 @@ bool clientMediaUpdateCache(const std::string &raw_hash, const std::string &file
 	std::string sha1_hex = hex_encode(raw_hash);
 	if (!media_cache.exists(sha1_hex))
 		return media_cache.update(sha1_hex, filedata);
-	return true;
+	return false;
+}
+
+bool clientMediaUpdateCacheCopy(const std::string &raw_hash, const std::string &path)
+{
+	FileCache media_cache(getMediaCacheDir());
+	std::string sha1_hex = hex_encode(raw_hash);
+	if (!media_cache.exists(sha1_hex))
+		return media_cache.updateCopyFile(sha1_hex, path);
+	return false;
 }
 
 /*
@@ -177,6 +188,11 @@ void ClientMediaDownloader::step(Client *client)
 
 void ClientMediaDownloader::initialStep(Client *client)
 {
+	std::wstring loading_text = wstrgettext("Media...");
+	// Tradeoff between responsiveness during media loading and media loading speed
+	const u64 chunk_time_ms = 33;
+	u64 last_time = porting::getTimeMs();
+
 	// Check media cache
 	m_uncached_count = m_files.size();
 	for (auto &file_it : m_files) {
@@ -194,14 +210,17 @@ void ClientMediaDownloader::initialStep(Client *client)
 			filestatus->received = true;
 			m_uncached_count--;
 		}
+
+		u64 cur_time = porting::getTimeMs();
+		u64 dtime = porting::getDeltaMs(last_time, cur_time);
+		if (dtime >= chunk_time_ms) {
+			client->drawLoadScreen(loading_text, dtime / 1000.0f, 30);
+			last_time = cur_time;
+		}
 	}
 
 	assert(m_uncached_received_count == 0);
 
-	// Create the media cache dir if we are likely to write to it
-	if (m_uncached_count != 0)
-		createCacheDirs();
-
 	// If we found all files in the cache, report this fact to the server.
 	// If the server reported no remote servers, immediately start
 	// conventional transfers. Note: if cURL support is not compiled in,
@@ -520,18 +539,6 @@ IClientMediaDownloader::IClientMediaDownloader():
 {
 }
 
-void IClientMediaDownloader::createCacheDirs()
-{
-	if (!m_write_to_cache)
-		return;
-
-	std::string path = getMediaCacheDir();
-	if (!fs::CreateAllDirs(path)) {
-		errorstream << "Client: Could not create media cache directory: "
-			<< path << std::endl;
-	}
-}
-
 bool IClientMediaDownloader::tryLoadFromCache(const std::string &name,
 	const std::string &sha1, Client *client)
 {
@@ -556,11 +563,9 @@ bool IClientMediaDownloader::checkAndLoad(
 	// Compute actual checksum of data
 	std::string data_sha1;
 	{
-		class SHA1 data_sha1_calculator;
-		data_sha1_calculator.addBytes(data.c_str(), data.size());
-		unsigned char *data_tmpdigest = data_sha1_calculator.getDigest();
-		data_sha1.assign((char*) data_tmpdigest, 20);
-		free(data_tmpdigest);
+		class SHA1 ctx;
+		ctx.addBytes(data);
+		data_sha1 = ctx.getDigest();
 	}
 
 	// Check that received file matches announced checksum
@@ -735,8 +740,6 @@ void SingleMediaDownloader::initialStep(Client *client)
 	if (isDone())
 		return;
 
-	createCacheDirs();
-
 	// If the server reported no remote servers, immediately fall back to
 	// conventional transfer.
 	if (!USE_CURL || m_remotes.empty()) {
diff --git a/src/client/clientmedia.h b/src/client/clientmedia.h
index 0bf41b899..d81dd5e1d 100644
--- a/src/client/clientmedia.h
+++ b/src/client/clientmedia.h
@@ -25,7 +25,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlichttypes.h"
 #include "filecache.h"
 #include "util/basic_macros.h"
-#include <ostream>
 #include <map>
 #include <set>
 #include <vector>
@@ -38,10 +37,15 @@ struct HTTPFetchResult;
 #define MTHASHSET_FILE_NAME "index.mth"
 
 // Store file into media cache (unless it exists already)
-// Validating the hash is responsibility of the caller
+// Caller should check the hash.
+// return true if something was updated
 bool clientMediaUpdateCache(const std::string &raw_hash,
 	const std::string &filedata);
 
+// Copy file on disk(!) into media cache (unless it exists already)
+bool clientMediaUpdateCacheCopy(const std::string &raw_hash,
+	const std::string &path);
+
 // more of a base class than an interface but this name was most convenient...
 class IClientMediaDownloader
 {
@@ -84,8 +88,6 @@ protected:
 	virtual bool loadMedia(Client *client, const std::string &data,
 		const std::string &name) = 0;
 
-	void createCacheDirs();
-
 	bool tryLoadFromCache(const std::string &name, const std::string &sha1,
 			Client *client);
 
diff --git a/src/client/clouds.cpp b/src/client/clouds.cpp
index f3700875d..6d1957ccf 100644
--- a/src/client/clouds.cpp
+++ b/src/client/clouds.cpp
@@ -21,10 +21,12 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "client/renderingengine.h"
+#include "client/shader.h"
 #include "clouds.h"
-#include "noise.h"
 #include "constants.h"
 #include "debug.h"
+#include "irrlicht_changes/printing.h"
+#include "noise.h"
 #include "profiler.h"
 #include "settings.h"
 #include <cmath>
@@ -43,35 +45,38 @@ static void cloud_3d_setting_changed(const std::string &settingname, void *data)
 	((Clouds *)data)->readSettings();
 }
 
-Clouds::Clouds(scene::ISceneManager* mgr,
+Clouds::Clouds(scene::ISceneManager* mgr, IShaderSource *ssrc,
 		s32 id,
 		u32 seed
 ):
 	scene::ISceneNode(mgr->getRootSceneNode(), mgr, id),
 	m_seed(seed)
 {
+	m_enable_shaders = g_settings->getBool("enable_shaders");
+	// menu clouds use shader-less clouds for simplicity (ssrc == NULL)
+	m_enable_shaders = m_enable_shaders && ssrc;
+
 	m_material.Lighting = false;
 	m_material.BackfaceCulling = true;
 	m_material.FogEnable = true;
 	m_material.AntiAliasing = video::EAAM_SIMPLE;
-	m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	m_material.forEachTexture([] (auto &tex) {
-		tex.MinFilter = video::ETMINF_NEAREST_MIPMAP_NEAREST;
-		tex.MagFilter = video::ETMAGF_NEAREST;
-	});
+	if (m_enable_shaders) {
+		auto sid = ssrc->getShader("cloud_shader", TILE_MATERIAL_ALPHA);
+		m_material.MaterialType = ssrc->getShaderInfo(sid).material;
+	} else {
+		m_material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+	}
 
-	m_params.height        = 120;
-	m_params.density       = 0.4f;
-	m_params.thickness     = 16.0f;
-	m_params.color_bright  = video::SColor(229, 240, 240, 255);
-	m_params.color_ambient = video::SColor(255, 0, 0, 0);
-	m_params.speed         = v2f(0.0f, -2.0f);
+	m_params = SkyboxDefaults::getCloudDefaults();
 
 	readSettings();
 	g_settings->registerChangedCallback("enable_3d_clouds",
 		&cloud_3d_setting_changed, this);
 
 	updateBox();
+
+	m_meshbuffer.reset(new scene::SMeshBuffer());
+	m_meshbuffer->setHardwareMappingHint(scene::EHM_DYNAMIC);
 }
 
 Clouds::~Clouds()
@@ -85,7 +90,6 @@ void Clouds::OnRegisterSceneNode()
 	if(IsVisible)
 	{
 		SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT);
-		//SceneManager->registerNodeForRendering(this, scene::ESNRP_SOLID);
 	}
 
 	ISceneNode::OnRegisterSceneNode();
@@ -98,37 +102,11 @@ inline static void applyShadeFactor(video::SColor& color, float factor)
 	color.setBlue(core::clamp(core::round32(color.getBlue()*factor), 0, 255));
 }
 
-void Clouds::render()
+void Clouds::updateMesh()
 {
+	// Clouds move from Z+ towards Z-
 
-	if (m_params.density <= 0.0f)
-		return; // no need to do anything
-
-	video::IVideoDriver* driver = SceneManager->getVideoDriver();
-
-	if(SceneManager->getSceneNodeRenderPass() != scene::ESNRP_TRANSPARENT)
-	//if(SceneManager->getSceneNodeRenderPass() != scene::ESNRP_SOLID)
-		return;
-
-/*
-	ScopeProfiler sp(g_profiler, "Clouds::render()", SPT_AVG);
-*/
-
-	int num_faces_to_draw = m_enable_3d ? 6 : 1;
-
-	m_material.BackfaceCulling = m_enable_3d;
-
-	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-	driver->setMaterial(m_material);
-
-	/*
-		Clouds move from Z+ towards Z-
-	*/
-
-	//const float cloud_mul = m_params.height/BS/120; // fmtodo: remake
 	const float cloud_mul = 1;
-	//cloud_size = BS * 64.0f * cloud_mul;
-	const float cloud_full_radius = cloud_size * m_cloud_radius_i;
 
 	v2f camera_pos_2d(m_camera_pos.X, m_camera_pos.Z);
 	// Position of cloud noise origin from the camera
@@ -141,62 +119,67 @@ void Clouds::render()
 		std::floor(center_of_drawing_in_noise_f.Y / cloud_size)
 	);
 
+	// Only update mesh if it has moved enough, this saves lots of GPU buffer uploads.
+	constexpr float max_d = 5 * BS;
+
+	if (!m_mesh_valid) {
+		// mesh was never created or invalidated
+	} else if (m_mesh_origin.getDistanceFrom(m_origin) >= max_d) {
+		// clouds moved
+	} else if (center_of_drawing_in_noise_i != m_last_noise_center) {
+		// noise offset changed
+		// I think in practice this never happens due to the camera offset
+		// being smaller than the cloud size.(?)
+	} else {
+		return;
+	}
+
+	ScopeProfiler sp(g_profiler, "Clouds::updateMesh()", SPT_AVG);
+	m_mesh_origin = m_origin;
+	m_last_noise_center = center_of_drawing_in_noise_i;
+	m_mesh_valid = true;
+
+	const u32 num_faces_to_draw = m_enable_3d ? 6 : 1;
+
 	// The world position of the integer center point of drawing in the noise
 	v2f world_center_of_drawing_in_noise_f = v2f(
 		center_of_drawing_in_noise_i.X * cloud_size,
 		center_of_drawing_in_noise_i.Y * cloud_size
 	) + m_origin;
 
-	/*video::SColor c_top(128,b*240,b*240,b*255);
-	video::SColor c_side_1(128,b*230,b*230,b*255);
-	video::SColor c_side_2(128,b*220,b*220,b*245);
-	video::SColor c_bottom(128,b*205,b*205,b*230);*/
+	// Colors with primitive shading
+
 	video::SColorf c_top_f(m_color);
 	video::SColorf c_side_1_f(m_color);
 	video::SColorf c_side_2_f(m_color);
 	video::SColorf c_bottom_f(m_color);
-	c_side_1_f.r *= 0.95;
-	c_side_1_f.g *= 0.95;
-	c_side_1_f.b *= 0.95;
-	c_side_2_f.r *= 0.90;
-	c_side_2_f.g *= 0.90;
-	c_side_2_f.b *= 0.90;
-	c_bottom_f.r *= 0.80;
-	c_bottom_f.g *= 0.80;
-	c_bottom_f.b *= 0.80;
+	if (m_enable_shaders) {
+		// shader mixes the base color, set via EmissiveColor
+		c_top_f = c_side_1_f = c_side_2_f = c_bottom_f = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f);
+	}
+	c_side_1_f.r *= 0.95f;
+	c_side_1_f.g *= 0.95f;
+	c_side_1_f.b *= 0.95f;
+	c_side_2_f.r *= 0.90f;
+	c_side_2_f.g *= 0.90f;
+	c_side_2_f.b *= 0.90f;
+	c_bottom_f.r *= 0.80f;
+	c_bottom_f.g *= 0.80f;
+	c_bottom_f.b *= 0.80f;
 	video::SColor c_top = c_top_f.toSColor();
 	video::SColor c_side_1 = c_side_1_f.toSColor();
 	video::SColor c_side_2 = c_side_2_f.toSColor();
 	video::SColor c_bottom = c_bottom_f.toSColor();
 
-
 	const auto humidity_color = 1 - ((float)m_humidity / 300);
 	applyShadeFactor(c_bottom, humidity_color);
 	applyShadeFactor(c_top, humidity_color);
 	applyShadeFactor(c_side_1, humidity_color);
 	applyShadeFactor(c_side_2, humidity_color);
 
-
-	// Get fog parameters for setting them back later
-	video::SColor fog_color(0,0,0,0);
-	video::E_FOG_TYPE fog_type = video::EFT_FOG_LINEAR;
-	f32 fog_start = 0;
-	f32 fog_end = 0;
-	f32 fog_density = 0;
-	bool fog_pixelfog = false;
-	bool fog_rangefog = false;
-	driver->getFog(fog_color, fog_type, fog_start, fog_end, fog_density,
-			fog_pixelfog, fog_rangefog);
-
-	// Set our own fog
-	driver->setFog(fog_color, fog_type, cloud_full_radius * 0.5,
-			cloud_full_radius*1.2, fog_density, fog_pixelfog, fog_rangefog);
-
 	// Read noise
 
 	std::vector<bool> grid(m_cloud_radius_i * 2 * m_cloud_radius_i * 2);
-	std::vector<video::S3DVertex> vertices;
-	vertices.reserve(16 * m_cloud_radius_i * m_cloud_radius_i);
 
 	for(s16 zi = -m_cloud_radius_i; zi < m_cloud_radius_i; zi++) {
 		u32 si = (zi + m_cloud_radius_i) * m_cloud_radius_i * 2 + m_cloud_radius_i;
@@ -212,10 +195,23 @@ void Clouds::render()
 		}
 	}
 
+
+	auto *mb = m_meshbuffer.get();
+	{
+		const u32 vertex_count = num_faces_to_draw * 16 * m_cloud_radius_i * m_cloud_radius_i;
+		const u32 quad_count = vertex_count / 4;
+		const u32 index_count = quad_count * 6;
+
+		// reserve memory
+		mb->Vertices.reallocate(vertex_count);
+		mb->Indices.reallocate(index_count);
+	}
+
 #define GETINDEX(x, z, radius) (((z)+(radius))*(radius)*2 + (x)+(radius))
 #define INAREA(x, z, radius) \
 	((x) >= -(radius) && (x) < (radius) && (z) >= -(radius) && (z) < (radius))
 
+	mb->Vertices.set_used(0);
 	for (s16 zi0= -m_cloud_radius_i; zi0 < m_cloud_radius_i; zi0++)
 	for (s16 xi0= -m_cloud_radius_i; xi0 < m_cloud_radius_i; xi0++)
 	{
@@ -246,7 +242,7 @@ void Clouds::render()
 		const f32 ry = m_enable_3d ? m_params.thickness * BS * cloud_mul : 0.0f;
 		const f32 rz = cloud_size / 2;
 
-		for(int i=0; i<num_faces_to_draw; i++)
+		for(u32 i = 0; i < num_faces_to_draw; i++)
 		{
 			switch(i)
 			{
@@ -332,27 +328,87 @@ void Clouds::render()
 			}
 
 			v3f pos(p0.X, m_params.height * BS, p0.Y);
-			pos -= intToFloat(m_camera_offset, BS);
 
 			for (video::S3DVertex &vertex : v) {
 				vertex.Pos += pos;
-				vertices.push_back(vertex);
+				mb->Vertices.push_back(vertex);
 			}
 		}
 	}
-	int quad_count = vertices.size() / 4;
-	std::vector<u16> indices;
-	indices.reserve(quad_count * 6);
-	for (int k = 0; k < quad_count; k++) {
-		indices.push_back(4 * k + 0);
-		indices.push_back(4 * k + 1);
-		indices.push_back(4 * k + 2);
-		indices.push_back(4 * k + 2);
-		indices.push_back(4 * k + 3);
-		indices.push_back(4 * k + 0);
+	mb->setDirty(scene::EBT_VERTEX);
+
+	const u32 quad_count = mb->getVertexCount() / 4;
+	const u32 index_count = quad_count * 6;
+	// rewrite index array as needed
+	if (mb->getIndexCount() > index_count) {
+		mb->Indices.set_used(index_count);
+		mb->setDirty(scene::EBT_INDEX);
+	} else if (mb->getIndexCount() < index_count) {
+		const u32 start = mb->getIndexCount() / 6;
+		assert(start * 6 == mb->getIndexCount());
+		for (u32 k = start; k < quad_count; k++) {
+			mb->Indices.push_back(4 * k + 0);
+			mb->Indices.push_back(4 * k + 1);
+			mb->Indices.push_back(4 * k + 2);
+			mb->Indices.push_back(4 * k + 2);
+			mb->Indices.push_back(4 * k + 3);
+			mb->Indices.push_back(4 * k + 0);
+		}
+		mb->setDirty(scene::EBT_INDEX);
 	}
-	driver->drawVertexPrimitiveList(vertices.data(), vertices.size(), indices.data(), 2 * quad_count,
-			video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT);
+
+	tracestream << "Cloud::updateMesh(): " << mb->getVertexCount() << " vertices"
+		<< std::endl;
+}
+
+void Clouds::render()
+{
+	if (m_params.density <= 0.0f)
+		return; // no need to do anything
+
+	video::IVideoDriver* driver = SceneManager->getVideoDriver();
+
+	if (SceneManager->getSceneNodeRenderPass() != scene::ESNRP_TRANSPARENT)
+		return;
+
+	updateMesh();
+
+	// Update position
+	{
+		v2f off_origin = m_origin - m_mesh_origin;
+		v3f rel(off_origin.X, 0, off_origin.Y);
+		rel -= intToFloat(m_camera_offset, BS);
+		setPosition(rel);
+		updateAbsolutePosition();
+	}
+
+	m_material.BackfaceCulling = m_enable_3d;
+	if (m_enable_shaders)
+		m_material.EmissiveColor = m_color.toSColor();
+
+	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
+	driver->setMaterial(m_material);
+
+	const float cloud_full_radius = cloud_size * m_cloud_radius_i;
+
+	// Get fog parameters for setting them back later
+	video::SColor fog_color(0,0,0,0);
+	video::E_FOG_TYPE fog_type = video::EFT_FOG_LINEAR;
+	f32 fog_start = 0;
+	f32 fog_end = 0;
+	f32 fog_density = 0;
+	bool fog_pixelfog = false;
+	bool fog_rangefog = false;
+	driver->getFog(fog_color, fog_type, fog_start, fog_end, fog_density,
+			fog_pixelfog, fog_rangefog);
+
+	// Set our own fog, unless it was already disabled
+	if (fog_start < FOG_RANGE_ALL) {
+		driver->setFog(fog_color, fog_type, cloud_full_radius * 0.5,
+				cloud_full_radius*1.2, fog_density, fog_pixelfog, fog_rangefog);
+	}
+
+	driver->drawMeshBuffer(m_meshbuffer.get());
 
 	// Restore fog settings
 	driver->setFog(fog_color, fog_type, fog_start, fog_end, fog_density,
@@ -373,13 +429,13 @@ void Clouds::update(const v3f &camera_p, const video::SColorf &color_diffuse, s1
 
 	video::SColorf ambient(m_params.color_ambient);
 	video::SColorf bright(m_params.color_bright);
-	m_camera_pos = camera_p;
 	m_color.r = core::clamp(color_diffuse.r * bright.r, ambient.r, 1.0f);
 	m_color.g = core::clamp(color_diffuse.g * bright.g, ambient.g, 1.0f);
 	m_color.b = core::clamp(color_diffuse.b * bright.b, ambient.b, 1.0f);
 	m_color.a = bright.a;
 
 	// is the camera inside the cloud mesh?
+	m_camera_pos = camera_p;
 	m_camera_inside_cloud = false; // default
 	if (m_enable_3d) {
 		float camera_height = camera_p.Y - BS * m_camera_offset.Y;
@@ -396,9 +452,14 @@ void Clouds::update(const v3f &camera_p, const video::SColorf &color_diffuse, s1
 
 void Clouds::readSettings()
 {
-	// Upper limit was chosen due to posible render bugs
-	m_cloud_radius_i = rangelim(g_settings->getU16("cloud_radius"), 1, 62);
+	// The code isn't designed to go over 64k vertices so the upper limits were
+	// chosen to avoid exactly that.
+	// refer to vertex_count in updateMesh()
 	m_enable_3d = g_settings->getBool("enable_3d_clouds");
+	const u16 maximum = m_enable_3d ? 62 : 25;
+	m_cloud_radius_i = rangelim(g_settings->getU16("cloud_radius"), 1, maximum);
+
+	invalidateMesh();
 }
 
 bool Clouds::gridFilled(int x, int y, s16 humidity) const
diff --git a/src/client/clouds.h b/src/client/clouds.h
index 288f6fb49..bb267739b 100644
--- a/src/client/clouds.h
+++ b/src/client/clouds.h
@@ -22,10 +22,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
-#include <iostream>
 #include "constants.h"
+#include "irr_ptr.h"
+#include "irrlichttypes_extrabloated.h"
 #include "skyparams.h"
+#include <iostream>
+
+class IShaderSource;
 
 // Menu clouds
 class Clouds;
@@ -37,7 +40,7 @@ extern scene::ISceneManager *g_menucloudsmgr;
 class Clouds : public scene::ISceneNode
 {
 public:
-	Clouds(scene::ISceneManager* mgr,
+	Clouds(scene::ISceneManager* mgr, IShaderSource *ssrc,
 			s32 id,
 			u32 seed
 	);
@@ -75,7 +78,7 @@ public:
 
 	void update(const v3f &camera_p, const video::SColorf &color, s16 humidity = 50);
 
-	void updateCameraOffset(const v3s16 &camera_offset)
+	void updateCameraOffset(v3s16 camera_offset)
 	{
 		m_camera_offset = camera_offset;
 		updateBox();
@@ -85,24 +88,29 @@ public:
 
 	void setDensity(float density)
 	{
+		if (m_params.density == density)
+			return;
 		m_params.density = density;
-		// currently does not need bounding
+		invalidateMesh();
 	}
 
-	void setColorBright(const video::SColor &color_bright)
+	void setColorBright(video::SColor color_bright)
 	{
 		m_params.color_bright = color_bright;
 	}
 
-	void setColorAmbient(const video::SColor &color_ambient)
+	void setColorAmbient(video::SColor color_ambient)
 	{
 		m_params.color_ambient = color_ambient;
 	}
 
 	void setHeight(float height)
 	{
-		m_params.height = height; // add bounding when necessary
+		if (m_params.height == height)
+			return;
+		m_params.height = height;
 		updateBox();
+		invalidateMesh();
 	}
 
 	void setSpeed(v2f speed)
@@ -112,8 +120,11 @@ public:
 
 	void setThickness(float thickness)
 	{
+		if (m_params.thickness == thickness)
+			return;
 		m_params.thickness = thickness;
 		updateBox();
+		invalidateMesh();
 	}
 
 	bool isCameraInsideCloud() const { return m_camera_inside_cloud; }
@@ -129,26 +140,40 @@ private:
 				BS * 1000000.0f, height_bs + thickness_bs - BS * m_camera_offset.Y, BS * 1000000.0f);
 	}
 
+	void updateMesh();
+	void invalidateMesh()
+	{
+		m_mesh_valid = false;
+	}
+
 	bool gridFilled(int x, int y, s16 humidity) const;
 
-//freeminer:
+// freeminer:
 	s32 m_humidity = 50;
-
+// ==
 
 	video::SMaterial m_material;
+	irr_ptr<scene::SMeshBuffer> m_meshbuffer;
+	// Value of m_origin at the time the mesh was last updated
+	v2f m_mesh_origin;
+	// Value of center_of_drawing_in_noise_i at the time the mesh was last updated
+	v2s16 m_last_noise_center;
+	// Was the mesh ever generated?
+	bool m_mesh_valid = false;
+
 	aabb3f m_box;
+	v2f m_origin;
 	u16 m_cloud_radius_i;
-	bool m_enable_3d;
 	u32 m_seed;
 	v3f m_camera_pos;
-	v2f m_origin;
+
 	v3s16 m_camera_offset;
+	bool m_camera_inside_cloud = false;
+
+	bool m_enable_shaders, m_enable_3d;
 	video::SColorf m_color = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f);
 public:
 	CloudParams m_params;
-private:
-	bool m_camera_inside_cloud = false;
-
 };
 
 // fm:
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index d28b32900..646a1bda7 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -28,7 +28,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/client.h"
 #include "client/renderingengine.h"
 #include "client/sound.h"
-#include "client/tile.h"
+#include "client/texturesource.h"
 #include "client/mapblock_mesh.h"
 #include "util/basic_macros.h"
 #include "util/numeric.h"
@@ -36,6 +36,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "camera.h" // CameraModes
 #include "collision.h"
 #include "content_cso.h"
+#include "clientobject.h"
 #include "environment.h"
 #include "itemdef.h"
 #include "localplayer.h"
@@ -49,6 +50,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <cmath>
 #include "client/shader.h"
 #include "client/minimap.h"
+#include <quaternion.h>
 
 class Settings;
 struct ToolCapabilities;
@@ -220,14 +222,15 @@ private:
 };
 
 // Prototype
-TestCAO proto_TestCAO(NULL, NULL);
+static TestCAO proto_TestCAO(nullptr, nullptr);
 
 TestCAO::TestCAO(Client *client, ClientEnvironment *env):
 	ClientActiveObject(0, client, env),
 	m_node(NULL),
 	m_position(v3f(0,10*BS,0))
 {
-	ClientActiveObject::registerType(getType(), create);
+	if (!client)
+		ClientActiveObject::registerType(getType(), create);
 }
 
 std::unique_ptr<ClientActiveObject> TestCAO::create(Client *client, ClientEnvironment *env)
@@ -325,8 +328,6 @@ void TestCAO::processMessage(const std::string &data)
 	GenericCAO
 */
 
-#include "clientobject.h"
-
 GenericCAO::GenericCAO(Client *client, ClientEnvironment *env):
 		ClientActiveObject(0, client, env)
 {
@@ -414,8 +415,7 @@ GenericCAO::~GenericCAO()
 
 bool GenericCAO::getSelectionBox(aabb3f *toset) const
 {
-	if (!m_prop.is_visible || !m_is_visible || m_is_local_player
-			|| !m_prop.pointable) {
+	if (!m_prop.is_visible || !m_is_visible || m_is_local_player) {
 		return false;
 	}
 	*toset = m_selection_box;
@@ -625,6 +625,8 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 
 	infostream << "GenericCAO::addToScene(): " << m_prop.visual << std::endl;
 
+	m_material_type_param = 0.5f; // May cut off alpha < 128 depending on m_material_type
+
 	if (m_enable_shaders) {
 		IShaderSource *shader_source = m_client->getShaderSource();
 		MaterialType material_type;
@@ -639,8 +641,12 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 		u32 shader_id = shader_source->getShader("object_shader", material_type, NDT_NORMAL);
 		m_material_type = shader_source->getShaderInfo(shader_id).material;
 	} else {
-		m_material_type = (m_prop.use_texture_alpha) ?
-			video::EMT_TRANSPARENT_ALPHA_CHANNEL : video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+		if (m_prop.use_texture_alpha) {
+			m_material_type = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+			m_material_type_param = 1.0f / 256.f; // minimal alpha for texture rendering
+		} else {
+			m_material_type = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+		}
 	}
 
 	auto grabMatrixNode = [this] {
@@ -819,12 +825,23 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 			(m_prop.visual == "wielditem"));
 
 		m_wield_meshnode->setScale(m_prop.visual_size / 2.0f);
-		m_wield_meshnode->setColor(video::SColor(0xFFFFFFFF));
 	} else {
 		warningstream<<"GenericCAO::addToScene(): \""<<m_prop.visual
 				<<"\" not supported"<<std::endl;
 	}
 
+	/* Set VBO hint */
+	// - if shaders are disabled we modify the mesh often
+	// - sprites are also modified often
+	// - the wieldmesh sets its own hint
+	// - bone transformations do not need to modify the vertex data
+	if (m_enable_shaders && (m_meshnode || m_animated_meshnode)) {
+		if (m_meshnode)
+			m_meshnode->getMesh()->setHardwareMappingHint(scene::EHM_STATIC);
+		if (m_animated_meshnode)
+			m_animated_meshnode->getMesh()->setHardwareMappingHint(scene::EHM_STATIC);
+	}
+
 	/* don't update while punch texture modifier is active */
 	if (m_reset_textures_timer < 0)
 		updateTextures(m_current_texture_modifier);
@@ -841,7 +858,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 	updateMarker();
 	updateNodePos();
 	updateAnimation();
-	updateBonePosition();
+	updateBones(.0f);
 	updateAttachments();
 
 	setNodeLight(m_last_light);
@@ -1229,7 +1246,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 		}
 	}
 
-	if (node && fabs(m_prop.automatic_rotate) > 0.001f) {
+	if (node && std::abs(m_prop.automatic_rotate) > 0.001f) {
 		// This is the child node's rotation. It is only used for automatic_rotate.
 		v3f local_rot = node->getRotation();
 		local_rot.Y = modulo360f(local_rot.Y - dtime * core::RADTODEG *
@@ -1273,7 +1290,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 			updatePositionRecursive(m_matrixnode);
 		m_animated_meshnode->updateAbsolutePosition();
 		m_animated_meshnode->animateJoints();
-		updateBonePosition();
+		updateBones(dtime);
 	}
 }
 
@@ -1367,7 +1384,7 @@ void GenericCAO::updateTextures(std::string mod)
 
 			video::SMaterial &material = m_spritenode->getMaterial(0);
 			material.MaterialType = m_material_type;
-			material.MaterialTypeParam = 0.5f;
+			material.MaterialTypeParam = m_material_type_param;
 			material.setTexture(0, tsrc->getTextureForMesh(texturestring));
 
 			// This allows setting per-material colors. However, until a real lighting
@@ -1403,7 +1420,7 @@ void GenericCAO::updateTextures(std::string mod)
 				// Set material flags and texture
 				video::SMaterial &material = m_animated_meshnode->getMaterial(i);
 				material.MaterialType = m_material_type;
-				material.MaterialTypeParam = 0.5f;
+				material.MaterialTypeParam = m_material_type_param;
 				material.TextureLayers[0].Texture = texture;
 				material.Lighting = true;
 				material.BackfaceCulling = m_prop.backface_culling;
@@ -1447,7 +1464,7 @@ void GenericCAO::updateTextures(std::string mod)
 				// Set material flags and texture
 				video::SMaterial &material = m_meshnode->getMaterial(i);
 				material.MaterialType = m_material_type;
-				material.MaterialTypeParam = 0.5f;
+				material.MaterialTypeParam = m_material_type_param;
 				material.Lighting = false;
 				material.setTexture(0, tsrc->getTextureForMesh(texturestring));
 				material.getTextureMatrix(0).makeIdentity();
@@ -1556,19 +1573,28 @@ void GenericCAO::updateAnimationSpeed()
 	m_animated_meshnode->setAnimationSpeed(m_animation_speed);
 }
 
-void GenericCAO::updateBonePosition()
+void GenericCAO::updateBones(f32 dtime)
 {
-	if (m_bone_position.empty() || !m_animated_meshnode)
+	if (!m_animated_meshnode)
 		return;
+	if (m_bone_override.empty()) {
+		m_animated_meshnode->setJointMode(scene::EJUOR_NONE);
+		return;
+	}
 
 	m_animated_meshnode->setJointMode(scene::EJUOR_CONTROL); // To write positions to the mesh on render
-	for (auto &it : m_bone_position) {
+	for (auto &it : m_bone_override) {
 		std::string bone_name = it.first;
 		scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
-		if (bone) {
-			bone->setPosition(it.second.X);
-			bone->setRotation(it.second.Y);
-		}
+		if (!bone)
+			continue;
+
+		BoneOverride &props = it.second;
+		props.dtime_passed += dtime;
+
+		bone->setPosition(props.getPosition(bone->getPosition()));
+		bone->setRotation(props.getRotationEulerDeg(bone->getRotation()));
+		bone->setScale(props.getScale(bone->getScale()));
 	}
 
 	// search through bones to find mistakenly rotated bones due to bug in Irrlicht
@@ -1579,7 +1605,7 @@ void GenericCAO::updateBonePosition()
 
 		//If bone is manually positioned there is no need to perform the bug check
 		bool skip = false;
-		for (auto &it : m_bone_position) {
+		for (auto &it : m_bone_override) {
 			if (it.first == bone->getName()) {
 				skip = true;
 				break;
@@ -1814,6 +1840,7 @@ void GenericCAO::processMessage(const std::string &data)
 		bool sneak_glitch = !readU8(is);
 		bool new_move = !readU8(is);
 
+		// new overrides since 5.8.0
 		float override_speed_climb = readF32(is);
 		float override_speed_crouch = readF32(is);
 		float override_liquid_fluidity = readF32(is);
@@ -1821,7 +1848,6 @@ void GenericCAO::processMessage(const std::string &data)
 		float override_liquid_sink = readF32(is);
 		float override_acceleration_default = readF32(is);
 		float override_acceleration_air = readF32(is);
-		// fallback for new overrides (since 5.8.0)
 		if (is.eof()) {
 			override_speed_climb = 1.0f;
 			override_speed_crouch = 1.0f;
@@ -1832,6 +1858,16 @@ void GenericCAO::processMessage(const std::string &data)
 			override_acceleration_air = 1.0f;
 		}
 
+		// new overrides since 5.9.0
+		float override_speed_fast = readF32(is);
+		float override_acceleration_fast = readF32(is);
+		float override_speed_walk = readF32(is);
+		if (is.eof()) {
+			override_speed_fast = 1.0f;
+			override_acceleration_fast = 1.0f;
+			override_speed_walk = 1.0f;
+		}
+
 		if (m_is_local_player) {
 			auto &phys = m_env->getLocalPlayer()->physics_override;
 			phys.speed = override_speed;
@@ -1847,6 +1883,9 @@ void GenericCAO::processMessage(const std::string &data)
 			phys.liquid_sink = override_liquid_sink;
 			phys.acceleration_default = override_acceleration_default;
 			phys.acceleration_air = override_acceleration_air;
+			phys.speed_fast = override_speed_fast;
+			phys.acceleration_fast = override_acceleration_fast;
+			phys.speed_walk = override_speed_walk;
 		}
 	} else if (cmd == AO_CMD_SET_ANIMATION) {
 		// TODO: change frames send as v2s32 value
@@ -1888,11 +1927,46 @@ void GenericCAO::processMessage(const std::string &data)
 		updateAnimationSpeed();
 	} else if (cmd == AO_CMD_SET_BONE_POSITION) {
 		std::string bone = deSerializeString16(is);
-		v3f position = readV3F32(is);
-		v3f rotation = readV3F32(is);
-		m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
-
-		// updateBonePosition(); now called every step
+		auto it = m_bone_override.find(bone);
+		BoneOverride props;
+		if (it != m_bone_override.end()) {
+			props = it->second;
+			// Reset timer
+			props.dtime_passed = 0;
+			// Save previous values for interpolation
+			props.position.previous = props.position.vector;
+			props.rotation.previous = props.rotation.next;
+			props.scale.previous = props.scale.vector;
+		} else {
+			// Disable interpolation
+			props.position.interp_timer = 0.0f;
+			props.rotation.interp_timer = 0.0f;
+			props.scale.interp_timer = 0.0f;
+		}
+		// Read new values
+		props.position.vector = readV3F32(is);
+		props.rotation.next = core::quaternion(readV3F32(is) * core::DEGTORAD);
+		props.scale.vector = readV3F32(is); // reads past end of string on older cmds
+		if (is.eof()) {
+			// Backwards compatibility
+			props.scale.vector = v3f(1, 1, 1); // restore the scale which was not sent
+			props.position.absolute = true;
+			props.rotation.absolute = true;
+		} else {
+			props.position.interp_timer = readF32(is);
+			props.rotation.interp_timer = readF32(is);
+			props.scale.interp_timer = readF32(is);
+			u8 absoluteFlag = readU8(is);
+			props.position.absolute = (absoluteFlag & 1) > 0;
+			props.rotation.absolute = (absoluteFlag & 2) > 0;
+			props.scale.absolute = (absoluteFlag & 4) > 0;
+		}
+		if (props.isIdentity()) {
+			m_bone_override.erase(bone);
+		} else {
+			m_bone_override[bone] = props;
+		}
+		// updateBones(); now called every step
 	} else if (cmd == AO_CMD_ATTACH_TO) {
 		u16 parent_id = readS16(is);
 		std::string bone = deSerializeString16(is);
@@ -2057,4 +2131,4 @@ void GenericCAO::updateMeshCulling()
 }
 
 // Prototype
-GenericCAO proto_GenericCAO(NULL, NULL);
+static GenericCAO proto_GenericCAO(nullptr, nullptr);
diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 5d4c3a761..cbe874341 100644
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -108,7 +108,7 @@ private:
 	float m_animation_blend = 0.0f;
 	bool m_animation_loop = true;
 	// stores position and rotation for each bone name
-	std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;
+	BoneOverrideMap m_bone_override;
 
 	int m_attachment_parent_id = 0;
 	std::unordered_set<int> m_attachment_child_ids;
@@ -134,6 +134,7 @@ private:
 	bool m_is_visible = false;
 	// Material
 	video::E_MATERIAL_TYPE m_material_type;
+	f32 m_material_type_param;
 	// Settings
 	bool m_enable_shaders = false;
 
@@ -180,6 +181,8 @@ public:
 
 	inline const ObjectProperties &getProperties() const { return m_prop; }
 
+	inline const std::string &getName() const { return m_name; }
+
 	scene::ISceneNode *getSceneNode() const override;
 
 	scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() const override;
@@ -214,6 +217,11 @@ public:
 		return m_is_local_player;
 	}
 
+	inline bool isPlayer() const
+	{
+		return m_is_player;
+	}
+
 	inline bool isVisible() const
 	{
 		return m_is_visible;
@@ -274,7 +282,7 @@ public:
 
 	void updateAnimationSpeed();
 
-	void updateBonePosition();
+	void updateBones(f32 dtime);
 
 	void processMessage(const std::string &data) override;
 
diff --git a/src/client/content_cso.cpp b/src/client/content_cso.cpp
index a62fbb880..b1aee5190 100644
--- a/src/client/content_cso.cpp
+++ b/src/client/content_cso.cpp
@@ -22,7 +22,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "content_cso.h"
 #include <IBillboardSceneNode.h>
-#include "client/tile.h"
+#include "client/texturesource.h"
 #include "clientenvironment.h"
 #include "client.h"
 #include "map.h"
diff --git a/src/client/content_mapblock.cpp b/src/client/content_mapblock.cpp
index 343a3c262..d0d5e158d 100644
--- a/src/client/content_mapblock.cpp
+++ b/src/client/content_mapblock.cpp
@@ -77,7 +77,7 @@ MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector
 		scene::IMeshManipulator *mm):
 	data(input),
 	collector(output),
-	nodedef(data->m_client->ndef()),
+	nodedef(data->nodedef),
 	meshmanip(mm),
 	blockpos_nodes(data->m_blockpos * MAP_BLOCKSIZE),
 	enable_mesh_cache(g_settings->getBool("enable_mesh_cache") &&
@@ -534,7 +534,7 @@ u8 MapblockMeshGenerator::getNodeBoxMask(aabb3f box, u8 solid_neighbors, u8 same
 			(box.MinEdge.Z == -NODE_BOUNDARY ? 32 : 0);
 
 	u8 sametype_mask = 0;
-   if (data->fscale <= 1)
+  if (data->fscale <= 1)
 	if (cur_node.f->alpha == AlphaMode::ALPHAMODE_OPAQUE) {
 		// In opaque nodeboxes, faces on opposite sides can cancel
 		// each other out if there is a matching neighbor of the same type
@@ -633,14 +633,14 @@ void MapblockMeshGenerator::calculateCornerLevels()
 		cur_liquid.corner_levels[k][i] = getCornerLevel(i, k);
 }
 
-f32 MapblockMeshGenerator::getCornerLevel(int i, int k)
+f32 MapblockMeshGenerator::getCornerLevel(int i, int k) const
 {
 	float sum = 0;
 	int count = 0;
 	int air_count = 0;
 	for (int dk = 0; dk < 2; dk++)
 	for (int di = 0; di < 2; di++) {
-		LiquidData::NeighborData &neighbor_data = cur_liquid.neighbors[k + dk][i + di];
+		const LiquidData::NeighborData &neighbor_data = cur_liquid.neighbors[k + dk][i + di];
 		content_t content = neighbor_data.content;
 
 		// If top is liquid, draw starting from top of node
@@ -1024,7 +1024,9 @@ void MapblockMeshGenerator::drawTorchlikeNode()
 	switch (wall) {
 		case DWM_YP: tileindex = 1; break; // ceiling
 		case DWM_YN: tileindex = 0; break; // floor
-		default:     tileindex = 2; // side (or invalid—should we care?)
+		case DWM_S1: tileindex = 1; break; // ceiling, but rotated
+		case DWM_S2: tileindex = 0; break; // floor, but rotated
+		default: tileindex = 2; // side (or invalid, shouldn't happen)
 	}
 	useTile(tileindex, MATERIAL_FLAG_CRACK_OVERLAY, MATERIAL_FLAG_BACKFACE_CULLING);
 
@@ -1060,6 +1062,17 @@ void MapblockMeshGenerator::drawTorchlikeNode()
 			case DWM_ZN:
 				vertex.X += -size + BS/2;
 				vertex.rotateXZBy(-90);
+				break;
+			case DWM_S1:
+				// same as DWM_YP, but rotated 90°
+				vertex.Y += -size + BS/2;
+				vertex.rotateXZBy(45);
+				break;
+			case DWM_S2:
+				// same as DWM_YN, but rotated -90°
+				vertex.Y += size - BS/2;
+				vertex.rotateXZBy(-45);
+				break;
 		}
 	}
 	drawQuad(vertices);
@@ -1093,6 +1106,10 @@ void MapblockMeshGenerator::drawSignlikeNode()
 				vertex.rotateXZBy( 90); break;
 			case DWM_ZN:
 				vertex.rotateXZBy(-90); break;
+			case DWM_S1:
+				vertex.rotateXYBy( 90); vertex.rotateXZBy(90); break;
+			case DWM_S2:
+				vertex.rotateXYBy(-90); vertex.rotateXZBy(-90); break;
 		}
 	}
 	drawQuad(vertices);
@@ -1533,8 +1550,10 @@ void MapblockMeshGenerator::drawNodeboxNode()
 	bool param2_is_rotation =
 			cur_node.f->param_type_2 == CPT2_COLORED_FACEDIR ||
 			cur_node.f->param_type_2 == CPT2_COLORED_WALLMOUNTED ||
+			cur_node.f->param_type_2 == CPT2_COLORED_4DIR ||
 			cur_node.f->param_type_2 == CPT2_FACEDIR ||
-			cur_node.f->param_type_2 == CPT2_WALLMOUNTED;
+			cur_node.f->param_type_2 == CPT2_WALLMOUNTED ||
+			cur_node.f->param_type_2 == CPT2_4DIR;
 
 	bool param2_is_level =
 			cur_node.f->param_type_2 == CPT2_LEVELED;
diff --git a/src/client/content_mapblock.h b/src/client/content_mapblock.h
index ceadbf511..07207954e 100644
--- a/src/client/content_mapblock.h
+++ b/src/client/content_mapblock.h
@@ -141,7 +141,7 @@ private:
 	void prepareLiquidNodeDrawing();
 	void getLiquidNeighborhood();
 	void calculateCornerLevels();
-	f32 getCornerLevel(int i, int k);
+	f32 getCornerLevel(int i, int k) const;
 	void drawLiquidSides();
 	void drawLiquidTop();
 	void drawLiquidBottom();
diff --git a/src/client/event_manager.h b/src/client/event_manager.h
index 78023f6d4..1a9d429a5 100644
--- a/src/client/event_manager.h
+++ b/src/client/event_manager.h
@@ -73,14 +73,13 @@ public:
 	}
 	void dereg(MtEvent::Type type, event_receive_func f, void *data) override
 	{
-		std::map<MtEvent::Type, Dest>::iterator i = m_dest.find(type);
+		auto i = m_dest.find(type);
 		if (i != m_dest.end()) {
 			std::list<FuncSpec> &funcs = i->second.funcs;
-			auto j = funcs.begin();
-			while (j != funcs.end()) {
+			for (auto j = funcs.begin(); j != funcs.end(); ) {
 				bool remove = (j->f == f && (!data || j->d == data));
 				if (remove)
-					funcs.erase(j++);
+					j = funcs.erase(j);
 				else
 					++j;
 			}
diff --git a/src/client/filecache.cpp b/src/client/filecache.cpp
index 08aac94b8..01aaebc08 100644
--- a/src/client/filecache.cpp
+++ b/src/client/filecache.cpp
@@ -31,20 +31,24 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <fstream>
 #include <cstdlib>
 
+void FileCache::createDir()
+{
+	if (!fs::CreateAllDirs(m_dir)) {
+		errorstream << "Could not create cache directory: "
+			<< m_dir << std::endl;
+	}
+}
+
 bool FileCache::loadByPath(const std::string &path, std::ostream &os)
 {
-	std::ifstream fis(path.c_str(), std::ios_base::binary);
-
-	if(!fis.good()){
-		verbosestream<<"FileCache: File not found in cache: "
-				<<path<<std::endl;
+	auto fis = open_ifstream(path.c_str(), false);
+	if (!fis.good())
 		return false;
-	}
 
 	bool bad = false;
 	for(;;){
-		char buf[1024];
-		fis.read(buf, 1024);
+		char buf[4096];
+		fis.read(buf, sizeof(buf));
 		std::streamsize len = fis.gcount();
 		os.write(buf, len);
 		if(fis.eof())
@@ -62,25 +66,21 @@ bool FileCache::loadByPath(const std::string &path, std::ostream &os)
 	return !bad;
 }
 
-bool FileCache::updateByPath(const std::string &path, const std::string &data)
+bool FileCache::updateByPath(const std::string &path, std::string_view data)
 {
-	std::ofstream file(path.c_str(), std::ios_base::binary |
-			std::ios_base::trunc);
+	createDir();
 
-	if(!file.good())
-	{
-		errorstream<<"FileCache: Can't write to file at "
-				<<path<<std::endl;
+	auto file = open_ofstream(path.c_str(), true);
+	if (!file.good())
 		return false;
-	}
 
-	file.write(data.c_str(), data.length());
+	file << data;
 	file.close();
 
 	return !file.fail();
 }
 
-bool FileCache::update(const std::string &name, const std::string &data)
+bool FileCache::update(const std::string &name, std::string_view data)
 {
 	std::string path = m_dir + DIR_DELIM + name;
 	return updateByPath(path, data);
@@ -95,6 +95,13 @@ bool FileCache::load(const std::string &name, std::ostream &os)
 bool FileCache::exists(const std::string &name)
 {
 	std::string path = m_dir + DIR_DELIM + name;
-	std::ifstream fis(path.c_str(), std::ios_base::binary);
-	return fis.good();
+	return fs::PathExists(path);
+}
+
+bool FileCache::updateCopyFile(const std::string &name, const std::string &src_path)
+{
+	std::string path = m_dir + DIR_DELIM + name;
+
+	createDir();
+	return fs::CopyFileContents(src_path, path);
 }
diff --git a/src/client/filecache.h b/src/client/filecache.h
index 4be543b42..26bbdc49f 100644
--- a/src/client/filecache.h
+++ b/src/client/filecache.h
@@ -25,6 +25,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <string>
+#include <string_view>
 
 class FileCache
 {
@@ -34,13 +35,17 @@ public:
 	*/
 	FileCache(const std::string &dir) : m_dir(dir) {}
 
-	bool update(const std::string &name, const std::string &data);
+	bool update(const std::string &name, std::string_view data);
 	bool load(const std::string &name, std::ostream &os);
 	bool exists(const std::string &name);
 
+	// Copy another file on disk into the cache
+	bool updateCopyFile(const std::string &name, const std::string &src_path);
+
 private:
 	std::string m_dir;
 
+	void createDir();
 	bool loadByPath(const std::string &path, std::ostream &os);
-	bool updateByPath(const std::string &path, const std::string &data);
+	bool updateByPath(const std::string &path, std::string_view data);
 };
diff --git a/src/client/fm_farmesh.cpp b/src/client/fm_farmesh.cpp
index ea51d6a1d..9a1a89630 100644
--- a/src/client/fm_farmesh.cpp
+++ b/src/client/fm_farmesh.cpp
@@ -75,8 +75,7 @@ void FarMesh::makeFarBlock(const v3bpos_t &blockpos, size_t step)
 		//const auto lock = far_blocks->lock_unique_rec();
 		if (!far_blocks.contains(blockpos_actual)) {
 			far_blocks.emplace(blockpos_actual,
-					std::make_shared<MapBlock>(
-							&m_client->getEnv().getClientMap(), blockpos, m_client));
+					std::make_shared<MapBlock>(blockpos, m_client));
 		}
 	}
 	const auto &block = far_blocks.at(blockpos_actual);
@@ -84,9 +83,10 @@ void FarMesh::makeFarBlock(const v3bpos_t &blockpos, size_t step)
 	{
 		const auto lock = std::lock_guard(block->far_mutex);
 		if (!block->getFarMesh(step)) {
-			MeshMakeData mdat(m_client, false, 0, step, &farcontainer);
+			const auto mesh_grid = m_client->getMeshGrid();
+			MeshMakeData mdat(m_client->ndef(), MAP_BLOCKSIZE * mesh_grid.cell_size, false, 0, step, &farcontainer);
 			mdat.m_blockpos = blockpos_actual;
-			auto mbmsh = std::make_shared<MapBlockMesh>(&mdat, m_camera_offset);
+			const auto mbmsh = std::make_shared<MapBlockMesh>(m_client, &mdat, m_camera_offset);
 			block->setFarMesh(mbmsh, m_client->m_uptime);
 		}
 	}
diff --git a/src/client/fontengine.cpp b/src/client/fontengine.cpp
index 84a7ab191..a1e597856 100644
--- a/src/client/fontengine.cpp
+++ b/src/client/fontengine.cpp
@@ -27,16 +27,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlicht_changes/CGUITTFont.h"
 #include "util/numeric.h" // rangelim
 
-/** maximum size distance for getting a "similar" font size */
-#define MAX_FONT_SIZE_OFFSET 10
-
 /** reference to access font engine, has to be initialized by main */
-FontEngine* g_fontengine = NULL;
+FontEngine *g_fontengine = nullptr;
 
 /** callback to be used on change of font size setting */
 static void font_setting_changed(const std::string &name, void *userdata)
 {
-	g_fontengine->readSettings();
+	if (g_fontengine)
+		g_fontengine->readSettings();
 }
 
 /******************************************************************************/
@@ -61,7 +59,7 @@ FontEngine::FontEngine(gui::IGUIEnvironment* env) :
 		"mono_font_path", "mono_font_path_bold", "mono_font_path_italic",
 		"mono_font_path_bold_italic",
 		"fallback_font_path",
-		"screen_dpi", "gui_scaling",
+		"dpi_change_notifier", "gui_scaling",
 	};
 
 	for (auto name : settings)
@@ -228,7 +226,7 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 	u16 divisible_by = g_settings->getU16(setting_prefix + "font_size_divisible_by");
 	if (divisible_by > 1) {
 		size = std::max<u32>(
-				std::round((double)size / divisible_by) * divisible_by, divisible_by);
+				std::round((float)size / divisible_by) * divisible_by, divisible_by);
 	}
 
 	sanity_check(size != 0);
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 76799684a..8723d2c26 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -30,12 +30,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/clientevent.h"
 #include "client/gameui.h"
 #include "client/inputhandler.h"
-#include "client/tile.h"     // For TextureSource
+#include "client/texturepaths.h"
 #include "client/keys.h"
 #include "client/joystick_controller.h"
 #include "client/mapblock_mesh.h"
 #include "client/sound.h"
 #include "clientmap.h"
+#include "clientmedia.h" // For clientMediaUpdateCacheCopy
 #include "clouds.h"
 #include "config.h"
 #include "content_cao.h"
@@ -43,6 +44,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/event_manager.h"
 #include "client/fm_farmesh.h"
 #include "fontengine.h"
+#include "gui/touchscreengui.h"
 #include "itemdef.h"
 #include "log.h"
 #include "filesys.h"
@@ -52,6 +54,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "gui/guiFormSpecMenu.h"
 #include "gui/guiKeyChangeMenu.h"
 #include "gui/guiPasswordChange.h"
+#include "gui/guiOpenURL.h"
 #include "gui/guiVolumeChange.h"
 #include "gui/mainmenumanager.h"
 #include "gui/profilergraph.h"
@@ -67,6 +70,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settings.h"
 #include "shader.h"
 #include "sky.h"
+#include "threading/lambda.h"
 #include "translation.h"
 #include "util/basic_macros.h"
 #include "util/directiontables.h"
@@ -79,6 +83,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "script/scripting_client.h"
 #include "hud.h"
 #include "clientdynamicinfo.h"
+#include <IAnimatedMeshSceneNode.h>
 
 #include "threading/async.h"
 #include <future>
@@ -381,47 +386,60 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
 {
 	Sky *m_sky;
 	Client *m_client;
-	bool *m_force_fog_off;
-	f32 *m_fog_range;
-	bool m_fog_enabled;
-	CachedPixelShaderSetting<float, 4> m_sky_bg_color;
-	CachedPixelShaderSetting<float> m_fog_distance;
-	CachedPixelShaderSetting<float> m_fog_shading_parameter;
-	CachedVertexShaderSetting<float> m_animation_timer_vertex;
-	CachedPixelShaderSetting<float> m_animation_timer_pixel;
-	CachedVertexShaderSetting<float> m_animation_timer_delta_vertex;
-	CachedPixelShaderSetting<float> m_animation_timer_delta_pixel;
-	CachedPixelShaderSetting<float, 3> m_day_light;
-	CachedPixelShaderSetting<float, 4> m_star_color;
-	CachedPixelShaderSetting<float, 3> m_eye_position_pixel;
-	CachedVertexShaderSetting<float, 3> m_eye_position_vertex;
-	CachedPixelShaderSetting<float, 3> m_minimap_yaw;
-	CachedPixelShaderSetting<float, 3> m_camera_offset_pixel;
-	CachedPixelShaderSetting<float, 3> m_camera_offset_vertex;
-	CachedPixelShaderSetting<SamplerLayer_t> m_texture0;
-	CachedPixelShaderSetting<SamplerLayer_t> m_texture1;
-	CachedPixelShaderSetting<SamplerLayer_t> m_texture2;
-	CachedPixelShaderSetting<SamplerLayer_t> m_texture3;
-	CachedVertexShaderSetting<float, 2> m_texel_size0_vertex;
-	CachedPixelShaderSetting<float, 2> m_texel_size0_pixel;
-	std::array<float, 2> m_texel_size0_values;
-	CachedStructPixelShaderSetting<float, 7> m_exposure_params_pixel;
+	CachedVertexShaderSetting<float> m_animation_timer_vertex{"animationTimer"};
+	CachedPixelShaderSetting<float> m_animation_timer_pixel{"animationTimer"};
+	CachedVertexShaderSetting<float>
+		m_animation_timer_delta_vertex{"animationTimerDelta"};
+	CachedPixelShaderSetting<float>
+		m_animation_timer_delta_pixel{"animationTimerDelta"};
+	CachedPixelShaderSetting<float, 3> m_day_light{"dayLight"};
+	CachedPixelShaderSetting<float, 3> m_minimap_yaw{"yawVec"};
+	CachedPixelShaderSetting<float, 3> m_camera_offset_pixel{"cameraOffset"};
+	CachedVertexShaderSetting<float, 3> m_camera_offset_vertex{"cameraOffset"};
+	CachedPixelShaderSetting<SamplerLayer_t> m_texture0{"texture0"};
+	CachedPixelShaderSetting<SamplerLayer_t> m_texture1{"texture1"};
+	CachedPixelShaderSetting<SamplerLayer_t> m_texture2{"texture2"};
+	CachedPixelShaderSetting<SamplerLayer_t> m_texture3{"texture3"};
+	CachedVertexShaderSetting<float, 2> m_texel_size0_vertex{"texelSize0"};
+	CachedPixelShaderSetting<float, 2> m_texel_size0_pixel{"texelSize0"};
+	v2f m_texel_size0;
+	CachedStructPixelShaderSetting<float, 7> m_exposure_params_pixel{
+		"exposureParams",
+		std::array<const char*, 7> {
+			"luminanceMin", "luminanceMax", "exposureCorrection",
+			"speedDarkBright", "speedBrightDark", "centerWeightPower",
+			"compensationFactor"
+		}};
 	float m_user_exposure_compensation;
 	bool m_bloom_enabled;
-	CachedPixelShaderSetting<float> m_bloom_intensity_pixel;
+	CachedPixelShaderSetting<float> m_bloom_intensity_pixel{"bloomIntensity"};
 	float m_bloom_intensity;
-	CachedPixelShaderSetting<float> m_bloom_strength_pixel;
+	CachedPixelShaderSetting<float> m_bloom_strength_pixel{"bloomStrength"};
 	float m_bloom_strength;
-	CachedPixelShaderSetting<float> m_bloom_radius_pixel;
+	CachedPixelShaderSetting<float> m_bloom_radius_pixel{"bloomRadius"};
 	float m_bloom_radius;
-	CachedPixelShaderSetting<float> m_saturation_pixel;
-	Inventory *m_local_inventory;
+	Inventory *m_local_inventory{};
+	CachedPixelShaderSetting<float> m_saturation_pixel{"saturation"};
+	bool m_volumetric_light_enabled;
+	CachedPixelShaderSetting<float, 3>
+		m_sun_position_pixel{"sunPositionScreen"};
+	CachedPixelShaderSetting<float> m_sun_brightness_pixel{"sunBrightness"};
+	CachedPixelShaderSetting<float, 3>
+		m_moon_position_pixel{"moonPositionScreen"};
+	CachedPixelShaderSetting<float> m_moon_brightness_pixel{"moonBrightness"};
+	CachedPixelShaderSetting<float>
+		m_volumetric_light_strength_pixel{"volumetricLightStrength"};
+
+	static constexpr std::array<const char*, 4> SETTING_CALLBACKS = {
+		"exposure_compensation",
+		"bloom_intensity",
+		"bloom_strength_factor",
+		"bloom_radius"
+	};
 
 public:
 	void onSettingsChange(const std::string &name)
 	{
-		if (name == "enable_fog")
-			m_fog_enabled = g_settings->getBool("enable_fog");
 		if (name == "exposure_compensation")
 			m_user_exposure_compensation = g_settings->getFloat("exposure_compensation", -1.0f, 1.0f);
 		if (name == "bloom_intensity")
@@ -439,98 +457,33 @@ public:
 
 	void setSky(Sky *sky) { m_sky = sky; }
 
-	GameGlobalShaderConstantSetter(Sky *sky, bool *force_fog_off,
-			f32 *fog_range, Client *client, Inventory *local_inventory) :
+	GameGlobalShaderConstantSetter(Sky *sky, Client *client) :
 		m_sky(sky),
-		m_client(client),
-		m_force_fog_off(force_fog_off),
-		m_fog_range(fog_range),
-		m_sky_bg_color("skyBgColor"),
-		m_fog_distance("fogDistance"),
-		m_fog_shading_parameter("fogShadingParameter"),
-		m_animation_timer_vertex("animationTimer"),
-		m_animation_timer_pixel("animationTimer"),
-		m_animation_timer_delta_vertex("animationTimerDelta"),
-		m_animation_timer_delta_pixel("animationTimerDelta"),
-		m_day_light("dayLight"),
-		m_star_color("starColor"),
-		m_eye_position_pixel("eyePosition"),
-		m_eye_position_vertex("eyePosition"),
-		m_minimap_yaw("yawVec"),
-		m_camera_offset_pixel("cameraOffset"),
-		m_camera_offset_vertex("cameraOffset"),
-		m_texture0("texture0"),
-		m_texture1("texture1"),
-		m_texture2("texture2"),
-		m_texture3("texture3"),
-		m_texel_size0_vertex("texelSize0"),
-		m_texel_size0_pixel("texelSize0"),
-		m_exposure_params_pixel("exposureParams",
-				std::array<const char*, 7> {
-						"luminanceMin", "luminanceMax", "exposureCorrection",
-						"speedDarkBright", "speedBrightDark", "centerWeightPower", "compensationFactor"
-				}),
-		m_bloom_intensity_pixel("bloomIntensity"),
-		m_bloom_strength_pixel("bloomStrength"),
-		m_bloom_radius_pixel("bloomRadius"),
-		m_saturation_pixel("saturation")
-		,m_local_inventory(local_inventory)
+		m_client(client)
 	{
-		g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
-		g_settings->registerChangedCallback("exposure_compensation", settingsCallback, this);
-		g_settings->registerChangedCallback("bloom_intensity", settingsCallback, this);
-		g_settings->registerChangedCallback("bloom_strength_factor", settingsCallback, this);
-		g_settings->registerChangedCallback("bloom_radius", settingsCallback, this);
-		g_settings->registerChangedCallback("saturation", settingsCallback, this);
-		m_fog_enabled = g_settings->getBool("enable_fog");
+		for (auto &name : SETTING_CALLBACKS)
+			g_settings->registerChangedCallback(name, settingsCallback, this);
+
 		m_user_exposure_compensation = g_settings->getFloat("exposure_compensation", -1.0f, 1.0f);
 		m_bloom_enabled = g_settings->getBool("enable_bloom");
 		m_bloom_intensity = g_settings->getFloat("bloom_intensity", 0.01f, 1.0f);
 		m_bloom_strength = RenderingEngine::BASE_BLOOM_STRENGTH * g_settings->getFloat("bloom_strength_factor", 0.1f, 10.0f);
 		m_bloom_radius = g_settings->getFloat("bloom_radius", 0.1f, 8.0f);
+		m_volumetric_light_enabled = g_settings->getBool("enable_volumetric_lighting") && m_bloom_enabled;
 	}
 
 	~GameGlobalShaderConstantSetter()
 	{
-		g_settings->deregisterChangedCallback("enable_fog", settingsCallback, this);
+		for (auto &name : SETTING_CALLBACKS)
+			g_settings->deregisterChangedCallback(name, settingsCallback, this);
 	}
 
 	void onSetConstants(video::IMaterialRendererServices *services) override
 	{
-		// Background color
-		video::SColor bgcolor = m_sky->getBgColor();
-		video::SColorf bgcolorf(bgcolor);
-		float bgcolorfa[4] = {
-			bgcolorf.r,
-			bgcolorf.g,
-			bgcolorf.b,
-			bgcolorf.a,
-		};
-		m_sky_bg_color.set(bgcolorfa, services);
-
-		// Fog distance
-		float fog_distance = 10000 * BS;
-
-		if (m_fog_enabled && !*m_force_fog_off)
-			fog_distance = *m_fog_range;
-
-		float fog_shading_parameter = 1.0 / ( 1.0 - m_sky->getFogStart());
-
-		m_fog_distance.set(&fog_distance, services);
-		m_fog_shading_parameter.set(&fog_shading_parameter, services);
-
 		u32 daynight_ratio = (float)m_client->getEnv().getDayNightRatio();
 		video::SColorf sunlight;
 		get_sunlight_color(&sunlight, daynight_ratio);
-		float dnc[3] = {
-			sunlight.r,
-			sunlight.g,
-			sunlight.b };
-		m_day_light.set(dnc, services);
-
-		video::SColorf star_color = m_sky->getCurrentStarColor();
-		float clr[4] = {star_color.r, star_color.g, star_color.b, star_color.a};
-		m_star_color.set(clr, services);
+		m_day_light.set(sunlight, services);
 
 		u32 animation_timer = m_client->getEnv().getFrameTime() % 1000000;
 		float animation_timer_f = (float)animation_timer / 100000.f;
@@ -541,11 +494,6 @@ public:
 		m_animation_timer_delta_vertex.set(&animation_timer_delta_f, services);
 		m_animation_timer_delta_pixel.set(&animation_timer_delta_f, services);
 
-		float eye_position_array[3];
-		v3f epos = m_client->getEnv().getLocalPlayer()->getEyePosition();
-		epos.getAs3Values(eye_position_array);
-		m_eye_position_pixel.set(eye_position_array, services);
-		m_eye_position_vertex.set(eye_position_array, services);
 
 
        {
@@ -554,7 +502,7 @@ public:
 		if (m_sky->sun_moon_light) {
 			sun_moon_position = m_sky->sun_moon_light->getPosition();
 		} else {
-			sun_moon_position = v3f(0.0, epos.Y*BS+900.0, 0.0);
+			sun_moon_position = v3f(0.0, m_client->getEnv().getLocalPlayer()->getEyePosition().Y*BS+900.0, 0.0);
 		}
 		services->setPixelShaderConstant(services->getPixelShaderConstantID("sunPosition"), (irr::f32 *)&sun_moon_position, 3);
 		services->setVertexShaderConstant(services->getPixelShaderConstantID("sunPosition"), (irr::f32 *)&sun_moon_position, 3);
@@ -577,17 +525,13 @@ public:
        }
 
 		if (m_client->getMinimap()) {
-			float minimap_yaw_array[3];
 			v3f minimap_yaw = m_client->getMinimap()->getYawVec();
-			minimap_yaw.getAs3Values(minimap_yaw_array);
-			m_minimap_yaw.set(minimap_yaw_array, services);
+			m_minimap_yaw.set(minimap_yaw, services);
 		}
 
-		float camera_offset_array[3];
 		v3f offset = intToFloat(m_client->getCamera()->getOffset(), BS);
-		offset.getAs3Values(camera_offset_array);
-		m_camera_offset_pixel.set(camera_offset_array, services);
-		m_camera_offset_vertex.set(camera_offset_array, services);
+		m_camera_offset_pixel.set(offset, services);
+		m_camera_offset_vertex.set(offset, services);
 
 		SamplerLayer_t tex_id;
 		tex_id = 0;
@@ -599,8 +543,8 @@ public:
 		tex_id = 3;
 		m_texture3.set(&tex_id, services);
 
-		m_texel_size0_vertex.set(m_texel_size0_values.data(), services);
-		m_texel_size0_pixel.set(m_texel_size0_values.data(), services);
+		m_texel_size0_vertex.set(m_texel_size0, services);
+		m_texel_size0_pixel.set(m_texel_size0, services);
 
 		const AutoExposure &exposure_params = m_client->getEnv().getLocalPlayer()->getLighting().exposure;
 		std::array<float, 7> exposure_buffer = {
@@ -619,8 +563,54 @@ public:
 			m_bloom_radius_pixel.set(&m_bloom_radius, services);
 			m_bloom_strength_pixel.set(&m_bloom_strength, services);
 		}
-		float saturation = m_client->getEnv().getLocalPlayer()->getLighting().saturation;
+
+		const auto &lighting = m_client->getEnv().getLocalPlayer()->getLighting();
+		float saturation = lighting.saturation;
 		m_saturation_pixel.set(&saturation, services);
+
+		if (m_volumetric_light_enabled) {
+			// Map directional light to screen space
+			auto camera_node = m_client->getCamera()->getCameraNode();
+			core::matrix4 transform = camera_node->getProjectionMatrix();
+			transform *= camera_node->getViewMatrix();
+
+			if (m_sky->getSunVisible()) {
+				v3f sun_position = camera_node->getAbsolutePosition() +
+						10000.f * m_sky->getSunDirection();
+				transform.transformVect(sun_position);
+				sun_position.normalize();
+
+				m_sun_position_pixel.set(sun_position, services);
+
+				float sun_brightness = core::clamp(107.143f * m_sky->getSunDirection().Y, 0.f, 1.f);
+				m_sun_brightness_pixel.set(&sun_brightness, services);
+			} else {
+				m_sun_position_pixel.set(v3f(0.f, 0.f, -1.f), services);
+
+				float sun_brightness = 0.f;
+				m_sun_brightness_pixel.set(&sun_brightness, services);
+			}
+
+			if (m_sky->getMoonVisible()) {
+				v3f moon_position = camera_node->getAbsolutePosition() +
+						10000.f * m_sky->getMoonDirection();
+				transform.transformVect(moon_position);
+				moon_position.normalize();
+
+				m_moon_position_pixel.set(moon_position, services);
+
+				float moon_brightness = core::clamp(107.143f * m_sky->getMoonDirection().Y, 0.f, 1.f);
+				m_moon_brightness_pixel.set(&moon_brightness, services);
+			} else {
+				m_moon_position_pixel.set(v3f(0.f, 0.f, -1.f), services);
+
+				float moon_brightness = 0.f;
+				m_moon_brightness_pixel.set(&moon_brightness, services);
+			}
+
+			float volumetric_light_strength = lighting.volumetric_light_strength;
+			m_volumetric_light_strength_pixel.set(&volumetric_light_strength, services);
+		}
 	}
 
 	void onSetMaterial(const video::SMaterial &material) override
@@ -628,12 +618,9 @@ public:
 		video::ITexture *texture = material.getTexture(0);
 		if (texture) {
 			core::dimension2du size = texture->getSize();
-			m_texel_size0_values[0] = 1.f / size.Width;
-			m_texel_size0_values[1] = 1.f / size.Height;
-		}
-		else {
-			m_texel_size0_values[0] = 0.f;
-			m_texel_size0_values[1] = 0.f;
+			m_texel_size0 = v2f(1.f / size.Width, 1.f / size.Height);
+		} else {
+			m_texel_size0 = v2f();
 		}
 	}
 };
@@ -641,24 +628,13 @@ public:
 
 class GameGlobalShaderConstantSetterFactory : public IShaderConstantSetterFactory
 {
-	Sky *m_sky;
-	bool *m_force_fog_off;
-	f32 *m_fog_range;
+	Sky *m_sky = nullptr;
 	Client *m_client;
 
-	// freeminer:
-	Inventory * m_local_inventory = nullptr;
-	// =========
-
 	std::vector<GameGlobalShaderConstantSetter *> created_nosky;
 public:
-	GameGlobalShaderConstantSetterFactory(bool *force_fog_off,
-			f32 *fog_range, Client *client, Inventory * local_inventory) :
-		m_sky(NULL),
-		m_force_fog_off(force_fog_off),
-		m_fog_range(fog_range),
+	GameGlobalShaderConstantSetterFactory(Client *client) :
 		m_client(client)
-		, m_local_inventory(local_inventory)
 	{}
 
 	void setSky(Sky *sky) {
@@ -671,39 +647,20 @@ public:
 
 	virtual IShaderConstantSetter* create()
 	{
-		auto *scs = new GameGlobalShaderConstantSetter(
-				m_sky, m_force_fog_off, m_fog_range, m_client, m_local_inventory);
+		auto *scs = new GameGlobalShaderConstantSetter(m_sky, m_client);
 		if (!m_sky)
 			created_nosky.push_back(scs);
 		return scs;
 	}
 };
 
-#ifdef HAVE_TOUCHSCREENGUI
-#define SIZE_TAG "size[11,5.5]"
-#else
-#define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
-#endif
+#define SIZE_TAG "size[11,5.5,true]" // Fixed size (ignored in touchscreen mode)
 
 /****************************************************************************
  ****************************************************************************/
 
 const static float object_hit_delay = 0.2;
 
-struct FpsControl {
-	FpsControl() : last_time(0), busy_time(0), sleep_time(0) {}
-
-	void reset();
-
-	void limit(IrrlichtDevice *device, f32 *dtime);
-
-	u32 getBusyMs() const { return busy_time / 1000; }
-
-	// all values in microseconds (us)
-	u64 last_time, busy_time, sleep_time;
-};
-
-
 /* The reason the following structs are not anonymous structs within the
  * class is that they are not used by the majority of member functions and
  * many functions that do require objects of thse types do not modify them
@@ -803,6 +760,7 @@ protected:
 	bool initSound();
 	bool createSingleplayerServer(const std::string &map_dir,
 			const SubgameSpec &gamespec, u16 port);
+	void copyServerClientCache();
 
 	// Client creation
 	bool createClient(const GameStartData &start_data);
@@ -872,6 +830,7 @@ protected:
 	 * the camera position. This also gives the maximal distance
 	 * of the search.
 	 * @param[in]  liquids_pointable if false, liquids are ignored
+	 * @param[in]  pointabilities    item specific pointable overriding
 	 * @param[in]  look_for_object   if false, objects are ignored
 	 * @param[in]  camera_offset     offset of the camera
 	 * @param[out] selected_object   the selected object or
@@ -879,6 +838,7 @@ protected:
 	 */
 	PointedThing updatePointedThing(
 			const core::line3d<f32> &shootline, bool liquids_pointable,
+			const std::optional<Pointabilities> &pointabilities,
 			bool look_for_object, const v3s16 &camera_offset);
 	void handlePointingAtNothing(const ItemStack &playerItem);
 	void handlePointingAtNode(const PointedThing &pointed,
@@ -891,10 +851,19 @@ protected:
 			const CameraOrientation &cam);
 	void updateClouds(float dtime);
 	void updateShadows();
+	void drawScene(ProfilerGraph *graph, RunStats *stats);
 
 	// Misc
 	void showOverlayMessage(const std::string &msg, float dtime, int percent,
-			bool draw_clouds = true);
+			float *indef_pos = nullptr);
+
+	inline bool fogEnabled()
+	{
+		// Client setting only takes effect if fog distance unlimited or debug priv
+		if (sky->getFogDistance() < 0 || client->checkPrivilege("debug"))
+			return m_cache_enable_fog;
+		return true;
+	}
 
 	static void settingChangedCallback(const std::string &setting_name, void *data);
 	void readSettings();
@@ -922,7 +891,6 @@ protected:
 
 private:
 	struct Flags {
-		bool force_fog_off = false;
 		bool disable_camera_update = false;
 	};
 
@@ -1024,7 +992,6 @@ private:
 	bool *kill;
 	std::string *error_message;
 	bool *reconnect_requested;
-	scene::ISceneNode *skybox;
 	PausedNodesList paused_animated_nodes;
 
 	bool simple_singleplayer_mode;
@@ -1052,6 +1019,7 @@ private:
 	f32  m_cache_mouse_sensitivity;
 	f32  m_cache_joystick_frustum_sensitivity;
 	f32  m_repeat_place_time;
+	f32  m_repeat_dig_time;
 	f32  m_cache_cam_smoothing;
 
 	bool m_invert_mouse;
@@ -1068,16 +1036,16 @@ private:
 	// this happens in pause menu in singleplayer
 	bool m_is_paused = false;
 
-#ifdef HAVE_TOUCHSCREENGUI
-	bool m_cache_hold_aux1 = false;
+	bool m_touch_simulate_aux1 = false;
 	bool m_touch_use_crosshair;
-	inline bool isNoCrosshairAllowed() {
+	inline bool isTouchCrosshairDisabled() {
 		return !m_touch_use_crosshair && camera->getCameraMode() == CAMERA_MODE_FIRST;
 	}
-#endif
 #ifdef __ANDROID__
 	bool m_android_chat_open = false;
 #endif
+
+	float m_shutdown_progress = 0.0f;
 };
 
 Game::Game() :
@@ -1100,6 +1068,8 @@ Game::Game() :
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("repeat_place_time",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("repeat_dig_time",
+		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("noclip",
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("free_move",
@@ -1122,11 +1092,6 @@ Game::Game() :
 		&settingChangedCallback, this);
 
 	readSettings();
-
-#ifdef HAVE_TOUCHSCREENGUI
-	m_cache_hold_aux1 = false;	// This is initialised properly later
-#endif
-
 }
 
 /****************************************************************************
@@ -1143,7 +1108,7 @@ Game::~Game()
 	delete soundmaker;
 	sound_manager.reset();
 
-	delete server; // deleted first to stop all server threads
+	delete server;
 
 	delete hud;
 	delete camera;
@@ -1173,6 +1138,8 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("repeat_place_time",
 		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("repeat_dig_time",
+		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("noclip",
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("free_move",
@@ -1221,6 +1188,8 @@ bool Game::startup(bool *kill,
 	driver = device->getVideoDriver();
 	smgr = m_rendering_engine->get_scene_manager();
 
+	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
+
 	smgr->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
 
 	// Reinit runData
@@ -1240,9 +1209,7 @@ bool Game::startup(bool *kill,
 
 	m_first_loop_after_window_activation = true;
 
-#ifdef HAVE_TOUCHSCREENGUI
 	m_touch_use_crosshair = g_settings->getBool("touch_use_crosshair");
-#endif
 
 	g_client_translations->clear();
 
@@ -1269,9 +1236,11 @@ void Game::run()
 	FpsControl draw_times;
 	f32 dtime; // in seconds
 
-	/* Clear the profiler */
-	Profiler::GraphValues dummyvalues;
-	g_profiler->graphGet(dummyvalues);
+	// Clear the profiler
+	{
+		Profiler::GraphValues dummyvalues;
+		g_profiler->graphPop(dummyvalues);
+	}
 
 	draw_times.reset();
 
@@ -1279,16 +1248,15 @@ void Game::run()
 
 	set_light_table(g_settings->getFloat("display_gamma"));
 
-#ifdef HAVE_TOUCHSCREENGUI
-	m_cache_hold_aux1 = g_settings->getBool("fast_move")
+	m_touch_simulate_aux1 = g_settings->getBool("fast_move")
 			&& client->checkPrivilege("fast");
-#endif
 
 	const irr::core::dimension2du initial_screen_size(
 			g_settings->getU16("screen_w"),
 			g_settings->getU16("screen_h")
 		);
-	const bool initial_window_maximized = g_settings->getBool("window_maximized");
+	const bool initial_window_maximized = !g_settings->getBool("fullscreen") &&
+			g_settings->getBool("window_maximized");
 
 	while (m_rendering_engine->run()
 			&& !(*kill || g_gamecallback->shutdown_requested
@@ -1298,7 +1266,7 @@ void Game::run()
 		// Calculate dtime =
 		//    m_rendering_engine->run() from this iteration
 		//  + Sleep time until the wanted FPS are reached
-		draw_times.limit(device, &dtime);
+		draw_times.limit(device, &dtime, g_menumgr.pausesGame());
 
 		const auto current_dynamic_info = ClientDynamicInfo::getCurrent();
 		if (!current_dynamic_info.equal(client_display_info)) {
@@ -1348,8 +1316,8 @@ void Game::run()
 		updatePauseState();
 		if (m_is_paused)
 			dtime = 0.0f;
-		else
-			step(dtime);
+
+		step(dtime);
 
 		processClientEvents(&cam_view_target);
 		updateDebugState();
@@ -1359,9 +1327,6 @@ void Game::run()
 		updateFrame(&graph, &stats, dtime, cam_view);
 		updateProfilerGraphs(&graph);
 
-		// Update if minimap has been disabled by the server
-		m_game_ui->m_flags.show_minimap &= client->shouldShowMinimap();
-
 		if (m_does_lost_focus_pause_game && !device->isWindowFocused() && !isMenuActive()) {
 			showPauseMenu();
 		}
@@ -1388,12 +1353,15 @@ void Game::shutdown()
 	if (formspec)
 		formspec->quitMenu();
 
+	// Clear text when exiting.
+	m_game_ui->clearText();
 
-#ifdef HAVE_TOUCHSCREENGUI
-	g_touchscreengui->hide();
-#endif
+	if (g_touchscreengui)
+		g_touchscreengui->hide();
 
-	showOverlayMessage(N_("Shutting down..."), 0, 0, false);
+	// only if the shutdown progress bar isn't shown yet
+	if (m_shutdown_progress == 0.0f)
+		showOverlayMessage(N_("Shutting down..."), 0, 0);
 
 
 	if (clouds)
@@ -1426,15 +1394,30 @@ void Game::shutdown()
 			sleep_ms(100);
 	}
 
-/*
-	guitext->remove();
-	guitext2->remove();
-	guitext_info->remove();
-	guitext_status->remove();
-	guitext_chat->remove();
-	guitext_profiler->remove();
-*/
+	delete client;
+	client = nullptr;
+	delete soundmaker;
+	soundmaker = nullptr;
+	sound_manager.reset();
 
+	auto stop_thread = runInThread([=] {
+		delete server;
+		server = nullptr;
+	}, "ServerStop");
+
+	FpsControl fps_control;
+	fps_control.reset();
+
+	while (stop_thread->isRunning()) {
+		m_rendering_engine->run();
+		f32 dtime;
+		fps_control.limit(device, &dtime);
+		showOverlayMessage(N_("Shutting down..."), dtime, 0, &m_shutdown_progress);
+	}
+
+	stop_thread->rethrow();
+
+	// to be continued in Game::~Game
 }
 
 
@@ -1523,7 +1506,7 @@ bool Game::createSingleplayerServer(const std::string &map_dir,
 	} else {
 		bind_str = g_settings->get("bind_address");
 	}
-	
+
 	Address bind_addr(0, 0, 0, 0, port);
 
 	if (g_settings->getBool("ipv6_server"))
@@ -1544,9 +1527,9 @@ bool Game::createSingleplayerServer(const std::string &map_dir,
 	}
 
 	try {
+
 	server = new Server(map_dir, gamespec, simple_singleplayer_mode, bind_addr,
 			false, nullptr, error_message);
-	server->start();
 
 #if !EXCEPTION_DEBUG
 	} catch (const std::exception &e) {
@@ -1558,7 +1541,52 @@ bool Game::createSingleplayerServer(const std::string &map_dir,
 #endif
 	}
 
-	return true;
+	auto start_thread = runInThread([=] {
+		server->start();
+		copyServerClientCache();
+	}, "ServerStart");
+
+	input->clear();
+	bool success = true;
+
+	FpsControl fps_control;
+	fps_control.reset();
+
+	while (start_thread->isRunning()) {
+		if (!m_rendering_engine->run() || input->cancelPressed())
+			success = false;
+		f32 dtime;
+		fps_control.limit(device, &dtime);
+
+		if (success)
+			showOverlayMessage(N_("Creating server..."), dtime, 5);
+		else
+			showOverlayMessage(N_("Shutting down..."), dtime, 0, &m_shutdown_progress);
+	}
+
+	start_thread->rethrow();
+
+	return success;
+}
+
+void Game::copyServerClientCache()
+{
+	// It would be possible to let the client directly read the media files
+	// from where the server knows they are. But aside from being more complicated
+	// it would also *not* fill the media cache and cause slower joining of 
+	// remote servers.
+	// (Imagine that you launch a game once locally and then connect to a server.)
+
+	assert(server);
+	auto map = server->getMediaList();
+	u32 n = 0;
+	for (auto &it : map) {
+		assert(it.first.size() == 20); // SHA1
+		if (clientMediaUpdateCacheCopy(it.first, it.second))
+			n++;
+	}
+	infostream << "Copied " << n << " files directly from server to client cache"
+		<< std::endl;
 }
 
 bool Game::createClient(const GameStartData &start_data)
@@ -1572,12 +1600,6 @@ bool Game::createClient(const GameStartData &start_data)
 		return false;
 
 	bool could_connect, connect_aborted;
-#ifdef HAVE_TOUCHSCREENGUI
-	if (g_touchscreengui) {
-		g_touchscreengui->init(texture_src);
-		g_touchscreengui->hide();
-	}
-#endif
 	if (!connectToServer(start_data, &could_connect, &connect_aborted))
 		return false;
 
@@ -1599,13 +1621,14 @@ bool Game::createClient(const GameStartData &start_data)
 		return false;
 	}
 
-	//freeminer moved:
-	//m_local_inventory = new Inventory(itemdef_manager);
-
-	auto *scsf = new GameGlobalShaderConstantSetterFactory(
-			&m_flags.force_fog_off, &runData.fog_range, client, &client->getEnv().getLocalPlayer()->inventory);
+	auto *scsf = new GameGlobalShaderConstantSetterFactory(client);
 	shader_src->addShaderConstantSetterFactory(scsf);
 
+	shader_src->addShaderConstantSetterFactory(
+		new FogShaderConstantSetterFactory());
+
+	ShadowRenderer::preInit(shader_src);
+
 	// Update cached textures, meshes and materials
 	client->afterContentReceived();
 
@@ -1615,22 +1638,20 @@ bool Game::createClient(const GameStartData &start_data)
 	if (client->modsLoaded())
 		client->getScript()->on_camera_ready(camera);
 	client->setCamera(camera);
-#ifdef HAVE_TOUCHSCREENGUI
+
 	if (g_touchscreengui) {
-		g_touchscreengui->setUseCrosshair(!isNoCrosshairAllowed());
+		g_touchscreengui->setUseCrosshair(!isTouchCrosshairDisabled());
 	}
-#endif
 
 	/* Clouds
 	 */
 	if (m_cache_enable_clouds)
-		clouds = new Clouds(smgr, -1, time(0));
+		clouds = new Clouds(smgr, shader_src, -1, rand());
 
 	/* Skybox
 	 */
 	sky = new Sky(-1, m_rendering_engine, texture_src, shader_src);
 	scsf->setSky(sky);
-	skybox = NULL;	// This is used/set later on in the main run loop
 
 	/* Pre-calculated values
 	 */
@@ -1648,18 +1669,16 @@ bool Game::createClient(const GameStartData &start_data)
 
 	/* Set window caption
 	 */
-	std::wstring str = utf8_to_wide(PROJECT_NAME_C);
-	str += L" ";
-	str += utf8_to_wide(g_version_hash);
-	str += L" [";
-	str += simple_singleplayer_mode ? wstrgettext("Singleplayer")
-			: wstrgettext("Multiplayer");
-	str += L"]";
-	str += L" [";
-	str += driver->getName();
-	str += L"]";
+	auto driver_name = driver->getName();
+	std::string str = std::string(PROJECT_NAME_C) +
+			" " + g_version_hash + " [";
+	str += simple_singleplayer_mode ? gettext("Singleplayer")
+			: gettext("Multiplayer");
+	str += "] [";
+	str += driver_name;
+	str += "]";
 
-	device->setWindowCaption(str.c_str());
+	device->setWindowCaption(utf8_to_wide(str).c_str());
 
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 	player->hurt_tilt_timer = 0;
@@ -1708,12 +1727,8 @@ bool Game::initGui()
 	gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(),
 			-1, chat_backend, client, &g_menumgr);
 
-#ifdef HAVE_TOUCHSCREENGUI
-
-	if (g_touchscreengui)
-		g_touchscreengui->show();
-
-#endif
+	if (g_settings->getBool("enable_touch"))
+		g_touchscreengui = new TouchScreenGUI(device, texture_src);
 
 	if(!g_settings->get("console_color").empty())
 	{
@@ -1730,16 +1745,25 @@ bool Game::connectToServer(const GameStartData &start_data,
 	*connect_ok = false;	// Let's not be overly optimistic
 	*connection_aborted = false;
 	bool local_server_mode = false;
+	const auto &address_name = start_data.address;
 
 	showOverlayMessage(N_("Resolving address..."), 0, 15);
 
 	Address connect_address(0, 0, 0, 0, start_data.socket_port);
+	Address fallback_address;
 
 	try {
-		connect_address.Resolve(start_data.address.c_str());
+		connect_address.Resolve(address_name.c_str(), &fallback_address);
 
-		if (connect_address.isZero()) { // i.e. INADDR_ANY, IN6ADDR_ANY
+		if (connect_address.isAny()) {
+			// replace with localhost IP
 			if (connect_address.isIPv6() || (g_settings->getBool("ipv6_server") && g_settings->getBool("enable_ipv6"))) {
+
+/*
+				IPv6AddressBytes addr_bytes;
+				addr_bytes.bytes[15] = 1;
+*/
+
 				connect_address.setAddress(in6addr_loopback);
 			} else {
 				connect_address.setAddress(127, 0, 0, 1);
@@ -1753,10 +1777,15 @@ bool Game::connectToServer(const GameStartData &start_data,
 		return false;
 	}
 
-	if (connect_address.isIPv6() && !g_settings->getBool("enable_ipv6")) {
+	// this shouldn't normally happen since Address::Resolve() checks for enable_ipv6
+	if (g_settings->getBool("enable_ipv6")) {
+		// empty
+	} else if (connect_address.isIPv6()) {
 		*error_message = fmtgettext("Unable to connect to %s because IPv6 is disabled", connect_address.serializeString().c_str());
 		errorstream << *error_message << std::endl;
 		return false;
+	} else if (fallback_address.isIPv6()) {
+		fallback_address = Address();
 	}
 
 #if USE_MULTI
@@ -1780,16 +1809,26 @@ bool Game::connectToServer(const GameStartData &start_data,
 	}
 #endif
 
+	fallback_address.setPort(connect_address.getPort());
+	if (fallback_address.isValid()) {
+		infostream << "Resolved two addresses for \"" << address_name
+			<< "\" isIPv6[0]=" << connect_address.isIPv6()
+			<< " isIPv6[1]=" << fallback_address.isIPv6() << std::endl;
+	} else {
+		infostream << "Resolved one address for \"" << address_name
+			<< "\" isIPv6=" << connect_address.isIPv6() << std::endl;
+	}
+
+
 	try {
 		client = new Client(
 				simple_singleplayer_mode,
 				start_data.name.c_str(),
-				start_data.password, start_data.address,
+				start_data.password,
 				*draw_control, texture_src, shader_src,
 				itemdef_manager, nodedef_manager, sound_manager.get(), eventmgr,
-				m_rendering_engine, connect_address.isIPv6(), m_game_ui.get(),
+				m_rendering_engine, m_game_ui.get(),
 				start_data.allow_login_or_register);
-		client->migrateModStorage();
 	} catch (const BaseException &e) {
 		*error_message = fmtgettext("Error creating client: %s", e.what());
 		errorstream << *error_message << std::endl;
@@ -1797,26 +1836,24 @@ bool Game::connectToServer(const GameStartData &start_data,
 	}
 
 	client->chat_backend = chat_backend;
+	client->migrateModStorage();
 	client->m_simple_singleplayer_mode = simple_singleplayer_mode;
 
-	infostream << "Connecting to server at ";
-	connect_address.print(infostream);
-	infostream << std::endl;
-
-	try {
-
-	client->connect(connect_address,
-		simple_singleplayer_mode || local_server_mode);
-
 	/*
 		Wait for server to accept connection
 	*/
+	try {
 
+	client->connect(connect_address, address_name,
+		simple_singleplayer_mode || local_server_mode);
+
+//	try {
 		input->clear();
 
 		FpsControl fps_control;
 		f32 dtime;
 		f32 wait_time = 0; // in seconds
+		bool did_fallback = false;
 
 		fps_control.reset();
 
@@ -1825,10 +1862,7 @@ bool Game::connectToServer(const GameStartData &start_data,
 			fps_control.limit(device, &dtime);
 
 			// Update client and server
-			client->step(dtime);
-
-			if (server != NULL)
-				server->step(dtime);
+			step(dtime);
 
 			// End condition
 			if (client->getState() == LC_Init) {
@@ -1854,8 +1888,15 @@ bool Game::connectToServer(const GameStartData &start_data,
 			}
 
 			wait_time += dtime;
-			// Only time out if we aren't waiting for the server we started
-			if (!start_data.address.empty() && wait_time > 10) {
+			if (local_server_mode) {
+				// never time out
+			} else if (wait_time > GAME_FALLBACK_TIMEOUT && !did_fallback) {
+				if (!client->hasServerReplied() && fallback_address.isValid()) {
+					client->connect(fallback_address, address_name,
+						simple_singleplayer_mode || local_server_mode);
+				}
+				did_fallback = true;
+			} else if (wait_time > GAME_CONNECTION_TIMEOUT) {
 				*error_message = gettext("Connection timed out.");
 				errorstream << *error_message << std::endl;
 				runData.reconnect = true;
@@ -1867,17 +1908,21 @@ bool Game::connectToServer(const GameStartData &start_data,
 		}
 
 	} catch (con::ConnectionException &e) {
-		showOverlayMessage(std::string("Connection error: ") + e.what(), 0, 0, false);
+		showOverlayMessage(std::string("Connection error: ") + e.what(), 0, 0);
 		errorstream << "Connection error: "<< e.what() << std::endl;
+/*
+	} catch (con::PeerNotFoundException &e) {
+		warningstream << "This should not happen. Please report a bug." << std::endl;
+*/
 		return false;
 
 #if !EXCEPTION_DEBUG
 	} catch (const std::exception &e) {
-		showOverlayMessage(std::string("Connection error: ") + e.what(), 0, 0, false);
+		showOverlayMessage(std::string("Connection error: ") + e.what(), 0, 0);
 		errorstream << "Connection error: "<< e.what() << std::endl;
 		return false;
 	} catch (...) {
-		showOverlayMessage(std::string("Oops ") , 0, 0, false);
+		showOverlayMessage(std::string("Oops ") , 0, 0);
 		return false;
 #else
 	} catch (int) { //nothing
@@ -1909,15 +1954,12 @@ bool Game::getServerContent(bool *aborted)
 		fps_control.limit(device, &dtime);
 
 		// Update client and server
-		client->step(dtime);
-
-		if (server != NULL)
-			server->step(dtime);
+		step(dtime);
 
 		// End condition
 		if (client->mediaReceived() && client->itemdefReceived() &&
 				client->nodedefReceived()) {
-			break;
+			return true;
 		}
 
 		// Error conditions
@@ -1988,7 +2030,9 @@ bool Game::getServerContent(bool *aborted)
 
 	}
 
-	return true;
+	*aborted = true;
+	infostream << "Connect aborted [device]" << std::endl;
+	return false;
 }
 
 
@@ -2059,6 +2103,12 @@ inline bool Game::handleCallbacks()
 		g_gamecallback->keyconfig_requested = false;
 	}
 
+	if (!g_gamecallback->show_open_url_dialog.empty()) {
+		(new GUIOpenURLMenu(guienv, guiroot, -1,
+				 &g_menumgr, texture_src, g_gamecallback->show_open_url_dialog))->drop();
+		g_gamecallback->show_open_url_dialog.clear();
+	}
+
 	if (g_gamecallback->keyconfig_changed) {
 		input->keycache.populate(); // update the cache with new settings
 		g_gamecallback->keyconfig_changed = false;
@@ -2093,8 +2143,14 @@ void Game::updateDebugState()
 	}
 	if (!has_basic_debug)
 		hud->disableBlockBounds();
-	if (!has_debug)
+	if (!has_debug) {
 		draw_control->show_wireframe = false;
+		m_flags.disable_camera_update = false;
+		auto formspec = m_game_ui->getFormspecGUI();
+		if (formspec) {
+			formspec->setDebugView(false);
+		}
+	}
 
 	// noclip
 	draw_control->allow_noclip = m_cache_enable_noclip && client->checkPrivilege("noclip");
@@ -2107,7 +2163,8 @@ void Game::updateProfilers(const RunStats &stats, const FpsControl &draw_times,
 			g_settings->getFloat("profiler_print_interval");
 	bool print_to_log = true;
 
-	if (profiler_print_interval == 0) {
+	// Update game UI anyway but don't log
+	if (profiler_print_interval <= 0) {
 		print_to_log = false;
 		profiler_print_interval = 3;
 	}
@@ -2122,12 +2179,12 @@ void Game::updateProfilers(const RunStats &stats, const FpsControl &draw_times,
 		g_profiler->clear();
 	}
 
-	// Update update graphs
+	// Update graphs
 	g_profiler->graphAdd("Time non-rendering [us]",
 		draw_times.busy_time - stats.drawtime);
-
 	g_profiler->graphAdd("Sleep [us]", draw_times.sleep_time);
-	g_profiler->graphAdd("FPS", 1.0f / dtime);
+
+	g_profiler->graphSet("FPS", 1.0f / dtime);
 }
 
 void Game::updateStats(RunStats *stats, const FpsControl &draw_times,
@@ -2197,19 +2254,17 @@ void Game::processUserInput(f32 dtime)
 		} else {
 			input->clear();
 		}
-#ifdef HAVE_TOUCHSCREENGUI
+
 		if (g_touchscreengui)
-		g_touchscreengui->hide();
-#endif
+			g_touchscreengui->hide();
+
 	} else {
-#ifdef HAVE_TOUCHSCREENGUI
 		if (g_touchscreengui) {
 			/* on touchscreengui step may generate own input events which ain't
 			 * what we want in case we just did clear them */
 			g_touchscreengui->show();
 			g_touchscreengui->step(dtime);
 		}
-#endif
 
 #ifdef __ANDROID__
 	if (gui_chat_console->isOpen()) {
@@ -2498,13 +2553,11 @@ void Game::processItemSelection(u16 *new_playeritem)
 		}
 	}
 
-#ifdef HAVE_TOUCHSCREENGUI
 	if (g_touchscreengui) {
 		std::optional<u16> selection = g_touchscreengui->getHotbarSelection();
 		if (selection)
 			*new_playeritem = *selection;
 	}
-#endif
 
 	// Clamp selection again in case it wasn't changed but max_item was
 	*new_playeritem = MYMIN(*new_playeritem, max_item);
@@ -2575,12 +2628,15 @@ void Game::openConsole(float scale, const wchar_t *line)
 {
 	assert(scale > 0.0f && scale <= 1.0f);
 
-/*
 #ifdef __ANDROID__
-	porting::showInputDialog(gettext("ok"), "", "", 2);
-	m_android_chat_open = true;
-#else
-*/
+
+// FM TODO was comment?
+	if (!porting::hasPhysicalKeyboardAndroid()) {
+		porting::showTextInputDialog("", "", 2);
+		m_android_chat_open = true;
+	} else {
+// =====
+#endif
 	if (gui_chat_console->isOpenInhibited())
 		return;
 
@@ -2596,16 +2652,16 @@ void Game::openConsole(float scale, const wchar_t *line)
 		gui_chat_console->replaceAndAddToHistory(line);
 	}
 
-#ifdef __ANDROID__
+/* fm todo del? 
 	} else {
 		int type = 2;
 		porting::showInputDialog(_("ok"), "", wide_to_utf8(gui_chat_console->getText()), type);
-
-/*
-	porting::showInputDialog(_("ok"), "", "", 2);
-*/
-	m_android_chat_open = true;
+		m_android_chat_open = true;
 	}
+*/
+
+#ifdef __ANDROID__
+	} // else
 #endif
 
 }
@@ -2613,15 +2669,19 @@ void Game::openConsole(float scale, const wchar_t *line)
 #ifdef __ANDROID__
 void Game::handleAndroidChatInput()
 {
-	if (m_android_chat_open && porting::getInputDialogState() == 0) {
-		std::string text = porting::getInputDialogValue();
-		client->typeChatMessage(utf8_to_wide(text));
-		m_android_chat_open = false;
+	// It has to be a text input
+	if (m_android_chat_open && porting::getLastInputDialogType() == porting::TEXT_INPUT) {
+		porting::AndroidDialogState dialogState = porting::getInputDialogState();
+		if (dialogState == porting::DIALOG_INPUTTED) {
+			std::string text = porting::getInputDialogMessage();
+			client->typeChatMessage(utf8_to_wide(text));
+		}
+		if (dialogState != porting::DIALOG_SHOWN)
+			m_android_chat_open = false;
 	}
 }
 #endif
 
-
 void Game::toggleFreeMove()
 {
 	bool free_move = !g_settings->getBool("free_move");
@@ -2683,9 +2743,7 @@ void Game::toggleFast()
 		m_game_ui->showTranslatedStatusText("Fast mode disabled");
 	}
 
-#ifdef HAVE_TOUCHSCREENGUI
-	m_cache_hold_aux1 = fast_move && has_fast_privs;
-#endif
+	m_touch_simulate_aux1 = fast_move && has_fast_privs;
 }
 
 
@@ -2744,9 +2802,6 @@ void Game::toggleBlockBounds()
 		case Hud::BLOCK_BOUNDS_NEAR:
 			m_game_ui->showTranslatedStatusText("Block bounds shown for nearby blocks");
 			break;
-		case Hud::BLOCK_BOUNDS_MAX:
-			m_game_ui->showTranslatedStatusText("Block bounds shown for all blocks");
-			break;
 		default:
 			break;
 	}
@@ -2780,23 +2835,16 @@ void Game::toggleMinimap(bool shift_pressed)
 	// -->
 	u32 hud_flags = client->getEnv().getLocalPlayer()->hud_flags;
 
-	if (!(hud_flags & HUD_FLAG_MINIMAP_VISIBLE)) {
-		m_game_ui->m_flags.show_minimap = false;
-	} else {
-
+	if (hud_flags & HUD_FLAG_MINIMAP_VISIBLE) {
 	// If radar is disabled, try to find a non radar mode or fall back to 0
 		if (!(hud_flags & HUD_FLAG_MINIMAP_RADAR_VISIBLE))
 			while (mapper->getModeIndex() &&
 					mapper->getModeDef().type == MINIMAP_TYPE_RADAR)
 				mapper->nextMode();
-
-		m_game_ui->m_flags.show_minimap = mapper->getModeDef().type !=
-				MINIMAP_TYPE_OFF;
 	}
 	// <--
 	// End of 'not so satifying code'
-	if ((hud_flags & HUD_FLAG_MINIMAP_VISIBLE) ||
-			(hud && hud->hasElementOfType(HUD_ELEM_MINIMAP)))
+	if (hud && hud->hasElementOfType(HUD_ELEM_MINIMAP))
 		m_game_ui->showStatusText(utf8_to_wide(mapper->getModeDef().label));
 	else
 		m_game_ui->showTranslatedStatusText("Minimap currently disabled by game or mod");
@@ -2804,14 +2852,17 @@ void Game::toggleMinimap(bool shift_pressed)
 
 void Game::toggleFog()
 {
-	bool fog_enabled = g_settings->getBool("enable_fog");
-	g_settings->setBool("enable_fog", !fog_enabled);
-	if (fog_enabled)
-		m_game_ui->showTranslatedStatusText("Fog disabled");
-	else
+	bool flag = !g_settings->getBool("enable_fog");
+	g_settings->setBool("enable_fog", flag);
+	bool allowed = sky->getFogDistance() < 0 || client->checkPrivilege("debug");
+	if (!allowed)
+		m_game_ui->showTranslatedStatusText("Fog enabled by game or mod");
+	else if (flag)
 		m_game_ui->showTranslatedStatusText("Fog enabled");
+	else
+		m_game_ui->showTranslatedStatusText("Fog disabled");
 
-	runData.enable_fog = !fog_enabled;
+	runData.enable_fog = allowed && flag;
 }
 
 
@@ -2865,8 +2916,9 @@ void Game::toggleDebug()
 
 void Game::toggleUpdateCamera()
 {
-	m_flags.disable_camera_update = !m_flags.disable_camera_update;
-	if (m_flags.disable_camera_update)
+	auto &flag = m_flags.disable_camera_update;
+	flag = client->checkPrivilege("debug") ? !flag : false;
+	if (flag)
 		m_game_ui->showTranslatedStatusText("Camera update disabled");
 	else
 		m_game_ui->showTranslatedStatusText("Camera update enabled");
@@ -2971,23 +3023,25 @@ void Game::checkZoomEnabled()
 
 void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 {
-#ifndef __ANDROID__
-	if (isMenuActive())
-		device->getCursorControl()->setRelativeMode(false);
-	else
-		device->getCursorControl()->setRelativeMode(true);
-#endif
+	auto *cur_control = device->getCursorControl();
+
+	/* With CIrrDeviceSDL on Linux and Windows, enabling relative mouse mode
+	somehow results in simulated mouse events being generated from touch events,
+	although SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS are set to 0.
+	Since Minetest has its own code to synthesize mouse events from touch events,
+	this results in duplicated input. To avoid that, we don't enable relative
+	mouse mode if we're in touchscreen mode. */
+	if (cur_control)
+		cur_control->setRelativeMode(!g_touchscreengui && !isMenuActive());
 
 	if ((device->isWindowActive() && device->isWindowFocused()
 			&& !isMenuActive()) || input->isRandom()) {
 
-#ifndef __ANDROID__
-		if (!input->isRandom()) {
+		if (cur_control && !input->isRandom()) {
 			// Mac OSX gets upset if this is set every frame
-			if (device->getCursorControl()->isVisible())
-				device->getCursorControl()->setVisible(false);
+			if (cur_control->isVisible())
+				cur_control->setVisible(false);
 		}
-#endif
 
 		if (m_first_loop_after_window_activation) {
 			m_first_loop_after_window_activation = false;
@@ -2999,15 +3053,11 @@ void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 		}
 
 	} else {
-
-#ifndef ANDROID
 		// Mac OSX gets upset if this is set every frame
-		if (!device->getCursorControl()->isVisible())
-			device->getCursorControl()->setVisible(true);
-#endif
+		if (cur_control && !cur_control->isVisible())
+			cur_control->setVisible(true);
 
 		m_first_loop_after_window_activation = true;
-
 	}
 }
 
@@ -3020,17 +3070,15 @@ f32 Game::getSensitivityScaleFactor() const
 	// Multiply by a constant such that it becomes 1.0 at 72 degree FOV and
 	// 16:9 aspect ratio to minimize disruption of existing sensitivity
 	// settings.
-	return tan(fov_y / 2.0f) * 1.3763818698f;
+	return std::tan(fov_y / 2.0f) * 1.3763819f;
 }
 
 void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 {
-#ifdef HAVE_TOUCHSCREENGUI
 	if (g_touchscreengui) {
 		cam->camera_yaw   += g_touchscreengui->getYawChange();
-		cam->camera_pitch  = g_touchscreengui->getPitch();
+		cam->camera_pitch += g_touchscreengui->getPitchChange();
 	} else {
-#endif
 		v2s32 center(driver->getScreenSize().Width / 2, driver->getScreenSize().Height / 2);
 		v2s32 dist = input->getMousePos() - center;
 
@@ -3044,9 +3092,7 @@ void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 
 		if (dist.X != 0 || dist.Y != 0)
 			input->setMousePos(center.X, center.Y);
-#ifdef HAVE_TOUCHSCREENGUI
 	}
-#endif
 
 	if (m_cache_enable_joysticks) {
 		f32 sens_scale = getSensitivityScaleFactor();
@@ -3087,20 +3133,18 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 			/*client->activeObjectsReceived() */ player->getCAO() && !player->isDead()) {
 		control.movement_speed = 1.0f;
 		// sideways movement only
-		float dx = sin(control.movement_direction);
-		control.movement_direction = atan2(dx, 1.0f);
+		float dx = std::sin(control.movement_direction);
+		control.movement_direction = std::atan2(dx, 1.0f);
 	}
 
-#ifdef HAVE_TOUCHSCREENGUI
 	/* For touch, simulate holding down AUX1 (fast move) if the user has
 	 * the fast_move setting toggled on. If there is an aux1 key defined for
 	 * touch then its meaning is inverted (i.e. holding aux1 means walk and
 	 * not fast)
 	 */
-	if (m_cache_hold_aux1) {
+	if (g_touchscreengui && m_touch_simulate_aux1) {
 		control.aux1 = control.aux1 ^ true;
 	}
-#endif
 
 	client->setPlayerControl(control);
 
@@ -3146,10 +3190,29 @@ void Game::updatePauseState()
 
 inline void Game::step(f32 dtime)
 {
-	if (server)
-		server->step(dtime);
+	if (server) {
+		float fps_max = (!device->isWindowFocused() || g_menumgr.pausesGame()) ?
+				g_settings->getFloat("fps_max_unfocused") :
+				g_settings->getFloat("fps_max");
+		fps_max = std::max(fps_max, 1.0f);
+		/*
+		 * Unless you have a barebones game, running the server at more than 60Hz
+		 * is hardly realistic and you're at the point of diminishing returns.
+		 * fps_max is also not necessarily anywhere near the FPS actually achieved
+		 * (also due to vsync).
+		 */
+		fps_max = std::min(fps_max, 60.0f);
 
-	client->step(dtime);
+		server->setStepSettings(Server::StepSettings{
+				1.0f / fps_max,
+				m_is_paused
+			});
+
+		server->step();
+	}
+
+	if (!m_is_paused)
+		client->step(dtime);
 }
 
 static void pauseNodeAnimation(PausedNodesList &paused, scene::ISceneNode *node) {
@@ -3399,6 +3462,9 @@ void Game::handleClientEvent_HudChange(ClientEvent *event, CameraOrientation *ca
 		CASE_SET(HUD_STAT_TEXT2, text2, sdata);
 
 		CASE_SET(HUD_STAT_STYLE, style, data);
+
+		case HudElementStat_END:
+			break;
 	}
 
 #undef CASE_SET
@@ -3412,10 +3478,6 @@ void Game::handleClientEvent_SetSky(ClientEvent *event, CameraOrientation *cam)
 	// Whether clouds are visible in front of a custom skybox.
 	sky->setCloudsEnabled(event->set_sky->clouds);
 
-	if (skybox) {
-		skybox->remove();
-		skybox = NULL;
-	}
 	// Clear the old textures out in case we switch rendering type.
 	sky->clearSkyboxTextures();
 	// Handle according to type
@@ -3475,6 +3537,7 @@ void Game::handleClientEvent_SetSky(ClientEvent *event, CameraOrientation *cam)
 	else
 		sky->setFogStart(rangelim(g_settings->getFloat("fog_start"), 0.0f, 0.99f));
 
+	sky->setFogColor(event->set_sky->fog_color);
 
 	delete event->set_sky;
 }
@@ -3596,10 +3659,8 @@ void Game::updateCamera(f32 dtime)
 
 		camera->toggleCameraMode();
 
-#ifdef HAVE_TOUCHSCREENGUI
 		if (g_touchscreengui)
-			g_touchscreengui->setUseCrosshair(!isNoCrosshairAllowed());
-#endif
+			g_touchscreengui->setUseCrosshair(!isTouchCrosshairDisabled());
 
 		// Make the player visible depending on camera mode.
 		playercao->updateMeshCulling();
@@ -3651,19 +3712,7 @@ void Game::updateSound(f32 dtime)
 			camera->getDirection(),
 			camera->getCameraNode()->getUpVector());
 
-	bool mute_sound = g_settings->getBool("mute_sound");
-	if (mute_sound) {
-		sound_manager->setListenerGain(0.0f);
-	} else {
-		// Check if volume is in the proper range, else fix it.
-		float old_volume = g_settings->getFloat("sound_volume");
-		float new_volume = rangelim(old_volume, 0.0f, 1.0f);
-		sound_manager->setListenerGain(new_volume);
-
-		if (old_volume != new_volume) {
-			g_settings->setFloat("sound_volume", new_volume);
-		}
-	}
+	sound_volume_control(sound_manager.get(), device->isWindowActive());
 
 	// Tell the sound maker whether to make footstep sounds
 	soundmaker->makes_footstep_sound = player->makes_footstep_sound;
@@ -3693,7 +3742,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud)
 	const ItemStack &tool_item = player->getWieldedItem(&selected_item, &hand_item);
 
 	const ItemDefinition &selected_def = selected_item.getDefinition(itemdef_manager);
-	f32 d = getToolRange(selected_def, hand_item.getDefinition(itemdef_manager));
+	f32 d = getToolRange(selected_item, hand_item, itemdef_manager);
 
 	core::line3d<f32> shootline;
 
@@ -3714,8 +3763,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud)
 	}
 	shootline.end = shootline.start + camera_direction * BS * d;
 
-#ifdef HAVE_TOUCHSCREENGUI
-	if (g_touchscreengui && isNoCrosshairAllowed()) {
+	if (g_touchscreengui && isTouchCrosshairDisabled()) {
 		shootline = g_touchscreengui->getShootline();
 		// Scale shootline to the acual distance the player can reach
 		shootline.end = shootline.start +
@@ -3723,16 +3771,21 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud)
 		shootline.start += intToFloat(camera_offset, BS);
 		shootline.end += intToFloat(camera_offset, BS);
 	}
-#endif
 
 	PointedThing pointed = updatePointedThing(shootline,
 			selected_def.liquids_pointable,
+			selected_def.pointabilities,
 			!runData.btn_down_for_dig,
 			camera_offset);
 
 	if (pointed != runData.pointed_old)
 		infostream << "Pointing at " << pointed.dump() << std::endl;
 
+	if (g_touchscreengui) {
+		auto mode = selected_def.touch_interaction.getMode(pointed.type);
+		g_touchscreengui->applyContextControls(mode);
+	}
+
 	// Note that updating the selection mesh every frame is not particularly efficient,
 	// but the halo rendering code is already inefficient so there's no point in optimizing it here
 	hud->updateSelectionMesh(camera_offset);
@@ -3833,6 +3886,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud)
 PointedThing Game::updatePointedThing(
 	const core::line3d<f32> &shootline,
 	bool liquids_pointable,
+	const std::optional<Pointabilities> &pointabilities,
 	bool look_for_object,
 	const v3s16 &camera_offset)
 {
@@ -3849,7 +3903,7 @@ PointedThing Game::updatePointedThing(
 	runData.selected_object = NULL;
 	hud->pointing_at_object = false;
 
-	RaycastState s(shootline, look_for_object, liquids_pointable);
+	RaycastState s(shootline, look_for_object, liquids_pointable, pointabilities);
 	PointedThing result;
 	env.continueRaycast(&s, &result);
 	if (result.type == POINTEDTHING_OBJECT) {
@@ -4091,7 +4145,36 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 		v3s16 dir = nodepos - neighborpos;
 
 		if (abs(dir.Y) > MYMAX(abs(dir.X), abs(dir.Z))) {
-			predicted_node.setParam2(dir.Y < 0 ? 1 : 0);
+			// If you change this code, also change builtin/game/item.lua
+			u8 predicted_param2 = dir.Y < 0 ? 1 : 0;
+			if (selected_def.wallmounted_rotate_vertical) {
+				bool rotate90 = false;
+				v3f fnodepos = v3f(neighborpos.X, neighborpos.Y, neighborpos.Z);
+				v3f ppos = client->getEnv().getLocalPlayer()->getPosition() / BS;
+				v3f pdir = fnodepos - ppos;
+				switch (predicted_f.drawtype) {
+					case NDT_TORCHLIKE: {
+						rotate90 = !((pdir.X < 0 && pdir.Z > 0) ||
+								(pdir.X > 0 && pdir.Z < 0));
+						if (dir.Y > 0) {
+							rotate90 = !rotate90;
+						}
+						break;
+					};
+					case NDT_SIGNLIKE: {
+						rotate90 = std::abs(pdir.X) < std::abs(pdir.Z);
+						break;
+					}
+					default: {
+						rotate90 = std::abs(pdir.X) > std::abs(pdir.Z);
+						break;
+					}
+				}
+				if (rotate90) {
+					predicted_param2 += 6;
+				}
+			}
+			predicted_node.setParam2(predicted_param2);
 		} else if (abs(dir.X) > abs(dir.Z)) {
 			predicted_node.setParam2(dir.X < 0 ? 3 : 2);
 		} else {
@@ -4342,10 +4425,16 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
 
 		// We don't want a corresponding delay to very time consuming nodes
 		// and nodes without digging time (e.g. torches) get a fixed delay.
-		if (runData.nodig_delay_timer > 0.3)
-			runData.nodig_delay_timer = 0.3;
+		if (runData.nodig_delay_timer > 0.3f)
+			runData.nodig_delay_timer = 0.3f;
 		else if (runData.dig_instantly)
-			runData.nodig_delay_timer = 0.15;
+			runData.nodig_delay_timer = 0.15f;
+
+		// Ensure that the delay between breaking nodes
+		// (dig_time_complete + nodig_delay_timer) is at least the
+		// value of the repeat_dig_time setting.
+		runData.nodig_delay_timer = std::max(runData.nodig_delay_timer,
+				m_repeat_dig_time - runData.dig_time_complete);
 
 		if (client->modsLoaded() &&
 				client->getScript()->on_dignode(nodepos, n)) {
@@ -4426,7 +4515,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 
 
 	if (draw_control->range_all && sky->getFogDistance() < 0) {
-		runData.fog_range = 100000 * BS;
+		runData.fog_range = FOG_RANGE_ALL;
 	} else if (!runData.headless_optimize) {
 		runData.fog_range = draw_control->wanted_range * BS
 				+ 0.0 * MAP_BLOCKSIZE * BS;
@@ -4442,7 +4531,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 		}
 
 		if (!runData.enable_fog)
-			runData.fog_range = FARMESH_LIMIT * BS;
+			runData.fog_range = FOG_RANGE_ALL;
 		else
 		runData.fog_range = MYMIN(
 				runData.fog_range,
@@ -4534,36 +4623,12 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 	*/
 	client->getParticleManager()->step(dtime);
 
-	/*
-		Fog
-	*/
-	if (m_cache_enable_fog) {
-		driver->setFog(
-				sky->getBgColor(),
-				video::EFT_FOG_LINEAR,
-				runData.fog_range * sky->getFogStart(),
-				runData.fog_range * 1.0,
-				0.01,
-				false, // pixel fog
-				true // range fog
-		);
-	} else {
-		driver->setFog(
-				sky->getBgColor(),
-				video::EFT_FOG_LINEAR,
-				100000 * BS,
-				110000 * BS,
-				0.01f,
-				false, // pixel fog
-				false // range fog
-		);
-	}
-
 	} // headless_optimize
 
 	/*
 		Damage camera tilt
 	*/
+
 	if (player->hurt_tilt_timer > 0.0f) {
 		player->hurt_tilt_timer -= dtime * 6.0f;
 
@@ -4676,6 +4741,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 			break;
 
 		if (formspec->getReferenceCount() == 1) {
+			// See GUIFormSpecMenu::create what refcnt = 1 means
 			m_game_ui->deleteFormspec();
 			break;
 		}
@@ -4696,68 +4762,19 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 	/*
 		==================== Drawing begins ====================
 	*/
-	const video::SColor skycolor = sky->getSkyColor();
-
-	//auto start_ms = porting::getTimeMs();
-
-	TimeTaker tt_draw("Draw scene", nullptr, PRECISION_MICRO);
 	if (!runData.headless_optimize)
-	driver->beginScene(true, true, skycolor);
-
-	bool draw_wield_tool = (m_game_ui->m_flags.show_hud &&
-			(player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE) &&
-			(camera->getCameraMode() == CAMERA_MODE_FIRST));
-	bool draw_crosshair = (
-			(player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
-			(camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT));
-#ifdef HAVE_TOUCHSCREENGUI
-	if (isNoCrosshairAllowed())
-		draw_crosshair = false;
-#endif
-	if (!runData.headless_optimize)
-	m_rendering_engine->draw_scene(skycolor, m_game_ui->m_flags.show_hud,
-			m_game_ui->m_flags.show_minimap, draw_wield_tool, draw_crosshair);
-
-	/*
-		Profiler graph
-	*/
-	v2u32 screensize = driver->getScreenSize();
-
-	if (m_game_ui->m_flags.show_profiler_graph)
-		graph->draw(10, screensize.Y - 10, driver, g_fontengine->getFont());
-
-	/*
-		Damage flash
-	*/
-	if (runData.damage_flash > 0.0f) {
-		video::SColor color(runData.damage_flash, 180, 0, 0);
-		driver->draw2DRectangle(color,
-					core::rect<s32>(0, 0, screensize.X, screensize.Y),
-					NULL);
-
-		runData.damage_flash -= 384.0f * dtime;
-	}
-
+	if (device->isWindowVisible())
+		drawScene(graph, stats);
 	/*
 		==================== End scene ====================
 	*/
 
-	/*
-		Draw background for player list
-	*/
-	if (playerlist) {
-		driver->draw2DRectangle(console_bg, playerlist->getAbsolutePosition());
-		draw2DRectangleOutline(driver,
-				playerlist->getAbsolutePosition(), video::SColor(255, 128, 128, 128));
+	// Damage flash is drawn in drawScene, but the timing update is done here to
+	// keep dtime out of the drawing code.
+	if (runData.damage_flash > 0.0f) {
+		runData.damage_flash -= 384.0f * dtime;
 	}
 
-	if (!runData.headless_optimize)
-		driver->endScene();
-
-	/*
-	stats->drawtime = tt_draw.stop(true);
-	*/
-	g_profiler->graphAdd("Draw scene [us]", stats->drawtime);
 	g_profiler->avg("Game::updateFrame(): update frame [ms]", tt_update.stop(true));
 }
 
@@ -4773,6 +4790,7 @@ void Game::updateClouds(float dtime)
 		camera_node_position.Y   = camera_node_position.Y + camera_offset.Y * BS;
 		camera_node_position.Z   = camera_node_position.Z + camera_offset.Z * BS;
 
+		{
 	 	const auto pos_i = floatToInt(camera_node_position, BS);
 		if (std::abs(clouds->m_params.height - camera_node_position.Y)/BS > 3000){
 			this->clouds->setVisible(false);
@@ -4782,7 +4800,8 @@ void Game::updateClouds(float dtime)
 		this->clouds->update(camera_node_position, this->sky->getCloudColor(),
 			client->getEnv().getClientMap().getHumidity({pos_i.X, (pos_t)clouds->m_params.height, pos_i.Z}, 1)
 		);
-		if (this->clouds->isCameraInsideCloud() && this->m_cache_enable_fog) {
+		}
+		if (this->clouds->isCameraInsideCloud() && this->fogEnabled()) {
 			// If camera is inside cloud and fog is enabled, use cloud's colors as sky colors.
 			video::SColor clouds_dark = this->clouds->getColor().getInterpolated(
 					video::SColor(255, 0, 0, 0), 0.9);
@@ -4801,7 +4820,7 @@ void Game::updateClouds(float dtime)
 inline void Game::updateProfilerGraphs(ProfilerGraph *graph)
 {
 	Profiler::GraphValues values;
-	g_profiler->graphGet(values);
+	g_profiler->graphPop(values);
 	graph->put(values);
 }
 
@@ -4814,14 +4833,14 @@ void Game::updateShadows()
 	if (!shadow)
 		return;
 
-	float in_timeofday = fmod(runData.time_of_day_smooth, 1.0f);
+	float in_timeofday = std::fmod(runData.time_of_day_smooth, 1.0f);
 
 	float timeoftheday = getWickedTimeOfDay(in_timeofday);
 	bool is_day = timeoftheday > 0.25 && timeoftheday < 0.75;
 	bool is_shadow_visible = is_day ? sky->getSunVisible() : sky->getMoonVisible();
 	shadow->setShadowIntensity(is_shadow_visible ? client->getEnv().getLocalPlayer()->getLighting().shadow_intensity : 0.0f);
 
-	timeoftheday = fmod(timeoftheday + 0.75f, 0.5f) + 0.25f;
+	timeoftheday = std::fmod(timeoftheday + 0.75f, 0.5f) + 0.25f;
 	const float offset_constant = 10000.0f;
 
 	v3f light = is_day ? sky->getSunDirection() : sky->getMoonDirection();
@@ -4834,56 +4853,101 @@ void Game::updateShadows()
 	shadow->getDirectionalLight().update_frustum(camera, client, m_camera_offset_changed);
 }
 
+void Game::drawScene(ProfilerGraph *graph, RunStats *stats)
+{
+	const video::SColor fog_color = this->sky->getFogColor();
+	const video::SColor sky_color = this->sky->getSkyColor();
+
+	/*
+		Fog
+	*/
+	if (this->fogEnabled()) {
+		this->driver->setFog(
+				fog_color,
+				video::EFT_FOG_LINEAR,
+				this->runData.fog_range * this->sky->getFogStart(),
+				this->runData.fog_range * 1.0f,
+				0.f, // unused
+				false, // pixel fog
+				true // range fog
+		);
+	} else {
+		this->driver->setFog(
+				fog_color,
+				video::EFT_FOG_LINEAR,
+				FOG_RANGE_ALL,
+				FOG_RANGE_ALL + 100 * BS,
+				0.f, // unused
+				false, // pixel fog
+				false // range fog
+		);
+	}
+
+	/*
+		Drawing
+	*/
+	TimeTaker tt_draw("Draw scene", nullptr, PRECISION_MICRO);
+	this->driver->beginScene(true, true, sky_color);
+
+	const LocalPlayer *player = this->client->getEnv().getLocalPlayer();
+	bool draw_wield_tool = (this->m_game_ui->m_flags.show_hud &&
+			(player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE) &&
+			(this->camera->getCameraMode() == CAMERA_MODE_FIRST));
+	bool draw_crosshair = (
+			(player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
+			(this->camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT));
+
+	if (g_touchscreengui && isTouchCrosshairDisabled())
+		draw_crosshair = false;
+
+	this->m_rendering_engine->draw_scene(sky_color, this->m_game_ui->m_flags.show_hud,
+			draw_wield_tool, draw_crosshair);
+
+	/*
+		Profiler graph
+	*/
+	v2u32 screensize = this->driver->getScreenSize();
+
+	if (this->m_game_ui->m_flags.show_profiler_graph)
+		graph->draw(10, screensize.Y - 10, driver, g_fontengine->getFont());
+
+	/*
+		Damage flash
+	*/
+	if (this->runData.damage_flash > 0.0f) {
+		video::SColor color(this->runData.damage_flash, 180, 0, 0);
+		this->driver->draw2DRectangle(color,
+					core::rect<s32>(0, 0, screensize.X, screensize.Y),
+					NULL);
+	}
+
+	/*
+		Draw background for player list
+ 		// FMTODO: this is corect place?
+	*/
+	if (playerlist) {
+		driver->draw2DRectangle(console_bg, playerlist->getAbsolutePosition());
+		draw2DRectangleOutline(driver,
+				playerlist->getAbsolutePosition(), video::SColor(255, 128, 128, 128));
+	}
+
+
+	this->driver->endScene();
+
+	if (m_game_ui->m_flags.show_profiler_graph)
+	stats->drawtime = tt_draw.stop(true);
+	g_profiler->graphAdd("Draw scene [us]", stats->drawtime);
+
+}
+
 /****************************************************************************
  Misc
  ****************************************************************************/
 
-void FpsControl::reset()
-{
-	last_time = porting::getTimeUs();
-}
-
-/*
- * On some computers framerate doesn't seem to be automatically limited
- */
-void FpsControl::limit(IrrlichtDevice *device, f32 *dtime)
-{
-	const float fps_limit = (device->isWindowFocused() && !g_menumgr.pausesGame())
-			? g_settings->getFloat("fps_max")
-			: g_settings->getFloat("fps_max_unfocused");
-	const u64 frametime_min = 1000000.0f / std::max(fps_limit, 1.0f);
-
-	u64 time = porting::getTimeUs();
-
-	if (time > last_time) // Make sure time hasn't overflowed
-		busy_time = time - last_time;
-	else
-		busy_time = 0;
-
-	if (busy_time < frametime_min) {
-		sleep_time = frametime_min - busy_time;
-		if (sleep_time > 0)
-			sleep_us(sleep_time);
-	} else {
-		sleep_time = 0;
-	}
-
-	// Read the timer again to accurately determine how long we actually slept,
-	// rather than calculating it by adding sleep_time to time.
-	time = porting::getTimeUs();
-
-	if (time > last_time) // Make sure last_time hasn't overflowed
-		*dtime = (time - last_time) / 1000000.0f;
-	else
-		*dtime = 0;
-
-	last_time = time;
-}
-
-void Game::showOverlayMessage(const std::string &msg, float dtime, int percent, bool draw_sky)
+void Game::showOverlayMessage(const std::string &msg, float dtime, int percent, float *indef_pos)
 {
 	m_rendering_engine->draw_load_screen(wstrgettext(msg), guienv, texture_src,
-			dtime, percent, draw_sky);
+			dtime, percent, indef_pos);
 }
 
 void Game::settingChangedCallback(const std::string &setting_name, void *data)
@@ -4901,7 +4965,8 @@ void Game::readSettings()
 	m_cache_enable_fog                   = g_settings->getBool("enable_fog");
 	m_cache_mouse_sensitivity            = g_settings->getFloat("mouse_sensitivity", 0.001f, 10.0f);
 	m_cache_joystick_frustum_sensitivity = std::max(g_settings->getFloat("joystick_frustum_sensitivity"), 0.001f);
-	m_repeat_place_time                  = g_settings->getFloat("repeat_place_time", 0.16f, 2.0);
+	m_repeat_place_time                  = g_settings->getFloat("repeat_place_time", 0.16f, 2.0f);
+	m_repeat_dig_time                    = g_settings->getFloat("repeat_dig_time", 0.0f, 2.0f);
 
 	m_cache_enable_noclip                = g_settings->getBool("noclip");
 	m_cache_enable_free_move             = g_settings->getBool("free_move");
@@ -4958,56 +5023,23 @@ void Game::showDeathFormspec()
 #define GET_KEY_NAME(KEY) gettext(getKeySetting(#KEY).name())
 void Game::showPauseMenu()
 {
-#ifdef HAVE_TOUCHSCREENGUI
-	static const std::string control_text = strgettext("Controls:\n"
-		"No menu open:\n"
-		"- slide finger: look around\n"
-		"- tap: place/use\n"
-		"- long tap: dig/punch/use\n"
-		"Menu/inventory open:\n"
-		"- double tap (outside):\n"
-		" --> close\n"
-		"- touch stack, touch slot:\n"
-		" --> move stack\n"
-		"- touch&drag, tap 2nd finger\n"
-		" --> place single item to slot\n"
-		);
-#else
-	static const std::string control_text_template = strgettext("Controls:\n"
-		"- %s: move forwards\n"
-		"- %s: move backwards\n"
-		"- %s: move left\n"
-		"- %s: move right\n"
-		"- %s: jump/climb up\n"
-		"- %s: dig/punch/use\n"
-		"- %s: place/use\n"
-		"- %s: sneak/climb down\n"
-		"- %s: drop item\n"
-		"- %s: inventory\n"
-		"- Mouse: turn/look\n"
-		"- Mouse wheel: select item\n"
-		"- %s: chat\n"
-	);
+	std::string control_text;
 
-	char control_text_buf[600];
-
-	porting::mt_snprintf(control_text_buf, sizeof(control_text_buf), control_text_template.c_str(),
-		GET_KEY_NAME(keymap_forward),
-		GET_KEY_NAME(keymap_backward),
-		GET_KEY_NAME(keymap_left),
-		GET_KEY_NAME(keymap_right),
-		GET_KEY_NAME(keymap_jump),
-		GET_KEY_NAME(keymap_dig),
-		GET_KEY_NAME(keymap_place),
-		GET_KEY_NAME(keymap_sneak),
-		GET_KEY_NAME(keymap_drop),
-		GET_KEY_NAME(keymap_inventory),
-		GET_KEY_NAME(keymap_chat)
-	);
-
-	std::string control_text = std::string(control_text_buf);
-	str_formspec_escape(control_text);
-#endif
+	if (g_touchscreengui) {
+		control_text = strgettext("Controls:\n"
+			"No menu open:\n"
+			"- slide finger: look around\n"
+			"- tap: place/punch/use (default)\n"
+			"- long tap: dig/use (default)\n"
+			"Menu/inventory open:\n"
+			"- double tap (outside):\n"
+			" --> close\n"
+			"- touch stack, touch slot:\n"
+			" --> move stack\n"
+			"- touch&drag, tap 2nd finger\n"
+			" --> place single item to slot\n"
+			);
+	}
 
 	float ypos = simple_singleplayer_mode ? 0.7f : 0.1f;
 	std::ostringstream os;
@@ -5031,30 +5063,29 @@ void Game::showPauseMenu()
 	}
 #endif
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
-		<< strgettext("Change Keys")  << "]";
+		<< strgettext("Controls")  << "]";
 #endif
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
 		<< strgettext("Exit to Menu") << "]";
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
-		<< strgettext("Exit to OS")   << "]"
-		<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
-		<< "textarea[0.4,0.25;3.9,6.25;;" << PROJECT_NAME_C " " VERSION_STRING "\n"
+		<< strgettext("Exit to OS")   << "]";
+	if (!control_text.empty()) {
+	os		<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]";
+	}
+	os		<< "textarea[0.4,0.25;3.9,6.25;;" << PROJECT_NAME_C " " VERSION_STRING "\n"
 		<< "\n"
 		<<  strgettext("Game info:") << "\n";
 	const std::string &address = client->getAddressName();
-	static const std::string mode = strgettext("- Mode: ");
+	os << strgettext("- Mode: ");
 	if (!simple_singleplayer_mode) {
-		Address serverAddress = client->getServerAddress();
-		if (!address.empty()) {
-			os << mode << strgettext("Remote server") << "\n"
-					<< strgettext("- Address: ") << address;
-		} else {
-			os << mode << strgettext("Hosting server");
-		}
-		os << "\n" << strgettext("- Port: ") << serverAddress.getPort() << "\n";
+		if (address.empty())
+			os << strgettext("Hosting server");
+		else
+			os << strgettext("Remote server");
 	} else {
-		os << mode << strgettext("Singleplayer") << "\n";
+		os << strgettext("Singleplayer");
 	}
+	os << "\n";
 	if (simple_singleplayer_mode || address.empty()) {
 		static const std::string on = strgettext("On");
 		static const std::string off = strgettext("Off");
@@ -5142,10 +5173,17 @@ bool the_game(bool *kill,
 		error_message = std::string("ModError: ") + e.what() +
 				strgettext("\nCheck debug.txt for details.");
 		errorstream << error_message << std::endl;
+	} catch (con::PeerNotFoundException &e) {
+		error_message = gettext("Connection error (timed out?)");
+		errorstream << error_message << std::endl;
+	} catch (ShaderException &e) {
+		error_message = e.what();
+		errorstream << error_message << std::endl;
 #else
 	} catch (int) { //nothing
 #endif
 	}
+
 	game.shutdown();
 
 	return started && game.runData.reconnect; 
diff --git a/src/client/game.h b/src/client/game.h
index 09f354535..2fae85007 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -25,6 +25,10 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlichttypes.h"
 #include <string>
 
+#ifdef SERVER
+#error Do not include in server builds
+#endif
+
 class InputHandler;
 class ChatBackend;
 class RenderingEngine;
@@ -46,6 +50,8 @@ struct CameraOrientation {
 	f32 camera_pitch;  // "up/down"
 };
 
+#define GAME_FALLBACK_TIMEOUT 1.8f
+#define GAME_CONNECTION_TIMEOUT 10.0f
 
 bool the_game(bool *kill,
 		InputHandler *input,
diff --git a/src/client/gameui.cpp b/src/client/gameui.cpp
index e16ba601c..7628aadae 100644
--- a/src/client/gameui.cpp
+++ b/src/client/gameui.cpp
@@ -250,11 +250,6 @@ void GameUI::initFlags()
 	m_flags.show_minimal_debug = g_settings->getBool("show_debug");
 }
 
-void GameUI::showMinimap(bool show)
-{
-	m_flags.show_minimap = show;
-}
-
 void GameUI::showTranslatedStatusText(const char *str)
 {
 	showStatusText(wstrgettext(str));
@@ -371,3 +366,36 @@ void GameUI::deleteFormspec()
 
 	m_formname.clear();
 }
+
+void GameUI::clearText()
+{
+	if (m_guitext_chat) {
+		m_guitext_chat->remove();
+		m_guitext_chat = nullptr;
+	}
+
+	if (m_guitext) {
+		m_guitext->remove();
+		m_guitext = nullptr;
+	}
+
+	if (m_guitext2) {
+		m_guitext2->remove();
+		m_guitext2 = nullptr;
+	}
+
+	if (m_guitext_info) {
+		m_guitext_info->remove();
+		m_guitext_info = nullptr;
+	}
+
+	if (m_guitext_status) {
+		m_guitext_status->remove();
+		m_guitext_status = nullptr;
+	}
+
+	if (m_guitext_profiler) {
+		m_guitext_profiler->remove();
+		m_guitext_profiler = nullptr;
+	}
+}
diff --git a/src/client/gameui.h b/src/client/gameui.h
index 73e087e49..c848f02b5 100644
--- a/src/client/gameui.h
+++ b/src/client/gameui.h
@@ -57,7 +57,6 @@ public:
 	{
 		bool show_chat = true;
 		bool show_hud = true;
-		bool show_minimap = false;
 		bool show_minimal_debug = false;
 		bool show_basic_debug = false;
 		bool show_profiler_graph = false;
@@ -71,8 +70,6 @@ public:
 	void initFlags();
 	const Flags &getFlags() const { return m_flags; }
 
-	void showMinimap(bool show);
-
 	inline void setInfoText(const std::wstring &str) { m_infotext = str; }
 	inline void clearInfoText() { m_infotext.clear(); }
 
@@ -107,6 +104,7 @@ public:
 	const std::string &getFormspecName() { return m_formname; }
 	GUIFormSpecMenu *&getFormspecGUI() { return m_formspec; }
 	void deleteFormspec();
+	void clearText();
 
 private:
 	Flags m_flags;
diff --git a/src/client/guiscalingfilter.cpp b/src/client/guiscalingfilter.cpp
index e627b7912..40fe9c94f 100644
--- a/src/client/guiscalingfilter.cpp
+++ b/src/client/guiscalingfilter.cpp
@@ -29,12 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  * converting textures back into images repeatedly, and some don't even
  * allow it at all.
  */
-std::map<io::path, video::IImage *> g_imgCache;
+static std::map<io::path, video::IImage *> g_imgCache;
 
 /* Maintain a static cache of all pre-scaled textures.  These need to be
  * cleared as well when the cached images.
  */
-std::map<io::path, video::ITexture *> g_txrCache;
+static std::map<io::path, video::ITexture *> g_txrCache;
 
 /* Manually insert an image into the cache, useful to avoid texture-to-image
  * conversion whenever we can intercept it.
diff --git a/src/client/hud.cpp b/src/client/hud.cpp
index 612f56704..72a0df6cc 100644
--- a/src/client/hud.cpp
+++ b/src/client/hud.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "client/clientmap.h"
 #include "client/hud.h"
 #include <string>
 #include <iostream>
@@ -41,15 +42,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "wieldmesh.h"
 #include "client/renderingengine.h"
 #include "client/minimap.h"
-#include "client/clientmap.h"
-
-#ifdef HAVE_TOUCHSCREENGUI
 #include "gui/touchscreengui.h"
-#endif
+#include "util/enriched_string.h"
+#include "irrlicht_changes/CGUITTFont.h"
 
 #define OBJECT_CROSSHAIR_LINE_SIZE 8
 #define CROSSHAIR_LINE_SIZE 10
 
+static void setting_changed_callback(const std::string &name, void *data)
+{
+	static_cast<Hud*>(data)->readScalingSetting();
+}
+
 Hud::Hud(Client *client, LocalPlayer *player,
 		Inventory *inventory)
 {
@@ -58,12 +62,9 @@ Hud::Hud(Client *client, LocalPlayer *player,
 	this->player      = player;
 	this->inventory   = inventory;
 
-	m_hud_scaling      = g_settings->getFloat("hud_scaling", 0.5f, 20.0f);
-	m_scale_factor     = m_hud_scaling * RenderingEngine::getDisplayDensity();
-	m_hotbar_imagesize = std::floor(HOTBAR_IMAGE_SIZE *
-		RenderingEngine::getDisplayDensity() + 0.5f);
-	m_hotbar_imagesize *= m_hud_scaling;
-	m_padding = m_hotbar_imagesize / 12;
+	readScalingSetting();
+	g_settings->registerChangedCallback("dpi_change_notifier", setting_changed_callback, this);
+	g_settings->registerChangedCallback("hud_scaling", setting_changed_callback, this);
 
 	for (auto &hbar_color : hbar_colors)
 		hbar_color = video::SColor(255, 255, 255, 255);
@@ -103,7 +104,7 @@ Hud::Hud(Client *client, LocalPlayer *player,
 
 	if (g_settings->getBool("enable_shaders")) {
 		IShaderSource *shdrsrc = client->getShaderSource();
-		u16 shader_id = shdrsrc->getShader(
+		auto shader_id = shdrsrc->getShader(
 			m_mode == HIGHLIGHT_HALO ? "selection_shader" : "default_shader", TILE_MATERIAL_ALPHA);
 		m_selection_material.MaterialType = shdrsrc->getShaderInfo(shader_id).material;
 	} else {
@@ -141,10 +142,24 @@ Hud::Hud(Client *client, LocalPlayer *player,
 
 	m_rotation_mesh_buffer.getMaterial().Lighting = false;
 	m_rotation_mesh_buffer.getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+	m_rotation_mesh_buffer.setHardwareMappingHint(scene::EHM_STATIC);
+}
+
+void Hud::readScalingSetting()
+{
+	m_hud_scaling      = g_settings->getFloat("hud_scaling", 0.5f, 20.0f);
+	m_scale_factor     = m_hud_scaling * RenderingEngine::getDisplayDensity();
+	m_hotbar_imagesize = std::floor(HOTBAR_IMAGE_SIZE *
+		RenderingEngine::getDisplayDensity() + 0.5f);
+	m_hotbar_imagesize *= m_hud_scaling;
+	m_padding = m_hotbar_imagesize / 12;
 }
 
 Hud::~Hud()
 {
+	g_settings->deregisterChangedCallback("dpi_change_notifier", setting_changed_callback, this);
+	g_settings->deregisterChangedCallback("hud_scaling", setting_changed_callback, this);
+
 	if (m_selection_mesh)
 		m_selection_mesh->drop();
 }
@@ -295,10 +310,8 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
 
 		drawItem(mainlist->getItem(i), item_rect, (i + 1) == selectitem);
 
-#ifdef HAVE_TOUCHSCREENGUI
 		if (is_hotbar && g_touchscreengui)
 			g_touchscreengui->registerHotbarRect(i, item_rect);
-#endif
 	}
 }
 
@@ -343,6 +356,14 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 	std::vector<HudElement*> elems;
 	elems.reserve(player->maxHudId());
 
+	// Add builtin minimap if the server doesn't send it.
+	HudElement minimap;
+	if (client->getProtoVersion() < 44 && (player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE)) {
+		minimap = {HUD_ELEM_MINIMAP, v2f(1, 0), "", v2f(), "", 0 , 0, 0, v2f(-1, 1),
+				v2f(-10, 10), v3f(), v2s32(256, 256), 0, "", 0};
+		elems.push_back(&minimap);
+	}
+
 	for (size_t i = 0; i != player->maxHudId(); i++) {
 		HudElement *e = player->getHud(i);
 		if (!e)
@@ -376,10 +397,14 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 					(e->style & HUD_STYLE_MONO) ? FM_Mono : FM_Unspecified,
 					e->style & HUD_STYLE_BOLD, e->style & HUD_STYLE_ITALIC));
 
+				irr::gui::CGUITTFont *ttfont = nullptr;
+				if (textfont->getType() == irr::gui::EGFT_CUSTOM)
+					ttfont = static_cast<irr::gui::CGUITTFont *>(textfont);
+
 				video::SColor color(255, (e->number >> 16) & 0xFF,
 										 (e->number >> 8)  & 0xFF,
 										 (e->number >> 0)  & 0xFF);
-				std::wstring text = unescape_translate(utf8_to_wide(e->text));
+				EnrichedString text(unescape_string(utf8_to_wide(e->text)), color);
 				core::dimension2d<u32> textsize = textfont->getDimension(text.c_str());
 
 				v2s32 offset(0, (e->align.Y - 1.0) * (textsize.Height / 2));
@@ -387,13 +412,19 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 						text_height * e->scale.Y * m_scale_factor);
 				v2s32 offs(e->offset.X * m_scale_factor,
 						e->offset.Y * m_scale_factor);
-				std::wstringstream wss(text);
-				std::wstring line;
-				while (std::getline(wss, line, L'\n'))
-				{
+
+				// Draw each line
+				// See also: GUIFormSpecMenu::parseLabel
+				size_t str_pos = 0;
+				while (str_pos < text.size()) {
+					EnrichedString line = text.getNextLine(&str_pos);
+
 					core::dimension2d<u32> linesize = textfont->getDimension(line.c_str());
 					v2s32 line_offset((e->align.X - 1.0) * (linesize.Width / 2), 0);
-					textfont->draw(line.c_str(), size + pos + offset + offs + line_offset, color);
+					if (ttfont)
+						ttfont->draw(line, size + pos + offset + offs + line_offset);
+					else
+						textfont->draw(line.c_str(), size + pos + offset + offs + line_offset, color);
 					offset.Y += linesize.Height;
 				}
 				break; }
@@ -419,7 +450,9 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 										 (e->number >> 0)  & 0xFF);
 				std::wstring text = unescape_translate(utf8_to_wide(e->name));
 				const std::string &unit = e->text;
-				// waypoints reuse the item field to store precision, item = precision + 1
+				// Waypoints reuse the item field to store precision,
+				// item = precision + 1 and item = 0 <=> precision = 10 for backwards compatibility.
+				// Also see `push_hud_element`.
 				u32 item = e->item;
 				float precision = (item == 0) ? 10.0f : (item - 1.f);
 				bool draw_precision = precision > 0;
@@ -742,10 +775,8 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir,
 
 void Hud::drawHotbar(u16 playeritem)
 {
-#ifdef HAVE_TOUCHSCREENGUI
 	if (g_touchscreengui)
 		g_touchscreengui->resetHotbarRects();
-#endif
 
 	InventoryList *mainlist = inventory->getList("main");
 	if (mainlist == NULL) {
@@ -785,9 +816,9 @@ void Hud::drawCrosshair()
 {
 	auto draw_image_crosshair = [this] (video::ITexture *tex) {
 		core::dimension2di orig_size(tex->getOriginalSize());
-		core::dimension2di scaled_size(
-				core::round32(orig_size.Width * m_scale_factor),
-				core::round32(orig_size.Height * m_scale_factor));
+		// Integer scaling to avoid artifacts, floor instead of round since too
+		// small looks better than too large in this case.
+		core::dimension2di scaled_size = orig_size * std::max(std::floor(m_scale_factor), 1.0f);
 
 		core::rect<s32> src_rect(orig_size);
 		core::position2d pos(m_displaycenter.X - scaled_size.Width / 2,
@@ -887,7 +918,7 @@ enum Hud::BlockBoundsMode Hud::toggleBlockBounds()
 {
 	m_block_bounds_mode = static_cast<BlockBoundsMode>(m_block_bounds_mode + 1);
 
-	if (m_block_bounds_mode >= BLOCK_BOUNDS_MAX) {
+	if (m_block_bounds_mode > BLOCK_BOUNDS_NEAR) {
 		m_block_bounds_mode = BLOCK_BOUNDS_OFF;
 	}
 	return m_block_bounds_mode;
@@ -1078,8 +1109,7 @@ void drawItemStack(
 		return;
 	}
 
-	const static thread_local bool enable_animations =
-		g_settings->getBool("inventory_items_animations");
+	const bool enable_animations = g_settings->getBool("inventory_items_animations");
 
 	auto *idef = client->idef();
 	const ItemDefinition &def = item.getDefinition(idef);
@@ -1157,24 +1187,23 @@ void drawItemStack(
 		video::SColor basecolor =
 			client->idef()->getItemstackColor(item, client);
 
-		u32 mc = mesh->getMeshBufferCount();
+		const u32 mc = mesh->getMeshBufferCount();
+		if (mc > imesh->buffer_colors.size())
+			imesh->buffer_colors.resize(mc);
 		for (u32 j = 0; j < mc; ++j) {
 			scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-			// we can modify vertices relatively fast,
-			// because these meshes are not buffered.
-			assert(buf->getHardwareMappingHint_Vertex() == scene::EHM_NEVER);
 			video::SColor c = basecolor;
 
-			if (imesh->buffer_colors.size() > j) {
-				ItemPartColor *p = &imesh->buffer_colors[j];
-				if (p->override_base)
-					c = p->color;
-			}
+			auto &p = imesh->buffer_colors[j];
+			p.applyOverride(c);
 
-			if (imesh->needs_shading)
-				colorizeMeshBuffer(buf, &c);
-			else
-				setMeshBufferColor(buf, c);
+			if (p.needColorize(c)) {
+				buf->setDirty(scene::EBT_VERTEX);
+				if (imesh->needs_shading)
+					colorizeMeshBuffer(buf, &c);
+				else
+					setMeshBufferColor(buf, c);
+			}
 
 			video::SMaterial &material = buf->getMaterial();
 			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
@@ -1238,17 +1267,26 @@ void drawItemStack(
 			(1 - wear) * progressrect.LowerRightCorner.X;
 
 		// Compute progressbar color
+		// default scheme:
 		//   wear = 0.0: green
 		//   wear = 0.5: yellow
 		//   wear = 1.0: red
-		video::SColor color(255, 255, 255, 255);
-		int wear_i = MYMIN(std::floor(wear * 600), 511);
-		wear_i = MYMIN(wear_i + 10, 511);
 
-		if (wear_i <= 255)
-			color.set(255, wear_i, 255, 0);
-		else
-			color.set(255, 255, 511 - wear_i, 0);
+		video::SColor color;
+		auto barParams = item.getWearBarParams(client->idef());
+		if (barParams.has_value()) {
+			f32 durabilityPercent = 1.0 - wear;
+			color = barParams->getWearBarColor(durabilityPercent);
+		} else {
+			color = video::SColor(255, 255, 255, 255);
+			int wear_i = MYMIN(std::floor(wear * 600), 511);
+			wear_i = MYMIN(wear_i + 10, 511);
+
+			if (wear_i <= 255)
+				color.set(255, wear_i, 255, 0);
+			else
+				color.set(255, 255, 511 - wear_i, 0);
+		}
 
 		core::rect<s32> progressrect2 = progressrect;
 		progressrect2.LowerRightCorner.X = progressmid;
diff --git a/src/client/hud.h b/src/client/hud.h
index fb6713f69..50f917a9d 100644
--- a/src/client/hud.h
+++ b/src/client/hud.h
@@ -41,7 +41,6 @@ public:
 		BLOCK_BOUNDS_CURRENT,
 		BLOCK_BOUNDS_NEAR,
 		BLOCK_BOUNDS_FAR,
-		BLOCK_BOUNDS_MAX
 	} m_block_bounds_mode = BLOCK_BOUNDS_OFF;
 
 	video::SColor crosshair_argb;
@@ -58,6 +57,7 @@ public:
 
 	Hud(Client *client, LocalPlayer *player,
 			Inventory *inventory);
+	void readScalingSetting();
 	~Hud();
 
 	enum BlockBoundsMode toggleBlockBounds();
diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp
index ed8483fcf..db6523ad3 100644
--- a/src/client/imagefilters.cpp
+++ b/src/client/imagefilters.cpp
@@ -65,20 +65,27 @@ public:
 	}
 };
 
-/* Fill in RGB values for transparent pixels, to correct for odd colors
- * appearing at borders when blending.  This is because many PNG optimizers
- * like to discard RGB values of transparent pixels, but when blending then
- * with non-transparent neighbors, their RGB values will show up nonetheless.
- *
- * This function modifies the original image in-place.
- *
- * Parameter "threshold" is the alpha level below which pixels are considered
- * transparent. Should be 127 when the texture is used with ALPHA_CHANNEL_REF,
- * 0 when alpha blending is used.
- */
-void imageCleanTransparent(video::IImage *src, u32 threshold)
+template <bool IS_A8R8G8B8>
+static void imageCleanTransparentWithInlining(video::IImage *src, u32 threshold)
 {
-	core::dimension2d<u32> dim = src->getDimension();
+	void *const src_data = src->getData();
+	const core::dimension2d<u32> dim = src->getDimension();
+
+	auto get_pixel = [=](u32 x, u32 y) -> video::SColor {
+		if constexpr (IS_A8R8G8B8) {
+			return reinterpret_cast<u32 *>(src_data)[y*dim.Width + x];
+		} else {
+			return src->getPixel(x, y);
+		}
+	};
+	auto set_pixel = [=](u32 x, u32 y, video::SColor color) {
+		if constexpr (IS_A8R8G8B8) {
+			u32 *dest = &reinterpret_cast<u32 *>(src_data)[y*dim.Width + x];
+			*dest = color.color;
+		} else {
+			src->setPixel(x, y, color);
+		}
+	};
 
 	Bitmap bitmap(dim.Width, dim.Height);
 
@@ -86,7 +93,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
 	// Note: loop y around x for better cache locality.
 	for (u32 ctry = 0; ctry < dim.Height; ctry++)
 	for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {
-		if (src->getPixel(ctrx, ctry).getAlpha() > threshold)
+		if (get_pixel(ctrx, ctry).getAlpha() > threshold)
 			bitmap.set(ctrx, ctry);
 	}
 
@@ -125,7 +132,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
 
 			// Add RGB values weighted by alpha IF the pixel is opaque, otherwise
 			// use full weight since we want to propagate colors.
-			video::SColor d = src->getPixel(sx, sy);
+			video::SColor d = get_pixel(sx, sy);
 			u32 a = d.getAlpha() <= threshold ? 255 : d.getAlpha();
 			ss += a;
 			sr += a * d.getRed();
@@ -135,11 +142,11 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
 
 		// Set pixel to average weighted by alpha
 		if (ss > 0) {
-			video::SColor c = src->getPixel(ctrx, ctry);
+			video::SColor c = get_pixel(ctrx, ctry);
 			c.setRed(sr / ss);
 			c.setGreen(sg / ss);
 			c.setBlue(sb / ss);
-			src->setPixel(ctrx, ctry, c);
+			set_pixel(ctrx, ctry, c);
 			newmap.set(ctrx, ctry);
 		}
 	}
@@ -154,6 +161,25 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
 	}
 }
 
+/* Fill in RGB values for transparent pixels, to correct for odd colors
+ * appearing at borders when blending.  This is because many PNG optimizers
+ * like to discard RGB values of transparent pixels, but when blending then
+ * with non-transparent neighbors, their RGB values will show up nonetheless.
+ *
+ * This function modifies the original image in-place.
+ *
+ * Parameter "threshold" is the alpha level below which pixels are considered
+ * transparent. Should be 127 when the texture is used with ALPHA_CHANNEL_REF,
+ * 0 when alpha blending is used.
+ */
+void imageCleanTransparent(video::IImage *src, u32 threshold)
+{
+	if (src->getColorFormat() == video::ECF_A8R8G8B8)
+		imageCleanTransparentWithInlining<true>(src, threshold);
+	else
+		imageCleanTransparentWithInlining<false>(src, threshold);
+}
+
 /* Scale a region of an image into another image, using nearest-neighbor with
  * anti-aliasing; treat pixels as crisp rectangles, but blend them at boundaries
  * to prevent non-integer scaling ratio artifacts.  Note that this may cause
@@ -246,3 +272,38 @@ void imageScaleNNAA(video::IImage *src, const core::rect<s32> &srcrect, video::I
 		dest->setPixel(dx, dy, pxl);
 	}
 }
+
+/* Check and align image to npot2 if required by hardware
+ * @param image image to check for npot2 alignment
+ * @param driver driver to use for image operations
+ * @return image or copy of image aligned to npot2
+ */
+video::IImage *Align2Npot2(video::IImage *image, video::IVideoDriver *driver)
+{
+	if (image == nullptr)
+		return image;
+
+	if (driver->queryFeature(video::EVDF_TEXTURE_NPOT))
+		return image;
+
+	core::dimension2d<u32> dim = image->getDimension();
+	unsigned int height = npot2(dim.Height);
+	unsigned int width  = npot2(dim.Width);
+
+	if (dim.Height == height && dim.Width == width)
+		return image;
+
+	if (dim.Height > height)
+		height *= 2;
+	if (dim.Width > width)
+		width *= 2;
+
+	video::IImage *targetimage =
+			driver->createImage(video::ECF_A8R8G8B8,
+					core::dimension2d<u32>(width, height));
+
+	if (targetimage != nullptr)
+		image->copyToScaling(targetimage);
+	image->drop();
+	return targetimage;
+}
diff --git a/src/client/imagefilters.h b/src/client/imagefilters.h
index c9bdefbb6..e6cbf2d29 100644
--- a/src/client/imagefilters.h
+++ b/src/client/imagefilters.h
@@ -41,3 +41,11 @@ void imageCleanTransparent(video::IImage *src, u32 threshold);
  * and downscaling.
  */
 void imageScaleNNAA(video::IImage *src, const core::rect<s32> &srcrect, video::IImage *dest);
+
+/* Check and align image to npot2 if required by hardware
+ * @param image image to check for npot2 alignment
+ * @param driver driver to use for image operations
+ * @return image or copy of image aligned to npot2
+ */
+video::IImage *Align2Npot2(video::IImage *image, video::IVideoDriver *driver);
+
diff --git a/src/client/imagesource.cpp b/src/client/imagesource.cpp
new file mode 100644
index 000000000..696159408
--- /dev/null
+++ b/src/client/imagesource.cpp
@@ -0,0 +1,1975 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "imagesource.h"
+
+#include <IFileSystem.h>
+#include "settings.h"
+#include "mesh.h"
+#include "util/strfnd.h"
+#include "renderingengine.h"
+#include "util/base64.h"
+#include "irrlicht_changes/printing.h"
+#include "imagefilters.h"
+#include "texturepaths.h"
+#include "util/numeric.h"
+
+
+////////////////////////////////
+// SourceImageCache Functions //
+////////////////////////////////
+
+SourceImageCache::~SourceImageCache() {
+	for (auto &m_image : m_images) {
+		m_image.second->drop();
+	}
+	m_images.clear();
+}
+
+void SourceImageCache::insert(const std::string &name, video::IImage *img, bool prefer_local)
+{
+	assert(img); // Pre-condition
+	// Remove old image
+	std::map<std::string, video::IImage*>::iterator n;
+	n = m_images.find(name);
+	if (n != m_images.end()){
+		if (n->second)
+			n->second->drop();
+	}
+
+	video::IImage* toadd = img;
+	bool need_to_grab = true;
+
+	// Try to use local texture instead if asked to
+	if (prefer_local) {
+		bool is_base_pack;
+		std::string path = getTexturePath(name, &is_base_pack);
+		// Ignore base pack
+		if (!path.empty() && !is_base_pack) {
+			video::IImage *img2 = RenderingEngine::get_video_driver()->
+				createImageFromFile(path.c_str());
+			if (img2){
+				toadd = img2;
+				need_to_grab = false;
+			}
+		}
+	}
+
+	if (need_to_grab)
+		toadd->grab();
+	m_images[name] = toadd;
+}
+
+video::IImage* SourceImageCache::get(const std::string &name)
+{
+	std::map<std::string, video::IImage*>::iterator n;
+	n = m_images.find(name);
+	if (n != m_images.end())
+		return n->second;
+	return nullptr;
+}
+
+// Primarily fetches from cache, secondarily tries to read from filesystem
+video::IImage* SourceImageCache::getOrLoad(const std::string &name)
+{
+	std::map<std::string, video::IImage*>::iterator n;
+	n = m_images.find(name);
+	if (n != m_images.end()){
+		n->second->grab(); // Grab for caller
+		return n->second;
+	}
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	std::string path = getTexturePath(name);
+	if (path.empty()) {
+		infostream << "SourceImageCache::getOrLoad(): No path found for \""
+				<< name << "\"" << std::endl;
+		return nullptr;
+	}
+	infostream << "SourceImageCache::getOrLoad(): Loading path \"" << path
+			<< "\"" << std::endl;
+	video::IImage *img = driver->createImageFromFile(path.c_str());
+
+	if (img){
+		m_images[name] = img;
+		img->grab(); // Grab for caller
+	}
+	return img;
+}
+
+
+////////////////////////////
+// Image Helper Functions //
+////////////////////////////
+
+
+/** Draw an image on top of another one with gamma-incorrect alpha compositing
+ *
+ * This exists because IImage::copyToWithAlpha() doesn't seem to always work.
+ *
+ * \tparam overlay If enabled, only modify pixels in dst which are fully opaque.
+ *   Defaults to false.
+ * \param src Top image. This image must have the ECF_A8R8G8B8 color format.
+ * \param dst Bottom image.
+ *   The top image is drawn onto this base image in-place.
+ * \param dst_pos An offset vector to move src before drawing it onto dst
+ * \param size Size limit of the copied area
+*/
+template<bool overlay = false>
+static void blit_with_alpha(video::IImage *src, video::IImage *dst,
+	v2s32 dst_pos, v2u32 size);
+
+// Apply a color to an image.  Uses an int (0-255) to calculate the ratio.
+// If the ratio is 255 or -1 and keep_alpha is true, then it multiples the
+// color alpha with the destination alpha.
+// Otherwise, any pixels that are not fully transparent get the color alpha.
+static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color, int ratio, bool keep_alpha);
+
+// paint a texture using the given color
+static void apply_multiplication(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color);
+
+// Perform a Screen blend with the given color. The opposite effect of a
+// Multiply blend.
+static void apply_screen(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color);
+
+// Adjust the hue, saturation, and lightness of destination. Like
+// "Hue-Saturation" in GIMP.
+// If colorize is true then the image will be converted to a grayscale
+// image as though seen through a colored glass, like "Colorize" in GIMP.
+static void apply_hue_saturation(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		s32 hue, s32 saturation, s32 lightness, bool colorize);
+
+// Apply an overlay blend to an images.
+// Overlay blend combines Multiply and Screen blend modes.The parts of the top
+// layer where the base layer is light become lighter, the parts where the base
+// layer is dark become darker.Areas where the base layer are mid grey are
+// unaffected.An overlay with the same picture looks like an S - curve.
+static void apply_overlay(video::IImage *overlay, video::IImage *dst,
+		v2s32 overlay_pos, v2s32 dst_pos, v2u32 size, bool hardlight);
+
+// Adjust the brightness and contrast of the base image. Conceptually like
+// "Brightness-Contrast" in GIMP but allowing brightness to be wound all the
+// way up to white or down to black.
+static void apply_brightness_contrast(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		s32 brightness, s32 contrast);
+
+// Apply a mask to an image
+static void apply_mask(video::IImage *mask, video::IImage *dst,
+		v2s32 mask_pos, v2s32 dst_pos, v2u32 size);
+
+// Draw or overlay a crack
+static void draw_crack(video::IImage *crack, video::IImage *dst,
+		bool use_overlay, s32 frame_count, s32 progression,
+		video::IVideoDriver *driver, u8 tiles = 1);
+
+// Brighten image
+void brighten(video::IImage *image);
+// Parse a transform name
+u32 parseImageTransform(std::string_view s);
+// Apply transform to image dimension
+core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<u32> dim);
+// Apply transform to image data
+void imageTransform(u32 transform, video::IImage *src, video::IImage *dst);
+
+inline static void applyShadeFactor(video::SColor &color, u32 factor)
+{
+	u32 f = core::clamp<u32>(factor, 0, 256);
+	color.setRed(color.getRed() * f / 256);
+	color.setGreen(color.getGreen() * f / 256);
+	color.setBlue(color.getBlue() * f / 256);
+}
+
+static video::IImage *createInventoryCubeImage(
+	video::IImage *top, video::IImage *left, video::IImage *right)
+{
+	core::dimension2du size_top = top->getDimension();
+	core::dimension2du size_left = left->getDimension();
+	core::dimension2du size_right = right->getDimension();
+
+	u32 size = npot2(std::max({
+			size_top.Width, size_top.Height,
+			size_left.Width, size_left.Height,
+			size_right.Width, size_right.Height,
+	}));
+
+	// It must be divisible by 4, to let everything work correctly.
+	// But it is a power of 2, so being at least 4 is the same.
+	// And the resulting texture should't be too large as well.
+	size = core::clamp<u32>(size, 4, 64);
+
+	// With such parameters, the cube fits exactly, touching each image line
+	// from `0` to `cube_size - 1`. (Note that division is exact here).
+	u32 cube_size = 9 * size;
+	u32 offset = size / 2;
+
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+
+	auto lock_image = [size, driver] (video::IImage *&image) -> const u32 * {
+		image->grab();
+		core::dimension2du dim = image->getDimension();
+		video::ECOLOR_FORMAT format = image->getColorFormat();
+		if (dim.Width != size || dim.Height != size || format != video::ECF_A8R8G8B8) {
+			video::IImage *scaled = driver->createImage(video::ECF_A8R8G8B8, {size, size});
+			image->copyToScaling(scaled);
+			image->drop();
+			image = scaled;
+		}
+		sanity_check(image->getPitch() == 4 * size);
+		return reinterpret_cast<u32 *>(image->getData());
+	};
+	auto free_image = [] (video::IImage *image) -> void {
+		image->drop();
+	};
+
+	video::IImage *result = driver->createImage(video::ECF_A8R8G8B8, {cube_size, cube_size});
+	sanity_check(result->getPitch() == 4 * cube_size);
+	result->fill(video::SColor(0x00000000u));
+	u32 *target = reinterpret_cast<u32 *>(result->getData());
+
+	// Draws single cube face
+	// `shade_factor` is face brightness, in range [0.0, 1.0]
+	// (xu, xv, x1; yu, yv, y1) form coordinate transformation matrix
+	// `offsets` list pixels to be drawn for single source pixel
+	auto draw_image = [=] (video::IImage *image, float shade_factor,
+			s16 xu, s16 xv, s16 x1,
+			s16 yu, s16 yv, s16 y1,
+			std::initializer_list<v2s16> offsets) -> void {
+		u32 brightness = core::clamp<u32>(256 * shade_factor, 0, 256);
+		const u32 *source = lock_image(image);
+		for (u16 v = 0; v < size; v++) {
+			for (u16 u = 0; u < size; u++) {
+				video::SColor pixel(*source);
+				applyShadeFactor(pixel, brightness);
+				s16 x = xu * u + xv * v + x1;
+				s16 y = yu * u + yv * v + y1;
+				for (const auto &off : offsets)
+					target[(y + off.Y) * cube_size + (x + off.X) + offset] = pixel.color;
+				source++;
+			}
+		}
+		free_image(image);
+	};
+
+	draw_image(top, 1.000000f,
+			4, -4, 4 * (size - 1),
+			2, 2, 0,
+			{
+				                {2, 0}, {3, 0}, {4, 0}, {5, 0},
+				{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1},
+				                {2, 2}, {3, 2}, {4, 2}, {5, 2},
+			});
+
+	draw_image(left, 0.836660f,
+			4, 0, 0,
+			2, 5, 2 * size,
+			{
+				{0, 0}, {1, 0},
+				{0, 1}, {1, 1}, {2, 1}, {3, 1},
+				{0, 2}, {1, 2}, {2, 2}, {3, 2},
+				{0, 3}, {1, 3}, {2, 3}, {3, 3},
+				{0, 4}, {1, 4}, {2, 4}, {3, 4},
+				                {2, 5}, {3, 5},
+			});
+
+	draw_image(right, 0.670820f,
+			4, 0, 4 * size,
+			-2, 5, 4 * size - 2,
+			{
+				                {2, 0}, {3, 0},
+				{0, 1}, {1, 1}, {2, 1}, {3, 1},
+				{0, 2}, {1, 2}, {2, 2}, {3, 2},
+				{0, 3}, {1, 3}, {2, 3}, {3, 3},
+				{0, 4}, {1, 4}, {2, 4}, {3, 4},
+				{0, 5}, {1, 5},
+			});
+
+	return result;
+}
+
+static std::string unescape_string(const std::string &str, const char esc = '\\')
+{
+	std::string out;
+	size_t pos = 0, cpos;
+	out.reserve(str.size());
+	while (1) {
+		cpos = str.find_first_of(esc, pos);
+		if (cpos == std::string::npos) {
+			out += str.substr(pos);
+			break;
+		}
+		out += str.substr(pos, cpos - pos) + str[cpos + 1];
+		pos = cpos + 2;
+	}
+	return out;
+}
+
+/*
+	Replaces the smaller of the two images with one upscaled to match the
+	dimensions of the other.
+	Ensure no other references to these images are being held, as one may
+	get dropped and switched with a new image.
+*/
+void upscaleImagesToMatchLargest(video::IImage *& img1,
+	video::IImage *& img2)
+{
+	core::dimension2d<u32> dim1 = img1->getDimension();
+	core::dimension2d<u32> dim2 = img2->getDimension();
+
+	if (dim1 == dim2) {
+		// image dimensions match, no scaling required
+
+	}
+	else if (dim1.Width * dim1.Height < dim2.Width * dim2.Height) {
+		// Upscale img1
+		video::IImage *scaled_image = RenderingEngine::get_video_driver()->
+			createImage(video::ECF_A8R8G8B8, dim2);
+		img1->copyToScaling(scaled_image);
+		img1->drop();
+		img1 = scaled_image;
+
+	} else {
+		// Upscale img2
+		video::IImage *scaled_image = RenderingEngine::get_video_driver()->
+			createImage(video::ECF_A8R8G8B8, dim1);
+		img2->copyToScaling(scaled_image);
+		img2->drop();
+		img2 = scaled_image;
+	}
+}
+
+void blitBaseImage(video::IImage* &src, video::IImage* &dst)
+{
+	//infostream<<"Blitting "<<part_of_name<<" on base"<<std::endl;
+	upscaleImagesToMatchLargest(dst, src);
+
+	// Size of the copied area
+	core::dimension2d<u32> dim_dst = dst->getDimension();
+	// Position to copy the blitted to in the base image
+	core::position2d<s32> pos_to(0,0);
+
+	blit_with_alpha(src, dst, pos_to, dim_dst);
+}
+
+
+namespace {
+
+/** Calculate the color of a single pixel drawn on top of another pixel without
+ * gamma correction
+ *
+ * The color mixing is a little more complicated than just
+ * video::SColor::getInterpolated because getInterpolated does not handle alpha
+ * correctly.
+ * For example, a pixel with alpha=64 drawn atop a pixel with alpha=128 should
+ * yield a pixel with alpha=160, while getInterpolated would yield alpha=96.
+ *
+ * \tparam overlay If enabled, only modify dst_col if it is fully opaque
+ * \param src_col Color of the top pixel
+ * \param dst_col Color of the bottom pixel. This color is modified in-place to
+ *   store the result.
+*/
+template <bool overlay>
+void blit_pixel(video::SColor src_col, video::SColor &dst_col)
+{
+	u8 dst_a = (u8)dst_col.getAlpha();
+	if constexpr (overlay) {
+		if (dst_a != 255)
+			// The bottom pixel has transparency -> do nothing
+			return;
+	}
+	u8 src_a = (u8)src_col.getAlpha();
+	if (src_a == 0) {
+		// A fully transparent pixel is on top -> do nothing
+		return;
+	}
+	if (src_a == 255 || dst_a == 0) {
+		// The top pixel is fully opaque or the bottom pixel is
+		// fully transparent -> replace the color
+		dst_col = src_col;
+		return;
+	}
+	struct Color { u8 r, g, b; };
+	Color src{(u8)src_col.getRed(), (u8)src_col.getGreen(),
+		(u8)src_col.getBlue()};
+	Color dst{(u8)dst_col.getRed(), (u8)dst_col.getGreen(),
+		(u8)dst_col.getBlue()};
+	if (dst_a == 255) {
+		// A semi-transparent pixel is on top and an opaque one in
+		// the bottom -> lerp r, g, and b
+		dst.r = (dst.r * (255 - src_a) + src.r * src_a) / 255;
+		dst.g = (dst.g * (255 - src_a) + src.g * src_a) / 255;
+		dst.b = (dst.b * (255 - src_a) + src.b * src_a) / 255;
+		dst_col.set(255, dst.r, dst.g, dst.b);
+		return;
+	}
+	// A semi-transparent pixel is on top of a
+	// semi-transparent pixel -> weird overlaying
+	dst.r = (dst.r * (255 - src_a) + src.r * src_a) / 255;
+	dst.g = (dst.g * (255 - src_a) + src.g * src_a) / 255;
+	dst.b = (dst.b * (255 - src_a) + src.b * src_a) / 255;
+	dst_a = dst_a + (255 - dst_a) * src_a * src_a / (255 * 255);
+	dst_col.set(dst_a, dst.r, dst.g, dst.b);
+}
+
+}  // namespace
+template<bool overlay>
+void blit_with_alpha(video::IImage *src, video::IImage *dst, v2s32 dst_pos,
+	v2u32 size)
+{
+	if (dst->getColorFormat() != video::ECF_A8R8G8B8)
+		throw BaseException("blit_with_alpha() supports only ECF_A8R8G8B8 "
+			"destination images.");
+
+	core::dimension2d<u32> src_dim = src->getDimension();
+	core::dimension2d<u32> dst_dim = dst->getDimension();
+	bool drop_src = false;
+	if (src->getColorFormat() != video::ECF_A8R8G8B8) {
+		video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+		video::IImage *src_converted = driver->createImage(video::ECF_A8R8G8B8,
+			src_dim);
+		if (!src_converted)
+			throw BaseException("blit_with_alpha() failed to convert the "
+				"source image to ECF_A8R8G8B8.");
+		src->copyTo(src_converted);
+		src = src_converted;
+		drop_src = true;
+	}
+	video::SColor *pixels_src =
+		reinterpret_cast<video::SColor *>(src->getData());
+	video::SColor *pixels_dst =
+		reinterpret_cast<video::SColor *>(dst->getData());
+	// Limit y and x to the overlapping ranges
+	// s.t. the positions are all in bounds after offsetting.
+	u32 x_start = (u32)std::max(0, -dst_pos.X);
+	u32 y_start = (u32)std::max(0, -dst_pos.Y);
+	u32 x_end = (u32)std::min<s64>({size.X, src_dim.Width,
+		dst_dim.Width - (s64)dst_pos.X});
+	u32 y_end = (u32)std::min<s64>({size.Y, src_dim.Height,
+		dst_dim.Height - (s64)dst_pos.Y});
+	for (u32 y0 = y_start; y0 < y_end; ++y0) {
+		size_t i_src = y0 * src_dim.Width + x_start;
+		size_t i_dst = (dst_pos.Y + y0) * dst_dim.Width + dst_pos.X + x_start;
+		for (u32 x0 = x_start; x0 < x_end; ++x0) {
+			blit_pixel<overlay>(pixels_src[i_src++], pixels_dst[i_dst++]);
+		}
+	}
+	if (drop_src)
+		src->drop();
+}
+
+/*
+	Apply color to destination, using a weighted interpolation blend
+*/
+static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color, int ratio, bool keep_alpha)
+{
+	u32 alpha = color.getAlpha();
+	video::SColor dst_c;
+	if ((ratio == -1 && alpha == 255) || ratio == 255) { // full replacement of color
+		if (keep_alpha) { // replace the color with alpha = dest alpha * color alpha
+			dst_c = color;
+			for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+			for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+				u32 dst_alpha = dst->getPixel(x, y).getAlpha();
+				if (dst_alpha > 0) {
+					dst_c.setAlpha(dst_alpha * alpha / 255);
+					dst->setPixel(x, y, dst_c);
+				}
+			}
+		} else { // replace the color including the alpha
+			for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+			for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++)
+				if (dst->getPixel(x, y).getAlpha() > 0)
+					dst->setPixel(x, y, color);
+		}
+	} else {  // interpolate between the color and destination
+		float interp = (ratio == -1 ? color.getAlpha() / 255.0f : ratio / 255.0f);
+		for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+		for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+			dst_c = dst->getPixel(x, y);
+			if (dst_c.getAlpha() > 0) {
+				dst_c = color.getInterpolated(dst_c, interp);
+				dst->setPixel(x, y, dst_c);
+			}
+		}
+	}
+}
+
+/*
+	Apply color to destination, using a Multiply blend mode
+*/
+static void apply_multiplication(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color)
+{
+	video::SColor dst_c;
+
+	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+		dst_c = dst->getPixel(x, y);
+		dst_c.set(
+				dst_c.getAlpha(),
+				(dst_c.getRed() * color.getRed()) / 255,
+				(dst_c.getGreen() * color.getGreen()) / 255,
+				(dst_c.getBlue() * color.getBlue()) / 255
+				);
+		dst->setPixel(x, y, dst_c);
+	}
+}
+
+/*
+	Apply color to destination, using a Screen blend mode
+*/
+static void apply_screen(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+		const video::SColor color)
+{
+	video::SColor dst_c;
+
+	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+		dst_c = dst->getPixel(x, y);
+		dst_c.set(
+			dst_c.getAlpha(),
+			255 - ((255 - dst_c.getRed())   * (255 - color.getRed()))   / 255,
+			255 - ((255 - dst_c.getGreen()) * (255 - color.getGreen())) / 255,
+			255 - ((255 - dst_c.getBlue())  * (255 - color.getBlue()))  / 255
+		);
+		dst->setPixel(x, y, dst_c);
+	}
+}
+
+/*
+	Adjust the hue, saturation, and lightness of destination. Like
+	"Hue-Saturation" in GIMP, but with 0 as the mid-point.
+	Hue should be from -180 to +180, or from 0 to 360.
+	Saturation and Lightness are percentages.
+	Lightness is from -100 to +100.
+	Saturation goes down to -100 (fully desaturated) but can go above 100,
+	allowing for even muted colors to become saturated.
+
+	If colorize is true then saturation is from 0 to 100, and destination will
+	be converted to a grayscale image as seen through a colored glass, like
+	"Colorize" in GIMP.
+*/
+static void apply_hue_saturation(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+	s32 hue, s32 saturation, s32 lightness, bool colorize)
+{
+	video::SColorf colorf;
+	video::SColorHSL hsl;
+	f32 norm_s = core::clamp(saturation, -100, 1000) / 100.0f;
+	f32 norm_l = core::clamp(lightness,  -100, 100) / 100.0f;
+
+	if (colorize) {
+		hsl.Saturation = core::clamp((f32)saturation, 0.0f, 100.0f);
+	}
+
+	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+		for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+
+			if (colorize) {
+				f32 lum = dst->getPixel(x, y).getLuminance() / 255.0f;
+
+				if (norm_l < 0) {
+					lum *= norm_l + 1.0f;
+				} else {
+					lum = lum * (1.0f - norm_l) + norm_l;
+				}
+				hsl.Hue = 0;
+				hsl.Luminance = lum * 100;
+
+			} else {
+				// convert the RGB to HSL
+				colorf = video::SColorf(dst->getPixel(x, y));
+				hsl.fromRGB(colorf);
+
+				if (norm_l < 0) {
+					hsl.Luminance *= norm_l + 1.0f;
+				} else{
+					hsl.Luminance = hsl.Luminance + norm_l * (100.0f - hsl.Luminance);
+				}
+
+				// Adjusting saturation in the same manner as lightness resulted in
+				// muted colors being affected too much and bright colors not
+				// affected enough, so I'm borrowing a leaf out of gimp's book and
+				// using a different scaling approach for saturation.
+				// https://github.com/GNOME/gimp/blob/6cc1e035f1822bf5198e7e99a53f7fa6e281396a/app/operations/gimpoperationhuesaturation.c#L139-L145=
+				// This difference is why values over 100% are not necessary for
+				// lightness but are very useful with saturation. An alternative UI
+				// approach would be to have an upper saturation limit of 100, but
+				// multiply positive values by ~3 to make it a more useful positive
+				// range scale.
+				hsl.Saturation *= norm_s + 1.0f;
+				hsl.Saturation = core::clamp(hsl.Saturation, 0.0f, 100.0f);
+			}
+
+			// Apply the specified HSL adjustments
+			hsl.Hue = fmod(hsl.Hue + hue, 360);
+			if (hsl.Hue < 0)
+				hsl.Hue += 360;
+
+			// Convert back to RGB
+			hsl.toRGB(colorf);
+			dst->setPixel(x, y, colorf.toSColor());
+		}
+}
+
+
+/*
+	Apply an Overlay blend to destination
+	If hardlight is true then swap the dst & blend images (a hardlight blend)
+*/
+static void apply_overlay(video::IImage *blend, video::IImage *dst,
+	v2s32 blend_pos, v2s32 dst_pos, v2u32 size, bool hardlight)
+{
+	video::IImage *blend_layer = hardlight ? dst : blend;
+	video::IImage *base_layer  = hardlight ? blend : dst;
+	v2s32 blend_layer_pos = hardlight ? dst_pos : blend_pos;
+	v2s32 base_layer_pos  = hardlight ? blend_pos : dst_pos;
+
+	for (u32 y = 0; y < size.Y; y++)
+	for (u32 x = 0; x < size.X; x++) {
+		s32 base_x = x + base_layer_pos.X;
+		s32 base_y = y + base_layer_pos.Y;
+
+		video::SColor blend_c =
+			blend_layer->getPixel(x + blend_layer_pos.X, y + blend_layer_pos.Y);
+		video::SColor base_c = base_layer->getPixel(base_x, base_y);
+		double blend_r = blend_c.getRed()   / 255.0;
+		double blend_g = blend_c.getGreen() / 255.0;
+		double blend_b = blend_c.getBlue()  / 255.0;
+		double base_r = base_c.getRed()   / 255.0;
+		double base_g = base_c.getGreen() / 255.0;
+		double base_b = base_c.getBlue()  / 255.0;
+
+		base_c.set(
+			base_c.getAlpha(),
+			// Do a Multiply blend if less that 0.5, otherwise do a Screen blend
+			(u32)((base_r < 0.5 ? 2 * base_r * blend_r : 1 - 2 * (1 - base_r) * (1 - blend_r)) * 255),
+			(u32)((base_g < 0.5 ? 2 * base_g * blend_g : 1 - 2 * (1 - base_g) * (1 - blend_g)) * 255),
+			(u32)((base_b < 0.5 ? 2 * base_b * blend_b : 1 - 2 * (1 - base_b) * (1 - blend_b)) * 255)
+		);
+		dst->setPixel(base_x, base_y, base_c);
+	}
+}
+
+/*
+	Adjust the brightness and contrast of the base image.
+
+	Conceptually like GIMP's "Brightness-Contrast" feature but allows brightness to be
+	wound all the way up to white or down to black.
+*/
+static void apply_brightness_contrast(video::IImage *dst, v2u32 dst_pos, v2u32 size,
+	s32 brightness, s32 contrast)
+{
+	video::SColor dst_c;
+	// Only allow normalized contrast to get as high as 127/128 to avoid infinite slope.
+	// (we could technically allow -128/128 here as that would just result in 0 slope)
+	double norm_c = core::clamp(contrast,   -127, 127) / 128.0;
+	double norm_b = core::clamp(brightness, -127, 127) / 127.0;
+
+	// Scale brightness so its range is -127.5 to 127.5, otherwise brightness
+	// adjustments will outputs values from 0.5 to 254.5 instead of 0 to 255.
+	double scaled_b = brightness * 127.5 / 127;
+
+	// Calculate a contrast slope such that that no colors will get clamped due
+	// to the brightness setting.
+	// This allows the texture modifier to used as a brightness modifier without
+	// the user having to calculate a contrast to avoid clipping at that brightness.
+	double slope = 1 - fabs(norm_b);
+
+	// Apply the user's contrast adjustment to the calculated slope, such that
+	// -127 will make it near-vertical and +127 will make it horizontal
+	double angle = atan(slope);
+	angle += norm_c <= 0
+		? norm_c * angle // allow contrast slope to be lowered to 0
+		: norm_c * (M_PI_2 - angle); // allow contrast slope to be raised almost vert.
+	slope = tan(angle);
+
+	double c = slope <= 1
+		? -slope * 127.5 + 127.5 + scaled_b    // shift up/down when slope is horiz.
+		: -slope * (127.5 - scaled_b) + 127.5; // shift left/right when slope is vert.
+
+	// add 0.5 to c so that when the final result is cast to int, it is effectively
+	// rounded rather than trunc'd.
+	c += 0.5;
+
+	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
+	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
+		dst_c = dst->getPixel(x, y);
+
+		dst_c.set(
+			dst_c.getAlpha(),
+			core::clamp((int)(slope * dst_c.getRed()   + c), 0, 255),
+			core::clamp((int)(slope * dst_c.getGreen() + c), 0, 255),
+			core::clamp((int)(slope * dst_c.getBlue()  + c), 0, 255)
+		);
+		dst->setPixel(x, y, dst_c);
+	}
+}
+
+/*
+	Apply mask to destination
+*/
+static void apply_mask(video::IImage *mask, video::IImage *dst,
+		v2s32 mask_pos, v2s32 dst_pos, v2u32 size)
+{
+	for (u32 y0 = 0; y0 < size.Y; y0++) {
+		for (u32 x0 = 0; x0 < size.X; x0++) {
+			s32 mask_x = x0 + mask_pos.X;
+			s32 mask_y = y0 + mask_pos.Y;
+			s32 dst_x = x0 + dst_pos.X;
+			s32 dst_y = y0 + dst_pos.Y;
+			video::SColor mask_c = mask->getPixel(mask_x, mask_y);
+			video::SColor dst_c = dst->getPixel(dst_x, dst_y);
+			dst_c.color &= mask_c.color;
+			dst->setPixel(dst_x, dst_y, dst_c);
+		}
+	}
+}
+
+video::IImage *create_crack_image(video::IImage *crack, s32 frame_index,
+		core::dimension2d<u32> size, u8 tiles, video::IVideoDriver *driver)
+{
+	core::dimension2d<u32> strip_size = crack->getDimension();
+
+	if (tiles == 0 || strip_size.getArea() == 0)
+		return nullptr;
+
+	core::dimension2d<u32> frame_size(strip_size.Width, strip_size.Width);
+	core::dimension2d<u32> tile_size(size / tiles);
+	s32 frame_count = strip_size.Height / strip_size.Width;
+	if (frame_index >= frame_count)
+		frame_index = frame_count - 1;
+	core::rect<s32> frame(v2s32(0, frame_index * frame_size.Height), frame_size);
+	video::IImage *result = nullptr;
+
+	// extract crack frame
+	video::IImage *crack_tile = driver->createImage(video::ECF_A8R8G8B8, tile_size);
+	if (!crack_tile)
+		return nullptr;
+	if (tile_size == frame_size) {
+		crack->copyTo(crack_tile, v2s32(0, 0), frame);
+	} else {
+		video::IImage *crack_frame = driver->createImage(video::ECF_A8R8G8B8, frame_size);
+		if (!crack_frame)
+			goto exit__has_tile;
+		crack->copyTo(crack_frame, v2s32(0, 0), frame);
+		crack_frame->copyToScaling(crack_tile);
+		crack_frame->drop();
+	}
+	if (tiles == 1)
+		return crack_tile;
+
+	// tile it
+	result = driver->createImage(video::ECF_A8R8G8B8, size);
+	if (!result)
+		goto exit__has_tile;
+	result->fill({});
+	for (u8 i = 0; i < tiles; i++)
+		for (u8 j = 0; j < tiles; j++)
+			crack_tile->copyTo(result, v2s32(i * tile_size.Width, j * tile_size.Height));
+
+exit__has_tile:
+	crack_tile->drop();
+	return result;
+}
+
+static void draw_crack(video::IImage *crack, video::IImage *dst,
+		bool use_overlay, s32 frame_count, s32 progression,
+		video::IVideoDriver *driver, u8 tiles)
+{
+	// Dimension of destination image
+	core::dimension2d<u32> dim_dst = dst->getDimension();
+	// Limit frame_count
+	if (frame_count > (s32) dim_dst.Height)
+		frame_count = dim_dst.Height;
+	if (frame_count < 1)
+		frame_count = 1;
+	// Dimension of the scaled crack stage,
+	// which is the same as the dimension of a single destination frame
+	core::dimension2d<u32> frame_size(
+		dim_dst.Width,
+		dim_dst.Height / frame_count
+	);
+	video::IImage *crack_scaled = create_crack_image(crack, progression,
+			frame_size, tiles, driver);
+	if (!crack_scaled)
+		return;
+
+	auto blit = use_overlay ? blit_with_alpha<true> : blit_with_alpha<false>;
+	for (s32 i = 0; i < frame_count; ++i) {
+		v2s32 dst_pos(0, frame_size.Height * i);
+		blit(crack_scaled, dst, dst_pos, frame_size);
+	}
+
+	crack_scaled->drop();
+}
+
+void brighten(video::IImage *image)
+{
+	if (image == NULL)
+		return;
+
+	core::dimension2d<u32> dim = image->getDimension();
+
+	for (u32 y=0; y<dim.Height; y++)
+	for (u32 x=0; x<dim.Width; x++)
+	{
+		video::SColor c = image->getPixel(x,y);
+		c.setRed(0.5 * 255 + 0.5 * (float)c.getRed());
+		c.setGreen(0.5 * 255 + 0.5 * (float)c.getGreen());
+		c.setBlue(0.5 * 255 + 0.5 * (float)c.getBlue());
+		image->setPixel(x,y,c);
+	}
+}
+
+u32 parseImageTransform(std::string_view s)
+{
+	int total_transform = 0;
+
+	std::string transform_names[8];
+	transform_names[0] = "i";
+	transform_names[1] = "r90";
+	transform_names[2] = "r180";
+	transform_names[3] = "r270";
+	transform_names[4] = "fx";
+	transform_names[6] = "fy";
+
+	std::size_t pos = 0;
+	while(pos < s.size())
+	{
+		int transform = -1;
+		for (int i = 0; i <= 7; ++i)
+		{
+			const std::string &name_i = transform_names[i];
+
+			if (s[pos] == ('0' + i))
+			{
+				transform = i;
+				pos++;
+				break;
+			}
+
+			if (!(name_i.empty()) && lowercase(s.substr(pos, name_i.size())) == name_i) {
+				transform = i;
+				pos += name_i.size();
+				break;
+			}
+		}
+		if (transform < 0)
+			break;
+
+		// Multiply total_transform and transform in the group D4
+		int new_total = 0;
+		if (transform < 4)
+			new_total = (transform + total_transform) % 4;
+		else
+			new_total = (transform - total_transform + 8) % 4;
+		if ((transform >= 4) ^ (total_transform >= 4))
+			new_total += 4;
+
+		total_transform = new_total;
+	}
+	return total_transform;
+}
+
+core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<u32> dim)
+{
+	if (transform % 2 == 0)
+		return dim;
+
+	return core::dimension2d<u32>(dim.Height, dim.Width);
+}
+
+void imageTransform(u32 transform, video::IImage *src, video::IImage *dst)
+{
+	if (src == NULL || dst == NULL)
+		return;
+
+	core::dimension2d<u32> dstdim = dst->getDimension();
+
+	// Pre-conditions
+	assert(dstdim == imageTransformDimension(transform, src->getDimension()));
+	assert(transform <= 7);
+
+	/*
+		Compute the transformation from source coordinates (sx,sy)
+		to destination coordinates (dx,dy).
+	*/
+	int sxn = 0;
+	int syn = 2;
+	if (transform == 0)         // identity
+		sxn = 0, syn = 2;  //   sx = dx, sy = dy
+	else if (transform == 1)    // rotate by 90 degrees ccw
+		sxn = 3, syn = 0;  //   sx = (H-1) - dy, sy = dx
+	else if (transform == 2)    // rotate by 180 degrees
+		sxn = 1, syn = 3;  //   sx = (W-1) - dx, sy = (H-1) - dy
+	else if (transform == 3)    // rotate by 270 degrees ccw
+		sxn = 2, syn = 1;  //   sx = dy, sy = (W-1) - dx
+	else if (transform == 4)    // flip x
+		sxn = 1, syn = 2;  //   sx = (W-1) - dx, sy = dy
+	else if (transform == 5)    // flip x then rotate by 90 degrees ccw
+		sxn = 2, syn = 0;  //   sx = dy, sy = dx
+	else if (transform == 6)    // flip y
+		sxn = 0, syn = 3;  //   sx = dx, sy = (H-1) - dy
+	else if (transform == 7)    // flip y then rotate by 90 degrees ccw
+		sxn = 3, syn = 1;  //   sx = (H-1) - dy, sy = (W-1) - dx
+
+	for (u32 dy=0; dy<dstdim.Height; dy++)
+	for (u32 dx=0; dx<dstdim.Width; dx++)
+	{
+		u32 entries[4] = {dx, dstdim.Width-1-dx, dy, dstdim.Height-1-dy};
+		u32 sx = entries[sxn];
+		u32 sy = entries[syn];
+		video::SColor c = src->getPixel(sx,sy);
+		dst->setPixel(dx,dy,c);
+	}
+}
+
+namespace {
+	// For more colorspace transformations, see for example
+	// https://github.com/tobspr/GLSL-Color-Spaces/blob/master/ColorSpaces.inc.glsl
+
+	inline float linear_to_srgb_component(float v)
+	{
+		if (v > 0.0031308f)
+			return 1.055f * powf(v, 1.0f / 2.4f) - 0.055f;
+		return 12.92f * v;
+	}
+	inline float srgb_to_linear_component(float v)
+	{
+		if (v > 0.04045f)
+			return powf((v + 0.055f) / 1.055f, 2.4f);
+		return v / 12.92f;
+	}
+
+	v3f srgb_to_linear(const video::SColor col_srgb)
+	{
+		v3f col(col_srgb.getRed(), col_srgb.getGreen(), col_srgb.getBlue());
+		col /= 255.0f;
+		col.X = srgb_to_linear_component(col.X);
+		col.Y = srgb_to_linear_component(col.Y);
+		col.Z = srgb_to_linear_component(col.Z);
+		return col;
+	}
+
+	video::SColor linear_to_srgb(const v3f col_linear)
+	{
+		v3f col;
+		col.X = linear_to_srgb_component(col_linear.X);
+		col.Y = linear_to_srgb_component(col_linear.Y);
+		col.Z = linear_to_srgb_component(col_linear.Z);
+		col *= 255.0f;
+		col.X = core::clamp<float>(col.X, 0.0f, 255.0f);
+		col.Y = core::clamp<float>(col.Y, 0.0f, 255.0f);
+		col.Z = core::clamp<float>(col.Z, 0.0f, 255.0f);
+		return video::SColor(0xff, myround(col.X), myround(col.Y),
+			myround(col.Z));
+	}
+}
+
+
+///////////////////////////
+// ImageSource Functions //
+///////////////////////////
+
+#define CHECK_BASEIMG() \
+	do { \
+		if (!baseimg) { \
+			errorstream << "generateImagePart(): baseimg == NULL" \
+					<< " for part_of_name=\"" << part_of_name \
+					<< "\", cancelling." << std::endl; \
+			return false; \
+		} \
+	} while(0)
+
+#define COMPLAIN_INVALID(description) \
+	do { \
+		errorstream << "generateImagePart(): invalid " << (description) \
+			<< " for part_of_name=\"" << part_of_name \
+			<< "\", cancelling." << std::endl; \
+		return false; \
+	} while(0)
+
+#define CHECK_DIM(w, h) \
+	do { \
+		if ((w) <= 0 || (h) <= 0 || (w) >= 0xffff || (h) >= 0xffff) { \
+			COMPLAIN_INVALID("width or height"); \
+		} \
+	} while(0)
+
+bool ImageSource::generateImagePart(std::string_view part_of_name,
+		video::IImage *& baseimg, std::set<std::string> &source_image_names)
+{
+	const char escape = '\\'; // same as in generateImage()
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	sanity_check(driver);
+
+	if (baseimg && (baseimg->getDimension().Width == 0 ||
+			baseimg->getDimension().Height == 0)) {
+		errorstream << "generateImagePart(): baseimg is zero-sized?!"
+			<< std::endl;
+		baseimg->drop();
+		baseimg = nullptr;
+	}
+
+	// Stuff starting with [ are special commands
+	if (part_of_name.empty() || part_of_name[0] != '[') {
+		std::string part_s(part_of_name);
+		source_image_names.insert(part_s);
+		video::IImage *image = m_sourcecache.getOrLoad(part_s);
+		if (!image) {
+			// Do not create the dummy texture
+			if (part_of_name.empty())
+				return true;
+
+			// Do not create normalmap dummies
+			if (str_ends_with(part_of_name, "_normal.png")) {
+				warningstream << "generateImagePart(): Could not load normal map \""
+					<< part_of_name << "\"" << std::endl;
+				return true;
+			}
+
+			errorstream << "generateImagePart(): Could not load image \""
+				<< part_of_name << "\" while building texture; "
+				"Creating a dummy image" << std::endl;
+
+			core::dimension2d<u32> dim(1,1);
+			image = driver->createImage(video::ECF_A8R8G8B8, dim);
+			sanity_check(image != NULL);
+			image->setPixel(0,0, video::SColor(255,myrand()%256,
+					myrand()%256,myrand()%256));
+		}
+
+		// If base image is NULL, load as base.
+		if (baseimg == NULL)
+		{
+			/*
+				Copy it this way to get an alpha channel.
+				Otherwise images with alpha cannot be blitted on
+				images that don't have alpha in the original file.
+			*/
+			core::dimension2d<u32> dim = image->getDimension();
+			baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+			image->copyTo(baseimg);
+		}
+		// Else blit on base.
+		else
+		{
+			blitBaseImage(image, baseimg);
+		}
+
+		image->drop();
+	}
+	else
+	{
+		// A special texture modification
+
+		/*
+			[crack:N:P
+			[cracko:N:P
+			Adds a cracking texture
+			N = animation frame count, P = crack progression
+		*/
+		if (str_starts_with(part_of_name, "[crack"))
+		{
+			CHECK_BASEIMG();
+
+			// Crack image number and overlay option
+			// Format: crack[o][:<tiles>]:<frame_count>:<frame>
+			bool use_overlay = (part_of_name[6] == 'o');
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			s32 frame_count = stoi(sf.next(":"));
+			s32 progression = stoi(sf.next(":"));
+			s32 tiles = 1;
+			// Check whether there is the <tiles> argument, that is,
+			// whether there are 3 arguments. If so, shift values
+			// as the first and not the last argument is optional.
+			auto s = sf.next(":");
+			if (!s.empty()) {
+				tiles = frame_count;
+				frame_count = progression;
+				progression = stoi(s);
+			}
+
+			if (progression >= 0) {
+				/*
+					Load crack image.
+
+					It is an image with a number of cracking stages
+					horizontally tiled.
+				*/
+				video::IImage *img_crack = m_sourcecache.getOrLoad(
+					"crack_anylength.png");
+
+				if (img_crack) {
+					draw_crack(img_crack, baseimg,
+						use_overlay, frame_count,
+						progression, driver, tiles);
+					img_crack->drop();
+				}
+			}
+		}
+		/*
+			[combine:WxH:X,Y=filename:X,Y=filename2
+			Creates a bigger texture from any amount of smaller ones
+		*/
+		else if (str_starts_with(part_of_name, "[combine"))
+		{
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 w0 = stoi(sf.next("x"));
+			u32 h0 = stoi(sf.next(":"));
+			if (!baseimg) {
+				CHECK_DIM(w0, h0);
+				baseimg = driver->createImage(video::ECF_A8R8G8B8, {w0, h0});
+				baseimg->fill(video::SColor(0,0,0,0));
+			}
+
+			while (!sf.at_end()) {
+				v2s32 pos_base;
+				pos_base.X = stoi(sf.next(","));
+				pos_base.Y = stoi(sf.next("="));
+				std::string filename = unescape_string(sf.next_esc(":", escape), escape);
+
+				auto basedim = baseimg->getDimension();
+				if (pos_base.X > (s32)basedim.Width || pos_base.Y > (s32)basedim.Height) {
+					warningstream << "generateImagePart(): Skipping \""
+						<< filename << "\" as it's out-of-bounds " << pos_base
+						<< " for [combine" << std::endl;
+					continue;
+				}
+				infostream << "Adding \"" << filename<< "\" to combined "
+					<< pos_base << std::endl;
+
+				video::IImage *img = generateImage(filename, source_image_names);
+				if (!img) {
+					errorstream << "generateImagePart(): Failed to load image \""
+						<< filename << "\" for [combine" << std::endl;
+					continue;
+				}
+				const auto dim = img->getDimension();
+				if (pos_base.X + dim.Width <= 0 || pos_base.Y + dim.Height <= 0) {
+					warningstream << "generateImagePart(): Skipping \""
+						<< filename << "\" as it's out-of-bounds " << pos_base
+						<< " for [combine" << std::endl;
+					img->drop();
+					continue;
+				}
+
+				blit_with_alpha(img, baseimg, pos_base, dim);
+				img->drop();
+			}
+		}
+		/*
+			[fill:WxH:color
+			[fill:WxH:X,Y:color
+			Creates a texture of the given size and color, optionally with an <x>,<y>
+			position. An alpha value may be specified in the `Colorstring`.
+		*/
+		else if (str_starts_with(part_of_name, "[fill"))
+		{
+			u32 x = 0;
+			u32 y = 0;
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 width  = stoi(sf.next("x"));
+			u32 height = stoi(sf.next(":"));
+			std::string color_or_x = sf.next(",");
+
+			video::SColor color;
+			if (!parseColorString(color_or_x, color, true)) {
+				x = stoi(color_or_x);
+				y = stoi(sf.next(":"));
+				std::string color_str = sf.next(":");
+
+				if (!parseColorString(color_str, color, false))
+					return false;
+			}
+			core::dimension2d<u32> dim(width, height);
+
+			CHECK_DIM(dim.Width, dim.Height);
+			if (baseimg) {
+				auto basedim = baseimg->getDimension();
+				if (x >= basedim.Width || y >= basedim.Height)
+					COMPLAIN_INVALID("X or Y offset");
+			}
+
+			video::IImage *img = driver->createImage(video::ECF_A8R8G8B8, dim);
+			img->fill(color);
+
+			if (baseimg == nullptr) {
+				baseimg = img;
+			} else {
+				blit_with_alpha(img, baseimg, v2s32(x, y), dim);
+				img->drop();
+			}
+		}
+		/*
+			[brighten
+		*/
+		else if (str_starts_with(part_of_name, "[brighten"))
+		{
+			CHECK_BASEIMG();
+
+			brighten(baseimg);
+		}
+		/*
+			[noalpha
+			Make image completely opaque.
+			Used for the leaves texture when in old leaves mode, so
+			that the transparent parts don't look completely black
+			when simple alpha channel is used for rendering.
+		*/
+		else if (str_starts_with(part_of_name, "[noalpha"))
+		{
+			CHECK_BASEIMG();
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			// Set alpha to full
+			for (u32 y=0; y<dim.Height; y++)
+			for (u32 x=0; x<dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x,y);
+				c.setAlpha(255);
+				baseimg->setPixel(x,y,c);
+			}
+		}
+		/*
+			[makealpha:R,G,B
+			Convert one color to transparent.
+		*/
+		else if (str_starts_with(part_of_name, "[makealpha:"))
+		{
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name.substr(11));
+			u32 r1 = stoi(sf.next(","));
+			u32 g1 = stoi(sf.next(","));
+			u32 b1 = stoi(sf.next(""));
+
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			for (u32 y=0; y<dim.Height; y++)
+			for (u32 x=0; x<dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x,y);
+				u32 r = c.getRed();
+				u32 g = c.getGreen();
+				u32 b = c.getBlue();
+				if (!(r == r1 && g == g1 && b == b1))
+					continue;
+				c.setAlpha(0);
+				baseimg->setPixel(x,y,c);
+			}
+		}
+		/*
+			[transformN
+			Rotates and/or flips the image.
+
+			N can be a number (between 0 and 7) or a transform name.
+			Rotations are counter-clockwise.
+			0  I      identity
+			1  R90    rotate by 90 degrees
+			2  R180   rotate by 180 degrees
+			3  R270   rotate by 270 degrees
+			4  FX     flip X
+			5  FXR90  flip X then rotate by 90 degrees
+			6  FY     flip Y
+			7  FYR90  flip Y then rotate by 90 degrees
+
+			Note: Transform names can be concatenated to produce
+			their product (applies the first then the second).
+			The resulting transform will be equivalent to one of the
+			eight existing ones, though (see: dihedral group).
+		*/
+		else if (str_starts_with(part_of_name, "[transform"))
+		{
+			CHECK_BASEIMG();
+
+			u32 transform = parseImageTransform(part_of_name.substr(10));
+			core::dimension2d<u32> dim = imageTransformDimension(
+					transform, baseimg->getDimension());
+			video::IImage *image = driver->createImage(
+					baseimg->getColorFormat(), dim);
+			sanity_check(image != NULL);
+			imageTransform(transform, baseimg, image);
+			baseimg->drop();
+			baseimg = image;
+		}
+		/*
+			[inventorycube{topimage{leftimage{rightimage
+			In every subimage, replace ^ with &.
+			Create an "inventory cube".
+			NOTE: This should be used only on its own.
+			Example (a grass block (not actually used in game):
+			"[inventorycube{grass.png{mud.png&grass_side.png{mud.png&grass_side.png"
+		*/
+		else if (str_starts_with(part_of_name, "[inventorycube"))
+		{
+			if (baseimg) {
+				errorstream<<"generateImagePart(): baseimg != NULL "
+						<<"for part_of_name=\""<<part_of_name
+						<<"\", cancelling."<<std::endl;
+				return false;
+			}
+
+			std::string part_s(part_of_name);
+			str_replace(part_s, '&', '^');
+
+			Strfnd sf(part_s);
+			sf.next("{");
+			std::string imagename_top = sf.next("{");
+			std::string imagename_left = sf.next("{");
+			std::string imagename_right = sf.next("{");
+
+			// Generate images for the faces of the cube
+			video::IImage *img_top = generateImage(imagename_top, source_image_names);
+			video::IImage *img_left = generateImage(imagename_left, source_image_names);
+			video::IImage *img_right = generateImage(imagename_right, source_image_names);
+
+			if (img_top == NULL || img_left == NULL || img_right == NULL) {
+				errorstream << "generateImagePart(): Failed to create textures"
+						<< " for inventorycube \"" << part_of_name << "\""
+						<< std::endl;
+				return false;
+			}
+
+			baseimg = createInventoryCubeImage(img_top, img_left, img_right);
+
+			// Face images are not needed anymore
+			img_top->drop();
+			img_left->drop();
+			img_right->drop();
+
+			return true;
+		}
+		/*
+			[lowpart:percent:filename
+			Adds the lower part of a texture
+		*/
+		else if (str_starts_with(part_of_name, "[lowpart:"))
+		{
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 percent = stoi(sf.next(":"), 0, 100);
+			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
+
+			video::IImage *img = generateImage(filename, source_image_names);
+			if (img) {
+				core::dimension2d<u32> dim = img->getDimension();
+				if (!baseimg)
+					baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+
+				core::position2d<s32> pos_base(0, 0);
+				core::position2d<s32> clippos(0, 0);
+				clippos.Y = dim.Height * (100-percent) / 100;
+				core::dimension2d<u32> clipdim = dim;
+				clipdim.Height = clipdim.Height * percent / 100 + 1;
+				core::rect<s32> cliprect(clippos, clipdim);
+				img->copyToWithAlpha(baseimg, pos_base,
+						core::rect<s32>(v2s32(0,0), dim),
+						video::SColor(255,255,255,255),
+						&cliprect);
+				img->drop();
+			}
+		}
+		/*
+			[verticalframe:N:I
+			Crops a frame of a vertical animation.
+			N = frame count, I = frame index
+		*/
+		else if (str_starts_with(part_of_name, "[verticalframe:"))
+		{
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 frame_count = stoi(sf.next(":"));
+			u32 frame_index = stoi(sf.next(":"));
+
+			if (frame_count == 0){
+				errorstream << "generateImagePart(): invalid frame_count "
+						<< "for part_of_name=\"" << part_of_name
+						<< "\", using frame_count = 1 instead." << std::endl;
+				frame_count = 1;
+			}
+			if (frame_index >= frame_count)
+				frame_index = frame_count - 1;
+
+			v2u32 frame_size = baseimg->getDimension();
+			frame_size.Y /= frame_count;
+
+			video::IImage *img = driver->createImage(video::ECF_A8R8G8B8,
+					frame_size);
+
+			// Fill target image with transparency
+			img->fill(video::SColor(0,0,0,0));
+
+			core::dimension2d<u32> dim = frame_size;
+			core::position2d<s32> pos_dst(0, 0);
+			core::position2d<s32> pos_src(0, frame_index * frame_size.Y);
+			baseimg->copyToWithAlpha(img, pos_dst,
+					core::rect<s32>(pos_src, dim),
+					video::SColor(255,255,255,255),
+					NULL);
+			// Replace baseimg
+			baseimg->drop();
+			baseimg = img;
+		}
+		/*
+			[mask:filename
+			Applies a mask to an image
+		*/
+		else if (str_starts_with(part_of_name, "[mask:"))
+		{
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
+
+			video::IImage *img = generateImage(filename, source_image_names);
+			if (img) {
+				apply_mask(img, baseimg, v2s32(0, 0), v2s32(0, 0),
+						img->getDimension());
+				img->drop();
+			} else {
+				errorstream << "generateImagePart(): Failed to load image \""
+						<< filename << "\" for [mask" << std::endl;
+			}
+		}
+		/*
+		[multiply:color
+		or
+		[screen:color
+			Multiply and Screen blend modes are basic blend modes for darkening and lightening
+			images, respectively.
+			A Multiply blend multiplies a given color to every pixel of an image.
+			A Screen blend has the opposite effect to a Multiply blend.
+			color = color as ColorString
+		*/
+		else if (str_starts_with(part_of_name, "[multiply:") ||
+		         str_starts_with(part_of_name, "[screen:")) {
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			std::string color_str = sf.next(":");
+
+			CHECK_BASEIMG();
+
+			video::SColor color;
+
+			if (!parseColorString(color_str, color, false))
+				return false;
+			if (str_starts_with(part_of_name, "[multiply:")) {
+				apply_multiplication(baseimg, v2u32(0, 0),
+					baseimg->getDimension(), color);
+			} else {
+				apply_screen(baseimg, v2u32(0, 0), baseimg->getDimension(), color);
+			}
+		}
+		/*
+			[colorize:color:ratio
+			Overlays image with given color
+			color = color as ColorString
+			ratio = optional string "alpha", or a weighting between 0 and 255
+		*/
+		else if (str_starts_with(part_of_name, "[colorize:"))
+		{
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			std::string color_str = sf.next(":");
+			std::string ratio_str = sf.next(":");
+
+			CHECK_BASEIMG();
+
+			video::SColor color;
+			int ratio = -1;
+			bool keep_alpha = false;
+
+			if (!parseColorString(color_str, color, false))
+				return false;
+
+			if (is_number(ratio_str))
+				ratio = mystoi(ratio_str, 0, 255);
+			else if (ratio_str == "alpha")
+				keep_alpha = true;
+
+			apply_colorize(baseimg, v2u32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha);
+		}
+		/*
+			[applyfiltersformesh
+			Internal modifier
+		*/
+		else if (str_starts_with(part_of_name, "[applyfiltersformesh"))
+		{
+			/* IMPORTANT: When changing this, getTextureForMesh() needs to be
+			 * updated too. */
+
+			CHECK_BASEIMG();
+
+			// Apply the "clean transparent" filter, if needed
+			if (m_setting_mipmap || m_setting_bilinear_filter ||
+				m_setting_trilinear_filter || m_setting_anisotropic_filter)
+				imageCleanTransparent(baseimg, 127);
+
+			/* Upscale textures to user's requested minimum size.  This is a trick to make
+			 * filters look as good on low-res textures as on high-res ones, by making
+			 * low-res textures BECOME high-res ones.  This is helpful for worlds that
+			 * mix high- and low-res textures, or for mods with least-common-denominator
+			 * textures that don't have the resources to offer high-res alternatives.
+			 */
+			const bool filter = m_setting_trilinear_filter || m_setting_bilinear_filter;
+			const s32 scaleto = filter ? g_settings->getU16("texture_min_size") : 1;
+			if (scaleto > 1) {
+				const core::dimension2d<u32> dim = baseimg->getDimension();
+
+				/* Calculate scaling needed to make the shortest texture dimension
+				 * equal to the target minimum.  If e.g. this is a vertical frames
+				 * animation, the short dimension will be the real size.
+				 */
+				u32 xscale = scaleto / dim.Width;
+				u32 yscale = scaleto / dim.Height;
+				const s32 scale = std::max(xscale, yscale);
+
+				// Never downscale; only scale up by 2x or more.
+				if (scale > 1) {
+					u32 w = scale * dim.Width;
+					u32 h = scale * dim.Height;
+					const core::dimension2d<u32> newdim(w, h);
+					video::IImage *newimg = driver->createImage(
+							baseimg->getColorFormat(), newdim);
+					baseimg->copyToScaling(newimg);
+					baseimg->drop();
+					baseimg = newimg;
+				}
+			}
+		}
+		/*
+			[resize:WxH
+			Resizes the base image to the given dimensions
+		*/
+		else if (str_starts_with(part_of_name, "[resize"))
+		{
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 width = stoi(sf.next("x"));
+			u32 height = stoi(sf.next(""));
+			CHECK_DIM(width, height);
+
+			video::IImage *image = driver->
+				createImage(video::ECF_A8R8G8B8, {width, height});
+			baseimg->copyToScaling(image);
+			baseimg->drop();
+			baseimg = image;
+		}
+		/*
+			[opacity:R
+			Makes the base image transparent according to the given ratio.
+			R must be between 0 and 255.
+			0 means totally transparent.
+			255 means totally opaque.
+		*/
+		else if (str_starts_with(part_of_name, "[opacity:")) {
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+
+			u32 ratio = mystoi(sf.next(""), 0, 255);
+
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			for (u32 y = 0; y < dim.Height; y++)
+			for (u32 x = 0; x < dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x, y);
+				c.setAlpha(floor((c.getAlpha() * ratio) / 255 + 0.5));
+				baseimg->setPixel(x, y, c);
+			}
+		}
+		/*
+			[invert:mode
+			Inverts the given channels of the base image.
+			Mode may contain the characters "r", "g", "b", "a".
+			Only the channels that are mentioned in the mode string
+			will be inverted.
+		*/
+		else if (str_starts_with(part_of_name, "[invert:")) {
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+
+			std::string mode = sf.next("");
+			u32 mask = 0;
+			if (mode.find('a') != std::string::npos)
+				mask |= 0xff000000UL;
+			if (mode.find('r') != std::string::npos)
+				mask |= 0x00ff0000UL;
+			if (mode.find('g') != std::string::npos)
+				mask |= 0x0000ff00UL;
+			if (mode.find('b') != std::string::npos)
+				mask |= 0x000000ffUL;
+
+			core::dimension2d<u32> dim = baseimg->getDimension();
+
+			for (u32 y = 0; y < dim.Height; y++)
+			for (u32 x = 0; x < dim.Width; x++)
+			{
+				video::SColor c = baseimg->getPixel(x, y);
+				c.color ^= mask;
+				baseimg->setPixel(x, y, c);
+			}
+		}
+		/*
+			[sheet:WxH:X,Y
+			Retrieves a tile at position X,Y (in tiles)
+			from the base image it assumes to be a
+			tilesheet with dimensions W,H (in tiles).
+		*/
+		else if (str_starts_with(part_of_name, "[sheet:")) {
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			u32 w0 = stoi(sf.next("x"));
+			u32 h0 = stoi(sf.next(":"));
+			u32 x0 = stoi(sf.next(","));
+			u32 y0 = stoi(sf.next(":"));
+
+			CHECK_DIM(w0, h0);
+			if (x0 >= w0 || y0 >= h0)
+				COMPLAIN_INVALID("tile position (X,Y)");
+
+			core::dimension2d<u32> img_dim = baseimg->getDimension();
+			core::dimension2d<u32> tile_dim(v2u32(img_dim) / v2u32(w0, h0));
+			if (tile_dim.Width == 0)
+				tile_dim.Width = 1;
+			if (tile_dim.Height == 0)
+				tile_dim.Height = 1;
+
+			video::IImage *img = driver->createImage(
+					video::ECF_A8R8G8B8, tile_dim);
+			img->fill(video::SColor(0,0,0,0));
+
+			v2u32 vdim(tile_dim);
+			core::rect<s32> rect(v2s32(x0 * vdim.X, y0 * vdim.Y), tile_dim);
+			baseimg->copyToWithAlpha(img, v2s32(0), rect,
+					video::SColor(255,255,255,255), NULL);
+
+			// Replace baseimg
+			baseimg->drop();
+			baseimg = img;
+		}
+		/*
+			[png:base64
+			Decodes a PNG image in base64 form.
+			Use minetest.encode_png and minetest.encode_base64
+			to produce a valid string.
+		*/
+		else if (str_starts_with(part_of_name, "[png:")) {
+			std::string png;
+			{
+				auto blob = part_of_name.substr(5);
+				if (!base64_is_valid(blob)) {
+					errorstream << "generateImagePart(): "
+								<< "malformed base64 in [png" << std::endl;
+					return false;
+				}
+				png = base64_decode(blob);
+			}
+
+			auto *device = RenderingEngine::get_raw_device();
+			auto *fs = device->getFileSystem();
+			auto *vd = device->getVideoDriver();
+			auto *memfile = fs->createMemoryReadFile(png.data(), png.size(), "[png_tmpfile");
+			video::IImage* pngimg = vd->createImageFromFile(memfile);
+			memfile->drop();
+
+			if (!pngimg) {
+				errorstream << "generateImagePart(): Invalid PNG data" << std::endl;
+				return false;
+			}
+
+			if (baseimg) {
+				blitBaseImage(pngimg, baseimg);
+			} else {
+				core::dimension2d<u32> dim = pngimg->getDimension();
+				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
+				pngimg->copyTo(baseimg);
+			}
+			pngimg->drop();
+		}
+		/*
+			[hsl:hue:saturation:lightness
+			or
+			[colorizehsl:hue:saturation:lightness
+
+			Adjust the hue, saturation, and lightness of the base image. Like
+			"Hue-Saturation" in GIMP, but with 0 as the mid-point.
+			Hue should be from -180 to +180, though 0 to 360 is also supported.
+			Saturation and lightness are optional, with lightness from -100 to
+			+100, and sauration from -100 to +100-or-higher.
+
+			If colorize is true then saturation is from 0 to 100, and the image
+			will be converted to a grayscale image as though seen through a
+			colored glass, like	"Colorize" in GIMP.
+		*/
+		else if (str_starts_with(part_of_name, "[hsl:") ||
+		         str_starts_with(part_of_name, "[colorizehsl:")) {
+
+			CHECK_BASEIMG();
+
+			bool colorize = str_starts_with(part_of_name, "[colorizehsl:");
+
+			// saturation range is 0 to 100 when colorize is true
+			s32 defaultSaturation = colorize ? 50 : 0;
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			s32 hue = mystoi(sf.next(":"), -180, 360);
+			s32 saturation = sf.at_end() ? defaultSaturation : mystoi(sf.next(":"), -100, 1000);
+			s32 lightness  = sf.at_end() ? 0 : mystoi(sf.next(":"), -100, 100);
+
+
+			apply_hue_saturation(baseimg, v2u32(0, 0), baseimg->getDimension(),
+				hue, saturation, lightness, colorize);
+		}
+		/*
+			[overlay:filename
+			or
+			[hardlight:filename
+
+			"A.png^[hardlight:B.png" is the same as "B.png^[overlay:A.Png"
+
+			Applies an Overlay or Hard Light blend between two images, like the
+			layer modes of the same names in GIMP.
+			Overlay combines Multiply and Screen blend modes. The parts of the
+			top layer where the base layer is light become lighter, the parts
+			where the base layer is dark become darker. Areas where the base
+			layer are mid grey are unaffected. An overlay with the same picture
+			looks like an S-curve.
+
+			Swapping the top layer and base layer is a Hard Light blend
+		*/
+		else if (str_starts_with(part_of_name, "[overlay:") ||
+		         str_starts_with(part_of_name, "[hardlight:")) {
+
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
+
+			video::IImage *img = generateImage(filename, source_image_names);
+			if (img) {
+				upscaleImagesToMatchLargest(baseimg, img);
+
+				bool hardlight = str_starts_with(part_of_name, "[hardlight:");
+				apply_overlay(img, baseimg, v2s32(0, 0), v2s32(0, 0),
+						img->getDimension(), hardlight);
+				img->drop();
+			} else {
+				errorstream << "generateImage(): Failed to load image \""
+					<< filename << "\" for [overlay or [hardlight" << std::endl;
+			}
+		}
+		/*
+			[contrast:C:B
+
+			Adjust the brightness and contrast of the base image. Conceptually
+			like GIMP's "Brightness-Contrast" feature but allows brightness to
+			be wound all the way up to white or down to black.
+			C and B are both values from -127 to +127.
+			B is optional.
+		*/
+		else if (str_starts_with(part_of_name, "[contrast:")) {
+
+			CHECK_BASEIMG();
+
+			Strfnd sf(part_of_name);
+			sf.next(":");
+			s32 contrast = mystoi(sf.next(":"), -127, 127);
+			s32 brightness = sf.at_end() ? 0 : mystoi(sf.next(":"), -127, 127);
+
+			apply_brightness_contrast(baseimg, v2u32(0, 0),
+				baseimg->getDimension(), brightness, contrast);
+		}
+		else
+		{
+			errorstream << "generateImagePart(): Invalid "
+					" modification: \"" << part_of_name << "\"" << std::endl;
+		}
+	}
+
+	return true;
+}
+
+#undef CHECK_BASEIMG
+
+#undef COMPLAIN_INVALID
+
+#undef CHECK_DIM
+
+
+video::IImage* ImageSource::generateImage(std::string_view name,
+		std::set<std::string> &source_image_names)
+{
+	// Get the base image
+
+	const char separator = '^';
+	const char escape = '\\';
+	const char paren_open = '(';
+	const char paren_close = ')';
+
+	// Find last separator in the name
+	s32 last_separator_pos = -1;
+	u8 paren_bal = 0;
+	for (s32 i = name.size() - 1; i >= 0; i--) {
+		if (i > 0 && name[i-1] == escape)
+			continue;
+		switch (name[i]) {
+		case separator:
+			if (paren_bal == 0) {
+				last_separator_pos = i;
+				i = -1; // break out of loop
+			}
+			break;
+		case paren_open:
+			if (paren_bal == 0) {
+				errorstream << "generateImage(): unbalanced parentheses"
+						<< "(extranous '(') while generating texture \""
+						<< name << "\"" << std::endl;
+				return NULL;
+			}
+			paren_bal--;
+			break;
+		case paren_close:
+			paren_bal++;
+			break;
+		default:
+			break;
+		}
+	}
+	if (paren_bal > 0) {
+		errorstream << "generateImage(): unbalanced parentheses"
+				<< "(missing matching '(') while generating texture \""
+				<< name << "\"" << std::endl;
+		return NULL;
+	}
+
+
+	video::IImage *baseimg = NULL;
+
+	/*
+		If separator was found, make the base image
+		using a recursive call.
+	*/
+	if (last_separator_pos != -1) {
+		baseimg = generateImage(name.substr(0, last_separator_pos), source_image_names);
+	}
+
+	/*
+		Parse out the last part of the name of the image and act
+		according to it
+	*/
+
+	auto last_part_of_name = name.substr(last_separator_pos + 1);
+
+	/*
+		If this name is enclosed in parentheses, generate it
+		and blit it onto the base image
+	*/
+	if (last_part_of_name.empty()) {
+		// keep baseimg == nullptr
+	} else if (last_part_of_name[0] == paren_open
+			&& last_part_of_name.back() == paren_close) {
+		auto name2 = last_part_of_name.substr(1,
+				last_part_of_name.size() - 2);
+		video::IImage *tmp = generateImage(name2, source_image_names);
+		if (!tmp) {
+			errorstream << "generateImage(): "
+				"Failed to generate \"" << name2 << "\""
+				<< std::endl;
+			return NULL;
+		}
+
+		if (baseimg) {
+			core::dimension2d<u32> dim = tmp->getDimension();
+			blit_with_alpha(tmp, baseimg, v2s32(0, 0), dim);
+			tmp->drop();
+		} else {
+			baseimg = tmp;
+		}
+	} else if (!generateImagePart(last_part_of_name, baseimg, source_image_names)) {
+		// Generate image according to part of name
+		errorstream << "generateImage(): "
+				"Failed to generate \"" << last_part_of_name << "\""
+				<< std::endl;
+	}
+
+	// If no resulting image, print a warning
+	if (baseimg == NULL) {
+		errorstream << "generateImage(): baseimg is NULL (attempted to"
+				" create texture \"" << name << "\")" << std::endl;
+	} else if (baseimg->getDimension().Width == 0 ||
+			baseimg->getDimension().Height == 0) {
+		errorstream << "generateImage(): zero-sized image was created?! "
+			"(attempted to create texture \"" << name << "\")" << std::endl;
+		baseimg->drop();
+		baseimg = nullptr;
+	}
+
+	return baseimg;
+}
+
+video::SColor ImageSource::getImageAverageColor(const video::IImage &image)
+{
+	video::SColor c(0, 0, 0, 0);
+	u32 total = 0;
+	v3f col_acc(0, 0, 0);
+	core::dimension2d<u32> dim = image.getDimension();
+	u16 step = 1;
+	if (dim.Width > 16)
+		step = dim.Width / 16;
+	for (u16 x = 0; x < dim.Width; x += step) {
+		for (u16 y = 0; y < dim.Width; y += step) {
+			c = image.getPixel(x,y);
+			if (c.getAlpha() > 0) {
+				total++;
+				col_acc += srgb_to_linear(c);
+			}
+		}
+	}
+	if (total > 0) {
+		col_acc /= total;
+		c = linear_to_srgb(col_acc);
+	}
+	c.setAlpha(255);
+	return c;
+}
+
+void ImageSource::insertSourceImage(const std::string &name, video::IImage *img, bool prefer_local) {
+	m_sourcecache.insert(name, img, prefer_local);
+}
diff --git a/src/client/imagesource.h b/src/client/imagesource.h
new file mode 100644
index 000000000..f3a30617a
--- /dev/null
+++ b/src/client/imagesource.h
@@ -0,0 +1,84 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include <IImage.h>
+#include <string>
+#include "settings.h"
+
+// This file is only used for internal generation of images.
+// Use texturesource.h to handle textures.
+
+// A cache used for storing source images.
+// (A "source image" is an unmodified image directly taken from the filesystem.)
+// Does not contain modified images.
+class SourceImageCache {
+public:
+	~SourceImageCache();
+
+	void insert(const std::string &name, video::IImage *img, bool prefer_local);
+
+	video::IImage* get(const std::string &name);
+
+	// Primarily fetches from cache, secondarily tries to read from filesystem.
+	video::IImage *getOrLoad(const std::string &name);
+private:
+	std::map<std::string, video::IImage*> m_images;
+};
+
+// Generates images using texture modifiers, and caches source images.
+struct ImageSource {
+	/*! Generates an image from a full string like
+	 * "stone.png^mineral_coal.png^[crack:1:0".
+	 * The returned Image should be dropped.
+	 * source_image_names is important to determine when to flush the image from a cache (dynamic media)
+	 */
+	video::IImage* generateImage(std::string_view name, std::set<std::string> &source_image_names);
+
+	// Insert a source image into the cache without touching the filesystem.
+	void insertSourceImage(const std::string &name, video::IImage *img, bool prefer_local);
+
+	// TODO should probably be moved elsewhere
+	static video::SColor getImageAverageColor(const video::IImage &image);
+
+	ImageSource() :
+		m_setting_mipmap{g_settings->getBool("mip_map")},
+		m_setting_trilinear_filter{g_settings->getBool("trilinear_filter")},
+		m_setting_bilinear_filter{g_settings->getBool("bilinear_filter")},
+		m_setting_anisotropic_filter{g_settings->getBool("anisotropic_filter")}
+	{};
+
+private:
+
+	// Generate image based on a string like "stone.png" or "[crack:1:0".
+	// If baseimg is NULL, it is created. Otherwise stuff is made on it.
+	// source_image_names is important to determine when to flush the image from a cache (dynamic media).
+	bool generateImagePart(std::string_view part_of_name, video::IImage *& baseimg,
+			std::set<std::string> &source_image_names);
+
+	// Cached settings needed for making textures from meshes
+	bool m_setting_mipmap;
+	bool m_setting_trilinear_filter;
+	bool m_setting_bilinear_filter;
+	bool m_setting_anisotropic_filter;
+
+	// Cache of source images
+	SourceImageCache m_sourcecache;
+};
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index fd5b6c8bf..5799525af 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -18,9 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "settings.h"
 #include "util/numeric.h"
 #include "inputhandler.h"
 #include "gui/mainmenumanager.h"
+#include "gui/touchscreengui.h"
 #include "hud.h"
 
 void KeyCache::populate_nonchanging()
@@ -100,7 +102,6 @@ void KeyCache::populate()
 			handler->listenForKey(k);
 		}
 		handler->listenForKey(EscapeKey);
-		handler->listenForKey(CancelKey);
 	}
 }
 
@@ -108,21 +109,58 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 {
   try {
 
-	/*
-		React to nothing here if a menu is active
-	*/
-	if (isMenuActive()) {
-#ifdef HAVE_TOUCHSCREENGUI
-		if (m_touchscreengui) {
-			m_touchscreengui->setVisible(false);
+	if (event.EventType == irr::EET_LOG_TEXT_EVENT) {
+		static const LogLevel irr_loglev_conv[] = {
+			LL_VERBOSE, // ELL_DEBUG
+			LL_INFO,    // ELL_INFORMATION
+			LL_WARNING, // ELL_WARNING
+			LL_ERROR,   // ELL_ERROR
+			LL_NONE,    // ELL_NONE
+		};
+		assert(event.LogEvent.Level < ARRLEN(irr_loglev_conv));
+		g_logger.log(irr_loglev_conv[event.LogEvent.Level],
+				std::string("Irrlicht: ") + event.LogEvent.Text);
+		return true;
+	}
+
+	if (event.EventType == EET_APPLICATION_EVENT &&
+			event.ApplicationEvent.EventType == EAET_DPI_CHANGED) {
+		// This is a fake setting so that we can use (de)registerChangedCallback
+		// not only to listen for gui/hud_scaling changes, but also for DPI changes.
+		g_settings->setU16("dpi_change_notifier",
+				g_settings->getU16("dpi_change_notifier") + 1);
+		return true;
+	}
+
+	// This is separate from other keyboard handling so that it also works in menus.
+	if (event.EventType == EET_KEY_INPUT_EVENT) {
+		const KeyPress keyCode(event.KeyInput);
+		if (keyCode == getKeySetting("keymap_fullscreen")) {
+			if (event.KeyInput.PressedDown && !fullscreen_is_down) {
+				IrrlichtDevice *device = RenderingEngine::get_raw_device();
+
+				bool new_fullscreen = !device->isFullscreen();
+				// Only update the setting if toggling succeeds - it always fails
+				// if Minetest was built without SDL.
+				if (device->setFullscreen(new_fullscreen)) {
+					g_settings->setBool("fullscreen", new_fullscreen);
+				}
+			}
+			fullscreen_is_down = event.KeyInput.PressedDown;
+			return true;
 		}
-#endif
+	}
+
+	// Let the menu handle events, if one is active.
+	if (isMenuActive()) {
+		if (g_touchscreengui)
+			g_touchscreengui->setVisible(false);
 		return g_menumgr.preprocessEvent(event);
 	}
 
 	// Remember whether each key is down or up
 	if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
-		const KeyPress &keyCode = event.KeyInput;
+		const KeyPress keyCode(event.KeyInput);
 		if (keysListenedFor[keyCode]) {
 			if (event.KeyInput.PressedDown) {
 				if (!IsKeyDown(keyCode))
@@ -140,80 +178,107 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 			return true;
 		}
 
-#ifdef HAVE_TOUCHSCREENGUI
-	} else if (m_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {
+	} else if (g_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {
 		// In case of touchscreengui, we have to handle different events
-		m_touchscreengui->translateEvent(event);
+		g_touchscreengui->translateEvent(event);
 		return true;
-#endif
-
 	} else if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
 		// joystick may be nullptr if game is launched with '--random-input' parameter
 		return joystick && joystick->handleEvent(event.JoystickEvent);
 	} else if (event.EventType == irr::EET_MOUSE_INPUT_EVENT) {
 		// Handle mouse events
-		KeyPress key;
 		switch (event.MouseInput.Event) {
 		case EMIE_LMOUSE_PRESSED_DOWN:
-			key = "KEY_LBUTTON";
-			keyIsDown.set(key);
-			keyWasDown.set(key);
-			keyWasPressed.set(key);
+			keyIsDown.set(LMBKey);
+			keyWasDown.set(LMBKey);
+			keyWasPressed.set(LMBKey);
 			break;
 		case EMIE_MMOUSE_PRESSED_DOWN:
-			key = "KEY_MBUTTON";
-			keyIsDown.set(key);
-			keyWasDown.set(key);
-			keyWasPressed.set(key);
+			keyIsDown.set(MMBKey);
+			keyWasDown.set(MMBKey);
+			keyWasPressed.set(MMBKey);
 			break;
 		case EMIE_RMOUSE_PRESSED_DOWN:
-			key = "KEY_RBUTTON";
-			keyIsDown.set(key);
-			keyWasDown.set(key);
-			keyWasPressed.set(key);
+			keyIsDown.set(RMBKey);
+			keyWasDown.set(RMBKey);
+			keyWasPressed.set(RMBKey);
 			break;
 		case EMIE_LMOUSE_LEFT_UP:
-			key = "KEY_LBUTTON";
-			keyIsDown.unset(key);
-			keyWasReleased.set(key);
+			keyIsDown.unset(LMBKey);
+			keyWasReleased.set(LMBKey);
 			break;
 		case EMIE_MMOUSE_LEFT_UP:
-			key = "KEY_MBUTTON";
-			keyIsDown.unset(key);
-			keyWasReleased.set(key);
+			keyIsDown.unset(MMBKey);
+			keyWasReleased.set(MMBKey);
 			break;
 		case EMIE_RMOUSE_LEFT_UP:
-			key = "KEY_RBUTTON";
-			keyIsDown.unset(key);
-			keyWasReleased.set(key);
+			keyIsDown.unset(RMBKey);
+			keyWasReleased.set(RMBKey);
 			break;
 		case EMIE_MOUSE_WHEEL:
 			mouse_wheel += event.MouseInput.Wheel;
 			break;
-		default: break;
+		default:
+			break;
 		}
-	} else if (event.EventType == irr::EET_LOG_TEXT_EVENT) {
-		static const LogLevel irr_loglev_conv[] = {
-				LL_VERBOSE, // ELL_DEBUG
-				LL_INFO,    // ELL_INFORMATION
-				LL_WARNING, // ELL_WARNING
-				LL_ERROR,   // ELL_ERROR
-				LL_NONE,    // ELL_NONE
-		};
-		assert(event.LogEvent.Level < ARRLEN(irr_loglev_conv));
-		g_logger.log(irr_loglev_conv[event.LogEvent.Level],
-				std::string("Irrlicht: ") + event.LogEvent.Text);
-		return true;
 	}
 
-	} catch(std::exception &e) {
-		errorstream<<"input exception: " << e.what() << std::endl;
+	} catch(const std::exception &e) {
+		errorstream << "input exception: " << e.what() << "\n";
 	}
 
-	/* always return false in order to continue processing events */
+	// tell Irrlicht to continue processing this event
 	return false;
 }
 
+/*
+ * RealInputHandler
+ */
+float RealInputHandler::getMovementSpeed()
+{
+	bool f = m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]),
+		b = m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]),
+		l = m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]),
+		r = m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]);
+	if (f || b || l || r)
+	{
+		// if contradictory keys pressed, stay still
+		if (f && b && l && r)
+			return 0.0f;
+		else if (f && b && !l && !r)
+			return 0.0f;
+		else if (!f && !b && l && r)
+			return 0.0f;
+		return 1.0f; // If there is a keyboard event, assume maximum speed
+	}
+	if (g_touchscreengui && g_touchscreengui->getMovementSpeed())
+		return g_touchscreengui->getMovementSpeed();
+	return joystick.getMovementSpeed();
+}
+
+float RealInputHandler::getMovementDirection()
+{
+	float x = 0, z = 0;
+
+	/* Check keyboard for input */
+	if (m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]))
+		z += 1;
+	if (m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]))
+		z -= 1;
+	if (m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]))
+		x += 1;
+	if (m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]))
+		x -= 1;
+
+	if (x != 0 || z != 0) /* If there is a keyboard event, it takes priority */
+		return std::atan2(x, z);
+	// `getMovementDirection() == 0` means forward, so we cannot use
+	// `getMovementDirection()` as a condition.
+	else if (g_touchscreengui && g_touchscreengui->getMovementSpeed())
+		return g_touchscreengui->getMovementDirection();
+	return joystick.getMovementDirection();
+}
+
 /*
  * RandomInputHandler
  */
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
index 81bed61a8..400503a3d 100644
--- a/src/client/inputhandler.h
+++ b/src/client/inputhandler.h
@@ -25,10 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "keycode.h"
 #include "renderingengine.h"
 
-#ifdef HAVE_TOUCHSCREENGUI
-#include "gui/touchscreengui.h"
-#endif
-
 class InputHandler;
 
 /****************************************************************************
@@ -201,19 +197,8 @@ public:
 		keyWasReleased.clear();
 	}
 
-	MyEventReceiver()
-	{
-#ifdef HAVE_TOUCHSCREENGUI
-		m_touchscreengui = NULL;
-#endif
-	}
-
 	JoystickController *joystick = nullptr;
 
-#ifdef HAVE_TOUCHSCREENGUI
-	TouchScreenGUI *m_touchscreengui;
-#endif
-
 private:
 	s32 mouse_wheel = 0;
 
@@ -235,6 +220,9 @@ private:
 	// often changing keys, and keysListenedFor is expected
 	// to change seldomly but contain lots of keys.
 	KeyList keysListenedFor;
+
+	// Intentionally not reset by clearInput/releaseAllKeys.
+	bool fullscreen_is_down = false;
 };
 
 class InputHandler
@@ -315,57 +303,13 @@ public:
 		return m_receiver->WasKeyReleased(keycache.key[k]) || joystick.wasKeyReleased(k);
 	}
 
-	virtual float getMovementSpeed()
-	{
-		bool f = m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]),
-			b = m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]),
-			l = m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]),
-			r = m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]);
-		if (f || b || l || r)
-		{
-			// if contradictory keys pressed, stay still
-			if (f && b && l && r)
-				return 0.0f;
-			else if (f && b && !l && !r)
-				return 0.0f;
-			else if (!f && !b && l && r)
-				return 0.0f;
-			return 1.0f; // If there is a keyboard event, assume maximum speed
-		}
-#ifdef HAVE_TOUCHSCREENGUI
-		return m_receiver->m_touchscreengui->getMovementSpeed();
-#else
-		return joystick.getMovementSpeed();
-#endif
-	}
+	virtual float getMovementSpeed();
 
-	virtual float getMovementDirection()
-	{
-		float x = 0, z = 0;
-
-		/* Check keyboard for input */
-		if (m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]))
-			z += 1;
-		if (m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]))
-			z -= 1;
-		if (m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]))
-			x += 1;
-		if (m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]))
-			x -= 1;
-
-		if (x != 0 || z != 0) /* If there is a keyboard event, it takes priority */
-			return atan2(x, z);
-		else
-#ifdef HAVE_TOUCHSCREENGUI
-			return m_receiver->m_touchscreengui->getMovementDirection();
-#else
-			return joystick.getMovementDirection();
-#endif
-	}
+	virtual float getMovementDirection();
 
 	virtual bool cancelPressed()
 	{
-		return wasKeyDown(KeyType::ESC) || m_receiver->WasKeyDown(CancelKey);
+		return wasKeyDown(KeyType::ESC);
 	}
 
 	virtual void clearWasKeyPressed()
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
index 19626d24e..5acb0b751 100644
--- a/src/client/joystick_controller.cpp
+++ b/src/client/joystick_controller.cpp
@@ -318,12 +318,14 @@ float JoystickController::getAxisWithoutDead(JoystickAxis axis)
 
 float JoystickController::getMovementDirection()
 {
-	return atan2(getAxisWithoutDead(JA_SIDEWARD_MOVE), -getAxisWithoutDead(JA_FORWARD_MOVE));
+	return std::atan2(getAxisWithoutDead(JA_SIDEWARD_MOVE),
+			-getAxisWithoutDead(JA_FORWARD_MOVE));
 }
 
 float JoystickController::getMovementSpeed()
 {
-	float speed = sqrt(pow(getAxisWithoutDead(JA_FORWARD_MOVE), 2) + pow(getAxisWithoutDead(JA_SIDEWARD_MOVE), 2));
+	float speed = std::sqrt(std::pow(getAxisWithoutDead(JA_FORWARD_MOVE), 2) +
+			std::pow(getAxisWithoutDead(JA_SIDEWARD_MOVE), 2));
 	if (speed > 1.0f)
 		speed = 1.0f;
 	return speed;
diff --git a/src/client/keycode.cpp b/src/client/keycode.cpp
index ca0c81329..0e4af4f7e 100644
--- a/src/client/keycode.cpp
+++ b/src/client/keycode.cpp
@@ -21,7 +21,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "keycode.h"
-#include "exceptions.h"
 #include "settings.h"
 #include "log.h"
 #include "debug.h"
@@ -29,13 +28,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/string.h"
 #include "util/basic_macros.h"
 
-class UnknownKeycode : public BaseException
-{
-public:
-	UnknownKeycode(const char *s) :
-		BaseException(s) {};
-};
-
 struct table_key {
 	const char *Name;
 	irr::EKEY_CODE Key;
@@ -254,7 +246,7 @@ static const struct table_key table[] = {
 #undef N_
 
 
-struct table_key lookup_keyname(const char *name)
+static const table_key &lookup_keyname(const char *name)
 {
 	for (const auto &table_key : table) {
 		if (strcmp(table_key.Name, name) == 0)
@@ -264,7 +256,7 @@ struct table_key lookup_keyname(const char *name)
 	throw UnknownKeycode(name);
 }
 
-struct table_key lookup_keykey(irr::EKEY_CODE key)
+static const table_key &lookup_keykey(irr::EKEY_CODE key)
 {
 	for (const auto &table_key : table) {
 		if (table_key.Key == key)
@@ -276,7 +268,7 @@ struct table_key lookup_keykey(irr::EKEY_CODE key)
 	throw UnknownKeycode(os.str().c_str());
 }
 
-struct table_key lookup_keychar(wchar_t Char)
+static const table_key &lookup_keychar(wchar_t Char)
 {
 	for (const auto &table_key : table) {
 		if (table_key.Char == Char)
@@ -302,7 +294,7 @@ KeyPress::KeyPress(const char *name)
 		int chars_read = mbtowc(&Char, name, 1);
 		FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
 		try {
-			struct table_key k = lookup_keychar(Char);
+			auto &k = lookup_keychar(Char);
 			m_name = k.Name;
 			Key = k.Key;
 			return;
@@ -311,7 +303,7 @@ KeyPress::KeyPress(const char *name)
 		// Lookup by name
 		m_name = name;
 		try {
-			struct table_key k = lookup_keyname(name);
+			auto &k = lookup_keyname(name);
 			Key = k.Key;
 			Char = k.Char;
 			return;
@@ -368,25 +360,27 @@ const KeyPress LShiftKey("KEY_LSHIFT");
 const KeyPress RShiftKey("KEY_RSHIFT");
 
 const KeyPress EscapeKey("KEY_ESCAPE");
-const KeyPress CancelKey("KEY_CANCEL");
+
+const KeyPress LMBKey("KEY_LBUTTON");
+const KeyPress MMBKey("KEY_MBUTTON");
+const KeyPress RMBKey("KEY_RBUTTON");
 
 /*
 	Key config
 */
 
 // A simple cache for quicker lookup
-std::unordered_map<std::string, KeyPress> g_key_setting_cache;
+static std::unordered_map<std::string, KeyPress> g_key_setting_cache;
 
-KeyPress getKeySetting(const char *settingname)
+const KeyPress &getKeySetting(const char *settingname)
 {
-	std::unordered_map<std::string, KeyPress>::iterator n;
-	n = g_key_setting_cache.find(settingname);
+	auto n = g_key_setting_cache.find(settingname);
 	if (n != g_key_setting_cache.end())
 		return n->second;
 
-	KeyPress k(g_settings->get(settingname).c_str());
-	g_key_setting_cache[settingname] = k;
-	return k;
+	auto &ref = g_key_setting_cache[settingname];
+	ref = g_settings->get(settingname).c_str();
+	return ref;
 }
 
 void clearKeyCache()
diff --git a/src/client/keycode.h b/src/client/keycode.h
index 691d8bde0..f59f2a4f5 100644
--- a/src/client/keycode.h
+++ b/src/client/keycode.h
@@ -22,11 +22,19 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "exceptions.h"
 #include "irrlichttypes.h"
-#include "Keycodes.h"
+#include <Keycodes.h>
 #include <IEventReceiver.h>
 #include <string>
 
+class UnknownKeycode : public BaseException
+{
+public:
+	UnknownKeycode(const char *s) :
+		BaseException(s) {};
+};
+
 /* A key press, consisting of either an Irrlicht keycode
    or an actual char */
 
@@ -63,11 +71,17 @@ extern const KeyPress RControlKey;
 extern const KeyPress LShiftKey;
 extern const KeyPress RShiftKey;
 
+
+// Global defines for convenience
+
 extern const KeyPress EscapeKey;
-extern const KeyPress CancelKey;
+
+extern const KeyPress LMBKey;
+extern const KeyPress MMBKey; // Middle Mouse Button
+extern const KeyPress RMBKey;
 
 // Key configuration getter
-KeyPress getKeySetting(const char *settingname);
+const KeyPress &getKeySetting(const char *settingname);
 
 // Clear fast lookup cache
 void clearKeyCache();
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index 9cdbe63db..c8abdb0b4 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -34,6 +34,49 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "log_types.h"
 
+/*
+	PlayerSettings
+*/
+
+const static std::string PlayerSettings_names[] = {
+	"free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
+	"aux1_descends", "noclip", "autojump"
+};
+
+void PlayerSettings::readGlobalSettings()
+{
+	free_move = g_settings->getBool("free_move");
+	pitch_move = g_settings->getBool("pitch_move");
+	fast_move = g_settings->getBool("fast_move");
+	continuous_forward = g_settings->getBool("continuous_forward");
+	always_fly_fast = g_settings->getBool("always_fly_fast");
+	aux1_descends = g_settings->getBool("aux1_descends");
+	noclip = g_settings->getBool("noclip");
+	autojump = g_settings->getBool("autojump");
+}
+
+
+void PlayerSettings::registerSettingsCallback()
+{
+	for (auto &name : PlayerSettings_names) {
+		g_settings->registerChangedCallback(name,
+			&PlayerSettings::settingsChangedCallback, this);
+	}
+}
+
+void PlayerSettings::deregisterSettingsCallback()
+{
+	for (auto &name : PlayerSettings_names) {
+		g_settings->deregisterChangedCallback(name,
+			&PlayerSettings::settingsChangedCallback, this);
+	}
+}
+
+void PlayerSettings::settingsChangedCallback(const std::string &name, void *data)
+{
+	((PlayerSettings *)data)->readGlobalSettings();
+}
+
 /*
 	LocalPlayer
 */
@@ -42,6 +85,13 @@ LocalPlayer::LocalPlayer(Client *client, const char *name):
 	Player(name, client->idef()),
 	m_client(client)
 {
+	m_player_settings.readGlobalSettings();
+	m_player_settings.registerSettingsCallback();
+}
+
+LocalPlayer::~LocalPlayer()
+{
+	m_player_settings.deregisterSettingsCallback();
 }
 
 static aabb3f getNodeBoundingBox(const std::vector<aabb3f> &nodeboxes)
@@ -405,15 +455,18 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 				m_speed.Z = 0.0f;
 		}
 
-		if (y_diff > 0 && m_speed.Y <= 0.0f &&
-				(physics_override.sneak_glitch || y_diff < BS * 0.6f)) {
+		if (y_diff > 0 && m_speed.Y <= 0.0f) {
 			// Move player to the maximal height when falling or when
 			// the ledge is climbed on the next step.
 
-			// Smoothen the movement (based on 'position.Y = bmax.Y')
-			position.Y += y_diff * dtime * 22.0f + BS * 0.01f;
-			position.Y = std::min(position.Y, bmax.Y);
-			m_speed.Y = 0.0f;
+			v3f check_pos = position;
+			check_pos.Y += y_diff * dtime * 22.0f + BS * 0.01f;
+			if (y_diff < BS * 0.6f || (physics_override.sneak_glitch
+					&& !collision_check_intersection(env, m_client, m_collisionbox, check_pos))) {
+				// Smoothen the movement (based on 'position.Y = bmax.Y')
+				position.Y = std::min(check_pos.Y, bmax.Y);
+				m_speed.Y = 0.0f;
+			}
 		}
 
 		// Allow jumping on node edges while sneaking
@@ -554,6 +607,9 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 	// Whether superspeed mode is used or not
 	bool superspeed = false;
 
+	const f32 speed_walk = movement_speed_walk * physics_override.speed_walk;
+	const f32 speed_fast = movement_speed_fast * physics_override.speed_fast;
+
 	if (always_fly_fast && free_move && fast_move)
 		superspeed = true;
 
@@ -568,11 +624,11 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 			if (free_move) {
 				// In free movement mode, aux1 descends
 				if (fast_move)
-					speedV.Y = -movement_speed_fast;
+					speedV.Y = -speed_fast;
 				else
-					speedV.Y = -movement_speed_walk;
+					speedV.Y = -speed_walk;
 			} else if ((in_liquid || in_liquid_stable) && !m_disable_descend) {
-				speedV.Y = -movement_speed_walk;
+				speedV.Y = -speed_walk;
 				swimming_vertical = true;
 			} else if (is_climbing && !m_disable_descend) {
 				speedV.Y = -movement_speed_climb * physics_override.speed_climb;
@@ -600,25 +656,26 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 			if (free_move) {
 				// In free movement mode, sneak descends
 				if (fast_move && (control.aux1 || always_fly_fast))
-					speedV.Y = -movement_speed_fast;
+					speedV.Y = -speed_fast;
 				else
-					speedV.Y = -movement_speed_walk;
+					speedV.Y = -speed_walk;
 			} else if ((in_liquid || in_liquid_stable) && !m_disable_descend) {
 				if (fast_climb)
-					speedV.Y = -movement_speed_fast;
+					speedV.Y = -speed_fast;
 				else
-					speedV.Y = -movement_speed_walk;
+					speedV.Y = -speed_walk;
 				swimming_vertical = true;
 			} else if (is_climbing && !m_disable_descend) {
 				if (fast_climb)
-					speedV.Y = -movement_speed_fast;
+					speedV.Y = -speed_fast;
 				else
 					speedV.Y = -movement_speed_climb * physics_override.speed_climb;
 			}
 		}
 	}
 
-	speedH = v3f(sin(control.movement_direction), 0.0f, cos(control.movement_direction));
+	speedH = v3f(std::sin(control.movement_direction), 0.0f,
+			std::cos(control.movement_direction));
 
 	if (m_autojump) {
 		// release autojump after a given time
@@ -633,14 +690,14 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 				// Don't fly up if sneak key is pressed
 				if (player_settings.aux1_descends || always_fly_fast) {
 					if (fast_move)
-						speedV.Y = movement_speed_fast;
+						speedV.Y = speed_fast;
 					else
-						speedV.Y = movement_speed_walk;
+						speedV.Y = speed_walk;
 				} else {
 					if (fast_move && control.aux1)
-						speedV.Y = movement_speed_fast;
+						speedV.Y = speed_fast;
 					else
-						speedV.Y = movement_speed_walk;
+						speedV.Y = speed_walk;
 				}
 			}
 		} else if (m_can_jump) {
@@ -657,13 +714,13 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 			}
 		} else if (in_liquid && !m_disable_jump && !control.sneak) {
 			if (fast_climb)
-				speedV.Y = movement_speed_fast;
+				speedV.Y = speed_fast;
 			else
-				speedV.Y = movement_speed_walk;
+				speedV.Y = speed_walk;
 			swimming_vertical = true;
 		} else if (is_climbing && !m_disable_jump && !control.sneak) {
 			if (fast_climb)
-				speedV.Y = movement_speed_fast;
+				speedV.Y = speed_fast;
 			else
 				speedV.Y = movement_speed_climb * physics_override.speed_climb;
 		}
@@ -672,11 +729,11 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 	// The speed of the player (Y is ignored)
 	if (superspeed || (is_climbing && fast_climb) ||
 			((in_liquid || in_liquid_stable) && fast_climb))
-		speedH = speedH.normalize() * movement_speed_fast;
+		speedH = speedH.normalize() * speed_fast;
 	else if (control.sneak && !free_move && !in_liquid && !in_liquid_stable)
 		speedH = speedH.normalize() * movement_speed_crouch * physics_override.speed_crouch;
 	else
-		speedH = speedH.normalize() * movement_speed_walk;
+		speedH = speedH.normalize() * speed_walk;
 
 	speedH *= control.movement_speed; /* Apply analog input */
 
@@ -687,7 +744,7 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 			(!free_move && m_can_jump && control.jump)) {
 		// Jumping and falling
 		if (superspeed || (fast_move && control.aux1))
-			incH = movement_acceleration_fast * BS * dtime;
+			incH = movement_acceleration_fast * physics_override.acceleration_fast * BS * dtime;
 		else
 			incH = movement_acceleration_air * physics_override.acceleration_air * BS * dtime;
 		incV = 0.0f; // No vertical acceleration in air
@@ -718,7 +775,7 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 
 	} else if (superspeed || (is_climbing && fast_climb) ||
 			((in_liquid || in_liquid_stable) && fast_climb)) {
-		incH = incV = movement_acceleration_fast * BS * dtime;
+		incH = incV = movement_acceleration_fast * physics_override.acceleration_fast * BS * dtime;
 	} else {
 		incH = incV = movement_acceleration_default * physics_override.acceleration_default * BS * dtime;
 	}
diff --git a/src/client/localplayer.h b/src/client/localplayer.h
index e76206653..a3a13d3e0 100644
--- a/src/client/localplayer.h
+++ b/src/client/localplayer.h
@@ -28,7 +28,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "constants.h"
 #include "settings.h"
 #include "lighting.h"
-#include <list>
 
 class Client;
 class Environment;
@@ -45,14 +44,33 @@ enum class LocalPlayerAnimation
 	NO_ANIM,
 	WALK_ANIM,
 	DIG_ANIM,
-	WD_ANIM
-}; // no local animation, walking, digging, both
+	WD_ANIM // walking + digging
+};
+
+struct PlayerSettings
+{
+	bool free_move = false;
+	bool pitch_move = false;
+	bool fast_move = false;
+	bool continuous_forward = false;
+	bool always_fly_fast = false;
+	bool aux1_descends = false;
+	bool noclip = false;
+	bool autojump = false;
+
+	void readGlobalSettings();
+	void registerSettingsCallback();
+	void deregisterSettingsCallback();
+
+private:
+	static void settingsChangedCallback(const std::string &name, void *data);
+};
 
 class LocalPlayer : public Player
 {
 public:
 	LocalPlayer(Client *client, const char *name);
-	virtual ~LocalPlayer() = default;
+	virtual ~LocalPlayer();
 
 	// Initialize hp to 0, so that no hearts will be shown if server
 	// doesn't support health points
@@ -148,6 +166,11 @@ public:
 		m_position = position;
 		m_sneak_node_exists = false;
 	}
+	inline void addPosition(const v3f &added_pos)
+	{
+		m_position += added_pos;
+		m_sneak_node_exists = false;
+	}
 
 	v3f getPosition() const { auto lock = lock_shared(); return m_position; }
 
@@ -175,6 +198,8 @@ public:
 
 	inline Lighting& getLighting() { return m_lighting; }
 
+	inline PlayerSettings &getPlayerSettings() { return m_player_settings; }
+
 private:
 	void accelerate(const v3f &target_speed, const f32 max_increase_H,
 		const f32 max_increase_V, const bool use_pitch);
@@ -227,5 +252,7 @@ private:
 
 	GenericCAO *m_cao = nullptr;
 	Client *m_client;
+
+	PlayerSettings m_player_settings;
 	Lighting m_lighting;
 };
diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
index b54946771..286d5e76c 100644
--- a/src/client/mapblock_mesh.cpp
+++ b/src/client/mapblock_mesh.cpp
@@ -37,23 +37,25 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <array>
 #include <algorithm>
 #include <cmath>
-
+#include "client/texturesource.h"
 
 /*
 	MeshMakeData
 */
 
-MeshMakeData::MeshMakeData(Client *client, bool use_shaders,
-		int lod_step, int far_step,
+MeshMakeData::MeshMakeData(const NodeDefManager *ndef, u16 side_length, bool use_shaders
+		, int lod_step, int far_step,
 		NodeContainer *nodecontainer) :
-
-	m_mesh_grid(client->getMeshGrid()),
-	side_length((MAP_BLOCKSIZE * m_mesh_grid.cell_size) / (pow(2, lod_step))),
-	m_client(client),
+	//side_length((MAP_BLOCKSIZE * m_mesh_grid.cell_size) >> lod_step)
+	side_length(side_length >> lod_step)
+    ,
+	//side_length(side_length),
+	nodedef(ndef),
 	m_use_shaders(use_shaders)
 		,
 		m_vmanip{nodecontainer ? *nodecontainer : m_vmanip_store},
-		side_length_data(MAP_BLOCKSIZE * m_mesh_grid.cell_size),
+		//side_length_data(MAP_BLOCKSIZE * m_mesh_grid.cell_size),
+		side_length_data{side_length},
 		lod_step{lod_step},
 		far_step{far_step},
 		fscale(pow(2, far_step + lod_step))
@@ -161,7 +163,7 @@ u16 getFaceLight(MapNode n, MapNode n2, const NodeDefManager *ndef)
 static u16 getSmoothLightCombined(const v3s16 &p,
 	const std::array<v3s16,8> &dirs, MeshMakeData *data)
 {
-	const NodeDefManager *ndef = data->m_client->ndef();
+	const NodeDefManager *ndef = data->nodedef;
 
 	u16 ambient_occlusion = 0;
 	u16 light_count = 0;
@@ -352,38 +354,12 @@ void final_color_blend(video::SColor *result,
 	Mesh generation helpers
 */
 
-// This table is moved outside getNodeVertexDirs to avoid the compiler using
-// a mutex to initialize this table at runtime right in the hot path.
-// For details search the internet for "cxa_guard_acquire".
-static const v3s16 vertex_dirs_table[] = {
-	// ( 1, 0, 0)
-	v3s16( 1,-1, 1), v3s16( 1,-1,-1),
-	v3s16( 1, 1,-1), v3s16( 1, 1, 1),
-	// ( 0, 1, 0)
-	v3s16( 1, 1,-1), v3s16(-1, 1,-1),
-	v3s16(-1, 1, 1), v3s16( 1, 1, 1),
-	// ( 0, 0, 1)
-	v3s16(-1,-1, 1), v3s16( 1,-1, 1),
-	v3s16( 1, 1, 1), v3s16(-1, 1, 1),
-	// invalid
-	v3s16(), v3s16(), v3s16(), v3s16(),
-	// ( 0, 0,-1)
-	v3s16( 1,-1,-1), v3s16(-1,-1,-1),
-	v3s16(-1, 1,-1), v3s16( 1, 1,-1),
-	// ( 0,-1, 0)
-	v3s16( 1,-1, 1), v3s16(-1,-1, 1),
-	v3s16(-1,-1,-1), v3s16( 1,-1,-1),
-	// (-1, 0, 0)
-	v3s16(-1,-1,-1), v3s16(-1,-1, 1),
-	v3s16(-1, 1, 1), v3s16(-1, 1,-1)
-};
-
 /*
 	Gets nth node tile (0 <= n <= 5).
 */
 void getNodeTileN(MapNode mn, const v3s16 &p, u8 tileindex, MeshMakeData *data, TileSpec &tile)
 {
-	const NodeDefManager *ndef = data->m_client->ndef();
+	const NodeDefManager *ndef = data->nodedef;
 	const ContentFeatures &f = ndef->get(mn);
 	tile = f.tiles[tileindex];
 	bool has_crack = p == data->m_crack_pos_relative;
@@ -403,7 +379,7 @@ void getNodeTileN(MapNode mn, const v3s16 &p, u8 tileindex, MeshMakeData *data,
 */
 void getNodeTile(MapNode mn, const v3s16 &p, const v3s16 &dir, MeshMakeData *data, TileSpec &tile)
 {
-	const NodeDefManager *ndef = data->m_client->ndef();
+	const NodeDefManager *ndef = data->nodedef;
 
 	// Direction must be (1,0,0), (-1,0,0), (0,1,0), (0,-1,0),
 	// (0,0,1), (0,0,-1) or (0,0,0)
@@ -658,16 +634,15 @@ void PartialMeshBuffer::afterDraw() const
 	MapBlockMesh
 */
 
-MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
-	far_step{data->far_step},
-	lod_step{data->lod_step},
-    fscale{data->fscale},
-    timestamp{data->timestamp},
+MapBlockMesh::MapBlockMesh(Client *client, MeshMakeData *data, v3s16 camera_offset) :
 
-	//no_draw(data->no_draw),
-	m_tsrc(data->m_client->getTextureSource()),
-	m_shdrsrc(data->m_client->getShaderSource()),
-	m_bounding_sphere_center((fscale * data->side_length_data * 0.5f - 0.5f) * BS), // TODO: why _data? 
+		far_step{data->far_step},
+		lod_step{data->lod_step},
+		fscale{data->fscale},
+		timestamp{data->timestamp},
+
+		m_tsrc(client->getTextureSource()), m_shdrsrc(client->getShaderSource()),
+		m_bounding_sphere_center((fscale * data->side_length * 0.5f - 0.5f) * BS),
 	m_animation_force_timer(0), // force initial animation
 	m_last_crack(-1),
 	m_last_daynight_ratio((u32) -1)
@@ -675,29 +650,29 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 	for (auto &m : m_mesh)
 		m = new scene::SMesh();
 	m_enable_shaders = data->m_use_shaders;
-	m_enable_vbo = g_settings->getBool("enable_vbo");
 
+	auto mesh_grid = client->getMeshGrid();
 	v3s16 bp = data->m_blockpos;
 	// Only generate minimap mapblocks at even coordinates.
 	if (fscale<=1) // || !data->block->getMesh())
-	if (data->m_mesh_grid.isMeshPos(bp) && data->m_client->getMinimap()) {
-		m_minimap_mapblocks.resize(data->m_mesh_grid.getCellVolume(), nullptr);
+	if (mesh_grid.isMeshPos(bp) && client->getMinimap()) {
+		m_minimap_mapblocks.resize(mesh_grid.getCellVolume(), nullptr);
 		v3s16 ofs;
 
 		// See also client.cpp for the code that reads the array of minimap blocks.
-		for (ofs.Z = 0; ofs.Z < data->m_mesh_grid.cell_size; ofs.Z++)
-		for (ofs.Y = 0; ofs.Y < data->m_mesh_grid.cell_size; ofs.Y++)
-		for (ofs.X = 0; ofs.X < data->m_mesh_grid.cell_size; ofs.X++) {
+		for (ofs.Z = 0; ofs.Z < mesh_grid.cell_size; ofs.Z++)
+		for (ofs.Y = 0; ofs.Y < mesh_grid.cell_size; ofs.Y++)
+		for (ofs.X = 0; ofs.X < mesh_grid.cell_size; ofs.X++) {
 			v3s16 p = (bp + ofs) * MAP_BLOCKSIZE;
 			if (data->m_vmanip.getNodeNoEx(p).getContent() != CONTENT_IGNORE) {
 				MinimapMapblock *block = new MinimapMapblock;
-				m_minimap_mapblocks[data->m_mesh_grid.getOffsetIndex(ofs)] = block;
+				m_minimap_mapblocks[mesh_grid.getOffsetIndex(ofs)] = block;
 				block->getMinimapNodes(&data->m_vmanip, p);
 			}
 		}
 	}
 
-	v3f offset = intToFloat((data->m_blockpos - data->m_mesh_grid.getMeshPos(data->m_blockpos)) * MAP_BLOCKSIZE, BS);
+	v3f offset = intToFloat((data->m_blockpos - mesh_grid.getMeshPos(data->m_blockpos)) * MAP_BLOCKSIZE, BS);
 	MeshCollector collector(m_bounding_sphere_center, offset);
 	/*
 		Add special graphics:
@@ -709,7 +684,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 
 	{
 		MapblockMeshGenerator(data, &collector,
-			data->m_client->getSceneManager()->getMeshManipulator()).generate();
+			client->getSceneManager()->getMeshManipulator()).generate();
 	}
 
 	/*
@@ -722,6 +697,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 	m_bounding_radius = std::sqrt(collector.m_bounding_radius_sq);
 
 	for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) {
+		scene::SMesh *mesh = (scene::SMesh *)m_mesh[layer];
+
 		for(u32 i = 0; i < collector.prebuffers[layer].size(); i++)
 		{
 			PreMeshBuffer &p = collector.prebuffers[layer][i];
@@ -815,8 +792,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 				p.layer.applyMaterialOptions(material);
 			}
 
-			scene::SMesh *mesh = (scene::SMesh *)m_mesh[layer];
-
 			scene::SMeshBuffer *buf = new scene::SMeshBuffer();
 			buf->Material = material;
 			if (p.layer.isTransparent() && data->far_step <= 0) {
@@ -841,10 +816,9 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 
 		}
 
-		if (m_mesh[layer]) {
+		if (mesh) {
 			// Use VBO for mesh (this just would set this for ever buffer)
-			if (m_enable_vbo)
-				m_mesh[layer]->setHardwareMappingHint(scene::EHM_STATIC);
+			mesh->setHardwareMappingHint(scene::EHM_STATIC);
 		}
 	}
 
@@ -861,13 +835,18 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 
 MapBlockMesh::~MapBlockMesh()
 {
+	size_t sz = 0;
 	for (scene::IMesh *m : m_mesh) {
+		for (u32 i = 0; i < m->getMeshBufferCount(); i++)
+			sz += m->getMeshBuffer(i)->getSize();
 		if (m)
 		m->drop();
 		m = nullptr;
 	}
 	for (MinimapMapblock *block : m_minimap_mapblocks)
 		delete block;
+
+	porting::TrackFreedMemory(sz);
 }
 
 bool MapBlockMesh::animate(bool faraway, float time, int crack,
@@ -940,15 +919,13 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack,
 
 	// Day-night transition
 	if (!m_enable_shaders && (daynight_ratio != m_last_daynight_ratio)) {
-		// Force reload mesh to VBO
-		if (m_enable_vbo)
-			for (scene::IMesh *m : m_mesh)
-				m->setDirty();
 		video::SColorf day_color;
 		get_sunlight_color(&day_color, daynight_ratio);
 
 		for (auto &daynight_diff : m_daynight_diffs) {
-			scene::IMeshBuffer *buf = m_mesh[daynight_diff.first.first]->
+			auto *mesh = m_mesh[daynight_diff.first.first];
+			mesh->setDirty(scene::EBT_VERTEX); // force reload to VBO
+			scene::IMeshBuffer *buf = mesh->
 				getMeshBuffer(daynight_diff.first.second);
 			buf->setDirty(irr::scene::EBT_VERTEX);
 			video::S3DVertex *vertices = (video::S3DVertex *)buf->getVertices();
@@ -1055,9 +1032,8 @@ video::SColor encode_light(u16 light, u8 emissive_light)
 u8 get_solid_sides(MeshMakeData *data)
 {
 	std::unordered_map<v3s16, u8> results;
-	v3s16 ofs;
 	v3s16 blockpos_nodes = data->m_blockpos * MAP_BLOCKSIZE;
-	const NodeDefManager *ndef = data->m_client->ndef();
+	const NodeDefManager *ndef = data->nodedef;
 
 	u8 result = 0x3F; // all sides solid;
 
diff --git a/src/client/mapblock_mesh.h b/src/client/mapblock_mesh.h
index c54f61eb2..ee2c68673 100644
--- a/src/client/mapblock_mesh.h
+++ b/src/client/mapblock_mesh.h
@@ -22,7 +22,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "irrlichttypes_extrabloated.h"
+#include "../irrlichttypes_extrabloated.h"
+#include "util/numeric.h"
 #include "client/tile.h"
 #include "voxel.h"
 #include <array>
@@ -30,7 +31,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <unordered_map>
 
 class Client;
+class NodeDefManager;
 class IShaderSource;
+class ITextureSource;
 
 /*
 	Mesh making stuff
@@ -46,28 +49,28 @@ struct MeshMakeData
 	v3s16 m_blockpos = v3s16(-1337,-1337,-1337);
 	v3s16 m_crack_pos_relative = v3s16(-1337,-1337,-1337);
 	bool m_smooth_lighting = false;
-	MeshGrid m_mesh_grid;
 	u16 side_length;
 
-	Client *m_client;
+	const NodeDefManager *nodedef;
 	bool m_use_shaders;
 
-    // fm:
-	NodeContainer & m_vmanip;
-	u16 side_length_data;
-	int lod_step;
-	int far_step;
+	// fm:
+	NodeContainer &m_vmanip;
+	const u16 side_length_data;
+	const int lod_step;
+	const int far_step;
 	const int fscale;
 
-	int range = 1;
-	bool no_draw = false;
-	unsigned int timestamp = 0;
-	bool debug = false;
+	int range{};
+	bool no_draw{};
+	unsigned int timestamp{};
+	bool debug{};
+	// ==
 
-	explicit MeshMakeData(Client *client, bool use_shaders
+	explicit MeshMakeData(const NodeDefManager *ndef, u16 side_length, bool use_shaders
 			, int lod_step = 0
 			, int far_step = 0
-			, NodeContainer * nodecontainer = nullptr
+			, NodeContainer * nodecontainer = {}
 			 );
 
 	/*
@@ -198,7 +201,7 @@ class MapBlockMesh
 {
 public:
 	// Builds the mesh given
-	MapBlockMesh(MeshMakeData *data, v3s16 camera_offset);
+	MapBlockMesh(Client *client, MeshMakeData *data, v3s16 camera_offset);
 	~MapBlockMesh();
 
 	// Main animation function, parameters:
@@ -287,7 +290,6 @@ private:
 	v3f m_bounding_sphere_center;
 
 	bool m_enable_shaders;
-	bool m_enable_vbo;
 
 	// Must animate() be called before rendering?
 	bool m_has_animation;
diff --git a/src/client/mesh_generator_thread.cpp b/src/client/mesh_generator_thread.cpp
index c1f408b14..a0846e279 100644
--- a/src/client/mesh_generator_thread.cpp
+++ b/src/client/mesh_generator_thread.cpp
@@ -27,18 +27,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock.h"
 #include "map.h"
 #include "util/directiontables.h"
+#include "porting.h"
 
-static class BlockPlaceholder {
-public:
-	MapNode data[MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE];
+// Data placeholder used for copying from non-existent blocks
+static struct BlockPlaceholder {
+	MapNode data[MapBlock::nodecount];
 
 	BlockPlaceholder()
 	{
-		for (std::size_t i = 0; i < MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE; i++)
+		for (std::size_t i = 0; i < MapBlock::nodecount; i++)
 			data[i] = MapNode(CONTENT_IGNORE);
 	}
 
 } block_placeholder;
+
 /*
 	QueuedMeshUpdate
 */
@@ -57,7 +59,6 @@ MeshUpdateQueue::MeshUpdateQueue(Client *client):
 {
 	m_cache_enable_shaders = g_settings->getBool("enable_shaders");
 	m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
-	m_meshgen_block_cache_size = g_settings->getS32("meshgen_block_cache_size");
 }
 
 MeshUpdateQueue::~MeshUpdateQueue()
@@ -193,18 +194,18 @@ void MeshUpdateQueue::done(v3s16 pos)
 
 void MeshUpdateQueue::fillDataFromMapBlocks(QueuedMeshUpdate *q)
 {
-
+	auto mesh_grid = m_client->getMeshGrid();
     const auto lod_step = getLodStep(m_client->m_env.getClientMap().getControl(), getNodeBlockPos(floatToInt(m_client->m_env.getLocalPlayer()->getPosition(), BS)), q->p);
-    MeshMakeData * data = new MeshMakeData(m_client, m_cache_enable_shaders, lod_step, 0);
+	MeshMakeData *data = new MeshMakeData(m_client->ndef(), MAP_BLOCKSIZE * mesh_grid.cell_size, m_cache_enable_shaders, lod_step, 0);
 	q->data = data;
 
 	data->fillBlockDataBegin(q->p);
 
 	v3s16 pos;
 	int i = 0;
-	for (pos.X = q->p.X - 1; pos.X <= q->p.X + data->m_mesh_grid.cell_size; pos.X++)
-	for (pos.Z = q->p.Z - 1; pos.Z <= q->p.Z + data->m_mesh_grid.cell_size; pos.Z++)
-	for (pos.Y = q->p.Y - 1; pos.Y <= q->p.Y + data->m_mesh_grid.cell_size; pos.Y++) {
+	for (pos.X = q->p.X - 1; pos.X <= q->p.X + mesh_grid.cell_size; pos.X++)
+	for (pos.Z = q->p.Z - 1; pos.Z <= q->p.Z + mesh_grid.cell_size; pos.Z++)
+	for (pos.Y = q->p.Y - 1; pos.Y <= q->p.Y + mesh_grid.cell_size; pos.Y++) {
 		MapBlock *block = q->map_blocks[i++];
 		if (block) {
 			auto lock = block->lock_shared_rec();
@@ -229,8 +230,8 @@ void MeshUpdateQueue::fillDataFromMapBlocks(QueuedMeshUpdate *q)
 	MeshUpdateWorkerThread
 */
 
-MeshUpdateWorkerThread::MeshUpdateWorkerThread(MeshUpdateQueue *queue_in, MeshUpdateManager *manager, v3s16 *camera_offset) :
-		UpdateThread("Mesh"), m_queue_in(queue_in), m_manager(manager), m_camera_offset(camera_offset)
+MeshUpdateWorkerThread::MeshUpdateWorkerThread(Client *client, MeshUpdateQueue *queue_in, MeshUpdateManager *manager, v3s16 *camera_offset) :
+		UpdateThread("Mesh"), m_client(client), m_queue_in(queue_in), m_manager(manager), m_camera_offset(camera_offset)
 {
 	m_generation_interval = g_settings->getU16("mesh_generation_interval");
 	m_generation_interval = rangelim(m_generation_interval, 0, 50);
@@ -242,11 +243,12 @@ void MeshUpdateWorkerThread::doUpdate()
 	while ((q = m_queue_in->pop())) {
 		if (m_generation_interval)
 			sleep_ms(m_generation_interval);
+
+		porting::TriggerMemoryTrim();
+
 		ScopeProfiler sp(g_profiler, "Client: Mesh making (sum)");
 
-		MapBlock::mesh_type mesh_new = std::make_shared<MapBlockMesh>(q->data, *m_camera_offset);
-
-
+		const auto mesh_new = std::make_shared<MapBlockMesh>(m_client, q->data, *m_camera_offset);
 
 		MeshUpdateResult r;
 		r.p = q->p;
@@ -281,9 +283,9 @@ MeshUpdateManager::MeshUpdateManager(Client *client):
 	infostream << "MeshUpdateManager: using " << number_of_threads << " threads" << std::endl;
 
 	for (int i = 0; i < number_of_threads; i++)
-		m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(&m_queue_in, this, &m_camera_offset));
+		m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(client, &m_queue_in, this, &m_camera_offset));
 
-	m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(&m_queue_in_urgent, this, &m_camera_offset));
+	m_workers.push_back(std::make_unique<MeshUpdateWorkerThread>(client, &m_queue_in_urgent, this, &m_camera_offset));
 }
 
 void MeshUpdateManager::updateBlock(Map *map, v3s16 p, bool ack_block_to_server,
diff --git a/src/client/mesh_generator_thread.h b/src/client/mesh_generator_thread.h
index f9b3d0b5a..2ac77ee88 100644
--- a/src/client/mesh_generator_thread.h
+++ b/src/client/mesh_generator_thread.h
@@ -89,7 +89,6 @@ private:
 	// TODO: Add callback to update these when g_settings changes
 	bool m_cache_enable_shaders;
 	bool m_cache_smooth_lighting;
-	int m_meshgen_block_cache_size;
 
 	void fillDataFromMapBlocks(QueuedMeshUpdate *q);
 	void cleanupCache();
@@ -113,12 +112,13 @@ class MeshUpdateManager;
 class MeshUpdateWorkerThread : public UpdateThread
 {
 public:
-	MeshUpdateWorkerThread(MeshUpdateQueue *queue_in, MeshUpdateManager *manager, v3s16 *camera_offset);
+	MeshUpdateWorkerThread(Client *client, MeshUpdateQueue *queue_in, MeshUpdateManager *manager, v3s16 *camera_offset);
 
 protected:
 	virtual void doUpdate();
 
 private:
+	Client *m_client;
 	MeshUpdateQueue *m_queue_in;
 	MeshUpdateManager *m_manager;
 	v3s16 *m_camera_offset;
diff --git a/src/client/meshgen/collector.h b/src/client/meshgen/collector.h
index 9b49ce72e..093c20eb8 100644
--- a/src/client/meshgen/collector.h
+++ b/src/client/meshgen/collector.h
@@ -47,7 +47,6 @@ struct MeshCollector
 	// offset: offset added to vertices
 	MeshCollector(const v3f center_pos, v3f offset = v3f()) : m_center_pos(center_pos), offset(offset) {}
 
-	// clang-format off
 	void append(const TileSpec &material,
 			const video::S3DVertex *vertices, u32 numVertices,
 			const u16 *indices, u32 numIndices);
@@ -55,10 +54,8 @@ struct MeshCollector
 			const video::S3DVertex *vertices, u32 numVertices,
 			const u16 *indices, u32 numIndices,
 			v3f pos, video::SColor c, u8 light_source);
-	// clang-format on
 
 private:
-	// clang-format off
 	void append(const TileLayer &material,
 			const video::S3DVertex *vertices, u32 numVertices,
 			const u16 *indices, u32 numIndices,
@@ -68,7 +65,6 @@ private:
 			const u16 *indices, u32 numIndices,
 			v3f pos, video::SColor c, u8 light_source,
 			u8 layernum, bool use_scale = false);
-	// clang-format on
 
 	PreMeshBuffer &findBuffer(const TileLayer &layer, u8 layernum, u32 numVertices);
 };
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index ef4af101e..16c4f28c5 100644
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -224,25 +224,6 @@ Minimap::Minimap(Client *client)
 
 	data->minimap_shape_round = g_settings->getBool("minimap_shape_round");
 
-	// Get round minimap textures
-	data->minimap_mask_round = driver->createImage(
-		m_tsrc->getTexture("minimap_mask_round.png"),
-		core::position2d<s32>(0, 0),
-		core::dimension2d<u32>(MINIMAP_MAX_SX, MINIMAP_MAX_SY));
-	data->minimap_overlay_round = m_tsrc->getTexture("minimap_overlay_round.png");
-
-	// Get square minimap textures
-	data->minimap_mask_square = driver->createImage(
-		m_tsrc->getTexture("minimap_mask_square.png"),
-		core::position2d<s32>(0, 0),
-		core::dimension2d<u32>(MINIMAP_MAX_SX, MINIMAP_MAX_SY));
-	data->minimap_overlay_square = m_tsrc->getTexture("minimap_overlay_square.png");
-
-	// Create player marker texture
-	data->player_marker = m_tsrc->getTexture("player_marker.png");
-	// Create object marker texture
-	data->object_marker_red = m_tsrc->getTexture("object_marker_red.png");
-
 	setModeIndex(0);
 
 	// Create mesh buffer for minimap
@@ -261,11 +242,10 @@ Minimap::~Minimap()
 
 	m_meshbuffer->drop();
 
-	if (data) {
 	if (data->minimap_mask_round)
-	data->minimap_mask_round->drop();
+		data->minimap_mask_round->drop();
 	if (data->minimap_mask_square)
-	data->minimap_mask_square->drop();
+		data->minimap_mask_square->drop();
 
 	if (data->texture)
 	driver->removeTexture(data->texture);
@@ -277,7 +257,7 @@ Minimap::~Minimap()
 	m_markers.clear();
 
 	delete data;
-	}
+
 	delete m_minimap_update_thread;
 }
 
@@ -488,6 +468,29 @@ void Minimap::blitMinimapPixelsToImageSurface(
 	}
 }
 
+video::IImage *Minimap::getMinimapMask()
+{
+	if (data->minimap_shape_round) {
+		if (!data->minimap_mask_round) {
+			// Get round minimap textures
+			data->minimap_mask_round = driver->createImage(
+				m_tsrc->getTexture("minimap_mask_round.png"),
+				core::position2d<s32>(0, 0),
+				core::dimension2d<u32>(MINIMAP_MAX_SX, MINIMAP_MAX_SY));
+		}
+		return data->minimap_mask_round;
+	}
+
+	if (!data->minimap_mask_square) {
+		// Get square minimap textures
+		data->minimap_mask_square = driver->createImage(
+			m_tsrc->getTexture("minimap_mask_square.png"),
+			core::position2d<s32>(0, 0),
+			core::dimension2d<u32>(MINIMAP_MAX_SX, MINIMAP_MAX_SY));
+	}
+	return data->minimap_mask_square;
+}
+
 video::ITexture *Minimap::getMinimapTexture()
 {
 	// update minimap textures when new scan is ready
@@ -536,16 +539,13 @@ video::ITexture *Minimap::getMinimapTexture()
 	map_image->copyToScaling(minimap_image);
 	map_image->drop();
 
-	video::IImage *minimap_mask = data->minimap_shape_round ?
-		data->minimap_mask_round : data->minimap_mask_square;
+	video::IImage *minimap_mask = getMinimapMask();
 
-	if (minimap_mask) {
-		for (s16 y = 0; y < MINIMAP_MAX_SY; y++)
-		for (s16 x = 0; x < MINIMAP_MAX_SX; x++) {
-			const video::SColor &mask_col = minimap_mask->getPixel(x, y);
-			if (!mask_col.getAlpha())
-				minimap_image->setPixel(x, y, video::SColor(0,0,0,0));
-		}
+	for (s16 y = 0; y < MINIMAP_MAX_SY; y++)
+	for (s16 x = 0; x < MINIMAP_MAX_SX; x++) {
+		const video::SColor &mask_col = minimap_mask->getPixel(x, y);
+		if (!mask_col.getAlpha())
+			minimap_image->setPixel(x, y, video::SColor(0,0,0,0));
 	}
 
 	if (data->texture)
@@ -595,28 +595,26 @@ scene::SMeshBuffer *Minimap::getMinimapMeshBuffer()
 	buf->Indices[4] = 3;
 	buf->Indices[5] = 0;
 
+	buf->setHardwareMappingHint(scene::EHM_STATIC);
 	return buf;
 }
 
-void Minimap::drawMinimap()
+void Minimap::drawMinimap(core::rect<s32> rect)
 {
-	// Non hud managed minimap drawing (legacy minimap)
-	v2u32 screensize = RenderingEngine::getWindowSize();
-	const u32 size = 0.25 * screensize.Y;
-
-	drawMinimap(core::rect<s32>(
-		screensize.X - size - 10, 10,
-		screensize.X - 10, size + 10));
-}
-
-void Minimap::drawMinimap(core::rect<s32> rect) {
+	if (data->mode.type == MINIMAP_TYPE_OFF)
+		return;
 
+	// Get textures
 	video::ITexture *minimap_texture = getMinimapTexture();
 	if (!minimap_texture)
 		return;
-
-	if (data->mode.type == MINIMAP_TYPE_OFF)
-		return;
+	if (!data->textures_initialised) {
+		data->minimap_overlay_round = m_tsrc->getTexture("minimap_overlay_round.png");
+		data->minimap_overlay_square = m_tsrc->getTexture("minimap_overlay_square.png");
+		data->player_marker = m_tsrc->getTexture("player_marker.png");
+		data->object_marker_red = m_tsrc->getTexture("object_marker_red.png");
+		data->textures_initialised = true;
+	}
 
 	updateActiveMarkers();
 
@@ -641,7 +639,7 @@ void Minimap::drawMinimap(core::rect<s32> rect) {
 	material.TextureLayers[1].Texture = data->heightmap_texture;
 
 	if (m_enable_shaders && data->mode.type == MINIMAP_TYPE_SURFACE) {
-		u16 sid = m_shdrsrc->getShader("minimap_shader", TILE_MATERIAL_ALPHA);
+		auto sid = m_shdrsrc->getShader("minimap_shader", TILE_MATERIAL_ALPHA);
 		material.MaterialType = m_shdrsrc->getShaderInfo(sid).material;
 	} else {
 		material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -727,8 +725,7 @@ void Minimap::removeMarker(MinimapMarker **m)
 
 void Minimap::updateActiveMarkers()
 {
-	video::IImage *minimap_mask = data->minimap_shape_round ?
-		data->minimap_mask_round : data->minimap_mask_square;
+	video::IImage *minimap_mask = getMinimapMask();
 
 	m_active_markers.clear();
 	v3f cam_offset = intToFloat(client->getCamera()->getOffset(), BS);
diff --git a/src/client/minimap.h b/src/client/minimap.h
index c8cd70b8d..ff96827cb 100644
--- a/src/client/minimap.h
+++ b/src/client/minimap.h
@@ -82,6 +82,7 @@ struct MinimapData {
 	video::IImage *minimap_mask_square = nullptr;
 	video::ITexture *texture = nullptr;
 	video::ITexture *heightmap_texture = nullptr;
+	bool textures_initialised = false; // True if the following textures are not nullptrs.
 	video::ITexture *minimap_overlay_round = nullptr;
 	video::ITexture *minimap_overlay_square = nullptr;
 	video::ITexture *player_marker = nullptr;
@@ -147,6 +148,7 @@ public:
 
 	MinimapModeDef getModeDef() const { return data->mode; }
 
+	video::IImage *getMinimapMask();
 	video::ITexture *getMinimapTexture();
 
 	void blitMinimapPixelsToImageRadar(video::IImage *map_image);
@@ -159,7 +161,6 @@ public:
 	void removeMarker(MinimapMarker **marker);
 
 	void updateActiveMarkers();
-	void drawMinimap();
 	void drawMinimap(core::rect<s32> rect);
 
 	video::IVideoDriver *driver;
diff --git a/src/mtevent.h b/src/client/mtevent.h
similarity index 100%
rename from src/mtevent.h
rename to src/client/mtevent.h
diff --git a/src/client/particles.cpp b/src/client/particles.cpp
index 66ebc8c94..c34a99a1d 100644
--- a/src/client/particles.cpp
+++ b/src/client/particles.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "particles.h"
 #include <cmath>
+#include <array>
 #include "client.h"
 #include "collision.h"
 #include "client/content_cao.h"
@@ -26,21 +27,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/renderingengine.h"
 #include "util/numeric.h"
 #include "light.h"
+#include "localplayer.h"
 #include "environment.h"
 #include "clientmap.h"
 #include "mapnode.h"
 #include "nodedef.h"
 #include "client.h"
 #include "settings.h"
+#include "profiler.h"
+
+ClientParticleTexture::ClientParticleTexture(const ServerParticleTexture& p, ITextureSource *tsrc)
+{
+	tex = p;
+	// note: getTextureForMesh not needed here because we don't use texture filtering
+	ref = tsrc->getTexture(p.string);
+}
 
 /*
 	Particle
 */
 
 Particle::Particle(
-		IGameDef *gamedef,
-		LocalPlayer *player,
-		ClientEnvironment *env,
 		const ParticleParameters &p,
 		const ClientParticleTexRef &texture,
 		v2f texpos,
@@ -49,14 +56,10 @@ Particle::Particle(
 		ParticleSpawner *parent,
 		std::unique_ptr<ClientParticleTexture> owned_texture
 	) :
-		scene::ISceneNode(((Client *)gamedef)->getSceneManager()->getRootSceneNode(),
-				((Client *)gamedef)->getSceneManager()),
-
 		m_expiration(p.expirationtime),
 
-		m_env(env),
-		m_gamedef(gamedef),
-		m_collisionbox(aabb3f(v3f(-p.size / 2.0f), v3f(p.size / 2.0f))),
+		m_base_color(color),
+
 		m_texture(texture),
 		m_texpos(texpos),
 		m_texsize(texsize),
@@ -64,102 +67,30 @@ Particle::Particle(
 		m_velocity(p.vel),
 		m_acceleration(p.acc),
 		m_p(p),
-		m_player(player),
-
-		m_base_color(color),
-		m_color(color),
 
 		m_parent(parent),
 		m_owned_texture(std::move(owned_texture))
 {
-	// Set material
-	{
-		// translate blend modes to GL blend functions
-		video::E_BLEND_FACTOR bfsrc, bfdst;
-		video::E_BLEND_OPERATION blendop;
-		const auto blendmode = texture.tex != nullptr
-				? texture.tex->blendmode
-				: ParticleParamTypes::BlendMode::alpha;
+}
 
-		switch (blendmode) {
-			case ParticleParamTypes::BlendMode::add:
-				bfsrc = video::EBF_SRC_ALPHA;
-				bfdst = video::EBF_DST_ALPHA;
-				blendop = video::EBO_ADD;
-			break;
+Particle::~Particle()
+{
+	if (m_buffer)
+		m_buffer->release(m_index);
+}
 
-			case ParticleParamTypes::BlendMode::sub:
-				bfsrc = video::EBF_SRC_ALPHA;
-				bfdst = video::EBF_DST_ALPHA;
-				blendop = video::EBO_REVSUBTRACT;
-			break;
-
-			case ParticleParamTypes::BlendMode::screen:
-				bfsrc = video::EBF_ONE;
-				bfdst = video::EBF_ONE_MINUS_SRC_COLOR;
-				blendop = video::EBO_ADD;
-			break;
-
-			default: // includes ParticleParamTypes::BlendMode::alpha
-				bfsrc = video::EBF_SRC_ALPHA;
-				bfdst = video::EBF_ONE_MINUS_SRC_ALPHA;
-				blendop = video::EBO_ADD;
-			break;
-		}
-
-		// Texture
-		m_material.Lighting = false;
-		m_material.BackfaceCulling = false;
-		m_material.FogEnable = true;
-		m_material.forEachTexture([] (auto &tex) {
-			tex.MinFilter = video::ETMINF_NEAREST_MIPMAP_NEAREST;
-			tex.MagFilter = video::ETMAGF_NEAREST;
-		});
-
-		// correctly render layered transparent particles -- see #10398
-		m_material.ZWriteEnable = video::EZW_AUTO;
-
-		// enable alpha blending and set blend mode
-		m_material.MaterialType = video::EMT_ONETEXTURE_BLEND;
-		m_material.MaterialTypeParam = video::pack_textureBlendFunc(
-				bfsrc, bfdst,
-				video::EMFN_MODULATE_1X,
-				video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
-		m_material.BlendOperation = blendop;
-		m_material.setTexture(0, m_texture.ref);
+bool Particle::attachToBuffer(ParticleBuffer *buffer)
+{
+	auto index_opt = buffer->allocate();
+	if (index_opt.has_value()) {
+		m_index = index_opt.value();
+		m_buffer = buffer;
+		return true;
 	}
-
-	// Irrlicht stuff
-	this->setAutomaticCulling(scene::EAC_OFF);
-
-	// Init lighting
-	updateLight();
-
-	// Init model
-	updateVertices();
+	return false;
 }
 
-void Particle::OnRegisterSceneNode()
-{
-	if (IsVisible)
-		SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT_EFFECT);
-
-	ISceneNode::OnRegisterSceneNode();
-}
-
-void Particle::render()
-{
-	video::IVideoDriver *driver = SceneManager->getVideoDriver();
-	driver->setMaterial(m_material);
-	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-
-	u16 indices[] = {0,1,2, 2,3,0};
-	driver->drawVertexPrimitiveList(m_vertices, 4,
-			indices, 2, video::EVT_STANDARD,
-			scene::EPT_TRIANGLES, video::EIT_16BIT);
-}
-
-void Particle::step(float dtime)
+void Particle::step(float dtime, ClientEnvironment *env)
 {
 	m_time += dtime;
 
@@ -169,10 +100,10 @@ void Particle::step(float dtime)
 	m_velocity = av*vecSign(m_velocity) + v3f(m_p.jitter.pickWithin())*dtime;
 
 	if (m_p.collisiondetection) {
-		aabb3f box = m_collisionbox;
+		aabb3f box(v3f(-m_p.size / 2.0f), v3f(m_p.size / 2.0f));
 		v3f p_pos = m_pos * BS;
 		v3f p_velocity = m_velocity * BS;
-		collisionMoveResult r = collisionMoveSimple(m_env, m_gamedef, BS * 0.5f,
+		collisionMoveResult r = collisionMoveSimple(env, env->getGameDef(), BS * 0.5f,
 			box, 0.0f, dtime, &p_pos, &p_velocity, m_acceleration * BS, nullptr,
 			m_p.object_collision);
 
@@ -213,10 +144,10 @@ void Particle::step(float dtime)
 
 	if (m_p.animation.type != TAT_NONE) {
 		m_animation_time += dtime;
-		int frame_length_i, frame_count;
+		int frame_length_i = 0;
 		m_p.animation.determineParams(
-				m_material.getTexture(0)->getSize(),
-				&frame_count, &frame_length_i, NULL);
+				m_texture.ref->getSize(),
+				NULL, &frame_length_i, NULL);
 		float frame_length = frame_length_i / 1000.0;
 		while (m_animation_time > frame_length) {
 			m_animation_frame++;
@@ -225,23 +156,19 @@ void Particle::step(float dtime)
 	}
 
 	// animate particle alpha in accordance with settings
+	float alpha = 1.f;
 	if (m_texture.tex != nullptr)
-		m_alpha = m_texture.tex -> alpha.blend(m_time / (m_expiration+0.1f));
-	else
-		m_alpha = 1.f;
+		alpha = m_texture.tex -> alpha.blend(m_time / (m_expiration+0.1f));
 
 	// Update lighting
-	updateLight();
+	auto col = updateLight(env);
+	col.setAlpha(255 * alpha);
 
 	// Update model
-	updateVertices();
-
-	// Update position -- see #10398
-	v3s16 camera_offset = m_env->getCameraOffset();
-	setPosition(m_pos*BS - intToFloat(camera_offset, BS));
+	updateVertices(env, col);
 }
 
-void Particle::updateLight()
+video::SColor Particle::updateLight(ClientEnvironment *env)
 {
 	u8 light = 0;
 
@@ -250,32 +177,37 @@ void Particle::updateLight()
 		floor(m_pos.Y+0.5),
 		floor(m_pos.Z+0.5)
 	);
-	MapNode n = m_env->getClientMap().getNodeTry(p);
+	MapNode n = env->getClientMap().getNodeTry(p);
 	if (n.getContent() != CONTENT_IGNORE)
-		light = n.getLightBlend(m_env->getDayNightRatio(),
-				m_gamedef->ndef()->getLightingFlags(n));
+		light = n.getLightBlend(env->getDayNightRatio(),
+				env->getGameDef()->ndef()->getLightingFlags(n));
 	else
-		light = blend_light(m_env->getDayNightRatio(), LIGHT_SUN, 0);
+		light = blend_light(env->getDayNightRatio(), LIGHT_SUN, 0);
 
 	u8 m_light = decode_light(light + m_p.glow);
-	m_color.set(m_alpha*255,
+	return video::SColor(255,
 		m_light * m_base_color.getRed() / 255,
 		m_light * m_base_color.getGreen() / 255,
 		m_light * m_base_color.getBlue() / 255);
 }
 
-void Particle::updateVertices()
+void Particle::updateVertices(ClientEnvironment *env, video::SColor color)
 {
 	f32 tx0, tx1, ty0, ty1;
 	v2f scale;
 
+	if (!m_buffer)
+		return;
+
+	video::S3DVertex *vertices = m_buffer->getVertices(m_index);
+
 	if (m_texture.tex != nullptr)
 		scale = m_texture.tex -> scale.blend(m_time / (m_expiration+0.1));
 	else
 		scale = v2f(1.f, 1.f);
 
 	if (m_p.animation.type != TAT_NONE) {
-		const v2u32 texsize = m_material.getTexture(0)->getSize();
+		const v2u32 texsize = m_texture.ref->getSize();
 		v2f texcoord, framesize_f;
 		v2u32 framesize;
 		texcoord = m_p.animation.getTextureCoords(texsize, m_animation_frame);
@@ -296,31 +228,30 @@ void Particle::updateVertices()
 	auto half = m_p.size * .5f,
 	     hx   = half * scale.X,
 	     hy   = half * scale.Y;
-	m_vertices[0] = video::S3DVertex(-hx, -hy,
-		0, 0, 0, 0, m_color, tx0, ty1);
-	m_vertices[1] = video::S3DVertex(hx, -hy,
-		0, 0, 0, 0, m_color, tx1, ty1);
-	m_vertices[2] = video::S3DVertex(hx, hy,
-		0, 0, 0, 0, m_color, tx1, ty0);
-	m_vertices[3] = video::S3DVertex(-hx, hy,
-		0, 0, 0, 0, m_color, tx0, ty0);
+	vertices[0] = video::S3DVertex(-hx, -hy,
+		0, 0, 0, 0, color, tx0, ty1);
+	vertices[1] = video::S3DVertex(hx, -hy,
+		0, 0, 0, 0, color, tx1, ty1);
+	vertices[2] = video::S3DVertex(hx, hy,
+		0, 0, 0, 0, color, tx1, ty0);
+	vertices[3] = video::S3DVertex(-hx, hy,
+		0, 0, 0, 0, color, tx0, ty0);
 
+	// Update position -- see #10398
+	auto *player = env->getLocalPlayer();
+	v3s16 camera_offset = env->getCameraOffset();
 
-	// see #10398
-	// v3s16 camera_offset = m_env->getCameraOffset();
-	// particle position is now handled by step()
-	m_box.reset(v3f());
-
-	for (video::S3DVertex &vertex : m_vertices) {
+	for (u16 i = 0; i < 4; i++) {
+		video::S3DVertex &vertex = vertices[i];
 		if (m_p.vertical) {
-			v3f ppos = m_player->getPosition()/BS;
+			v3f ppos = player->getPosition() / BS;
 			vertex.Pos.rotateXZBy(std::atan2(ppos.Z - m_pos.Z, ppos.X - m_pos.X) /
 				core::DEGTORAD + 90);
 		} else {
-			vertex.Pos.rotateYZBy(m_player->getPitch());
-			vertex.Pos.rotateXZBy(m_player->getYaw());
+			vertex.Pos.rotateYZBy(player->getPitch());
+			vertex.Pos.rotateXZBy(player->getYaw());
 		}
-		m_box.addInternalPoint(vertex.Pos);
+		vertex.Pos += m_pos * BS - intToFloat(camera_offset, BS);
 	}
 }
 
@@ -329,7 +260,6 @@ void Particle::updateVertices()
 */
 
 ParticleSpawner::ParticleSpawner(
-		IGameDef *gamedef,
 		LocalPlayer *player,
 		const ParticleSpawnerParameters &params,
 		u16 attached_id,
@@ -339,7 +269,6 @@ ParticleSpawner::ParticleSpawner(
 		m_active(0),
 		m_particlemanager(p_manager),
 		m_time(0.0f),
-		m_gamedef(gamedef),
 		m_player(player),
 		p(params),
 		m_texpool(std::move(texpool)),
@@ -564,9 +493,6 @@ void ParticleSpawner::spawnParticle(ClientEnvironment *env, float radius,
 
 	++m_active;
 	m_particlemanager->addParticle(std::make_unique<Particle>(
-			m_gamedef,
-			m_player,
-			env,
 			pp,
 			texture,
 			texpos,
@@ -623,6 +549,109 @@ void ParticleSpawner::step(float dtime, ClientEnvironment *env)
 	}
 }
 
+/*
+	ParticleBuffer
+*/
+
+ParticleBuffer::ParticleBuffer(ClientEnvironment *env, const video::SMaterial &material)
+	: scene::ISceneNode(
+			env->getGameDef()->getSceneManager()->getRootSceneNode(),
+			env->getGameDef()->getSceneManager()),
+	m_mesh_buffer(make_irr<scene::SMeshBuffer>())
+{
+	m_mesh_buffer->getMaterial() = material;
+}
+
+static constexpr u16 quad_indices[] = { 0, 1, 2, 2, 3, 0 };
+
+std::optional<u16> ParticleBuffer::allocate()
+{
+	u16 index;
+
+	m_usage_timer = 0;
+
+	if (!m_free_list.empty()) {
+		index = m_free_list.back();
+		m_free_list.pop_back();
+		auto *vertices = static_cast<video::S3DVertex*>(m_mesh_buffer->getVertices());
+		u16 *indices = m_mesh_buffer->getIndices();
+		// reset vertices, because it is only written in Particle::step()
+		for (u16 i = 0; i < 4; i++)
+			vertices[4 * index + i] = video::S3DVertex();
+		for (u16 i = 0; i < 6; i++)
+			indices[6 * index + i] = 4 * index + quad_indices[i];
+		return index;
+	}
+
+	if (m_count >= MAX_PARTICLES_PER_BUFFER)
+		return std::nullopt;
+
+	// append new vertices
+	// note: Our buffer never gets smaller, but ParticleManager will delete
+	//       us after a while.
+	std::array<video::S3DVertex, 4> vertices {};
+	m_mesh_buffer->append(&vertices.front(), 4, quad_indices, 6);
+	index = m_count++;
+	return index;
+}
+
+void ParticleBuffer::release(u16 index)
+{
+	assert(index < m_count);
+	u16 *indices = m_mesh_buffer->getIndices();
+	for (u16 i = 0; i < 6; i++)
+		indices[6 * index + i] = 0;
+	m_free_list.push_back(index);
+}
+
+video::S3DVertex *ParticleBuffer::getVertices(u16 index)
+{
+	if (index >= m_count)
+		return nullptr;
+	m_bounding_box_dirty = true;
+	return &(static_cast<video::S3DVertex *>(m_mesh_buffer->getVertices())[4 * index]);
+}
+
+void ParticleBuffer::OnRegisterSceneNode()
+{
+	if (IsVisible)
+		SceneManager->registerNodeForRendering(this, scene::ESNRP_TRANSPARENT_EFFECT);
+	scene::ISceneNode::OnRegisterSceneNode();
+}
+
+const core::aabbox3df &ParticleBuffer::getBoundingBox() const
+{
+	if (!m_bounding_box_dirty)
+		return m_mesh_buffer->BoundingBox;
+
+	core::aabbox3df box;
+	for (u16 i = 0; i < m_count; i++) {
+		// check if this index is used
+		static_assert(quad_indices[1] != 0);
+		if (m_mesh_buffer->getIndices()[6 * i + 1] == 0)
+			continue;
+
+		for (u16 j = 0; j < 4; j++)
+			box.addInternalPoint(m_mesh_buffer->getPosition(i * 4 + j));
+	}
+
+	m_mesh_buffer->BoundingBox = box;
+	m_bounding_box_dirty = false;
+	return m_mesh_buffer->BoundingBox;
+}
+
+void ParticleBuffer::render()
+{
+	video::IVideoDriver *driver = SceneManager->getVideoDriver();
+
+	if (isEmpty())
+		return;
+
+	driver->setTransform(video::ETS_WORLD, core::matrix4());
+	driver->setMaterial(m_mesh_buffer->getMaterial());
+	driver->drawMeshBuffer(m_mesh_buffer.get());
+}
+
 /*
 	ParticleManager
 */
@@ -638,8 +667,9 @@ ParticleManager::~ParticleManager()
 
 void ParticleManager::step(float dtime)
 {
-	stepParticles (dtime);
-	stepSpawners (dtime);
+	stepParticles(dtime);
+	stepSpawners(dtime);
+	stepBuffers(dtime);
 }
 
 void ParticleManager::stepSpawners(float dtime)
@@ -683,38 +713,64 @@ void ParticleManager::stepParticles(float dtime)
 				assert(parent->hasActive());
 				parent->decrActive();
 			}
-			// remove scene node
-			p.remove();
 			// delete
 			m_particles[i] = std::move(m_particles.back());
 			m_particles.pop_back();
 		} else {
-			p.step(dtime);
+			p.step(dtime, m_env);
 			++i;
 		}
 	}
 }
 
+void ParticleManager::stepBuffers(float dtime)
+{
+	constexpr float INTERVAL = 0.5f;
+	if (!m_buffer_gc.step(dtime, INTERVAL))
+		return;
+
+	MutexAutoLock lock(m_particle_list_lock);
+
+	// remove buffers that have been unused for 5 seconds
+	size_t alloc = 0;
+	for (size_t i = 0; i < m_particle_buffers.size(); ) {
+		auto &buf = m_particle_buffers[i];
+		buf->m_usage_timer += INTERVAL;
+		if (buf->isEmpty() && buf->m_usage_timer > 5.0f) {
+			// delete and swap with last
+			buf->remove();
+			buf = std::move(m_particle_buffers.back());
+			m_particle_buffers.pop_back();
+		} else {
+			i++;
+			alloc += buf->m_count;
+		}
+	}
+
+	g_profiler->avg("ParticleManager: particle buffer count [#]", m_particle_buffers.size());
+	if (!m_particle_buffers.empty())
+		g_profiler->avg("ParticleManager: buffer allocated size [#]", alloc);
+}
+
 void ParticleManager::clearAll()
 {
    {
 	MutexAutoLock lock(m_spawner_list_lock);
 
-	// clear particle spawners
 	m_particle_spawners.clear();
 	m_dying_particle_spawners.clear();
    }
-   {
+
+{
 	MutexAutoLock lock2(m_particle_list_lock);
-	// clear particles
-	for (std::unique_ptr<Particle> &p : m_particles) {
-		// remove scene node
-		p->remove();
-		// delete
-		p.reset();
-	}
+
 	m_particles.clear();
-   }
+}
+
+	// have to remove from scene first because it keeps a reference
+	for (auto &it : m_particle_buffers)
+		it->remove();
+	m_particle_buffers.clear();
 }
 
 void ParticleManager::handleParticleEvent(ClientEvent *event, Client *client,
@@ -746,7 +802,6 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, Client *client,
 
 			addParticleSpawner(event->add_particlespawner.id,
 					std::make_unique<ParticleSpawner>(
-						client,
 						player,
 						p,
 						event->add_particlespawner.attached_id,
@@ -787,7 +842,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, Client *client,
 				p.size = oldsize;
 
 			if (texture.ref) {
-				addParticle(std::make_unique<Particle>(client, player, m_env,
+				addParticle(std::make_unique<Particle>(
 						p, texture, texpos, texsize, color, nullptr,
 						std::move(texstore)));
 			}
@@ -887,9 +942,6 @@ void ParticleManager::addNodeParticle(IGameDef *gamedef,
 	);
 
 	addParticle(std::make_unique<Particle>(
-		gamedef,
-		player,
-		m_env,
 		p,
 		ClientParticleTexRef(ref),
 		texpos,
@@ -904,13 +956,103 @@ void ParticleManager::reserveParticleSpace(size_t max_estimate)
 	m_particles.reserve(m_particles.size() + max_estimate);
 }
 
-void ParticleManager::addParticle(std::unique_ptr<Particle> toadd)
+video::SMaterial ParticleManager::getMaterialForParticle(const ClientParticleTexRef &texture)
+{
+	// translate blend modes to GL blend functions
+	video::E_BLEND_FACTOR bfsrc, bfdst;
+	video::E_BLEND_OPERATION blendop;
+	const auto blendmode = texture.tex ? texture.tex->blendmode :
+						   ParticleParamTypes::BlendMode::alpha;
+
+	switch (blendmode) {
+		case ParticleParamTypes::BlendMode::add:
+			bfsrc = video::EBF_SRC_ALPHA;
+			bfdst = video::EBF_DST_ALPHA;
+			blendop = video::EBO_ADD;
+		break;
+
+		case ParticleParamTypes::BlendMode::sub:
+			bfsrc = video::EBF_SRC_ALPHA;
+			bfdst = video::EBF_DST_ALPHA;
+			blendop = video::EBO_REVSUBTRACT;
+		break;
+
+		case ParticleParamTypes::BlendMode::screen:
+			bfsrc = video::EBF_ONE;
+			bfdst = video::EBF_ONE_MINUS_SRC_COLOR;
+			blendop = video::EBO_ADD;
+		break;
+
+		default: // includes ParticleParamTypes::BlendMode::alpha
+			bfsrc = video::EBF_SRC_ALPHA;
+			bfdst = video::EBF_ONE_MINUS_SRC_ALPHA;
+			blendop = video::EBO_ADD;
+		break;
+	}
+
+	video::SMaterial material;
+
+	// Texture
+	material.Lighting = false;
+	material.BackfaceCulling = false;
+	material.FogEnable = true;
+	material.forEachTexture([] (auto &tex) {
+		tex.MinFilter = video::ETMINF_NEAREST_MIPMAP_NEAREST;
+		tex.MagFilter = video::ETMAGF_NEAREST;
+	});
+
+	// We don't have working transparency sorting. Disable Z-Write for
+	// correct results for clipped-alpha at least.
+	material.ZWriteEnable = video::EZW_OFF;
+
+	// enable alpha blending and set blend mode
+	material.MaterialType = video::EMT_ONETEXTURE_BLEND;
+	material.MaterialTypeParam = video::pack_textureBlendFunc(
+			bfsrc, bfdst,
+			video::EMFN_MODULATE_1X,
+			video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
+	material.BlendOperation = blendop;
+	material.setTexture(0, texture.ref);
+
+	return material;
+}
+
+bool ParticleManager::addParticle(std::unique_ptr<Particle> toadd)
 {
 	MutexAutoLock lock(m_particle_list_lock);
 
-	m_particles.push_back(std::move(toadd));
-}
+	auto material = getMaterialForParticle(toadd->getTextureRef());
 
+	ParticleBuffer *found = nullptr;
+	// simple shortcut when multiple particles of the same type get added
+	if (!m_particles.empty()) {
+		auto &last = m_particles.back();
+		if (last->getBuffer() && last->getBuffer()->getMaterial(0) == material)
+			found = last->getBuffer();
+	}
+	// search fitting buffer
+	if (!found) {
+		for (auto &buffer : m_particle_buffers) {
+			if (buffer->getMaterial(0) == material) {
+				found = buffer.get();
+				break;
+			}
+		}
+	}
+	// or create a new one
+	if (!found) {
+		auto tmp = make_irr<ParticleBuffer>(m_env, material);
+		found = tmp.get();
+		m_particle_buffers.push_back(std::move(tmp));
+	}
+
+	if (!toadd->attachToBuffer(found)) {
+		infostream << "ParticleManager: buffer full, dropping particle" << std::endl;
+		return false;
+	}
+	m_particles.push_back(std::move(toadd));
+	return true;
+}
 
 void ParticleManager::addParticleSpawner(u64 id, std::unique_ptr<ParticleSpawner> toadd)
 {
diff --git a/src/client/particles.h b/src/client/particles.h
index 8b7c30946..92ea8fb67 100644
--- a/src/client/particles.h
+++ b/src/client/particles.h
@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <iostream>
+#include <vector>
+#include <unordered_map>
 #include "irrlichttypes_extrabloated.h"
-#include "client/tile.h"
-#include "localplayer.h"
+#include "irr_ptr.h"
 #include "../particles.h"
 
 struct ClientEvent;
@@ -30,6 +30,10 @@ class ParticleManager;
 class ClientEnvironment;
 struct MapNode;
 struct ContentFeatures;
+class LocalPlayer;
+class ITextureSource;
+class IGameDef;
+class Client;
 
 struct ClientParticleTexture
 {
@@ -39,9 +43,7 @@ struct ClientParticleTexture
 	video::ITexture *ref = nullptr;
 
 	ClientParticleTexture() = default;
-	ClientParticleTexture(const ServerParticleTexture& p, ITextureSource *t):
-			tex(p),
-			ref(t->getTextureForMesh(p.string)) {};
+	ClientParticleTexture(const ServerParticleTexture& p, ITextureSource *tsrc);
 };
 
 struct ClientParticleTexRef
@@ -62,14 +64,12 @@ struct ClientParticleTexRef
 };
 
 class ParticleSpawner;
+class ParticleBuffer;
 
-class Particle : public scene::ISceneNode
+class Particle
 {
 public:
 	Particle(
-		IGameDef *gamedef,
-		LocalPlayer *player,
-		ClientEnvironment *env,
 		const ParticleParameters &p,
 		const ClientParticleTexRef &texture,
 		v2f texpos,
@@ -79,61 +79,46 @@ public:
 		std::unique_ptr<ClientParticleTexture> owned_texture = nullptr
 	);
 
-	virtual const aabb3f &getBoundingBox() const
-	{
-		return m_box;
-	}
+	~Particle();
 
-	virtual u32 getMaterialCount() const
-	{
-		return 1;
-	}
+	DISABLE_CLASS_COPY(Particle)
 
-	virtual video::SMaterial& getMaterial(u32 i)
-	{
-		return m_material;
-	}
+	void step(float dtime, ClientEnvironment *env);
 
-	virtual void OnRegisterSceneNode();
-	virtual void render();
-
-	void step(float dtime);
-
-	bool isExpired ()
+	bool isExpired () const
 	{ return m_expiration < m_time; }
 
-	ParticleSpawner *getParent() { return m_parent; }
+	ParticleSpawner *getParent() const { return m_parent; }
+
+	const ClientParticleTexRef &getTextureRef() const { return m_texture; }
+
+	ParticleBuffer *getBuffer() const { return m_buffer; }
+	bool attachToBuffer(ParticleBuffer *buffer);
 
 private:
-	void updateLight();
-	void updateVertices();
-	void setVertexAlpha(float a);
+	video::SColor updateLight(ClientEnvironment *env);
+	void updateVertices(ClientEnvironment *env, video::SColor color);
+
+	ParticleBuffer *m_buffer = nullptr;
+	u16 m_index; // index in m_buffer
 
-	video::S3DVertex m_vertices[4];
 	float m_time = 0.0f;
 	float m_expiration;
 
-	ClientEnvironment *m_env;
-	IGameDef *m_gamedef;
-	aabb3f m_box;
-	aabb3f m_collisionbox;
+	// Color without lighting
+	video::SColor m_base_color;
+
 	ClientParticleTexRef m_texture;
-	video::SMaterial m_material;
 	v2f m_texpos;
 	v2f m_texsize;
 	v3f m_pos;
 	v3f m_velocity;
 	v3f m_acceleration;
-	const ParticleParameters m_p;
-	LocalPlayer *m_player;
 
-	//! Color without lighting
-	video::SColor m_base_color;
-	//! Final rendered color
-	video::SColor m_color;
+	const ParticleParameters m_p;
+
 	float m_animation_time = 0.0f;
 	int m_animation_frame = 0;
-	float m_alpha = 0.0f;
 
 	ParticleSpawner *m_parent = nullptr;
 	// Used if not spawned from a particlespawner
@@ -143,8 +128,7 @@ private:
 class ParticleSpawner
 {
 public:
-	ParticleSpawner(IGameDef *gamedef,
-		LocalPlayer *player,
+	ParticleSpawner(LocalPlayer *player,
 		const ParticleSpawnerParameters &params,
 		u16 attached_id,
 		std::vector<ClientParticleTexture> &&texpool,
@@ -165,7 +149,6 @@ private:
 	size_t m_active;
 	ParticleManager *m_particlemanager;
 	float m_time;
-	IGameDef *m_gamedef;
 	LocalPlayer *m_player;
 	ParticleSpawnerParameters p;
 	std::vector<ClientParticleTexture> m_texpool;
@@ -173,12 +156,61 @@ private:
 	u16 m_attached_id;
 };
 
+class ParticleBuffer : public scene::ISceneNode
+{
+	friend class ParticleManager;
+public:
+	ParticleBuffer(ClientEnvironment *env, const video::SMaterial &material);
+
+	// for pointer stability
+	DISABLE_CLASS_COPY(ParticleBuffer)
+
+	/// Reserves one more slot for a particle (4 vertices, 6 indices)
+	/// @return particle index within buffer
+	std::optional<u16> allocate();
+	/// Frees the particle at `index`
+	void release(u16 index);
+
+	/// @return video::S3DVertex[4]
+	video::S3DVertex *getVertices(u16 index);
+
+	inline bool isEmpty() const {
+		return m_free_list.size() == m_count;
+	}
+
+	virtual video::SMaterial &getMaterial(u32 num) override {
+		return m_mesh_buffer->getMaterial();
+	}
+	virtual u32 getMaterialCount() const override {
+		return 1;
+	}
+
+	virtual const core::aabbox3df &getBoundingBox() const override;
+
+	virtual void render() override;
+
+	virtual void OnRegisterSceneNode() override;
+
+	// we have 16-bit indices
+	static constexpr u16 MAX_PARTICLES_PER_BUFFER = 16000;
+
+private:
+	irr_ptr<scene::SMeshBuffer> m_mesh_buffer;
+	// unused (e.g. expired) particle indices for re-use
+	std::vector<u16> m_free_list;
+	// for automatic deletion when unused for a while. is reset on allocate().
+	float m_usage_timer = 0;
+	// total count of contained particles
+	u16 m_count = 0;
+	mutable bool m_bounding_box_dirty = true;
+};
+
 /**
  * Class doing particle as well as their spawners handling
  */
 class ParticleManager
 {
-friend class ParticleSpawner;
+	friend class ParticleSpawner;
 public:
 	ParticleManager(ClientEnvironment* env);
 	DISABLE_CLASS_COPY(ParticleManager)
@@ -214,7 +246,9 @@ protected:
 		ParticleParameters &p, video::ITexture **texture, v2f &texpos,
 		v2f &texsize, video::SColor *color, u8 tilenum = 0);
 
-	void addParticle(std::unique_ptr<Particle> toadd);
+	static video::SMaterial getMaterialForParticle(const ClientParticleTexRef &texture);
+
+	bool addParticle(std::unique_ptr<Particle> toadd);
 
 private:
 	void addParticleSpawner(u64 id, std::unique_ptr<ParticleSpawner> toadd);
@@ -222,17 +256,23 @@ private:
 
 	void stepParticles(float dtime);
 	void stepSpawners(float dtime);
+	void stepBuffers(float dtime);
 
 	void clearAll();
 
 	std::vector<std::unique_ptr<Particle>> m_particles;
 	std::unordered_map<u64, std::unique_ptr<ParticleSpawner>> m_particle_spawners;
 	std::vector<std::unique_ptr<ParticleSpawner>> m_dying_particle_spawners;
-	// Start the particle spawner ids generated from here after u32_max. lower values are
-	// for server sent spawners.
-	u64 m_next_particle_spawner_id = U32_MAX + 1;
+	std::vector<irr_ptr<ParticleBuffer>> m_particle_buffers;
+
+	// Start the particle spawner ids generated from here after u32_max.
+	// lower values are for server sent spawners.
+	u64 m_next_particle_spawner_id = static_cast<u64>(U32_MAX) + 1;
 
 	ClientEnvironment *m_env;
+
+	IntervalLimiter m_buffer_gc;
+
 	std::mutex m_particle_list_lock;
 	std::mutex m_spawner_list_lock;
 };
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 37a5106df..dfd9dc02e 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -36,7 +36,7 @@ RenderingCore::~RenderingCore()
 	delete shadow_renderer;
 }
 
-void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_minimap,
+void RenderingCore::draw(video::SColor _skycolor, bool _show_hud,
 		bool _draw_wield_tool, bool _draw_crosshair)
 {
 	v2u32 screensize = device->getVideoDriver()->getScreenSize();
@@ -46,7 +46,6 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
 	context.draw_crosshair = _draw_crosshair;
 	context.draw_wield_tool = _draw_wield_tool;
 	context.show_hud = _show_hud;
-	context.show_minimap = _show_minimap;
 
 	pipeline->reset(context);
 	pipeline->run(context);
@@ -55,4 +54,4 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
 v2u32 RenderingCore::getVirtualSize() const
 {
 	return virtual_size;
-}
\ No newline at end of file
+}
diff --git a/src/client/render/core.h b/src/client/render/core.h
index 2d9e41047..c5617bcb2 100644
--- a/src/client/render/core.h
+++ b/src/client/render/core.h
@@ -53,7 +53,7 @@ public:
 	RenderingCore &operator=(const RenderingCore &) = delete;
 	RenderingCore &operator=(RenderingCore &&) = delete;
 
-	void draw(video::SColor _skycolor, bool _show_hud, bool _show_minimap,
+	void draw(video::SColor _skycolor, bool _show_hud,
 			bool _draw_wield_tool, bool _draw_crosshair);
 
 	v2u32 getVirtualSize() const;
diff --git a/src/client/render/pipeline.h b/src/client/render/pipeline.h
index f446773ba..abb108652 100644
--- a/src/client/render/pipeline.h
+++ b/src/client/render/pipeline.h
@@ -46,7 +46,6 @@ struct PipelineContext
 	v2u32 target_size;
 
 	bool show_hud {true};
-	bool show_minimap {true};
 	bool draw_wield_tool {true};
 	bool draw_crosshair {true};
 };
diff --git a/src/client/render/plain.cpp b/src/client/render/plain.cpp
index dccdaedb3..60a732415 100644
--- a/src/client/render/plain.cpp
+++ b/src/client/render/plain.cpp
@@ -64,9 +64,6 @@ void DrawHUD::run(PipelineContext &context)
 		context.hud->drawHotbar(context.client->getEnv().getLocalPlayer()->getWieldIndex());
 		context.hud->drawLuaElements(context.client->getCamera()->getOffset());
 		context.client->getCamera()->drawNametags();
-		auto mapper = context.client->getMinimap();
-		if (mapper && context.show_minimap)
-			mapper->drawMinimap();
 	}
 	context.device->getGUIEnvironment()->drawAll();
 }
@@ -106,7 +103,7 @@ void UpscaleStep::run(PipelineContext &context)
 std::unique_ptr<RenderStep> create3DStage(Client *client, v2f scale)
 {
 	RenderStep *step = new Draw3D();
-	if (g_settings->getBool("enable_shaders")) {
+	if (g_settings->getBool("enable_shaders") && g_settings->getBool("enable_post_processing")) {
 		RenderPipeline *pipeline = new RenderPipeline();
 		pipeline->addStep(pipeline->own(std::unique_ptr<RenderStep>(step)));
 
@@ -131,7 +128,7 @@ RenderStep* addUpscaling(RenderPipeline *pipeline, RenderStep *previousStep, v2f
 		return previousStep;
 
 	// When shaders are enabled, post-processing pipeline takes care of rescaling
-	if (g_settings->getBool("enable_shaders"))
+	if (g_settings->getBool("enable_shaders") && g_settings->getBool("enable_post_processing"))
 		return previousStep;
 
 
diff --git a/src/client/render/secondstage.cpp b/src/client/render/secondstage.cpp
index f33f1975e..da6536b97 100644
--- a/src/client/render/secondstage.cpp
+++ b/src/client/render/secondstage.cpp
@@ -120,8 +120,9 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 	static const u8 TEXTURE_EXPOSURE_1 = 3;
 	static const u8 TEXTURE_EXPOSURE_2 = 4;
 	static const u8 TEXTURE_FXAA = 5;
-	static const u8 TEXTURE_BLOOM_DOWN = 10;
-	static const u8 TEXTURE_BLOOM_UP = 20;
+	static const u8 TEXTURE_VOLUME = 6;
+	static const u8 TEXTURE_SCALE_DOWN = 10;
+	static const u8 TEXTURE_SCALE_UP = 20;
 
 	// Super-sampling is simply rendering into a larger texture.
 	// Downscaling is done by the final step when rendering to the screen.
@@ -130,6 +131,7 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 	const bool enable_auto_exposure = g_settings->getBool("enable_auto_exposure");
 	const bool enable_ssaa = antialiasing == "ssaa";
 	const bool enable_fxaa = antialiasing == "fxaa";
+	const bool enable_volumetric_light = g_settings->getBool("enable_volumetric_lighting") && enable_bloom;
 
 	if (enable_ssaa) {
 		u16 ssaa_scale = MYMAX(2, g_settings->getU16("fsaa"));
@@ -160,9 +162,9 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 
 		v2f downscale = scale * 0.5;
 		for (u8 i = 0; i < MIPMAP_LEVELS; i++) {
-			buffer->setTexture(TEXTURE_BLOOM_DOWN + i, downscale, std::string("downsample") + std::to_string(i), color_format);
+			buffer->setTexture(TEXTURE_SCALE_DOWN + i, downscale, std::string("downsample") + std::to_string(i), color_format);
 			if (enable_bloom)
-				buffer->setTexture(TEXTURE_BLOOM_UP + i, downscale, std::string("upsample") + std::to_string(i), color_format);
+				buffer->setTexture(TEXTURE_SCALE_UP + i, downscale, std::string("upsample") + std::to_string(i), color_format);
 			downscale *= 0.5;
 		}
 
@@ -171,20 +173,30 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 
 			// get bright spots
 			u32 shader_id = client->getShaderSource()->getShader("extract_bloom", TILE_MATERIAL_PLAIN, NDT_MESH);
-			RenderStep *extract_bloom = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { TEXTURE_COLOR, TEXTURE_EXPOSURE_1 });
+			RenderStep *extract_bloom = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { source, TEXTURE_EXPOSURE_1 });
 			extract_bloom->setRenderSource(buffer);
 			extract_bloom->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, TEXTURE_BLOOM));
 			source = TEXTURE_BLOOM;
 		}
 
+		if (enable_volumetric_light) {
+			buffer->setTexture(TEXTURE_VOLUME, scale, "volume", color_format);
+
+			shader_id = client->getShaderSource()->getShader("volumetric_light", TILE_MATERIAL_PLAIN, NDT_MESH);
+			auto volume = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { source, TEXTURE_DEPTH });
+			volume->setRenderSource(buffer);
+			volume->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, TEXTURE_VOLUME));
+			source = TEXTURE_VOLUME;
+		}
+
 		// downsample
 		shader_id = client->getShaderSource()->getShader("bloom_downsample", TILE_MATERIAL_PLAIN, NDT_MESH);
 		for (u8 i = 0; i < MIPMAP_LEVELS; i++) {
 			auto step = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { source });
 			step->setRenderSource(buffer);
 			step->setBilinearFilter(0, true);
-			step->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, TEXTURE_BLOOM_DOWN + i));
-			source = TEXTURE_BLOOM_DOWN + i;
+			step->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, TEXTURE_SCALE_DOWN + i));
+			source = TEXTURE_SCALE_DOWN + i;
 		}
 	}
 
@@ -193,19 +205,19 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 		// upsample
 		shader_id = client->getShaderSource()->getShader("bloom_upsample", TILE_MATERIAL_PLAIN, NDT_MESH);
 		for (u8 i = MIPMAP_LEVELS - 1; i > 0; i--) {
-			auto step = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { u8(TEXTURE_BLOOM_DOWN + i - 1), source });
+			auto step = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { u8(TEXTURE_SCALE_DOWN + i - 1), source });
 			step->setRenderSource(buffer);
 			step->setBilinearFilter(0, true);
 			step->setBilinearFilter(1, true);
-			step->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, u8(TEXTURE_BLOOM_UP + i - 1)));
-			source = TEXTURE_BLOOM_UP + i - 1;
+			step->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, u8(TEXTURE_SCALE_UP + i - 1)));
+			source = TEXTURE_SCALE_UP + i - 1;
 		}
 	}
 
 	// Dynamic Exposure pt2
 	if (enable_auto_exposure) {
 		shader_id = client->getShaderSource()->getShader("update_exposure", TILE_MATERIAL_PLAIN, NDT_MESH);
-		auto update_exposure = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { TEXTURE_EXPOSURE_1, u8(TEXTURE_BLOOM_DOWN + MIPMAP_LEVELS - 1) });
+		auto update_exposure = pipeline->addStep<PostProcessingStep>(shader_id, std::vector<u8> { TEXTURE_EXPOSURE_1, u8(TEXTURE_SCALE_DOWN + MIPMAP_LEVELS - 1) });
 		update_exposure->setBilinearFilter(1, true);
 		update_exposure->setRenderSource(buffer);
 		update_exposure->setRenderTarget(pipeline->createOwned<TextureBufferOutput>(buffer, TEXTURE_EXPOSURE_2));
@@ -228,7 +240,7 @@ RenderStep *addPostProcessing(RenderPipeline *pipeline, RenderStep *previousStep
 
 	// final merge
 	shader_id = client->getShaderSource()->getShader("second_stage", TILE_MATERIAL_PLAIN, NDT_MESH);
-	PostProcessingStep *effect = pipeline->createOwned<PostProcessingStep>(shader_id, std::vector<u8> { final_stage_source, TEXTURE_BLOOM_UP, TEXTURE_EXPOSURE_2 });
+	PostProcessingStep *effect = pipeline->createOwned<PostProcessingStep>(shader_id, std::vector<u8> { final_stage_source, TEXTURE_SCALE_UP, TEXTURE_EXPOSURE_2 });
 	pipeline->addStep(effect);
 	if (enable_ssaa)
 		effect->setBilinearFilter(0, true);
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index 26f199d04..4d3bec6ca 100644
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <optional>
-#include <IrrlichtDevice.h>
+#include <irrlicht.h>
 #include "fontengine.h"
 #include "client.h"
 #include "clouds.h"
@@ -44,6 +44,87 @@ RenderingEngine *RenderingEngine::s_singleton = nullptr;
 const video::SColor RenderingEngine::MENU_SKY_COLOR = video::SColor(255, 140, 186, 250);
 const float RenderingEngine::BASE_BLOOM_STRENGTH = 1.0f;
 
+/* Helper classes */
+
+void FpsControl::reset()
+{
+	last_time = porting::getTimeUs();
+}
+
+void FpsControl::limit(IrrlichtDevice *device, f32 *dtime, bool assume_paused)
+{
+	const float fps_limit = (device->isWindowFocused() && !assume_paused)
+			? g_settings->getFloat("fps_max")
+			: g_settings->getFloat("fps_max_unfocused");
+	const u64 frametime_min = 1000000.0f / std::max(fps_limit, 1.0f);
+
+	u64 time = porting::getTimeUs();
+
+	if (time > last_time) // Make sure time hasn't overflowed
+		busy_time = time - last_time;
+	else
+		busy_time = 0;
+
+	if (busy_time < frametime_min) {
+		sleep_time = frametime_min - busy_time;
+		if (sleep_time > 0)
+			sleep_us(sleep_time);
+	} else {
+		sleep_time = 0;
+	}
+
+	// Read the timer again to accurately determine how long we actually slept,
+	// rather than calculating it by adding sleep_time to time.
+	time = porting::getTimeUs();
+
+	if (time > last_time) // Make sure last_time hasn't overflowed
+		*dtime = (time - last_time) / 1000000.0f;
+	else
+		*dtime = 0;
+
+	last_time = time;
+}
+
+class FogShaderConstantSetter : public IShaderConstantSetter
+{
+	CachedPixelShaderSetting<float, 4> m_fog_color{"fogColor"};
+	CachedPixelShaderSetting<float> m_fog_distance{"fogDistance"};
+	CachedPixelShaderSetting<float> m_fog_shading_parameter{"fogShadingParameter"};
+
+public:
+	void onSetConstants(video::IMaterialRendererServices *services) override
+	{
+		auto *driver = services->getVideoDriver();
+		assert(driver);
+
+		video::SColor fog_color(0);
+		video::E_FOG_TYPE fog_type = video::EFT_FOG_LINEAR;
+		f32 fog_start = 0;
+		f32 fog_end = 0;
+		f32 fog_density = 0;
+		bool fog_pixelfog = false;
+		bool fog_rangefog = false;
+		driver->getFog(fog_color, fog_type, fog_start, fog_end, fog_density,
+				fog_pixelfog, fog_rangefog);
+
+		video::SColorf fog_colorf(fog_color);
+		m_fog_color.set(fog_colorf, services);
+
+		m_fog_distance.set(&fog_end, services);
+
+		float parameter = 0;
+		if (fog_end > 0)
+			parameter = 1.0f / (1.0f - fog_start / fog_end);
+		m_fog_shading_parameter.set(&parameter, services);
+	}
+};
+
+IShaderConstantSetter *FogShaderConstantSetterFactory::create()
+{
+	return new FogShaderConstantSetter();
+}
+
+/* Other helpers */
 
 static gui::GUISkin *createSkin(gui::IGUIEnvironment *environment,
 		gui::EGUI_SKIN_TYPE type, video::IVideoDriver *driver)
@@ -66,7 +147,6 @@ static gui::GUISkin *createSkin(gui::IGUIEnvironment *environment,
 	return skin;
 }
 
-
 static std::optional<video::E_DRIVER_TYPE> chooseVideoDriver()
 {
 	auto &&configured_name = g_settings->get("video_driver");
@@ -84,13 +164,19 @@ static std::optional<video::E_DRIVER_TYPE> chooseVideoDriver()
 	return std::nullopt;
 }
 
+static inline auto getVideoDriverName(video::E_DRIVER_TYPE driver)
+{
+	return RenderingEngine::getVideoDriverInfo(driver).friendly_name;
+}
+
 static irr::IrrlichtDevice *createDevice(SIrrlichtCreationParameters params, std::optional<video::E_DRIVER_TYPE> requested_driver)
 {
 	if (requested_driver) {
 		params.DriverType = *requested_driver;
+		verbosestream << "Trying video driver " << getVideoDriverName(params.DriverType) << std::endl;
 		if (auto *device = createDeviceEx(params))
 			return device;
-		errorstream << "Failed to initialize the " << RenderingEngine::getVideoDriverInfo(*requested_driver).friendly_name << " video driver" << std::endl;
+		errorstream << "Failed to initialize the " << getVideoDriverName(params.DriverType) << " video driver" << std::endl;
 	}
 	sanity_check(requested_driver != video::EDT_NULL);
 
@@ -99,6 +185,7 @@ static irr::IrrlichtDevice *createDevice(SIrrlichtCreationParameters params, std
 		if (fallback_driver == video::EDT_NULL || fallback_driver == requested_driver)
 			continue;
 		params.DriverType = fallback_driver;
+		verbosestream << "Trying video driver " << getVideoDriverName(params.DriverType) << std::endl;
 		if (auto *device = createDeviceEx(params))
 			return device;
 	}
@@ -106,6 +193,8 @@ static irr::IrrlichtDevice *createDevice(SIrrlichtCreationParameters params, std
 	throw std::runtime_error("Could not initialize the device with any supported video driver");
 }
 
+/* RenderingEngine class */
+
 RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 {
 	sanity_check(!s_singleton);
@@ -118,7 +207,12 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 #else
 	u16 screen_w = std::max<u16>(g_settings->getU16("screen_w"), 1);
 	u16 screen_h = std::max<u16>(g_settings->getU16("screen_h"), 1);
-	bool window_maximized = g_settings->getBool("window_maximized");
+	// If I…
+	// 1. … set fullscreen = true and window_maximized = true on startup
+	// 2. … set fullscreen = false later
+	// on Linux with SDL, everything breaks.
+	// => Don't do it.
+	bool window_maximized = !fullscreen && g_settings->getBool("window_maximized");
 #endif
 
 	// bpp, fsaa, vsync
@@ -140,9 +234,8 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 	params.Stencilbuffer = false;
 	params.Vsync = vsync;
 	params.EventReceiver = receiver;
-#ifdef __ANDROID__
-	params.PrivateData = porting::app_global;
-#endif
+	params.DriverDebug = g_settings->getBool("opengl_debug");
+
 	// there is no standardized path for these on desktop
 	std::string rel_path = std::string("client") + DIR_DELIM
 			+ "shaders" + DIR_DELIM + "Irrlicht";
@@ -150,7 +243,10 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 
 	m_device = createDevice(params, driverType);
 	driver = m_device->getVideoDriver();
-	infostream << "Using the " << RenderingEngine::getVideoDriverInfo(driver->getDriverType()).friendly_name << " video driver" << std::endl;
+	verbosestream << "Using the " << getVideoDriverName(driver->getDriverType()) << " video driver" << std::endl;
+
+	// This changes the minimum allowed number of vertices in a VBO. Default is 500.
+	driver->setMinHardwareBufferVertexCount(4);
 
 	s_singleton = this;
 
@@ -158,16 +254,41 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 			gui::EGST_WINDOWS_METALLIC, driver);
 	m_device->getGUIEnvironment()->setSkin(skin);
 	skin->drop();
+
+	g_settings->registerChangedCallback("fullscreen", settingChangedCallback, this);
+	g_settings->registerChangedCallback("window_maximized", settingChangedCallback, this);
 }
 
 RenderingEngine::~RenderingEngine()
 {
+	sanity_check(s_singleton == this);
+
+	g_settings->deregisterChangedCallback("fullscreen", settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("window_maximized", settingChangedCallback, this);
+
 	core.reset();
 	m_device->closeDevice();
 	m_device->run();
+	m_device->drop();
 	s_singleton = nullptr;
 }
 
+void RenderingEngine::settingChangedCallback(const std::string &name, void *data)
+{
+	IrrlichtDevice *device = static_cast<RenderingEngine*>(data)->m_device;
+	if (name == "fullscreen") {
+		device->setFullscreen(g_settings->getBool("fullscreen"));
+
+	} else if (name == "window_maximized") {
+		if (!device->isFullscreen()) {
+			if (g_settings->getBool("window_maximized"))
+				device->maximizeWindow();
+			else
+				device->restoreWindow();
+		}
+	}
+}
+
 v2u32 RenderingEngine::_getWindowSize() const
 {
 	if (core)
@@ -188,10 +309,7 @@ void RenderingEngine::removeMesh(const scene::IMesh* mesh)
 void RenderingEngine::cleanupMeshCache()
 {
 	auto mesh_cache = m_device->getSceneManager()->getMeshCache();
-	while (mesh_cache->getMeshCount() != 0) {
-		if (scene::IAnimatedMesh *mesh = mesh_cache->getMeshByIndex(0))
-			mesh_cache->removeMesh(mesh);
-	}
+	mesh_cache->clear();
 }
 
 bool RenderingEngine::setupTopLevelWindow()
@@ -218,7 +336,7 @@ bool RenderingEngine::setWindowIcon()
 */
 void RenderingEngine::draw_load_screen(const std::wstring &text,
 		gui::IGUIEnvironment *guienv, ITextureSource *tsrc, float dtime,
-		int percent, bool sky)
+		int percent, float *indef_pos)
 {
 	v2u32 screensize = getWindowSize();
 
@@ -230,18 +348,24 @@ void RenderingEngine::draw_load_screen(const std::wstring &text,
 			gui::StaticText::add(guienv, text, textrect, false, false);
 	guitext->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 
-	if (sky && g_settings->getBool("menu_clouds")) {
-		g_menuclouds->step(dtime * 3);
-		g_menuclouds->render();
-		get_video_driver()->beginScene(true, true, RenderingEngine::MENU_SKY_COLOR);
-		g_menucloudsmgr->drawAll();
-	} else if (sky)
-		get_video_driver()->beginScene(true, true, RenderingEngine::MENU_SKY_COLOR);
-	else
-		get_video_driver()->beginScene(true, true, video::SColor(255, 0, 0, 0));
+	auto *driver = get_video_driver();
 
+	driver->setFog(RenderingEngine::MENU_SKY_COLOR);
+	driver->beginScene(true, true, RenderingEngine::MENU_SKY_COLOR);
+	if (g_settings->getBool("menu_clouds")) {
+		g_menuclouds->step(dtime * 3);
+		g_menucloudsmgr->drawAll();
+	}
+
+	int percent_min = 0;
+	int percent_max = percent;
+	if (indef_pos) {
+		*indef_pos = fmodf(*indef_pos + (dtime * 50.0f), 140.0f);
+		percent_max = std::min((int) *indef_pos, 100);
+		percent_min = std::max((int) *indef_pos - 40, 0);
+	}
 	// draw progress bar
-	if ((percent >= 0) && (percent <= 100)) {
+	if ((percent_min >= 0) && (percent_max <= 100)) {
 		video::ITexture *progress_img = tsrc->getTexture("progress_bar.png");
 		video::ITexture *progress_img_bg =
 				tsrc->getTexture("progress_bar_bg.png");
@@ -250,8 +374,10 @@ void RenderingEngine::draw_load_screen(const std::wstring &text,
 #ifndef __ANDROID__
 			const core::dimension2d<u32> &img_size =
 					progress_img_bg->getSize();
-			u32 imgW = rangelim(img_size.Width, 200, 600) * getDisplayDensity();
-			u32 imgH = rangelim(img_size.Height, 24, 72) * getDisplayDensity();
+			float density = g_settings->getFloat("gui_scaling", 0.5f, 20.0f) *
+					getDisplayDensity();
+			u32 imgW = rangelim(img_size.Width, 200, 600) * density;
+			u32 imgH = rangelim(img_size.Height, 24, 72) * density;
 #else
 			const core::dimension2d<u32> img_size(256, 48);
 			float imgRatio = (float)img_size.Height / img_size.Width;
@@ -270,18 +396,18 @@ void RenderingEngine::draw_load_screen(const std::wstring &text,
 					0, 0, true);
 
 			draw2DImageFilterScaled(get_video_driver(), progress_img,
-					core::rect<s32>(img_pos.X, img_pos.Y,
-							img_pos.X + (percent * imgW) / 100,
+					core::rect<s32>(img_pos.X + (percent_min * imgW) / 100, img_pos.Y,
+							img_pos.X + (percent_max * imgW) / 100,
 							img_pos.Y + imgH),
-					core::rect<s32>(0, 0,
-							(percent * img_size.Width) / 100,
+					core::rect<s32>(percent_min * img_size.Width / 100, 0,
+							percent_max * img_size.Width / 100,
 							img_size.Height),
 					0, 0, true);
 		}
 	}
 
 	guienv->drawAll();
-	get_video_driver()->endScene();
+	driver->endScene();
 	guitext->remove();
 }
 
@@ -291,15 +417,16 @@ std::vector<video::E_DRIVER_TYPE> RenderingEngine::getSupportedVideoDrivers()
 	// Order by preference (best first)
 	static const video::E_DRIVER_TYPE glDrivers[] = {
 		video::EDT_OPENGL,
+		video::EDT_OPENGL3,
 		video::EDT_OGLES2,
 		video::EDT_OGLES1,
 		video::EDT_NULL,
 	};
 	std::vector<video::E_DRIVER_TYPE> drivers;
 
-	for (u32 i = 0; i < ARRLEN(glDrivers); i++) {
-		if (IrrlichtDevice::isDriverSupported(glDrivers[i]))
-			drivers.push_back(glDrivers[i]);
+	for (video::E_DRIVER_TYPE driver: glDrivers) {
+		if (IrrlichtDevice::isDriverSupported(driver))
+			drivers.push_back(driver);
 	}
 
 	return drivers;
@@ -317,9 +444,9 @@ void RenderingEngine::finalize()
 }
 
 void RenderingEngine::draw_scene(video::SColor skycolor, bool show_hud,
-		bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
+		bool draw_wield_tool, bool draw_crosshair)
 {
-	core->draw(skycolor, show_hud, show_minimap, draw_wield_tool, draw_crosshair);
+	core->draw(skycolor, show_hud, draw_wield_tool, draw_crosshair);
 }
 
 const VideoDriverInfo &RenderingEngine::getVideoDriverInfo(irr::video::E_DRIVER_TYPE type)
@@ -327,6 +454,7 @@ const VideoDriverInfo &RenderingEngine::getVideoDriverInfo(irr::video::E_DRIVER_
 	static const std::unordered_map<int, VideoDriverInfo> driver_info_map = {
 		{(int)video::EDT_NULL,   {"null",   "NULL Driver"}},
 		{(int)video::EDT_OPENGL, {"opengl", "OpenGL"}},
+		{(int)video::EDT_OPENGL3, {"opengl3", "OpenGL 3+"}},
 		{(int)video::EDT_OGLES1, {"ogles1", "OpenGL ES1"}},
 		{(int)video::EDT_OGLES2, {"ogles2", "OpenGL ES2"}},
 	};
@@ -335,18 +463,14 @@ const VideoDriverInfo &RenderingEngine::getVideoDriverInfo(irr::video::E_DRIVER_
 
 float RenderingEngine::getDisplayDensity()
 {
+	float user_factor = g_settings->getFloat("display_density_factor", 0.5f, 5.0f);
 #ifndef __ANDROID__
-	static float cached_display_density = [&] {
-		float dpi = get_raw_device()->getDisplayDensity();
-		// fall back to manually specified dpi
-		if (dpi == 0.0f)
-			dpi = g_settings->getFloat("screen_dpi");
-		return dpi / 96.0f;
-	}();
-	return std::max(cached_display_density * g_settings->getFloat("display_density_factor"), 0.5f);
-
+	float dpi = get_raw_device()->getDisplayDensity();
+	if (dpi == 0.0f)
+		dpi = 96.0f;
+	return std::max(dpi / 96.0f * user_factor, 0.5f);
 #else // __ANDROID__
-	return porting::getDisplayDensity();
+	return porting::getDisplayDensity() * user_factor;
 #endif // __ANDROID__
 }
 
@@ -362,11 +486,14 @@ void RenderingEngine::autosaveScreensizeAndCo(
 	// we do not want to save the thing. This allows users to also manually change
 	// the settings.
 
+	// Don't save the fullscreen size, we want the windowed size.
+	bool fullscreen = RenderingEngine::get_raw_device()->isFullscreen();
 	// Screen size
 	const irr::core::dimension2d<u32> current_screen_size =
 		RenderingEngine::get_video_driver()->getScreenSize();
 	// Don't replace good value with (0, 0)
-	if (current_screen_size != irr::core::dimension2d<u32>(0, 0) &&
+	if (!fullscreen &&
+			current_screen_size != irr::core::dimension2d<u32>(0, 0) &&
 			current_screen_size != initial_screen_size) {
 		g_settings->setU16("screen_w", current_screen_size.Width);
 		g_settings->setU16("screen_h", current_screen_size.Height);
diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h
index 22b8a3946..469d91a0d 100644
--- a/src/client/renderingengine.h
+++ b/src/client/renderingengine.h
@@ -25,10 +25,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include "irrlichttypes_extrabloated.h"
 #include "debug.h"
+#include "client/shader.h"
 #include "client/render/core.h"
 // include the shadow mapper classes too
 #include "client/shadows/dynamicshadowsrender.h"
 
+#ifdef SERVER
+#error Do not include in server builds
+#endif
+
 struct VideoDriverInfo {
 	std::string name;
 	std::string friendly_name;
@@ -43,6 +48,34 @@ class Minimap;
 
 class RenderingCore;
 
+// Instead of a mechanism to disable fog we just set it to be really far away
+#define FOG_RANGE_ALL (FARMESH_LIMIT*3 * BS)
+
+/* Helpers */
+
+struct FpsControl {
+	FpsControl() : last_time(0), busy_time(0), sleep_time(0) {}
+
+	void reset();
+
+	void limit(IrrlichtDevice *device, f32 *dtime, bool assume_paused = false);
+
+	u32 getBusyMs() const { return busy_time / 1000; }
+
+	// all values in microseconds (us)
+	u64 last_time, busy_time, sleep_time;
+};
+
+// Populates fogColor, fogDistance, fogShadingParameter with values from Irrlicht
+class FogShaderConstantSetterFactory : public IShaderConstantSetterFactory
+{
+public:
+	FogShaderConstantSetterFactory() {};
+	virtual IShaderConstantSetter *create();
+};
+
+/* Rendering engine class */
+
 class RenderingEngine
 {
 public:
@@ -61,7 +94,6 @@ public:
 
 	bool setupTopLevelWindow();
 	bool setWindowIcon();
-	static bool print_video_modes();
 	void cleanupMeshCache();
 
 	void removeMesh(const scene::IMesh* mesh);
@@ -100,22 +132,19 @@ public:
 		return s_singleton->m_device;
 	}
 
-	u32 get_timer_time()
-	{
-		return m_device->getTimer()->getTime();
-	}
-
 	gui::IGUIEnvironment *get_gui_env()
 	{
 		return m_device->getGUIEnvironment();
 	}
 
+	// If "indef_pos" is given, the value of "percent" is ignored and an indefinite
+	// progress bar is drawn.
 	void draw_load_screen(const std::wstring &text,
 			gui::IGUIEnvironment *guienv, ITextureSource *tsrc,
-			float dtime = 0, int percent = 0, bool sky = true);
+			float dtime = 0, int percent = 0, float *indef_pos = nullptr);
 
 	void draw_scene(video::SColor skycolor, bool show_hud,
-			bool show_minimap, bool draw_wield_tool, bool draw_crosshair);
+			bool draw_wield_tool, bool draw_crosshair);
 
 	void initialize(Client *client, Hud *hud);
 	void finalize();
@@ -139,6 +168,7 @@ public:
 			const bool initial_window_maximized);
 
 private:
+	static void settingChangedCallback(const std::string &name, void *data);
 	v2u32 _getWindowSize() const;
 
 	std::unique_ptr<RenderingCore> core;
diff --git a/src/client/shader.cpp b/src/client/shader.cpp
index abe396143..a1b89eeef 100644
--- a/src/client/shader.cpp
+++ b/src/client/shader.cpp
@@ -38,7 +38,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <IMaterialRendererServices.h>
 #include <IShaderConstantSetCallBack.h>
 #include "client/renderingengine.h"
-#include "EShaderTypes.h"
+#include <EShaderTypes.h>
+#include "gettext.h"
 #include "log.h"
 #include "gamedef.h"
 #include "client/tile.h"
@@ -49,7 +50,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 /*
 	A cache from shader name to shader path
 */
-MutexedMap<std::string, std::string> g_shadername_to_path_cache;
+static MutexedMap<std::string, std::string> g_shadername_to_path_cache;
 
 /*
 	Gets the path to a shader by first checking if the file
@@ -163,14 +164,12 @@ public:
 private:
 	StringMap m_programs;
 
-	std::string readFile(const std::string &path)
+	inline std::string readFile(const std::string &path)
 	{
-		std::ifstream is(path.c_str(), std::ios::binary);
-		if(!is.is_open())
-			return "";
-		std::ostringstream tmp_os;
-		tmp_os << is.rdbuf();
-		return tmp_os.str();
+		std::string ret;
+		if (!fs::ReadFile(path, ret, true))
+			ret.clear();
+		return ret;
 	}
 };
 
@@ -187,15 +186,15 @@ public:
 	template <typename Factories>
 	ShaderCallback(const Factories &factories)
 	{
-		for (auto &&factory : factories)
-			m_setters.emplace_back(factory->create());
+		for (auto &&factory : factories) {
+			auto *setter = factory->create();
+			if (setter)
+				m_setters.emplace_back(setter);
+		}
 	}
 
 	virtual void OnSetConstants(video::IMaterialRendererServices *services, s32 userData) override
 	{
-		video::IVideoDriver *driver = services->getVideoDriver();
-		sanity_check(driver != NULL);
-
 		for (auto &&setter : m_setters)
 			setter->onSetConstants(services);
 	}
@@ -214,61 +213,34 @@ public:
 
 class MainShaderConstantSetter : public IShaderConstantSetter
 {
-	CachedVertexShaderSetting<f32, 16> m_world_view_proj;
-	CachedVertexShaderSetting<f32, 16> m_world;
-
-	// Shadow-related
-	CachedPixelShaderSetting<f32, 16> m_shadow_view_proj;
-	CachedPixelShaderSetting<f32, 3> m_light_direction;
-	CachedPixelShaderSetting<f32> m_texture_res;
-	CachedPixelShaderSetting<f32> m_shadow_strength;
-	CachedPixelShaderSetting<f32> m_time_of_day;
-	CachedPixelShaderSetting<f32> m_shadowfar;
-	CachedPixelShaderSetting<f32, 4> m_camera_pos;
-	CachedPixelShaderSetting<s32> m_shadow_texture;
-	CachedVertexShaderSetting<f32> m_perspective_bias0_vertex;
-	CachedPixelShaderSetting<f32> m_perspective_bias0_pixel;
-	CachedVertexShaderSetting<f32> m_perspective_bias1_vertex;
-	CachedPixelShaderSetting<f32> m_perspective_bias1_pixel;
-	CachedVertexShaderSetting<f32> m_perspective_zbias_vertex;
-	CachedPixelShaderSetting<f32> m_perspective_zbias_pixel;
+	CachedVertexShaderSetting<f32, 16> m_world_view_proj{"mWorldViewProj"};
+	CachedVertexShaderSetting<f32, 16> m_world{"mWorld"};
 
 	// Modelview matrix
-	CachedVertexShaderSetting<float, 16> m_world_view;
+	CachedVertexShaderSetting<float, 16> m_world_view{"mWorldView"};
 	// Texture matrix
-	CachedVertexShaderSetting<float, 16> m_texture;
+	CachedVertexShaderSetting<float, 16> m_texture{"mTexture"};
+
+	// commonly used way to pass material color to shader
+	video::SColor m_emissive_color;
+	CachedPixelShaderSetting<float, 4> m_emissive_color_setting{"emissiveColor"};
 
 public:
-	MainShaderConstantSetter() :
-		  m_world_view_proj("mWorldViewProj")
-		, m_world("mWorld")
-		, m_shadow_view_proj("m_ShadowViewProj")
-		, m_light_direction("v_LightDirection")
-		, m_texture_res("f_textureresolution")
-		, m_shadow_strength("f_shadow_strength")
-		, m_time_of_day("f_timeofday")
-		, m_shadowfar("f_shadowfar")
-		, m_camera_pos("CameraPos")
-		, m_shadow_texture("ShadowMapSampler")
-		, m_perspective_bias0_vertex("xyPerspectiveBias0")
-		, m_perspective_bias0_pixel("xyPerspectiveBias0")
-		, m_perspective_bias1_vertex("xyPerspectiveBias1")
-		, m_perspective_bias1_pixel("xyPerspectiveBias1")
-		, m_perspective_zbias_vertex("zPerspectiveBias")
-		, m_perspective_zbias_pixel("zPerspectiveBias")
-		, m_world_view("mWorldView")
-		, m_texture("mTexture")
-	{}
 	~MainShaderConstantSetter() = default;
 
+	virtual void onSetMaterial(const video::SMaterial& material) override
+	{
+		m_emissive_color = material.EmissiveColor;
+	}
+
 	virtual void onSetConstants(video::IMaterialRendererServices *services) override
 	{
 		video::IVideoDriver *driver = services->getVideoDriver();
-		sanity_check(driver);
+		assert(driver);
 
 		// Set world matrix
 		core::matrix4 world = driver->getTransform(video::ETS_WORLD);
-		m_world.set(*reinterpret_cast<float(*)[16]>(world.pointer()), services);
+		m_world.set(world, services);
 
 		// Set clip matrix
 		core::matrix4 worldView;
@@ -278,57 +250,16 @@ public:
 		core::matrix4 worldViewProj;
 		worldViewProj = driver->getTransform(video::ETS_PROJECTION);
 		worldViewProj *= worldView;
-		m_world_view_proj.set(*reinterpret_cast<float(*)[16]>(worldViewProj.pointer()), services);
+		m_world_view_proj.set(worldViewProj, services);
 
-		if (driver->getDriverType() == video::EDT_OGLES2) {
+		if (driver->getDriverType() == video::EDT_OGLES2 || driver->getDriverType() == video::EDT_OPENGL3) {
 			core::matrix4 texture = driver->getTransform(video::ETS_TEXTURE_0);
-			m_world_view.set(*reinterpret_cast<float(*)[16]>(worldView.pointer()), services);
-			m_texture.set(*reinterpret_cast<float(*)[16]>(texture.pointer()), services);
+			m_world_view.set(worldView, services);
+			m_texture.set(texture, services);
 		}
 
-		// Set uniforms for Shadow shader
-		if (ShadowRenderer *shadow = RenderingEngine::get_shadow_renderer()) {
-			const auto &light = shadow->getDirectionalLight();
-
-			core::matrix4 shadowViewProj = light.getProjectionMatrix();
-			shadowViewProj *= light.getViewMatrix();
-			m_shadow_view_proj.set(shadowViewProj.pointer(), services);
-
-			f32 v_LightDirection[3];
-			light.getDirection().getAs3Values(v_LightDirection);
-			m_light_direction.set(v_LightDirection, services);
-
-			f32 TextureResolution = light.getMapResolution();
-			m_texture_res.set(&TextureResolution, services);
-
-			f32 ShadowStrength = shadow->getShadowStrength();
-			m_shadow_strength.set(&ShadowStrength, services);
-
-			f32 timeOfDay = shadow->getTimeOfDay();
-			m_time_of_day.set(&timeOfDay, services);
-
-			f32 shadowFar = shadow->getMaxShadowFar();
-			m_shadowfar.set(&shadowFar, services);
-
-			f32 cam_pos[4];
-			shadowViewProj.transformVect(cam_pos, light.getPlayerPos());
-			m_camera_pos.set(cam_pos, services);
-
-			// I don't like using this hardcoded value. maybe something like
-			// MAX_TEXTURE - 1 or somthing like that??
-			s32 TextureLayerID = 3;
-			m_shadow_texture.set(&TextureLayerID, services);
-
-			f32 bias0 = shadow->getPerspectiveBiasXY();
-			m_perspective_bias0_vertex.set(&bias0, services);
-			m_perspective_bias0_pixel.set(&bias0, services);
-			f32 bias1 = 1.0f - bias0 + 1e-5f;
-			m_perspective_bias1_vertex.set(&bias1, services);
-			m_perspective_bias1_pixel.set(&bias1, services);
-			f32 zbias = shadow->getPerspectiveBiasZ();
-			m_perspective_zbias_vertex.set(&zbias, services);
-			m_perspective_zbias_pixel.set(&zbias, services);
-		}
+		video::SColorf emissive_color(m_emissive_color);
+		m_emissive_color_setting.set(emissive_color, services);
 	}
 };
 
@@ -349,6 +280,7 @@ class ShaderSource : public IWritableShaderSource
 {
 public:
 	ShaderSource();
+	~ShaderSource() override;
 
 	/*
 		- If shader material specified by name is found from cache,
@@ -407,8 +339,10 @@ private:
 	// The former container is behind this mutex
 	std::mutex m_shaderinfo_cache_mutex;
 
+#if 0
 	// Queued shader fetches (to be processed by the main thread)
 	RequestQueue<std::string, u32, u8, u8> m_get_shader_queue;
+#endif
 
 	// Global constant setter factories
 	std::vector<std::unique_ptr<IShaderConstantSetterFactory>> m_setter_factories;
@@ -434,6 +368,20 @@ ShaderSource::ShaderSource()
 	addShaderConstantSetterFactory(new MainShaderConstantSetterFactory());
 }
 
+ShaderSource::~ShaderSource()
+{
+	MutexAutoLock lock(m_shaderinfo_cache_mutex);
+
+	// Delete materials
+	video::IGPUProgrammingServices *gpu = RenderingEngine::get_video_driver()->
+		getGPUProgrammingServices();
+	for (ShaderInfo &i : m_shaderinfo_cache) {
+		if (!i.name.empty())
+			gpu->deleteShaderMaterial(i.material);
+	}
+	m_shaderinfo_cache.clear();
+}
+
 u32 ShaderSource::getShader(const std::string &name,
 		MaterialType material_type, NodeDrawType drawtype)
 {
@@ -445,8 +393,10 @@ u32 ShaderSource::getShader(const std::string &name,
 		return getShaderIdDirect(name, material_type, drawtype);
 	}
 
-	/*errorstream<<"getShader(): Queued: name=\""<<name<<"\""<<std::endl;*/
+	errorstream << "ShaderSource::getShader(): getting from "
+		"other thread not implemented" << std::endl;
 
+#if 0
 	// We're gonna ask the result to be put into here
 
 	static ResultQueue<std::string, u32, u8, u8> result_queue;
@@ -469,6 +419,7 @@ u32 ShaderSource::getShader(const std::string &name,
 	}
 
 	infostream << "getShader(): Failed" << std::endl;
+#endif
 
 	return 0;
 }
@@ -552,15 +503,15 @@ void ShaderSource::rebuildShaders()
 {
 	MutexAutoLock lock(m_shaderinfo_cache_mutex);
 
-	/*// Oh well... just clear everything, they'll load sometime.
-	m_shaderinfo_cache.clear();
-	m_name_to_id.clear();*/
-
-	/*
-		FIXME: Old shader materials can't be deleted in Irrlicht,
-		or can they?
-		(This would be nice to do in the destructor too)
-	*/
+	// Delete materials
+	video::IGPUProgrammingServices *gpu = RenderingEngine::get_video_driver()->
+		getGPUProgrammingServices();
+	for (ShaderInfo &i : m_shaderinfo_cache) {
+		if (!i.name.empty()) {
+			gpu->deleteShaderMaterial(i.material);
+			i.material = video::EMT_SOLID; // invalidate
+		}
+	}
 
 	// Recreate shaders
 	for (ShaderInfo &i : m_shaderinfo_cache) {
@@ -606,24 +557,26 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 		return shaderinfo;
 
 	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	if (!driver->queryFeature(video::EVDF_ARB_GLSL)) {
-		errorstream << "Shaders are enabled but GLSL is not supported by the driver\n";
-		return shaderinfo;
-	}
 	video::IGPUProgrammingServices *gpu = driver->getGPUProgrammingServices();
+	if (!driver->queryFeature(video::EVDF_ARB_GLSL) || !gpu) {
+		throw ShaderException(gettext("Shaders are enabled but GLSL is not "
+			"supported by the driver."));
+	}
 
 	// Create shaders header
-	bool use_gles = driver->getDriverType() == video::EDT_OGLES2;
+	bool fully_programmable = driver->getDriverType() == video::EDT_OGLES2 || driver->getDriverType() == video::EDT_OPENGL3;
 	std::stringstream shaders_header;
 	shaders_header
 		<< std::noboolalpha
 		<< std::showpoint // for GLSL ES
 		;
 	std::string vertex_header, fragment_header, geometry_header;
-	if (use_gles) {
-		shaders_header << R"(
-			#version 100
-		)";
+	if (fully_programmable) {
+		if (driver->getDriverType() == video::EDT_OPENGL3) {
+			shaders_header << "#version 150\n";
+		} else {
+			shaders_header << "#version 100\n";
+		}
 		vertex_header = R"(
 			precision mediump float;
 
@@ -669,15 +622,7 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 		#define textureFlags texture2
 	)";
 
-	// Since this is the first time we're using the GL bindings be extra careful.
-	// This should be removed before 5.6.0 or similar.
-	if (!GL.GetString) {
-		errorstream << "OpenGL procedures were not loaded correctly, "
-			"please open a bug report with details about your platform/OS." << std::endl;
-		abort();
-	}
-
-	bool use_discard = use_gles;
+	bool use_discard = fully_programmable;
 	// For renderers that should use discard instead of GL_ALPHA_TEST
 	const char *renderer = reinterpret_cast<const char*>(GL.GetString(GL.RENDERER));
 	if (strstr(renderer, "GC7000"))
@@ -771,6 +716,13 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 		shaders_header << "#define SSAA_SCALE " << ssaa_scale << ".\n";
 	}
 
+	if (g_settings->getBool("debanding"))
+		shaders_header << "#define ENABLE_DITHERING 1\n";
+
+	if (g_settings->getBool("enable_volumetric_lighting")) {
+		shaders_header << "#define VOLUMETRIC_LIGHT 1\n";
+	}
+
 	shaders_header << "#line 0\n"; // reset the line counter for meaningful diagnostics
 
 	std::string common_header = shaders_header.str();
@@ -802,7 +754,9 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 		dumpShaderProgram(warningstream, "Vertex", vertex_shader);
 		dumpShaderProgram(warningstream, "Fragment", fragment_shader);
 		dumpShaderProgram(warningstream, "Geometry", geometry_shader);
-		return shaderinfo;
+		throw ShaderException(
+			fmtgettext("Failed to compile the \"%s\" shader.", name.c_str()) +
+			strgettext("\nCheck debug.txt for details."));
 	}
 
 	// Apply the newly created material type
@@ -811,7 +765,7 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 }
 
 void dumpShaderProgram(std::ostream &output_stream,
-		const std::string &program_type, const std::string &program)
+		const std::string &program_type, std::string_view program)
 {
 	output_stream << program_type << " shader program:" << std::endl <<
 		"----------------------------------" << std::endl;
diff --git a/src/client/shader.h b/src/client/shader.h
index da589a6c6..785f04bfc 100644
--- a/src/client/shader.h
+++ b/src/client/shader.h
@@ -26,7 +26,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlichttypes_bloated.h"
 #include <IMaterialRendererServices.h>
 #include <string>
-#include "tile.h"
 #include "nodedef.h"
 
 class IGameDef;
@@ -108,6 +107,57 @@ public:
 			has_been_set = true;
 		}
 	}
+
+	/* Type specializations */
+
+	/*
+	 * T2 looks redundant here but it is necessary so the compiler won't
+	 * resolve the templates at class instantiation and then fail because
+	 * some of these methods don't have valid types (= are not usable).
+	 * ref: <https://stackoverflow.com/a/6972771>
+	 *
+	 * Note: a `bool dummy` template parameter would have been easier but MSVC
+	 * does not like that. Also make sure not to define different specializations
+	 * with the same parameters, MSVC doesn't like that either.
+	 * I extend my thanks to Microsoft®
+	 */
+#define SPECIALIZE(_type, _count_expr) \
+	template<typename T2 = T> \
+	std::enable_if_t<std::is_same_v<T, T2> && std::is_same_v<T2, _type> && (_count_expr)>
+
+	SPECIALIZE(float, count == 2)
+	set(const v2f value, video::IMaterialRendererServices *services)
+	{
+		float array[2] = { value.X, value.Y };
+		set(array, services);
+	}
+
+	SPECIALIZE(float, count == 3)
+	set(const v3f value, video::IMaterialRendererServices *services)
+	{
+		float array[3] = { value.X, value.Y, value.Z };
+		set(array, services);
+	}
+
+	SPECIALIZE(float, count == 3 || count == 4)
+	set(const video::SColorf value, video::IMaterialRendererServices *services)
+	{
+		if constexpr (count == 3) {
+			float array[3] = { value.r, value.g, value.b };
+			set(array, services);
+		} else {
+			float array[4] = { value.r, value.g, value.b, value.a };
+			set(array, services);
+		}
+	}
+
+	SPECIALIZE(float, count == 16)
+	set(const core::matrix4 &value, video::IMaterialRendererServices *services)
+	{
+		set(value.pointer(), services);
+	}
+
+#undef SPECIALIZE
 };
 
 template <typename T, std::size_t count = 1, bool cache=true>
@@ -195,4 +245,4 @@ public:
 IWritableShaderSource *createShaderSource();
 
 void dumpShaderProgram(std::ostream &output_stream,
-	const std::string &program_type, const std::string &program);
+	const std::string &program_type, std::string_view program);
diff --git a/src/client/shadows/dynamicshadows.cpp b/src/client/shadows/dynamicshadows.cpp
index f717cc8b0..11db9bea7 100644
--- a/src/client/shadows/dynamicshadows.cpp
+++ b/src/client/shadows/dynamicshadows.cpp
@@ -42,7 +42,6 @@ static v3f quantizeDirection(v3f direction, float step)
 void DirectionalLight::createSplitMatrices(const Camera *cam)
 {
 	static const float COS_15_DEG = 0.965926f;
-	v3f newCenter;
 	v3f look = cam->getDirection().normalize();
 
 	// if current look direction is < 15 degrees away from the captured
diff --git a/src/client/shadows/dynamicshadowsrender.cpp b/src/client/shadows/dynamicshadowsrender.cpp
index d8dcbdf73..e42d8db01 100644
--- a/src/client/shadows/dynamicshadowsrender.cpp
+++ b/src/client/shadows/dynamicshadowsrender.cpp
@@ -121,14 +121,20 @@ void ShadowRenderer::disable()
 		});
 }
 
+void ShadowRenderer::preInit(IWritableShaderSource *shsrc)
+{
+	if (g_settings->getBool("enable_shaders") &&
+			g_settings->getBool("enable_dynamic_shadows")) {
+		shsrc->addShaderConstantSetterFactory(new ShadowConstantSetterFactory());
+	}
+}
+
 void ShadowRenderer::initialize()
 {
 	auto *gpu = m_driver->getGPUProgrammingServices();
 
 	// we need glsl
-	if (m_shadows_supported && gpu && m_driver->queryFeature(video::EVDF_ARB_GLSL)) {
-		createShaders();
-	} else {
+	if (!m_shadows_supported || !gpu || !m_driver->queryFeature(video::EVDF_ARB_GLSL)) {
 		m_shadows_supported = false;
 
 		warningstream << "Shadows: GLSL Shader not supported on this system."
@@ -136,6 +142,9 @@ void ShadowRenderer::initialize()
 		return;
 	}
 
+	createShaders();
+	
+
 	m_texture_format = m_shadow_map_texture_32bit
 					   ? video::ECOLOR_FORMAT::ECF_R32F
 					   : video::ECOLOR_FORMAT::ECF_R16F;
@@ -174,8 +183,8 @@ f32 ShadowRenderer::getMaxShadowFar() const
 
 void ShadowRenderer::setShadowIntensity(float shadow_intensity)
 {
-	m_shadow_strength = pow(shadow_intensity, 1.0f / m_shadow_strength_gamma);
-	if (m_shadow_strength > 1E-2)
+	m_shadow_strength = std::pow(shadow_intensity, 1.0f / m_shadow_strength_gamma);
+	if (m_shadow_strength > 1e-2f)
 		enable();
 	else
 		disable();
@@ -186,8 +195,7 @@ void ShadowRenderer::addNodeToShadowList(
 {
 	m_shadow_node_array.emplace_back(node, shadowMode);
 	// node should never be ClientMap
-	assert(strcmp(node->getName(), "ClientMap") != 0);
-
+	assert(!node->getName().has_value() || *node->getName() != "ClientMap");
 	node->forEachMaterial([this] (auto &mat) {
 		mat.setTexture(TEXTURE_LAYER_SHADOW, shadowMapTextureFinal);
 	});
@@ -705,7 +713,8 @@ std::string ShadowRenderer::readShaderFile(const std::string &path)
 	prefix.append("#line 0\n");
 
 	std::string content;
-	fs::ReadFile(path, content);
+	if (!fs::ReadFile(path, content, true))
+		return "";
 
 	return prefix + content;
 }
diff --git a/src/client/shadows/dynamicshadowsrender.h b/src/client/shadows/dynamicshadowsrender.h
index 7fe3461bc..fc139e28b 100644
--- a/src/client/shadows/dynamicshadowsrender.h
+++ b/src/client/shadows/dynamicshadowsrender.h
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class ShadowDepthShaderCB;
 class shadowScreenQuad;
 class shadowScreenQuadCB;
+class IWritableShaderSource;
 
 enum E_SHADOW_MODE : u8
 {
@@ -54,9 +55,13 @@ public:
 	static const int TEXTURE_LAYER_SHADOW = 3;
 
 	ShadowRenderer(IrrlichtDevice *device, Client *client);
-
 	~ShadowRenderer();
 
+	// Call before generating any shaders
+	// This is required because this class is initialized much later than all
+	// the shaders are dealt with.
+	static void preInit(IWritableShaderSource *shsrc);
+
 	void initialize();
 
 	/// Adds a directional light shadow map (Usually just one (the sun) except in
diff --git a/src/client/shadows/shadowsScreenQuad.h b/src/client/shadows/shadowsScreenQuad.h
index c18be9a2b..fe54b89c8 100644
--- a/src/client/shadows/shadowsScreenQuad.h
+++ b/src/client/shadows/shadowsScreenQuad.h
@@ -39,16 +39,12 @@ private:
 class shadowScreenQuadCB : public video::IShaderConstantSetCallBack
 {
 public:
-	shadowScreenQuadCB() :
-			m_sm_client_map_setting("ShadowMapClientMap"),
-			m_sm_client_map_trans_setting("ShadowMapClientMapTraslucent"),
-			m_sm_dynamic_sampler_setting("ShadowMapSamplerdynamic")
-	{}
-
 	virtual void OnSetConstants(video::IMaterialRendererServices *services,
 			s32 userData);
 private:
-	CachedPixelShaderSetting<s32> m_sm_client_map_setting;
-	CachedPixelShaderSetting<s32> m_sm_client_map_trans_setting;
-	CachedPixelShaderSetting<s32> m_sm_dynamic_sampler_setting;
+	CachedPixelShaderSetting<s32> m_sm_client_map_setting{"ShadowMapClientMap"};
+	CachedPixelShaderSetting<s32>
+		m_sm_client_map_trans_setting{"ShadowMapClientMapTraslucent"};
+	CachedPixelShaderSetting<s32>
+		m_sm_dynamic_sampler_setting{"ShadowMapSamplerdynamic"};
 };
diff --git a/src/client/shadows/shadowsshadercallbacks.cpp b/src/client/shadows/shadowsshadercallbacks.cpp
index b571ea939..32d3e36be 100644
--- a/src/client/shadows/shadowsshadercallbacks.cpp
+++ b/src/client/shadows/shadowsshadercallbacks.cpp
@@ -18,6 +18,51 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "client/shadows/shadowsshadercallbacks.h"
+#include "client/renderingengine.h"
+
+void ShadowConstantSetter::onSetConstants(video::IMaterialRendererServices *services)
+{
+	auto *shadow = RenderingEngine::get_shadow_renderer();
+	if (!shadow)
+		return;
+
+	const auto &light = shadow->getDirectionalLight();
+
+	core::matrix4 shadowViewProj = light.getProjectionMatrix();
+	shadowViewProj *= light.getViewMatrix();
+	m_shadow_view_proj.set(shadowViewProj.pointer(), services);
+
+	m_light_direction.set(light.getDirection(), services);
+
+	f32 TextureResolution = light.getMapResolution();
+	m_texture_res.set(&TextureResolution, services);
+
+	f32 ShadowStrength = shadow->getShadowStrength();
+	m_shadow_strength.set(&ShadowStrength, services);
+
+	f32 timeOfDay = shadow->getTimeOfDay();
+	m_time_of_day.set(&timeOfDay, services);
+
+	f32 shadowFar = shadow->getMaxShadowFar();
+	m_shadowfar.set(&shadowFar, services);
+
+	f32 cam_pos[4];
+	shadowViewProj.transformVect(cam_pos, light.getPlayerPos());
+	m_camera_pos.set(cam_pos, services);
+
+	s32 TextureLayerID = ShadowRenderer::TEXTURE_LAYER_SHADOW;
+	m_shadow_texture.set(&TextureLayerID, services);
+
+	f32 bias0 = shadow->getPerspectiveBiasXY();
+	m_perspective_bias0_vertex.set(&bias0, services);
+	m_perspective_bias0_pixel.set(&bias0, services);
+	f32 bias1 = 1.0f - bias0 + 1e-5f;
+	m_perspective_bias1_vertex.set(&bias1, services);
+	m_perspective_bias1_pixel.set(&bias1, services);
+	f32 zbias = shadow->getPerspectiveBiasZ();
+	m_perspective_zbias_vertex.set(&zbias, services);
+	m_perspective_zbias_pixel.set(&zbias, services);
+}
 
 void ShadowDepthShaderCB::OnSetConstants(
 		video::IMaterialRendererServices *services, s32 userData)
@@ -32,7 +77,7 @@ void ShadowDepthShaderCB::OnSetConstants(
 
 	lightMVP *= driver->getTransform(video::ETS_WORLD);
 
-	m_light_mvp_setting.set(lightMVP.pointer(), services);
+	m_light_mvp_setting.set(lightMVP, services);
 	m_map_resolution_setting.set(&MapRes, services);
 	m_max_far_setting.set(&MaxFar, services);
 	s32 TextureId = 0;
diff --git a/src/client/shadows/shadowsshadercallbacks.h b/src/client/shadows/shadowsshadercallbacks.h
index 87833c0ec..af83f021e 100644
--- a/src/client/shadows/shadowsshadercallbacks.h
+++ b/src/client/shadows/shadowsshadercallbacks.h
@@ -23,20 +23,50 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IShaderConstantSetCallBack.h>
 #include "client/shader.h"
 
+// Used by main game rendering
+
+class ShadowConstantSetter : public IShaderConstantSetter
+{
+	CachedPixelShaderSetting<f32, 16> m_shadow_view_proj{"m_ShadowViewProj"};
+	CachedPixelShaderSetting<f32, 3> m_light_direction{"v_LightDirection"};
+	CachedPixelShaderSetting<f32> m_texture_res{"f_textureresolution"};
+	CachedPixelShaderSetting<f32> m_shadow_strength{"f_shadow_strength"};
+	CachedPixelShaderSetting<f32> m_time_of_day{"f_timeofday"};
+	CachedPixelShaderSetting<f32> m_shadowfar{"f_shadowfar"};
+	CachedPixelShaderSetting<f32, 4> m_camera_pos{"CameraPos"};
+	CachedPixelShaderSetting<s32> m_shadow_texture{"ShadowMapSampler"};
+	CachedVertexShaderSetting<f32>
+		m_perspective_bias0_vertex{"xyPerspectiveBias0"};
+	CachedPixelShaderSetting<f32>
+		m_perspective_bias0_pixel{"xyPerspectiveBias0"};
+	CachedVertexShaderSetting<f32>
+		m_perspective_bias1_vertex{"xyPerspectiveBias1"};
+	CachedPixelShaderSetting<f32>
+		m_perspective_bias1_pixel{"xyPerspectiveBias1"};
+	CachedVertexShaderSetting<f32>
+		m_perspective_zbias_vertex{"zPerspectiveBias"};
+	CachedPixelShaderSetting<f32> m_perspective_zbias_pixel{"zPerspectiveBias"};
+
+public:
+	ShadowConstantSetter() = default;
+	~ShadowConstantSetter() = default;
+
+	virtual void onSetConstants(video::IMaterialRendererServices *services) override;
+};
+
+class ShadowConstantSetterFactory : public IShaderConstantSetterFactory
+{
+public:
+	virtual IShaderConstantSetter *create() {
+		return new ShadowConstantSetter();
+	}
+};
+
+// Used by depth shader
+
 class ShadowDepthShaderCB : public video::IShaderConstantSetCallBack
 {
 public:
-	ShadowDepthShaderCB() :
-			m_light_mvp_setting("LightMVP"),
-			m_map_resolution_setting("MapResolution"),
-			m_max_far_setting("MaxFar"),
-			m_color_map_sampler_setting("ColorMapSampler"),
-			m_perspective_bias0("xyPerspectiveBias0"),
-			m_perspective_bias1("xyPerspectiveBias1"),
-			m_perspective_zbias("zPerspectiveBias"),
-			m_cam_pos_setting("CameraPos")
-	{}
-
 	void OnSetMaterial(const video::SMaterial &material) override {}
 
 	void OnSetConstants(video::IMaterialRendererServices *services,
@@ -47,12 +77,13 @@ public:
 	v3f CameraPos;
 
 private:
-	CachedVertexShaderSetting<f32, 16> m_light_mvp_setting;
-	CachedVertexShaderSetting<f32> m_map_resolution_setting;
-	CachedVertexShaderSetting<f32> m_max_far_setting;
-	CachedPixelShaderSetting<s32> m_color_map_sampler_setting;
-	CachedVertexShaderSetting<f32> m_perspective_bias0;
-	CachedVertexShaderSetting<f32> m_perspective_bias1;
-	CachedVertexShaderSetting<f32> m_perspective_zbias;
-	CachedVertexShaderSetting<f32, 4> m_cam_pos_setting;
+	CachedVertexShaderSetting<f32, 16> m_light_mvp_setting{"LightMVP"};
+	CachedVertexShaderSetting<f32> m_map_resolution_setting{"MapResolution"};
+	CachedVertexShaderSetting<f32> m_max_far_setting{"MaxFar"};
+	CachedPixelShaderSetting<s32>
+		m_color_map_sampler_setting{"ColorMapSampler"};
+	CachedVertexShaderSetting<f32> m_perspective_bias0{"xyPerspectiveBias0"};
+	CachedVertexShaderSetting<f32> m_perspective_bias1{"xyPerspectiveBias1"};
+	CachedVertexShaderSetting<f32> m_perspective_zbias{"zPerspectiveBias"};
+	CachedVertexShaderSetting<f32, 4> m_cam_pos_setting{"CameraPos"};
 };
diff --git a/src/client/sky.cpp b/src/client/sky.cpp
index f8dc95ab4..014ae9277 100644
--- a/src/client/sky.cpp
+++ b/src/client/sky.cpp
@@ -81,6 +81,7 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade
 	// Create materials
 
 	m_materials[0] = baseMaterial();
+	// FIXME: shouldn't this check m_enable_shaders?
 	m_materials[0].MaterialType = ssrc->getShaderInfo(ssrc->getShader("stars_shader", TILE_MATERIAL_ALPHA)).material;
 	m_materials[0].Lighting = true;
 	m_materials[0].ColorMaterial = video::ECM_NONE;
@@ -150,7 +151,7 @@ void Sky::render()
 	if (!camera || !driver)
 		return;
 
-	ScopeProfiler sp(g_profiler, "Sky::render()", SPT_AVG);
+	ScopeProfiler sp(g_profiler, "Sky::render()", SPT_AVG, PRECISION_MICRO);
 
 	// Draw perspective skybox
 
@@ -560,9 +561,9 @@ void Sky::update(float time_of_day, float time_brightness,
 				);
 			} else {
 				pointcolor_moon_f = video::SColorf(
-					(m_sky_params.fog_moon_tint.getRed() / 255) * pointcolor_light,
-					(m_sky_params.fog_moon_tint.getGreen() / 255) * pointcolor_light,
-					(m_sky_params.fog_moon_tint.getBlue() / 255) * pointcolor_light,
+					(m_sky_params.fog_moon_tint.getRed() / 255.0f) * pointcolor_light,
+					(m_sky_params.fog_moon_tint.getGreen() / 255.0f) * pointcolor_light,
+					(m_sky_params.fog_moon_tint.getBlue() / 255.0f) * pointcolor_light,
 					1
 				);
 			}
@@ -751,14 +752,15 @@ void Sky::draw_stars(video::IVideoDriver * driver, float wicked_time_of_day)
 
 	float tod = wicked_time_of_day < 0.5f ? wicked_time_of_day : (1.0f - wicked_time_of_day);
 	float day_opacity = clamp(m_star_params.day_opacity, 0.0f, 1.0f);
-	float starbrightness = (0.25f - fabs(tod)) * 20.0f;
+	float starbrightness = (0.25f - std::abs(tod)) * 20.0f;
 	float alpha = clamp(starbrightness, day_opacity, 1.0f);
 
-	m_star_color = m_star_params.starcolor;
-	m_star_color.a *= alpha;
-	if (m_star_color.a <= 0.0f) // Stars are only drawn when not fully transparent
+	video::SColorf color(m_star_params.starcolor);
+	color.a *= alpha;
+	if (color.a <= 0.0f) // Stars are only drawn when not fully transparent
 		return;
-	m_materials[0].DiffuseColor = m_materials[0].EmissiveColor = m_star_color.toSColor();
+	m_materials[0].EmissiveColor = color.toSColor();
+
 	auto sky_rotation = core::matrix4().setRotationAxisRadians(2.0f * M_PI * (wicked_time_of_day - 0.25f), v3f(0.0f, 0.0f, 1.0f));
 	auto world_matrix = driver->getTransform(video::ETS_WORLD);
 	driver->setTransform(video::ETS_WORLD, world_matrix * sky_rotation);
diff --git a/src/client/sky.h b/src/client/sky.h
index 6827dba24..6509b2b1b 100644
--- a/src/client/sky.h
+++ b/src/client/sky.h
@@ -68,12 +68,12 @@ public:
 
 	float getBrightness() { return m_brightness; }
 
-	const video::SColor &getBgColor() const
+	video::SColor getBgColor() const
 	{
 		return m_visible ? m_bgcolor : m_fallback_bg_color;
 	}
 
-	const video::SColor &getSkyColor() const
+	video::SColor getSkyColor() const
 	{
 		return m_visible ? m_skycolor : m_fallback_bg_color;
 	}
@@ -104,6 +104,7 @@ public:
 	const video::SColorf &getCloudColor() const { return m_cloudcolor_f; }
 
 	void setVisible(bool visible) { m_visible = visible; }
+
 	// Set only from set_sky API
 	void setCloudsEnabled(bool clouds_enabled) { m_clouds_enabled = clouds_enabled; }
 	void setFallbackBgColor(video::SColor fallback_bg_color)
@@ -125,15 +126,23 @@ public:
 		const std::string &use_sun_tint);
 	void setInClouds(bool clouds) { m_in_clouds = clouds; }
 	void clearSkyboxTextures() { m_sky_params.textures.clear(); }
-	void addTextureToSkybox(const  std::string &texture, int material_id,
+	void addTextureToSkybox(const std::string &texture, int material_id,
 		ITextureSource *tsrc);
-	const video::SColorf &getCurrentStarColor() const { return m_star_color; }
+
+	// Note: the Sky class doesn't use these values. It just stores them.
 	void setFogDistance(s16 fog_distance) { m_sky_params.fog_distance = fog_distance; }
 	s16 getFogDistance() const { return m_sky_params.fog_distance; }
 
 	void setFogStart(float fog_start) { m_sky_params.fog_start = fog_start; }
 	float getFogStart() const { return m_sky_params.fog_start; }
 
+	void setFogColor(video::SColor v) { m_sky_params.fog_color = v; }
+	video::SColor getFogColor() const {
+		if (m_sky_params.fog_color.getAlpha() > 0)
+			return m_sky_params.fog_color;
+		return getBgColor();
+	}
+
 private:
 	aabb3f m_box;
 	video::SMaterial m_materials[SKY_MATERIAL_COUNT];
@@ -214,7 +223,6 @@ private:
 
 	u64 m_seed = 0;
 	irr_ptr<scene::SMeshBuffer> m_stars;
-	video::SColorf m_star_color;
 
 	video::ITexture *m_sun_texture;
 	video::ITexture *m_moon_texture;
diff --git a/src/client/sound.cpp b/src/client/sound.cpp
index 258173336..fe2fa9b91 100644
--- a/src/client/sound.cpp
+++ b/src/client/sound.cpp
@@ -2,7 +2,6 @@
 Minetest
 Copyright (C) 2023 DS
 
-/*
 This file is part of Freeminer.
 
 Freeminer is free software: you can redistribute it and/or modify
@@ -24,6 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "filesys.h"
 #include "log.h"
 #include "porting.h"
+#include "settings.h"
 #include "util/numeric.h"
 #include <algorithm>
 #include <string>
@@ -97,3 +97,26 @@ void ISoundManager::freeId(sound_handle_t id, u32 num_owners)
 	else
 		it->second -= num_owners;
 }
+
+void sound_volume_control(ISoundManager *sound_mgr, bool is_window_active)
+{
+	bool mute_sound = g_settings->getBool("mute_sound");
+	if (mute_sound) {
+		sound_mgr->setListenerGain(0.0f);
+	} else {
+		// Check if volume is in the proper range, else fix it.
+		float old_volume = g_settings->getFloat("sound_volume");
+		float new_volume = rangelim(old_volume, 0.0f, 1.0f);
+
+		if (old_volume != new_volume) {
+			g_settings->setFloat("sound_volume", new_volume);
+		}
+
+		if (!is_window_active) {
+			new_volume *= g_settings->getFloat("sound_volume_unfocused");
+			new_volume = rangelim(new_volume, 0.0f, 1.0f);
+		}
+
+		sound_mgr->setListenerGain(new_volume);
+	}
+}
diff --git a/src/client/sound.h b/src/client/sound.h
index ad5dbf649..8b19f7761 100644
--- a/src/client/sound.h
+++ b/src/client/sound.h
@@ -26,6 +26,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <unordered_set>
 #include <vector>
 
+#ifdef SERVER
+#error Do not include in server builds
+#endif
+
 struct SoundSpec;
 
 class SoundFallbackPathProvider
@@ -184,3 +188,9 @@ public:
 	void fadeSound(sound_handle_t sound, f32 step, f32 target_gain) override {}
 	void updateSoundPosVel(sound_handle_t sound, const v3f &pos, const v3f &vel) override {}
 };
+
+/**
+ * A helper function to control sound volume based on some values: sound volume
+ * settings, mute sound setting, and window activity.
+ */
+void sound_volume_control(ISoundManager *sound_mgr, bool is_window_active);
diff --git a/src/client/sound/al_extensions.cpp b/src/client/sound/al_extensions.cpp
new file mode 100644
index 000000000..bc696be35
--- /dev/null
+++ b/src/client/sound/al_extensions.cpp
@@ -0,0 +1,58 @@
+/*
+Minetest
+Copyright (C) 2023 DS
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "al_extensions.h"
+
+#include "settings.h"
+#include "util/string.h"
+#include <unordered_set>
+
+namespace sound {
+
+ALExtensions::ALExtensions(const ALCdevice *deviceHandle [[maybe_unused]])
+{
+	auto blacklist_vec = str_split(g_settings->get("sound_extensions_blacklist"), ',');
+	for (auto &s : blacklist_vec) {
+		s = trim(s);
+	}
+	std::unordered_set<std::string> blacklist;
+	blacklist.insert(blacklist_vec.begin(), blacklist_vec.end());
+
+	{
+		constexpr const char *ext_name = "AL_SOFT_direct_channels_remix";
+		bool blacklisted = blacklist.find(ext_name) != blacklist.end();
+		if (blacklisted)
+			infostream << "ALExtensions: Blacklisted: " << ext_name << std::endl;
+#ifndef AL_SOFT_direct_channels_remix
+		infostream << "ALExtensions: Not compiled with: " << ext_name << std::endl;
+#else
+		bool found = alIsExtensionPresent(ext_name);
+		if (found)
+			infostream << "ALExtensions: Found: " << ext_name << std::endl;
+		else
+			infostream << "ALExtensions: Not found: " << ext_name << std::endl;
+
+		if (found && !blacklisted) {
+			have_ext_AL_SOFT_direct_channels_remix = true;
+		}
+#endif
+	}
+}
+
+}
diff --git a/src/benchmark/benchmark_setup.h b/src/client/sound/al_extensions.h
similarity index 69%
rename from src/benchmark/benchmark_setup.h
rename to src/client/sound/al_extensions.h
index 34a4eca4c..cfa270d06 100644
--- a/src/benchmark/benchmark_setup.h
+++ b/src/client/sound/al_extensions.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2022 Minetest Authors
+Copyright (C) 2023 DS
 
 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
@@ -17,6 +17,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#define CATCH_CONFIG_ENABLE_BENCHMARKING
-#define CATCH_CONFIG_CONSOLE_WIDTH 160
-#include <catch.hpp>
+#pragma once
+
+#include "al_helpers.h"
+
+namespace sound {
+
+/**
+ * Struct for AL and ALC extensions
+ */
+struct ALExtensions
+{
+	explicit ALExtensions(const ALCdevice *deviceHandle [[maybe_unused]]);
+
+#ifdef AL_SOFT_direct_channels_remix
+	bool have_ext_AL_SOFT_direct_channels_remix = false;
+#endif
+};
+
+}
diff --git a/src/client/sound/al_helpers.cpp b/src/client/sound/al_helpers.cpp
index 3db3c6f61..e3b7bda94 100644
--- a/src/client/sound/al_helpers.cpp
+++ b/src/client/sound/al_helpers.cpp
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/al_helpers.h b/src/client/sound/al_helpers.h
index 5f0ba0089..566d9deeb 100644
--- a/src/client/sound/al_helpers.h
+++ b/src/client/sound/al_helpers.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/ogg_file.cpp b/src/client/sound/ogg_file.cpp
index 46c3427de..11659c706 100644
--- a/src/client/sound/ogg_file.cpp
+++ b/src/client/sound/ogg_file.cpp
@@ -18,12 +18,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "ogg_file.h"
 
+#include <cassert>
 #include <cstring> // memcpy
 
 namespace sound {
@@ -98,18 +99,31 @@ const ov_callbacks OggVorbisBufferSource::s_ov_callbacks = {
 std::optional<OggFileDecodeInfo> RAIIOggFile::getDecodeInfo(const std::string &filename_for_logging)
 {
 	OggFileDecodeInfo ret;
-
-	vorbis_info *pInfo = ov_info(&m_file, -1);
-	if (!pInfo)
-		return std::nullopt;
-
 	ret.name_for_logging = filename_for_logging;
 
-	if (pInfo->channels == 1) {
+	long num_logical_bitstreams = ov_streams(&m_file);
+	if (num_logical_bitstreams < 1) {
+		warningstream << "Audio: Can't decode. Has not even one logical bitstream (but "
+				<< num_logical_bitstreams << "): "
+				<< ret.name_for_logging << std::endl;
+		return std::nullopt;
+	}
+
+	// We only support sounds where the sample rate and channel count doesn't
+	// change.
+	// Read the info for the first logical bitstream:
+	vorbis_info *info0 = ov_info(&m_file, 0);
+	if (!info0) {
+		warningstream << "Audio: Can't decode. ov_info failed for: "
+				<< ret.name_for_logging << std::endl;
+		return std::nullopt;
+	}
+
+	if (info0->channels == 1) {
 		ret.is_stereo = false;
 		ret.format = AL_FORMAT_MONO16;
 		ret.bytes_per_sample = 2;
-	} else if (pInfo->channels == 2) {
+	} else if (info0->channels == 2) {
 		ret.is_stereo = true;
 		ret.format = AL_FORMAT_STEREO16;
 		ret.bytes_per_sample = 4;
@@ -119,10 +133,42 @@ std::optional<OggFileDecodeInfo> RAIIOggFile::getDecodeInfo(const std::string &f
 		return std::nullopt;
 	}
 
-	ret.freq = pInfo->rate;
+	ret.freq = info0->rate;
 
-	ret.length_samples = static_cast<ALuint>(ov_pcm_total(&m_file, -1));
-	ret.length_seconds = static_cast<f32>(ov_time_total(&m_file, -1));
+	if (!ov_seekable(&m_file)) {
+		warningstream << "Audio: Can't decode. Sound is not seekable, can't get length: "
+				<< ret.name_for_logging << std::endl;
+		return std::nullopt;
+	}
+
+	auto pcm_total = ov_pcm_total(&m_file, -1);
+	assert(pcm_total >= 0);
+	auto time_total = ov_time_total(&m_file, -1);
+	assert(time_total >= 0);
+	ret.length_samples = static_cast<ALuint>(pcm_total);
+	ret.length_seconds = static_cast<f32>(time_total);
+
+	// Check that channel count and sample rate do indeed not change
+	for (int strm = 1; strm < num_logical_bitstreams; ++strm) {
+		vorbis_info *info = ov_info(&m_file, strm);
+		if (!info) {
+			warningstream << "Audio: Can't decode. ov_info failed for: "
+					<< ret.name_for_logging << std::endl;
+			return std::nullopt;
+		}
+		if (info->channels != info0->channels) {
+			warningstream << "Audio: Can't decode. Channel count changes from "
+					<< info0->channels << " to " << info->channels << ": "
+					<< ret.name_for_logging << std::endl;
+			return std::nullopt;
+		}
+		if (info->rate != info0->rate) {
+			warningstream << "Audio: Can't decode. Sample rate changes from "
+					<< info0->rate << " to " << info->rate << ": "
+					<< ret.name_for_logging << std::endl;
+			return std::nullopt;
+		}
+	}
 
 	return ret;
 }
@@ -134,13 +180,19 @@ RAIIALSoundBuffer RAIIOggFile::loadBuffer(const OggFileDecodeInfo &decode_info,
 	constexpr int word_size = 2; // we use s16 samples
 	constexpr int word_signed = 1; // ^
 
+	assert(pcm_end <= decode_info.length_samples);
+	assert(pcm_start <= decode_info.length_samples);
+
 	// seek
-	if (ov_pcm_tell(&m_file) != pcm_start) {
+	s64 current_pcm = ov_pcm_tell(&m_file);
+	if (current_pcm != pcm_start) {
 		if (ov_pcm_seek(&m_file, pcm_start) != 0) {
-			warningstream << "Audio: Error decoding (could not seek) "
+			warningstream << "Audio: Error decoding (could not seek): "
 					<< decode_info.name_for_logging << std::endl;
 			return RAIIALSoundBuffer();
 		}
+		assert(ov_pcm_tell(&m_file) == pcm_start);
+		current_pcm = pcm_start;
 	}
 
 	const size_t size = static_cast<size_t>(pcm_end - pcm_start)
@@ -149,19 +201,48 @@ RAIIALSoundBuffer RAIIOggFile::loadBuffer(const OggFileDecodeInfo &decode_info,
 	std::unique_ptr<char[]> snd_buffer(new char[size]);
 
 	// read size bytes
+	s64 last_byte_offset = current_pcm * decode_info.bytes_per_sample;
 	size_t read_count = 0;
-	int bitStream;
+	int bitstream;
 	while (read_count < size) {
 		// Read up to a buffer's worth of decoded sound data
 		long num_bytes = ov_read(&m_file, &snd_buffer[read_count], size - read_count,
-				endian, word_size, word_signed, &bitStream);
+				endian, word_size, word_signed, &bitstream);
 
 		if (num_bytes <= 0) {
-			warningstream << "Audio: Error decoding "
+			std::string_view errstr = [&]{
+				switch (num_bytes) {
+				case 0: return "EOF";
+				case OV_HOLE: return "OV_HOLE";
+				case OV_EBADLINK: return "OV_EBADLINK";
+				case OV_EINVAL: return "OV_EINVAL";
+				default: return "unknown error";
+				}
+			}();
+			warningstream << "Audio: Error decoding (" << errstr << "): "
 					<< decode_info.name_for_logging << std::endl;
 			return RAIIALSoundBuffer();
 		}
 
+		// This usually doesn't happen, but for some sounds ov_read seems to skip
+		// some samples, see #14453.
+		s64 current_byte_offset = ov_pcm_tell(&m_file) * decode_info.bytes_per_sample;
+		if (current_byte_offset != last_byte_offset + num_bytes) {
+			infostream << "Audio: ov_read skipped "
+					<< current_byte_offset - (last_byte_offset + num_bytes)
+					<< " bytes, re-seeking: "
+					<< decode_info.name_for_logging << std::endl;
+			s64 expected_offset = (last_byte_offset + num_bytes) / decode_info.bytes_per_sample;
+			if (ov_pcm_seek(&m_file, expected_offset) != 0) {
+				warningstream << "Audio: Error decoding (could not seek): "
+						<< decode_info.name_for_logging << std::endl;
+				return RAIIALSoundBuffer();
+			}
+			assert(ov_pcm_tell(&m_file) == expected_offset);
+			current_byte_offset = last_byte_offset + num_bytes;
+		}
+		last_byte_offset = current_byte_offset;
+
 		read_count += num_bytes;
 	}
 
diff --git a/src/client/sound/ogg_file.h b/src/client/sound/ogg_file.h
index 177357337..5054a6e64 100644
--- a/src/client/sound/ogg_file.h
+++ b/src/client/sound/ogg_file.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/playing_sound.cpp b/src/client/sound/playing_sound.cpp
index a1570d42f..622dbdef8 100644
--- a/src/client/sound/playing_sound.cpp
+++ b/src/client/sound/playing_sound.cpp
@@ -18,13 +18,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "playing_sound.h"
 
+#include "al_extensions.h"
 #include "debug.h"
+#include "sound_constants.h"
 #include <cassert>
 #include <cmath>
 
@@ -32,7 +34,8 @@ namespace sound {
 
 PlayingSound::PlayingSound(ALuint source_id, std::shared_ptr<ISoundDataOpen> data,
 		bool loop, f32 volume, f32 pitch, f32 start_time,
-		const std::optional<std::pair<v3f, v3f>> &pos_vel_opt)
+		const std::optional<std::pair<v3f, v3f>> &pos_vel_opt,
+		const ALExtensions &exts [[maybe_unused]])
 	: m_source_id(source_id), m_data(std::move(data)), m_looping(loop),
 	m_is_positional(pos_vel_opt.has_value())
 {
@@ -75,33 +78,27 @@ PlayingSound::PlayingSound(ALuint source_id, std::shared_ptr<ISoundDataOpen> dat
 		warn_if_al_error("when creating non-streaming sound");
 
 	} else {
-		// Start with 2 buffers
-		ALuint buf_ids[2];
+		// Start with first buffer
 
-		// If m_next_sample_pos >= len_samples (happens only if not looped), one
-		// or both of buf_ids will be 0. Queuing 0 is a NOP.
+		// If m_next_sample_pos >= len_samples (happens only if not looped), buf0
+		// will be 0. Queuing 0 is a NOP.
 
 		auto [buf0, buf0_end, offset_in_buf0] = m_data->getOrLoadBufferAt(m_next_sample_pos);
-		buf_ids[0] = buf0;
 		m_next_sample_pos = buf0_end;
 
-		if (m_looping && m_next_sample_pos == len_samples)
-			m_next_sample_pos = 0;
-
-		auto [buf1, buf1_end, offset_in_buf1] = m_data->getOrLoadBufferAt(m_next_sample_pos);
-		buf_ids[1] = buf1;
-		m_next_sample_pos = buf1_end;
-		assert(offset_in_buf1 == 0);
-
-		alSourceQueueBuffers(m_source_id, 2, buf_ids);
+		alSourceQueueBuffers(m_source_id, 1, &buf0);
 		alSourcei(m_source_id, AL_SAMPLE_OFFSET, offset_in_buf0);
 
-		// We can't use AL_LOOPING because more buffers are queued later
-		// looping is therefore done manually
+		// We can't use AL_LOOPING because more buffers are queued later.
+		// Looping is therefore done manually.
 
+		// Sound is not dead if queue runs empty prematurely
 		m_stopped_means_dead = false;
 
 		warn_if_al_error("when creating streaming sound");
+
+		// Enqueue more buffers
+		stepStream(true);
 	}
 
 	// Set initial pos, volume, pitch
@@ -113,28 +110,58 @@ PlayingSound::PlayingSound(ALuint source_id, std::shared_ptr<ISoundDataOpen> dat
 		alSource3f(m_source_id, AL_POSITION, 0.0f, 0.0f, 0.0f);
 		alSource3f(m_source_id, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
 		warn_if_al_error("PlayingSound::PlayingSound at making position-less");
+
+#ifdef AL_SOFT_direct_channels_remix
+		// Play directly on stereo output channels if possible. Improves sound quality.
+		if (exts.have_ext_AL_SOFT_direct_channels_remix
+				&& m_data->m_decode_info.is_stereo) {
+			alSourcei(m_source_id, AL_DIRECT_CHANNELS_SOFT, AL_REMIX_UNMATCHED_SOFT);
+			warn_if_al_error("PlayingSound::PlayingSound at setting AL_DIRECT_CHANNELS_SOFT");
+		}
+#endif
 	}
 	setGain(volume);
 	setPitch(pitch);
 }
 
-bool PlayingSound::stepStream()
+bool PlayingSound::stepStream(bool playback_speed_changed)
 {
 	if (isDead())
 		return false;
 
-	// unqueue finished buffers
-	ALint num_unqueued_bufs = 0;
-	alGetSourcei(m_source_id, AL_BUFFERS_PROCESSED, &num_unqueued_bufs);
-	if (num_unqueued_bufs == 0)
-		return true;
-	// We always have 2 buffers enqueued at most
-	SANITY_CHECK(num_unqueued_bufs <= 2);
-	ALuint unqueued_buffer_ids[2];
-	alSourceUnqueueBuffers(m_source_id, num_unqueued_bufs, unqueued_buffer_ids);
+	// Unqueue finished buffers
+	ALint num_processed_bufs = 0;
+	alGetSourcei(m_source_id, AL_BUFFERS_PROCESSED, &num_processed_bufs);
+	if (num_processed_bufs == 0 && !playback_speed_changed)
+		return true; // Nothing to do
+	if (num_processed_bufs > 0) {
+		ALint num_to_unqueue = num_processed_bufs;
+		ALuint unqueued_buffer_ids[8];
+		while (num_to_unqueue > 8) {
+			alSourceUnqueueBuffers(m_source_id, 8, unqueued_buffer_ids);
+			num_to_unqueue -= 8;
+		}
+		alSourceUnqueueBuffers(m_source_id, num_to_unqueue, unqueued_buffer_ids);
+	}
 
-	// Fill up again
-	for (ALint i = 0; i < num_unqueued_bufs; ++i) {
+	// Find out how many buffers we want to enqueue
+	f32 pitch = 1.0f;
+	alGetSourcef(m_source_id, AL_PITCH, &pitch);
+	ALint num_queued_bufs = 0;
+	alGetSourcei(m_source_id, AL_BUFFERS_QUEUED, &num_queued_bufs);
+	// Min. length of untouched buffers
+	const f32 playback_left = MIN_STREAM_BUFFER_LENGTH * std::max(0, num_queued_bufs - 1);
+	// Max. time until next stepStream() call, see also [Streaming of sounds] in
+	// sound_constants.h.
+	// Multiplied by pitch because pitch makes playback faster than real time.
+	// (Does not account for doppler effect, if we had that.)
+	// +0.1 seconds to accommodate hickups.
+	const f32 playback_until_next_check = (2.0f * STREAM_BIGSTEP_TIME + 0.1f) * pitch;
+	const f32 playback_to_fill_up = std::max(0.0f, playback_until_next_check - playback_left);
+	const int num_bufs_to_enqueue = std::ceil(playback_to_fill_up / MIN_STREAM_BUFFER_LENGTH);
+
+	// Fill up
+	for (int i = 0; i < num_bufs_to_enqueue; ++i) {
 		if (m_next_sample_pos == m_data->m_decode_info.length_samples) {
 			// Reached end
 			if (m_looping) {
@@ -245,4 +272,11 @@ f32 PlayingSound::getGain() noexcept
 	return gain;
 }
 
+void PlayingSound::setPitch(f32 pitch)
+{
+	alSourcef(m_source_id, AL_PITCH, pitch);
+	if (isStreaming())
+		stepStream(true);
+}
+
 } // namespace sound
diff --git a/src/client/sound/playing_sound.h b/src/client/sound/playing_sound.h
index 1fbf37e3e..0f4c18fcb 100644
--- a/src/client/sound/playing_sound.h
+++ b/src/client/sound/playing_sound.h
@@ -18,13 +18,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #pragma once
 
 #include "sound_data.h"
+namespace sound { struct ALExtensions; }
 
 namespace sound {
 
@@ -51,7 +52,8 @@ class PlayingSound final
 public:
 	PlayingSound(ALuint source_id, std::shared_ptr<ISoundDataOpen> data, bool loop,
 			f32 volume, f32 pitch, f32 start_time,
-			const std::optional<std::pair<v3f, v3f>> &pos_vel_opt);
+			const std::optional<std::pair<v3f, v3f>> &pos_vel_opt,
+			const ALExtensions &exts [[maybe_unused]]);
 
 	~PlayingSound() noexcept
 	{
@@ -61,7 +63,7 @@ public:
 	DISABLE_CLASS_COPY(PlayingSound)
 
 	// return false means streaming finished
-	bool stepStream();
+	bool stepStream(bool playback_speed_changed = false);
 
 	// retruns true if it wasn't fading already
 	bool fade(f32 step, f32 target_gain) noexcept;
@@ -75,7 +77,7 @@ public:
 
 	f32 getGain() noexcept;
 
-	void setPitch(f32 pitch) noexcept { alSourcef(m_source_id, AL_PITCH, pitch); }
+	void setPitch(f32 pitch);
 
 	bool isStreaming() const noexcept { return m_data->isStreaming(); }
 
diff --git a/src/client/sound/proxy_sound_manager.cpp b/src/client/sound/proxy_sound_manager.cpp
index ede603e67..266e68e00 100644
--- a/src/client/sound/proxy_sound_manager.cpp
+++ b/src/client/sound/proxy_sound_manager.cpp
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/proxy_sound_manager.h b/src/client/sound/proxy_sound_manager.h
index 53299e045..edad70baa 100644
--- a/src/client/sound/proxy_sound_manager.h
+++ b/src/client/sound/proxy_sound_manager.h
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/sound_constants.h b/src/client/sound/sound_constants.h
index 94d74b86c..08aa2329b 100644
--- a/src/client/sound/sound_constants.h
+++ b/src/client/sound/sound_constants.h
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
@@ -89,14 +89,8 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
  * In the worst case, a sound is stepped at the start of one bigstep and in the
  * end of the next bigstep. So between two stepStream()-calls lie at most
  * 2 * STREAM_BIGSTEP_TIME seconds.
- * As there are always 2 sound buffers enqueued, at least one untouched full buffer
- * is still available after the first stepStream().
- * If we take a MIN_STREAM_BUFFER_LENGTH > 2 * STREAM_BIGSTEP_TIME, we can hence
- * not run into an empty queue.
- *
- * The MIN_STREAM_BUFFER_LENGTH needs to be a little bigger because of dtime jitter,
- * other sounds that may have taken long to stepStream(), and sounds being played
- * faster due to Doppler effect.
+ * We ensure that there are always enough untouched full buffers left such that
+ * we do not run into an empty queue in this time period, see stepStream().
  *
  */
 
@@ -115,8 +109,6 @@ constexpr f32 STREAM_BIGSTEP_TIME = 0.3f;
 // step duration for the OpenALSoundManager thread, in seconds
 constexpr f32 SOUNDTHREAD_DTIME = 0.016f;
 
-static_assert(MIN_STREAM_BUFFER_LENGTH > STREAM_BIGSTEP_TIME * 2.0f,
-		"See [Streaming of sounds].");
 static_assert(SOUND_DURATION_MAX_SINGLE >= MIN_STREAM_BUFFER_LENGTH * 2.0f,
 		"There's no benefit in streaming if we can't queue more than 2 buffers.");
 
diff --git a/src/client/sound/sound_data.cpp b/src/client/sound/sound_data.cpp
index f0cbc6dbf..261549d38 100644
--- a/src/client/sound/sound_data.cpp
+++ b/src/client/sound/sound_data.cpp
@@ -18,13 +18,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "sound_data.h"
 
 #include "sound_constants.h"
+#include <algorithm>
 
 namespace sound {
 
diff --git a/src/client/sound/sound_data.h b/src/client/sound/sound_data.h
index 36052c161..67fcd7756 100644
--- a/src/client/sound/sound_data.h
+++ b/src/client/sound/sound_data.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/sound_manager.cpp b/src/client/sound/sound_manager.cpp
index 97537cc0f..679d3a155 100644
--- a/src/client/sound/sound_manager.cpp
+++ b/src/client/sound/sound_manager.cpp
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
@@ -181,7 +181,7 @@ std::shared_ptr<PlayingSound> OpenALSoundManager::createPlayingSound(
 	}
 
 	auto sound = std::make_shared<PlayingSound>(source_id, std::move(lsnd), loop,
-			volume, pitch, start_time, pos_vel_opt);
+			volume, pitch, start_time, pos_vel_opt, m_exts);
 
 	sound->play();
 
@@ -271,7 +271,8 @@ OpenALSoundManager::OpenALSoundManager(SoundManagerSingleton *smg,
 	Thread("OpenALSoundManager"),
 	m_fallback_path_provider(std::move(fallback_path_provider)),
 	m_device(smg->m_device.get()),
-	m_context(smg->m_context.get())
+	m_context(smg->m_context.get()),
+	m_exts(m_device)
 {
 	SANITY_CHECK(!!m_fallback_path_provider);
 
diff --git a/src/client/sound/sound_manager.h b/src/client/sound/sound_manager.h
index 8d0ccf837..2a631db02 100644
--- a/src/client/sound/sound_manager.h
+++ b/src/client/sound/sound_manager.h
@@ -18,13 +18,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #pragma once
 
 #include "playing_sound.h"
+#include "al_extensions.h"
 #include "sound_constants.h"
 #include "sound_manager_messages.h"
 #include "../sound.h"
@@ -51,8 +52,10 @@ class OpenALSoundManager final : public Thread
 private:
 	std::unique_ptr<SoundFallbackPathProvider> m_fallback_path_provider;
 
-	ALCdevice *m_device;
-	ALCcontext *m_context;
+	ALCdevice *const m_device;
+	ALCcontext *const m_context;
+
+	const ALExtensions m_exts;
 
 	// time in seconds until which removeDeadSounds will be called again
 	f32 m_time_until_dead_removal = REMOVE_DEAD_SOUNDS_INTERVAL;
diff --git a/src/client/sound/sound_manager_messages.h b/src/client/sound/sound_manager_messages.h
index 41f4ffac1..e33729705 100644
--- a/src/client/sound/sound_manager_messages.h
+++ b/src/client/sound/sound_manager_messages.h
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/sound_openal.cpp b/src/client/sound/sound_openal.cpp
index 89f4b57ad..d44a1fbe2 100644
--- a/src/client/sound/sound_openal.cpp
+++ b/src/client/sound/sound_openal.cpp
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/sound_singleton.cpp b/src/client/sound/sound_singleton.cpp
index 4a600243c..dff339be0 100644
--- a/src/client/sound/sound_singleton.cpp
+++ b/src/client/sound/sound_singleton.cpp
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/sound/sound_singleton.h b/src/client/sound/sound_singleton.h
index 5168c1c9b..32cd2d4f8 100644
--- a/src/client/sound/sound_singleton.h
+++ b/src/client/sound/sound_singleton.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License along
-with this program; ifnot, write to the Free Software Foundation, Inc.,
+with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
diff --git a/src/client/texturepaths.cpp b/src/client/texturepaths.cpp
new file mode 100644
index 000000000..ba28a243c
--- /dev/null
+++ b/src/client/texturepaths.cpp
@@ -0,0 +1,114 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "texturepaths.h"
+
+#include "util/container.h"
+#include "settings.h"
+#include "filesys.h"
+#include "porting.h"
+#include <vector>
+
+// A cache from texture name to texture path
+static MutexedMap<std::string, std::string> g_texturename_to_path_cache;
+
+void clearTextureNameCache()
+{
+	g_texturename_to_path_cache.clear();
+}
+
+// Find out the full path of an image by trying different filename extensions.
+// If failed, return "".
+std::string getImagePath(std::string_view path)
+{
+	// A NULL-ended list of possible image extensions
+	// (In newer C++ versions a fixed size array and ranges::subrange could be used
+	// or just modernise removeStringEnd.)
+	static const char *extensions[] = {".png", ".jpg", ".bmp", ".tga", nullptr};
+
+	// Remove present extension
+	std::string_view stripped_path = removeStringEnd(path, extensions);
+	// If there is no known extension, assume it has been omitted.
+	if (stripped_path.empty())
+		stripped_path = path;
+
+	for (const char *ext : extensions) {
+		if (!ext)
+			break;
+		std::string extended_path(stripped_path);
+		extended_path.append(ext);
+		if (fs::PathExists(extended_path))
+			return extended_path;
+	}
+
+	return "";
+}
+
+/* Gets the path to a texture by first checking if the texture exists
+ * in texture_path and if not, using the data path.
+ *
+ * Checks all supported extensions by replacing the original extension.
+ *
+ * If not found, returns "".
+ *
+ * Utilizes a thread-safe cache.
+*/
+std::string getTexturePath(const std::string &filename, bool *is_base_pack)
+{
+	std::string fullpath;
+
+	// This can set a wrong value on cached textures, but is irrelevant because
+	// is_base_pack is only passed when initializing the textures the first time
+	if (is_base_pack)
+		*is_base_pack = false;
+
+	// Check from cache
+	bool incache = g_texturename_to_path_cache.get(filename, &fullpath);
+	if (incache)
+		return fullpath;
+
+	// Check from texture_path setting
+	for (const auto &path : getTextureDirs()) {
+		// Check all filename extensions. Returns "" if not found.
+		fullpath = getImagePath(path + DIR_DELIM + filename);
+		if (!fullpath.empty())
+			break;
+	}
+
+	// Check from default data directory i.e. .../minetest/textures/base/pack
+	if (fullpath.empty()) {
+		std::string base_path = porting::path_share + DIR_DELIM + "textures"
+				+ DIR_DELIM + "base" + DIR_DELIM + "pack";
+		// Check all filename extensions. Returns "" if not found.
+		fullpath = getImagePath(base_path + DIR_DELIM + filename);
+		if (is_base_pack && !fullpath.empty())
+			*is_base_pack = true;
+	}
+
+	// Add to cache (also an empty result is cached)
+	g_texturename_to_path_cache.set(filename, fullpath);
+
+	// Finally return it
+	return fullpath;
+}
+
+std::vector<std::string> getTextureDirs()
+{
+	return fs::GetRecursiveDirs(g_settings->get("texture_path"));
+}
diff --git a/src/client/texturepaths.h b/src/client/texturepaths.h
new file mode 100644
index 000000000..dc5119188
--- /dev/null
+++ b/src/client/texturepaths.h
@@ -0,0 +1,44 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+// Texture paths get cached and this clears the Cache.
+void clearTextureNameCache();
+
+// Find out the full path of an image by trying different filename extensions.
+// If failed, return "".
+std::string getImagePath(std::string_view path);
+
+/* Gets the path to a texture by first checking if the texture exists
+ * in texture_path and if not, using the data path.
+ *
+ * Checks all supported extensions by replacing the original extension.
+ *
+ * If not found, returns "".
+ *
+ * Utilizes a thread-safe cache.
+*/
+std::string getTexturePath(const std::string &filename, bool *is_base_pack = nullptr);
+
+// Returns all dictionaries found from the "texture_path" setting.
+std::vector<std::string> getTextureDirs();
diff --git a/src/client/texturesource.cpp b/src/client/texturesource.cpp
new file mode 100644
index 000000000..2102a0323
--- /dev/null
+++ b/src/client/texturesource.cpp
@@ -0,0 +1,570 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "texturesource.h"
+
+#include <IVideoDriver.h>
+#include "util/thread.h"
+#include "imagefilters.h"
+#include "guiscalingfilter.h"
+#include "renderingengine.h"
+#include "texturepaths.h"
+#include "imagesource.h"
+
+
+// Stores internal information about a texture.
+
+/* in tile.h
+
+struct TextureInfo
+{
+	std::string name;
+	video::ITexture *texture = nullptr;
+
+	// Stores source image names which ImageSource::generateImage used.
+	std::set<std::string> sourceImages{};
+};
+
+*/
+
+// TextureSource
+class TextureSource : public IWritableTextureSource
+{
+public:
+	TextureSource();
+	virtual ~TextureSource();
+
+	/*
+		Example case:
+		Now, assume a texture with the id 1 exists, and has the name
+		"stone.png^mineral1".
+		Then a random thread calls getTextureId for a texture called
+		"stone.png^mineral1^crack0".
+		...Now, WTF should happen? Well:
+		- getTextureId strips off stuff recursively from the end until
+		  the remaining part is found, or nothing is left when
+		  something is stripped out
+
+		But it is slow to search for textures by names and modify them
+		like that?
+		- ContentFeatures is made to contain ids for the basic plain
+		  textures
+		- Crack textures can be slow by themselves, but the framework
+		  must be fast.
+
+		Example case #2:
+		- Assume a texture with the id 1 exists, and has the name
+		  "stone.png^mineral_coal.png".
+		- Now getNodeTile() stumbles upon a node which uses
+		  texture id 1, and determines that MATERIAL_FLAG_CRACK
+		  must be applied to the tile
+		- MapBlockMesh::animate() finds the MATERIAL_FLAG_CRACK and
+		  has received the current crack level 0 from the client. It
+		  finds out the name of the texture with getTextureName(1),
+		  appends "^crack0" to it and gets a new texture id with
+		  getTextureId("stone.png^mineral_coal.png^crack0").
+
+	*/
+
+	/*
+		Gets a texture id from cache or
+		- if main thread, generates the texture, adds to cache and returns id.
+		- if other thread, adds to request queue and waits for main thread.
+
+		The id 0 points to a NULL texture. It is returned in case of error.
+	*/
+	u32 getTextureId(const std::string &name);
+
+	// Finds out the name of a cached texture.
+	std::string getTextureName(u32 id);
+
+	/*
+		If texture specified by the name pointed by the id doesn't
+		exist, create it, then return the cached texture.
+
+		Can be called from any thread. If called from some other thread
+		and not found in cache, the call is queued to the main thread
+		for processing.
+	*/
+	video::ITexture* getTexture(u32 id);
+
+	video::ITexture* getTexture(const std::string &name, u32 *id = NULL);
+
+	/*
+		Get a texture specifically intended for mesh
+		application, i.e. not HUD, compositing, or other 2D
+		use.  This texture may be a different size and may
+		have had additional filters applied.
+	*/
+	video::ITexture* getTextureForMesh(const std::string &name, u32 *id);
+
+	virtual Palette* getPalette(const std::string &name);
+
+	bool isKnownSourceImage(const std::string &name)
+	{
+		bool is_known = false;
+		bool cache_found = m_source_image_existence.get(name, &is_known);
+		if (cache_found)
+			return is_known;
+		// Not found in cache; find out if a local file exists
+		is_known = (!getTexturePath(name).empty());
+		m_source_image_existence.set(name, is_known);
+		return is_known;
+	}
+
+	// Processes queued texture requests from other threads.
+	// Shall be called from the main thread.
+	void processQueue();
+
+	// Insert a source image into the cache without touching the filesystem.
+	// Shall be called from the main thread.
+	void insertSourceImage(const std::string &name, video::IImage *img);
+
+	// Rebuild images and textures from the current set of source images
+	// Shall be called from the main thread.
+	void rebuildImagesAndTextures();
+
+	video::ITexture* getNormalTexture(const std::string &name);
+	video::SColor getTextureAverageColor(const std::string &name);
+	video::ITexture *getShaderFlagsTexture(bool normamap_present);
+
+private:
+
+	// The id of the thread that is allowed to use irrlicht directly
+	std::thread::id m_main_thread;
+
+	// Generates and caches source images
+	// This should be only accessed from the main thread
+	ImageSource m_imagesource;
+
+	// Rebuild images and textures from the current set of source images
+	// Shall be called from the main thread.
+	// You ARE expected to be holding m_textureinfo_cache_mutex
+	void rebuildTexture(video::IVideoDriver *driver, TextureInfo &ti);
+
+	// Generate a texture
+	u32 generateTexture(const std::string &name);
+
+	// Thread-safe cache of what source images are known (true = known)
+	MutexedMap<std::string, bool> m_source_image_existence;
+
+	// A texture id is index in this array.
+	// The first position contains a NULL texture.
+	std::vector<TextureInfo> m_textureinfo_cache;
+	// Maps a texture name to an index in the former.
+	std::map<std::string, u32> m_name_to_id;
+	// The two former containers are behind this mutex
+	std::mutex m_textureinfo_cache_mutex;
+
+	// Queued texture fetches (to be processed by the main thread)
+	RequestQueue<std::string, u32, std::thread::id, u8> m_get_texture_queue;
+
+	// Textures that have been overwritten with other ones
+	// but can't be deleted because the ITexture* might still be used
+	std::vector<video::ITexture*> m_texture_trash;
+
+	// Maps image file names to loaded palettes.
+	std::unordered_map<std::string, Palette> m_palettes;
+
+	// Cached from settings for making textures from meshes
+	bool mesh_filter_needed;
+};
+
+IWritableTextureSource *createTextureSource()
+{
+	return new TextureSource();
+}
+
+TextureSource::TextureSource()
+{
+	m_main_thread = std::this_thread::get_id();
+
+	// Add a NULL TextureInfo as the first index, named ""
+	m_textureinfo_cache.emplace_back(TextureInfo{""});
+	m_name_to_id[""] = 0;
+
+	// Cache some settings
+	// Note: Since this is only done once, the game must be restarted
+	// for these settings to take effect.
+	mesh_filter_needed =
+			g_settings->getBool("mip_map") ||
+			g_settings->getBool("trilinear_filter") ||
+			g_settings->getBool("bilinear_filter") ||
+			g_settings->getBool("anisotropic_filter");
+}
+
+TextureSource::~TextureSource()
+{
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+
+	unsigned int textures_before = driver->getTextureCount();
+
+	for (const auto &iter : m_textureinfo_cache) {
+		// cleanup texture
+		if (iter.texture)
+			driver->removeTexture(iter.texture);
+	}
+	m_textureinfo_cache.clear();
+
+	for (auto t : m_texture_trash) {
+		// cleanup trashed texture
+		driver->removeTexture(t);
+	}
+
+	infostream << "~TextureSource() before cleanup: " << textures_before
+			<< " after: " << driver->getTextureCount() << std::endl;
+}
+
+u32 TextureSource::getTextureId(const std::string &name)
+{
+	{ // See if texture already exists
+		MutexAutoLock lock(m_textureinfo_cache_mutex);
+		auto n = m_name_to_id.find(name);
+		if (n != m_name_to_id.end())
+			return n->second;
+	}
+
+	// Get texture
+	if (std::this_thread::get_id() == m_main_thread) {
+		return generateTexture(name);
+	}
+
+
+	infostream << "getTextureId(): Queued: name=\"" << name << "\"" << std::endl;
+
+	// We're gonna ask the result to be put into here
+	static thread_local ResultQueue<std::string, u32, std::thread::id, u8> result_queue;
+
+	// Throw a request in
+	m_get_texture_queue.add(name, std::this_thread::get_id(), 0, &result_queue);
+
+	try {
+		while(true) {
+			// Wait for result for up to 1 seconds (empirical value)
+			GetResult<std::string, u32, std::thread::id, u8>
+				result = result_queue.pop_front(1000);
+
+			if (result.key == name) {
+				return result.item;
+			}
+		}
+	} catch(ItemNotFoundException &e) {
+		errorstream << "Waiting for texture " << name << " timed out." << std::endl;
+		return 0;
+	}
+
+	infostream << "getTextureId(): Failed" << std::endl;
+
+	return 0;
+}
+
+// This method generates all the textures
+u32 TextureSource::generateTexture(const std::string &name)
+{
+	// Empty name means texture 0
+	if (name.empty()) {
+		infostream << "generateTexture(): name is empty" << std::endl;
+		return 0;
+	}
+
+	{ // See if texture already exists
+		MutexAutoLock lock(m_textureinfo_cache_mutex);
+		auto n = m_name_to_id.find(name);
+		if (n != m_name_to_id.end())
+			return n->second;
+	}
+
+	// Calling only allowed from main thread
+	if (std::this_thread::get_id() != m_main_thread) {
+		errorstream << "TextureSource::generateTexture() "
+				"called not from main thread" << std::endl;
+		return 0;
+	}
+
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	sanity_check(driver);
+
+	// passed into texture info for dynamic media tracking
+	std::set<std::string> source_image_names;
+	video::IImage *img = m_imagesource.generateImage(name, source_image_names);
+
+	video::ITexture *tex = nullptr;
+
+	if (img) {
+		img = Align2Npot2(img, driver);
+		// Create texture from resulting image
+		tex = driver->addTexture(name.c_str(), img);
+		guiScalingCache(io::path(name.c_str()), driver, img);
+		img->drop();
+	}
+
+	// Add texture to caches (add NULL textures too)
+
+	MutexAutoLock lock(m_textureinfo_cache_mutex);
+
+	u32 id = m_textureinfo_cache.size();
+	TextureInfo ti{name, tex, std::move(source_image_names)};
+	m_textureinfo_cache.emplace_back(std::move(ti));
+	m_name_to_id[name] = id;
+
+	return id;
+}
+
+std::string TextureSource::getTextureName(u32 id)
+{
+	MutexAutoLock lock(m_textureinfo_cache_mutex);
+
+	if (id >= m_textureinfo_cache.size()) {
+		errorstream << "TextureSource::getTextureName(): id=" << id
+				<< " >= m_textureinfo_cache.size()=" << m_textureinfo_cache.size()
+				<< std::endl;
+		return "";
+	}
+
+	return m_textureinfo_cache[id].name;
+}
+
+video::ITexture* TextureSource::getTexture(u32 id)
+{
+	MutexAutoLock lock(m_textureinfo_cache_mutex);
+
+	if (id >= m_textureinfo_cache.size())
+		return nullptr;
+
+	return m_textureinfo_cache[id].texture;
+}
+
+video::ITexture* TextureSource::getTexture(const std::string &name, u32 *id)
+{
+	u32 actual_id = getTextureId(name);
+	if (id)
+		*id = actual_id;
+
+	return getTexture(actual_id);
+}
+
+video::ITexture* TextureSource::getTextureForMesh(const std::string &name, u32 *id)
+{
+	// Avoid duplicating texture if it won't actually change
+	if (mesh_filter_needed && !name.empty())
+		return getTexture(name + "^[applyfiltersformesh", id);
+	return getTexture(name, id);
+}
+
+Palette* TextureSource::getPalette(const std::string &name)
+{
+	// Only the main thread may load images
+	sanity_check(std::this_thread::get_id() == m_main_thread);
+
+	if (name.empty())
+		return nullptr;
+
+	auto it = m_palettes.find(name);
+	if (it == m_palettes.end()) {
+		// Create palette
+		std::set<std::string> source_image_names; // unused, sadly.
+		video::IImage *img = m_imagesource.generateImage(name, source_image_names);
+		if (!img) {
+			warningstream << "TextureSource::getPalette(): palette \"" << name
+				<< "\" could not be loaded." << std::endl;
+			return nullptr;
+		}
+		Palette new_palette;
+		u32 w = img->getDimension().Width;
+		u32 h = img->getDimension().Height;
+		// Real area of the image
+		u32 area = h * w;
+		if (area == 0)
+			return nullptr;
+		if (area > 256) {
+			warningstream << "TextureSource::getPalette(): the specified"
+				<< " palette image \"" << name << "\" is larger than 256"
+				<< " pixels, using the first 256." << std::endl;
+			area = 256;
+		} else if (256 % area != 0)
+			warningstream << "TextureSource::getPalette(): the "
+				<< "specified palette image \"" << name << "\" does not "
+				<< "contain power of two pixels." << std::endl;
+		// We stretch the palette so it will fit 256 values
+		// This many param2 values will have the same color
+		u32 step = 256 / area;
+		// For each pixel in the image
+		for (u32 i = 0; i < area; i++) {
+			video::SColor c = img->getPixel(i % w, i / w);
+			// Fill in palette with 'step' colors
+			for (u32 j = 0; j < step; j++)
+				new_palette.push_back(c);
+		}
+		img->drop();
+		// Fill in remaining elements
+		while (new_palette.size() < 256)
+			new_palette.emplace_back(0xFFFFFFFF);
+		m_palettes[name] = new_palette;
+		it = m_palettes.find(name);
+	}
+	if (it != m_palettes.end())
+		return &((*it).second);
+	return nullptr;
+}
+
+void TextureSource::processQueue()
+{
+	// Fetch textures
+	// NOTE: process outstanding requests from all mesh generation threads
+	while (!m_get_texture_queue.empty()) {
+		GetRequest<std::string, u32, std::thread::id, u8>
+				request = m_get_texture_queue.pop();
+
+		m_get_texture_queue.pushResult(request, generateTexture(request.key));
+	}
+}
+
+void TextureSource::insertSourceImage(const std::string &name, video::IImage *img)
+{
+	sanity_check(std::this_thread::get_id() == m_main_thread);
+
+	m_imagesource.insertSourceImage(name, img, true);
+	m_source_image_existence.set(name, true);
+
+	// now we need to check for any textures that need updating
+	MutexAutoLock lock(m_textureinfo_cache_mutex);
+
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	sanity_check(driver);
+
+	// Recreate affected textures
+	u32 affected = 0;
+	for (TextureInfo &ti : m_textureinfo_cache) {
+		if (ti.name.empty())
+			continue; // Skip dummy entry
+		// If the source image was used, we need to rebuild this texture
+		if (ti.sourceImages.find(name) != ti.sourceImages.end()) {
+			rebuildTexture(driver, ti);
+			affected++;
+		}
+	}
+	if (affected > 0)
+		verbosestream << "TextureSource: inserting \"" << name << "\" caused rebuild of "
+				<< affected << " textures." << std::endl;
+}
+
+void TextureSource::rebuildImagesAndTextures()
+{
+	MutexAutoLock lock(m_textureinfo_cache_mutex);
+
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	sanity_check(driver);
+
+	infostream << "TextureSource: recreating " << m_textureinfo_cache.size()
+			<< " textures" << std::endl;
+
+	// Recreate textures
+	for (TextureInfo &ti : m_textureinfo_cache) {
+		if (ti.name.empty())
+			continue; // Skip dummy entry
+		rebuildTexture(driver, ti);
+	}
+}
+
+void TextureSource::rebuildTexture(video::IVideoDriver *driver, TextureInfo &ti)
+{
+	assert(!ti.name.empty());
+	sanity_check(std::this_thread::get_id() == m_main_thread);
+
+	// Replaces the previous sourceImages.
+	// Shouldn't really need to be done, but can't hurt.
+	std::set<std::string> source_image_names;
+	video::IImage *img = m_imagesource.generateImage(ti.name, source_image_names);
+	img = Align2Npot2(img, driver);
+	// Create texture from resulting image
+	video::ITexture *t = nullptr;
+	if (img) {
+		t = driver->addTexture(ti.name.c_str(), img);
+		guiScalingCache(io::path(ti.name.c_str()), driver, img);
+		img->drop();
+	}
+	video::ITexture *t_old = ti.texture;
+	// Replace texture
+	ti.texture = t;
+	ti.sourceImages = std::move(source_image_names);
+
+	if (t_old)
+		m_texture_trash.push_back(t_old);
+}
+
+video::ITexture* TextureSource::getNormalTexture(const std::string &name)
+{
+	if (isKnownSourceImage("override_normal.png"))
+		return getTexture("override_normal.png");
+	std::string fname_base = name;
+	static const char *normal_ext = "_normal.png";
+	static const u32 normal_ext_size = strlen(normal_ext);
+	size_t pos = fname_base.find('.');
+	std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
+	if (isKnownSourceImage(fname_normal)) {
+		// look for image extension and replace it
+		size_t i = 0;
+		while ((i = fname_base.find('.', i)) != std::string::npos) {
+			fname_base.replace(i, 4, normal_ext);
+			i += normal_ext_size;
+		}
+		return getTexture(fname_base);
+	}
+	return nullptr;
+}
+
+video::SColor TextureSource::getTextureAverageColor(const std::string &name)
+{
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	video::ITexture *texture = getTexture(name);
+	if (!texture)
+		return {0, 0, 0, 0};
+	video::IImage *image = driver->createImage(texture,
+		core::position2d<s32>(0, 0),
+		texture->getOriginalSize());
+	if (!image)
+		return {0, 0, 0, 0};
+
+	video::SColor c = ImageSource::getImageAverageColor(*image);
+	image->drop();
+
+	return c;
+}
+
+
+video::ITexture *TextureSource::getShaderFlagsTexture(bool normalmap_present)
+{
+	std::string tname = "__shaderFlagsTexture";
+	tname += normalmap_present ? "1" : "0";
+
+	if (isKnownSourceImage(tname)) {
+		return getTexture(tname);
+	}
+
+	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	video::IImage *flags_image = driver->createImage(
+		video::ECF_A8R8G8B8, core::dimension2d<u32>(1, 1));
+	sanity_check(flags_image);
+	video::SColor c(255, normalmap_present ? 255 : 0, 0, 0);
+	flags_image->setPixel(0, 0, c);
+	insertSourceImage(tname, flags_image);
+	flags_image->drop();
+	return getTexture(tname);
+
+}
diff --git a/src/client/texturesource.h b/src/client/texturesource.h
new file mode 100644
index 000000000..5fef20821
--- /dev/null
+++ b/src/client/texturesource.h
@@ -0,0 +1,93 @@
+/*
+Minetest
+Copyright (C) 2010-2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "irrlichttypes.h"
+#include <ITexture.h>
+#include <string>
+#include <vector>
+
+typedef std::vector<video::SColor> Palette;
+
+/*
+	TextureSource creates and caches textures.
+*/
+
+class ISimpleTextureSource
+{
+public:
+	ISimpleTextureSource() = default;
+
+	virtual ~ISimpleTextureSource() = default;
+
+	virtual video::ITexture* getTexture(
+			const std::string &name, u32 *id = nullptr) = 0;
+};
+
+class ITextureSource : public ISimpleTextureSource
+{
+public:
+	ITextureSource() = default;
+
+	virtual ~ITextureSource() = default;
+
+	virtual u32 getTextureId(const std::string &name)=0;
+	virtual std::string getTextureName(u32 id)=0;
+	virtual video::ITexture* getTexture(u32 id)=0;
+	virtual video::ITexture* getTexture(
+			const std::string &name, u32 *id = nullptr)=0;
+	virtual video::ITexture* getTextureForMesh(
+			const std::string &name, u32 *id = nullptr) = 0;
+	/*!
+	 * Returns a palette from the given texture name.
+	 * The pointer is valid until the texture source is
+	 * destructed.
+	 * Should be called from the main thread.
+	 */
+	virtual Palette* getPalette(const std::string &name) = 0;
+	virtual bool isKnownSourceImage(const std::string &name)=0;
+	virtual video::ITexture* getNormalTexture(const std::string &name)=0;
+	virtual video::SColor getTextureAverageColor(const std::string &name)=0;
+	virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
+};
+
+class IWritableTextureSource : public ITextureSource
+{
+public:
+	IWritableTextureSource() = default;
+
+	virtual ~IWritableTextureSource() = default;
+
+	virtual u32 getTextureId(const std::string &name)=0;
+	virtual std::string getTextureName(u32 id)=0;
+	virtual video::ITexture* getTexture(u32 id)=0;
+	virtual video::ITexture* getTexture(
+			const std::string &name, u32 *id = nullptr)=0;
+	virtual bool isKnownSourceImage(const std::string &name)=0;
+
+	virtual void processQueue()=0;
+	virtual void insertSourceImage(const std::string &name, video::IImage *img)=0;
+	virtual void rebuildImagesAndTextures()=0;
+	virtual video::ITexture* getNormalTexture(const std::string &name)=0;
+	virtual video::SColor getTextureAverageColor(const std::string &name)=0;
+	virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
+};
+
+IWritableTextureSource *createTextureSource();
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index ae2b7b681..68c3b9e93 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -22,2750 +22,48 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tile.h"
 
-#include <algorithm>
-#include <ICameraSceneNode.h>
-#include <IVideoDriver.h>
-#include "util/string.h"
-#include "util/container.h"
-#include "util/thread.h"
-#include "filesys.h"
-#include "settings.h"
-#include "mesh.h"
-#include "gamedef.h"
-#include "util/strfnd.h"
-#include "imagefilters.h"
-#include "guiscalingfilter.h"
-#include "renderingengine.h"
-#include "util/base64.h"
-
-/*
-	A cache from texture name to texture path
-*/
-MutexedMap<std::string, std::string> g_texturename_to_path_cache;
-
-/*
-	Replaces the filename extension.
-	eg:
-		std::string image = "a/image.png"
-		replace_ext(image, "jpg")
-		-> image = "a/image.jpg"
-	Returns true on success.
-*/
-static bool replace_ext(std::string &path, const char *ext)
+// Sets everything else except the texture in the material
+void TileLayer::applyMaterialOptions(video::SMaterial &material) const
 {
-	if (ext == NULL)
-		return false;
-	// Find place of last dot, fail if \ or / found.
-	s32 last_dot_i = -1;
-	for (s32 i=path.size()-1; i>=0; i--)
-	{
-		if (path[i] == '.')
-		{
-			last_dot_i = i;
-			break;
-		}
-
-		if (path[i] == '\\' || path[i] == '/')
-			break;
+	switch (material_type) {
+	case TILE_MATERIAL_OPAQUE:
+	case TILE_MATERIAL_LIQUID_OPAQUE:
+	case TILE_MATERIAL_WAVING_LIQUID_OPAQUE:
+		material.MaterialType = video::EMT_SOLID;
+		break;
+	case TILE_MATERIAL_BASIC:
+	case TILE_MATERIAL_WAVING_LEAVES:
+	case TILE_MATERIAL_WAVING_PLANTS:
+	case TILE_MATERIAL_WAVING_LIQUID_BASIC:
+		material.MaterialTypeParam = 0.5;
+		material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+		break;
+	case TILE_MATERIAL_ALPHA:
+	case TILE_MATERIAL_LIQUID_TRANSPARENT:
+	case TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT:
+		material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+		break;
+	default:
+		break;
 	}
-	// If not found, return an empty string
-	if (last_dot_i == -1)
-		return false;
-	// Else make the new path
-	path = path.substr(0, last_dot_i+1) + ext;
-	return true;
-}
-
-/*
-	Find out the full path of an image by trying different filename
-	extensions.
-
-	If failed, return "".
-*/
-std::string getImagePath(std::string path)
-{
-	// A NULL-ended list of possible image extensions
-	const char *extensions[] = { "png", "jpg", "bmp", "tga", NULL };
-	// If there is no extension, assume PNG
-	if (removeStringEnd(path, extensions).empty())
-		path = path + ".png";
-	// Check paths until something is found to exist
-	const char **ext = extensions;
-	do{
-		bool r = replace_ext(path, *ext);
-		if (!r)
-			return "";
-		if (fs::PathExists(path))
-			return path;
+	material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) != 0;
+	if (!(material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)) {
+		material.TextureLayers[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
 	}
-	while((++ext) != NULL);
-
-	return "";
-}
-
-/*
-	Gets the path to a texture by first checking if the texture exists
-	in texture_path and if not, using the data path.
-
-	Checks all supported extensions by replacing the original extension.
-
-	If not found, returns "".
-
-	Utilizes a thread-safe cache.
-*/
-std::string getTexturePath(const std::string &filename, bool *is_base_pack)
-{
-	std::string fullpath;
-
-	// This can set a wrong value on cached textures, but is irrelevant because
-	// is_base_pack is only passed when initializing the textures the first time
-	if (is_base_pack)
-		*is_base_pack = false;
-	/*
-		Check from cache
-	*/
-	bool incache = g_texturename_to_path_cache.get(filename, &fullpath);
-	if (incache)
-		return fullpath;
-
-	/*
-		Check from texture_path
-	*/
-	for (const auto &path : getTextureDirs()) {
-		std::string testpath = path + DIR_DELIM;
-		testpath.append(filename);
-		// Check all filename extensions. Returns "" if not found.
-		fullpath = getImagePath(testpath);
-		if (!fullpath.empty())
-			break;
-	}
-
-	/*
-		Check from default data directory
-	*/
-	if (fullpath.empty())
-	{
-		std::string base_path = porting::path_share + DIR_DELIM + "textures"
-				+ DIR_DELIM + "base" + DIR_DELIM + "pack";
-		std::string testpath = base_path + DIR_DELIM + filename;
-		// Check all filename extensions. Returns "" if not found.
-		fullpath = getImagePath(testpath);
-		if (is_base_pack && !fullpath.empty())
-			*is_base_pack = true;
-	}
-
-	// Add to cache (also an empty result is cached)
-	g_texturename_to_path_cache.set(filename, fullpath);
-
-	// Finally return it
-	return fullpath;
-}
-
-void clearTextureNameCache()
-{
-	g_texturename_to_path_cache.clear();
-}
-
-/*
-	Stores internal information about a texture.
-*/
-
-/*
-	SourceImageCache: A cache used for storing source images.
-*/
-
-class SourceImageCache
-{
-public:
-	~SourceImageCache() {
-		for (auto &m_image : m_images) {
-			m_image.second->drop();
-		}
-		m_images.clear();
-	}
-	void insert(const std::string &name, video::IImage *img, bool prefer_local)
-	{
-		if(!img)
-			return;
-		// Remove old image
-		std::map<std::string, video::IImage*>::iterator n;
-		n = m_images.find(name);
-		if (n != m_images.end()){
-			if (n->second)
-				n->second->drop();
-		}
-
-		video::IImage* toadd = img;
-		bool need_to_grab = true;
-
-		// Try to use local texture instead if asked to
-		if (prefer_local) {
-			bool is_base_pack;
-			std::string path = getTexturePath(name, &is_base_pack);
-			// Ignore base pack
-			if (!path.empty() && !is_base_pack) {
-				video::IImage *img2 = RenderingEngine::get_video_driver()->
-					createImageFromFile(path.c_str());
-				if (img2){
-					toadd = img2;
-					need_to_grab = false;
-				}
-			}
-		}
-
-		if (need_to_grab)
-			toadd->grab();
-		m_images[name] = toadd;
-	}
-	video::IImage* get(const std::string &name)
-	{
-		std::map<std::string, video::IImage*>::iterator n;
-		n = m_images.find(name);
-		if (n != m_images.end())
-			return n->second;
-		return NULL;
-	}
-	// Primarily fetches from cache, secondarily tries to read from filesystem
-	video::IImage *getOrLoad(const std::string &name)
-	{
-		std::map<std::string, video::IImage*>::iterator n;
-		n = m_images.find(name);
-		if (n != m_images.end()){
-			n->second->grab(); // Grab for caller
-			return n->second;
-		}
-		video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-		std::string path = getTexturePath(name);
-		if (path.empty()) {
-			infostream<<"SourceImageCache::getOrLoad(): No path found for \""
-					<<name<<"\""<<std::endl;
-			return NULL;
-		}
-		infostream<<"SourceImageCache::getOrLoad(): Loading path \""<<path
-				<<"\""<<std::endl;
-		video::IImage *img = driver->createImageFromFile(path.c_str());
-
-		if (img){
-			m_images[name] = img;
-			img->grab(); // Grab for caller
-		}
-		return img;
-	}
-private:
-	std::map<std::string, video::IImage*> m_images;
-};
-
-/*
-	TextureSource
-*/
-
-class TextureSource : public IWritableTextureSource
-{
-public:
-	TextureSource();
-	virtual ~TextureSource();
-
-	/*
-		Example case:
-		Now, assume a texture with the id 1 exists, and has the name
-		"stone.png^mineral1".
-		Then a random thread calls getTextureId for a texture called
-		"stone.png^mineral1^crack0".
-		...Now, WTF should happen? Well:
-		- getTextureId strips off stuff recursively from the end until
-		  the remaining part is found, or nothing is left when
-		  something is stripped out
-
-		But it is slow to search for textures by names and modify them
-		like that?
-		- ContentFeatures is made to contain ids for the basic plain
-		  textures
-		- Crack textures can be slow by themselves, but the framework
-		  must be fast.
-
-		Example case #2:
-		- Assume a texture with the id 1 exists, and has the name
-		  "stone.png^mineral_coal.png".
-		- Now getNodeTile() stumbles upon a node which uses
-		  texture id 1, and determines that MATERIAL_FLAG_CRACK
-		  must be applied to the tile
-		- MapBlockMesh::animate() finds the MATERIAL_FLAG_CRACK and
-		  has received the current crack level 0 from the client. It
-		  finds out the name of the texture with getTextureName(1),
-		  appends "^crack0" to it and gets a new texture id with
-		  getTextureId("stone.png^mineral_coal.png^crack0").
-
-	*/
-
-	/*
-		Gets a texture id from cache or
-		- if main thread, generates the texture, adds to cache and returns id.
-		- if other thread, adds to request queue and waits for main thread.
-
-		The id 0 points to a NULL texture. It is returned in case of error.
-	*/
-	u32 getTextureId(const std::string &name);
-
-	// Finds out the name of a cached texture.
-	std::string getTextureName(u32 id);
-
-	/*
-		If texture specified by the name pointed by the id doesn't
-		exist, create it, then return the cached texture.
-
-		Can be called from any thread. If called from some other thread
-		and not found in cache, the call is queued to the main thread
-		for processing.
-	*/
-	video::ITexture* getTexture(u32 id);
-
-	video::ITexture* getTexture(const std::string &name, u32 *id = NULL);
-
-	TextureInfo* getTextureInfo(u32 id);
-	/*
-		Get a texture specifically intended for mesh
-		application, i.e. not HUD, compositing, or other 2D
-		use.  This texture may be a different size and may
-		have had additional filters applied.
-	*/
-	video::ITexture* getTextureForMesh(const std::string &name, u32 *id);
-
-	virtual Palette* getPalette(const std::string &name);
-
-	bool isKnownSourceImage(const std::string &name)
-	{
-		bool is_known = false;
-		bool cache_found = m_source_image_existence.get(name, &is_known);
-		if (cache_found)
-			return is_known;
-		// Not found in cache; find out if a local file exists
-		is_known = (!getTexturePath(name).empty());
-		m_source_image_existence.set(name, is_known);
-		return is_known;
-	}
-
-	// Processes queued texture requests from other threads.
-	// Shall be called from the main thread.
-	void processQueue();
-
-	// Insert an image into the cache without touching the filesystem.
-	// Shall be called from the main thread.
-	void insertSourceImage(const std::string &name, video::IImage *img);
-
-	// Rebuild images and textures from the current set of source images
-	// Shall be called from the main thread.
-	void rebuildImagesAndTextures();
-
-	video::ITexture* getNormalTexture(const std::string &name);
-	video::SColor getTextureAverageColor(const std::string &name);
-	video::ITexture *getShaderFlagsTexture(bool normamap_present);
-
-private:
-
-	// The id of the thread that is allowed to use irrlicht directly
-	std::thread::id m_main_thread;
-
-	// Cache of source images
-	// This should be only accessed from the main thread
-	SourceImageCache m_sourcecache;
-
-	// Rebuild images and textures from the current set of source images
-	// Shall be called from the main thread.
-	// You ARE expected to be holding m_textureinfo_cache_mutex
-	void rebuildTexture(video::IVideoDriver *driver, TextureInfo &ti);
-
-	// Generate a texture
-	u32 generateTexture(const std::string &name);
-
-	// Generate image based on a string like "stone.png" or "[crack:1:0".
-	// if baseimg is NULL, it is created. Otherwise stuff is made on it.
-	// source_image_names is important to determine when to flush the image from a cache (dynamic media)
-	bool generateImagePart(std::string part_of_name, video::IImage *& baseimg, std::set<std::string> &source_image_names);
-
-	/*! Generates an image from a full string like
-	 * "stone.png^mineral_coal.png^[crack:1:0".
-	 * Shall be called from the main thread.
-	 * The returned Image should be dropped.
-	 * source_image_names is important to determine when to flush the image from a cache (dynamic media)
-	 */
-	video::IImage* generateImage(const std::string &name, std::set<std::string> &source_image_names);
-
-	// Thread-safe cache of what source images are known (true = known)
-	MutexedMap<std::string, bool> m_source_image_existence;
-
-	// A texture id is index in this array.
-	// The first position contains a NULL texture.
-	std::vector<TextureInfo> m_textureinfo_cache;
-	// Maps a texture name to an index in the former.
-	std::map<std::string, u32> m_name_to_id;
-	// The two former containers are behind this mutex
-	std::mutex m_textureinfo_cache_mutex;
-
-	// Queued texture fetches (to be processed by the main thread)
-	RequestQueue<std::string, u32, std::thread::id, u8> m_get_texture_queue;
-
-	// Textures that have been overwritten with other ones
-	// but can't be deleted because the ITexture* might still be used
-	std::vector<video::ITexture*> m_texture_trash;
-
-	// Maps image file names to loaded palettes.
-	std::unordered_map<std::string, Palette> m_palettes;
-
-	// Cached settings needed for making textures from meshes
-	bool m_setting_mipmap;
-	bool m_setting_trilinear_filter;
-	bool m_setting_bilinear_filter;
-	bool m_setting_anisotropic_filter;
-};
-
-IWritableTextureSource *createTextureSource()
-{
-	return new TextureSource();
-}
-
-TextureSource::TextureSource()
-{
-	m_main_thread = std::this_thread::get_id();
-
-	// Add a NULL TextureInfo as the first index, named ""
-	m_textureinfo_cache.emplace_back("");
-	m_name_to_id[""] = 0;
-
-	// Cache some settings
-	// Note: Since this is only done once, the game must be restarted
-	// for these settings to take effect
-	m_setting_mipmap = g_settings->getBool("mip_map");
-	m_setting_trilinear_filter = g_settings->getBool("trilinear_filter");
-	m_setting_bilinear_filter = g_settings->getBool("bilinear_filter");
-	m_setting_anisotropic_filter = g_settings->getBool("anisotropic_filter");
-}
-
-TextureSource::~TextureSource()
-{
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-
-	unsigned int textures_before = driver->getTextureCount();
-
-	for (const auto &iter : m_textureinfo_cache) {
-		//cleanup texture
-		if (iter.texture)
-			driver->removeTexture(iter.texture);
-	}
-	m_textureinfo_cache.clear();
-
-	for (auto t : m_texture_trash) {
-		//cleanup trashed texture
-		driver->removeTexture(t);
-	}
-
-	infostream << "~TextureSource() before cleanup: "<< textures_before
-			<< " after: " << driver->getTextureCount() << std::endl;
-}
-
-u32 TextureSource::getTextureId(const std::string &name)
-{
-	//infostream<<"getTextureId(): \""<<name<<"\""<<std::endl;
-
-	{
-		/*
-			See if texture already exists
-		*/
-		MutexAutoLock lock(m_textureinfo_cache_mutex);
-		std::map<std::string, u32>::iterator n;
-		n = m_name_to_id.find(name);
-		if (n != m_name_to_id.end())
-		{
-			return n->second;
-		}
-	}
-
-	/*
-		Get texture
-	*/
-	if (std::this_thread::get_id() == m_main_thread) {
-		return generateTexture(name);
-	}
-
-
-	infostream<<"getTextureId(): Queued: name=\""<<name<<"\""<<std::endl;
-
-	// We're gonna ask the result to be put into here
-	static thread_local ResultQueue<std::string, u32, std::thread::id, u8> result_queue;
-
-	// Throw a request in
-	m_get_texture_queue.add(name, std::this_thread::get_id(), 0, &result_queue);
-
-	try {
-		while(true) {
-			// Wait for result for up to 1 seconds (empirical value)
-			GetResult<std::string, u32, std::thread::id, u8>
-				result = result_queue.pop_front(1000);
-
-			if (result.key == name) {
-				return result.item;
-			}
-		}
-	} catch(ItemNotFoundException &e) {
-		infostream << "Waiting for texture " << name << " timed out." << std::endl;
-		return 0;
-	}
-
-	infostream << "getTextureId(): Failed" << std::endl;
-
-	return 0;
-}
-
-// Draw an image on top of another one, using the alpha channel of the
-// source image
-static void blit_with_alpha(video::IImage *src, video::IImage *dst,
-		v2s32 src_pos, v2s32 dst_pos, v2u32 size);
-
-// Like blit_with_alpha, but only modifies destination pixels that
-// are fully opaque
-static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
-		v2s32 src_pos, v2s32 dst_pos, v2u32 size);
-
-// Apply a color to an image.  Uses an int (0-255) to calculate the ratio.
-// If the ratio is 255 or -1 and keep_alpha is true, then it multiples the
-// color alpha with the destination alpha.
-// Otherwise, any pixels that are not fully transparent get the color alpha.
-static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color, int ratio, bool keep_alpha);
-
-// paint a texture using the given color
-static void apply_multiplication(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color);
-
-// Perform a Screen blend with the given color. The opposite effect of a
-// Multiply blend.
-static void apply_screen(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color);
-
-// Adjust the hue, saturation, and lightness of destination. Like
-// "Hue-Saturation" in GIMP.
-// If colorize is true then the image will be converted to a grayscale
-// image as though seen through a colored glass, like "Colorize" in GIMP.
-static void apply_hue_saturation(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		s32 hue, s32 saturation, s32 lightness, bool colorize);
-
-// Apply an overlay blend to an images.
-// Overlay blend combines Multiply and Screen blend modes.The parts of the top
-// layer where the base layer is light become lighter, the parts where the base
-// layer is dark become darker.Areas where the base layer are mid grey are
-// unaffected.An overlay with the same picture looks like an S - curve.
-static void apply_overlay(video::IImage *overlay, video::IImage *dst,
-		v2s32 overlay_pos, v2s32 dst_pos, v2u32 size, bool hardlight);
-
-// Adjust the brightness and contrast of the base image. Conceptually like
-// "Brightness-Contrast" in GIMP but allowing brightness to be wound all the
-// way up to white or down to black.
-static void apply_brightness_contrast(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		s32 brightness, s32 contrast);
-
-// Apply a mask to an image
-static void apply_mask(video::IImage *mask, video::IImage *dst,
-		v2s32 mask_pos, v2s32 dst_pos, v2u32 size);
-
-// Draw or overlay a crack
-static void draw_crack(video::IImage *crack, video::IImage *dst,
-		bool use_overlay, s32 frame_count, s32 progression,
-		video::IVideoDriver *driver, u8 tiles = 1);
-
-// Brighten image
-void brighten(video::IImage *image);
-// Parse a transform name
-u32 parseImageTransform(const std::string& s);
-// Apply transform to image dimension
-core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<u32> dim);
-// Apply transform to image data
-void imageTransform(u32 transform, video::IImage *src, video::IImage *dst);
-
-/*
-	This method generates all the textures
-*/
-u32 TextureSource::generateTexture(const std::string &name)
-{
-	//infostream << "generateTexture(): name=\"" << name << "\"" << std::endl;
-
-	// Empty name means texture 0
-	if (name.empty()) {
-		infostream<<"generateTexture(): name is empty"<<std::endl;
-		return 0;
-	}
-
-	{
-		/*
-			See if texture already exists
-		*/
-		MutexAutoLock lock(m_textureinfo_cache_mutex);
-		std::map<std::string, u32>::iterator n;
-		n = m_name_to_id.find(name);
-		if (n != m_name_to_id.end()) {
-			return n->second;
-		}
-	}
-
-	/*
-		Calling only allowed from main thread
-	*/
-	if (std::this_thread::get_id() != m_main_thread) {
-		errorstream<<"TextureSource::generateTexture() "
-				"called not from main thread"<<std::endl;
-		return 0;
-	}
-
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	if (!driver)
-		return 0;
-	//sanity_check(driver);
-
-	// passed into texture info for dynamic media tracking
-	std::set<std::string> source_image_names;
-	video::IImage *img = generateImage(name, source_image_names);
-
-	video::ITexture *tex = NULL;
-
-	if (img != NULL) {
-		img = Align2Npot2(img, driver);
-		// Create texture from resulting image
-		tex = driver->addTexture(name.c_str(), img);
-		guiScalingCache(io::path(name.c_str()), driver, img);
-		img->drop();
-	}
-
-	/*
-		Add texture to caches (add NULL textures too)
-	*/
-
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	u32 id = m_textureinfo_cache.size();
-	TextureInfo ti(name, tex, source_image_names);
-	m_textureinfo_cache.push_back(ti);
-	m_name_to_id[name] = id;
-
-	return id;
-}
-
-std::string TextureSource::getTextureName(u32 id)
-{
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	if (id >= m_textureinfo_cache.size())
-	{
-		errorstream<<"TextureSource::getTextureName(): id="<<id
-				<<" >= m_textureinfo_cache.size()="
-				<<m_textureinfo_cache.size()<<std::endl;
-		return "";
-	}
-
-	return m_textureinfo_cache[id].name;
-}
-
-video::ITexture* TextureSource::getTexture(u32 id)
-{
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	if (id >= m_textureinfo_cache.size())
-		return NULL;
-
-	return m_textureinfo_cache[id].texture;
-}
-
-video::ITexture* TextureSource::getTexture(const std::string &name, u32 *id)
-{
-	u32 actual_id = getTextureId(name);
-	if (id){
-		*id = actual_id;
-	}
-	return getTexture(actual_id);
-}
-
-TextureInfo * TextureSource::getTextureInfo(u32 id)
-{
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	if(id >= m_textureinfo_cache.size())
-		return NULL;
-
-	return &m_textureinfo_cache[id];
-}
-
-video::ITexture* TextureSource::getTextureForMesh(const std::string &name, u32 *id)
-{
-	// Avoid duplicating texture if it won't actually change
-	const bool filter_needed =
-		m_setting_mipmap || m_setting_trilinear_filter ||
-		m_setting_bilinear_filter || m_setting_anisotropic_filter;
-	if (filter_needed)
-		return getTexture(name + "^[applyfiltersformesh", id);
-	return getTexture(name, id);
-}
-
-Palette* TextureSource::getPalette(const std::string &name)
-{
-	// Only the main thread may load images
-	sanity_check(std::this_thread::get_id() == m_main_thread);
-
-	if (name.empty())
-		return NULL;
-
-	auto it = m_palettes.find(name);
-	if (it == m_palettes.end()) {
-		// Create palette
-		std::set<std::string> source_image_names; // unused, sadly.
-		video::IImage *img = generateImage(name, source_image_names);
-		if (!img) {
-			warningstream << "TextureSource::getPalette(): palette \"" << name
-				<< "\" could not be loaded." << std::endl;
-			return NULL;
-		}
-		Palette new_palette;
-		u32 w = img->getDimension().Width;
-		u32 h = img->getDimension().Height;
-		// Real area of the image
-		u32 area = h * w;
-		if (area == 0)
-			return NULL;
-		if (area > 256) {
-			warningstream << "TextureSource::getPalette(): the specified"
-				<< " palette image \"" << name << "\" is larger than 256"
-				<< " pixels, using the first 256." << std::endl;
-			area = 256;
-		} else if (256 % area != 0)
-			warningstream << "TextureSource::getPalette(): the "
-				<< "specified palette image \"" << name << "\" does not "
-				<< "contain power of two pixels." << std::endl;
-		// We stretch the palette so it will fit 256 values
-		// This many param2 values will have the same color
-		u32 step = 256 / area;
-		// For each pixel in the image
-		for (u32 i = 0; i < area; i++) {
-			video::SColor c = img->getPixel(i % w, i / w);
-			// Fill in palette with 'step' colors
-			for (u32 j = 0; j < step; j++)
-				new_palette.push_back(c);
-		}
-		img->drop();
-		// Fill in remaining elements
-		while (new_palette.size() < 256)
-			new_palette.emplace_back(0xFFFFFFFF);
-		m_palettes[name] = new_palette;
-		it = m_palettes.find(name);
-	}
-	if (it != m_palettes.end())
-		return &((*it).second);
-	return NULL;
-}
-
-void TextureSource::processQueue()
-{
-	/*
-		Fetch textures
-	*/
-	// NOTE: process outstanding requests from all mesh generation threads
-	while (!m_get_texture_queue.empty())
-	{
-		GetRequest<std::string, u32, std::thread::id, u8>
-				request = m_get_texture_queue.pop();
-
-		/*infostream<<"TextureSource::processQueue(): "
-				<<"got texture request with "
-				<<"name=\""<<request.key<<"\""
-				<<std::endl;*/
-
-		m_get_texture_queue.pushResult(request, generateTexture(request.key));
+	if (!(material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) {
+		material.TextureLayers[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
 	}
 }
 
-void TextureSource::insertSourceImage(const std::string &name, video::IImage *img)
+void TileLayer::applyMaterialOptionsWithShaders(video::SMaterial &material) const
 {
-	//infostream<<"TextureSource::insertSourceImage(): name="<<name<<std::endl;
-
-	if (!(std::this_thread::get_id() == m_main_thread))
-		return;
-	//sanity_check(std::this_thread::get_id() == m_main_thread);
-
-	m_sourcecache.insert(name, img, true);
-	m_source_image_existence.set(name, true);
-
-	// now we need to check for any textures that need updating
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	sanity_check(driver);
-
-	// Recreate affected textures
-	u32 affected = 0;
-	for (TextureInfo &ti : m_textureinfo_cache) {
-		if (ti.name.empty())
-			continue; // Skip dummy entry
-		// If the source image was used, we need to rebuild this texture
-		if (ti.sourceImages.find(name) != ti.sourceImages.end()) {
-			rebuildTexture(driver, ti);
-			affected++;
-		}
+	material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) != 0;
+	if (!(material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)) {
+		material.TextureLayers[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
+		material.TextureLayers[1].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
 	}
-	if (affected > 0)
-		verbosestream << "TextureSource: inserting \"" << name << "\" caused rebuild of " << affected << " textures." << std::endl;
-}
-
-void TextureSource::rebuildImagesAndTextures()
-{
-	MutexAutoLock lock(m_textureinfo_cache_mutex);
-
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	if (!driver)
-		return;
-	//sanity_check(driver);
-
-	infostream << "TextureSource: recreating " << m_textureinfo_cache.size()
-		<< " textures" << std::endl;
-
-	// Recreate textures
-	for (TextureInfo &ti : m_textureinfo_cache) {
-		if (ti.name.empty())
-			continue; // Skip dummy entry
-		rebuildTexture(driver, ti);
+	if (!(material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) {
+		material.TextureLayers[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
+		material.TextureLayers[1].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
 	}
 }
-
-void TextureSource::rebuildTexture(video::IVideoDriver *driver, TextureInfo &ti)
-{
-	if (ti.name.empty())
-		return; // this shouldn't happen, just a precaution
-
-	// replaces the previous sourceImages
-	// shouldn't really need to be done, but can't hurt
-	std::set<std::string> source_image_names;
-	video::IImage *img = generateImage(ti.name, source_image_names);
-	img = Align2Npot2(img, driver);
-	// Create texture from resulting image
-	video::ITexture *t = NULL;
-	if (img) {
-		t = driver->addTexture(ti.name.c_str(), img);
-		guiScalingCache(io::path(ti.name.c_str()), driver, img);
-		img->drop();
-	}
-	video::ITexture *t_old = ti.texture;
-	// Replace texture
-	ti.texture = t;
-	ti.sourceImages = source_image_names;
-
-	if (t_old)
-		m_texture_trash.push_back(t_old);
-}
-
-inline static void applyShadeFactor(video::SColor &color, u32 factor)
-{
-	u32 f = core::clamp<u32>(factor, 0, 256);
-	color.setRed(color.getRed() * f / 256);
-	color.setGreen(color.getGreen() * f / 256);
-	color.setBlue(color.getBlue() * f / 256);
-}
-
-static video::IImage *createInventoryCubeImage(
-	video::IImage *top, video::IImage *left, video::IImage *right)
-{
-	core::dimension2du size_top = top->getDimension();
-	core::dimension2du size_left = left->getDimension();
-	core::dimension2du size_right = right->getDimension();
-
-	u32 size = npot2(std::max({
-			size_top.Width, size_top.Height,
-			size_left.Width, size_left.Height,
-			size_right.Width, size_right.Height,
-	}));
-
-	// It must be divisible by 4, to let everything work correctly.
-	// But it is a power of 2, so being at least 4 is the same.
-	// And the resulting texture should't be too large as well.
-	size = core::clamp<u32>(size, 4, 64);
-
-	// With such parameters, the cube fits exactly, touching each image line
-	// from `0` to `cube_size - 1`. (Note that division is exact here).
-	u32 cube_size = 9 * size;
-	u32 offset = size / 2;
-
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-
-	auto lock_image = [size, driver] (video::IImage *&image) -> const u32 * {
-		image->grab();
-		core::dimension2du dim = image->getDimension();
-		video::ECOLOR_FORMAT format = image->getColorFormat();
-		if (dim.Width != size || dim.Height != size || format != video::ECF_A8R8G8B8) {
-			video::IImage *scaled = driver->createImage(video::ECF_A8R8G8B8, {size, size});
-			image->copyToScaling(scaled);
-			image->drop();
-			image = scaled;
-		}
-		sanity_check(image->getPitch() == 4 * size);
-		return reinterpret_cast<u32 *>(image->getData());
-	};
-	auto free_image = [] (video::IImage *image) -> void {
-		image->drop();
-	};
-
-	video::IImage *result = driver->createImage(video::ECF_A8R8G8B8, {cube_size, cube_size});
-	//sanity_check(result->getPitch() == 4 * cube_size);
-	result->fill(video::SColor(0x00000000u));
-	u32 *target = reinterpret_cast<u32 *>(result->getData());
-
-	// Draws single cube face
-	// `shade_factor` is face brightness, in range [0.0, 1.0]
-	// (xu, xv, x1; yu, yv, y1) form coordinate transformation matrix
-	// `offsets` list pixels to be drawn for single source pixel
-	auto draw_image = [=] (video::IImage *image, float shade_factor,
-			s16 xu, s16 xv, s16 x1,
-			s16 yu, s16 yv, s16 y1,
-			std::initializer_list<v2s16> offsets) -> void {
-		u32 brightness = core::clamp<u32>(256 * shade_factor, 0, 256);
-		const u32 *source = lock_image(image);
-		for (u16 v = 0; v < size; v++) {
-			for (u16 u = 0; u < size; u++) {
-				video::SColor pixel(*source);
-				applyShadeFactor(pixel, brightness);
-				s16 x = xu * u + xv * v + x1;
-				s16 y = yu * u + yv * v + y1;
-				for (const auto &off : offsets)
-					target[(y + off.Y) * cube_size + (x + off.X) + offset] = pixel.color;
-				source++;
-			}
-		}
-		free_image(image);
-	};
-
-	draw_image(top, 1.000000f,
-			4, -4, 4 * (size - 1),
-			2, 2, 0,
-			{
-				                {2, 0}, {3, 0}, {4, 0}, {5, 0},
-				{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1},
-				                {2, 2}, {3, 2}, {4, 2}, {5, 2},
-			});
-
-	draw_image(left, 0.836660f,
-			4, 0, 0,
-			2, 5, 2 * size,
-			{
-				{0, 0}, {1, 0},
-				{0, 1}, {1, 1}, {2, 1}, {3, 1},
-				{0, 2}, {1, 2}, {2, 2}, {3, 2},
-				{0, 3}, {1, 3}, {2, 3}, {3, 3},
-				{0, 4}, {1, 4}, {2, 4}, {3, 4},
-				                {2, 5}, {3, 5},
-			});
-
-	draw_image(right, 0.670820f,
-			4, 0, 4 * size,
-			-2, 5, 4 * size - 2,
-			{
-				                {2, 0}, {3, 0},
-				{0, 1}, {1, 1}, {2, 1}, {3, 1},
-				{0, 2}, {1, 2}, {2, 2}, {3, 2},
-				{0, 3}, {1, 3}, {2, 3}, {3, 3},
-				{0, 4}, {1, 4}, {2, 4}, {3, 4},
-				{0, 5}, {1, 5},
-			});
-
-	return result;
-}
-
-video::IImage* TextureSource::generateImage(const std::string &name, std::set<std::string> &source_image_names)
-{
-	// Get the base image
-
-	const char separator = '^';
-	const char escape = '\\';
-	const char paren_open = '(';
-	const char paren_close = ')';
-
-	// Find last separator in the name
-	s32 last_separator_pos = -1;
-	u8 paren_bal = 0;
-	for (s32 i = name.size() - 1; i >= 0; i--) {
-		if (i > 0 && name[i-1] == escape)
-			continue;
-		switch (name[i]) {
-		case separator:
-			if (paren_bal == 0) {
-				last_separator_pos = i;
-				i = -1; // break out of loop
-			}
-			break;
-		case paren_open:
-			if (paren_bal == 0) {
-				errorstream << "generateImage(): unbalanced parentheses"
-						<< "(extranous '(') while generating texture \""
-						<< name << "\"" << std::endl;
-				return NULL;
-			}
-			paren_bal--;
-			break;
-		case paren_close:
-			paren_bal++;
-			break;
-		default:
-			break;
-		}
-	}
-	if (paren_bal > 0) {
-		errorstream << "generateImage(): unbalanced parentheses"
-				<< "(missing matching '(') while generating texture \""
-				<< name << "\"" << std::endl;
-		return NULL;
-	}
-
-
-	video::IImage *baseimg = NULL;
-
-	/*
-		If separator was found, make the base image
-		using a recursive call.
-	*/
-	if (last_separator_pos != -1) {
-		baseimg = generateImage(name.substr(0, last_separator_pos), source_image_names);
-	}
-
-	/*
-		Parse out the last part of the name of the image and act
-		according to it
-	*/
-
-	std::string last_part_of_name = name.substr(last_separator_pos + 1);
-
-	/*
-		If this name is enclosed in parentheses, generate it
-		and blit it onto the base image
-	*/
-	if (last_part_of_name[0] == paren_open
-			&& last_part_of_name[last_part_of_name.size() - 1] == paren_close) {
-		std::string name2 = last_part_of_name.substr(1,
-				last_part_of_name.size() - 2);
-		video::IImage *tmp = generateImage(name2, source_image_names);
-		if (!tmp) {
-			errorstream << "generateImage(): "
-				"Failed to generate \"" << name2 << "\""
-				<< std::endl;
-			return NULL;
-		}
-
-		if (baseimg) {
-			core::dimension2d<u32> dim = tmp->getDimension();
-			blit_with_alpha(tmp, baseimg, v2s32(0, 0), v2s32(0, 0), dim);
-			tmp->drop();
-		} else {
-			baseimg = tmp;
-		}
-	} else if (!generateImagePart(last_part_of_name, baseimg, source_image_names)) {
-		// Generate image according to part of name
-		errorstream << "generateImage(): "
-				"Failed to generate \"" << last_part_of_name << "\""
-				<< std::endl;
-	}
-
-	// If no resulting image, print a warning
-	if (baseimg == NULL) {
-		errorstream << "generateImage(): baseimg is NULL (attempted to"
-				" create texture \"" << name << "\")" << std::endl;
-	}
-
-	return baseimg;
-}
-
-/**
- * Check and align image to npot2 if required by hardware
- * @param image image to check for npot2 alignment
- * @param driver driver to use for image operations
- * @return image or copy of image aligned to npot2
- */
-video::IImage *Align2Npot2(video::IImage *image,
-		video::IVideoDriver *driver)
-{
-	if (image == NULL)
-		return image;
-
-	if (driver->queryFeature(video::EVDF_TEXTURE_NPOT))
-		return image;
-
-	core::dimension2d<u32> dim = image->getDimension();
-	unsigned int height = npot2(dim.Height);
-	unsigned int width  = npot2(dim.Width);
-
-	if (dim.Height == height && dim.Width == width)
-		return image;
-
-	if (dim.Height > height)
-		height *= 2;
-	if (dim.Width > width)
-		width *= 2;
-
-	video::IImage *targetimage =
-			driver->createImage(video::ECF_A8R8G8B8,
-					core::dimension2d<u32>(width, height));
-
-	if (targetimage != NULL)
-		image->copyToScaling(targetimage);
-	image->drop();
-	return targetimage;
-}
-
-static std::string unescape_string(const std::string &str, const char esc = '\\')
-{
-	std::string out;
-	size_t pos = 0, cpos;
-	out.reserve(str.size());
-	while (1) {
-		cpos = str.find_first_of(esc, pos);
-		if (cpos == std::string::npos) {
-			out += str.substr(pos);
-			break;
-		}
-		out += str.substr(pos, cpos - pos) + str[cpos + 1];
-		pos = cpos + 2;
-	}
-	return out;
-}
-
-/*
-	Replaces the smaller of the two images with one upscaled to match the
-	dimensions of the other.
-	Ensure no other references to these images are being held, as one may
-	get dropped and switched with a new image.
-*/
-void upscaleImagesToMatchLargest(video::IImage *& img1,
-	video::IImage *& img2)
-{
-	core::dimension2d<u32> dim1 = img1->getDimension();
-	core::dimension2d<u32> dim2 = img2->getDimension();
-
-	if (dim1 == dim2) {
-		// image dimensions match, no scaling required
-
-	}
-	else if (dim1.Width * dim1.Height < dim2.Width * dim2.Height) {
-		// Upscale img1
-		video::IImage *scaled_image = RenderingEngine::get_video_driver()->
-			createImage(video::ECF_A8R8G8B8, dim2);
-		img1->copyToScaling(scaled_image);
-		img1->drop();
-		img1 = scaled_image;
-
-	} else {
-		// Upscale img2
-		video::IImage *scaled_image = RenderingEngine::get_video_driver()->
-			createImage(video::ECF_A8R8G8B8, dim1);
-		img2->copyToScaling(scaled_image);
-		img2->drop();
-		img2 = scaled_image;
-	}
-}
-
-void blitBaseImage(video::IImage* &src, video::IImage* &dst)
-{
-	//infostream<<"Blitting "<<part_of_name<<" on base"<<std::endl;
-	upscaleImagesToMatchLargest(dst, src);
-
-	// Size of the copied area
-	core::dimension2d<u32> dim_dst = dst->getDimension();
-	// Position to copy the blitted to in the base image
-	core::position2d<s32> pos_to(0,0);
-	// Position to copy the blitted from in the blitted image
-	core::position2d<s32> pos_from(0,0);
-
-	blit_with_alpha(src, dst, pos_from, pos_to, dim_dst);
-}
-
-bool TextureSource::generateImagePart(std::string part_of_name,
-		video::IImage *& baseimg, std::set<std::string> &source_image_names)
-{
-	const char escape = '\\'; // same as in generateImage()
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	if (!driver)
-		return false;
-	//sanity_check(driver);
-
-	// Stuff starting with [ are special commands
-	if (part_of_name.empty() || part_of_name[0] != '[') {
-		source_image_names.insert(part_of_name);
-		video::IImage *image = m_sourcecache.getOrLoad(part_of_name);
-		if (image == NULL) {
-			if (!part_of_name.empty()) {
-
-				// Do not create normalmap dummies
-				if (part_of_name.find("_normal.png") != std::string::npos) {
-					infostream << "generateImage(): Could not load normal map \""
-						<< part_of_name << "\"" << std::endl;
-					return true;
-				}
-
-				errorstream << "generateImage(): Could not load image \""
-					<< part_of_name << "\" while building texture; "
-					"Creating a dummy image" << std::endl;
-			}
-
-			// Just create a dummy image
-			//core::dimension2d<u32> dim(2,2);
-			core::dimension2d<u32> dim(1,1);
-			image = driver->createImage(video::ECF_A8R8G8B8, dim);
-			if (!image)
-				return false;
-			/*image->setPixel(0,0, video::SColor(255,255,0,0));
-			image->setPixel(1,0, video::SColor(255,0,255,0));
-			image->setPixel(0,1, video::SColor(255,0,0,255));
-			image->setPixel(1,1, video::SColor(255,255,0,255));*/
-			image->setPixel(0,0, video::SColor(255,myrand()%256,
-					myrand()%256,myrand()%256));
-			/*image->setPixel(1,0, video::SColor(255,myrand()%256,
-					myrand()%256,myrand()%256));
-			image->setPixel(0,1, video::SColor(255,myrand()%256,
-					myrand()%256,myrand()%256));
-			image->setPixel(1,1, video::SColor(255,myrand()%256,
-					myrand()%256,myrand()%256));*/
-		}
-
-		// If base image is NULL, load as base.
-		if (baseimg == NULL)
-		{
-			//infostream<<"Setting "<<part_of_name<<" as base"<<std::endl;
-			/*
-				Copy it this way to get an alpha channel.
-				Otherwise images with alpha cannot be blitted on
-				images that don't have alpha in the original file.
-			*/
-			core::dimension2d<u32> dim = image->getDimension();
-			baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-			image->copyTo(baseimg);
-		}
-		// Else blit on base.
-		else
-		{
-			blitBaseImage(image, baseimg);
-		}
-		//cleanup
-		image->drop();
-	}
-	else
-	{
-		// A special texture modification
-
-		/*infostream<<"generateImage(): generating special "
-				<<"modification \""<<part_of_name<<"\""
-				<<std::endl;*/
-
-		/*
-			[crack:N:P
-			[cracko:N:P
-			Adds a cracking texture
-			N = animation frame count, P = crack progression
-		*/
-		if (str_starts_with(part_of_name, "[crack"))
-		{
-			if (baseimg == NULL) {
-				errorstream<<"generateImagePart(): baseimg == NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			// Crack image number and overlay option
-			// Format: crack[o][:<tiles>]:<frame_count>:<frame>
-			bool use_overlay = (part_of_name[6] == 'o');
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			s32 frame_count = stoi(sf.next(":"));
-			s32 progression = stoi(sf.next(":"));
-			s32 tiles = 1;
-			// Check whether there is the <tiles> argument, that is,
-			// whether there are 3 arguments. If so, shift values
-			// as the first and not the last argument is optional.
-			auto s = sf.next(":");
-			if (!s.empty()) {
-				tiles = frame_count;
-				frame_count = progression;
-				progression = stoi(s);
-			}
-
-			if (progression >= 0) {
-				/*
-					Load crack image.
-
-					It is an image with a number of cracking stages
-					horizontally tiled.
-				*/
-				video::IImage *img_crack = m_sourcecache.getOrLoad(
-					"crack_anylength.png");
-
-				if (img_crack) {
-					draw_crack(img_crack, baseimg,
-						use_overlay, frame_count,
-						progression, driver, tiles);
-					img_crack->drop();
-				}
-			}
-		}
-		/*
-			[combine:WxH:X,Y=filename:X,Y=filename2
-			Creates a bigger texture from any amount of smaller ones
-		*/
-		else if (str_starts_with(part_of_name, "[combine"))
-		{
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 w0 = stoi(sf.next("x"));
-			u32 h0 = stoi(sf.next(":"));
-			core::dimension2d<u32> dim(w0,h0);
-			if (baseimg == NULL) {
-				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-				baseimg->fill(video::SColor(0,0,0,0));
-			}
-			while (!sf.at_end()) {
-				u32 x = stoi(sf.next(","));
-				u32 y = stoi(sf.next("="));
-				std::string filename = unescape_string(sf.next_esc(":", escape), escape);
-				infostream<<"Adding \""<<filename
-						<<"\" to combined ("<<x<<","<<y<<")"
-						<<std::endl;
-				video::IImage *img = generateImage(filename, source_image_names);
-				if (img) {
-					core::dimension2d<u32> dim = img->getDimension();
-					core::position2d<s32> pos_base(x, y);
-					video::IImage *img2 =
-							driver->createImage(video::ECF_A8R8G8B8, dim);
-					img->copyTo(img2);
-					img->drop();
-					/*img2->copyToWithAlpha(baseimg, pos_base,
-							core::rect<s32>(v2s32(0,0), dim),
-							video::SColor(255,255,255,255),
-							NULL);*/
-					blit_with_alpha(img2, baseimg, v2s32(0,0), pos_base, dim);
-					img2->drop();
-				} else {
-					errorstream << "generateImagePart(): Failed to load image \""
-						<< filename << "\" for [combine" << std::endl;
-				}
-			}
-		}
-		/*
-			[fill:WxH:color
-			[fill:WxH:X,Y:color
-			Creates a texture of the given size and color, optionally with an <x>,<y>
-			position. An alpha value may be specified in the `Colorstring`.
-		*/
-		else if (str_starts_with(part_of_name, "[fill"))
-		{
-			s32 x = 0;
-			s32 y = 0;
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 width  = stoi(sf.next("x"));
-			u32 height = stoi(sf.next(":"));
-			std::string color_or_x = sf.next(",");
-
-			video::SColor color;
-			if (!parseColorString(color_or_x, color, true)) {
-				x = stoi(color_or_x);
-				y = stoi(sf.next(":"));
-				std::string color_str = sf.next(":");
-
-				if (!parseColorString(color_str, color, false))
-					return false;
-			}
-			core::dimension2d<u32> dim(width, height);
-
-			video::IImage *img = driver->createImage(video::ECF_A8R8G8B8, dim);
-			img->fill(color);
-
-			if (baseimg == nullptr) {
-				baseimg = img;
-			} else {
-				blit_with_alpha(img, baseimg, v2s32(0, 0), v2s32(x, y), dim);
-				img->drop();
-			}
-		}
-		/*
-			[brighten
-		*/
-		else if (str_starts_with(part_of_name, "[brighten"))
-		{
-			if (baseimg == NULL) {
-				errorstream<<"generateImagePart(): baseimg==NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			brighten(baseimg);
-		}
-		/*
-			[noalpha
-			Make image completely opaque.
-			Used for the leaves texture when in old leaves mode, so
-			that the transparent parts don't look completely black
-			when simple alpha channel is used for rendering.
-		*/
-		else if (str_starts_with(part_of_name, "[noalpha"))
-		{
-			if (baseimg == NULL){
-				errorstream<<"generateImagePart(): baseimg==NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			core::dimension2d<u32> dim = baseimg->getDimension();
-
-			// Set alpha to full
-			for (u32 y=0; y<dim.Height; y++)
-			for (u32 x=0; x<dim.Width; x++)
-			{
-				video::SColor c = baseimg->getPixel(x,y);
-				c.setAlpha(255);
-				baseimg->setPixel(x,y,c);
-			}
-		}
-		/*
-			[makealpha:R,G,B
-			Convert one color to transparent.
-		*/
-		else if (str_starts_with(part_of_name, "[makealpha:"))
-		{
-			if (baseimg == NULL) {
-				errorstream<<"generateImagePart(): baseimg == NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name.substr(11));
-			u32 r1 = stoi(sf.next(","));
-			u32 g1 = stoi(sf.next(","));
-			u32 b1 = stoi(sf.next(""));
-
-			core::dimension2d<u32> dim = baseimg->getDimension();
-
-			/*video::IImage *oldbaseimg = baseimg;
-			baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-			oldbaseimg->copyTo(baseimg);
-			oldbaseimg->drop();*/
-
-			// Set alpha to full
-			for (u32 y=0; y<dim.Height; y++)
-			for (u32 x=0; x<dim.Width; x++)
-			{
-				video::SColor c = baseimg->getPixel(x,y);
-				u32 r = c.getRed();
-				u32 g = c.getGreen();
-				u32 b = c.getBlue();
-				if (!(r == r1 && g == g1 && b == b1))
-					continue;
-				c.setAlpha(0);
-				baseimg->setPixel(x,y,c);
-			}
-		}
-		/*
-			[transformN
-			Rotates and/or flips the image.
-
-			N can be a number (between 0 and 7) or a transform name.
-			Rotations are counter-clockwise.
-			0  I      identity
-			1  R90    rotate by 90 degrees
-			2  R180   rotate by 180 degrees
-			3  R270   rotate by 270 degrees
-			4  FX     flip X
-			5  FXR90  flip X then rotate by 90 degrees
-			6  FY     flip Y
-			7  FYR90  flip Y then rotate by 90 degrees
-
-			Note: Transform names can be concatenated to produce
-			their product (applies the first then the second).
-			The resulting transform will be equivalent to one of the
-			eight existing ones, though (see: dihedral group).
-		*/
-		else if (str_starts_with(part_of_name, "[transform"))
-		{
-			if (baseimg == NULL) {
-				errorstream<<"generateImagePart(): baseimg == NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			u32 transform = parseImageTransform(part_of_name.substr(10));
-			core::dimension2d<u32> dim = imageTransformDimension(
-					transform, baseimg->getDimension());
-			video::IImage *image = driver->createImage(
-					baseimg->getColorFormat(), dim);
-			if (!image)
-				return false;
-			imageTransform(transform, baseimg, image);
-			baseimg->drop();
-			baseimg = image;
-		}
-		/*
-			[inventorycube{topimage{leftimage{rightimage
-			In every subimage, replace ^ with &.
-			Create an "inventory cube".
-			NOTE: This should be used only on its own.
-			Example (a grass block (not actually used in game):
-			"[inventorycube{grass.png{mud.png&grass_side.png{mud.png&grass_side.png"
-		*/
-		else if (str_starts_with(part_of_name, "[inventorycube"))
-		{
-			if (baseimg != NULL){
-				errorstream<<"generateImagePart(): baseimg != NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			str_replace(part_of_name, '&', '^');
-			Strfnd sf(part_of_name);
-			sf.next("{");
-			std::string imagename_top = sf.next("{");
-			std::string imagename_left = sf.next("{");
-			std::string imagename_right = sf.next("{");
-
-			// Generate images for the faces of the cube
-			video::IImage *img_top = generateImage(imagename_top, source_image_names);
-			video::IImage *img_left = generateImage(imagename_left, source_image_names);
-			video::IImage *img_right = generateImage(imagename_right, source_image_names);
-
-			if (img_top == NULL || img_left == NULL || img_right == NULL) {
-				errorstream << "generateImagePart(): Failed to create textures"
-						<< " for inventorycube \"" << part_of_name << "\""
-						<< std::endl;
-				baseimg = generateImage(imagename_top, source_image_names);
-				return true;
-			}
-
-			baseimg = createInventoryCubeImage(img_top, img_left, img_right);
-
-			// Face images are not needed anymore
-			img_top->drop();
-			img_left->drop();
-			img_right->drop();
-
-			return true;
-		}
-		/*
-			[lowpart:percent:filename
-			Adds the lower part of a texture
-		*/
-		else if (str_starts_with(part_of_name, "[lowpart:"))
-		{
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 percent = stoi(sf.next(":"));
-			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
-
-			if (baseimg == NULL)
-				baseimg = driver->createImage(video::ECF_A8R8G8B8, v2u32(16,16));
-			video::IImage *img = generateImage(filename, source_image_names);
-			if (img)
-			{
-				core::dimension2d<u32> dim = img->getDimension();
-				core::position2d<s32> pos_base(0, 0);
-				video::IImage *img2 =
-						driver->createImage(video::ECF_A8R8G8B8, dim);
-				img->copyTo(img2);
-				img->drop();
-				core::position2d<s32> clippos(0, 0);
-				clippos.Y = dim.Height * (100-percent) / 100;
-				core::dimension2d<u32> clipdim = dim;
-				clipdim.Height = clipdim.Height * percent / 100 + 1;
-				core::rect<s32> cliprect(clippos, clipdim);
-				img2->copyToWithAlpha(baseimg, pos_base,
-						core::rect<s32>(v2s32(0,0), dim),
-						video::SColor(255,255,255,255),
-						&cliprect);
-				img2->drop();
-			}
-		}
-		/*
-			[verticalframe:N:I
-			Crops a frame of a vertical animation.
-			N = frame count, I = frame index
-		*/
-		else if (str_starts_with(part_of_name, "[verticalframe:"))
-		{
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 frame_count = stoi(sf.next(":"));
-			u32 frame_index = stoi(sf.next(":"));
-
-			if (baseimg == NULL){
-				errorstream<<"generateImagePart(): baseimg != NULL "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			v2u32 frame_size = baseimg->getDimension();
-			if (frame_count)
-			frame_size.Y /= frame_count;
-
-			video::IImage *img = driver->createImage(video::ECF_A8R8G8B8,
-					frame_size);
-			if (!img){
-				errorstream<<"generateImagePart(): Could not create image "
-						<<"for part_of_name=\""<<part_of_name
-						<<"\", cancelling."<<std::endl;
-				return false;
-			}
-
-			// Fill target image with transparency
-			img->fill(video::SColor(0,0,0,0));
-
-			core::dimension2d<u32> dim = frame_size;
-			core::position2d<s32> pos_dst(0, 0);
-			core::position2d<s32> pos_src(0, frame_index * frame_size.Y);
-			baseimg->copyToWithAlpha(img, pos_dst,
-					core::rect<s32>(pos_src, dim),
-					video::SColor(255,255,255,255),
-					NULL);
-			// Replace baseimg
-			baseimg->drop();
-			baseimg = img;
-		}
-		/*
-			[mask:filename
-			Applies a mask to an image
-		*/
-		else if (str_starts_with(part_of_name, "[mask:"))
-		{
-			if (baseimg == NULL) {
-				errorstream << "generateImage(): baseimg == NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
-
-			video::IImage *img = generateImage(filename, source_image_names);
-			if (img) {
-				apply_mask(img, baseimg, v2s32(0, 0), v2s32(0, 0),
-						img->getDimension());
-				img->drop();
-			} else {
-				errorstream << "generateImage(): Failed to load \""
-						<< filename << "\".";
-			}
-		}
-		/*
-		[multiply:color
-		or 
-		[screen:color
-			Multiply and Screen blend modes are basic blend modes for darkening and lightening
-			images, respectively.
-			A Multiply blend multiplies a given color to every pixel of an image.
-			A Screen blend has the opposite effect to a Multiply blend.
-			color = color as ColorString
-		*/
-		else if (str_starts_with(part_of_name, "[multiply:") ||
-		         str_starts_with(part_of_name, "[screen:")) {
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			std::string color_str = sf.next(":");
-
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg != NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			video::SColor color;
-
-			if (!parseColorString(color_str, color, false))
-				return false;
-			if (str_starts_with(part_of_name, "[multiply:")) {
-				apply_multiplication(baseimg, v2u32(0, 0), 
-					baseimg->getDimension(), color);
-			} else {
-				apply_screen(baseimg, v2u32(0, 0), baseimg->getDimension(), color);
-			}
-		}
-		/*
-			[colorize:color:ratio
-			Overlays image with given color
-			color = color as ColorString
-			ratio = optional string "alpha", or a weighting between 0 and 255
-		*/
-		else if (str_starts_with(part_of_name, "[colorize:"))
-		{
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			std::string color_str = sf.next(":");
-			std::string ratio_str = sf.next(":");
-
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg != NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			video::SColor color;
-			int ratio = -1;
-			bool keep_alpha = false;
-
-			if (!parseColorString(color_str, color, false))
-				return false;
-
-			if (is_number(ratio_str))
-				ratio = mystoi(ratio_str, 0, 255);
-			else if (ratio_str == "alpha")
-				keep_alpha = true;
-
-			apply_colorize(baseimg, v2u32(0, 0), baseimg->getDimension(), color, ratio, keep_alpha);
-		}
-		/*
-			[applyfiltersformesh
-			Internal modifier
-		*/
-		else if (str_starts_with(part_of_name, "[applyfiltersformesh"))
-		{
-			/* IMPORTANT: When changing this, getTextureForMesh() needs to be
-			 * updated too. */
-
-			if (!baseimg) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			// Apply the "clean transparent" filter, if needed
-			if (m_setting_mipmap || m_setting_bilinear_filter ||
-				m_setting_trilinear_filter || m_setting_anisotropic_filter)
-				imageCleanTransparent(baseimg, 127);
-
-			/* Upscale textures to user's requested minimum size.  This is a trick to make
-			 * filters look as good on low-res textures as on high-res ones, by making
-			 * low-res textures BECOME high-res ones.  This is helpful for worlds that
-			 * mix high- and low-res textures, or for mods with least-common-denominator
-			 * textures that don't have the resources to offer high-res alternatives.
-			 */
-			const bool filter = m_setting_trilinear_filter || m_setting_bilinear_filter;
-			const s32 scaleto = filter ? g_settings->getU16("texture_min_size") : 1;
-			if (scaleto > 1) {
-				const core::dimension2d<u32> dim = baseimg->getDimension();
-
-				/* Calculate scaling needed to make the shortest texture dimension
-				 * equal to the target minimum.  If e.g. this is a vertical frames
-				 * animation, the short dimension will be the real size.
-				 */
-				if (dim.Width == 0 || dim.Height == 0) {
-					errorstream << "generateImagePart(): Illegal 0 dimension "
-						<< "for part_of_name=\""<< part_of_name
-						<< "\", cancelling." << std::endl;
-					return false;
-				}
-				u32 xscale = scaleto / dim.Width;
-				u32 yscale = scaleto / dim.Height;
-				const s32 scale = std::max(xscale, yscale);
-
-				// Never downscale; only scale up by 2x or more.
-				if (scale > 1) {
-					u32 w = scale * dim.Width;
-					u32 h = scale * dim.Height;
-					const core::dimension2d<u32> newdim(w, h);
-					video::IImage *newimg = driver->createImage(
-							baseimg->getColorFormat(), newdim);
-					baseimg->copyToScaling(newimg);
-					baseimg->drop();
-					baseimg = newimg;
-				}
-			}
-		}
-		/*
-			[resize:WxH
-			Resizes the base image to the given dimensions
-		*/
-		else if (str_starts_with(part_of_name, "[resize"))
-		{
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-						<< "for part_of_name=\""<< part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 width = stoi(sf.next("x"));
-			u32 height = stoi(sf.next(""));
-			core::dimension2d<u32> dim(width, height);
-
-			video::IImage *image = RenderingEngine::get_video_driver()->
-				createImage(video::ECF_A8R8G8B8, dim);
-			baseimg->copyToScaling(image);
-			baseimg->drop();
-			baseimg = image;
-		}
-		/*
-			[opacity:R
-			Makes the base image transparent according to the given ratio.
-			R must be between 0 and 255.
-			0 means totally transparent.
-			255 means totally opaque.
-		*/
-		else if (str_starts_with(part_of_name, "[opacity:")) {
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-
-			u32 ratio = mystoi(sf.next(""), 0, 255);
-
-			core::dimension2d<u32> dim = baseimg->getDimension();
-
-			for (u32 y = 0; y < dim.Height; y++)
-			for (u32 x = 0; x < dim.Width; x++)
-			{
-				video::SColor c = baseimg->getPixel(x, y);
-				c.setAlpha(floor((c.getAlpha() * ratio) / 255 + 0.5));
-				baseimg->setPixel(x, y, c);
-			}
-		}
-		/*
-			[invert:mode
-			Inverts the given channels of the base image.
-			Mode may contain the characters "r", "g", "b", "a".
-			Only the channels that are mentioned in the mode string
-			will be inverted.
-		*/
-		else if (str_starts_with(part_of_name, "[invert:")) {
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-
-			std::string mode = sf.next("");
-			u32 mask = 0;
-			if (mode.find('a') != std::string::npos)
-				mask |= 0xff000000UL;
-			if (mode.find('r') != std::string::npos)
-				mask |= 0x00ff0000UL;
-			if (mode.find('g') != std::string::npos)
-				mask |= 0x0000ff00UL;
-			if (mode.find('b') != std::string::npos)
-				mask |= 0x000000ffUL;
-
-			core::dimension2d<u32> dim = baseimg->getDimension();
-
-			for (u32 y = 0; y < dim.Height; y++)
-			for (u32 x = 0; x < dim.Width; x++)
-			{
-				video::SColor c = baseimg->getPixel(x, y);
-				c.color ^= mask;
-				baseimg->setPixel(x, y, c);
-			}
-		}
-		/*
-			[sheet:WxH:X,Y
-			Retrieves a tile at position X,Y (in tiles)
-			from the base image it assumes to be a
-			tilesheet with dimensions W,H (in tiles).
-		*/
-		else if (part_of_name.substr(0,7) == "[sheet:") {
-			if (baseimg == NULL) {
-				errorstream << "generateImagePart(): baseimg != NULL "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			u32 w0 = stoi(sf.next("x"));
-			u32 h0 = stoi(sf.next(":"));
-			u32 x0 = stoi(sf.next(","));
-			u32 y0 = stoi(sf.next(":"));
-
-			core::dimension2d<u32> img_dim = baseimg->getDimension();
-			core::dimension2d<u32> tile_dim(v2u32(img_dim) / v2u32(w0, h0));
-
-			video::IImage *img = driver->createImage(
-					video::ECF_A8R8G8B8, tile_dim);
-			if (!img) {
-				errorstream << "generateImagePart(): Could not create image "
-						<< "for part_of_name=\"" << part_of_name
-						<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			img->fill(video::SColor(0,0,0,0));
-			v2u32 vdim(tile_dim);
-			core::rect<s32> rect(v2s32(x0 * vdim.X, y0 * vdim.Y), tile_dim);
-			baseimg->copyToWithAlpha(img, v2s32(0), rect,
-					video::SColor(255,255,255,255), NULL);
-
-			// Replace baseimg
-			baseimg->drop();
-			baseimg = img;
-		}
-		/*
-			[png:base64
-			Decodes a PNG image in base64 form.
-			Use minetest.encode_png and minetest.encode_base64
-			to produce a valid string.
-		*/
-		else if (str_starts_with(part_of_name, "[png:")) {
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			std::string png;
-			{
-				std::string blob = sf.next("");
-				if (!base64_is_valid(blob)) {
-					errorstream << "generateImagePart(): "
-								<< "malformed base64 in '[png'"
-								<< std::endl;
-					return false;
-				}
-				png = base64_decode(blob);
-			}
-
-			auto *device = RenderingEngine::get_raw_device();
-			auto *fs = device->getFileSystem();
-			auto *vd = device->getVideoDriver();
-			auto *memfile = fs->createMemoryReadFile(png.data(), png.size(), "__temp_png");
-			video::IImage* pngimg = vd->createImageFromFile(memfile);
-			memfile->drop();
-
-			if (!pngimg) {
-				errorstream << "generateImagePart(): Invalid PNG data" << std::endl;
-				return false;
-			}
-
-			if (baseimg) {
-				blitBaseImage(pngimg, baseimg);
-			} else {
-				core::dimension2d<u32> dim = pngimg->getDimension();
-				baseimg = driver->createImage(video::ECF_A8R8G8B8, dim);
-				pngimg->copyTo(baseimg);
-			}
-			pngimg->drop();
-		}
-		/*
-			[hsl:hue:saturation:lightness
-			or 
-			[colorizehsl:hue:saturation:lightness
-
-			Adjust the hue, saturation, and lightness of the base image. Like
-			"Hue-Saturation" in GIMP, but with 0 as the mid-point.
-			Hue should be from -180 to +180, though 0 to 360 is also supported.
-			Saturation and lightness are optional, with lightness from -100 to
-			+100, and sauration from -100 to +100-or-higher.
-
-			If colorize is true then saturation is from 0 to 100, and the image
-			will be converted to a grayscale image as though seen through a
-			colored glass, like	"Colorize" in GIMP.
-		*/
-		else if (str_starts_with(part_of_name, "[hsl:") || 
-		         str_starts_with(part_of_name, "[colorizehsl:")) {
-
-			if (baseimg == nullptr) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-					<< "for part_of_name=\"" << part_of_name
-					<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			bool colorize = str_starts_with(part_of_name, "[colorizehsl:");
-
-			// saturation range is 0 to 100 when colorize is true
-			s32 defaultSaturation = colorize ? 50 : 0;
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			s32 hue = mystoi(sf.next(":"), -180, 360); 
-			s32 saturation = sf.at_end() ? defaultSaturation : mystoi(sf.next(":"), -100, 1000);
-			s32 lightness  = sf.at_end() ? 0 : mystoi(sf.next(":"), -100, 100);
-
-
-			apply_hue_saturation(baseimg, v2u32(0, 0), baseimg->getDimension(),
-				hue, saturation, lightness, colorize);
-		}
-		/*
-			[overlay:filename
-			or 
-			[hardlight:filename
-
-			"A.png^[hardlight:B.png" is the same as "B.png^[overlay:A.Png"
-
-			Applies an Overlay or Hard Light blend between two images, like the
-			layer modes of the same names in GIMP.
-			Overlay combines Multiply and Screen blend modes. The parts of the
-			top layer where the base layer is light become lighter, the parts
-			where the base layer is dark become darker. Areas where the base
-			layer are mid grey are unaffected. An overlay with the same picture
-			looks like an S-curve.
-
-			Swapping the top layer and base layer is a Hard Light blend
-		*/
-		else if (str_starts_with(part_of_name, "[overlay:") ||
-		         str_starts_with(part_of_name, "[hardlight:")) {
-
-			if (baseimg == nullptr) {
-				errorstream << "generateImage(): baseimg == NULL "
-					<< "for part_of_name=\"" << part_of_name
-					<< "\", cancelling." << std::endl;
-				return false;
-			}
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			std::string filename = unescape_string(sf.next_esc(":", escape), escape);
-
-			video::IImage *img = generateImage(filename, source_image_names);
-			if (img) {
-				upscaleImagesToMatchLargest(baseimg, img);
-
-				bool hardlight = str_starts_with(part_of_name, "[hardlight:");
-				apply_overlay(img, baseimg, v2s32(0, 0), v2s32(0, 0),
-						img->getDimension(), hardlight);
-				img->drop();
-			} else {
-				errorstream << "generateImage(): Failed to load \""
-					<< filename << "\".";
-			}
-		}
-		/*
-			[contrast:C:B
-
-			Adjust the brightness and contrast of the base image. Conceptually
-			like GIMP's "Brightness-Contrast" feature but allows brightness to
-			be wound all the way up to white or down to black.
-			C and B are both values from -127 to +127.
-			B is optional.
-		*/
-		else if (str_starts_with(part_of_name, "[contrast:")) {
-
-			if (baseimg == nullptr) {
-				errorstream << "generateImagePart(): baseimg == NULL "
-					<< "for part_of_name=\"" << part_of_name
-					<< "\", cancelling." << std::endl;
-				return false;
-			}
-
-			Strfnd sf(part_of_name);
-			sf.next(":");
-			s32 contrast = mystoi(sf.next(":"), -127, 127);
-			s32 brightness = sf.at_end() ? 0 : mystoi(sf.next(":"), -127, 127);
-
-			apply_brightness_contrast(baseimg, v2u32(0, 0), 
-				baseimg->getDimension(), brightness, contrast);
-		}
-		else
-		{
-			errorstream << "generateImagePart(): Invalid "
-					" modification: \"" << part_of_name << "\"" << std::endl;
-		}
-	}
-
-	return true;
-}
-
-/*
-	Calculate the color of a single pixel drawn on top of another pixel.
-
-	This is a little more complicated than just video::SColor::getInterpolated
-	because getInterpolated does not handle alpha correctly.  For example, a
-	pixel with alpha=64 drawn atop a pixel with alpha=128 should yield a
-	pixel with alpha=160, while getInterpolated would yield alpha=96.
-*/
-static inline video::SColor blitPixel(const video::SColor &src_c, const video::SColor &dst_c, u32 ratio)
-{
-	if (dst_c.getAlpha() == 0)
-		return src_c;
-	video::SColor out_c = src_c.getInterpolated(dst_c, (float)ratio / 255.0f);
-	out_c.setAlpha(dst_c.getAlpha() + (255 - dst_c.getAlpha()) *
-		src_c.getAlpha() * ratio / (255 * 255));
-	return out_c;
-}
-
-/*
-	Draw an image on top of another one, using the alpha channel of the
-	source image
-
-	This exists because IImage::copyToWithAlpha() doesn't seem to always
-	work.
-*/
-static void blit_with_alpha(video::IImage *src, video::IImage *dst,
-		v2s32 src_pos, v2s32 dst_pos, v2u32 size)
-{
-	for (u32 y0=0; y0<size.Y; y0++)
-	for (u32 x0=0; x0<size.X; x0++)
-	{
-		s32 src_x = src_pos.X + x0;
-		s32 src_y = src_pos.Y + y0;
-		s32 dst_x = dst_pos.X + x0;
-		s32 dst_y = dst_pos.Y + y0;
-		video::SColor src_c = src->getPixel(src_x, src_y);
-		video::SColor dst_c = dst->getPixel(dst_x, dst_y);
-		dst_c = blitPixel(src_c, dst_c, src_c.getAlpha());
-		dst->setPixel(dst_x, dst_y, dst_c);
-	}
-}
-
-/*
-	Draw an image on top of another one, using the alpha channel of the
-	source image; only modify fully opaque pixels in destinaion
-*/
-static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
-		v2s32 src_pos, v2s32 dst_pos, v2u32 size)
-{
-	for (u32 y0=0; y0<size.Y; y0++)
-	for (u32 x0=0; x0<size.X; x0++)
-	{
-		s32 src_x = src_pos.X + x0;
-		s32 src_y = src_pos.Y + y0;
-		s32 dst_x = dst_pos.X + x0;
-		s32 dst_y = dst_pos.Y + y0;
-		video::SColor src_c = src->getPixel(src_x, src_y);
-		video::SColor dst_c = dst->getPixel(dst_x, dst_y);
-		if (dst_c.getAlpha() == 255 && src_c.getAlpha() != 0)
-		{
-			dst_c = blitPixel(src_c, dst_c, src_c.getAlpha());
-			dst->setPixel(dst_x, dst_y, dst_c);
-		}
-	}
-}
-
-// This function has been disabled because it is currently unused.
-// Feel free to re-enable if you find it handy.
-#if 0
-/*
-	Draw an image on top of another one, using the specified ratio
-	modify all partially-opaque pixels in the destination.
-*/
-static void blit_with_interpolate_overlay(video::IImage *src, video::IImage *dst,
-		v2s32 src_pos, v2s32 dst_pos, v2u32 size, int ratio)
-{
-	for (u32 y0 = 0; y0 < size.Y; y0++)
-	for (u32 x0 = 0; x0 < size.X; x0++)
-	{
-		s32 src_x = src_pos.X + x0;
-		s32 src_y = src_pos.Y + y0;
-		s32 dst_x = dst_pos.X + x0;
-		s32 dst_y = dst_pos.Y + y0;
-		video::SColor src_c = src->getPixel(src_x, src_y);
-		video::SColor dst_c = dst->getPixel(dst_x, dst_y);
-		if (dst_c.getAlpha() > 0 && src_c.getAlpha() != 0)
-		{
-			if (ratio == -1)
-				dst_c = src_c.getInterpolated(dst_c, (float)src_c.getAlpha()/255.0f);
-			else
-				dst_c = src_c.getInterpolated(dst_c, (float)ratio/255.0f);
-			dst->setPixel(dst_x, dst_y, dst_c);
-		}
-	}
-}
-#endif
-
-/*
-	Apply color to destination, using a weighted interpolation blend
-*/
-static void apply_colorize(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color, int ratio, bool keep_alpha)
-{
-	u32 alpha = color.getAlpha();
-	video::SColor dst_c;
-	if ((ratio == -1 && alpha == 255) || ratio == 255) { // full replacement of color
-		if (keep_alpha) { // replace the color with alpha = dest alpha * color alpha
-			dst_c = color;
-			for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-			for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-				u32 dst_alpha = dst->getPixel(x, y).getAlpha();
-				if (dst_alpha > 0) {
-					dst_c.setAlpha(dst_alpha * alpha / 255);
-					dst->setPixel(x, y, dst_c);
-				}
-			}
-		} else { // replace the color including the alpha
-			for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-			for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++)
-				if (dst->getPixel(x, y).getAlpha() > 0)
-					dst->setPixel(x, y, color);
-		}
-	} else {  // interpolate between the color and destination
-		float interp = (ratio == -1 ? color.getAlpha() / 255.0f : ratio / 255.0f);
-		for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-		for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-			dst_c = dst->getPixel(x, y);
-			if (dst_c.getAlpha() > 0) {
-				dst_c = color.getInterpolated(dst_c, interp);
-				dst->setPixel(x, y, dst_c);
-			}
-		}
-	}
-}
-
-/*
-	Apply color to destination, using a Multiply blend mode
-*/
-static void apply_multiplication(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color)
-{
-	video::SColor dst_c;
-
-	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-		dst_c = dst->getPixel(x, y);
-		dst_c.set(
-				dst_c.getAlpha(),
-				(dst_c.getRed() * color.getRed()) / 255,
-				(dst_c.getGreen() * color.getGreen()) / 255,
-				(dst_c.getBlue() * color.getBlue()) / 255
-				);
-		dst->setPixel(x, y, dst_c);
-	}
-}
-
-/*
-	Apply color to destination, using a Screen blend mode
-*/
-static void apply_screen(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-		const video::SColor &color)
-{
-	video::SColor dst_c;
-
-	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-		dst_c = dst->getPixel(x, y);
-		dst_c.set(
-			dst_c.getAlpha(),
-			255 - ((255 - dst_c.getRed())   * (255 - color.getRed()))   / 255,
-			255 - ((255 - dst_c.getGreen()) * (255 - color.getGreen())) / 255,
-			255 - ((255 - dst_c.getBlue())  * (255 - color.getBlue()))  / 255
-		);
-		dst->setPixel(x, y, dst_c);
-	}
-}
-
-/*
-	Adjust the hue, saturation, and lightness of destination. Like
-	"Hue-Saturation" in GIMP, but with 0 as the mid-point.
-	Hue should be from -180 to +180, or from 0 to 360.
-	Saturation and Lightness are percentages.
-	Lightness is from -100 to +100.
-	Saturation goes down to -100 (fully desaturated) but can go above 100,
-	allowing for even muted colors to become saturated.
-
-	If colorize is true then saturation is from 0 to 100, and destination will
-	be converted to a grayscale image as seen through a colored glass, like
-	"Colorize" in GIMP.
-*/
-static void apply_hue_saturation(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-	s32 hue, s32 saturation, s32 lightness, bool colorize)
-{
-	video::SColorf colorf;
-	video::SColorHSL hsl;
-	f32 norm_s = core::clamp(saturation, -100, 1000) / 100.0f;
-	f32 norm_l = core::clamp(lightness,  -100, 100) / 100.0f;
-
-	if (colorize) {
-		hsl.Saturation = core::clamp((f32)saturation, 0.0f, 100.0f);
-	}
-
-	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-		for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-
-			if (colorize) {
-				f32 lum = dst->getPixel(x, y).getLuminance() / 255.0f;
-
-				if (norm_l < 0) {
-					lum *= norm_l + 1.0f;
-				} else {
-					lum = lum * (1.0f - norm_l) + norm_l;
-				}
-				hsl.Hue = 0;
-				hsl.Luminance = lum * 100;
-
-			} else {
-				// convert the RGB to HSL
-				colorf = video::SColorf(dst->getPixel(x, y));
-				hsl.fromRGB(colorf);
-
-				if (norm_l < 0) {
-					hsl.Luminance *= norm_l + 1.0f;
-				} else{
-					hsl.Luminance = hsl.Luminance + norm_l * (100.0f - hsl.Luminance);
-				}
-
-				// Adjusting saturation in the same manner as lightness resulted in
-				// muted colours being affected too much and bright colours not
-				// affected enough, so I'm borrowing a leaf out of gimp's book and
-				// using a different scaling approach for saturation.
-				// https://github.com/GNOME/gimp/blob/6cc1e035f1822bf5198e7e99a53f7fa6e281396a/app/operations/gimpoperationhuesaturation.c#L139-L145=
-				// This difference is why values over 100% are not necessary for
-				// lightness but are very useful with saturation. An alternative UI
-				// approach would be to have an upper saturation limit of 100, but
-				// multiply positive values by ~3 to make it a more useful positive
-				// range scale.
-				hsl.Saturation *= norm_s + 1.0f;
-				hsl.Saturation = core::clamp(hsl.Saturation, 0.0f, 100.0f);
-			}
-
-			// Apply the specified HSL adjustments
-			hsl.Hue = fmod(hsl.Hue + hue, 360);
-			if (hsl.Hue < 0)
-				hsl.Hue += 360;
-
-			// Convert back to RGB
-			hsl.toRGB(colorf);
-			dst->setPixel(x, y, colorf.toSColor());
-		}
-}
-
-
-/*
-	Apply an Overlay blend to destination
-	If hardlight is true then swap the dst & blend images (a hardlight blend)
-*/
-static void apply_overlay(video::IImage *blend, video::IImage *dst,
-	v2s32 blend_pos, v2s32 dst_pos, v2u32 size, bool hardlight)
-{
-	video::IImage *blend_layer = hardlight ? dst : blend;
-	video::IImage *base_layer  = hardlight ? blend : dst;
-	v2s32 blend_layer_pos = hardlight ? dst_pos : blend_pos;
-	v2s32 base_layer_pos  = hardlight ? blend_pos : dst_pos;
-
-	for (u32 y = 0; y < size.Y; y++) 
-	for (u32 x = 0; x < size.X; x++) {
-		s32 base_x = x + base_layer_pos.X;
-		s32 base_y = y + base_layer_pos.Y;
-
-		video::SColor blend_c =
-			blend_layer->getPixel(x + blend_layer_pos.X, y + blend_layer_pos.Y);
-		video::SColor base_c = base_layer->getPixel(base_x, base_y);		
-		double blend_r = blend_c.getRed()   / 255.0;
-		double blend_g = blend_c.getGreen() / 255.0;
-		double blend_b = blend_c.getBlue()  / 255.0;
-		double base_r = base_c.getRed()   / 255.0;
-		double base_g = base_c.getGreen() / 255.0;
-		double base_b = base_c.getBlue()  / 255.0;
-
-		base_c.set(
-			base_c.getAlpha(),
-			// Do a Multiply blend if less that 0.5, otherwise do a Screen blend
-			(u32)((base_r < 0.5 ? 2 * base_r * blend_r : 1 - 2 * (1 - base_r) * (1 - blend_r)) * 255),
-			(u32)((base_g < 0.5 ? 2 * base_g * blend_g : 1 - 2 * (1 - base_g) * (1 - blend_g)) * 255),
-			(u32)((base_b < 0.5 ? 2 * base_b * blend_b : 1 - 2 * (1 - base_b) * (1 - blend_b)) * 255)
-		);
-		dst->setPixel(base_x, base_y, base_c);
-	}
-}
-
-/* 
-	Adjust the brightness and contrast of the base image.
-
-	Conceptually like GIMP's "Brightness-Contrast" feature but allows brightness to be
-	wound all the way up to white or down to black.
-*/
-static void apply_brightness_contrast(video::IImage *dst, v2u32 dst_pos, v2u32 size,
-	s32 brightness, s32 contrast)
-{
-	video::SColor dst_c;
-	// Only allow normalized contrast to get as high as 127/128 to avoid infinite slope.
-	// (we could technically allow -128/128 here as that would just result in 0 slope)
-	double norm_c = core::clamp(contrast,   -127, 127) / 128.0;
-	double norm_b = core::clamp(brightness, -127, 127) / 127.0;
-	
-	// Scale brightness so its range is -127.5 to 127.5, otherwise brightness
-	// adjustments will outputs values from 0.5 to 254.5 instead of 0 to 255.
-	double scaled_b = brightness * 127.5 / 127;
-
-	// Calculate a contrast slope such that that no colors will get clamped due 
-	// to the brightness setting.
-	// This allows the texture modifier to used as a brightness modifier without
-	// the user having to calculate a contrast to avoid clipping at that brightness.
-	double slope = 1 - fabs(norm_b);
-	
-	// Apply the user's contrast adjustment to the calculated slope, such that
-	// -127 will make it near-vertical and +127 will make it horizontal
-	double angle = atan(slope);
-	angle += norm_c <= 0
-		? norm_c * angle // allow contrast slope to be lowered to 0
-		: norm_c * (M_PI_2 - angle); // allow contrast slope to be raised almost vert.
-	slope = tan(angle);
-
-	double c = slope <= 1
-		? -slope * 127.5 + 127.5 + scaled_b    // shift up/down when slope is horiz.
-		: -slope * (127.5 - scaled_b) + 127.5; // shift left/right when slope is vert.
-
-	// add 0.5 to c so that when the final result is cast to int, it is effectively
-	// rounded rather than trunc'd.
-	c += 0.5;
-
-	for (u32 y = dst_pos.Y; y < dst_pos.Y + size.Y; y++)
-	for (u32 x = dst_pos.X; x < dst_pos.X + size.X; x++) {
-		dst_c = dst->getPixel(x, y);
-
-		dst_c.set(
-			dst_c.getAlpha(),
-			core::clamp((int)(slope * dst_c.getRed()   + c), 0, 255),
-			core::clamp((int)(slope * dst_c.getGreen() + c), 0, 255),
-			core::clamp((int)(slope * dst_c.getBlue()  + c), 0, 255)
-		);
-		dst->setPixel(x, y, dst_c);
-	}
-}
-
-/*
-	Apply mask to destination
-*/
-static void apply_mask(video::IImage *mask, video::IImage *dst,
-		v2s32 mask_pos, v2s32 dst_pos, v2u32 size)
-{
-	for (u32 y0 = 0; y0 < size.Y; y0++) {
-		for (u32 x0 = 0; x0 < size.X; x0++) {
-			s32 mask_x = x0 + mask_pos.X;
-			s32 mask_y = y0 + mask_pos.Y;
-			s32 dst_x = x0 + dst_pos.X;
-			s32 dst_y = y0 + dst_pos.Y;
-			video::SColor mask_c = mask->getPixel(mask_x, mask_y);
-			video::SColor dst_c = dst->getPixel(dst_x, dst_y);
-			dst_c.color &= mask_c.color;
-			dst->setPixel(dst_x, dst_y, dst_c);
-		}
-	}
-}
-
-video::IImage *create_crack_image(video::IImage *crack, s32 frame_index,
-		core::dimension2d<u32> size, u8 tiles, video::IVideoDriver *driver)
-{
-	core::dimension2d<u32> strip_size = crack->getDimension();
-	core::dimension2d<u32> frame_size(strip_size.Width, strip_size.Width);
-	core::dimension2d<u32> tile_size(size / tiles);
-	s32 frame_count = strip_size.Height / strip_size.Width;
-	if (frame_index >= frame_count)
-		frame_index = frame_count - 1;
-	core::rect<s32> frame(v2s32(0, frame_index * frame_size.Height), frame_size);
-	video::IImage *result = nullptr;
-
-// extract crack frame
-	video::IImage *crack_tile = driver->createImage(video::ECF_A8R8G8B8, tile_size);
-	if (!crack_tile)
-		return nullptr;
-	if (tile_size == frame_size) {
-		crack->copyTo(crack_tile, v2s32(0, 0), frame);
-	} else {
-		video::IImage *crack_frame = driver->createImage(video::ECF_A8R8G8B8, frame_size);
-		if (!crack_frame)
-			goto exit__has_tile;
-		crack->copyTo(crack_frame, v2s32(0, 0), frame);
-		crack_frame->copyToScaling(crack_tile);
-		crack_frame->drop();
-	}
-	if (tiles == 1)
-		return crack_tile;
-
-// tile it
-	result = driver->createImage(video::ECF_A8R8G8B8, size);
-	if (!result)
-		goto exit__has_tile;
-	result->fill({});
-	for (u8 i = 0; i < tiles; i++)
-		for (u8 j = 0; j < tiles; j++)
-			crack_tile->copyTo(result, v2s32(i * tile_size.Width, j * tile_size.Height));
-
-exit__has_tile:
-	crack_tile->drop();
-	return result;
-}
-
-static void draw_crack(video::IImage *crack, video::IImage *dst,
-		bool use_overlay, s32 frame_count, s32 progression,
-		video::IVideoDriver *driver, u8 tiles)
-{
-	// Dimension of destination image
-	core::dimension2d<u32> dim_dst = dst->getDimension();
-	// Limit frame_count
-	if (frame_count > (s32) dim_dst.Height)
-		frame_count = dim_dst.Height;
-	if (frame_count < 1)
-		frame_count = 1;
-	// Dimension of the scaled crack stage,
-	// which is the same as the dimension of a single destination frame
-	core::dimension2d<u32> frame_size(
-		dim_dst.Width,
-		dim_dst.Height / frame_count
-	);
-	video::IImage *crack_scaled = create_crack_image(crack, progression,
-			frame_size, tiles, driver);
-	if (!crack_scaled)
-		return;
-
-	auto blit = use_overlay ? blit_with_alpha_overlay : blit_with_alpha;
-	for (s32 i = 0; i < frame_count; ++i) {
-		v2s32 dst_pos(0, frame_size.Height * i);
-		blit(crack_scaled, dst, v2s32(0,0), dst_pos, frame_size);
-	}
-
-	crack_scaled->drop();
-}
-
-void brighten(video::IImage *image)
-{
-	if (image == NULL)
-		return;
-
-	core::dimension2d<u32> dim = image->getDimension();
-
-	for (u32 y=0; y<dim.Height; y++)
-	for (u32 x=0; x<dim.Width; x++)
-	{
-		video::SColor c = image->getPixel(x,y);
-		c.setRed(0.5 * 255 + 0.5 * (float)c.getRed());
-		c.setGreen(0.5 * 255 + 0.5 * (float)c.getGreen());
-		c.setBlue(0.5 * 255 + 0.5 * (float)c.getBlue());
-		image->setPixel(x,y,c);
-	}
-}
-
-u32 parseImageTransform(const std::string& s)
-{
-	int total_transform = 0;
-
-	std::string transform_names[8];
-	transform_names[0] = "i";
-	transform_names[1] = "r90";
-	transform_names[2] = "r180";
-	transform_names[3] = "r270";
-	transform_names[4] = "fx";
-	transform_names[6] = "fy";
-
-	std::size_t pos = 0;
-	while(pos < s.size())
-	{
-		int transform = -1;
-		for (int i = 0; i <= 7; ++i)
-		{
-			const std::string &name_i = transform_names[i];
-
-			if (s[pos] == ('0' + i))
-			{
-				transform = i;
-				pos++;
-				break;
-			}
-
-			if (!(name_i.empty()) && lowercase(s.substr(pos, name_i.size())) == name_i) {
-				transform = i;
-				pos += name_i.size();
-				break;
-			}
-		}
-		if (transform < 0)
-			break;
-
-		// Multiply total_transform and transform in the group D4
-		int new_total = 0;
-		if (transform < 4)
-			new_total = (transform + total_transform) % 4;
-		else
-			new_total = (transform - total_transform + 8) % 4;
-		if ((transform >= 4) ^ (total_transform >= 4))
-			new_total += 4;
-
-		total_transform = new_total;
-	}
-	return total_transform;
-}
-
-core::dimension2d<u32> imageTransformDimension(u32 transform, core::dimension2d<u32> dim)
-{
-	if (transform % 2 == 0)
-		return dim;
-
-	return core::dimension2d<u32>(dim.Height, dim.Width);
-}
-
-void imageTransform(u32 transform, video::IImage *src, video::IImage *dst)
-{
-	if (src == NULL || dst == NULL)
-		return;
-
-	core::dimension2d<u32> dstdim = dst->getDimension();
-
-	// Pre-conditions
-	if (!(dstdim == imageTransformDimension(transform, src->getDimension())))
-		return;
-	if (!(transform <= 7))
-		return;
-
-	/*
-		Compute the transformation from source coordinates (sx,sy)
-		to destination coordinates (dx,dy).
-	*/
-	int sxn = 0;
-	int syn = 2;
-	if (transform == 0)         // identity
-		sxn = 0, syn = 2;  //   sx = dx, sy = dy
-	else if (transform == 1)    // rotate by 90 degrees ccw
-		sxn = 3, syn = 0;  //   sx = (H-1) - dy, sy = dx
-	else if (transform == 2)    // rotate by 180 degrees
-		sxn = 1, syn = 3;  //   sx = (W-1) - dx, sy = (H-1) - dy
-	else if (transform == 3)    // rotate by 270 degrees ccw
-		sxn = 2, syn = 1;  //   sx = dy, sy = (W-1) - dx
-	else if (transform == 4)    // flip x
-		sxn = 1, syn = 2;  //   sx = (W-1) - dx, sy = dy
-	else if (transform == 5)    // flip x then rotate by 90 degrees ccw
-		sxn = 2, syn = 0;  //   sx = dy, sy = dx
-	else if (transform == 6)    // flip y
-		sxn = 0, syn = 3;  //   sx = dx, sy = (H-1) - dy
-	else if (transform == 7)    // flip y then rotate by 90 degrees ccw
-		sxn = 3, syn = 1;  //   sx = (H-1) - dy, sy = (W-1) - dx
-
-	for (u32 dy=0; dy<dstdim.Height; dy++)
-	for (u32 dx=0; dx<dstdim.Width; dx++)
-	{
-		u32 entries[4] = {dx, dstdim.Width-1-dx, dy, dstdim.Height-1-dy};
-		u32 sx = entries[sxn];
-		u32 sy = entries[syn];
-		video::SColor c = src->getPixel(sx,sy);
-		dst->setPixel(dx,dy,c);
-	}
-}
-
-video::ITexture* TextureSource::getNormalTexture(const std::string &name)
-{
-	if (isKnownSourceImage("override_normal.png"))
-		return getTexture("override_normal.png");
-	std::string fname_base = name;
-	static const char *normal_ext = "_normal.png";
-	static const u32 normal_ext_size = strlen(normal_ext);
-	size_t pos = fname_base.find('.');
-	std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
-	if (isKnownSourceImage(fname_normal)) {
-		// look for image extension and replace it
-		size_t i = 0;
-		while ((i = fname_base.find('.', i)) != std::string::npos) {
-			fname_base.replace(i, 4, normal_ext);
-			i += normal_ext_size;
-		}
-		return getTexture(fname_base);
-	}
-	return NULL;
-}
-
-namespace {
-	// For more colourspace transformations, see for example
-	// https://github.com/tobspr/GLSL-Color-Spaces/blob/master/ColorSpaces.inc.glsl
-
-	inline float linear_to_srgb_component(float v)
-	{
-		if (v > 0.0031308f)
-			return 1.055f * powf(v, 1.0f / 2.4f) - 0.055f;
-		return 12.92f * v;
-	}
-	inline float srgb_to_linear_component(float v)
-	{
-		if (v > 0.04045f)
-			return powf((v + 0.055f) / 1.055f, 2.4f);
-		return v / 12.92f;
-	}
-
-	v3f srgb_to_linear(const video::SColor &col_srgb)
-	{
-		v3f col(col_srgb.getRed(), col_srgb.getGreen(), col_srgb.getBlue());
-		col /= 255.0f;
-		col.X = srgb_to_linear_component(col.X);
-		col.Y = srgb_to_linear_component(col.Y);
-		col.Z = srgb_to_linear_component(col.Z);
-		return col;
-	}
-
-	video::SColor linear_to_srgb(const v3f &col_linear)
-	{
-		v3f col;
-		col.X = linear_to_srgb_component(col_linear.X);
-		col.Y = linear_to_srgb_component(col_linear.Y);
-		col.Z = linear_to_srgb_component(col_linear.Z);
-		col *= 255.0f;
-		col.X = core::clamp<float>(col.X, 0.0f, 255.0f);
-		col.Y = core::clamp<float>(col.Y, 0.0f, 255.0f);
-		col.Z = core::clamp<float>(col.Z, 0.0f, 255.0f);
-		return video::SColor(0xff, myround(col.X), myround(col.Y),
-			myround(col.Z));
-	}
-}
-
-video::SColor TextureSource::getTextureAverageColor(const std::string &name)
-{
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	video::SColor c(0, 0, 0, 0);
-	video::ITexture *texture = getTexture(name);
-	if (!texture)
-		return c;
-	video::IImage *image = driver->createImage(texture,
-		core::position2d<s32>(0, 0),
-		texture->getOriginalSize());
-	if (!image)
-		return c;
-	u32 total = 0;
-	v3f col_acc(0, 0, 0);
-	core::dimension2d<u32> dim = image->getDimension();
-	u16 step = 1;
-	if (dim.Width > 16)
-		step = dim.Width / 16;
-	for (u16 x = 0; x < dim.Width; x += step) {
-		for (u16 y = 0; y < dim.Width; y += step) {
-			c = image->getPixel(x,y);
-			if (c.getAlpha() > 0) {
-				total++;
-				col_acc += srgb_to_linear(c);
-			}
-		}
-	}
-	image->drop();
-	if (total > 0) {
-		col_acc /= total;
-		c = linear_to_srgb(col_acc);
-	}
-	c.setAlpha(255);
-	return c;
-}
-
-
-video::ITexture *TextureSource::getShaderFlagsTexture(bool normalmap_present)
-{
-	std::string tname = "__shaderFlagsTexture";
-	tname += normalmap_present ? "1" : "0";
-
-	if (isKnownSourceImage(tname)) {
-		return getTexture(tname);
-	}
-
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	video::IImage *flags_image = driver->createImage(
-		video::ECF_A8R8G8B8, core::dimension2d<u32>(1, 1));
-	if (!flags_image) return nullptr;
-	video::SColor c(255, normalmap_present ? 255 : 0, 0, 0);
-	flags_image->setPixel(0, 0, c);
-	insertSourceImage(tname, flags_image);
-	flags_image->drop();
-	return getTexture(tname);
-
-}
-
-std::vector<std::string> getTextureDirs()
-{
-	return fs::GetRecursiveDirs(g_settings->get("texture_path"));
-}
diff --git a/src/client/tile.h b/src/client/tile.h
index a6d4bfa6f..5697efec8 100644
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -23,151 +23,22 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "irrlichttypes.h"
-#include "irr_v3d.h"
 #include <ITexture.h>
 #include <set>
-#include <string>
 #include <vector>
 #include <SMaterial.h>
-#include "util/numeric.h"
-#include "config.h"
 
-class IGameDef;
-struct TileSpec;
-struct TileDef;
 
-namespace irr::video { class IVideoDriver; }
-
-typedef std::vector<video::SColor> Palette;
-
-/*
-	tile.{h,cpp}: Texture handling stuff.
-*/
-
-/*
-	Find out the full path of an image by trying different filename
-	extensions.
-
-	If failed, return "".
-
-	TODO: Should probably be moved out from here, because things needing
-	      this function do not need anything else from this header
-*/
-std::string getImagePath(std::string path);
-
-/*
-	Gets the path to a texture by first checking if the texture exists
-	in texture_path and if not, using the data path.
-
-	Checks all supported extensions by replacing the original extension.
-
-	If not found, returns "".
-
-	Utilizes a thread-safe cache.
-*/
-std::string getTexturePath(const std::string &filename, bool *is_base_pack = nullptr);
-
-void clearTextureNameCache();
-
-/*
-	Stores internal information about a texture.
-*/
+// Stores internal information about a texture.
 struct TextureInfo
 {
 	std::string name;
-	video::ITexture *texture;
-	std::set<std::string> sourceImages;
+	video::ITexture *texture = nullptr;
 
-	TextureInfo(
-			const std::string &name_,
-			video::ITexture *texture_=NULL
-		):
-		name(name_),
-		texture(texture_)
-	{
-	}
-
-	TextureInfo(
-			const std::string &name_,
-			video::ITexture *texture_,
-			std::set<std::string> &sourceImages_
-		):
-		name(name_),
-		texture(texture_),
-		sourceImages(sourceImages_)
-	{
-	}
+	// Stores source image names which ImageSource::generateImage used.
+	std::set<std::string> sourceImages{};
 };
 
-/*
-	TextureSource creates and caches textures.
-*/
-
-class ISimpleTextureSource
-{
-public:
-	ISimpleTextureSource() = default;
-
-	virtual ~ISimpleTextureSource() = default;
-
-	virtual video::ITexture* getTexture(
-			const std::string &name, u32 *id = nullptr) = 0;
-};
-
-class ITextureSource : public ISimpleTextureSource
-{
-public:
-	ITextureSource() = default;
-
-	virtual ~ITextureSource() = default;
-
-	virtual u32 getTextureId(const std::string &name)=0;
-	virtual std::string getTextureName(u32 id)=0;
-	virtual video::ITexture* getTexture(u32 id)=0;
-	virtual TextureInfo* getTextureInfo(u32 id)=0;
-	virtual video::ITexture* getTexture(
-			const std::string &name, u32 *id = nullptr)=0;
-	virtual video::ITexture* getTextureForMesh(
-			const std::string &name, u32 *id = nullptr) = 0;
-	/*!
-	 * Returns a palette from the given texture name.
-	 * The pointer is valid until the texture source is
-	 * destructed.
-	 * Should be called from the main thread.
-	 */
-	virtual Palette* getPalette(const std::string &name) = 0;
-	virtual bool isKnownSourceImage(const std::string &name)=0;
-	virtual video::ITexture* getNormalTexture(const std::string &name)=0;
-	virtual video::SColor getTextureAverageColor(const std::string &name)=0;
-	virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
-};
-
-class IWritableTextureSource : public ITextureSource
-{
-public:
-	IWritableTextureSource() = default;
-
-	virtual ~IWritableTextureSource() = default;
-
-	virtual u32 getTextureId(const std::string &name)=0;
-	virtual std::string getTextureName(u32 id)=0;
-	virtual video::ITexture* getTexture(u32 id)=0;
-	virtual video::ITexture* getTexture(
-			const std::string &name, u32 *id = nullptr)=0;
-	virtual bool isKnownSourceImage(const std::string &name)=0;
-
-	virtual void processQueue()=0;
-	virtual void insertSourceImage(const std::string &name, video::IImage *img)=0;
-	virtual void rebuildImagesAndTextures()=0;
-	virtual video::ITexture* getNormalTexture(const std::string &name)=0;
-	virtual video::SColor getTextureAverageColor(const std::string &name)=0;
-	virtual video::ITexture *getShaderFlagsTexture(bool normalmap_present)=0;
-};
-
-IWritableTextureSource *createTextureSource();
-
-video::IImage *Align2Npot2(video::IImage *image, video::IVideoDriver *driver);
-
 enum MaterialType{
 	TILE_MATERIAL_BASIC,
 	TILE_MATERIAL_ALPHA,
@@ -240,50 +111,9 @@ struct TileLayer
 	}
 
 	// Sets everything else except the texture in the material
-	void applyMaterialOptions(video::SMaterial &material) const
-	{
-		switch (material_type) {
-		case TILE_MATERIAL_OPAQUE:
-		case TILE_MATERIAL_LIQUID_OPAQUE:
-		case TILE_MATERIAL_WAVING_LIQUID_OPAQUE:
-			material.MaterialType = video::EMT_SOLID;
-			break;
-		case TILE_MATERIAL_BASIC:
-		case TILE_MATERIAL_WAVING_LEAVES:
-		case TILE_MATERIAL_WAVING_PLANTS:
-		case TILE_MATERIAL_WAVING_LIQUID_BASIC:
-			material.MaterialTypeParam = 0.5;
-			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-			break;
-		case TILE_MATERIAL_ALPHA:
-		case TILE_MATERIAL_LIQUID_TRANSPARENT:
-		case TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT:
-			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-			break;
-		default:
-			break;
-		}
-		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) != 0;
-		if (!(material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)) {
-			material.TextureLayers[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
-		}
-		if (!(material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) {
-			material.TextureLayers[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
-		}
-	}
+	void applyMaterialOptions(video::SMaterial &material) const;
 
-	void applyMaterialOptionsWithShaders(video::SMaterial &material) const
-	{
-		material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) != 0;
-		if (!(material_flags & MATERIAL_FLAG_TILEABLE_HORIZONTAL)) {
-			material.TextureLayers[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
-			material.TextureLayers[1].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
-		}
-		if (!(material_flags & MATERIAL_FLAG_TILEABLE_VERTICAL)) {
-			material.TextureLayers[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
-			material.TextureLayers[1].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
-		}
-	}
+	void applyMaterialOptionsWithShaders(video::SMaterial &material) const;
 
 	bool isTransparent() const
 	{
@@ -353,5 +183,3 @@ struct TileSpec
 	//! The first is base texture, the second is overlay.
 	TileLayer layers[MAX_TILE_LAYERS];
 };
-
-std::vector<std::string> getTextureDirs();
diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp
index f925dac88..e1577098a 100644
--- a/src/client/wieldmesh.cpp
+++ b/src/client/wieldmesh.cpp
@@ -194,7 +194,7 @@ private:
 	scene::IMesh *m_cube;
 };
 
-ExtrusionMeshCache *g_extrusion_mesh_cache = NULL;
+static ExtrusionMeshCache *g_extrusion_mesh_cache = nullptr;
 
 
 WieldMeshSceneNode::WieldMeshSceneNode(scene::ISceneManager *mgr, s32 id, bool lighting):
@@ -318,7 +318,7 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename,
 static scene::SMesh *createSpecialNodeMesh(Client *client, MapNode n,
 	std::vector<ItemPartColor> *colors, const ContentFeatures &f)
 {
-	MeshMakeData mesh_make_data(client, false);
+	MeshMakeData mesh_make_data(client->ndef(), 1, false);
 	MeshCollector collector(v3f(0.0f * BS), v3f());
 	mesh_make_data.setSmoothLighting(false);
 	MapblockMeshGenerator gen(&mesh_make_data, &collector,
@@ -511,21 +511,26 @@ void WieldMeshSceneNode::setColor(video::SColor c)
 	u8 red = c.getRed();
 	u8 green = c.getGreen();
 	u8 blue = c.getBlue();
-	u32 mc = mesh->getMeshBufferCount();
+
+	const u32 mc = mesh->getMeshBufferCount();
+	if (mc > m_colors.size())
+		m_colors.resize(mc);
 	for (u32 j = 0; j < mc; j++) {
 		video::SColor bc(m_base_color);
-		if ((m_colors.size() > j) && (m_colors[j].override_base))
-			bc = m_colors[j].color;
+		m_colors[j].applyOverride(bc);
 		video::SColor buffercolor(255,
 			bc.getRed() * red / 255,
 			bc.getGreen() * green / 255,
 			bc.getBlue() * blue / 255);
 		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
 
-		if (m_enable_shaders)
-			setMeshBufferColor(buf, buffercolor);
-		else
-			colorizeMeshBuffer(buf, &buffercolor);
+		if (m_colors[j].needColorize(buffercolor)) {
+			buf->setDirty(scene::EBT_VERTEX);
+			if (m_enable_shaders)
+				setMeshBufferColor(buf, buffercolor);
+			else
+				colorizeMeshBuffer(buf, &buffercolor);
+		}
 	}
 }
 
@@ -539,8 +544,7 @@ void WieldMeshSceneNode::setNodeLightColor(video::SColor color)
 			video::SMaterial &material = m_meshnode->getMaterial(i);
 			material.EmissiveColor = color;
 		}
-	}
-	else {
+	} else {
 		setColor(color);
 	}
 }
@@ -560,6 +564,12 @@ void WieldMeshSceneNode::changeToMesh(scene::IMesh *mesh)
 		dummymesh->drop();  // m_meshnode grabbed it
 	} else {
 		m_meshnode->setMesh(mesh);
+		// without shaders recolored often for lighting
+		// otherwise only once
+		if (m_enable_shaders)
+			mesh->setHardwareMappingHint(scene::EHM_STATIC);
+		else
+			mesh->setHardwareMappingHint(scene::EHM_DYNAMIC);
 	}
 
 	m_meshnode->forEachMaterial([this] (auto &mat) {
@@ -654,8 +664,7 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 		}
 		}
 
-		u32 mc = mesh->getMeshBufferCount();
-		for (u32 i = 0; i < mc; ++i) {
+		for (u32 i = 0; i < mesh->getMeshBufferCount(); ++i) {
 			scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
 			video::SMaterial &material = buf->getMaterial();
 			material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -671,6 +680,12 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 		rotateMeshXZby(mesh, -45);
 		rotateMeshYZby(mesh, -30);
 	}
+
+	// might need to be re-colorized, this is done only when needed
+	if (mesh) {
+		mesh->setHardwareMappingHint(scene::EHM_DYNAMIC, scene::EBT_VERTEX);
+		mesh->setHardwareMappingHint(scene::EHM_STATIC, scene::EBT_INDEX);
+	}
 	result->mesh = mesh;
 }
 
@@ -725,11 +740,10 @@ void postProcessNodeMesh(scene::SMesh *mesh, const ContentFeatures &f,
 	bool use_shaders, bool set_material, const video::E_MATERIAL_TYPE *mattype,
 	std::vector<ItemPartColor> *colors, bool apply_scale)
 {
-	u32 mc = mesh->getMeshBufferCount();
+	const u32 mc = mesh->getMeshBufferCount();
 	// Allocate colors for existing buffers
 	colors->clear();
-	for (u32 i = 0; i < mc; ++i)
-		colors->push_back(ItemPartColor());
+	colors->resize(mc);
 
 	for (u32 i = 0; i < mc; ++i) {
 		const TileSpec *tile = &(f.tiles[i]);
@@ -744,11 +758,11 @@ void postProcessNodeMesh(scene::SMesh *mesh, const ContentFeatures &f,
 				mesh->addMeshBuffer(copy);
 				copy->drop();
 				buf = copy;
-				colors->push_back(
-					ItemPartColor(layer->has_color, layer->color));
+				colors->emplace_back(layer->has_color, layer->color);
 			} else {
 				(*colors)[i] = ItemPartColor(layer->has_color, layer->color);
 			}
+
 			video::SMaterial &material = buf->getMaterial();
 			if (set_material)
 				layer->applyMaterialOptions(material);
@@ -771,6 +785,7 @@ void postProcessNodeMesh(scene::SMesh *mesh, const ContentFeatures &f,
 				}
 				material.setTexture(2, layer->flags_texture);
 			}
+
 			if (apply_scale && tile->world_aligned) {
 				u32 n = buf->getVertexCount();
 				for (u32 k = 0; k != n; ++k)
diff --git a/src/client/wieldmesh.h b/src/client/wieldmesh.h
index e747f3188..9d69c824d 100644
--- a/src/client/wieldmesh.h
+++ b/src/client/wieldmesh.h
@@ -29,38 +29,54 @@ class ITextureSource;
 struct ContentFeatures;
 class ShadowRenderer;
 
-/*!
+/*
  * Holds color information of an item mesh's buffer.
  */
-struct ItemPartColor
+class ItemPartColor
 {
-	/*!
-	 * If this is false, the global base color of the item
-	 * will be used instead of the specific color of the
-	 * buffer.
+	/*
+	 * Optional color that overrides the global base color.
 	 */
-	bool override_base = false;
-	/*!
-	 * The color of the buffer.
+	video::SColor override_color;
+	/*
+	 * Stores the last color this mesh buffer was colorized as.
 	 */
-	video::SColor color = 0;
+	video::SColor last_colorized;
+
+	// saves some bytes compared to two std::optionals
+	bool override_color_set = false;
+	bool last_colorized_set = false;
+
+public:
 
 	ItemPartColor() = default;
 
 	ItemPartColor(bool override, video::SColor color) :
-			override_base(override), color(color)
-	{
+		override_color(color), override_color_set(override)
+	{}
+
+	void applyOverride(video::SColor &dest) const {
+		if (override_color_set)
+			dest = override_color;
+	}
+
+	bool needColorize(video::SColor target) {
+		if (last_colorized_set && target == last_colorized)
+			return false;
+		last_colorized_set = true;
+		last_colorized = target;
+		return true;
 	}
 };
 
 struct ItemMesh
 {
 	scene::IMesh *mesh = nullptr;
-	/*!
+	/*
 	 * Stores the color of each mesh buffer.
 	 */
 	std::vector<ItemPartColor> buffer_colors;
-	/*!
+	/*
 	 * If false, all faces of the item should have the same brightness.
 	 * Disables shading based on normal vectors.
 	 */
diff --git a/src/clientdynamicinfo.cpp b/src/clientdynamicinfo.cpp
new file mode 100644
index 000000000..a9b2a6ef3
--- /dev/null
+++ b/src/clientdynamicinfo.cpp
@@ -0,0 +1,55 @@
+/*
+Minetest
+Copyright (C) 2022-3 rubenwardy <rw@rubenwardy.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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef SERVER
+
+#include "clientdynamicinfo.h"
+
+#include "settings.h"
+#include "client/renderingengine.h"
+#include "gui/touchscreengui.h"
+
+ClientDynamicInfo ClientDynamicInfo::getCurrent()
+{
+    v2u32 screen_size = RenderingEngine::getWindowSize();
+    f32 density = RenderingEngine::getDisplayDensity();
+    f32 gui_scaling = g_settings->getFloat("gui_scaling", 0.5f, 20.0f);
+    f32 hud_scaling = g_settings->getFloat("hud_scaling", 0.5f, 20.0f);
+    f32 real_gui_scaling = gui_scaling * density;
+    f32 real_hud_scaling = hud_scaling * density;
+    bool touch_controls = g_touchscreengui;
+
+    return {
+        screen_size, real_gui_scaling, real_hud_scaling,
+        ClientDynamicInfo::calculateMaxFSSize(screen_size, gui_scaling),
+        touch_controls
+    };
+}
+
+v2f32 ClientDynamicInfo::calculateMaxFSSize(v2u32 render_target_size, f32 gui_scaling)
+{
+    f32 factor = (g_settings->getBool("enable_touch") ? 10 : 15) / gui_scaling;
+    f32 ratio = (f32)render_target_size.X / (f32)render_target_size.Y;
+    if (ratio < 1)
+        return { factor, factor / ratio };
+    else
+        return { factor * ratio, factor };
+}
+
+#endif
diff --git a/src/clientdynamicinfo.h b/src/clientdynamicinfo.h
index c377a64f0..39faeeecc 100644
--- a/src/clientdynamicinfo.h
+++ b/src/clientdynamicinfo.h
@@ -20,10 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include "irrlichttypes_bloated.h"
-#ifndef SERVER
-#include "settings.h"
-#include "client/renderingengine.h"
-#endif
 
 
 struct ClientDynamicInfo
@@ -33,43 +29,19 @@ public:
 	f32 real_gui_scaling;
 	f32 real_hud_scaling;
 	v2f32 max_fs_size;
+	bool touch_controls;
 
 	bool equal(const ClientDynamicInfo &other) const {
 		return render_target_size == other.render_target_size &&
-				abs(real_gui_scaling - other.real_gui_scaling) < 0.001f &&
-				abs(real_hud_scaling - other.real_hud_scaling) < 0.001f;
+				std::abs(real_gui_scaling - other.real_gui_scaling) < 0.001f &&
+				std::abs(real_hud_scaling - other.real_hud_scaling) < 0.001f &&
+				touch_controls == other.touch_controls;
 	}
 
 #ifndef SERVER
-	static ClientDynamicInfo getCurrent() {
-		v2u32 screen_size = RenderingEngine::getWindowSize();
-		f32 density = RenderingEngine::getDisplayDensity();
-		f32 gui_scaling = g_settings->getFloat("gui_scaling", 0.5f, 20.0f);
-		f32 hud_scaling = g_settings->getFloat("hud_scaling", 0.5f, 20.0f);
-		f32 real_gui_scaling = gui_scaling * density;
-		f32 real_hud_scaling = hud_scaling * density;
-
-		return {
-			screen_size, real_gui_scaling, real_hud_scaling,
-			ClientDynamicInfo::calculateMaxFSSize(screen_size, gui_scaling)
-		};
-	}
-#endif
+	static ClientDynamicInfo getCurrent();
 
 private:
-#ifndef SERVER
-	static v2f32 calculateMaxFSSize(v2u32 render_target_size, f32 gui_scaling) {
-		f32 factor =
-#ifdef HAVE_TOUCHSCREENGUI
-				10 / gui_scaling;
-#else
-				15 / gui_scaling;
-#endif
-		f32 ratio = (f32)render_target_size.X / (f32)render_target_size.Y;
-		if (ratio < 1)
-			return { factor, factor / ratio };
-		else
-			return { factor * ratio, factor };
-	}
+	static v2f32 calculateMaxFSSize(v2u32 render_target_size, f32 gui_scaling);
 #endif
 };
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index c267060d6..60c6a8138 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -58,6 +58,8 @@
 #cmakedefine01 USE_SYSTEM_JSONCPP
 #cmakedefine01 USE_REDIS
 #cmakedefine01 HAVE_ENDIAN_H
+#cmakedefine01 HAVE_STRLCPY
+#cmakedefine01 HAVE_MALLOC_TRIM
 #cmakedefine01 CURSES_HAVE_CURSES_H
 #cmakedefine01 CURSES_HAVE_NCURSES_H
 #cmakedefine01 CURSES_HAVE_NCURSES_NCURSES_H
@@ -66,3 +68,4 @@
 #cmakedefine01 CURSES_HAVE_NCURSESW_CURSES_H
 #cmakedefine01 BUILD_UNITTESTS
 #cmakedefine01 BUILD_BENCHMARKS
+#cmakedefine01 USE_SDL2
diff --git a/src/collision.cpp b/src/collision.cpp
index 58ea38543..8448e51f9 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -39,45 +39,47 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #warning "-ffast-math is known to cause bugs in collision code, do not use!"
 #endif
 
+namespace {
+
 struct NearbyCollisionInfo {
 	// node
-	NearbyCollisionInfo(bool is_ul, int bouncy, const v3s16 &pos,
-			const aabb3f &box) :
-		is_unloaded(is_ul),
+	NearbyCollisionInfo(bool is_ul, int bouncy, v3s16 pos, const aabb3f &box) :
 		obj(nullptr),
-		bouncy(bouncy),
+		box(box),
 		position(pos),
-		box(box)
+		bouncy(bouncy),
+		is_unloaded(is_ul),
+		is_step_up(false)
 	{}
 
 	// object
-	NearbyCollisionInfo(ActiveObject *obj, int bouncy,
-			const aabb3f &box) :
-		is_unloaded(false),
+	NearbyCollisionInfo(ActiveObject *obj, int bouncy, const aabb3f &box) :
 		obj(obj),
+		box(box),
 		bouncy(bouncy),
-		box(box)
+		is_unloaded(false),
+		is_step_up(false)
 	{}
 
 	inline bool isObject() const { return obj != nullptr; }
 
-	bool is_unloaded;
-	bool is_step_up = false;
 	ActiveObject *obj;
-	int bouncy;
-	v3s16 position;
 	aabb3f box;
+	v3s16 position;
+	u8 bouncy;
+	// bitfield to save space
+	bool is_unloaded:1, is_step_up:1;
 };
 
 // Helper functions:
 // Truncate floating point numbers to specified number of decimal places
 // in order to move all the floating point error to one side of the correct value
-static inline f32 truncate(const f32 val, const f32 factor)
+inline f32 truncate(const f32 val, const f32 factor)
 {
 	return truncf(val * factor) / factor;
 }
 
-static inline v3f truncate(const v3f& vec, const f32 factor)
+inline v3f truncate(const v3f vec, const f32 factor)
 {
 	return v3f(
 		truncate(vec.X, factor),
@@ -86,13 +88,15 @@ static inline v3f truncate(const v3f& vec, const f32 factor)
 	);
 }
 
+}
+
 // Helper function:
 // Checks for collision of a moving aabbox with a static aabbox
 // Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
 // The time after which the collision occurs is stored in dtime.
 CollisionAxis axisAlignedCollision(
 		const aabb3f &staticbox, const aabb3f &movingbox,
-		const v3f &speed, f32 *dtime)
+		const v3f speed, f32 *dtime)
 {
 	//TimeTaker tt("axisAlignedCollision");
 
@@ -218,28 +222,134 @@ bool wouldCollideWithCeiling(
 	return false;
 }
 
-static inline void getNeighborConnectingFace(const v3s16 &p,
-	const NodeDefManager *nodedef, Map *map, MapNode n, int v, int *neighbors)
+static bool add_area_node_boxes(const v3s16 min, const v3s16 max, IGameDef *gamedef,
+		Environment *env, std::vector<NearbyCollisionInfo> &cinfo)
 {
-	MapNode n2 = map->getNode(p);
-	if (nodedef->nodeboxConnects(n, n2, v))
-		*neighbors |= v;
+	const auto *nodedef = gamedef->getNodeDefManager();
+	bool any_position_valid = false;
+
+	thread_local std::vector<aabb3f> nodeboxes;
+	Map *map = &env->getMap();
+
+	v3s16 p;
+	for (p.Z = min.Z; p.Z <= max.Z; p.Z++)
+	for (p.Y = min.Y; p.Y <= max.Y; p.Y++)
+	for (p.X = min.X; p.X <= max.X; p.X++) {
+		bool is_position_valid;
+		MapNode n = map->getNode(p, &is_position_valid);
+
+		if (is_position_valid && n.getContent() != CONTENT_IGNORE) {
+			// Object collides into walkable nodes
+
+			any_position_valid = true;
+			const ContentFeatures &f = nodedef->get(n);
+
+			if (!f.walkable)
+				continue;
+
+			// Negative bouncy may have a meaning, but we need +value here.
+			int n_bouncy_value = abs(itemgroup_get(f.groups, "bouncy"));
+
+			u8 neighbors = n.getNeighbors(p, map);
+
+			nodeboxes.clear();
+			n.getCollisionBoxes(nodedef, &nodeboxes, neighbors);
+
+			// Calculate float position only once
+			v3f posf = intToFloat(p, BS);
+			for (auto box : nodeboxes) {
+				box.MinEdge += posf;
+				box.MaxEdge += posf;
+				cinfo.emplace_back(false, n_bouncy_value, p, box);
+			}
+		} else {
+			// Collide with unloaded nodes (position invalid) and loaded
+			// CONTENT_IGNORE nodes (position valid)
+			aabb3f box = getNodeBox(p, BS);
+			cinfo.emplace_back(true, 0, p, box);
+		}
+	}
+	return any_position_valid;
 }
 
+static void add_object_boxes(Environment *env,
+		const aabb3f &box_0, f32 dtime,
+		const v3f pos_f, const v3f speed_f, ActiveObject *self,
+		std::vector<NearbyCollisionInfo> &cinfo)
+{
+	auto process_object = [&] (ActiveObject *object) {
+		if (object && object->collideWithObjects()) {
+			aabb3f box;
+			if (object->getCollisionBox(&box))
+				cinfo.emplace_back(object, 0, box);
+		}
+	};
+
+	// Calculate distance by speed, add own extent and 1.5m of tolerance
+	const f32 distance = speed_f.getLength() * dtime +
+		box_0.getExtent().getLength() + 1.5f * BS;
+
+#ifndef SERVER
+	ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
+	if (c_env) {
+		std::vector<DistanceSortedActiveObject> clientobjects;
+		c_env->getActiveObjects(pos_f, distance, clientobjects);
+
+		for (auto &clientobject : clientobjects) {
+			// Do collide with everything but itself and the parent CAO
+			if (!self || (self != clientobject.obj.get() &&
+					self != clientobject.obj->getParent())) {
+				process_object(clientobject.obj.get());
+			}
+		}
+
+		// add collision with local player
+		LocalPlayer *lplayer = c_env->getLocalPlayer();
+		if (lplayer->getParent() == nullptr) {
+			aabb3f lplayer_collisionbox = lplayer->getCollisionbox();
+			v3f lplayer_pos = lplayer->getPosition();
+			lplayer_collisionbox.MinEdge += lplayer_pos;
+			lplayer_collisionbox.MaxEdge += lplayer_pos;
+			auto *obj = (ActiveObject*) lplayer->getCAO();
+			cinfo.emplace_back(obj, 0, lplayer_collisionbox);
+		}
+	}
+	else
+#endif
+	{
+		ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
+		if (s_env) {
+			// search for objects which are not us, or we are not its parent.
+			// we directly process the object in this callback to avoid useless
+			// looping afterwards.
+			auto include_obj_cb = [self, &process_object] (ServerActiveObjectPtr obj) {
+				if (!obj->isGone() &&
+					(!self || (self != obj.get() && self != obj->getParent()))) {
+					process_object(obj.get());
+				}
+				return false;
+			};
+
+			// nothing is put into this vector
+			std::vector<ServerActiveObjectPtr> s_objects;
+			s_env->getObjectsInsideRadius(s_objects, pos_f, distance, include_obj_cb);
+		}
+	}
+}
+
+#define PROFILER_NAME(text) (dynamic_cast<ServerEnvironment*>(env) ? ("Server: " text) : ("Client: " text))
+
 collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		f32 pos_max_d, const aabb3f &box_0,
 		f32 stepheight, f32 dtime,
 		v3f *pos_f, v3f *speed_f,
 		v3f accel_f, ActiveObject *self,
-		bool collideWithObjects)
+		bool collide_with_objects)
 {
-	#define PROFILER_NAME(text) (s_env ? ("Server: " text) : ("Client: " text))
 	thread_local static bool time_notification_done = false;
-	Map *map = &env->getMap();
-	ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
 
 #if !NDEBUG
-	ScopeProfiler sp(g_profiler, PROFILER_NAME("collisionMoveSimple()"), SPT_AVG);
+	ScopeProfiler sp(g_profiler, PROFILER_NAME("collisionMoveSimple()"), SPT_AVG, PRECISION_MICRO);
 #endif
 
 	collisionMoveResult result;
@@ -247,13 +357,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 	/*
 		Calculate new velocity
 	*/
-	if (dtime > 1) {
+	if (dtime > DTIME_LIMIT) {
 		if (!time_notification_done) {
 			time_notification_done = true;
-			infostream << "collisionMoveSimple: maximum step interval exceeded,"
+			warningstream << "collisionMoveSimple: maximum step interval exceeded,"
 					" lost movement details!"<<std::endl;
 		}
-		dtime = 1;
+		dtime = DTIME_LIMIT;
 	} else {
 		time_notification_done = false;
 	}
@@ -276,176 +386,44 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 	/*
 		Collect node boxes in movement range
 	*/
-	std::vector<NearbyCollisionInfo> cinfo;
+
+	// cached allocation
+	thread_local std::vector<NearbyCollisionInfo> cinfo;
+	cinfo.clear();
+
 	{
-	//TimeTaker tt2("collisionMoveSimple collect boxes");
-#if !NDEBUG
-	ScopeProfiler sp2(g_profiler, PROFILER_NAME("collision collect boxes"), SPT_AVG);
-#endif
+		v3f minpos_f(
+			MYMIN(pos_f->X, newpos_f.X),
+			MYMIN(pos_f->Y, newpos_f.Y) + 0.01f * BS, // bias rounding, player often at +/-n.5
+			MYMIN(pos_f->Z, newpos_f.Z)
+		);
+		v3f maxpos_f(
+			MYMAX(pos_f->X, newpos_f.X),
+			MYMAX(pos_f->Y, newpos_f.Y),
+			MYMAX(pos_f->Z, newpos_f.Z)
+		);
+		v3s16 min = floatToInt(minpos_f + box_0.MinEdge, BS) - v3s16(1, 1, 1);
+		v3s16 max = floatToInt(maxpos_f + box_0.MaxEdge, BS) + v3s16(1, 1, 1);
 
-	v3f minpos_f(
-		MYMIN(pos_f->X, newpos_f.X),
-		MYMIN(pos_f->Y, newpos_f.Y) + 0.01f * BS, // bias rounding, player often at +/-n.5
-		MYMIN(pos_f->Z, newpos_f.Z)
-	);
-	v3f maxpos_f(
-		MYMAX(pos_f->X, newpos_f.X),
-		MYMAX(pos_f->Y, newpos_f.Y),
-		MYMAX(pos_f->Z, newpos_f.Z)
-	);
-	v3s16 min = floatToInt(minpos_f + box_0.MinEdge, BS) - v3s16(1, 1, 1);
-	v3s16 max = floatToInt(maxpos_f + box_0.MaxEdge, BS) + v3s16(1, 1, 1);
+		bool any_position_valid = add_area_node_boxes(min, max, gamedef, env, cinfo);
 
-	bool any_position_valid = false;
-
-	v3s16 p;
-	for (p.X = min.X; p.X <= max.X; p.X++)
-	for (p.Y = min.Y; p.Y <= max.Y; p.Y++)
-	for (p.Z = min.Z; p.Z <= max.Z; p.Z++) {
-		bool is_position_valid;
-		MapNode n = map->getNode(p, &is_position_valid);
-
-		if (is_position_valid && n.getContent() != CONTENT_IGNORE) {
-			// Object collides into walkable nodes
-
-			any_position_valid = true;
-			const NodeDefManager *nodedef = gamedef->getNodeDefManager();
-			const ContentFeatures &f = nodedef->get(n);
-
-			if (!f.walkable)
-				continue;
-
-			// Negative bouncy may have a meaning, but we need +value here.
-			int n_bouncy_value = abs(itemgroup_get(f.groups, "bouncy"));
-
-			int neighbors = 0;
-			if (f.drawtype == NDT_NODEBOX &&
-				f.node_box.type == NODEBOX_CONNECTED) {
-				v3s16 p2 = p;
-
-				p2.Y++;
-				getNeighborConnectingFace(p2, nodedef, map, n, 1, &neighbors);
-
-				p2 = p;
-				p2.Y--;
-				getNeighborConnectingFace(p2, nodedef, map, n, 2, &neighbors);
-
-				p2 = p;
-				p2.Z--;
-				getNeighborConnectingFace(p2, nodedef, map, n, 4, &neighbors);
-
-				p2 = p;
-				p2.X--;
-				getNeighborConnectingFace(p2, nodedef, map, n, 8, &neighbors);
-
-				p2 = p;
-				p2.Z++;
-				getNeighborConnectingFace(p2, nodedef, map, n, 16, &neighbors);
-
-				p2 = p;
-				p2.X++;
-				getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors);
-			}
-			std::vector<aabb3f> nodeboxes;
-			n.getCollisionBoxes(gamedef->ndef(), &nodeboxes, neighbors);
-
-			// Calculate float position only once
-			v3f posf = intToFloat(p, BS);
-			for (auto box : nodeboxes) {
-				box.MinEdge += posf;
-				box.MaxEdge += posf;
-				cinfo.emplace_back(false, n_bouncy_value, p, box);
-			}
-		} else {
-			// Collide with unloaded nodes (position invalid) and loaded
-			// CONTENT_IGNORE nodes (position valid)
-			aabb3f box = getNodeBox(p, BS);
-			cinfo.emplace_back(true, 0, p, box);
+		// Do not move if world has not loaded yet, since custom node boxes
+		// are not available for collision detection.
+		// This also intentionally occurs in the case of the object being positioned
+		// solely on loaded CONTENT_IGNORE nodes, no matter where they come from.
+		if (!any_position_valid) {
+			*speed_f = v3f(0, 0, 0);
+			return result;
 		}
 	}
 
-	// Do not move if world has not loaded yet, since custom node boxes
-	// are not available for collision detection.
-	// This also intentionally occurs in the case of the object being positioned
-	// solely on loaded CONTENT_IGNORE nodes, no matter where they come from.
-	if (!any_position_valid) {
-		*speed_f = v3f(0, 0, 0);
-		return result;
+	/*
+		Collect object boxes in movement range
+	*/
+	if (collide_with_objects) {
+		add_object_boxes(env, box_0, dtime, *pos_f, *speed_f, self, cinfo);
 	}
 
-	} // tt2
-
-	if(collideWithObjects)
-	{
-		/* add object boxes to cinfo */
-
-		std::vector<ActiveObject*> objects;
-#ifndef SERVER
-		ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
-		if (c_env != 0) {
-			// Calculate distance by speed, add own extent and 1.5m of tolerance
-			f32 distance = speed_f->getLength() * dtime +
-				box_0.getExtent().getLength() + 1.5f * BS;
-			std::vector<DistanceSortedActiveObject> clientobjects;
-			c_env->getActiveObjects(*pos_f, distance, clientobjects);
-
-			for (auto &clientobject : clientobjects) {
-				// Do collide with everything but itself and the parent CAO
-				if (!self || (self != clientobject.obj.get() &&
-						self != clientobject.obj->getParent())) {
-					objects.push_back((ActiveObject*) clientobject.obj.get());
-				}
-			}
-		}
-		else
-#endif
-		{
-			if (s_env != NULL) {
-				// Calculate distance by speed, add own extent and 1.5m of tolerance
-				f32 distance = speed_f->getLength() * dtime +
-					box_0.getExtent().getLength() + 1.5f * BS;
-
-				// search for objects which are not us, or we are not its parent
-				// we directly use the callback to populate the result to prevent
-				// a useless result loop here
-				auto include_obj_cb = [self, &objects] (const ServerActiveObjectPtr &obj) {
-					if (!obj->isGone() &&
-						(!self || (self != obj.get() && self != obj->getParent()))) {
-						objects.push_back((ActiveObject *)obj.get());
-					}
-					return false;
-				};
-
-				std::vector<ServerActiveObjectPtr> s_objects;
-				s_env->getObjectsInsideRadius(s_objects, *pos_f, distance, include_obj_cb);
-			}
-		}
-
-		for (std::vector<ActiveObject*>::const_iterator iter = objects.begin();
-				iter != objects.end(); ++iter) {
-			ActiveObject *object = *iter;
-
-			if (object && object->collideWithObjects()) {
-				aabb3f object_collisionbox;
-				if (object->getCollisionBox(&object_collisionbox))
-					cinfo.emplace_back(object, 0, object_collisionbox);
-			}
-		}
-#ifndef SERVER
-		if (self && c_env) {
-			LocalPlayer *lplayer = c_env->getLocalPlayer();
-			if (lplayer->getParent() == nullptr) {
-				aabb3f lplayer_collisionbox = lplayer->getCollisionbox();
-				v3f lplayer_pos = lplayer->getPosition();
-				lplayer_collisionbox.MinEdge += lplayer_pos;
-				lplayer_collisionbox.MaxEdge += lplayer_pos;
-				ActiveObject *obj = (ActiveObject*) lplayer->getCAO();
-				cinfo.emplace_back(obj, 0, lplayer_collisionbox);
-			}
-		}
-#endif
-	} //tt3
-
 	/*
 		Collision detection
 	*/
@@ -546,6 +524,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 
 			info.node_p = nearest_info.position;
 			info.object = nearest_info.obj;
+			info.new_pos = *pos_f;
 			info.old_speed = *speed_f;
 			info.plane = nearest_collided;
 
@@ -580,7 +559,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 
 			if (is_collision) {
 				info.axis = nearest_collided;
-				result.collisions.push_back(info);
+				result.collisions.push_back(std::move(info));
 			}
 		}
 	}
@@ -622,3 +601,44 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 
 	return result;
 }
+
+bool collision_check_intersection(Environment *env, IGameDef *gamedef,
+		const aabb3f &box_0, const v3f &pos_f, ActiveObject *self,
+		bool collide_with_objects)
+{
+	ScopeProfiler sp(g_profiler, PROFILER_NAME("collision_check_intersection()"), SPT_AVG, PRECISION_MICRO);
+
+	std::vector<NearbyCollisionInfo> cinfo;
+	{
+		v3s16 min = floatToInt(pos_f + box_0.MinEdge, BS) - v3s16(1, 1, 1);
+		v3s16 max = floatToInt(pos_f + box_0.MaxEdge, BS) + v3s16(1, 1, 1);
+
+		bool any_position_valid = add_area_node_boxes(min, max, gamedef, env, cinfo);
+
+		if (!any_position_valid) {
+			return true;
+		}
+	}
+
+	if (collide_with_objects) {
+		v3f speed;
+		add_object_boxes(env, box_0, 0, pos_f, speed, self, cinfo);
+	}
+
+	/*
+		Collision detection
+	*/
+	aabb3f checkbox = box_0;
+	checkbox.MinEdge += pos_f;
+	checkbox.MaxEdge += pos_f;
+
+	/*
+		Go through every node and object box
+	*/
+	for (const NearbyCollisionInfo &box_info : cinfo) {
+		if (box_info.box.intersectsWithBox(checkbox))
+			return true;
+	}
+
+	return false;
+}
diff --git a/src/collision.h b/src/collision.h
index 41e4b0089..b69cc122c 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -52,6 +52,7 @@ struct CollisionInfo
 	CollisionAxis axis = COLLISION_AXIS_NONE;
 	v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
 	ActiveObject *object = nullptr; // COLLISION_OBJECT
+	v3f new_pos;
 	v3f old_speed;
 	v3f new_speed;
 	int plane = -1;
@@ -73,7 +74,12 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
 		f32 stepheight, f32 dtime,
 		v3f *pos_f, v3f *speed_f,
 		v3f accel_f, ActiveObject *self=NULL,
-		bool collideWithObjects=true);
+		bool collide_with_objects=true);
+
+// check if box is in collision on actual position
+bool collision_check_intersection(Environment *env, IGameDef *gamedef,
+		const aabb3f &box_0, const v3f &pos_f, ActiveObject *self = nullptr,
+		bool collide_with_objects = true);
 
 // Helper function:
 // Checks for collision of a moving aabbox with a static aabbox
@@ -81,7 +87,7 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
 // dtime receives time until first collision, invalid if -1 is returned
 CollisionAxis axisAlignedCollision(
 		const aabb3f &staticbox, const aabb3f &movingbox,
-		const v3f &speed, f32 *dtime);
+		v3f speed, f32 *dtime);
 
 // Helper function:
 // Checks if moving the movingbox up by the given distance would hit a ceiling.
diff --git a/src/constants.h b/src/constants.h
index b68043130..237dce8d0 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -55,11 +55,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #define CONNECTION_TIMEOUT 30
 
-#define RESEND_TIMEOUT_MIN 0.1
-#define RESEND_TIMEOUT_MAX 3.0
-// resend_timeout = avg_rtt * this
-#define RESEND_TIMEOUT_FACTOR 8
-
 /*
     Server
 */
@@ -69,6 +64,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 // Override for the previous one when distance of block is very low
 #define BLOCK_SEND_DISABLE_LIMITS_MAX_D 1
 
+/*
+    Client/Server
+*/
+
+// Limit maximum dtime in client/server step(...) and for collision detection
+#define DTIME_LIMIT 2.5f
+
 /*
     Map-related things
 */
diff --git a/src/content/content.cpp b/src/content/content.cpp
index e576943ff..f056ad1e4 100644
--- a/src/content/content.cpp
+++ b/src/content/content.cpp
@@ -24,70 +24,43 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "settings.h"
 
-enum ContentType
+ContentType getContentType(const std::string &path)
 {
-	ECT_UNKNOWN,
-	ECT_MOD,
-	ECT_MODPACK,
-	ECT_GAME,
-	ECT_TXP
-};
+	if (fs::IsFile(path + DIR_DELIM "modpack.txt") || fs::IsFile(path + DIR_DELIM "modpack.conf"))
+		return ContentType::MODPACK;
 
-ContentType getContentType(const ContentSpec &spec)
-{
-	std::ifstream modpack_is((spec.path + DIR_DELIM + "modpack.txt").c_str());
-	if (modpack_is.good()) {
-		modpack_is.close();
-		return ECT_MODPACK;
-	}
+	if (fs::IsFile(path + DIR_DELIM "init.lua"))
+		return ContentType::MOD;
 
-	std::ifstream modpack2_is((spec.path + DIR_DELIM + "modpack.conf").c_str());
-	if (modpack2_is.good()) {
-		modpack2_is.close();
-		return ECT_MODPACK;
-	}
+	if (fs::IsFile(path + DIR_DELIM "game.conf"))
+		return ContentType::GAME;
 
-	std::ifstream init_is((spec.path + DIR_DELIM + "init.lua").c_str());
-	if (init_is.good()) {
-		init_is.close();
-		return ECT_MOD;
-	}
+	if (fs::IsFile(path + DIR_DELIM "texture_pack.conf"))
+		return ContentType::TXP;
 
-	std::ifstream game_is((spec.path + DIR_DELIM + "game.conf").c_str());
-	if (game_is.good()) {
-		game_is.close();
-		return ECT_GAME;
-	}
-
-	std::ifstream txp_is((spec.path + DIR_DELIM + "texture_pack.conf").c_str());
-	if (txp_is.good()) {
-		txp_is.close();
-		return ECT_TXP;
-	}
-
-	return ECT_UNKNOWN;
+	return ContentType::UNKNOWN;
 }
 
 void parseContentInfo(ContentSpec &spec)
 {
 	std::string conf_path;
 
-	switch (getContentType(spec)) {
-	case ECT_MOD:
+	switch (getContentType(spec.path)) {
+	case ContentType::MOD:
 		spec.type = "mod";
-		conf_path = spec.path + DIR_DELIM + "mod.conf";
+		conf_path = spec.path + DIR_DELIM "mod.conf";
 		break;
-	case ECT_MODPACK:
+	case ContentType::MODPACK:
 		spec.type = "modpack";
-		conf_path = spec.path + DIR_DELIM + "modpack.conf";
+		conf_path = spec.path + DIR_DELIM "modpack.conf";
 		break;
-	case ECT_GAME:
+	case ContentType::GAME:
 		spec.type = "game";
-		conf_path = spec.path + DIR_DELIM + "game.conf";
+		conf_path = spec.path + DIR_DELIM "game.conf";
 		break;
-	case ECT_TXP:
+	case ContentType::TXP:
 		spec.type = "txp";
-		conf_path = spec.path + DIR_DELIM + "texture_pack.conf";
+		conf_path = spec.path + DIR_DELIM "texture_pack.conf";
 		break;
 	default:
 		spec.type = "unknown";
@@ -104,6 +77,15 @@ void parseContentInfo(ContentSpec &spec)
 		if (spec.type != "game" && conf.exists("name"))
 			spec.name = conf.get("name");
 
+		if (conf.exists("title"))
+			spec.title = conf.get("title");
+
+		if (spec.type == "game") {
+			if (spec.title.empty())
+				spec.title = spec.name;
+			spec.name = "";
+		}
+
 		if (conf.exists("description"))
 			spec.desc = conf.get("description");
 
@@ -112,11 +94,18 @@ void parseContentInfo(ContentSpec &spec)
 
 		if (conf.exists("release"))
 			spec.release = conf.getS32("release");
+
+		if (conf.exists("textdomain"))
+			spec.textdomain = conf.get("textdomain");
 	}
 
+	if (spec.name.empty())
+		spec.name = fs::GetFilenameFromPath(spec.path.c_str());
+
+	if (spec.textdomain.empty())
+		spec.textdomain = spec.name;
+
 	if (spec.desc.empty()) {
-		std::ifstream is((spec.path + DIR_DELIM + "description.txt").c_str());
-		spec.desc = std::string((std::istreambuf_iterator<char>(is)),
-				std::istreambuf_iterator<char>());
+		fs::ReadFile(spec.path + DIR_DELIM + "description.txt", spec.desc);
 	}
 }
diff --git a/src/content/content.h b/src/content/content.h
index ce09a2eb9..c7fc220dc 100644
--- a/src/content/content.h
+++ b/src/content/content.h
@@ -22,6 +22,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "convert_json.h"
 #include "irrlichttypes.h"
 
+enum class ContentType
+{
+	UNKNOWN,
+	MOD,
+	MODPACK,
+	GAME,
+	TXP
+};
+
+
 struct ContentSpec
 {
 	std::string type;
@@ -37,6 +47,9 @@ struct ContentSpec
 	/// Short description
 	std::string desc;
 	std::string path;
+	std::string textdomain;
 };
 
+
+ContentType getContentType(const std::string &path);
 void parseContentInfo(ContentSpec &spec);
diff --git a/src/content/mod_configuration.cpp b/src/content/mod_configuration.cpp
index 29f4cb4f2..c3a5ceb5f 100644
--- a/src/content/mod_configuration.cpp
+++ b/src/content/mod_configuration.cpp
@@ -22,7 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "filesys.h"
 #include "gettext.h"
-
+#include "exceptions.h"
+#include "util/numeric.h"
+#include <optional>
+#include <algorithm>
 
 std::string ModConfiguration::getUnsatisfiedModsError() const
 {
@@ -114,6 +117,9 @@ void ModConfiguration::addGameMods(const SubgameSpec &gamespec)
 	std::string game_virtual_path;
 	game_virtual_path.append("games/").append(gamespec.id).append("/mods");
 	addModsInPath(gamespec.gamemods_path, game_virtual_path);
+
+	m_first_mod = gamespec.first_mod;
+	m_last_mod = gamespec.last_mod;
 }
 
 void ModConfiguration::addModsFromConfig(
@@ -221,31 +227,77 @@ void ModConfiguration::checkConflictsAndDeps()
 
 void ModConfiguration::resolveDependencies()
 {
-	// Step 1: Compile a list of the mod names we're working with
+	// Compile a list of the mod names we're working with
 	std::set<std::string> modnames;
-	for (const ModSpec &mod : m_unsatisfied_mods) {
-		modnames.insert(mod.name);
+	std::optional<ModSpec> first_mod_spec, last_mod_spec;
+	for (ModSpec &mod : m_unsatisfied_mods) {
+		if (mod.name == m_first_mod) {
+			first_mod_spec = mod;
+		} else if (mod.name == m_last_mod) {
+			last_mod_spec = mod;
+		} else {
+			modnames.insert(mod.name);
+		}
 	}
 
-	// Step 2: get dependencies (including optional dependencies)
+	// Optionally shuffle unsatisfied mods so non declared depends get found by their devs
+	if (g_settings->getBool("random_mod_load_order")) {
+		MyRandGenerator rg;
+		std::shuffle(m_unsatisfied_mods.begin(),
+			m_unsatisfied_mods.end(),
+			rg
+		);
+	}
+
+	// Check for presence of first and last mod
+	if (!m_first_mod.empty() && !first_mod_spec.has_value())
+		throw ModError("The mod specified as first by the game was not found.");
+	if (!m_last_mod.empty() && !last_mod_spec.has_value())
+		throw ModError("The mod specified as last by the game was not found.");
+
+	// Check and add first mod
+	if (first_mod_spec.has_value()) {
+		// Dependencies are not allowed for first mod
+		if (!first_mod_spec->depends.empty() || !first_mod_spec->optdepends.empty())
+			throw ModError("Mod specified by first_mod cannot have dependencies");
+
+		m_sorted_mods.push_back(*first_mod_spec);
+	}
+
+	// Get dependencies (including optional dependencies)
 	// of each mod, split mods into satisfied and unsatisfied
 	std::vector<ModSpec> satisfied;
 	std::list<ModSpec> unsatisfied;
 	for (ModSpec mod : m_unsatisfied_mods) {
+		if (mod.name == m_first_mod || mod.name == m_last_mod)
+			continue; // skip, handled separately
+
 		mod.unsatisfied_depends = mod.depends;
 		// check which optional dependencies actually exist
 		for (const std::string &optdep : mod.optdepends) {
 			if (modnames.count(optdep) != 0)
 				mod.unsatisfied_depends.insert(optdep);
 		}
+		mod.unsatisfied_depends.erase(m_first_mod); // first is already satisfied
+
+		if (last_mod_spec.has_value() && mod.unsatisfied_depends.count(last_mod_spec->name) != 0) {
+			throw ModError("Impossible to depend on the mod specified by last_mod");
+		}
 		// if a mod has no depends it is initially satisfied
-		if (mod.unsatisfied_depends.empty())
+		if (mod.unsatisfied_depends.empty()) {
 			satisfied.push_back(mod);
-		else
+		} else {
 			unsatisfied.push_back(mod);
+		}
 	}
 
-	// Step 3: mods without unmet dependencies can be appended to
+	// All dependencies of the last mod are initially unsatisfied
+	if (last_mod_spec.has_value()) {
+		last_mod_spec->unsatisfied_depends = last_mod_spec->depends;
+		last_mod_spec->unsatisfied_depends.erase(m_first_mod);
+	}
+
+	// Mods without unmet dependencies can be appended to
 	// the sorted list.
 	while (!satisfied.empty()) {
 		ModSpec mod = satisfied.back();
@@ -261,8 +313,18 @@ void ModConfiguration::resolveDependencies()
 				++it;
 			}
 		}
+		if (last_mod_spec.has_value())
+			last_mod_spec->unsatisfied_depends.erase(mod.name);
 	}
 
-	// Step 4: write back list of unsatisfied mods
+	// Write back list of unsatisfied mods
 	m_unsatisfied_mods.assign(unsatisfied.begin(), unsatisfied.end());
+
+	// Check and add last mod
+	if (last_mod_spec.has_value()) {
+		if (last_mod_spec->unsatisfied_depends.empty())
+			m_sorted_mods.push_back(*last_mod_spec);
+		else
+			m_unsatisfied_mods.push_back(*last_mod_spec);
+	}
 }
diff --git a/src/content/mod_configuration.h b/src/content/mod_configuration.h
index e945a785a..200694652 100644
--- a/src/content/mod_configuration.h
+++ b/src/content/mod_configuration.h
@@ -87,6 +87,9 @@ public:
 	void checkConflictsAndDeps();
 
 private:
+	std::string m_first_mod; // "" <=> no mod
+	std::string m_last_mod; // "" <=> no mod
+
 	std::vector<ModSpec> m_sorted_mods;
 
 	/**
diff --git a/src/content/mods.cpp b/src/content/mods.cpp
index 58e084d7f..1dce8f677 100644
--- a/src/content/mods.cpp
+++ b/src/content/mods.cpp
@@ -111,10 +111,8 @@ bool parseModContents(ModSpec &spec)
 	if (info.exists("depends")) {
 		mod_conf_has_depends = true;
 		std::string dep = info.get("depends");
-		// clang-format off
 		dep.erase(std::remove_if(dep.begin(), dep.end(),
 				static_cast<int (*)(int)>(&std::isspace)), dep.end());
-		// clang-format on
 		for (const auto &dependency : str_split(dep, ',')) {
 			spec.depends.insert(dependency);
 		}
@@ -123,10 +121,8 @@ bool parseModContents(ModSpec &spec)
 	if (info.exists("optional_depends")) {
 		mod_conf_has_depends = true;
 		std::string dep = info.get("optional_depends");
-		// clang-format off
 		dep.erase(std::remove_if(dep.begin(), dep.end(),
 				static_cast<int (*)(int)>(&std::isspace)), dep.end());
-		// clang-format on
 		for (const auto &dependency : str_split(dep, ',')) {
 			spec.optdepends.insert(dependency);
 		}
@@ -235,7 +231,7 @@ bool ModStorage::contains(const std::string &name) const
 	return m_database->hasModEntry(m_mod_name, name);
 }
 
-bool ModStorage::setString(const std::string &name, const std::string &var)
+bool ModStorage::setString(const std::string &name, std::string_view var)
 {
 	if (var.empty())
 		return m_database->removeModEntry(m_mod_name, name);
diff --git a/src/content/mods.h b/src/content/mods.h
index 476fab0f0..afdedc8ec 100644
--- a/src/content/mods.h
+++ b/src/content/mods.h
@@ -126,7 +126,7 @@ public:
 
 	bool contains(const std::string &name) const override;
 
-	bool setString(const std::string &name, const std::string &var) override;
+	bool setString(const std::string &name, std::string_view var) override;
 
 	const StringMap &getStrings(StringMap *place) const override;
 
diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp
index 5e1765997..b0519e5e6 100644
--- a/src/content/subgames.cpp
+++ b/src/content/subgames.cpp
@@ -32,7 +32,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/string.h"
 
 #ifndef SERVER
-#include "client/tile.h" // getImagePath
+#include "client/texturepaths.h"
 #endif
 #include "util/string.h"
 #include "config.h"
@@ -82,8 +82,65 @@ struct GameFindPath
 
 std::string getSubgamePathEnv()
 {
+	static bool has_warned = false;
 	char *subgame_path = getenv("MINETEST_SUBGAME_PATH");
-	return subgame_path ? std::string(subgame_path) : "";
+	if (subgame_path && !has_warned) {
+		warningstream << "MINETEST_SUBGAME_PATH is deprecated, use MINETEST_GAME_PATH instead."
+				<< std::endl;
+		has_warned = true;
+	}
+
+	char *game_path = getenv("MINETEST_GAME_PATH");
+
+	if (game_path)
+		return std::string(game_path);
+	else if (subgame_path)
+		return std::string(subgame_path);
+	return "";
+}
+
+static SubgameSpec getSubgameSpec(const std::string &game_id,
+		const std::string &game_path,
+		const std::unordered_map<std::string, std::string> &mods_paths,
+		const std::string &menuicon_path)
+{
+	const auto gamemods_path = game_path + DIR_DELIM + "mods";
+	// Get meta
+	const std::string conf_path = game_path + DIR_DELIM + "game.conf";
+	Settings conf;
+	conf.readConfigFile(conf_path.c_str());
+
+	std::string game_title;
+	if (conf.exists("title"))
+		game_title = conf.get("title");
+	else if (conf.exists("name"))
+		game_title = conf.get("name");
+	else
+		game_title = game_id;
+
+	std::string game_author;
+	if (conf.exists("author"))
+		game_author = conf.get("author");
+
+	int game_release = 0;
+	if (conf.exists("release"))
+		game_release = conf.getS32("release");
+
+	std::string first_mod;
+	if (conf.exists("first_mod"))
+		first_mod = conf.get("first_mod");
+
+	std::string last_mod;
+	if (conf.exists("last_mod"))
+		last_mod = conf.get("last_mod");
+
+	SubgameSpec spec(game_id, game_path, gamemods_path, mods_paths, game_title,
+			menuicon_path, game_author, game_release, first_mod, last_mod);
+
+	if (conf.exists("name") && !conf.exists("title"))
+		spec.deprecation_msgs.push_back("\"name\" setting in game.conf is deprecated, please use \"title\" instead");
+
+	return spec;
 }
 
 SubgameSpec findSubgame(const std::string &id)
@@ -130,8 +187,6 @@ SubgameSpec findSubgame(const std::string &id)
 	if (game_path.empty())
 		return SubgameSpec();
 
-	std::string gamemod_path = game_path + DIR_DELIM + "mods";
-
 	// Find mod directories
 	std::unordered_map<std::string, std::string> mods_paths;
 	mods_paths["mods"] = user + DIR_DELIM + "mods";
@@ -142,40 +197,13 @@ SubgameSpec findSubgame(const std::string &id)
 		mods_paths[fs::AbsolutePath(mod_path)] = mod_path;
 	}
 
-	// Get meta
-	std::string conf_path = game_path + DIR_DELIM + "game.conf";
-	Settings conf;
-	conf.readConfigFile(conf_path.c_str());
-
-	std::string game_title;
-	if (conf.exists("title"))
-		game_title = conf.get("title");
-	else if (conf.exists("name"))
-		game_title = conf.get("name");
-	else
-		game_title = id;
-
-	std::string game_author;
-	if (conf.exists("author"))
-		game_author = conf.get("author");
-
-	int game_release = 0;
-	if (conf.exists("release"))
-		game_release = conf.getS32("release");
-
 	std::string menuicon_path;
 #ifndef SERVER
 	menuicon_path = getImagePath(
 			game_path + DIR_DELIM + "menu" + DIR_DELIM + "icon.png");
 #endif
 
-	SubgameSpec spec(id, game_path, gamemod_path, mods_paths, game_title,
-			menuicon_path, game_author, game_release);
-
-	if (conf.exists("name") && !conf.exists("title"))
-		spec.deprecation_msgs.push_back("\"name\" setting in game.conf is deprecated, please use \"title\" instead");
-
-	return spec;
+	return getSubgameSpec(id, game_path, mods_paths, menuicon_path);
 }
 
 SubgameSpec findWorldSubgame(const std::string &world_path)
@@ -183,25 +211,8 @@ SubgameSpec findWorldSubgame(const std::string &world_path)
 	std::string world_gameid = getWorldGameId(world_path, true);
 	// See if world contains an embedded game; if so, use it.
 	std::string world_gamepath = world_path + DIR_DELIM + "game";
-	if (fs::PathExists(world_gamepath)) {
-		SubgameSpec gamespec;
-		gamespec.id = world_gameid;
-		gamespec.path = world_gamepath;
-		gamespec.gamemods_path = world_gamepath + DIR_DELIM + "mods";
-
-		Settings conf;
-		std::string conf_path = world_gamepath + DIR_DELIM + "game.conf";
-		conf.readConfigFile(conf_path.c_str());
-
-		if (conf.exists("title"))
-			gamespec.title = conf.get("title");
-		else if (conf.exists("name"))
-			gamespec.title = conf.get("name");
-		else
-			gamespec.title = world_gameid;
-
-		return gamespec;
-	}
+	if (fs::PathExists(world_gamepath))
+		return getSubgameSpec(world_gameid, world_gamepath, {}, "");
 	return findSubgame(world_gameid);
 }
 
@@ -232,9 +243,9 @@ std::set<std::string> getAvailableGameIds()
 
 			// Add it to result
 			const char *ends[] = {"_game", NULL};
-			std::string shorter = removeStringEnd(dln.name, ends);
+			auto shorter = removeStringEnd(dln.name, ends);
 			if (!shorter.empty())
-				gameids.insert(shorter);
+				gameids.emplace(shorter);
 			else
 				gameids.insert(dln.name);
 		}
diff --git a/src/content/subgames.h b/src/content/subgames.h
index a0809f16e..5a6053859 100644
--- a/src/content/subgames.h
+++ b/src/content/subgames.h
@@ -35,6 +35,8 @@ struct SubgameSpec
 	std::string title;
 	std::string author;
 	int release;
+	std::string first_mod; // "" <=> no mod
+	std::string last_mod; // "" <=> no mod
 	std::string path;
 	std::string gamemods_path;
 
@@ -52,10 +54,16 @@ struct SubgameSpec
 			const std::unordered_map<std::string, std::string> &addon_mods_paths = {},
 			const std::string &title = "",
 			const std::string &menuicon_path = "",
-			const std::string &author = "", int release = 0) :
+			const std::string &author = "", int release = 0,
+			const std::string &first_mod = "",
+			const std::string &last_mod = "") :
 			id(id),
-			title(title), author(author), release(release), path(path),
-			gamemods_path(gamemods_path), addon_mods_paths(addon_mods_paths),
+			title(title), author(author), release(release),
+			first_mod(first_mod),
+			last_mod(last_mod),
+			path(path),
+			gamemods_path(gamemods_path),
+			addon_mods_paths(addon_mods_paths),
 			menuicon_path(menuicon_path)
 	{
 	}
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index a97d91be3..f85be1e44 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -25,6 +25,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "nodetimer.h"
 #include "inventory.h"
 #include "log.h"
+#include "debug.h"
 #include "serialization.h"
 #include "util/serialize.h"
 #include "util/string.h"
diff --git a/src/craftdef.cpp b/src/craftdef.cpp
index 2d0bf33e6..eaeb83dba 100644
--- a/src/craftdef.cpp
+++ b/src/craftdef.cpp
@@ -37,7 +37,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 inline bool isGroupRecipeStr(const std::string &rec_name)
 {
-	return str_starts_with(rec_name, std::string("group:"));
+	return str_starts_with(rec_name, "group:");
 }
 
 static bool hasGroupItem(const std::vector<std::string> &recipe)
diff --git a/src/database/database-dummy.cpp b/src/database/database-dummy.cpp
index bdb481286..b6f9a349c 100644
--- a/src/database/database-dummy.cpp
+++ b/src/database/database-dummy.cpp
@@ -25,7 +25,7 @@ Dummy database class
 #include "remoteplayer.h"
 
 
-bool Database_Dummy::saveBlock(const v3s16 &pos, const std::string &data)
+bool Database_Dummy::saveBlock(const v3s16 &pos, std::string_view data)
 {
 	m_database.insert_or_assign(getBlockAsString(pos), data);
 	return true;
@@ -128,11 +128,12 @@ bool Database_Dummy::hasModEntry(const std::string &modname, const std::string &
 }
 
 bool Database_Dummy::setModEntry(const std::string &modname,
-	const std::string &key, const std::string &value)
+	const std::string &key, std::string_view value)
 {
 	auto mod_pair = m_mod_storage_database.find(modname);
 	if (mod_pair == m_mod_storage_database.end()) {
-		m_mod_storage_database[modname] = StringMap({{key, value}});
+		auto &map = m_mod_storage_database[modname];
+		map[key] = value;
 	} else {
 		mod_pair->second[key] = value;
 	}
diff --git a/src/database/database-dummy.h b/src/database/database-dummy.h
index f5d9525a3..1acb13d58 100644
--- a/src/database/database-dummy.h
+++ b/src/database/database-dummy.h
@@ -23,6 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <map>
+#include <set>
 #include <string>
 #include "database.h"
 #include "irrlichttypes.h"
@@ -31,7 +32,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 class Database_Dummy : public MapDatabase, public PlayerDatabase, public ModStorageDatabase
 {
 public:
-	bool saveBlock(const v3s16 &pos, const std::string &data);
+	bool saveBlock(const v3s16 &pos, std::string_view data);
 	void loadBlock(const v3s16 &pos, std::string *block);
 	bool deleteBlock(const v3s16 &pos);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
@@ -47,7 +48,7 @@ public:
 			const std::string &key, std::string *value);
 	bool hasModEntry(const std::string &modname, const std::string &key);
 	bool setModEntry(const std::string &modname,
-			const std::string &key, const std::string &value);
+			const std::string &key,std::string_view value);
 	bool removeModEntry(const std::string &modname, const std::string &key);
 	bool removeModEntries(const std::string &modname);
 	void listMods(std::vector<std::string> *res);
diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp
index 2aacf6142..43388a73f 100644
--- a/src/database/database-files.cpp
+++ b/src/database/database-files.cpp
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "server/player_sao.h"
 #include "util/string.h"
+#include <json/json.h>
 #include <cassert>
 
 // !!! WARNING !!!
@@ -164,11 +165,9 @@ void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
 		}
 
 		// Open and deserialize file to check player name
-		std::ifstream is(path.c_str(), std::ios_base::binary);
-		if (!is.good()) {
-			errorstream << "Failed to open " << path << std::endl;
+		auto is = open_ifstream(path.c_str(), true);
+		if (!is.good())
 			return;
-		}
 
 		deSerialize(&testplayer, is, path, NULL);
 		is.close();
@@ -204,7 +203,7 @@ bool PlayerDatabaseFiles::removePlayer(const std::string &name)
 	RemotePlayer temp_player("", NULL);
 	for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
 		// Open file and deserialize
-		std::ifstream is(path.c_str(), std::ios_base::binary);
+		auto is = open_ifstream(path.c_str(), false);
 		if (!is.good())
 			continue;
 
@@ -230,7 +229,7 @@ bool PlayerDatabaseFiles::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 	const std::string player_to_load = player->getName();
 	for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
 		// Open file and deserialize
-		std::ifstream is(path.c_str(), std::ios_base::binary);
+		auto is = open_ifstream(path.c_str(), false);
 		if (!is.good())
 			continue;
 
@@ -259,7 +258,7 @@ void PlayerDatabaseFiles::listPlayers(std::vector<std::string> &res)
 
 		const std::string &filename = it->name;
 		std::string full_path = m_savedir + DIR_DELIM + filename;
-		std::ifstream is(full_path.c_str(), std::ios_base::binary);
+		auto is = open_ifstream(full_path.c_str(), true);
 		if (!is.good())
 			continue;
 
@@ -331,7 +330,7 @@ void AuthDatabaseFiles::reload()
 bool AuthDatabaseFiles::readAuthFile()
 {
 	std::string path = m_savedir + DIR_DELIM + "auth.txt";
-	std::ifstream file(path, std::ios::binary);
+	auto file = open_ifstream(path.c_str(), false);
 	if (!file.good()) {
 		return false;
 	}
@@ -428,13 +427,14 @@ bool ModStorageDatabaseFiles::hasModEntry(const std::string &modname, const std:
 }
 
 bool ModStorageDatabaseFiles::setModEntry(const std::string &modname,
-	const std::string &key, const std::string &value)
+	const std::string &key, std::string_view value)
 {
 	Json::Value *meta = getOrCreateJson(modname);
 	if (!meta)
 		return false;
 
-	(*meta)[key] = Json::Value(value);
+	Json::Value value_v(value.data(), value.data() + value.size());
+	(*meta)[key] = std::move(value_v);
 	m_modified.insert(modname);
 
 	return true;
@@ -526,8 +526,7 @@ Json::Value *ModStorageDatabaseFiles::getOrCreateJson(const std::string &modname
 
 	std::string path = m_storage_dir + DIR_DELIM + modname;
 	if (fs::PathExists(path)) {
-		std::ifstream is(path.c_str(), std::ios_base::binary);
-
+		auto is = open_ifstream(path.c_str(), true);
 		Json::CharReaderBuilder builder;
 		builder.settings_["collectComments"] = false;
 		std::string errs;
diff --git a/src/database/database-files.h b/src/database/database-files.h
index 61a8fd9a2..c1bd034f4 100644
--- a/src/database/database-files.h
+++ b/src/database/database-files.h
@@ -84,7 +84,7 @@ public:
 		const std::string &key, std::string *value);
 	virtual bool hasModEntry(const std::string &modname, const std::string &key);
 	virtual bool setModEntry(const std::string &modname,
-		const std::string &key, const std::string &value);
+		const std::string &key, std::string_view value);
 	virtual bool removeModEntry(const std::string &modname, const std::string &key);
 	virtual bool removeModEntries(const std::string &modname);
 	virtual void listMods(std::vector<std::string> *res);
@@ -94,7 +94,6 @@ public:
 
 private:
 	Json::Value *getOrCreateJson(const std::string &modname);
-	bool writeJson(const std::string &modname, const Json::Value &json);
 
 	std::string m_storage_dir;
 	std::unordered_map<std::string, Json::Value> m_mod_storage;
diff --git a/src/database/database-leveldb.cpp b/src/database/database-leveldb.cpp
index 678f290e1..261db49ae 100644
--- a/src/database/database-leveldb.cpp
+++ b/src/database/database-leveldb.cpp
@@ -56,10 +56,12 @@ Database_LevelDB::Database_LevelDB(const std::string &savedir)
 	m_database.reset(db);
 }
 
-bool Database_LevelDB::saveBlock(const v3s16 &pos, const std::string &data)
+bool Database_LevelDB::saveBlock(const v3s16 &pos, std::string_view data)
 {
+	leveldb::Slice data_s(data.data(), data.size());
 	leveldb::Status status = m_database->Put(leveldb::WriteOptions(),
-			getBlockAsString(pos), data);
+			getBlockAsString(pos), data_s);
+			//i64tos(getBlockAsInteger(pos)), data_s);
 	if (!status.ok()) {
 		warningstream << "saveBlock: LevelDB error saving block "
 			<< pos << ": " << status.ToString() << std::endl;
diff --git a/src/database/database-leveldb.h b/src/database/database-leveldb.h
index 6e078edbe..f04b41475 100644
--- a/src/database/database-leveldb.h
+++ b/src/database/database-leveldb.h
@@ -43,7 +43,7 @@ public:
 	void close() { m_database->close(); };
 	*/
 
-	bool saveBlock(const v3s16 &pos, const std::string &data);
+	bool saveBlock(const v3s16 &pos, std::string_view data);
 	void loadBlock(const v3s16 &pos, std::string *block);
 	bool deleteBlock(const v3s16 &pos);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
diff --git a/src/database/database-postgresql.cpp b/src/database/database-postgresql.cpp
index a50f270d0..7c464c81a 100644
--- a/src/database/database-postgresql.cpp
+++ b/src/database/database-postgresql.cpp
@@ -223,7 +223,7 @@ void MapDatabasePostgreSQL::initStatements()
 		"SELECT posX, posY, posZ FROM blocks");
 }
 
-bool MapDatabasePostgreSQL::saveBlock(const v3s16 &pos, const std::string &data)
+bool MapDatabasePostgreSQL::saveBlock(const v3s16 &pos, std::string_view data)
 {
 	// Verify if we don't overflow the platform integer with the mapblock size
 	if (data.size() > INT_MAX) {
@@ -240,7 +240,7 @@ bool MapDatabasePostgreSQL::saveBlock(const v3s16 &pos, const std::string &data)
 	y = htonl(pos.Y);
 	z = htonl(pos.Z);
 
-	const void *args[] = { &x, &y, &z, data.c_str() };
+	const void *args[] = { &x, &y, &z, data.data() };
 	const int argLen[] = {
 		sizeof(x), sizeof(y), sizeof(z), (int)data.size()
 	};
@@ -940,11 +940,11 @@ bool ModStorageDatabasePostgreSQL::hasModEntry(const std::string &modname,
 }
 
 bool ModStorageDatabasePostgreSQL::setModEntry(const std::string &modname,
-	const std::string &key, const std::string &value)
+	const std::string &key, std::string_view value)
 {
 	verifyDatabase();
 
-	const void *args[] = { modname.c_str(), key.c_str(), value.c_str() };
+	const void *args[] = { modname.c_str(), key.c_str(), value.data() };
 	const int argLen[] = {
 		-1,
 		(int)MYMIN(key.size(), INT_MAX),
diff --git a/src/database/database-postgresql.h b/src/database/database-postgresql.h
index 56b3d6b53..28ff1c35f 100644
--- a/src/database/database-postgresql.h
+++ b/src/database/database-postgresql.h
@@ -120,7 +120,7 @@ public:
 	MapDatabasePostgreSQL(const std::string &connect_string);
 	virtual ~MapDatabasePostgreSQL() = default;
 
-	bool saveBlock(const v3s16 &pos, const std::string &data);
+	bool saveBlock(const v3s16 &pos, std::string_view data);
 	void loadBlock(const v3s16 &pos, std::string *block);
 	bool deleteBlock(const v3s16 &pos);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
@@ -186,7 +186,7 @@ public:
 	bool getModEntry(const std::string &modname, const std::string &key, std::string *value);
 	bool hasModEntry(const std::string &modname, const std::string &key);
 	bool setModEntry(const std::string &modname,
-			const std::string &key, const std::string &value);
+			const std::string &key, std::string_view value);
 	bool removeModEntry(const std::string &modname, const std::string &key);
 	bool removeModEntries(const std::string &modname);
 	void listMods(std::vector<std::string> *res);
diff --git a/src/database/database-redis.cpp b/src/database/database-redis.cpp
index 6a17f02c6..3f18df966 100644
--- a/src/database/database-redis.cpp
+++ b/src/database/database-redis.cpp
@@ -30,6 +30,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <hiredis.h>
 #include <cassert>
 
+/*
+ * Redis is not a good fit for Minetest and only still supported for legacy as
+ * well as advanced use case reasons, see:
+ * <https://github.com/minetest/minetest/issues/14822>
+ *
+ * Do NOT extend this backend with any new functionality.
+ */
 
 Database_Redis::Database_Redis(Settings &conf)
 {
@@ -64,6 +71,9 @@ Database_Redis::Database_Redis(Settings &conf)
 		}
 		freeReplyObject(reply);
 	}
+
+	dstream << "Note: When storing data in Redis you need to ensure that eviction"
+		" is disabled, or you risk DATA LOSS." << std::endl;
 }
 
 Database_Redis::~Database_Redis()
@@ -71,7 +81,8 @@ Database_Redis::~Database_Redis()
 	redisFree(ctx);
 }
 
-void Database_Redis::beginSave() {
+void Database_Redis::beginSave()
+{
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
 	if (!reply) {
 		throw DatabaseException(std::string(
@@ -80,7 +91,8 @@ void Database_Redis::beginSave() {
 	freeReplyObject(reply);
 }
 
-void Database_Redis::endSave() {
+void Database_Redis::endSave()
+{
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC"));
 	if (!reply) {
 		throw DatabaseException(std::string(
@@ -89,12 +101,12 @@ void Database_Redis::endSave() {
 	freeReplyObject(reply);
 }
 
-bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
+bool Database_Redis::saveBlock(const v3s16 &pos, std::string_view data)
 {
 	std::string tmp = i64tos(getBlockAsInteger(pos));
 
 	redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HSET %s %s %b",
-			hash.c_str(), tmp.c_str(), data.c_str(), data.size()));
+			hash.c_str(), tmp.c_str(), data.data(), data.size()));
 	if (!reply) {
 		warningstream << "saveBlock: redis command 'HSET' failed on "
 			"block " << pos << ": " << ctx->errstr << std::endl;
diff --git a/src/database/database-redis.h b/src/database/database-redis.h
index 6a1f2d4d1..2b695d653 100644
--- a/src/database/database-redis.h
+++ b/src/database/database-redis.h
@@ -41,7 +41,7 @@ public:
 	void beginSave();
 	void endSave();
 
-	bool saveBlock(const v3s16 &pos, const std::string &data);
+	bool saveBlock(const v3s16 &pos, std::string_view data);
 	void loadBlock(const v3s16 &pos, std::string *block);
 	bool deleteBlock(const v3s16 &pos);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
diff --git a/src/database/database-sqlite3.cpp b/src/database/database-sqlite3.cpp
index 0d52cb12b..31bda0791 100644
--- a/src/database/database-sqlite3.cpp
+++ b/src/database/database-sqlite3.cpp
@@ -262,7 +262,7 @@ bool MapDatabaseSQLite3::deleteBlock(const v3s16 &pos)
 	return good;
 }
 
-bool MapDatabaseSQLite3::saveBlock(const v3s16 &pos, const std::string &data)
+bool MapDatabaseSQLite3::saveBlock(const v3s16 &pos, std::string_view data)
 {
 	std::lock_guard<std::mutex> lock(mutex);
 
@@ -291,13 +291,8 @@ void MapDatabaseSQLite3::loadBlock(const v3s16 &pos, std::string *block)
 		return;
 	}
 
-	const char *data = (const char *) sqlite3_column_blob(m_stmt_read, 0);
-	size_t len = sqlite3_column_bytes(m_stmt_read, 0);
-
-	if (data)
-		block->assign(data, len);
-	else
-		block->clear();
+	auto data = sqlite_to_blob(m_stmt_read, 0);
+	block->assign(data);
 
 	sqlite3_step(m_stmt_read);
 	// We should never get more than 1 row, so ok to reset
@@ -561,7 +556,7 @@ bool PlayerDatabaseSQLite3::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 		int_to_sqlite(m_stmt_player_load_inventory_items, 2, invId);
 		while (sqlite3_step(m_stmt_player_load_inventory_items) == SQLITE_ROW) {
 			const std::string itemStr = sqlite_to_string(m_stmt_player_load_inventory_items, 1);
-			if (itemStr.length() > 0) {
+			if (!itemStr.empty()) {
 				ItemStack stack;
 				stack.deSerialize(itemStr);
 				invList->changeItem(sqlite_to_uint(m_stmt_player_load_inventory_items, 0), stack);
@@ -575,7 +570,7 @@ bool PlayerDatabaseSQLite3::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 	str_to_sqlite(m_stmt_player_metadata_load, 1, sao->getPlayer()->getName());
 	while (sqlite3_step(m_stmt_player_metadata_load) == SQLITE_ROW) {
 		std::string attr = sqlite_to_string(m_stmt_player_metadata_load, 0);
-		std::string value = sqlite_to_string(m_stmt_player_metadata_load, 1);
+		auto value = sqlite_to_string_view(m_stmt_player_metadata_load, 1);
 
 		sao->getMeta().setString(attr, value);
 	}
@@ -600,7 +595,7 @@ void PlayerDatabaseSQLite3::listPlayers(std::vector<std::string> &res)
 	verifyDatabase();
 
 	while (sqlite3_step(m_stmt_player_list) == SQLITE_ROW)
-		res.push_back(sqlite_to_string(m_stmt_player_list, 0));
+		res.emplace_back(sqlite_to_string_view(m_stmt_player_list, 0));
 
 	sqlite3_reset(m_stmt_player_list);
 }
@@ -677,14 +672,14 @@ bool AuthDatabaseSQLite3::getAuth(const std::string &name, AuthEntry &res)
 		return false;
 	}
 	res.id = sqlite_to_uint(m_stmt_read, 0);
-	res.name = sqlite_to_string(m_stmt_read, 1);
-	res.password = sqlite_to_string(m_stmt_read, 2);
+	res.name = sqlite_to_string_view(m_stmt_read, 1);
+	res.password = sqlite_to_string_view(m_stmt_read, 2);
 	res.last_login = sqlite_to_int64(m_stmt_read, 3);
 	sqlite3_reset(m_stmt_read);
 
 	int64_to_sqlite(m_stmt_read_privs, 1, res.id);
 	while (sqlite3_step(m_stmt_read_privs) == SQLITE_ROW) {
-		res.privileges.emplace_back(sqlite_to_string(m_stmt_read_privs, 0));
+		res.privileges.emplace_back(sqlite_to_string_view(m_stmt_read_privs, 0));
 	}
 	sqlite3_reset(m_stmt_read_privs);
 
@@ -749,7 +744,7 @@ void AuthDatabaseSQLite3::listNames(std::vector<std::string> &res)
 	verifyDatabase();
 
 	while (sqlite3_step(m_stmt_list_names) == SQLITE_ROW) {
-		res.push_back(sqlite_to_string(m_stmt_list_names, 0));
+		res.emplace_back(sqlite_to_string_view(m_stmt_list_names, 0));
 	}
 	sqlite3_reset(m_stmt_list_names);
 }
@@ -823,11 +818,9 @@ void ModStorageDatabaseSQLite3::getModEntries(const std::string &modname, String
 
 	str_to_sqlite(m_stmt_get_all, 1, modname);
 	while (sqlite3_step(m_stmt_get_all) == SQLITE_ROW) {
-		const char *key_data = (const char *) sqlite3_column_blob(m_stmt_get_all, 0);
-		size_t key_len = sqlite3_column_bytes(m_stmt_get_all, 0);
-		const char *value_data = (const char *) sqlite3_column_blob(m_stmt_get_all, 1);
-		size_t value_len = sqlite3_column_bytes(m_stmt_get_all, 1);
-		(*storage)[std::string(key_data, key_len)] = std::string(value_data, value_len);
+		auto key = sqlite_to_blob(m_stmt_get_all, 0);
+		auto value = sqlite_to_blob(m_stmt_get_all, 1);
+		(*storage)[std::string(key)].assign(value);
 	}
 	sqlite3_vrfy(sqlite3_errcode(m_database), SQLITE_DONE);
 
@@ -841,9 +834,8 @@ void ModStorageDatabaseSQLite3::getModKeys(const std::string &modname,
 
 	str_to_sqlite(m_stmt_get_keys, 1, modname);
 	while (sqlite3_step(m_stmt_get_keys) == SQLITE_ROW) {
-		const char *key_data = (const char *) sqlite3_column_blob(m_stmt_get_keys, 0);
-		size_t key_len = sqlite3_column_bytes(m_stmt_get_keys, 0);
-		storage->emplace_back(key_data, key_len);
+		auto key = sqlite_to_blob(m_stmt_get_keys, 0);
+		storage->emplace_back(key);
 	}
 	sqlite3_vrfy(sqlite3_errcode(m_database), SQLITE_DONE);
 
@@ -860,9 +852,8 @@ bool ModStorageDatabaseSQLite3::getModEntry(const std::string &modname,
 		"Internal error: failed to bind query at " __FILE__ ":" TOSTRING(__LINE__));
 	bool found = sqlite3_step(m_stmt_get) == SQLITE_ROW;
 	if (found) {
-		const char *value_data = (const char *) sqlite3_column_blob(m_stmt_get, 0);
-		size_t value_len = sqlite3_column_bytes(m_stmt_get, 0);
-		value->assign(value_data, value_len);
+		auto sv = sqlite_to_blob(m_stmt_get, 0);
+		value->assign(sv);
 		sqlite3_step(m_stmt_get);
 	}
 
@@ -889,7 +880,7 @@ bool ModStorageDatabaseSQLite3::hasModEntry(const std::string &modname,
 }
 
 bool ModStorageDatabaseSQLite3::setModEntry(const std::string &modname,
-	const std::string &key, const std::string &value)
+	const std::string &key, std::string_view value)
 {
 	verifyDatabase();
 
@@ -950,9 +941,9 @@ void ModStorageDatabaseSQLite3::listMods(std::vector<std::string> *res)
 			return 0;
 		}, (void *) res, &errmsg);
 	if (status != SQLITE_OK) {
-		DatabaseException e(std::string("Error trying to list mods with metadata: ") + errmsg);
+		auto msg = std::string("Error trying to list mods with metadata: ") + errmsg;
 		sqlite3_free(errmsg);
-		throw e;
+		throw DatabaseException(msg);
 	}
 }
 
diff --git a/src/database/database-sqlite3.h b/src/database/database-sqlite3.h
index 0392f27a7..f89ed827b 100644
--- a/src/database/database-sqlite3.h
+++ b/src/database/database-sqlite3.h
@@ -45,14 +45,9 @@ protected:
 	void verifyDatabase();
 
 	// Convertors
-	inline void str_to_sqlite(sqlite3_stmt *s, int iCol, const std::string &str) const
+	inline void str_to_sqlite(sqlite3_stmt *s, int iCol, std::string_view str) const
 	{
-		sqlite3_vrfy(sqlite3_bind_text(s, iCol, str.c_str(), str.size(), NULL));
-	}
-
-	inline void str_to_sqlite(sqlite3_stmt *s, int iCol, const char *str) const
-	{
-		sqlite3_vrfy(sqlite3_bind_text(s, iCol, str, strlen(str), NULL));
+		sqlite3_vrfy(sqlite3_bind_text(s, iCol, str.data(), str.size(), NULL));
 	}
 
 	inline void int_to_sqlite(sqlite3_stmt *s, int iCol, int val) const
@@ -70,10 +65,28 @@ protected:
 		sqlite3_vrfy(sqlite3_bind_double(s, iCol, val));
 	}
 
-	inline std::string sqlite_to_string(sqlite3_stmt *s, int iCol)
+	// Note that the return value is only valid until the statement is stepped or reset.
+	inline std::string_view sqlite_to_string_view(sqlite3_stmt *s, int iCol)
 	{
 		const char* text = reinterpret_cast<const char*>(sqlite3_column_text(s, iCol));
-		return std::string(text ? text : "");
+		return text ? std::string_view(text) : std::string_view();
+	}
+
+	// Avoid using this in favor of `sqlite_to_string_view`.
+	inline std::string sqlite_to_string(sqlite3_stmt *s, int iCol)
+	{
+		return std::string(sqlite_to_string_view(s, iCol));
+	}
+
+	// Converts a BLOB-type column into a string_view (null byte safe).
+	// Note that the return value is only valid until the statement is stepped or reset.
+	inline std::string_view sqlite_to_blob(sqlite3_stmt *s, int iCol)
+	{
+		const char *data = reinterpret_cast<const char*>(sqlite3_column_blob(s, iCol));
+		if (!data)
+			return std::string_view();
+		size_t len = sqlite3_column_bytes(s, iCol);
+		return std::string_view(data, len);
 	}
 
 	inline s32 sqlite_to_int(sqlite3_stmt *s, int iCol)
@@ -108,13 +121,16 @@ protected:
 	}
 
 	// Query verifiers helpers
-	inline void sqlite3_vrfy(int s, const std::string &m = "", int r = SQLITE_OK) const
+	inline void sqlite3_vrfy(int s, std::string_view m = "", int r = SQLITE_OK) const
 	{
-		if (s != r)
-			throw DatabaseException(m + ": " + sqlite3_errmsg(m_database));
+		if (s != r) {
+			std::string msg(m);
+			msg.append(": ").append(sqlite3_errmsg(m_database));
+			throw DatabaseException(msg);
+		}
 	}
 
-	inline void sqlite3_vrfy(const int s, const int r, const std::string &m = "") const
+	inline void sqlite3_vrfy(const int s, const int r, std::string_view m = "") const
 	{
 		sqlite3_vrfy(s, m, r);
 	}
@@ -147,7 +163,7 @@ public:
 	MapDatabaseSQLite3(const std::string &savedir);
 	virtual ~MapDatabaseSQLite3();
 
-	bool saveBlock(const v3s16 &pos, const std::string &data);
+	bool saveBlock(const v3s16 &pos, std::string_view data);
 	void loadBlock(const v3s16 &pos, std::string *block);
 	bool deleteBlock(const v3s16 &pos);
 	void listAllLoadableBlocks(std::vector<v3s16> &dst);
@@ -248,7 +264,7 @@ public:
 		const std::string &key, std::string *value);
 	virtual bool hasModEntry(const std::string &modname, const std::string &key);
 	virtual bool setModEntry(const std::string &modname,
-		const std::string &key, const std::string &value);
+		const std::string &key,std::string_view value);
 	virtual bool removeModEntry(const std::string &modname, const std::string &key);
 	virtual bool removeModEntries(const std::string &modname);
 	virtual void listMods(std::vector<std::string> *res);
diff --git a/src/database/database.h b/src/database/database.h
index c7fe664d9..f57fcecae 100644
--- a/src/database/database.h
+++ b/src/database/database.h
@@ -19,12 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <set>
 #include <string>
+#include <string_view>
 #include <vector>
 #include "irr_v3d.h"
 #include "irrlichttypes.h"
-#include "util/basic_macros.h"
 #include "util/string.h"
 
 class Database
@@ -40,7 +39,7 @@ class MapDatabase : public Database
 public:
 	virtual ~MapDatabase() = default;
 
-	virtual bool saveBlock(const v3s16 &pos, const std::string &data) = 0;
+	virtual bool saveBlock(const v3s16 &pos, std::string_view data) = 0;
 	virtual void loadBlock(const v3s16 &pos, std::string *block) = 0;
 	virtual bool deleteBlock(const v3s16 &pos) = 0;
 
@@ -100,7 +99,7 @@ public:
 	virtual bool getModEntry(const std::string &modname,
 		const std::string &key, std::string *value) = 0;
 	virtual bool setModEntry(const std::string &modname,
-		const std::string &key, const std::string &value) = 0;
+		const std::string &key, std::string_view value) = 0;
 	virtual bool removeModEntry(const std::string &modname, const std::string &key) = 0;
 	virtual bool removeModEntries(const std::string &modname) = 0;
 	virtual void listMods(std::vector<std::string> *res) = 0;
diff --git a/src/debug.h b/src/debug.h
index 236de86f4..62466d43f 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -22,7 +22,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <iostream>
 #include <exception>
 #include <cassert>
 #include "gettime.h"
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index f091b32cd..d5efaf20f 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -21,6 +21,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "network/fm_connection_use.h"
+#include "threading/thread.h"
 #include "settings.h"
 #include "porting.h"
 #include "filesys.h"
@@ -399,9 +400,73 @@ void fm_set_default_settings(Settings *settings) {
 // End of freeminer ======
 
 
+/*
+ * inspired by https://github.com/systemd/systemd/blob/7aed43437175623e0f3ae8b071bbc500c13ce893/src/hostname/hostnamed.c#L406
+ * this could be done in future with D-Bus using query:
+ * busctl get-property org.freedesktop.hostname1 /org/freedesktop/hostname1 org.freedesktop.hostname1 Chassis
+ */
+static bool detect_touch()
+{
+#if defined(__ANDROID__)
+	return true;
+#elif defined(__linux__)
+	std::string chassis_type;
+
+	// device-tree platforms (non-X86)
+	std::ifstream dtb_file("/proc/device-tree/chassis-type");
+	if (dtb_file.is_open()) {
+		std::getline(dtb_file, chassis_type);
+		chassis_type.pop_back();
+
+		if (chassis_type == "tablet" ||
+		    chassis_type == "handset" ||
+		    chassis_type == "watch")
+			return true;
+
+		if (!chassis_type.empty())
+			return false;
+	}
+	// SMBIOS
+	std::ifstream dmi_file("/sys/class/dmi/id/chassis_type");
+	if (dmi_file.is_open()) {
+		std::getline(dmi_file, chassis_type);
+
+		if (chassis_type == "11" /* Handheld */ ||
+		    chassis_type == "30" /* Tablet */)
+			return true;
+
+		return false;
+	}
+
+	// ACPI-based platforms
+	std::ifstream acpi_file("/sys/firmware/acpi/pm_profile");
+	if (acpi_file.is_open()) {
+		std::getline(acpi_file, chassis_type);
+
+		if (chassis_type == "8" /* Tablet */)
+			return true;
+
+		return false;
+	}
+
+	return false;
+#elif defined(_WIN32)
+	// 0x01 The device has an integrated touch digitizer
+	// 0x80 The device is ready to receive digitizer input.
+	if ((GetSystemMetrics(SM_DIGITIZER) & 0x81) == 0x81)
+		return true;
+
+	return false;
+#else
+	// we don't know, return default
+	return false;
+#endif
+}
+
 void set_default_settings()
 {
 	Settings *settings = Settings::createLayer(SL_DEFAULTS);
+	bool has_touch = detect_touch();
 
 	// Client and server
 	settings->setDefault("language", "");
@@ -412,13 +477,14 @@ void set_default_settings()
 	// Client
 	settings->setDefault("address", "");
 	settings->setDefault("enable_sound", "true");
+	settings->setDefault("enable_touch", bool_to_cstr(has_touch));
 	settings->setDefault("sound_volume", "0.8");
+	settings->setDefault("sound_volume_unfocused", "0.3");
 	settings->setDefault("mute_sound", "false");
+	settings->setDefault("sound_extensions_blacklist", "");
 	settings->setDefault("enable_mesh_cache", "false");
 	settings->setDefault("mesh_generation_interval", "0");
 	settings->setDefault("mesh_generation_threads", "0");
-	settings->setDefault("meshgen_block_cache_size", "20");
-	settings->setDefault("enable_vbo", "true");
 	settings->setDefault("free_move", "false");
 	settings->setDefault("pitch_move", "false");
 	settings->setDefault("fast_move", "false");
@@ -462,12 +528,10 @@ void set_default_settings()
 	settings->setDefault("keymap_cmd_local", ".");
 	settings->setDefault("keymap_minimap", "KEY_KEY_V");
 	settings->setDefault("keymap_console", "KEY_F10");
-#if HAVE_TOUCHSCREENGUI
+
 	// See https://github.com/minetest/minetest/issues/12792
-	settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
-#else
-	settings->setDefault("keymap_rangeselect", "");
-#endif
+	settings->setDefault("keymap_rangeselect", has_touch ? "KEY_KEY_R" : "");
+
 	settings->setDefault("keymap_freemove", "KEY_KEY_K");
 	settings->setDefault("keymap_pitchmove", "");
 	settings->setDefault("keymap_fastmove", "KEY_KEY_J");
@@ -482,7 +546,7 @@ void set_default_settings()
 	settings->setDefault("keymap_toggle_hud", "KEY_F1");
 	settings->setDefault("keymap_toggle_chat", "KEY_F2");
 	settings->setDefault("keymap_toggle_fog", "KEY_F3");
-#if DEBUG
+#ifndef NDEBUG
 	settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
 #else
 	settings->setDefault("keymap_toggle_update_camera", "");
@@ -491,6 +555,7 @@ void set_default_settings()
 	settings->setDefault("keymap_toggle_profiler", "KEY_F6");
 	settings->setDefault("keymap_camera_mode", "KEY_KEY_C");
 	settings->setDefault("keymap_screenshot", "KEY_F12");
+	settings->setDefault("keymap_fullscreen", "KEY_F11");
 	settings->setDefault("keymap_increase_viewing_range_min", "+");
 	settings->setDefault("keymap_decrease_viewing_range_min", "-");
 	settings->setDefault("keymap_slot1", "KEY_KEY_1");
@@ -542,8 +607,10 @@ void set_default_settings()
 	// Visuals
 #ifdef NDEBUG
 	settings->setDefault("show_debug", "false");
+	settings->setDefault("opengl_debug", "false");
 #else
 	settings->setDefault("show_debug", "true");
+	settings->setDefault("opengl_debug", "true");
 #endif
 	settings->setDefault("fsaa", "2");
 	settings->setDefault("undersampling", "1");
@@ -564,7 +631,7 @@ void set_default_settings()
 	settings->setDefault("screen_h", "600");
 	settings->setDefault("window_maximized", "false");
 	settings->setDefault("autosave_screensize", "true");
-	settings->setDefault("fullscreen", "false");
+	settings->setDefault("fullscreen", bool_to_cstr(has_touch));
 	settings->setDefault("vsync", "false");
 	settings->setDefault("fov", "72");
 	settings->setDefault("leaves_style", "fancy");
@@ -589,7 +656,7 @@ void set_default_settings()
 	settings->setDefault("enable_3d_clouds", "true");
 	settings->setDefault("cloud_radius", "12");
 	settings->setDefault("menu_clouds", "true");
-	settings->setDefault("opaque_water", "false");
+	settings->setDefault("translucent_liquids", "true");
 	settings->setDefault("console_height", "0.6");
 	settings->setDefault("console_color", "(0,0,0)");
 	settings->setDefault("console_alpha", "200");
@@ -621,6 +688,7 @@ void set_default_settings()
 	settings->setDefault("minimap_double_scan_height", "true");
 
 	// Effects
+	settings->setDefault("enable_post_processing", "true");
 	settings->setDefault("directional_colored_fog", "true");
 	settings->setDefault("inventory_items_animations", "false");
 	settings->setDefault("mip_map", "false");
@@ -636,12 +704,14 @@ void set_default_settings()
 	settings->setDefault("enable_waving_plants", "false");
 	settings->setDefault("exposure_compensation", "0.0");
 	settings->setDefault("enable_auto_exposure", "false");
+	settings->setDefault("debanding", "true");
 	settings->setDefault("antialiasing", "none");
 	settings->setDefault("enable_bloom", "false");
 	settings->setDefault("enable_bloom_debug", "false");
 	settings->setDefault("bloom_strength_factor", "1.0");
 	settings->setDefault("bloom_intensity", "0.05");
 	settings->setDefault("bloom_radius", "1");
+	settings->setDefault("enable_volumetric_lighting", "false");
 
 	// Effects Shadows
 	settings->setDefault("enable_dynamic_shadows", "false");
@@ -662,16 +732,13 @@ void set_default_settings()
 	settings->setDefault("invert_hotbar_mouse_wheel", "false");
 	settings->setDefault("mouse_sensitivity", "0.2");
 	settings->setDefault("repeat_place_time", "0.25");
+	settings->setDefault("repeat_dig_time", "0.0");
 	settings->setDefault("safe_dig_and_place", "false");
 	settings->setDefault("random_input", "false");
 	settings->setDefault("aux1_descends", "false");
 	settings->setDefault("doubletap_jump", "false");
 	settings->setDefault("always_fly_fast", "true");
-#ifdef HAVE_TOUCHSCREENGUI
-	settings->setDefault("autojump", "true");
-#else
-	settings->setDefault("autojump", "false");
-#endif
+	settings->setDefault("autojump", bool_to_cstr(has_touch));
 	settings->setDefault("continuous_forward", "false");
 	settings->setDefault("enable_joysticks", "false");
 	settings->setDefault("joystick_id", "0");
@@ -708,6 +775,7 @@ void set_default_settings()
 
 	// ContentDB
 	settings->setDefault("contentdb_url", "https://content.minetest.net");
+	settings->setDefault("contentdb_enable_updates_indicator", "true");
 	settings->setDefault("contentdb_max_concurrent_downloads", "3");
 
 #ifdef __ANDROID__
@@ -716,16 +784,20 @@ void set_default_settings()
 	settings->setDefault("contentdb_flag_blacklist", "nonfree, desktop_default");
 #endif
 
-	settings->setDefault("update_information_url", "https://freeminer.org/release_info.json");
 #if ENABLE_UPDATE_CHECKER
-	settings->setDefault("update_last_checked", "");
+	settings->setDefault("update_information_url", "https://freeminer.org/release_info.json");
 #else
-	settings->setDefault("update_last_checked", "disabled");
+	settings->setDefault("update_information_url", "");
 #endif
 
 	// Server
 	settings->setDefault("disable_escape_sequences", "false");
 	settings->setDefault("strip_color_codes", "false");
+#ifndef NDEBUG
+	settings->setDefault("random_mod_load_order", "true");
+#else
+	settings->setDefault("random_mod_load_order", "false");
+#endif
 #if USE_PROMETHEUS
 	settings->setDefault("prometheus_listener_address", "127.0.0.1:30000");
 #endif
@@ -736,6 +808,7 @@ void set_default_settings()
 	settings->setDefault("max_packets_per_iteration", "1024");
 	settings->setDefault("port", "30000");
 	settings->setDefault("strict_protocol_version_checking", "false");
+	settings->setDefault("protocol_version_min", "1");
 	settings->setDefault("player_transfer_distance", "0");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "40");
 	settings->setDefault("time_send_interval", "5");
@@ -765,6 +838,7 @@ void set_default_settings()
 	// This causes frametime jitter on client side, or does it?
 	settings->setDefault("max_block_send_distance", "12");
 	settings->setDefault("block_send_optimize_distance", "4");
+	settings->setDefault("block_cull_optimize_distance", "25");
 	settings->setDefault("server_side_occlusion_culling", "true");
 	settings->setDefault("csm_restriction_flags", "62");
 	settings->setDefault("csm_restriction_noderange", "0");
@@ -836,29 +910,26 @@ void set_default_settings()
 	settings->setDefault("server_description", "");
 
 	settings->setDefault("enable_console", "false");
-	settings->setDefault("screen_dpi", "72");
 	settings->setDefault("display_density_factor", "1");
+	settings->setDefault("dpi_change_notifier", "0");
 
-	// Altered settings for macOS
-#if defined(__MACH__) && defined(__APPLE__)
+	// Altered settings for CIrrDeviceOSX
+#if !USE_SDL2 && defined(__MACH__) && defined(__APPLE__)
 	settings->setDefault("keymap_sneak", "KEY_SHIFT");
 #endif
 
-#ifdef HAVE_TOUCHSCREENGUI
-	settings->setDefault("touchscreen_threshold", "20");
 	settings->setDefault("touchscreen_sensitivity", "0.2");
+	settings->setDefault("touchscreen_threshold", "20");
+	settings->setDefault("touch_long_tap_delay", "400");
 	settings->setDefault("touch_use_crosshair", "false");
 	settings->setDefault("fixed_virtual_joystick", "false");
 	settings->setDefault("virtual_joystick_triggers_aux1", "false");
-	settings->setDefault("clickable_chat_weblinks", "false");
-#else
+	settings->setDefault("touch_punch_gesture", "short_tap");
 	settings->setDefault("clickable_chat_weblinks", "true");
-#endif
 	// Altered settings for Android
 #ifdef __ANDROID__
 	settings->setDefault("screen_w", "0");
 	settings->setDefault("screen_h", "0");
-	settings->setDefault("fullscreen", "true");
 	settings->setDefault("performance_tradeoffs", "true");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "10");
 	settings->setDefault("emergequeue_limit_diskonly", "16");
@@ -870,6 +941,8 @@ void set_default_settings()
 	settings->setDefault("active_block_range", "2");
 	settings->setDefault("viewing_range", "50");
 	settings->setDefault("leaves_style", "simple");
+	settings->setDefault("enable_post_processing", "false");
+	settings->setDefault("debanding", "false");
 	settings->setDefault("curl_verify_cert", "false");
 
 	// Apply settings according to screen size
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 1f3f02343..18645efe0 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -21,22 +21,19 @@ You should have received a copy of the GNU General Public License
 along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "emerge.h"
+#include "emerge_internal.h"
 
 #include <iostream>
-#include <queue>
 
 #include "irr_v2d.h"
 #include "util/container.h"
-#include "util/thread.h"
-#include "threading/event.h"
-
 #include "config.h"
 #include "constants.h"
 #include "environment.h"
 #include "irrlicht_changes/printing.h"
+#include "filesys.h"
 #include "log.h"
-#include "map.h"
+#include "servermap.h"
 #include "mapblock.h"
 #include "mapgen/mg_biome.h"
 #include "mapgen/mg_ore.h"
@@ -45,78 +42,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "nodedef.h"
 #include "profiler.h"
 #include "scripting_server.h"
+#include "scripting_emerge.h"
 #include "server.h"
 #include "settings.h"
 #include "voxel.h"
 
-#include "threading/thread_vector.h"
-
-class EmergeThread : public thread_vector {
-public:
-	bool enable_mapgen_debug_info;
-	int id;
-
-	EmergeThread(Server *server, int ethreadid);
-	~EmergeThread() = default;
-
-	void *run();
-	void signal();
-
-	// Requires queue mutex held
-	bool pushBlock(const v3s16 &pos);
-
-	void cancelPendingItems();
-
-protected:
-
-	void runCompletionCallbacks(
-		const v3s16 &pos, EmergeAction action,
-		const EmergeCallbackList &callbacks);
-
-private:
-	Server *m_server;
-	ServerMap *m_map;
-	EmergeManager *m_emerge;
-	Mapgen *m_mapgen;
-
-	Event m_queue_event;
-	std::queue<v3s16> m_block_queue;
-
-	bool popBlockEmerge(v3s16 *pos, BlockEmergeData *bedata);
-
-	EmergeAction getBlockOrStartGen(
-		const v3s16 &pos, bool allow_gen, MapBlock **block, BlockMakeData *data);
-	MapBlock *finishGen(v3s16 pos, BlockMakeData *bmdata,
-		std::map<v3s16, MapBlock *> *modified_blocks);
-
-	friend class EmergeManager;
-};
-
-class MapEditEventAreaIgnorer
-{
-public:
-	MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a):
-		m_ignorevariable(ignorevariable)
-	{
-		if(m_ignorevariable->getVolume() == 0)
-			*m_ignorevariable = a;
-		else
-			m_ignorevariable = NULL;
-	}
-
-	~MapEditEventAreaIgnorer()
-	{
-		if(m_ignorevariable)
-		{
-			assert(m_ignorevariable->getVolume() != 0);
-			*m_ignorevariable = VoxelArea();
-		}
-	}
-
-private:
-	VoxelArea *m_ignorevariable;
-};
-
 EmergeParams::~EmergeParams()
 {
 	infostream << "EmergeParams: destroying " << this << std::endl;
@@ -136,6 +66,7 @@ EmergeParams::EmergeParams(EmergeManager *parent, const BiomeGen *biomegen,
 	enable_mapgen_debug_info(parent->enable_mapgen_debug_info),
 	gen_notify_on(parent->gen_notify_on),
 	gen_notify_on_deco_ids(&parent->gen_notify_on_deco_ids),
+	gen_notify_on_custom(&parent->gen_notify_on_custom),
 	biomemgr(biomemgr->clone()), oremgr(oremgr->clone()),
 	decomgr(decomgr->clone()), schemmgr(schemmgr->clone())
 {
@@ -545,9 +476,10 @@ EmergeThread::EmergeThread(Server *server, int ethreadid) :
 	enable_mapgen_debug_info(false),
 	id(ethreadid),
 	m_server(server),
-	m_map(NULL),
-	m_emerge(NULL),
-	m_mapgen(NULL)
+	m_map(nullptr),
+	m_emerge(nullptr),
+	m_mapgen(nullptr),
+	m_trans_liquid(nullptr)
 {
 	m_name = "Emerge-" + itos(ethreadid);
 }
@@ -691,16 +623,15 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
 				 v3s16(1,1,1) * (MAP_BLOCKSIZE - 1);
 
 	// Ignore map edit events, they will not need to be sent
-	// to anybody because the block hasn't been sent to anybody
-
 /* thread unsafe
+	// to anyone because the block hasn't been sent yet.
 	MapEditEventAreaIgnorer ign(
 		&m_server->m_ignore_map_edit_events_area,
 		VoxelArea(minp, maxp));
 */
 
 	/*
-		Run Lua on_generated callbacks
+		Run Lua on_generated callbacks in the server environment
 	*/
 	try {
 		MAP_NOTHREAD_LOCK(m_map);
@@ -728,6 +659,36 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
 }
 
 
+bool EmergeThread::initScripting()
+{
+	m_script = std::make_unique<EmergeScripting>(this);
+
+	try {
+		m_script->loadMod(Server::getBuiltinLuaPath() + DIR_DELIM + "init.lua",
+			BUILTIN_MOD_NAME);
+		m_script->checkSetByBuiltin();
+	} catch (const ModError &e) {
+		errorstream << "Execution of mapgen base environment failed." << std::endl;
+		m_server->setAsyncFatalError(e.what());
+		return false;
+	}
+
+	const auto &list = m_server->m_mapgen_init_files;
+	try {
+		for (auto &it : list)
+			m_script->loadMod(it.second, it.first);
+
+		m_script->on_mods_loaded();
+	} catch (const ModError &e) {
+		errorstream << "Failed to load mod script inside mapgen environment." << std::endl;
+		m_server->setAsyncFatalError(e.what());
+		return false;
+	}
+
+	return true;
+}
+
+
 void *EmergeThread::run()
 {
 	BEGIN_DEBUG_EXCEPTION_HANDLER
@@ -736,10 +697,15 @@ void *EmergeThread::run()
 	std::map<v3s16, MapBlock *> modified_blocks;
 
 	m_map    = &m_server->m_env->getServerMap();
-	m_emerge = m_server->m_emerge;
+	m_emerge = m_server->getEmergeManager();
 	m_mapgen = m_emerge->m_mapgens[id];
 	enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
 
+	if (!initScripting()) {
+		m_script.reset();
+		stop(); // do not enter main loop
+	}
+
 	reg("EmergeThread" + itos(id), 5);
 
 	while (!stopRequested()) {
@@ -751,6 +717,8 @@ void *EmergeThread::run()
 		EmergeAction action;
 		MapBlock *block = nullptr;
 
+		porting::TriggerMemoryTrim();
+
 		if (!popBlockEmerge(&pos, &bedata)) {
 			m_queue_event.wait();
 			continue;
@@ -764,6 +732,9 @@ void *EmergeThread::run()
 
 		action = getBlockOrStartGen(pos, allow_gen, &block, &bmdata);
 		if (action == EMERGE_GENERATED) {
+			bool error = false;
+			m_trans_liquid = &bmdata.transforming_liquid;
+
 			{
 				ScopeProfiler sp(g_profiler,
 					"EmergeThread: Mapgen::makeChunk", SPT_AVG);
@@ -771,9 +742,24 @@ void *EmergeThread::run()
 				m_mapgen->makeChunk(&bmdata);
 			}
 
-			block = finishGen(pos, &bmdata, &modified_blocks);
-			if (!block)
+			{
+				ScopeProfiler sp(g_profiler,
+					"EmergeThread: Lua on_generated", SPT_AVG);
+
+				try {
+					m_script->on_generated(&bmdata, m_mapgen->blockseed);
+				} catch (const LuaError &e) {
+					m_server->setAsyncFatalError(e);
+					error = true;
+				}
+			}
+
+			if (!error)
+				block = finishGen(pos, &bmdata, &modified_blocks);
+			if (!block || error)
 				action = EMERGE_ERRORED;
+
+			m_trans_liquid = nullptr;
 		}
 
 		runCompletionCallbacks(pos, action, bedata.callbacks);
@@ -820,6 +806,13 @@ void *EmergeThread::run()
 	}
 	}
 
+	try {
+		if (m_script)
+			m_script->on_shutdown();
+	} catch (const ModError &e) {
+		m_server->setAsyncFatalError(e.what());
+	}
+
 	cancelPendingItems();
 
 	END_DEBUG_EXCEPTION_HANDLER
diff --git a/src/emerge.h b/src/emerge.h
index 39b1e74e1..635d5f8c2 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -42,8 +42,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 class EmergeThread;
 class NodeDefManager;
 class Settings;
-//class ServerEnvironment;
-
+class MapSettingsManager;
 class BiomeManager;
 class OreManager;
 class DecorationManager;
@@ -54,6 +53,7 @@ class ModApiMapgen;
 // Structure containing inputs/outputs for chunk generation
 struct BlockMakeData {
 	MMVManip *vmanip = nullptr;
+	// Global map seed
 	u64 seed = 0;
 	v3s16 blockpos_min;
 	v3s16 blockpos_max;
@@ -74,7 +74,7 @@ enum EmergeAction {
 	EMERGE_GENERATED,
 };
 
-const static std::string emergeActionStrs[] = {
+constexpr const char *emergeActionStrs[] = {
 	"cancelled",
 	"errored",
 	"from_memory",
@@ -113,6 +113,7 @@ public:
 
 	u32 gen_notify_on;
 	const std::set<u32> *gen_notify_on_deco_ids; // shared
+	const std::set<std::string> *gen_notify_on_custom; // shared
 
 	BiomeGen *biomegen;
 	BiomeManager *biomemgr;
@@ -120,6 +121,11 @@ public:
 	DecorationManager *decomgr;
 	SchematicManager *schemmgr;
 
+	inline GenerateNotifier createNotifier() const {
+		return GenerateNotifier(gen_notify_on, gen_notify_on_deco_ids,
+			gen_notify_on_custom);
+	}
+
 private:
 	EmergeParams(EmergeManager *parent, const BiomeGen *biomegen,
 		const BiomeManager *biomemgr,
@@ -142,6 +148,7 @@ public:
 	// Generation Notify
 	u32 gen_notify_on = 0;
 	std::set<u32> gen_notify_on_deco_ids;
+	std::set<std::string> gen_notify_on_custom;
 
 	// Parameters passed to mapgens owned by ServerMap
 	// TODO(hmmmm): Remove this after mapgen helper methods using them
diff --git a/src/emerge_internal.h b/src/emerge_internal.h
new file mode 100644
index 000000000..b240ffcee
--- /dev/null
+++ b/src/emerge_internal.h
@@ -0,0 +1,118 @@
+/*
+Minetest
+Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+/******************************************************************/
+/* may only be included by emerge.cpp or emerge scripting related */
+/******************************************************************/
+
+
+#include "emerge.h"
+
+#include "threading/thread_vector.h"
+
+#include <queue>
+
+#include "util/thread.h"
+#include "threading/event.h"
+
+class Server;
+class ServerMap;
+class Mapgen;
+
+class EmergeManager;
+class EmergeScripting;
+
+class EmergeThread : public thread_vector {
+public:
+	bool enable_mapgen_debug_info;
+	int id;
+
+	EmergeThread(Server *server, int ethreadid);
+	~EmergeThread() = default;
+
+	void *run();
+	void signal();
+
+	// Requires queue mutex held
+	bool pushBlock(const v3s16 &pos);
+
+	void cancelPendingItems();
+
+	EmergeManager *getEmergeManager() { return m_emerge; }
+	Mapgen *getMapgen() { return m_mapgen; }
+
+protected:
+
+	void runCompletionCallbacks(
+		const v3s16 &pos, EmergeAction action,
+		const EmergeCallbackList &callbacks);
+
+private:
+	Server *m_server;
+	ServerMap *m_map;
+	EmergeManager *m_emerge;
+	Mapgen *m_mapgen;
+
+	std::unique_ptr<EmergeScripting> m_script;
+	// read from scripting:
+	UniqueQueue<v3s16> *m_trans_liquid; //< non-null only when generating a mapblock
+
+	Event m_queue_event;
+	std::queue<v3s16> m_block_queue;
+
+	bool initScripting();
+
+	bool popBlockEmerge(v3s16 *pos, BlockEmergeData *bedata);
+
+	EmergeAction getBlockOrStartGen(
+		const v3s16 &pos, bool allow_gen, MapBlock **block, BlockMakeData *data);
+	MapBlock *finishGen(v3s16 pos, BlockMakeData *bmdata,
+		std::map<v3s16, MapBlock *> *modified_blocks);
+
+	friend class EmergeManager;
+	friend class EmergeScripting;
+	friend class ModApiMapgen;
+};
+
+// Scoped helper to set Server::m_ignore_map_edit_events_area
+class MapEditEventAreaIgnorer
+{
+public:
+	MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a):
+		m_ignorevariable(ignorevariable)
+	{
+		if (m_ignorevariable->getVolume() == 0)
+			*m_ignorevariable = a;
+		else
+			m_ignorevariable = nullptr;
+	}
+
+	~MapEditEventAreaIgnorer()
+	{
+		if (m_ignorevariable) {
+			assert(m_ignorevariable->getVolume() != 0);
+			*m_ignorevariable = VoxelArea();
+		}
+	}
+
+private:
+	VoxelArea *m_ignorevariable;
+};
diff --git a/src/environment.cpp b/src/environment.cpp
index 39a0a753a..660e1a30b 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -120,27 +120,35 @@ bool Environment::line_of_sight(v3f pos1, v3f pos2, v3s16 *p)
 }
 
 /*
-	Check if a node is pointable
+	Check how a node can be pointed at
 */
-inline static bool isPointableNode(const MapNode &n,
-	const NodeDefManager *nodedef , bool liquids_pointable)
+inline static PointabilityType isPointableNode(const MapNode &n,
+	const NodeDefManager *nodedef, bool liquids_pointable,
+	const std::optional<Pointabilities> &pointabilities)
 {
 	const ContentFeatures &features = nodedef->get(n);
-	return features.pointable ||
-	       (liquids_pointable && features.isLiquid());
+	if (pointabilities) {
+		std::optional<PointabilityType> match =
+				pointabilities->matchNode(features.name, features.groups);
+		if (match)
+			return match.value();
+	}
+
+	if (features.isLiquid() && liquids_pointable)
+		return PointabilityType::POINTABLE;
+	return features.pointable;
 }
 
-void Environment::continueRaycast(RaycastState *state, PointedThing *result)
+void Environment::continueRaycast(RaycastState *state, PointedThing *result_p)
 {
 	const NodeDefManager *nodedef = getMap().getNodeDefManager();
 	if (state->m_initialization_needed) {
 		// Add objects
 		if (state->m_objects_pointable) {
 			std::vector<PointedThing> found;
-			getSelectedActiveObjects(state->m_shootline, found);
-			for (const PointedThing &pointed : found) {
-				state->m_found.push(pointed);
-			}
+			getSelectedActiveObjects(state->m_shootline, found, state->m_pointabilities);
+			for (auto &pointed : found)
+				state->m_found.push(std::move(pointed));
 		}
 		// Set search range
 		core::aabbox3d<s16> maximal_exceed = nodedef->getSelectionBoxIntUnion();
@@ -159,14 +167,10 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 	}
 
 	Map &map = getMap();
-	// If a node is found, this is the center of the
-	// first nodebox the shootline meets.
-	v3f found_boxcenter(0, 0, 0);
-	// The untested nodes are in this range.
-	core::aabbox3d<s16> new_nodes;
+	std::vector<aabb3f> boxes;
 	while (state->m_iterator.m_current_index <= lastIndex) {
 		// Test the nodes around the current node in search_range.
-		new_nodes = state->m_search_range;
+		core::aabbox3d<s16> new_nodes = state->m_search_range;
 		new_nodes.MinEdge += state->m_iterator.m_current_node_pos;
 		new_nodes.MaxEdge += state->m_iterator.m_current_node_pos;
 
@@ -194,22 +198,27 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 		}
 
 		// For each untested node
-		for (s16 x = new_nodes.MinEdge.X; x <= new_nodes.MaxEdge.X; x++)
+		for (s16 z = new_nodes.MinEdge.Z; z <= new_nodes.MaxEdge.Z; z++)
 		for (s16 y = new_nodes.MinEdge.Y; y <= new_nodes.MaxEdge.Y; y++)
-		for (s16 z = new_nodes.MinEdge.Z; z <= new_nodes.MaxEdge.Z; z++) {
+		for (s16 x = new_nodes.MinEdge.X; x <= new_nodes.MaxEdge.X; x++) {
 			MapNode n;
 			v3s16 np(x, y, z);
 			bool is_valid_position;
 
 			n = map.getNode(np, &is_valid_position);
-			if (!(is_valid_position && isPointableNode(n, nodedef,
-					state->m_liquids_pointable))) {
+			if (!is_valid_position)
+				continue;
+
+			PointabilityType pointable = isPointableNode(n, nodedef,
+					state->m_liquids_pointable,
+					state->m_pointabilities);
+			// If it can be pointed through skip
+			if (pointable == PointabilityType::POINTABLE_NOT)
 				continue;
-			}
 
 			PointedThing result;
 
-			std::vector<aabb3f> boxes;
+			boxes.clear();
 			n.getSelectionBoxes(nodedef, &boxes,
 				n.getNeighbors(np, &map));
 
@@ -219,6 +228,9 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 			float min_distance_sq = 10000000;
 			// ID of the current box (loop counter)
 			u16 id = 0;
+			// If a node is found, this is the center of the
+			// first nodebox the shootline meets.
+			v3f found_boxcenter(0, 0, 0);
 
 			// Do calculations relative to the node center
 			// to translate the ray rather than the boxes
@@ -252,11 +264,12 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 			if (!is_colliding) {
 				continue;
 			}
+			result.pointability = pointable;
 			result.type = POINTEDTHING_NODE;
 			result.node_undersurface = np;
 			result.distanceSq = min_distance_sq;
 			// Set undersurface and abovesurface nodes
-			f32 d = 0.002 * BS;
+			const f32 d = 0.002 * BS;
 			v3f fake_intersection = result.intersection_point;
 			found_boxcenter += npf; // translate back to world coords
 			// Move intersection towards its source block.
@@ -279,8 +292,9 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 				fake_intersection, BS);
 			result.node_abovesurface = result.node_real_undersurface
 				+ floatToInt(result.intersection_normal, 1.0f);
+
 			// Push found PointedThing
-			state->m_found.push(result);
+			state->m_found.push(std::move(result));
 			// If this is nearer than the old nearest object,
 			// the search can be shorter
 			s16 newIndex = state->m_iterator.getIndex(
@@ -293,12 +307,15 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 		state->m_previous_node = state->m_iterator.m_current_node_pos;
 		state->m_iterator.next();
 	}
-	// Return empty PointedThing if nothing left on the ray
+
+	// Return empty PointedThing if nothing left on the ray or it is blocking pointable
 	if (state->m_found.empty()) {
-		result->type = POINTEDTHING_NOTHING;
+		result_p->type = POINTEDTHING_NOTHING;
 	} else {
-		*result = state->m_found.top();
+		*result_p = state->m_found.top();
 		state->m_found.pop();
+		if (result_p->pointability == PointabilityType::POINTABLE_BLOCKING)
+			result_p->type = POINTEDTHING_NOTHING;
 	}
 }
 
diff --git a/src/environment.h b/src/environment.h
index 61ac66363..4ba0e1ee5 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -49,6 +49,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <map>
 #include <atomic>
 #include <mutex>
+#include <optional>
 #include "irr_v3d.h"
 #include "util/basic_macros.h"
 #include "line3d.h"
@@ -57,6 +58,7 @@ class IGameDef;
 class Map;
 struct PointedThing;
 class RaycastState;
+struct Pointabilities;
 
 struct ItemStack;
 class PlayerSAO;
@@ -121,7 +123,8 @@ public:
 	 * @param[out] objects          found objects
 	 */
 	virtual void getSelectedActiveObjects(const core::line3d<f32> &shootline_on_map,
-			std::vector<PointedThing> &objects) = 0;
+			std::vector<PointedThing> &objects,
+			const std::optional<Pointabilities> &pointabilities) = 0;
 
 	/*!
 	 * Returns the next node or object the shootline meets.
diff --git a/src/exceptions.h b/src/exceptions.h
index e8f1258d6..02f3215c9 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -29,10 +29,10 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 class BaseException : public std::exception
 {
 public:
-	BaseException(const std::string &s) throw(): m_s(s) {}
+	BaseException(const std::string &s) noexcept: m_s(s) {}
 	~BaseException() throw() = default;
 
-	virtual const char * what() const throw()
+	virtual const char * what() const noexcept
 	{
 		return m_s.c_str();
 	}
@@ -102,6 +102,11 @@ public:
 	PrngException(const std::string &s): BaseException(s) {}
 };
 
+class ShaderException : public BaseException {
+public:
+	ShaderException(const std::string &s): BaseException(s) {}
+};
+
 class ModError : public BaseException {
 public:
 	ModError(const std::string &s): BaseException(s) {}
diff --git a/src/filesys.cpp b/src/filesys.cpp
index fa5f1e9bf..c915dda35 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -41,11 +41,28 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #if defined(__FreeBSD__)
 #include <sys/time.h>
 #endif
+#include <atomic>
 #include "log.h"
 #include "config.h"
 #include "porting.h"
 #ifndef SERVER
 #include "irr_ptr.h"
+#include <IFileArchive.h>
+#include <IFileSystem.h>
+#endif
+#ifdef __linux__
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#ifndef FICLONE
+#define FICLONE _IOW(0x94, 9, int)
+#endif
+#endif
+
+// Error from last OS call as string
+#ifdef _WIN32
+#define LAST_OS_ERROR() porting::ConvertError(GetLastError())
+#else
+#define LAST_OS_ERROR() strerror(errno)
 #endif
 
 namespace fs
@@ -230,6 +247,41 @@ std::string CreateTempFile()
 	return path;
 }
 
+std::string CreateTempDir()
+{
+	std::string path = TempPath() + DIR_DELIM "MT_XXXXXX";
+	_mktemp_s(&path[0], path.size() + 1); // modifies path
+	// will error if it already exists
+	if (!CreateDirectory(path.c_str(), nullptr))
+		return "";
+	return path;
+}
+
+bool CopyFileContents(const std::string &source, const std::string &target)
+{
+	BOOL ok = CopyFileEx(source.c_str(), target.c_str(), nullptr, nullptr,
+		nullptr, COPY_FILE_ALLOW_DECRYPTED_DESTINATION);
+	if (!ok) {
+		errorstream << "copying " << source << " to " << target
+			<< " failed: " << GetLastError() << std::endl;
+		return false;
+	}
+
+	// docs: "File attributes for the existing file are copied to the new file."
+	// This is not our intention so get rid of unwanted attributes:
+	DWORD attr = GetFileAttributes(target.c_str());
+	if (attr == INVALID_FILE_ATTRIBUTES) {
+		errorstream << target << ": file disappeared after copy" << std::endl;
+		return false;
+	}
+	attr &= ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN);
+	SetFileAttributes(target.c_str(), attr);
+
+	tracestream << "copied " << source << " to " << target
+		<< " using CopyFileEx" << std::endl;
+	return true;
+}
+
 #else
 
 /*********
@@ -429,6 +481,110 @@ std::string CreateTempFile()
 	return path;
 }
 
+std::string CreateTempDir()
+{
+	std::string path = TempPath() + DIR_DELIM "MT_XXXXXX";
+	auto r = mkdtemp(&path[0]); // modifies path
+	if (!r)
+		return "";
+	return path;
+}
+
+namespace {
+	struct FileDeleter {
+		void operator()(FILE *stream) {
+			fclose(stream);
+		}
+	};
+
+	typedef std::unique_ptr<FILE, FileDeleter> FileUniquePtr;
+}
+
+bool CopyFileContents(const std::string &source, const std::string &target)
+{
+	FileUniquePtr sourcefile, targetfile;
+
+#ifdef __linux__
+	// Try to clone using Copy-on-Write (CoW). This is instant but supported
+	// only by some filesystems.
+
+	int srcfd, tgtfd;
+	srcfd = open(source.c_str(), O_RDONLY);
+	if (srcfd == -1) {
+		errorstream << source << ": can't open for reading: "
+			<< strerror(errno) << std::endl;
+		return false;
+	}
+	tgtfd = open(target.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	if (tgtfd == -1) {
+		errorstream << target << ": can't open for writing: "
+			<< strerror(errno) << std::endl;
+		close(srcfd);
+		return false;
+	}
+
+	if (ioctl(tgtfd, FICLONE, srcfd) == 0) {
+		tracestream << "copied " << source << " to " << target
+			<< " using FICLONE" << std::endl;
+		close(srcfd);
+		close(tgtfd);
+		return true;
+	}
+
+	// fallback to normal copy, but no need to reopen the files
+	sourcefile.reset(fdopen(srcfd, "rb"));
+	targetfile.reset(fdopen(tgtfd, "wb"));
+	goto fallback;
+
+#endif
+
+	sourcefile.reset(fopen(source.c_str(), "rb"));
+	targetfile.reset(fopen(target.c_str(), "wb"));
+
+fallback:
+
+	if (!sourcefile) {
+		errorstream << source << ": can't open for reading: "
+			<< strerror(errno) << std::endl;
+		return false;
+	}
+	if (!targetfile) {
+		errorstream << target << ": can't open for writing: "
+			<< strerror(errno) << std::endl;
+		return false;
+	}
+
+	size_t total = 0;
+	bool done = false;
+	char readbuffer[BUFSIZ];
+	while (!done) {
+		size_t readbytes = fread(readbuffer, 1,
+				sizeof(readbuffer), sourcefile.get());
+		total += readbytes;
+		if (ferror(sourcefile.get())) {
+			errorstream << source << ": IO error: "
+				<< strerror(errno) << std::endl;
+			return false;
+		}
+		if (readbytes > 0)
+			fwrite(readbuffer, 1, readbytes, targetfile.get());
+		if (feof(sourcefile.get())) {
+			// flush destination file to catch write errors (e.g. disk full)
+			fflush(targetfile.get());
+			done = true;
+		}
+		if (ferror(targetfile.get())) {
+			errorstream << target << ": IO error: "
+					<< strerror(errno) << std::endl;
+			return false;
+		}
+	}
+	tracestream << "copied " << total << " bytes from "
+		<< source << " to " << target << std::endl;
+
+	return true;
+}
+
 #endif
 
 /****************************
@@ -503,60 +659,6 @@ bool CreateAllDirs(const std::string &path)
 	return true;
 }
 
-bool CopyFileContents(const std::string &source, const std::string &target)
-{
-	FILE *sourcefile = fopen(source.c_str(), "rb");
-	if(sourcefile == NULL){
-		errorstream<<source<<": can't open for reading: "
-			<<strerror(errno)<<std::endl;
-		return false;
-	}
-
-	FILE *targetfile = fopen(target.c_str(), "wb");
-	if(targetfile == NULL){
-		errorstream<<target<<": can't open for writing: "
-			<<strerror(errno)<<std::endl;
-		fclose(sourcefile);
-		return false;
-	}
-
-	size_t total = 0;
-	bool retval = true;
-	bool done = false;
-	char readbuffer[BUFSIZ];
-	while(!done){
-		size_t readbytes = fread(readbuffer, 1,
-				sizeof(readbuffer), sourcefile);
-		total += readbytes;
-		if(ferror(sourcefile)){
-			errorstream<<source<<": IO error: "
-				<<strerror(errno)<<std::endl;
-			retval = false;
-			done = true;
-		}
-		if(readbytes > 0){
-			fwrite(readbuffer, 1, readbytes, targetfile);
-		}
-		if(feof(sourcefile) || ferror(sourcefile)){
-			// flush destination file to catch write errors
-			// (e.g. disk full)
-			fflush(targetfile);
-			done = true;
-		}
-		if(ferror(targetfile)){
-			errorstream<<target<<": IO error: "
-					<<strerror(errno)<<std::endl;
-			retval = false;
-			done = true;
-		}
-	}
-	infostream<<"copied "<<total<<" bytes from "
-		<<source<<" to "<<target<<std::endl;
-	fclose(sourcefile);
-	fclose(targetfile);
-	return retval;
-}
-
 bool CopyDir(const std::string &source, const std::string &target)
 {
 	if(PathExists(source)){
@@ -643,8 +745,8 @@ bool PathStartsWith(const std::string &path, const std::string &prefix)
 				char pathchar = path[pathpos+len];
 				char prefixchar = prefix[prefixpos+len];
 				if(FILESYS_CASE_INSENSITIVE){
-					pathchar = tolower(pathchar);
-					prefixchar = tolower(prefixchar);
+					pathchar = my_tolower(pathchar);
+					prefixchar = my_tolower(prefixchar);
 				}
 				if(pathchar != prefixchar)
 					return false;
@@ -770,49 +872,74 @@ const char *GetFilenameFromPath(const char *path)
 	return filename ? filename + 1 : path;
 }
 
-bool safeWriteToFile(const std::string &path, const std::string &content)
+// Note: this is not safe if two MT processes try this at the same time (FIXME?)
+bool safeWriteToFile(const std::string &path, std::string_view content)
 {
-	std::string tmp_file = path + ".~mt";
+	// Prevent two threads from writing to the same temporary file
+	static std::atomic<u16> g_file_counter;
+	const std::string tmp_file = path + ".~mt" + itos(g_file_counter.fetch_add(1));
 
-	// Write to a tmp file
-	std::ofstream os(tmp_file.c_str(), std::ios::binary);
+	// Write data to a temporary file
+	std::string write_error;
+
+#ifdef _WIN32
+	// We've observed behavior suggesting that the MSVC implementation of std::ofstream::flush doesn't
+	// actually flush, so we use win32 APIs.
+	HANDLE handle = CreateFile(tmp_file.c_str(), GENERIC_WRITE, 0, nullptr,
+		CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+	if (handle == INVALID_HANDLE_VALUE) {
+		errorstream << "Failed to open file: " << LAST_OS_ERROR() << std::endl;
+		return false;
+	}
+	DWORD bytes_written;
+	if (!WriteFile(handle, content.data(), content.size(), &bytes_written, nullptr))
+		write_error = LAST_OS_ERROR();
+	else if (!FlushFileBuffers(handle))
+		write_error = LAST_OS_ERROR();
+	CloseHandle(handle);
+#else
+	auto os = open_ofstream(tmp_file.c_str(), true);
 	if (!os.good())
 		return false;
-	os << content;
-	os.flush();
+	os << content << std::flush;
 	os.close();
-	if (os.fail()) {
-		// Remove the temporary file because writing it failed and it's useless.
+	if (os.fail())
+		write_error = "iostream fail";
+#endif
+
+	if (!write_error.empty()) {
+		errorstream << "Failed to write file: " << write_error << std::endl;
 		remove(tmp_file.c_str());
 		return false;
 	}
 
-	bool rename_success = false;
+	std::string rename_error;
 
 	// Move the finished temporary file over the real file
 #ifdef _WIN32
 	// When creating the file, it can cause Windows Search indexer, virus scanners and other apps
 	// to query the file. This can make the move file call below fail.
 	// We retry up to 5 times, with a 1ms sleep between, before we consider the whole operation failed
-	int number_attempts = 0;
-	while (number_attempts < 5) {
-		rename_success = MoveFileEx(tmp_file.c_str(), path.c_str(),
+	for (int attempt = 0; attempt < 5; attempt++) {
+		auto ok = MoveFileEx(tmp_file.c_str(), path.c_str(),
 				MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH);
-		if (rename_success)
+		if (ok) {
+			rename_error.clear();
 			break;
+		}
+		rename_error = LAST_OS_ERROR();
 		sleep_ms(1);
-		++number_attempts;
 	}
 #else
 	// On POSIX compliant systems rename() is specified to be able to swap the
 	// file in place of the destination file, making this a truly error-proof
 	// transaction.
-	rename_success = rename(tmp_file.c_str(), path.c_str()) == 0;
+	if (rename(tmp_file.c_str(), path.c_str()) != 0)
+		rename_error = LAST_OS_ERROR();
 #endif
-	if (!rename_success) {
-		warningstream << "Failed to write to file: " << path.c_str() << std::endl;
-		// Remove the temporary file because moving it over the target file
-		// failed.
+
+	if (!rename_error.empty()) {
+		errorstream << "Failed to overwrite \"" << path << "\": " << rename_error << std::endl;
 		remove(tmp_file.c_str());
 		return false;
 	}
@@ -839,22 +966,33 @@ bool extractZipFile(io::IFileSystem *fs, const char *filename, const std::string
 	}
 
 	irr_ptr<io::IFileArchive> opened_zip(zip_loader->createArchive(filename, false, false));
+	if (!opened_zip)
+		return false;
 	const io::IFileList* files_in_zip = opened_zip->getFileList();
 
 	for (u32 i = 0; i < files_in_zip->getFileCount(); i++) {
-		std::string fullpath = destination + DIR_DELIM;
-		fullpath += files_in_zip->getFullFileName(i).c_str();
-		std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
-
 		if (files_in_zip->isDirectory(i))
 			continue; // ignore, we create dirs as necessary
 
+		const auto &filename = files_in_zip->getFullFileName(i);
+		std::string fullpath = destination + DIR_DELIM;
+		fullpath += filename.c_str();
+
+		fullpath = fs::RemoveRelativePathComponents(fullpath);
+		if (!fs::PathStartsWith(fullpath, destination)) {
+			warningstream << "fs::extractZipFile(): refusing to extract file \""
+				<< filename.c_str() << "\"" << std::endl;
+			continue;
+		}
+
+		std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
+
 		if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir))
 			return false;
 
 		irr_ptr<io::IReadFile> toread(opened_zip->createAndOpenFile(i));
 
-		std::ofstream os(fullpath.c_str(), std::ios::binary);
+		auto os = open_ofstream(fullpath.c_str(), true);
 		if (!os.good())
 			return false;
 
@@ -881,12 +1019,11 @@ bool extractZipFile(io::IFileSystem *fs, const char *filename, const std::string
 }
 #endif
 
-bool ReadFile(const std::string &path, std::string &out)
+bool ReadFile(const std::string &path, std::string &out, bool log_error)
 {
-	std::ifstream is(path, std::ios::binary | std::ios::ate);
-	if (!is.good()) {
+	auto is = open_ifstream(path.c_str(), log_error, std::ios::ate);
+	if (!is.good())
 		return false;
-	}
 
 	auto size = is.tellg();
 	out.resize(size);
@@ -901,4 +1038,22 @@ bool Rename(const std::string &from, const std::string &to)
 	return rename(from.c_str(), to.c_str()) == 0;
 }
 
+bool OpenStream(std::filebuf &stream, const char *filename,
+	std::ios::openmode mode, bool log_error, bool log_warn)
+{
+	assert((mode & std::ios::in) || (mode & std::ios::out));
+	assert(!stream.is_open());
+	// C++ dropped the ball hard for file opening error handling, there's not even
+	// an implementation-defined mechanism for returning any kind of error code or message.
+	if (!stream.open(filename, mode)) {
+		if (log_warn || log_error) {
+			std::string msg = LAST_OS_ERROR();
+			(log_error ? errorstream : warningstream)
+				<< "Failed to open \"" << filename << "\": " << msg << std::endl;
+		}
+		return false;
+	}
+	return true;
+}
+
 } // namespace fs
diff --git a/src/filesys.h b/src/filesys.h
index 34792d7cf..46131aa3c 100644
--- a/src/filesys.h
+++ b/src/filesys.h
@@ -24,8 +24,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <set>
 #include <string>
+#include <string_view>
 #include <vector>
-#include "exceptions.h"
+#include <fstream>
 
 #ifdef _WIN32
 #define DIR_DELIM "\\"
@@ -78,13 +79,19 @@ bool RecursiveDelete(const std::string &path);
 
 bool DeleteSingleFileOrEmptyDirectory(const std::string &path);
 
-// Returns path to temp directory, can return "" on error
+/// Returns path to temp directory.
+/// You probably don't want to use this directly, see `CreateTempFile` or `CreateTempDir`.
+/// @return path or "" on error
 std::string TempPath();
 
-// Returns path to securely-created temporary file (will already exist when this function returns)
-// can return "" on error
+/// Returns path to securely-created temporary file (will already exist when this function returns).
+/// @return path or "" on error
 std::string CreateTempFile();
 
+/// Returns path to securely-created temporary directory (will already exist when this function returns).
+/// @return path or "" on error
+std::string CreateTempDir();
+
 /* Returns a list of subdirectories, including the path itself, but excluding
        hidden directories (whose names start with . or _)
 */
@@ -145,14 +152,74 @@ std::string AbsolutePath(const std::string &path);
 // delimiter is found.
 const char *GetFilenameFromPath(const char *path);
 
-bool safeWriteToFile(const std::string &path, const std::string &content);
+// Replace the content of a file on disk in a way that is safe from
+// corruption/truncation on a crash.
+// logs and returns false on error
+bool safeWriteToFile(const std::string &path, std::string_view content);
 
 #ifndef SERVER
 bool extractZipFile(irr::io::IFileSystem *fs, const char *filename, const std::string &destination);
 #endif
 
-bool ReadFile(const std::string &path, std::string &out);
+bool ReadFile(const std::string &path, std::string &out, bool log_error = false);
 
 bool Rename(const std::string &from, const std::string &to);
 
+/**
+ * Open a file buffer with error handling, commonly used with `std::fstream.rdbuf()`.
+ *
+ * @param stream stream references, must not already be open
+ * @param filename filename to open
+ * @param mode mode bits (used as-is)
+ * @param log_error log failure to errorstream?
+ * @param log_warn log failure to warningstream?
+ * @return true if success
+*/
+bool OpenStream(std::filebuf &stream, const char *filename,
+	std::ios::openmode mode, bool log_error, bool log_warn);
+
 } // namespace fs
+
+// outside of namespace for convenience:
+
+/**
+ * Helper function to open an output file stream (= writing).
+ *
+ * For compatibility with fopen() binary mode and truncate are always set.
+ * Use `fs::OpenStream` for more control.
+ * @param name file name
+ * @param log if true, failure to open the file will be logged to errorstream
+ * @param mode additional mode bits (e.g. std::ios::app)
+ * @return file stream, will be !good in case of error
+*/
+inline std::ofstream open_ofstream(const char *name, bool log,
+	std::ios::openmode mode = std::ios::openmode())
+{
+	mode |= std::ios::out | std::ios::binary;
+	if (!(mode & std::ios::app))
+		mode |= std::ios::trunc;
+	std::ofstream ofs;
+	if (!fs::OpenStream(*ofs.rdbuf(), name, mode, log, false))
+		ofs.setstate(std::ios::failbit);
+	return ofs;
+}
+
+/**
+ * Helper function to open an input file stream (= reading).
+ *
+ * For compatibility with fopen() binary mode is always set.
+ * Use `fs::OpenStream` for more control.
+ * @param name file name
+ * @param log if true, failure to open the file will be logged to errorstream
+ * @param mode additional mode bits (e.g. std::ios::ate)
+ * @return file stream, will be !good in case of error
+*/
+inline std::ifstream open_ifstream(const char *name, bool log,
+	std::ios::openmode mode = std::ios::openmode())
+{
+	mode |= std::ios::in | std::ios::binary;
+	std::ifstream ifs;
+	if (!fs::OpenStream(*ifs.rdbuf(), name, mode, log, false))
+		ifs.setstate(std::ios::failbit);
+	return ifs;
+}
diff --git a/src/fm_clientiface.cpp b/src/fm_clientiface.cpp
index 6661e3648..8cc24f28e 100644
--- a/src/fm_clientiface.cpp
+++ b/src/fm_clientiface.cpp
@@ -1,4 +1,4 @@
-#include "clientiface.h"
+#include "server/clientiface.h"
 #include "irr_v3d.h"
 #include "map.h"
 #include "profiler.h"
diff --git a/src/fm_liquid.cpp b/src/fm_liquid.cpp
index aa0bca78f..890fc494e 100644
--- a/src/fm_liquid.cpp
+++ b/src/fm_liquid.cpp
@@ -37,8 +37,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LIQUID_DEBUG 0
 
-enum NeighborType
-{
+namespace {
+enum NeighborType : u8 {
 	NEIGHBOR_UPPER,
 	NEIGHBOR_SAME_LEVEL,
 	NEIGHBOR_LOWER
@@ -55,6 +55,7 @@ struct NodeNeighbor
 	int weight;
 	int drop; // drop by liquid
 };
+}
 
 const v3pos_t liquid_flow_dirs[7] = {
 		// +right, +top, +back
@@ -82,12 +83,6 @@ size_t ServerMap::transforming_liquid_size()
 	return m_transforming_liquid.size();
 }
 
-void ServerMap::transforming_liquid_add(const v3pos_t &p)
-{
-	std::lock_guard<std::mutex> lock(m_transforming_liquid_mutex);
-	m_transforming_liquid.push_back(p);
-}
-
 v3pos_t ServerMap::transforming_liquid_pop()
 {
 	std::lock_guard<std::mutex> lock(m_transforming_liquid_mutex);
diff --git a/src/fm_map.cpp b/src/fm_map.cpp
index 8e714eb87..fb0c09b87 100644
--- a/src/fm_map.cpp
+++ b/src/fm_map.cpp
@@ -20,6 +20,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cstdint>
+#include "database/database.h"
 #include "irr_v3d.h"
 #include "map.h"
 #include "mapblock.h"
@@ -31,6 +32,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "emerge.h"
 #include "mapgen/mg_biome.h"
 #include "gamedef.h"
+#include "reflowscan.h"
+#include "server.h"
+#include "server/ban.h"
 #include "util/directiontables.h"
 #include "serverenvironment.h"
 #include "voxelalgorithms.h"
@@ -106,7 +110,7 @@ void Map::getBlockCacheFlush()
 
 MapBlock *Map::createBlankBlockNoInsert(const v3pos_t &p)
 {
-	auto block = new MapBlock(this, p, m_gamedef);
+	auto block = new MapBlock(p, m_gamedef);
 	return block;
 }
 
@@ -189,7 +193,7 @@ MapNode &Map::getNodeTry(const v3pos_t &p)
 	if (!block)
 		return dummy; // MapNode(CONTENT_IGNORE);
 	auto relpos = p - blockpos * MAP_BLOCKSIZE;
-	return block->getNodeTry(relpos);
+	return block->getNodeRef(relpos);
 }
 
 /*
@@ -351,11 +355,9 @@ void Map::copy_27_blocks_to_vm(MapBlock *block, VoxelManipulator &vmanip)
 
 	block->copyTo(vmanip);
 
-	auto *map = block->getParent();
-
 	for (u16 i = 0; i < 26; i++) {
 		v3pos_t bp = blockpos + g_26dirs[i];
-		MapBlock *b = map->getBlockNoCreateNoEx(bp);
+		auto b = getBlockNoCreateNoEx(bp);
 		if (b)
 			b->copyTo(vmanip);
 	}
@@ -1388,3 +1390,277 @@ s16 ServerMap::findGroundLevel(v2pos_t p2d, bool cacheBlocks)
 
 	return level;
 }
+
+
+void ServerMap::prepareBlock(MapBlock *block) {
+	ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
+
+	// Calculate weather conditions
+	//block->heat_last_update     = 0;
+	//block->humidity_last_update = 0;
+	v3pos_t p = block->getPos() *  MAP_BLOCKSIZE;
+	updateBlockHeat(senv, p, block);
+	updateBlockHumidity(senv, p, block);
+}
+
+
+MapBlock * ServerMap::loadBlock(v3bpos_t p3d)
+{
+	ScopeProfiler sp(g_profiler, "ServerMap::loadBlock");
+	const auto sector = this;
+	MapBlock *block = nullptr;
+	try {
+		std::string blob;
+		dbase->loadBlock(p3d, &blob);
+		if (!blob.length() && dbase_ro) {
+			dbase_ro->loadBlock(p3d, &blob);
+		}
+		if (!blob.length()) {
+			m_db_miss.emplace(p3d, 1);
+			return nullptr;
+		}
+
+		std::istringstream is(blob, std::ios_base::binary);
+
+		u8 version = SER_FMT_VER_INVALID;
+		is.read((char*)&version, 1);
+
+		if(is.fail())
+			throw SerializationError("ServerMap::loadBlock(): Failed"
+					" to read MapBlock version");
+
+		/*u32 block_size = MapBlock::serializedLength(version);
+		SharedBuffer<u8> data(block_size);
+		is.read((char*)*data, block_size);*/
+
+		// This will always return a sector because we're the server
+		//MapSector *sector = emergeSector(p2d);
+
+		bool created_new = false;
+		block = sector->getBlockNoCreateNoEx(p3d, false, true);
+		if(block == NULL)
+		{
+			block = sector->createBlankBlockNoInsert(p3d);
+			created_new = true;
+		}
+
+		// Read basic data
+		if (!block->deSerialize(is, version, true)) {
+			if (created_new && block)
+				delete block;
+			return nullptr;
+		}
+
+		// If it's a new block, insert it to the map
+		if(created_new)
+			if(!sector->insertBlock(block)) {
+				delete block;
+				return nullptr;
+			}
+
+		if (!g_settings->getBool("liquid_real")) {
+			ReflowScan scanner(this, m_emerge->ndef);
+			scanner.scan(block, &m_transforming_liquid);
+		}
+
+		// We just loaded it from, so it's up-to-date.
+		block->resetModified();
+
+/*
+		if (block->getLightingExpired()) {
+			verbosestream<<"Loaded block with exiried lighting. (maybe sloooow appear), try recalc " << p3d<<std::endl;
+			lighting_modified_blocks.set(p3d, nullptr);
+		}
+*/
+
+	//MapBlock *block = getBlockNoCreateNoEx(blockpos);
+	if (created_new && (block != NULL)) {
+		std::map<v3bpos_t, MapBlock*> modified_blocks;
+		// Fix lighting if necessary
+		voxalgo::update_block_border_lighting(this, block, modified_blocks);
+		if (!modified_blocks.empty()) {
+			//Modified lighting, send event
+			MapEditEvent event;
+			event.type = MEET_OTHER;
+			for (auto it = modified_blocks.begin();
+					it != modified_blocks.end(); ++it)
+				event.modified_blocks.push_back(it->first);
+			dispatchEvent(event);
+		}
+	}
+
+
+
+		return block;
+	} catch (const std::exception &e) {
+		if (block)
+			delete block;
+
+		errorstream<<"Invalid block data in database"
+				<<" ("<<p3d.X<<","<<p3d.Y<<","<<p3d.Z<<")"
+				<<" (SerializationError): "<<e.what()<<std::endl;
+
+		// TODO: Block should be marked as invalid in memory so that it is
+		// not touched but the game can run
+
+		if(g_settings->getBool("ignore_world_load_errors")){
+			errorstream<<"Ignoring block load error. Duck and cover! "
+					<<"(ignore_world_load_errors)"<<std::endl;
+		} else {
+			throw SerializationError("Invalid block data in database");
+		}
+	}
+	return nullptr;
+}
+
+
+s32 ServerMap::save(ModifiedState save_level, float dedicated_server_step, bool breakable)
+{
+	if (!m_map_saving_enabled) {
+		warningstream<<"Not saving map, saving disabled."<<std::endl;
+		return 0;
+	}
+
+	const auto start_time = porting::getTimeUs();
+
+	if(save_level == MOD_STATE_CLEAN)
+		infostream<<"ServerMap: Saving whole map, this can take time."
+				<<std::endl;
+
+	if (m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
+		if (settings_mgr.saveMapMeta())
+			m_map_metadata_changed = false;
+	}
+
+	// Profile modified reasons
+	Profiler modprofiler;
+
+	u32 block_count = 0;
+	u32 block_count_all = 0; // Number of blocks in memory
+
+	// Don't do anything with sqlite unless something is really saved
+	bool save_started = false;
+	u32 n = 0, calls = 0;
+	const auto end_ms = porting::getTimeMs() + u32(1000 * dedicated_server_step);
+	if (!breakable)
+		m_blocks_save_last = 0;
+
+	MAP_NOTHREAD_LOCK(this);
+
+	{
+		auto lock = breakable ? m_blocks.try_lock_shared_rec() : m_blocks.lock_shared_rec();
+		if (!lock->owns_lock())
+			return m_blocks_save_last;
+
+		for(const auto &[pos, block] : m_blocks)
+		{
+			if (n++ < m_blocks_save_last)
+				continue;
+			else
+				m_blocks_save_last = 0;
+			++calls;
+
+			if (!block)
+				continue;
+
+			block_count_all++;
+
+			if(block->getModified() >= (u32)save_level) {
+				// Lazy beginSave()
+				if(!save_started) {
+					beginSave();
+					save_started = true;
+				}
+
+				//modprofiler.add(block->getModifiedReasonString(), 1);
+
+				auto lock = breakable ? block->try_lock_unique_rec() : block->lock_unique_rec();
+				if (!lock->owns_lock())
+					continue;
+
+				saveBlock(block);
+				block_count++;
+			}
+			if (breakable && porting::getTimeMs() > end_ms) {
+				m_blocks_save_last = n;
+				break;
+			}
+		}
+	}
+	if (!calls)
+		m_blocks_save_last = 0;
+
+	if(save_started)
+		endSave();
+
+	/*
+		Only print if something happened or saved whole map
+	*/
+	if(/*save_level == MOD_STATE_CLEAN
+			||*/ block_count != 0) {
+		infostream << "ServerMap: Written: "
+				<< block_count << " blocks"
+				<< ", " << block_count_all << " blocks in memory."
+
+                << " Total=" << m_blocks.size() << ".";
+				if (m_blocks_save_last)
+					infostream<<" Break at "<< m_blocks_save_last;
+				infostream
+
+				<< std::endl;
+		PrintInfo(infostream); // ServerMap/ClientMap:
+		//infostream<<"Blocks modified by: "<<std::endl;
+		modprofiler.print(infostream);
+	}
+
+	const auto end_time = porting::getTimeUs();
+
+	m_save_time_counter->increment(end_time - start_time);
+
+	reportMetrics(end_time - start_time, block_count, block_count_all);
+
+	return m_blocks_save_last;
+}
+
+int Server::save(float dtime, float dedicated_server_step, bool breakable) {
+	// Save map, players and auth stuff
+	int ret = 0;
+		float &counter = m_savemap_timer;
+		counter += dtime;
+		static thread_local const float save_interval =
+			g_settings->getFloat("server_map_save_interval");
+		if (counter >= save_interval) {
+			counter = 0.0;
+			TimeTaker timer_step("Server step: Save map, players and auth stuff");
+			//MutexAutoLock lock(m_env_mutex);
+
+			ScopeProfiler sp(g_profiler, "Server: map saving (sum)");
+
+			// Save changed parts of map
+			if(m_env->getMap().save(MOD_STATE_WRITE_NEEDED, dedicated_server_step, breakable)) {
+				// partial save, will continue on next step
+				counter = g_settings->getFloat("server_map_save_interval");
+				++ret;
+				if (breakable)
+					goto save_break;
+			}
+
+			// Save ban file
+			if (m_banmanager->isModified()) {
+				m_banmanager->save();
+			}
+
+			// Save players
+			m_env->saveLoadedPlayers();
+
+			// Save environment metadata
+			m_env->saveMeta();
+
+			stat.save();
+			m_env->blocks_with_abm.save();
+
+		}
+		save_break:;
+
+	return ret;
+}
diff --git a/src/fm_nodecontainer.h b/src/fm_nodecontainer.h
index e831d17f4..e24eb2c46 100644
--- a/src/fm_nodecontainer.h
+++ b/src/fm_nodecontainer.h
@@ -37,6 +37,7 @@ public:
 	{
 		return getNodeRefUnsafe(p);
 	};
+    virtual void setNode(const v3pos_t &p, const MapNode &n, bool important = false) {};
 	virtual void clear() {}
 	virtual void addArea(const VoxelArea &a){};
 	virtual void copyFrom(MapNode *src, const VoxelArea &src_area, v3pos_t from_pos,
diff --git a/src/fm_porting.h b/src/fm_porting.h
index cc4f2ba21..b0de3699b 100644
--- a/src/fm_porting.h
+++ b/src/fm_porting.h
@@ -88,7 +88,7 @@ extern std::atomic_bool g_sighup, g_siginfo;
 
 #ifndef SERVER
 
-void irr_device_wait_egl (irr::IrrlichtDevice * device = nullptr);
+//void irr_device_wait_egl (irr::IrrlichtDevice * device = nullptr);
 
 #endif
 
diff --git a/src/fm_server.cpp b/src/fm_server.cpp
index e8950cde6..1291c90bc 100644
--- a/src/fm_server.cpp
+++ b/src/fm_server.cpp
@@ -725,7 +725,7 @@ KeyValueStorage &ServerEnvironment::getKeyValueStorage(std::string name)
 	}
 	if (!m_key_value_storage.count(name)) {
 		m_key_value_storage.emplace(std::piecewise_construct, std::forward_as_tuple(name),
-				std::forward_as_tuple(m_path_world, name));
+				std::forward_as_tuple( getGameDef()->m_path_world, name));
 	}
 	return m_key_value_storage.at(name);
 }
diff --git a/src/gamedef.h b/src/gamedef.h
index 8fac6721c..8820265b3 100644
--- a/src/gamedef.h
+++ b/src/gamedef.h
@@ -78,6 +78,7 @@ public:
 	virtual const ModSpec* getModSpec(const std::string &modname) const = 0;
 	virtual const SubgameSpec* getGameSpec() const { return nullptr; }
 	virtual std::string getWorldPath() const { return ""; }
+	virtual std::string getModDataPath() const { return ""; }
 	virtual ModStorageDatabase *getModStorageDatabase() = 0;
 
 	virtual bool joinModChannel(const std::string &channel) = 0;
diff --git a/src/gettext.cpp b/src/gettext.cpp
index dd64ed579..7f2086eec 100644
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -23,9 +23,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>
 #include <cstring>
 #include <iostream>
-#include <cstdlib>
 #include "gettext.h"
 #include "util/string.h"
+#include "porting.h"
 #include "log.h"
 
 #if USE_GETTEXT && defined(_MSC_VER)
@@ -40,7 +40,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 static std::map<std::wstring, std::wstring> glb_supported_locales;
 
 /******************************************************************************/
-BOOL CALLBACK UpdateLocaleCallback(LPTSTR pStr)
+static BOOL CALLBACK UpdateLocaleCallback(LPTSTR pStr)
 {
 	char* endptr = 0;
 	int LOCALEID = strtol(pStr, &endptr,16);
@@ -81,7 +81,8 @@ BOOL CALLBACK UpdateLocaleCallback(LPTSTR pStr)
 }
 
 /******************************************************************************/
-const char* MSVC_LocaleLookup(const char* raw_shortname) {
+static const char* MSVC_LocaleLookup(const char* raw_shortname)
+{
 
 	/* NULL is used to read locale only so we need to return it too */
 	if (raw_shortname == NULL) return NULL;
@@ -105,9 +106,9 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
 
 	last_raw_value = shortname;
 
-	if (glb_supported_locales.find(utf8_to_wide(shortname)) != glb_supported_locales.end()) {
-		last_full_name = wide_to_utf8(
-			glb_supported_locales[utf8_to_wide(shortname)]);
+	auto key = utf8_to_wide(shortname);
+	if (glb_supported_locales.find(key) != glb_supported_locales.end()) {
+		last_full_name = wide_to_utf8(glb_supported_locales[key]);
 		return last_full_name.c_str();
 	}
 
@@ -117,6 +118,50 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
 	return "";
 }
 
+static void MSVC_LocaleWorkaround(int argc, char* argv[])
+{
+	errorstream << "MSVC localization workaround active.  "
+		"Restarting " PROJECT_NAME_C " in a new environment!" << std::endl;
+
+	std::string parameters;
+	for (int i = 1; i < argc; i++) {
+		if (i > 1)
+			parameters += ' ';
+		parameters += porting::QuoteArgv(argv[i]);
+	}
+
+	char *ptr_parameters = nullptr;
+	if (!parameters.empty())
+		ptr_parameters = &parameters[0];
+
+	// Allow calling without an extension
+	std::string app_name = argv[0];
+	if (app_name.compare(app_name.size() - 4, 4, ".exe") != 0)
+		app_name += ".exe";
+
+	STARTUPINFO startup_info = {};
+	PROCESS_INFORMATION process_info = {};
+
+	bool success = CreateProcess(app_name.c_str(), ptr_parameters,
+		NULL, NULL, false, DETACHED_PROCESS | CREATE_UNICODE_ENVIRONMENT,
+		NULL, NULL, &startup_info, &process_info);
+
+	if (success) {
+		exit(0);
+		// NOTREACHED
+	} else {
+		auto e = GetLastError();
+
+		errorstream
+			<< "*******************************************************" << '\n'
+			<< "CMD: " << app_name << '\n'
+			<< "Failed to restart with current locale: "
+			<< porting::ConvertError(e) << '\n'
+			<< "Expect language to be broken!" << '\n'
+			<< "*******************************************************" << std::endl;
+	}
+}
+
 #endif
 
 /******************************************************************************/
@@ -126,72 +171,26 @@ void init_gettext(const char *path, const std::string &configured_language,
 #if USE_GETTEXT
 	// First, try to set user override environment
 	if (!configured_language.empty()) {
-#ifndef _WIN32
-		// Add user specified locale to environment
+		// Set LANGUAGE which overrides all others, see
+		// <https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html>
+#ifndef _MSC_VER
 		setenv("LANGUAGE", configured_language.c_str(), 1);
 
-#ifdef __ANDROID__
-		setenv("LANG", configured_language.c_str(), 1);
-#endif
-
 		// Reload locale with changed environment
 		setlocale(LC_ALL, "");
-#elif defined(_MSC_VER)
+#else
 		std::string current_language;
 		const char *env_lang = getenv("LANGUAGE");
 		if (env_lang)
 			current_language = env_lang;
 
-		_putenv(("LANGUAGE=" + configured_language).c_str());
+		setenv("LANGUAGE", configured_language.c_str(), 1);
 		SetEnvironmentVariableA("LANGUAGE", configured_language.c_str());
 
 #ifndef SERVER
 		// Hack to force gettext to see the right environment
-		if (current_language != configured_language) {
-			errorstream << "MSVC localization workaround active.  "
-				"Restarting " PROJECT_NAME_C " in a new environment!" << std::endl;
-
-			std::string parameters;
-			for (int i = 1; i < argc; i++) {
-				if (i > 1)
-					parameters += ' ';
-				parameters += porting::QuoteArgv(argv[i]);
-			}
-
-			char *ptr_parameters = nullptr;
-			if (!parameters.empty())
-				ptr_parameters = &parameters[0];
-
-			// Allow calling without an extension
-			std::string app_name = argv[0];
-			if (app_name.compare(app_name.size() - 4, 4, ".exe") != 0)
-				app_name += ".exe";
-
-			STARTUPINFO startup_info = {};
-			PROCESS_INFORMATION process_info = {};
-
-			bool success = CreateProcess(app_name.c_str(), ptr_parameters,
-				NULL, NULL, false, DETACHED_PROCESS | CREATE_UNICODE_ENVIRONMENT,
-				NULL, NULL, &startup_info, &process_info);
-
-			if (success) {
-				exit(0);
-				// NOTREACHED
-			} else {
-				char buffer[1024];
-
-				FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
-					MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT), buffer,
-					sizeof(buffer) - 1, NULL);
-
-				errorstream << "*******************************************************" << std::endl;
-				errorstream << "CMD: " << app_name << std::endl;
-				errorstream << "Failed to restart with current locale: " << std::endl;
-				errorstream << buffer;
-				errorstream << "Expect language to be broken!" << std::endl;
-				errorstream << "*******************************************************" << std::endl;
-			}
-		}
+		if (current_language != configured_language)
+			MSVC_LocaleWorkaround(argc, argv);
 #else
 		errorstream << "*******************************************************" << std::endl;
 		errorstream << "Can't apply locale workaround for server!" << std::endl;
@@ -200,15 +199,8 @@ void init_gettext(const char *path, const std::string &configured_language,
 #endif
 
 		setlocale(LC_ALL, configured_language.c_str());
-#else // Mingw
-		_putenv(("LANGUAGE=" + configured_language).c_str());
-		setlocale(LC_ALL, "");
-#endif // ifndef _WIN32
-	}
-	else {
-#ifdef __ANDROID__
-		setenv("LANG", porting::getLanguageAndroid().c_str(), 1);
-#endif
+#endif // ifdef _MSC_VER
+	} else {
 		/* set current system default locale */
 		setlocale(LC_ALL, "");
 	}
@@ -241,18 +233,13 @@ void init_gettext(const char *path, const std::string &configured_language,
 	}
 #endif
 
-#if defined(_WIN32)
-	// Set character encoding for Win32
-	char *tdomain = textdomain( (char *) NULL );
-	if( tdomain == NULL )
-	{
-		errorstream << "Warning: domainname parameter is the null pointer" <<
-				", default domain is not set" << std::endl;
-		tdomain = (char *) "messages";
-	}
-	/* char *codeset = */bind_textdomain_codeset( tdomain, "UTF-8" );
-	//errorstream << "Gettext debug: domainname = " << tdomain << "; codeset = "<< codeset << std::endl;
-#endif // defined(_WIN32)
+#ifdef _WIN32
+	// set character encoding
+	char *tdomain = textdomain(nullptr);
+	assert(tdomain);
+	if (tdomain)
+		bind_textdomain_codeset(tdomain, "UTF-8");
+#endif
 
 #else
 	/* set current system default locale */
@@ -260,7 +247,7 @@ void init_gettext(const char *path, const std::string &configured_language,
 #endif // if USE_GETTEXT
 
 	/* no matter what locale is used we need number format to be "C" */
-	/* to ensure formspec parameters are evaluated correct!          */
+	/* to ensure formspec parameters are evaluated correctly!        */
 
 	setlocale(LC_NUMERIC, "C");
 	infostream << "Message locale is now set to: "
diff --git a/src/gettime.h b/src/gettime.h
index 8f2cf9f39..89cffbf33 100644
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -26,14 +26,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>
 #include <mutex>
 
-enum TimePrecision
-{
-	PRECISION_SECONDS,
-	PRECISION_MILLI,
-	PRECISION_MICRO,
-	PRECISION_NANO
-};
-
 inline struct tm mt_localtime()
 {
 	// initialize the time zone on first invocation
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4434b14a0..66d6a9ee8 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(extra_gui_SRCS "")
-if(ENABLE_TOUCH)
-	set(extra_gui_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/touchscreengui.cpp)
-endif()
-
 set(gui_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/guiAnimatedImage.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiBackgroundImage.cpp
@@ -18,6 +13,7 @@ set(gui_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/guiInventoryList.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiItemImage.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiKeyChangeMenu.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiOpenURL.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiPasswordChange.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiPathSelectMenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiScene.cpp
@@ -29,6 +25,6 @@ set(gui_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/guiVolumeChange.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/modalMenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/profilergraph.cpp
-	${extra_gui_SRCS}
+	${CMAKE_CURRENT_SOURCE_DIR}/touchscreengui.cpp
 	PARENT_SCOPE
 )
diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
index ab132f69e..ef7416bca 100644
--- a/src/gui/StyleSpec.h
+++ b/src/gui/StyleSpec.h
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "client/tile.h" // ITextureSource
+#include "client/texturesource.h"
 #include "client/fontengine.h"
 #include "debug.h"
 #include "irrlichttypes_extrabloated.h"
diff --git a/src/gui/guiAnimatedImage.cpp b/src/gui/guiAnimatedImage.cpp
index 890763e71..5e14d2ef2 100644
--- a/src/gui/guiAnimatedImage.cpp
+++ b/src/gui/guiAnimatedImage.cpp
@@ -1,7 +1,6 @@
 #include "guiAnimatedImage.h"
 
 #include "client/guiscalingfilter.h"
-#include "client/tile.h" // ITextureSource
 #include "log.h"
 #include "porting.h"
 #include "util/string.h"
diff --git a/src/gui/guiBackgroundImage.cpp b/src/gui/guiBackgroundImage.cpp
index 987287fce..96197ca2c 100644
--- a/src/gui/guiBackgroundImage.cpp
+++ b/src/gui/guiBackgroundImage.cpp
@@ -18,6 +18,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "guiBackgroundImage.h"
 #include "client/guiscalingfilter.h"
 #include "log.h"
+#include "client/texturesource.h"
 
 GUIBackgroundImage::GUIBackgroundImage(gui::IGUIEnvironment *env,
 	gui::IGUIElement *parent, s32 id, const core::rect<s32> &rectangle,
diff --git a/src/gui/guiBackgroundImage.h b/src/gui/guiBackgroundImage.h
index 2e51a8190..71c5b5077 100644
--- a/src/gui/guiBackgroundImage.h
+++ b/src/gui/guiBackgroundImage.h
@@ -19,7 +19,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "irrlichttypes_extrabloated.h"
 #include "util/string.h"
-#include "client/tile.h" // ITextureSource
+
+class ISimpleTextureSource;
+
 
 class GUIBackgroundImage : public gui::IGUIElement
 {
diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp
index d19188699..d78433edd 100644
--- a/src/gui/guiButton.cpp
+++ b/src/gui/guiButton.cpp
@@ -1,770 +1,765 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "guiButton.h"
-
-
-#include "client/guiscalingfilter.h"
-#include "client/tile.h"
-#include "IGUISkin.h"
-#include "IGUIEnvironment.h"
-#include "IVideoDriver.h"
-#include "IGUIFont.h"
-#include "irrlicht_changes/static_text.h"
-#include "porting.h"
-#include "StyleSpec.h"
-#include "util/numeric.h"
-
-using namespace irr;
-using namespace gui;
-
-// Multiply with a color to get the default corresponding hovered color
-#define COLOR_HOVERED_MOD 1.25f
-
-// Multiply with a color to get the default corresponding pressed color
-#define COLOR_PRESSED_MOD 0.85f
-
-//! constructor
-GUIButton::GUIButton(IGUIEnvironment* environment, IGUIElement* parent,
-		s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
-		bool noclip) :
-	IGUIButton(environment, parent, id, rectangle),
-	TSrc(tsrc)
-{
-	setNotClipped(noclip);
-
-	// This element can be tabbed.
-	setTabStop(true);
-	setTabOrder(-1);
-
-	// PATCH
-	for (size_t i = 0; i < 4; i++) {
-		Colors[i] = Environment->getSkin()->getColor((EGUI_DEFAULT_COLOR)i);
-	}
-	StaticText = gui::StaticText::add(Environment, Text.c_str(), core::rect<s32>(0,0,rectangle.getWidth(),rectangle.getHeight()), false, false, this, id);
-	StaticText->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
-	// END PATCH
-}
-
-//! destructor
-GUIButton::~GUIButton()
-{
-	if (OverrideFont)
-		OverrideFont->drop();
-
-	if (SpriteBank)
-		SpriteBank->drop();
-}
-
-
-//! Sets if the images should be scaled to fit the button
-void GUIButton::setScaleImage(bool scaleImage)
-{
-	ScaleImage = scaleImage;
-}
-
-
-//! Returns whether the button scale the used images
-bool GUIButton::isScalingImage() const
-{
-	return ScaleImage;
-}
-
-
-//! Sets if the button should use the skin to draw its border
-void GUIButton::setDrawBorder(bool border)
-{
-	DrawBorder = border;
-}
-
-
-void GUIButton::setSpriteBank(IGUISpriteBank* sprites)
-{
-	if (sprites)
-		sprites->grab();
-
-	if (SpriteBank)
-		SpriteBank->drop();
-
-	SpriteBank = sprites;
-}
-
-void GUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop, bool scale)
-{
-	ButtonSprites[(u32)state].Index	= index;
-	ButtonSprites[(u32)state].Color	= color;
-	ButtonSprites[(u32)state].Loop	= loop;
-	ButtonSprites[(u32)state].Scale = scale;
-}
-
-//! Get the sprite-index for the given state or -1 when no sprite is set
-s32 GUIButton::getSpriteIndex(EGUI_BUTTON_STATE state) const
-{
-	return ButtonSprites[(u32)state].Index;
-}
-
-//! Get the sprite color for the given state. Color is only used when a sprite is set.
-video::SColor GUIButton::getSpriteColor(EGUI_BUTTON_STATE state) const
-{
-	return ButtonSprites[(u32)state].Color;
-}
-
-//! Returns if the sprite in the given state does loop
-bool GUIButton::getSpriteLoop(EGUI_BUTTON_STATE state) const
-{
-	return ButtonSprites[(u32)state].Loop;
-}
-
-//! Returns if the sprite in the given state is scaled
-bool GUIButton::getSpriteScale(EGUI_BUTTON_STATE state) const
-{
-	return ButtonSprites[(u32)state].Scale;
-}
-
-//! called if an event happened.
-bool GUIButton::OnEvent(const SEvent& event)
-{
-	if (!isEnabled())
-		return IGUIElement::OnEvent(event);
-
-	switch(event.EventType)
-	{
-	case EET_KEY_INPUT_EVENT:
-		if (event.KeyInput.PressedDown &&
-			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
-		{
-			if (!IsPushButton)
-				setPressed(true);
-			else
-				setPressed(!Pressed);
-
-			return true;
-		}
-		if (Pressed && !IsPushButton && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
-		{
-			setPressed(false);
-			return true;
-		}
-		else
-		if (!event.KeyInput.PressedDown && Pressed &&
-			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
-		{
-
-			if (!IsPushButton)
-				setPressed(false);
-
-			if (Parent)
-			{
-				ClickShiftState = event.KeyInput.Shift;
-				ClickControlState = event.KeyInput.Control;
-
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
-				Parent->OnEvent(newEvent);
-			}
-			return true;
-		}
-		break;
-	case EET_GUI_EVENT:
-		if (event.GUIEvent.Caller == this)
-		{
-			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-			{
-				if (!IsPushButton)
-					setPressed(false);
-				FocusTime = (u32)porting::getTimeMs();
-			}
-			else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED)
-			{
-				FocusTime = (u32)porting::getTimeMs();
-			}
-			else if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED || event.GUIEvent.EventType == EGET_ELEMENT_LEFT)
-			{
-				HoverTime = (u32)porting::getTimeMs();
-			}
-		}
-		break;
-	case EET_MOUSE_INPUT_EVENT:
-		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
-		{
-			// Sometimes formspec elements can receive mouse events when the
-			// mouse is outside of the formspec. Thus, we test the position here.
-			if ( !IsPushButton && AbsoluteClippingRect.isPointInside(
-						core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y ))) {
-				Environment->setFocus(this);
-				setPressed(true);
-			}
-
-			return true;
-		}
-		else
-		if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
-		{
-			bool wasPressed = Pressed;
-
-			if ( !AbsoluteClippingRect.isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y ) ) )
-			{
-				if (!IsPushButton)
-					setPressed(false);
-				return true;
-			}
-
-			if (!IsPushButton)
-				setPressed(false);
-			else
-			{
-				setPressed(!Pressed);
-			}
-
-			if ((!IsPushButton && wasPressed && Parent) ||
-				(IsPushButton && wasPressed != Pressed))
-			{
-				ClickShiftState = event.MouseInput.Shift;
-				ClickControlState = event.MouseInput.Control;
-
-				SEvent newEvent;
-				newEvent.EventType = EET_GUI_EVENT;
-				newEvent.GUIEvent.Caller = this;
-				newEvent.GUIEvent.Element = 0;
-				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
-				Parent->OnEvent(newEvent);
-			}
-
-			return true;
-		}
-		break;
-	default:
-		break;
-	}
-
-	return Parent ? Parent->OnEvent(event) : false;
-}
-
-
-//! draws the element and its children
-void GUIButton::draw()
-{
-	if (!IsVisible)
-		return;
-
-	// PATCH
-	// Track hovered state, if it has changed then we need to update the style.
-	bool hovered = isHovered();
-	bool focused = isFocused();
-	if (hovered != WasHovered || focused != WasFocused) {
-		WasHovered = hovered;
-		WasFocused = focused;
-		setFromState();
-	}
-
-	GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
-	video::IVideoDriver* driver = Environment->getVideoDriver();
-	// END PATCH
-
-	if (DrawBorder)
-	{
-		if (!Pressed)
-		{
-			// PATCH
-			skin->drawColored3DButtonPaneStandard(this, AbsoluteRect,
-					&AbsoluteClippingRect, Colors);
-			// END PATCH
-		}
-		else
-		{
-			// PATCH
-			skin->drawColored3DButtonPanePressed(this, AbsoluteRect,
-					&AbsoluteClippingRect, Colors);
-			// END PATCH
-		}
-	}
-
-	const core::position2di buttonCenter(AbsoluteRect.getCenter());
-	// PATCH
-	// The image changes based on the state, so we use the default every time.
-	EGUI_BUTTON_IMAGE_STATE imageState = EGBIS_IMAGE_UP;
-	// END PATCH
-	if ( ButtonImages[(u32)imageState].Texture )
-	{
-		core::position2d<s32> pos(buttonCenter);
-		core::rect<s32> sourceRect(ButtonImages[(u32)imageState].SourceRect);
-		if ( sourceRect.getWidth() == 0 && sourceRect.getHeight() == 0 )
-			sourceRect = core::rect<s32>(core::position2di(0,0), ButtonImages[(u32)imageState].Texture->getOriginalSize());
-
-		pos.X -= sourceRect.getWidth() / 2;
-		pos.Y -= sourceRect.getHeight() / 2;
-
-		if ( Pressed )
-		{
-			// Create a pressed-down effect by moving the image when it looks identical to the unpressed state image
-			EGUI_BUTTON_IMAGE_STATE unpressedState = getImageState(false);
-			if ( unpressedState == imageState || ButtonImages[(u32)imageState] == ButtonImages[(u32)unpressedState] )
-			{
-				pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X);
-				pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y);
-			}
-		}
-
-		// PATCH
-		video::ITexture* texture = ButtonImages[(u32)imageState].Texture;
-		video::SColor image_colors[] = { BgColor, BgColor, BgColor, BgColor };
-		if (BgMiddle.getArea() == 0) {
-			driver->draw2DImage(texture,
-					ScaleImage? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
-					sourceRect, &AbsoluteClippingRect,
-					image_colors, UseAlphaChannel);
-		} else {
-			draw2DImage9Slice(driver, texture,
-					ScaleImage ? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
-					sourceRect, BgMiddle, &AbsoluteClippingRect, image_colors);
-		}
-		// END PATCH
-	}
-
-	if (SpriteBank)
-	{
-		if (isEnabled())
-		{
-			core::position2di pos(buttonCenter);
-			// pressed / unpressed animation
-			EGUI_BUTTON_STATE state = Pressed ? EGBS_BUTTON_DOWN : EGBS_BUTTON_UP;
-			drawSprite(state, ClickTime, pos);
-
-			// focused / unfocused animation
-			state = Environment->hasFocus(this) ? EGBS_BUTTON_FOCUSED : EGBS_BUTTON_NOT_FOCUSED;
-			drawSprite(state, FocusTime, pos);
-
-			// mouse over / off animation
-			state = isHovered() ? EGBS_BUTTON_MOUSE_OVER : EGBS_BUTTON_MOUSE_OFF;
-			drawSprite(state, HoverTime, pos);
-		}
-		else
-		{
-			// draw disabled
-//			drawSprite(EGBS_BUTTON_DISABLED, 0, pos);
-		}
-	}
-
-	IGUIElement::draw();
-}
-
-void GUIButton::drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center)
-{
-	u32 stateIdx = (u32)state;
-
-	if (ButtonSprites[stateIdx].Index != -1)
-	{
-		if ( ButtonSprites[stateIdx].Scale )
-		{
-			const video::SColor colors[] = {ButtonSprites[stateIdx].Color,ButtonSprites[stateIdx].Color,ButtonSprites[stateIdx].Color,ButtonSprites[stateIdx].Color};
-			SpriteBank->draw2DSprite(ButtonSprites[stateIdx].Index, AbsoluteRect.UpperLeftCorner,
-					&AbsoluteClippingRect, colors[0], // FIXME: remove [0]
-					porting::getTimeMs()-startTime, ButtonSprites[stateIdx].Loop);
-		}
-		else
-		{
-			SpriteBank->draw2DSprite(ButtonSprites[stateIdx].Index, center,
-				&AbsoluteClippingRect, ButtonSprites[stateIdx].Color, startTime, porting::getTimeMs(),
-				ButtonSprites[stateIdx].Loop, true);
-		}
-	}
-}
-
-EGUI_BUTTON_IMAGE_STATE GUIButton::getImageState(bool pressed) const
-{
-	// PATCH
-	return getImageState(pressed, ButtonImages);
-	// END PATCH
-}
-
-EGUI_BUTTON_IMAGE_STATE GUIButton::getImageState(bool pressed, const ButtonImage* images) const
-{
-	// figure state we should have
-	EGUI_BUTTON_IMAGE_STATE state = EGBIS_IMAGE_DISABLED;
-	bool focused = isFocused();
-	bool mouseOver = isHovered();
-	if (isEnabled())
-	{
-		if ( pressed )
-		{
-			if ( focused && mouseOver )
-				state = EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER;
-			else if ( focused )
-				state = EGBIS_IMAGE_DOWN_FOCUSED;
-			else if ( mouseOver )
-				state = EGBIS_IMAGE_DOWN_MOUSEOVER;
-			else
-				state = EGBIS_IMAGE_DOWN;
-		}
-		else // !pressed
-		{
-			if ( focused && mouseOver )
-				state = EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER;
-			else if ( focused )
-				state = EGBIS_IMAGE_UP_FOCUSED;
-			else if ( mouseOver )
-				state = EGBIS_IMAGE_UP_MOUSEOVER;
-			else
-				state = EGBIS_IMAGE_UP;
-		}
-	}
-
-	// find a compatible state that has images
-	while ( state != EGBIS_IMAGE_UP && !images[(u32)state].Texture )
-	{
-		// PATCH
-		switch ( state )
-		{
-			case EGBIS_IMAGE_UP_FOCUSED:
-				state = EGBIS_IMAGE_UP;
-				break;
-			case EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER:
-				state = EGBIS_IMAGE_UP_FOCUSED;
-				break;
-			case EGBIS_IMAGE_DOWN_MOUSEOVER:
-				state = EGBIS_IMAGE_DOWN;
-				break;
-			case EGBIS_IMAGE_DOWN_FOCUSED:
-				state = EGBIS_IMAGE_DOWN;
-				break;
-			case EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER:
-				state = EGBIS_IMAGE_DOWN_FOCUSED;
-				break;
-			case EGBIS_IMAGE_DISABLED:
-				if ( pressed )
-					state = EGBIS_IMAGE_DOWN;
-				else
-					state = EGBIS_IMAGE_UP;
-				break;
-			default:
-				state = EGBIS_IMAGE_UP;
-		}
-		// END PATCH
-	}
-
-	return state;
-}
-
-//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
-void GUIButton::setOverrideFont(IGUIFont* font)
-{
-	if (OverrideFont == font)
-		return;
-
-	if (OverrideFont)
-		OverrideFont->drop();
-
-	OverrideFont = font;
-
-	if (OverrideFont)
-		OverrideFont->grab();
-
-	StaticText->setOverrideFont(font);
-}
-
-//! Gets the override font (if any)
-IGUIFont * GUIButton::getOverrideFont() const
-{
-	return OverrideFont;
-}
-
-//! Get the font which is used right now for drawing
-IGUIFont* GUIButton::getActiveFont() const
-{
-	if ( OverrideFont )
-		return OverrideFont;
-	IGUISkin* skin = Environment->getSkin();
-	if (skin)
-		return skin->getFont(EGDF_BUTTON);
-	return 0;
-}
-
-//! Sets another color for the text.
-void GUIButton::setOverrideColor(video::SColor color)
-{
-	OverrideColor = color;
-	OverrideColorEnabled = true;
-
-	StaticText->setOverrideColor(color);
-}
-
-video::SColor GUIButton::getOverrideColor() const
-{
-	return OverrideColor;
-}
-
-video::SColor GUIButton::getActiveColor() const
-{
-	return video::SColor(0,0,0,0); // unused?
-}
-
-void GUIButton::enableOverrideColor(bool enable)
-{
-	OverrideColorEnabled = enable;
-}
-
-bool GUIButton::isOverrideColorEnabled() const
-{
-	return OverrideColorEnabled;
-}
-
-void GUIButton::setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image, const core::rect<s32>& sourceRect)
-{
-	if ( state >= EGBIS_COUNT )
-		return;
-
-	if ( image )
-		image->grab();
-
-	u32 stateIdx = (u32)state;
-	if ( ButtonImages[stateIdx].Texture )
-		ButtonImages[stateIdx].Texture->drop();
-
-	ButtonImages[stateIdx].Texture = image;
-	ButtonImages[stateIdx].SourceRect = sourceRect;
-}
-
-// PATCH
-void GUIButton::setImage(video::ITexture* image)
-{
-	setImage(gui::EGBIS_IMAGE_UP, image);
-}
-
-void GUIButton::setImage(video::ITexture* image, const core::rect<s32>& pos)
-{
-	setImage(gui::EGBIS_IMAGE_UP, image, pos);
-}
-
-void GUIButton::setPressedImage(video::ITexture* image)
-{
-	setImage(gui::EGBIS_IMAGE_DOWN, image);
-}
-
-void GUIButton::setPressedImage(video::ITexture* image, const core::rect<s32>& pos)
-{
-	setImage(gui::EGBIS_IMAGE_DOWN, image, pos);
-}
-
-//! Sets the text displayed by the button
-void GUIButton::setText(const wchar_t* text)
-{
-	StaticText->setText(text);
-
-	IGUIButton::setText(text);
-}
-// END PATCH
-
-//! Sets if the button should behave like a push button. Which means it
-//! can be in two states: Normal or Pressed. With a click on the button,
-//! the user can change the state of the button.
-void GUIButton::setIsPushButton(bool isPushButton)
-{
-	IsPushButton = isPushButton;
-}
-
-
-//! Returns if the button is currently pressed
-bool GUIButton::isPressed() const
-{
-	return Pressed;
-}
-
-// PATCH
-//! Returns if this element (or one of its direct children) is hovered
-bool GUIButton::isHovered() const
-{
-	IGUIElement *hovered = Environment->getHovered();
-	return  hovered == this || (hovered != nullptr && hovered->getParent() == this);
-}
-
-//! Returns if this element (or one of its direct children) is focused
-bool GUIButton::isFocused() const
-{
-	return Environment->hasFocus((IGUIElement*)this, true);
-}
-// END PATCH
-
-//! Sets the pressed state of the button if this is a pushbutton
-void GUIButton::setPressed(bool pressed)
-{
-	if (Pressed != pressed)
-	{
-		ClickTime = porting::getTimeMs();
-		Pressed = pressed;
-		setFromState();
-	}
-}
-
-
-//! Returns whether the button is a push button
-bool GUIButton::isPushButton() const
-{
-	return IsPushButton;
-}
-
-
-//! Sets if the alpha channel should be used for drawing images on the button (default is false)
-void GUIButton::setUseAlphaChannel(bool useAlphaChannel)
-{
-	UseAlphaChannel = useAlphaChannel;
-}
-
-
-//! Returns if the alpha channel should be used for drawing images on the button
-bool GUIButton::isAlphaChannelUsed() const
-{
-	return UseAlphaChannel;
-}
-
-
-bool GUIButton::isDrawingBorder() const
-{
-	return DrawBorder;
-}
-
-
-// PATCH
-GUIButton* GUIButton::addButton(IGUIEnvironment *environment,
-		const core::rect<s32>& rectangle, ISimpleTextureSource *tsrc,
-		IGUIElement* parent, s32 id, const wchar_t* text,
-		const wchar_t *tooltiptext)
-{
-	GUIButton* button = new GUIButton(environment, parent ? parent : environment->getRootGUIElement(), id, rectangle, tsrc);
-	if (text)
-		button->setText(text);
-
-	if ( tooltiptext )
-		button->setToolTipText ( tooltiptext );
-
-	button->drop();
-	return button;
-}
-
-void GUIButton::setColor(video::SColor color)
-{
-	BgColor = color;
-
-	float d = 0.65f;
-	for (size_t i = 0; i < 4; i++) {
-		video::SColor base = Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);
-		Colors[i] = base.getInterpolated(color, d);
-	}
-}
-
-//! Set element properties from a StyleSpec corresponding to the button state
-void GUIButton::setFromState()
-{
-	StyleSpec::State state = StyleSpec::STATE_DEFAULT;
-
-	if (isPressed())
-		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_PRESSED);
-
-	if (isHovered())
-		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_HOVERED);
-
-	if (isFocused())
-		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_FOCUSED);
-
-	setFromStyle(StyleSpec::getStyleFromStatePropagation(Styles, state));
-}
-
-//! Set element properties from a StyleSpec
-void GUIButton::setFromStyle(const StyleSpec& style)
-{
-	bool hovered = (style.getState() & StyleSpec::STATE_HOVERED) != 0;
-	bool pressed = (style.getState() & StyleSpec::STATE_PRESSED) != 0;
-
-	if (style.isNotDefault(StyleSpec::BGCOLOR)) {
-		setColor(style.getColor(StyleSpec::BGCOLOR));
-
-		// If we have a propagated hover/press color, we need to automatically
-		// lighten/darken it
-		if (!Styles[style.getState()].isNotDefault(StyleSpec::BGCOLOR)) {
-				if (pressed) {
-					BgColor = multiplyColorValue(BgColor, COLOR_PRESSED_MOD);
-
-					for (size_t i = 0; i < 4; i++)
-						Colors[i] = multiplyColorValue(Colors[i], COLOR_PRESSED_MOD);
-				} else if (hovered) {
-					BgColor = multiplyColorValue(BgColor, COLOR_HOVERED_MOD);
-
-					for (size_t i = 0; i < 4; i++)
-						Colors[i] = multiplyColorValue(Colors[i], COLOR_HOVERED_MOD);
-				}
-		}
-
-	} else {
-		BgColor = video::SColor(255, 255, 255, 255);
-		for (size_t i = 0; i < 4; i++) {
-			video::SColor base =
-					Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);
-			if (pressed) {
-				Colors[i] = multiplyColorValue(base, COLOR_PRESSED_MOD);
-			} else if (hovered) {
-				Colors[i] = multiplyColorValue(base, COLOR_HOVERED_MOD);
-			} else {
-				Colors[i] = base;
-			}
-		}
-	}
-
-	if (style.isNotDefault(StyleSpec::TEXTCOLOR)) {
-		setOverrideColor(style.getColor(StyleSpec::TEXTCOLOR));
-	} else {
-		setOverrideColor(video::SColor(255,255,255,255));
-		OverrideColorEnabled = false;
-	}
-	setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
-	setDrawBorder(style.getBool(StyleSpec::BORDER, true));
-	setUseAlphaChannel(style.getBool(StyleSpec::ALPHA, true));
-	setOverrideFont(style.getFont());
-
-	if (style.isNotDefault(StyleSpec::BGIMG)) {
-		video::ITexture *texture = style.getTexture(StyleSpec::BGIMG,
-				getTextureSource());
-		setImage(guiScalingImageButton(
-				Environment->getVideoDriver(), texture,
-						AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
-		setScaleImage(true);
-	} else {
-		setImage(nullptr);
-	}
-
-	BgMiddle = style.getRect(StyleSpec::BGIMG_MIDDLE, BgMiddle);
-
-	// Child padding and offset
-	Padding = style.getRect(StyleSpec::PADDING, core::rect<s32>());
-	Padding = core::rect<s32>(
-			Padding.UpperLeftCorner + BgMiddle.UpperLeftCorner,
-			Padding.LowerRightCorner + BgMiddle.LowerRightCorner);
-
-	GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
-	core::vector2d<s32> defaultPressOffset(
-			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
-			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y));
-	ContentOffset = style.getVector2i(StyleSpec::CONTENT_OFFSET, isPressed()
-			? defaultPressOffset
-			: core::vector2d<s32>(0));
-
-	core::rect<s32> childBounds(
-				Padding.UpperLeftCorner.X + ContentOffset.X,
-				Padding.UpperLeftCorner.Y + ContentOffset.Y,
-				AbsoluteRect.getWidth() + Padding.LowerRightCorner.X + ContentOffset.X,
-				AbsoluteRect.getHeight() + Padding.LowerRightCorner.Y + ContentOffset.Y);
-
-	for (IGUIElement *child : getChildren()) {
-		child->setRelativePosition(childBounds);
-	}
-}
-
-//! Set the styles used for each state
-void GUIButton::setStyles(const std::array<StyleSpec, StyleSpec::NUM_STATES>& styles)
-{
-	Styles = styles;
-	setFromState();
-}
-// END PATCH
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "guiButton.h"
+
+
+#include "client/guiscalingfilter.h"
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "irrlicht_changes/static_text.h"
+#include "porting.h"
+#include "StyleSpec.h"
+#include "util/numeric.h"
+
+using namespace irr;
+using namespace gui;
+
+// Multiply with a color to get the default corresponding hovered color
+#define COLOR_HOVERED_MOD 1.25f
+
+// Multiply with a color to get the default corresponding pressed color
+#define COLOR_PRESSED_MOD 0.85f
+
+//! constructor
+GUIButton::GUIButton(IGUIEnvironment* environment, IGUIElement* parent,
+		s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
+		bool noclip) :
+	IGUIButton(environment, parent, id, rectangle),
+	TSrc(tsrc)
+{
+	setNotClipped(noclip);
+
+	// This element can be tabbed.
+	setTabStop(true);
+	setTabOrder(-1);
+
+	// PATCH
+	for (size_t i = 0; i < 4; i++) {
+		Colors[i] = Environment->getSkin()->getColor((EGUI_DEFAULT_COLOR)i);
+	}
+	StaticText = gui::StaticText::add(Environment, Text.c_str(), core::rect<s32>(0,0,rectangle.getWidth(),rectangle.getHeight()), false, false, this, id);
+	StaticText->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
+	// END PATCH
+}
+
+//! destructor
+GUIButton::~GUIButton()
+{
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+}
+
+
+//! Sets if the images should be scaled to fit the button
+void GUIButton::setScaleImage(bool scaleImage)
+{
+	ScaleImage = scaleImage;
+}
+
+
+//! Returns whether the button scale the used images
+bool GUIButton::isScalingImage() const
+{
+	return ScaleImage;
+}
+
+
+//! Sets if the button should use the skin to draw its border
+void GUIButton::setDrawBorder(bool border)
+{
+	DrawBorder = border;
+}
+
+
+void GUIButton::setSpriteBank(IGUISpriteBank* sprites)
+{
+	if (sprites)
+		sprites->grab();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+
+	SpriteBank = sprites;
+}
+
+void GUIButton::setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop)
+{
+	ButtonSprites[(u32)state].Index	= index;
+	ButtonSprites[(u32)state].Color	= color;
+	ButtonSprites[(u32)state].Loop	= loop;
+}
+
+//! Get the sprite-index for the given state or -1 when no sprite is set
+s32 GUIButton::getSpriteIndex(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Index;
+}
+
+//! Get the sprite color for the given state. Color is only used when a sprite is set.
+video::SColor GUIButton::getSpriteColor(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Color;
+}
+
+//! Returns if the sprite in the given state does loop
+bool GUIButton::getSpriteLoop(EGUI_BUTTON_STATE state) const
+{
+	return ButtonSprites[(u32)state].Loop;
+}
+
+//! called if an event happened.
+bool GUIButton::OnEvent(const SEvent& event)
+{
+	if (!isEnabled())
+		return IGUIElement::OnEvent(event);
+
+	switch(event.EventType)
+	{
+	case EET_KEY_INPUT_EVENT:
+		if (event.KeyInput.PressedDown &&
+			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
+		{
+			if (!IsPushButton)
+				setPressed(true);
+			else
+				setPressed(!Pressed);
+
+			return true;
+		}
+		if (Pressed && !IsPushButton && event.KeyInput.PressedDown && event.KeyInput.Key == KEY_ESCAPE)
+		{
+			setPressed(false);
+			return true;
+		}
+		else
+		if (!event.KeyInput.PressedDown && Pressed &&
+			(event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE))
+		{
+
+			if (!IsPushButton)
+				setPressed(false);
+
+			if (Parent)
+			{
+				ClickShiftState = event.KeyInput.Shift;
+				ClickControlState = event.KeyInput.Control;
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
+				Parent->OnEvent(newEvent);
+			}
+			return true;
+		}
+		break;
+	case EET_GUI_EVENT:
+		if (event.GUIEvent.Caller == this)
+		{
+			if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+			{
+				if (!IsPushButton)
+					setPressed(false);
+				FocusTime = (u32)porting::getTimeMs();
+			}
+			else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUSED)
+			{
+				FocusTime = (u32)porting::getTimeMs();
+			}
+			else if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED || event.GUIEvent.EventType == EGET_ELEMENT_LEFT)
+			{
+				HoverTime = (u32)porting::getTimeMs();
+			}
+		}
+		break;
+	case EET_MOUSE_INPUT_EVENT:
+		if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+		{
+			// Sometimes formspec elements can receive mouse events when the
+			// mouse is outside of the formspec. Thus, we test the position here.
+			if ( !IsPushButton && AbsoluteClippingRect.isPointInside(
+						core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y ))) {
+				Environment->setFocus(this);
+				setPressed(true);
+			}
+
+			return true;
+		}
+		else
+		if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
+		{
+			bool wasPressed = Pressed;
+
+			if ( !AbsoluteClippingRect.isPointInside( core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y ) ) )
+			{
+				if (!IsPushButton)
+					setPressed(false);
+				return true;
+			}
+
+			if (!IsPushButton)
+				setPressed(false);
+			else
+			{
+				setPressed(!Pressed);
+			}
+
+			if ((!IsPushButton && wasPressed && Parent) ||
+				(IsPushButton && wasPressed != Pressed))
+			{
+				ClickShiftState = event.MouseInput.Shift;
+				ClickControlState = event.MouseInput.Control;
+
+				SEvent newEvent;
+				newEvent.EventType = EET_GUI_EVENT;
+				newEvent.GUIEvent.Caller = this;
+				newEvent.GUIEvent.Element = 0;
+				newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
+				Parent->OnEvent(newEvent);
+			}
+
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+
+	return Parent ? Parent->OnEvent(event) : false;
+}
+
+
+//! draws the element and its children
+void GUIButton::draw()
+{
+	if (!IsVisible)
+		return;
+
+	// PATCH
+	// Track hovered state, if it has changed then we need to update the style.
+	bool hovered = isHovered();
+	bool focused = isFocused();
+	if (hovered != WasHovered || focused != WasFocused) {
+		WasHovered = hovered;
+		WasFocused = focused;
+		setFromState();
+	}
+
+	GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
+	video::IVideoDriver* driver = Environment->getVideoDriver();
+	// END PATCH
+
+	if (DrawBorder)
+	{
+		if (!Pressed)
+		{
+			// PATCH
+			skin->drawColored3DButtonPaneStandard(this, AbsoluteRect,
+					&AbsoluteClippingRect, Colors);
+			// END PATCH
+		}
+		else
+		{
+			// PATCH
+			skin->drawColored3DButtonPanePressed(this, AbsoluteRect,
+					&AbsoluteClippingRect, Colors);
+			// END PATCH
+		}
+	}
+
+	const core::position2di buttonCenter(AbsoluteRect.getCenter());
+	// PATCH
+	// The image changes based on the state, so we use the default every time.
+	EGUI_BUTTON_IMAGE_STATE imageState = EGBIS_IMAGE_UP;
+	// END PATCH
+	if ( ButtonImages[(u32)imageState].Texture )
+	{
+		core::position2d<s32> pos(buttonCenter);
+		core::rect<s32> sourceRect(ButtonImages[(u32)imageState].SourceRect);
+		if ( sourceRect.getWidth() == 0 && sourceRect.getHeight() == 0 )
+			sourceRect = core::rect<s32>(core::position2di(0,0), ButtonImages[(u32)imageState].Texture->getOriginalSize());
+
+		pos.X -= sourceRect.getWidth() / 2;
+		pos.Y -= sourceRect.getHeight() / 2;
+
+		if ( Pressed )
+		{
+			// Create a pressed-down effect by moving the image when it looks identical to the unpressed state image
+			EGUI_BUTTON_IMAGE_STATE unpressedState = getImageState(false);
+			if ( unpressedState == imageState || ButtonImages[(u32)imageState] == ButtonImages[(u32)unpressedState] )
+			{
+				pos.X += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X);
+				pos.Y += skin->getSize(EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y);
+			}
+		}
+
+		// PATCH
+		video::ITexture* texture = ButtonImages[(u32)imageState].Texture;
+		video::SColor image_colors[] = { BgColor, BgColor, BgColor, BgColor };
+		if (BgMiddle.getArea() == 0) {
+			driver->draw2DImage(texture,
+					ScaleImage? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
+					sourceRect, &AbsoluteClippingRect,
+					image_colors, UseAlphaChannel);
+		} else {
+			draw2DImage9Slice(driver, texture,
+					ScaleImage ? AbsoluteRect : core::rect<s32>(pos, sourceRect.getSize()),
+					sourceRect, BgMiddle, &AbsoluteClippingRect, image_colors);
+		}
+		// END PATCH
+	}
+
+	if (SpriteBank)
+	{
+		if (isEnabled())
+		{
+			core::position2di pos(buttonCenter);
+			// pressed / unpressed animation
+			EGUI_BUTTON_STATE state = Pressed ? EGBS_BUTTON_DOWN : EGBS_BUTTON_UP;
+			drawSprite(state, ClickTime, pos);
+
+			// focused / unfocused animation
+			state = Environment->hasFocus(this) ? EGBS_BUTTON_FOCUSED : EGBS_BUTTON_NOT_FOCUSED;
+			drawSprite(state, FocusTime, pos);
+
+			// mouse over / off animation
+			state = isHovered() ? EGBS_BUTTON_MOUSE_OVER : EGBS_BUTTON_MOUSE_OFF;
+			drawSprite(state, HoverTime, pos);
+		}
+		else
+		{
+			// draw disabled
+//			drawSprite(EGBS_BUTTON_DISABLED, 0, pos);
+		}
+	}
+
+	IGUIElement::draw();
+}
+
+void GUIButton::drawSprite(EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center)
+{
+	u32 stateIdx = (u32)state;
+	s32 spriteIdx = ButtonSprites[stateIdx].Index;
+	if (spriteIdx == -1)
+		return;
+
+	u32 rectIdx = SpriteBank->getSprites()[spriteIdx].Frames[0].rectNumber;
+	core::rect<s32> srcRect = SpriteBank->getPositions()[rectIdx];
+
+	IGUISkin *skin = Environment->getSkin();
+	s32 scale = std::max(std::floor(skin->getScale()), 1.0f);
+	core::rect<s32> rect(center, srcRect.getSize() * scale);
+	rect -= rect.getSize() / 2;
+
+	const video::SColor colors[] = {
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+		ButtonSprites[stateIdx].Color,
+	};
+	SpriteBank->draw2DSprite(spriteIdx, rect, &AbsoluteClippingRect, colors,
+			porting::getTimeMs() - startTime, ButtonSprites[stateIdx].Loop);
+}
+
+EGUI_BUTTON_IMAGE_STATE GUIButton::getImageState(bool pressed) const
+{
+	// PATCH
+	return getImageState(pressed, ButtonImages);
+	// END PATCH
+}
+
+EGUI_BUTTON_IMAGE_STATE GUIButton::getImageState(bool pressed, const ButtonImage* images) const
+{
+	// figure state we should have
+	EGUI_BUTTON_IMAGE_STATE state = EGBIS_IMAGE_DISABLED;
+	bool focused = isFocused();
+	bool mouseOver = isHovered();
+	if (isEnabled())
+	{
+		if ( pressed )
+		{
+			if ( focused && mouseOver )
+				state = EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER;
+			else if ( focused )
+				state = EGBIS_IMAGE_DOWN_FOCUSED;
+			else if ( mouseOver )
+				state = EGBIS_IMAGE_DOWN_MOUSEOVER;
+			else
+				state = EGBIS_IMAGE_DOWN;
+		}
+		else // !pressed
+		{
+			if ( focused && mouseOver )
+				state = EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER;
+			else if ( focused )
+				state = EGBIS_IMAGE_UP_FOCUSED;
+			else if ( mouseOver )
+				state = EGBIS_IMAGE_UP_MOUSEOVER;
+			else
+				state = EGBIS_IMAGE_UP;
+		}
+	}
+
+	// find a compatible state that has images
+	while ( state != EGBIS_IMAGE_UP && !images[(u32)state].Texture )
+	{
+		// PATCH
+		switch ( state )
+		{
+			case EGBIS_IMAGE_UP_FOCUSED:
+				state = EGBIS_IMAGE_UP;
+				break;
+			case EGBIS_IMAGE_UP_FOCUSED_MOUSEOVER:
+				state = EGBIS_IMAGE_UP_FOCUSED;
+				break;
+			case EGBIS_IMAGE_DOWN_MOUSEOVER:
+				state = EGBIS_IMAGE_DOWN;
+				break;
+			case EGBIS_IMAGE_DOWN_FOCUSED:
+				state = EGBIS_IMAGE_DOWN;
+				break;
+			case EGBIS_IMAGE_DOWN_FOCUSED_MOUSEOVER:
+				state = EGBIS_IMAGE_DOWN_FOCUSED;
+				break;
+			case EGBIS_IMAGE_DISABLED:
+				if ( pressed )
+					state = EGBIS_IMAGE_DOWN;
+				else
+					state = EGBIS_IMAGE_UP;
+				break;
+			default:
+				state = EGBIS_IMAGE_UP;
+		}
+		// END PATCH
+	}
+
+	return state;
+}
+
+//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
+void GUIButton::setOverrideFont(IGUIFont* font)
+{
+	if (OverrideFont == font)
+		return;
+
+	if (OverrideFont)
+		OverrideFont->drop();
+
+	OverrideFont = font;
+
+	if (OverrideFont)
+		OverrideFont->grab();
+
+	StaticText->setOverrideFont(font);
+}
+
+//! Gets the override font (if any)
+IGUIFont * GUIButton::getOverrideFont() const
+{
+	return OverrideFont;
+}
+
+//! Get the font which is used right now for drawing
+IGUIFont* GUIButton::getActiveFont() const
+{
+	if ( OverrideFont )
+		return OverrideFont;
+	IGUISkin* skin = Environment->getSkin();
+	if (skin)
+		return skin->getFont(EGDF_BUTTON);
+	return 0;
+}
+
+//! Sets another color for the text.
+void GUIButton::setOverrideColor(video::SColor color)
+{
+	OverrideColor = color;
+	OverrideColorEnabled = true;
+
+	StaticText->setOverrideColor(color);
+}
+
+video::SColor GUIButton::getOverrideColor() const
+{
+	return OverrideColor;
+}
+
+video::SColor GUIButton::getActiveColor() const
+{
+	return video::SColor(0,0,0,0); // unused?
+}
+
+void GUIButton::enableOverrideColor(bool enable)
+{
+	OverrideColorEnabled = enable;
+}
+
+bool GUIButton::isOverrideColorEnabled() const
+{
+	return OverrideColorEnabled;
+}
+
+void GUIButton::setImage(EGUI_BUTTON_IMAGE_STATE state, video::ITexture* image, const core::rect<s32>& sourceRect)
+{
+	if ( state >= EGBIS_COUNT )
+		return;
+
+	if ( image )
+		image->grab();
+
+	u32 stateIdx = (u32)state;
+	if ( ButtonImages[stateIdx].Texture )
+		ButtonImages[stateIdx].Texture->drop();
+
+	ButtonImages[stateIdx].Texture = image;
+	ButtonImages[stateIdx].SourceRect = sourceRect;
+}
+
+// PATCH
+void GUIButton::setImage(video::ITexture* image)
+{
+	setImage(gui::EGBIS_IMAGE_UP, image);
+}
+
+void GUIButton::setImage(video::ITexture* image, const core::rect<s32>& pos)
+{
+	setImage(gui::EGBIS_IMAGE_UP, image, pos);
+}
+
+void GUIButton::setPressedImage(video::ITexture* image)
+{
+	setImage(gui::EGBIS_IMAGE_DOWN, image);
+}
+
+void GUIButton::setPressedImage(video::ITexture* image, const core::rect<s32>& pos)
+{
+	setImage(gui::EGBIS_IMAGE_DOWN, image, pos);
+}
+
+//! Sets the text displayed by the button
+void GUIButton::setText(const wchar_t* text)
+{
+	StaticText->setText(text);
+
+	IGUIButton::setText(text);
+}
+// END PATCH
+
+//! Sets if the button should behave like a push button. Which means it
+//! can be in two states: Normal or Pressed. With a click on the button,
+//! the user can change the state of the button.
+void GUIButton::setIsPushButton(bool isPushButton)
+{
+	IsPushButton = isPushButton;
+}
+
+
+//! Returns if the button is currently pressed
+bool GUIButton::isPressed() const
+{
+	return Pressed;
+}
+
+// PATCH
+//! Returns if this element (or one of its direct children) is hovered
+bool GUIButton::isHovered() const
+{
+	IGUIElement *hovered = Environment->getHovered();
+	return  hovered == this || (hovered != nullptr && hovered->getParent() == this);
+}
+
+//! Returns if this element (or one of its direct children) is focused
+bool GUIButton::isFocused() const
+{
+	return Environment->hasFocus((IGUIElement*)this, true);
+}
+// END PATCH
+
+//! Sets the pressed state of the button if this is a pushbutton
+void GUIButton::setPressed(bool pressed)
+{
+	if (Pressed != pressed)
+	{
+		ClickTime = porting::getTimeMs();
+		Pressed = pressed;
+		setFromState();
+	}
+}
+
+
+//! Returns whether the button is a push button
+bool GUIButton::isPushButton() const
+{
+	return IsPushButton;
+}
+
+
+//! Sets if the alpha channel should be used for drawing images on the button (default is false)
+void GUIButton::setUseAlphaChannel(bool useAlphaChannel)
+{
+	UseAlphaChannel = useAlphaChannel;
+}
+
+
+//! Returns if the alpha channel should be used for drawing images on the button
+bool GUIButton::isAlphaChannelUsed() const
+{
+	return UseAlphaChannel;
+}
+
+
+bool GUIButton::isDrawingBorder() const
+{
+	return DrawBorder;
+}
+
+
+// PATCH
+GUIButton* GUIButton::addButton(IGUIEnvironment *environment,
+		const core::rect<s32>& rectangle, ISimpleTextureSource *tsrc,
+		IGUIElement* parent, s32 id, const wchar_t* text,
+		const wchar_t *tooltiptext)
+{
+	GUIButton* button = new GUIButton(environment, parent ? parent : environment->getRootGUIElement(), id, rectangle, tsrc);
+	if (text)
+		button->setText(text);
+
+	if ( tooltiptext )
+		button->setToolTipText ( tooltiptext );
+
+	button->drop();
+	return button;
+}
+
+void GUIButton::setColor(video::SColor color)
+{
+	BgColor = color;
+
+	float d = 0.65f;
+	for (size_t i = 0; i < 4; i++) {
+		video::SColor base = Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);
+		Colors[i] = base.getInterpolated(color, d);
+	}
+}
+
+//! Set element properties from a StyleSpec corresponding to the button state
+void GUIButton::setFromState()
+{
+	StyleSpec::State state = StyleSpec::STATE_DEFAULT;
+
+	if (isPressed())
+		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_PRESSED);
+
+	if (isHovered())
+		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_HOVERED);
+
+	if (isFocused())
+		state = static_cast<StyleSpec::State>(state | StyleSpec::STATE_FOCUSED);
+
+	setFromStyle(StyleSpec::getStyleFromStatePropagation(Styles, state));
+}
+
+//! Set element properties from a StyleSpec
+void GUIButton::setFromStyle(const StyleSpec& style)
+{
+	bool hovered = (style.getState() & StyleSpec::STATE_HOVERED) != 0;
+	bool pressed = (style.getState() & StyleSpec::STATE_PRESSED) != 0;
+
+	if (style.isNotDefault(StyleSpec::BGCOLOR)) {
+		setColor(style.getColor(StyleSpec::BGCOLOR));
+
+		// If we have a propagated hover/press color, we need to automatically
+		// lighten/darken it
+		if (!Styles[style.getState()].isNotDefault(StyleSpec::BGCOLOR)) {
+				if (pressed) {
+					BgColor = multiplyColorValue(BgColor, COLOR_PRESSED_MOD);
+
+					for (size_t i = 0; i < 4; i++)
+						Colors[i] = multiplyColorValue(Colors[i], COLOR_PRESSED_MOD);
+				} else if (hovered) {
+					BgColor = multiplyColorValue(BgColor, COLOR_HOVERED_MOD);
+
+					for (size_t i = 0; i < 4; i++)
+						Colors[i] = multiplyColorValue(Colors[i], COLOR_HOVERED_MOD);
+				}
+		}
+
+	} else {
+		BgColor = video::SColor(255, 255, 255, 255);
+		for (size_t i = 0; i < 4; i++) {
+			video::SColor base =
+					Environment->getSkin()->getColor((gui::EGUI_DEFAULT_COLOR)i);
+			if (pressed) {
+				Colors[i] = multiplyColorValue(base, COLOR_PRESSED_MOD);
+			} else if (hovered) {
+				Colors[i] = multiplyColorValue(base, COLOR_HOVERED_MOD);
+			} else {
+				Colors[i] = base;
+			}
+		}
+	}
+
+	if (style.isNotDefault(StyleSpec::TEXTCOLOR)) {
+		setOverrideColor(style.getColor(StyleSpec::TEXTCOLOR));
+	} else {
+		setOverrideColor(video::SColor(255,255,255,255));
+		OverrideColorEnabled = false;
+	}
+	setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
+	setDrawBorder(style.getBool(StyleSpec::BORDER, true));
+	setUseAlphaChannel(style.getBool(StyleSpec::ALPHA, true));
+	setOverrideFont(style.getFont());
+
+	if (style.isNotDefault(StyleSpec::BGIMG)) {
+		video::ITexture *texture = style.getTexture(StyleSpec::BGIMG,
+				getTextureSource());
+		setImage(guiScalingImageButton(
+				Environment->getVideoDriver(), texture,
+						AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
+		setScaleImage(true);
+	} else {
+		setImage(nullptr);
+	}
+
+	BgMiddle = style.getRect(StyleSpec::BGIMG_MIDDLE, BgMiddle);
+
+	// Child padding and offset
+	Padding = style.getRect(StyleSpec::PADDING, core::rect<s32>());
+	Padding = core::rect<s32>(
+			Padding.UpperLeftCorner + BgMiddle.UpperLeftCorner,
+			Padding.LowerRightCorner + BgMiddle.LowerRightCorner);
+
+	GUISkin* skin = dynamic_cast<GUISkin*>(Environment->getSkin());
+	core::vector2d<s32> defaultPressOffset(
+			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X),
+			skin->getSize(irr::gui::EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y));
+	ContentOffset = style.getVector2i(StyleSpec::CONTENT_OFFSET, isPressed()
+			? defaultPressOffset
+			: core::vector2d<s32>(0));
+
+	core::rect<s32> childBounds(
+				Padding.UpperLeftCorner.X + ContentOffset.X,
+				Padding.UpperLeftCorner.Y + ContentOffset.Y,
+				AbsoluteRect.getWidth() + Padding.LowerRightCorner.X + ContentOffset.X,
+				AbsoluteRect.getHeight() + Padding.LowerRightCorner.Y + ContentOffset.Y);
+
+	for (IGUIElement *child : getChildren()) {
+		child->setRelativePosition(childBounds);
+	}
+}
+
+//! Set the styles used for each state
+void GUIButton::setStyles(const std::array<StyleSpec, StyleSpec::NUM_STATES>& styles)
+{
+	Styles = styles;
+	setFromState();
+}
+// END PATCH
diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h
index b0fc4b647..4fad8747c 100644
--- a/src/gui/guiButton.h
+++ b/src/gui/guiButton.h
@@ -1,280 +1,276 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#pragma once
-
-#include <IGUIStaticText.h>
-#include "irrlicht_changes/static_text.h"
-#include "IGUIButton.h"
-#include "IGUISpriteBank.h"
-#include "ITexture.h"
-#include "SColor.h"
-#include "guiSkin.h"
-#include "StyleSpec.h"
-
-using namespace irr;
-
-class ISimpleTextureSource;
-
-class GUIButton : public gui::IGUIButton
-{
-public:
-
-	//! constructor
-	GUIButton(gui::IGUIEnvironment* environment, gui::IGUIElement* parent,
-			   s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
-			   bool noclip=false);
-
-	//! destructor
-	virtual ~GUIButton();
-
-	//! called if an event happened.
-	virtual bool OnEvent(const SEvent& event) override;
-
-	//! draws the element and its children
-	virtual void draw() override;
-
-	//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
-	virtual void setOverrideFont(gui::IGUIFont* font=0) override;
-
-	//! Gets the override font (if any)
-	virtual gui::IGUIFont* getOverrideFont() const override;
-
-	//! Get the font which is used right now for drawing
-	virtual gui::IGUIFont* getActiveFont() const override;
-
-	//! Sets another color for the button text.
-	virtual void setOverrideColor(video::SColor color) override;
-
-	//! Gets the override color
-	virtual video::SColor getOverrideColor() const override;
-
-	//! Gets the currently used text color
-	virtual video::SColor getActiveColor() const override;
-
-	//! Sets if the button text should use the override color or the color in the gui skin.
-	virtual void enableOverrideColor(bool enable) override;
-
-	//! Checks if an override color is enabled
-	virtual bool isOverrideColorEnabled(void) const override;
-
-	// PATCH
-	//! Sets an image which should be displayed on the button when it is in the given state.
-	virtual void setImage(gui::EGUI_BUTTON_IMAGE_STATE state,
-			video::ITexture* image=nullptr,
-			const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) override;
-
-	//! Sets an image which should be displayed on the button when it is in normal state.
-	virtual void setImage(video::ITexture* image=nullptr) override;
-
-	//! Sets an image which should be displayed on the button when it is in normal state.
-	virtual void setImage(video::ITexture* image, const core::rect<s32>& pos) override;
-
-	//! Sets an image which should be displayed on the button when it is in pressed state.
-	virtual void setPressedImage(video::ITexture* image=nullptr) override;
-
-	//! Sets an image which should be displayed on the button when it is in pressed state.
-	virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) override;
-
-	//! Sets the text displayed by the button
-	virtual void setText(const wchar_t* text) override;
-	// END PATCH
-
-	//! Sets the sprite bank used by the button
-	virtual void setSpriteBank(gui::IGUISpriteBank* bank=0) override;
-
-	//! Sets the animated sprite for a specific button state
-	/** \param index: Number of the sprite within the sprite bank, use -1 for no sprite
-	\param state: State of the button to set the sprite for
-	\param index: The sprite number from the current sprite bank
-	\param color: The color of the sprite
-	*/
-	virtual void setSprite(gui::EGUI_BUTTON_STATE state, s32 index,
-						   video::SColor color=video::SColor(255,255,255,255),
-						   bool loop=false, bool scale=false) override;
-
-	//! Get the sprite-index for the given state or -1 when no sprite is set
-	virtual s32 getSpriteIndex(gui::EGUI_BUTTON_STATE state) const override;
-
-	//! Get the sprite color for the given state. Color is only used when a sprite is set.
-	virtual video::SColor getSpriteColor(gui::EGUI_BUTTON_STATE state) const override;
-
-	//! Returns if the sprite in the given state does loop
-	virtual bool getSpriteLoop(gui::EGUI_BUTTON_STATE state) const override;
-
-	//! Returns if the sprite in the given state is scaled
-	virtual bool getSpriteScale(gui::EGUI_BUTTON_STATE state) const override;
-
-	//! Sets if the button should behave like a push button. Which means it
-	//! can be in two states: Normal or Pressed. With a click on the button,
-	//! the user can change the state of the button.
-	virtual void setIsPushButton(bool isPushButton=true) override;
-
-	//! Checks whether the button is a push button
-	virtual bool isPushButton() const override;
-
-	//! Sets the pressed state of the button if this is a pushbutton
-	virtual void setPressed(bool pressed=true) override;
-
-	//! Returns if the button is currently pressed
-	virtual bool isPressed() const override;
-
-	// PATCH
-	//! Returns if this element (or one of its direct children) is hovered
-	bool isHovered() const;
-
-	//! Returns if this element (or one of its direct children) is focused
-	bool isFocused() const;
-	// END PATCH
-
-	//! Sets if the button should use the skin to draw its border
-	virtual void setDrawBorder(bool border=true) override;
-
-	//! Checks if the button face and border are being drawn
-	virtual bool isDrawingBorder() const override;
-
-	//! Sets if the alpha channel should be used for drawing images on the button (default is false)
-	virtual void setUseAlphaChannel(bool useAlphaChannel=true) override;
-
-	//! Checks if the alpha channel should be used for drawing images on the button
-	virtual bool isAlphaChannelUsed() const override;
-
-	//! Sets if the button should scale the button images to fit
-	virtual void setScaleImage(bool scaleImage=true) override;
-
-	//! Checks whether the button scales the used images
-	virtual bool isScalingImage() const override;
-
-	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
-	virtual bool getClickShiftState() const override
-	{
-		return ClickShiftState;
-	}
-
-	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
-	virtual bool getClickControlState() const override
-	{
-		return ClickControlState;
-	}
-
-	void setColor(video::SColor color);
-	// PATCH
-	//! Set element properties from a StyleSpec corresponding to the button state
-	void setFromState();
-
-	//! Set element properties from a StyleSpec
-	virtual void setFromStyle(const StyleSpec& style);
-
-	//! Set the styles used for each state
-	void setStyles(const std::array<StyleSpec, StyleSpec::NUM_STATES>& styles);
-	// END PATCH
-
-
-	//! Do not drop returned handle
-	static GUIButton* addButton(gui::IGUIEnvironment *environment,
-			const core::rect<s32>& rectangle, ISimpleTextureSource *tsrc,
-			IGUIElement* parent, s32 id, const wchar_t* text,
-			const wchar_t *tooltiptext=L"");
-
-protected:
-	void drawSprite(gui::EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center);
-	gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed) const;
-
-	ISimpleTextureSource *getTextureSource() { return TSrc; }
-
-	struct ButtonImage
-	{
-		ButtonImage() = default;
-
-		ButtonImage(const ButtonImage& other)
-		{
-			*this = other;
-		}
-
-		~ButtonImage()
-		{
-			if ( Texture )
-				Texture->drop();
-		}
-
-		ButtonImage& operator=(const ButtonImage& other)
-		{
-			if ( this == &other )
-				return *this;
-
-			if (other.Texture)
-				other.Texture->grab();
-			if ( Texture )
-				Texture->drop();
-			Texture = other.Texture;
-			SourceRect = other.SourceRect;
-			return *this;
-		}
-
-		bool operator==(const ButtonImage& other) const
-		{
-			return Texture == other.Texture && SourceRect == other.SourceRect;
-		}
-
-
-		video::ITexture* Texture = nullptr;
-		core::rect<s32> SourceRect = core::rect<s32>(0,0,0,0);
-	};
-
-	gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed, const ButtonImage* images) const;
-
-private:
-
-	struct ButtonSprite
-	{
-		bool operator==(const ButtonSprite &other) const
-		{
-			return Index == other.Index && Color == other.Color && Loop == other.Loop && Scale == other.Scale;
-		}
-
-		s32 Index = -1;
-		video::SColor Color;
-		bool Loop = false;
-		bool Scale = false;
-	};
-
-	ButtonSprite ButtonSprites[gui::EGBS_COUNT];
-	gui::IGUISpriteBank* SpriteBank = nullptr;
-
-	ButtonImage ButtonImages[gui::EGBIS_COUNT];
-
-	std::array<StyleSpec, StyleSpec::NUM_STATES> Styles;
-
-	gui::IGUIFont* OverrideFont = nullptr;
-
-	bool OverrideColorEnabled = false;
-	video::SColor OverrideColor = video::SColor(101,255,255,255);
-
-	u32 ClickTime = 0;
-	u32 HoverTime = 0;
-	u32 FocusTime = 0;
-
-	bool ClickShiftState = false;
-	bool ClickControlState = false;
-
-	bool IsPushButton = false;
-	bool Pressed = false;
-	bool UseAlphaChannel = false;
-	bool DrawBorder = true;
-	bool ScaleImage = false;
-
-	video::SColor Colors[4];
-	// PATCH
-	bool WasHovered = false;
-	bool WasFocused = false;
-	ISimpleTextureSource *TSrc;
-
-	gui::IGUIStaticText *StaticText;
-
-	core::rect<s32> BgMiddle;
-	core::rect<s32> Padding;
-	core::vector2d<s32> ContentOffset;
-	video::SColor BgColor = video::SColor(0xFF,0xFF,0xFF,0xFF);
-	// END PATCH
-};
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#pragma once
+
+#include <IGUIStaticText.h>
+#include "irrlicht_changes/static_text.h"
+#include "IGUIButton.h"
+#include "IGUISpriteBank.h"
+#include "ITexture.h"
+#include "SColor.h"
+#include "guiSkin.h"
+#include "StyleSpec.h"
+
+using namespace irr;
+
+class ISimpleTextureSource;
+
+class GUIButton : public gui::IGUIButton
+{
+public:
+
+	//! constructor
+	GUIButton(gui::IGUIEnvironment* environment, gui::IGUIElement* parent,
+			   s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
+			   bool noclip=false);
+
+	//! destructor
+	virtual ~GUIButton();
+
+	//! called if an event happened.
+	virtual bool OnEvent(const SEvent& event) override;
+
+	//! draws the element and its children
+	virtual void draw() override;
+
+	//! sets another skin independent font. if this is set to zero, the button uses the font of the skin.
+	virtual void setOverrideFont(gui::IGUIFont* font=0) override;
+
+	//! Gets the override font (if any)
+	virtual gui::IGUIFont* getOverrideFont() const override;
+
+	//! Get the font which is used right now for drawing
+	virtual gui::IGUIFont* getActiveFont() const override;
+
+	//! Sets another color for the button text.
+	virtual void setOverrideColor(video::SColor color) override;
+
+	//! Gets the override color
+	virtual video::SColor getOverrideColor() const override;
+
+	//! Gets the currently used text color
+	virtual video::SColor getActiveColor() const override;
+
+	//! Sets if the button text should use the override color or the color in the gui skin.
+	virtual void enableOverrideColor(bool enable) override;
+
+	//! Checks if an override color is enabled
+	virtual bool isOverrideColorEnabled(void) const override;
+
+	// PATCH
+	//! Sets an image which should be displayed on the button when it is in the given state.
+	virtual void setImage(gui::EGUI_BUTTON_IMAGE_STATE state,
+			video::ITexture* image=nullptr,
+			const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) override;
+
+	//! Sets an image which should be displayed on the button when it is in normal state.
+	virtual void setImage(video::ITexture* image=nullptr) override;
+
+	//! Sets an image which should be displayed on the button when it is in normal state.
+	virtual void setImage(video::ITexture* image, const core::rect<s32>& pos) override;
+
+	//! Sets an image which should be displayed on the button when it is in pressed state.
+	virtual void setPressedImage(video::ITexture* image=nullptr) override;
+
+	//! Sets an image which should be displayed on the button when it is in pressed state.
+	virtual void setPressedImage(video::ITexture* image, const core::rect<s32>& pos) override;
+
+	//! Sets the text displayed by the button
+	virtual void setText(const wchar_t* text) override;
+	// END PATCH
+
+	//! Sets the sprite bank used by the button
+	virtual void setSpriteBank(gui::IGUISpriteBank* bank=0) override;
+
+	//! Sets the animated sprite for a specific button state
+	/** \param index: Number of the sprite within the sprite bank, use -1 for no sprite
+	\param state: State of the button to set the sprite for
+	\param index: The sprite number from the current sprite bank
+	\param color: The color of the sprite
+	*/
+	virtual void setSprite(gui::EGUI_BUTTON_STATE state, s32 index,
+						   video::SColor color=video::SColor(255,255,255,255),
+						   bool loop=false) override;
+
+	//! Get the sprite-index for the given state or -1 when no sprite is set
+	virtual s32 getSpriteIndex(gui::EGUI_BUTTON_STATE state) const override;
+
+	//! Get the sprite color for the given state. Color is only used when a sprite is set.
+	virtual video::SColor getSpriteColor(gui::EGUI_BUTTON_STATE state) const override;
+
+	//! Returns if the sprite in the given state does loop
+	virtual bool getSpriteLoop(gui::EGUI_BUTTON_STATE state) const override;
+
+	//! Sets if the button should behave like a push button. Which means it
+	//! can be in two states: Normal or Pressed. With a click on the button,
+	//! the user can change the state of the button.
+	virtual void setIsPushButton(bool isPushButton=true) override;
+
+	//! Checks whether the button is a push button
+	virtual bool isPushButton() const override;
+
+	//! Sets the pressed state of the button if this is a pushbutton
+	virtual void setPressed(bool pressed=true) override;
+
+	//! Returns if the button is currently pressed
+	virtual bool isPressed() const override;
+
+	// PATCH
+	//! Returns if this element (or one of its direct children) is hovered
+	bool isHovered() const;
+
+	//! Returns if this element (or one of its direct children) is focused
+	bool isFocused() const;
+	// END PATCH
+
+	//! Sets if the button should use the skin to draw its border
+	virtual void setDrawBorder(bool border=true) override;
+
+	//! Checks if the button face and border are being drawn
+	virtual bool isDrawingBorder() const override;
+
+	//! Sets if the alpha channel should be used for drawing images on the button (default is false)
+	virtual void setUseAlphaChannel(bool useAlphaChannel=true) override;
+
+	//! Checks if the alpha channel should be used for drawing images on the button
+	virtual bool isAlphaChannelUsed() const override;
+
+	//! Sets if the button should scale the button images to fit
+	virtual void setScaleImage(bool scaleImage=true) override;
+
+	//! Checks whether the button scales the used images
+	virtual bool isScalingImage() const override;
+
+	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event
+	virtual bool getClickShiftState() const override
+	{
+		return ClickShiftState;
+	}
+
+	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event
+	virtual bool getClickControlState() const override
+	{
+		return ClickControlState;
+	}
+
+	void setColor(video::SColor color);
+	// PATCH
+	//! Set element properties from a StyleSpec corresponding to the button state
+	void setFromState();
+
+	//! Set element properties from a StyleSpec
+	virtual void setFromStyle(const StyleSpec& style);
+
+	//! Set the styles used for each state
+	void setStyles(const std::array<StyleSpec, StyleSpec::NUM_STATES>& styles);
+	// END PATCH
+
+
+	//! Do not drop returned handle
+	static GUIButton* addButton(gui::IGUIEnvironment *environment,
+			const core::rect<s32>& rectangle, ISimpleTextureSource *tsrc,
+			IGUIElement* parent, s32 id, const wchar_t* text,
+			const wchar_t *tooltiptext=L"");
+
+protected:
+	void drawSprite(gui::EGUI_BUTTON_STATE state, u32 startTime, const core::position2di& center);
+	gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed) const;
+
+	ISimpleTextureSource *getTextureSource() { return TSrc; }
+
+	struct ButtonImage
+	{
+		ButtonImage() = default;
+
+		ButtonImage(const ButtonImage& other)
+		{
+			*this = other;
+		}
+
+		~ButtonImage()
+		{
+			if ( Texture )
+				Texture->drop();
+		}
+
+		ButtonImage& operator=(const ButtonImage& other)
+		{
+			if ( this == &other )
+				return *this;
+
+			if (other.Texture)
+				other.Texture->grab();
+			if ( Texture )
+				Texture->drop();
+			Texture = other.Texture;
+			SourceRect = other.SourceRect;
+			return *this;
+		}
+
+		bool operator==(const ButtonImage& other) const
+		{
+			return Texture == other.Texture && SourceRect == other.SourceRect;
+		}
+
+
+		video::ITexture* Texture = nullptr;
+		core::rect<s32> SourceRect = core::rect<s32>(0,0,0,0);
+	};
+
+	gui::EGUI_BUTTON_IMAGE_STATE getImageState(bool pressed, const ButtonImage* images) const;
+
+private:
+
+	struct ButtonSprite
+	{
+		bool operator==(const ButtonSprite &other) const
+		{
+			return Index == other.Index && Color == other.Color && Loop == other.Loop;
+		}
+
+		s32 Index = -1;
+		video::SColor Color;
+		bool Loop = false;
+	};
+
+	ButtonSprite ButtonSprites[gui::EGBS_COUNT];
+	gui::IGUISpriteBank* SpriteBank = nullptr;
+
+	ButtonImage ButtonImages[gui::EGBIS_COUNT];
+
+	std::array<StyleSpec, StyleSpec::NUM_STATES> Styles;
+
+	gui::IGUIFont* OverrideFont = nullptr;
+
+	bool OverrideColorEnabled = false;
+	video::SColor OverrideColor = video::SColor(101,255,255,255);
+
+	u32 ClickTime = 0;
+	u32 HoverTime = 0;
+	u32 FocusTime = 0;
+
+	bool ClickShiftState = false;
+	bool ClickControlState = false;
+
+	bool IsPushButton = false;
+	bool Pressed = false;
+	bool UseAlphaChannel = false;
+	bool DrawBorder = true;
+	bool ScaleImage = false;
+
+	video::SColor Colors[4];
+	// PATCH
+	bool WasHovered = false;
+	bool WasFocused = false;
+	ISimpleTextureSource *TSrc;
+
+	gui::IGUIStaticText *StaticText;
+
+	core::rect<s32> BgMiddle;
+	core::rect<s32> Padding;
+	core::vector2d<s32> ContentOffset;
+	video::SColor BgColor = video::SColor(0xFF,0xFF,0xFF,0xFF);
+	// END PATCH
+};
diff --git a/src/gui/guiChatConsole.cpp b/src/gui/guiChatConsole.cpp
index 554e73540..1d5105564 100644
--- a/src/gui/guiChatConsole.cpp
+++ b/src/gui/guiChatConsole.cpp
@@ -28,7 +28,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/keycode.h"
 #include "settings.h"
 #include "porting.h"
-#include "client/tile.h"
+#include "client/texturesource.h"
 #include "client/fontengine.h"
 #include "log_types.h"
 #include "gettext.h"
@@ -109,9 +109,13 @@ GUIChatConsole::~GUIChatConsole()
 
 void GUIChatConsole::openConsole(f32 scale)
 {
+	if (m_open)
+		return;
+
 	assert(scale > 0.0f && scale <= 1.0f);
 
 	m_open = true;
+
 	m_desired_height_fraction = scale;
 	m_desired_height = scale * m_screensize.Y;
 	reformatConsole();
@@ -496,7 +500,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 				!iswcntrl(event.KeyInput.Char) && !IS_PRIVATE_USE_CHAR(event.KeyInput.Char);
 
 		//if (event.KeyInput.Key == KEY_ESCAPE) {
-		if ( (kp == EscapeKey || kp == CancelKey) && ((int)event.KeyInput.Key == (int)event.KeyInput.Char) ) {
+		if ( (kp == EscapeKey) && ((int)event.KeyInput.Key == (int)event.KeyInput.Char) ) {
 			closeConsoleAtOnce();
 			m_close_on_enter = false;
 			// inhibit open so the_game doesn't reopen immediately
@@ -744,12 +748,8 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 				if (!was_url_pressed
 						&& event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN) {
 					// Paste primary selection at cursor pos
-#if IRRLICHT_VERSION_MT_REVISION >= 11
 					const c8 *text = Environment->getOSOperator()
 							->getTextFromPrimarySelection();
-#else
-					const c8 *text = nullptr;
-#endif
 					if (text)
 						prompt.input(utf8_to_wide(text));
 				}
@@ -840,9 +840,7 @@ bool GUIChatConsole::weblinkClick(s32 col, s32 row)
 
 void GUIChatConsole::updatePrimarySelection()
 {
-#if IRRLICHT_VERSION_MT_REVISION >= 11
 	std::wstring wselected = m_chat_backend->getPrompt().getSelection();
 	std::string selected = wide_to_utf8(wselected);
 	Environment->getOSOperator()->copyToPrimarySelection(selected.c_str());
-#endif
 }
diff --git a/src/gui/guiEditBox.cpp b/src/gui/guiEditBox.cpp
index be6731653..34689fc13 100644
--- a/src/gui/guiEditBox.cpp
+++ b/src/gui/guiEditBox.cpp
@@ -178,7 +178,6 @@ void GUIEditBox::setTextMarkers(s32 begin, s32 end)
 		m_mark_begin = begin;
 		m_mark_end = end;
 
-#if IRRLICHT_VERSION_MT_REVISION >= 11
 		if (!m_passwordbox && m_operator && m_mark_begin != m_mark_end) {
 			// copy to primary selection
 			const s32 realmbgn = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
@@ -187,7 +186,6 @@ void GUIEditBox::setTextMarkers(s32 begin, s32 end)
 			std::string s = stringw_to_utf8(Text.subString(realmbgn, realmend - realmbgn));
 			m_operator->copyToPrimarySelection(s.c_str());
 		}
-#endif
 
 		sendGuiEvent(EGET_EDITBOX_MARKING_CHANGED);
 	}
@@ -455,7 +453,6 @@ bool GUIEditBox::processKey(const SEvent &event)
 
 bool GUIEditBox::onKeyUp(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 {
-	// clang-format off
 	if (m_multiline || (m_word_wrap && m_broken_text.size() > 1)) {
 		s32 lineNo = getLineFromPos(m_cursor_pos);
 		s32 mb = (m_mark_begin == m_mark_end) ? m_cursor_pos :
@@ -481,13 +478,11 @@ bool GUIEditBox::onKeyUp(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 		return true;
 	}
 
-	// clang-format on
 	return false;
 }
 
 bool GUIEditBox::onKeyDown(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 {
-	// clang-format off
 	if (m_multiline || (m_word_wrap && m_broken_text.size() > 1)) {
 		s32 lineNo = getLineFromPos(m_cursor_pos);
 		s32 mb = (m_mark_begin == m_mark_end) ? m_cursor_pos :
@@ -513,7 +508,6 @@ bool GUIEditBox::onKeyDown(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 		return true;
 	}
 
-	// clang-format on
 	return false;
 }
 
@@ -780,9 +774,9 @@ bool GUIEditBox::processMouse(const SEvent &event)
 		}
 	case EMIE_MOUSE_WHEEL:
 		if (m_vscrollbar && m_vscrollbar->isVisible()) {
-			s32 pos = m_vscrollbar->getPos();
+			s32 pos = m_vscrollbar->getTargetPos();
 			s32 step = m_vscrollbar->getSmallStep();
-			m_vscrollbar->setPos(pos - event.MouseInput.Wheel * step);
+			m_vscrollbar->setPosInterpolated(pos - event.MouseInput.Wheel * step);
 			return true;
 		}
 		break;
@@ -800,7 +794,6 @@ bool GUIEditBox::processMouse(const SEvent &event)
 		m_mouse_marking = false;
 		setTextMarkers(m_cursor_pos, m_cursor_pos);
 
-#if IRRLICHT_VERSION_MT_REVISION >= 11
 		// paste from the primary selection
 		inputString([&] {
 			if (!m_operator)
@@ -810,7 +803,6 @@ bool GUIEditBox::processMouse(const SEvent &event)
 				return core::stringw();
 			return utf8_to_stringw(inserted_text_utf8);
 		}());
-#endif
 
 		return true;
 	}
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index 83067294a..c7a100b58 100644
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -22,25 +22,27 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "guiEngine.h"
 
-#include <IGUIStaticText.h>
-#include <ICameraSceneNode.h>
-#include "client/renderingengine.h"
-#include "scripting_mainmenu.h"
-#include "util/numeric.h"
-#include "config.h"
-#include "version.h"
-#include "porting.h"
-#include "filesys.h"
-//#include <fstream>
-#include "settings.h"
-#include "guiMainMenu.h"
-#include "sound.h"
-#include "httpfetch.h"
-#include "log.h"
 #include "client/fontengine.h"
 #include "client/guiscalingfilter.h"
-#include "irrlicht_changes/static_text.h"
+#include "client/renderingengine.h"
+#include "client/shader.h"
 #include "client/tile.h"
+#include "config.h"
+#include "content/content.h"
+#include "content/mods.h"
+#include "filesys.h"
+#include "guiMainMenu.h"
+#include "httpfetch.h"
+#include "irrlicht_changes/static_text.h"
+#include "log.h"
+#include "porting.h"
+#include "scripting_mainmenu.h"
+#include "settings.h"
+#include "sound.h"
+#include "version.h"
+#include <ICameraSceneNode.h>
+#include <IGUIStaticText.h>
+#include "client/imagefilters.h"
 
 #if USE_SOUND
 	#include "client/sound/sound_openal.h"
@@ -83,7 +85,7 @@ video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 	if (name.empty())
 		return NULL;
 
-	porting::irr_device_wait_egl();
+	// fmtodo? porting::irr_device_wait_egl();
 
 	// return if already loaded
 	video::ITexture *retval = m_driver->findTexture(name.c_str());
@@ -145,6 +147,10 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 	// create texture source
 	m_texture_source = std::make_unique<MenuTextureSource>(rendering_engine->get_video_driver());
 
+	// create shader source
+	// (currently only used by clouds)
+	m_shader_source.reset(createShaderSource());
+
 	// create soundmanager
 #if USE_SOUND
 	if (g_settings->getBool("enable_sound") && g_sound_manager_singleton.get()) {
@@ -193,6 +199,8 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 
 	m_script = std::make_unique<MainMenuScripting>(this);
 
+	g_settings->registerChangedCallback("fullscreen", fullscreenChangedCallback, this);
+
 	try {
 		m_script->setMainMenuData(&m_data->script_data);
 		m_data->script_data.errormessage.clear();
@@ -212,6 +220,57 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 	m_menu.reset();
 }
 
+
+/******************************************************************************/
+std::string findLocaleFileInMods(const std::string &path, const std::string &filename)
+{
+	std::vector<ModSpec> mods = flattenMods(getModsInPath(path, "root", true));
+
+	for (const auto &mod : mods) {
+		std::string ret = mod.path + DIR_DELIM "locale" DIR_DELIM + filename;
+		if (fs::PathExists(ret)) {
+			return ret;
+		}
+	}
+
+	return "";
+}
+
+/******************************************************************************/
+Translations *GUIEngine::getContentTranslations(const std::string &path,
+		const std::string &domain, const std::string &lang_code)
+{
+	if (domain.empty() || lang_code.empty())
+		return nullptr;
+
+	std::string filename = domain + "." + lang_code + ".tr";
+	std::string key = path + DIR_DELIM "locale" DIR_DELIM + filename;
+
+	if (key == m_last_translations_key)
+		return &m_last_translations;
+
+	std::string trans_path = key;
+	ContentType type = getContentType(path);
+	if (type == ContentType::GAME)
+		trans_path = findLocaleFileInMods(path + DIR_DELIM "mods" DIR_DELIM, filename);
+	else if (type == ContentType::MODPACK)
+		trans_path = findLocaleFileInMods(path, filename);
+	// We don't need to search for locale files in a mod, as there's only one `locale` folder.
+
+	if (trans_path.empty())
+		return nullptr;
+
+	m_last_translations_key = key;
+	m_last_translations = {};
+
+	std::string data;
+	if (fs::ReadFile(trans_path, data)) {
+		m_last_translations.loadTranslation(data);
+	}
+
+	return &m_last_translations;
+}
+
 /******************************************************************************/
 bool GUIEngine::loadMainMenuScript()
 {
@@ -239,10 +298,11 @@ bool GUIEngine::loadMainMenuScript()
 /******************************************************************************/
 void GUIEngine::run()
 {
+	IrrlichtDevice *device = m_rendering_engine->get_raw_device();
+	video::IVideoDriver *driver = device->getVideoDriver();
+
 	// Always create clouds because they may or may not be
 	// needed based on the game selected
-	video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
-
 	cloudInit();
 
 	unsigned int text_height = g_fontengine->getTextHeight();
@@ -267,56 +327,50 @@ void GUIEngine::run()
 			g_settings->getU16("screen_w"),
 			g_settings->getU16("screen_h")
 		);
-	const bool initial_window_maximized = g_settings->getBool("window_maximized");
+	const bool initial_window_maximized = !g_settings->getBool("fullscreen") &&
+			g_settings->getBool("window_maximized");
 
-	u64 t_last_frame = porting::getTimeUs();
+	FpsControl fps_control;
 	f32 dtime = 0.0f;
 
-	while (m_rendering_engine->run() && (!m_startgame) && (!m_kill)) {
+	fps_control.reset();
 
-		//check if we need to update the "upper left corner"-text
-		if (text_height != g_fontengine->getTextHeight()) {
-			updateTopLeftTextSize();
-			text_height = g_fontengine->getTextHeight();
+	while (m_rendering_engine->run() && !m_startgame && !m_kill) {
+
+		fps_control.limit(device, &dtime);
+
+		if (device->isWindowVisible()) {
+			// check if we need to update the "upper left corner"-text
+			if (text_height != g_fontengine->getTextHeight()) {
+				updateTopLeftTextSize();
+				text_height = g_fontengine->getTextHeight();
+			}
+
+			driver->beginScene(true, true, RenderingEngine::MENU_SKY_COLOR);
+
+			if (m_clouds_enabled) {
+				drawClouds(dtime);
+				drawOverlay(driver);
+			} else {
+				drawBackground(driver);
+			}
+
+			drawFooter(driver);
+
+			m_rendering_engine->get_gui_env()->drawAll();
+
+			// The header *must* be drawn after the menu because it uses
+			// GUIFormspecMenu::getAbsoluteRect().
+			// The header *can* be drawn after the menu because it never intersects
+			// the menu.
+			drawHeader(driver);
+
+			driver->endScene();
 		}
 
-		driver->beginScene(true, true, RenderingEngine::MENU_SKY_COLOR);
-
-		if (m_clouds_enabled)
-		{
-			cloudPreProcess();
-			drawOverlay(driver);
-		}
-		else
-			drawBackground(driver);
-
-		drawFooter(driver);
-
-		m_rendering_engine->get_gui_env()->drawAll();
-
-		// The header *must* be drawn after the menu because it uses
-		// GUIFormspecMenu::getAbsoluteRect().
-		// The header *can* be drawn after the menu because it never intersects
-		// the menu.
-		drawHeader(driver);
-
-		driver->endScene();
-
-		IrrlichtDevice *device = m_rendering_engine->get_raw_device();
-		u32 frametime_min = 1000 / (device->isWindowFocused()
-			? g_settings->getFloat("fps_max")
-			: g_settings->getFloat("fps_max_unfocused"));
-		if (m_clouds_enabled)
-			cloudPostProcess(frametime_min, device);
-		else
-			sleep_ms(frametime_min);
-
-		u64 t_now = porting::getTimeUs();
-		dtime = static_cast<f32>(t_now - t_last_frame) * 1.0e-6f;
-		t_last_frame = t_now;
-
 		m_script->step();
 
+		sound_volume_control(m_sound_manager.get(), device->isWindowActive());
 		m_sound_manager->step(dtime);
 
 #ifdef __ANDROID__
@@ -324,82 +378,55 @@ void GUIEngine::run()
 #endif
 	}
 
+	m_script->beforeClose();
+
 	RenderingEngine::autosaveScreensizeAndCo(initial_screen_size, initial_window_maximized);
 }
 
 /******************************************************************************/
 GUIEngine::~GUIEngine()
 {
+	g_settings->deregisterChangedCallback("fullscreen", fullscreenChangedCallback, this);
+
 	// deinitialize script first. gc destructors might depend on other stuff
 	infostream << "GUIEngine: Deinitializing scripting" << std::endl;
 	m_script.reset();
 
 	m_sound_manager.reset();
 
-	m_irr_toplefttext->setText(L"");
+	m_irr_toplefttext->remove();
 
-	//clean up texture pointers
+	m_cloud.clouds.reset();
+
+	// delete textures
 	for (image_definition &texture : m_textures) {
 		if (texture.texture)
 			m_rendering_engine->get_video_driver()->removeTexture(texture.texture);
 	}
-
-	m_texture_source.reset();
-
-	m_cloud.clouds.reset();
 }
 
 /******************************************************************************/
 void GUIEngine::cloudInit()
 {
-	m_cloud.clouds = make_irr<Clouds>(m_smgr, -1, rand());
+	m_shader_source->addShaderConstantSetterFactory(
+		new FogShaderConstantSetterFactory());
+
+	m_cloud.clouds = make_irr<Clouds>(m_smgr, m_shader_source.get(), -1, rand());
 	m_cloud.clouds->setHeight(100.0f);
 	m_cloud.clouds->update(v3f(0, 0, 0), video::SColor(255,240,240,255));
 
 	m_cloud.camera = m_smgr->addCameraSceneNode(0,
 				v3f(0,0,0), v3f(0, 60, 100));
 	m_cloud.camera->setFarValue(10000);
-
-	m_cloud.lasttime = m_rendering_engine->get_timer_time();
 }
 
 /******************************************************************************/
-void GUIEngine::cloudPreProcess()
+void GUIEngine::drawClouds(float dtime)
 {
-	u32 time = m_rendering_engine->get_timer_time();
-
-	if(time > m_cloud.lasttime)
-		m_cloud.dtime = (time - m_cloud.lasttime) / 1000.0;
-	else
-		m_cloud.dtime = 0;
-
-	m_cloud.lasttime = time;
-
-	m_cloud.clouds->step(m_cloud.dtime*3);
-	m_cloud.clouds->render();
+	m_cloud.clouds->step(dtime*3);
 	m_smgr->drawAll();
 }
 
-/******************************************************************************/
-void GUIEngine::cloudPostProcess(u32 frametime_min, IrrlichtDevice *device)
-{
-	// Time of frame without fps limit
-	u32 busytime_u32;
-
-	// not using getRealTime is necessary for wine
-	u32 time = m_rendering_engine->get_timer_time();
-	if(time > m_cloud.lasttime)
-		busytime_u32 = time - m_cloud.lasttime;
-	else
-		busytime_u32 = 0;
-
-	// FPS limit
-	if (busytime_u32 < frametime_min) {
-		u32 sleeptime = frametime_min - busytime_u32;
-		device->sleep(sleeptime);
-	}
-}
-
 /******************************************************************************/
 void GUIEngine::setFormspecPrepend(const std::string &fs)
 {
@@ -604,10 +631,9 @@ bool GUIEngine::setTexture(texture_layer layer, const std::string &texturepath,
 bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 {
 #if USE_CURL
-	std::ofstream target_file(target.c_str(), std::ios::out | std::ios::binary);
-	if (!target_file.good()) {
+	auto target_file = open_ofstream(target.c_str(), true);
+	if (!target_file.good())
 		return false;
-	}
 
 	HTTPFetchRequest fetch_request;
 	HTTPFetchResult fetch_result;
@@ -615,13 +641,15 @@ bool GUIEngine::downloadFile(const std::string &url, const std::string &target)
 	fetch_request.caller = HTTPFETCH_SYNC;
 	fetch_request.timeout = std::max(MIN_HTTPFETCH_TIMEOUT,
 		(long)g_settings->getS32("curl_file_download_timeout"));
-	httpfetch_sync(fetch_request, fetch_result);
+	bool completed = httpfetch_sync_interruptible(fetch_request, fetch_result);
 
-	if (!fetch_result.succeeded) {
+	if (!completed || !fetch_result.succeeded) {
 		target_file.close();
 		fs::DeleteSingleFileOrEmptyDirectory(target);
 		return false;
 	}
+	// TODO: directly stream the response data into the file instead of first
+	// storing the complete response in memory
 	target_file << fetch_result.data;
 
 	return true;
@@ -649,3 +677,9 @@ void GUIEngine::updateTopLeftTextSize()
 	m_irr_toplefttext = gui::StaticText::add(m_rendering_engine->get_gui_env(),
 			m_toplefttext, rect, false, true, 0, -1);
 }
+
+/******************************************************************************/
+void GUIEngine::fullscreenChangedCallback(const std::string &name, void *data)
+{
+	static_cast<GUIEngine*>(data)->getScriptIface()->handleMainMenuEvent("FullscreenChange");
+}
diff --git a/src/gui/guiEngine.h b/src/gui/guiEngine.h
index ba77e1416..743c30f9b 100644
--- a/src/gui/guiEngine.h
+++ b/src/gui/guiEngine.h
@@ -29,8 +29,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "guiFormSpecMenu.h"
 #include "client/clouds.h"
 #include "client/sound.h"
-#include "client/tile.h"
 #include "util/enriched_string.h"
+#include "translation.h"
 
 /******************************************************************************/
 /* Structs and macros                                                         */
@@ -56,6 +56,7 @@ struct image_definition {
 class GUIEngine;
 class RenderingEngine;
 class MainMenuScripting;
+class IWritableShaderSource;
 struct MainMenuData;
 
 /******************************************************************************/
@@ -168,7 +169,22 @@ public:
 		return m_scriptdir;
 	}
 
+	/**
+	 * Get translations for content
+	 *
+	 * Only loads a single textdomain from the path, as specified by `domain`,
+	 * for performance reasons.
+	 *
+	 * WARNING: Do not store the returned pointer for long as the contents may
+	 * change with the next call to `getContentTranslations`.
+	 * */
+	Translations *getContentTranslations(const std::string &path,
+			const std::string &domain, const std::string &lang_code);
+
 private:
+	std::string m_last_translations_key;
+	/** Only the most recently used translation set is kept loaded */
+	Translations m_last_translations;
 
 	/** find and run the main menu script */
 	bool loadMainMenuScript();
@@ -190,7 +206,9 @@ private:
 	MainMenuData                         *m_data = nullptr;
 	/** texture source */
 	std::unique_ptr<ISimpleTextureSource> m_texture_source;
-	/** sound manager*/
+	/** shader source */
+	std::unique_ptr<IWritableShaderSource> m_shader_source;
+	/** sound manager */
 	std::unique_ptr<ISoundManager>        m_sound_manager;
 
 	/** representation of form source to be used in mainmenu formspec */
@@ -267,16 +285,10 @@ private:
 	/** initialize cloud subsystem */
 	void cloudInit();
 	/** do preprocessing for cloud subsystem */
-	void cloudPreProcess();
-	/** do postprocessing for cloud subsystem */
-	void cloudPostProcess(u32 frametime_min, IrrlichtDevice *device);
+	void drawClouds(float dtime);
 
 	/** internam data required for drawing clouds */
 	struct clouddata {
-		/** delta time since last cloud processing */
-		f32 dtime;
-		/** absolute time of last cloud processing */
-		u32 lasttime;
 		/** pointer to cloud class */
 		irr_ptr<Clouds> clouds;
 		/** camera required for drawing clouds */
@@ -287,4 +299,6 @@ private:
 	bool        m_clouds_enabled = true;
 	/** data used to draw clouds */
 	clouddata   m_cloud;
+
+	static void fullscreenChangedCallback(const std::string &name, void *data);
 };
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 1a29e4030..1b2a2b316 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -36,12 +36,12 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <IGUICheckBox.h>
 #include <IGUIComboBox.h>
 #include <IGUIEditBox.h>
-#include <IGUIStaticText.h>
 #include <IGUIFont.h>
 #include <IGUITabControl.h>
+#include <IGUIImage.h>
+#include <IAnimatedMeshSceneNode.h>
 #include "client/renderingengine.h"
 #include "log.h"
-#include "client/tile.h" // ITextureSource
 #include "client/hud.h" // drawItemStack
 #include "filesys.h"
 #include "gettime.h"
@@ -147,11 +147,23 @@ void GUIFormSpecMenu::create(GUIFormSpecMenu *&cur_formspec, Client *client,
 		g_touchscreengui->reset_pressed();
 #endif
 
+	if (cur_formspec && cur_formspec->getReferenceCount() == 1) {
+		/*
+			Why reference count == 1? Reason:
+			1 on creation (see "drop()" remark below)
+			+1 for being a guiroot child
+			+1 when focused (CGUIEnvironment::setFocus)
+
+			Hence re-create the formspec when it's existing without any parent.
+		*/
+		cur_formspec->drop();
+		cur_formspec = nullptr;
+	}
+
 	if (cur_formspec == nullptr) {
 		cur_formspec = new GUIFormSpecMenu(joystick, guiroot, -1, &g_menumgr,
 			client, guienv, client->getTextureSource(), sound_manager, fs_src,
 			txt_dest, formspecPrepend);
-		cur_formspec->doPause = false;
 
 		/*
 			Caution: do not call (*cur_formspec)->drop() here --
@@ -160,12 +172,13 @@ void GUIFormSpecMenu::create(GUIFormSpecMenu *&cur_formspec, Client *client,
 			remaining reference (i.e. the menu was removed)
 			and delete it in that case.
 		*/
-
 	} else {
 		cur_formspec->setFormspecPrepend(formspecPrepend);
 		cur_formspec->setFormSource(fs_src);
 		cur_formspec->setTextDest(txt_dest);
 	}
+
+	cur_formspec->doPause = false;
 }
 
 void GUIFormSpecMenu::removeTooltip()
@@ -311,13 +324,11 @@ void GUIFormSpecMenu::parseSize(parserData* data, const std::string &element)
 		data->invsize.Y = MYMAX(0, stof(parts[1]));
 
 		lockSize(false);
-#ifndef HAVE_TOUCHSCREENGUI
-		if (parts.size() == 3) {
+		if (!g_settings->getBool("enable_touch") && parts.size() == 3) {
 			if (parts[2] == "true") {
 				lockSize(true,v2u32(800,600));
 			}
 		}
-#endif
 		data->explicit_size = true;
 		return;
 	}
@@ -750,7 +761,7 @@ void GUIFormSpecMenu::parseScrollBarOptions(parserData* data, const std::string
 			data->scrollbar_options.thumb_size = value <= 0 ? 1 : value;
 			continue;
 		} else if (options[0] == "arrows") {
-			std::string value = trim(options[1]);
+			auto value = trim(options[1]);
 			if (value == "hide")
 				data->scrollbar_options.arrow_visiblity = GUIScrollBar::HIDE;
 			else if (value == "show")
@@ -974,14 +985,18 @@ void GUIFormSpecMenu::parseItemImage(parserData* data, const std::string &elemen
 void GUIFormSpecMenu::parseButton(parserData* data, const std::string &element,
 		const std::string &type)
 {
+	int expected_parts = (type == "button_url" || type == "button_url_exit") ? 5 : 4;
 	std::vector<std::string> parts;
-	if (!precheckElement("button", element, 4, 4, parts))
+	if (!precheckElement("button", element, expected_parts, expected_parts, parts))
 		return;
 
 	std::vector<std::string> v_pos = split(parts[0],',');
 	std::vector<std::string> v_geom = split(parts[1],',');
 	std::string name = parts[2];
 	std::string label = parts[3];
+	std::string url;
+	if (type == "button_url" || type == "button_url_exit")
+		url = parts[4];
 
 	MY_CHECKPOS("button",0);
 	MY_CHECKGEOM("button",1);
@@ -1016,8 +1031,10 @@ void GUIFormSpecMenu::parseButton(parserData* data, const std::string &element,
 		258 + m_fields.size()
 	);
 	spec.ftype = f_Button;
-	if(type == "button_exit")
+	if (type == "button_exit" || type == "button_url_exit")
 		spec.is_exit = true;
+	if (type == "button_url" || type == "button_url_exit")
+		spec.url = url;
 
 	GUIButton *e = GUIButton::addButton(Environment, rect, m_tsrc,
 			data->current_parent, spec.fid, spec.flabel.c_str());
@@ -1180,7 +1197,9 @@ void GUIFormSpecMenu::parseTable(parserData* data, const std::string &element)
 	std::vector<std::string> v_pos = split(parts[0],',');
 	std::vector<std::string> v_geom = split(parts[1],',');
 	std::string name = parts[2];
-	std::vector<std::string> items = split(parts[3],',');
+	std::vector<std::string> items;
+	if (!parts[3].empty())
+		items = split(parts[3],',');
 	std::string str_initial_selection;
 
 	if (parts.size() >= 5)
@@ -1250,7 +1269,9 @@ void GUIFormSpecMenu::parseTextList(parserData* data, const std::string &element
 	std::vector<std::string> v_pos = split(parts[0],',');
 	std::vector<std::string> v_geom = split(parts[1],',');
 	std::string name = parts[2];
-	std::vector<std::string> items = split(parts[3],',');
+	std::vector<std::string> items;
+	if (!parts[3].empty())
+		items = split(parts[3],',');
 	std::string str_initial_selection;
 	std::string str_transparent = "false";
 
@@ -1769,12 +1790,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element)
 	size_t str_pos = 0;
 
 	for (size_t i = 0; str_pos < str.size(); ++i) {
-		// Split per line
-		size_t str_nl = str.getString().find(L'\n', str_pos);
-		if (str_nl == std::wstring::npos)
-			str_nl = str.getString().size();
-		EnrichedString line = str.substr(str_pos, str_nl - str_pos);
-		str_pos += line.size() + 1;
+		EnrichedString line = str.getNextLine(&str_pos);
 
 		core::rect<s32> rect;
 
@@ -2444,8 +2460,8 @@ bool GUIFormSpecMenu::parseSizeDirect(parserData* data, const std::string &eleme
 	if (parts.size() < 2)
 		return false;
 
-	std::string type = trim(parts[0]);
-	std::string description = trim(parts[1]);
+	auto type = trim(parts[0]);
+	std::string description(trim(parts[1]));
 
 	if (type != "size" && type != "invsize")
 		return false;
@@ -2468,8 +2484,8 @@ bool GUIFormSpecMenu::parsePositionDirect(parserData *data, const std::string &e
 	if (parts.size() != 2)
 		return false;
 
-	std::string type = trim(parts[0]);
-	std::string description = trim(parts[1]);
+	auto type = trim(parts[0]);
+	std::string description(trim(parts[1]));
 
 	if (type != "position")
 		return false;
@@ -2507,8 +2523,8 @@ bool GUIFormSpecMenu::parseAnchorDirect(parserData *data, const std::string &ele
 	if (parts.size() != 2)
 		return false;
 
-	std::string type = trim(parts[0]);
-	std::string description = trim(parts[1]);
+	auto type = trim(parts[0]);
+	std::string description(trim(parts[1]));
 
 	if (type != "anchor")
 		return false;
@@ -2547,8 +2563,8 @@ bool GUIFormSpecMenu::parsePaddingDirect(parserData *data, const std::string &el
 	if (parts.size() != 2)
 		return false;
 
-	std::string type = trim(parts[0]);
-	std::string description = trim(parts[1]);
+	auto type = trim(parts[0]);
+	std::string description(trim(parts[1]));
 
 	if (type != "padding")
 		return false;
@@ -2619,7 +2635,7 @@ bool GUIFormSpecMenu::parseStyle(parserData *data, const std::string &element, b
 
 	std::vector<std::string> selectors = split(parts[0], ',');
 	for (size_t sel = 0; sel < selectors.size(); sel++) {
-		std::string selector = trim(selectors[sel]);
+		std::string selector(trim(selectors[sel]));
 
 		// Copy the style properties to a new StyleSpec
 		// This allows a separate state mask per-selector
@@ -2895,7 +2911,7 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
 		return;
 	}
 
-	if (type == "button" || type == "button_exit") {
+	if (type == "button" || type == "button_exit" || type == "button_url" || type == "button_url_exit") {
 		parseButton(data, description, type);
 		return;
 	}
@@ -3057,7 +3073,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 		return;
 	}
 
-	porting::irr_device_wait_egl();
+	// fmtodo? porting::irr_device_wait_egl();
 
 	parserData mydata;
 
@@ -3214,7 +3230,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	mydata.real_coordinates = m_formspec_version >= 2;
 	for (; i < elements.size(); i++) {
 		std::vector<std::string> parts = split(elements[i], '[');
-		std::string name = trim(parts[0]);
+		auto name = trim(parts[0]);
 		if (name != "real_coordinates" || parts.size() != 2)
 			break; // Invalid format
 
@@ -3282,14 +3298,15 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 
 			s32 min_screen_dim = std::min(padded_screensize.X, padded_screensize.Y);
 
-#ifdef HAVE_TOUCHSCREENGUI
-			// In Android, the preferred imgsize should be larger to accommodate the
-			// smaller screensize.
-			double prefer_imgsize = min_screen_dim / 10 * gui_scaling;
-#else
-			// Desktop computers have more space, so try to fit 15 coordinates.
-			double prefer_imgsize = min_screen_dim / 15 * gui_scaling;
-#endif
+			double prefer_imgsize;
+			if (g_settings->getBool("enable_touch")) {
+				// The preferred imgsize should be larger to accommodate the
+				// smaller screensize.
+				prefer_imgsize = min_screen_dim / 10 * gui_scaling;
+			} else {
+				// Desktop computers have more space, so try to fit 15 coordinates.
+				prefer_imgsize = min_screen_dim / 15 * gui_scaling;
+			}
 			// Try to use the preferred imgsize, but if that's bigger than the maximum
 			// size, use the maximum size.
 			use_imgsize = std::min(prefer_imgsize,
@@ -3497,46 +3514,58 @@ void GUIFormSpecMenu::legacySortElements(std::list<IGUIElement *>::iterator from
 }
 
 #ifdef __ANDROID__
-bool GUIFormSpecMenu::getAndroidUIInput()
+void GUIFormSpecMenu::getAndroidUIInput()
 {
-	if (!hasAndroidUIInput())
-		return false;
+	porting::AndroidDialogState dialogState = getAndroidUIInputState();
+	if (dialogState == porting::DIALOG_SHOWN) {
+		return;
+	} else if (dialogState == porting::DIALOG_CANCELED) {
+		m_jni_field_name.clear();
+		return;
+	}
 
-	// still waiting
-	if (porting::getInputDialogState() == -1)
-		return true;
+	porting::AndroidDialogType dialog_type = porting::getLastInputDialogType();
 
 	std::string fieldname = m_jni_field_name;
 	m_jni_field_name.clear();
 
 	for (const FieldSpec &field : m_fields) {
 		if (field.fname != fieldname)
-			continue;
+			continue; // Iterate until found
 
 		IGUIElement *element = getElementFromId(field.fid, true);
 
-		if (!element || element->getType() != irr::gui::EGUIET_EDIT_BOX)
-			return false;
+		if (!element)
+			return;
 
-		gui::IGUIEditBox *editbox = (gui::IGUIEditBox *)element;
-		std::string text = porting::getInputDialogValue();
-		editbox->setText(utf8_to_wide(text).c_str());
+		auto element_type = element->getType();
+		if (dialog_type == porting::TEXT_INPUT && element_type == irr::gui::EGUIET_EDIT_BOX) {
+			gui::IGUIEditBox *editbox = (gui::IGUIEditBox *)element;
+			std::string text = porting::getInputDialogMessage();
+			editbox->setText(utf8_to_wide(text).c_str());
 
-		bool enter_after_edit = false;
-		auto iter = field_enter_after_edit.find(fieldname);
-		if (iter != field_enter_after_edit.end()) {
-			enter_after_edit = iter->second;
-		}
-		if (enter_after_edit && editbox->getParent()) {
-			SEvent enter;
-			enter.EventType = EET_GUI_EVENT;
-			enter.GUIEvent.Caller = editbox;
-			enter.GUIEvent.Element = nullptr;
-			enter.GUIEvent.EventType = gui::EGET_EDITBOX_ENTER;
-			editbox->getParent()->OnEvent(enter);
+			bool enter_after_edit = false;
+			auto iter = field_enter_after_edit.find(fieldname);
+			if (iter != field_enter_after_edit.end()) {
+				enter_after_edit = iter->second;
+			}
+			if (enter_after_edit && editbox->getParent()) {
+				SEvent enter;
+				enter.EventType = EET_GUI_EVENT;
+				enter.GUIEvent.Caller = editbox;
+				enter.GUIEvent.Element = nullptr;
+				enter.GUIEvent.EventType = gui::EGET_EDITBOX_ENTER;
+				editbox->getParent()->OnEvent(enter);
+			}
+		} else if (dialog_type == porting::SELECTION_INPUT &&
+				element_type == irr::gui::EGUIET_COMBO_BOX) {
+			auto dropdown = (gui::IGUIComboBox *) element;
+			int selected = porting::getInputDialogSelection();
+			dropdown->setAndSendSelected(selected);
 		}
+
+		return; // Early-return after found
 	}
-	return false;
 }
 #endif
 
@@ -3659,24 +3688,18 @@ void GUIFormSpecMenu::drawMenu()
 			NULL, m_client, IT_ROT_HOVERED);
 	}
 
-	gui::IGUIElement::draw();
-
-	// On touchscreens, m_pointer is set by GUIModalMenu::preprocessEvent instead.
-#ifndef HAVE_TOUCHSCREENGUI
-	m_pointer = RenderingEngine::get_raw_device()->getCursorControl()->getPosition();
-#endif
-
 	/*
 		Draw fields/buttons tooltips and update the mouse cursor
 	*/
 	gui::IGUIElement *hovered =
 			Environment->getRootGUIElement()->getElementFromPoint(m_pointer);
 
-#ifndef HAVE_TOUCHSCREENGUI
 	gui::ICursorControl *cursor_control = RenderingEngine::get_raw_device()->
 			getCursorControl();
-	gui::ECURSOR_ICON current_cursor_icon = cursor_control->getActiveIcon();
-#endif
+	gui::ECURSOR_ICON current_cursor_icon = gui::ECI_NORMAL;
+	if (cursor_control)
+		current_cursor_icon = cursor_control->getActiveIcon();
+
 	bool hovered_element_found = false;
 
 	if (hovered) {
@@ -3720,11 +3743,10 @@ void GUIFormSpecMenu::drawMenu()
 							m_tooltips[field.fname].bgcolor);
 				}
 
-#ifndef HAVE_TOUCHSCREENGUI
-				if (field.ftype != f_HyperText && // Handled directly in guiHyperText
+				if (cursor_control &&
+						field.ftype != f_HyperText && // Handled directly in guiHyperText
 						current_cursor_icon != field.fcursor_icon)
 					cursor_control->setActiveIcon(field.fcursor_icon);
-#endif
 
 				hovered_element_found = true;
 
@@ -3735,10 +3757,8 @@ void GUIFormSpecMenu::drawMenu()
 
 	if (!hovered_element_found) {
 		// no element is hovered
-#ifndef HAVE_TOUCHSCREENGUI
-		if (current_cursor_icon != ECI_NORMAL)
+		if (cursor_control && current_cursor_icon != ECI_NORMAL)
 			cursor_control->setActiveIcon(ECI_NORMAL);
-#endif
 	}
 
 	m_tooltip_element->draw();
@@ -3769,16 +3789,13 @@ void GUIFormSpecMenu::showTooltip(const std::wstring &text,
 	v2u32 screenSize = Environment->getVideoDriver()->getScreenSize();
 	int tooltip_offset_x = m_btn_height;
 	int tooltip_offset_y = m_btn_height;
-#ifdef HAVE_TOUCHSCREENGUI
-	tooltip_offset_x *= 3;
-	tooltip_offset_y  = 0;
-	if (m_pointer.X > (s32)screenSize.X / 2)
-		tooltip_offset_x = -(tooltip_offset_x + tooltip_width);
 
-	// Hide tooltip after ETIE_LEFT_UP
-	if (m_pointer.X == 0)
-		return;
-#endif
+	if (m_pointer_type == PointerType::Touch) {
+		tooltip_offset_x *= 3;
+		tooltip_offset_y  = 0;
+		if (m_pointer.X > (s32)screenSize.X / 2)
+			tooltip_offset_x = -(tooltip_offset_x + tooltip_width);
+	}
 
 	// Calculate and set the tooltip position
 	s32 tooltip_x = m_pointer.X + tooltip_offset_x;
@@ -4075,8 +4092,10 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode)
 
 bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 {
-
-	GUIModalMenu::preprocessEvent(event);
+	// This must be done first so that GUIModalMenu can set m_pointer_type
+	// correctly.
+	if (GUIModalMenu::preprocessEvent(event))
+		return true;
 
 	// The IGUITabControl renders visually using the skin's selected
 	// font, which we override for the duration of form drawing,
@@ -4100,6 +4119,8 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 			skin->setFont(m_font);
 			bool retval = hovered->OnEvent(event);
 			skin->setFont(old_font);
+			// This is expected to be set to BET_OTHER with mouse UP event
+			m_held_mouse_button = BET_OTHER;
 			return retval;
 		}
 	}
@@ -4107,7 +4128,7 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 	// Fix Esc/Return key being eaten by checkboxen and tables
 	if (event.EventType == EET_KEY_INPUT_EVENT) {
 			KeyPress kp(event.KeyInput);
-		if (kp == EscapeKey || kp == CancelKey
+		if (kp == EscapeKey
 				|| kp == getKeySetting("keymap_inventory")
 				|| event.KeyInput.Key==KEY_RETURN) {
 			gui::IGUIElement *focused = Environment->getFocus();
@@ -4156,7 +4177,7 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 		return handled;
 	}
 
-	return GUIModalMenu::preprocessEvent(event);
+	return false;
 }
 
 void GUIFormSpecMenu::tryClose()
@@ -4175,7 +4196,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 	if (event.EventType==EET_KEY_INPUT_EVENT) {
 		KeyPress kp(event.KeyInput);
 		if (event.KeyInput.PressedDown && (
-				(kp == EscapeKey) || (kp == CancelKey) ||
+				(kp == EscapeKey) ||
 				((m_client != NULL) && (kp == getKeySetting("keymap_inventory"))))) {
 			tryClose();
 			return true;
@@ -4186,8 +4207,10 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			m_client->makeScreenshot();
 		}
 
-		if (event.KeyInput.PressedDown && kp == getKeySetting("keymap_toggle_debug"))
-			m_show_debug = !m_show_debug;
+		if (event.KeyInput.PressedDown && kp == getKeySetting("keymap_toggle_debug")) {
+			if (!m_client || m_client->checkPrivilege("debug"))
+				m_show_debug = !m_show_debug;
+		}
 
 		if (event.KeyInput.PressedDown &&
 			(event.KeyInput.Key==KEY_RETURN ||
@@ -4405,14 +4428,12 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			}
 		}
 
-#ifdef HAVE_TOUCHSCREENGUI
 		// The second touch (see GUIModalMenu::preprocessEvent() function)
 		ButtonEventType touch = BET_OTHER;
 		if (event.EventType == EET_TOUCH_INPUT_EVENT) {
 			if (event.TouchInput.Event == ETIE_LEFT_UP)
 				touch = BET_RIGHT;
 		}
-#endif
 
 		// Set this number to a positive value to generate a move action
 		// from m_selected_item to s.
@@ -4699,11 +4720,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			if (!m_left_dragging)
 				break;
 
-			// Abort left-dragging
-			m_left_dragging = false;
-			m_client->inhibit_inventory_revert = false;
-			m_left_drag_stacks.clear();
-
 			// Both the selected item and the hovered item need to be checked
 			// because we don't know exactly when the double-click happened
 			ItemStack slct;
@@ -4732,6 +4748,12 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 						}
 
 						if (amount > 0) {
+							if (m_left_dragging) {
+								// Abort left-dragging
+								m_left_dragging = false;
+								m_client->inhibit_inventory_revert = false;
+								m_left_drag_stacks.clear();
+							}
 							IMoveAction *a = new IMoveAction();
 							a->count = amount;
 							a->from_inv = s.inventoryloc;
@@ -4757,7 +4779,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			break;
 		}
 
-#ifdef HAVE_TOUCHSCREENGUI
 		if (touch == BET_RIGHT && m_selected_item && !m_left_dragging) {
 			if (!s.isValid()) {
 				// Not a valid slot
@@ -4777,7 +4798,6 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 				}
 			}
 		}
-#endif
 
 		// Update left-dragged slots
 		if (m_left_dragging && m_left_drag_stacks.size() > 1) {
@@ -4816,6 +4836,8 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			list_selected->changeItem(m_selected_item->i, stack_from);
 		}
 
+		bool absorb_event = false;
+
 		// Possibly send inventory action to server
 		if (move_amount > 0 && inv_selected) {
 			// Send IAction::Move
@@ -4970,6 +4992,10 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			a->from_i = m_selected_item->i;
 			m_invmgr->inventoryAction(a);
 
+			// Formspecs usually close when you click outside them, we absorb
+			// the event to prevent that. See GUIModalMenu::remapClickOutside.
+			absorb_event = true;
+
 		} else if (craft_amount > 0) {
 			if(!s.isValid())
 				return false;
@@ -5003,6 +5029,9 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			m_selected_dragging = false;
 		}
 		m_old_pointer = m_pointer;
+
+		if (absorb_event)
+			return true;
 	}
 
 	if (event.EventType == EET_GUI_EVENT) {
@@ -5061,6 +5090,17 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 						m_sound_manager->playSound(0, SoundSpec(s.sound, 1.0f));
 
 					s.send = true;
+
+					if (!s.url.empty()) {
+						if (m_client) {
+							// in game
+							g_gamecallback->showOpenURLDialog(s.url);
+						} else {
+							// main menu
+							porting::open_url(s.url);
+						}
+					}
+
 					if (s.is_exit) {
 						if (m_allowclose) {
 							acceptInput(quit_mode_accept);
@@ -5162,10 +5202,8 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 		}
 	}
 
-#ifdef HAVE_TOUCHSCREENGUI
 	if (m_second_touch)
 		return true; // Stop propagating the event
-#endif
 
 	return Parent ? Parent->OnEvent(event) : false;
 }
diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
index ad1be3c64..7daa8a20a 100644
--- a/src/gui/guiFormSpecMenu.h
+++ b/src/gui/guiFormSpecMenu.h
@@ -40,6 +40,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/string.h"
 #include "util/enriched_string.h"
 #include "StyleSpec.h"
+#include <IGUIStaticText.h>
 
 class InventoryManager;
 class ISimpleTextureSource;
@@ -139,6 +140,7 @@ class GUIFormSpecMenu : public GUIModalMenu
 		std::string fname;
 		std::wstring flabel;
 		std::wstring fdefault;
+		std::string url;
 		s32 fid;
 		bool send;
 		FormspecFieldType ftype;
@@ -224,6 +226,11 @@ public:
 		m_allowclose = value;
 	}
 
+	void setDebugView(bool value)
+	{
+		m_show_debug = value;
+	}
+
 	void lockSize(bool lock,v2u32 basescreensize=v2u32(0,0))
 	{
 		m_lock = lock;
@@ -289,7 +296,7 @@ public:
 	core::rect<s32> getAbsoluteRect();
 
 #ifdef __ANDROID__
-	bool getAndroidUIInput();
+	void getAndroidUIInput();
 #endif
 
 protected:
diff --git a/src/gui/guiHyperText.cpp b/src/gui/guiHyperText.cpp
index 66771f2e2..45e5d6e98 100644
--- a/src/gui/guiHyperText.cpp
+++ b/src/gui/guiHyperText.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiHyperText.h"
 #include "guiScrollBar.h"
 #include "client/fontengine.h"
-#include "client/tile.h"
 #include "IVideoDriver.h"
 #include "client/client.h"
 #include "client/renderingengine.h"
@@ -28,6 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "util/string.h"
 #include "irrlicht_changes/CGUITTFont.h"
+#include "mainmenumanager.h"
+#include "porting.h"
 
 using namespace irr::gui;
 
@@ -292,8 +293,8 @@ void ParsedText::pushChar(wchar_t c)
 		else
 			return;
 	} else {
-		m_empty_paragraph = false;
 		enterElement(ELEMENT_TEXT);
+		m_empty_paragraph = false;
 	}
 	m_element->text += c;
 }
@@ -420,14 +421,16 @@ u32 ParsedText::parseTag(const wchar_t *text, u32 cursor)
 	AttrsList attrs;
 	while (c != L'>') {
 		std::string attr_name = "";
-		core::stringw attr_val = L"";
+		std::wstring attr_val = L"";
 
+		// Consume whitespace
 		while (c == ' ') {
 			c = text[++cursor];
 			if (c == L'\0' || c == L'=')
 				return 0;
 		}
 
+		// Read attribute name
 		while (c != L' ' && c != L'=') {
 			attr_name += (char)c;
 			c = text[++cursor];
@@ -435,28 +438,51 @@ u32 ParsedText::parseTag(const wchar_t *text, u32 cursor)
 				return 0;
 		}
 
+		// Consume whitespace
 		while (c == L' ') {
 			c = text[++cursor];
 			if (c == L'\0' || c == L'>')
 				return 0;
 		}
 
+		// Skip equals
 		if (c != L'=')
 			return 0;
-
 		c = text[++cursor];
-
 		if (c == L'\0')
 			return 0;
 
-		while (c != L'>' && c != L' ') {
-			attr_val += c;
+		// Read optional quote
+		wchar_t quote_used = 0;
+		if (c == L'"' || c == L'\'') {
+			quote_used = c;
 			c = text[++cursor];
 			if (c == L'\0')
 				return 0;
 		}
 
-		attrs[attr_name] = stringw_to_utf8(attr_val);
+		// Read attribute value
+		bool escape = false;
+		while (escape || (quote_used && c != quote_used) || (!quote_used && c != L'>' && c != L' ')) {
+			if (quote_used && !escape && c == L'\\') {
+				escape = true;
+			} else {
+				escape = false;
+				attr_val += c;
+			}
+			c = text[++cursor];
+			if (c == L'\0')
+				return 0;
+		}
+
+		// Remove quote
+		if (quote_used) {
+			if (c != quote_used)
+				return 0;
+			c = text[++cursor];
+		}
+
+		attrs[attr_name] = wide_to_utf8(attr_val);
 	}
 
 	++cursor; // Last ">"
@@ -1052,14 +1078,10 @@ void GUIHyperText::checkHover(s32 X, s32 Y)
 		}
 	}
 
-#ifndef HAVE_TOUCHSCREENGUI
-	if (m_drawer.m_hovertag)
-		RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon(
-				gui::ECI_HAND);
-	else
-		RenderingEngine::get_raw_device()->getCursorControl()->setActiveIcon(
-				gui::ECI_NORMAL);
-#endif
+	ICursorControl *cursor_control = RenderingEngine::get_raw_device()->getCursorControl();
+
+	if (cursor_control)
+		cursor_control->setActiveIcon(m_drawer.m_hovertag ? gui::ECI_HAND : gui::ECI_NORMAL);
 }
 
 bool GUIHyperText::OnEvent(const SEvent &event)
@@ -1075,12 +1097,11 @@ bool GUIHyperText::OnEvent(const SEvent &event)
 	if (event.EventType == EET_GUI_EVENT &&
 			event.GUIEvent.EventType == EGET_ELEMENT_LEFT) {
 		m_drawer.m_hovertag = nullptr;
-#ifndef HAVE_TOUCHSCREENGUI
-		gui::ICursorControl *cursor_control =
-				RenderingEngine::get_raw_device()->getCursorControl();
-		if (cursor_control->isVisible())
+
+		ICursorControl *cursor_control = RenderingEngine::get_raw_device()->getCursorControl();
+
+		if (cursor_control && cursor_control->isVisible())
 			cursor_control->setActiveIcon(gui::ECI_NORMAL);
-#endif
 	}
 
 	if (event.EventType == EET_MOUSE_INPUT_EVENT) {
@@ -1088,7 +1109,7 @@ bool GUIHyperText::OnEvent(const SEvent &event)
 			checkHover(event.MouseInput.X, event.MouseInput.Y);
 
 		if (event.MouseInput.Event == EMIE_MOUSE_WHEEL && m_vscrollbar->isVisible()) {
-			m_vscrollbar->setPos(m_vscrollbar->getPos() -
+			m_vscrollbar->setPosInterpolated(m_vscrollbar->getTargetPos() -
 					event.MouseInput.Wheel * m_vscrollbar->getSmallStep());
 			m_text_scrollpos.Y = -m_vscrollbar->getPos();
 			m_drawer.draw(m_display_text_rect, m_text_scrollpos);
@@ -1112,6 +1133,18 @@ bool GUIHyperText::OnEvent(const SEvent &event)
 							newEvent.GUIEvent.EventType = EGET_BUTTON_CLICKED;
 							Parent->OnEvent(newEvent);
 						}
+
+						auto url_it = tag->attrs.find("url");
+						if (url_it != tag->attrs.end()) {
+							if (g_gamecallback) {
+								// in game
+								g_gamecallback->showOpenURLDialog(url_it->second);
+							} else {
+								// main menu
+								porting::open_url(url_it->second);
+							}
+						}
+
 						break;
 					}
 				}
diff --git a/src/gui/guiInventoryList.cpp b/src/gui/guiInventoryList.cpp
index 6f1d28e0b..02505d436 100644
--- a/src/gui/guiInventoryList.cpp
+++ b/src/gui/guiInventoryList.cpp
@@ -152,10 +152,10 @@ void GUIInventoryList::draw()
 
 		// Add hovering tooltip
 		bool show_tooltip = !item.empty() && hovering && !selected_item;
-#ifdef HAVE_TOUCHSCREENGUI
 		// Make it possible to see item tooltips on touchscreens
-		show_tooltip |= hovering && selected && m_fs_menu->getSelectedAmount() != 0;
-#endif
+		if (m_fs_menu->getPointerType() == PointerType::Touch) {
+			show_tooltip |= hovering && selected && m_fs_menu->getSelectedAmount() != 0;
+		}
 		if (show_tooltip) {
 			std::string tooltip = orig_item.getDescription(client->idef());
 			if (m_fs_menu->doTooltipAppendItemname())
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index 8642f355d..7cd1bb2dd 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -111,13 +111,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	removeAllChildren();
 	key_used_text = nullptr;
 
-	const float s = m_gui_scale;
-	DesiredRect = core::rect<s32>(
-		screensize.X / 2 - 835 * s / 2,
-		screensize.Y / 2 - 430 * s / 2,
-		screensize.X / 2 + 835 * s / 2,
-		screensize.Y / 2 + 430 * s / 2
-	);
+	ScalingInfo info = getScalingInfo(screensize, v2u32(835, 430));
+	const float s = info.scale;
+	DesiredRect = info.rect;
 	recalculateAbsolutePosition(false);
 
 	v2s32 size = DesiredRect.getSize();
diff --git a/src/gui/guiOpenURL.cpp b/src/gui/guiOpenURL.cpp
new file mode 100644
index 000000000..f91d31391
--- /dev/null
+++ b/src/gui/guiOpenURL.cpp
@@ -0,0 +1,199 @@
+/*
+Part of Minetest
+Copyright (C) 2023-24 rubenwardy
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include "guiOpenURL.h"
+#include "guiButton.h"
+#include "guiEditBoxWithScrollbar.h"
+#include <IGUIEditBox.h>
+#include <IGUIFont.h>
+#include "client/renderingengine.h"
+#include "porting.h"
+#include "gettext.h"
+#include "util/colorize.h"
+
+namespace {
+	constexpr int ID_url = 256;
+	constexpr int ID_open = 259;
+	constexpr int ID_cancel = 261;
+}
+
+GUIOpenURLMenu::GUIOpenURLMenu(gui::IGUIEnvironment* env,
+		gui::IGUIElement* parent, s32 id,
+		IMenuManager *menumgr,
+		ISimpleTextureSource *tsrc, const std::string &url
+):
+	GUIModalMenu(env, parent, id, menumgr),
+	m_tsrc(tsrc),
+	url(url)
+{
+}
+
+static std::string maybe_colorize_url(const std::string &url)
+{
+	// Forbid escape codes in URL
+	if (url.find('\x1b') != std::string::npos) {
+		throw std::runtime_error("URL contains escape codes");
+	}
+
+#ifdef HAVE_COLORIZE_URL
+	return colorize_url(url);
+#else
+	return url;
+#endif
+}
+
+void GUIOpenURLMenu::regenerateGui(v2u32 screensize)
+{
+	/*
+		Remove stuff
+	*/
+	removeAllChildren();
+
+	/*
+		Calculate new sizes and positions
+	*/
+	ScalingInfo info = getScalingInfo(screensize, v2u32(580, 250));
+	const float s = info.scale;
+	DesiredRect = info.rect;
+	recalculateAbsolutePosition(false);
+
+	v2s32 size = DesiredRect.getSize();
+	v2s32 topleft_client(40 * s, 0);
+
+	/*
+		Get URL text
+	*/
+	bool ok = true;
+	std::string text;
+	try {
+		text = maybe_colorize_url(url);
+	} catch (const std::exception &e) {
+		text = std::string(e.what()) + " (url = " + url + ")";
+		ok = false;
+	}
+
+	/*
+		Add stuff
+	*/
+	s32 ypos = 40 * s;
+
+	{
+		core::rect<s32> rect(0, 0, 500 * s, 20 * s);
+		rect += topleft_client + v2s32(20 * s, ypos);
+
+		std::wstring title = ok
+				? wstrgettext("Open URL?")
+				: wstrgettext("Unable to open URL");
+		gui::StaticText::add(Environment, title, rect,
+				false, true, this, -1);
+	}
+
+	ypos += 50 * s;
+
+	{
+		core::rect<s32> rect(0, 0, 440 * s, 60 * s);
+
+		auto font = g_fontengine->getFont(FONT_SIZE_UNSPECIFIED,
+				ok ? FM_Mono : FM_Standard);
+		int scrollbar_width = Environment->getSkin()->getSize(gui::EGDS_SCROLLBAR_SIZE);
+		int max_cols = (rect.getWidth() - scrollbar_width - 10) / font->getDimension(L"x").Width;
+
+		text = wrap_rows(text, max_cols, true);
+
+		rect += topleft_client + v2s32(20 * s, ypos);
+		IGUIEditBox *e = new GUIEditBoxWithScrollBar(utf8_to_wide(text).c_str(), true, Environment,
+				this, ID_url, rect, m_tsrc, false, true);
+		e->setMultiLine(true);
+		e->setWordWrap(true);
+		e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT);
+		e->setDrawBorder(true);
+		e->setDrawBackground(true);
+		e->setOverrideFont(font);
+		e->drop();
+	}
+
+	ypos += 80 * s;
+	if (ok) {
+		core::rect<s32> rect(0, 0, 100 * s, 40 * s);
+		rect = rect + v2s32(size.X / 2 - 150 * s, ypos);
+		GUIButton::addButton(Environment, rect, m_tsrc, this, ID_open,
+				wstrgettext("Open").c_str());
+	}
+	{
+		core::rect<s32> rect(0, 0, 100 * s, 40 * s);
+		rect = rect + v2s32(size.X / 2 + 50 * s, ypos);
+		GUIButton::addButton(Environment, rect, m_tsrc, this, ID_cancel,
+				wstrgettext("Cancel").c_str());
+	}
+}
+
+void GUIOpenURLMenu::drawMenu()
+{
+	gui::IGUISkin *skin = Environment->getSkin();
+	if (!skin)
+		return;
+	video::IVideoDriver *driver = Environment->getVideoDriver();
+
+	video::SColor bgcolor(140, 0, 0, 0);
+	driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
+
+	gui::IGUIElement::draw();
+#ifdef __ANDROID__
+	getAndroidUIInput();
+#endif
+}
+
+bool GUIOpenURLMenu::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_KEY_INPUT_EVENT) {
+		if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
+			quitMenu();
+			return true;
+		}
+		if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
+			porting::open_url(url);
+			quitMenu();
+			return true;
+		}
+	}
+
+	if (event.EventType == EET_GUI_EVENT) {
+		if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST &&
+				isVisible()) {
+			if (!canTakeFocus(event.GUIEvent.Element)) {
+				infostream << "GUIOpenURLMenu: Not allowing focus change."
+					<< std::endl;
+				// Returning true disables focus change
+				return true;
+			}
+		}
+
+		if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
+			switch (event.GUIEvent.Caller->getID()) {
+			case ID_open:
+				porting::open_url(url);
+				quitMenu();
+				return true;
+			case ID_cancel:
+				quitMenu();
+				return true;
+			}
+		}
+	}
+
+	return Parent != nullptr && Parent->OnEvent(event);
+}
diff --git a/src/gui/guiOpenURL.h b/src/gui/guiOpenURL.h
new file mode 100644
index 000000000..8f873c2fa
--- /dev/null
+++ b/src/gui/guiOpenURL.h
@@ -0,0 +1,50 @@
+/*
+Part of Minetest
+Copyright (C) 2023 rubenwardy
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#pragma once
+
+#include "irrlichttypes_extrabloated.h"
+#include "modalMenu.h"
+#include <string>
+
+class Client;
+class ISimpleTextureSource;
+
+class GUIOpenURLMenu : public GUIModalMenu
+{
+public:
+	GUIOpenURLMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
+			IMenuManager *menumgr,
+			ISimpleTextureSource *tsrc, const std::string &url);
+
+	/*
+		Remove and re-add (or reposition) stuff
+	*/
+	void regenerateGui(v2u32 screensize);
+
+	void drawMenu();
+
+	bool OnEvent(const SEvent &event);
+
+protected:
+	std::wstring getLabelByID(s32 id) { return L""; }
+	std::string getNameByID(s32 id) { return ""; }
+
+private:
+	ISimpleTextureSource *m_tsrc;
+	std::string url;
+};
diff --git a/src/gui/guiPasswordChange.cpp b/src/gui/guiPasswordChange.cpp
index 23675388c..1b9bc439e 100644
--- a/src/gui/guiPasswordChange.cpp
+++ b/src/gui/guiPasswordChange.cpp
@@ -30,10 +30,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
 
-#ifdef HAVE_TOUCHSCREENGUI
-	#include "client/renderingengine.h"
-#endif
-
 #include "porting.h"
 #include "gettext.h"
 #include "util/string.h"
@@ -73,17 +69,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	/*
 		Calculate new sizes and positions
 	*/
-#ifdef HAVE_TOUCHSCREENGUI
-	const float s = m_gui_scale * RenderingEngine::getDisplayDensity() / 2;
-#else
-	const float s = m_gui_scale;
-#endif
-	DesiredRect = core::rect<s32>(
-		screensize.X / 2 - 580 * s / 2,
-		screensize.Y / 2 - 300 * s / 2,
-		screensize.X / 2 + 580 * s / 2,
-		screensize.Y / 2 + 300 * s / 2
-	);
+	ScalingInfo info = getScalingInfo(screensize, v2u32(580, 300));
+	const float s = info.scale;
+	DesiredRect = info.rect;
 	recalculateAbsolutePosition(false);
 
 	v2s32 size = DesiredRect.getSize();
@@ -209,14 +197,10 @@ bool GUIPasswordChange::OnEvent(const SEvent &event)
 		return true;
 
 	if (event.EventType == EET_KEY_INPUT_EVENT) {
-		// clang-format off
-		if ((event.KeyInput.Key == KEY_ESCAPE ||
-				event.KeyInput.Key == KEY_CANCEL) &&
-				event.KeyInput.PressedDown) {
+		if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
 			quitMenu();
 			return true;
 		}
-		// clang-format on
 		if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
 			acceptInput();
 			if (processInput())
@@ -276,14 +260,19 @@ std::string GUIPasswordChange::getNameByID(s32 id)
 }
 
 #ifdef __ANDROID__
-bool GUIPasswordChange::getAndroidUIInput()
+void GUIPasswordChange::getAndroidUIInput()
 {
-	if (!hasAndroidUIInput())
-		return false;
+	porting::AndroidDialogState dialogState = getAndroidUIInputState();
+	if (dialogState == porting::DIALOG_SHOWN) {
+		return;
+	} else if (dialogState == porting::DIALOG_CANCELED) {
+		m_jni_field_name.clear();
+		return;
+	}
 
-	// still waiting
-	if (porting::getInputDialogState() == -1)
-		return true;
+	// It has to be a text input
+	if (porting::getLastInputDialogType() != porting::TEXT_INPUT)
+		return;
 
 	gui::IGUIElement *e = nullptr;
 	if (m_jni_field_name == "old_password")
@@ -295,10 +284,10 @@ bool GUIPasswordChange::getAndroidUIInput()
 	m_jni_field_name.clear();
 
 	if (!e || e->getType() != irr::gui::EGUIET_EDIT_BOX)
-		return false;
+		return;
 
-	std::string text = porting::getInputDialogValue();
+	std::string text = porting::getInputDialogMessage();
 	e->setText(utf8_to_wide(text).c_str());
-	return false;
+	return;
 }
 #endif
diff --git a/src/gui/guiPasswordChange.h b/src/gui/guiPasswordChange.h
index 333220586..e2cafa312 100644
--- a/src/gui/guiPasswordChange.h
+++ b/src/gui/guiPasswordChange.h
@@ -50,7 +50,7 @@ public:
 
 	bool OnEvent(const SEvent &event);
 #ifdef __ANDROID__
-	bool getAndroidUIInput();
+	void getAndroidUIInput();
 #endif
 
 protected:
diff --git a/src/gui/guiScrollBar.cpp b/src/gui/guiScrollBar.cpp
index 634f60f2d..8e8935b2d 100644
--- a/src/gui/guiScrollBar.cpp
+++ b/src/gui/guiScrollBar.cpp
@@ -12,6 +12,7 @@ the arrow buttons where there is insufficient space.
 
 #include "guiScrollBar.h"
 #include "guiButton.h"
+#include "porting.h"
 #include <IGUISkin.h>
 
 GUIScrollBar::GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id,
@@ -38,40 +39,32 @@ bool GUIScrollBar::OnEvent(const SEvent &event)
 		switch (event.EventType) {
 		case EET_KEY_INPUT_EVENT:
 			if (event.KeyInput.PressedDown) {
-				const s32 old_pos = scroll_pos;
+				const s32 old_pos = getTargetPos();
 				bool absorb = true;
 				switch (event.KeyInput.Key) {
 				case KEY_LEFT:
 				case KEY_UP:
-					setPos(scroll_pos - small_step);
+					setPosInterpolated(old_pos - small_step);
 					break;
 				case KEY_RIGHT:
 				case KEY_DOWN:
-					setPos(scroll_pos + small_step);
+					setPosInterpolated(old_pos + small_step);
 					break;
 				case KEY_HOME:
-					setPos(min_pos);
+					setPosInterpolated(min_pos);
 					break;
 				case KEY_PRIOR:
-					setPos(scroll_pos - large_step);
+					setPosInterpolated(old_pos - large_step);
 					break;
 				case KEY_END:
-					setPos(max_pos);
+					setPosInterpolated(max_pos);
 					break;
 				case KEY_NEXT:
-					setPos(scroll_pos + large_step);
+					setPosInterpolated(old_pos + large_step);
 					break;
 				default:
 					absorb = false;
 				}
-				if (scroll_pos != old_pos) {
-					SEvent e;
-					e.EventType = EET_GUI_EVENT;
-					e.GUIEvent.Caller = this;
-					e.GUIEvent.Element = nullptr;
-					e.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-					Parent->OnEvent(e);
-				}
 				if (absorb)
 					return true;
 			}
@@ -79,16 +72,9 @@ bool GUIScrollBar::OnEvent(const SEvent &event)
 		case EET_GUI_EVENT:
 			if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED) {
 				if (event.GUIEvent.Caller == up_button)
-					setPos(scroll_pos - small_step);
+					setPosInterpolated(getTargetPos() - small_step);
 				else if (event.GUIEvent.Caller == down_button)
-					setPos(scroll_pos + small_step);
-
-				SEvent e;
-				e.EventType = EET_GUI_EVENT;
-				e.GUIEvent.Caller = this;
-				e.GUIEvent.Element = nullptr;
-				e.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-				Parent->OnEvent(e);
+					setPosInterpolated(getTargetPos() + small_step);
 				return true;
 			} else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
 				if (event.GUIEvent.Caller == this)
@@ -102,14 +88,7 @@ bool GUIScrollBar::OnEvent(const SEvent &event)
 				if (Environment->hasFocus(this)) {
 					s8 d = event.MouseInput.Wheel < 0 ? -1 : 1;
 					s8 h = is_horizontal ? 1 : -1;
-					setPos(getPos() + (d * small_step * h));
-
-					SEvent e;
-					e.EventType = EET_GUI_EVENT;
-					e.GUIEvent.Caller = this;
-					e.GUIEvent.Element = nullptr;
-					e.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
-					Parent->OnEvent(e);
+					setPosInterpolated(getTargetPos() + (d * small_step * h));
 					return true;
 				}
 				break;
@@ -155,7 +134,6 @@ bool GUIScrollBar::OnEvent(const SEvent &event)
 				if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
 					is_dragging = false;
 
-				// clang-format off
 				if (!dragged_by_slider) {
 					if (is_inside) {
 						dragged_by_slider = slider_rect.isPointInside(p);
@@ -167,7 +145,6 @@ bool GUIScrollBar::OnEvent(const SEvent &event)
 							return is_inside;
 					}
 				}
-				// clang-format on
 
 				const s32 new_pos = getPosFromMousePos(p);
 				const s32 old_pos = scroll_pos;
@@ -230,11 +207,45 @@ void GUIScrollBar::draw()
 	IGUIElement::draw();
 }
 
+static inline s32 interpolate_scroll(s32 from, s32 to, f32 amount)
+{
+	s32 step = core::round32((to - from) * core::clamp(amount, 0.001f, 1.0f));
+	if (step == 0)
+		return to;
+	return from + step;
+}
+
+void GUIScrollBar::interpolatePos()
+{
+	if (target_pos.has_value()) {
+		// Adjust to match 60 FPS. This also means that interpolation is
+		// effectively disabled at <= 30 FPS.
+		f32 amount = 0.5f * (last_delta_ms / 16.667f);
+		setPosRaw(interpolate_scroll(scroll_pos, *target_pos, amount));
+		if (scroll_pos == target_pos)
+			target_pos = std::nullopt;
+
+		SEvent e;
+		e.EventType = EET_GUI_EVENT;
+		e.GUIEvent.Caller = this;
+		e.GUIEvent.Element = nullptr;
+		e.GUIEvent.EventType = EGET_SCROLL_BAR_CHANGED;
+		Parent->OnEvent(e);
+	}
+}
+
+void GUIScrollBar::OnPostRender(u32 time_ms)
+{
+	last_delta_ms = porting::getDeltaMs(last_time_ms, time_ms);
+	last_time_ms = time_ms;
+	interpolatePos();
+}
+
 void GUIScrollBar::updateAbsolutePosition()
 {
 	IGUIElement::updateAbsolutePosition();
 	refreshControls();
-	setPos(scroll_pos);
+	updatePos();
 }
 
 s32 GUIScrollBar::getPosFromMousePos(const core::position2di &pos) const
@@ -252,16 +263,21 @@ s32 GUIScrollBar::getPosFromMousePos(const core::position2di &pos) const
 	return core::isnotzero(range()) ? s32(f32(p) / f32(w) * range() + 0.5f) + min_pos : 0;
 }
 
-void GUIScrollBar::setPos(const s32 &pos)
+void GUIScrollBar::updatePos()
+{
+	setPosRaw(scroll_pos);
+}
+
+void GUIScrollBar::setPosRaw(const s32 &pos)
 {
 	s32 thumb_area = 0;
 	s32 thumb_min = 0;
 
 	if (is_horizontal) {
-		thumb_min = RelativeRect.getHeight();
+		thumb_min = std::min(RelativeRect.getHeight(), RelativeRect.getWidth() / 2);
 		thumb_area = RelativeRect.getWidth() - border_size * 2;
 	} else {
-		thumb_min = RelativeRect.getWidth();
+		thumb_min = std::min(RelativeRect.getWidth(), RelativeRect.getHeight() / 2);
 		thumb_area = RelativeRect.getHeight() - border_size * 2;
 	}
 
@@ -278,6 +294,23 @@ void GUIScrollBar::setPos(const s32 &pos)
 		border_size;
 }
 
+void GUIScrollBar::setPos(const s32 &pos)
+{
+	setPosRaw(pos);
+	target_pos = std::nullopt;
+}
+
+void GUIScrollBar::setPosInterpolated(const s32 &pos)
+{
+	s32 clamped = core::s32_clamp(pos, min_pos, max_pos);
+	if (scroll_pos != clamped) {
+		target_pos = clamped;
+		interpolatePos();
+	} else {
+		target_pos = std::nullopt;
+	}
+}
+
 void GUIScrollBar::setSmallStep(const s32 &step)
 {
 	small_step = step > 0 ? step : 10;
@@ -297,7 +330,7 @@ void GUIScrollBar::setMax(const s32 &max)
 	bool enable = core::isnotzero(range());
 	up_button->setEnabled(enable);
 	down_button->setEnabled(enable);
-	setPos(scroll_pos);
+	updatePos();
 }
 
 void GUIScrollBar::setMin(const s32 &min)
@@ -309,13 +342,13 @@ void GUIScrollBar::setMin(const s32 &min)
 	bool enable = core::isnotzero(range());
 	up_button->setEnabled(enable);
 	down_button->setEnabled(enable);
-	setPos(scroll_pos);
+	updatePos();
 }
 
 void GUIScrollBar::setPageSize(const s32 &size)
 {
 	page_size = size;
-	setPos(scroll_pos);
+	updatePos();
 }
 
 void GUIScrollBar::setArrowsVisible(ArrowVisibility visible)
@@ -329,6 +362,15 @@ s32 GUIScrollBar::getPos() const
 	return scroll_pos;
 }
 
+s32 GUIScrollBar::getTargetPos() const
+{
+	if (target_pos.has_value()) {
+		s32 clamped = core::s32_clamp(*target_pos, min_pos, max_pos);
+		return clamped;
+	}
+	return scroll_pos;
+}
+
 void GUIScrollBar::refreshControls()
 {
 	IGUISkin *skin = Environment->getSkin();
diff --git a/src/gui/guiScrollBar.h b/src/gui/guiScrollBar.h
index 3ff3bba35..a976d1a59 100644
--- a/src/gui/guiScrollBar.h
+++ b/src/gui/guiScrollBar.h
@@ -13,6 +13,7 @@ the arrow buttons where there is insufficient space.
 #pragma once
 
 #include "irrlichttypes_extrabloated.h"
+#include <optional>
 
 class ISimpleTextureSource;
 
@@ -33,21 +34,30 @@ public:
 		DEFAULT
 	};
 
-	virtual void draw();
-	virtual void updateAbsolutePosition();
-	virtual bool OnEvent(const SEvent &event);
+	virtual void draw() override;
+	virtual void updateAbsolutePosition() override;
+	virtual bool OnEvent(const SEvent &event) override;
+	virtual void OnPostRender(u32 time_ms) override;
 
 	s32 getMax() const { return max_pos; }
 	s32 getMin() const { return min_pos; }
 	s32 getLargeStep() const { return large_step; }
 	s32 getSmallStep() const { return small_step; }
 	s32 getPos() const;
+	s32 getTargetPos() const;
 
 	void setMax(const s32 &max);
 	void setMin(const s32 &min);
 	void setSmallStep(const s32 &step);
 	void setLargeStep(const s32 &step);
+	//! Sets a position immediately, aborting any ongoing interpolation.
+	// setPos does not send EGET_SCROLL_BAR_CHANGED events for you.
 	void setPos(const s32 &pos);
+	//! Sets a target position for interpolation.
+	// If you want to do an interpolated addition, use
+	// setPosInterpolated(getTargetPos() + x).
+	// setPosInterpolated takes care of sending EGET_SCROLL_BAR_CHANGED events.
+	void setPosInterpolated(const s32 &pos);
 	void setPageSize(const s32 &size);
 	void setArrowsVisible(ArrowVisibility visible);
 
@@ -79,4 +89,11 @@ private:
 	video::SColor current_icon_color;
 
 	ISimpleTextureSource *m_tsrc;
+
+	void setPosRaw(const s32 &pos);
+	void updatePos();
+	std::optional<s32> target_pos;
+	u32 last_time_ms = 0;
+	u32 last_delta_ms = 17; // assume 60 FPS
+	void interpolatePos();
 };
diff --git a/src/gui/guiSkin.cpp b/src/gui/guiSkin.cpp
index 5462a2fec..0ecc80f02 100644
--- a/src/gui/guiSkin.cpp
+++ b/src/gui/guiSkin.cpp
@@ -1,1037 +1,1037 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// Copyright (C) 2019 Irrlick
-//
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "guiSkin.h"
-
-#include "IGUIFont.h"
-#include "IGUISpriteBank.h"
-#include "IGUIElement.h"
-#include "IVideoDriver.h"
-#include "IAttributes.h"
-
-namespace irr
-{
-namespace gui
-{
-
-GUISkin::GUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
-: SpriteBank(0), Driver(driver), Type(type)
-{
-	#ifdef _DEBUG
-	setDebugName("GUISkin");
-	#endif
-
-	if ((Type == EGST_WINDOWS_CLASSIC) || (Type == EGST_WINDOWS_METALLIC))
-	{
-		Colors[EGDC_3D_DARK_SHADOW]     = video::SColor(101,50,50,50);
-		Colors[EGDC_3D_SHADOW]          = video::SColor(101,130,130,130);
-		Colors[EGDC_3D_FACE]            = video::SColor(220,100,100,100);
-		Colors[EGDC_3D_HIGH_LIGHT]      = video::SColor(101,255,255,255);
-		Colors[EGDC_3D_LIGHT]           = video::SColor(101,210,210,210);
-		Colors[EGDC_ACTIVE_BORDER]      = video::SColor(101,16,14,115);
-		Colors[EGDC_ACTIVE_CAPTION]     = video::SColor(255,255,255,255);
-		Colors[EGDC_APP_WORKSPACE]      = video::SColor(101,100,100,100);
-		Colors[EGDC_BUTTON_TEXT]        = video::SColor(240,10,10,10);
-		Colors[EGDC_GRAY_TEXT]          = video::SColor(240,130,130,130);
-		Colors[EGDC_HIGH_LIGHT]         = video::SColor(101,8,36,107);
-		Colors[EGDC_HIGH_LIGHT_TEXT]    = video::SColor(240,255,255,255);
-		Colors[EGDC_INACTIVE_BORDER]    = video::SColor(101,165,165,165);
-		Colors[EGDC_INACTIVE_CAPTION]   = video::SColor(255,30,30,30);
-		Colors[EGDC_TOOLTIP]            = video::SColor(200,0,0,0);
-		Colors[EGDC_TOOLTIP_BACKGROUND] = video::SColor(200,255,255,225);
-		Colors[EGDC_SCROLLBAR]          = video::SColor(101,230,230,230);
-		Colors[EGDC_WINDOW]             = video::SColor(101,255,255,255);
-		Colors[EGDC_WINDOW_SYMBOL]      = video::SColor(200,10,10,10);
-		Colors[EGDC_ICON]               = video::SColor(200,255,255,255);
-		Colors[EGDC_ICON_HIGH_LIGHT]    = video::SColor(200,8,36,107);
-		Colors[EGDC_GRAY_WINDOW_SYMBOL] = video::SColor(240,100,100,100);
-		Colors[EGDC_EDITABLE] 			= video::SColor(255,255,255,255);
-		Colors[EGDC_GRAY_EDITABLE]		= video::SColor(255,120,120,120);
-		Colors[EGDC_FOCUSED_EDITABLE]	= video::SColor(255,240,240,255);
-
-
-		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
-		Sizes[EGDS_MENU_HEIGHT] = 30;
-		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
-		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
-		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
-		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
-		Sizes[EGDS_BUTTON_WIDTH] = 80;
-		Sizes[EGDS_BUTTON_HEIGHT] = 30;
-
-		Sizes[EGDS_TEXT_DISTANCE_X] = 2;
-		Sizes[EGDS_TEXT_DISTANCE_Y] = 0;
-
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 2;
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 0;
-	}
-	else
-	{
-		//0x80a6a8af
-		Colors[EGDC_3D_DARK_SHADOW] 	=	0x60767982;
-		//Colors[EGDC_3D_FACE]			=	0xc0c9ccd4;		// tab background
-		Colors[EGDC_3D_FACE]			=	0xc0cbd2d9;		// tab background
-		Colors[EGDC_3D_SHADOW]			=	0x50e4e8f1;		// tab background, and left-top highlight
-		Colors[EGDC_3D_HIGH_LIGHT]		=	0x40c7ccdc;
-		Colors[EGDC_3D_LIGHT]			=	0x802e313a;
-		Colors[EGDC_ACTIVE_BORDER]		=	0x80404040;		// window title
-		Colors[EGDC_ACTIVE_CAPTION] 	=	0xffd0d0d0;
-		Colors[EGDC_APP_WORKSPACE]		=	0xc0646464;		// unused
-		Colors[EGDC_BUTTON_TEXT]		=	0xd0161616;
-		Colors[EGDC_GRAY_TEXT]			=	0x3c141414;
-		Colors[EGDC_HIGH_LIGHT]			=	0x6c606060;
-		Colors[EGDC_HIGH_LIGHT_TEXT]	=	0xd0e0e0e0;
-		Colors[EGDC_INACTIVE_BORDER]	=	0xf0a5a5a5;
-		Colors[EGDC_INACTIVE_CAPTION]	=	0xffd2d2d2;
-		Colors[EGDC_TOOLTIP]			=	0xf00f2033;
-		Colors[EGDC_TOOLTIP_BACKGROUND]	= 	0xc0cbd2d9;
-		Colors[EGDC_SCROLLBAR]			= 	0xf0e0e0e0;
-		Colors[EGDC_WINDOW]				= 	0xf0f0f0f0;
-		Colors[EGDC_WINDOW_SYMBOL]		= 	0xd0161616;
-		Colors[EGDC_ICON]				= 	0xd0161616;
-		Colors[EGDC_ICON_HIGH_LIGHT]	= 	0xd0606060;
-		Colors[EGDC_GRAY_WINDOW_SYMBOL] = 	0x3c101010;
-		Colors[EGDC_EDITABLE] 			= 	0xf0ffffff;
-		Colors[EGDC_GRAY_EDITABLE]		= 	0xf0cccccc;
-		Colors[EGDC_FOCUSED_EDITABLE]	= 	0xf0fffff0;
-
-		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
-		Sizes[EGDS_MENU_HEIGHT] = 48;
-		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
-		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
-		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
-		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
-		Sizes[EGDS_BUTTON_WIDTH] = 80;
-		Sizes[EGDS_BUTTON_HEIGHT] = 30;
-
-		Sizes[EGDS_TEXT_DISTANCE_X] = 3;
-		Sizes[EGDS_TEXT_DISTANCE_Y] = 2;
-
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 3;
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 2;
-	}
-
-	Sizes[EGDS_MESSAGE_BOX_GAP_SPACE] = 15;
-	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH] = 0;
-	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH] = 500;
-	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT] = 0;
-	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT] = 99999;
-
-	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X] = 1;
-	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y] = 1;
-	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_X] = 0;
-	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y] = 2;
-
-	Texts[EGDT_MSG_BOX_OK] = L"OK";
-	Texts[EGDT_MSG_BOX_CANCEL] = L"Cancel";
-	Texts[EGDT_MSG_BOX_YES] = L"Yes";
-	Texts[EGDT_MSG_BOX_NO] = L"No";
-	Texts[EGDT_WINDOW_CLOSE] = L"Close";
-	Texts[EGDT_WINDOW_RESTORE] = L"Restore";
-	Texts[EGDT_WINDOW_MINIMIZE] = L"Minimize";
-	Texts[EGDT_WINDOW_MAXIMIZE] = L"Maximize";
-
-	Icons[EGDI_WINDOW_MAXIMIZE] = 225;
-	Icons[EGDI_WINDOW_RESTORE] = 226;
-	Icons[EGDI_WINDOW_CLOSE] = 227;
-	Icons[EGDI_WINDOW_MINIMIZE] = 228;
-	Icons[EGDI_CURSOR_UP] = 229;
-	Icons[EGDI_CURSOR_DOWN] = 230;
-	Icons[EGDI_CURSOR_LEFT] = 231;
-	Icons[EGDI_CURSOR_RIGHT] = 232;
-	Icons[EGDI_MENU_MORE] = 232;
-	Icons[EGDI_CHECK_BOX_CHECKED] = 233;
-	Icons[EGDI_DROP_DOWN] = 234;
-	Icons[EGDI_SMALL_CURSOR_UP] = 235;
-	Icons[EGDI_SMALL_CURSOR_DOWN] = 236;
-	Icons[EGDI_RADIO_BUTTON_CHECKED] = 237;
-	Icons[EGDI_MORE_LEFT] = 238;
-	Icons[EGDI_MORE_RIGHT] = 239;
-	Icons[EGDI_MORE_UP] = 240;
-	Icons[EGDI_MORE_DOWN] = 241;
-	Icons[EGDI_WINDOW_RESIZE] = 242;
-	Icons[EGDI_EXPAND] = 243;
-	Icons[EGDI_COLLAPSE] = 244;
-
-	Icons[EGDI_FILE] = 245;
-	Icons[EGDI_DIRECTORY] = 246;
-
-	for (u32 i=0; i<EGDF_COUNT; ++i)
-		Fonts[i] = 0;
-
-	UseGradient = (Type == EGST_WINDOWS_METALLIC) || (Type == EGST_BURNING_SKIN) ;
-}
-
-
-//! destructor
-GUISkin::~GUISkin()
-{
-	for (u32 i=0; i<EGDF_COUNT; ++i)
-	{
-		if (Fonts[i])
-			Fonts[i]->drop();
-	}
-
-	if (SpriteBank)
-		SpriteBank->drop();
-}
-
-
-//! returns default color
-video::SColor GUISkin::getColor(EGUI_DEFAULT_COLOR color) const
-{
-	if ((u32)color < EGDC_COUNT)
-		return Colors[color];
-	else
-		return video::SColor();
-}
-
-
-//! sets a default color
-void GUISkin::setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor)
-{
-	if ((u32)which < EGDC_COUNT)
-		Colors[which] = newColor;
-}
-
-
-//! returns size for the given size type
-s32 GUISkin::getSize(EGUI_DEFAULT_SIZE size) const
-{
-	if ((u32)size < EGDS_COUNT)
-		return Sizes[size];
-	else
-		return 0;
-}
-
-
-//! sets a default size
-void GUISkin::setSize(EGUI_DEFAULT_SIZE which, s32 size)
-{
-	if ((u32)which < EGDS_COUNT)
-		Sizes[which] = size;
-}
-
-
-//! returns the default font
-IGUIFont* GUISkin::getFont(EGUI_DEFAULT_FONT which) const
-{
-	if (((u32)which < EGDF_COUNT) && Fonts[which])
-		return Fonts[which];
-	else
-		return Fonts[EGDF_DEFAULT];
-}
-
-
-//! sets a default font
-void GUISkin::setFont(IGUIFont* font, EGUI_DEFAULT_FONT which)
-{
-	if ((u32)which >= EGDF_COUNT)
-		return;
-
-	if (font)
-	{
-		font->grab();
-		if (Fonts[which])
-			Fonts[which]->drop();
-
-		Fonts[which] = font;
-	}
-}
-
-
-//! gets the sprite bank stored
-IGUISpriteBank* GUISkin::getSpriteBank() const
-{
-	return SpriteBank;
-}
-
-
-//! set a new sprite bank or remove one by passing 0
-void GUISkin::setSpriteBank(IGUISpriteBank* bank)
-{
-	if (bank)
-		bank->grab();
-
-	if (SpriteBank)
-		SpriteBank->drop();
-
-	SpriteBank = bank;
-}
-
-
-//! Returns a default icon
-u32 GUISkin::getIcon(EGUI_DEFAULT_ICON icon) const
-{
-	if ((u32)icon < EGDI_COUNT)
-		return Icons[icon];
-	else
-		return 0;
-}
-
-
-//! Sets a default icon
-void GUISkin::setIcon(EGUI_DEFAULT_ICON icon, u32 index)
-{
-	if ((u32)icon < EGDI_COUNT)
-		Icons[icon] = index;
-}
-
-
-//! Returns a default text. For example for Message box button captions:
-//! "OK", "Cancel", "Yes", "No" and so on.
-const wchar_t* GUISkin::getDefaultText(EGUI_DEFAULT_TEXT text) const
-{
-	if ((u32)text < EGDT_COUNT)
-		return Texts[text].c_str();
-	else
-		return Texts[0].c_str();
-}
-
-
-//! Sets a default text. For example for Message box button captions:
-//! "OK", "Cancel", "Yes", "No" and so on.
-void GUISkin::setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText)
-{
-	if ((u32)which < EGDT_COUNT)
-		Texts[which] = newText;
-}
-
-
-//! draws a standard 3d button pane
-/**	Used for drawing for example buttons in normal state.
-It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-\param rect: Defining area where to draw.
-\param clip: Clip area.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly. */
-// PATCH
-void GUISkin::drawColored3DButtonPaneStandard(IGUIElement* element,
-					const core::rect<s32>& r,
-					const core::rect<s32>* clip,
-					const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		rect.UpperLeftCorner.X -= 1;
-		rect.UpperLeftCorner.Y -= 1;
-		rect.LowerRightCorner.X += 1;
-		rect.LowerRightCorner.Y += 1;
-		draw3DSunkenPane(element,
-					colors[ EGDC_WINDOW ].getInterpolated( 0xFFFFFFFF, 0.9f )
-					,false, true, rect, clip);
-		return;
-	}
-
-	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-	rect.LowerRightCorner.X -= 1;
-	rect.LowerRightCorner.Y -= 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-
-	rect.UpperLeftCorner.X += 1;
-	rect.UpperLeftCorner.Y += 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-
-	rect.LowerRightCorner.X -= 1;
-	rect.LowerRightCorner.Y -= 1;
-
-	if (!UseGradient)
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
-}
-// END PATCH
-
-
-//! draws a pressed 3d button pane
-/**	Used for drawing for example buttons in pressed state.
-It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-\param rect: Defining area where to draw.
-\param clip: Clip area.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly. */
-// PATCH
-void GUISkin::drawColored3DButtonPanePressed(IGUIElement* element,
-					const core::rect<s32>& r,
-					const core::rect<s32>* clip,
-					const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-
-	rect.LowerRightCorner.X -= 1;
-	rect.LowerRightCorner.Y -= 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-	rect.UpperLeftCorner.X += 1;
-	rect.UpperLeftCorner.Y += 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-
-	rect.UpperLeftCorner.X += 1;
-	rect.UpperLeftCorner.Y += 1;
-
-	if (!UseGradient)
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
-}
-// END PATCH
-
-
-//! draws a sunken 3d pane
-/** Used for drawing the background of edit, combo or check boxes.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly.
-\param bgcolor: Background color.
-\param flat: Specifies if the sunken pane should be flat or displayed as sunken
-deep into the ground.
-\param rect: Defining area where to draw.
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColored3DSunkenPane(IGUIElement* element, video::SColor bgcolor,
-				bool flat, bool fillBackGround,
-				const core::rect<s32>& r,
-				const core::rect<s32>* clip,
-				const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-
-	if (fillBackGround)
-		Driver->draw2DRectangle(bgcolor, rect, clip);
-
-	if (flat)
-	{
-		// draw flat sunken pane
-
-		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// top
-
-		++rect.UpperLeftCorner.Y;
-		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// left
-
-		rect = r;
-		++rect.UpperLeftCorner.Y;
-		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// right
-
-		rect = r;
-		++rect.UpperLeftCorner.X;
-		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-		--rect.LowerRightCorner.X;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// bottom
-	}
-	else
-	{
-		// draw deep sunken pane
-		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// top
-		++rect.UpperLeftCorner.X;
-		++rect.UpperLeftCorner.Y;
-		--rect.LowerRightCorner.X;
-		++rect.LowerRightCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-		rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
-		rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y+1;
-		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
-		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// left
-		++rect.UpperLeftCorner.X;
-		++rect.UpperLeftCorner.Y;
-		++rect.LowerRightCorner.X;
-		--rect.LowerRightCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-		rect = r;
-		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-		++rect.UpperLeftCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// right
-		--rect.UpperLeftCorner.X;
-		++rect.UpperLeftCorner.Y;
-		--rect.LowerRightCorner.X;
-		--rect.LowerRightCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_LIGHT], rect, clip);
-
-		rect = r;
-		++rect.UpperLeftCorner.X;
-		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-		--rect.LowerRightCorner.X;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// bottom
-		++rect.UpperLeftCorner.X;
-		--rect.UpperLeftCorner.Y;
-		--rect.LowerRightCorner.X;
-		--rect.LowerRightCorner.Y;
-		Driver->draw2DRectangle(colors[EGDC_3D_LIGHT], rect, clip);
-	}
-}
-// END PATCH
-
-//! draws a window background
-// return where to draw title bar text.
-// PATCH
-core::rect<s32> GUISkin::drawColored3DWindowBackground(IGUIElement* element,
-				bool drawTitleBar, video::SColor titleBarColor,
-				const core::rect<s32>& r,
-				const core::rect<s32>* clip,
-				core::rect<s32>* checkClientArea,
-				const video::SColor* colors)
-{
-	if (!Driver)
-	{
-		if ( checkClientArea )
-		{
-			*checkClientArea = r;
-		}
-		return r;
-	}
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-
-	// top border
-	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-	}
-
-	// left border
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-	}
-
-	// right border dark outer line
-	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
-	rect.LowerRightCorner.X = r.LowerRightCorner.X;
-	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-	}
-
-	// right border bright innner line
-	rect.UpperLeftCorner.X -= 1;
-	rect.LowerRightCorner.X -= 1;
-	rect.UpperLeftCorner.Y += 1;
-	rect.LowerRightCorner.Y -= 1;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-	}
-
-	// bottom border dark outer line
-	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
-	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	rect.LowerRightCorner.X = r.LowerRightCorner.X;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-	}
-
-	// bottom border bright inner line
-	rect.UpperLeftCorner.X += 1;
-	rect.LowerRightCorner.X -= 1;
-	rect.UpperLeftCorner.Y -= 1;
-	rect.LowerRightCorner.Y -= 1;
-	if ( !checkClientArea )
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-	}
-
-	// client area for background
-	rect = r;
-	rect.UpperLeftCorner.X +=1;
-	rect.UpperLeftCorner.Y +=1;
-	rect.LowerRightCorner.X -= 2;
-	rect.LowerRightCorner.Y -= 2;
-	if (checkClientArea)
-	{
-		*checkClientArea = rect;
-	}
-
-	if ( !checkClientArea )
-	{
-		if (!UseGradient)
-		{
-			Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-		}
-		else if ( Type == EGST_BURNING_SKIN )
-		{
-			const video::SColor c1 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.9f );
-			const video::SColor c2 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.8f );
-
-			Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-		}
-		else
-		{
-			const video::SColor c2 = colors[EGDC_3D_SHADOW];
-			const video::SColor c1 = colors[EGDC_3D_FACE];
-			Driver->draw2DRectangle(rect, c1, c1, c1, c2, clip);
-		}
-	}
-
-	// title bar
-	rect = r;
-	rect.UpperLeftCorner.X += 2;
-	rect.UpperLeftCorner.Y += 2;
-	rect.LowerRightCorner.X -= 2;
-	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + getSize(EGDS_WINDOW_BUTTON_WIDTH) + 2;
-
-	if (drawTitleBar )
-	{
-		if (checkClientArea)
-		{
-			(*checkClientArea).UpperLeftCorner.Y = rect.LowerRightCorner.Y;
-		}
-		else
-		{
-			// draw title bar
-			//if (!UseGradient)
-			//	Driver->draw2DRectangle(titleBarColor, rect, clip);
-			//else
-			if ( Type == EGST_BURNING_SKIN )
-			{
-				const video::SColor c = titleBarColor.getInterpolated( video::SColor(titleBarColor.getAlpha(),255,255,255), 0.8f);
-				Driver->draw2DRectangle(rect, titleBarColor, titleBarColor, c, c, clip);
-			}
-			else
-			{
-				const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(),0,0,0), 0.2f);
-				Driver->draw2DRectangle(rect, titleBarColor, c, titleBarColor, c, clip);
-			}
-		}
-	}
-
-	return rect;
-}
-// END PATCH
-
-
-//! draws a standard 3d menu pane
-/**	Used for drawing for menus and context menus.
-It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly.
-\param rect: Defining area where to draw.
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColored3DMenuPane(IGUIElement* element,
-			const core::rect<s32>& r, const core::rect<s32>* clip,
-			const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		rect.UpperLeftCorner.Y -= 3;
-		draw3DButtonPaneStandard(element, rect, clip);
-		return;
-	}
-
-	// in this skin, this is exactly what non pressed buttons look like,
-	// so we could simply call
-	// draw3DButtonPaneStandard(element, rect, clip);
-	// here.
-	// but if the skin is transparent, this doesn't look that nice. So
-	// We draw it a little bit better, with some more draw2DRectangle calls,
-	// but there aren't that much menus visible anyway.
-
-	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
-
-	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
-	rect.LowerRightCorner.X = r.LowerRightCorner.X;
-	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-	rect.UpperLeftCorner.X -= 1;
-	rect.LowerRightCorner.X -= 1;
-	rect.UpperLeftCorner.Y += 1;
-	rect.LowerRightCorner.Y -= 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-
-	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
-	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	rect.LowerRightCorner.X = r.LowerRightCorner.X;
-	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
-
-	rect.UpperLeftCorner.X += 1;
-	rect.LowerRightCorner.X -= 1;
-	rect.UpperLeftCorner.Y -= 1;
-	rect.LowerRightCorner.Y -= 1;
-	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-
-	rect = r;
-	rect.UpperLeftCorner.X +=1;
-	rect.UpperLeftCorner.Y +=1;
-	rect.LowerRightCorner.X -= 2;
-	rect.LowerRightCorner.Y -= 2;
-
-	if (!UseGradient)
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = colors[EGDC_3D_SHADOW];
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
-}
-// END PATCH
-
-
-//! draws a standard 3d tool bar
-/**	Used for drawing for toolbars and menus.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly.
-\param rect: Defining area where to draw.
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColored3DToolBar(IGUIElement* element,
-				const core::rect<s32>& r,
-				const core::rect<s32>* clip,
-				const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> rect = r;
-
-	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
-	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
-	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
-	rect.LowerRightCorner.X = r.LowerRightCorner.X;
-	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
-
-	rect = r;
-	rect.LowerRightCorner.Y -= 1;
-
-	if (!UseGradient)
-	{
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
-	else
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		const video::SColor c1 = 0xF0000000 | colors[EGDC_3D_FACE].color;
-		const video::SColor c2 = 0xF0000000 | colors[EGDC_3D_SHADOW].color;
-
-		rect.LowerRightCorner.Y += 1;
-		Driver->draw2DRectangle(rect, c1, c2, c1, c2, clip);
-	}
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = colors[EGDC_3D_SHADOW];
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
-}
-// END PATCH
-
-//! draws a tab button
-/**	Used for drawing for tab buttons on top of tabs.
-\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly.
-\param active: Specifies if the tab is currently active.
-\param rect: Defining area where to draw.
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColored3DTabButton(IGUIElement* element, bool active,
-	const core::rect<s32>& frameRect, const core::rect<s32>* clip, EGUI_ALIGNMENT alignment,
-	const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> tr = frameRect;
-
-	if ( alignment == EGUIA_UPPERLEFT )
-	{
-		tr.LowerRightCorner.X -= 2;
-		tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
-		tr.UpperLeftCorner.X += 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-		// draw left highlight
-		tr = frameRect;
-		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-		tr.UpperLeftCorner.Y += 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-		// draw grey background
-		tr = frameRect;
-		tr.UpperLeftCorner.X += 1;
-		tr.UpperLeftCorner.Y += 1;
-		tr.LowerRightCorner.X -= 2;
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
-
-		// draw right middle gray shadow
-		tr.LowerRightCorner.X += 1;
-		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
-
-		tr.LowerRightCorner.X += 1;
-		tr.UpperLeftCorner.X += 1;
-		tr.UpperLeftCorner.Y += 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], tr, clip);
-	}
-	else
-	{
-		tr.LowerRightCorner.X -= 2;
-		tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
-		tr.UpperLeftCorner.X += 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-		// draw left highlight
-		tr = frameRect;
-		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-		tr.LowerRightCorner.Y -= 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-		// draw grey background
-		tr = frameRect;
-		tr.UpperLeftCorner.X += 1;
-		tr.UpperLeftCorner.Y -= 1;
-		tr.LowerRightCorner.X -= 2;
-		tr.LowerRightCorner.Y -= 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
-
-		// draw right middle gray shadow
-		tr.LowerRightCorner.X += 1;
-		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
-		//tr.LowerRightCorner.Y -= 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
-
-		tr.LowerRightCorner.X += 1;
-		tr.UpperLeftCorner.X += 1;
-		tr.LowerRightCorner.Y -= 1;
-		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], tr, clip);
-	}
-}
-// END PATCH
-
-
-//! draws a tab control body
-/**	\param element: Pointer to the element which wishes to draw this. This parameter
-is usually not used by ISkin, but can be used for example by more complex
-implementations to find out how to draw the part exactly.
-\param border: Specifies if the border should be drawn.
-\param background: Specifies if the background should be drawn.
-\param rect: Defining area where to draw.
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColored3DTabBody(IGUIElement* element, bool border, bool background,
-	const core::rect<s32>& rect, const core::rect<s32>* clip, s32 tabHeight, EGUI_ALIGNMENT alignment,
-	const video::SColor* colors)
-{
-	if (!Driver)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	core::rect<s32> tr = rect;
-
-	if ( tabHeight == -1 )
-		tabHeight = getSize(gui::EGDS_BUTTON_HEIGHT);
-
-	// draw border.
-	if (border)
-	{
-		if ( alignment == EGUIA_UPPERLEFT )
-		{
-			// draw left hightlight
-			tr.UpperLeftCorner.Y += tabHeight + 2;
-			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-			// draw right shadow
-			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
-
-			// draw lower shadow
-			tr = rect;
-			tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
-		}
-		else
-		{
-			// draw left hightlight
-			tr.LowerRightCorner.Y -= tabHeight + 2;
-			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-
-			// draw right shadow
-			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
-			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
-
-			// draw lower shadow
-			tr = rect;
-			tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
-			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
-		}
-	}
-
-	if (background)
-	{
-		if ( alignment == EGUIA_UPPERLEFT )
-		{
-			tr = rect;
-			tr.UpperLeftCorner.Y += tabHeight + 2;
-			tr.LowerRightCorner.X -= 1;
-			tr.UpperLeftCorner.X += 1;
-			tr.LowerRightCorner.Y -= 1;
-		}
-		else
-		{
-			tr = rect;
-			tr.UpperLeftCorner.X += 1;
-			tr.UpperLeftCorner.Y -= 1;
-			tr.LowerRightCorner.X -= 1;
-			tr.LowerRightCorner.Y -= tabHeight + 2;
-			//tr.UpperLeftCorner.X += 1;
-		}
-
-		if (!UseGradient)
-			Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
-		else
-		{
-			video::SColor c1 = colors[EGDC_3D_FACE];
-			video::SColor c2 = colors[EGDC_3D_SHADOW];
-			Driver->draw2DRectangle(tr, c1, c1, c2, c2, clip);
-		}
-	}
-}
-// END PATCH
-
-
-//! draws an icon, usually from the skin's sprite bank
-/**	\param parent: Pointer to the element which wishes to draw this icon.
-This parameter is usually not used by IGUISkin, but can be used for example
-by more complex implementations to find out how to draw the part exactly.
-\param icon: Specifies the icon to be drawn.
-\param position: The position to draw the icon
-\param starttime: The time at the start of the animation
-\param currenttime: The present time, used to calculate the frame number
-\param loop: Whether the animation should loop or not
-\param clip: Clip area.	*/
-// PATCH
-void GUISkin::drawColoredIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
-			const core::position2di position,
-			u32 starttime, u32 currenttime,
-			bool loop, const core::rect<s32>* clip,
-			const video::SColor* colors)
-{
-	if (!SpriteBank)
-		return;
-
-	if (!colors)
-		colors = Colors;
-
-	bool gray = element && !element->isEnabled();
-	SpriteBank->draw2DSprite(Icons[icon], position, clip,
-			colors[gray? EGDC_GRAY_WINDOW_SYMBOL : EGDC_WINDOW_SYMBOL], starttime, currenttime, loop, true);
-}
-// END PATCH
-
-
-EGUI_SKIN_TYPE GUISkin::getType() const
-{
-	return Type;
-}
-
-
-//! draws a 2d rectangle.
-void GUISkin::draw2DRectangle(IGUIElement* element,
-		const video::SColor &color, const core::rect<s32>& pos,
-		const core::rect<s32>* clip)
-{
-	Driver->draw2DRectangle(color, pos, clip);
-}
-
-
-//! gets the colors
-// PATCH
-void GUISkin::getColors(video::SColor* colors)
-{
-	u32 i;
-	for (i=0; i<EGDC_COUNT; ++i)
-		colors[i] = Colors[i];
-}
-// END PATCH
-
-} // end namespace gui
-} // end namespace irr
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2019 Irrlick
+//
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "guiSkin.h"
+
+#include "IGUIFont.h"
+#include "IGUISpriteBank.h"
+#include "IGUIElement.h"
+#include "IVideoDriver.h"
+#include "IAttributes.h"
+
+namespace irr
+{
+namespace gui
+{
+
+GUISkin::GUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
+: SpriteBank(0), Driver(driver), Type(type)
+{
+	#ifdef _DEBUG
+	setDebugName("GUISkin");
+	#endif
+
+	if ((Type == EGST_WINDOWS_CLASSIC) || (Type == EGST_WINDOWS_METALLIC))
+	{
+		Colors[EGDC_3D_DARK_SHADOW]     = video::SColor(101,50,50,50);
+		Colors[EGDC_3D_SHADOW]          = video::SColor(101,130,130,130);
+		Colors[EGDC_3D_FACE]            = video::SColor(220,100,100,100);
+		Colors[EGDC_3D_HIGH_LIGHT]      = video::SColor(101,255,255,255);
+		Colors[EGDC_3D_LIGHT]           = video::SColor(101,210,210,210);
+		Colors[EGDC_ACTIVE_BORDER]      = video::SColor(101,16,14,115);
+		Colors[EGDC_ACTIVE_CAPTION]     = video::SColor(255,255,255,255);
+		Colors[EGDC_APP_WORKSPACE]      = video::SColor(101,100,100,100);
+		Colors[EGDC_BUTTON_TEXT]        = video::SColor(240,10,10,10);
+		Colors[EGDC_GRAY_TEXT]          = video::SColor(240,130,130,130);
+		Colors[EGDC_HIGH_LIGHT]         = video::SColor(101,8,36,107);
+		Colors[EGDC_HIGH_LIGHT_TEXT]    = video::SColor(240,255,255,255);
+		Colors[EGDC_INACTIVE_BORDER]    = video::SColor(101,165,165,165);
+		Colors[EGDC_INACTIVE_CAPTION]   = video::SColor(255,30,30,30);
+		Colors[EGDC_TOOLTIP]            = video::SColor(200,0,0,0);
+		Colors[EGDC_TOOLTIP_BACKGROUND] = video::SColor(200,255,255,225);
+		Colors[EGDC_SCROLLBAR]          = video::SColor(101,230,230,230);
+		Colors[EGDC_WINDOW]             = video::SColor(101,255,255,255);
+		Colors[EGDC_WINDOW_SYMBOL]      = video::SColor(200,10,10,10);
+		Colors[EGDC_ICON]               = video::SColor(200,255,255,255);
+		Colors[EGDC_ICON_HIGH_LIGHT]    = video::SColor(200,8,36,107);
+		Colors[EGDC_GRAY_WINDOW_SYMBOL] = video::SColor(240,100,100,100);
+		Colors[EGDC_EDITABLE] 			= video::SColor(255,255,255,255);
+		Colors[EGDC_GRAY_EDITABLE]		= video::SColor(255,120,120,120);
+		Colors[EGDC_FOCUSED_EDITABLE]	= video::SColor(255,240,240,255);
+
+
+		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
+		Sizes[EGDS_MENU_HEIGHT] = 30;
+		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
+		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
+		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
+		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
+		Sizes[EGDS_BUTTON_WIDTH] = 80;
+		Sizes[EGDS_BUTTON_HEIGHT] = 30;
+
+		Sizes[EGDS_TEXT_DISTANCE_X] = 2;
+		Sizes[EGDS_TEXT_DISTANCE_Y] = 0;
+
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 2;
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 0;
+	}
+	else
+	{
+		//0x80a6a8af
+		Colors[EGDC_3D_DARK_SHADOW] 	=	0x60767982;
+		//Colors[EGDC_3D_FACE]			=	0xc0c9ccd4;		// tab background
+		Colors[EGDC_3D_FACE]			=	0xc0cbd2d9;		// tab background
+		Colors[EGDC_3D_SHADOW]			=	0x50e4e8f1;		// tab background, and left-top highlight
+		Colors[EGDC_3D_HIGH_LIGHT]		=	0x40c7ccdc;
+		Colors[EGDC_3D_LIGHT]			=	0x802e313a;
+		Colors[EGDC_ACTIVE_BORDER]		=	0x80404040;		// window title
+		Colors[EGDC_ACTIVE_CAPTION] 	=	0xffd0d0d0;
+		Colors[EGDC_APP_WORKSPACE]		=	0xc0646464;		// unused
+		Colors[EGDC_BUTTON_TEXT]		=	0xd0161616;
+		Colors[EGDC_GRAY_TEXT]			=	0x3c141414;
+		Colors[EGDC_HIGH_LIGHT]			=	0x6c606060;
+		Colors[EGDC_HIGH_LIGHT_TEXT]	=	0xd0e0e0e0;
+		Colors[EGDC_INACTIVE_BORDER]	=	0xf0a5a5a5;
+		Colors[EGDC_INACTIVE_CAPTION]	=	0xffd2d2d2;
+		Colors[EGDC_TOOLTIP]			=	0xf00f2033;
+		Colors[EGDC_TOOLTIP_BACKGROUND]	= 	0xc0cbd2d9;
+		Colors[EGDC_SCROLLBAR]			= 	0xf0e0e0e0;
+		Colors[EGDC_WINDOW]				= 	0xf0f0f0f0;
+		Colors[EGDC_WINDOW_SYMBOL]		= 	0xd0161616;
+		Colors[EGDC_ICON]				= 	0xd0161616;
+		Colors[EGDC_ICON_HIGH_LIGHT]	= 	0xd0606060;
+		Colors[EGDC_GRAY_WINDOW_SYMBOL] = 	0x3c101010;
+		Colors[EGDC_EDITABLE] 			= 	0xf0ffffff;
+		Colors[EGDC_GRAY_EDITABLE]		= 	0xf0cccccc;
+		Colors[EGDC_FOCUSED_EDITABLE]	= 	0xf0fffff0;
+
+		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
+		Sizes[EGDS_MENU_HEIGHT] = 48;
+		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
+		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
+		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
+		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
+		Sizes[EGDS_BUTTON_WIDTH] = 80;
+		Sizes[EGDS_BUTTON_HEIGHT] = 30;
+
+		Sizes[EGDS_TEXT_DISTANCE_X] = 3;
+		Sizes[EGDS_TEXT_DISTANCE_Y] = 2;
+
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 3;
+		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 2;
+	}
+
+	Sizes[EGDS_MESSAGE_BOX_GAP_SPACE] = 15;
+	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH] = 0;
+	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH] = 500;
+	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_HEIGHT] = 0;
+	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_HEIGHT] = 99999;
+
+	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_X] = 1;
+	Sizes[EGDS_BUTTON_PRESSED_IMAGE_OFFSET_Y] = 1;
+	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_X] = 0;
+	Sizes[EGDS_BUTTON_PRESSED_TEXT_OFFSET_Y] = 2;
+
+	Texts[EGDT_MSG_BOX_OK] = L"OK";
+	Texts[EGDT_MSG_BOX_CANCEL] = L"Cancel";
+	Texts[EGDT_MSG_BOX_YES] = L"Yes";
+	Texts[EGDT_MSG_BOX_NO] = L"No";
+	Texts[EGDT_WINDOW_CLOSE] = L"Close";
+	Texts[EGDT_WINDOW_RESTORE] = L"Restore";
+	Texts[EGDT_WINDOW_MINIMIZE] = L"Minimize";
+	Texts[EGDT_WINDOW_MAXIMIZE] = L"Maximize";
+
+	Icons[EGDI_WINDOW_MAXIMIZE] = 225;
+	Icons[EGDI_WINDOW_RESTORE] = 226;
+	Icons[EGDI_WINDOW_CLOSE] = 227;
+	Icons[EGDI_WINDOW_MINIMIZE] = 228;
+	Icons[EGDI_CURSOR_UP] = 229;
+	Icons[EGDI_CURSOR_DOWN] = 230;
+	Icons[EGDI_CURSOR_LEFT] = 231;
+	Icons[EGDI_CURSOR_RIGHT] = 232;
+	Icons[EGDI_MENU_MORE] = 232;
+	Icons[EGDI_CHECK_BOX_CHECKED] = 233;
+	Icons[EGDI_DROP_DOWN] = 234;
+	Icons[EGDI_SMALL_CURSOR_UP] = 235;
+	Icons[EGDI_SMALL_CURSOR_DOWN] = 236;
+	Icons[EGDI_RADIO_BUTTON_CHECKED] = 237;
+	Icons[EGDI_MORE_LEFT] = 238;
+	Icons[EGDI_MORE_RIGHT] = 239;
+	Icons[EGDI_MORE_UP] = 240;
+	Icons[EGDI_MORE_DOWN] = 241;
+	Icons[EGDI_WINDOW_RESIZE] = 242;
+	Icons[EGDI_EXPAND] = 243;
+	Icons[EGDI_COLLAPSE] = 244;
+
+	Icons[EGDI_FILE] = 245;
+	Icons[EGDI_DIRECTORY] = 246;
+
+	for (u32 i=0; i<EGDF_COUNT; ++i)
+		Fonts[i] = 0;
+
+	UseGradient = (Type == EGST_WINDOWS_METALLIC) || (Type == EGST_BURNING_SKIN) ;
+}
+
+
+//! destructor
+GUISkin::~GUISkin()
+{
+	for (u32 i=0; i<EGDF_COUNT; ++i)
+	{
+		if (Fonts[i])
+			Fonts[i]->drop();
+	}
+
+	if (SpriteBank)
+		SpriteBank->drop();
+}
+
+
+//! returns default color
+video::SColor GUISkin::getColor(EGUI_DEFAULT_COLOR color) const
+{
+	if ((u32)color < EGDC_COUNT)
+		return Colors[color];
+	else
+		return video::SColor();
+}
+
+
+//! sets a default color
+void GUISkin::setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor)
+{
+	if ((u32)which < EGDC_COUNT)
+		Colors[which] = newColor;
+}
+
+
+//! returns size for the given size type
+s32 GUISkin::getSize(EGUI_DEFAULT_SIZE size) const
+{
+	if ((u32)size < EGDS_COUNT)
+		return Sizes[size];
+	else
+		return 0;
+}
+
+
+//! sets a default size
+void GUISkin::setSize(EGUI_DEFAULT_SIZE which, s32 size)
+{
+	if ((u32)which < EGDS_COUNT)
+		Sizes[which] = size;
+}
+
+
+//! returns the default font
+IGUIFont* GUISkin::getFont(EGUI_DEFAULT_FONT which) const
+{
+	if (((u32)which < EGDF_COUNT) && Fonts[which])
+		return Fonts[which];
+	else
+		return Fonts[EGDF_DEFAULT];
+}
+
+
+//! sets a default font
+void GUISkin::setFont(IGUIFont* font, EGUI_DEFAULT_FONT which)
+{
+	if ((u32)which >= EGDF_COUNT)
+		return;
+
+	if (font)
+	{
+		font->grab();
+		if (Fonts[which])
+			Fonts[which]->drop();
+
+		Fonts[which] = font;
+	}
+}
+
+
+//! gets the sprite bank stored
+IGUISpriteBank* GUISkin::getSpriteBank() const
+{
+	return SpriteBank;
+}
+
+
+//! set a new sprite bank or remove one by passing 0
+void GUISkin::setSpriteBank(IGUISpriteBank* bank)
+{
+	if (bank)
+		bank->grab();
+
+	if (SpriteBank)
+		SpriteBank->drop();
+
+	SpriteBank = bank;
+}
+
+
+//! Returns a default icon
+u32 GUISkin::getIcon(EGUI_DEFAULT_ICON icon) const
+{
+	if ((u32)icon < EGDI_COUNT)
+		return Icons[icon];
+	else
+		return 0;
+}
+
+
+//! Sets a default icon
+void GUISkin::setIcon(EGUI_DEFAULT_ICON icon, u32 index)
+{
+	if ((u32)icon < EGDI_COUNT)
+		Icons[icon] = index;
+}
+
+
+//! Returns a default text. For example for Message box button captions:
+//! "OK", "Cancel", "Yes", "No" and so on.
+const wchar_t* GUISkin::getDefaultText(EGUI_DEFAULT_TEXT text) const
+{
+	if ((u32)text < EGDT_COUNT)
+		return Texts[text].c_str();
+	else
+		return Texts[0].c_str();
+}
+
+
+//! Sets a default text. For example for Message box button captions:
+//! "OK", "Cancel", "Yes", "No" and so on.
+void GUISkin::setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText)
+{
+	if ((u32)which < EGDT_COUNT)
+		Texts[which] = newText;
+}
+
+
+//! draws a standard 3d button pane
+/**	Used for drawing for example buttons in normal state.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param rect: Defining area where to draw.
+\param clip: Clip area.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly. */
+// PATCH
+void GUISkin::drawColored3DButtonPaneStandard(IGUIElement* element,
+					const core::rect<s32>& r,
+					const core::rect<s32>* clip,
+					const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+
+	if ( Type == EGST_BURNING_SKIN )
+	{
+		rect.UpperLeftCorner.X -= 1;
+		rect.UpperLeftCorner.Y -= 1;
+		rect.LowerRightCorner.X += 1;
+		rect.LowerRightCorner.Y += 1;
+		draw3DSunkenPane(element,
+					colors[ EGDC_WINDOW ].getInterpolated( 0xFFFFFFFF, 0.9f )
+					,false, true, rect, clip);
+		return;
+	}
+
+	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+
+	if (!UseGradient)
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
+	}
+	else
+	{
+		const video::SColor c1 = colors[EGDC_3D_FACE];
+		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+// END PATCH
+
+
+//! draws a pressed 3d button pane
+/**	Used for drawing for example buttons in pressed state.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param rect: Defining area where to draw.
+\param clip: Clip area.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly. */
+// PATCH
+void GUISkin::drawColored3DButtonPanePressed(IGUIElement* element,
+					const core::rect<s32>& r,
+					const core::rect<s32>* clip,
+					const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+
+	rect.LowerRightCorner.X -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.UpperLeftCorner.Y += 1;
+
+	if (!UseGradient)
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
+	}
+	else
+	{
+		const video::SColor c1 = colors[EGDC_3D_FACE];
+		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+// END PATCH
+
+
+//! draws a sunken 3d pane
+/** Used for drawing the background of edit, combo or check boxes.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param bgcolor: Background color.
+\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+deep into the ground.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColored3DSunkenPane(IGUIElement* element, video::SColor bgcolor,
+				bool flat, bool fillBackGround,
+				const core::rect<s32>& r,
+				const core::rect<s32>* clip,
+				const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+
+	if (fillBackGround)
+		Driver->draw2DRectangle(bgcolor, rect, clip);
+
+	if (flat)
+	{
+		// draw flat sunken pane
+
+		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// top
+
+		++rect.UpperLeftCorner.Y;
+		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// left
+
+		rect = r;
+		++rect.UpperLeftCorner.Y;
+		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// right
+
+		rect = r;
+		++rect.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// bottom
+	}
+	else
+	{
+		// draw deep sunken pane
+		rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// top
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		++rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+		rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y+1;
+		rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+		rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);	// left
+		++rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		++rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+		rect = r;
+		rect.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+		++rect.UpperLeftCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// right
+		--rect.UpperLeftCorner.X;
+		++rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_LIGHT], rect, clip);
+
+		rect = r;
+		++rect.UpperLeftCorner.X;
+		rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+		--rect.LowerRightCorner.X;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);	// bottom
+		++rect.UpperLeftCorner.X;
+		--rect.UpperLeftCorner.Y;
+		--rect.LowerRightCorner.X;
+		--rect.LowerRightCorner.Y;
+		Driver->draw2DRectangle(colors[EGDC_3D_LIGHT], rect, clip);
+	}
+}
+// END PATCH
+
+//! draws a window background
+// return where to draw title bar text.
+// PATCH
+core::rect<s32> GUISkin::drawColored3DWindowBackground(IGUIElement* element,
+				bool drawTitleBar, video::SColor titleBarColor,
+				const core::rect<s32>& r,
+				const core::rect<s32>* clip,
+				core::rect<s32>* checkClientArea,
+				const video::SColor* colors)
+{
+	if (!Driver)
+	{
+		if ( checkClientArea )
+		{
+			*checkClientArea = r;
+		}
+		return r;
+	}
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+
+	// top border
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+	}
+
+	// left border
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+	}
+
+	// right border dark outer line
+	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+	}
+
+	// right border bright innner line
+	rect.UpperLeftCorner.X -= 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.Y -= 1;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+	}
+
+	// bottom border dark outer line
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+	}
+
+	// bottom border bright inner line
+	rect.UpperLeftCorner.X += 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	if ( !checkClientArea )
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+	}
+
+	// client area for background
+	rect = r;
+	rect.UpperLeftCorner.X +=1;
+	rect.UpperLeftCorner.Y +=1;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y -= 2;
+	if (checkClientArea)
+	{
+		*checkClientArea = rect;
+	}
+
+	if ( !checkClientArea )
+	{
+		if (!UseGradient)
+		{
+			Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
+		}
+		else if ( Type == EGST_BURNING_SKIN )
+		{
+			const video::SColor c1 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.9f );
+			const video::SColor c2 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.8f );
+
+			Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+		}
+		else
+		{
+			const video::SColor c2 = colors[EGDC_3D_SHADOW];
+			const video::SColor c1 = colors[EGDC_3D_FACE];
+			Driver->draw2DRectangle(rect, c1, c1, c1, c2, clip);
+		}
+	}
+
+	// title bar
+	rect = r;
+	rect.UpperLeftCorner.X += 2;
+	rect.UpperLeftCorner.Y += 2;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + getSize(EGDS_WINDOW_BUTTON_WIDTH) + 2;
+
+	if (drawTitleBar )
+	{
+		if (checkClientArea)
+		{
+			(*checkClientArea).UpperLeftCorner.Y = rect.LowerRightCorner.Y;
+		}
+		else
+		{
+			// draw title bar
+			//if (!UseGradient)
+			//	Driver->draw2DRectangle(titleBarColor, rect, clip);
+			//else
+			if ( Type == EGST_BURNING_SKIN )
+			{
+				const video::SColor c = titleBarColor.getInterpolated( video::SColor(titleBarColor.getAlpha(),255,255,255), 0.8f);
+				Driver->draw2DRectangle(rect, titleBarColor, titleBarColor, c, c, clip);
+			}
+			else
+			{
+				const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(),0,0,0), 0.2f);
+				Driver->draw2DRectangle(rect, titleBarColor, c, titleBarColor, c, clip);
+			}
+		}
+	}
+
+	return rect;
+}
+// END PATCH
+
+
+//! draws a standard 3d menu pane
+/**	Used for drawing for menus and context menus.
+It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColored3DMenuPane(IGUIElement* element,
+			const core::rect<s32>& r, const core::rect<s32>* clip,
+			const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+
+	if ( Type == EGST_BURNING_SKIN )
+	{
+		rect.UpperLeftCorner.Y -= 3;
+		draw3DButtonPaneStandard(element, rect, clip);
+		return;
+	}
+
+	// in this skin, this is exactly what non pressed buttons look like,
+	// so we could simply call
+	// draw3DButtonPaneStandard(element, rect, clip);
+	// here.
+	// but if the skin is transparent, this doesn't look that nice. So
+	// We draw it a little bit better, with some more draw2DRectangle calls,
+	// but there aren't that much menus visible anyway.
+
+	rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = rect.UpperLeftCorner.X + 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], rect, clip);
+
+	rect.UpperLeftCorner.X = r.LowerRightCorner.X - 1;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	rect.UpperLeftCorner.Y = r.UpperLeftCorner.Y;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+	rect.UpperLeftCorner.X -= 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y += 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
+
+	rect.UpperLeftCorner.X += 1;
+	rect.LowerRightCorner.X -= 1;
+	rect.UpperLeftCorner.Y -= 1;
+	rect.LowerRightCorner.Y -= 1;
+	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+
+	rect = r;
+	rect.UpperLeftCorner.X +=1;
+	rect.UpperLeftCorner.Y +=1;
+	rect.LowerRightCorner.X -= 2;
+	rect.LowerRightCorner.Y -= 2;
+
+	if (!UseGradient)
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
+	else
+	{
+		const video::SColor c1 = colors[EGDC_3D_FACE];
+		const video::SColor c2 = colors[EGDC_3D_SHADOW];
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+// END PATCH
+
+
+//! draws a standard 3d tool bar
+/**	Used for drawing for toolbars and menus.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColored3DToolBar(IGUIElement* element,
+				const core::rect<s32>& r,
+				const core::rect<s32>* clip,
+				const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> rect = r;
+
+	rect.UpperLeftCorner.X = r.UpperLeftCorner.X;
+	rect.UpperLeftCorner.Y = r.LowerRightCorner.Y - 1;
+	rect.LowerRightCorner.Y = r.LowerRightCorner.Y;
+	rect.LowerRightCorner.X = r.LowerRightCorner.X;
+	Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], rect, clip);
+
+	rect = r;
+	rect.LowerRightCorner.Y -= 1;
+
+	if (!UseGradient)
+	{
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
+	}
+	else
+	if ( Type == EGST_BURNING_SKIN )
+	{
+		const video::SColor c1 = 0xF0000000 | colors[EGDC_3D_FACE].color;
+		const video::SColor c2 = 0xF0000000 | colors[EGDC_3D_SHADOW].color;
+
+		rect.LowerRightCorner.Y += 1;
+		Driver->draw2DRectangle(rect, c1, c2, c1, c2, clip);
+	}
+	else
+	{
+		const video::SColor c1 = colors[EGDC_3D_FACE];
+		const video::SColor c2 = colors[EGDC_3D_SHADOW];
+		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
+	}
+}
+// END PATCH
+
+//! draws a tab button
+/**	Used for drawing for tab buttons on top of tabs.
+\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param active: Specifies if the tab is currently active.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColored3DTabButton(IGUIElement* element, bool active,
+	const core::rect<s32>& frameRect, const core::rect<s32>* clip, EGUI_ALIGNMENT alignment,
+	const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> tr = frameRect;
+
+	if ( alignment == EGUIA_UPPERLEFT )
+	{
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		tr.LowerRightCorner.X -= 2;
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
+
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
+
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y += 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], tr, clip);
+	}
+	else
+	{
+		tr.LowerRightCorner.X -= 2;
+		tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+		tr.UpperLeftCorner.X += 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+		// draw left highlight
+		tr = frameRect;
+		tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+		// draw grey background
+		tr = frameRect;
+		tr.UpperLeftCorner.X += 1;
+		tr.UpperLeftCorner.Y -= 1;
+		tr.LowerRightCorner.X -= 2;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
+
+		// draw right middle gray shadow
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X = tr.LowerRightCorner.X - 1;
+		//tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
+
+		tr.LowerRightCorner.X += 1;
+		tr.UpperLeftCorner.X += 1;
+		tr.LowerRightCorner.Y -= 1;
+		Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], tr, clip);
+	}
+}
+// END PATCH
+
+
+//! draws a tab control body
+/**	\param element: Pointer to the element which wishes to draw this. This parameter
+is usually not used by ISkin, but can be used for example by more complex
+implementations to find out how to draw the part exactly.
+\param border: Specifies if the border should be drawn.
+\param background: Specifies if the background should be drawn.
+\param rect: Defining area where to draw.
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColored3DTabBody(IGUIElement* element, bool border, bool background,
+	const core::rect<s32>& rect, const core::rect<s32>* clip, s32 tabHeight, EGUI_ALIGNMENT alignment,
+	const video::SColor* colors)
+{
+	if (!Driver)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	core::rect<s32> tr = rect;
+
+	if ( tabHeight == -1 )
+		tabHeight = getSize(gui::EGDS_BUTTON_HEIGHT);
+
+	// draw border.
+	if (border)
+	{
+		if ( alignment == EGUIA_UPPERLEFT )
+		{
+			// draw left hightlight
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
+
+			// draw lower shadow
+			tr = rect;
+			tr.UpperLeftCorner.Y = tr.LowerRightCorner.Y - 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
+		}
+		else
+		{
+			// draw left hightlight
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+
+			// draw right shadow
+			tr.UpperLeftCorner.X = rect.LowerRightCorner.X - 1;
+			tr.LowerRightCorner.X = tr.UpperLeftCorner.X + 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_SHADOW], tr, clip);
+
+			// draw lower shadow
+			tr = rect;
+			tr.LowerRightCorner.Y = tr.UpperLeftCorner.Y + 1;
+			Driver->draw2DRectangle(colors[EGDC_3D_HIGH_LIGHT], tr, clip);
+		}
+	}
+
+	if (background)
+	{
+		if ( alignment == EGUIA_UPPERLEFT )
+		{
+			tr = rect;
+			tr.UpperLeftCorner.Y += tabHeight + 2;
+			tr.LowerRightCorner.X -= 1;
+			tr.UpperLeftCorner.X += 1;
+			tr.LowerRightCorner.Y -= 1;
+		}
+		else
+		{
+			tr = rect;
+			tr.UpperLeftCorner.X += 1;
+			tr.UpperLeftCorner.Y -= 1;
+			tr.LowerRightCorner.X -= 1;
+			tr.LowerRightCorner.Y -= tabHeight + 2;
+			//tr.UpperLeftCorner.X += 1;
+		}
+
+		if (!UseGradient)
+			Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
+		else
+		{
+			video::SColor c1 = colors[EGDC_3D_FACE];
+			video::SColor c2 = colors[EGDC_3D_SHADOW];
+			Driver->draw2DRectangle(tr, c1, c1, c2, c2, clip);
+		}
+	}
+}
+// END PATCH
+
+
+//! draws an icon, usually from the skin's sprite bank
+/**	\param parent: Pointer to the element which wishes to draw this icon.
+This parameter is usually not used by IGUISkin, but can be used for example
+by more complex implementations to find out how to draw the part exactly.
+\param icon: Specifies the icon to be drawn.
+\param position: The position to draw the icon
+\param starttime: The time at the start of the animation
+\param currenttime: The present time, used to calculate the frame number
+\param loop: Whether the animation should loop or not
+\param clip: Clip area.	*/
+// PATCH
+void GUISkin::drawColoredIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
+			const core::position2di position,
+			u32 starttime, u32 currenttime,
+			bool loop, const core::rect<s32>* clip,
+			const video::SColor* colors)
+{
+	if (!SpriteBank)
+		return;
+
+	if (!colors)
+		colors = Colors;
+
+	bool gray = element && !element->isEnabled();
+	SpriteBank->draw2DSprite(Icons[icon], position, clip,
+			colors[gray? EGDC_GRAY_WINDOW_SYMBOL : EGDC_WINDOW_SYMBOL], starttime, currenttime, loop, true);
+}
+// END PATCH
+
+
+EGUI_SKIN_TYPE GUISkin::getType() const
+{
+	return Type;
+}
+
+
+//! draws a 2d rectangle.
+void GUISkin::draw2DRectangle(IGUIElement* element,
+		const video::SColor &color, const core::rect<s32>& pos,
+		const core::rect<s32>* clip)
+{
+	Driver->draw2DRectangle(color, pos, clip);
+}
+
+
+//! gets the colors
+// PATCH
+void GUISkin::getColors(video::SColor* colors)
+{
+	u32 i;
+	for (i=0; i<EGDC_COUNT; ++i)
+		colors[i] = Colors[i];
+}
+// END PATCH
+
+} // end namespace gui
+} // end namespace irr
diff --git a/src/gui/guiSkin.h b/src/gui/guiSkin.h
index e90a61290..33df7a933 100644
--- a/src/gui/guiSkin.h
+++ b/src/gui/guiSkin.h
@@ -1,360 +1,367 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __GUI_SKIN_H_INCLUDED__
-#define __GUI_SKIN_H_INCLUDED__
-
-#include "IGUISkin.h"
-#include "irrString.h"
-#include <string>
-#include "ITexture.h"
-
-namespace irr
-{
-namespace video
-{
-	class IVideoDriver;
-}
-namespace gui
-{
-	class GUISkin : public IGUISkin
-	{
-	public:
-
-		GUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver);
-
-		//! destructor
-		virtual ~GUISkin();
-
-		//! returns default color
-		virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const;
-
-		//! sets a default color
-		virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor);
-
-		//! returns size for the given size type
-		virtual s32 getSize(EGUI_DEFAULT_SIZE size) const;
-
-		//! sets a default size
-		virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size);
-
-		//! returns the default font
-		virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const;
-
-		//! sets a default font
-		virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT);
-
-		//! sets the sprite bank used for drawing icons
-		virtual void setSpriteBank(IGUISpriteBank* bank);
-
-		//! gets the sprite bank used for drawing icons
-		virtual IGUISpriteBank* getSpriteBank() const;
-
-		//! Returns a default icon
-		/** Returns the sprite index within the sprite bank */
-		virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const;
-
-		//! Sets a default icon
-		/** Sets the sprite index used for drawing icons like arrows,
-		close buttons and ticks in checkboxes
-		\param icon: Enum specifying which icon to change
-		\param index: The sprite index used to draw this icon */
-		virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index);
-
-		//! Returns a default text.
-		/** For example for Message box button captions:
-		"OK", "Cancel", "Yes", "No" and so on. */
-		virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const;
-
-		//! Sets a default text.
-		/** For example for Message box button captions:
-		"OK", "Cancel", "Yes", "No" and so on. */
-		virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText);
-
-		//! draws a standard 3d button pane
-		/** Used for drawing for example buttons in normal state.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly. */
-		virtual void draw3DButtonPaneStandard(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0)
-		{
-			drawColored3DButtonPaneStandard(element, rect,clip);
-		}
-
-		virtual void drawColored3DButtonPaneStandard(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a pressed 3d button pane
-		/** Used for drawing for example buttons in pressed state.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly. */
-		virtual void draw3DButtonPanePressed(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0)
-		{
-			drawColored3DButtonPanePressed(element, rect, clip);
-		}
-
-		virtual void drawColored3DButtonPanePressed(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a sunken 3d pane
-		/** Used for drawing the background of edit, combo or check boxes.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param bgcolor: Background color.
-		\param flat: Specifies if the sunken pane should be flat or displayed as sunken
-		deep into the ground.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DSunkenPane(IGUIElement* element,
-				video::SColor bgcolor, bool flat,
-				bool fillBackGround,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0)
-		{
-			drawColored3DSunkenPane(element, bgcolor, flat, fillBackGround, rect, clip);
-		}
-
-		virtual void drawColored3DSunkenPane(IGUIElement* element,
-				video::SColor bgcolor, bool flat,
-				bool fillBackGround,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a window background
-		/** Used for drawing the background of dialogs and windows.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param titleBarColor: Title color.
-		\param drawTitleBar: True to enable title drawing.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.
-		\param checkClientArea: When set to non-null the function will not draw anything,
-		but will instead return the clientArea which can be used for drawing by the calling window.
-		That is the area without borders and without titlebar.
-		\return Returns rect where it would be good to draw title bar text. This will
-		work even when checkClientArea is set to a non-null value.*/
-		virtual core::rect<s32> draw3DWindowBackground(IGUIElement* element,
-				bool drawTitleBar, video::SColor titleBarColor,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip,
-				core::rect<s32>* checkClientArea)
-		{
-			return drawColored3DWindowBackground(element, drawTitleBar, titleBarColor,
-				rect, clip, checkClientArea);
-		}
-
-		virtual core::rect<s32> drawColored3DWindowBackground(IGUIElement* element,
-				bool drawTitleBar, video::SColor titleBarColor,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip,
-				core::rect<s32>* checkClientArea,
-				const video::SColor* colors=0);
-
-		//! draws a standard 3d menu pane
-		/** Used for drawing for menus and context menus.
-		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
-		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DMenuPane(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0)
-		{
-			drawColored3DMenuPane(element, rect, clip);
-		}
-
-		virtual void drawColored3DMenuPane(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a standard 3d tool bar
-		/** Used for drawing for toolbars and menus.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DToolBar(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0)
-		{
-			drawColored3DToolBar(element, rect, clip);
-		}
-
-		virtual void drawColored3DToolBar(IGUIElement* element,
-				const core::rect<s32>& rect,
-				const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a tab button
-		/** Used for drawing for tab buttons on top of tabs.
-		\param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param active: Specifies if the tab is currently active.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DTabButton(IGUIElement* element, bool active,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT)
-		{
-			drawColored3DTabButton(element, active, rect, clip, alignment);
-		}
-
-		virtual void drawColored3DTabButton(IGUIElement* element, bool active,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT,
-			const video::SColor* colors=0);
-
-		//! draws a tab control body
-		/** \param element: Pointer to the element which wishes to draw this. This parameter
-		is usually not used by ISkin, but can be used for example by more complex
-		implementations to find out how to draw the part exactly.
-		\param border: Specifies if the border should be drawn.
-		\param background: Specifies if the background should be drawn.
-		\param rect: Defining area where to draw.
-		\param clip: Clip area.	*/
-		virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT)
-		{
-			drawColored3DTabBody(element, border, background, rect, clip, tabHeight, alignment);
-		}
-
-		virtual void drawColored3DTabBody(IGUIElement* element, bool border, bool background,
-			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT,
-			const video::SColor* colors=0);
-
-		//! draws an icon, usually from the skin's sprite bank
-		/** \param element: Pointer to the element which wishes to draw this icon.
-		This parameter is usually not used by IGUISkin, but can be used for example
-		by more complex implementations to find out how to draw the part exactly.
-		\param icon: Specifies the icon to be drawn.
-		\param position: The position to draw the icon
-		\param starttime: The time at the start of the animation
-		\param currenttime: The present time, used to calculate the frame number
-		\param loop: Whether the animation should loop or not
-		\param clip: Clip area.	*/
-		virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
-				const core::position2di position,
-				u32 starttime=0, u32 currenttime=0,
-				bool loop=false, const core::rect<s32>* clip=0)
-		{
-			drawColoredIcon(element, icon, position, starttime, currenttime, loop, clip);
-		}
-
-		virtual void drawColoredIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
-				const core::position2di position,
-				u32 starttime=0, u32 currenttime=0,
-				bool loop=false, const core::rect<s32>* clip=0,
-				const video::SColor* colors=0);
-
-		//! draws a 2d rectangle.
-		/** \param element: Pointer to the element which wishes to draw this icon.
-		This parameter is usually not used by IGUISkin, but can be used for example
-		by more complex implementations to find out how to draw the part exactly.
-		\param color: Color of the rectangle to draw. The alpha component specifies how
-		transparent the rectangle will be.
-		\param pos: Position of the rectangle.
-		\param clip: Pointer to rectangle against which the rectangle will be clipped.
-		If the pointer is null, no clipping will be performed. */
-		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
-				const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
-
-
-		//! get the type of this skin
-		virtual EGUI_SKIN_TYPE getType() const;
-
-		//! gets the colors
-		virtual void getColors(video::SColor* colors); // ::PATCH:
-
-	private:
-
-		video::SColor Colors[EGDC_COUNT];
-		s32 Sizes[EGDS_COUNT];
-		u32 Icons[EGDI_COUNT];
-		IGUIFont* Fonts[EGDF_COUNT];
-		IGUISpriteBank* SpriteBank;
-		core::stringw Texts[EGDT_COUNT];
-		video::IVideoDriver* Driver;
-		bool UseGradient;
-
-		EGUI_SKIN_TYPE Type;
-	};
-
-	#define set3DSkinColors(skin, button_color) \
-		{ \
-			skin->setColor(EGDC_3D_FACE, button_color); \
-			skin->setColor(EGDC_3D_DARK_SHADOW, button_color, 0.25f); \
-			skin->setColor(EGDC_3D_SHADOW, button_color, 0.5f); \
-			skin->setColor(EGDC_3D_LIGHT, button_color); \
-			skin->setColor(EGDC_3D_HIGH_LIGHT, button_color, 1.5f); \
-		}
-
-	#define getElementSkinColor(color) \
-		{ \
-			if (!Colors) \
-			{ \
-				IGUISkin* skin = Environment->getSkin(); \
-				if (skin) \
-					return skin->getColor(color); \
-			} \
-			return Colors[color]; \
-		}
-
-	#define setElementSkinColor(which, newColor, shading) \
-		{ \
-			if (!Colors) \
-			{ \
-				Colors = new video::SColor[EGDC_COUNT]; \
-				GUISkin* skin = (GUISkin *)Environment->getSkin(); \
-				if (skin) \
-					skin->getColors(Colors); \
-			} \
-			Colors[which] = newColor; \
-			setShading(Colors[which],shading); \
-		}
-} // end namespace gui
-//! Sets the shading
-inline void setShading(video::SColor &color,f32 s) // :PATCH:
-{
-	if (s < 1.0f)
-	{
-		color.setRed(color.getRed() * s);
-		color.setGreen(color.getGreen() * s);
-		color.setBlue(color.getBlue() * s);
-	}
-	else if (s > 1.0f)
-	{
-		s -= 1.0f;
-
-		color.setRed(color.getRed() + (255 - color.getRed()) * s);
-		color.setGreen(color.getGreen() + (255 - color.getGreen()) * s);
-		color.setBlue(color.getBlue() + (255 - color.getBlue()) * s);
-	}
-}
-} // end namespace irr
-
-#endif
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __GUI_SKIN_H_INCLUDED__
+#define __GUI_SKIN_H_INCLUDED__
+
+#include "IGUISkin.h"
+#include "irrString.h"
+#include <string>
+#include "ITexture.h"
+
+namespace irr
+{
+namespace video
+{
+	class IVideoDriver;
+}
+namespace gui
+{
+	class GUISkin : public IGUISkin
+	{
+	public:
+
+		GUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver);
+
+		//! destructor
+		virtual ~GUISkin();
+
+		//! returns display density scaling factor
+		virtual float getScale() const { return Scale; }
+
+		//! sets display density scaling factor
+		virtual void setScale(float scale) { Scale = scale; }
+
+		//! returns default color
+		virtual video::SColor getColor(EGUI_DEFAULT_COLOR color) const;
+
+		//! sets a default color
+		virtual void setColor(EGUI_DEFAULT_COLOR which, video::SColor newColor);
+
+		//! returns size for the given size type
+		virtual s32 getSize(EGUI_DEFAULT_SIZE size) const;
+
+		//! sets a default size
+		virtual void setSize(EGUI_DEFAULT_SIZE which, s32 size);
+
+		//! returns the default font
+		virtual IGUIFont* getFont(EGUI_DEFAULT_FONT which=EGDF_DEFAULT) const;
+
+		//! sets a default font
+		virtual void setFont(IGUIFont* font, EGUI_DEFAULT_FONT which=EGDF_DEFAULT);
+
+		//! sets the sprite bank used for drawing icons
+		virtual void setSpriteBank(IGUISpriteBank* bank);
+
+		//! gets the sprite bank used for drawing icons
+		virtual IGUISpriteBank* getSpriteBank() const;
+
+		//! Returns a default icon
+		/** Returns the sprite index within the sprite bank */
+		virtual u32 getIcon(EGUI_DEFAULT_ICON icon) const;
+
+		//! Sets a default icon
+		/** Sets the sprite index used for drawing icons like arrows,
+		close buttons and ticks in checkboxes
+		\param icon: Enum specifying which icon to change
+		\param index: The sprite index used to draw this icon */
+		virtual void setIcon(EGUI_DEFAULT_ICON icon, u32 index);
+
+		//! Returns a default text.
+		/** For example for Message box button captions:
+		"OK", "Cancel", "Yes", "No" and so on. */
+		virtual const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const;
+
+		//! Sets a default text.
+		/** For example for Message box button captions:
+		"OK", "Cancel", "Yes", "No" and so on. */
+		virtual void setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t* newText);
+
+		//! draws a standard 3d button pane
+		/** Used for drawing for example buttons in normal state.
+		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly. */
+		virtual void draw3DButtonPaneStandard(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0)
+		{
+			drawColored3DButtonPaneStandard(element, rect,clip);
+		}
+
+		virtual void drawColored3DButtonPaneStandard(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a pressed 3d button pane
+		/** Used for drawing for example buttons in pressed state.
+		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly. */
+		virtual void draw3DButtonPanePressed(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0)
+		{
+			drawColored3DButtonPanePressed(element, rect, clip);
+		}
+
+		virtual void drawColored3DButtonPanePressed(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a sunken 3d pane
+		/** Used for drawing the background of edit, combo or check boxes.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param bgcolor: Background color.
+		\param flat: Specifies if the sunken pane should be flat or displayed as sunken
+		deep into the ground.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.	*/
+		virtual void draw3DSunkenPane(IGUIElement* element,
+				video::SColor bgcolor, bool flat,
+				bool fillBackGround,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0)
+		{
+			drawColored3DSunkenPane(element, bgcolor, flat, fillBackGround, rect, clip);
+		}
+
+		virtual void drawColored3DSunkenPane(IGUIElement* element,
+				video::SColor bgcolor, bool flat,
+				bool fillBackGround,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a window background
+		/** Used for drawing the background of dialogs and windows.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param titleBarColor: Title color.
+		\param drawTitleBar: True to enable title drawing.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.
+		\param checkClientArea: When set to non-null the function will not draw anything,
+		but will instead return the clientArea which can be used for drawing by the calling window.
+		That is the area without borders and without titlebar.
+		\return Returns rect where it would be good to draw title bar text. This will
+		work even when checkClientArea is set to a non-null value.*/
+		virtual core::rect<s32> draw3DWindowBackground(IGUIElement* element,
+				bool drawTitleBar, video::SColor titleBarColor,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip,
+				core::rect<s32>* checkClientArea)
+		{
+			return drawColored3DWindowBackground(element, drawTitleBar, titleBarColor,
+				rect, clip, checkClientArea);
+		}
+
+		virtual core::rect<s32> drawColored3DWindowBackground(IGUIElement* element,
+				bool drawTitleBar, video::SColor titleBarColor,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip,
+				core::rect<s32>* checkClientArea,
+				const video::SColor* colors=0);
+
+		//! draws a standard 3d menu pane
+		/** Used for drawing for menus and context menus.
+		It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and
+		EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.	*/
+		virtual void draw3DMenuPane(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0)
+		{
+			drawColored3DMenuPane(element, rect, clip);
+		}
+
+		virtual void drawColored3DMenuPane(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a standard 3d tool bar
+		/** Used for drawing for toolbars and menus.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.	*/
+		virtual void draw3DToolBar(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0)
+		{
+			drawColored3DToolBar(element, rect, clip);
+		}
+
+		virtual void drawColored3DToolBar(IGUIElement* element,
+				const core::rect<s32>& rect,
+				const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a tab button
+		/** Used for drawing for tab buttons on top of tabs.
+		\param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param active: Specifies if the tab is currently active.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.	*/
+		virtual void draw3DTabButton(IGUIElement* element, bool active,
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT)
+		{
+			drawColored3DTabButton(element, active, rect, clip, alignment);
+		}
+
+		virtual void drawColored3DTabButton(IGUIElement* element, bool active,
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT,
+			const video::SColor* colors=0);
+
+		//! draws a tab control body
+		/** \param element: Pointer to the element which wishes to draw this. This parameter
+		is usually not used by ISkin, but can be used for example by more complex
+		implementations to find out how to draw the part exactly.
+		\param border: Specifies if the border should be drawn.
+		\param background: Specifies if the background should be drawn.
+		\param rect: Defining area where to draw.
+		\param clip: Clip area.	*/
+		virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT)
+		{
+			drawColored3DTabBody(element, border, background, rect, clip, tabHeight, alignment);
+		}
+
+		virtual void drawColored3DTabBody(IGUIElement* element, bool border, bool background,
+			const core::rect<s32>& rect, const core::rect<s32>* clip=0, s32 tabHeight=-1, EGUI_ALIGNMENT alignment=EGUIA_UPPERLEFT,
+			const video::SColor* colors=0);
+
+		//! draws an icon, usually from the skin's sprite bank
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
+		\param icon: Specifies the icon to be drawn.
+		\param position: The position to draw the icon
+		\param starttime: The time at the start of the animation
+		\param currenttime: The present time, used to calculate the frame number
+		\param loop: Whether the animation should loop or not
+		\param clip: Clip area.	*/
+		virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
+				const core::position2di position,
+				u32 starttime=0, u32 currenttime=0,
+				bool loop=false, const core::rect<s32>* clip=0)
+		{
+			drawColoredIcon(element, icon, position, starttime, currenttime, loop, clip);
+		}
+
+		virtual void drawColoredIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
+				const core::position2di position,
+				u32 starttime=0, u32 currenttime=0,
+				bool loop=false, const core::rect<s32>* clip=0,
+				const video::SColor* colors=0);
+
+		//! draws a 2d rectangle.
+		/** \param element: Pointer to the element which wishes to draw this icon.
+		This parameter is usually not used by IGUISkin, but can be used for example
+		by more complex implementations to find out how to draw the part exactly.
+		\param color: Color of the rectangle to draw. The alpha component specifies how
+		transparent the rectangle will be.
+		\param pos: Position of the rectangle.
+		\param clip: Pointer to rectangle against which the rectangle will be clipped.
+		If the pointer is null, no clipping will be performed. */
+		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
+				const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
+
+
+		//! get the type of this skin
+		virtual EGUI_SKIN_TYPE getType() const;
+
+		//! gets the colors
+		virtual void getColors(video::SColor* colors); // ::PATCH:
+
+	private:
+
+		float Scale = 1.0f;
+		video::SColor Colors[EGDC_COUNT];
+		s32 Sizes[EGDS_COUNT];
+		u32 Icons[EGDI_COUNT];
+		IGUIFont* Fonts[EGDF_COUNT];
+		IGUISpriteBank* SpriteBank;
+		core::stringw Texts[EGDT_COUNT];
+		video::IVideoDriver* Driver;
+		bool UseGradient;
+
+		EGUI_SKIN_TYPE Type;
+	};
+
+	#define set3DSkinColors(skin, button_color) \
+		{ \
+			skin->setColor(EGDC_3D_FACE, button_color); \
+			skin->setColor(EGDC_3D_DARK_SHADOW, button_color, 0.25f); \
+			skin->setColor(EGDC_3D_SHADOW, button_color, 0.5f); \
+			skin->setColor(EGDC_3D_LIGHT, button_color); \
+			skin->setColor(EGDC_3D_HIGH_LIGHT, button_color, 1.5f); \
+		}
+
+	#define getElementSkinColor(color) \
+		{ \
+			if (!Colors) \
+			{ \
+				IGUISkin* skin = Environment->getSkin(); \
+				if (skin) \
+					return skin->getColor(color); \
+			} \
+			return Colors[color]; \
+		}
+
+	#define setElementSkinColor(which, newColor, shading) \
+		{ \
+			if (!Colors) \
+			{ \
+				Colors = new video::SColor[EGDC_COUNT]; \
+				GUISkin* skin = (GUISkin *)Environment->getSkin(); \
+				if (skin) \
+					skin->getColors(Colors); \
+			} \
+			Colors[which] = newColor; \
+			setShading(Colors[which],shading); \
+		}
+} // end namespace gui
+//! Sets the shading
+inline void setShading(video::SColor &color,f32 s) // :PATCH:
+{
+	if (s < 1.0f)
+	{
+		color.setRed(color.getRed() * s);
+		color.setGreen(color.getGreen() * s);
+		color.setBlue(color.getBlue() * s);
+	}
+	else if (s > 1.0f)
+	{
+		s -= 1.0f;
+
+		color.setRed(color.getRed() + (255 - color.getRed()) * s);
+		color.setGreen(color.getGreen() + (255 - color.getGreen()) * s);
+		color.setBlue(color.getBlue() + (255 - color.getBlue()) * s);
+	}
+}
+} // end namespace irr
+
+#endif
diff --git a/src/gui/guiTable.cpp b/src/gui/guiTable.cpp
index 7078c0229..fe39e88c0 100644
--- a/src/gui/guiTable.cpp
+++ b/src/gui/guiTable.cpp
@@ -30,8 +30,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <IGUIFont.h>
 #include "client/renderingengine.h"
 #include "debug.h"
+#include "irrlicht_changes/CGUITTFont.h"
 #include "log.h"
-#include "client/tile.h"
+#include "client/texturesource.h"
 #include "gettime.h"
 #include "util/string.h"
 #include "util/numeric.h"
@@ -80,18 +81,6 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
 	setTabStop(true);
 	setTabOrder(-1);
 	updateAbsolutePosition();
-#ifdef HAVE_TOUCHSCREENGUI
-	float density = 1; // dp scaling is applied by the skin
-#else
-	float density = RenderingEngine::getDisplayDensity();
-#endif
-	core::rect<s32> relative_rect = m_scrollbar->getRelativePosition();
-	s32 width = (relative_rect.getWidth() / (2.0 / 3.0)) * density *
-			g_settings->getFloat("gui_scaling", 0.5f, 20.0f);
-	m_scrollbar->setRelativePosition(core::rect<s32>(
-			relative_rect.LowerRightCorner.X-width,relative_rect.UpperLeftCorner.Y,
-			relative_rect.LowerRightCorner.X,relative_rect.LowerRightCorner.Y
-			));
 }
 
 GUITable::~GUITable()
@@ -198,7 +187,6 @@ void GUITable::setTable(const TableOptions &options,
 	}
 
 	// Handle table options
-	video::SColor default_color(255, 255, 255, 255);
 	s32 opendepth = 0;
 	for (const Option &option : options) {
 		const std::string &name = option.name;
@@ -226,7 +214,7 @@ void GUITable::setTable(const TableOptions &options,
 	if (!(colcount >= 1))
 		return;
 	// rowcount = ceil(cellcount / colcount) but use integer arithmetic
-	s32 rowcount = (content.size() + colcount - 1) / colcount;
+	s32 rowcount = std::min(((u32)content.size() + colcount - 1) / colcount, (u32)S32_MAX);
 	if (!(rowcount >= 0))
 		return;
 	// Append empty strings to content if there is an incomplete row
@@ -245,6 +233,8 @@ void GUITable::setTable(const TableOptions &options,
 		s32 content_index;
 		// Next cell: Width in pixels
 		s32 content_width;
+		// Next cell: Image scale (only for "image" column type)
+		f32 image_scale;
 		// Vector of completed cells in this row
 		std::vector<Cell> cells;
 		// Stores colors and how long they last (maximum column index)
@@ -254,6 +244,17 @@ void GUITable::setTable(const TableOptions &options,
 	};
 	TempRow *rows = new TempRow[rowcount];
 
+	CGUITTFont *ttfont = dynamic_cast<CGUITTFont *>(m_font);
+	f32 desired_image_scale = 1.0f;
+	if (ttfont) {
+		// This gives us the effective font size, which is chosen taking display
+		// density and gui_scaling into account.
+		// Since row height scales with font size, this gives better results than
+		// just using display density and gui_scaling when a non-standard font
+		// size is used (e.g. Android default of 14).
+		desired_image_scale = std::max(1.0f, ttfont->getFontSize() / 16.0f);
+	}
+
 	// Get em width. Pedantically speaking, the width of "M" is not
 	// necessarily the same as the em width, but whatever, close enough.
 	s32 em = 6;
@@ -391,8 +392,18 @@ void GUITable::setTable(const TableOptions &options,
 				if (row->content_index >= 0)
 					image = m_images[row->content_index];
 
+				row->image_scale = 1.0f;
+				row->content_width = 0;
+				if (image) {
+					f32 max_image_scale = (f32)m_rowheight / (f32)image->getOriginalSize().Height;
+					// Scale with display density and make sure it fits into the row
+					row->image_scale = std::min(desired_image_scale, max_image_scale);
+					// When upscaling, fractional factors would cause artifacts
+					if (row->image_scale > 1.0f)
+						row->image_scale = std::floor(row->image_scale);
+					row->content_width = image->getOriginalSize().Width * row->image_scale;
+				}
 				// Get content width and update xmax
-				row->content_width = image ? image->getOriginalSize().Width : 0;
 				row->content_width = MYMAX(row->content_width, width);
 				s32 row_xmax = row->x + padding + row->content_width;
 				xmax = MYMAX(xmax, row_xmax);
@@ -402,6 +413,7 @@ void GUITable::setTable(const TableOptions &options,
 				newcell.xmin = rows[i].x + padding;
 				alignContent(&newcell, xmax, rows[i].content_width, align);
 				newcell.content_index = rows[i].content_index;
+				newcell.image_scale = rows[i].image_scale;
 				rows[i].cells.push_back(newcell);
 				rows[i].x = newcell.xmax;
 			}
@@ -761,23 +773,23 @@ void GUITable::drawCell(const Cell *cell, video::SColor color,
 		video::ITexture *image = m_images[cell->content_index];
 
 		if (image) {
-			core::position2d<s32> dest_pos =
-					row_rect.UpperLeftCorner;
-			dest_pos.X += cell->xpos;
 			core::rect<s32> source_rect(
 					core::position2d<s32>(0, 0),
 					image->getOriginalSize());
-			s32 imgh = source_rect.LowerRightCorner.Y;
+			core::rect<s32> dest_rect(
+					0, 0,
+					image->getOriginalSize().Width * cell->image_scale,
+					image->getOriginalSize().Height * cell->image_scale);
+			dest_rect += row_rect.UpperLeftCorner + v2s32(cell->xpos, 0);
+
+			s32 imgh = dest_rect.getHeight();
 			s32 rowh = row_rect.getHeight();
+			// Center vertically if needed
 			if (imgh < rowh)
-				dest_pos.Y += (rowh - imgh) / 2;
-			else
-				source_rect.LowerRightCorner.Y = rowh;
+				dest_rect += v2s32(0, (rowh - imgh) / 2);
 
-			video::SColor color(255, 255, 255, 255);
-
-			driver->draw2DImage(image, dest_pos, source_rect,
-					&client_clip, color, true);
+			driver->draw2DImage(image, dest_rect, source_rect,
+					&client_clip, nullptr, true);
 		}
 	}
 }
@@ -889,7 +901,7 @@ bool GUITable::OnEvent(const SEvent &event)
 		core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
 
 		if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
-			m_scrollbar->setPos(m_scrollbar->getPos() +
+			m_scrollbar->setPosInterpolated(m_scrollbar->getTargetPos() +
 					(event.MouseInput.Wheel < 0 ? -3 : 3) *
 					- (s32) m_rowheight / 2);
 			return true;
diff --git a/src/gui/guiTable.h b/src/gui/guiTable.h
index afc7c24a7..775349cc7 100644
--- a/src/gui/guiTable.h
+++ b/src/gui/guiTable.h
@@ -171,6 +171,7 @@ protected:
 		video::SColor color;
 		bool color_defined;
 		s32 reported_column;
+		f32 image_scale; // only for "image" type columns
 	};
 
 	struct Row {
diff --git a/src/gui/guiVolumeChange.cpp b/src/gui/guiVolumeChange.cpp
index 65e42003e..d1ceb6ea8 100644
--- a/src/gui/guiVolumeChange.cpp
+++ b/src/gui/guiVolumeChange.cpp
@@ -59,13 +59,9 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
 	/*
 		Calculate new sizes and positions
 	*/
-	const float s = m_gui_scale;
-	DesiredRect = core::rect<s32>(
-		screensize.X / 2 - 380 * s / 2,
-		screensize.Y / 2 - 200 * s / 2,
-		screensize.X / 2 + 380 * s / 2,
-		screensize.Y / 2 + 200 * s / 2
-	);
+	ScalingInfo info = getScalingInfo(screensize, v2u32(380, 200));
+	const float s = info.scale;
+	DesiredRect = info.rect;
 	recalculateAbsolutePosition(false);
 
 	v2s32 size = DesiredRect.getSize();
diff --git a/src/gui/mainmenumanager.h b/src/gui/mainmenumanager.h
index dd4f08619..865894d4e 100644
--- a/src/gui/mainmenumanager.h
+++ b/src/gui/mainmenumanager.h
@@ -37,7 +37,7 @@ public:
 	virtual void disconnect() = 0;
 	virtual void changePassword() = 0;
 	virtual void changeVolume() = 0;
-
+	virtual void showOpenURLDialog(const std::string &url) = 0;
 	virtual void signalKeyConfigChange() = 0;
 };
 
@@ -51,14 +51,14 @@ class MainMenuManager : public IMenuManager
 public:
 	virtual void createdMenu(gui::IGUIElement *menu)
 	{
-#ifndef NDEBUG
-		for (gui::IGUIElement *i : m_stack) {
-			assert(i != menu);
+		for (gui::IGUIElement *e : m_stack) {
+			if (e == menu)
+				return;
 		}
-#endif
 
 		if(!m_stack.empty())
 			m_stack.back()->setVisible(false);
+
 		m_stack.push_back(menu);
 		guienv->setFocus(m_stack.back());
 	}
@@ -83,7 +83,7 @@ public:
 		return mm && mm->preprocessEvent(event);
 	}
 
-	u32 menuCount()
+	size_t menuCount() const
 	{
 		return m_stack.size();
 	}
@@ -98,12 +98,16 @@ public:
 		return false;
 	}
 
+	// FIXME: why isn't this private?
 	std::list<gui::IGUIElement*> m_stack;
 };
 
 extern MainMenuManager g_menumgr;
 
-extern bool isMenuActive();
+static inline bool isMenuActive()
+{
+	return g_menumgr.menuCount() != 0;
+}
 
 class MainGameCallback : public IGameCallback
 {
@@ -111,44 +115,48 @@ public:
 	MainGameCallback() = default;
 	virtual ~MainGameCallback() = default;
 
-	virtual void exitToOS()
+	void exitToOS() override
 	{
 		shutdown_requested = true;
 	}
 
-	virtual void disconnect()
+	void disconnect() override
 	{
 		disconnect_requested = true;
 	}
 
-	virtual void changePassword()
+	void changePassword() override
 	{
 		changepassword_requested = true;
 	}
 
-	virtual void changeVolume()
+	void changeVolume() override
 	{
 		changevolume_requested = true;
 	}
 
-	virtual void keyConfig()
+	void keyConfig() override
 	{
 		keyconfig_requested = true;
 	}
 
-	virtual void signalKeyConfigChange()
+	void signalKeyConfigChange() override
 	{
 		keyconfig_changed = true;
 	}
 
+	void showOpenURLDialog(const std::string &url) override
+	{
+		show_open_url_dialog = url;
+	}
 
 	bool disconnect_requested = false;
 	bool changepassword_requested = false;
 	bool changevolume_requested = false;
 	bool keyconfig_requested = false;
 	bool shutdown_requested = false;
-
 	bool keyconfig_changed = false;
+	std::string show_open_url_dialog = "";
 };
 
 extern MainGameCallback *g_gamecallback;
diff --git a/src/gui/modalMenu.cpp b/src/gui/modalMenu.cpp
index 168770bbd..39eb3542d 100644
--- a/src/gui/modalMenu.cpp
+++ b/src/gui/modalMenu.cpp
@@ -19,45 +19,52 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <cstdlib>
+#include <IEventReceiver.h>
+#include <IGUIComboBox.h>
+#include <IGUIEditBox.h>
 #include "client/renderingengine.h"
 #include "modalMenu.h"
 #include "gettext.h"
+#include "gui/guiInventoryList.h"
 #include "porting.h"
 #include "settings.h"
-
-#ifdef HAVE_TOUCHSCREENGUI
 #include "touchscreengui.h"
-#endif
 
-// clang-format off
+PointerAction PointerAction::fromEvent(const SEvent &event) {
+	switch (event.EventType) {
+	case EET_MOUSE_INPUT_EVENT:
+		return {v2s32(event.MouseInput.X, event.MouseInput.Y), porting::getTimeMs()};
+	case EET_TOUCH_INPUT_EVENT:
+		return {v2s32(event.TouchInput.X, event.TouchInput.Y), porting::getTimeMs()};
+	default:
+		FATAL_ERROR("SEvent given to PointerAction::fromEvent has wrong EventType");
+	}
+}
+
+bool PointerAction::isRelated(PointerAction previous) {
+	u64 time_delta = porting::getDeltaMs(previous.time, time);
+	v2s32 pos_delta = pos - previous.pos;
+	f32 distance_sq = (f32)pos_delta.X * pos_delta.X + (f32)pos_delta.Y * pos_delta.Y;
+
+	return time_delta < 400 && distance_sq < (30.0f * 30.0f);
+}
+
 GUIModalMenu::GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent,
-	s32 id, IMenuManager *menumgr, bool remap_dbl_click) :
+	s32 id, IMenuManager *menumgr, bool remap_click_outside) :
 		IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
 				core::rect<s32>(0, 0, 100, 100)),
 #ifdef __ANDROID__
 		m_jni_field_name(""),
 #endif
 		m_menumgr(menumgr),
-		m_remap_dbl_click(remap_dbl_click)
+		m_remap_click_outside(remap_click_outside)
 {
-	m_gui_scale = std::max(g_settings->getFloat("gui_scaling"), 0.5f);
-	const float screen_dpi_scale = RenderingEngine::getDisplayDensity();
-#ifdef HAVE_TOUCHSCREENGUI
-	m_gui_scale *= 1.1f - 0.3f * screen_dpi_scale + 0.2f * screen_dpi_scale * screen_dpi_scale;
-#else
-	m_gui_scale *= screen_dpi_scale;
-#endif
+	m_gui_scale = g_settings->getFloat("gui_scaling", 0.5f, 20.0f) *
+			RenderingEngine::getDisplayDensity();
 
 	setVisible(true);
 	m_menumgr->createdMenu(this);
-
-	m_doubleclickdetect[0].time = 0;
-	m_doubleclickdetect[1].time = 0;
-
-	m_doubleclickdetect[0].pos = v2s32(0, 0);
-	m_doubleclickdetect[1].pos = v2s32(0, 0);
 }
-// clang-format on
 
 GUIModalMenu::~GUIModalMenu()
 {
@@ -104,64 +111,10 @@ void GUIModalMenu::quitMenu()
 	Environment->removeFocus(this);
 	m_menumgr->deletingMenu(this);
 	this->remove();
-#ifdef HAVE_TOUCHSCREENGUI
-	if (g_touchscreengui && m_touchscreen_visible)
+	if (g_touchscreengui)
 		g_touchscreengui->show();
-#endif
 }
 
-// clang-format off
-bool GUIModalMenu::DoubleClickDetection(const SEvent &event)
-{
-	/* The following code is for capturing double-clicks of the mouse button
-	 * and translating the double-click into an EET_KEY_INPUT_EVENT event
-	 * -- which closes the form -- under some circumstances.
-	 *
-	 * There have been many github issues reporting this as a bug even though it
-	 * was an intended feature.  For this reason, remapping the double-click as
-	 * an ESC must be explicitly set when creating this class via the
-	 * /p remap_dbl_click parameter of the constructor.
-	 */
-
-	if (!m_remap_dbl_click)
-		return false;
-
-	if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
-		m_doubleclickdetect[0].pos = m_doubleclickdetect[1].pos;
-		m_doubleclickdetect[0].time = m_doubleclickdetect[1].time;
-
-		m_doubleclickdetect[1].pos = m_pointer;
-		m_doubleclickdetect[1].time = porting::getTimeMs();
-	} else if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) {
-		u64 delta = porting::getDeltaMs(
-			m_doubleclickdetect[0].time, porting::getTimeMs());
-		if (delta > 400)
-			return false;
-
-		double squaredistance = m_doubleclickdetect[0].pos.
-			getDistanceFromSQ(m_doubleclickdetect[1].pos);
-
-		if (squaredistance > (30 * 30)) {
-			return false;
-		}
-
-		SEvent translated{};
-		// translate doubleclick to escape
-		translated.EventType            = EET_KEY_INPUT_EVENT;
-		translated.KeyInput.Key         = KEY_ESCAPE;
-		translated.KeyInput.Control     = false;
-		translated.KeyInput.Shift       = false;
-		translated.KeyInput.PressedDown = true;
-		translated.KeyInput.Char        = 0;
-		OnEvent(translated);
-
-		return true;
-	}
-
-	return false;
-}
-// clang-format on
-
 static bool isChild(gui::IGUIElement *tocheck, gui::IGUIElement *parent)
 {
 	while (tocheck) {
@@ -173,11 +126,63 @@ static bool isChild(gui::IGUIElement *tocheck, gui::IGUIElement *parent)
 	return false;
 }
 
-#ifdef HAVE_TOUCHSCREENGUI
-
-bool GUIModalMenu::simulateMouseEvent(
-		gui::IGUIElement *target, ETOUCH_INPUT_EVENT touch_event)
+bool GUIModalMenu::remapClickOutside(const SEvent &event)
 {
+	if (!m_remap_click_outside || event.EventType != EET_MOUSE_INPUT_EVENT ||
+			(event.MouseInput.Event != EMIE_LMOUSE_PRESSED_DOWN &&
+					event.MouseInput.Event != EMIE_LMOUSE_LEFT_UP))
+		return false;
+
+	// The formspec must only be closed if both the EMIE_LMOUSE_PRESSED_DOWN and
+	// the EMIE_LMOUSE_LEFT_UP event haven't been absorbed by something else.
+
+	PointerAction last = m_last_click_outside;
+	m_last_click_outside = {}; // always reset
+	PointerAction current = PointerAction::fromEvent(event);
+
+	gui::IGUIElement *hovered =
+			Environment->getRootGUIElement()->getElementFromPoint(current.pos);
+	if (isChild(hovered, this))
+		return false;
+
+	// Dropping items is also done by tapping outside the formspec. If an item
+	// is selected, make sure it is dropped without closing the formspec.
+	// We have to explicitly restrict this to GUIInventoryList because other
+	// GUI elements like text fields like to absorb events for no reason.
+	GUIInventoryList *focused = dynamic_cast<GUIInventoryList *>(Environment->getFocus());
+	if (focused && focused->OnEvent(event))
+		// Return true since the event was handled, even if it wasn't handled by us.
+		return true;
+
+	if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+		m_last_click_outside = current;
+		return true;
+	}
+
+	if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP &&
+			current.isRelated(last)) {
+		SEvent translated{};
+		translated.EventType            = EET_KEY_INPUT_EVENT;
+		translated.KeyInput.Key         = KEY_ESCAPE;
+		translated.KeyInput.Control     = false;
+		translated.KeyInput.Shift       = false;
+		translated.KeyInput.PressedDown = true;
+		translated.KeyInput.Char        = 0;
+		OnEvent(translated);
+		return true;
+	}
+
+	return false;
+}
+
+bool GUIModalMenu::simulateMouseEvent(ETOUCH_INPUT_EVENT touch_event, bool second_try)
+{
+	IGUIElement *target;
+	if (!second_try)
+		target = Environment->getFocus();
+	else
+		target = m_touch_hovered.get();
+
 	SEvent mouse_event{}; // value-initialized, not unitialized
 	mouse_event.EventType = EET_MOUSE_INPUT_EVENT;
 	mouse_event.MouseInput.X = m_pointer.X;
@@ -195,51 +200,69 @@ bool GUIModalMenu::simulateMouseEvent(
 		mouse_event.MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
 		mouse_event.MouseInput.ButtonStates = 0;
 		break;
+	case ETIE_COUNT:
+		// ETIE_COUNT is used for double-tap events.
+		mouse_event.MouseInput.Event = EMIE_LMOUSE_DOUBLE_CLICK;
+		mouse_event.MouseInput.ButtonStates = EMBSM_LEFT;
+		break;
 	default:
 		return false;
 	}
-	if (preprocessEvent(mouse_event))
-		return true;
-	if (!target)
-		return false;
-	return target->OnEvent(mouse_event);
+
+	bool retval;
+	m_simulated_mouse = true;
+	do {
+		if (preprocessEvent(mouse_event)) {
+			retval = true;
+			break;
+		}
+		if (!target) {
+			retval = false;
+			break;
+		}
+		retval = target->OnEvent(mouse_event);
+	} while (false);
+	m_simulated_mouse = false;
+
+	if (!retval && !second_try)
+		return simulateMouseEvent(touch_event, true);
+
+	return retval;
 }
 
 void GUIModalMenu::enter(gui::IGUIElement *hovered)
 {
 	if (!hovered)
 		return;
-	sanity_check(!m_hovered);
-	m_hovered.grab(hovered);
+	sanity_check(!m_touch_hovered);
+	m_touch_hovered.grab(hovered);
 	SEvent gui_event{};
 	gui_event.EventType = EET_GUI_EVENT;
-	gui_event.GUIEvent.Caller = m_hovered.get();
-	gui_event.GUIEvent.EventType = EGET_ELEMENT_HOVERED;
+	gui_event.GUIEvent.Caller = m_touch_hovered.get();
+	gui_event.GUIEvent.EventType = gui::EGET_ELEMENT_HOVERED;
 	gui_event.GUIEvent.Element = gui_event.GUIEvent.Caller;
-	m_hovered->OnEvent(gui_event);
+	m_touch_hovered->OnEvent(gui_event);
 }
 
 void GUIModalMenu::leave()
 {
-	if (!m_hovered)
+	if (!m_touch_hovered)
 		return;
 	SEvent gui_event{};
 	gui_event.EventType = EET_GUI_EVENT;
-	gui_event.GUIEvent.Caller = m_hovered.get();
-	gui_event.GUIEvent.EventType = EGET_ELEMENT_LEFT;
-	m_hovered->OnEvent(gui_event);
-	m_hovered.reset();
+	gui_event.GUIEvent.Caller = m_touch_hovered.get();
+	gui_event.GUIEvent.EventType = gui::EGET_ELEMENT_LEFT;
+	m_touch_hovered->OnEvent(gui_event);
+	m_touch_hovered.reset();
 }
 
-#endif
-
 bool GUIModalMenu::preprocessEvent(const SEvent &event)
 {
 #ifdef __ANDROID__
-	// clang-format off
 	// display software keyboard when clicking edit boxes
 	if (event.EventType == EET_MOUSE_INPUT_EVENT &&
-			event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+			event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN &&
+			!porting::hasPhysicalKeyboardAndroid()) {
 		gui::IGUIElement *hovered =
 			Environment->getRootGUIElement()->getElementFromPoint(
 				core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
@@ -266,36 +289,73 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
 			if (((gui::IGUIEditBox *)hovered)->isPasswordBox())
 				type = 3;
 
-			porting::showInputDialog(gettext("OK"), "",
-				wide_to_utf8(((gui::IGUIEditBox *)hovered)->getText()), type);
+			porting::showTextInputDialog("",
+					wide_to_utf8(((gui::IGUIEditBox *) hovered)->getText()), type);
 			return retval;
 		}
 	}
+
+	if (event.EventType == EET_GUI_EVENT) {
+		if (event.GUIEvent.EventType == gui::EGET_LISTBOX_OPENED) {
+			gui::IGUIComboBox *dropdown = (gui::IGUIComboBox *) event.GUIEvent.Caller;
+
+			std::string field_name = getNameByID(dropdown->getID());
+			if (field_name.empty())
+				return false;
+
+			m_jni_field_name = field_name;
+
+			s32 selected_idx = dropdown->getSelected();
+			s32 option_size = dropdown->getItemCount();
+			std::string list_of_options[option_size];
+
+			for (s32 i = 0; i < option_size; i++) {
+				list_of_options[i] = wide_to_utf8(dropdown->getItem(i));
+			}
+
+			porting::showComboBoxDialog(list_of_options, option_size, selected_idx);
+			return true; // Prevent the Irrlicht dropdown from opening.
+		}
+	}
 #endif
 
-#ifdef HAVE_TOUCHSCREENGUI
+	// If the second touch arrives here again, that means nobody handled it.
+	// Abort to avoid infinite recursion.
+	if (m_second_touch)
+		return true;
+
+	// Convert touch events into mouse events.
 	if (event.EventType == EET_TOUCH_INPUT_EVENT) {
 		irr_ptr<GUIModalMenu> holder;
 		holder.grab(this); // keep this alive until return (it might be dropped downstream [?])
 
-		if (event.TouchInput.ID == 0) {
-			if (event.TouchInput.Event == ETIE_PRESSED_DOWN || event.TouchInput.Event == ETIE_MOVED)
-				m_pointer = v2s32(event.TouchInput.X, event.TouchInput.Y);
+		if (event.TouchInput.touchedCount == 1) {
+			m_pointer_type = PointerType::Touch;
+			m_pointer = v2s32(event.TouchInput.X, event.TouchInput.Y);
+
 			gui::IGUIElement *hovered = Environment->getRootGUIElement()->getElementFromPoint(core::position2d<s32>(m_pointer));
 			if (event.TouchInput.Event == ETIE_PRESSED_DOWN)
 				Environment->setFocus(hovered);
-			if (m_hovered != hovered) {
+			if (m_touch_hovered != hovered) {
 				leave();
 				enter(hovered);
 			}
-			gui::IGUIElement *focused = Environment->getFocus();
-			bool ret = simulateMouseEvent(focused, event.TouchInput.Event);
-			if (!ret && m_hovered != focused)
-				ret = simulateMouseEvent(m_hovered.get(), event.TouchInput.Event);
+			bool ret = simulateMouseEvent(event.TouchInput.Event);
 			if (event.TouchInput.Event == ETIE_LEFT_UP)
 				leave();
+
+			// Detect double-taps and convert them into double-click events.
+			if (event.TouchInput.Event == ETIE_PRESSED_DOWN) {
+				PointerAction current = PointerAction::fromEvent(event);
+				if (current.isRelated(m_last_touch)) {
+					// ETIE_COUNT is used for double-tap events.
+					simulateMouseEvent(ETIE_COUNT);
+				}
+				m_last_touch = current;
+			}
+
 			return ret;
-		} else if (event.TouchInput.ID == 1) {
+		} else if (event.TouchInput.touchedCount == 2) {
 			if (event.TouchInput.Event != ETIE_LEFT_UP)
 				return true; // ignore
 			auto focused = Environment->getFocus();
@@ -311,19 +371,17 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
 			return true;
 		}
 	}
-#endif
 
 	if (event.EventType == EET_MOUSE_INPUT_EVENT) {
-		s32 x = event.MouseInput.X;
-		s32 y = event.MouseInput.Y;
-		gui::IGUIElement *hovered =
-				Environment->getRootGUIElement()->getElementFromPoint(
-						core::position2d<s32>(x, y));
-		if (!isChild(hovered, this)) {
-			if (DoubleClickDetection(event)) {
-				return true;
-			}
+		if (!m_simulated_mouse) {
+			// Only set the pointer type to mouse if this is a real mouse event.
+			m_pointer_type = PointerType::Mouse;
+			m_pointer = v2s32(event.MouseInput.X, event.MouseInput.Y);
+			m_touch_hovered.reset();
 		}
+
+		if (remapClickOutside(event))
+			return true;
 	}
 /* fm?
 		#ifdef __ANDROID__
@@ -341,28 +399,33 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
 		#endif
 
 */
+
 	return false;
 }
 
 
 
 #ifdef __ANDROID__
-bool GUIModalMenu::hasAndroidUIInput()
+porting::AndroidDialogState GUIModalMenu::getAndroidUIInputState()
 {
-	// no dialog shown
+	// No dialog is shown
 	if (m_jni_field_name.empty())
-		return false;
+		return porting::DIALOG_CANCELED;
 
-	// still waiting
-	if (porting::getInputDialogState() == -1)
-		return true;
-
-	// no value abort dialog processing
-	if (porting::getInputDialogState() != 0) {
-		m_jni_field_name.clear();
-		return false;
-	}
-
-	return true;
+	return porting::getInputDialogState();
 }
 #endif
+
+GUIModalMenu::ScalingInfo GUIModalMenu::getScalingInfo(v2u32 screensize, v2u32 base_size)
+{
+	f32 scale = m_gui_scale;
+	scale = std::min(scale, (f32)screensize.X / (f32)base_size.X);
+	scale = std::min(scale, (f32)screensize.Y / (f32)base_size.Y);
+	s32 w = base_size.X * scale, h = base_size.Y * scale;
+	return {scale, core::rect<s32>(
+		screensize.X / 2 - w / 2,
+		screensize.Y / 2 - h / 2,
+		screensize.X / 2 + w / 2,
+		screensize.Y / 2 + h / 2
+	)};
+}
diff --git a/src/gui/modalMenu.h b/src/gui/modalMenu.h
index 0fd76da53..3a333851e 100644
--- a/src/gui/modalMenu.h
+++ b/src/gui/modalMenu.h
@@ -25,6 +25,22 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlichttypes_extrabloated.h"
 #include "irr_ptr.h"
 #include "util/string.h"
+#ifdef __ANDROID__
+	#include <porting_android.h>
+#endif
+
+enum class PointerType {
+	Mouse,
+	Touch,
+};
+
+struct PointerAction {
+	v2s32 pos;
+	u64 time; // ms
+
+	static PointerAction fromEvent(const SEvent &event);
+	bool isRelated(PointerAction other);
+};
 
 // fm:
 #include "client/keycode.h"
@@ -63,7 +79,7 @@ public:
 	virtual bool OnEvent(const SEvent& event) {
 		if(event.EventType == EET_KEY_INPUT_EVENT && event.KeyInput.PressedDown) {
 			KeyPress kp(event.KeyInput);
-			if (kp == EscapeKey || kp == CancelKey) {
+			if (kp == EscapeKey) {
 				quitMenu();
 				return true;
 			}
@@ -74,59 +90,66 @@ public:
 
 	virtual bool pausesGame() { return false; } // Used for pause menu
 #ifdef __ANDROID__
-	virtual bool getAndroidUIInput() { return false; }
-	bool hasAndroidUIInput();
+	virtual void getAndroidUIInput() {};
+	porting::AndroidDialogState getAndroidUIInputState();
 #endif
 
+	PointerType getPointerType() { return m_pointer_type; };
+
 protected:
 	virtual std::wstring getLabelByID(s32 id) = 0;
 	virtual std::string getNameByID(s32 id) = 0;
 
-	/**
-	 * check if event is part of a double click
-	 * @param event event to evaluate
-	 * @return true/false if a doubleclick was detected
-	 */
-	bool DoubleClickDetection(const SEvent &event);
-
+	// Stores the last known pointer type.
+	PointerType m_pointer_type = PointerType::Mouse;
+	// Stores the last known pointer position.
+	// If the last input event was a mouse event, it's the cursor position.
+	// If the last input event was a touch event, it's the finger position.
 	v2s32 m_pointer;
 	v2s32 m_old_pointer;  // Mouse position after previous mouse event
+
 	v2u32 m_screensize_old;
 	float m_gui_scale;
 #ifdef __ANDROID__
 	std::string m_jni_field_name;
 #endif
-#ifdef HAVE_TOUCHSCREENGUI
+
+	struct ScalingInfo {
+		f32 scale;
+		core::rect<s32> rect;
+	};
+	ScalingInfo getScalingInfo(v2u32 screensize, v2u32 base_size);
+
 	// This is set to true if the menu is currently processing a second-touch event.
 	bool m_second_touch = false;
-	bool m_touchscreen_visible = true;
-#endif
+	// This is set to true if the menu is currently processing a mouse event
+	// that was synthesized by the menu itself from a touch event.
+	bool m_simulated_mouse = false;
 
 private:
-	struct clickpos
-	{
-		v2s32 pos;
-		s64 time;
-	};
-	clickpos m_doubleclickdetect[2];
-
 	IMenuManager *m_menumgr;
-	/* If true, remap a double-click (or double-tap) action to ESC. This is so
-	 * that, for example, Android users can double-tap to close a formspec.
-	*
-	 * This value can (currently) only be set by the class constructor
-	 * and the default value for the setting is true.
+	/* If true, remap a click outside the formspec to ESC. This is so that, for
+	 * example, touchscreen users can close formspecs.
+	 * The default for this setting is true. Currently, it's set to false for
+	 * the mainmenu to prevent Minetest from closing unexpectedly.
 	 */
-	bool m_remap_dbl_click;
+	bool m_remap_click_outside;
+	bool remapClickOutside(const SEvent &event);
+	PointerAction m_last_click_outside{};
+
 	// This might be necessary to expose to the implementation if it
 	// wants to launch other menus
 	bool m_allow_focus_removal = false;
 
-#ifdef HAVE_TOUCHSCREENGUI
-	irr_ptr<gui::IGUIElement> m_hovered;
+	// Stuff related to touchscreen input
 
-	bool simulateMouseEvent(gui::IGUIElement *target, ETOUCH_INPUT_EVENT touch_event);
+	irr_ptr<gui::IGUIElement> m_touch_hovered;
+
+	// Converts touches into clicks.
+	bool simulateMouseEvent(ETOUCH_INPUT_EVENT touch_event, bool second_try=false);
 	void enter(gui::IGUIElement *element);
 	void leave();
-#endif
+
+	// Used to detect double-taps and convert them into double-click events.
+	PointerAction m_last_touch{};
 };
diff --git a/src/gui/profilergraph.cpp b/src/gui/profilergraph.cpp
index ff06ffede..dfc009b3a 100644
--- a/src/gui/profilergraph.cpp
+++ b/src/gui/profilergraph.cpp
@@ -97,7 +97,7 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
 		}
 
 		const s32 texth = 15;
-		char buf[10];
+		char buf[20];
 		if (floorf(show_max) == show_max)
 			porting::mt_snprintf(buf, sizeof(buf), "%.5g", show_max);
 		else
diff --git a/src/gui/touchscreengui.cpp b/src/gui/touchscreengui.cpp
index d20f7c4ab..20194b965 100644
--- a/src/gui/touchscreengui.cpp
+++ b/src/gui/touchscreengui.cpp
@@ -2,6 +2,8 @@
 Copyright (C) 2014 sapier
 Copyright (C) 2018 srifqi, Muhammad Rifqi Priyo Susanto
 		<muhammadrifqipriyosusanto@gmail.com>
+Copyright (C) 2024 grorp, Gregor Parzefall
+		<gregor.parzefall@posteo.de>
 
 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
@@ -19,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 //#include "fm_touchscreengui.cpp"
-#if 1
 
 #include "touchscreengui.h"
 
@@ -32,29 +33,152 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/keycode.h"
 #include "client/renderingengine.h"
 #include "util/numeric.h"
+#include <ISceneCollisionManager.h>
 
 #include <iostream>
 #include <algorithm>
 
-using namespace irr::core;
-
 TouchScreenGUI *g_touchscreengui;
 
-const std::string button_image_names[] = {
+static const char *button_image_names[] = {
 	"jump_btn.png",
 	"down.png",
 	"zoom.png",
-	"aux1_btn.png"
-};
+	"aux1_btn.png",
+	"gear_icon.png",
+	"rare_controls.png",
+
+	"fly_btn.png",
+	"noclip_btn.png",
+	"fast_btn.png",
+	"debug_btn.png",
+	"camera_btn.png",
+	"rangeview_btn.png",
+	"minimap_btn.png",
+	"",
+
+	"chat_btn.png",
+	"inventory_btn.png",
+	"drop_btn.png",
+	"exit_btn.png",
 
-const std::string joystick_image_names[] = {
 	"joystick_off.png",
 	"joystick_bg.png",
-	"joystick_center.png"
+	"joystick_center.png",
 };
 
+static void load_button_texture(IGUIImage *gui_button, const std::string &path,
+		const recti &button_rect, ISimpleTextureSource *tsrc, video::IVideoDriver *driver)
+{
+	video::ITexture *texture = guiScalingImageButton(driver,
+			tsrc->getTexture(path), button_rect.getWidth(),
+			button_rect.getHeight());
+	gui_button->setImage(texture);
+	gui_button->setScaleImage(true);
+}
+
+void button_info::emitAction(bool action, video::IVideoDriver *driver,
+		IEventReceiver *receiver, ISimpleTextureSource *tsrc)
+{
+	if (keycode == KEY_UNKNOWN)
+		return;
+
+	SEvent translated{};
+	translated.EventType        = EET_KEY_INPUT_EVENT;
+	translated.KeyInput.Key     = keycode;
+	translated.KeyInput.Control = false;
+	translated.KeyInput.Shift   = false;
+	translated.KeyInput.Char    = 0;
+
+	if (action) {
+		translated.KeyInput.PressedDown = true;
+		receiver->OnEvent(translated);
+
+		if (toggleable == button_info::FIRST_TEXTURE) {
+			toggleable = button_info::SECOND_TEXTURE;
+			load_button_texture(gui_button.get(), toggle_textures[1],
+					gui_button->getRelativePosition(),
+					tsrc, driver);
+		} else if (toggleable == button_info::SECOND_TEXTURE) {
+			toggleable = button_info::FIRST_TEXTURE;
+			load_button_texture(gui_button.get(), toggle_textures[0],
+					gui_button->getRelativePosition(),
+					tsrc, driver);
+		}
+	} else {
+		translated.KeyInput.PressedDown = false;
+		receiver->OnEvent(translated);
+	}
+}
+
+static bool buttons_handlePress(std::vector<button_info> &buttons, size_t pointer_id, IGUIElement *element,
+		video::IVideoDriver *driver, IEventReceiver *receiver, ISimpleTextureSource *tsrc)
+{
+	if (!element)
+		return false;
+
+	for (button_info &btn : buttons) {
+		if (btn.gui_button.get() == element) {
+			assert(std::find(btn.pointer_ids.begin(), btn.pointer_ids.end(), pointer_id) == btn.pointer_ids.end());
+			btn.pointer_ids.push_back(pointer_id);
+
+			if (btn.pointer_ids.size() > 1)
+				return true;
+
+			btn.emitAction(true, driver, receiver, tsrc);
+			btn.repeat_counter = -BUTTON_REPEAT_DELAY;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+static bool buttons_handleRelease(std::vector<button_info> &buttons, size_t pointer_id,
+		video::IVideoDriver *driver, IEventReceiver *receiver, ISimpleTextureSource *tsrc)
+{
+	for (button_info &btn : buttons) {
+		auto it = std::find(btn.pointer_ids.begin(), btn.pointer_ids.end(), pointer_id);
+		if (it != btn.pointer_ids.end()) {
+			btn.pointer_ids.erase(it);
+
+			if (!btn.pointer_ids.empty())
+				return true;
+
+			btn.emitAction(false, driver, receiver, tsrc);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static bool buttons_step(std::vector<button_info> &buttons, float dtime,
+		video::IVideoDriver *driver, IEventReceiver *receiver, ISimpleTextureSource *tsrc)
+{
+	bool has_pointers = false;
+
+	for (button_info &btn : buttons) {
+		if (btn.pointer_ids.empty())
+			continue;
+		has_pointers = true;
+
+		btn.repeat_counter += dtime;
+		if (btn.repeat_counter < BUTTON_REPEAT_INTERVAL)
+			continue;
+
+		btn.emitAction(false, driver, receiver, tsrc);
+		btn.emitAction(true, driver, receiver, tsrc);
+		btn.repeat_counter = 0.0f;
+	}
+
+	return has_pointers;
+}
+
 static EKEY_CODE id_to_keycode(touch_gui_button_id id)
 {
+	EKEY_CODE code;
 	// ESC isn't part of the keymap.
 	if (id == exit_id)
 		return KEY_ESCAPE;
@@ -64,7 +188,7 @@ static EKEY_CODE id_to_keycode(touch_gui_button_id id)
 		case jump_id:
 			key = "jump";
 			break;
-		case crunch_id:
+		case sneak_id:
 			key = "sneak";
 			break;
 		case zoom_id:
@@ -109,114 +233,42 @@ static EKEY_CODE id_to_keycode(touch_gui_button_id id)
 		default:
 			break;
 	}
+	assert(!key.empty());
 	if(key.empty())
 		return irr::EKEY_CODE();
-	return keyname_to_keycode(g_settings->get("keymap_" + key).c_str());
-}
-
-static void load_button_texture(const button_info *btn, const std::string &path,
-		const rect<s32> &button_rect, ISimpleTextureSource *tsrc, video::IVideoDriver *driver)
-{
-	u32 tid;
-	video::ITexture *texture = guiScalingImageButton(driver,
-			tsrc->getTexture(path, &tid), button_rect.getWidth(),
-			button_rect.getHeight());
-	if (texture) {
-		btn->gui_button->setUseAlphaChannel(true);
-		if (g_settings->getBool("gui_scaling_filter")) {
-			rect<s32> txr_rect = rect<s32>(0, 0, button_rect.getWidth(), button_rect.getHeight());
-			btn->gui_button->setImage(texture, txr_rect);
-			btn->gui_button->setPressedImage(texture, txr_rect);
-			btn->gui_button->setScaleImage(false);
-		} else {
-			btn->gui_button->setImage(texture);
-			btn->gui_button->setPressedImage(texture);
-			btn->gui_button->setScaleImage(true);
-		}
-		btn->gui_button->setDrawBorder(false);
-		btn->gui_button->setText(L"");
+	std::string resolved = g_settings->get("keymap_" + key);
+	try {
+		code = keyname_to_keycode(resolved.c_str());
+	} catch (UnknownKeycode &e) {
+		code = KEY_UNKNOWN;
+		warningstream << "TouchScreenGUI: Unknown key '" << resolved
+			      << "' for '" << key << "', hiding button." << std::endl;
 	}
+	return code;
 }
 
-AutoHideButtonBar::AutoHideButtonBar(IrrlichtDevice *device,
-		IEventReceiver *receiver) :
+AutoHideButtonBar::AutoHideButtonBar(IrrlichtDevice *device, ISimpleTextureSource *tsrc,
+		touch_gui_button_id starter_id, const std::string &starter_img,
+		recti starter_rect, autohide_button_bar_dir dir) :
 			m_driver(device->getVideoDriver()),
 			m_guienv(device->getGUIEnvironment()),
-			m_receiver(receiver)
+			m_receiver(device->getEventReceiver()),
+			m_texturesource(tsrc)
 {
-}
+	m_upper_left = starter_rect.UpperLeftCorner;
+	m_lower_right = starter_rect.LowerRightCorner;
 
-void AutoHideButtonBar::init(ISimpleTextureSource *tsrc,
-		const std::string &starter_img, int button_id, const v2s32 &UpperLeft,
-		const v2s32 &LowerRight, autohide_button_bar_dir dir, float timeout)
-{
-	m_texturesource = tsrc;
-
-	m_upper_left = UpperLeft;
-	m_lower_right = LowerRight;
-
-	clear();
-
-	rect<int> starter_rect = rect<s32>(UpperLeft.X, UpperLeft.Y, LowerRight.X, LowerRight.Y);
-
-	IGUIButton *starter_gui_button = m_guienv->addButton(starter_rect, nullptr,
-			button_id, L"", nullptr);
-
-	m_starter.gui_button        = starter_gui_button;
-	m_starter.gui_button->grab();
-	m_starter.repeat_counter    = -1.0f;
-	m_starter.keycode           = KEY_OEM_8; // use invalid keycode as it's not relevant
-	m_starter.immediate_release = true;
-	m_starter.ids.clear();
-
-	load_button_texture(&m_starter, starter_img, starter_rect,
+	IGUIImage *starter_gui_button = m_guienv->addImage(starter_rect, nullptr,
+			starter_id);
+	load_button_texture(starter_gui_button, starter_img, starter_rect,
 			m_texturesource, m_driver);
 
+	m_starter = grab_gui_element<IGUIImage>(starter_gui_button);
 	m_dir = dir;
-	m_timeout_value = timeout;
-
-	m_initialized = true;
 }
 
-void AutoHideButtonBar::clear()
+void AutoHideButtonBar::addButton(touch_gui_button_id id, const std::string &image)
 {
-	if (m_starter.gui_button) {
-		m_starter.gui_button->setVisible(false);
-		m_starter.gui_button->drop();
-		m_starter.gui_button = nullptr;
-	}
-
-	for (auto &button : m_buttons) {
-		if (button->gui_button) {
-			button->gui_button->drop();
-			button->gui_button = nullptr;
-		}
-	}
-
-/* FM: del?
-	for (auto i : m_buttons) {
-		i->guibutton->drop();
-		delete i;
-	}
-	m_buttons.clear();
-*/
-
-}
-
-AutoHideButtonBar::~AutoHideButtonBar()
-{
-	clear();
-}
-
-void AutoHideButtonBar::addButton(touch_gui_button_id button_id, const wchar_t *caption,
-		const std::string &btn_image)
-{
-
-	if (!m_initialized) {
-		errorstream << "AutoHideButtonBar::addButton not yet initialized!" << std::endl;
-		return;
-	}
-
 	int button_size = 0;
 
 	if (m_dir == AHBB_Dir_Top_Bottom || m_dir == AHBB_Dir_Bottom_Top)
@@ -224,7 +276,7 @@ void AutoHideButtonBar::addButton(touch_gui_button_id button_id, const wchar_t *
 	else
 		button_size = m_lower_right.Y - m_upper_left.Y;
 
-	irr::core::rect<int> current_button;
+	recti current_button;
 
 	if (m_dir == AHBB_Dir_Right_Left || m_dir == AHBB_Dir_Left_Right) {
 		int x_start = 0;
@@ -240,7 +292,7 @@ void AutoHideButtonBar::addButton(touch_gui_button_id button_id, const wchar_t *
 			x_start = x_end - button_size;
 		}
 
-		current_button = rect<s32>(x_start, m_upper_left.Y, x_end, m_lower_right.Y);
+		current_button = recti(x_start, m_upper_left.Y, x_end, m_lower_right.Y);
 	} else {
 		double y_start = 0;
 		double y_end = 0;
@@ -255,351 +307,238 @@ void AutoHideButtonBar::addButton(touch_gui_button_id button_id, const wchar_t *
 			y_start = y_end - button_size;
 		}
 
-		current_button = rect<s32>(m_upper_left.X, y_start, m_lower_right.Y, y_end);
+		current_button = recti(m_upper_left.X, y_start, m_lower_right.Y, y_end);
 	}
 
-	IGUIButton *btn_gui_button = m_guienv->addButton(current_button, nullptr, button_id,
-			caption, nullptr);
-
-	std::shared_ptr<button_info> btn(new button_info);
-	btn->gui_button        = btn_gui_button;
-	btn->gui_button->grab();
-	btn->gui_button->setVisible(false);
-	btn->gui_button->setEnabled(false);
-	btn->repeat_counter    = -1.0f;
-	btn->keycode           = id_to_keycode(button_id);
-	btn->immediate_release = true;
-	btn->ids.clear();
-
-	load_button_texture(btn.get(), btn_image, current_button, m_texturesource, m_driver);
+	IGUIImage *btn_gui_button = m_guienv->addImage(current_button, nullptr, id);
+	btn_gui_button->setVisible(false);
+	btn_gui_button->setEnabled(false);
+	load_button_texture(btn_gui_button, image, current_button, m_texturesource, m_driver);
 
+	button_info btn{};
+	btn.keycode = id_to_keycode(id);
+	btn.gui_button = grab_gui_element<IGUIImage>(btn_gui_button);
 	m_buttons.push_back(btn);
 }
 
-void AutoHideButtonBar::addToggleButton(touch_gui_button_id button_id, const wchar_t *caption,
-		const std::string &btn_image_1, const std::string &btn_image_2)
+void AutoHideButtonBar::addToggleButton(touch_gui_button_id id,
+		const std::string &image_1, const std::string &image_2)
 {
-	addButton(button_id, caption, btn_image_1);
-	std::shared_ptr<button_info> btn = m_buttons.back();
-	btn->toggleable = button_info::FIRST_TEXTURE;
-	btn->textures.push_back(btn_image_1);
-	btn->textures.push_back(btn_image_2);
+	addButton(id, image_1);
+	button_info &btn = m_buttons.back();
+	btn.toggleable = button_info::FIRST_TEXTURE;
+	btn.toggle_textures[0] = image_1;
+	btn.toggle_textures[1] = image_2;
 }
 
-bool AutoHideButtonBar::isButton(const SEvent &event)
+bool AutoHideButtonBar::handlePress(size_t pointer_id, IGUIElement *element)
 {
-	IGUIElement *rootguielement = m_guienv->getRootGUIElement();
-
-	if (rootguielement == nullptr)
-		return false;
-
-	gui::IGUIElement *element = rootguielement->getElementFromPoint(
-			v2s32(event.TouchInput.X, event.TouchInput.Y));
-
-	if (element == nullptr)
-		return false;
-
 	if (m_active) {
-		// check for all buttons in vector
-		for (const auto &button : m_buttons) {
-			if (button->gui_button == element) {
-				SEvent translated{};
-				translated.EventType        = irr::EET_KEY_INPUT_EVENT;
-				translated.KeyInput.Key     = button->keycode;
-				translated.KeyInput.Control = false;
-				translated.KeyInput.Shift   = false;
-				translated.KeyInput.Char    = 0;
-
-				// add this event
-				translated.KeyInput.PressedDown = true;
-				m_receiver->OnEvent(translated);
-
-				// remove this event
-				translated.KeyInput.PressedDown = false;
-				m_receiver->OnEvent(translated);
-
-				button->ids.push_back(event.TouchInput.ID);
-
-				m_timeout = 0.0f;
-
-				if (button->toggleable == button_info::FIRST_TEXTURE) {
-					button->toggleable = button_info::SECOND_TEXTURE;
-					load_button_texture(button.get(), button->textures[1],
-							button->gui_button->getRelativePosition(),
-							m_texturesource, m_driver);
-				} else if (button->toggleable == button_info::SECOND_TEXTURE) {
-					button->toggleable = button_info::FIRST_TEXTURE;
-					load_button_texture(button.get(), button->textures[0],
-							button->gui_button->getRelativePosition(),
-							m_texturesource, m_driver);
-				}
-
-				return true;
-			}
-		}
-	} else {
-		// check for starter button only
-		if (element == m_starter.gui_button) {
-			m_starter.ids.push_back(event.TouchInput.ID);
-			m_starter.gui_button->setVisible(false);
-			m_starter.gui_button->setEnabled(false);
-			m_active = true;
-			m_timeout = 0.0f;
-
-			for (const auto &button : m_buttons) {
-				button->gui_button->setVisible(true);
-				button->gui_button->setEnabled(true);
-			}
-
-			return true;
-		}
+		return buttons_handlePress(m_buttons, pointer_id, element, m_driver,
+				m_receiver, m_texturesource);
+	}
+	if (m_starter.get() == element) {
+		activate();
+		return true;
 	}
 	return false;
 }
 
+bool AutoHideButtonBar::handleRelease(size_t pointer_id)
+{
+	return buttons_handleRelease(m_buttons, pointer_id, m_driver,
+			m_receiver, m_texturesource);
+}
+
 void AutoHideButtonBar::step(float dtime)
 {
-	if (m_active) {
-		m_timeout += dtime;
+	// Since buttons can stay pressed after the buttonbar is deactivated,
+	// we call the step function even if the buttonbar is inactive.
+	bool has_pointers = buttons_step(m_buttons, dtime, m_driver, m_receiver,
+			m_texturesource);
 
-		if (m_timeout > m_timeout_value)
-			deactivate();
+	if (m_active) {
+		if (!has_pointers) {
+			m_timeout += dtime;
+			if (m_timeout > BUTTONBAR_HIDE_DELAY)
+				deactivate();
+		} else {
+			m_timeout = 0.0f;
+		}
 	}
+
+}
+
+void AutoHideButtonBar::updateVisibility() {
+	bool starter_visible = m_visible && !m_active;
+	bool inner_visible = m_visible && m_active;
+
+	m_starter->setVisible(starter_visible);
+	m_starter->setEnabled(starter_visible);
+
+	for (auto &button : m_buttons) {
+		button.gui_button->setVisible(inner_visible);
+		button.gui_button->setEnabled(inner_visible);
+	}
+}
+
+void AutoHideButtonBar::activate()
+{
+	m_active = true;
+	m_timeout = 0.0f;
+	updateVisibility();
 }
 
 void AutoHideButtonBar::deactivate()
 {
-	if (m_visible) {
-		m_starter.gui_button->setVisible(true);
-		m_starter.gui_button->setEnabled(true);
-	}
 	m_active = false;
-
-	for (const auto &button : m_buttons) {
-		button->gui_button->setVisible(false);
-		button->gui_button->setEnabled(false);
-	}
-}
-
-void AutoHideButtonBar::hide()
-{
-	m_visible = false;
-	m_starter.gui_button->setVisible(false);
-	m_starter.gui_button->setEnabled(false);
-
-	for (const auto &button : m_buttons) {
-		button->gui_button->setVisible(false);
-		button->gui_button->setEnabled(false);
-	}
+	updateVisibility();
 }
 
 void AutoHideButtonBar::show()
 {
 	m_visible = true;
-
-	if (m_active) {
-		for (const auto &button : m_buttons) {
-			button->gui_button->setVisible(true);
-			button->gui_button->setEnabled(true);
-		}
-	} else {
-		m_starter.gui_button->setVisible(true);
-		m_starter.gui_button->setEnabled(true);
-	}
+	updateVisibility();
 }
 
-TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver):
+void AutoHideButtonBar::hide()
+{
+	m_visible = false;
+	updateVisibility();
+}
+
+TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsrc):
 		m_device(device),
 		m_guienv(device->getGUIEnvironment()),
-		m_receiver(receiver),
-		m_settings_bar(device, receiver),
-		m_rare_controls_bar(device, receiver)
+		m_receiver(device->getEventReceiver()),
+		m_texturesource(tsrc)
 {
-	for (auto &button : m_buttons) {
-		button.gui_button     = nullptr;
-		button.repeat_counter = -1.0f;
-		button.repeat_delay   = BUTTON_REPEAT_DELAY;
-	}
-
 	m_touchscreen_threshold = g_settings->getU16("touchscreen_threshold");
+	m_long_tap_delay = g_settings->getU16("touch_long_tap_delay");
 	m_fixed_joystick = g_settings->getBool("fixed_virtual_joystick");
 	m_joystick_triggers_aux1 = g_settings->getBool("virtual_joystick_triggers_aux1");
 	m_screensize = m_device->getVideoDriver()->getScreenSize();
-	button_size = MYMIN(m_screensize.Y / 4.5f,
+	m_button_size = MYMIN(m_screensize.Y / 4.5f,
 			RenderingEngine::getDisplayDensity() * 65.0f *
 					g_settings->getFloat("hud_scaling"));
-}
-
-void TouchScreenGUI::initButton(touch_gui_button_id id, const rect<s32> &button_rect,
-		const std::wstring &caption, bool immediate_release, float repeat_delay)
-{
-	IGUIButton *btn_gui_button = m_guienv->addButton(button_rect, nullptr, id, caption.c_str());
-
-	button_info *btn       = &m_buttons[id];
-	btn->gui_button        = btn_gui_button;
-	btn->gui_button->grab();
-	btn->repeat_counter    = -1.0f;
-	btn->repeat_delay      = repeat_delay;
-	btn->keycode           = id_to_keycode(id);
-	btn->immediate_release = immediate_release;
-	btn->ids.clear();
-
-	load_button_texture(btn, button_image_names[id], button_rect,
-			m_texturesource, m_device->getVideoDriver());
-}
-
-std::shared_ptr<button_info> TouchScreenGUI::initJoystickButton(touch_gui_button_id id,
-		const rect<s32> &button_rect, int texture_id, bool visible)
-{
-	IGUIButton *btn_gui_button = m_guienv->addButton(button_rect, nullptr, id, L"O");
-
-	std::shared_ptr<button_info> btn(new button_info);
-	btn->gui_button = btn_gui_button;
-	btn->gui_button->setVisible(visible);
-	btn->gui_button->grab();
-	btn->ids.clear();
-
-	load_button_texture(btn.get(), joystick_image_names[texture_id], button_rect,
-			m_texturesource, m_device->getVideoDriver());
-
-	return btn;
-}
-
-void TouchScreenGUI::init(ISimpleTextureSource *tsrc)
-{
-	if (!tsrc)
-		return;
-
-	m_visible       = true;
-	m_texturesource = tsrc;
 
 	// Initialize joystick display "button".
 	// Joystick is placed on the bottom left of screen.
 	if (m_fixed_joystick) {
-		m_joystick_btn_off = initJoystickButton(joystick_off_id,
-				rect<s32>(button_size,
-						m_screensize.Y - button_size * 4,
-						button_size * 4,
-						m_screensize.Y - button_size), 0);
+		m_joystick_btn_off = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_off_id,
+				recti(m_button_size,
+						m_screensize.Y - m_button_size * 4,
+						m_button_size * 4,
+						m_screensize.Y - m_button_size), true));
 	} else {
-		m_joystick_btn_off = initJoystickButton(joystick_off_id,
-				rect<s32>(button_size,
-						m_screensize.Y - button_size * 3,
-						button_size * 3,
-						m_screensize.Y - button_size), 0);
+		m_joystick_btn_off = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_off_id,
+				recti(m_button_size,
+						m_screensize.Y - m_button_size * 3,
+						m_button_size * 3,
+						m_screensize.Y - m_button_size), true));
 	}
 
-	m_joystick_btn_bg = initJoystickButton(joystick_bg_id,
-			rect<s32>(button_size,
-					m_screensize.Y - button_size * 4,
-					button_size * 4,
-					m_screensize.Y - button_size),
-			1, false);
+	m_joystick_btn_bg = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_bg_id,
+			recti(m_button_size,
+					m_screensize.Y - m_button_size * 4,
+					m_button_size * 4,
+					m_screensize.Y - m_button_size), false));
 
-	m_joystick_btn_center = initJoystickButton(joystick_center_id,
-			rect<s32>(0, 0, button_size, button_size), 2, false);
+	m_joystick_btn_center = grab_gui_element<IGUIImage>(makeJoystickButton(joystick_center_id,
+			recti(0, 0, m_button_size, m_button_size), false));
 
 	// init jump button
-	initButton(jump_id,
-			rect<s32>(m_screensize.X - 1.75f * button_size,
-					m_screensize.Y - button_size,
-					m_screensize.X - 0.25f * button_size,
-					m_screensize.Y),
-			L"x", false);
+	addButton(jump_id, button_image_names[jump_id],
+			recti(m_screensize.X - 1.75f * m_button_size,
+					m_screensize.Y - m_button_size,
+					m_screensize.X - 0.25f * m_button_size,
+					m_screensize.Y));
 
-	// init crunch button
-	initButton(crunch_id,
-			rect<s32>(m_screensize.X - 3.25f * button_size,
-					m_screensize.Y - button_size,
-					m_screensize.X - 1.75f * button_size,
-					m_screensize.Y),
-			L"H", false);
+	// init sneak button
+	addButton(sneak_id, button_image_names[sneak_id],
+			recti(m_screensize.X - 3.25f * m_button_size,
+					m_screensize.Y - m_button_size,
+					m_screensize.X - 1.75f * m_button_size,
+					m_screensize.Y));
 
 	// init zoom button
-	initButton(zoom_id,
-			rect<s32>(m_screensize.X - 1.25f * button_size,
-					m_screensize.Y - 4 * button_size,
-					m_screensize.X - 0.25f * button_size,
-					m_screensize.Y - 3 * button_size),
-			L"z", false);
+	addButton(zoom_id, button_image_names[zoom_id],
+			recti(m_screensize.X - 1.25f * m_button_size,
+					m_screensize.Y - 4 * m_button_size,
+					m_screensize.X - 0.25f * m_button_size,
+					m_screensize.Y - 3 * m_button_size));
 
 	// init aux1 button
 	if (!m_joystick_triggers_aux1)
-		initButton(aux1_id,
-				rect<s32>(m_screensize.X - 1.25f * button_size,
-						m_screensize.Y - 2.5f * button_size,
-						m_screensize.X - 0.25f * button_size,
-						m_screensize.Y - 1.5f * button_size),
-				L"spc1", false);
+		addButton(aux1_id, button_image_names[aux1_id],
+				recti(m_screensize.X - 1.25f * m_button_size,
+						m_screensize.Y - 2.5f * m_button_size,
+						m_screensize.X - 0.25f * m_button_size,
+						m_screensize.Y - 1.5f * m_button_size));
 
-	m_settings_bar.init(m_texturesource, "gear_icon.png", settings_starter_id,
-			v2s32(m_screensize.X - 1.25f * button_size,
-					m_screensize.Y - (SETTINGS_BAR_Y_OFFSET + 1.0f) * button_size
-							+ 0.5f * button_size),
-			v2s32(m_screensize.X - 0.25f * button_size,
-					m_screensize.Y - SETTINGS_BAR_Y_OFFSET * button_size
-							+ 0.5f * button_size),
-			AHBB_Dir_Right_Left, 3.0f);
+	AutoHideButtonBar &settings_bar = m_buttonbars.emplace_back(m_device, m_texturesource,
+			settings_starter_id, button_image_names[settings_starter_id],
+			recti(m_screensize.X - 1.25f * m_button_size,
+					m_screensize.Y - (SETTINGS_BAR_Y_OFFSET + 1.0f) * m_button_size
+							+ 0.5f * m_button_size,
+					m_screensize.X - 0.25f * m_button_size,
+					m_screensize.Y - SETTINGS_BAR_Y_OFFSET * m_button_size
+							+ 0.5f * m_button_size),
+			AHBB_Dir_Right_Left);
 
-	m_settings_bar.addButton(fly_id, L"fly", "fly_btn.png");
-	m_settings_bar.addButton(noclip_id, L"noclip", "noclip_btn.png");
-	m_settings_bar.addButton(fast_id, L"fast", "fast_btn.png");
-	m_settings_bar.addButton(debug_id, L"debug", "debug_btn.png");
-	m_settings_bar.addButton(camera_id, L"camera", "camera_btn.png");
-	m_settings_bar.addButton(range_id, L"rangeview", "rangeview_btn.png");
-	m_settings_bar.addButton(minimap_id, L"minimap", "minimap_btn.png");
+	const static touch_gui_button_id settings_bar_buttons[] {
+		fly_id, noclip_id, fast_id, debug_id, camera_id, range_id, minimap_id,
+	};
+	for (auto id : settings_bar_buttons) {
+		if (id_to_keycode(id) == KEY_UNKNOWN)
+			continue;
+		settings_bar.addButton(id, button_image_names[id]);
+	}
 
 	// Chat is shown by default, so chat_hide_btn.png is shown first.
-	m_settings_bar.addToggleButton(toggle_chat_id, L"togglechat",
+	settings_bar.addToggleButton(toggle_chat_id,
 			"chat_hide_btn.png", "chat_show_btn.png");
 
-	m_rare_controls_bar.init(m_texturesource, "rare_controls.png",
-			rare_controls_starter_id,
-			v2s32(0.25f * button_size,
-					m_screensize.Y - (RARE_CONTROLS_BAR_Y_OFFSET + 1.0f) * button_size
-							+ 0.5f * button_size),
-			v2s32(0.75f * button_size,
-					m_screensize.Y - RARE_CONTROLS_BAR_Y_OFFSET * button_size
-							+ 0.5f * button_size),
-			AHBB_Dir_Left_Right, 2.0f);
+	AutoHideButtonBar &rare_controls_bar = m_buttonbars.emplace_back(m_device, m_texturesource,
+			rare_controls_starter_id, button_image_names[rare_controls_starter_id],
+			recti(0.25f * m_button_size,
+					m_screensize.Y - (RARE_CONTROLS_BAR_Y_OFFSET + 1.0f) * m_button_size
+							+ 0.5f * m_button_size,
+					0.75f * m_button_size,
+					m_screensize.Y - RARE_CONTROLS_BAR_Y_OFFSET * m_button_size
+							+ 0.5f * m_button_size),
+			AHBB_Dir_Left_Right);
 
-	m_rare_controls_bar.addButton(chat_id, L"chat", "chat_btn.png");
-	m_rare_controls_bar.addButton(inventory_id, L"inv", "inventory_btn.png");
-	m_rare_controls_bar.addButton(drop_id, L"drop", "drop_btn.png");
-	m_rare_controls_bar.addButton(exit_id, L"exit", "exit_btn.png");
-
-	m_initialized = true;
+	const static touch_gui_button_id rare_controls_bar_buttons[] {
+		chat_id, inventory_id, drop_id, exit_id,
+	};
+	for (auto id : rare_controls_bar_buttons) {
+		if (id_to_keycode(id) == KEY_UNKNOWN)
+			continue;
+		rare_controls_bar.addButton(id, button_image_names[id]);
+	}
 }
 
-touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y)
+void TouchScreenGUI::addButton(touch_gui_button_id id, const std::string &image, const recti &rect)
 {
-	IGUIElement *rootguielement = m_guienv->getRootGUIElement();
+	IGUIImage *btn_gui_button = m_guienv->addImage(rect, nullptr, id);
+	load_button_texture(btn_gui_button, image, rect,
+			m_texturesource, m_device->getVideoDriver());
 
-	if (rootguielement != nullptr) {
-		gui::IGUIElement *element =
-				rootguielement->getElementFromPoint(v2s32(x, y));
-
-		if (element)
-			for (unsigned int i = 0; i < after_last_element_id; i++)
-				if (element == m_buttons[i].gui_button)
-					return (touch_gui_button_id) i;
-	}
-
-	return after_last_element_id;
+	button_info &btn = m_buttons.emplace_back();
+	btn.keycode = id_to_keycode(id);
+	btn.gui_button = grab_gui_element<IGUIImage>(btn_gui_button);
 }
 
-touch_gui_button_id TouchScreenGUI::getButtonID(size_t eventID)
+IGUIImage *TouchScreenGUI::makeJoystickButton(touch_gui_button_id id,
+		const recti &button_rect, bool visible)
 {
-	for (unsigned int i = 0; i < after_last_element_id; i++) {
-		button_info *btn = &m_buttons[i];
+	IGUIImage *btn_gui_button = m_guienv->addImage(button_rect, nullptr, id);
+	btn_gui_button->setVisible(visible);
+	load_button_texture(btn_gui_button, button_image_names[id], button_rect,
+			m_texturesource, m_device->getVideoDriver());
 
-		auto id = std::find(btn->ids.begin(), btn->ids.end(), eventID);
-
-		if (id != btn->ids.end())
-			return (touch_gui_button_id) i;
-	}
-
-	return after_last_element_id;
+	return btn_gui_button;
 }
 
 bool TouchScreenGUI::isHotbarButton(const SEvent &event)
@@ -624,83 +563,40 @@ std::optional<u16> TouchScreenGUI::getHotbarSelection()
 	return selection;
 }
 
-void TouchScreenGUI::handleButtonEvent(touch_gui_button_id button,
-		size_t eventID, bool action)
+void TouchScreenGUI::handleReleaseEvent(size_t pointer_id)
 {
-	button_info *btn = &m_buttons[button];
-	SEvent translated{};
-	translated.EventType        = irr::EET_KEY_INPUT_EVENT;
-	translated.KeyInput.Key     = btn->keycode;
-	translated.KeyInput.Control = false;
-	translated.KeyInput.Shift   = false;
-	translated.KeyInput.Char    = 0;
+	// By the way: Android reuses pointer IDs, so m_pointer_pos[pointer_id]
+	// will be overwritten soon anyway.
+	m_pointer_downpos.erase(pointer_id);
+	m_pointer_pos.erase(pointer_id);
 
-	// add this event
-	if (action) {
-		if(!(std::find(btn->ids.begin(), btn->ids.end(), eventID) == btn->ids.end()))
+	// handle buttons
+	if (buttons_handleRelease(m_buttons, pointer_id, m_device->getVideoDriver(),
+			m_receiver, m_texturesource))
+		return;
+
+	// handle buttonbars
+	for (AutoHideButtonBar &bar : m_buttonbars) {
+		if (bar.handleRelease(pointer_id))
 			return;
-
-		btn->ids.push_back(eventID);
-
-		if (btn->ids.size() > 1)
-			return;
-
-		btn->repeat_counter = 0.0f;
-		translated.KeyInput.PressedDown = true;
-		translated.KeyInput.Key = btn->keycode;
-		m_receiver->OnEvent(translated);
 	}
 
-	// remove event
-	if (!action || btn->immediate_release) {
-		auto pos = std::find(btn->ids.begin(), btn->ids.end(), eventID);
-		// has to be in touch list
-		if(!(pos != btn->ids.end()))
-			return;
-		btn->ids.erase(pos);
-
-		if (!btn->ids.empty())
-			return;
-
-		translated.KeyInput.PressedDown = false;
-		btn->repeat_counter             = -1.0f;
-		m_receiver->OnEvent(translated);
-	}
-}
-
-void TouchScreenGUI::handleReleaseEvent(size_t evt_id)
-{
-	touch_gui_button_id button = getButtonID(evt_id);
-
-	if (button != after_last_element_id) {
-		// handle button events
-		handleButtonEvent(button, evt_id, false);
-	} else if (m_has_move_id && evt_id == m_move_id) {
+	if (m_has_move_id && pointer_id == m_move_id) {
 		// handle the point used for moving view
 		m_has_move_id = false;
 
-		// if this pointer issued a mouse event issue symmetric release here
-		if (m_move_sent_as_mouse_event) {
-			SEvent translated {};
-			translated.EventType               = EET_MOUSE_INPUT_EVENT;
-			translated.MouseInput.X            = m_move_downlocation.X;
-			translated.MouseInput.Y            = m_move_downlocation.Y;
-			translated.MouseInput.Shift        = false;
-			translated.MouseInput.Control      = false;
-			translated.MouseInput.ButtonStates = 0;
-			translated.MouseInput.Event        = EMIE_LMOUSE_LEFT_UP;
-			if (m_draw_crosshair) {
-				translated.MouseInput.X = m_screensize.X / 2;
-				translated.MouseInput.Y = m_screensize.Y / 2;
-			}
-			m_receiver->OnEvent(translated);
-		} else if (!m_move_has_really_moved) {
-			doRightClick();
+		// If m_tap_state is already set to TapState::ShortTap, we must keep
+		// that value. Otherwise, many short taps will be ignored if you tap
+		// very fast.
+		if (!m_move_has_really_moved && m_tap_state != TapState::LongTap) {
+			m_tap_state = TapState::ShortTap;
+		} else {
+			m_tap_state = TapState::None;
 		}
 	}
 
 	// handle joystick
-	else if (m_has_joystick_id && evt_id == m_joystick_id) {
+	else if (m_has_joystick_id && pointer_id == m_joystick_id) {
 		m_has_joystick_id = false;
 
 		// reset joystick
@@ -709,27 +605,17 @@ void TouchScreenGUI::handleReleaseEvent(size_t evt_id)
 		m_joystick_status_aux1 = false;
 		applyJoystickStatus();
 
-		m_joystick_btn_off->gui_button->setVisible(true);
-		m_joystick_btn_bg->gui_button->setVisible(false);
-		m_joystick_btn_center->gui_button->setVisible(false);
+		m_joystick_btn_off->setVisible(true);
+		m_joystick_btn_bg->setVisible(false);
+		m_joystick_btn_center->setVisible(false);
 	} else {
 		infostream << "TouchScreenGUI::translateEvent released unknown button: "
-				<< evt_id << std::endl;
-	}
-
-	for (auto iter = m_known_ids.begin(); iter != m_known_ids.end(); ++iter) {
-		if (iter->id == evt_id) {
-			m_known_ids.erase(iter);
-			break;
-		}
+				<< pointer_id << std::endl;
 	}
 }
 
 void TouchScreenGUI::translateEvent(const SEvent &event)
 {
-	if (!m_initialized)
-		return;
-
 	if (!m_visible) {
 		infostream << "TouchScreenGUI::translateEvent got event but is not visible!"
 				<< std::endl;
@@ -739,7 +625,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 	if (event.EventType != EET_TOUCH_INPUT_EVENT)
 		return;
 
-	const s32 half_button_size = button_size / 2.0f;
+	const s32 half_button_size = m_button_size / 2.0f;
 	const s32 fixed_joystick_range_sq = half_button_size * half_button_size * 3 * 3;
 	const s32 X = event.TouchInput.X;
 	const s32 Y = event.TouchInput.Y;
@@ -749,82 +635,81 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 	const v2s32 dir_fixed = touch_pos - fixed_joystick_center;
 
 	if (event.TouchInput.Event == ETIE_PRESSED_DOWN) {
-		/*
-		 * Add to own copy of event list...
-		 * android would provide this information but Irrlicht guys don't
-		 * wanna design an efficient interface
-		 */
-		id_status to_be_added{};
-		to_be_added.id = event.TouchInput.ID;
-		to_be_added.X  = event.TouchInput.X;
-		to_be_added.Y  = event.TouchInput.Y;
-		m_known_ids.push_back(to_be_added);
+		size_t pointer_id = event.TouchInput.ID;
+		m_pointer_downpos[pointer_id] = touch_pos;
+		m_pointer_pos[pointer_id] = touch_pos;
 
-		size_t eventID = event.TouchInput.ID;
+		IGUIElement *element = m_guienv->getRootGUIElement()->getElementFromPoint(touch_pos);
 
-		touch_gui_button_id button = getButtonID(X, Y);
+		// handle buttons
+		if (buttons_handlePress(m_buttons, pointer_id, element,
+				m_device->getVideoDriver(), m_receiver, m_texturesource)) {
+			for (AutoHideButtonBar &bar : m_buttonbars)
+				bar.deactivate();
+			return;
+		}
 
-		// handle button events
-		if (button != after_last_element_id) {
-			handleButtonEvent(button, eventID, true);
-			m_settings_bar.deactivate();
-			m_rare_controls_bar.deactivate();
-		} else if (isHotbarButton(event)) {
-			m_settings_bar.deactivate();
-			m_rare_controls_bar.deactivate();
-			// already handled in isHotbarButton()
-		} else if (m_settings_bar.isButton(event)) {
-			m_rare_controls_bar.deactivate();
-			// already handled in isSettingsBarButton()
-		} else if (m_rare_controls_bar.isButton(event)) {
-			m_settings_bar.deactivate();
-			// already handled in isSettingsBarButton()
-		} else {
-			// handle non button events
-			if (m_settings_bar.active() || m_rare_controls_bar.active()) {
-				m_settings_bar.deactivate();
-				m_rare_controls_bar.deactivate();
+		// handle buttonbars
+		for (AutoHideButtonBar &bar : m_buttonbars) {
+			if (bar.handlePress(pointer_id, element)) {
+				for (AutoHideButtonBar &other : m_buttonbars)
+					if (other != bar)
+						other.deactivate();
 				return;
 			}
-
-			// Select joystick when joystick tapped (fixed joystick position) or
-			// when left 1/3 of screen dragged (free joystick position)
-			if ((m_fixed_joystick && dir_fixed.getLengthSQ() <= fixed_joystick_range_sq) ||
-					(!m_fixed_joystick && X < m_screensize.X / 3.0f)) {
-				// If we don't already have a starting point for joystick, make this the one.
-				if (!m_has_joystick_id) {
-					m_has_joystick_id           = true;
-					m_joystick_id               = event.TouchInput.ID;
-					m_joystick_has_really_moved = false;
-
-					m_joystick_btn_off->gui_button->setVisible(false);
-					m_joystick_btn_bg->gui_button->setVisible(true);
-					m_joystick_btn_center->gui_button->setVisible(true);
-
-					// If it's a fixed joystick, don't move the joystick "button".
-					if (!m_fixed_joystick)
-						m_joystick_btn_bg->gui_button->setRelativePosition(
-								touch_pos - half_button_size * 3);
-
-					m_joystick_btn_center->gui_button->setRelativePosition(
-							touch_pos - half_button_size);
-				}
-			} else {
-				// If we don't already have a moving point, make this the moving one.
-				if (!m_has_move_id) {
-					m_has_move_id              = true;
-					m_move_id                  = event.TouchInput.ID;
-					m_move_has_really_moved    = false;
-					m_move_downtime            = porting::getTimeMs();
-					m_move_downlocation        = touch_pos;
-					m_move_sent_as_mouse_event = false;
-					if (m_draw_crosshair)
-						m_move_downlocation = v2s32(m_screensize.X / 2, m_screensize.Y / 2);
-				}
-			}
 		}
 
-		m_pointer_pos[event.TouchInput.ID] = touch_pos;
+		// handle hotbar
+		if (isHotbarButton(event)) {
+			// already handled in isHotbarButton()
+			for (AutoHideButtonBar &bar : m_buttonbars)
+				bar.deactivate();
+			return;
+		}
+
+		// handle non button events
+		for (AutoHideButtonBar &bar : m_buttonbars) {
+			if (bar.isActive()) {
+				bar.deactivate();
+				return;
+			}
+		}
+
+		// Select joystick when joystick tapped (fixed joystick position) or
+		// when left 1/3 of screen dragged (free joystick position)
+		if ((m_fixed_joystick && dir_fixed.getLengthSQ() <= fixed_joystick_range_sq) ||
+				(!m_fixed_joystick && X < m_screensize.X / 3.0f)) {
+			// If we don't already have a starting point for joystick, make this the one.
+			if (!m_has_joystick_id) {
+				m_has_joystick_id           = true;
+				m_joystick_id               = pointer_id;
+				m_joystick_has_really_moved = false;
+
+				m_joystick_btn_off->setVisible(false);
+				m_joystick_btn_bg->setVisible(true);
+				m_joystick_btn_center->setVisible(true);
+
+				// If it's a fixed joystick, don't move the joystick "button".
+				if (!m_fixed_joystick)
+					m_joystick_btn_bg->setRelativePosition(
+							touch_pos - half_button_size * 3);
+
+				m_joystick_btn_center->setRelativePosition(
+						touch_pos - half_button_size);
+			}
+		} else {
+			// If we don't already have a moving point, make this the moving one.
+			if (!m_has_move_id) {
+				m_has_move_id              = true;
+				m_move_id                  = pointer_id;
+				m_move_has_really_moved    = false;
+				m_move_downtime            = porting::getTimeMs();
+				m_move_pos                 = touch_pos;
+				// DON'T reset m_tap_state here, otherwise many short taps
+				// will be ignored if you tap very fast.
+				m_had_move_id              = true;
+			}
+		}
 	}
 	else if (event.TouchInput.Event == ETIE_LEFT_UP) {
 		verbosestream << "Up event for pointerid: " << event.TouchInput.ID << std::endl;
@@ -836,40 +721,24 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 				m_pointer_pos[event.TouchInput.ID] == touch_pos)
 			return;
 
-		const v2s32 free_joystick_center = v2s32(m_pointer_pos[event.TouchInput.ID].X,
-				m_pointer_pos[event.TouchInput.ID].Y);
+		const v2s32 dir_free_original = touch_pos - m_pointer_downpos[event.TouchInput.ID];
+		const v2s32 free_joystick_center = m_pointer_pos[event.TouchInput.ID];
 		const v2s32 dir_free = touch_pos - free_joystick_center;
 
 		const double touch_threshold_sq = m_touchscreen_threshold * m_touchscreen_threshold;
 
-		if (m_has_move_id) {
-			if (event.TouchInput.ID == m_move_id &&
-					(!m_move_sent_as_mouse_event || m_draw_crosshair)) {
-				if (dir_free.getLengthSQ() > touch_threshold_sq || m_move_has_really_moved) {
-					m_move_has_really_moved = true;
+		if (m_has_move_id && event.TouchInput.ID == m_move_id) {
+			m_move_pos = touch_pos;
+			m_pointer_pos[event.TouchInput.ID] = touch_pos;
 
-					// update camera_yaw and camera_pitch
-					m_pointer_pos[event.TouchInput.ID] = touch_pos;
+			// update camera_yaw and camera_pitch
+			const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f)
+					* 6.0f / RenderingEngine::getDisplayDensity();
+			m_camera_yaw_change -= dir_free.X * d;
+			m_camera_pitch_change += dir_free.Y * d;
 
-					// adapt to similar behavior as pc screen
-					const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f) * 3.0f;
-
-					m_camera_yaw_change -= dir_free.X * d;
-					m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dir_free.Y * d), -180.0f), 180.0f);
-
-					// update shootline
-					// no need to update (X, Y) when using crosshair since the shootline is not used
-					m_shootline = m_device
-							->getSceneManager()
-							->getSceneCollisionManager()
-							->getRayFromScreenCoordinates(touch_pos);
-				}
-			} else if (event.TouchInput.ID == m_move_id && m_move_sent_as_mouse_event) {
-				m_shootline = m_device
-						->getSceneManager()
-						->getSceneCollisionManager()
-						->getRayFromScreenCoordinates(touch_pos);
-			}
+			if (dir_free_original.getLengthSQ() > touch_threshold_sq)
+				m_move_has_really_moved = true;
 		}
 
 		if (m_has_joystick_id && event.TouchInput.ID == m_joystick_id) {
@@ -890,108 +759,36 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 				if (distance <= m_touchscreen_threshold) {
 					m_joystick_speed = 0.0f;
 				} else {
-					m_joystick_speed = distance / button_size;
+					m_joystick_speed = distance / m_button_size;
 					if (m_joystick_speed > 1.0f)
 						m_joystick_speed = 1.0f;
 				}
 
 				m_joystick_status_aux1 = distance > (half_button_size * 3);
 
-				if (distance > button_size) {
+				if (distance > m_button_size) {
 					// move joystick "button"
-					v2s32 new_offset = dir * button_size / distance - half_button_size;
+					v2s32 new_offset = dir * m_button_size / distance - half_button_size;
 					if (m_fixed_joystick)
-						m_joystick_btn_center->gui_button->setRelativePosition(
+						m_joystick_btn_center->setRelativePosition(
 								fixed_joystick_center + new_offset);
 					else
-						m_joystick_btn_center->gui_button->setRelativePosition(
+						m_joystick_btn_center->setRelativePosition(
 								free_joystick_center + new_offset);
 				} else {
-					m_joystick_btn_center->gui_button->setRelativePosition(
+					m_joystick_btn_center->setRelativePosition(
 							touch_pos - half_button_size);
 				}
 			}
 		}
-
-		if (!m_has_move_id && !m_has_joystick_id)
-			handleChangedButton(event);
 	}
 }
 
-void TouchScreenGUI::handleChangedButton(const SEvent &event)
-{
-	for (unsigned int i = 0; i < after_last_element_id; i++) {
-		if (m_buttons[i].ids.empty())
-			continue;
-
-		for (auto iter = m_buttons[i].ids.begin(); iter != m_buttons[i].ids.end(); ++iter) {
-			if (event.TouchInput.ID == *iter) {
-				auto current_button_id = getButtonID(event.TouchInput.X, event.TouchInput.Y);
-
-				if (current_button_id == i)
-					continue;
-
-				// remove old button
-				handleButtonEvent((touch_gui_button_id) i, *iter, false);
-
-				if (current_button_id == after_last_element_id)
-					return;
-
-				handleButtonEvent((touch_gui_button_id) current_button_id, *iter, true);
-				return;
-			}
-		}
-	}
-
-	int current_button_id = getButtonID(event.TouchInput.X, event.TouchInput.Y);
-
-	if (current_button_id == after_last_element_id)
-		return;
-
-	button_info *btn = &m_buttons[current_button_id];
-	if (std::find(btn->ids.begin(), btn->ids.end(), event.TouchInput.ID) == btn->ids.end())
-		handleButtonEvent((touch_gui_button_id) current_button_id, event.TouchInput.ID, true);
-}
-
-bool TouchScreenGUI::doRightClick()
-{
-	v2s32 mPos = v2s32(m_move_downlocation.X, m_move_downlocation.Y);
-	if (m_draw_crosshair) {
-		mPos.X = m_screensize.X / 2;
-		mPos.Y = m_screensize.Y / 2;
-	}
-
-	SEvent translated {};
-	translated.EventType               = EET_MOUSE_INPUT_EVENT;
-	translated.MouseInput.X            = mPos.X;
-	translated.MouseInput.Y            = mPos.Y;
-	translated.MouseInput.Shift        = false;
-	translated.MouseInput.Control      = false;
-	translated.MouseInput.ButtonStates = EMBSM_RIGHT;
-
-	// update shootline
-	m_shootline = m_device
-			->getSceneManager()
-			->getSceneCollisionManager()
-			->getRayFromScreenCoordinates(mPos);
-
-	translated.MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
-	verbosestream << "TouchScreenGUI::translateEvent right click press" << std::endl;
-	m_receiver->OnEvent(translated);
-
-	translated.MouseInput.ButtonStates = 0;
-	translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
-	verbosestream << "TouchScreenGUI::translateEvent right click release" << std::endl;
-	m_receiver->OnEvent(translated);
-
-	return true;
-}
-
 void TouchScreenGUI::applyJoystickStatus()
 {
 	if (m_joystick_triggers_aux1) {
 		SEvent translated{};
-		translated.EventType            = irr::EET_KEY_INPUT_EVENT;
+		translated.EventType            = EET_KEY_INPUT_EVENT;
 		translated.KeyInput.Key         = id_to_keycode(aux1_id);
 		translated.KeyInput.PressedDown = false;
 		m_receiver->OnEvent(translated);
@@ -1003,96 +800,40 @@ void TouchScreenGUI::applyJoystickStatus()
 	}
 }
 
-TouchScreenGUI::~TouchScreenGUI()
-{
-	if (!m_initialized)
-		return;
-
-	for (auto &button : m_buttons) {
-		if (button.gui_button) {
-			button.gui_button->drop();
-			button.gui_button = nullptr;
-		}
-	}
-
-	if (m_joystick_btn_off->gui_button) {
-		m_joystick_btn_off->gui_button->drop();
-		m_joystick_btn_off->gui_button = nullptr;
-	}
-
-	if (m_joystick_btn_bg->gui_button) {
-		m_joystick_btn_bg->gui_button->drop();
-		m_joystick_btn_bg->gui_button = nullptr;
-	}
-
-	if (m_joystick_btn_center->gui_button) {
-		m_joystick_btn_center->gui_button->drop();
-		m_joystick_btn_center->gui_button = nullptr;
-	}
-}
-
 void TouchScreenGUI::step(float dtime)
 {
-	if (!m_initialized)
-		return;
-
 	// simulate keyboard repeats
-	for (auto &button : m_buttons) {
-		if (!button.ids.empty()) {
-			button.repeat_counter += dtime;
-
-			if (button.repeat_counter < button.repeat_delay)
-				continue;
-
-			button.repeat_counter           = 0.0f;
-			SEvent translated {};
-			translated.EventType            = irr::EET_KEY_INPUT_EVENT;
-			translated.KeyInput.Key         = button.keycode;
-			translated.KeyInput.PressedDown = false;
-			m_receiver->OnEvent(translated);
-
-			translated.KeyInput.PressedDown = true;
-			m_receiver->OnEvent(translated);
-		}
-	}
+	buttons_step(m_buttons, dtime, m_device->getVideoDriver(), m_receiver, m_texturesource);
+	for (AutoHideButtonBar &bar : m_buttonbars)
+		bar.step(dtime);
 
 	// joystick
 	applyJoystickStatus();
 
 	// if a new placed pointer isn't moved for some time start digging
-	if (m_has_move_id &&
-			(!m_move_has_really_moved) &&
-			(!m_move_sent_as_mouse_event)) {
+	if (m_has_move_id && !m_move_has_really_moved && m_tap_state == TapState::None) {
 		u64 delta = porting::getDeltaMs(m_move_downtime, porting::getTimeMs());
 
-		if (delta > MIN_DIG_TIME_MS) {
-			s32 mX = m_move_downlocation.X;
-			s32 mY = m_move_downlocation.Y;
-			if (m_draw_crosshair) {
-				mX = m_screensize.X / 2;
-				mY = m_screensize.Y / 2;
-			}
-			m_shootline = m_device
-					->getSceneManager()
-					->getSceneCollisionManager()
-					->getRayFromScreenCoordinates(v2s32(mX, mY));
-
-			SEvent translated {};
-			translated.EventType               = EET_MOUSE_INPUT_EVENT;
-			translated.MouseInput.X            = mX;
-			translated.MouseInput.Y            = mY;
-			translated.MouseInput.Shift        = false;
-			translated.MouseInput.Control      = false;
-			translated.MouseInput.ButtonStates = EMBSM_LEFT;
-			translated.MouseInput.Event        = EMIE_LMOUSE_PRESSED_DOWN;
-			verbosestream << "TouchScreenGUI::step left click press" << std::endl;
-			m_receiver->OnEvent(translated);
-			m_move_sent_as_mouse_event         = true;
+		if (delta > m_long_tap_delay) {
+			m_tap_state = TapState::LongTap;
 		}
 	}
 
-	m_settings_bar.step(dtime);
-	m_rare_controls_bar.step(dtime);
+	// Update the shootline.
+	// Since not only the pointer position, but also the player position and
+	// thus the camera position can change, it doesn't suffice to update the
+	// shootline when a touch event occurs.
+	// Note that the shootline isn't used if touch_use_crosshair is enabled.
+	// Only updating when m_has_move_id means that the shootline will stay at
+	// it's last in-world position when the player doesn't need it.
+	if (!m_draw_crosshair && (m_has_move_id || m_had_move_id)) {
+		v2s32 pointer_pos = getPointerPos();
+		m_shootline = m_device
+				->getSceneManager()
+				->getSceneCollisionManager()
+				->getRayFromScreenCoordinates(pointer_pos);
+	}
+	m_had_move_id = false;
 }
 
 void TouchScreenGUI::resetHotbarRects()
@@ -1100,35 +841,33 @@ void TouchScreenGUI::resetHotbarRects()
 	m_hotbar_rects.clear();
 }
 
-void TouchScreenGUI::registerHotbarRect(u16 index, const rect<s32> &rect)
+void TouchScreenGUI::registerHotbarRect(u16 index, const recti &rect)
 {
 	m_hotbar_rects[index] = rect;
 }
 
 void TouchScreenGUI::setVisible(bool visible)
 {
-	if (!m_initialized)
-		return;
-
 	m_visible = visible;
 	for (auto &button : m_buttons) {
 		if (button.gui_button)
 			button.gui_button->setVisible(visible);
 	}
 
-	if (m_joystick_btn_off->gui_button)
-		m_joystick_btn_off->gui_button->setVisible(visible);
+	if (m_joystick_btn_off)
+		m_joystick_btn_off->setVisible(visible);
 
 	// clear all active buttons
 	if (!visible) {
-		while (!m_known_ids.empty())
-			handleReleaseEvent(m_known_ids.begin()->id);
-
-		m_settings_bar.hide();
-		m_rare_controls_bar.hide();
+		while (!m_pointer_pos.empty())
+			handleReleaseEvent(m_pointer_pos.begin()->first);
+		for (AutoHideButtonBar &bar : m_buttonbars) {
+			bar.deactivate();
+			bar.hide();
+		}
 	} else {
-		m_settings_bar.show();
-		m_rare_controls_bar.show();
+		for (AutoHideButtonBar &bar : m_buttonbars)
+			bar.show();
 	}
 }
 
@@ -1142,10 +881,116 @@ void TouchScreenGUI::hide()
 
 void TouchScreenGUI::show()
 {
-	if (m_visible)
+	if (m_visible) 
 		return;
 
 	setVisible(true);
 }
 
-#endif
\ No newline at end of file
+v2s32 TouchScreenGUI::getPointerPos()
+{
+	if (m_draw_crosshair)
+		return v2s32(m_screensize.X / 2, m_screensize.Y / 2);
+	// We can't just use m_pointer_pos[m_move_id] because applyContextControls
+	// may emit release events after m_pointer_pos[m_move_id] is erased.
+	return m_move_pos;
+}
+
+void TouchScreenGUI::emitMouseEvent(EMOUSE_INPUT_EVENT type)
+{
+	v2s32 pointer_pos = getPointerPos();
+
+	SEvent event{};
+	event.EventType               = EET_MOUSE_INPUT_EVENT;
+	event.MouseInput.X            = pointer_pos.X;
+	event.MouseInput.Y            = pointer_pos.Y;
+	event.MouseInput.Shift        = false;
+	event.MouseInput.Control      = false;
+	event.MouseInput.ButtonStates = 0;
+	event.MouseInput.Event        = type;
+	m_receiver->OnEvent(event);
+}
+
+void TouchScreenGUI::applyContextControls(const TouchInteractionMode &mode)
+{
+	// Since the pointed thing has already been determined when this function
+	// is called, we cannot use this function to update the shootline.
+
+	sanity_check(mode != TouchInteractionMode_USER);
+	u64 now = porting::getTimeMs();
+	bool target_dig_pressed = false;
+	bool target_place_pressed = false;
+
+	// If the meanings of short and long taps have been swapped, abort any ongoing
+	// short taps because they would do something else than the player expected.
+	// Long taps don't need this, they're adjusted to the swapped meanings instead.
+	if (mode != m_last_mode) {
+		m_dig_pressed_until = 0;
+		m_place_pressed_until = 0;
+	}
+	m_last_mode = mode;
+
+	switch (m_tap_state) {
+	case TapState::ShortTap:
+		if (mode == SHORT_DIG_LONG_PLACE) {
+			if (!m_dig_pressed) {
+				// The button isn't currently pressed, we can press it.
+				m_dig_pressed_until = now + SIMULATED_CLICK_DURATION_MS;
+				// We're done with this short tap.
+				m_tap_state = TapState::None;
+			}  else {
+				// The button is already pressed, perhaps due to another short tap.
+				// Release it now, press it again during the next client step.
+				// We can't release and press during the same client step because
+				// the digging code simply ignores that.
+				m_dig_pressed_until = 0;
+			}
+		} else {
+			if (!m_place_pressed) {
+				// The button isn't currently pressed, we can press it.
+				m_place_pressed_until = now + SIMULATED_CLICK_DURATION_MS;
+				// We're done with this short tap.
+				m_tap_state = TapState::None;
+			}  else {
+				// The button is already pressed, perhaps due to another short tap.
+				// Release it now, press it again during the next client step.
+				// We can't release and press during the same client step because
+				// the digging code simply ignores that.
+				m_place_pressed_until = 0;
+			}
+		}
+		break;
+
+	case TapState::LongTap:
+		if (mode == SHORT_DIG_LONG_PLACE)
+			target_place_pressed = true;
+		else
+			target_dig_pressed = true;
+		break;
+
+	case TapState::None:
+		break;
+	}
+
+	// Apply short taps.
+	target_dig_pressed |= now < m_dig_pressed_until;
+	target_place_pressed |= now < m_place_pressed_until;
+
+	if (target_dig_pressed && !m_dig_pressed) {
+		emitMouseEvent(EMIE_LMOUSE_PRESSED_DOWN);
+		m_dig_pressed = true;
+
+	} else if (!target_dig_pressed && m_dig_pressed) {
+		emitMouseEvent(EMIE_LMOUSE_LEFT_UP);
+		m_dig_pressed = false;
+	}
+
+	if (target_place_pressed && !m_place_pressed) {
+		emitMouseEvent(EMIE_RMOUSE_PRESSED_DOWN);
+		m_place_pressed = true;
+
+	} else if (!target_place_pressed && m_place_pressed) {
+		emitMouseEvent(EMIE_RMOUSE_LEFT_UP);
+		m_place_pressed = false;
+	}
+}
diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h
index 9c3eece84..61828908f 100644
--- a/src/gui/touchscreengui.h
+++ b/src/gui/touchscreengui.h
@@ -1,5 +1,7 @@
 /*
 Copyright (C) 2014 sapier
+Copyright (C) 2024 grorp, Gregor Parzefall
+		<gregor.parzefall@posteo.de>
 
 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
@@ -23,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes.h"
 #include <IEventReceiver.h>
-#include <IGUIButton.h>
+#include <IGUIImage.h>
 #include <IGUIEnvironment.h>
 #include <IrrlichtDevice.h>
 
@@ -32,22 +34,53 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <unordered_map>
 #include <vector>
 
-#include "client/tile.h"
+#include "itemdef.h"
 #include "client/game.h"
 
 using namespace irr;
 using namespace irr::core;
 using namespace irr::gui;
 
-typedef enum
+
+// We cannot use irr_ptr for Irrlicht GUI elements we own.
+// Option 1: Pass IGUIElement* returned by IGUIEnvironment::add* into irr_ptr
+//           constructor.
+//           -> We steal the reference owned by IGUIEnvironment and drop it later,
+//           causing the IGUIElement to be deleted while IGUIEnvironment still
+//           references it.
+// Option 2: Pass IGUIElement* returned by IGUIEnvironment::add* into irr_ptr::grab.
+//           -> We add another reference and drop it later, but since IGUIEnvironment
+//           still references the IGUIElement, it is never deleted.
+// To make IGUIEnvironment drop its reference to the IGUIElement, we have to call
+// IGUIElement::remove, so that's what we'll do.
+template <typename T>
+std::shared_ptr<T> grab_gui_element(T *element)
+{
+	static_assert(std::is_base_of_v<IGUIElement, T>,
+			"grab_gui_element only works for IGUIElement");
+	return std::shared_ptr<T>(element, [](T *e) {
+		e->remove();
+	});
+}
+
+
+enum class TapState
+{
+	None,
+	ShortTap,
+	LongTap,
+};
+
+enum touch_gui_button_id
 {
 	jump_id = 0,
-	crunch_id,
+	sneak_id,
 	zoom_id,
 	aux1_id,
-	after_last_element_id,
 	settings_starter_id,
 	rare_controls_starter_id,
+
+	// usually in the "settings bar"
 	fly_id,
 	noclip_id,
 	fast_id,
@@ -56,117 +89,112 @@ typedef enum
 	range_id,
 	minimap_id,
 	toggle_chat_id,
+
+	// usually in the "rare controls bar"
 	chat_id,
 	inventory_id,
 	drop_id,
 	exit_id,
+
+	// the joystick
 	joystick_off_id,
 	joystick_bg_id,
-	joystick_center_id
-} touch_gui_button_id;
+	joystick_center_id,
+};
 
-typedef enum
+enum autohide_button_bar_dir
 {
 	AHBB_Dir_Top_Bottom,
 	AHBB_Dir_Bottom_Top,
 	AHBB_Dir_Left_Right,
 	AHBB_Dir_Right_Left
-} autohide_button_bar_dir;
+};
 
-#define MIN_DIG_TIME_MS 500
-#define BUTTON_REPEAT_DELAY 0.2f
+#define BUTTON_REPEAT_DELAY 0.5f
+#define BUTTON_REPEAT_INTERVAL 0.333f
+#define BUTTONBAR_HIDE_DELAY 3.0f
 #define SETTINGS_BAR_Y_OFFSET 5
 #define RARE_CONTROLS_BAR_Y_OFFSET 5
 
-extern const std::string button_image_names[];
-extern const std::string joystick_image_names[];
+// Our simulated clicks last some milliseconds so that server-side mods have a
+// chance to detect them via l_get_player_control.
+// If you tap faster than this value, the simulated clicks are of course shorter.
+#define SIMULATED_CLICK_DURATION_MS 50
 
 struct button_info
 {
 	float repeat_counter;
-	float repeat_delay;
 	EKEY_CODE keycode;
-	std::vector<size_t> ids;
-	IGUIButton *gui_button = nullptr;
-	bool immediate_release;
+	std::vector<size_t> pointer_ids;
+	std::shared_ptr<IGUIImage> gui_button = nullptr;
 
 	enum {
 		NOT_TOGGLEABLE,
 		FIRST_TEXTURE,
 		SECOND_TEXTURE
 	} toggleable = NOT_TOGGLEABLE;
-	std::vector<std::string> textures;
+	std::string toggle_textures[2];
+
+	void emitAction(bool action, video::IVideoDriver *driver,
+			IEventReceiver *receiver, ISimpleTextureSource *tsrc);
 };
 
 class AutoHideButtonBar
 {
 public:
-	AutoHideButtonBar(IrrlichtDevice *device, IEventReceiver *receiver);
+	AutoHideButtonBar(IrrlichtDevice *device, ISimpleTextureSource *tsrc,
+			touch_gui_button_id starter_id, const std::string &starter_image,
+			recti starter_rect, autohide_button_bar_dir dir);
 
-	void init(ISimpleTextureSource *tsrc, const std::string &starter_img, int button_id,
-			const v2s32 &UpperLeft, const v2s32 &LowerRight,
-			autohide_button_bar_dir dir, float timeout);
+	void addButton(touch_gui_button_id id, const std::string &image);
+	void addToggleButton(touch_gui_button_id id,
+			const std::string &image_1, const std::string &image_2);
 
 	void clear();
-	~AutoHideButtonBar();
+	
+	bool handlePress(size_t pointer_id, IGUIElement *element);
+	bool handleRelease(size_t pointer_id);
 
-	// add button to be shown
-	void addButton(touch_gui_button_id id, const wchar_t *caption,
-			const std::string &btn_image);
-
-	// add toggle button to be shown
-	void addToggleButton(touch_gui_button_id id, const wchar_t *caption,
-			const std::string &btn_image_1, const std::string &btn_image_2);
-
-	// detect button bar button events
-	bool isButton(const SEvent &event);
-
-	// step handler
 	void step(float dtime);
 
-	// return whether the button bar is active
-	bool active() { return m_active; }
-
-	// deactivate the button bar
+	void activate();
 	void deactivate();
+	bool isActive() { return m_active; }
 
-	// hide the whole button bar
+	void show();
 	void hide();
 
-	// unhide the button bar
-	void show();
+	bool operator==(const AutoHideButtonBar &other)
+			{ return m_starter.get() == other.m_starter.get(); }
+	bool operator!=(const AutoHideButtonBar &other)
+			{ return m_starter.get() != other.m_starter.get(); }
 
 private:
+	irr::video::IVideoDriver *m_driver = nullptr;
+	IGUIEnvironment *m_guienv = nullptr;
+	IEventReceiver *m_receiver = nullptr;
 	ISimpleTextureSource *m_texturesource = nullptr;
-	irr::video::IVideoDriver *m_driver;
-	IGUIEnvironment *m_guienv;
-	IEventReceiver *m_receiver;
-	button_info m_starter;
-	std::vector<std::shared_ptr<button_info>> m_buttons;
+	std::shared_ptr<IGUIImage> m_starter;
+	std::vector<button_info> m_buttons;
 
 	v2s32 m_upper_left;
 	v2s32 m_lower_right;
 
-	// show button bar
 	bool m_active = false;
 	bool m_visible = true;
-
-	// button bar timeout
 	float m_timeout = 0.0f;
-	float m_timeout_value = 3.0f;
-	bool m_initialized = false;
 	autohide_button_bar_dir m_dir = AHBB_Dir_Right_Left;
+
+	void updateVisibility();
 };
 
 class TouchScreenGUI
 {
 public:
-	TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver);
-	~TouchScreenGUI();
+	TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsrc);
 
 	void translateEvent(const SEvent &event);
-
-	void init(ISimpleTextureSource *tsrc);
+	void applyContextControls(const TouchInteractionMode &mode);
 
 	double getYawChange()
 	{
@@ -175,7 +203,11 @@ public:
 		return res;
 	}
 
-	double getPitch() { return m_camera_pitch; }
+	double getPitchChange() {
+		double res = m_camera_pitch_change;
+		m_camera_pitch_change = 0;
+		return res;
+	}
 
 	/**
 	 * Returns a line which describes what the player is pointing at.
@@ -198,26 +230,26 @@ public:
 	void show();
 
 	void resetHotbarRects();
-	void registerHotbarRect(u16 index, const rect<s32> &rect);
+	void registerHotbarRect(u16 index, const recti &rect);
 	std::optional<u16> getHotbarSelection();
 
 private:
-	bool m_initialized = false;
-	IrrlichtDevice *m_device;
-	IGUIEnvironment *m_guienv;
-	IEventReceiver *m_receiver;
-	ISimpleTextureSource *m_texturesource;
+	IrrlichtDevice *m_device = nullptr;
+	IGUIEnvironment *m_guienv = nullptr;
+	IEventReceiver *m_receiver = nullptr;
+	ISimpleTextureSource *m_texturesource = nullptr;
 	v2u32 m_screensize;
-	s32 button_size;
+	s32 m_button_size;
 	double m_touchscreen_threshold;
-	bool m_visible; // is the whole touch screen gui visible
+	u16 m_long_tap_delay;
+	bool m_visible = true; // is the whole touch screen gui visible
 
-	std::unordered_map<u16, rect<s32>> m_hotbar_rects;
+	std::unordered_map<u16, recti> m_hotbar_rects;
 	std::optional<u16> m_hotbar_selection = std::nullopt;
 
 	// value in degree
 	double m_camera_yaw_change = 0.0;
-	double m_camera_pitch = 0.0;
+	double m_camera_pitch_change = 0.0;
 
 	/**
 	 * A line starting at the camera and pointing towards the selected object.
@@ -230,8 +262,11 @@ private:
 	size_t m_move_id;
 	bool m_move_has_really_moved = false;
 	u64 m_move_downtime = 0;
-	bool m_move_sent_as_mouse_event = false;
-	v2s32 m_move_downlocation = v2s32(-10000, -10000); // off-screen
+	// m_move_pos stays valid even after m_move_id has been released.
+	v2s32 m_move_pos;
+	// This is needed so that we don't miss if m_has_move_id is true for less
+	// than one client step, i.e. press and release happen in the same step.
+	bool m_had_move_id = false;
 
 	bool m_has_joystick_id = false;
 	size_t m_joystick_id;
@@ -242,64 +277,46 @@ private:
 	bool m_fixed_joystick = false;
 	bool m_joystick_triggers_aux1 = false;
 	bool m_draw_crosshair = false;
-	std::shared_ptr<button_info> m_joystick_btn_off = nullptr;
-	std::shared_ptr<button_info> m_joystick_btn_bg = nullptr;
-	std::shared_ptr<button_info> m_joystick_btn_center = nullptr;
+	std::shared_ptr<IGUIImage> m_joystick_btn_off;
+	std::shared_ptr<IGUIImage> m_joystick_btn_bg;
+	std::shared_ptr<IGUIImage> m_joystick_btn_center;
 
-	button_info m_buttons[after_last_element_id];
-
-	// gui button detection
-	touch_gui_button_id getButtonID(s32 x, s32 y);
-
-	// gui button by eventID
-	touch_gui_button_id getButtonID(size_t eventID);
-
-	// check if a button has changed
-	void handleChangedButton(const SEvent &event);
+	std::vector<button_info> m_buttons;
 
 	// initialize a button
-	void initButton(touch_gui_button_id id, const rect<s32> &button_rect,
-			const std::wstring &caption, bool immediate_release,
-			float repeat_delay = BUTTON_REPEAT_DELAY);
+	void addButton(touch_gui_button_id id, const std::string &image,
+			const recti &rect);
 
 	// initialize a joystick button
-	std::shared_ptr<button_info> initJoystickButton(touch_gui_button_id id,
-			const rect<s32> &button_rect, int texture_id,
-			bool visible = true);
-
-	struct id_status
-	{
-		size_t id;
-		int X;
-		int Y;
-	};
-
-	// vector to store known ids and their initial touch positions
-	std::vector<id_status> m_known_ids;
-
-	// handle a button event
-	void handleButtonEvent(touch_gui_button_id bID, size_t eventID, bool action);
+	IGUIImage *makeJoystickButton(touch_gui_button_id id,
+			const recti &rect, bool visible);
 
 	// handle pressing hotbar items
 	bool isHotbarButton(const SEvent &event);
 
-	// do a right-click
-	bool doRightClick();
-
 	// handle release event
-	void handleReleaseEvent(size_t evt_id);
+	void handleReleaseEvent(size_t pointer_id);
 
 	// apply joystick status
 	void applyJoystickStatus();
 
-	// array for saving last known position of a pointer
+	// map to store the IDs and original positions of currently pressed pointers
+	std::unordered_map<size_t, v2s32> m_pointer_downpos;
+	// map to store the IDs and positions of currently pressed pointers
 	std::unordered_map<size_t, v2s32> m_pointer_pos;
 
-	// settings bar
-	AutoHideButtonBar m_settings_bar;
+	std::vector<AutoHideButtonBar> m_buttonbars;
 
-	// rare controls bar
-	AutoHideButtonBar m_rare_controls_bar;
+	v2s32 getPointerPos();
+	void emitMouseEvent(EMOUSE_INPUT_EVENT type);
+	TouchInteractionMode m_last_mode = TouchInteractionMode_END;
+	TapState m_tap_state = TapState::None;
+
+	bool m_dig_pressed = false;
+	u64 m_dig_pressed_until = 0;
+
+	bool m_place_pressed = false;
+	u64 m_place_pressed_until = 0;
 };
 
 extern TouchScreenGUI *g_touchscreengui;
diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp
index 7e8f44a1b..d54ea3055 100644
--- a/src/httpfetch.cpp
+++ b/src/httpfetch.cpp
@@ -22,18 +22,16 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "httpfetch.h"
 #include "porting.h" // for sleep_ms(), get_sysinfo(), secure_rand_fill_buf()
-#include <iostream>
-#include <sstream>
 #include <list>
 #include <unordered_map>
 #include <cerrno>
 #include <mutex>
-#include "network/socket.h" // for select()
 #include "threading/event.h"
 #include "config.h"
 #include "exceptions.h"
 #include "debug.h"
 #include "log.h"
+#include "porting.h"
 #include "util/container.h"
 #include "util/thread.h"
 #include "version.h"
@@ -45,10 +43,17 @@ static std::unordered_map<u64, std::queue<HTTPFetchResult>>
 	g_httpfetch_results;
 std::unique_ptr<PcgRandom> g_callerid_randomness;
 
+static std::string default_user_agent()
+{
+	std::string ret(PROJECT_NAME_C "/");
+	ret.append(g_version_string).append(" (").append(porting::get_sysinfo()).append(")");
+	return ret;
+}
+
 HTTPFetchRequest::HTTPFetchRequest() :
 	timeout(g_settings->getS32("curl_timeout")),
 	connect_timeout(10 * 1000),
-	useragent(std::string(PROJECT_NAME_C "/") + g_version_hash + " (" + porting::get_sysinfo() + ")")
+	useragent(default_user_agent())
 {
 	timeout = std::max(timeout, MIN_HTTPFETCH_TIMEOUT_INTERACTIVE);
 }
@@ -158,9 +163,9 @@ bool httpfetch_async_get(u64 caller, HTTPFetchResult &fetch_result)
 static size_t httpfetch_writefunction(
 		char *ptr, size_t size, size_t nmemb, void *userdata)
 {
-	std::ostringstream *stream = (std::ostringstream*)userdata;
+	auto *dest = reinterpret_cast<std::string*>(userdata);
 	size_t count = size * nmemb;
-	stream->write(ptr, count);
+	dest->append(ptr, count);
 	return count;
 }
 
@@ -172,16 +177,15 @@ static size_t httpfetch_discardfunction(
 
 class CurlHandlePool
 {
-	std::list<CURL*> handles;
+	std::vector<CURL*> handles;
 
 public:
 	CurlHandlePool() = default;
 
 	~CurlHandlePool()
 	{
-		for (std::list<CURL*>::iterator it = handles.begin();
-				it != handles.end(); ++it) {
-			curl_easy_cleanup(*it);
+		for (CURL *it : handles) {
+			curl_easy_cleanup(it);
 		}
 	}
 	CURL * alloc()
@@ -189,13 +193,11 @@ public:
 		CURL *curl;
 		if (handles.empty()) {
 			curl = curl_easy_init();
-			if (curl == NULL) {
-				errorstream<<"curl_easy_init returned NULL"<<std::endl;
-			}
-		}
-		else {
-			curl = handles.front();
-			handles.pop_front();
+			if (!curl)
+				throw std::bad_alloc();
+		} else {
+			curl = handles.back();
+			handles.pop_back();
 		}
 		return curl;
 	}
@@ -224,7 +226,6 @@ private:
 	CURLM *multi = nullptr;
 	HTTPFetchRequest request;
 	HTTPFetchResult result;
-	std::ostringstream oss;
 	struct curl_slist *http_header = nullptr;
 	curl_mime *multipart_mime = nullptr;
 };
@@ -234,19 +235,17 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
 		CurlHandlePool *pool_):
 	pool(pool_),
 	request(request_),
-	result(request_),
-	oss(std::ios::binary)
+	result(request_)
 {
 	curl = pool->alloc();
-	if (curl == NULL) {
+	if (!curl)
 		return;
-	}
 
 	// Set static cURL options
 	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 3);
-	curl_easy_setopt(curl, CURLOPT_ENCODING, "gzip");
+	curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""); // = all supported ones
 
 	std::string bind_address = g_settings->get("bind_address");
 	if (!bind_address.empty()) {
@@ -298,16 +297,15 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
 	}
 
 	// Set up a write callback that writes to the
-	// ostringstream ongoing->oss, unless the data
-	// is to be discarded
+	// result struct, unless the data is to be discarded
 	if (request.caller == HTTPFETCH_DISCARD) {
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
 				httpfetch_discardfunction);
-		curl_easy_setopt(curl, CURLOPT_WRITEDATA, NULL);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, nullptr);
 	} else {
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
 				httpfetch_writefunction);
-		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &oss);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &result.data);
 	}
 
 	// Set data from fields or raw_data
@@ -393,7 +391,6 @@ const HTTPFetchResult * HTTPFetchOngoing::complete(CURLcode res)
 {
 	result.succeeded = (res == CURLE_OK);
 	result.timeout = (res == CURLE_OPERATION_TIMEDOUT);
-	result.data = oss.str();
 
 	// Get HTTP/FTP response code
 	result.response_code = 0;
@@ -437,10 +434,12 @@ HTTPFetchOngoing::~HTTPFetchOngoing()
 	// Set safe options for the reusable cURL handle
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
 			httpfetch_discardfunction);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, NULL);
-	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, nullptr);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, nullptr);
+	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, nullptr);
+	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, nullptr);
 	if (http_header) {
-		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, nullptr);
 		curl_slist_free_all(http_header);
 	}
 	if (multipart_mime) {
@@ -453,6 +452,12 @@ HTTPFetchOngoing::~HTTPFetchOngoing()
 }
 
 
+#if LIBCURL_VERSION_NUM >= 0x074200
+#define HAVE_CURL_MULTI_POLL
+#else
+#undef HAVE_CURL_MULTI_POLL
+#endif
+
 class CurlFetchThread : public Thread
 {
 protected:
@@ -465,7 +470,7 @@ protected:
 	struct Request {
 		RequestType type;
 		HTTPFetchRequest fetch_request;
-		Event *event;
+		Event *event = nullptr;
 	};
 
 	CURLM *m_multi;
@@ -491,8 +496,7 @@ public:
 		Request req;
 		req.type = RT_FETCH;
 		req.fetch_request = fetch_request;
-		req.event = NULL;
-		m_requests.push_back(req);
+		m_requests.push_back(std::move(req));
 	}
 
 	void requestClear(u64 caller, Event *event)
@@ -501,31 +505,29 @@ public:
 		req.type = RT_CLEAR;
 		req.fetch_request.caller = caller;
 		req.event = event;
-		m_requests.push_back(req);
+		m_requests.push_back(std::move(req));
 	}
 
 	void requestWakeUp()
 	{
 		Request req;
 		req.type = RT_WAKEUP;
-		req.event = NULL;
-		m_requests.push_back(req);
+		m_requests.push_back(std::move(req));
 	}
 
 protected:
 	// Handle a request from some other thread
 	// E.g. new fetch; clear fetches for one caller; wake up
-	void processRequest(const Request &req)
+	void processRequest(Request &req)
 	{
 		if (req.type == RT_FETCH) {
 			// New fetch, queue until there are less
 			// than m_parallel_limit ongoing fetches
-			m_queued_fetches.push_back(req.fetch_request);
+			m_queued_fetches.push_back(std::move(req.fetch_request));
 
 			// see processQueued() for what happens next
 
-		}
-		else if (req.type == RT_CLEAR) {
+		} else if (req.type == RT_CLEAR) {
 			u64 caller = req.fetch_request.caller;
 
 			// Abort all ongoing fetches for the caller
@@ -538,20 +540,18 @@ protected:
 			}
 
 			// Also abort all queued fetches for the caller
-			for (std::list<HTTPFetchRequest>::iterator
-					it = m_queued_fetches.begin();
+			for (auto it = m_queued_fetches.begin();
 					it != m_queued_fetches.end();) {
 				if ((*it).caller == caller)
 					it = m_queued_fetches.erase(it);
 				else
 					++it;
 			}
-		}
-		else if (req.type == RT_WAKEUP) {
+		} else if (req.type == RT_WAKEUP) {
 			// Wakeup: Nothing to do, thread is awake at this point
 		}
 
-		if (req.event != NULL)
+		if (req.event)
 			req.event->signal();
 	}
 
@@ -560,7 +560,7 @@ protected:
 	{
 		while (m_all_ongoing.size() < m_parallel_limit &&
 				!m_queued_fetches.empty()) {
-			HTTPFetchRequest request = m_queued_fetches.front();
+			HTTPFetchRequest request = std::move(m_queued_fetches.front());
 			m_queued_fetches.pop_front();
 
 			// Create ongoing fetch data and make a cURL handle
@@ -580,20 +580,16 @@ protected:
 	// Process CURLMsg (indicates completion of a fetch)
 	void processCurlMessage(CURLMsg *msg)
 	{
+		if (msg->msg != CURLMSG_DONE)
+			return;
 		// Determine which ongoing fetch the message pertains to
-		size_t i = 0;
-		bool found = false;
-		for (i = 0; i < m_all_ongoing.size(); ++i) {
-			if (m_all_ongoing[i]->getEasyHandle() == msg->easy_handle) {
-				found = true;
-				break;
-			}
-		}
-		if (msg->msg == CURLMSG_DONE && found) {
-			// m_all_ongoing[i] succeeded or failed.
-			HTTPFetchOngoing &ongoing = *m_all_ongoing[i];
+		for (auto it = m_all_ongoing.begin(); it != m_all_ongoing.end(); ++it) {
+			auto &ongoing = **it;
+			if (ongoing.getEasyHandle() != msg->easy_handle)
+				continue;
 			httpfetch_deliver_result(*ongoing.complete(msg->data.result));
-			m_all_ongoing.erase(m_all_ongoing.begin() + i);
+			m_all_ongoing.erase(it);
+			return;
 		}
 	}
 
@@ -612,62 +608,40 @@ protected:
 	// Wait until some IO happens, or timeout elapses
 	void waitForIO(long timeout)
 	{
-		fd_set read_fd_set;
-		fd_set write_fd_set;
-		fd_set exc_fd_set;
-		int max_fd;
-		long select_timeout = -1;
-		struct timeval select_tv;
 		CURLMcode mres;
 
-		FD_ZERO(&read_fd_set);
-		FD_ZERO(&write_fd_set);
-		FD_ZERO(&exc_fd_set);
+#ifdef HAVE_CURL_MULTI_POLL
+		mres = curl_multi_poll(m_multi, nullptr, 0, timeout, nullptr);
 
-		mres = curl_multi_fdset(m_multi, &read_fd_set,
-				&write_fd_set, &exc_fd_set, &max_fd);
 		if (mres != CURLM_OK) {
-			errorstream<<"curl_multi_fdset"
-				<<" returned error code "<<mres
-				<<std::endl;
-			select_timeout = 0;
+			errorstream << "curl_multi_poll returned error code "
+				<< mres << std::endl;
+		}
+#else
+		// If there's nothing to do curl_multi_wait() will immediately return
+		// so we have to emulate the sleeping.
+
+		fd_set dummy;
+		int max_fd;
+		mres = curl_multi_fdset(m_multi, &dummy, &dummy, &dummy, &max_fd);
+		if (mres != CURLM_OK) {
+			errorstream << "curl_multi_fdset returned error code "
+				<< mres << std::endl;
+			max_fd = -1;
 		}
 
-		mres = curl_multi_timeout(m_multi, &select_timeout);
-		if (mres != CURLM_OK) {
-			errorstream<<"curl_multi_timeout"
-				<<" returned error code "<<mres
-				<<std::endl;
-			select_timeout = 0;
-		}
+		if (max_fd == -1) { // curl has nothing to wait for
+			if (timeout > 0)
+				sleep_ms(timeout);
+		} else {
+			mres = curl_multi_wait(m_multi, nullptr, 0, timeout, nullptr);
 
-		// Limit timeout so new requests get through
-		if (select_timeout < 0 || select_timeout > timeout)
-			select_timeout = timeout;
-
-		if (select_timeout > 0) {
-			// in Winsock it is forbidden to pass three empty
-			// fd_sets to select(), so in that case use sleep_ms
-			if (max_fd != -1) {
-				select_tv.tv_sec = select_timeout / 1000;
-				select_tv.tv_usec = (select_timeout % 1000) * 1000;
-				int retval = select(max_fd + 1, &read_fd_set,
-						&write_fd_set, &exc_fd_set,
-						&select_tv);
-				if (retval == -1) {
-					#ifdef _WIN32
-					errorstream<<"select returned error code "
-						<<WSAGetLastError()<<std::endl;
-					#else
-					errorstream<<"select returned error code "
-						<<errno<<std::endl;
-					#endif
-				}
-			}
-			else {
-				sleep_ms(select_timeout);
+			if (mres != CURLM_OK) {
+				errorstream << "curl_multi_wait returned error code "
+					<< mres << std::endl;
 			}
 		}
+#endif
 	}
 
 	void *run()
@@ -675,10 +649,7 @@ protected:
 		CurlHandlePool pool;
 
 		m_multi = curl_multi_init();
-		if (m_multi == NULL) {
-			errorstream<<"curl_multi_init returned NULL\n";
-			return NULL;
-		}
+		FATAL_ERROR_IF(!m_multi, "curl_multi_init returned NULL");
 
 		FATAL_ERROR_IF(!m_all_ongoing.empty(), "Expected empty");
 
@@ -752,15 +723,17 @@ protected:
 	}
 };
 
-std::unique_ptr<CurlFetchThread> g_httpfetch_thread = nullptr;
+static std::unique_ptr<CurlFetchThread> g_httpfetch_thread;
 
 void httpfetch_init(int parallel_limit)
 {
+	FATAL_ERROR_IF(g_httpfetch_thread, "httpfetch_init called twice");
+
 	verbosestream<<"httpfetch_init: parallel_limit="<<parallel_limit
 			<<std::endl;
 
 	CURLcode res = curl_global_init(CURL_GLOBAL_DEFAULT);
-	FATAL_ERROR_IF(res != CURLE_OK, "CURL init failed");
+	FATAL_ERROR_IF(res != CURLE_OK, "cURL init failed");
 
 	g_httpfetch_thread = std::make_unique<CurlFetchThread>(parallel_limit);
 
@@ -798,21 +771,46 @@ static void httpfetch_request_clear(u64 caller)
 		g_httpfetch_thread->requestClear(caller, &event);
 		event.wait();
 	} else {
-		g_httpfetch_thread->requestClear(caller, NULL);
+		g_httpfetch_thread->requestClear(caller, nullptr);
 	}
 }
 
+// fmtodo: remove:
 void httpfetch_sync(const HTTPFetchRequest &fetch_request,
-		HTTPFetchResult &fetch_result)
+               HTTPFetchResult &fetch_result)
 {
-	// Create ongoing fetch data and make a cURL handle
-	// Set cURL options based on HTTPFetchRequest
-	CurlHandlePool pool;
-	HTTPFetchOngoing ongoing(fetch_request, &pool);
-	// Do the fetch (curl_easy_perform)
-	CURLcode res = ongoing.start(NULL);
-	// Update fetch result
-	fetch_result = *ongoing.complete(res);
+       // Create ongoing fetch data and make a cURL handle
+       // Set cURL options based on HTTPFetchRequest
+       CurlHandlePool pool;
+       HTTPFetchOngoing ongoing(fetch_request, &pool);
+       // Do the fetch (curl_easy_perform)
+       CURLcode res = ongoing.start(nullptr);
+       // Update fetch result
+       fetch_result = *ongoing.complete(res);
+}
+// ==
+
+bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request,
+		HTTPFetchResult &fetch_result, long interval)
+{
+	if (Thread *thread = Thread::getCurrentThread()) {
+		HTTPFetchRequest req = fetch_request;
+		req.caller = httpfetch_caller_alloc_secure();
+		httpfetch_async(req);
+		do {
+			if (thread->stopRequested()) {
+				httpfetch_caller_free(req.caller);
+				fetch_result = HTTPFetchResult(fetch_request);
+				return false;
+			}
+			sleep_ms(interval);
+		} while (!httpfetch_async_get(req.caller, fetch_result));
+		httpfetch_caller_free(req.caller);
+	} else {
+		throw ModError(std::string("You have tried to execute a synchronous HTTP request on the main thread! "
+				"This offense shall be punished. (").append(fetch_request.url).append(")"));
+	}
+	return true;
 }
 
 #else  // USE_CURL
@@ -844,13 +842,14 @@ static void httpfetch_request_clear(u64 caller)
 {
 }
 
-void httpfetch_sync(const HTTPFetchRequest &fetch_request,
-		HTTPFetchResult &fetch_result)
+bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request,
+		HTTPFetchResult &fetch_result, long interval)
 {
-	errorstream << "httpfetch_sync: unable to fetch " << fetch_request.url
+	errorstream << "httpfetch_sync_interruptible: unable to fetch " << fetch_request.url
 			<< " because USE_CURL=0" << std::endl;
 
 	fetch_result = HTTPFetchResult(fetch_request); // sets succeeded = false etc.
+	return false;
 }
 
 #endif  // USE_CURL
diff --git a/src/httpfetch.h b/src/httpfetch.h
index bd141d6b4..36e4071bc 100644
--- a/src/httpfetch.h
+++ b/src/httpfetch.h
@@ -138,6 +138,14 @@ u64 httpfetch_caller_alloc_secure();
 // to stop any ongoing fetches for the given caller.
 void httpfetch_caller_free(u64 caller);
 
+// Performs a synchronous HTTP request that is interruptible if the current
+// thread is a Thread object. interval is the completion check interval in ms.
+// This blocks and therefore should only be used from background threads.
+// Returned is whether the request completed without interruption.
+bool httpfetch_sync_interruptible(const HTTPFetchRequest &fetch_request,
+		HTTPFetchResult &fetch_result, long interval = 100);
+
+// FMTODO: remove
 // Performs a synchronous HTTP request. This blocks and therefore should
 // only be used from background threads.
 void httpfetch_sync(const HTTPFetchRequest &fetch_request, HTTPFetchResult &fetch_result);
diff --git a/src/hud.h b/src/hud.h
index 53fcdf38c..93dab50eb 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -72,7 +72,7 @@ enum HudElementType {
 	HUD_ELEM_MINIMAP   = 7
 };
 
-enum HudElementStat {
+enum HudElementStat : u8 {
 	HUD_STAT_POS = 0,
 	HUD_STAT_NAME,
 	HUD_STAT_SCALE,
@@ -87,6 +87,7 @@ enum HudElementStat {
 	HUD_STAT_Z_INDEX,
 	HUD_STAT_TEXT2,
 	HUD_STAT_STYLE,
+	HudElementStat_END // Dummy for validity check
 };
 
 enum HudCompassDir {
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 9d1d7454d..30ed3e03f 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -395,7 +395,7 @@ bool ItemStack::itemFits(ItemStack newitem,
 	return newitem.empty();
 }
 
-bool ItemStack::stacksWith(ItemStack other) const
+bool ItemStack::stacksWith(const ItemStack &other) const
 {
 	return (this->name == other.name &&
 			this->wear == other.wear &&
@@ -605,8 +605,10 @@ ItemStack InventoryList::changeItem(u32 i, const ItemStack &newitem)
 		return newitem;
 
 	ItemStack olditem = m_items[i];
-	m_items[i] = newitem;
-	setModified();
+	if (olditem != newitem) {
+		m_items[i] = newitem;
+		setModified();
+	}
 	return olditem;
 }
 
@@ -763,55 +765,54 @@ void InventoryList::moveItemSomewhere(u32 i, InventoryList *dest, u32 count)
 
 	if (!leftover.empty()) {
 		// Add the remaining part back to the source item
-		addItem(i, leftover);
+		// do NOT use addItem to allow oversized stacks!
+		leftover.add(getItem(i).count);
+		changeItem(i, leftover);
 	}
 }
 
-u32 InventoryList::moveItem(u32 i, InventoryList *dest, u32 dest_i,
+ItemStack InventoryList::moveItem(u32 i, InventoryList *dest, u32 dest_i,
 		u32 count, bool swap_if_needed, bool *did_swap)
 {
+	ItemStack moved;
 	if (this == dest && i == dest_i)
-		return count;
+		return moved;
 
 	// Take item from source list
-	ItemStack item1;
 	if (count == 0)
-		item1 = changeItem(i, ItemStack());
+		moved = changeItem(i, ItemStack());
 	else
-		item1 = takeItem(i, count);
-
-	if (item1.empty())
-		return 0;
+		moved = takeItem(i, count);
 
 	// Try to add the item to destination list
-	u32 oldcount = item1.count;
-	item1 = dest->addItem(dest_i, item1);
+	ItemStack leftover = dest->addItem(dest_i, moved);
 
 	// If something is returned, the item was not fully added
-	if (!item1.empty()) {
-		// If olditem is returned, nothing was added.
-		bool nothing_added = (item1.count == oldcount);
+	if (!leftover.empty()) {
+		// Keep track of how many we actually moved
+		moved.remove(leftover.count);
 
-		// If something else is returned, part of the item was left unadded.
-		// Add the other part back to the source item
-		addItem(i, item1);
+		// Add any leftover stack back to the source stack.
+		leftover.add(getItem(i).count); // leftover + source count
+		changeItem(i, leftover); // do NOT use addItem to allow oversized stacks!
+		leftover.clear();
 
-		// If olditem is returned, nothing was added.
-		// Swap the items
-		if (nothing_added && swap_if_needed) {
+		// Swap if no items could be moved
+		if (moved.empty() && swap_if_needed) {
 			// Tell that we swapped
 			if (did_swap != NULL) {
 				*did_swap = true;
 			}
 			// Take item from source list
-			item1 = changeItem(i, ItemStack());
+			moved = changeItem(i, ItemStack());
 			// Adding was not possible, swap the items.
-			ItemStack item2 = dest->changeItem(dest_i, item1);
+			ItemStack item2 = dest->changeItem(dest_i, moved);
 			// Put item from destination list to the source list
 			changeItem(i, item2);
 		}
 	}
-	return (oldcount - item1.count);
+
+	return moved;
 }
 
 void InventoryList::checkResizeLock()
diff --git a/src/inventory.h b/src/inventory.h
index c42679e78..a8c7a5ee4 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -135,6 +135,15 @@ struct ItemStack
 		return metadata.getToolCapabilities(*item_cap); // Check for override
 	}
 
+	const std::optional<WearBarParams> &getWearBarParams(
+			const IItemDefManager *itemdef) const
+	{
+		auto &meta_override = metadata.getWearBarParamOverride();
+		if (meta_override.has_value())
+			return meta_override;
+		return itemdef->get(name).wear_bar_params;
+	}
+
 	// Wear out (only tools)
 	// Returns true if the item is (was) a tool
 	bool addWear(s32 amount, const IItemDefManager *itemdef)
@@ -168,7 +177,7 @@ struct ItemStack
 
 	// Checks if another itemstack would stack with this one.
 	// Does not check if the item actually fits in the stack.
-	bool stacksWith(ItemStack other) const;
+	bool stacksWith(const ItemStack &other) const;
 
 	// Takes some items.
 	// If there are not enough, takes as many as it can.
@@ -281,8 +290,8 @@ public:
 
 	// Move an item to a different list (or a different stack in the same list)
 	// count is the maximum number of items to move (0 for everything)
-	// returns number of moved items
-	u32 moveItem(u32 i, InventoryList *dest, u32 dest_i,
+	// returns the moved stack
+	ItemStack moveItem(u32 i, InventoryList *dest, u32 dest_i,
 		u32 count = 0, bool swap_if_needed = true, bool *did_swap = NULL);
 
 	// like moveItem, but without a fixed destination index
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 78c813cc8..4862b0411 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -166,7 +166,20 @@ void IMoveAction::swapDirections()
 	std::swap(from_i, to_i);
 }
 
-void IMoveAction::onPutAndOnTake(const ItemStack &src_item, ServerActiveObject *player) const
+void IMoveAction::onTake(const ItemStack &src_item, ServerActiveObject *player) const
+{
+	ServerScripting *sa = PLAYER_TO_SA(player);
+	if (from_inv.type == InventoryLocation::DETACHED)
+		sa->detached_inventory_OnTake(*this, src_item, player);
+	else if (from_inv.type == InventoryLocation::NODEMETA)
+		sa->nodemeta_inventory_OnTake(*this, src_item, player);
+	else if (from_inv.type == InventoryLocation::PLAYER)
+		sa->player_inventory_OnTake(*this, src_item, player);
+	else
+		assert(false);
+}
+
+void IMoveAction::onPut(const ItemStack &src_item, ServerActiveObject *player) const
 {
 	ServerScripting *sa = PLAYER_TO_SA(player);
 	if (to_inv.type == InventoryLocation::DETACHED)
@@ -177,15 +190,6 @@ void IMoveAction::onPutAndOnTake(const ItemStack &src_item, ServerActiveObject *
 		sa->player_inventory_OnPut(*this, src_item, player);
 	else
 		assert(false);
-
-	if (from_inv.type == InventoryLocation::DETACHED)
-		sa->detached_inventory_OnTake(*this, src_item, player);
-	else if (from_inv.type == InventoryLocation::NODEMETA)
-		sa->nodemeta_inventory_OnTake(*this, src_item, player);
-	else if (from_inv.type == InventoryLocation::PLAYER)
-		sa->player_inventory_OnTake(*this, src_item, player);
-	else
-		assert(false);
 }
 
 void IMoveAction::onMove(int count, ServerActiveObject *player) const
@@ -248,6 +252,8 @@ int IMoveAction::allowMove(int try_take_count, ServerActiveObject *player) const
 
 void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef)
 {
+	/// Necessary for executing Lua callbacks which may manipulate the inventory,
+	/// hence invalidate pointers needed by IMoveAction::apply
 	auto get_borrow_checked_invlist = [mgr](const InventoryLocation &invloc,
 			const std::string &listname) -> InventoryList::ResizeLocked
 	{
@@ -379,6 +385,8 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 	bool allow_swap = !list_to->itemFits(to_i, src_item, &restitem)
 		&& restitem.count == src_item.count
 		&& !caused_by_move_somewhere;
+	// move_count : How many items that were moved at the end
+	// count      : Total items "in the queue" of being moved. Do not touch.
 	move_count = src_item.count - restitem.count;
 
 	// Shift-click: Cannot fill this stack, proceed with next slot
@@ -387,10 +395,11 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 	}
 
 	if (allow_swap) {
-		// Swap will affect the entire stack if it can performed.
+		// Swap will affect the entire stack (= count) if it can performed.
 		src_item = list_from->getItem(from_i);
-		count = src_item.count;
+		move_count = src_item.count;
 	}
+	src_item.count = move_count; // Temporary movement stack
 
 	if (from_inv == to_inv) {
 		// Move action within the same inventory
@@ -413,16 +422,9 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			src_can_take_count = dst_can_put_count = 0;
 	} else {
 		// Take from one inventory, put into another
-		int src_item_count = src_item.count;
-		if (caused_by_move_somewhere)
-			// When moving somewhere: temporarily use the actual movable stack
-			// size to ensure correct callback execution.
-			src_item.count = move_count;
 		dst_can_put_count = allowPut(src_item, player);
 		src_can_take_count = allowTake(src_item, player);
-		if (caused_by_move_somewhere)
-			// Reset source item count
-			src_item.count = src_item_count;
+
 		bool swap_expected = allow_swap;
 		allow_swap = allow_swap
 			&& (src_can_take_count == -1 || src_can_take_count >= src_item.count)
@@ -444,25 +446,20 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			src_can_take_count = dst_can_put_count = 0;
 	}
 
-	int old_count = count;
+	int old_move_count = move_count;
 
-	/* Modify count according to collected data */
-	count = src_item.count;
-	if (src_can_take_count != -1 && count > src_can_take_count)
-		count = src_can_take_count;
-	if (dst_can_put_count != -1 && count > dst_can_put_count)
-		count = dst_can_put_count;
+	// Apply limits given by allow_* callbacks
+	if (src_can_take_count != -1)
+		move_count = (u32)std::min<s32>(src_can_take_count, move_count);
+	if (dst_can_put_count != -1)
+		move_count = (u32)std::min<s32>(dst_can_put_count, move_count);
 
-	/* Limit according to source item count */
-	if (count > list_from->getItem(from_i).count)
-		count = list_from->getItem(from_i).count;
+	// allow_* callbacks should not modify the stack - but if they do - handle that.
+	if (move_count > list_from->getItem(from_i).count)
+		move_count = list_from->getItem(from_i).count;
 
 	/* If no items will be moved, don't go further */
-	if (count == 0) {
-		if (caused_by_move_somewhere)
-			// Set move count to zero, as no items have been moved
-			move_count = 0;
-
+	if (move_count == 0) {
 		// Undo client prediction. See 'clientApply'
 		if (from_inv.type == InventoryLocation::PLAYER)
 			list_from->setModified();
@@ -471,7 +468,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			list_to->setModified();
 
 		infostream<<"IMoveAction::apply(): move was completely disallowed:"
-				<<" count="<<old_count
+				<<" move_count="<<old_move_count
 				<<" from inv=\""<<from_inv.dump()<<"\""
 				<<" list=\""<<from_list<<"\""
 				<<" i="<<from_i
@@ -483,8 +480,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 		return;
 	}
 
-	src_item = list_from->getItem(from_i);
-	src_item.count = count;
+	// Backups stacks for infinite sources
 	ItemStack from_stack_was = list_from->getItem(from_i);
 	ItemStack to_stack_was = list_to->getItem(to_i);
 
@@ -495,13 +491,13 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 		same as source), nothing happens
 	*/
 	bool did_swap = false;
-	move_count = list_from->moveItem(from_i,
-		list_to.get(), to_i, count, allow_swap, &did_swap);
-	if (caused_by_move_somewhere)
-		count = old_count;
+	src_item = list_from->moveItem(from_i,
+		list_to.get(), to_i, move_count, allow_swap, &did_swap);
+	move_count = src_item.count;
+
 	assert(allow_swap == did_swap);
 
-	// If source is infinite, reset it's stack
+	// If source is infinite, reset its stack
 	if (src_can_take_count == -1) {
 		// For the caused_by_move_somewhere == true case we didn't force-put the item,
 		// which guarantees there is no leftover, and code below would duplicate the
@@ -521,23 +517,23 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			}
 		}
 		if (move_count > 0 || did_swap) {
-			list_from->deleteItem(from_i);
-			list_from->addItem(from_i, from_stack_was);
+			list_from->changeItem(from_i, from_stack_was);
 		}
 	}
-	// If destination is infinite, reset it's stack and take count from source
+	// If destination is infinite, reset its stack and take count from source
 	if (dst_can_put_count == -1) {
-		list_to->deleteItem(to_i);
-		list_to->addItem(to_i, to_stack_was);
-		list_from->deleteItem(from_i);
-		list_from->addItem(from_i, from_stack_was);
-		list_from->takeItem(from_i, count);
+		list_to->changeItem(to_i, to_stack_was);
+		if (did_swap) {
+			// Undo swap result: set the expected stack + size
+			list_from->changeItem(from_i, from_stack_was);
+			list_from->takeItem(from_i, move_count);
+		}
 	}
 
 	infostream << "IMoveAction::apply(): moved"
 			<< " msom=" << move_somewhere
 			<< " caused=" << caused_by_move_somewhere
-			<< " count=" << count
+			<< " move_count=" << move_count
 			<< " from inv=\"" << from_inv.dump() << "\""
 			<< " list=\"" << from_list << "\""
 			<< " i=" << from_i
@@ -593,9 +589,9 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 
 	// Source = destination => move
 	if (from_inv == to_inv) {
-		onMove(count, player);
+		onMove(move_count, player);
 		if (did_swap) {
-			// Item is now placed in source list
+			// Already swapped. The other stack is now placed in "from" list
 			list_from = get_borrow_checked_invlist(from_inv, from_list);
 			if (list_from) {
 				src_item = list_from->getItem(from_i);
@@ -607,26 +603,34 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 		}
 		mgr->setInventoryModified(from_inv);
 	} else {
-		int src_item_count = src_item.count;
-		if (caused_by_move_somewhere)
-			// When moving somewhere: temporarily use the actual movable stack
-			// size to ensure correct callback execution.
-			src_item.count = move_count;
-		onPutAndOnTake(src_item, player);
-		if (caused_by_move_somewhere)
-			// Reset source item count
-			src_item.count = src_item_count;
+		ItemStack swap_item;
 		if (did_swap) {
-			// Item is now placed in source list
+			// Already swapped. The other stack is now placed in "from" list
 			list_from = get_borrow_checked_invlist(from_inv, from_list);
 			if (list_from) {
-				src_item = list_from->getItem(from_i);
+				swap_item = list_from->getItem(from_i);
 				list_from.reset();
-				swapDirections();
-				onPutAndOnTake(src_item, player);
-				swapDirections();
 			}
 		}
+
+		// 1. Take the ItemStack (visually: freely detached)
+		onTake(src_item, player);
+		if (!swap_item.empty() && get_borrow_checked_invlist(to_inv, to_list)) {
+			swapDirections();
+			onTake(swap_item, player);
+			swapDirections();
+		}
+
+		// 2. Put the ItemStack
+		if (get_borrow_checked_invlist(to_inv, to_list))
+			onPut(src_item, player);
+
+		if (!swap_item.empty() && get_borrow_checked_invlist(to_inv, to_list)) {
+			swapDirections();
+			onPut(swap_item, player);
+			swapDirections();
+		}
+
 		mgr->setInventoryModified(to_inv);
 		mgr->setInventoryModified(from_inv);
 	}
diff --git a/src/inventorymanager.h b/src/inventorymanager.h
index 41dc0ce2a..283cba6e6 100644
--- a/src/inventorymanager.h
+++ b/src/inventorymanager.h
@@ -194,7 +194,8 @@ struct IMoveAction : public InventoryAction, public MoveAction
 
 	void swapDirections();
 
-	void onPutAndOnTake(const ItemStack &src_item, ServerActiveObject *player) const;
+	void onTake(const ItemStack &src_item, ServerActiveObject *player) const;
+	void onPut(const ItemStack &src_item, ServerActiveObject *player) const;
 
 	void onMove(int count, ServerActiveObject *player) const;
 
diff --git a/src/irr_ptr.h b/src/irr_ptr.h
index f1caf9c7d..fc4a0f558 100644
--- a/src/irr_ptr.h
+++ b/src/irr_ptr.h
@@ -144,9 +144,6 @@ public:
 	}
 };
 
-// clang-format off
-// ^ dislikes long lines
-
 /** Constructs a shared pointer as a *secondary* reference to an object
  *
  * This function is intended to make a temporary reference to an object which
@@ -205,5 +202,3 @@ irr_ptr<T> make_irr(Args&&... args)
 {
 	return irr_ptr<T>(new T(std::forward<Args>(args)...));
 }
-
-// clang-format on
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
index c429d9727..495efac93 100644
--- a/src/irrlicht_changes/CGUITTFont.cpp
+++ b/src/irrlicht_changes/CGUITTFont.cpp
@@ -32,8 +32,6 @@
 
 #include <irrlicht.h>
 #include <iostream>
-#include <codecvt>
-#include <locale>
 #include "CGUITTFont.h"
 
 namespace irr
@@ -244,37 +242,6 @@ CGUITTFont* CGUITTFont::createTTFont(IGUIEnvironment *env, const io::path& filen
 	return font;
 }
 
-CGUITTFont* CGUITTFont::createTTFont(IrrlichtDevice *device, const io::path& filename, const u32 size, const bool antialias, const bool transparency)
-{
-	if (!c_libraryLoaded)
-	{
-		if (FT_Init_FreeType(&c_library))
-			return 0;
-		c_libraryLoaded = true;
-	}
-
-	CGUITTFont* font = new CGUITTFont(device->getGUIEnvironment());
-	font->Device = device;
-	bool ret = font->load(filename, size, antialias, transparency);
-	if (!ret)
-	{
-		font->drop();
-		return 0;
-	}
-
-	return font;
-}
-
-CGUITTFont* CGUITTFont::create(IGUIEnvironment *env, const io::path& filename, const u32 size, const bool antialias, const bool transparency)
-{
-	return CGUITTFont::createTTFont(env, filename, size, antialias, transparency);
-}
-
-CGUITTFont* CGUITTFont::create(IrrlichtDevice *device, const io::path& filename, const u32 size, const bool antialias, const bool transparency)
-{
-	return CGUITTFont::createTTFont(device, filename, size, antialias, transparency);
-}
-
 //////////////////////
 
 //! Constructor.
@@ -308,6 +275,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 
 	io::IFileSystem* filesystem = Environment->getFileSystem();
 	irr::ILogger* logger = (Device != 0 ? Device->getLogger() : 0);
+	// FIXME: this is always null ^
 	this->size = size;
 	this->filename = filename;
 
@@ -318,7 +286,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 
 	// Log.
 	if (logger)
-		logger->log(L"CGUITTFont", core::stringw(core::stringw(L"Creating new font: ") + core::stringw(filename) + L" " + core::stringc(size) + L"pt " + (antialias ? L"+antialias " : L"-antialias ") + (transparency ? L"+transparency" : L"-transparency")).c_str(), irr::ELL_INFORMATION);
+		logger->log("CGUITTFont", (core::stringc(L"Creating new font: ") + filename + " " + core::stringc(size) + "pt " + (antialias ? "+antialias " : "-antialias ") + (transparency ? "+transparency" : "-transparency")).c_str(), irr::ELL_INFORMATION);
 
 	// Grab the face.
 	SGUITTFace* face = 0;
@@ -334,7 +302,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 			io::IReadFile* file = filesystem->createAndOpenFile(filename);
 			if (file == 0)
 			{
-				if (logger) logger->log(L"CGUITTFont", L"Failed to open the file.", irr::ELL_INFORMATION);
+				if (logger) logger->log("CGUITTFont", "Failed to open the file.", irr::ELL_INFORMATION);
 
 				c_faces.erase(filename);
 				delete face;
@@ -349,7 +317,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 			// Create the face.
 			if (FT_New_Memory_Face(c_library, face->face_buffer, face->face_buffer_size, 0, &face->face))
 			{
-				if (logger) logger->log(L"CGUITTFont", L"FT_New_Memory_Face failed.", irr::ELL_INFORMATION);
+				if (logger) logger->log("CGUITTFont", "FT_New_Memory_Face failed.", irr::ELL_INFORMATION);
 
 				c_faces.erase(filename);
 				delete face;
@@ -361,7 +329,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 		{
 			if (FT_New_Face(c_library, reinterpret_cast<const char*>(filename.c_str()), 0, &face->face))
 			{
-				if (logger) logger->log(L"CGUITTFont", L"FT_New_Face failed.", irr::ELL_INFORMATION);
+				if (logger) logger->log("CGUITTFont", "FT_New_Face failed.", irr::ELL_INFORMATION);
 
 				c_faces.erase(filename);
 				delete face;
@@ -1086,6 +1054,7 @@ void CGUITTFont::createSharedPlane()
 	buf->append(vertices, 4, indices, 6);
 
 	shared_plane_.addMeshBuffer( buf );
+	shared_plane_.setHardwareMappingHint(EHM_STATIC);
 
 	shared_plane_ptr_ = &shared_plane_;
 	buf->drop(); //the addMeshBuffer method will grab it, so we can drop this ptr.
@@ -1259,21 +1228,31 @@ std::u32string CGUITTFont::convertWCharToU32String(const wchar_t* const charArra
 {
 	static_assert(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4, "unexpected wchar size");
 
-	if (sizeof(wchar_t) == 4) // Systems where wchar_t is UTF-32
+	if (sizeof(wchar_t) == 4) // wchar_t is UTF-32
 		return std::u32string(reinterpret_cast<const char32_t*>(charArray));
 
-	// Systems where wchar_t is UTF-16:
-	// First, convert to UTF-8
-	std::u16string utf16String(reinterpret_cast<const char16_t*>(charArray));
-	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter1;
-	std::string utf8String = converter1.to_bytes(utf16String);
+	// wchar_t is UTF-16 and we need to convert.
+	// std::codecvt could do this for us but aside from being deprecated,
+	// it turns out that it's laughably slow on MSVC. Thanks Microsoft.
 
-	// Next, convert to UTF-32
-	std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter2;
-	return converter2.from_bytes(utf8String);
-
-	// This is inefficient, but importantly it is _correct_, rather than a hand-rolled UTF-16 to
-	// UTF-32 converter which may or may not be correct.
+	std::u32string ret;
+	ret.reserve(wcslen(charArray));
+	const wchar_t *p = charArray;
+	while (*p) {
+		char32_t c = *p;
+		if (c >= 0xD800 && c < 0xDC00) {
+			p++;
+			char32_t c2 = *p;
+			if (!c2)
+				break;
+			else if (c2 < 0xDC00 || c2 > 0xDFFF)
+				continue; // can't find low surrogate, skip
+			c = 0x10000 + ( ((c & 0x3ff) << 10) | (c2 & 0x3ff) );
+		}
+		ret.push_back(c);
+		p++;
+	}
+	return ret;
 }
 
 
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
index 6fa45678a..b67d518ae 100644
--- a/src/irrlicht_changes/CGUITTFont.h
+++ b/src/irrlicht_changes/CGUITTFont.h
@@ -229,9 +229,6 @@ namespace gui
 			//! \param transparency set the use_transparency flag
 			//! \return Returns a pointer to a CGUITTFont.  Will return 0 if the font failed to load.
 			static CGUITTFont* createTTFont(IGUIEnvironment *env, const io::path& filename, const u32 size, const bool antialias = true, const bool transparency = true, const u32 shadow = 0, const u32 shadow_alpha = 255);
-			static CGUITTFont* createTTFont(IrrlichtDevice *device, const io::path& filename, const u32 size, const bool antialias = true, const bool transparency = true);
-			static CGUITTFont* create(IGUIEnvironment *env, const io::path& filename, const u32 size, const bool antialias = true, const bool transparency = true);
-			static CGUITTFont* create(IrrlichtDevice *device, const io::path& filename, const u32 size, const bool antialias = true, const bool transparency = true);
 
 			//! Destructor
 			virtual ~CGUITTFont();
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp
index 61f4da5e1..eba397963 100644
--- a/src/irrlicht_changes/static_text.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -94,7 +94,6 @@ void StaticText::draw()
 				getTextWidth();
 		}
 
-		irr::video::SColor previous_color(255, 255, 255, 255);
 		for (const EnrichedString &str : BrokenText) {
 			if (HAlign == EGUIA_LOWERRIGHT)
 			{
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 80e69df42..f37a0cfc1 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -28,43 +28,28 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <cstdint>
 
-#include <irrTypes.h>
+#include "irrTypes.h"
 #include "config.h"
 
 using namespace irr;
 
 #define IRRLICHT_VERSION_10000 IRRLICHT_VERSION_MAJOR*10000 + IRRLICHT_VERSION_MINOR * 100 + IRRLICHT_VERSION_REVISION
+#define S8_MIN  INT8_MIN
+#define S16_MIN INT16_MIN
+#define S32_MIN INT32_MIN
+#define S64_MIN INT64_MIN
 
-namespace irr {
+#define S8_MAX  INT8_MAX
+#define S16_MAX INT16_MAX
+#define S32_MAX INT32_MAX
+#define S64_MAX INT64_MAX
 
-// Define missing constant for vector math with 16-bit numbers
-namespace core {
-	template <typename T>
-	inline T roundingError();
+#define U8_MAX  UINT8_MAX
+#define U16_MAX UINT16_MAX
+#define U32_MAX UINT32_MAX
+#define U64_MAX UINT64_MAX
 
-	template <>
-	inline s16 roundingError()
-	{
-		return 0;
-	}
-}
 
-}
-
-#define S8_MIN  (-0x7F - 1)
-#define S16_MIN (-0x7FFF - 1)
-#define S32_MIN (-0x7FFFFFFF - 1)
-#define S64_MIN (-0x7FFFFFFFFFFFFFFF - 1)
-
-#define S8_MAX  0x7F
-#define S16_MAX 0x7FFF
-#define S32_MAX 0x7FFFFFFF
-#define S64_MAX 0x7FFFFFFFFFFFFFFF
-
-#define U8_MAX  0xFF
-#define U16_MAX 0xFFFF
-#define U32_MAX 0xFFFFFFFF
-#define U64_MAX 0xFFFFFFFFFFFFFFFF
 
 #if USE_POS32
 
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index de8e3c163..87b366b02 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -29,7 +29,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "client/mapblock_mesh.h"
 #include "client/mesh.h"
 #include "client/wieldmesh.h"
-#include "client/tile.h"
 #include "client/client.h"
 #endif
 #include "log.h"
@@ -37,9 +36,73 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/serialize.h"
 #include "util/container.h"
 #include "util/thread.h"
+#include "util/pointedthing.h"
 #include <map>
 #include <set>
 
+TouchInteraction::TouchInteraction()
+{
+	pointed_nothing = TouchInteractionMode_USER;
+	pointed_node    = TouchInteractionMode_USER;
+	pointed_object  = TouchInteractionMode_USER;
+}
+
+TouchInteractionMode TouchInteraction::getMode(PointedThingType pointed_type) const
+{
+	TouchInteractionMode result;
+	switch (pointed_type) {
+	case POINTEDTHING_NOTHING:
+		result = pointed_nothing;
+		break;
+	case POINTEDTHING_NODE:
+		result = pointed_node;
+		break;
+	case POINTEDTHING_OBJECT:
+		result = pointed_object;
+		break;
+	default:
+		FATAL_ERROR("Invalid PointedThingType given to TouchInteraction::getMode");
+	}
+
+	if (result == TouchInteractionMode_USER) {
+		if (pointed_type == POINTEDTHING_OBJECT)
+			result = g_settings->get("touch_punch_gesture") == "long_tap" ?
+					LONG_DIG_SHORT_PLACE : SHORT_DIG_LONG_PLACE;
+		else
+			result = LONG_DIG_SHORT_PLACE;
+	}
+
+	return result;
+}
+
+void TouchInteraction::serialize(std::ostream &os) const
+{
+	writeU8(os, pointed_nothing);
+	writeU8(os, pointed_node);
+	writeU8(os, pointed_object);
+}
+
+void TouchInteraction::deSerialize(std::istream &is)
+{
+	u8 tmp = readU8(is);
+	if (is.eof())
+		throw SerializationError("");
+	if (tmp < TouchInteractionMode_END)
+		pointed_nothing = (TouchInteractionMode)tmp;
+
+	tmp = readU8(is);
+	if (is.eof())
+		throw SerializationError("");
+	if (tmp < TouchInteractionMode_END)
+		pointed_node = (TouchInteractionMode)tmp;
+
+	tmp = readU8(is);
+	if (is.eof())
+		throw SerializationError("");
+	if (tmp < TouchInteractionMode_END)
+		pointed_object = (TouchInteractionMode)tmp;
+}
+
 /*
 	ItemDefinition
 */
@@ -73,11 +136,14 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
 	stack_max = def.stack_max;
 	usable = def.usable;
 	liquids_pointable = def.liquids_pointable;
+	pointabilities = def.pointabilities;
 	if (def.tool_capabilities)
 		tool_capabilities = new ToolCapabilities(*def.tool_capabilities);
+	wear_bar_params = def.wear_bar_params;
 	groups = def.groups;
 	node_placement_prediction = def.node_placement_prediction;
 	place_param2 = def.place_param2;
+	wallmounted_rotate_vertical = def.wallmounted_rotate_vertical;
 	sound_place = def.sound_place;
 	sound_place_failed = def.sound_place_failed;
 	sound_use = def.sound_use;
@@ -85,6 +151,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
 	range = def.range;
 	palette_image = def.palette_image;
 	color = def.color;
+	touch_interaction = def.touch_interaction;
 	return *this;
 }
 
@@ -97,6 +164,7 @@ void ItemDefinition::resetInitial()
 {
 	// Initialize pointers to NULL so reset() does not delete undefined pointers
 	tool_capabilities = NULL;
+	wear_bar_params = std::nullopt;
 	reset();
 }
 
@@ -116,8 +184,10 @@ void ItemDefinition::reset()
 	stack_max = 99;
 	usable = false;
 	liquids_pointable = false;
+	pointabilities = std::nullopt;
 	delete tool_capabilities;
 	tool_capabilities = NULL;
+	wear_bar_params.reset();
 	groups.clear();
 	sound_place = SoundSpec();
 	sound_place_failed = SoundSpec();
@@ -126,6 +196,8 @@ void ItemDefinition::reset()
 	range = -1;
 	node_placement_prediction.clear();
 	place_param2.reset();
+	wallmounted_rotate_vertical = false;
+	touch_interaction = TouchInteraction();
 }
 
 void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
@@ -185,6 +257,24 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
 	os << (u8)place_param2.has_value(); // protocol_version >= 43
 	if (place_param2)
 		os << *place_param2;
+
+	writeU8(os, wallmounted_rotate_vertical);
+	touch_interaction.serialize(os);
+
+	std::string pointabilities_s;
+	if (pointabilities) {
+		std::ostringstream tmp_os(std::ios::binary);
+		pointabilities->serialize(tmp_os);
+		pointabilities_s = tmp_os.str();
+	}
+	os << serializeString16(pointabilities_s);
+
+	if (wear_bar_params.has_value()) {
+		writeU8(os, 1);
+		wear_bar_params->serialize(os);
+	} else {
+		writeU8(os, 0);
+	}
 }
 
 void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version)
@@ -197,7 +287,11 @@ void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version)
 	if (version < 6)
 		throw SerializationError("unsupported ItemDefinition version");
 
-	type = (enum ItemType)readU8(is);
+	type = static_cast<ItemType>(readU8(is));
+	if (type >= ItemType_END) {
+		type = ITEM_NONE;
+	}
+
 	name = deSerializeString16(is);
 	description = deSerializeString16(is);
 	inventory_image = deSerializeString16(is);
@@ -253,6 +347,20 @@ void ItemDefinition::deSerialize(std::istream &is, u16 protocol_version)
 
 		if (readU8(is)) // protocol_version >= 43
 			place_param2 = readU8(is);
+
+		wallmounted_rotate_vertical = readU8(is); // 0 if missing
+		touch_interaction.deSerialize(is);
+
+		std::string pointabilities_s = deSerializeString16(is);
+		if (!pointabilities_s.empty()) {
+			std::istringstream tmp_is(pointabilities_s, std::ios::binary);
+			pointabilities = std::make_optional<Pointabilities>();
+			pointabilities->deSerialize(tmp_is);
+		}
+
+		if (readU8(is)) {
+			wear_bar_params = WearBarParams::deserialize(is);
+		}
 	} catch(SerializationError &e) {};
 }
 
@@ -426,7 +534,6 @@ public:
 		// Create new ClientCached
 		auto cc = std::make_unique<ClientCached>();
 
-		// Create an inventory texture
 		cc->inventory_texture = NULL;
 		if (!inventory_image.empty())
 			cc->inventory_texture = tsrc->getTexture(inventory_image);
diff --git a/src/itemdef.h b/src/itemdef.h
index 85f70e37b..8b149cdb6 100644
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -35,11 +35,15 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "msgpack_fix.h"
 
 #include "texture_override.h" // TextureOverride
+#include "tool.h"
+#include "util/pointabilities.h"
+#include "util/pointedthing.h"
+
 class IGameDef;
 class Client;
 struct ToolCapabilities;
 #ifndef SERVER
-#include "client/tile.h"
+#include "client/texturesource.h"
 struct ItemMesh;
 struct ItemStack;
 #endif
@@ -48,12 +52,35 @@ struct ItemStack;
 	Base item definition
 */
 
-enum ItemType
+enum ItemType : u8
 {
 	ITEM_NONE,
 	ITEM_NODE,
 	ITEM_CRAFT,
 	ITEM_TOOL,
+	ItemType_END // Dummy for validity check
+};
+
+enum TouchInteractionMode : u8
+{
+	LONG_DIG_SHORT_PLACE,
+	SHORT_DIG_LONG_PLACE,
+	TouchInteractionMode_USER, // Meaning depends on client-side settings
+	TouchInteractionMode_END, // Dummy for validity check
+};
+
+struct TouchInteraction
+{
+	TouchInteractionMode pointed_nothing;
+	TouchInteractionMode pointed_node;
+	TouchInteractionMode pointed_object;
+
+	TouchInteraction();
+	// Returns the right mode for the pointed thing and resolves any occurrence
+	// of TouchInteractionMode_USER into an actual mode.
+	TouchInteractionMode getMode(PointedThingType pointed_type) const;
+	void serialize(std::ostream &os) const;
+	void deSerialize(std::istream &is);
 };
 
 enum {
@@ -101,8 +128,13 @@ struct ItemDefinition
 	u16 stack_max;
 	bool usable;
 	bool liquids_pointable;
-	// May be NULL. If non-NULL, deleted by destructor
+	std::optional<Pointabilities> pointabilities;
+
+	// They may be NULL. If non-NULL, deleted by destructor
 	ToolCapabilities *tool_capabilities;
+
+	std::optional<WearBarParams> wear_bar_params;
+
 	ItemGroupList groups;
 	SoundSpec sound_place;
 	SoundSpec sound_place_failed;
@@ -114,6 +146,9 @@ struct ItemDefinition
 	// "" = no prediction
 	std::string node_placement_prediction;
 	std::optional<u8> place_param2;
+	bool wallmounted_rotate_vertical;
+
+	TouchInteraction touch_interaction;
 
 	/*
 		Some helpful methods
diff --git a/src/itemstackmetadata.cpp b/src/itemstackmetadata.cpp
index c8ce2449f..be1715e1a 100644
--- a/src/itemstackmetadata.cpp
+++ b/src/itemstackmetadata.cpp
@@ -21,7 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "itemstackmetadata.h"
 #include "util/serialize.h"
 #include "util/strfnd.h"
+
 #include <algorithm>
+#include <optional>
 
 #define DESERIALIZE_START '\x01'
 #define DESERIALIZE_KV_DELIM '\x02'
@@ -31,11 +33,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DESERIALIZE_PAIR_DELIM_STR "\x03"
 
 #define TOOLCAP_KEY "tool_capabilities"
+#define WEAR_BAR_KEY "wear_color"
 
 void ItemStackMetadata::clear()
 {
 	SimpleMetadata::clear();
 	updateToolCapabilities();
+	updateWearBarParams();
 }
 
 static void sanitize_string(std::string &str)
@@ -45,16 +49,18 @@ static void sanitize_string(std::string &str)
 	str.erase(std::remove(str.begin(), str.end(), DESERIALIZE_PAIR_DELIM), str.end());
 }
 
-bool ItemStackMetadata::setString(const std::string &name, const std::string &var)
+bool ItemStackMetadata::setString(const std::string &name, std::string_view var)
 {
 	std::string clean_name = name;
-	std::string clean_var = var;
+	std::string clean_var(var);
 	sanitize_string(clean_name);
 	sanitize_string(clean_var);
 
 	bool result = SimpleMetadata::setString(clean_name, clean_var);
 	if (clean_name == TOOLCAP_KEY)
 		updateToolCapabilities();
+	else if (clean_name == WEAR_BAR_KEY)
+		updateWearBarParams();
 	return result;
 }
 
@@ -91,6 +97,7 @@ void ItemStackMetadata::deSerialize(std::istream &is)
 		}
 	}
 	updateToolCapabilities();
+	updateWearBarParams();
 }
 
 void ItemStackMetadata::updateToolCapabilities()
@@ -116,3 +123,25 @@ void ItemStackMetadata::clearToolCapabilities()
 {
 	setString(TOOLCAP_KEY, "");
 }
+
+void ItemStackMetadata::updateWearBarParams()
+{
+	if (contains(WEAR_BAR_KEY)) {
+		std::istringstream is(getString(WEAR_BAR_KEY));
+		wear_bar_override = WearBarParams::deserializeJson(is);
+	} else {
+		wear_bar_override.reset();
+	}
+}
+
+void ItemStackMetadata::setWearBarParams(const WearBarParams &params)
+{
+	std::ostringstream os;
+	params.serializeJson(os);
+	setString(WEAR_BAR_KEY, os.str());
+}
+
+void ItemStackMetadata::clearWearBarParams()
+{
+	setString(WEAR_BAR_KEY, "");
+}
diff --git a/src/itemstackmetadata.h b/src/itemstackmetadata.h
index 48a029c51..db450dc4a 100644
--- a/src/itemstackmetadata.h
+++ b/src/itemstackmetadata.h
@@ -22,17 +22,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "metadata.h"
 #include "tool.h"
 
+#include <optional>
+
 class Inventory;
 class IItemDefManager;
 
 class ItemStackMetadata : public SimpleMetadata
 {
 public:
-	ItemStackMetadata() : toolcaps_overridden(false) {}
+	ItemStackMetadata():
+			toolcaps_overridden(false)
+	{}
 
 	// Overrides
 	void clear() override;
-	bool setString(const std::string &name, const std::string &var) override;
+	bool setString(const std::string &name, std::string_view var) override;
 
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
@@ -46,9 +50,20 @@ public:
 	void setToolCapabilities(const ToolCapabilities &caps);
 	void clearToolCapabilities();
 
+	const std::optional<WearBarParams> &getWearBarParamOverride() const
+	{
+		return wear_bar_override;
+	}
+
+
+	void setWearBarParams(const WearBarParams &params);
+	void clearWearBarParams();
+
 private:
 	void updateToolCapabilities();
+	void updateWearBarParams();
 
 	bool toolcaps_overridden;
 	ToolCapabilities toolcaps_override;
+	std::optional<WearBarParams> wear_bar_override;
 };
diff --git a/src/lighting.h b/src/lighting.h
index 0535383a6..262a48b5d 100644
--- a/src/lighting.h
+++ b/src/lighting.h
@@ -53,4 +53,5 @@ struct Lighting
 	AutoExposure exposure;
 	float shadow_intensity {0.0f};
 	float saturation {1.0f};
+	float volumetric_light_strength {0.0f};
 };
diff --git a/src/log.cpp b/src/log.cpp
index d8e46bf79..edd6462a0 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -30,11 +30,20 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #include "exceptions.h"
 #include "util/numeric.h"
+#include "log.h"
+#include "filesys.h"
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
+
+#if !defined(_WIN32)
+#include <unistd.h> // isatty
+#endif
 
 #include <sstream>
 #include <iostream>
 #include <algorithm>
-#include <cerrno>
 #include <cstring>
 #include <mutex>
 
@@ -103,21 +112,19 @@ thread_local LogStream dout_con(trace_target);
 
 static unsigned int g_level_to_android[] = {
 	ANDROID_LOG_INFO,     // LL_NONE
-	//ANDROID_LOG_FATAL,
 	ANDROID_LOG_ERROR,    // LL_ERROR
 	ANDROID_LOG_WARN,     // LL_WARNING
-	ANDROID_LOG_WARN,     // LL_ACTION
-	//ANDROID_LOG_INFO,
+	ANDROID_LOG_INFO,     // LL_ACTION
 	ANDROID_LOG_DEBUG,    // LL_INFO
 	ANDROID_LOG_VERBOSE,  // LL_VERBOSE
 	ANDROID_LOG_VERBOSE,  // LL_TRACE
 };
 
-void AndroidLogOutput::logRaw(LogLevel lev, const std::string &line) {
+void AndroidLogOutput::logRaw(LogLevel lev, const std::string &line)
+{
 	static_assert(ARRLEN(g_level_to_android) == LL_MAX,
 		"mismatch between android and internal loglevels");
-	__android_log_print(g_level_to_android[lev],
-		PROJECT_NAME_C, "%s", line.c_str());
+	__android_log_write(g_level_to_android[lev], PROJECT_NAME_C, line.c_str());
 }
 #endif
 
@@ -155,9 +162,7 @@ void Logger::addOutput(ILogOutput *out)
 
 void Logger::addOutput(ILogOutput *out, LogLevel lev)
 {
-	MutexAutoLock lock(m_mutex);
-	m_outputs[lev].push_back(out);
-	m_has_outputs[lev] = true;
+	addOutputMasked(out, LOGLEVEL_TO_MASKLEVEL(lev));
 }
 
 void Logger::addOutputMasked(ILogOutput *out, LogLevelMask mask)
@@ -186,9 +191,7 @@ LogLevelMask Logger::removeOutput(ILogOutput *out)
 	MutexAutoLock lock(m_mutex);
 	LogLevelMask ret_mask = 0;
 	for (size_t i = 0; i < LL_MAX; i++) {
-		std::vector<ILogOutput *>::iterator it;
-
-		it = std::find(m_outputs[i].begin(), m_outputs[i].end(), out);
+		auto it = std::find(m_outputs[i].begin(), m_outputs[i].end(), out);
 		if (it != m_outputs[i].end()) {
 			ret_mask |= LOGLEVEL_TO_MASKLEVEL(i);
 			m_outputs[i].erase(it);
@@ -217,9 +220,9 @@ void Logger::deregisterThread()
 	m_thread_names.erase(id);
 }
 
-const std::string Logger::getLevelLabel(LogLevel lev)
+const char *Logger::getLevelLabel(LogLevel lev)
 {
-	static const std::string names[] = {
+	static const char *names[] = {
 		"",
 		"ERROR",
 		"WARNING",
@@ -228,48 +231,54 @@ const std::string Logger::getLevelLabel(LogLevel lev)
 		"VERBOSE",
 		"TRACE",
 	};
-	assert(lev < LL_MAX && lev >= 0);
 	static_assert(ARRLEN(names) == LL_MAX,
 		"mismatch between loglevel names and enum");
+	assert(lev < LL_MAX && lev >= 0);
 	return names[lev];
 }
 
 LogColor Logger::color_mode = LOG_COLOR_AUTO;
 
-const std::string Logger::getThreadName()
+const std::string &Logger::getThreadName()
 {
-	std::map<std::thread::id, std::string>::const_iterator it;
-
 	std::thread::id id = std::this_thread::get_id();
 	{
 	MutexAutoLock lock(m_mutex);
-	it = m_thread_names.find(id);
+
+	auto it = m_thread_names.find(id);
 	if (it != m_thread_names.end())
 		return it->second;
+
 	}
 
-	std::ostringstream os;
-	os << "#0x" << std::hex << id;
-	return os.str();
+	thread_local std::string fallback_name;
+	if (fallback_name.empty()) {
+		std::ostringstream os;
+		os << "#0x" << std::hex << id;
+		fallback_name = os.str();
+	}
+	return fallback_name;
 }
 
 void Logger::log(LogLevel lev, const std::string &text)
 {
-	if (m_silenced_levels[lev])
+	if (isLevelSilenced(lev))
 		return;
 
-	const std::string thread_name = getThreadName();
-	const std::string label = getLevelLabel(lev);
+	const std::string &thread_name = getThreadName();
+	const char *label = getLevelLabel(lev);
 	const std::string timestamp = getTimestamp();
-	std::ostringstream os(std::ios_base::binary);
-	os << timestamp << ": " << label << "[" << thread_name << "]: " << text;
 
-	logToOutputs(lev, os.str(), timestamp, thread_name, text);
+	std::string line = timestamp;
+	line.append(": ").append(label).append("[").append(thread_name)
+		.append("]: ").append(text);
+
+	logToOutputs(lev, line, timestamp, thread_name, text);
 }
 
 void Logger::logRaw(LogLevel lev, const std::string &text)
 {
-	if (m_silenced_levels[lev])
+	if (isLevelSilenced(lev))
 		return;
 
 	logToOutputsRaw(lev, text);
@@ -301,28 +310,38 @@ void FileLogOutput::setFile(const std::string &filename, s64 file_size_max)
 	bool is_too_large = false;
 	if (file_size_max > 0) {
 		std::ifstream ifile(filename, std::ios::binary | std::ios::ate);
-		is_too_large = ifile.tellg() > file_size_max;
-		ifile.close();
+		if (ifile.good())
+			is_too_large = ifile.tellg() > file_size_max;
 	}
-
 	if (is_too_large) {
 		std::string filename_secondary = filename + ".1";
 		actionstream << "The log file grew too big; it is moved to " <<
 			filename_secondary << std::endl;
-		remove(filename_secondary.c_str());
-		rename(filename.c_str(), filename_secondary.c_str());
+		fs::DeleteSingleFileOrEmptyDirectory(filename_secondary);
+		fs::Rename(filename, filename_secondary);
 	}
-	m_stream.open(filename, std::ios::app | std::ios::ate);
 
-	if (!m_stream.good())
-		throw FileNotGoodException("Failed to open log file " +
-			filename + ": " + strerror(errno));
+	// Intentionally not using open_ofstream() to keep the text mode
+	if (!fs::OpenStream(*m_stream.rdbuf(), filename.c_str(), std::ios::out | std::ios::app, true, false))
+		throw FileNotGoodException("Failed to open log file");
+
 	m_stream << "\n\n"
-		"-------------" << std::endl <<
-		"  Separator" << std::endl <<
+		"-------------\n" <<
+		"  Separator\n" <<
 		"-------------\n" << std::endl;
 }
 
+StreamLogOutput::StreamLogOutput(std::ostream &stream) :
+	m_stream(stream)
+{
+#if !defined(_WIN32)
+	if (&stream == &std::cout)
+		is_tty = isatty(STDOUT_FILENO);
+	else if (&stream == &std::cerr)
+		is_tty = isatty(STDERR_FILENO);
+#endif
+}
+
 void StreamLogOutput::logRaw(LogLevel lev, const std::string &line)
 {
 	bool colored_message = (Logger::color_mode == LOG_COLOR_ALWAYS) ||
diff --git a/src/log.h b/src/log.h
index a3625a1c0..9028eb94c 100644
--- a/src/log.h
+++ b/src/log.h
@@ -33,9 +33,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "threading/mutex_auto_lock.h"
 #include <thread>
 #include <mutex>
-#if !defined(_WIN32)  // POSIX
-	#include <unistd.h>
-#endif
 #include "threading/mutex_auto_lock.h"
 #include "util/basic_macros.h"
 #include "util/stream.h"
@@ -82,12 +79,16 @@ public:
 	void logRaw(LogLevel lev, const std::string &text);
 
 	static LogLevel stringToLevel(const std::string &name);
-	static const std::string getLevelLabel(LogLevel lev);
+	static const char *getLevelLabel(LogLevel lev);
 
 	bool hasOutput(LogLevel level) {
 		return m_has_outputs[level].load(std::memory_order_relaxed);
 	}
 
+	bool isLevelSilenced(LogLevel level) {
+		return m_silenced_levels[level].load(std::memory_order_relaxed);
+	}
+
 	static LogColor color_mode;
 
 private:
@@ -96,15 +97,11 @@ private:
 		const std::string &time, const std::string &thread_name,
 		const std::string &payload_text);
 
-	const std::string getThreadName();
+	const std::string &getThreadName();
 
 	std::vector<ILogOutput *> m_outputs[LL_MAX];
 	std::atomic<bool> m_has_outputs[LL_MAX];
-
-	// Should implement atomic loads and stores (even though it's only
-	// written to when one thread has access currently).
-	// Works on all known architectures (x86, ARM, MIPS).
-	volatile bool m_silenced_levels[LL_MAX];
+	std::atomic<bool> m_silenced_levels[LL_MAX];
 	std::map<std::thread::id, std::string> m_thread_names;
 protected:
 	mutable std::mutex m_mutex;
@@ -130,16 +127,7 @@ public:
 
 class StreamLogOutput : public ICombinedLogOutput {
 public:
-	StreamLogOutput(std::ostream &stream) :
-		m_stream(stream)
-	{
-#if !defined(_WIN32)
-		if (&stream == &std::cout)
-			is_tty = isatty(STDOUT_FILENO);
-		else if (&stream == &std::cerr)
-			is_tty = isatty(STDERR_FILENO);
-#endif
-	}
+	StreamLogOutput(std::ostream &stream);
 
 	void logRaw(LogLevel lev, const std::string &line);
 
diff --git a/src/main.cpp b/src/main.cpp
index 5736f2407..28615432e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,19 +21,19 @@ You should have received a copy of the GNU General Public License
 along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "irrlichttypes.h" // must be included before anything irrlicht, see comment in the file
+#include "irrlichttypes_bloated.h"
 #include "irrlicht.h" // createDevice
-#include "irrlichttypes_extrabloated.h"
 #include "irrlicht_changes/printing.h"
 #include "benchmark/benchmark.h"
 #include "chat_interface.h"
 #include "debug.h"
+#include "profiler.h"
 #include "unittest/test.h"
 #include "server.h"
 #include "filesys.h"
 #include "version.h"
-#include "client/game.h"
 #include "defaultsettings.h"
+#include "migratesettings.h"
 #include "gettext.h"
 #include "log.h"
 #include "util/quicktune.h"
@@ -55,17 +55,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "gui/mainmenumanager.h"
 #endif
 
-#include <netinet/in.h>
-#include "profiler.h"
-#include "util/timetaker.h"
 #if USE_ENET
 // todo: move to connection
 #include "enet/enet.h"
 #endif
 
-#ifdef HAVE_TOUCHSCREENGUI
-	#include "gui/touchscreengui.h"
-#endif
 
 // for version information only
 extern "C" {
@@ -80,12 +74,14 @@ extern "C" {
 #error Minetest cannot be built without exceptions or RTTI
 #endif
 
-#if defined(__MINGW32__) && !defined(__MINGW64__) && !defined(__clang__) && \
-	(__GNUC__ < 11 || (__GNUC__ == 11 && __GNUC_MINOR__ < 1))
-// see e.g. https://github.com/minetest/minetest/issues/10137
-#warning ==================================
-#warning 32-bit MinGW gcc before 11.1 has known issues with crashes on thread exit, you should upgrade.
-#warning ==================================
+#if defined(__MINGW32__) && !defined(__clang__)
+// see https://github.com/minetest/minetest/issues/14140 or
+// https://github.com/minetest/minetest/issues/10137 for one of the various issues we had
+#error ==================================
+#error MinGW gcc has a broken TLS implementation and is not supported for building \
+	Minetest. Look at testTLS() in test_threading.cpp and see for yourself. \
+	Please use a clang-based compiler or alternatively MSVC.
+#error ==================================
 #endif
 
 #define DEBUGFILE "debug.txt"
@@ -108,7 +104,7 @@ static void set_allowed_options(OptionList *allowed_options);
 
 static void print_help(const OptionList &allowed_options);
 static void print_allowed_options(const OptionList &allowed_options);
-static void print_version();
+static void print_version(std::ostream &os);
 static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
 	std::ostream &os, bool print_name = true, bool print_path = true);
 static void print_modified_quicktune_values();
@@ -165,6 +161,8 @@ int main(int argc, char *argv[])
 	g_logger.registerThread("Main");
 	g_logger.addOutputMaxLevel(&stderr_output, LL_ACTION);
 
+	porting::osSpecificInit();
+
 	Settings cmd_args;
 	get_env_opts(cmd_args);
 	bool cmd_args_ok = get_cmdline_opts(argc, argv, &cmd_args);
@@ -180,10 +178,13 @@ int main(int argc, char *argv[])
 
 	if (cmd_args.getFlag("version")) {
 		porting::attachOrCreateConsole();
-		print_version();
+		print_version(std::cout);
 		return 0;
 	}
 
+	// Debug handler
+	BEGIN_DEBUG_EXCEPTION_HANDLER
+
 	if (!setup_log_params(cmd_args))
 		return 1;
 
@@ -193,22 +194,13 @@ int main(int argc, char *argv[])
 	}
 
 	porting::signal_handler_init();
-
-#ifdef __ANDROID__
-	porting::initAndroid();
-	porting::initializePathsAndroid();
-#else
 	porting::initializePaths();
-#endif
 
 	if (!create_userdata_path()) {
 		errorstream << "Cannot create user data directory "<< porting::path_user << std::endl;
 		//return 1;
 	}
 
-	// Debug handler
-	BEGIN_DEBUG_EXCEPTION_HANDLER
-
 	// List gameids if requested
 	if (cmd_args.exists("gameid") && cmd_args.get("gameid") == "list") {
 		list_game_ids();
@@ -255,9 +247,9 @@ int main(int argc, char *argv[])
 	if (g_settings->getBool("enable_console"))
 		porting::attachOrCreateConsole();
 
-#if !defined(__ANDROID__) && !defined(_MSC_VER)
 	// Run unit tests
 	if (cmd_args.getFlag("run-unittests")) {
+		porting::attachOrCreateConsole();
 #if BUILD_UNITTESTS
 		if (cmd_args.exists("test-module"))
 			return run_tests(cmd_args.get("test-module")) ? 0 : 1;
@@ -273,8 +265,12 @@ int main(int argc, char *argv[])
 
 	// Run benchmarks
 	if (cmd_args.getFlag("run-benchmarks")) {
+		porting::attachOrCreateConsole();
 #if BUILD_BENCHMARKS
-		return run_benchmarks();
+		if (cmd_args.exists("test-module"))
+			return run_benchmarks(cmd_args.get("test-module").c_str()) ? 0 : 1;
+		else
+			return run_benchmarks() ? 0 : 1;
 #else
 		errorstream << "Benchmark support is not enabled in this binary. "
 			<< "If you want to enable it, compile project with BUILD_BENCHMARKS=1 flag."
@@ -282,7 +278,6 @@ int main(int argc, char *argv[])
 		return 1;
 #endif
 	}
-#endif // __ANDROID__
 
 	GameStartData game_params;
 #ifdef SERVER
@@ -380,7 +375,7 @@ static void set_allowed_options(OptionList *allowed_options)
 	allowed_options->insert(std::make_pair("run-benchmarks", ValueSpec(VALUETYPE_FLAG,
 			_("Run the benchmarks and exit"))));
 	allowed_options->insert(std::make_pair("test-module", ValueSpec(VALUETYPE_STRING,
-			_("Only run the specified test module"))));
+			_("Only run the specified test module or benchmark"))));
 	allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
 			_("Same as --world (deprecated)"))));
 	allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
@@ -424,8 +419,6 @@ static void set_allowed_options(OptionList *allowed_options)
 	allowed_options->insert(std::make_pair("recompress", ValueSpec(VALUETYPE_FLAG,
 			_("Recompress the blocks of the given map database."))));
 #ifndef SERVER
-	allowed_options->insert(std::make_pair("speedtests", ValueSpec(VALUETYPE_FLAG,
-			_("Run speed tests"))));
 	allowed_options->insert(std::make_pair("address", ValueSpec(VALUETYPE_STRING,
 			_("Address to connect to. ('' = local game)"))));
 	allowed_options->insert(std::make_pair("random-input", ValueSpec(VALUETYPE_FLAG,
@@ -471,19 +464,28 @@ static void print_allowed_options(const OptionList &allowed_options)
 	}
 }
 
-static void print_version()
+static void print_version(std::ostream &os)
 {
-	std::cout << PROJECT_NAME_C " " << g_version_hash
+	os << PROJECT_NAME_C " " << g_version_hash
 		<< " (" << porting::getPlatformName() << ")" << std::endl;
-#ifndef SERVER
-	std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
-#endif
 #if USE_LUAJIT
-	std::cout << "Using " << LUAJIT_VERSION << std::endl;
-#else
-	std::cout << "Using " << LUA_RELEASE << std::endl;
+	os << "Using " << LUAJIT_VERSION
+#ifdef OPENRESTY_LUAJIT
+	<< " (OpenResty)"
 #endif
-	std::cout << g_build_info << std::endl;
+	<< std::endl;
+#else
+	os << "Using " << LUA_RELEASE << std::endl;
+#endif
+#if defined(__clang__)
+	os << "Built by Clang " << __clang_major__ << "." << __clang_minor__ << std::endl;
+#elif defined(__GNUC__)
+	os << "Built by GCC " << __GNUC__ << "." << __GNUC_MINOR__ << std::endl;
+#elif defined(_MSC_VER)
+	os << "Built by MSVC " << (_MSC_VER / 100) << "." << (_MSC_VER % 100) << std::endl;
+#endif
+	os << "Running on " << porting::get_sysinfo() << std::endl;
+	os << g_build_info << std::endl;
 }
 
 static void list_game_ids()
@@ -683,6 +685,7 @@ static bool use_debugger(int argc, char *argv[])
 			continue;
 		new_args.push_back(argv[i]);
 	}
+	new_args.push_back("--console");
 	new_args.push_back(nullptr);
 
 #ifdef _WIN32
@@ -733,6 +736,8 @@ static bool init_common(const Settings &cmd_args, int argc, char *argv[])
 	if (!read_config_file(cmd_args))
 		return false;
 
+	migrate_settings();
+
 	init_log_streams(cmd_args);
 
 	int autoexit_ = 0;
@@ -740,8 +745,12 @@ static bool init_common(const Settings &cmd_args, int argc, char *argv[])
 	g_profiler_enabled = g_settings->getFloat("profiler_print_interval") || autoexit_;
 
 	// Initialize random seed
-	srand(time(0));
-	mysrand(time(0));
+	{
+		u32 seed = static_cast<u32>(time(nullptr)) << 16;
+		seed |= porting::getTimeUs() & 0xffff;
+		srand(seed);
+		mysrand(seed);
+	}
 
 	// Initialize HTTP fetcher
 	httpfetch_init(g_settings->getS32("curl_parallel_limit"));
@@ -771,10 +780,11 @@ static void uninit_common()
 
 static void startup_message()
 {
-	infostream << PROJECT_NAME_C << " " << g_version_hash
-		<< "\nwith SER_FMT_VER_HIGHEST_READ="
-		<< (int)SER_FMT_VER_HIGHEST_READ << ", "
-		<< g_build_info << std::endl;
+	print_version(infostream);
+	infostream << "SER_FMT_VER_HIGHEST_READ=" <<
+		TOSTRING(SER_FMT_VER_HIGHEST_READ) <<
+		" LATEST_PROTOCOL_VERSION=" << TOSTRING(LATEST_PROTOCOL_VERSION)
+		<< std::endl;
 }
 
 static bool read_config_file(const Settings &cmd_args)
@@ -1369,7 +1379,7 @@ static bool recompress_map_database(const GameParams &game_params, const Setting
 		iss.clear();
 
 		{
-			MapBlock mb(nullptr, v3s16(0,0,0), &server);
+			MapBlock mb(v3s16(0,0,0), &server);
 			u8 ver = readU8(iss);
 			mb.deSerialize(iss, ver, true);
 
diff --git a/src/map.cpp b/src/map.cpp
index 59b69d168..b34c707ee 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -27,43 +27,18 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef SERVER
 	#include "client/mapblock_mesh.h"
 #endif
-#include "filesys.h"
 #include "voxel.h"
 #include "voxelalgorithms.h"
 #include "porting.h"
-#include "serialization.h"
 #include "nodemetadata.h"
-#include "settings.h"
-#include "log_types.h"
+#include "log.h"
 #include "profiler.h"
 #include "nodedef.h"
 #include "gamedef.h"
 #include "util/directiontables.h"
 #include "rollback_interface.h"
 #include "environment.h"
-#include "reflowscan.h"
-#include "emerge.h"
-#include "mapgen/mapgen_v6.h"
-#include "mapgen/mg_biome.h"
-#include "config.h"
-#include "server.h"
-#include "database/database.h"
-#include "database/database-dummy.h"
-#include "database/database-sqlite3.h"
-#include "script/scripting_server.h"
 #include "irrlicht_changes/printing.h"
-#include <deque>
-#include <queue>
-#if USE_LEVELDB
-#include "database/database-leveldb.h"
-#endif
-#if USE_REDIS
-#include "database/database-redis.h"
-#endif
-#if USE_POSTGRESQL
-#include "database/database-postgresql.h"
-#endif
-
 
 /*
 	Map
@@ -190,11 +165,11 @@ MapNode Map::getNode(v3s16 p, bool *is_valid_position)
 	return node;
 }
 
-static void set_node_in_block(MapBlock *block, v3pos_t relpos, MapNode n, bool important = false)
+static void set_node_in_block(const NodeDefManager *nodedef, MapBlock *block,
+		v3pos_t relpos, MapNode n, bool important = false)
 {
 	// Never allow placing CONTENT_IGNORE, it causes problems
 	if(n.getContent() == CONTENT_IGNORE){
-		const NodeDefManager *nodedef = block->getParent()->getNodeDefManager();
 		v3s16 blockpos = block->getPos();
 		v3s16 p = blockpos * MAP_BLOCKSIZE + relpos;
 		errorstream<<"Not allowing to place CONTENT_IGNORE"
@@ -207,12 +182,12 @@ static void set_node_in_block(MapBlock *block, v3pos_t relpos, MapNode n, bool i
 }
 
 // throws InvalidPositionException if not found
-void Map::setNode(v3pos_t p, MapNode n, bool important)
+void Map::setNode(const v3pos_t &p, const MapNode &n, bool important)
 {
 	v3s16 blockpos = getNodeBlockPos(p);
 	MapBlock *block = getBlockNoCreate(blockpos);
 	v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
-	set_node_in_block(block, relpos, n, important);
+	set_node_in_block(m_gamedef->ndef(), block, relpos, n, important);
 }
 
 void Map::addNodeAndUpdate(v3s16 p, MapNode n,
@@ -269,25 +244,25 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 		// No light update needed, just copy over the old light.
 		n.setLight(LIGHTBANK_DAY, oldnode.getLightRaw(LIGHTBANK_DAY, oldf), f);
 		n.setLight(LIGHTBANK_NIGHT, oldnode.getLightRaw(LIGHTBANK_NIGHT, oldf), f);
-		set_node_in_block(block, relpos, n, important);
+		set_node_in_block(m_gamedef->ndef(), block, relpos, n, important);
 
 		modified_blocks[blockpos] = block;
 	} else {
 		// Ignore light (because calling voxalgo::update_lighting_nodes)
 		n.setLight(LIGHTBANK_DAY, 0, f);
 		n.setLight(LIGHTBANK_NIGHT, 0, f);
-		set_node_in_block(block, relpos, n, important);
+		set_node_in_block(m_gamedef->ndef(), block, relpos, n, important);
 
 		// Update lighting
 		std::vector<std::pair<v3s16, MapNode> > oldnodes;
 		oldnodes.emplace_back(p, oldnode);
 		voxalgo::update_lighting_nodes(this, oldnodes, modified_blocks);
-
-		for (auto &modified_block : modified_blocks) {
-			modified_block.second->expireDayNightDiff();
-		}
 	}
 
+	if (n.getContent() != oldnode.getContent() &&
+			(oldnode.getContent() == CONTENT_AIR || n.getContent() == CONTENT_AIR))
+		block->expireIsAirCache();
+
 	// Report for rollback
 	if(m_gamedef->rollback())
 	{
@@ -350,11 +325,11 @@ bool Map::removeNodeWithEvent(v3pos_t p, bool important)
 }
 
 struct TimeOrderedMapBlock {
-	MapSector *sect;
+	//MapSector *sect;
 	MapBlock *block;
 
-	TimeOrderedMapBlock(MapSector *sect, MapBlock *block) :
-		sect(sect),
+	TimeOrderedMapBlock(/*MapSector *sect,*/ MapBlock *block) :
+		//sect(sect),
 		block(block)
 	{}
 
@@ -537,467 +512,6 @@ void Map::PrintInfo(std::ostream &out)
 	out<<"Map: ";
 }
 
-#define WATER_DROP_BOOST 4
-
-const static v3s16 liquid_6dirs[6] = {
-	// order: upper before same level before lower
-	v3s16( 0, 1, 0),
-	v3s16( 0, 0, 1),
-	v3s16( 1, 0, 0),
-	v3s16( 0, 0,-1),
-	v3s16(-1, 0, 0),
-	v3s16( 0,-1, 0)
-};
-
-enum NeighborType : u8 {
-	NEIGHBOR_UPPER,
-	NEIGHBOR_SAME_LEVEL,
-	NEIGHBOR_LOWER
-};
-
-struct NodeNeighbor {
-	MapNode n;
-	NeighborType t;
-	v3s16 p;
-
-	NodeNeighbor()
-		: n(CONTENT_AIR), t(NEIGHBOR_SAME_LEVEL)
-	{ }
-
-	NodeNeighbor(const MapNode &node, NeighborType n_type, const v3s16 &pos)
-		: n(node),
-		  t(n_type),
-		  p(pos)
-	{ }
-};
-
-/*
-void ServerMap::transforming_liquid_add(v3s16 p) {
-		m_transforming_liquid.push_back(p);
-}
-*/
-
-size_t ServerMap::transformLiquids(std::map<v3bpos_t, MapBlock*> &modified_blocks,
-		ServerEnvironment *env
-		, Server *m_server, unsigned int max_cycle_ms
-		)
-{
-	g_profiler->avg("Server: liquids queue", transforming_liquid_size());
-
-	if (g_settings->getBool("liquid_real"))
-		return ServerMap::transformLiquidsReal(m_server, max_cycle_ms);
-
-	const auto end_ms = porting::getTimeMs() + max_cycle_ms;
-
-	u32 loopcount = 0;
-	const auto initial_size = transforming_liquid_size();
-
-	/*if(initial_size != 0)
-		infostream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
-
-	// list of nodes that due to viscosity have not reached their max level height
-	std::vector<v3s16> must_reflow;
-
-/*
-	std::vector<std::pair<v3s16, MapNode> > changed_nodes;
-*/
-
-	std::vector<v3s16> check_for_falling;
-
-	u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
-	u32 loop_max = liquid_loop_max;
-
-	while (transforming_liquid_size() != 0)
-	{
-		// This should be done here so that it is done when continue is used
-		if (loopcount >= initial_size || loopcount >= loop_max || porting::getTimeMs() > end_ms)
-			break;
-		loopcount++;
-
-		/*
-			Get a queued transforming liquid node
-		*/
-		v3pos_t p0 = transforming_liquid_pop();
-
-		MapNode n0 = getNode(p0);
-
-		/*
-			Collect information about current node
-		 */
-		s8 liquid_level = -1;
-		// The liquid node which will be placed there if
-		// the liquid flows into this node.
-		content_t liquid_kind = CONTENT_IGNORE;
-		// The node which will be placed there if liquid
-		// can't flow into this node.
-		content_t floodable_node = CONTENT_AIR;
-		const ContentFeatures &cf = m_nodedef->get(n0);
-		LiquidType liquid_type = cf.liquid_type;
-		switch (liquid_type) {
-			case LIQUID_SOURCE:
-				liquid_level = LIQUID_LEVEL_SOURCE;
-				liquid_kind = cf.liquid_alternative_flowing_id;
-				break;
-			case LIQUID_FLOWING:
-				liquid_level = (n0.param2 & LIQUID_LEVEL_MASK);
-				liquid_kind = n0.getContent();
-				break;
-			case LIQUID_NONE:
-				// if this node is 'floodable', it *could* be transformed
-				// into a liquid, otherwise, continue with the next node.
-				if (!cf.floodable)
-					continue;
-				floodable_node = n0.getContent();
-				liquid_kind = CONTENT_AIR;
-				break;
-		}
-
-		/*
-			Collect information about the environment
-		 */
-		NodeNeighbor sources[6]; // surrounding sources
-		int num_sources = 0;
-		NodeNeighbor flows[6]; // surrounding flowing liquid nodes
-		int num_flows = 0;
-		NodeNeighbor airs[6]; // surrounding air
-		int num_airs = 0;
-		NodeNeighbor neutrals[6]; // nodes that are solid or another kind of liquid
-		int num_neutrals = 0;
-		bool flowing_down = false;
-		bool ignored_sources = false;
-		bool floating_node_above = false;
-		for (u16 i = 0; i < 6; i++) {
-			NeighborType nt = NEIGHBOR_SAME_LEVEL;
-			switch (i) {
-				case 0:
-					nt = NEIGHBOR_UPPER;
-					break;
-				case 5:
-					nt = NEIGHBOR_LOWER;
-					break;
-				default:
-					break;
-			}
-			v3s16 npos = p0 + liquid_6dirs[i];
-			NodeNeighbor nb(getNode(npos), nt, npos);
-			const ContentFeatures &cfnb = m_nodedef->get(nb.n);
-			if (nt == NEIGHBOR_UPPER && cfnb.floats)
-				floating_node_above = true;
-			switch (cfnb.liquid_type) {
-				case LIQUID_NONE:
-					if (cfnb.floodable) {
-						airs[num_airs++] = nb;
-						// if the current node is a water source the neighbor
-						// should be enqueded for transformation regardless of whether the
-						// current node changes or not.
-						if (nb.t != NEIGHBOR_UPPER && liquid_type != LIQUID_NONE)
-							transforming_liquid_add(npos);
-						// if the current node happens to be a flowing node, it will start to flow down here.
-						if (nb.t == NEIGHBOR_LOWER)
-							flowing_down = true;
-					} else {
-						neutrals[num_neutrals++] = nb;
-						if (nb.n.getContent() == CONTENT_IGNORE) {
-							// If node below is ignore prevent water from
-							// spreading outwards and otherwise prevent from
-							// flowing away as ignore node might be the source
-							if (nb.t == NEIGHBOR_LOWER)
-								flowing_down = true;
-							else
-								ignored_sources = true;
-						}
-					}
-					break;
-				case LIQUID_SOURCE:
-					// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
-					if (liquid_kind == CONTENT_AIR)
-						liquid_kind = cfnb.liquid_alternative_flowing_id;
-					if (cfnb.liquid_alternative_flowing_id != liquid_kind) {
-						neutrals[num_neutrals++] = nb;
-					} else {
-						// Do not count bottom source, it will screw things up
-						if(nt != NEIGHBOR_LOWER)
-							sources[num_sources++] = nb;
-					}
-					break;
-				case LIQUID_FLOWING:
-					if (nb.t != NEIGHBOR_SAME_LEVEL ||
-						(nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK) {
-						// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
-						// but exclude falling liquids on the same level, they cannot flow here anyway
-						if (liquid_kind == CONTENT_AIR)
-							liquid_kind = cfnb.liquid_alternative_flowing_id;
-					}
-					if (cfnb.liquid_alternative_flowing_id != liquid_kind) {
-						neutrals[num_neutrals++] = nb;
-					} else {
-						flows[num_flows++] = nb;
-						if (nb.t == NEIGHBOR_LOWER)
-							flowing_down = true;
-					}
-					break;
-			}
-		}
-
-		u16 level_max = m_nodedef->get(liquid_kind).getMaxLevel(); // source level
-		if (level_max <= 1)
-			continue;
-
-		/*
-			decide on the type (and possibly level) of the current node
-		 */
-		content_t new_node_content;
-		s8 new_node_level = -1;
-		s8 max_node_level = -1;
-
-		u8 range = m_nodedef->get(liquid_kind).liquid_range;
-		if (range > LIQUID_LEVEL_MAX + 1)
-			range = LIQUID_LEVEL_MAX + 1;
-
-		if ((num_sources >= 2 && m_nodedef->get(liquid_kind).liquid_renewable) || liquid_type == LIQUID_SOURCE) {
-			// liquid_kind will be set to either the flowing alternative of the node (if it's a liquid)
-			// or the flowing alternative of the first of the surrounding sources (if it's air), so
-			// it's perfectly safe to use liquid_kind here to determine the new node content.
-			new_node_content = m_nodedef->get(liquid_kind).liquid_alternative_source_id;
-		} else if (num_sources >= 1 && sources[0].t != NEIGHBOR_LOWER) {
-			// liquid_kind is set properly, see above
-			max_node_level = new_node_level = LIQUID_LEVEL_MAX;
-			if (new_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
-				new_node_content = liquid_kind;
-			else
-				new_node_content = floodable_node;
-		} else if (ignored_sources && liquid_level >= 0) {
-			// Maybe there are neighboring sources that aren't loaded yet
-			// so prevent flowing away.
-			new_node_level = liquid_level;
-			new_node_content = liquid_kind;
-		} else {
-			// no surrounding sources, so get the maximum level that can flow into this node
-			for (u16 i = 0; i < num_flows; i++) {
-				u8 nb_liquid_level = (flows[i].n.param2 & LIQUID_LEVEL_MASK);
-				switch (flows[i].t) {
-					case NEIGHBOR_UPPER:
-						if (nb_liquid_level + WATER_DROP_BOOST > max_node_level) {
-							max_node_level = LIQUID_LEVEL_MAX;
-							if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX)
-								max_node_level = nb_liquid_level + WATER_DROP_BOOST;
-						} else if (nb_liquid_level > max_node_level) {
-							max_node_level = nb_liquid_level;
-						}
-						break;
-					case NEIGHBOR_LOWER:
-						break;
-					case NEIGHBOR_SAME_LEVEL:
-						if ((flows[i].n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK &&
-								nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level)
-							max_node_level = nb_liquid_level - 1;
-						break;
-				}
-			}
-
-			u8 viscosity = m_nodedef->get(liquid_kind).liquid_viscosity;
-			if (viscosity > 1 && max_node_level != liquid_level) {
-				// amount to gain, limited by viscosity
-				// must be at least 1 in absolute value
-				s8 level_inc = max_node_level - liquid_level;
-				if (level_inc < -viscosity || level_inc > viscosity)
-					new_node_level = liquid_level + level_inc/viscosity;
-				else if (level_inc < 0)
-					new_node_level = liquid_level - 1;
-				else if (level_inc > 0)
-					new_node_level = liquid_level + 1;
-				if (new_node_level != max_node_level)
-					must_reflow.push_back(p0);
-			} else {
-				new_node_level = max_node_level;
-			}
-
-			if (max_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
-				new_node_content = liquid_kind;
-			else
-				new_node_content = floodable_node;
-
-		}
-
-		if (!new_node_level && m_nodedef->get(n0.getContent()).liquid_type == LIQUID_FLOWING)
-			new_node_content = CONTENT_AIR;
-
-		//if (liquid_level == new_node_level || new_node_level < 0)
-		//	continue;
-
-		/*
-			check if anything has changed. if not, just continue with the next node.
-		 */
-		if (new_node_content == n0.getContent() &&
-				(m_nodedef->get(n0.getContent()).liquid_type != LIQUID_FLOWING ||
-				((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level &&
-				((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK)
-				== flowing_down)))
-			continue;
-
-		//errorstream << " was="<<(int)liquid_level<<" new="<< (int)new_node_level<< " ncon="<< (int)new_node_content << " flodo="<<(int)flowing_down<< " lmax="<<level_max<< " nameNE="<<nodemgr->get(new_node_content).name<<" nums="<<(int)num_sources<<" wasname="<<nodemgr->get(n0).name<<std::endl;
-
-		/*
-			check if there is a floating node above that needs to be updated.
-		 */
-		if (floating_node_above && new_node_content == CONTENT_AIR)
-			check_for_falling.push_back(p0);
-
-		/*
-			update the current node
-		 */
-		MapNode n00 = n0;
-		//bool flow_down_enabled = (flowing_down && ((n0.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK));
-		if (m_nodedef->get(new_node_content).liquid_type == LIQUID_FLOWING) {
-			// set level to last 3 bits, flowing down bit to 4th bit
-			n0.param2 = (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK);
-		} else {
-			// set the liquid level and flow bits to 0
-			n0.param2 &= ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK);
-		}
-
-		// change the node.
-		n0.setContent(new_node_content);
-
-		// on_flood() the node
-		if (floodable_node != CONTENT_AIR) {
-			if (env->getScriptIface()->node_on_flood(p0, n00, n0))
-				continue;
-		}
-
-		// Ignore light (because calling voxalgo::update_lighting_nodes)
-		ContentLightingFlags f0 = m_nodedef->getLightingFlags(n0);
-		n0.setLight(LIGHTBANK_DAY, 0, f0);
-		n0.setLight(LIGHTBANK_NIGHT, 0, f0);
-
-		// Find out whether there is a suspect for this action
-		std::string suspect;
-		if (m_gamedef->rollback())
-			suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1);
-
-		if (m_gamedef->rollback() && !suspect.empty()) {
-			// Blame suspect
-			RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true);
-			// Get old node for rollback
-			RollbackNode rollback_oldnode(this, p0, m_gamedef);
-			// Set node
-			setNode(p0, n0);
-			// Report
-			RollbackNode rollback_newnode(this, p0, m_gamedef);
-			RollbackAction action;
-			action.setSetNode(p0, rollback_oldnode, rollback_newnode);
-			m_gamedef->rollback()->reportAction(action);
-		} else {
-			// Set node
-			try {
-				setNode(p0, n0);
-			}
-			catch(InvalidPositionException &e) {
-				infostream<<"transformLiquids: setNode() failed:"<<p0<<":"<<e.what()<<std::endl;
-			}
-		}
-
-/*
-		v3s16 blockpos = getNodeBlockPos(p0);
-		MapBlock *block = getBlockNoCreateNoEx(blockpos);
-		if (block != NULL) {
-			modified_blocks[blockpos] =  block;
-			changed_nodes.emplace_back(p0, n00);
-		}
-*/
-
-		/*
-			enqueue neighbors for update if necessary
-		 */
-		switch (m_nodedef->get(n0.getContent()).liquid_type) {
-			case LIQUID_SOURCE:
-			case LIQUID_FLOWING:
-				// make sure source flows into all neighboring nodes
-				for (u16 i = 0; i < num_flows; i++)
-					if (flows[i].t != NEIGHBOR_UPPER)
-						transforming_liquid_add(flows[i].p);
-				for (u16 i = 0; i < num_airs; i++)
-					if (airs[i].t != NEIGHBOR_UPPER)
-						transforming_liquid_add(airs[i].p);
-				break;
-			case LIQUID_NONE:
-				// this flow has turned to air; neighboring flows might need to do the same
-				for (u16 i = 0; i < num_flows; i++)
-					transforming_liquid_add(flows[i].p);
-				break;
-		}
-	}
-
-	u32 ret = loopcount >= initial_size ? 0 : transforming_liquid_size();
-
-	//infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<" per="<<timer.getTimerTime()<<" ret="<<ret<<std::endl;
-
-	for (const auto &iter : must_reflow)
-		transforming_liquid_add(iter);
-
-/*
-	voxalgo::update_lighting_nodes(this, changed_nodes, modified_blocks);
-
-	for (const v3s16 &p : check_for_falling) {
-		env->getScriptIface()->check_for_falling(p);
-	}
-
-	env->getScriptIface()->on_liquid_transformed(changed_nodes);
-*/
-
-	/* ----------------------------------------------------------------------
-	 * Manage the queue so that it does not grow indefinitely
-	 */
-	u16 time_until_purge = g_settings->getU16("liquid_queue_purge_time");
-
-	if (time_until_purge == 0)
-		return ret; // Feature disabled
-
-	time_until_purge *= 1000;	// seconds -> milliseconds
-
-	u64 curr_time = porting::getTimeMs();
-	u32 prev_unprocessed = m_unprocessed_count;
-	m_unprocessed_count = transforming_liquid_size();
-
-	// if unprocessed block count is decreasing or stable
-	if (m_unprocessed_count <= prev_unprocessed) {
-		m_queue_size_timer_started = false;
-	} else {
-		if (!m_queue_size_timer_started)
-			m_inc_trending_up_start_time = curr_time;
-		m_queue_size_timer_started = true;
-	}
-
-	// Account for curr_time overflowing
-	if (m_queue_size_timer_started && m_inc_trending_up_start_time > curr_time)
-		m_queue_size_timer_started = false;
-
-	/* If the queue has been growing for more than liquid_queue_purge_time seconds
-	 * and the number of unprocessed blocks is still > liquid_loop_max then we
-	 * cannot keep up; dump the oldest blocks from the queue so that the queue
-	 * has liquid_loop_max items in it
-	 */
-	if (m_queue_size_timer_started
-			&& curr_time - m_inc_trending_up_start_time > time_until_purge
-			&& m_unprocessed_count > liquid_loop_max) {
-
-		size_t dump_qty = m_unprocessed_count - liquid_loop_max;
-
-		infostream << "transformLiquids(): DUMPING " << dump_qty
-		           << " blocks from the queue" << std::endl;
-
-		while (dump_qty--)
-			transforming_liquid_pop();
-
-		m_queue_size_timer_started = false; // optimistically assume we can keep up now
-		m_unprocessed_count = transforming_liquid_size();
-	}
-
-	g_profiler->add("Server: liquids processed", loopcount);
-
-	return ret;
-}
-
 std::vector<v3s16> Map::findNodesWithMetadata(v3s16 p1, v3s16 p2)
 {
 	std::vector<v3s16> positions_with_meta;
@@ -1145,7 +659,7 @@ void Map::removeNodeTimer(v3s16 p)
 	block->removeNodeTimer(p_rel);
 }
 
-bool Map::determineAdditionalOcclusionCheck(const v3s16 &pos_camera,
+bool Map::determineAdditionalOcclusionCheck(const v3s16 pos_camera,
 	const core::aabbox3d<s16> &block_bounds, v3s16 &check)
 {
 	/*
@@ -1209,7 +723,7 @@ bool Map::determineAdditionalOcclusionCheck(const v3s16 &pos_camera,
 	return false;
 }
 
-bool Map::isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target,
+bool Map::isOccluded(const v3s16 pos_camera, const v3s16 pos_target,
 	float step, float stepfac, float offset, float end_offset, u32 needed_count)
 {
 	v3f direction = intToFloat(pos_target - pos_camera, BS);
@@ -1241,7 +755,7 @@ bool Map::isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target,
 	return false;
 }
 
-bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
+bool Map::isBlockOccluded(v3s16 pos_relative, v3s16 cam_pos_nodes, bool simple_check)
 {
 	// Check occlusion for center and all 8 corners of the mapblock
 	// Overshoot a little for less flickering
@@ -1258,7 +772,7 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
 		v3s16(-1, -1, -1) * bs2,
 	};
 
-	v3s16 pos_blockcenter = block->getPosRelative() + (MAP_BLOCKSIZE / 2);
+	v3s16 pos_blockcenter = pos_relative + (MAP_BLOCKSIZE / 2);
 
 	// Starting step size, value between 1m and sqrt(3)m
 	float step = BS * 1.2f;
@@ -1279,9 +793,18 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
 	// this is a HACK, we should think of a more precise algorithm
 	u32 needed_count = 2;
 
+	// This should be only used in server occlusion cullung.
+	// The client recalculates the complete drawlist periodically,
+	// and random sampling could lead to visible flicker.
+	if (simple_check) {
+		v3s16 random_point(myrand_range(-bs2, bs2), myrand_range(-bs2, bs2), myrand_range(-bs2, bs2));
+		return isOccluded(cam_pos_nodes, pos_blockcenter + random_point, step, stepfac,
+					start_offset, end_offset, 1);
+	}
+
 	// Additional occlusion check, see comments in that function
 	v3s16 check;
-	if (determineAdditionalOcclusionCheck(cam_pos_nodes, block->getBox(), check)) {
+	if (determineAdditionalOcclusionCheck(cam_pos_nodes, MapBlock::getBox(pos_relative), check)) {
 		// node is always on a side facing the camera, end_offset can be lower
 		if (!isOccluded(cam_pos_nodes, check, step, stepfac, start_offset,
 				-1.0f, needed_count))
@@ -1296,989 +819,6 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
 	return true;
 }
 
-/*
-	ServerMap
-*/
-ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
-		EmergeManager *emerge, MetricsBackend *mb):
-	Map(gamedef),
-	settings_mgr(savedir + DIR_DELIM + "map_meta"),
-	m_emerge(emerge)
-{
-	verbosestream<<FUNCTION_NAME<<std::endl;
-
-	// Tell the EmergeManager about our MapSettingsManager
-	emerge->map_settings_mgr = &settings_mgr;
-
-	/*
-		Try to load map; if not found, create a new one.
-	*/
-
-	// Determine which database backend to use
-	std::string conf_path = savedir + DIR_DELIM + "world.mt";
-	Settings conf;
-	bool succeeded = conf.readConfigFile(conf_path.c_str());
-	if (!succeeded || !conf.exists("backend")) {
-		// fall back to sqlite3
-		#if USE_LEVELDB
-		conf.set("backend", "leveldb");
-		#elif USE_SQLITE3
-		conf.set("backend", "sqlite3");
-		#elif USE_REDIS
-		conf.set("backend", "redis");
-		#endif
-	}
-	std::string backend = conf.get("backend");
-	dbase = createDatabase(backend, savedir, conf);
-
-	if (conf.exists("readonly_backend")) {
-		std::string readonly_dir = savedir + DIR_DELIM + "readonly";
-		dbase_ro = createDatabase(conf.get("readonly_backend"), readonly_dir, conf);
-	}
-	if (!conf.updateConfigFile(conf_path.c_str()))
-		errorstream << "ServerMap::ServerMap(): Failed to update world.mt!" << std::endl;
-
-	m_savedir = savedir;
-	m_map_saving_enabled = false;
-	m_map_loading_enabled = true;
-
-	m_save_time_counter = mb->addCounter(
-		"minetest_map_save_time", "Time spent saving blocks (in microseconds)");
-	m_save_count_counter = mb->addCounter(
-		"minetest_map_saved_blocks", "Number of blocks saved");
-	m_loaded_blocks_gauge = mb->addGauge(
-		"minetest_map_loaded_blocks", "Number of loaded blocks");
-
-	m_map_compression_level = rangelim(g_settings->getS16("map_compression_level_disk"), -1, 9);
-
-	try {
-		// If directory exists, check contents and load if possible
-		if (fs::PathExists(m_savedir)) {
-			// If directory is empty, it is safe to save into it.
-			if (fs::GetDirListing(m_savedir).empty()) {
-				infostream<<"ServerMap: Empty save directory is valid."
-						<<std::endl;
-				m_map_saving_enabled = true;
-			}
-			else
-			{
-
-				if (settings_mgr.loadMapMeta()) {
-					infostream << "ServerMap: Metadata loaded from "
-						<< savedir << std::endl;
-				} else {
-					infostream << "ServerMap: Metadata could not be loaded "
-						"from " << savedir << ", assuming valid save "
-						"directory." << std::endl;
-				}
-
-				m_map_saving_enabled = true;
-				// Map loaded, not creating new one
-				return;
-			}
-		}
-		// If directory doesn't exist, it is safe to save to it
-		else{
-			m_map_saving_enabled = true;
-		}
-	}
-	catch(std::exception &e)
-	{
-		warningstream<<"ServerMap: Failed to load map from "<<savedir
-				<<", exception: "<<e.what()<<std::endl;
-		infostream<<"Please remove the map or fix it."<<std::endl;
-		warningstream<<"Map saving will be disabled."<<std::endl;
-	}
-}
-
-ServerMap::~ServerMap()
-{
-	verbosestream<<FUNCTION_NAME<<std::endl;
-
-	try
-	{
-/*
-		if (m_map_saving_enabled) {
-			// Save only changed parts
-*/			
-			save(MOD_STATE_WRITE_AT_UNLOAD);
-/*
-			infostream << "ServerMap: Saved map to " << m_savedir << std::endl;
-		} else {
-			infostream << "ServerMap: Map not saved" << std::endl;
-		}
-*/
-	}
-	catch(std::exception &e)
-	{
-		infostream<<"ServerMap: Failed to save map to "<<m_savedir
-				<<", exception: "<<e.what()<<std::endl;
-	}
-
-	/*
-		Close database if it was opened
-	*/
-	delete dbase;
-	delete dbase_ro;
-
-	deleteDetachedBlocks();
-}
-
-MapgenParams *ServerMap::getMapgenParams()
-{
-	// getMapgenParams() should only ever be called after Server is initialized
-	assert(settings_mgr.mapgen_params != NULL);
-	return settings_mgr.mapgen_params;
-}
-
-u64 ServerMap::getSeed()
-{
-	return getMapgenParams()->seed;
-}
-
-bool ServerMap::blockpos_over_mapgen_limit(v3s16 p)
-{
-	const s16 mapgen_limit_bp = rangelim(
-		getMapgenParams()->mapgen_limit, 0, MAX_MAP_GENERATION_LIMIT) /
-		MAP_BLOCKSIZE;
-	return p.X < -mapgen_limit_bp ||
-		p.X >  mapgen_limit_bp ||
-		p.Y < -mapgen_limit_bp ||
-		p.Y >  mapgen_limit_bp ||
-		p.Z < -mapgen_limit_bp ||
-		p.Z >  mapgen_limit_bp;
-}
-
-bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
-{
-	s16 csize = getMapgenParams()->chunksize;
-	v3s16 bpmin = EmergeManager::getContainingChunk(blockpos, csize);
-	v3s16 bpmax = bpmin + v3s16(1, 1, 1) * (csize - 1);
-
-	if (!m_chunks_in_progress.insert(bpmin).second)
-		return false;
-
-	bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
-	EMERGE_DBG_OUT("initBlockMake(): " << bpmin << " - " << bpmax);
-
-	{
-		auto lock = m_mapgen_process.lock_unique_rec();
-		auto gen = m_mapgen_process.get(bpmin);
-		auto now = porting::getTimeMs();
-		if (gen > now - 60000 ) {
-			//verbosestream << " already generating" << blockpos_min << " for " << blockpos << " gentime=" << now - gen << std::endl;
-			return false;
-		}
-		m_mapgen_process.insert_or_assign(bpmin, now);
-	}
-
-	v3s16 extra_borders(1, 1, 1);
-	v3s16 full_bpmin = bpmin - extra_borders;
-	v3s16 full_bpmax = bpmax + extra_borders;
-
-	// Do nothing if not inside mapgen limits (+-1 because of neighbors)
-	if (blockpos_over_mapgen_limit(full_bpmin) ||
-			blockpos_over_mapgen_limit(full_bpmax))
-		return false;
-
-	data->seed = getSeed();
-	data->blockpos_min = bpmin;
-	data->blockpos_max = bpmax;
-	data->nodedef = m_nodedef;
-
-	/*
-		Create the whole area of this and the neighboring blocks
-	*/
-	{
-		//TimeTaker timer("initBlockMake() create area");
-
-	for (s16 x = full_bpmin.X; x <= full_bpmax.X; x++)
-	for (s16 z = full_bpmin.Z; z <= full_bpmax.Z; z++) {
-/*
-		v2s16 sectorpos(x, z);
-		// Sector metadata is loaded from disk if not already loaded.
-		MapSector *sector = createSector(sectorpos);
-		FATAL_ERROR_IF(sector == NULL, "createSector() failed");
-*/
-		for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
-			v3s16 p(x, y, z);
-
-			MapBlock *block = emergeBlock(p, false);
-			if (block == NULL) {
-				block = createBlock(p);
-
-				// Block gets sunlight if this is true.
-				// Refer to the map generator heuristics.
-				bool ug = m_emerge->isBlockUnderground(p);
-				block->setIsUnderground(ug);
-			}
-		}
-	}
-	}
-
-	/*
-		Now we have a big empty area.
-
-		Make a ManualMapVoxelManipulator that contains this and the
-		neighboring blocks
-	*/
-
-	data->vmanip = new MMVManip(this);
-	data->vmanip->initialEmerge(full_bpmin, full_bpmax);
-
-	// Data is ready now.
-	return true;
-}
-
-void ServerMap::finishBlockMake(BlockMakeData *data,
-	std::map<v3s16, MapBlock*> *changed_blocks)
-{
-	v3s16 bpmin = data->blockpos_min;
-	v3s16 bpmax = data->blockpos_max;
-
-	bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
-	EMERGE_DBG_OUT("finishBlockMake(): " << bpmin << " - " << bpmax);
-
-	static const thread_local auto save_generated_block = g_settings->getBool("save_generated_block");
-
-	/*
-		Blit generated stuff to map
-		NOTE: blitBackAll adds nearly everything to changed_blocks
-	*/
-	{
-		MAP_NOTHREAD_LOCK(this);
-		// 70ms @cs=8
-		//TimeTaker timer("finishBlockMake() blitBackAll");
-	data->vmanip->blitBackAll(changed_blocks, false, save_generated_block);
-	}
-
-	EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()="
-		<< changed_blocks->size());
-
-	/*
-		Copy transforming liquid information
-	*/
-
-
-	while (data->transforming_liquid.size()) {
-		transforming_liquid_add(data->transforming_liquid.front());
-		data->transforming_liquid.pop_front();
-	}
-
-	for (auto &changed_block : *changed_blocks) {
-		MapBlock *block = changed_block.second;
-		if (!block)
-			continue;
-		/*
-			Update day/night difference cache of the MapBlocks
-		*/
-		block->expireDayNightDiff();
-		/*
-			Set block as modified
-		*/
-
-		if (save_generated_block)
-		block->raiseModified(MOD_STATE_WRITE_NEEDED,
-			MOD_REASON_EXPIRE_DAYNIGHTDIFF);
-		else
-			block->setLightingComplete(0);
-	}
-
-	/*
-		Set central blocks as generated
-		Update weather data in blocks
-	*/
-	ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
-	for (s16 x = bpmin.X; x <= bpmax.X; x++)
-	for (s16 z = bpmin.Z; z <= bpmax.Z; z++)
-	for (s16 y = bpmin.Y; y <= bpmax.Y; y++) {
-		v3pos_t p(x, y, z);
-		MapBlock *block = getBlockNoCreateNoEx(p, false,true);
-		if (!block)
-			continue;
-
-		block->setGenerated(true);
-		updateBlockHeat(senv, p * MAP_BLOCKSIZE, block);
-		updateBlockHumidity(senv, p * MAP_BLOCKSIZE, block);
-	}
-
-	/*
-		Save changed parts of map
-		NOTE: Will be saved later.
-	*/
-	//save(MOD_STATE_WRITE_AT_UNLOAD);
-	m_chunks_in_progress.erase(bpmin);
-
-    //fmtodo merge with m_chunks_in_progress
-	m_mapgen_process.erase(bpmin);
-}
-
-#if WTF
-MapSector *ServerMap::createSector(v2s16 p2d)
-{
-	/*
-		Check if it exists already in memory
-	*/
-	MapSector *sector = getSectorNoGenerate(p2d);
-	if (sector)
-		return sector;
-
-	/*
-		Do not create over max mapgen limit
-	*/
-	if (blockpos_over_max_limit(v3s16(p2d.X, 0, p2d.Y)))
-		throw InvalidPositionException("createSector(): pos. over max mapgen limit");
-
-	MapBlock *block = this->getBlockNoCreateNoEx(p, false, true);
-	if(block)
-	{
-		if(block->isDummy())
-			block->unDummify();
-		return block;
-	}
-	// Create blank
-	block = this->createBlankBlock(p);
-
-	sector = new MapSector(this, p2d, m_gamedef);
-
-	/*
-		Insert to container
-	*/
-	m_sectors[p2d] = sector;
-
-	return sector;
-}
-
-MapBlock * ServerMap::createBlock(v3s16 p)
-{
-	/*
-		Do not create over max mapgen limit
-	*/
-	if (blockpos_over_max_limit(p))
-		throw InvalidPositionException("createBlock(): pos. over max mapgen limit");
-
-	v2s16 p2d(p.X, p.Z);
-	s16 block_y = p.Y;
-	/*
-		This will create or load a sector if not found in memory.
-		If block exists on disk, it will be loaded.
-
-		NOTE: On old save formats, this will be slow, as it generates
-		      lighting on blocks for them.
-	*/
-	MapSector *sector;
-	try {
-		sector = createSector(p2d);
-	} catch (InvalidPositionException &e) {
-		infostream<<"createBlock: createSector() failed"<<std::endl;
-		throw e;
-	}
-
-	/*
-		Try to get a block from the sector
-	*/
-
-	MapBlock *block = sector->getBlockNoCreateNoEx(block_y);
-	if (block) {
-		return block;
-	}
-	// Create blank
-	block = sector->createBlankBlock(block_y);
-
-	return block;
-}
-
-
-#endif // WTF
-
-MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank)
-{
-	TimeTaker timer("generateBlock");
-	MAP_NOTHREAD_LOCK(this);
-
-	{
-		MapBlock *block = getBlockNoCreateNoEx(p, false, true);
-		if (block)
-			return block;
-	}
-
-	if (!m_map_loading_enabled)
-		return nullptr;
-
-	{
-		MapBlock *block = loadBlock(p);
-		if(block)
-			return block;
-	}
-
-	if (create_blank) {
-        return this->createBlankBlock(p);
-/*
-		MapSector *sector = createSector(v2s16(p.X, p.Z));
-		MapBlock *block = sector->createBlankBlock(p.Y);
-
-		return block;
-*/
-	}
-
-	return NULL;
-}
-
-
-MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d)
-{
-	MapBlock *block = getBlockNoCreateNoEx(p3d, false, true);
-	if (block == NULL && m_map_loading_enabled)
-		m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, false);
-
-	return block;
-}
-
-void ServerMap::prepareBlock(MapBlock *block) {
-	ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
-
-	// Calculate weather conditions
-	//block->heat_last_update     = 0;
-	//block->humidity_last_update = 0;
-	v3pos_t p = block->getPos() *  MAP_BLOCKSIZE;
-	updateBlockHeat(senv, p, block);
-	updateBlockHumidity(senv, p, block);
-}
-
-bool ServerMap::isBlockInQueue(v3s16 pos)
-{
-	return m_emerge && m_emerge->isBlockInQueue(pos);
-}
-
-void ServerMap::addNodeAndUpdate(v3s16 p, MapNode n,
-		std::map<v3s16, MapBlock*> &modified_blocks,
-		bool remove_metadata,
-		int fast, bool important)
-{
-	Map::addNodeAndUpdate(p, n, modified_blocks, remove_metadata, fast, important);
-
-	/*
-		Add neighboring liquid nodes and this node to transform queue.
-		(it's vital for the node itself to get updated last, if it was removed.)
-	 */
-    if (!fast)
-	for (const v3s16 &dir : g_7dirs) {
-		v3s16 p2 = p + dir;
-
-		bool is_valid_position;
-		MapNode n2 = getNode(p2, &is_valid_position);
-		if(is_valid_position &&
-				(m_nodedef->get(n2).isLiquid() ||
-				n2.getContent() == CONTENT_AIR))
-			transforming_liquid_add(p2);
-	}
-}
-
-// N.B.  This requires no synchronization, since data will not be modified unless
-// the VoxelManipulator being updated belongs to the same thread.
-void ServerMap::updateVManip(v3s16 pos)
-{
-	Mapgen *mg = m_emerge->getCurrentMapgen();
-	if (!mg)
-		return;
-
-	MMVManip *vm = mg->vm;
-	if (!vm)
-		return;
-
-	if (!vm->m_area.contains(pos))
-		return;
-
-	s32 idx = vm->m_area.index(pos);
-	vm->m_data[idx] = getNode(pos);
-	vm->m_flags[idx] &= ~VOXELFLAG_NO_DATA;
-
-	vm->m_is_dirty = true;
-}
-
-void ServerMap::reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks)
-{
-	m_loaded_blocks_gauge->set(all_blocks);
-	m_save_time_counter->increment(save_time_us);
-	m_save_count_counter->increment(saved_blocks);
-}
-
-s32 ServerMap::save(ModifiedState save_level, float dedicated_server_step, bool breakable)
-{
-	if (!m_map_saving_enabled) {
-		warningstream<<"Not saving map, saving disabled."<<std::endl;
-		return 0;
-	}
-
-	const auto start_time = porting::getTimeUs();
-
-	if(save_level == MOD_STATE_CLEAN)
-		infostream<<"ServerMap: Saving whole map, this can take time."
-				<<std::endl;
-
-	if (m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
-		if (settings_mgr.saveMapMeta())
-			m_map_metadata_changed = false;
-	}
-
-	// Profile modified reasons
-	Profiler modprofiler;
-
-	u32 block_count = 0;
-	u32 block_count_all = 0; // Number of blocks in memory
-
-	// Don't do anything with sqlite unless something is really saved
-	bool save_started = false;
-	u32 n = 0, calls = 0;
-	const auto end_ms = porting::getTimeMs() + u32(1000 * dedicated_server_step);
-	if (!breakable)
-		m_blocks_save_last = 0;
-
-	MAP_NOTHREAD_LOCK(this);
-
-	{
-		auto lock = breakable ? m_blocks.try_lock_shared_rec() : m_blocks.lock_shared_rec();
-		if (!lock->owns_lock())
-			return m_blocks_save_last;
-
-		for(const auto &[pos, block] : m_blocks)
-		{
-			if (n++ < m_blocks_save_last)
-				continue;
-			else
-				m_blocks_save_last = 0;
-			++calls;
-
-			if (!block)
-				continue;
-
-			block_count_all++;
-
-			if(block->getModified() >= (u32)save_level) {
-				// Lazy beginSave()
-				if(!save_started) {
-					beginSave();
-					save_started = true;
-				}
-
-				//modprofiler.add(block->getModifiedReasonString(), 1);
-
-				auto lock = breakable ? block->try_lock_unique_rec() : block->lock_unique_rec();
-				if (!lock->owns_lock())
-					continue;
-
-				saveBlock(block);
-				block_count++;
-			}
-			if (breakable && porting::getTimeMs() > end_ms) {
-				m_blocks_save_last = n;
-				break;
-			}
-		}
-	}
-	if (!calls)
-		m_blocks_save_last = 0;
-
-	if(save_started)
-		endSave();
-
-	/*
-		Only print if something happened or saved whole map
-	*/
-	if(/*save_level == MOD_STATE_CLEAN
-			||*/ block_count != 0) {
-		infostream << "ServerMap: Written: "
-				<< block_count << " blocks"
-				<< ", " << block_count_all << " blocks in memory."
-
-                << " Total=" << m_blocks.size() << ".";
-				if (m_blocks_save_last)
-					infostream<<" Break at "<< m_blocks_save_last;
-				infostream
-
-				<< std::endl;
-		PrintInfo(infostream); // ServerMap/ClientMap:
-		//infostream<<"Blocks modified by: "<<std::endl;
-		modprofiler.print(infostream);
-	}
-
-	const auto end_time = porting::getTimeUs();
-
-	m_save_time_counter->increment(end_time - start_time);
-
-	reportMetrics(end_time - start_time, block_count, block_count_all);
-
-	return m_blocks_save_last;
-}
-
-void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
-{
-	dbase->listAllLoadableBlocks(dst);
-	if (dbase_ro)
-		dbase_ro->listAllLoadableBlocks(dst);
-}
-
-void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
-{
-
-	auto lock = m_blocks.lock_shared_rec();
-	for(const auto & i : m_blocks)
-		dst.push_back(i.second->getPos());
-/*
-	for (auto &sector_it : m_sectors) {
-		MapSector *sector = sector_it.second;
-
-		MapBlockVect blocks;
-		sector->getBlocks(blocks);
-
-		for (MapBlock *block : blocks) {
-			v3s16 p = block->getPos();
-			dst.push_back(p);
-		}
-	}
-*/
-}
-
-MapDatabase *ServerMap::createDatabase(
-	const std::string &name,
-	const std::string &savedir,
-	Settings &conf)
-{
-	#if USE_SQLITE3
- 	if (name == "sqlite3")
-		return new MapDatabaseSQLite3(savedir);
-	#endif
-	if (name == "dummy")
-		return new Database_Dummy();
-	#if USE_LEVELDB
-	if (name == "leveldb")
-		return new Database_LevelDB(savedir);
-	#endif
-	#if USE_REDIS
-	if (name == "redis")
-		return new Database_Redis(conf);
-	#endif
-	#if USE_POSTGRESQL
-	if (name == "postgresql") {
-		std::string connect_string;
-		conf.getNoEx("pgsql_connection", connect_string);
-		return new MapDatabasePostgreSQL(connect_string);
-	}
-	#endif
-
-	throw BaseException(std::string("Database backend ") + name + " not supported.");
-}
-
-void ServerMap::beginSave()
-{
-	dbase->beginSave();
-}
-
-void ServerMap::endSave()
-{
-	dbase->endSave();
-}
-
-bool ServerMap::saveBlock(MapBlock *block)
-{
-	return saveBlock(block, dbase, m_map_compression_level);
-}
-
-bool ServerMap::saveBlock(MapBlock *block, MapDatabase *db, int compression_level)
-{
-	v3s16 p3d = block->getPos();
-
-	if (!block->isGenerated()) {
-		//warningstream << "saveBlock: Not writing not generated block p="<< p3d << std::endl;
-		return true;
-	}
-
-	// Format used for writing
-	u8 version = SER_FMT_VER_HIGHEST_WRITE;
-
-	/*
-		[0] u8 serialization version
-		[1] data
-	*/
-	std::ostringstream o(std::ios_base::binary);
-	o.write((char*) &version, 1);
-	block->serialize(o, version, true, compression_level);
-
-	bool ret = db->saveBlock(p3d, o.str());
-	if (ret) {
-		// We just wrote it to the disk so clear modified flag
-		block->resetModified();
-	}
-	return ret;
-}
-
-MapBlock * ServerMap::loadBlock(v3bpos_t p3d)
-{
-	ScopeProfiler sp(g_profiler, "ServerMap::loadBlock");
-	const auto sector = this;
-	MapBlock *block = nullptr;
-	try {
-		std::string blob;
-		dbase->loadBlock(p3d, &blob);
-		if (!blob.length() && dbase_ro) {
-			dbase_ro->loadBlock(p3d, &blob);
-		}
-		if (!blob.length()) {
-			m_db_miss.emplace(p3d, 1);
-			return nullptr;
-		}
-
-		std::istringstream is(blob, std::ios_base::binary);
-
-		u8 version = SER_FMT_VER_INVALID;
-		is.read((char*)&version, 1);
-
-		if(is.fail())
-			throw SerializationError("ServerMap::loadBlock(): Failed"
-					" to read MapBlock version");
-
-		/*u32 block_size = MapBlock::serializedLength(version);
-		SharedBuffer<u8> data(block_size);
-		is.read((char*)*data, block_size);*/
-
-		// This will always return a sector because we're the server
-		//MapSector *sector = emergeSector(p2d);
-
-		bool created_new = false;
-		block = sector->getBlockNoCreateNoEx(p3d, false, true);
-		if(block == NULL)
-		{
-			block = sector->createBlankBlockNoInsert(p3d);
-			created_new = true;
-		}
-
-		// Read basic data
-		if (!block->deSerialize(is, version, true)) {
-			if (created_new && block)
-				delete block;
-			return nullptr;
-		}
-
-		// If it's a new block, insert it to the map
-		if(created_new)
-			if(!sector->insertBlock(block)) {
-				delete block;
-				return nullptr;
-			}
-
-		if (!g_settings->getBool("liquid_real")) {
-			ReflowScan scanner(this, m_emerge->ndef);
-			scanner.scan(block, &m_transforming_liquid);
-		}
-
-		// We just loaded it from, so it's up-to-date.
-		block->resetModified();
-
-/*
-		if (block->getLightingExpired()) {
-			verbosestream<<"Loaded block with exiried lighting. (maybe sloooow appear), try recalc " << p3d<<std::endl;
-			lighting_modified_blocks.set(p3d, nullptr);
-		}
-*/
-
-	//MapBlock *block = getBlockNoCreateNoEx(blockpos);
-	if (created_new && (block != NULL)) {
-		std::map<v3bpos_t, MapBlock*> modified_blocks;
-		// Fix lighting if necessary
-		voxalgo::update_block_border_lighting(this, block, modified_blocks);
-		if (!modified_blocks.empty()) {
-			//Modified lighting, send event
-			MapEditEvent event;
-			event.type = MEET_OTHER;
-			for (auto it = modified_blocks.begin();
-					it != modified_blocks.end(); ++it)
-				event.modified_blocks.push_back(it->first);
-			dispatchEvent(event);
-		}
-	}
-
-
-
-		return block;
-	} catch (const std::exception &e) {
-		if (block)
-			delete block;
-
-		errorstream<<"Invalid block data in database"
-				<<" ("<<p3d.X<<","<<p3d.Y<<","<<p3d.Z<<")"
-				<<" (SerializationError): "<<e.what()<<std::endl;
-
-		// TODO: Block should be marked as invalid in memory so that it is
-		// not touched but the game can run
-
-		if(g_settings->getBool("ignore_world_load_errors")){
-			errorstream<<"Ignoring block load error. Duck and cover! "
-					<<"(ignore_world_load_errors)"<<std::endl;
-		} else {
-			throw SerializationError("Invalid block data in database");
-		}
-	}
-	return nullptr;
-}
-
-#if WTF
-
-void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load)
-{
-	try {
-		std::istringstream is(*blob, std::ios_base::binary);
-
-		u8 version = SER_FMT_VER_INVALID;
-		is.read((char*)&version, 1);
-
-		if(is.fail())
-			throw SerializationError("ServerMap::loadBlock(): Failed"
-					" to read MapBlock version");
-
-		MapBlock *block = nullptr;
-		std::unique_ptr<MapBlock> block_created_new;
-		block = sector->getBlockNoCreateNoEx(p3d.Y);
-		if (!block) {
-			block_created_new = sector->createBlankBlockNoInsert(p3d.Y);
-			block = block_created_new.get();
-		}
-
-		{
-		ScopeProfiler sp(g_profiler, "ServerMap: deSer block", SPT_AVG);
-		// Read basic data
-		block->deSerialize(is, version, true);
-		}
-
-		// If it's a new block, insert it to the map
-		if (block_created_new) {
-			sector->insertBlock(std::move(block_created_new));
-			ReflowScan scanner(this, m_emerge->ndef);
-			scanner.scan(block, &m_transforming_liquid);
-		}
-
-		/*
-			Save blocks loaded in old format in new format
-		*/
-
-		//if(version < SER_FMT_VER_HIGHEST_READ || save_after_load)
-		// Only save if asked to; no need to update version
-		if(save_after_load)
-			saveBlock(block);
-
-		// We just loaded it from, so it's up-to-date.
-		block->resetModified();
-	}
-	catch(SerializationError &e)
-	{
-		errorstream<<"Invalid block data in database"
-				<<" ("<<p3d.X<<","<<p3d.Y<<","<<p3d.Z<<")"
-				<<" (SerializationError): "<<e.what()<<std::endl;
-
-		// TODO: Block should be marked as invalid in memory so that it is
-		// not touched but the game can run
-
-		if(g_settings->getBool("ignore_world_load_errors")){
-			errorstream<<"Ignoring block load error. Duck and cover! "
-					<<"(ignore_world_load_errors)"<<std::endl;
-		} else {
-			throw SerializationError("Invalid block data in database");
-		}
-	}
-}
-
-MapBlock* ServerMap::loadBlock(v3s16 blockpos)
-{
-	ScopeProfiler sp(g_profiler, "ServerMap: load block", SPT_AVG);
-	bool created_new = (getBlockNoCreateNoEx(blockpos) == NULL);
-
-	v2s16 p2d(blockpos.X, blockpos.Z);
-
-	std::string ret;
-	dbase->loadBlock(blockpos, &ret);
-	if (!ret.empty()) {
-		loadBlock(&ret, blockpos, createSector(p2d), false);
-	} else if (dbase_ro) {
-		dbase_ro->loadBlock(blockpos, &ret);
-		if (!ret.empty()) {
-			loadBlock(&ret, blockpos, createSector(p2d), false);
-		}
-	} else {
-		return NULL;
-	}
-
-	MapBlock *block = getBlockNoCreateNoEx(blockpos);
-	if (created_new && (block != NULL)) {
-		std::map<v3s16, MapBlock*> modified_blocks;
-		// Fix lighting if necessary
-		voxalgo::update_block_border_lighting(this, block, modified_blocks);
-		if (!modified_blocks.empty()) {
-			//Modified lighting, send event
-			MapEditEvent event;
-			event.type = MEET_OTHER;
-			event.setModifiedBlocks(modified_blocks);
-			dispatchEvent(event);
-		}
-	}
-	return block;
-}
-#endif
-
-bool ServerMap::deleteBlock(v3s16 blockpos)
-{
-	if (!dbase->deleteBlock(blockpos))
-		return false;
-
-	MapBlock *block = getBlockNoCreateNoEx(blockpos);
-	if (block) {
-		Map::deleteBlock(blockpos);
-/*
-		v2s16 p2d(blockpos.X, blockpos.Z);
-		MapSector *sector = getSectorNoGenerate(p2d);
-		if (!sector)
-			return false;
-		// It may not be safe to delete the block from memory at the moment
-		// (pointers to it could still be in use)
-		sector->detachBlock(block);
-		m_detached_blocks.push_back(sector->detachBlock(block));
-*/
-		m_detached_blocks.push_back(std::unique_ptr<MapBlock>{block});
-	}
-
-	return true;
-}
-
-void ServerMap::deleteDetachedBlocks()
-{
-	for (const auto &block : m_detached_blocks) {
-		assert(block->isOrphan());
-		(void)block; // silence unused-variable warning in release builds
-	}
-
-	m_detached_blocks.clear();
-}
-
-void ServerMap::step()
-{
-	// Delete from memory blocks removed by deleteBlocks() only when pointers
-	// to them are (probably) no longer in use
-	deleteDetachedBlocks();
-}
-
-void ServerMap::PrintInfo(std::ostream &out)
-{
-	out<<"ServerMap: ";
-}
-
-bool ServerMap::repairBlockLight(v3s16 blockpos,
-	std::map<v3s16, MapBlock *> *modified_blocks)
-{
-	MapBlock *block = emergeBlock(blockpos, false);
-	if (!block || !block->isGenerated())
-		return false;
-	voxalgo::repair_block_light(this, block, modified_blocks);
-	return true;
-}
-
 MMVManip::MMVManip(Map *map):
 		VoxelManipulator(),
 		m_map(map)
@@ -2319,9 +859,7 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
 		u8 flags = 0;
 		MapBlock *block;
 		v3s16 p(x,y,z);
-		std::map<v3s16, u8>::iterator n;
-		n = m_loaded_blocks.find(p);
-		if(n != m_loaded_blocks.end())
+		if (m_loaded_blocks.count(p) > 0)
 			continue;
 
 		bool block_data_inexistent = false;
@@ -2339,10 +877,7 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
 		{
 
 			if (load_if_inexistent && !blockpos_over_max_limit(p)) {
-				ServerMap *svrmap = (ServerMap *)m_map;
-				block = svrmap->emergeBlock(p, false);
-				if (block == NULL)
-					block = svrmap->createBlock(p);
+				block = m_map->emergeBlock(p, true);
 				block->copyTo(*this);
 			} else {
 				flags |= VMANIP_BLOCK_DATA_INEXIST;
@@ -2395,6 +930,7 @@ void MMVManip::blitBackAll(std::map<v3s16, MapBlock*> *modified_blocks,
 
    	  if (save_generated_block)
 		block->raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_VMANIP);
+		block->expireIsAirCache();
 
 		if(modified_blocks)
 			(*modified_blocks)[p] = block;
diff --git a/src/map.h b/src/map.h
index 377536781..1b2beb7d1 100644
--- a/src/map.h
+++ b/src/map.h
@@ -24,14 +24,12 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdint>
 #include <iostream>
-#include <sstream>
 #include <set>
 #include <map>
-#include "irr_v3d.h"
+
 #include "util/unordered_map_hash.h"
 #include "threading/concurrent_unordered_map.h"
-#include "threading/concurrent_set.h"
-#include <list>
+#include "threading/concurrent_unordered_set.h"
 
 #include "irrlichttypes_bloated.h"
 #include "mapblock.h"
@@ -39,39 +37,31 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "constants.h"
 #include "voxel.h"
 #include "modifiedstate.h"
-#include "util/container.h"
-#include "util/metricsbackend.h"
 #include "util/numeric.h"
 #include "nodetimer.h"
-#include "map_settings_manager.h"
 #include "debug.h"
 
-#include "mapblock.h"
-#include <sys/types.h>
-#include <unordered_set>
-#include "fm_nodecontainer.h"
-#include "config.h"
-
-class Settings;
-class MapDatabase;
-class ClientMap;
+/*
 class MapSector;
-class ServerMapSector;
-class MapBlock;
+*/
 class NodeMetadata;
 class IGameDef;
 class IRollbackManager;
-class EmergeManager;
-class MetricsBackend;
-class ServerEnvironment;
-struct BlockMakeData;
-class Server;
+
+
+#if !ENABLE_THREADS
+	#define MAP_NOTHREAD_LOCK(map) auto lock_map = map->m_nothread_locker.lock_unique_rec();
+#else
+	#define MAP_NOTHREAD_LOCK(map) ;
+#endif
+
+
 
 /*
 	MapEditEvent
 */
 
-enum MapEditEventType{
+enum MapEditEventType {
 	// Node added (changed from air or something else to something)
 	MEET_ADDNODE,
 	// Node removed (changed to air)
@@ -102,7 +92,7 @@ struct MapEditEvent
 		modified_blocks.push_back(getNodeBlockPos(pos));
 	}
 
-	void setModifiedBlocks(const std::map<v3s16, MapBlock *> blocks)
+	void setModifiedBlocks(const std::map<v3s16, MapBlock *>& blocks)
 	{
 		assert(modified_blocks.empty()); // only meant for initialization (once)
 		modified_blocks.reserve(blocks.size());
@@ -148,14 +138,6 @@ public:
 	virtual ~Map();
 	DISABLE_CLASS_COPY(Map);
 
-	/*
-		Drop (client) or delete (server) the map.
-	*/
-	virtual void drop()
-	{
-		delete this;
-	}
-
 	void addEventReceiver(MapEventReceiver *event_receiver);
 	void removeEventReceiver(MapEventReceiver *event_receiver);
 	// event shall be deleted by caller after the call.
@@ -177,7 +159,7 @@ public:
 	bool isValidPosition(v3s16 p);
 
 	// throws InvalidPositionException if not found
-	void setNode(v3pos_t p, MapNode n, bool important = false);
+	void setNode(const v3pos_t &p, const MapNode &n, bool important = false) override;
 
 	// Returns a CONTENT_IGNORE node if not found
 	// If is_valid_position is not NULL then this will be set to true if the
@@ -338,6 +320,8 @@ public:
 	};
 	inline MapNode &getNodeRefUnsafe(const v3pos_t &p) override { return getNodeTry(p); }
 
+	concurrent_unordered_set<v3bpos_t> changed_blocks_for_merge;
+
 	//end of freeminer
 
 
@@ -378,7 +362,12 @@ public:
 		}
 	}
 
-	bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
+	bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
+	{
+		return isBlockOccluded(block->getPosRelative(), cam_pos_nodes, false);
+	}
+	bool isBlockOccluded(v3s16 pos_relative, v3s16 cam_pos_nodes, bool simple_check = false);
+
 protected:
 	IGameDef *m_gamedef;
 	std::set<MapEventReceiver*> m_event_receivers;
@@ -397,229 +386,13 @@ protected:
 	// Can be implemented by child class
 	virtual void reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks) {}
 
-	bool determineAdditionalOcclusionCheck(const v3s16 &pos_camera,
-		const core::aabbox3d<s16> &block_bounds, v3s16 &check);
-	bool isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target,
+	bool determineAdditionalOcclusionCheck(v3s16 pos_camera,
+		const core::aabbox3d<s16> &block_bounds, v3s16 &to_check);
+	bool isOccluded(v3s16 pos_camera, v3s16 pos_target,
 		float step, float stepfac, float start_offset, float end_offset,
 		u32 needed_count);
 };
 
-/*
-	ServerMap
-
-	This is the only map class that is able to generate map.
-*/
-
-class ServerMap : public Map
-{
-public:
-//freeminer:
-	virtual s16 updateBlockHeat(ServerEnvironment *env, const v3pos_t &p, MapBlock *block = nullptr, unordered_map_v3pos<s16> *cache = nullptr, bool block_add = true);
-	virtual s16 updateBlockHumidity(ServerEnvironment *env, const v3pos_t & p, MapBlock *block = nullptr, unordered_map_v3pos<s16> *cache = nullptr, bool block_add = true);
-
-	size_t transforming_liquid_size();
-	v3pos_t transforming_liquid_pop();
-	void transforming_liquid_add(const v3pos_t &p);
-	size_t transformLiquidsReal(Server *m_server, const unsigned int max_cycle_ms);
-
-	//getSurface level starting on basepos.y up to basepos.y + searchup
-	//returns basepos.y -1 if no surface has been found
-	// (due to limited data range of basepos.y this will always give a unique
-	// return value as long as minetest is compiled at least on 32bit architecture)
-	//int getSurface(v3s16 basepos, int searchup, bool walkable_only);
-	virtual int getSurface(const v3pos_t& basepos, int searchup, bool walkable_only);
-/*
-	{
-		return basepos.Y - 1;
-	}
-*/
-
-	//concurrent_unordered_map<v3POS, bool, v3posHash, v3posEqual> m_transforming_liquid;
-	std::mutex m_transforming_liquid_mutex;
-	typedef unordered_map_v3pos<int> lighting_map_t;
-	std::mutex m_lighting_modified_mutex;
-	std::map<v3pos_t, int> m_lighting_modified_blocks;
-	std::map<unsigned int, lighting_map_t> m_lighting_modified_blocks_range;
-	void lighting_modified_add(const v3pos_t& pos, int range = 5);
-
-	void unspreadLight(enum LightBank bank, std::map<v3pos_t, u8> &from_nodes,
-			std::set<v3pos_t> &light_sources, std::map<v3bpos_t, MapBlock *> &modified_blocks);
-	void spreadLight(enum LightBank bank, std::set<v3pos_t> &from_nodes,
-			std::map<v3bpos_t, MapBlock *> &modified_blocks, uint64_t end_ms);
-
-	u32 updateLighting(concurrent_map<v3pos_t, MapBlock *> &a_blocks,
-			std::map<v3pos_t, MapBlock *> &modified_blocks, unsigned int max_cycle_ms);
-	u32 updateLighting(lighting_map_t & a_blocks, unordered_map_v3pos<int> & processed, unsigned int max_cycle_ms = 0);
-	unsigned int updateLightingQueue(unsigned int max_cycle_ms, int & loopcount);
-
-	bool propagateSunlight(
-			const v3pos_t& pos, std::set<v3pos_t> &light_sources, bool remove_light = false);
-
-//end of freeminer
-
-
-
-
-
-
-	/*
-		savedir: directory to which map data should be saved
-	*/
-	ServerMap(const std::string &savedir, IGameDef *gamedef, EmergeManager *emerge, MetricsBackend *mb);
-	~ServerMap();
-
-	/*
-		Blocks are generated by using these and makeBlock().
-	*/
-	bool blockpos_over_mapgen_limit(v3s16 p);
-	bool initBlockMake(v3s16 blockpos, BlockMakeData *data);
-	void finishBlockMake(BlockMakeData *data,
-		std::map<v3s16, MapBlock*> *changed_blocks);
-
-	/*
-		Get a block from somewhere.
-		- Memory
-		- Create blank
-	*/
-	MapBlock *createBlock(v3s16 p);
-
-	/*
-		Forcefully get a block from somewhere.
-		- Memory
-		- Load from disk
-		- Create blank filled with CONTENT_IGNORE
-
-	*/
-	MapBlock *emergeBlock(v3bpos_t p, bool create_blank=false) override;
-
-	/*
-		Try to get a block.
-		If it does not exist in memory, add it to the emerge queue.
-		- Memory
-		- Emerge Queue (deferred disk or generate)
-	*/
-	MapBlock *getBlockOrEmerge(v3s16 p3d);
-
-	// Carries out any initialization necessary before block is sent
-	void prepareBlock(MapBlock *block);
-
-	// Helper for placing objects on ground level
-	s16 findGroundLevel(v2pos_t p2d, bool cacheBlocks);
-
-	bool isBlockInQueue(v3s16 pos);
-
-	void addNodeAndUpdate(v3s16 p, MapNode n,
-			std::map<v3s16, MapBlock*> &modified_blocks,
-			bool remove_metadata
-			, int fast = 0, bool important = false) override;
-
-	/*
-		Database functions
-	*/
-	static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
-
-	// Call these before and after saving of blocks
-	void beginSave() override;
-	void endSave() override;
-
-	s32 save(ModifiedState save_level, float dedicated_server_step = 0.1, bool breakable = 0) override;
-	void listAllLoadableBlocks(std::vector<v3s16> &dst);
-	void listAllLoadedBlocks(std::vector<v3s16> &dst);
-
-	MapgenParams *getMapgenParams();
-
-	bool saveBlock(MapBlock *block) override;
-	static bool saveBlock(MapBlock *block, MapDatabase *db, int compression_level = -1);
-	MapBlock* loadBlock(v3s16 p);
-
-	// Blocks are removed from the map but not deleted from memory until
-	// deleteDetachedBlocks() is called, since pointers to them may still exist
-	// when deleteBlock() is called.
-	bool deleteBlock(v3s16 blockpos) override;
-
-	void deleteDetachedBlocks();
-
-	void step();
-
-	void updateVManip(v3s16 pos);
-
-	// For debug printing
-	void PrintInfo(std::ostream &out) override;
-
-	bool isSavingEnabled(){ return m_map_saving_enabled; }
-
-	u64 getSeed();
-
-	/*!
-	 * Fixes lighting in one map block.
-	 * May modify other blocks as well, as light can spread
-	 * out of the specified block.
-	 * Returns false if the block is not generated (so nothing
-	 * changed), true otherwise.
-	 */
-	bool repairBlockLight(v3s16 blockpos,
-		std::map<v3s16, MapBlock *> *modified_blocks);
-
-	size_t transformLiquids(std::map<v3bpos_t, MapBlock*> & modified_blocks,
-			ServerEnvironment *env
-            , Server *m_server, unsigned int max_cycle_ms			
-			);
-
-	MapSettingsManager settings_mgr;
-
-protected:
-
-	void reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks) override;
-
-private:
-	friend class ModApiMapgen; // for m_transforming_liquid
-
-	// Emerge manager
-	EmergeManager *m_emerge;
-
-public:
-	std::string m_savedir;
-	bool m_map_saving_enabled;
-	bool m_map_loading_enabled;
-	concurrent_shared_unordered_map<v3pos_t, unsigned int, v3posHash, v3posEqual> m_mapgen_process;
-private:
-
-	int m_map_compression_level;
-
-	concurrent_set<v3bpos_t> m_chunks_in_progress;
-
-	// used by deleteBlock() and deleteDetachedBlocks()
-	std::vector<std::unique_ptr<MapBlock>> m_detached_blocks;
-
-	// Queued transforming water nodes
-	UniqueQueue<v3s16> m_transforming_liquid;
-	f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
-	u32 m_unprocessed_count = 0;
-	u64 m_inc_trending_up_start_time = 0; // milliseconds
-	bool m_queue_size_timer_started = false;
-
-	/*
-		Metadata is re-written on disk only if this is true.
-		This is reset to false when written on disk.
-	*/
-	bool m_map_metadata_changed = true;
-public:
-	MapDatabase *dbase = nullptr;
-private:
-	MapDatabase *dbase_ro = nullptr;
-
-	// Map metrics
-	MetricGaugePtr m_loaded_blocks_gauge;
-	MetricCounterPtr m_save_time_counter;
-	MetricCounterPtr m_save_count_counter;
-};
-
-#if !ENABLE_THREADS
-	#define MAP_NOTHREAD_LOCK(map) auto lock_map = map->m_nothread_locker.lock_unique_rec();
-#else
-	#define MAP_NOTHREAD_LOCK(map) ;
-#endif
-
 #define VMANIP_BLOCK_DATA_INEXIST     1
 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2
 
diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 562ec45b9..edf892a74 100644
--- a/src/map_settings_manager.cpp
+++ b/src/map_settings_manager.cpp
@@ -99,15 +99,11 @@ bool MapSettingsManager::loadMapMeta()
 	if (m_map_settings->readJsonFile(m_map_meta_path + ".json")) {
 		return true;
 	}
-	auto map_meta_path = m_map_meta_path + ".txt";
+	const auto map_meta_path = m_map_meta_path + ".txt";
 
-	std::ifstream is(map_meta_path.c_str(), std::ios_base::binary);
-
-	if (!is.good()) {
-		errorstream << "loadMapMeta: could not open "
-			<< map_meta_path << std::endl;
+	auto is = open_ifstream(map_meta_path.c_str(), true);
+	if (!is.good())
 		return false;
-	}
 
 	if (!m_map_settings->parseConfigLines(is)) {
 		errorstream << "loadMapMeta: Format error. '[end_of_params]' missing?" << std::endl;
diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 3374a9932..d72dc5503 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -47,25 +47,24 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 
 static const char *modified_reason_strings[] = {
-	"initial",
-	"reallocate",
+	"reallocate or initial",
 	"setIsUnderground",
-	"setLightingExpired",
+	"setLightingComplete",
 	"setGenerated",
 	"setNode",
-	"setNodeNoCheck",
 	"setTimestamp",
-	"NodeMetaRef::reportMetadataChange",
+	"reportMetadataChange",
 	"clearAllObjects",
 	"Timestamp expired (step)",
 	"addActiveObjectRaw",
-	"removeRemovedObjects/remove",
-	"removeRemovedObjects/deactivate",
-	"Stored list cleared in activateObjects due to overflow",
-	"deactivateFarObjects: Static data moved in",
-	"deactivateFarObjects: Static data moved out",
-	"deactivateFarObjects: Static data changed considerably",
-	"finishBlockMake: expireDayNightDiff",
+	"removeRemovedObjects: remove",
+	"removeRemovedObjects: deactivate",
+	"objects cleared due to overflow",
+	"deactivateFarObjects: static data moved in",
+	"deactivateFarObjects: static data moved out",
+	"deactivateFarObjects: static data changed",
+	"finishBlockMake: expireIsAir",
+	"MMVManip::blitBackAll",
 	"unknown",
 };
 
@@ -73,14 +72,14 @@ static const char *modified_reason_strings[] = {
 	MapBlock
 */
 
-MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef):
-		m_uptime_timer_last(0),
-		m_parent(parent),
+MapBlock::MapBlock(v3s16 pos, IGameDef *gamedef):
 		m_pos(pos),
 		m_pos_relative(pos * MAP_BLOCKSIZE),
+		data(new MapNode[nodecount]),
 		m_gamedef(gamedef)
 {
 	reallocate();
+	assert(m_modified > MOD_STATE_CLEAN);
 }
 
 MapBlock::~MapBlock()
@@ -105,7 +104,7 @@ bool MapBlock::onObjectsActivation()
 	const auto count = m_static_objects.getStoredSize();
 #if !NDEBUG
 	verbosestream << "MapBlock::onObjectsActivation(): "
-			<< "activating " << count << "objects in block " << getPos()
+			<< "activating " << count << " objects in block " << getPos()
 			<< std::endl;
 #endif
 
@@ -158,28 +157,6 @@ void MapBlock::step(float dtime, const std::function<bool(v3s16, MapNode, f32)>
 	}
 }
 
-bool MapBlock::isValidPositionParent(v3s16 p)
-{
-	if (isValidPosition(p)) {
-		return true;
-	}
-
-	return m_parent->isValidPosition(getPosRelative() + p);
-}
-
-MapNode MapBlock::getNodeParent(v3s16 p, bool *is_valid_position)
-{
-	if (!isValidPosition(p))
-		return m_parent->getNode(getPosRelative() + p, is_valid_position);
-
-	if (is_valid_position)
-		*is_valid_position = true;
-
-	auto lock = lock_shared_rec();
-
-	return data[p.Z * zstride + p.Y * ystride + p.X];
-}
-
 std::string MapBlock::getModifiedReasonString()
 {
 	std::string reason;
@@ -204,7 +181,7 @@ std::string MapBlock::getModifiedReasonString()
 
 void MapBlock::copyTo(VoxelManipulator &dst)
 {
-	auto lock = lock_shared_rec();
+	const auto lock = lock_shared_rec();
 	v3s16 data_size(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
 	VoxelArea data_area(v3s16(0,0,0), data_size - v3s16(1,1,1));
 
@@ -215,7 +192,7 @@ void MapBlock::copyTo(VoxelManipulator &dst)
 
 void MapBlock::copyFrom(VoxelManipulator &dst)
 {
-	auto lock = lock_unique_rec();
+	const auto lock = lock_unique_rec();
 	v3s16 data_size(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
 	VoxelArea data_area(v3s16(0,0,0), data_size - v3s16(1,1,1));
 
@@ -224,58 +201,29 @@ void MapBlock::copyFrom(VoxelManipulator &dst)
 			getPosRelative(), data_size);
 }
 
-void MapBlock::actuallyUpdateDayNightDiff()
+void MapBlock::actuallyUpdateIsAir()
 {
-	const NodeDefManager *nodemgr = m_gamedef->ndef();
+	// Running this function un-expires m_is_air
+	m_is_air_expired = false;
 
-	// Running this function un-expires m_day_night_differs
-	m_day_night_differs_expired = false;
+	const auto lock = lock_shared_rec();
 
-	bool differs = false;
-
-	/*
-		Check if any lighting value differs
-	*/
-	auto lock = lock_shared_rec();
-
-	MapNode previous_n(CONTENT_IGNORE);
+	bool only_air = true;
 	for (u32 i = 0; i < nodecount; i++) {
-		MapNode n = data[i];
-
-		// If node is identical to previous node, don't verify if it differs
-		if (n == previous_n)
-			continue;
-
-		differs = !n.isLightDayNightEq(nodemgr->getLightingFlags(n));
-		if (differs)
+		MapNode &n = data[i];
+		if (n.getContent() != CONTENT_AIR) {
+			only_air = false;
 			break;
-		previous_n = n;
-	}
-
-	/*
-		If some lighting values differ, check if the whole thing is
-		just air. If it is just air, differs = false
-	*/
-	if (differs) {
-		bool only_air = true;
-		for (u32 i = 0; i < nodecount; i++) {
-			MapNode &n = data[i];
-			if (n.getContent() != CONTENT_AIR) {
-				only_air = false;
-				break;
-			}
 		}
-		if (only_air)
-			differs = false;
 	}
 
 	// Set member variable
-	m_day_night_differs = differs;
+	m_is_air = only_air;
 }
 
-void MapBlock::expireDayNightDiff()
+void MapBlock::expireIsAirCache()
 {
-	m_day_night_differs_expired = true;
+	m_is_air_expired = true;
 }
 
 /*
@@ -284,21 +232,22 @@ void MapBlock::expireDayNightDiff()
 
 // List relevant id-name pairs for ids in the block using nodedef
 // Renumbers the content IDs (starting at 0 and incrementing)
+// Note that there's no technical reason why we *have to* renumber the IDs,
+// but we do it anyway as it also helps compressability.
 static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes,
 	const NodeDefManager *nodedef)
 {
-	// The static memory requires about 65535 * sizeof(int) RAM in order to be
+	// The static memory requires about 65535 * 2 bytes RAM in order to be
 	// sure we can handle all content ids. But it's absolutely worth it as it's
 	// a speedup of 4 for one of the major time consuming functions on storing
 	// mapblocks.
 	thread_local std::unique_ptr<content_t[]> mapping;
 	static_assert(sizeof(content_t) == 2, "content_t must be 16-bit");
 	if (!mapping)
-		mapping = std::make_unique<content_t[]>(USHRT_MAX + 1);
+		mapping = std::make_unique<content_t[]>(CONTENT_MAX + 1);
 
-	memset(mapping.get(), 0xFF, (USHRT_MAX + 1) * sizeof(content_t));
+	memset(mapping.get(), 0xFF, (CONTENT_MAX + 1) * sizeof(content_t));
 
-	std::unordered_set<content_t> unknown_contents;
 	content_t id_counter = 0;
 	for (u32 i = 0; i < MapBlock::nodecount; i++) {
 		content_t global_id = nodes[i].getContent();
@@ -312,21 +261,13 @@ static void getBlockNodeIdMapping(NameIdMapping *nimap, MapNode *nodes,
 			id = id_counter++;
 			mapping[global_id] = id;
 
-			const ContentFeatures &f = nodedef->get(global_id);
-			const std::string &name = f.name;
-			if (name.empty())
-				unknown_contents.insert(global_id);
-			else
-				nimap->set(id, name);
+			const auto &name = nodedef->get(global_id).name;
+			nimap->set(id, name);
 		}
 
 		// Update the MapNode
 		nodes[i].setContent(id);
 	}
-	for (u16 unknown_content : unknown_contents) {
-		errorstream << "getBlockNodeIdMapping(): IGNORING ERROR: "
-				<< "Name for node id " << unknown_content << " not known" << std::endl;
-	}
 }
 
 // Correct ids in the block to match nodedef based on names.
@@ -412,7 +353,12 @@ void MapBlock::serialize(std::ostream &os_compressed, u8 version, bool disk, int
 	u8 flags = 0;
 	if(is_underground)
 		flags |= 0x01;
-	if(getDayNightDiff())
+	// This flag used to be day-night-differs, and it is no longer used.
+	// We write it anyway so that old servers can still use this.
+	// Above ground isAir implies !day-night-differs, !isAir is good enough for old servers
+	// to check whether above ground blocks should be sent.
+	// See RemoteClient::getNextBlocks(...)
+	if(!isAir())
 		flags |= 0x02;
 	if (!m_generated) {
 		flags |= 0x08;
@@ -432,7 +378,7 @@ void MapBlock::serialize(std::ostream &os_compressed, u8 version, bool disk, int
 		Bulk node data
 	*/
 	NameIdMapping nimap;
-	SharedBuffer<u8> buf;
+	Buffer<u8> buf;
 	const u8 content_width = 2;
 	const u8 params_width = 2;
  	if(disk)
@@ -527,7 +473,7 @@ bool MapBlock::deSerialize(std::istream &in_compressed, u8 version, bool disk)
 
 	TRACESTREAM(<<"MapBlock::deSerialize "<<getPos()<<std::endl);
 
-	m_day_night_differs_expired = false;
+	m_is_air_expired = true;
 
 	if(version <= 21)
 	{
@@ -543,7 +489,9 @@ bool MapBlock::deSerialize(std::istream &in_compressed, u8 version, bool disk)
 
 	u8 flags = readU8(is);
 	is_underground = (flags & 0x01) != 0;
-	m_day_night_differs = (flags & 0x02) != 0;
+	// IMPORTANT: when the version is bumped to 30 we can read m_is_air from here
+	// m_is_air = (flags & 0x02) == 0;
+
 	if (version < 27)
 		m_lighting_complete = 0xFFFF;
 	else
@@ -668,6 +616,10 @@ bool MapBlock::deSerialize(std::istream &in_compressed, u8 version, bool disk)
 			m_node_timers.deSerialize(is, version);
 		}
 
+		u16 dummy;
+		m_is_air = nimap.size() == 1 && nimap.getId("air", dummy);
+		m_is_air_expired = false;
+
 		analyzeContent();
 	}
 
@@ -702,7 +654,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 		return getNodeNoLock(p);
 	}
 
-	void MapBlock::setNode(v3pos_t p, MapNode & n)
+	void MapBlock::setNode(const v3pos_t &p, MapNode & n, bool important)
 	{
 #ifndef NDEBUG
 		g_profiler->add("Map: setNode", 1);
@@ -723,6 +675,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 		modified_light light = modified_light_no;
 		if (f0.light_propagates != f1.light_propagates || f0.solidness != f1.solidness || f0.light_source != f1.light_source) /*|| f0.drawtype != f1.drawtype*/
 			light = modified_light_yes;
+	   if (important)
 		raiseModified(MOD_STATE_WRITE_NEEDED, light);
 	}
 
@@ -731,9 +684,11 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 		static const thread_local auto save_changed_block = g_settings->getBool("save_changed_block");
 		if (save_changed_block || important || m_disk_timestamp != BLOCK_TIMESTAMP_UNDEFINED ) {
 
-		if(mod >= MOD_STATE_WRITE_NEEDED /*&& m_timestamp != BLOCK_TIMESTAMP_UNDEFINED*/) {
+/*
+		if(mod >= MOD_STATE_WRITE_NEEDED / *&& m_timestamp != BLOCK_TIMESTAMP_UNDEFINED* /) {
 			m_changed_timestamp = (unsigned int)m_parent->time_life;
 		}
+*/		
 		if(mod > m_modified){
 			m_modified = mod;
 			if(m_modified >= MOD_STATE_WRITE_AT_UNLOAD)
@@ -769,7 +724,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 
 
 #if BUILD_CLIENT
-	MapBlock::mesh_type MapBlock::getLodMesh(int step, bool allow_other)
+	const MapBlock::mesh_type MapBlock::getLodMesh(block_step_t step, bool allow_other)
 	{
 
 		if (m_lod_mesh[step] || !allow_other)
@@ -784,7 +739,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 		return {};
 	}
 
-	MapBlock::mesh_type MapBlock::getFarMesh(int step)
+	const MapBlock::mesh_type MapBlock::getFarMesh(block_step_t step)
 	{
 		return m_far_mesh[step];
 	}
@@ -796,7 +751,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 		m_lod_mesh[ms] = rmesh;
 	}
 
-	void MapBlock::setFarMesh(const MapBlock::mesh_type &rmesh, uint32_t time)
+	void MapBlock::setFarMesh(const MapBlock::mesh_type &rmesh, block_step_t step)
 	{
 		const auto ms = rmesh->far_step;
 		if (m_far_mesh[ms]) {
@@ -845,13 +800,13 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 {
 	// Initialize default flags
 	is_underground = false;
-	m_day_night_differs = false;
+	m_is_air = false;
 	m_lighting_complete = 0xFFFF;
 	m_generated = true;
 
 	// Make a temporary buffer
 	u32 ser_length = MapNode::serializedLength(version);
-	SharedBuffer<u8> databuf_nodelist(nodecount * ser_length);
+	Buffer<u8> databuf_nodelist(nodecount * ser_length);
 
 	// These have no compression
 	if (version <= 3 || version == 5 || version == 6) {
@@ -911,7 +866,6 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 		u8 flags;
 		is.read((char*)&flags, 1);
 		is_underground = (flags & 0x01) != 0;
-		m_day_night_differs = (flags & 0x02) != 0;
 		if (version >= 18)
 			m_generated = (flags & 0x08) == 0;
 
@@ -996,9 +950,13 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 		// If supported, read node definition id mapping
 		if (version >= 21) {
 			nimap.deSerialize(is);
+			u16 dummy;
+			m_is_air = nimap.size() == 1 && nimap.getId("air", dummy);
 		// Else set the legacy mapping
 		} else {
 			content_mapnode_get_name_id_mapping(&nimap);
+			m_is_air = false;
+			m_is_air_expired = true;
 		}
 		correctBlockNodeIds(&nimap, data, m_gamedef);
 	}
@@ -1084,7 +1042,7 @@ std::string analyze_block(MapBlock *block)
 	if (block == NULL)
 		return "NULL";
 
-	auto lock = block->lock_shared_rec();
+	const auto lock = block->lock_shared_rec();
 	std::ostringstream desc;
 
 	v3s16 p = block->getPos();
diff --git a/src/mapblock.h b/src/mapblock.h
index ab01c99c4..8c174a55e 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -22,11 +22,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "config.h"
+
 #include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <mutex>
-#include <set>
+#include <stdatomic.h>
+#include <vector>
 #include "irr_v3d.h"
 #include "mapnode.h"
 #include "exceptions.h"
@@ -70,65 +70,55 @@ struct abm_trigger_one {
 //// MapBlock modified reason flags
 ////
 
-#define MOD_REASON_INITIAL                   (1 << 0)
-#define MOD_REASON_REALLOCATE                (1 << 1)
-#define MOD_REASON_SET_IS_UNDERGROUND        (1 << 2)
-#define MOD_REASON_SET_LIGHTING_COMPLETE     (1 << 3)
-#define MOD_REASON_SET_GENERATED             (1 << 4)
-#define MOD_REASON_SET_NODE                  (1 << 5)
-#define MOD_REASON_SET_NODE_NO_CHECK         (1 << 6)
-#define MOD_REASON_SET_TIMESTAMP             (1 << 7)
-#define MOD_REASON_REPORT_META_CHANGE        (1 << 8)
-#define MOD_REASON_CLEAR_ALL_OBJECTS         (1 << 9)
-#define MOD_REASON_BLOCK_EXPIRED             (1 << 10)
-#define MOD_REASON_ADD_ACTIVE_OBJECT_RAW     (1 << 11)
-#define MOD_REASON_REMOVE_OBJECTS_REMOVE     (1 << 12)
-#define MOD_REASON_REMOVE_OBJECTS_DEACTIVATE (1 << 13)
-#define MOD_REASON_TOO_MANY_OBJECTS          (1 << 14)
-#define MOD_REASON_STATIC_DATA_ADDED         (1 << 15)
-#define MOD_REASON_STATIC_DATA_REMOVED       (1 << 16)
-#define MOD_REASON_STATIC_DATA_CHANGED       (1 << 17)
-#define MOD_REASON_EXPIRE_DAYNIGHTDIFF       (1 << 18)
-#define MOD_REASON_VMANIP                    (1 << 19)
-#define MOD_REASON_UNKNOWN                   (1 << 20)
+enum ModReason : u32 {
+	MOD_REASON_REALLOCATE                 = 1 << 0,
+	MOD_REASON_SET_IS_UNDERGROUND         = 1 << 1,
+	MOD_REASON_SET_LIGHTING_COMPLETE      = 1 << 2,
+	MOD_REASON_SET_GENERATED              = 1 << 3,
+	MOD_REASON_SET_NODE                   = 1 << 4,
+	MOD_REASON_SET_TIMESTAMP              = 1 << 5,
+	MOD_REASON_REPORT_META_CHANGE         = 1 << 6,
+	MOD_REASON_CLEAR_ALL_OBJECTS          = 1 << 7,
+	MOD_REASON_BLOCK_EXPIRED              = 1 << 8,
+	MOD_REASON_ADD_ACTIVE_OBJECT_RAW      = 1 << 9,
+	MOD_REASON_REMOVE_OBJECTS_REMOVE      = 1 << 10,
+	MOD_REASON_REMOVE_OBJECTS_DEACTIVATE  = 1 << 11,
+	MOD_REASON_TOO_MANY_OBJECTS           = 1 << 12,
+	MOD_REASON_STATIC_DATA_ADDED          = 1 << 13,
+	MOD_REASON_STATIC_DATA_REMOVED        = 1 << 14,
+	MOD_REASON_STATIC_DATA_CHANGED        = 1 << 15,
+	MOD_REASON_EXPIRE_IS_AIR              = 1 << 16,
+	MOD_REASON_VMANIP                     = 1 << 17,
+	MOD_REASON_UNKNOWN                    = 1 << 18,
+};
 
 ////
 //// MapBlock itself
 ////
 
 class MapBlock
-: public locker<>
+ : public locker<>
 {
 public:
-	MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef);
+	MapBlock(v3s16 pos, IGameDef *gamedef);
 	~MapBlock();
 
-	/*virtual u16 nodeContainerId() const
-	{
-		return NODECONTAINER_ID_MAPBLOCK;
-	}*/
-
-	Map *getParent()
-	{
-		return m_parent;
-	}
-
 	// Any server-modding code can "delete" arbitrary blocks (i.e. with
 	// core.delete_area), which makes them orphan. Avoid using orphan blocks for
 	// anything.
 	bool isOrphan() const
 	{
-		return !m_parent;
+		return m_orphan;
 	}
 
 	void makeOrphan()
 	{
-		m_parent = nullptr;
+		m_orphan = true;
 	}
 
 	void reallocate()
 	{
-		auto lock = lock_unique_rec();
+		const auto lock = lock_unique_rec();
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
 #if __GNUC__ > 7
@@ -152,8 +142,8 @@ public:
 		Flags
 	*/
 
-	enum modified_light {modified_light_no = 0, modified_light_yes};
-	void raiseModified(u32 mod, modified_light light = modified_light_no, bool important = false);
+	//enum modified_light {modified_light_no = 0, modified_light_yes};
+	//void raiseModified(u32 mod, modified_light light = modified_light_no, bool important = false);
 	
 	MapNode* getData()
 	{
@@ -163,7 +153,7 @@ public:
 	////
 	//// Modification tracking methods
 	////
-	void raiseModified(u32 mod, u32 reason, bool important = false)
+	void raiseModified(u32 mod, u32 reason=MOD_REASON_UNKNOWN, bool important = false)
 	{
 		raiseModified(mod, modified_light_no, important);
 #ifdef WTFdebug
@@ -177,7 +167,7 @@ public:
 		}
 #endif
 		if (mod == MOD_STATE_WRITE_NEEDED)
-			contents_cached = false;
+			contents.clear();
 	}
 
 	inline u32 getModified()
@@ -185,6 +175,11 @@ public:
 		return m_modified;
 	}
 
+	inline u32 getModifiedReason()
+	{
+		return m_modified_reason;
+	}
+
 	std::string getModifiedReasonString();
 
 	inline void resetModified()
@@ -218,7 +213,7 @@ public:
 */
 			m_lighting_complete = newflags;
 /*
-			raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_LIGHTING_COMPLETE);
+			raiseModified(MOD_STATE_WRITE_AT_UNLOAD, MOD_REASON_SET_LIGHTING_COMPLETE);
 		}
 */
 	}
@@ -231,7 +226,7 @@ public:
 	inline void setLightingComplete(LightBank bank, u8 direction,
 		bool is_complete)
 	{
-		assert(direction >= 0 && direction <= 5);
+		assert(direction <= 5);
 		if (bank == LIGHTBANK_NIGHT) {
 			direction += 6;
 		}
@@ -246,7 +241,7 @@ public:
 
 	inline bool isLightingComplete(LightBank bank, u8 direction)
 	{
-		assert(direction >= 0 && direction <= 5);
+		assert(direction <= 5);
 		if (bank == LIGHTBANK_NIGHT) {
 			direction += 6;
 		}
@@ -282,10 +277,14 @@ public:
 		return m_pos_relative;
 	}
 
-	inline core::aabbox3d<s16> getBox()
+	inline core::aabbox3d<s16> getBox() {
+		return getBox(getPosRelative());
+	}
+
+	static inline core::aabbox3d<s16> getBox(const v3s16 &pos_relative)
 	{
-		return core::aabbox3d<s16>(getPosRelative(),
-				getPosRelative()
+		return core::aabbox3d<s16>(pos_relative,
+				pos_relative
 				+ v3s16(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE)
 				- v3s16(1,1,1));
 	}
@@ -324,18 +323,6 @@ public:
 		return getNodeNoEx(p);
 	}
 
-	MapNode &getNodeTry(v3pos_t p)
-	{
-		auto lock = try_lock_shared_rec();
-		if (!lock->owns_lock())
-			return ignoreNode;
-		return getNodeNoLock(p);
-/*
-		bool is_valid;
-		return getNode(p.X, p.Y, p.Z, &is_valid);
-*/
-	}
-
 /*
 	inline void setNode(s16 x, s16 y, s16 z, MapNode n)
 	{
@@ -345,21 +332,13 @@ public:
 		data[z * zstride + y * ystride + x] = n;
 		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE);
 	}
+
+	inline void setNode(v3s16 p, MapNode n)
+	{
+		setNode(p.X, p.Y, p.Z, n);
+	}
 */
 
-	void setNode(v3pos_t p, MapNode& n);
-
-	MapNode &getNodeNoLock(v3pos_t p)
-	{
-		return data[p.Z*zstride + p.Y*ystride + p.X];
-	}
-
-	inline void setNodeNoLock(v3pos_t p, MapNode n, bool important = false)
-	{
-		data[p.Z * zstride + p.Y * ystride + p.X] = n;
-		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE_NO_CHECK, important);
-	}
-
 	////
 	//// Non-checking variants of the above
 	////
@@ -380,7 +359,7 @@ public:
         auto lock = lock_unique_rec();
 
 		data[z * zstride + y * ystride + x] = n;
-		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE_NO_CHECK);
+		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE);
 	}
 
 	inline void setNodeNoCheck(v3pos_t p, MapNode n, bool important = false)
@@ -388,34 +367,28 @@ public:
 		auto lock = lock_unique_rec();
 
 		data[p.Z * zstride + p.Y * ystride + p.X] = n;
-		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE_NO_CHECK, important);
+		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE, important);
 	}
 
-	// These functions consult the parent container if the position
-	// is not valid on this MapBlock.
-	bool isValidPositionParent(v3s16 p);
-	MapNode getNodeParent(v3s16 p, bool *is_valid_position = NULL);
-
 	// Copies data to VoxelManipulator to getPosRelative()
 	void copyTo(VoxelManipulator &dst);
 
 	// Copies data from VoxelManipulator getPosRelative()
 	void copyFrom(VoxelManipulator &dst);
 
-	// Update day-night lighting difference flag.
-	// Sets m_day_night_differs to appropriate value.
-	// These methods don't care about neighboring blocks.
-	void actuallyUpdateDayNightDiff();
+	// Update is air flag.
+	// Sets m_is_air to appropriate value.
+	void actuallyUpdateIsAir();
 
 	// Call this to schedule what the previous function does to be done
 	// when the value is actually needed.
-	void expireDayNightDiff();
+	void expireIsAirCache();
 
-	inline bool getDayNightDiff()
+	inline bool isAir()
 	{
-		if (m_day_night_differs_expired)
-			actuallyUpdateDayNightDiff();
-		return m_day_night_differs;
+		if (m_is_air_expired)
+			actuallyUpdateIsAir();
+		return m_is_air;
 	}
 
 	bool onObjectsActivation();
@@ -475,15 +448,17 @@ public:
 
 	inline void refGrab()
 	{
+		assert(m_refcount < SHRT_MAX);
 		m_refcount++;
 	}
 
 	inline void refDrop()
 	{
+		assert(m_refcount > 0);
 		m_refcount--;
 	}
 
-	inline int refGet()
+	inline short refGet()
 	{
 		return m_refcount;
 	}
@@ -527,40 +502,34 @@ public:
 	void serializeNetworkSpecific(std::ostream &os);
 	void deSerializeNetworkSpecific(std::istream &is);
 
-
 //fm:
+	/*
+		Flags
+	*/
+
+	enum modified_light {modified_light_no = 0, modified_light_yes};
+	void raiseModified(u32 mod, modified_light light = modified_light_no, bool important = false);
+
+
 	void pushElementsToCircuit(Circuit* circuit);
 
-	typedef std::shared_ptr<MapBlockMesh> mesh_type;
+	void fill(const MapNode & n) {
+		for (u32 i = 0; i < nodecount; ++i)
+			data[i] = n;
+	}
+
+	using mesh_type = std::shared_ptr<MapBlockMesh>;
+	using block_step_t = uint8_t;
 
 #if BUILD_CLIENT // Only on client
-	MapBlock::mesh_type getLodMesh(int step, bool allow_other = false);
-	void setLodMesh(const MapBlock::mesh_type & rmesh);
-	MapBlock::mesh_type getFarMesh(int step);
-	void setFarMesh(const MapBlock::mesh_type & rmesh, uint32_t time);
+	const MapBlock::mesh_type getLodMesh(block_step_t step, bool allow_other = false);
+	void setLodMesh(const MapBlock::mesh_type &rmesh);
+	const MapBlock::mesh_type getFarMesh(block_step_t step);
+	void setFarMesh(const MapBlock::mesh_type &rmesh, block_step_t step);
 	std::mutex far_mutex;
-	u32 mesh_requested_timestamp = 0;
-#endif
-//===
+	u32 mesh_requested_timestamp {};
+	uint8_t mesh_requested_step {};
 
-
-	bool storeActiveObject(u16 id);
-	// clearObject and return removed objects count
-	u32 clearObjects();
-
-private:
-	/*
-		Private methods
-	*/
-
-	void deSerialize_pre22(std::istream &is, u8 version, bool disk);
-
-public:
-	/*
-		Public member variables
-	*/
-
-#if BUILD_CLIENT // Only on client
 private:
 	std::array<MapBlock::mesh_type, LODMESH_STEP_MAX + 1> m_lod_mesh;
 	std::array<MapBlock::mesh_type, FARMESH_STEP_MAX + 1> m_far_mesh;
@@ -569,28 +538,29 @@ private:
 public:	
 #endif
 
-	NodeMetadataList m_node_metadata;
-	StaticObjectList m_static_objects;
-	
-	std::atomic_short heat {0};
-	std::atomic_short humidity {0};
-	std::atomic_short heat_add {0};
-	std::atomic_short humidity_add {0};
-	std::atomic_ulong heat_last_update {0};
-	u32 humidity_last_update = 0;
-	float m_uptime_timer_last = 0;
-	std::atomic_short usage_timer_multiplier {1};
+	block_step_t far_step{};
+	std::atomic_uint32_t far_iteration{};
+	std::atomic_bool creating_far_mesh{};
+	std::atomic_short heat{};
+	std::atomic_short humidity{};
+	std::atomic_short heat_add{};
+	std::atomic_short humidity_add{};
+	std::atomic_ulong heat_last_update{};
+	std::atomic_uint32_t humidity_last_update{};
+	float m_uptime_timer_last{};
+	std::atomic_short usage_timer_multiplier{1};
 
 	// Last really changed time (need send to client)
-	std::atomic_uint m_changed_timestamp {0};
-	u32 m_next_analyze_timestamp = 0;
+	std::atomic_uint m_changed_timestamp{};
+	u32 m_next_analyze_timestamp{};
 	typedef std::list<abm_trigger_one> abm_triggers_type;
 	std::unique_ptr<abm_triggers_type> abm_triggers;
 	std::mutex abm_triggers_mutex;
-	size_t abmTriggersRun(ServerEnvironment * m_env, u32 time, uint8_t activate = 0);
+	size_t abmTriggersRun(ServerEnvironment *m_env, u32 time, uint8_t activate = 0);
 	u32 m_abm_timestamp = 0;
 
-	u32 getActualTimestamp() {
+	u32 getActualTimestamp()
+	{
 		u32 block_timestamp = 0;
 		if (m_changed_timestamp && m_changed_timestamp != BLOCK_TIMESTAMP_UNDEFINED) {
 			block_timestamp = m_changed_timestamp;
@@ -601,62 +571,10 @@ public:
 	}
 
 	// Set to content type of a node if the block consists solely of nodes of one type, otherwise set to CONTENT_IGNORE
-	std::atomic<content_t> content_only = CONTENT_IGNORE;
-	u8 content_only_param1 = 0, content_only_param2 = 0;
+	std::atomic<content_t> content_only{CONTENT_IGNORE};
+	u8 content_only_param1{}, content_only_param2{};
 	bool analyzeContent();
-
-	static const u32 ystride = MAP_BLOCKSIZE;
-	static const u32 zstride = MAP_BLOCKSIZE * MAP_BLOCKSIZE;
-
-	static const u32 nodecount = MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
-
-	//// ABM optimizations ////
-	// Cache of content types
-	std::unordered_set<content_t> contents;
-	// True if content types are cached
-	std::atomic_bool contents_cached {false};
-	// True if we never want to cache content types for this block
-	bool do_not_cache_contents = false;
-	// marks the sides which are opaque: 00+Z-Z+Y-Y+X-X
-	u8 solid_sides {0};
-
-private:
-	/*
-		Private member variables
-	*/
-
-	// NOTE: Lots of things rely on this being the Map
-	Map *m_parent;
-	// Position in blocks on parent
-	v3s16 m_pos;
-
-	/* This is the precalculated m_pos_relative value
-	* This caches the value, improving performance by removing 3 s16 multiplications
-	* at runtime on each getPosRelative call
-	* For a 5 minutes runtime with valgrind this removes 3 * 19M s16 multiplications
-	* The gain can be estimated in Release Build to 3 * 100M multiply operations for 5 mins
-	*/
-	v3s16 m_pos_relative;
-
-	IGameDef *m_gamedef;
-
-	/*
-		- On the server, this is used for telling whether the
-		  block has been modified from the one on disk.
-		- On the client, this is used for nothing.
-	*/
-	std::atomic_uint8_t m_modified = MOD_STATE_CLEAN;
-	u32 m_modified_reason = MOD_REASON_INITIAL;
-
-	/*
-		When propagating sunlight and the above block doesn't exist,
-		sunlight is assumed if this is false.
-
-		In practice this is set to true if the block is completely
-		undeground with nothing visible above the ground except
-		caves.
-	*/
-	std::atomic_bool is_underground = false;
+	std::mutex m_usage_timer_mutex;
 
 	/*
 		Set to true if changes has been made that make the old lighting
@@ -668,6 +586,137 @@ private:
 
 	std::atomic_bool m_lighting_expired {false};
 
+	inline MapNode getNodeTry(const v3pos_t &p)
+	{
+		auto lock = try_lock_shared_rec();
+		if (!lock->owns_lock())
+			return ignoreNode;
+		return getNodeNoLock(p);
+	}
+
+	inline MapNode& getNodeRef(const v3pos_t &p)
+	{
+		auto lock = try_lock_shared_rec();
+		if (!lock->owns_lock())
+			return ignoreNode;
+		return getNodeNoLock(p);
+	}
+
+	void setNode(const v3pos_t &p, MapNode &n, bool important = false);
+
+	MapNode &getNodeNoLock(const v3pos_t &p)
+	{
+		return data[p.Z * zstride + p.Y * ystride + p.X];
+	}
+
+	inline void setNodeNoLock(const v3pos_t & p, MapNode n, bool important = false)
+	{
+		data[p.Z * zstride + p.Y * ystride + p.X] = n;
+		raiseModified(MOD_STATE_WRITE_NEEDED, MOD_REASON_SET_NODE, important);
+	}
+
+//===
+
+	bool storeActiveObject(u16 id);
+	// clearObject and return removed objects count
+	u32 clearObjects();
+
+	static const u32 ystride = MAP_BLOCKSIZE;
+	static const u32 zstride = MAP_BLOCKSIZE * MAP_BLOCKSIZE;
+
+	static const u32 nodecount = MAP_BLOCKSIZE * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
+
+private:
+	/*
+		Private methods
+	*/
+
+	void deSerialize_pre22(std::istream &is, u8 version, bool disk);
+
+	/*
+	 * PLEASE NOTE: When adding something here be mindful of position and size
+	 * of member variables! This is also the reason for the weird public-private
+	 * interleaving.
+	 * If in doubt consult `pahole` to see the effects.
+	 */
+
+public:
+#ifndef SERVER // Only on client
+/*
+	MapBlockMesh *mesh = nullptr;
+*/
+	// marks the sides which are opaque: 00+Z-Z+Y-Y+X-X
+	u8 solid_sides = 0;
+#endif
+
+private:
+	// see isOrphan()
+	bool m_orphan = false;
+
+	// Position in blocks on parent
+	v3s16 m_pos;
+
+	/* Precalculated m_pos_relative value
+	 * This caches the value, improving performance by removing 3 s16 multiplications
+	 * at runtime on each getPosRelative call.
+	 * For a 5 minutes runtime with valgrind this removes 3 * 19M s16 multiplications.
+	 * The gain can be estimated in Release Build to 3 * 100M multiply operations for 5 mins.
+	 */
+	v3s16 m_pos_relative;
+
+	/*
+		Reference count; currently used for determining if this block is in
+		the list of blocks to be drawn.
+	*/
+	std::atomic_short m_refcount = 0;
+
+	/*
+	 * Note that this is not an inline array because that has implications for
+	 * heap fragmentation (the array is exactly 16K), CPU caches and/or
+	 * optimizability of algorithms working on this array.
+	 */
+	MapNode *const data; // of `nodecount` elements
+
+	// provides the item and node definitions
+	IGameDef *m_gamedef;
+
+	/*
+		When the block is accessed, this is set to 0.
+		Map will unload the block when this reaches a timeout.
+	*/
+	float m_usage_timer = 0;
+
+public:
+	//// ABM optimizations ////
+	// True if we never want to cache content types for this block
+	bool do_not_cache_contents = false;
+	// Cache of content types
+	// This is actually a set but for the small sizes we have a vector should be
+	// more efficient.
+	// Can be empty, in which case nothing was cached yet.
+	std::vector<content_t> contents;
+
+private:
+	// Whether day and night lighting differs
+	bool m_is_air = false;
+	bool m_is_air_expired = true;
+
+	/*
+		- On the server, this is used for telling whether the
+		  block has been modified from the one on disk.
+		- On the client, this is used for nothing.
+	*/
+	std::atomic_uint16_t m_modified = MOD_STATE_CLEAN;
+	u32 m_modified_reason = 0;
+
+	/*
+		When block is removed from active blocks, this is set to gametime.
+		Value BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp.
+	*/
+	std::atomic_uint32_t m_timestamp = BLOCK_TIMESTAMP_UNDEFINED;
+	// The on-disk (or to-be on-disk) timestamp value
+	std::atomic_uint32_t m_disk_timestamp = BLOCK_TIMESTAMP_UNDEFINED;
+
 	/*!
 	 * Each bit indicates if light spreading was finished
 	 * in a direction. (Because the neighbor could also be unloaded.)
@@ -678,36 +727,23 @@ private:
 	*/
 	std::atomic_short m_lighting_complete {static_cast<short>(0xFFFF)};
 
-	// Whether day and night lighting differs
-	bool m_day_night_differs = false;
-	std::atomic_bool m_day_night_differs_expired {true};
-
-	std::atomic_bool m_generated {false};
+	// Whether mapgen has generated the content of this block (persisted)
+	std::atomic_bool m_generated = false;
 
 	/*
-		When block is removed from active blocks, this is set to gametime.
-		Value BLOCK_TIMESTAMP_UNDEFINED=0xffffffff means there is no timestamp.
-	*/
-	std::atomic_uint m_timestamp {BLOCK_TIMESTAMP_UNDEFINED};
-	// The on-disk (or to-be on-disk) timestamp value
-	std::atomic_uint m_disk_timestamp = BLOCK_TIMESTAMP_UNDEFINED;
+		When propagating sunlight and the above block doesn't exist,
+		sunlight is assumed if this is false.
 
-	/*
-		When the block is accessed, this is set to 0.
-		Map will unload the block when this reaches a timeout.
+		In practice this is set to true if the block is completely
+		undeground with nothing visible above the ground except
+		caves.
 	*/
-	std::mutex m_usage_timer_mutex;
-	float m_usage_timer = 0;
-
-	/*
-		Reference count; currently used for determining if this block is in
-		the list of blocks to be drawn.
-	*/
-	std::atomic_int m_refcount {0};
-
-	MapNode data[nodecount];
+	std::atomic_bool is_underground = false;
 
 public:
+	NodeMetadataList m_node_metadata;
+	StaticObjectList m_static_objects;
+
 	NodeTimerList m_node_timers;
 };
 
diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index 436bc4931..135302e02 100644
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -79,6 +79,7 @@ FlagDesc flagdesc_gennotify[] = {
 	{"large_cave_begin", 1 << GENNOTIFY_LARGECAVE_BEGIN},
 	{"large_cave_end",   1 << GENNOTIFY_LARGECAVE_END},
 	{"decoration",       1 << GENNOTIFY_DECORATION},
+	{"custom",           1 << GENNOTIFY_CUSTOM},
 	{NULL,               0}
 };
 
@@ -121,7 +122,7 @@ static_assert(
 ////
 
 Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeParams *emerge) :
-	gennotify(emerge->gen_notify_on, emerge->gen_notify_on_deco_ids)
+	gennotify(emerge->createNotifier())
 {
 	id           = mapgenid;
 	water_level  = params->water_level;
@@ -1066,39 +1067,67 @@ void MapgenBasic::generateDungeons(s16 max_stone_y)
 ////
 
 GenerateNotifier::GenerateNotifier(u32 notify_on,
-	const std::set<u32> *notify_on_deco_ids)
+	const std::set<u32> *notify_on_deco_ids,
+	const std::set<std::string> *notify_on_custom)
 {
 	m_notify_on = notify_on;
 	m_notify_on_deco_ids = notify_on_deco_ids;
+	m_notify_on_custom = notify_on_custom;
 }
 
 
-bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos, u32 id)
+bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos)
 {
-	if (!(m_notify_on & (1 << type)))
-		return false;
-
-	if (type == GENNOTIFY_DECORATION &&
-		m_notify_on_deco_ids->find(id) == m_notify_on_deco_ids->cend())
+	assert(type != GENNOTIFY_DECORATION && type != GENNOTIFY_CUSTOM);
+	if (!shouldNotifyOn(type))
 		return false;
 
 	GenNotifyEvent gne;
 	gne.type = type;
 	gne.pos  = pos;
-	gne.id   = id;
-	m_notify_events.push_back(gne);
+	m_notify_events.emplace_back(std::move(gne));
+	return true;
+}
 
+
+bool GenerateNotifier::addDecorationEvent(v3s16 pos, u32 id)
+{
+	if (!shouldNotifyOn(GENNOTIFY_DECORATION))
+		return false;
+	// check if data relating to this decoration was requested
+	assert(m_notify_on_deco_ids);
+	if (m_notify_on_deco_ids->find(id) == m_notify_on_deco_ids->cend())
+		return false;
+
+	GenNotifyEvent gne;
+	gne.type = GENNOTIFY_DECORATION;
+	gne.pos  = pos;
+	gne.id   = id;
+	m_notify_events.emplace_back(std::move(gne));
+	return true;
+}
+
+
+bool GenerateNotifier::setCustom(const std::string &key, const std::string &value)
+{
+	if (!shouldNotifyOn(GENNOTIFY_CUSTOM))
+		return false;
+	// check if this key was requested to be saved
+	assert(m_notify_on_custom);
+	if (m_notify_on_custom->count(key) == 0)
+		return false;
+
+	m_notify_custom[key] = value;
 	return true;
 }
 
 
 void GenerateNotifier::getEvents(
-	std::map<std::string, std::vector<v3s16> > &event_map)
+	std::map<std::string, std::vector<v3s16>> &event_map) const
 {
-	std::list<GenNotifyEvent>::iterator it;
+	for (auto &gn : m_notify_events) {
+		assert(gn.type != GENNOTIFY_CUSTOM); // never stored in this list
 
-	for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) {
-		GenNotifyEvent &gn = *it;
 		std::string name = (gn.type == GENNOTIFY_DECORATION) ?
 			"decoration#"+ itos(gn.id) :
 			flagdesc_gennotify[gn.type].name;
@@ -1111,6 +1140,7 @@ void GenerateNotifier::getEvents(
 void GenerateNotifier::clearEvents()
 {
 	m_notify_events.clear();
+	m_notify_custom.clear();
 }
 
 
diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index c1d50ed63..82bb7852a 100644
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -79,29 +79,41 @@ enum GenNotifyType {
 	GENNOTIFY_LARGECAVE_BEGIN,
 	GENNOTIFY_LARGECAVE_END,
 	GENNOTIFY_DECORATION,
+	GENNOTIFY_CUSTOM, // user-defined data
 	NUM_GENNOTIFY_TYPES
 };
 
-struct GenNotifyEvent {
-	GenNotifyType type;
-	v3s16 pos;
-	u32 id;
-};
-
 class GenerateNotifier {
 public:
+	struct GenNotifyEvent {
+		GenNotifyType type;
+		v3s16 pos;
+		u32 id; // for GENNOTIFY_DECORATION
+	};
+
 	// Use only for temporary Mapgen objects with no map generation!
 	GenerateNotifier() = default;
-	GenerateNotifier(u32 notify_on, const std::set<u32> *notify_on_deco_ids);
+	// normal constructor
+	GenerateNotifier(u32 notify_on, const std::set<u32> *notify_on_deco_ids,
+		const std::set<std::string> *notify_on_custom);
 
-	bool addEvent(GenNotifyType type, v3s16 pos, u32 id=0);
-	void getEvents(std::map<std::string, std::vector<v3s16> > &event_map);
+	bool addEvent(GenNotifyType type, v3s16 pos);
+	bool addDecorationEvent(v3s16 pos, u32 deco_id);
+	bool setCustom(const std::string &key, const std::string &value);
+	void getEvents(std::map<std::string, std::vector<v3s16>> &map) const;
+	const StringMap &getCustomData() const { return m_notify_custom; }
 	void clearEvents();
 
 private:
 	u32 m_notify_on = 0;
 	const std::set<u32> *m_notify_on_deco_ids = nullptr;
+	const std::set<std::string> *m_notify_on_custom = nullptr;
 	std::list<GenNotifyEvent> m_notify_events;
+	StringMap m_notify_custom;
+
+	inline bool shouldNotifyOn(GenNotifyType type) const {
+		return m_notify_on & (1 << type);
+	}
 };
 
 // Order must match the order of 'static MapgenDesc g_reg_mapgens[]' in mapgen.cpp
@@ -164,6 +176,7 @@ private:
 */
 class Mapgen {
 public:
+	// Seed used for noises (truncated from the map seed)
 	s32 seed = 0;
 	int water_level = 0;
 	int mapgen_limit = 0;
@@ -177,6 +190,7 @@ public:
 	EmergeParams *m_emerge = nullptr;
 	const NodeDefManager *ndef = nullptr;
 
+	// Chunk-specific seed used to place ores and decorations
 	u32 blockseed;
 	s16 *heightmap = nullptr;
 	biome_t *biomemap = nullptr;
diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp
index c80a4b535..18aa130d3 100644
--- a/src/mapgen/mapgen_v6.cpp
+++ b/src/mapgen/mapgen_v6.cpp
@@ -53,6 +53,7 @@ FlagDesc flagdesc_mapgen_v6[] = {
 	{"snowbiomes", MGV6_SNOWBIOMES},
 	{"flat",       MGV6_FLAT},
 	{"trees",      MGV6_TREES},
+	{"temples",    MGV6_TEMPLES},
 	{"floatlands", MGV6_FLOATLANDS},
 	{NULL,         0}
 };
@@ -237,7 +238,8 @@ void MapgenV6Params::writeParams(Settings *settings) const
 void MapgenV6Params::setDefaultSettings(Settings *settings)
 {
 	settings->setDefault("mgv6_spflags", flagdesc_mapgen_v6, MGV6_JUNGLES |
-		MGV6_SNOWBIOMES | MGV6_TREES | MGV6_BIOMEBLEND | MGV6_MUDFLOW);
+		MGV6_SNOWBIOMES | MGV6_TREES | MGV6_BIOMEBLEND | MGV6_MUDFLOW |
+		MGV6_TEMPLES);
 }
 
 
@@ -604,7 +606,8 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 			dp.np_alt_wall
 				= NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0);
 
-			if (getBiome(0, node_min) == BT_DESERT) {
+			if ((spflags & MGV6_TEMPLES) &&
+					getBiome(0, node_min) == BT_DESERT) {
 				dp.c_wall              = c_desert_stone;
 				dp.c_alt_wall          = CONTENT_IGNORE;
 				dp.c_stair             = c_stair_desert_stone;
diff --git a/src/mapgen/mapgen_v6.h b/src/mapgen/mapgen_v6.h
index 39f25857a..a11db7475 100644
--- a/src/mapgen/mapgen_v6.h
+++ b/src/mapgen/mapgen_v6.h
@@ -41,7 +41,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #define MGV6_SNOWBIOMES 0x08
 #define MGV6_FLAT       0x10
 #define MGV6_TREES      0x20
-#define MGV6_FLOATLANDS 0x40
+#define MGV6_TEMPLES    0x40
+#define MGV6_FLOATLANDS 0x80
 
 
 extern FlagDesc flagdesc_mapgen_v6[];
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
index 4424ad736..0026ff420 100644
--- a/src/mapgen/mg_biome.cpp
+++ b/src/mapgen/mg_biome.cpp
@@ -34,6 +34,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "porting.h"
 #include "settings.h"
 
+#include <algorithm>
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -326,7 +327,11 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
 	// Carefully tune pseudorandom seed variation to avoid single node dither
 	// and create larger scale blending patterns similar to horizontal biome
 	// blend.
-	const u64 seed = pos.Y + (heat + humidity) * 0.9f;
+	// The calculation can be a negative floating point number, which is an
+	// undefined behavior if assigned to unsigned integer. Cast the result
+	// into signed integer before it is casted into unsigned integer to
+	// eliminate the undefined behavior.
+	const u64 seed = static_cast<s64>(pos.Y + (heat + humidity) * 0.9f);
 	PcgRandom rng(seed);
 
 	if (biome_closest_blend && dist_min_blend <= dist_min &&
diff --git a/src/mapgen/mg_decoration.cpp b/src/mapgen/mg_decoration.cpp
index 75764a9f1..f647059d7 100644
--- a/src/mapgen/mg_decoration.cpp
+++ b/src/mapgen/mg_decoration.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include <algorithm>
 #include <vector>
+#include "mapgen/treegen.h"
 
 
 FlagDesc flagdesc_deco[] = {
@@ -236,8 +237,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 
 						v3s16 pos(x, y, z);
 						if (generate(mg->vm, &ps, pos, false))
-							mg->gennotify.addEvent(
-									GENNOTIFY_DECORATION, pos, index);
+							mg->gennotify.addDecorationEvent(pos, index);
 					}
 				}
 
@@ -249,8 +249,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 
 						v3s16 pos(x, y, z);
 						if (generate(mg->vm, &ps, pos, true))
-							mg->gennotify.addEvent(
-									GENNOTIFY_DECORATION, pos, index);
+							mg->gennotify.addDecorationEvent(pos, index);
 					}
 				}
 			} else { // Heightmap decorations
@@ -273,7 +272,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 
 				v3s16 pos(x, y, z);
 				if (generate(mg->vm, &ps, pos, false))
-					mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, index);
+					mg->gennotify.addDecorationEvent(pos, index);
 			}
 		}
 	}
@@ -474,3 +473,24 @@ size_t DecoSchematic::generate(MMVManip *vm, PcgRandom *pr, v3s16 p, bool ceilin
 
 	return 1;
 }
+
+///////////////////////////////////////////////////////////////////////////////
+ObjDef *DecoLSystem::clone() const
+{
+	auto def = new DecoLSystem();
+	Decoration::cloneTo(def);
+
+	def->tree_def = tree_def;
+	return def;
+}
+
+
+size_t DecoLSystem::generate(MMVManip *vm, PcgRandom *pr, v3s16 p, bool ceiling)
+{
+	if (!canPlaceDecoration(vm, p))
+		return 0;
+
+	// Make sure that tree_def can't be modified, since it is shared.
+	const auto &ref = *tree_def;
+	return treegen::make_ltree(*vm, p, ref);
+}
diff --git a/src/mapgen/mg_decoration.h b/src/mapgen/mg_decoration.h
index 89d8d355f..41d0dac64 100644
--- a/src/mapgen/mg_decoration.h
+++ b/src/mapgen/mg_decoration.h
@@ -31,6 +31,7 @@ class Mapgen;
 class MMVManip;
 class PcgRandom;
 class Schematic;
+namespace treegen { struct TreeDef; }
 
 enum DecorationType {
 	DECO_SIMPLE,
@@ -112,12 +113,15 @@ public:
 };
 
 
-/*
 class DecoLSystem : public Decoration {
 public:
-	virtual void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+	ObjDef *clone() const;
+
+	virtual size_t generate(MMVManip *vm, PcgRandom *pr, v3s16 p, bool ceiling);
+
+	// In case it gets cloned it uses the same tree def.
+	std::shared_ptr<treegen::TreeDef> tree_def;
 };
-*/
 
 
 class DecorationManager : public ObjDefManager {
@@ -139,8 +143,8 @@ public:
 			return new DecoSimple;
 		case DECO_SCHEMATIC:
 			return new DecoSchematic;
-		//case DECO_LSYSTEM:
-		//	return new DecoLSystem;
+		case DECO_LSYSTEM:
+			return new DecoLSystem;
 		default:
 			return NULL;
 		}
diff --git a/src/mapgen/mg_schematic.cpp b/src/mapgen/mg_schematic.cpp
index 7bf309125..01c68fd03 100644
--- a/src/mapgen/mg_schematic.cpp
+++ b/src/mapgen/mg_schematic.cpp
@@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <fstream>
-#include <typeinfo>
 #include "mg_schematic.h"
 #include "server.h"
 #include "mapgen.h"
@@ -32,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include "filesys.h"
 #include "voxelalgorithms.h"
+#include "porting.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -80,6 +80,8 @@ Schematic::~Schematic()
 {
 	delete []schemdata;
 	delete []slice_probs;
+	u32 nodecount = size.X * size.Y * size.Z;
+	porting::TrackFreedMemory(nodecount * sizeof(MapNode));
 }
 
 ObjDef *Schematic::clone() const
@@ -393,7 +395,7 @@ bool Schematic::serializeToMts(std::ostream *os) const
 	}
 
 	// compressed bulk node data
-	SharedBuffer<u8> buf = MapNode::serializeBulk(MTSCHEM_MAPNODE_SER_FMT_VER,
+	auto buf = MapNode::serializeBulk(MTSCHEM_MAPNODE_SER_FMT_VER,
 		schemdata, size.X * size.Y * size.Z, 2, 2);
 	compress(buf, ss, MTSCHEM_MAPNODE_SER_FMT_VER);
 
@@ -494,12 +496,9 @@ bool Schematic::serializeToLua(std::ostream *os, bool use_comments,
 bool Schematic::loadSchematicFromFile(const std::string &filename,
 	const NodeDefManager *ndef, StringMap *replace_names)
 {
-	std::ifstream is(filename.c_str(), std::ios_base::binary);
-	if (!is.good()) {
-		errorstream << __FUNCTION__ << ": unable to open file '"
-			<< filename << "'" << std::endl;
+	auto is = open_ifstream(filename.c_str(), true);
+	if (!is.good())
 		return false;
-	}
 
 	if (!m_ndef)
 		m_ndef = ndef;
@@ -639,7 +638,7 @@ void Schematic::condenseContentIds()
 			numids++;
 
 			m_nodenames.push_back(m_ndef->get(c).name);
-			nodeidmap.emplace(std::make_pair(c, id));
+			nodeidmap.emplace(c, id);
 		} else {
 			id = it->second;
 		}
diff --git a/src/mapgen/treegen.cpp b/src/mapgen/treegen.cpp
index b39b41434..8c593912d 100644
--- a/src/mapgen/treegen.cpp
+++ b/src/mapgen/treegen.cpp
@@ -18,14 +18,14 @@ You should have received a copy of the GNU General Public License
 along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "irr_v3d.h"
 #include <stack>
+#include "treegen.h"
+#include "irr_v3d.h"
 #include "util/pointer.h"
 #include "util/numeric.h"
-#include "map.h"
+#include "servermap.h"
 #include "mapblock.h"
-#include "nodedef.h"
-#include "treegen.h"
+#include "noise.h"
 #include "voxelalgorithms.h"
 
 #include "log.h"
@@ -33,6 +33,33 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 namespace treegen
 {
 
+void TreeDef::resolveNodeNames()
+{
+	getIdFromNrBacklog(&trunknode.param0, "", CONTENT_IGNORE);
+	getIdFromNrBacklog(&leavesnode.param0, "", CONTENT_IGNORE);
+	if (leaves2_chance)
+		getIdFromNrBacklog(&leaves2node.param0, "", CONTENT_IGNORE);
+	if (fruit_chance)
+		getIdFromNrBacklog(&fruitnode.param0, "", CONTENT_IGNORE);
+}
+
+/*
+	L-System tree gen helper functions
+
+	NOTE: the PseudoRandom parameters here were probably accidentally used
+	as by-value instead of by-reference. But don't change this now to keep
+	the old behaviour.
+*/
+static void tree_trunk_placement(MMVManip &vmanip, v3f p0, const TreeDef &def);
+static void tree_leaves_placement(MMVManip &vmanip, v3f p0,
+	PseudoRandom ps, const TreeDef &def);
+static void tree_single_leaves_placement(MMVManip &vmanip, v3f p0,
+	PseudoRandom ps, const TreeDef &def);
+static void tree_fruit_placement(MMVManip &vmanip, v3f p0, const TreeDef &def);
+
+static void setRotationAxisRadians(core::matrix4 &M, float angle, v3f axis);
+static v3f transposeMatrix(const core::matrix4 &M, v3f v);
+
 void make_tree(MMVManip &vmanip, v3s16 p0, bool is_apple_tree,
 	const NodeDefManager *ndef, s32 seed)
 {
@@ -121,20 +148,18 @@ void make_tree(MMVManip &vmanip, v3s16 p0, bool is_apple_tree,
 }
 
 
-// L-System tree LUA spawner
 treegen::error spawn_ltree(ServerMap *map, v3s16 p0,
-	const NodeDefManager *ndef, const TreeDef &tree_definition)
+	const TreeDef &tree_definition)
 {
-	std::map<v3s16, MapBlock*> modified_blocks;
 	MMVManip vmanip(map);
 	v3s16 tree_blockp = getNodeBlockPos(p0);
-	treegen::error e;
 
 	vmanip.initialEmerge(tree_blockp - v3s16(1, 1, 1), tree_blockp + v3s16(1, 3, 1));
-	e = make_ltree(vmanip, p0, ndef, tree_definition);
+	treegen::error e = make_ltree(vmanip, p0, tree_definition);
 	if (e != SUCCESS)
 		return e;
 
+	std::map<v3s16, MapBlock*> modified_blocks;
 	voxalgo::blit_back_with_light(map, &vmanip, &modified_blocks);
 
 
@@ -148,9 +173,8 @@ treegen::error spawn_ltree(ServerMap *map, v3s16 p0,
 }
 
 
-//L-System tree generator
 treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
-	const NodeDefManager *ndef, TreeDef tree_definition)
+	const TreeDef &tree_definition)
 {
 	s32 seed;
 	if (tree_definition.explicit_seed)
@@ -160,10 +184,10 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
 	PseudoRandom ps(seed);
 
 	// chance of inserting abcd rules
-	double prop_a = 9;
-	double prop_b = 8;
-	double prop_c = 7;
-	double prop_d = 6;
+	constexpr float prop_a = 9;
+	constexpr float prop_b = 8;
+	constexpr float prop_c = 7;
+	constexpr float prop_d = 6;
 
 	//randomize tree growth level, minimum=2
 	s16 iterations = tree_definition.iterations;
@@ -172,13 +196,13 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
 	if (iterations < 2)
 		iterations = 2;
 
-	s16 MAX_ANGLE_OFFSET = 5;
-	double angle_in_radians = (double)tree_definition.angle * M_PI / 180;
-	double angleOffset_in_radians = (s16)(ps.range(0, 1) % MAX_ANGLE_OFFSET) * M_PI / 180;
+	constexpr s16 MAX_ANGLE_OFFSET = 5;
+	float angle_in_radians = tree_definition.angle * M_PI / 180;
+	float angleOffset_in_radians = (s16)(ps.range(0, 1) % MAX_ANGLE_OFFSET) * M_PI / 180;
 
 	//initialize rotation matrix, position and stacks for branches
 	core::matrix4 rotation;
-	rotation = setRotationAxisRadians(rotation, M_PI / 2, v3f(0, 0, 1));
+	setRotationAxisRadians(rotation, M_PI / 2, v3f(0, 0, 1));
 	v3f position;
 	position.X = p0.X;
 	position.Y = p0.Y;
@@ -489,37 +513,37 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
 			break;
 		case '+':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians + angleOffset_in_radians, v3f(0, 0, 1));
 			rotation *= temp_rotation;
 			break;
 		case '-':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians + angleOffset_in_radians, v3f(0, 0, -1));
 			rotation *= temp_rotation;
 			break;
 		case '&':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians + angleOffset_in_radians, v3f(0, 1, 0));
 			rotation *= temp_rotation;
 			break;
 		case '^':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians + angleOffset_in_radians, v3f(0, -1, 0));
 			rotation *= temp_rotation;
 			break;
 		case '*':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians, v3f(1, 0, 0));
 			rotation *= temp_rotation;
 			break;
 		case '/':
 			temp_rotation.makeIdentity();
-			temp_rotation = setRotationAxisRadians(temp_rotation,
+			setRotationAxisRadians(temp_rotation,
 					angle_in_radians, v3f(-1, 0, 0));
 			rotation *= temp_rotation;
 			break;
@@ -532,7 +556,7 @@ treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
 }
 
 
-void tree_trunk_placement(MMVManip &vmanip, v3f p0, TreeDef &tree_definition)
+void tree_trunk_placement(MMVManip &vmanip, v3f p0, const TreeDef &tree_definition)
 {
 	v3s16 p1 = v3s16(myround(p0.X), myround(p0.Y), myround(p0.Z));
 	if (!vmanip.m_area.contains(p1))
@@ -549,7 +573,7 @@ void tree_trunk_placement(MMVManip &vmanip, v3f p0, TreeDef &tree_definition)
 
 
 void tree_leaves_placement(MMVManip &vmanip, v3f p0,
-		PseudoRandom ps, TreeDef &tree_definition)
+		PseudoRandom ps, const TreeDef &tree_definition)
 {
 	MapNode leavesnode = tree_definition.leavesnode;
 	if (ps.range(1, 100) > 100 - tree_definition.leaves2_chance)
@@ -573,7 +597,7 @@ void tree_leaves_placement(MMVManip &vmanip, v3f p0,
 
 
 void tree_single_leaves_placement(MMVManip &vmanip, v3f p0,
-		PseudoRandom ps, TreeDef &tree_definition)
+		PseudoRandom ps, const TreeDef &tree_definition)
 {
 	MapNode leavesnode = tree_definition.leavesnode;
 	if (ps.range(1, 100) > 100 - tree_definition.leaves2_chance)
@@ -589,7 +613,7 @@ void tree_single_leaves_placement(MMVManip &vmanip, v3f p0,
 }
 
 
-void tree_fruit_placement(MMVManip &vmanip, v3f p0, TreeDef &tree_definition)
+void tree_fruit_placement(MMVManip &vmanip, v3f p0, const TreeDef &tree_definition)
 {
 	v3s16 p1 = v3s16(myround(p0.X), myround(p0.Y), myround(p0.Z));
 	if (!vmanip.m_area.contains(p1))
@@ -602,18 +626,18 @@ void tree_fruit_placement(MMVManip &vmanip, v3f p0, TreeDef &tree_definition)
 }
 
 
-irr::core::matrix4 setRotationAxisRadians(irr::core::matrix4 M, double angle, v3f axis)
+void setRotationAxisRadians(core::matrix4 &M, float angle, v3f axis)
 {
-	double c = cos(angle);
-	double s = sin(angle);
-	double t = 1.0 - c;
+	float c = std::cos(angle);
+	float s = std::sin(angle);
+	float t = 1.0f - c;
 
-	double tx  = t * axis.X;
-	double ty  = t * axis.Y;
-	double tz  = t * axis.Z;
-	double sx  = s * axis.X;
-	double sy  = s * axis.Y;
-	double sz  = s * axis.Z;
+	float tx  = t * axis.X;
+	float ty  = t * axis.Y;
+	float tz  = t * axis.Z;
+	float sx  = s * axis.X;
+	float sy  = s * axis.Y;
+	float sz  = s * axis.Z;
 
 	M[0] = tx * axis.X + c;
 	M[1] = tx * axis.Y + sz;
@@ -626,19 +650,15 @@ irr::core::matrix4 setRotationAxisRadians(irr::core::matrix4 M, double angle, v3
 	M[8]  = tz * axis.X + sy;
 	M[9]  = tz * axis.Y - sx;
 	M[10] = tz * axis.Z + c;
-	return M;
 }
 
 
-v3f transposeMatrix(irr::core::matrix4 M, v3f v)
+v3f transposeMatrix(const core::matrix4 &M, v3f v)
 {
 	v3f translated;
-	double x = M[0] * v.X + M[4] * v.Y + M[8]  * v.Z +M[12];
-	double y = M[1] * v.X + M[5] * v.Y + M[9]  * v.Z +M[13];
-	double z = M[2] * v.X + M[6] * v.Y + M[10] * v.Z +M[14];
-	translated.X = x;
-	translated.Y = y;
-	translated.Z = z;
+	translated.X = M[0] * v.X + M[4] * v.Y + M[8]  * v.Z + M[12];
+	translated.Y = M[1] * v.X + M[5] * v.Y + M[9]  * v.Z + M[13];
+	translated.Z = M[2] * v.X + M[6] * v.Y + M[10] * v.Z + M[14];
 	return translated;
 }
 
diff --git a/src/mapgen/treegen.h b/src/mapgen/treegen.h
index 18dc1e089..3f20e0311 100644
--- a/src/mapgen/treegen.h
+++ b/src/mapgen/treegen.h
@@ -24,9 +24,10 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <matrix4.h>
+#include <string>
+#include "irr_v3d.h"
+#include "nodedef.h"
 #include "mapnode.h"
-#include "noise.h"
 
 class MMVManip;
 class NodeDefManager;
@@ -39,7 +40,16 @@ namespace treegen {
 		UNBALANCED_BRACKETS
 	};
 
-	struct TreeDef {
+	struct TreeDef : public NodeResolver {
+		TreeDef() :
+			// Initialize param1 and param2
+			trunknode(CONTENT_IGNORE),
+			leavesnode(CONTENT_IGNORE),
+			leaves2node(CONTENT_IGNORE),
+			fruitnode(CONTENT_IGNORE)
+		{}
+		virtual void resolveNodeNames();
+
 		std::string initial_axiom;
 		std::string rules_a;
 		std::string rules_b;
@@ -75,25 +85,8 @@ namespace treegen {
 	void make_cavetree(MMVManip &vmanip, v3pos_t p0,
 		bool is_jungle_tree, const NodeDefManager *ndef, s32 seed);
 
-
-	// Add L-Systems tree (used by engine)
-	treegen::error make_ltree(MMVManip &vmanip, v3s16 p0,
-		const NodeDefManager *ndef, TreeDef tree_definition);
-	// Spawn L-systems tree from LUA
-	treegen::error spawn_ltree (ServerMap *map, v3s16 p0,
-		const NodeDefManager *ndef, const TreeDef &tree_definition);
-
-	// L-System tree gen helper functions
-	void tree_trunk_placement(MMVManip &vmanip, v3f p0,
-		TreeDef &tree_definition);
-	void tree_leaves_placement(MMVManip &vmanip, v3f p0,
-		PseudoRandom ps, TreeDef &tree_definition);
-	void tree_single_leaves_placement(MMVManip &vmanip, v3f p0,
-		PseudoRandom ps, TreeDef &tree_definition);
-	void tree_fruit_placement(MMVManip &vmanip, v3f p0,
-		TreeDef &tree_definition);
-	irr::core::matrix4 setRotationAxisRadians(irr::core::matrix4 M, double angle, v3f axis);
-
-	v3f transposeMatrix(irr::core::matrix4 M ,v3f v);
-
+	// Spawn L-Systems tree on VManip
+	treegen::error make_ltree(MMVManip &vmanip, v3s16 p0, const TreeDef &def);
+	// Helper to spawn it directly on map
+	treegen::error spawn_ltree(ServerMap *map, v3s16 p0, const TreeDef &def);
 }; // namespace treegen
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 4d571e493..5da54e64c 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -98,6 +98,8 @@ v3s16 MapNode::getWallMountedDir(const NodeDefManager *nodemgr) const
 	case 3: return v3s16(-1,0,0);
 	case 4: return v3s16(0,0,1);
 	case 5: return v3s16(0,0,-1);
+	case 6: return v3s16(0,1,0);
+	case 7: return v3s16(0,-1,0);
 	}
 }
 
@@ -329,16 +331,45 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
 	else if(nodebox.type == NODEBOX_WALLMOUNTED)
 	{
 		v3s16 dir = n.getWallMountedDir(nodemgr);
+		u8 wall = n.getWallMounted(nodemgr);
 
 		// top
 		if(dir == v3s16(0,1,0))
 		{
-			boxes.push_back(nodebox.wall_top);
+			if (wall == DWM_S1) {
+				v3f vertices[2] =
+				{
+					nodebox.wall_top.MinEdge,
+					nodebox.wall_top.MaxEdge
+				};
+				for (v3f &vertex : vertices) {
+					vertex.rotateXZBy(90);
+				}
+				aabb3f box = aabb3f(vertices[0]);
+				box.addInternalPoint(vertices[1]);
+				boxes.push_back(box);
+			} else {
+				boxes.push_back(nodebox.wall_top);
+			}
 		}
 		// bottom
 		else if(dir == v3s16(0,-1,0))
 		{
-			boxes.push_back(nodebox.wall_bottom);
+			if (wall == DWM_S2) {
+				v3f vertices[2] =
+				{
+					nodebox.wall_bottom.MinEdge,
+					nodebox.wall_bottom.MaxEdge
+				};
+				for (v3f &vertex : vertices) {
+					vertex.rotateXZBy(-90);
+				}
+				aabb3f box = aabb3f(vertices[0]);
+				box.addInternalPoint(vertices[1]);
+				boxes.push_back(box);
+			} else {
+				boxes.push_back(nodebox.wall_bottom);
+			}
 		}
 		// side
 		else
@@ -785,7 +816,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
 	}
 }
 
-SharedBuffer<u8> MapNode::serializeBulk(int version,
+Buffer<u8> MapNode::serializeBulk(int version,
 		const MapNode *nodes, u32 nodecount,
 		u8 content_width, u8 params_width)
 {
@@ -801,17 +832,19 @@ SharedBuffer<u8> MapNode::serializeBulk(int version,
 		throw SerializationError("MapNode::serializeBulk: serialization to "
 				"version < 24 not possible");
 
-	SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
+	Buffer<u8> databuf(nodecount * (content_width + params_width));
 
-	u32 start1 = content_width * nodecount;
-	u32 start2 = (content_width + 1) * nodecount;
+	// Writing to the buffer linearly is faster
+	u8 *p = &databuf[0];
+	for (u32 i = 0; i < nodecount; i++, p += 2)
+		writeU16(p, nodes[i].param0);
+
+	for (u32 i = 0; i < nodecount; i++, p++)
+		writeU8(p, nodes[i].param1);
+
+	for (u32 i = 0; i < nodecount; i++, p++)
+		writeU8(p, nodes[i].param2);
 
-	// Serialize content
-	for (u32 i = 0; i < nodecount; i++) {
-		writeU16(&databuf[i * 2], nodes[i].param0);
-		writeU8(&databuf[start1 + i], nodes[i].param1);
-		writeU8(&databuf[start2 + i], nodes[i].param2);
-	}
 	return databuf;
 }
 
diff --git a/src/mapnode.h b/src/mapnode.h
index f7611837b..daea8ffd5 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -336,7 +336,7 @@ struct alignas(u32) MapNode
 	//   content_width = the number of bytes of content per node
 	//   params_width = the number of bytes of params per node
 	//   compressed = true to zlib-compress output
-	static SharedBuffer<u8> serializeBulk(int version,
+	static Buffer<u8> serializeBulk(int version,
 			const MapNode *nodes, u32 nodecount,
 			u8 content_width, u8 params_width);
 	static void deSerializeBulk(std::istream &is, int version,
diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index c10657f5f..15d35aea4 100644
--- a/src/mapsector.cpp
+++ b/src/mapsector.cpp
@@ -74,9 +74,12 @@ std::unique_ptr<MapBlock> MapSector::createBlankBlockNoInsert(s16 y)
 {
 	assert(getBlockBuffered(y) == nullptr); // Pre-condition
 
+	if (blockpos_over_max_limit(v3s16(0, y, 0)))
+		throw InvalidPositionException("createBlankBlockNoInsert(): pos over max mapgen limit");
+
 	v3s16 blockpos_map(m_pos.X, y, m_pos.Y);
 
-	return std::make_unique<MapBlock>(m_parent, blockpos_map, m_gamedef);
+	return std::make_unique<MapBlock>(blockpos_map, m_gamedef);
 }
 
 MapBlock *MapSector::createBlankBlock(s16 y)
diff --git a/src/mapsector.h b/src/mapsector.h
index d7a90c522..67e78dbc5 100644
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -50,7 +50,7 @@ public:
 
 	void deleteBlocks();
 
-	v2s16 getPos()
+	v2s16 getPos() const
 	{
 		return m_pos;
 	}
@@ -67,8 +67,16 @@ public:
 	// Returns an owning ptr to block.
 	std::unique_ptr<MapBlock> detachBlock(MapBlock *block);
 
+	// This makes a copy of the internal collection.
+	// Prefer getBlocks() if possible.
 	void getBlocks(MapBlockVect &dest);
 
+	// Get access to the internal collection
+	// This is explicitly only allowed on a const object since modifying anything while iterating is unsafe.
+	// The caller needs to make sure that this does not happen.
+	const auto &getBlocks() const { return m_blocks; }
+	const auto &getBlocks() = delete;
+
 	bool empty() const { return m_blocks.empty(); }
 
 	int size() const { return m_blocks.size(); }
diff --git a/src/metadata.cpp b/src/metadata.cpp
index f02495fa4..f8fc02da5 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -70,7 +70,7 @@ bool IMetadata::getStringToRef(const std::string &name,
 const std::string &IMetadata::resolveString(const std::string &str, std::string *place,
 		u16 recursion, bool deprecated) const
 {
-	if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
+	if (recursion <= 1 && str_starts_with(str, "${") && str.back() == '}') {
 		if (deprecated) {
 			warningstream << "Deprecated use of recursive resolution syntax in metadata: ";
 			safe_print_string(warningstream, str);
@@ -128,7 +128,7 @@ const std::string *SimpleMetadata::getStringRaw(const std::string &name, std::st
 	return found != m_stringvars.cend() ? &found->second : nullptr;
 }
 
-bool SimpleMetadata::setString(const std::string &name, const std::string &var)
+bool SimpleMetadata::setString(const std::string &name, std::string_view var)
 {
 	if (var.empty()) {
 		if (m_stringvars.erase(name) == 0)
@@ -137,7 +137,7 @@ bool SimpleMetadata::setString(const std::string &name, const std::string &var)
 		StringMap::iterator it = m_stringvars.find(name);
 		if (it != m_stringvars.end() && it->second == var)
 			return false;
-		m_stringvars[name] = var;
+		m_stringvars[name].assign(var);
 	}
 	m_modified = true;
 	return true;
diff --git a/src/metadata.h b/src/metadata.h
index 1a0350bbf..be053662e 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -53,7 +53,7 @@ public:
 	bool getStringToRef(const std::string &name, std::string &str, u16 recursion = 0) const;
 
 	// Returns whether the metadata was (potentially) changed.
-	virtual bool setString(const std::string &name, const std::string &var) = 0;
+	virtual bool setString(const std::string &name, std::string_view var) = 0;
 
 	inline bool removeString(const std::string &name) { return setString(name, ""); }
 
@@ -89,7 +89,7 @@ public:
 
 	size_t size() const;
 	bool contains(const std::string &name) const override;
-	virtual bool setString(const std::string &name, const std::string &var) override;
+	virtual bool setString(const std::string &name, std::string_view var) override;
 	const StringMap &getStrings(StringMap *) const override final;
 	const std::vector<std::string> &getKeys(std::vector<std::string> *place)
 		const override final;
diff --git a/src/migratesettings.h b/src/migratesettings.h
new file mode 100644
index 000000000..60435f18a
--- /dev/null
+++ b/src/migratesettings.h
@@ -0,0 +1,14 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "settings.h"
+
+void migrate_settings()
+{
+	// Converts opaque_water to translucent_liquids
+	if (g_settings->existsLocal("opaque_water")) {
+		g_settings->set("translucent_liquids",
+				g_settings->getBool("opaque_water") ? "false" : "true");
+		g_settings->remove("opaque_water");
+	}
+}
diff --git a/src/modifiedstate.h b/src/modifiedstate.h
index 404ab46a5..70ee18fd2 100644
--- a/src/modifiedstate.h
+++ b/src/modifiedstate.h
@@ -22,7 +22,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-enum ModifiedState
+#include "irrlichttypes.h"
+
+enum ModifiedState : u16
 {
 	// Has not been modified.
 	MOD_STATE_CLEAN = 0,
diff --git a/src/nameidmapping.h b/src/nameidmapping.h
index cd63bbe49..594ee958f 100644
--- a/src/nameidmapping.h
+++ b/src/nameidmapping.h
@@ -24,8 +24,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
 #include <iostream>
-#include <set>
 #include <unordered_map>
+#include <cassert>
 #include "irrlichttypes_bloated.h"
 
 typedef std::unordered_map<u16, std::string> IdToNameMap;
@@ -45,6 +45,7 @@ public:
 
 	void set(u16 id, const std::string &name)
 	{
+		assert(!name.empty());
 		m_id_to_name[id] = name;
 		m_name_to_id[name] = id;
 	}
@@ -70,8 +71,7 @@ public:
 	}
 	bool getName(u16 id, std::string &result) const
 	{
-		IdToNameMap::const_iterator i;
-		i = m_id_to_name.find(id);
+		auto i = m_id_to_name.find(id);
 		if (i == m_id_to_name.end())
 			return false;
 		result = i->second;
@@ -79,8 +79,7 @@ public:
 	}
 	bool getId(const std::string &name, u16 &result) const
 	{
-		NameToIdMap::const_iterator i;
-		i = m_name_to_id.find(name);
+		auto i = m_name_to_id.find(name);
 		if (i == m_name_to_id.end())
 			return false;
 		result = i->second;
diff --git a/src/network/address.cpp b/src/network/address.cpp
index 295e940df..f6ab43fbe 100644
--- a/src/network/address.cpp
+++ b/src/network/address.cpp
@@ -106,44 +106,60 @@ bool Address::operator==(const Address &other) const
 	return false;
 }
 
-void Address::Resolve(const char *name)
+void Address::Resolve(const char *name, Address *fallback)
 {
 	if (!name || name[0] == 0) {
 		if (m_addr_family == AF_INET)
 			setAddress(static_cast<u32>(0));
 		else if (m_addr_family == AF_INET6)
 			setAddress(static_cast<IPv6AddressBytes*>(nullptr));
+		if (fallback)
+			*fallback = Address();
 		return;
 	}
 
-	struct addrinfo *resolved, hints;
+	const auto &copy_from_ai = [] (const struct addrinfo *ai, Address *to) {
+		if (ai->ai_family == AF_INET) {
+			struct sockaddr_in *t = (struct sockaddr_in *)ai->ai_addr;
+			to->m_addr_family = AF_INET;
+			to->m_address.ipv4 = *t;
+		} else if (ai->ai_family == AF_INET6) {
+			struct sockaddr_in6 *t = (struct sockaddr_in6 *)ai->ai_addr;
+			to->m_addr_family = AF_INET6;
+			to->m_address.ipv6 = *t;
+		} else {
+			to->m_addr_family = 0;
+		}
+	};
+
+	struct addrinfo hints;
 	memset(&hints, 0, sizeof(hints));
 
-	// Setup hints
+	// set a type, so every unique address is only returned once
+	hints.ai_socktype = SOCK_DGRAM;
 	if (g_settings->getBool("enable_ipv6")) {
 		// AF_UNSPEC allows both IPv6 and IPv4 addresses to be returned
 		hints.ai_family = AF_UNSPEC;
 	} else {
 		hints.ai_family = AF_INET;
 	}
+	hints.ai_flags = AI_ADDRCONFIG;
 
 	// Do getaddrinfo()
-	int e = getaddrinfo(name, NULL, &hints, &resolved);
+	struct addrinfo *resolved = nullptr;
+	int e = getaddrinfo(name, nullptr, &hints, &resolved);
 	if (e != 0)
 		throw ResolveError(gai_strerror(e));
+	assert(resolved);
 
 	// Copy data
-	if (resolved->ai_family == AF_INET) {
-		struct sockaddr_in *t = (struct sockaddr_in *)resolved->ai_addr;
-		m_addr_family = AF_INET;
-		m_address.ipv4 = *t;
-	} else if (resolved->ai_family == AF_INET6) {
-		struct sockaddr_in6 *t = (struct sockaddr_in6 *)resolved->ai_addr;
-		m_addr_family = AF_INET6;
-		m_address.ipv6 = *t;
-	} else {
-		m_addr_family = 0;
+	copy_from_ai(resolved, this);
+	if (fallback) {
+		*fallback = Address();
+		if (resolved->ai_next)
+			copy_from_ai(resolved->ai_next, fallback);
 	}
+
 	freeaddrinfo(resolved);
 }
 
@@ -157,28 +173,11 @@ std::string Address::serializeString() const
 	return std::string{str} + ((m_addr_family == AF_INET6) ? (m_address.ipv6.sin6_scope_id ? "%" + itos(m_address.ipv6.sin6_scope_id) : "") : "");
 }
 
-struct sockaddr_in Address::getAddress() const
-{
-	return m_address.ipv4;
-}
-
-struct sockaddr_in6 Address::getAddress6() const
-{
-	return m_address.ipv6;
-}
-
-u16 Address::getPort() const
-{
-	return m_port;
-}
-
-bool Address::isZero() const
+bool Address::isAny() const
 {
 	if (m_addr_family == AF_INET) {
 		return m_address.ipv4.sin_addr.s_addr == 0;
-	}
-
-	if (m_addr_family == AF_INET6) {
+	} else if (m_addr_family == AF_INET6) {
 		static const char zero[16] = {0};
 		return memcmp(m_address.ipv6.sin6_addr.s6_addr, zero, 16) == 0;
 	}
@@ -231,18 +230,19 @@ void Address::print(std::ostream& s) const
 
 bool Address::isLocalhost() const
 {
-	if (isIPv6()) {
+	if (m_addr_family == AF_INET6) {
 		static const u8 localhost_bytes[] = {
 				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
 		static const u8 mapped_ipv4_localhost[] = {
 				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0x7f, 0, 0, 0};
 
-		auto addr = m_address.ipv6.sin6_addr.s6_addr;
+		auto *addr = m_address.ipv6.sin6_addr.s6_addr;
 
 		return memcmp(addr, localhost_bytes, 16) == 0 ||
 			memcmp(addr, mapped_ipv4_localhost, 13) == 0;
+	} else if (m_addr_family == AF_INET) {
+		auto addr = ntohl(m_address.ipv4.sin_addr.s_addr);
+		return (addr >> 24) == 0x7f;
 	}
-
-	auto addr = ntohl(m_address.ipv4.sin_addr.s_addr);
-	return (addr >> 24) == 0x7f;
+	return false;
 }
diff --git a/src/network/address.h b/src/network/address.h
index 0319d8938..9a8086cf2 100644
--- a/src/network/address.h
+++ b/src/network/address.h
@@ -56,18 +56,26 @@ public:
 	bool operator==(const Address &address) const;
 	bool operator!=(const Address &address) const { return !(*this == address); }
 
-	struct sockaddr_in getAddress() const;
-	struct sockaddr_in6 getAddress6() const;
-	u16 getPort() const;
 	int getFamily() const { return m_addr_family; }
+	bool isValid() const { return m_addr_family != 0; }
 	bool isIPv6() const { return m_addr_family == AF_INET6; }
-	bool isZero() const;
+	struct sockaddr_in getAddress() const { return m_address.ipv4; }
+	struct sockaddr_in6 getAddress6() const { return m_address.ipv6; }
+	u16 getPort() const { return m_port; }
+
 	void print(std::ostream &s) const;
 	std::string serializeString() const;
+
+	// Is this an address that binds to all interfaces (like INADDR_ANY)?
+	bool isAny() const;
+	// Is this an address referring to the local host?
 	bool isLocalhost() const;
 
-	// Resolve() may throw ResolveError (address is unchanged in this case)
-	void Resolve(const char *name);
+	// `name`: hostname or numeric IP
+	// `fallback`: fallback IP to try gets written here
+	// any empty name resets the IP to the "any address"
+	// may throw ResolveError (address is unchanged in this case)
+	void Resolve(const char *name, Address *fallback = nullptr);
 
 	void setAddress(u32 address);
 	void setAddress(u8 a, u8 b, u8 c, u8 d);
@@ -82,5 +90,6 @@ private:
 		struct sockaddr_in ipv4;
 		struct sockaddr_in6 ipv6;
 	} m_address = {};
-	u16 m_port = 0; // Port is separate from sockaddr structures
+	// port is separate from in_addr structures
+	u16 m_port = 0;
 };
diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp
index 5755565b1..8e702597f 100644
--- a/src/network/clientopcodes.cpp
+++ b/src/network/clientopcodes.cpp
@@ -19,8 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "clientopcodes.h"
+#include "client/client.h"
 
-const static ToClientCommandHandler null_command_handler = {"TOCLIENT_NULL", TOCLIENT_STATE_ALL, &Client::handleCommand_Null};
+const static ToClientCommandHandler null_command_handler =
+	{"TOCLIENT_NULL", TOCLIENT_STATE_ALL, &Client::handleCommand_Null};
 
 const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
 {
@@ -117,16 +119,16 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
 	{ "TOCLIENT_SET_SUN",                  TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudSetSun }, // 0x5a
 	{ "TOCLIENT_SET_MOON",                 TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudSetMoon }, // 0x5b
 	{ "TOCLIENT_SET_STARS",                TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudSetStars }, // 0x5c
-	null_command_handler,
+	{ "TOCLIENT_MOVE_PLAYER_REL",          TOCLIENT_STATE_CONNECTED, &Client::handleCommand_MovePlayerRel }, // 0x5d,
 	null_command_handler,
 	null_command_handler,
 	{ "TOCLIENT_SRP_BYTES_S_B",            TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_SrpBytesSandB }, // 0x60
 	{ "TOCLIENT_FORMSPEC_PREPEND",         TOCLIENT_STATE_CONNECTED, &Client::handleCommand_FormspecPrepend }, // 0x61,
 	{ "TOCLIENT_MINIMAP_MODES",            TOCLIENT_STATE_CONNECTED, &Client::handleCommand_MinimapModes }, // 0x62,
-	{ "TOCLIENT_SET_LIGHTING",        TOCLIENT_STATE_CONNECTED, &Client::handleCommand_SetLighting }, // 0x63,
+	{ "TOCLIENT_SET_LIGHTING",             TOCLIENT_STATE_CONNECTED, &Client::handleCommand_SetLighting }, // 0x63,
 };
 
-const static ServerCommandFactory null_command_factory = { "TOSERVER_NULL", 0, false };
+const static ServerCommandFactory null_command_factory = { nullptr, 0, false };
 
 /*
 	Channels used for Client -> Server communication
@@ -223,5 +225,5 @@ const ServerCommandFactory serverCommandFactoryTable[TOSERVER_NUM_MSG_TYPES] =
 	{ "TOSERVER_FIRST_SRP",          1, true }, // 0x50
 	{ "TOSERVER_SRP_BYTES_A",        1, true }, // 0x51
 	{ "TOSERVER_SRP_BYTES_M",        1, true }, // 0x52
-	{ "TOSERVER_UPDATE_CLIENT_INFO", 1, true }, // 0x53
+	{ "TOSERVER_UPDATE_CLIENT_INFO", 2, true }, // 0x53
 };
diff --git a/src/network/clientopcodes.h b/src/network/clientopcodes.h
index 5c5a31315..20bfc6697 100644
--- a/src/network/clientopcodes.h
+++ b/src/network/clientopcodes.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "networkprotocol.h"
 
 class NetworkPacket;
+// Note: don't forward-declare Client here (#14324)
 
 enum ToClientConnectionState {
 	TOCLIENT_STATE_NOT_CONNECTED,
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index aeac518bf..bcf0db610 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "chatmessage.h"
 #include "client/clientmedia.h"
 #include "log.h"
-#include "map.h"
+#include "servermap.h"
 #include "mapsector.h"
 #include "client/minimap.h"
 #include "modchannels.h"
@@ -172,6 +172,7 @@ void Client::handleCommand_AuthAccept(NetworkPacket* pkt)
 
 	m_state = LC_Init;
 }
+
 void Client::handleCommand_AcceptSudoMode(NetworkPacket* pkt)
 {
 	deleteAuthData();
@@ -489,6 +490,8 @@ void Client::handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt)
 		for (u16 i = 0; i < removed_count; i++) {
 			*pkt >> id;
 			m_env.removeActiveObject(id);
+			// Object-attached sounds MUST NOT be removed here because they might
+			// have started to play immediately before the entity was removed.
 		}
 
 		// Read added objects
@@ -656,6 +659,17 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
 
 void Client::handleCommand_PunchPlayer(NetworkPacket* pkt) { }
 
+void Client::handleCommand_MovePlayerRel(NetworkPacket *pkt)
+{
+	v3f added_pos;
+
+	*pkt >> added_pos;
+
+	LocalPlayer *player = m_env.getLocalPlayer();
+	assert(player);
+	player->addPosition(added_pos);
+}
+
 void Client::handleCommand_DeathScreen(NetworkPacket* pkt)
 {
 	bool set_camera_point_target;
@@ -1239,8 +1253,13 @@ void Client::handleCommand_HudChange(NetworkPacket* pkt)
 
 	*pkt >> server_id >> stat;
 
+	// Do nothing if stat is not known
+	if (stat >= HudElementStat_END) {
+		return;
+	}
+
 	// Keep in sync with:server.cpp -> SendHUDChange
-	switch ((HudElementStat)stat) {
+	switch (static_cast<HudElementStat>(stat)) {
 		case HUD_STAT_POS:
 		case HUD_STAT_SCALE:
 		case HUD_STAT_ALIGN:
@@ -1285,24 +1304,15 @@ void Client::handleCommand_HudSetFlags(NetworkPacket* pkt)
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
-	bool was_minimap_visible = player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE;
 	bool was_minimap_radar_visible = player->hud_flags & HUD_FLAG_MINIMAP_RADAR_VISIBLE;
 
 	player->hud_flags &= ~mask;
 	player->hud_flags |= flags;
 
-	m_minimap_disabled_by_server = !(player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE);
 	bool m_minimap_radar_disabled_by_server = !(player->hud_flags & HUD_FLAG_MINIMAP_RADAR_VISIBLE);
 
 	// Not so satisying code to keep compatibility with old fixed mode system
 	// -->
-
-	// Hide minimap if it has been disabled by the server
-	if (m_minimap && m_minimap_disabled_by_server && was_minimap_visible)
-		// defers a minimap update, therefore only call it if really
-		// needed, by checking that minimap was visible before
-		m_minimap->setModeIndex(0);
-
 	// If radar has been disabled, try to find a non radar mode or fall back to 0
 	if (m_minimap && m_minimap_radar_disabled_by_server
 			&& was_minimap_radar_visible) {
@@ -1398,41 +1408,44 @@ void Client::handleCommand_HudSetSky(NetworkPacket* pkt)
 		star_event->type = CE_SET_STARS;
 		star_event->star_params = new StarParams(stars);
 		m_client_event_queue.push(star_event);
-	} else {
-		SkyboxParams skybox;
+		return;
+	}
+
+	SkyboxParams skybox;
+
+	*pkt >> skybox.bgcolor >> skybox.type >> skybox.clouds >>
+		skybox.fog_sun_tint >> skybox.fog_moon_tint >> skybox.fog_tint_type;
+
+	if (skybox.type == "skybox") {
 		u16 texture_count;
 		std::string texture;
-
-		*pkt >> skybox.bgcolor >> skybox.type >> skybox.clouds >>
-			skybox.fog_sun_tint >> skybox.fog_moon_tint >> skybox.fog_tint_type;
-
-		if (skybox.type == "skybox") {
-			*pkt >> texture_count;
-			for (int i = 0; i < texture_count; i++) {
-				*pkt >> texture;
-				skybox.textures.emplace_back(texture);
-			}
+		*pkt >> texture_count;
+		for (u16 i = 0; i < texture_count; i++) {
+			*pkt >> texture;
+			skybox.textures.emplace_back(texture);
 		}
-		else if (skybox.type == "regular") {
-			*pkt >> skybox.sky_color.day_sky >> skybox.sky_color.day_horizon
-				>> skybox.sky_color.dawn_sky >> skybox.sky_color.dawn_horizon
-				>> skybox.sky_color.night_sky >> skybox.sky_color.night_horizon
-				>> skybox.sky_color.indoors;
-		}
-
-		if (pkt->getRemainingBytes() >= 4) {
-			*pkt >> skybox.body_orbit_tilt;
-		}
-
-		if (pkt->getRemainingBytes() >= 6) {
-			*pkt >> skybox.fog_distance >> skybox.fog_start;
-		}
-
-		ClientEvent *event = new ClientEvent();
-		event->type = CE_SET_SKY;
-		event->set_sky = new SkyboxParams(skybox);
-		m_client_event_queue.push(event);
+	} else if (skybox.type == "regular") {
+		auto &c = skybox.sky_color;
+		*pkt >> c.day_sky >> c.day_horizon >> c.dawn_sky >> c.dawn_horizon
+			>> c.night_sky >> c.night_horizon >> c.indoors;
 	}
+
+	if (pkt->getRemainingBytes() >= 4) {
+		*pkt >> skybox.body_orbit_tilt;
+	}
+
+	if (pkt->getRemainingBytes() >= 6) {
+		*pkt >> skybox.fog_distance >> skybox.fog_start;
+	}
+
+	if (pkt->getRemainingBytes() >= 4) {
+		*pkt >> skybox.fog_color;
+	}
+
+	ClientEvent *event = new ClientEvent();
+	event->type = CE_SET_SKY;
+	event->set_sky = new SkyboxParams(skybox);
+	m_client_event_queue.push(event);
 }
 
 void Client::handleCommand_HudSetSun(NetworkPacket *pkt)
@@ -1664,10 +1677,8 @@ void Client::handleCommand_MediaPush(NetworkPacket *pkt)
 		std::string computed_hash;
 		{
 			class SHA1 ctx;
-			ctx.addBytes(filedata.c_str(), filedata.size());
-			unsigned char *buf = ctx.getDigest();
-			computed_hash.assign((char*) buf, 20);
-			free(buf);
+			ctx.addBytes(filedata);
+			computed_hash = ctx.getDigest();
 		}
 		if (raw_hash != computed_hash) {
 			verbosestream << "Hash of file data mismatches, ignoring." << std::endl;
@@ -1828,6 +1839,8 @@ void Client::handleCommand_SetLighting(NetworkPacket *pkt)
 				>> lighting.exposure.speed_bright_dark
 				>> lighting.exposure.center_weight_power;
 	}
+	if (pkt->getRemainingBytes() >= 4)
+		*pkt >> lighting.volumetric_light_strength;
 }
 
 
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
index 34108c51b..7a9c0c9b7 100644
--- a/src/network/connection.cpp
+++ b/src/network/connection.cpp
@@ -28,7 +28,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <cerrno>
 #include <algorithm>
 #include <cmath>
-#include "connection.h"
+#include "connection_internal.h"
 #include "serialization.h"
 #include "log.h"
 #include "porting.h"
@@ -58,7 +58,16 @@ namespace con
 // TODO: Clean this up.
 #define LOG(a) a
 
-#define PING_TIMEOUT 5.0
+#define PING_TIMEOUT 5.0f
+
+// exponent base
+#define RESEND_SCALE_BASE 1.5f
+
+// since spacing is exponential the numbers here shouldn't be too high
+// (it's okay to start out quick)
+#define RESEND_TIMEOUT_MIN 0.1f
+#define RESEND_TIMEOUT_MAX 2.0f
+#define RESEND_TIMEOUT_FACTOR 4
 
 u16 BufferedPacket::getSeqnum() const
 {
@@ -68,7 +77,7 @@ u16 BufferedPacket::getSeqnum() const
 	return readU16(&data[BASE_HEADER_SIZE + 1]);
 }
 
-BufferedPacketPtr makePacket(Address &address, const SharedBuffer<u8> &data,
+BufferedPacketPtr makePacket(const Address &address, const SharedBuffer<u8> &data,
 		u32 protocol_id, session_t sender_peer_id, u8 channel)
 {
 	u32 packet_size = data.getSize() + BASE_HEADER_SIZE;
@@ -103,12 +112,10 @@ void makeSplitPacket(const SharedBuffer<u8> &data, u32 chunksize_max, u16 seqnum
 		std::list<SharedBuffer<u8>> *chunks)
 {
 	// Chunk packets, containing the TYPE_SPLIT header
-	u32 chunk_header_size = 7;
-	u32 maximum_data_size = chunksize_max - chunk_header_size;
-	u32 start = 0;
-	u32 end = 0;
-	u32 chunk_num = 0;
-	u16 chunk_count = 0;
+	const u32 chunk_header_size = 7;
+	const u32 maximum_data_size = chunksize_max - chunk_header_size;
+	u32 start = 0, end = 0;
+	u16 chunk_num = 0;
 	do {
 		end = start + maximum_data_size - 1;
 		if (end > data.getSize() - 1)
@@ -126,16 +133,16 @@ void makeSplitPacket(const SharedBuffer<u8> &data, u32 chunksize_max, u16 seqnum
 		memcpy(&chunk[chunk_header_size], &data[start], payload_size);
 
 		chunks->push_back(chunk);
-		chunk_count++;
 
 		start = end + 1;
+		sanity_check(chunk_num < 0xFFFF); // overflow
 		chunk_num++;
 	}
 	while (end != data.getSize() - 1);
 
-	for (SharedBuffer<u8> &chunk : *chunks) {
+	for (auto &chunk : *chunks) {
 		// Write chunk_count
-		writeU16(&(chunk[3]), chunk_count);
+		writeU16(&chunk[3], chunk_num);
 	}
 }
 
@@ -194,7 +201,7 @@ u32 ReliablePacketBuffer::size()
 	return m_list.size();
 }
 
-RPBSearchResult ReliablePacketBuffer::findPacketNoLock(u16 seqnum)
+ReliablePacketBuffer::FindResult ReliablePacketBuffer::findPacketNoLock(u16 seqnum)
 {
 	for (auto it = m_list.begin(); it != m_list.end(); ++it) {
 		if ((*it)->getSeqnum() == seqnum)
@@ -232,7 +239,7 @@ BufferedPacketPtr ReliablePacketBuffer::popFirst()
 BufferedPacketPtr ReliablePacketBuffer::popSeqnum(u16 seqnum)
 {
 	MutexAutoLock listlock(m_list_mutex);
-	RPBSearchResult r = findPacketNoLock(seqnum);
+	auto r = findPacketNoLock(seqnum);
 	if (r == m_list.end()) {
 		LOG(dout_con<<"Sequence number: " << seqnum
 				<< " not found in reliable buffer"<<std::endl);
@@ -325,15 +332,21 @@ void ReliablePacketBuffer::insert(BufferedPacketPtr &p_ptr, u16 next_expected)
 			)
 		{
 			/* if this happens your maximum transfer window may be to big */
-			fprintf(stderr,
+			char buf[200];
+			snprintf(buf, sizeof(buf),
 					"Duplicated seqnum %d non matching packet detected:\n",
 					seqnum);
-			fprintf(stderr, "Old: seqnum: %05d size: %04zu, address: %s\n",
+			warningstream << buf;
+			snprintf(buf, sizeof(buf),
+					"Old: seqnum: %05d size: %04zu, address: %s\n",
 					i->getSeqnum(), i->size(),
 					i->address.serializeString().c_str());
-			fprintf(stderr, "New: seqnum: %05d size: %04zu, address: %s\n",
+			warningstream << buf;
+			snprintf(buf, sizeof(buf),
+					"New: seqnum: %05d size: %04zu, address: %s\n",
 					p.getSeqnum(), p.size(),
 					p.address.serializeString().c_str());
+			warningstream << buf << std::flush;
 			throw IncomingDataCorruption("duplicated packet isn't same as original one");
 		}
 	}
@@ -357,13 +370,27 @@ void ReliablePacketBuffer::incrementTimeouts(float dtime)
 	}
 }
 
-std::list<ConstSharedPtr<BufferedPacket>>
-	ReliablePacketBuffer::getTimedOuts(float timeout, u32 max_packets)
+u32 ReliablePacketBuffer::getTimedOuts(float timeout)
 {
 	MutexAutoLock listlock(m_list_mutex);
-	std::list<ConstSharedPtr<BufferedPacket>> timed_outs;
+	u32 count = 0;
 	for (auto &packet : m_list) {
-		if (packet->time < timeout)
+		if (packet->totaltime >= timeout)
+			count++;
+	}
+	return count;
+}
+
+std::vector<ConstSharedPtr<BufferedPacket>>
+	ReliablePacketBuffer::getResend(float timeout, u32 max_packets)
+{
+	MutexAutoLock listlock(m_list_mutex);
+	std::vector<ConstSharedPtr<BufferedPacket>> timed_outs;
+	for (auto &packet : m_list) {
+		// resend time scales exponentially with each cycle
+		const float pkt_timeout = timeout * powf(RESEND_SCALE_BASE, packet->resend_count);
+
+		if (packet->time < pkt_timeout)
 			continue;
 
 		// caller will resend packet so reset time and increase counter
@@ -501,9 +528,9 @@ SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacketPtr &p_ptr, bool reli
 
 void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout)
 {
+	MutexAutoLock listlock(m_map_mutex);
 	std::vector<u16> remove_queue;
 	{
-		MutexAutoLock listlock(m_map_mutex);
 		for (const auto &i : m_buf) {
 			IncomingSplitPacket *p = i.second;
 			// Reliable ones are not removed by timeout
@@ -515,10 +542,10 @@ void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout)
 		}
 	}
 	for (u16 j : remove_queue) {
-		MutexAutoLock listlock(m_map_mutex);
 		LOG(dout_con<<"NOTE: Removing timed out unreliable split packet"<<std::endl);
-		delete m_buf[j];
-		m_buf.erase(j);
+		auto it = m_buf.find(j);
+		delete it->second;
+		m_buf.erase(it);
 	}
 }
 
@@ -563,6 +590,15 @@ ConnectionCommandPtr ConnectionCommand::disconnect_peer(session_t peer_id)
 	return c;
 }
 
+ConnectionCommandPtr ConnectionCommand::resend_one(session_t peer_id)
+{
+	auto c = create(CONNCMD_RESEND_ONE);
+	c->peer_id = peer_id;
+	c->channelnum = 0; // must be same as createPeer
+	c->reliable = true;
+	return c;
+}
+
 ConnectionCommandPtr ConnectionCommand::send(session_t peer_id, u8 channelnum,
 	NetworkPacket *pkt, bool reliable)
 {
@@ -813,13 +849,6 @@ void Channel::UpdateTimers(float dtime)
 	Peer
 */
 
-PeerHelper::PeerHelper(Peer* peer) :
-	m_peer(peer)
-{
-	if (peer && !peer->IncUseCount())
-		m_peer = nullptr;
-}
-
 PeerHelper::~PeerHelper()
 {
 	if (m_peer)
@@ -830,32 +859,14 @@ PeerHelper::~PeerHelper()
 
 PeerHelper& PeerHelper::operator=(Peer* peer)
 {
+	if (m_peer)
+		m_peer->DecUseCount();
 	m_peer = peer;
 	if (peer && !peer->IncUseCount())
 		m_peer = nullptr;
 	return *this;
 }
 
-Peer* PeerHelper::operator->() const
-{
-	return m_peer;
-}
-
-Peer* PeerHelper::operator&() const
-{
-	return m_peer;
-}
-
-bool PeerHelper::operator!()
-{
-	return ! m_peer;
-}
-
-bool PeerHelper::operator!=(void* ptr)
-{
-	return ((void*) m_peer != ptr);
-}
-
 bool Peer::IncUseCount()
 {
 	MutexAutoLock lock(m_exclusive_access_mutex);
@@ -929,17 +940,22 @@ void Peer::RTTStatistics(float rtt, const std::string &profiler_id,
 	m_last_rtt = rtt;
 }
 
-bool Peer::isTimedOut(float timeout)
+bool Peer::isTimedOut(float timeout, std::string &reason)
 {
 	MutexAutoLock lock(m_exclusive_access_mutex);
-	u64 current_time = porting::getTimeMs();
 
-	float dtime = CALC_DTIME(m_last_timeout_check,current_time);
-	m_last_timeout_check = current_time;
+	{
+		u64 current_time = porting::getTimeMs();
+		float dtime = CALC_DTIME(m_last_timeout_check, current_time);
+		m_last_timeout_check = current_time;
+		m_timeout_counter += dtime;
+	}
+	if (m_timeout_counter > timeout) {
+		reason = "timeout counter";
+		return true;
+	}
 
-	m_timeout_counter += dtime;
-
-	return m_timeout_counter > timeout;
+	return false;
 }
 
 void Peer::Drop()
@@ -963,19 +979,26 @@ void Peer::Drop()
 	delete this;
 }
 
-UDPPeer::UDPPeer(u16 a_id, Address a_address, Connection* connection) :
-	Peer(a_address,a_id,connection)
+UDPPeer::UDPPeer(session_t id, const Address &address, Connection *connection) :
+	Peer(id, address, connection)
 {
 	for (Channel &channel : channels)
 		channel.setWindowSize(START_RELIABLE_WINDOW_SIZE);
 }
 
-bool UDPPeer::getAddress(MTProtocols type,Address& toset)
+bool UDPPeer::isTimedOut(float timeout, std::string &reason)
 {
-	if ((type == MTP_UDP) || (type == MTP_MINETEST_RELIABLE_UDP) || (type == MTP_PRIMARY))
-	{
-		toset = address;
+	if (Peer::isTimedOut(timeout, reason))
 		return true;
+
+	MutexAutoLock lock(m_exclusive_access_mutex);
+
+	for (int i = 0; i < CHANNEL_COUNT; i++) {
+		Channel &channel = channels[i];
+		if (channel.outgoing_reliables_sent.getTimedOuts(timeout) > 0) {
+			reason = "outgoing reliables channel=" + itos(i);
+			return true;
+		}
 	}
 
 	return false;
@@ -988,25 +1011,25 @@ void UDPPeer::reportRTT(float rtt)
 	}
 	RTTStatistics(rtt,"rudp",MAX_RELIABLE_WINDOW_SIZE*10);
 
+	// use this value to decide the resend timeout
 	float timeout = getStat(AVG_RTT) * RESEND_TIMEOUT_FACTOR;
 	if (timeout < RESEND_TIMEOUT_MIN)
 		timeout = RESEND_TIMEOUT_MIN;
 	if (timeout > RESEND_TIMEOUT_MAX)
 		timeout = RESEND_TIMEOUT_MAX;
 
-	MutexAutoLock usage_lock(m_exclusive_access_mutex);
-	resend_timeout = timeout;
+	setResendTimeout(timeout);
 }
 
 bool UDPPeer::Ping(float dtime,SharedBuffer<u8>& data)
 {
 	m_ping_timer += dtime;
-	if (m_ping_timer >= PING_TIMEOUT)
+	if (!isHalfOpen() && m_ping_timer >= PING_TIMEOUT)
 	{
 		// Create and send PING packet
 		writeU8(&data[0], PACKET_TYPE_CONTROL);
 		writeU8(&data[1], CONTROLTYPE_PING);
-		m_ping_timer = 0.0;
+		m_ping_timer = 0.0f;
 		return true;
 	}
 	return false;
@@ -1053,26 +1076,26 @@ bool UDPPeer::processReliableSendCommand(
 	const auto &c = *c_ptr;
 	Channel &chan = channels[c.channelnum];
 
-	u32 chunksize_max = max_packet_size
+	const u32 chunksize_max = max_packet_size
 							- BASE_HEADER_SIZE
 							- RELIABLE_HEADER_SIZE;
 
-	sanity_check(c.data.getSize() < MAX_RELIABLE_WINDOW_SIZE*512);
-
 	std::list<SharedBuffer<u8>> originals;
-	u16 split_sequence_number = chan.readNextSplitSeqNum();
 
 	if (c.raw) {
 		originals.emplace_back(c.data);
 	} else {
-		makeAutoSplitPacket(c.data, chunksize_max,split_sequence_number, &originals);
-		chan.setNextSplitSeqNum(split_sequence_number);
+		u16 split_seqnum = chan.readNextSplitSeqNum();
+		makeAutoSplitPacket(c.data, chunksize_max, split_seqnum, &originals);
+		chan.setNextSplitSeqNum(split_seqnum);
 	}
 
+	sanity_check(originals.size() < MAX_RELIABLE_WINDOW_SIZE);
+
 	bool have_sequence_number = false;
 	bool have_initial_sequence_number = false;
 	std::queue<BufferedPacketPtr> toadd;
-	volatile u16 initial_sequence_number = 0;
+	u16 initial_sequence_number = 0;
 
 	for (SharedBuffer<u8> &original : originals) {
 		u16 seqnum = chan.getOutgoingSequenceNumber(have_sequence_number);
@@ -1112,7 +1135,7 @@ bool UDPPeer::processReliableSendCommand(
 		return true;
 	}
 
-	volatile u16 packets_available = toadd.size();
+	u16 packets_available = toadd.size();
 	/* we didn't get a single sequence number no need to fill queue */
 	if (!have_initial_sequence_number) {
 		LOG(derr_con << m_connection->getDesc() << "Ran out of sequence numbers!" << std::endl);
@@ -1130,8 +1153,6 @@ bool UDPPeer::processReliableSendCommand(
 		FATAL_ERROR_IF(!successfully_put_back_sequence_number, "error");
 	}
 
-	// DO NOT REMOVE n_queued! It avoids a deadlock of async locked
-	// 'log_message_mutex' and 'm_list_mutex'.
 	u32 n_queued = chan.outgoing_reliables_sent.size();
 
 	LOG(dout_con<<m_connection->getDesc()
@@ -1150,16 +1171,13 @@ bool UDPPeer::processReliableSendCommand(
 
 void UDPPeer::RunCommandQueues(
 							unsigned int max_packet_size,
-							unsigned int maxcommands,
 							unsigned int maxtransfer)
 {
 
 	for (Channel &channel : channels) {
-		unsigned int commands_processed = 0;
 
 		if ((!channel.queued_commands.empty()) &&
-				(channel.queued_reliables.size() < maxtransfer) &&
-				(commands_processed < maxcommands)) {
+				(channel.queued_reliables.size() < maxtransfer)) {
 			try {
 				ConnectionCommandPtr c = channel.queued_commands.front();
 
@@ -1274,7 +1292,7 @@ Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
 	m_udpSocket(ipv6),
 	m_protocol_id(protocol_id),
 	m_sendThread(new ConnectionSendThread(max_packet_size, timeout)),
-	m_receiveThread(new ConnectionReceiveThread(max_packet_size)),
+	m_receiveThread(new ConnectionReceiveThread()),
 	m_bc_peerhandler(peerhandler)
 
 {
@@ -1341,29 +1359,36 @@ PeerHelper Connection::getPeerNoEx(session_t peer_id)
 }
 
 /* find peer_id for address */
-u16 Connection::lookupPeer(Address& sender)
+session_t Connection::lookupPeer(const Address& sender)
 {
 	MutexAutoLock peerlock(m_peers_mutex);
-	std::map<u16, Peer*>::iterator j;
-	j = m_peers.begin();
-	for(; j != m_peers.end(); ++j)
-	{
-		Peer *peer = j->second;
+	for (auto &it: m_peers) {
+		Peer *peer = it.second;
 		if (peer->isPendingDeletion())
 			continue;
 
-		Address tocheck;
-
-		if ((peer->getAddress(MTP_MINETEST_RELIABLE_UDP, tocheck)) && (tocheck == sender))
-			return peer->id;
-
-		if ((peer->getAddress(MTP_UDP, tocheck)) && (tocheck == sender))
+		if (peer->getAddress() == sender)
 			return peer->id;
 	}
 
 	return PEER_ID_INEXISTENT;
 }
 
+u32 Connection::getActiveCount()
+{
+	MutexAutoLock peerlock(m_peers_mutex);
+	u32 count = 0;
+	for (auto &it : m_peers) {
+		Peer *peer = it.second;
+		if (peer->isPendingDeletion())
+			continue;
+		if (peer->isHalfOpen())
+			continue;
+		count++;
+	}
+	return count;
+}
+
 bool Connection::deletePeer(session_t peer_id, bool timeout)
 {
 	Peer *peer = 0;
@@ -1379,12 +1404,8 @@ bool Connection::deletePeer(session_t peer_id, bool timeout)
 		m_peer_ids.erase(it);
 	}
 
-	Address peer_address;
-	//any peer has a primary address this never fails!
-	peer->getAddress(MTP_PRIMARY, peer_address);
-
 	// Create event
-	putEvent(ConnectionEvent::peerRemoved(peer_id, timeout, peer_address));
+	putEvent(ConnectionEvent::peerRemoved(peer_id, timeout, peer->getAddress()));
 
 	peer->Drop();
 	return true;
@@ -1444,7 +1465,7 @@ void Connection::Disconnect()
 	putCommand(ConnectionCommand::disconnect());
 }
 
-u32 Connection::Receive(NetworkPacket *pkt, u32 timeout)
+u32 Connection::ReceiveTimeoutMs(NetworkPacket *pkt, u32 timeout_ms)
 {
 	/*
 		Note that this function can potentially wait infinitely if non-data
@@ -1452,7 +1473,7 @@ u32 Connection::Receive(NetworkPacket *pkt, u32 timeout)
 		This is not considered to be a problem (is it?)
 	*/
 	for(;;) {
-		ConnectionEventPtr e_ptr = waitEvent(timeout);
+		ConnectionEventPtr e_ptr = waitEvent(timeout_ms);
 		const ConnectionEvent &e = *e_ptr;
 
 		if (e.type != CONNEVENT_NONE) {
@@ -1495,7 +1516,7 @@ u32 Connection::Receive(NetworkPacket *pkt, u32 timeout)
 
 u32 Connection::Receive(NetworkPacket *pkt)
 {
-	auto any = Receive(pkt, m_bc_receive_timeout);
+	auto any = ReceiveTimeoutMs(pkt, m_bc_receive_timeout);
 	if (!any)
 		throw NoIncomingDataException("No incoming data");
 	return any;
@@ -1503,7 +1524,7 @@ u32 Connection::Receive(NetworkPacket *pkt)
 
 bool Connection::TryReceive(NetworkPacket *pkt)
 {
-	return Receive(pkt, 0);
+	return ReceiveTimeoutMs(pkt, 0);
 }
 
 void Connection::Send(session_t peer_id, u8 channelnum,
@@ -1511,6 +1532,15 @@ void Connection::Send(session_t peer_id, u8 channelnum,
 {
 	assert(channelnum < CHANNEL_COUNT); // Pre-condition
 
+	// approximate check similar to UDPPeer::processReliableSendCommand()
+	// to get nicer errors / backtraces if this happens.
+	if (reliable && pkt->getSize() > MAX_RELIABLE_WINDOW_SIZE*512) {
+		std::ostringstream oss;
+		oss << "Packet too big for window, peer_id=" << peer_id
+			<< " command=" << pkt->getCommand() << " size=" << pkt->getSize();
+		FATAL_ERROR(oss.str().c_str());
+	}
+
 	putCommand(ConnectionCommand::send(peer_id, channelnum, pkt, reliable));
 }
 
@@ -1520,15 +1550,14 @@ Address Connection::GetPeerAddress(session_t peer_id)
 
 	if (!peer)
 		throw PeerNotFoundException("No address for peer found!");
-	Address peer_address;
-	peer->getAddress(MTP_PRIMARY, peer_address);
-	return peer_address;
+	return peer->getAddress();
 }
 
 float Connection::getPeerStat(session_t peer_id, rtt_stat_type type)
 {
 	PeerHelper peer = getPeerNoEx(peer_id);
-	if (!peer) return -1;
+	if (!peer)
+		return -1;
 	return peer->getStat(type);
 }
 
@@ -1541,7 +1570,7 @@ float Connection::getLocalStat(rate_stat_type type)
 
 	FATAL_ERROR_IF(!peer, "Connection::getLocalStat we couldn't get our own peer? are you serious???");
 
-	float retval = 0.0;
+	float retval = 0;
 
 	for (Channel &channel : dynamic_cast<UDPPeer *>(&peer)->channels) {
 		switch(type) {
@@ -1570,33 +1599,26 @@ float Connection::getLocalStat(rate_stat_type type)
 	return retval;
 }
 
-u16 Connection::createPeer(Address& sender, MTProtocols protocol, int fd)
+session_t Connection::createPeer(const Address &sender, int fd)
 {
 	// Somebody wants to make a new connection
 
-	// Get a unique peer id (2 or higher)
-	session_t peer_id_new = m_next_remote_peer_id;
-	u16 overflow =  PEER_MINETEST_MAX;
+	// Get a unique peer id
+	const session_t minimum = PEER_MINETEST_MIN;
+	const session_t overflow = PEER_MINETEST_MAX;
 
 	/*
 		Find an unused peer id
 	*/
+
 	MutexAutoLock lock(m_peers_mutex);
-	bool out_of_ids = false;
-	for(;;) {
-		// Check if exists
+	session_t peer_id_new;
+	for (int tries = 0; tries < 100; tries++) {
+		peer_id_new = myrand_range(minimum, overflow - 1);
 		if (m_peers.find(peer_id_new) == m_peers.end())
-
 			break;
-		// Check for overflow
-		if (peer_id_new == overflow) {
-			out_of_ids = true;
-			break;
-		}
-		peer_id_new++;
 	}
-
-	if (out_of_ids) {
+	if (m_peers.find(peer_id_new) != m_peers.end()) {
 		errorstream << getDesc() << " ran out of peer ids" << std::endl;
 		return PEER_ID_INEXISTENT;
 	}
@@ -1608,10 +1630,6 @@ u16 Connection::createPeer(Address& sender, MTProtocols protocol, int fd)
 	m_peers[peer->id] = peer;
 	m_peer_ids.push_back(peer->id);
 
-	m_next_remote_peer_id = (peer_id_new + 1);
-
-	if (m_next_remote_peer_id > overflow) m_next_remote_peer_id = PEER_MINETEST_MIN;
-
 	LOG(dout_con << getDesc()
 			<< "createPeer(): giving peer_id=" << peer_id_new << std::endl);
 
@@ -1642,6 +1660,12 @@ void Connection::DisconnectPeer(session_t peer_id)
 	putCommand(ConnectionCommand::disconnect_peer(peer_id));
 }
 
+void Connection::doResendOne(session_t peer_id)
+{
+	assert(peer_id != PEER_ID_INEXISTENT);
+	putCommand(ConnectionCommand::resend_one(peer_id));
+}
+
 void Connection::sendAck(session_t peer_id, u8 channelnum, u16 seqnum)
 {
 	assert(channelnum < CHANNEL_COUNT); // Pre-condition
@@ -1660,14 +1684,13 @@ void Connection::sendAck(session_t peer_id, u8 channelnum, u16 seqnum)
 	m_sendThread->Trigger();
 }
 
-UDPPeer* Connection::createServerPeer(Address& address)
+UDPPeer* Connection::createServerPeer(const Address &address)
 {
 	if (ConnectedToServer())
-	{
 		throw ConnectionException("Already connected to a server");
-	}
 
 	UDPPeer *peer = new UDPPeer(PEER_ID_SERVER, address, this);
+	peer->SetFullyOpen();
 
 	{
 		MutexAutoLock lock(m_peers_mutex);
diff --git a/src/network/connection.h b/src/network/connection.h
index 3ef1bbe82..0b30d3339 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -28,104 +28,14 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "constants.h"
 #include "util/pointer.h"
 #include "util/container.h"
-#include "util/thread.h"
 #include "util/numeric.h"
+#include "porting.h"
 #include "networkprotocol.h"
 #include <iostream>
 #include <vector>
 #include <map>
 
 namespace con_ws { class Connection; }
-
-#define MAX_UDP_PEERS 0x3fff
-
-/*
-=== NOTES ===
-
-A packet is sent through a channel to a peer with a basic header:
-	Header (7 bytes):
-	[0] u32 protocol_id
-	[4] session_t sender_peer_id
-	[6] u8 channel
-sender_peer_id:
-	Unique to each peer.
-	value 0 (PEER_ID_INEXISTENT) is reserved for making new connections
-	value 1 (PEER_ID_SERVER) is reserved for server
-	these constants are defined in constants.h
-channel:
-	Channel numbers have no intrinsic meaning. Currently only 0, 1, 2 exist.
-*/
-#define BASE_HEADER_SIZE 7
-#define CHANNEL_COUNT 3
-
-/*
-Packet types:
-
-CONTROL: This is a packet used by the protocol.
-- When this is processed, nothing is handed to the user.
-	Header (2 byte):
-	[0] u8 type
-	[1] u8 controltype
-controltype and data description:
-	CONTROLTYPE_ACK
-		[2] u16 seqnum
-	CONTROLTYPE_SET_PEER_ID
-		[2] session_t peer_id_new
-	CONTROLTYPE_PING
-	- There is no actual reply, but this can be sent in a reliable
-	  packet to get a reply
-	CONTROLTYPE_DISCO
-*/
-enum ControlType : u8 {
-	CONTROLTYPE_ACK = 0,
-	CONTROLTYPE_SET_PEER_ID = 1,
-	CONTROLTYPE_PING = 2,
-	CONTROLTYPE_DISCO = 3,
-};
-
-/*
-ORIGINAL: This is a plain packet with no control and no error
-checking at all.
-- When this is processed, it is directly handed to the user.
-	Header (1 byte):
-	[0] u8 type
-*/
-//#define TYPE_ORIGINAL 1
-#define ORIGINAL_HEADER_SIZE 1
-
-/*
-SPLIT: These are sequences of packets forming one bigger piece of
-data.
-- When processed and all the packet_nums 0...packet_count-1 are
-  present (this should be buffered), the resulting data shall be
-  directly handed to the user.
-- If the data fails to come up in a reasonable time, the buffer shall
-  be silently discarded.
-- These can be sent as-is or atop of a RELIABLE packet stream.
-	Header (7 bytes):
-	[0] u8 type
-	[1] u16 seqnum
-	[3] u16 chunk_count
-	[5] u16 chunk_num
-*/
-//#define TYPE_SPLIT 2
-
-/*
-RELIABLE: Delivery of all RELIABLE packets shall be forced by ACKs,
-and they shall be delivered in the same order as sent. This is done
-with a buffer in the receiving and transmitting end.
-- When this is processed, the contents of each packet is recursively
-  processed as packets.
-	Header (3 bytes):
-	[0] u8 type
-	[1] u16 seqnum
-
-*/
-//#define TYPE_RELIABLE 3
-#define RELIABLE_HEADER_SIZE 3
-#define SEQNUM_INITIAL 65500
-#define SEQNUM_MAX 65535
-
 class NetworkPacket;
 
 namespace con
@@ -134,531 +44,34 @@ namespace con
 class ConnectionReceiveThread;
 class ConnectionSendThread;
 
-typedef enum MTProtocols {
-	MTP_PRIMARY,
-	MTP_UDP,
-	MTP_MINETEST_RELIABLE_UDP
-} MTProtocols;
-
-enum PacketType : u8 {
-	PACKET_TYPE_CONTROL = 0,
-	PACKET_TYPE_ORIGINAL = 1,
-	PACKET_TYPE_SPLIT = 2,
-	PACKET_TYPE_RELIABLE = 3,
-	PACKET_TYPE_MAX
-};
-
-inline bool seqnum_higher(u16 totest, u16 base)
-{
-	if (totest > base)
-	{
-		if ((totest - base) > (SEQNUM_MAX/2))
-			return false;
-
-		return true;
-	}
-
-	if ((base - totest) > (SEQNUM_MAX/2))
-		return true;
-
-	return false;
-}
-
-inline bool seqnum_in_window(u16 seqnum, u16 next,u16 window_size)
-{
-	u16 window_start = next;
-	u16 window_end   = ( next + window_size ) % (SEQNUM_MAX+1);
-
-	if (window_start < window_end) {
-		return ((seqnum >= window_start) && (seqnum < window_end));
-	}
-
-
-	return ((seqnum < window_end) || (seqnum >= window_start));
-}
-
-static inline float CALC_DTIME(u64 lasttime, u64 curtime)
-{
-	float value = ( curtime - lasttime) / 1000.0;
-	return MYMAX(MYMIN(value,0.1),0.0);
-}
-
-/*
-	Struct for all kinds of packets. Includes following data:
-		BASE_HEADER
-		u8[] packet data (usually copied from SharedBuffer<u8>)
-*/
-struct BufferedPacket {
-	BufferedPacket(u32 a_size)
-	{
-		m_data.resize(a_size);
-		data = &m_data[0];
-	}
-
-	DISABLE_CLASS_COPY(BufferedPacket)
-
-	u16 getSeqnum() const;
-
-	inline size_t size() const { return m_data.size(); }
-
-	u8 *data; // Direct memory access
-	float time = 0.0f; // Seconds from buffering the packet or re-sending
-	float totaltime = 0.0f; // Seconds from buffering the packet
-	u64 absolute_send_time = -1;
-	Address address; // Sender or destination
-	unsigned int resend_count = 0;
-
-private:
-	std::vector<u8> m_data; // Data of the packet, including headers
-};
-
-typedef std::shared_ptr<BufferedPacket> BufferedPacketPtr;
-
-
-// This adds the base headers to the data and makes a packet out of it
-BufferedPacketPtr makePacket(Address &address, const SharedBuffer<u8> &data,
-		u32 protocol_id, session_t sender_peer_id, u8 channel);
-
-// Depending on size, make a TYPE_ORIGINAL or TYPE_SPLIT packet
-// Increments split_seqnum if a split packet is made
-void makeAutoSplitPacket(const SharedBuffer<u8> &data, u32 chunksize_max,
-		u16 &split_seqnum, std::list<SharedBuffer<u8>> *list);
-
-// Add the TYPE_RELIABLE header to the data
-SharedBuffer<u8> makeReliablePacket(const SharedBuffer<u8> &data, u16 seqnum);
-
-struct IncomingSplitPacket
-{
-	IncomingSplitPacket(u32 cc, bool r):
-		chunk_count(cc), reliable(r) {}
-
-	IncomingSplitPacket() = delete;
-
-	float time = 0.0f; // Seconds from adding
-	u32 chunk_count;
-	bool reliable; // If true, isn't deleted on timeout
-
-	bool allReceived() const
-	{
-		return (chunks.size() == chunk_count);
-	}
-	bool insert(u32 chunk_num, SharedBuffer<u8> &chunkdata);
-	SharedBuffer<u8> reassemble();
-
-private:
-	// Key is chunk number, value is data without headers
-	std::map<u16, SharedBuffer<u8>> chunks;
-};
-
-/*
-	A buffer which stores reliable packets and sorts them internally
-	for fast access to the smallest one.
-*/
-
-typedef std::list<BufferedPacketPtr>::iterator RPBSearchResult;
-
-class ReliablePacketBuffer
-{
-public:
-	ReliablePacketBuffer() = default;
-
-	bool getFirstSeqnum(u16& result);
-
-	BufferedPacketPtr popFirst();
-	BufferedPacketPtr popSeqnum(u16 seqnum);
-	void insert(BufferedPacketPtr &p_ptr, u16 next_expected);
-
-	void incrementTimeouts(float dtime);
-	std::list<ConstSharedPtr<BufferedPacket>> getTimedOuts(float timeout, u32 max_packets);
-
-	void print();
-	bool empty();
-	u32 size();
-
-
-private:
-	RPBSearchResult findPacketNoLock(u16 seqnum);
-
-	std::list<BufferedPacketPtr> m_list;
-
-	u16 m_oldest_non_answered_ack;
-
-	std::mutex m_list_mutex;
-};
-
-/*
-	A buffer for reconstructing split packets
-*/
-
-class IncomingSplitBuffer
-{
-public:
-	~IncomingSplitBuffer();
-	/*
-		Returns a reference counted buffer of length != 0 when a full split
-		packet is constructed. If not, returns one of length 0.
-	*/
-	SharedBuffer<u8> insert(BufferedPacketPtr &p_ptr, bool reliable);
-
-	void removeUnreliableTimedOuts(float dtime, float timeout);
-
-private:
-	// Key is seqnum
-	std::map<u16, IncomingSplitPacket*> m_buf;
-
-	std::mutex m_map_mutex;
-};
-
-enum ConnectionCommandType{
-	CONNCMD_NONE,
-	CONNCMD_SERVE,
-	CONNCMD_CONNECT,
-	CONNCMD_DISCONNECT,
-	CONNCMD_DISCONNECT_PEER,
-	CONNCMD_SEND,
-	CONNCMD_SEND_TO_ALL,
-	CONCMD_ACK,
-	CONCMD_CREATE_PEER
-};
-
-struct ConnectionCommand;
-typedef std::shared_ptr<ConnectionCommand> ConnectionCommandPtr;
-
-// This is very similar to ConnectionEvent
-struct ConnectionCommand
-{
-	const ConnectionCommandType type;
-	Address address;
-	session_t peer_id = PEER_ID_INEXISTENT;
-	u8 channelnum = 0;
-	Buffer<u8> data;
-	bool reliable = false;
-	bool raw = false;
-
-	DISABLE_CLASS_COPY(ConnectionCommand);
-
-	//fm:
-	static ConnectionCommandPtr send(session_t peer_id, u8 channelnum, SharedBuffer<u8> data, bool reliable);
-
-	static ConnectionCommandPtr serve(Address address);
-	static ConnectionCommandPtr connect(Address address);
-	static ConnectionCommandPtr disconnect();
-	static ConnectionCommandPtr disconnect_peer(session_t peer_id);
-	static ConnectionCommandPtr send(session_t peer_id, u8 channelnum, NetworkPacket *pkt, bool reliable);
-	static ConnectionCommandPtr ack(session_t peer_id, u8 channelnum, const Buffer<u8> &data);
-	static ConnectionCommandPtr createPeer(session_t peer_id, const Buffer<u8> &data);
-
-private:
-	ConnectionCommand(ConnectionCommandType type_) :
-		type(type_) {}
-
-	static ConnectionCommandPtr create(ConnectionCommandType type);
-};
-
-/* maximum window size to use, 0xFFFF is theoretical maximum. don't think about
- * touching it, the less you're away from it the more likely data corruption
- * will occur
- */
-#define MAX_RELIABLE_WINDOW_SIZE 0x8000
-/* starting value for window size */
-#define START_RELIABLE_WINDOW_SIZE 0x400
-/* minimum value for window size */
-#define MIN_RELIABLE_WINDOW_SIZE 0x40
-
-class Channel
-{
-
-public:
-	u16 readNextIncomingSeqNum();
-	u16 incNextIncomingSeqNum();
-
-	u16 getOutgoingSequenceNumber(bool& successful);
-	u16 readOutgoingSequenceNumber();
-	bool putBackSequenceNumber(u16);
-
-	u16 readNextSplitSeqNum();
-	void setNextSplitSeqNum(u16 seqnum);
-
-	// This is for buffering the incoming packets that are coming in
-	// the wrong order
-	ReliablePacketBuffer incoming_reliables;
-	// This is for buffering the sent packets so that the sender can
-	// re-send them if no ACK is received
-	ReliablePacketBuffer outgoing_reliables_sent;
-
-	//queued reliable packets
-	std::queue<BufferedPacketPtr> queued_reliables;
-
-	//queue commands prior splitting to packets
-	std::deque<ConnectionCommandPtr> queued_commands;
-
-	IncomingSplitBuffer incoming_splits;
-
-	Channel() = default;
-	~Channel() = default;
-
-	void UpdatePacketLossCounter(unsigned int count);
-	void UpdatePacketTooLateCounter();
-	void UpdateBytesSent(unsigned int bytes,unsigned int packages=1);
-	void UpdateBytesLost(unsigned int bytes);
-	void UpdateBytesReceived(unsigned int bytes);
-
-	void UpdateTimers(float dtime);
-
-	float getCurrentDownloadRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return cur_kbps; };
-	float getMaxDownloadRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return max_kbps; };
-
-	float getCurrentLossRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return cur_kbps_lost; };
-	float getMaxLossRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return max_kbps_lost; };
-
-	float getCurrentIncomingRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return cur_incoming_kbps; };
-	float getMaxIncomingRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return max_incoming_kbps; };
-
-	float getAvgDownloadRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return avg_kbps; };
-	float getAvgLossRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return avg_kbps_lost; };
-	float getAvgIncomingRateKB()
-		{ MutexAutoLock lock(m_internal_mutex); return avg_incoming_kbps; };
-
-	u16 getWindowSize() const { return m_window_size; };
-
-	void setWindowSize(long size)
-	{
-		m_window_size = (u16)rangelim(size, MIN_RELIABLE_WINDOW_SIZE, MAX_RELIABLE_WINDOW_SIZE);
-	}
-
-private:
-	std::mutex m_internal_mutex;
-	u16 m_window_size = MIN_RELIABLE_WINDOW_SIZE;
-
-	u16 next_incoming_seqnum = SEQNUM_INITIAL;
-
-	u16 next_outgoing_seqnum = SEQNUM_INITIAL;
-	u16 next_outgoing_split_seqnum = SEQNUM_INITIAL;
-
-	unsigned int current_packet_loss = 0;
-	unsigned int current_packet_too_late = 0;
-	unsigned int current_packet_successful = 0;
-	float packet_loss_counter = 0.0f;
-
-	unsigned int current_bytes_transfered = 0;
-	unsigned int current_bytes_received = 0;
-	unsigned int current_bytes_lost = 0;
-	float max_kbps = 0.0f;
-	float cur_kbps = 0.0f;
-	float avg_kbps = 0.0f;
-	float max_incoming_kbps = 0.0f;
-	float cur_incoming_kbps = 0.0f;
-	float avg_incoming_kbps = 0.0f;
-	float max_kbps_lost = 0.0f;
-	float cur_kbps_lost = 0.0f;
-	float avg_kbps_lost = 0.0f;
-	float bpm_counter = 0.0f;
-
-	unsigned int rate_samples = 0;
-};
-
-class Peer;
-
-class PeerHelper
-{
-public:
-	PeerHelper() = default;
-	PeerHelper(Peer* peer);
-	~PeerHelper();
-
-	PeerHelper&   operator=(Peer* peer);
-	Peer*         operator->() const;
-	bool          operator!();
-	Peer*         operator&() const;
-	bool          operator!=(void* ptr);
-
-private:
-	Peer *m_peer = nullptr;
-};
-
-class Connection;
-
-typedef enum {
+enum rate_stat_type {
 	CUR_DL_RATE,
 	AVG_DL_RATE,
 	CUR_INC_RATE,
 	AVG_INC_RATE,
 	CUR_LOSS_RATE,
 	AVG_LOSS_RATE,
-} rate_stat_type;
-
-class Peer {
-	public:
-		friend class PeerHelper;
-
-		Peer(Address address_,session_t id_,Connection* connection) :
-			id(id_),
-			m_connection(connection),
-			address(address_),
-			m_last_timeout_check(porting::getTimeMs())
-		{
-		};
-
-		virtual ~Peer() {
-			MutexAutoLock usage_lock(m_exclusive_access_mutex);
-			FATAL_ERROR_IF(m_usage != 0, "Reference counting failure");
-		};
-
-		// Unique id of the peer
-		const session_t id;
-
-		void Drop();
-
-		virtual void PutReliableSendCommand(ConnectionCommandPtr &c,
-						unsigned int max_packet_size) {};
-
-		virtual bool getAddress(MTProtocols type, Address& toset) = 0;
-
-		bool isPendingDeletion()
-		{ MutexAutoLock lock(m_exclusive_access_mutex); return m_pending_deletion; };
-
-		void ResetTimeout()
-			{MutexAutoLock lock(m_exclusive_access_mutex); m_timeout_counter = 0.0; };
-
-		bool isTimedOut(float timeout);
-
-		unsigned int m_increment_packets_remaining = 0;
-
-		virtual u16 getNextSplitSequenceNumber(u8 channel) { return 0; };
-		virtual void setNextSplitSequenceNumber(u8 channel, u16 seqnum) {};
-		virtual SharedBuffer<u8> addSplitPacket(u8 channel, BufferedPacketPtr &toadd,
-				bool reliable)
-		{
-			errorstream << "Peer::addSplitPacket called,"
-					<< " this is supposed to be never called!" << std::endl;
-			return SharedBuffer<u8>(0);
-		};
-
-		virtual bool Ping(float dtime, SharedBuffer<u8>& data) { return false; };
-
-		virtual float getStat(rtt_stat_type type) const {
-			switch (type) {
-				case MIN_RTT:
-					return m_rtt.min_rtt;
-				case MAX_RTT:
-					return m_rtt.max_rtt;
-				case AVG_RTT:
-					return m_rtt.avg_rtt;
-				case MIN_JITTER:
-					return m_rtt.jitter_min;
-				case MAX_JITTER:
-					return m_rtt.jitter_max;
-				case AVG_JITTER:
-					return m_rtt.jitter_avg;
-			}
-			return -1;
-		}
-	protected:
-		virtual void reportRTT(float rtt) {};
-
-		void RTTStatistics(float rtt,
-							const std::string &profiler_id = "",
-							unsigned int num_samples = 1000);
-
-		bool IncUseCount();
-		void DecUseCount();
-
-		mutable std::mutex m_exclusive_access_mutex;
-
-		bool m_pending_deletion = false;
-
-		Connection* m_connection;
-
-		// Address of the peer
-		Address address;
-
-		// Ping timer
-		float m_ping_timer = 0.0f;
-	private:
-
-		struct rttstats {
-			float jitter_min = FLT_MAX;
-			float jitter_max = 0.0f;
-			float jitter_avg = -1.0f;
-			float min_rtt = FLT_MAX;
-			float max_rtt = 0.0f;
-			float avg_rtt = -1.0f;
-
-			rttstats() = default;
-		};
-
-		rttstats m_rtt;
-		float m_last_rtt = -1.0f;
-
-		// current usage count
-		unsigned int m_usage = 0;
-
-		// Seconds from last receive
-		float m_timeout_counter = 0.0f;
-
-		u64 m_last_timeout_check;
 };
 
-class UDPPeer : public Peer
+class Peer;
+
+// FIXME: Peer refcounting should generally be replaced by std::shared_ptr
+class PeerHelper
 {
 public:
+	PeerHelper() = default;
+	inline PeerHelper(Peer *peer) { *this = peer; }
+	~PeerHelper();
 
-	friend class PeerHelper;
-	friend class ConnectionReceiveThread;
-	friend class ConnectionSendThread;
-	friend class Connection;
-	friend class con_ws::Connection;
+	PeerHelper& operator=(Peer *peer);
+	inline Peer* operator->() const { return m_peer; }
+	inline Peer* operator&() const { return m_peer; }
 
-	UDPPeer(u16 a_id, Address a_address, Connection* connection);
-	virtual ~UDPPeer() = default;
+	inline bool operator!() { return !m_peer; }
+	inline bool operator!=(std::nullptr_t) { return !!m_peer; }
 
-	void PutReliableSendCommand(ConnectionCommandPtr &c,
-							unsigned int max_packet_size);
-
-	bool getAddress(MTProtocols type, Address& toset);
-
-	u16 getNextSplitSequenceNumber(u8 channel);
-	void setNextSplitSequenceNumber(u8 channel, u16 seqnum);
-
-	SharedBuffer<u8> addSplitPacket(u8 channel, BufferedPacketPtr &toadd,
-		bool reliable);
-
-protected:
-	/*
-		Calculates avg_rtt and resend_timeout.
-		rtt=-1 only recalculates resend_timeout
-	*/
-	void reportRTT(float rtt);
-
-	void RunCommandQueues(
-					unsigned int max_packet_size,
-					unsigned int maxcommands,
-					unsigned int maxtransfer);
-
-	float getResendTimeout()
-		{ MutexAutoLock lock(m_exclusive_access_mutex); return resend_timeout; }
-
-	void setResendTimeout(float timeout)
-		{ MutexAutoLock lock(m_exclusive_access_mutex); resend_timeout = timeout; }
-	bool Ping(float dtime,SharedBuffer<u8>& data);
-
-	Channel channels[CHANNEL_COUNT];
-	bool m_pending_disconnect = false;
 private:
-	// This is changed dynamically
-	float resend_timeout = 0.5;
-
-	bool processReliableSendCommand(
-					ConnectionCommandPtr &c_ptr,
-					unsigned int max_packet_size);
+	Peer *m_peer = nullptr;
 };
 
 /*
@@ -705,8 +118,147 @@ private:
 		type(type_) {}
 };
 
+struct ConnectionCommand;
+typedef std::shared_ptr<ConnectionCommand> ConnectionCommandPtr;
+
+struct BufferedPacket;
+typedef std::shared_ptr<BufferedPacket> BufferedPacketPtr;
+
+class Connection;
 class PeerHandler;
 
+class Peer {
+	public:
+		friend class PeerHelper;
+
+		virtual ~Peer() {
+			MutexAutoLock usage_lock(m_exclusive_access_mutex);
+			FATAL_ERROR_IF(m_usage != 0, "Reference counting failure");
+		}
+
+		// Unique id of the peer
+		const session_t id;
+
+		void Drop();
+
+		virtual void PutReliableSendCommand(ConnectionCommandPtr &c,
+						unsigned int max_packet_size) {};
+
+		virtual const Address &getAddress() const = 0;
+
+		bool isPendingDeletion() const {
+			MutexAutoLock lock(m_exclusive_access_mutex);
+			return m_pending_deletion;
+		}
+		void ResetTimeout() {
+			MutexAutoLock lock(m_exclusive_access_mutex);
+			m_timeout_counter = 0;
+		}
+
+		bool isHalfOpen() const {
+			MutexAutoLock lock(m_exclusive_access_mutex);
+			return m_half_open;
+		}
+		void SetFullyOpen() {
+			MutexAutoLock lock(m_exclusive_access_mutex);
+			m_half_open = false;
+		}
+
+		virtual bool isTimedOut(float timeout, std::string &reason);
+
+		unsigned int m_increment_packets_remaining = 0;
+
+		virtual u16 getNextSplitSequenceNumber(u8 channel) { return 0; };
+		virtual void setNextSplitSequenceNumber(u8 channel, u16 seqnum) {};
+		virtual SharedBuffer<u8> addSplitPacket(u8 channel, BufferedPacketPtr &toadd,
+				bool reliable)
+		{
+			FATAL_ERROR("unimplemented in abstract class");
+		}
+
+		virtual bool Ping(float dtime, SharedBuffer<u8>& data) { return false; };
+
+		virtual float getStat(rtt_stat_type type) const {
+			switch (type) {
+				case MIN_RTT:
+					return m_rtt.min_rtt;
+				case MAX_RTT:
+					return m_rtt.max_rtt;
+				case AVG_RTT:
+					return m_rtt.avg_rtt;
+				case MIN_JITTER:
+					return m_rtt.jitter_min;
+				case MAX_JITTER:
+					return m_rtt.jitter_max;
+				case AVG_JITTER:
+					return m_rtt.jitter_avg;
+			}
+			return -1;
+		}
+
+	protected:
+		Peer(session_t id, const Address &address, Connection *connection) :
+			id(id),
+			m_connection(connection),
+			address(address),
+			m_last_timeout_check(porting::getTimeMs())
+		{
+		}
+
+		virtual void reportRTT(float rtt) {};
+
+		void RTTStatistics(float rtt,
+							const std::string &profiler_id = "",
+							unsigned int num_samples = 1000);
+
+		bool IncUseCount();
+		void DecUseCount();
+
+		mutable std::mutex m_exclusive_access_mutex;
+
+		bool m_pending_deletion = false;
+
+		Connection *m_connection;
+
+		// Address of the peer
+		Address address;
+
+		// Ping timer
+		float m_ping_timer = 0.0f;
+
+	private:
+		struct rttstats {
+			float jitter_min = FLT_MAX;
+			float jitter_max = 0.0f;
+			float jitter_avg = -1.0f;
+			float min_rtt = FLT_MAX;
+			float max_rtt = 0.0f;
+			float avg_rtt = -1.0f;
+		};
+
+		rttstats m_rtt;
+		float m_last_rtt = -1.0f;
+
+		/*
+			Until the peer has communicated with us using their assigned peer id
+			the connection is considered half-open.
+			During this time we inhibit re-sending any reliables or pings. This
+			is to avoid spending too many resources on a potential DoS attack
+			and to make sure Minetest servers are not useful for UDP amplificiation.
+		*/
+		bool m_half_open = true;
+
+		// current usage count
+		unsigned int m_usage = 0;
+
+		// Seconds from last receive
+		float m_timeout_counter = 0.0f;
+
+		u64 m_last_timeout_check;
+};
+
+class UDPPeer;
+
 class Connection
 {
 public:
@@ -727,7 +279,8 @@ public:
 	void Connect(Address address);
 	bool Connected();
 	void Disconnect();
-	u32 Receive(NetworkPacket* pkt);
+	u32 ReceiveTimeoutMs(NetworkPacket *pkt, u32 timeout_ms);
+	u32 Receive(NetworkPacket *pkt);
 	bool TryReceive(NetworkPacket *pkt);
 	void Send(session_t peer_id, u8 channelnum, NetworkPacket *pkt, bool reliable);
 	session_t GetPeerID() const { return m_peer_id; }
@@ -740,14 +293,16 @@ public:
 
 	PeerHelper getPeerNoEx(session_t peer_id);
 protected:
-	u16   lookupPeer(Address& sender);
+	session_t   lookupPeer(const Address& sender);
 
-	u16 createPeer(Address& sender, MTProtocols protocol, int fd);
-	UDPPeer*  createServerPeer(Address& sender);
+	session_t createPeer(const Address& sender, int fd);
+	UDPPeer*  createServerPeer(const Address& sender);
 	bool deletePeer(session_t peer_id, bool timeout);
 
 	void SetPeerID(session_t id) { m_peer_id = id; }
 
+	void doResendOne(session_t peer_id);
+
 	void sendAck(session_t peer_id, u8 channelnum, u16 seqnum);
 
 	std::vector<session_t> getPeerIDs()
@@ -756,14 +311,12 @@ protected:
 		return m_peer_ids;
 	}
 
+	u32 getActiveCount();
+
 	UDPSocket m_udpSocket;
 	// Command queue: user -> SendThread
 	MutexedQueue<ConnectionCommandPtr> m_command_queue;
 
-public:
-	u32 Receive(NetworkPacket *pkt, u32 timeout);
-protected:
-
 	void putEvent(ConnectionEventPtr e);
 
 	void TriggerSend();
@@ -792,14 +345,13 @@ private:
 	PeerHandler *m_bc_peerhandler;
 	u32 m_bc_receive_timeout = 0;
 
-	std::atomic_bool m_shutting_down = false;
-
-	session_t m_next_remote_peer_id = PEER_MINETEST_MIN;
-
-//freeminer:
+// freeminer:
 public:
 	size_t events_size() { return m_event_queue.size(); }
+private:
+// ==
 
+	std::atomic_bool m_shutting_down = false;
 };
 
 } // namespace
diff --git a/src/network/connection_internal.h b/src/network/connection_internal.h
new file mode 100644
index 000000000..ad7d6e28e
--- /dev/null
+++ b/src/network/connection_internal.h
@@ -0,0 +1,505 @@
+/*
+Minetest
+Copyright (C) 2013 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+/********************************************/
+/* may only be included from in src/network */
+/********************************************/
+
+#include "connection.h"
+
+#define MAX_UDP_PEERS 0x3fff
+
+/*
+=== NOTES ===
+
+A packet is sent through a channel to a peer with a basic header:
+	Header (7 bytes):
+	[0] u32 protocol_id
+	[4] session_t sender_peer_id
+	[6] u8 channel
+sender_peer_id:
+	Unique to each peer.
+	value 0 (PEER_ID_INEXISTENT) is reserved for making new connections
+	value 1 (PEER_ID_SERVER) is reserved for server
+	these constants are defined in constants.h
+channel:
+	Channel numbers have no intrinsic meaning. Currently only 0, 1, 2 exist.
+*/
+#define BASE_HEADER_SIZE 7
+#define CHANNEL_COUNT 3
+
+/*
+Packet types:
+
+CONTROL: This is a packet used by the protocol.
+- When this is processed, nothing is handed to the user.
+	Header (2 byte):
+	[0] u8 type
+	[1] u8 controltype
+controltype and data description:
+	CONTROLTYPE_ACK
+		[2] u16 seqnum
+	CONTROLTYPE_SET_PEER_ID
+		[2] session_t peer_id_new
+	CONTROLTYPE_PING
+	- There is no actual reply, but this can be sent in a reliable
+	  packet to get a reply
+	CONTROLTYPE_DISCO
+*/
+enum ControlType : u8 {
+	CONTROLTYPE_ACK = 0,
+	CONTROLTYPE_SET_PEER_ID = 1,
+	CONTROLTYPE_PING = 2,
+	CONTROLTYPE_DISCO = 3,
+};
+
+/*
+ORIGINAL: This is a plain packet with no control and no error
+checking at all.
+- When this is processed, it is directly handed to the user.
+	Header (1 byte):
+	[0] u8 type
+*/
+//#define TYPE_ORIGINAL 1
+#define ORIGINAL_HEADER_SIZE 1
+
+/*
+SPLIT: These are sequences of packets forming one bigger piece of
+data.
+- When processed and all the packet_nums 0...packet_count-1 are
+  present (this should be buffered), the resulting data shall be
+  directly handed to the user.
+- If the data fails to come up in a reasonable time, the buffer shall
+  be silently discarded.
+- These can be sent as-is or atop of a RELIABLE packet stream.
+	Header (7 bytes):
+	[0] u8 type
+	[1] u16 seqnum
+	[3] u16 chunk_count
+	[5] u16 chunk_num
+*/
+//#define TYPE_SPLIT 2
+
+/*
+RELIABLE: Delivery of all RELIABLE packets shall be forced by ACKs,
+and they shall be delivered in the same order as sent. This is done
+with a buffer in the receiving and transmitting end.
+- When this is processed, the contents of each packet is recursively
+  processed as packets.
+	Header (3 bytes):
+	[0] u8 type
+	[1] u16 seqnum
+
+*/
+//#define TYPE_RELIABLE 3
+#define RELIABLE_HEADER_SIZE 3
+#define SEQNUM_INITIAL 65500
+#define SEQNUM_MAX 65535
+
+namespace con
+{
+
+
+enum PacketType : u8 {
+	PACKET_TYPE_CONTROL = 0,
+	PACKET_TYPE_ORIGINAL = 1,
+	PACKET_TYPE_SPLIT = 2,
+	PACKET_TYPE_RELIABLE = 3,
+	PACKET_TYPE_MAX
+};
+
+inline bool seqnum_higher(u16 totest, u16 base)
+{
+	if (totest > base)
+	{
+		if ((totest - base) > (SEQNUM_MAX/2))
+			return false;
+
+		return true;
+	}
+
+	if ((base - totest) > (SEQNUM_MAX/2))
+		return true;
+
+	return false;
+}
+
+inline bool seqnum_in_window(u16 seqnum, u16 next,u16 window_size)
+{
+	u16 window_start = next;
+	u16 window_end   = ( next + window_size ) % (SEQNUM_MAX+1);
+
+	if (window_start < window_end) {
+		return ((seqnum >= window_start) && (seqnum < window_end));
+	}
+
+
+	return ((seqnum < window_end) || (seqnum >= window_start));
+}
+
+inline float CALC_DTIME(u64 lasttime, u64 curtime)
+{
+	float value = (curtime - lasttime) / 1000.0f;
+	return MYMAX(MYMIN(value, 0.1f), 0.0f);
+}
+
+
+/*
+	Struct for all kinds of packets. Includes following data:
+		BASE_HEADER
+		u8[] packet data (usually copied from SharedBuffer<u8>)
+*/
+struct BufferedPacket {
+	BufferedPacket(u32 a_size)
+	{
+		m_data.resize(a_size);
+		data = &m_data[0];
+	}
+
+	DISABLE_CLASS_COPY(BufferedPacket)
+
+	u16 getSeqnum() const;
+
+	inline size_t size() const { return m_data.size(); }
+
+	u8 *data; // Direct memory access
+	float time = 0.0f; // Seconds from buffering the packet or re-sending
+	float totaltime = 0.0f; // Seconds from buffering the packet
+	u64 absolute_send_time = -1;
+	Address address; // Sender or destination
+	unsigned int resend_count = 0;
+
+private:
+	std::vector<u8> m_data; // Data of the packet, including headers
+};
+
+
+// This adds the base headers to the data and makes a packet out of it
+BufferedPacketPtr makePacket(const Address &address, const SharedBuffer<u8> &data,
+		u32 protocol_id, session_t sender_peer_id, u8 channel);
+
+// Depending on size, make a TYPE_ORIGINAL or TYPE_SPLIT packet
+// Increments split_seqnum if a split packet is made
+void makeAutoSplitPacket(const SharedBuffer<u8> &data, u32 chunksize_max,
+		u16 &split_seqnum, std::list<SharedBuffer<u8>> *list);
+
+// Add the TYPE_RELIABLE header to the data
+SharedBuffer<u8> makeReliablePacket(const SharedBuffer<u8> &data, u16 seqnum);
+
+struct IncomingSplitPacket
+{
+	IncomingSplitPacket(u32 cc, bool r):
+		chunk_count(cc), reliable(r) {}
+
+	IncomingSplitPacket() = delete;
+
+	float time = 0.0f; // Seconds from adding
+	u32 chunk_count;
+	bool reliable; // If true, isn't deleted on timeout
+
+	bool allReceived() const
+	{
+		return (chunks.size() == chunk_count);
+	}
+	bool insert(u32 chunk_num, SharedBuffer<u8> &chunkdata);
+	SharedBuffer<u8> reassemble();
+
+private:
+	// Key is chunk number, value is data without headers
+	std::map<u16, SharedBuffer<u8>> chunks;
+};
+
+/*
+	A buffer which stores reliable packets and sorts them internally
+	for fast access to the smallest one.
+*/
+
+class ReliablePacketBuffer
+{
+public:
+	bool getFirstSeqnum(u16 &result);
+
+	BufferedPacketPtr popFirst();
+	BufferedPacketPtr popSeqnum(u16 seqnum);
+	void insert(BufferedPacketPtr &p_ptr, u16 next_expected);
+
+	void incrementTimeouts(float dtime);
+	u32 getTimedOuts(float timeout);
+	// timeout relative to last resend
+	std::vector<ConstSharedPtr<BufferedPacket>> getResend(float timeout, u32 max_packets);
+
+	void print();
+	bool empty();
+	u32 size();
+
+
+private:
+	typedef std::list<BufferedPacketPtr>::iterator FindResult;
+
+	FindResult findPacketNoLock(u16 seqnum);
+
+	std::list<BufferedPacketPtr> m_list;
+
+	u16 m_oldest_non_answered_ack;
+
+	std::mutex m_list_mutex;
+};
+
+/*
+	A buffer for reconstructing split packets
+*/
+
+class IncomingSplitBuffer
+{
+public:
+	~IncomingSplitBuffer();
+
+	/*
+		Returns a reference counted buffer of length != 0 when a full split
+		packet is constructed. If not, returns one of length 0.
+	*/
+	SharedBuffer<u8> insert(BufferedPacketPtr &p_ptr, bool reliable);
+
+	void removeUnreliableTimedOuts(float dtime, float timeout);
+
+private:
+	// Key is seqnum
+	std::map<u16, IncomingSplitPacket*> m_buf;
+
+	std::mutex m_map_mutex;
+};
+
+enum ConnectionCommandType{
+	CONNCMD_NONE,
+	CONNCMD_SERVE,
+	CONNCMD_CONNECT,
+	CONNCMD_DISCONNECT,
+	CONNCMD_DISCONNECT_PEER,
+	CONNCMD_SEND,
+	CONNCMD_SEND_TO_ALL,
+	CONCMD_ACK,
+	CONCMD_CREATE_PEER,
+	CONNCMD_RESEND_ONE
+};
+
+// This is very similar to ConnectionEvent
+struct ConnectionCommand
+{
+	const ConnectionCommandType type;
+	Address address;
+	session_t peer_id = PEER_ID_INEXISTENT;
+	u8 channelnum = 0;
+	Buffer<u8> data;
+	bool reliable = false;
+	bool raw = false;
+
+	DISABLE_CLASS_COPY(ConnectionCommand);
+
+	//fm:
+	static ConnectionCommandPtr send(session_t peer_id, u8 channelnum, SharedBuffer<u8> data, bool reliable);
+
+	static ConnectionCommandPtr serve(Address address);
+	static ConnectionCommandPtr connect(Address address);
+	static ConnectionCommandPtr disconnect();
+	static ConnectionCommandPtr disconnect_peer(session_t peer_id);
+	static ConnectionCommandPtr resend_one(session_t peer_id);
+	static ConnectionCommandPtr send(session_t peer_id, u8 channelnum, NetworkPacket *pkt, bool reliable);
+	static ConnectionCommandPtr ack(session_t peer_id, u8 channelnum, const Buffer<u8> &data);
+	static ConnectionCommandPtr createPeer(session_t peer_id, const Buffer<u8> &data);
+
+private:
+	ConnectionCommand(ConnectionCommandType type_) :
+		type(type_) {}
+
+	static ConnectionCommandPtr create(ConnectionCommandType type);
+};
+
+/* maximum window size to use, 0xFFFF is theoretical maximum. don't think about
+ * touching it, the less you're away from it the more likely data corruption
+ * will occur
+ */
+#define MAX_RELIABLE_WINDOW_SIZE 0x8000
+/* starting value for window size */
+#define START_RELIABLE_WINDOW_SIZE 0x400
+/* minimum value for window size */
+#define MIN_RELIABLE_WINDOW_SIZE 0x40
+
+class Channel
+{
+
+public:
+	u16 readNextIncomingSeqNum();
+	u16 incNextIncomingSeqNum();
+
+	u16 getOutgoingSequenceNumber(bool& successful);
+	u16 readOutgoingSequenceNumber();
+	bool putBackSequenceNumber(u16);
+
+	u16 readNextSplitSeqNum();
+	void setNextSplitSeqNum(u16 seqnum);
+
+	// This is for buffering the incoming packets that are coming in
+	// the wrong order
+	ReliablePacketBuffer incoming_reliables;
+	// This is for buffering the sent packets so that the sender can
+	// re-send them if no ACK is received
+	ReliablePacketBuffer outgoing_reliables_sent;
+
+	//queued reliable packets
+	std::queue<BufferedPacketPtr> queued_reliables;
+
+	//queue commands prior splitting to packets
+	std::deque<ConnectionCommandPtr> queued_commands;
+
+	IncomingSplitBuffer incoming_splits;
+
+	Channel() = default;
+	~Channel() = default;
+
+	void UpdatePacketLossCounter(unsigned int count);
+	void UpdatePacketTooLateCounter();
+	void UpdateBytesSent(unsigned int bytes,unsigned int packages=1);
+	void UpdateBytesLost(unsigned int bytes);
+	void UpdateBytesReceived(unsigned int bytes);
+
+	void UpdateTimers(float dtime);
+
+	float getCurrentDownloadRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return cur_kbps; };
+	float getMaxDownloadRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return max_kbps; };
+
+	float getCurrentLossRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return cur_kbps_lost; };
+	float getMaxLossRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return max_kbps_lost; };
+
+	float getCurrentIncomingRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return cur_incoming_kbps; };
+	float getMaxIncomingRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return max_incoming_kbps; };
+
+	float getAvgDownloadRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return avg_kbps; };
+	float getAvgLossRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return avg_kbps_lost; };
+	float getAvgIncomingRateKB()
+		{ MutexAutoLock lock(m_internal_mutex); return avg_incoming_kbps; };
+
+	u16 getWindowSize() const { return m_window_size; };
+
+	void setWindowSize(long size)
+	{
+		m_window_size = (u16)rangelim(size, MIN_RELIABLE_WINDOW_SIZE, MAX_RELIABLE_WINDOW_SIZE);
+	}
+
+private:
+	std::mutex m_internal_mutex;
+	u16 m_window_size = MIN_RELIABLE_WINDOW_SIZE;
+
+	u16 next_incoming_seqnum = SEQNUM_INITIAL;
+
+	u16 next_outgoing_seqnum = SEQNUM_INITIAL;
+	u16 next_outgoing_split_seqnum = SEQNUM_INITIAL;
+
+	unsigned int current_packet_loss = 0;
+	unsigned int current_packet_too_late = 0;
+	unsigned int current_packet_successful = 0;
+	float packet_loss_counter = 0.0f;
+
+	unsigned int current_bytes_transfered = 0;
+	unsigned int current_bytes_received = 0;
+	unsigned int current_bytes_lost = 0;
+	float max_kbps = 0.0f;
+	float cur_kbps = 0.0f;
+	float avg_kbps = 0.0f;
+	float max_incoming_kbps = 0.0f;
+	float cur_incoming_kbps = 0.0f;
+	float avg_incoming_kbps = 0.0f;
+	float max_kbps_lost = 0.0f;
+	float cur_kbps_lost = 0.0f;
+	float avg_kbps_lost = 0.0f;
+	float bpm_counter = 0.0f;
+
+	unsigned int rate_samples = 0;
+};
+
+
+class UDPPeer final : public Peer
+{
+public:
+
+	friend class con_ws::Connection;
+
+	friend class PeerHelper;
+	friend class ConnectionReceiveThread;
+	friend class ConnectionSendThread;
+	friend class Connection;
+
+	UDPPeer(session_t id, const Address &address, Connection *connection);
+	virtual ~UDPPeer() = default;
+
+	void PutReliableSendCommand(ConnectionCommandPtr &c,
+							unsigned int max_packet_size) override;
+
+	virtual const Address &getAddress() const override {
+		return address;
+	}
+
+	u16 getNextSplitSequenceNumber(u8 channel) override;
+	void setNextSplitSequenceNumber(u8 channel, u16 seqnum) override;
+
+	SharedBuffer<u8> addSplitPacket(u8 channel, BufferedPacketPtr &toadd,
+		bool reliable) override;
+
+	bool isTimedOut(float timeout, std::string &reason) override;
+
+protected:
+	/*
+		Calculates avg_rtt and resend_timeout.
+		rtt=-1 only recalculates resend_timeout
+	*/
+	void reportRTT(float rtt) override;
+
+	void RunCommandQueues(
+					unsigned int max_packet_size,
+					unsigned int maxtransfer);
+
+	float getResendTimeout()
+		{ MutexAutoLock lock(m_exclusive_access_mutex); return resend_timeout; }
+
+	void setResendTimeout(float timeout)
+		{ MutexAutoLock lock(m_exclusive_access_mutex); resend_timeout = timeout; }
+
+	bool Ping(float dtime, SharedBuffer<u8>& data) override;
+
+	Channel channels[CHANNEL_COUNT];
+	bool m_pending_disconnect = false;
+private:
+	// This is changed dynamically
+	float resend_timeout = 0.5;
+
+	bool processReliableSendCommand(
+					ConnectionCommandPtr &c_ptr,
+					unsigned int max_packet_size);
+};
+
+}
diff --git a/src/network/connectionthreads.cpp b/src/network/connectionthreads.cpp
index cab3856e9..071e2b1aa 100644
--- a/src/network/connectionthreads.cpp
+++ b/src/network/connectionthreads.cpp
@@ -47,13 +47,13 @@ namespace con
 // TODO: Clean this up.
 #define LOG(a) a
 
-#define WINDOW_SIZE 5
+#define MAX_NEW_PEERS_PER_SEC 30
 
-static session_t readPeerId(const u8 *packetdata)
+static inline session_t readPeerId(const u8 *packetdata)
 {
 	return readU16(&packetdata[4]);
 }
-static u8 readChannel(const u8 *packetdata)
+static inline u8 readChannel(const u8 *packetdata)
 {
 	return readU8(&packetdata[6]);
 }
@@ -91,8 +91,6 @@ void *ConnectionSendThread::run()
 		BEGIN_DEBUG_EXCEPTION_HANDLER
 		PROFILE(ScopeProfiler sp(g_profiler, ThreadIdentifier.str(), SPT_AVG));
 
-		m_iteration_packets_avaialble = m_max_data_packets_per_iteration;
-
 		/* wait for trigger or timeout */
 		m_send_sleep_semaphore.wait(50);
 
@@ -104,8 +102,16 @@ void *ConnectionSendThread::run()
 		curtime = porting::getTimeMs();
 		float dtime = CALC_DTIME(lasttime, curtime);
 
+		m_iteration_packets_avaialble = m_max_data_packets_per_iteration;
+		const auto &calculate_quota = [&] () -> u32 {
+			u32 numpeers = m_connection->getActiveCount();
+			if (numpeers > 0)
+				return MYMAX(1, m_iteration_packets_avaialble / numpeers);
+			return m_iteration_packets_avaialble;
+		};
+
 		/* first resend timed-out packets */
-		runTimeouts(dtime);
+		runTimeouts(dtime, calculate_quota());
 		if (m_iteration_packets_avaialble == 0) {
 			LOG(warningstream << m_connection->getDesc()
 				<< " Packet quota used up after re-sending packets, "
@@ -126,7 +132,7 @@ void *ConnectionSendThread::run()
 		}
 
 		/* send queued packets */
-		sendPackets(dtime);
+		sendPackets(dtime, calculate_quota());
 
 		END_DEBUG_EXCEPTION_HANDLER
 	}
@@ -167,22 +173,12 @@ bool ConnectionSendThread::packetsQueued()
 	return false;
 }
 
-void ConnectionSendThread::runTimeouts(float dtime)
+void ConnectionSendThread::runTimeouts(float dtime, u32 peer_packet_quota)
 {
 	std::vector<session_t> timeouted_peers;
 	std::vector<session_t> peerIds = m_connection->getPeerIDs();
 
-	u32 numpeers;
-
-	{
-		MutexAutoLock peerlock(m_connection->m_peers_mutex);
-		numpeers = m_connection->m_peers.size();
-	}
-
-	if (numpeers == 0)
-		return;
-
-	for (session_t &peerId : peerIds) {
+	for (const session_t peerId : peerIds) {
 		PeerHelper peer = m_connection->getPeerNoEx(peerId);
 
 		if (!peer)
@@ -203,10 +199,15 @@ void ConnectionSendThread::runTimeouts(float dtime)
 		/*
 			Check peer timeout
 		*/
-		if (peer->isTimedOut(m_timeout)) {
+		// When the connection is half-open give the peer less time.
+		// Note that this time is also fixed since the timeout is not reset in half-open state.
+		const float peer_timeout = peer->isHalfOpen() ?
+			MYMAX(5.0f, m_timeout / 4) : m_timeout;
+		std::string reason;
+		if (peer->isTimedOut(peer_timeout, reason)) {
 			infostream << m_connection->getDesc()
 				<< "RunTimeouts(): Peer " << peer->id
-				<< " has timed out."
+				<< " has timed out (" << reason << ")"
 				<< std::endl;
 			// Add peer to the list
 			timeouted_peers.push_back(peer->id);
@@ -218,41 +219,38 @@ void ConnectionSendThread::runTimeouts(float dtime)
 		for (Channel &channel : udpPeer->channels) {
 
 			// Remove timed out incomplete unreliable split packets
-			channel.incoming_splits.removeUnreliableTimedOuts(dtime, m_timeout);
+			channel.incoming_splits.removeUnreliableTimedOuts(dtime, peer_timeout);
 
 			// Increment reliable packet times
 			channel.outgoing_reliables_sent.incrementTimeouts(dtime);
 
 			// Re-send timed out outgoing reliables
-			auto timed_outs = channel.outgoing_reliables_sent.getTimedOuts(resend_timeout,
-				(m_max_data_packets_per_iteration / numpeers));
+			auto timed_outs = channel.outgoing_reliables_sent.getResend(
+				resend_timeout, peer_packet_quota);
 
 			channel.UpdatePacketLossCounter(timed_outs.size());
 			g_profiler->graphAdd("packets_lost", timed_outs.size());
 
-			m_iteration_packets_avaialble -= timed_outs.size();
-
-			for (const auto &k : timed_outs) {
-				u8 channelnum = readChannel(k->data);
-				u16 seqnum = k->getSeqnum();
-
-				channel.UpdateBytesLost(k->size());
-
-				LOG(derr_con << m_connection->getDesc()
-					<< "RE-SENDING timed-out RELIABLE to "
-					<< k->address.serializeString()
-					<< "(t/o=" << resend_timeout << "): "
-					<< "count=" << k->resend_count
-					<< ", channel=" << ((int) channelnum & 0xff)
-					<< ", seqnum=" << seqnum
-					<< std::endl);
-
-				rawSend(k.get());
-
-				// do not handle rtt here as we can't decide if this packet was
-				// lost or really takes more time to transmit
+			// Note that this only happens during connection setup, it would
+			// break badly otherwise.
+			if (peer->isHalfOpen()) {
+				if (!timed_outs.empty()) {
+					dout_con << m_connection->getDesc() <<
+						"Skipping re-send of " << timed_outs.size() <<
+						" timed-out reliables to peer_id " << udpPeer->id
+						<< " (half-open)." << std::endl;
+				}
+				continue;
 			}
 
+			if (m_iteration_packets_avaialble > timed_outs.size())
+				m_iteration_packets_avaialble -= timed_outs.size();
+			else
+				m_iteration_packets_avaialble = 0;
+
+			for (const auto &k : timed_outs)
+				resendReliable(channel, k.get(), resend_timeout);
+
 			channel.UpdateTimers(dtime);
 		}
 
@@ -260,16 +258,10 @@ void ConnectionSendThread::runTimeouts(float dtime)
 		if (udpPeer->Ping(dtime, data)) {
 			LOG(dout_con << m_connection->getDesc()
 				<< "Sending ping for peer_id: " << udpPeer->id << std::endl);
-			/* this may fail if there ain't a sequence number left */
-			if (!rawSendAsPacket(udpPeer->id, 0, data, true)) {
-				//retrigger with reduced ping interval
-				udpPeer->Ping(4.0, data);
-			}
+			rawSendAsPacket(udpPeer->id, 0, data, true);
 		}
 
-		udpPeer->RunCommandQueues(m_max_packet_size,
-			m_max_commands_per_iteration,
-			m_max_packets_requeued);
+		udpPeer->RunCommandQueues(m_max_packet_size, m_max_packets_requeued);
 	}
 
 	// Remove timed out peers
@@ -280,8 +272,36 @@ void ConnectionSendThread::runTimeouts(float dtime)
 	}
 }
 
+void ConnectionSendThread::resendReliable(Channel &channel, const BufferedPacket *k, float resend_timeout)
+{
+	assert(k);
+	u8 channelnum = readChannel(k->data);
+	u16 seqnum = k->getSeqnum();
+
+	channel.UpdateBytesLost(k->size());
+
+	derr_con << m_connection->getDesc()
+		<< "RE-SENDING timed-out RELIABLE to "
+		<< k->address.serializeString();
+	if (resend_timeout >= 0)
+		derr_con << "(t/o=" << resend_timeout << "): ";
+	else
+		derr_con << "(force): ";
+	derr_con
+		<< "count=" << k->resend_count
+		<< ", channel=" << ((int) channelnum & 0xff)
+		<< ", seqnum=" << seqnum
+		<< std::endl;
+
+	rawSend(k);
+
+	// do not handle rtt here as we can't decide if this packet was
+	// lost or really takes more time to transmit
+}
+
 void ConnectionSendThread::rawSend(const BufferedPacket *p)
 {
+	assert(p);
 	try {
 		m_connection->m_udpSocket.Send(p->address, p->data, p->size());
 		LOG(dout_con << m_connection->getDesc()
@@ -337,11 +357,9 @@ bool ConnectionSendThread::rawSendAsPacket(session_t peer_id, u8 channelnum,
 			return false;
 
 		SharedBuffer<u8> reliable = makeReliablePacket(data, seqnum);
-		Address peer_address;
-		peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
 
 		// Add base headers and make a packet
-		BufferedPacketPtr p = con::makePacket(peer_address, reliable,
+		BufferedPacketPtr p = con::makePacket(peer->getAddress(), reliable,
 			m_connection->GetProtocolID(), m_connection->GetPeerID(),
 			channelnum);
 
@@ -363,22 +381,14 @@ bool ConnectionSendThread::rawSendAsPacket(session_t peer_id, u8 channelnum,
 		return false;
 	}
 
-	Address peer_address;
-	if (peer->getAddress(MTP_UDP, peer_address)) {
-		// Add base headers and make a packet
-		BufferedPacketPtr p = con::makePacket(peer_address, data,
-			m_connection->GetProtocolID(), m_connection->GetPeerID(),
-			channelnum);
+	// Add base headers and make a packet
+	BufferedPacketPtr p = con::makePacket(peer->getAddress(), data,
+		m_connection->GetProtocolID(), m_connection->GetPeerID(),
+		channelnum);
 
-		// Send the packet
-		rawSend(p.get());
-		return true;
-	}
-
-	LOG(dout_con << m_connection->getDesc()
-		<< " INFO: dropped unreliable packet for peer_id: " << peer_id
-		<< " because of (yet) missing udp address" << std::endl);
-	return false;
+	// Send the packet
+	rawSend(p.get());
+	return true;
 }
 
 void ConnectionSendThread::processReliableCommand(ConnectionCommandPtr &c)
@@ -412,6 +422,23 @@ void ConnectionSendThread::processReliableCommand(ConnectionCommandPtr &c)
 			}
 			return;
 
+		case CONNCMD_RESEND_ONE: {
+			LOG(dout_con << m_connection->getDesc()
+				<< "UDP processing reliable CONNCMD_RESEND_ONE" << std::endl);
+
+			PeerHelper peer = m_connection->getPeerNoEx(c->peer_id);
+			if (!peer)
+				return;
+			Channel &channel = dynamic_cast<UDPPeer *>(&peer)->channels[c->channelnum];
+
+			auto list = channel.outgoing_reliables_sent.getResend(0, 1);
+
+			if (!list.empty())
+				resendReliable(channel, list.front().get(), -1);
+
+			return;
+		}
+
 		case CONNCMD_SERVE:
 		case CONNCMD_CONNECT:
 		case CONNCMD_DISCONNECT:
@@ -471,9 +498,6 @@ void ConnectionSendThread::processNonReliableCommand(ConnectionCommandPtr &c_ptr
 			sendAsPacket(c.peer_id, c.channelnum, c.data, true);
 			return;
 		case CONCMD_CREATE_PEER:
-		/*
-			FATAL_ERROR("Got command that should be reliable as unreliable command");
-		*/
 			LOG(dout_con << m_connection->getDesc()
 				<< "UDP processing reliable CONCMD_CREATE_PEER" << std::endl);
 			if (!rawSendAsPacket(c.peer_id, c.channelnum, c.data, c.reliable)) {
@@ -482,6 +506,11 @@ void ConnectionSendThread::processNonReliableCommand(ConnectionCommandPtr &c_ptr
 				//sendReliable(c);
 			}
 			return;
+
+		case CONNCMD_RESEND_ONE:
+        /*
+			FATAL_ERROR("Got command that should be reliable as unreliable command");
+		*/
 		
 		default:
 			LOG(dout_con << m_connection->getDesc()
@@ -505,9 +534,9 @@ void ConnectionSendThread::serve(Address bind_address)
 
 void ConnectionSendThread::connect(Address address)
 {
-	LOG(dout_con << m_connection->getDesc() << " connecting to "
-		<< address.serializeString()
-		<< ":" << address.getPort() << std::endl);
+	dout_con << m_connection->getDesc() << " connecting to ";
+	address.print(dout_con);
+	dout_con << std::endl;
 
 	UDPPeer *peer = m_connection->createServerPeer(address);
 
@@ -515,11 +544,10 @@ void ConnectionSendThread::connect(Address address)
 	m_connection->putEvent(ConnectionEvent::peerAdded(peer->id, peer->address));
 
 	Address bind_addr;
-
 	if (address.isIPv6())
-		bind_addr.setAddress((IPv6AddressBytes *) NULL);
+		bind_addr.setAddress(static_cast<IPv6AddressBytes*>(nullptr));
 	else
-		bind_addr.setAddress(0, 0, 0, 0);
+		bind_addr.setAddress(static_cast<u32>(0));
 
 	m_connection->m_udpSocket.Bind(bind_addr);
 
@@ -633,15 +661,12 @@ void ConnectionSendThread::sendToAllReliable(ConnectionCommandPtr &c)
 	}
 }
 
-void ConnectionSendThread::sendPackets(float dtime)
+void ConnectionSendThread::sendPackets(float dtime, u32 peer_packet_quota)
 {
 	std::vector<session_t> peerIds = m_connection->getPeerIDs();
 	std::vector<session_t> pendingDisconnect;
 	std::map<session_t, bool> pending_unreliable;
 
-	const unsigned int peer_packet_quota = m_iteration_packets_avaialble
-		/ MYMAX(peerIds.size(), 1);
-
 	for (session_t peerId : peerIds) {
 		PeerHelper peer = m_connection->getPeerNoEx(peerId);
 		//peer may have been removed
@@ -792,7 +817,7 @@ void ConnectionSendThread::sendAsPacket(session_t peer_id, u8 channelnum,
 	m_outgoing_queue.push(packet);
 }
 
-ConnectionReceiveThread::ConnectionReceiveThread(unsigned int max_packet_size) :
+ConnectionReceiveThread::ConnectionReceiveThread() :
 	Thread("ConnectionReceive")
 {
 }
@@ -937,26 +962,42 @@ void ConnectionReceiveThread::receive(SharedBuffer<u8> &packetdata,
 		session_t peer_id = readPeerId(*packetdata);
 		u8 channelnum = readChannel(*packetdata);
 
-		if (channelnum > CHANNEL_COUNT - 1) {
+		if (channelnum >= CHANNEL_COUNT) {
 			LOG(derr_con << m_connection->getDesc()
-				<< "Receive(): Invalid channel " << (u32)channelnum << std::endl);
+				<< "Receive(): Invalid channel " << (int)channelnum << std::endl);
 			return;
 		}
 
-		/* Try to identify peer by sender address (may happen on join) */
-		if (peer_id == PEER_ID_INEXISTENT) {
-			peer_id = m_connection->lookupPeer(sender);
-			// We do not have to remind the peer of its
-			// peer id as the CONTROLTYPE_SET_PEER_ID
-			// command was sent reliably.
-		}
+		const bool knew_peer_id = peer_id != PEER_ID_INEXISTENT;
 
-		if (peer_id == PEER_ID_INEXISTENT) {
-			/* Ignore it if we are a client */
-			if (m_connection->ConnectedToServer())
-				return;
-			/* The peer was not found in our lists. Add it. */
-			peer_id = m_connection->createPeer(sender, MTP_MINETEST_RELIABLE_UDP, 0);
+		if (!m_connection->ConnectedToServer()) {
+			// Try to identify peer by sender address
+			if (peer_id == PEER_ID_INEXISTENT) {
+				peer_id = m_connection->lookupPeer(sender);
+				if (peer_id != PEER_ID_INEXISTENT) {
+					/* During join it can happen that the CONTROLTYPE_SET_PEER_ID
+					 * packet is lost. Since resends are not active at this stage
+					 * we need to remind the peer manually. */
+					m_connection->doResendOne(peer_id);
+				}
+			}
+
+			// Someone new is trying to talk to us. Add them.
+			if (peer_id == PEER_ID_INEXISTENT) {
+				auto &l = m_new_peer_ratelimit;
+				l.tick();
+				if (++l.counter > MAX_NEW_PEERS_PER_SEC) {
+					if (!l.logged) {
+						warningstream << m_connection->getDesc()
+							<< "Receive(): More than " << MAX_NEW_PEERS_PER_SEC
+							<< " new clients within 1s. Throttling." << std::endl;
+					}
+					l.logged = true;
+					// We simply drop the packet, the client can try again.
+				} else {
+					peer_id = m_connection->createPeer(sender, 0);
+				}
+			}
 		}
 
 		PeerHelper peer = m_connection->getPeerNoEx(peer_id);
@@ -969,32 +1010,34 @@ void ConnectionReceiveThread::receive(SharedBuffer<u8> &packetdata,
 
 		// Validate peer address
 
-		Address peer_address;
-		if (peer->getAddress(MTP_UDP, peer_address)) {
-			if (peer_address != sender) {
-				LOG(derr_con << m_connection->getDesc()
-					<< " Peer " << peer_id << " sending from different address."
-					" Ignoring." << std::endl);
-				return;
-			}
-		} else {
+		if (sender != peer->getAddress()) {
 			LOG(derr_con << m_connection->getDesc()
-				<< " Peer " << peer_id << " doesn't have an address?!"
+				<< " Peer " << peer_id << " sending from different address."
 				" Ignoring." << std::endl);
 			return;
 		}
 
-		peer->ResetTimeout();
+		if (knew_peer_id) {
+			peer->SetFullyOpen();
+			// Setup phase has a fixed timeout
+			peer->ResetTimeout();
+		} else if (!peer->isHalfOpen()) {
+			// If the peer talks to us without a peer ID when it has done so
+			// before something is definitely fishy.
+			LOG(derr_con << m_connection->getDesc()
+				<< " Peer " << peer_id << " sending without peer id?!"
+				" Ignoring." << std::endl);
+			return;
+		}
 
-		Channel *channel = nullptr;
-		if (dynamic_cast<UDPPeer *>(&peer)) {
-			channel = &dynamic_cast<UDPPeer *>(&peer)->channels[channelnum];
-		} else {
+		auto *udpPeer = dynamic_cast<UDPPeer *>(&peer);
+		if (!udpPeer) {
 			LOG(derr_con << m_connection->getDesc()
 				<< "Receive(): peer_id=" << peer_id << " isn't an UDPPeer?!"
 				" Ignoring." << std::endl);
 			return;
 		}
+		Channel *channel = &udpPeer->channels[channelnum];
 
 		channel->UpdateBytesReceived(received_size);
 
@@ -1244,32 +1287,25 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Original(Channel *cha
 SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Split(Channel *channel,
 	const SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum, bool reliable)
 {
-	Address peer_address;
+	// We have to create a packet again for buffering
+	// This isn't actually too bad an idea.
+	BufferedPacketPtr packet = con::makePacket(peer->getAddress(),
+		packetdata,
+		m_connection->GetProtocolID(),
+		peer->id,
+		channelnum);
 
-	if (peer->getAddress(MTP_UDP, peer_address)) {
-		// We have to create a packet again for buffering
-		// This isn't actually too bad an idea.
-		BufferedPacketPtr packet = con::makePacket(peer_address,
-			packetdata,
-			m_connection->GetProtocolID(),
-			peer->id,
-			channelnum);
+	// Buffer the packet
+	SharedBuffer<u8> data = peer->addSplitPacket(channelnum, packet, reliable);
 
-		// Buffer the packet
-		SharedBuffer<u8> data = peer->addSplitPacket(channelnum, packet, reliable);
-
-		if (data.getSize() != 0) {
-			LOG(dout_con << m_connection->getDesc()
-				<< "RETURNING TYPE_SPLIT: Constructed full data, "
-				<< "size=" << data.getSize() << std::endl);
-			return data;
-		}
-		LOG(dout_con << m_connection->getDesc() << "BUFFERED TYPE_SPLIT" << std::endl);
-		throw ProcessedSilentlyException("Buffered a split packet chunk");
+	if (data.getSize() != 0) {
+		LOG(dout_con << m_connection->getDesc()
+			<< "RETURNING TYPE_SPLIT: Constructed full data, "
+			<< "size=" << data.getSize() << std::endl);
+		return data;
 	}
-
-	// We should never get here.
-	FATAL_ERROR("Invalid execution point");
+	LOG(dout_con << m_connection->getDesc() << "BUFFERED TYPE_SPLIT" << std::endl);
+	throw ProcessedSilentlyException("Buffered a split packet chunk");
 }
 
 SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Reliable(Channel *channel,
@@ -1321,15 +1357,11 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Reliable(Channel *cha
 	}
 
 	if (seqnum != channel->readNextIncomingSeqNum()) {
-		Address peer_address;
-
-		// this is a reliable packet so we have a udp address for sure
-		peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
 		// This one comes later, buffer it.
 		// Actually we have to make a packet to buffer one.
 		// Well, we have all the ingredients, so just do it.
 		BufferedPacketPtr packet = con::makePacket(
-			peer_address,
+			peer->getAddress(),
 			packetdata,
 			m_connection->GetProtocolID(),
 			peer->id,
diff --git a/src/network/connectionthreads.h b/src/network/connectionthreads.h
index d7fc9ddbf..d74a0b979 100644
--- a/src/network/connectionthreads.h
+++ b/src/network/connectionthreads.h
@@ -23,10 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 #if MINETEST_TRANSPORT
 
+/********************************************/
+/* may only be included from in src/network */
+/********************************************/
 
 #include <cassert>
 #include "threading/thread.h"
-#include "connection.h"
+#include "connection_internal.h"
 
 namespace con
 {
@@ -73,7 +76,8 @@ public:
 	void setPeerTimeout(float peer_timeout) { m_timeout = peer_timeout; }
 
 private:
-	void runTimeouts(float dtime);
+	void runTimeouts(float dtime, u32 peer_packet_quota);
+	void resendReliable(Channel &channel, const BufferedPacket *k, float resend_timeout);
 	void rawSend(const BufferedPacket *p);
 	bool rawSendAsPacket(session_t peer_id, u8 channelnum,
 			const SharedBuffer<u8> &data, bool reliable);
@@ -89,7 +93,7 @@ private:
 	void sendToAll(u8 channelnum, const SharedBuffer<u8> &data);
 	void sendToAllReliable(ConnectionCommandPtr &c);
 
-	void sendPackets(float dtime);
+	void sendPackets(float dtime, u32 peer_packet_quota);
 
 	void sendAsPacket(session_t peer_id, u8 channelnum, const SharedBuffer<u8> &data,
 			bool ack = false);
@@ -100,12 +104,11 @@ private:
 
 	Connection *m_connection = nullptr;
 	unsigned int m_max_packet_size;
-	std::atomic<float> m_timeout;
+	float m_timeout;
 	std::queue<OutgoingPacket> m_outgoing_queue;
 	Semaphore m_send_sleep_semaphore;
 
 	unsigned int m_iteration_packets_avaialble;
-	unsigned int m_max_commands_per_iteration = 1;
 	unsigned int m_max_data_packets_per_iteration;
 	unsigned int m_max_packets_requeued = 256;
 };
@@ -113,7 +116,7 @@ private:
 class ConnectionReceiveThread : public Thread
 {
 public:
-	ConnectionReceiveThread(unsigned int max_packet_size);
+	ConnectionReceiveThread();
 
 	void *run();
 
@@ -166,9 +169,26 @@ private:
 				bool reliable);
 	};
 
+	struct RateLimitHelper {
+		u64 time = 0;
+		int counter = 0;
+		bool logged = false;
+
+		void tick() {
+			u64 now = porting::getTimeS();
+			if (time != now) {
+				time = now;
+				counter = 0;
+				logged = false;
+			}
+		}
+	};
+
 	static const PacketTypeHandler packetTypeRouter[PACKET_TYPE_MAX];
 
 	Connection *m_connection = nullptr;
+
+	RateLimitHelper m_new_peer_ratelimit;
 };
 }
 
diff --git a/src/network/fm_connection_enet.cpp b/src/network/fm_connection_enet.cpp
index e7eed6e57..b17e164ce 100644
--- a/src/network/fm_connection_enet.cpp
+++ b/src/network/fm_connection_enet.cpp
@@ -16,6 +16,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "config.h"
+#include "network/connection_internal.h"
 #if USE_ENET
 
 #include "fm_connection_enet.h"
@@ -174,6 +175,8 @@ void Connection::processCommand(ConnectionCommandPtr c)
 	case con::CONCMD_ACK:
 	case con::CONCMD_CREATE_PEER:
 		break;
+	case con::CONNCMD_RESEND_ONE:
+		break;
 	}
 }
 
diff --git a/src/network/fm_connection_multi.cpp b/src/network/fm_connection_multi.cpp
index 20c621a6e..4f747490f 100644
--- a/src/network/fm_connection_multi.cpp
+++ b/src/network/fm_connection_multi.cpp
@@ -190,10 +190,10 @@ void Connection::Disconnect()
 	connected_to = proto_name::none;
 }
 
-u32 Connection::Receive(NetworkPacket *pkt, int want_timeout)
+u32 Connection::ReceiveTimeoutMs(NetworkPacket *pkt, u32 timeout_ms)
 {
 	u32 ret = 0;
-	for (const auto &timeout : {0, want_timeout}) {
+	for (const auto &timeout : {u32(0), timeout_ms}) {
 #if USE_SCTP
 		if (m_con_sctp)
 			ret += m_con_sctp->Receive(pkt, timeout);
@@ -220,7 +220,7 @@ u32 Connection::Receive(NetworkPacket *pkt, int want_timeout)
 #endif
 #if MINETEST_TRANSPORT
 		if (m_con)
-			ret += m_con->Receive(pkt, timeout);
+			ret += m_con->ReceiveTimeoutMs(pkt, timeout);
 #endif
 		if (ret)
 			return ret;
@@ -230,7 +230,7 @@ u32 Connection::Receive(NetworkPacket *pkt, int want_timeout)
 
 bool Connection::TryReceive(NetworkPacket *pkt)
 {
-	return Receive(pkt, 0);
+	return ReceiveTimeoutMs(pkt, 0);
 }
 
 void Connection::Send(session_t peer_id, u8 channelnum, NetworkPacket *pkt, bool reliable)
diff --git a/src/network/fm_connection_multi.h b/src/network/fm_connection_multi.h
index ae8d33228..10a8aca5c 100644
--- a/src/network/fm_connection_multi.h
+++ b/src/network/fm_connection_multi.h
@@ -64,7 +64,8 @@ public:
 	void Connect(Address address);
 	bool Connected();
 	void Disconnect();
-	u32 Receive(NetworkPacket *pkt, int timeout = 1);
+	u32 ReceiveTimeoutMs(NetworkPacket *pkt, u32 timeout_ms);
+	u32 Receive(NetworkPacket *pkt);
 	bool TryReceive(NetworkPacket *pkt);
 	void SendToAll(u8 channelnum, SharedBuffer<u8> data, bool reliable);
 	void Send(session_t peer_id, u8 channelnum, const msgpack::sbuffer &buffer,
diff --git a/src/network/fm_lan.cpp b/src/network/fm_lan.cpp
index cdaf1bf3e..faa306fc1 100644
--- a/src/network/fm_lan.cpp
+++ b/src/network/fm_lan.cpp
@@ -27,7 +27,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "../settings.h"
 #include "../version.h"
 #include "networkprotocol.h"
-#include "serverlist.h"
+#include "../server/serverlist.h"
 
 //copypaste from ../socket.cpp
 #ifdef _WIN32
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
index a86b3c55d..6bd95189d 100644
--- a/src/network/networkpacket.cpp
+++ b/src/network/networkpacket.cpp
@@ -18,40 +18,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "networkpacket.h"
+#include <memory>
 #include <sstream>
 #include "networkexceptions.h"
 #include "util/serialize.h"
 #include "networkprotocol.h"
 
-#include "config.h"
-
-
-NetworkPacket::NetworkPacket(u16 command, u32 datasize, session_t peer_id):
-m_datasize(datasize), m_command(command), m_peer_id(peer_id)
-{
-	m_data.resize(m_datasize);
-}
-
-NetworkPacket::NetworkPacket(u16 command, u32 datasize):
-m_datasize(datasize), m_command(command)
-{
-	m_data.resize(m_datasize);
-}
-
-NetworkPacket::~NetworkPacket()
-{
-	//m_data.clear();
-
-	delete packet;
-	packet = nullptr;
-	delete packet_unpacked;
-	packet_unpacked = nullptr;
-}
-
-void NetworkPacket::checkReadOffset(u32 from_offset, u32 field_size)
+void NetworkPacket::checkReadOffset(u32 from_offset, u32 field_size) const
 {
 	if (from_offset + field_size > m_datasize) {
-		std::stringstream ss;
+		std::ostringstream ss;
 		ss << "Reading outside packet (offset: " <<
 				from_offset << ", packet size: " << getSize() << ")";
 		throw PacketError(ss.str());
@@ -65,6 +41,7 @@ void NetworkPacket::putRawPacket(const u8 *data, u32 datasize, session_t peer_id
 	assert(m_command == 0);
 
 #if MINETEST_PROTO
+	assert(datasize >= 2);
 	m_datasize = datasize - 2;
 #else
 	m_datasize = datasize;
@@ -92,7 +69,7 @@ void NetworkPacket::clear()
 	m_peer_id = 0;
 }
 
-const char* NetworkPacket::getString(u32 from_offset)
+const char* NetworkPacket::getString(u32 from_offset) const
 {
 	checkReadOffset(from_offset, 0);
 
@@ -101,10 +78,7 @@ const char* NetworkPacket::getString(u32 from_offset)
 
 void NetworkPacket::putRawString(const char* src, u32 len)
 {
-	if (m_read_offset + len > m_datasize) {
-		m_datasize = m_read_offset + len;
-		m_data.resize(m_datasize);
-	}
+	checkDataSize(len);
 
 	if (len == 0)
 		return;
@@ -134,7 +108,7 @@ NetworkPacket& NetworkPacket::operator>>(std::string& dst)
 	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator<<(const std::string &src)
+NetworkPacket& NetworkPacket::operator<<(std::string_view src)
 {
 	if (src.size() > STRING_MAX_LEN) {
 		throw PacketError("String too long");
@@ -144,12 +118,12 @@ NetworkPacket& NetworkPacket::operator<<(const std::string &src)
 
 	*this << msgsize;
 
-	putRawString(src.c_str(), (u32)msgsize);
+	putRawString(src.data(), (u32)msgsize);
 
 	return *this;
 }
 
-void NetworkPacket::putLongString(const std::string &src)
+void NetworkPacket::putLongString(std::string_view src)
 {
 	if (src.size() > LONG_STRING_MAX_LEN) {
 		throw PacketError("String too long");
@@ -159,7 +133,7 @@ void NetworkPacket::putLongString(const std::string &src)
 
 	*this << msgsize;
 
-	putRawString(src.c_str(), msgsize);
+	putRawString(src.data(), msgsize);
 }
 
 static constexpr bool NEED_SURROGATE_CODING = sizeof(wchar_t) > 2;
@@ -195,7 +169,7 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
 	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator<<(const std::wstring &src)
+NetworkPacket& NetworkPacket::operator<<(std::wstring_view src)
 {
 	if (src.size() > WIDE_STRING_MAX_LEN) {
 		throw PacketError("String too long");
@@ -295,7 +269,7 @@ NetworkPacket& NetworkPacket::operator<<(bool src)
 {
 	checkDataSize(1);
 
-	writeU8(&m_data[m_read_offset], src);
+	writeU8(&m_data[m_read_offset], src ? 1 : 0);
 
 	m_read_offset += 1;
 	return *this;
@@ -345,7 +319,7 @@ NetworkPacket& NetworkPacket::operator>>(bool& dst)
 {
 	checkReadOffset(m_read_offset, 1);
 
-	dst = readU8(&m_data[m_read_offset]);
+	dst = readU8(&m_data[m_read_offset]) != 0;
 
 	m_read_offset += 1;
 	return *this;
@@ -376,7 +350,7 @@ u8* NetworkPacket::getU8Ptr(u32 from_offset)
 
 	checkReadOffset(from_offset, 1);
 
-	return (u8*)&m_data[from_offset];
+	return &m_data[from_offset];
 }
 
 NetworkPacket& NetworkPacket::operator>>(u16& dst)
@@ -568,6 +542,12 @@ NetworkPacket& NetworkPacket::operator<<(video::SColor src)
 
 Buffer<u8> NetworkPacket::oldForgePacket()
 {
+	// this is the dummy packet used to first contact the server
+	if (m_command == 0) {
+		assert(m_datasize == 0);
+		return Buffer<u8>();
+	}
+
 	Buffer<u8> sb(m_datasize + 2);
 	writeU16(&sb[0], m_command);
 	if (m_datasize > 0)
@@ -616,9 +596,9 @@ int NetworkPacket::packet_unpack() {
 
 	int command;
 	if (!packet)
-		packet = new MsgpackPacketSafe;
+		packet = std::make_unique<MsgpackPacketSafe>();
 	if (!packet_unpacked)
-		packet_unpacked = new msgpack::unpacked;
+		packet_unpacked = std::make_unique<msgpack::unpacked>();
 	if (!parse_msgpack_packet(getString(
 #if MINETEST_PROTO
 									  4
@@ -626,7 +606,7 @@ int NetworkPacket::packet_unpack() {
 									  0
 #endif
 									  ),
-				datasize, packet, &command, *packet_unpacked)) {
+				datasize, packet.get(), &command, *packet_unpacked.get())) {
 		// verbosestream<<"Server: Ignoring broken packet from " <<addr_s<<"
 		// (peer_id="<<peer_id<<") size="<<datasize<<std::endl;
 		return 0;
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index d8c515e84..41d23dce2 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include "util/pointer.h"
-#include "util/numeric.h"
 #include "networkprotocol.h"
 #include <SColor.h>
+#include <memory>
 
 // fm:
 #include "fm_networkprotocol.h"
@@ -33,13 +33,20 @@ class MsgpackPacketSafe;
 
 class NetworkPacket
 {
-
 public:
-	NetworkPacket(u16 command, u32 datasize, session_t peer_id);
-	NetworkPacket(u16 command, u32 datasize);
+	NetworkPacket(u16 command, u32 preallocate, session_t peer_id) :
+		m_command(command), m_peer_id(peer_id)
+	{
+		m_data.reserve(preallocate);
+	}
+	NetworkPacket(u16 command, u32 preallocate) :
+		m_command(command)
+	{
+		m_data.reserve(preallocate);
+	}
 	NetworkPacket() = default;
 
-	~NetworkPacket();
+	~NetworkPacket() = default;
 
 	void putRawPacket(const u8 *data, u32 datasize, session_t peer_id);
 	void clear();
@@ -47,27 +54,27 @@ public:
 	// Getters
 	u32 getSize() const { return m_datasize; }
 	session_t getPeerId() const { return m_peer_id; }
-	u16 getCommand() { return m_command; }
+	u16 getCommand() const { return m_command; }
 	u32 getRemainingBytes() const { return m_datasize - m_read_offset; }
 	const char *getRemainingString() { return getString(m_read_offset); }
 
 	// Returns a c-string without copying.
 	// A better name for this would be getRawString()
-	const char *getString(u32 from_offset);
+	const char *getString(u32 from_offset) const;
 	// major difference to putCString(): doesn't write len into the buffer
 	void putRawString(const char *src, u32 len);
-	void putRawString(const std::string &src)
+	void putRawString(std::string_view src)
 	{
-		putRawString(src.c_str(), src.size());
+		putRawString(src.data(), src.size());
 	}
 
 	NetworkPacket &operator>>(std::string &dst);
-	NetworkPacket &operator<<(const std::string &src);
+	NetworkPacket &operator<<(std::string_view src);
 
-	void putLongString(const std::string &src);
+	void putLongString(std::string_view src);
 
 	NetworkPacket &operator>>(std::wstring &dst);
-	NetworkPacket &operator<<(const std::wstring &src);
+	NetworkPacket &operator<<(std::wstring_view src);
 
 	std::string readLongString();
 
@@ -122,11 +129,11 @@ public:
 	NetworkPacket &operator<<(video::SColor src);
 
 	// Temp, we remove SharedBuffer when migration finished
-	// ^ this comment has been here for 4 years
+	// ^ this comment has been here for 7 years
 	Buffer<u8> oldForgePacket();
 
 private:
-	void checkReadOffset(u32 from_offset, u32 field_size);
+	void checkReadOffset(u32 from_offset, u32 field_size) const;
 
 	inline void checkDataSize(u32 field_size)
 	{
@@ -139,17 +146,17 @@ private:
 	std::vector<u8> m_data;
 	u32 m_datasize = 0;
 	u32 m_read_offset = 0;
-	u16 m_command = 0;
+	u16 m_command =0;
 	session_t m_peer_id = 0;
 
-
-// freeminer:
+	// freeminer:
 public:
-	MsgpackPacketSafe * packet = nullptr;
-	msgpack::unpacked * packet_unpacked = nullptr;
+	std::shared_ptr<MsgpackPacketSafe> packet;
+	std::shared_ptr<msgpack::unpacked> packet_unpacked;
 	int packet_unpack();
 private:
+	// ==
 
 };
 
-bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg);
+bool parse_msgpack_packet(const char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg);
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 6f3595d56..996b724ea 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -219,9 +219,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		"start_time" added to TOCLIENT_PLAY_SOUND
 		place_param2 type change u8 -> optional<u8>
 		[scheduled bump for 5.8.0]
+	PROTOCOL VERSION 44:
+		AO_CMD_SET_BONE_POSITION extended
+		Add TOCLIENT_MOVE_PLAYER_REL
+		Move default minimap from client-side C++ to server-side builtin Lua
+		[scheduled bump for 5.9.0]
 */
 
-#define LATEST_PROTOCOL_VERSION 43
+#define LATEST_PROTOCOL_VERSION 44
 #define LATEST_PROTOCOL_VERSION_STRING TOSTRING(LATEST_PROTOCOL_VERSION)
 
 // Server's supported network protocol range
@@ -229,8 +234,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define SERVER_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION
 
 // Client's supported network protocol range
-// The minimal version depends on whether
-// send_pre_v25_init is enabled or not
 #define CLIENT_PROTOCOL_VERSION_MIN 37
 #define CLIENT_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION
 
@@ -250,7 +253,7 @@ typedef u16 session_t;
 #include <atomic>
 using atomic_session_t = std::atomic_ushort;
 
-enum ToClientCommand
+enum ToClientCommand : u16
 {
 	TOCLIENT_HELLO = 0x02,
 	/*
@@ -290,9 +293,10 @@ enum ToClientCommand
 		u8 (bool) reconnect
 	*/
 
-	TOCLIENT_INIT_LEGACY = 0x10, // Obsolete
+    TOCLIENT_INIT_LEGACY = 0x10,
+	
 
-	TOCLIENT_BLOCKDATA = 0x20, //TODO: Multiple blocks
+	TOCLIENT_BLOCKDATA = 0x20,
 	TOCLIENT_ADDNODE = 0x21,
 	/*
 		v3s16 position
@@ -301,22 +305,15 @@ enum ToClientCommand
 	*/
 	TOCLIENT_REMOVENODE = 0x22,
 
-	TOCLIENT_PLAYERPOS = 0x23, // Obsolete
-	TOCLIENT_PLAYERINFO = 0x24, // Obsolete
-	TOCLIENT_OPT_BLOCK_NOT_FOUND = 0x25, // Obsolete
-	TOCLIENT_SECTORMETA = 0x26, // Obsolete
-
 	TOCLIENT_INVENTORY = 0x27,
 	/*
 		[0] u16 command
 		[2] serialized inventory
 	*/
 
-	TOCLIENT_OBJECTDATA = 0x28, // Obsolete
 	TOCLIENT_TIME_OF_DAY = 0x29,
 	/*
 		u16 time (0-23999)
-		Added in a later version:
 		f1000 time_speed
 	*/
 
@@ -338,8 +335,6 @@ enum ToClientCommand
 		bool should_be_cached
 	*/
 
-	// (oops, there is some gap here)
-
 	TOCLIENT_CHAT_MESSAGE = 0x2F,
 	/*
 		u8 version
@@ -350,8 +345,6 @@ enum ToClientCommand
 		wstring message
 	*/
 
-	TOCLIENT_CHAT_MESSAGE_OLD = 0x30, // Obsolete
-
 	TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD = 0x31,
 	/*
 		u16 count of removed objects
@@ -425,26 +418,13 @@ enum ToClientCommand
 		string url
 	*/
 
-	TOCLIENT_TOOLDEF = 0x39,
-	/*
-		u32 length of the next item
-		serialized ToolDefManager
-	*/
-
 	TOCLIENT_NODEDEF = 0x3a,
 	/*
 		u32 length of the next item
 		serialized NodeDefManager
 	*/
 
-	TOCLIENT_CRAFTITEMDEF = 0x3b,
-	/*
-		u32 length of the next item
-		serialized CraftiItemDefManager
-	*/
-
 	TOCLIENT_ANNOUNCE_MEDIA = 0x3c,
-
 	/*
 		u32 number of files
 		for each texture {
@@ -531,22 +511,50 @@ enum ToClientCommand
 
 	TOCLIENT_SPAWN_PARTICLE = 0x46,
 	/*
-		-- struct range<T> { T min, T max, f32 bias };
+		using range<T> = RangedParameter<T> {
+			T min, max
+			f32 bias
+		}
+		using tween<T> = TweenedParameter<T> {
+			u8 style
+			u16 reps
+			f32 beginning
+			T start, end
+		}
+
 		v3f pos
 		v3f velocity
 		v3f acceleration
 		f32 expirationtime
 		f32 size
 		u8 bool collisiondetection
+
 		u32 len
 		u8[len] texture
+
 		u8 bool vertical
-		u8 collision_removal
+		u8 bool collision_removal
+
 		TileAnimation animation
+
 		u8 glow
-		u8 object_collision
+		u8 bool object_collision
+
+		u16 node_param0
+		u8 node_param2
+		u8 node_tile
+
 		v3f drag
-		range<v3f> bounce
+		range<v3f> jitter
+		range<f32> bounce
+
+		texture {
+			u8 flags (ParticleTextureFlags)
+			-- bit 0: animated
+			-- next bits: blend mode (BlendMode)
+			tween<f32> alpha
+			tween<v2f> scale
+		}
 	*/
 
 	TOCLIENT_ADD_PARTICLESPAWNER = 0x47,
@@ -565,7 +573,7 @@ enum ToClientCommand
 		u16 amount
 		f32 spawntime
 		if PROTOCOL_VERSION >= 42 {
-			tween<T> pos, vel, acc, exptime, size
+			tween<range<T>> pos, vel, acc, exptime, size
 		} else {
 			v3f minpos
 			v3f maxpos
@@ -579,14 +587,23 @@ enum ToClientCommand
 			f32 maxsize
 		}
 		u8 bool collisiondetection
+
 		u32 len
 		u8[len] texture
+
+		u32 spawner_id
 		u8 bool vertical
-		u8 collision_removal
-		u32 id
+		u8 bool collision_removal
+		u32 attached_id
+
 		TileAnimation animation
+
 		u8 glow
-		u8 object_collision
+		u8 bool object_collision
+
+		u16 node_param0
+		u8 node_param2
+		u8 node_tile
 
 		if PROTOCOL_VERSION < 42 {
 			f32 pos_start_bias
@@ -601,6 +618,19 @@ enum ToClientCommand
 			--     f32 pos_end_bias
 			range<v3f> vel_end
 			range<v3f> acc_end
+			range<f32> exptime_end
+			range<f32> size_end
+		}
+
+		texture {
+			u8 flags (ParticleTextureFlags)
+			-- bit 0: animated
+			-- next bits: blend mode (BlendMode)
+			tween<f32> alpha
+			tween<v2f> scale
+
+			if (flags.animated)
+				TileAnimation animation
 		}
 
 		tween<range<v3f>> drag
@@ -626,30 +656,30 @@ enum ToClientCommand
 			u8                spawner_flags
 			    bit 1: attractor_kill (particles dies on contact)
 			if attraction_mode > point {
-				tween<v3f> attractor_angle
-				u16        attractor_origin_attachment_object_id
+				tween<v3f> attractor_direction
+				u16        attractor_direction_attachment_object_id
 			}
 		}
 
 		tween<range<v3f>> radius
-		tween<range<v3f>> drag
 
-		u16 texpool_sz
-		texpool_sz.times {
-			u8 flags
+		u16 texpool_size
+		texpool_size.times {
+			u8 flags (ParticleTextureFlags)
 			-- bit 0: animated
-			-- other bits free & ignored as of proto v40
+			-- next bits: blend mode (BlendMode)
 			tween<f32> alpha
 			tween<v2f> scale
-			if flags.animated {
+
+			u32 len
+			u8[len] texture
+
+			if (flags.animated)
 				TileAnimation animation
-			}
 		}
 
 	*/
 
-	TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY = 0x48, // Obsolete
-
 	TOCLIENT_HUDADD = 0x49,
 	/*
 		u32 id
@@ -837,6 +867,11 @@ enum ToClientCommand
 		f32 day_opacity
 	*/
 
+	TOCLIENT_MOVE_PLAYER_REL = 0x5d,
+	/*
+		v3f added_pos
+	*/
+
 	TOCLIENT_SRP_BYTES_S_B = 0x60,
 	/*
 		Belonging to AUTH_MECHANISM_SRP.
@@ -878,7 +913,7 @@ enum ToClientCommand
 	TOCLIENT_NUM_MSG_TYPES = 0x64,
 };
 
-enum ToServerCommand
+enum ToServerCommand : u16
 {
 	TOSERVER_INIT = 0x02,
 	/*
@@ -891,14 +926,10 @@ enum ToServerCommand
 		std::string player name
 	*/
 
-	TOSERVER_INIT_LEGACY = 0x10, // Obsolete
-
 	TOSERVER_INIT2 = 0x11,
 	/*
-		Sent as an ACK for TOCLIENT_INIT.
+		Sent as an ACK for TOCLIENT_AUTH_ACCEPT.
 		After this, the server can send data.
-
-		[0] u16 TOSERVER_INIT2
 	*/
 
 	TOSERVER_MODCHANNEL_JOIN = 0x17,
@@ -921,10 +952,6 @@ enum ToServerCommand
 	 	std::string message
 	 */
 
-	TOSERVER_GETBLOCK = 0x20, // Obsolete
-	TOSERVER_ADDNODE = 0x21, // Obsolete
-	TOSERVER_REMOVENODE = 0x22, // Obsolete
-
 	TOSERVER_PLAYERPOS = 0x23,
 	/*
 		[0] u16 command
@@ -957,12 +984,6 @@ enum ToServerCommand
 		...
 	*/
 
-	TOSERVER_ADDNODE_FROM_INVENTORY = 0x26, // Obsolete
-	TOSERVER_CLICK_OBJECT = 0x27, // Obsolete
-	TOSERVER_GROUND_ACTION = 0x28, // Obsolete
-	TOSERVER_RELEASE = 0x29, // Obsolete
-	TOSERVER_SIGNTEXT = 0x30, // Obsolete
-
 	TOSERVER_INVENTORY_ACTION = 0x31,
 	/*
 		See InventoryAction in inventorymanager.h
@@ -974,16 +995,11 @@ enum ToServerCommand
 		wstring message
 	*/
 
-	TOSERVER_SIGNNODETEXT = 0x33, // Obsolete
-	TOSERVER_CLICK_ACTIVEOBJECT = 0x34, // Obsolete
-
 	TOSERVER_DAMAGE = 0x35,
 	/*
 		u8 amount
 	*/
 
-	TOSERVER_PASSWORD_LEGACY = 0x36, // Obsolete
-
 	TOSERVER_PLAYERITEM = 0x37,
 	/*
 		Sent to change selected item.
@@ -1059,8 +1075,6 @@ enum ToServerCommand
 			u32 token
 	*/
 
-	TOSERVER_BREATH = 0x42, // Obsolete
-
 	TOSERVER_CLIENT_READY = 0x43,
 	/*
 		u8 major
@@ -1145,7 +1159,7 @@ enum NetProtoCompressionMode {
 	NETPROTO_COMPRESSION_NONE = 0,
 };
 
-const static std::string accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
+constexpr const char *accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
 	"Invalid password",
 	"Your client sent something the server didn't expect.  Try reconnecting or updating your client.",
 	"The server is running in simple singleplayer mode.  You cannot connect.",
diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp
index 060dadbc9..0989ff016 100644
--- a/src/network/serveropcodes.cpp
+++ b/src/network/serveropcodes.cpp
@@ -19,9 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "serveropcodes.h"
-#include "../config.h"
+#include "server.h"
 
-const static ToServerCommandHandler null_command_handler = { "TOSERVER_NULL", TOSERVER_STATE_ALL, &Server::handleCommand_Null };
+const static ToServerCommandHandler null_command_handler =
+	{ "TOSERVER_NULL", TOSERVER_STATE_ALL, &Server::handleCommand_Null };
 
 const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
 {
@@ -113,7 +114,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
 	{ "TOSERVER_UPDATE_CLIENT_INFO",       TOSERVER_STATE_INGAME, &Server::handleCommand_UpdateClientInfo }, // 0x53
 };
 
-const static ClientCommandFactory null_command_factory = { "TOCLIENT_NULL", 0, false };
+const static ClientCommandFactory null_command_factory = { nullptr, 0, false };
 
 /*
 	Channels used for Server -> Client communication
@@ -143,7 +144,7 @@ const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] =
 	null_command_factory, // 0x0D
 	null_command_factory, // 0x0E
 	null_command_factory, // 0x0F
-	{ "TOCLIENT_INIT",                     0, true }, // 0x10
+	null_command_factory, // 0x10
 	null_command_factory, // 0x11
 	null_command_factory, // 0x12
 	null_command_factory, // 0x13
@@ -220,7 +221,7 @@ const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] =
 	{ "TOCLIENT_SET_SUN",                  0, true }, // 0x5a
 	{ "TOCLIENT_SET_MOON",                 0, true }, // 0x5b
 	{ "TOCLIENT_SET_STARS",                0, true }, // 0x5c
-	null_command_factory, // 0x5d
+	{ "TOCLIENT_MOVE_PLAYER_REL",          0, true }, // 0x5d
 	null_command_factory, // 0x5e
 	null_command_factory, // 0x5f
 	{ "TOCLIENT_SRP_BYTES_S_B",            0, true }, // 0x60
diff --git a/src/network/serveropcodes.h b/src/network/serveropcodes.h
index dfaa52a0f..275270ab9 100644
--- a/src/network/serveropcodes.h
+++ b/src/network/serveropcodes.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "networkprotocol.h"
 
 class NetworkPacket;
+// Note: don't forward-declare Server here (#14324)
 
 enum ToServerConnectionState {
 	TOSERVER_STATE_NOT_CONNECTED,
@@ -33,7 +34,7 @@ enum ToServerConnectionState {
 };
 struct ToServerCommandHandler
 {
-	const std::string name;
+	const char *name;
 	ToServerConnectionState state;
 	void (Server::*handler)(NetworkPacket* pkt);
 };
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 47cddd7f8..84db252be 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -102,6 +102,9 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 		return;
 	}
 
+	if (denyIfBanned(peer_id))
+		return;
+
 	// First byte after command is maximum supported
 	// serialization version
 	u8 client_max;
@@ -154,10 +157,8 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 
 	client->net_proto_version = net_proto_version;
 
-	if ((g_settings->getBool("strict_protocol_version_checking") &&
-			net_proto_version != LATEST_PROTOCOL_VERSION) ||
-			net_proto_version < SERVER_PROTOCOL_VERSION_MIN ||
-			net_proto_version > SERVER_PROTOCOL_VERSION_MAX) {
+	if (net_proto_version < Server::getProtocolVersionMin() ||
+			net_proto_version > Server::getProtocolVersionMax()) {
 		actionstream << "Server: A mismatched client " << playerName << " tried to connect from " <<
 			addr_s << " proto_max=" << (int)max_net_proto_version << std::endl;
 		DenyAccess(peer_id, SERVER_ACCESSDENIED_WRONG_VERSION);
@@ -185,7 +186,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 		return;
 	}
 
-	RemotePlayer *player = m_env->getPlayer(playername);
+	RemotePlayer *player = m_env->getPlayer(playername, true);
 
 	// If player is already connected, cancel
 	if (player && player->getPeerId() != PEER_ID_INEXISTENT) {
@@ -267,7 +268,7 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 		}
 	} else {
 		std::string default_password = g_settings->get("default_password");
-		if (default_password.length() == 0) {
+		if (isSingleplayer() || default_password.length() == 0) {
 			auth_mechs |= AUTH_MECHANISM_FIRST_SRP;
 		} else {
 			// Take care of default passwords.
@@ -367,24 +368,24 @@ void Server::handleCommand_Init2(NetworkPacket* pkt)
 
 void Server::handleCommand_RequestMedia(NetworkPacket* pkt)
 {
-	std::vector<std::string> tosend;
+	std::unordered_set<std::string> tosend;
 	u16 numfiles;
 
 	*pkt >> numfiles;
 
 	session_t peer_id = pkt->getPeerId();
-	infostream << "Sending " << numfiles << " files to " <<
-		getPlayerName(peer_id) << std::endl;
-	verbosestream << "TOSERVER_REQUEST_MEDIA: requested file(s)" << std::endl;
+	verbosestream << "Client " << getPlayerName(peer_id)
+		<< " requested media file(s):\n";
 
 	for (u16 i = 0; i < numfiles; i++) {
 		std::string name;
 
 		*pkt >> name;
 
-		tosend.emplace_back(name);
-		verbosestream << "  " << name << std::endl;
+		tosend.emplace(name);
+		verbosestream << "  " << name << "\n";
 	}
+	verbosestream << std::flush;
 
 	sendRequestedMedia(peer_id, tosend);
 }
@@ -530,7 +531,7 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 	if (playersao->checkMovementCheat()) {
 		// Call callbacks
 		m_script->on_cheat(playersao, "moved_too_fast");
-		SendMovePlayer(pkt->getPeerId());
+		SendMovePlayer(playersao);
 	}
 // copypaste from fm_serverpackethandler.cpp
 		else if (playersao->m_ms_from_last_respawn > 3000) {
@@ -939,8 +940,7 @@ bool Server::checkInteractDistance(RemotePlayer *player, const f32 d, const std:
 {
 	ItemStack selected_item, hand_item;
 	player->getWieldedItem(&selected_item, &hand_item);
-	f32 max_d = BS * getToolRange(selected_item.getDefinition(m_itemdef),
-			hand_item.getDefinition(m_itemdef));
+	f32 max_d = BS * getToolRange(selected_item, hand_item, m_itemdef);
 
 	// Cube diagonal * 1.5 for maximal supported node extents:
 	// sqrt(3) * 1.5 ≅ 2.6
@@ -1042,7 +1042,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 		return;
 	}
 
-	playersao->getPlayer()->setWieldIndex(item_i);
+	player->setWieldIndex(item_i);
 
 	// Get pointed to object (NULL if not POINTEDTYPE_OBJECT)
 	ServerActiveObject *pointed_object = NULL;
@@ -1212,7 +1212,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 			// Get player's wielded item
 			// See also: Game::handleDigging
 			ItemStack selected_item, hand_item;
-			playersao->getPlayer()->getWieldedItem(&selected_item, &hand_item);
+			player->getWieldedItem(&selected_item, &hand_item);
 
 			// Get diggability and expected digging time
 			DigParams params = getDigParams(m_nodedef->get(n).groups,
@@ -1309,7 +1309,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 			// Do stuff
 			if (m_script->item_OnSecondaryUse(selected_item, playersao, pointed)) {
 				if (selected_item.has_value() && playersao->setWieldedItem(*selected_item))
-					SendInventory(playersao, true);
+					SendInventory(player, true);
 			}
 
 			pointed_object->rightClick(playersao);
@@ -1320,7 +1320,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 
 			// Apply returned ItemStack
 			if (selected_item.has_value() && playersao->setWieldedItem(*selected_item))
-				SendInventory(playersao, true);
+				SendInventory(player, true);
 		}
 
 		if (pointed.type != POINTEDTHING_NODE)
@@ -1354,7 +1354,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 		if (m_script->item_OnUse(selected_item, playersao, pointed)) {
 			// Apply returned ItemStack
 			if (selected_item.has_value() && playersao->setWieldedItem(*selected_item))
-				SendInventory(playersao, true);
+				SendInventory(player, true);
 
 			stat.add("use", player->getName());
             if (selected_item.has_value())
@@ -1377,7 +1377,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 		if (m_script->item_OnSecondaryUse(selected_item, playersao, pointed)) {
 			// Apply returned ItemStack
 			if (selected_item.has_value() && playersao->setWieldedItem(*selected_item))
-				SendInventory(playersao, true);
+				SendInventory(player, true);
 		}
 
 		return;
@@ -1398,15 +1398,14 @@ void Server::handleCommand_RemovedSounds(NetworkPacket* pkt)
 
 		*pkt >> id;
 
-		std::unordered_map<s32, ServerPlayingSound>::iterator i =
-			m_playing_sounds.find(id);
+		auto i = m_playing_sounds.find(id);
 		if (i == m_playing_sounds.end())
 			continue;
 
 		ServerPlayingSound &psound = i->second;
 		psound.clients.erase(pkt->getPeerId());
 		if (psound.clients.empty())
-			m_playing_sounds.erase(i++);
+			m_playing_sounds.erase(i);
 	}
 }
 
@@ -1586,8 +1585,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt)
 			return;
 		}
 
-		std::string initial_ver_key;
-		initial_ver_key = encode_srp_verifier(verification_key, salt);
+		std::string encpwd = encode_srp_verifier(verification_key, salt);
 
 		// It is possible for multiple connections to get this far with the same
 		// player name. In the end only one player with a given name will be emerged
@@ -1600,9 +1598,11 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt)
 			DenyAccess(peer_id, SERVER_ACCESSDENIED_ALREADY_CONNECTED);
 			return;
 		}
-		m_script->createAuth(playername, initial_ver_key);
-		m_script->on_authplayer(playername, addr_s, true);
 
+		m_script->createAuth(playername, encpwd);
+		client->setEncryptedPassword(encpwd);
+
+		m_script->on_authplayer(playername, addr_s, true);
 		acceptAuth(peer_id, false);
 	} else {
 		if (cstate < CS_SudoMode) {
@@ -1621,12 +1621,13 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt)
 			return;
 		}
 
-		std::string pw_db_field = encode_srp_verifier(verification_key, salt);
-		bool success = m_script->setPassword(playername, pw_db_field);
+		std::string encpwd = encode_srp_verifier(verification_key, salt);
+		bool success = m_script->setPassword(playername, encpwd);
 		if (success) {
 			actionstream << playername << " changes password" << std::endl;
 			SendChatMessage(peer_id, ChatMessage(CHATMESSAGE_TYPE_SYSTEM,
 				L"Password change successful."));
+			client->setEncryptedPassword(encpwd);
 		} else {
 			actionstream << playername <<
 				" tries to change password but it fails" << std::endl;
@@ -1677,7 +1678,8 @@ void Server::handleCommand_SrpBytesA(NetworkPacket* pkt)
 		AUTH_MECHANISM_LEGACY_PASSWORD : AUTH_MECHANISM_SRP;
 
 	if (wantSudo) {
-		if (!client->isSudoMechAllowed(chosen)) {
+		// Right now, the auth mechs don't change between login and sudo mode.
+		if (!client->isMechAllowed(chosen)) {
 			actionstream << "Server: Player \"" << client->getName() <<
 				"\" at " << getPeerAddress(peer_id).serializeString() <<
 				" tried to change password using unallowed mech " << chosen <<
@@ -1944,6 +1946,12 @@ void Server::handleCommand_UpdateClientInfo(NetworkPacket *pkt)
 	*pkt >> info.real_hud_scaling;
 	*pkt >> info.max_fs_size.X;
 	*pkt >> info.max_fs_size.Y;
+	try {
+		// added in 5.9.0
+		*pkt >> info.touch_controls;
+	} catch (PacketError &e) {
+		info.touch_controls = false;
+	}
 
 	session_t peer_id = pkt->getPeerId();
 	RemoteClient *client = getClient(peer_id, CS_Invalid);
diff --git a/src/network/socket.cpp b/src/network/socket.cpp
index d29211f19..f09b5fa1c 100644
--- a/src/network/socket.cpp
+++ b/src/network/socket.cpp
@@ -47,7 +47,7 @@ typedef int socklen_t;
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <fcntl.h>
-#include <netdb.h>
+#include <poll.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 #define LAST_SOCKET_ERR() (errno)
@@ -77,6 +77,7 @@ void sockets_cleanup()
 	// On Windows, cleanup sockets after use
 	WSACleanup();
 #endif
+	g_sockets_initialized = false;
 }
 
 /*
@@ -91,10 +92,18 @@ UDPSocket::UDPSocket(bool ipv6)
 bool UDPSocket::init(bool ipv6, bool noExceptions)
 {
 	if (!g_sockets_initialized) {
-		tracestream << "Sockets not initialized" << std::endl;
+		verbosestream << "Sockets not initialized" << std::endl;
 		return false;
 	}
 
+	if (m_handle >= 0) {
+		auto msg = "Cannot initialize socket twice";
+		verbosestream << msg << std::endl;
+		if (noExceptions)
+			return false;
+		throw SocketException(msg);
+	}
+
 	// Use IPv6 if specified
 	m_addr_family = ipv6 ? AF_INET6 : AF_INET;
 	m_handle = socket(m_addr_family, SOCK_DGRAM, IPPROTO_UDP);
@@ -105,7 +114,7 @@ bool UDPSocket::init(bool ipv6, bool noExceptions)
 			<< std::endl;
 	}
 
-	if (m_handle <= 0) {
+	if (m_handle < 0) {
 		if (noExceptions) {
 			return false;
 		}
@@ -135,11 +144,13 @@ UDPSocket::~UDPSocket()
 			<< std::endl;
 	}
 
+	if (m_handle >= 0) {
 #ifdef _WIN32
-	closesocket(m_handle);
+		closesocket(m_handle);
 #else
-	close(m_handle);
+		close(m_handle);
 #endif
+	}
 }
 
 void UDPSocket::Bind(Address addr)
@@ -255,9 +266,12 @@ void UDPSocket::Send(const Address &destination, const void *data, int size)
 int UDPSocket::Receive(Address &sender, void *data, int size)
 {
 	// Return on timeout
+	assert(m_timeout_ms >= 0);
 	if (!WaitData(m_timeout_ms))
 		return -1;
 
+	size = MYMAX(size, 0);
+
 	int received;
 	if (m_addr_family == AF_INET6) {
 		struct sockaddr_in6 address;
@@ -321,11 +335,6 @@ int UDPSocket::Receive(Address &sender, void *data, int size)
 	return received;
 }
 
-int UDPSocket::GetHandle()
-{
-	return m_handle;
-}
-
 void UDPSocket::setTimeoutMs(int timeout_ms)
 {
 	m_timeout_ms = timeout_ms;
@@ -333,46 +342,45 @@ void UDPSocket::setTimeoutMs(int timeout_ms)
 
 bool UDPSocket::WaitData(int timeout_ms)
 {
-	fd_set readset;
-	int result;
+	timeout_ms = MYMAX(timeout_ms, 0);
 
-	// Initialize the set
-	FD_ZERO(&readset);
-	FD_SET(m_handle, &readset);
-
-	// Initialize time out struct
-	struct timeval tv;
-	tv.tv_sec = 0;
-	tv.tv_usec = timeout_ms * 1000;
-
-	// select()
-	result = select(m_handle + 1, &readset, NULL, NULL, &tv);
-
-	if (result == 0)
-		return false;
-
-	int e = LAST_SOCKET_ERR();
 #ifdef _WIN32
-	if (result < 0 && (e == WSAEINTR || e == WSAEBADF)) {
+	WSAPOLLFD pfd;
+	pfd.fd = m_handle;
+	pfd.events = POLLRDNORM;
+
+	int result = WSAPoll(&pfd, 1, timeout_ms);
 #else
-	if (result < 0 && (e == EINTR || e == EBADF)) {
+	struct pollfd pfd;
+	pfd.fd = m_handle;
+	pfd.events = POLLIN;
+
+	int result = poll(&pfd, 1, timeout_ms);
 #endif
-		// N.B. select() fails when sockets are destroyed on Connection's dtor
-		// with EBADF.  Instead of doing tricky synchronization, allow this
+
+	if (result == 0) {
+		return false; // No data
+	} else if (result > 0) {
+		// There might be data
+		return pfd.revents != 0;
+	}
+
+	// Error case
+	int e = LAST_SOCKET_ERR();
+
+#ifdef _WIN32
+	if (e == WSAEINTR || e == WSAEBADF) {
+#else
+	if (e == EINTR || e == EBADF) {
+#endif
+		// N.B. poll() fails when sockets are destroyed on Connection's dtor
+		// with EBADF. Instead of doing tricky synchronization, allow this
 		// thread to exit but don't throw an exception.
 		return false;
 	}
 
-	if (result < 0) {
-		tracestream << (int)m_handle << ": Select failed: " << SOCKET_ERR_STR(e)
-			<< std::endl;
+	tracestream << (int)m_handle << ": poll failed: "
+		<< SOCKET_ERR_STR(e) << std::endl;
 
-		throw SocketException("Select failed");
-	} else if (!FD_ISSET(m_handle, &readset)) {
-		// No data
-		return false;
-	}
-
-	// There is data
-	return true;
+	throw SocketException("poll failed");
 }
diff --git a/src/network/socket.h b/src/network/socket.h
index f9d1f40ad..da1cf5f4f 100644
--- a/src/network/socket.h
+++ b/src/network/socket.h
@@ -37,23 +37,24 @@ class UDPSocket
 {
 public:
 	UDPSocket() = default;
-
-	UDPSocket(bool ipv6);
+	UDPSocket(bool ipv6); // calls init()
 	~UDPSocket();
-	void Bind(Address addr);
-
 	bool init(bool ipv6, bool noExceptions = false);
 
+	void Bind(Address addr);
+
 	void Send(const Address &destination, const void *data, int size);
 	// Returns -1 if there is no data
 	int Receive(Address &sender, void *data, int size);
-	int GetHandle(); // For debugging purposes only
 	void setTimeoutMs(int timeout_ms);
 	// Returns true if there is data, false if timeout occurred
 	bool WaitData(int timeout_ms);
 
+	// Debugging purposes only
+	int GetHandle() const { return m_handle; };
+
 private:
-	int m_handle;
-	int m_timeout_ms;
-	int m_addr_family;
+	int m_handle = -1;
+	int m_timeout_ms = -1;
+	unsigned short m_addr_family = 0;
 };
diff --git a/src/network/ws/connection.cpp b/src/network/ws/connection.cpp
index 4051fdd58..98cbcfc3b 100644
--- a/src/network/ws/connection.cpp
+++ b/src/network/ws/connection.cpp
@@ -1567,7 +1567,7 @@ float Connection::getLocalStat(rate_stat_type type)
 	return retval;
 }
 
-u16 Connection::createPeer(Address& sender, MTProtocols protocol, int fd)
+session_t Connection::createPeer(Address& sender, int fd)
 {
 	// Somebody wants to make a new connection
 
diff --git a/src/network/ws/connection.h b/src/network/ws/connection.h
index 653447c7e..946f395cf 100644
--- a/src/network/ws/connection.h
+++ b/src/network/ws/connection.h
@@ -24,6 +24,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "irrlichttypes.h"
 #include "network/connection.h"
+#include "network/connection_internal.h"
 #include "network/wssocket.h"
 #include "network/networkexceptions.h"
 #include "../peerhandler.h"
@@ -532,7 +533,8 @@ class Peer {
 		virtual void PutReliableSendCommand(ConnectionCommandPtr &c,
 						unsigned int max_packet_size) {};
 
-		virtual bool getAddress(MTProtocols type, Address& toset) = 0;
+		//virtual bool getAddress(MTProtocols type, Address& toset) = 0;
+		virtual bool getAddress() = 0;
 
 		bool isPendingDeletion()
 		{ MutexAutoLock lock(m_exclusive_access_mutex); return m_pending_deletion; };
@@ -637,7 +639,8 @@ public:
 	void PutReliableSendCommand(ConnectionCommandPtr &c,
 							unsigned int max_packet_size);
 
-	bool getAddress(MTProtocols type, Address& toset);
+	//bool getAddress(MTProtocols type, Address& toset);
+	bool getAddress();
 
 	u16 getNextSplitSequenceNumber(u8 channel);
 	void setNextSplitSequenceNumber(u8 channel, u16 seqnum);
@@ -759,7 +762,7 @@ public:
 protected:
 	u16   lookupPeer(Address& sender);
 
-	u16 createPeer(Address& sender, MTProtocols protocol, int fd);
+	session_t createPeer(Address& sender, int fd);
 	UDPPeer*  createServerPeer(Address& sender);
 	bool deletePeer(session_t peer_id, bool timeout);
 
diff --git a/src/network/ws/connectionthreads.h b/src/network/ws/connectionthreads.h
index 185fb1906..7be5525d4 100644
--- a/src/network/ws/connectionthreads.h
+++ b/src/network/ws/connectionthreads.h
@@ -100,7 +100,7 @@ private:
 
 	Connection *m_connection = nullptr;
 	unsigned int m_max_packet_size;
-	std::atomic<float> m_timeout;
+	float m_timeout;
 	std::queue<OutgoingPacket> m_outgoing_queue;
 	Semaphore m_send_sleep_semaphore;
 
diff --git a/src/network/wssocket.cpp b/src/network/wssocket.cpp
index 499c3e380..1e12f5718 100644
--- a/src/network/wssocket.cpp
+++ b/src/network/wssocket.cpp
@@ -27,13 +27,14 @@ openssl req -new -x509 -key privkey.pem > fullchain.pem
 */
 
 #include "config.h"
+#include "server/serverlist.h"
 #if USE_WEBSOCKET || USE_WEBSOCKET_SCTP
 
 #include "wssocket.h"
 #include "constants.h"
 #include "filesys.h"
 #include "log.h"
-#include "serverlist.h"
+//#include "../server/serverlist.h"
 #include "settings.h"
 #include "util/numeric.h"
 #include "util/string.h"
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index ef24d157f..15fb1bd50 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -129,57 +129,62 @@ void NodeBox::deSerialize(std::istream &is)
 
 	reset();
 
-	type = (enum NodeBoxType)readU8(is);
-
-	if(type == NODEBOX_FIXED || type == NODEBOX_LEVELED)
-	{
-		u16 fixed_count = readU16(is);
-		while(fixed_count--)
-		{
-			aabb3f box;
-			box.MinEdge = readV3F32(is);
-			box.MaxEdge = readV3F32(is);
-			fixed.push_back(box);
+	type = static_cast<NodeBoxType>(readU8(is));
+	switch (type) {
+		case NODEBOX_REGULAR:
+			break;
+		case NODEBOX_FIXED:
+		case NODEBOX_LEVELED: {
+			u16 fixed_count = readU16(is);
+			while(fixed_count--) {
+				aabb3f box;
+				box.MinEdge = readV3F32(is);
+				box.MaxEdge = readV3F32(is);
+				fixed.push_back(box);
+			}
+			break;
 		}
-	}
-	else if(type == NODEBOX_WALLMOUNTED)
-	{
-		wall_top.MinEdge = readV3F32(is);
-		wall_top.MaxEdge = readV3F32(is);
-		wall_bottom.MinEdge = readV3F32(is);
-		wall_bottom.MaxEdge = readV3F32(is);
-		wall_side.MinEdge = readV3F32(is);
-		wall_side.MaxEdge = readV3F32(is);
-	}
-	else if (type == NODEBOX_CONNECTED)
-	{
+		case NODEBOX_WALLMOUNTED:
+			wall_top.MinEdge = readV3F32(is);
+			wall_top.MaxEdge = readV3F32(is);
+			wall_bottom.MinEdge = readV3F32(is);
+			wall_bottom.MaxEdge = readV3F32(is);
+			wall_side.MinEdge = readV3F32(is);
+			wall_side.MaxEdge = readV3F32(is);
+			break;
+		case NODEBOX_CONNECTED: {
 #define READBOXES(box) { \
-		count = readU16(is); \
-		(box).reserve(count); \
-		while (count--) { \
-			v3f min = readV3F32(is); \
-			v3f max = readV3F32(is); \
-			(box).emplace_back(min, max); }; }
+			count = readU16(is); \
+			(box).reserve(count); \
+			while (count--) { \
+				v3f min = readV3F32(is); \
+				v3f max = readV3F32(is); \
+				(box).emplace_back(min, max); }; }
 
-		u16 count;
+			u16 count;
 
-		auto &c = getConnected();
+			auto &c = getConnected();
 
-		READBOXES(fixed);
-		READBOXES(c.connect_top);
-		READBOXES(c.connect_bottom);
-		READBOXES(c.connect_front);
-		READBOXES(c.connect_left);
-		READBOXES(c.connect_back);
-		READBOXES(c.connect_right);
-		READBOXES(c.disconnected_top);
-		READBOXES(c.disconnected_bottom);
-		READBOXES(c.disconnected_front);
-		READBOXES(c.disconnected_left);
-		READBOXES(c.disconnected_back);
-		READBOXES(c.disconnected_right);
-		READBOXES(c.disconnected);
-		READBOXES(c.disconnected_sides);
+			READBOXES(fixed);
+			READBOXES(c.connect_top);
+			READBOXES(c.connect_bottom);
+			READBOXES(c.connect_front);
+			READBOXES(c.connect_left);
+			READBOXES(c.connect_back);
+			READBOXES(c.connect_right);
+			READBOXES(c.disconnected_top);
+			READBOXES(c.disconnected_bottom);
+			READBOXES(c.disconnected_front);
+			READBOXES(c.disconnected_left);
+			READBOXES(c.disconnected_back);
+			READBOXES(c.disconnected_right);
+			READBOXES(c.disconnected);
+			READBOXES(c.disconnected_sides);
+			break;
+		}
+		default:
+			type = NODEBOX_REGULAR;
+			break;
 	}
 }
 
@@ -335,10 +340,13 @@ void TileDef::deSerialize(std::istream &is, NodeDrawType drawtype, u16 protocol_
 		color.setBlue(readU8(is));
 	}
 	scale = has_scale ? readU8(is) : 0;
-	if (has_align_style)
+	if (has_align_style) {
 		align_style = static_cast<AlignStyle>(readU8(is));
-	else
+		if (align_style >= AlignStyle_END)
+			align_style = ALIGN_STYLE_NODE;
+	} else {
 		align_style = ALIGN_STYLE_NODE;
+	}
 }
 
 // FMTODO fix:
@@ -376,7 +384,7 @@ void TileDef::msgpack_unpack(msgpack::object o)
 void TextureSettings::readSettings()
 {
 	connected_glass                = g_settings->getBool("connected_glass");
-	opaque_water                   = g_settings->getBool("opaque_water");
+	translucent_liquids            = g_settings->getBool("translucent_liquids");
 	bool smooth_lighting           = g_settings->getBool("smooth_lighting");
 	enable_mesh_cache              = g_settings->getBool("enable_mesh_cache");
 	enable_minimap                 = g_settings->getBool("enable_minimap");
@@ -449,8 +457,8 @@ void ContentFeatures::reset()
 	has_on_construct = false;
 	has_on_destruct = false;
 	has_after_destruct = false;
-	has_on_activate = false;
-	has_on_deactivate = false;
+	floats = false;
+
 	/*
 		Actual data
 
@@ -481,7 +489,7 @@ void ContentFeatures::reset()
 	light_propagates = false;
 	sunlight_propagates = false;
 	walkable = true;
-	pointable = true;
+	pointable = PointabilityType::POINTABLE;
 	diggable = true;
 	climbable = false;
 	buildable_to = false;
@@ -508,7 +516,7 @@ void ContentFeatures::reset()
 	legacy_wallmounted = false;
 
 
-//freeminer:
+// freeminer:
 	freeze = "";
 	melt = "";
 	is_circuit_element = false;
@@ -523,7 +531,9 @@ void ContentFeatures::reset()
 		circuit_element_func[i] = 0;
 	}
 	circuit_element_delay = 0;
-
+	has_on_activate = false;
+	has_on_deactivate = false;
+// ==
 
 	sound_footstep = SoundSpec();
 	sound_dig = SoundSpec("__group");
@@ -542,8 +552,6 @@ void ContentFeatures::reset()
 
 void ContentFeatures::setAlphaFromLegacy(u8 legacy_alpha)
 {
-	// No special handling for nodebox/mesh here as it doesn't make sense to
-	// throw warnings when the server is too old to support the "correct" way
 	switch (drawtype) {
 	case NDT_NORMAL:
 		alpha = legacy_alpha == 255 ? ALPHAMODE_OPAQUE : ALPHAMODE_CLIP;
@@ -620,7 +628,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
 
 	// interaction
 	writeU8(os, walkable);
-	writeU8(os, pointable);
+	Pointabilities::serializePointabilityType(os, pointable);
 	writeU8(os, diggable);
 	writeU8(os, climbable);
 	writeU8(os, buildable_to);
@@ -683,11 +691,19 @@ void ContentFeatures::deSerialize(std::istream &is, u16 protocol_version)
 		int value = readS16(is);
 		groups[name] = value;
 	}
-	param_type = (enum ContentParamType) readU8(is);
-	param_type_2 = (enum ContentParamType2) readU8(is);
+
+	param_type = static_cast<ContentParamType>(readU8(is));
+	if (param_type >= ContentParamType_END)
+		param_type = CPT_NONE;
+
+	param_type_2 = static_cast<ContentParamType2>(readU8(is));
+	if (param_type_2 >= ContentParamType2_END)
+		param_type_2 = CPT2_NONE;
 
 	// visual
-	drawtype = (enum NodeDrawType) readU8(is);
+	drawtype = static_cast<NodeDrawType>(readU8(is));
+	if (drawtype >= NodeDrawType_END)
+		drawtype = NDT_NORMAL;
 	mesh = deSerializeString16(is);
 	visual_scale = readF32(is);
 	if (readU8(is) != 6)
@@ -725,7 +741,7 @@ void ContentFeatures::deSerialize(std::istream &is, u16 protocol_version)
 
 	// interaction
 	walkable = readU8(is);
-	pointable = readU8(is);
+	pointable = Pointabilities::deSerializePointabilityType(is);
 	diggable = readU8(is);
 	climbable = readU8(is);
 	buildable_to = readU8(is);
@@ -733,7 +749,9 @@ void ContentFeatures::deSerialize(std::istream &is, u16 protocol_version)
 	damage_per_second = readU32(is);
 
 	// liquid
-	liquid_type = (enum LiquidType) readU8(is);
+	liquid_type = static_cast<LiquidType>(readU8(is));
+	if (liquid_type >= LiquidType_END)
+		liquid_type = LIQUID_NONE;
 	liquid_move_physics = liquid_type != LIQUID_NONE;
 	liquid_alternative_flowing = deSerializeString16(is);
 	liquid_alternative_source = deSerializeString16(is);
@@ -770,6 +788,8 @@ void ContentFeatures::deSerialize(std::istream &is, u16 protocol_version)
 		if (is.eof())
 			throw SerializationError("");
 		alpha = static_cast<enum AlphaMode>(tmp);
+		if (alpha >= AlphaMode_END || alpha == ALPHAMODE_LEGACY_COMPAT)
+			alpha = ALPHAMODE_OPAQUE;
 
 		tmp = readU8(is);
 		if (is.eof())
@@ -785,7 +805,7 @@ void ContentFeatures::deSerialize(std::istream &is, u16 protocol_version)
 		if (is.eof())
 			throw SerializationError("");
 		post_effect_color_shaded = tmp;
-	} catch(SerializationError &e) {};
+	} catch (SerializationError &e) {};
 }
 
 void ContentFeatures::msgpack_pack(msgpack::packer<msgpack::sbuffer> &pk) const
@@ -815,7 +835,8 @@ void ContentFeatures::msgpack_pack(msgpack::packer<msgpack::sbuffer> &pk) const
 	PACK(CONTENTFEATURES_LIGHT_PROPAGATES, light_propagates);
 	PACK(CONTENTFEATURES_SUNLIGHT_PROPAGATES, sunlight_propagates);
 	PACK(CONTENTFEATURES_WALKABLE, walkable);
-	PACK(CONTENTFEATURES_POINTABLE, pointable);
+//FMTODO:
+	//PACK(CONTENTFEATURES_POINTABLE, pointable);
 	PACK(CONTENTFEATURES_DIGGABLE, diggable);
 	PACK(CONTENTFEATURES_CLIMBABLE, climbable);
 	PACK(CONTENTFEATURES_BUILDABLE_TO, buildable_to);
@@ -873,7 +894,7 @@ void ContentFeatures::msgpack_unpack(msgpack::object o)
 	for (size_t i = 0; i < CF_SPECIAL_COUNT; ++i)
 		tiledef_special[i] = tiledef_special_received[i];
 
-	//TODOpacket[CONTENTFEATURES_ALPHA].convert(alpha);
+	//TODO packet[CONTENTFEATURES_ALPHA].convert(alpha);
 	packet[CONTENTFEATURES_POST_EFFECT_COLOR].convert(post_effect_color);
 
 	int param_type_tmp;
@@ -886,7 +907,7 @@ void ContentFeatures::msgpack_unpack(msgpack::object o)
 	packet[CONTENTFEATURES_LIGHT_PROPAGATES].convert(light_propagates);
 	packet[CONTENTFEATURES_SUNLIGHT_PROPAGATES].convert(sunlight_propagates);
 	packet[CONTENTFEATURES_WALKABLE].convert(walkable);
-	packet[CONTENTFEATURES_POINTABLE].convert(pointable);
+	//TODO packet[CONTENTFEATURES_POINTABLE].convert(pointable);
 	packet[CONTENTFEATURES_DIGGABLE].convert(diggable);
 	packet[CONTENTFEATURES_CLIMBABLE].convert(climbable);
 	packet[CONTENTFEATURES_BUILDABLE_TO].convert(buildable_to);
@@ -971,7 +992,7 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
 	int frame_count = 1;
 	if (layer->material_flags & MATERIAL_FLAG_ANIMATION) {
 		assert(layer->texture);
-		int frame_length_ms;
+		int frame_length_ms = 0;
 		tiledef.animation.determineParams(layer->texture->getOriginalSize(),
 				&frame_count, &frame_length_ms, NULL);
 		layer->animation_frame_count = frame_count;
@@ -1004,58 +1025,6 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
 	}
 }
 
-bool ContentFeatures::textureAlphaCheck(ITextureSource *tsrc, const TileDef *tiles, int length)
-{
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
-	static thread_local bool long_warning_printed = false;
-	std::set<std::string> seen;
-
-	for (int i = 0; i < length; i++) {
-		if (seen.find(tiles[i].name) != seen.end())
-			continue;
-		seen.insert(tiles[i].name);
-
-		// Load the texture and see if there's any transparent pixels
-		video::ITexture *texture = tsrc->getTexture(tiles[i].name);
-		video::IImage *image = driver->createImage(texture,
-			core::position2d<s32>(0, 0), texture->getOriginalSize());
-		if (!image)
-			continue;
-		core::dimension2d<u32> dim = image->getDimension();
-		bool ok = true;
-		for (u16 x = 0; x < dim.Width; x++) {
-			for (u16 y = 0; y < dim.Height; y++) {
-				if (image->getPixel(x, y).getAlpha() < 255) {
-					ok = false;
-					goto break_loop;
-				}
-			}
-		}
-
-break_loop:
-		image->drop();
-		if (ok)
-			continue;
-		warningstream << "Texture \"" << tiles[i].name << "\" of "
-			<< name << " has transparency, assuming "
-			"use_texture_alpha = \"clip\"." << std::endl;
-		if (!long_warning_printed) {
-			warningstream << "  This warning can be a false-positive if "
-				"unused pixels in the texture are transparent. However if "
-				"it is meant to be transparent, you *MUST* update the "
-				"nodedef and set use_texture_alpha = \"clip\"! This "
-				"compatibility code will be removed in a few releases."
-				<< std::endl;
-			long_warning_printed = true;
-		}
-		return true;
-	}
-	return false;
-}
-#endif
-
-#ifndef SERVER
-
 bool isWorldAligned(AlignStyle style, WorldAlignMode mode, NodeDrawType drawtype)
 {
 	if (style == ALIGN_STYLE_WORLD)
@@ -1106,13 +1075,6 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 
 	bool is_liquid = false;
 
-#ifndef SERVER
-	if (alpha == ALPHAMODE_LEGACY_COMPAT) {
-		// Before working with the alpha mode, resolve any legacy kludges
-		alpha = textureAlphaCheck(tsrc, tdef, 6) ? ALPHAMODE_CLIP : ALPHAMODE_OPAQUE;
-	}
-#endif
-
 	MaterialType material_type = alpha == ALPHAMODE_OPAQUE ?
 		TILE_MATERIAL_OPAQUE : (alpha == ALPHAMODE_CLIP ? TILE_MATERIAL_BASIC :
 		TILE_MATERIAL_ALPHA);
@@ -1126,7 +1088,7 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 		solidness = 0;
 		break;
 	case NDT_LIQUID:
-		if (tsettings.opaque_water)
+		if (!tsettings.translucent_liquids)
 			alpha = ALPHAMODE_OPAQUE;
 		solidness = 1;
 		is_liquid = true;
@@ -1134,7 +1096,7 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 	case NDT_FLOWINGLIQUID:
 		solidness_far = 1;
 		solidness = 0;
-		if (tsettings.opaque_water)
+		if (!tsettings.translucent_liquids)
 			alpha = ALPHAMODE_OPAQUE;
 		is_liquid = true;
 		break;
@@ -1410,7 +1372,7 @@ void NodeDefManager::clear()
 		f.light_propagates    = true;
 		f.sunlight_propagates = true;
 		f.walkable            = false;
-		f.pointable           = false;
+		f.pointable           = PointabilityType::POINTABLE_NOT;
 		f.diggable            = false;
 		f.buildable_to        = true;
 		f.floodable           = true;
@@ -1434,7 +1396,7 @@ void NodeDefManager::clear()
 		f.light_propagates    = false;
 		f.sunlight_propagates = false;
 		f.walkable            = false;
-		f.pointable           = false;
+		f.pointable           = PointabilityType::POINTABLE_NOT;
 		f.diggable            = false;
 		f.buildable_to        = true; // A way to remove accidental CONTENT_IGNOREs
 		f.is_ground_content   = true;
@@ -1476,17 +1438,16 @@ bool NodeDefManager::getIds(const std::string &name,
 		std::vector<content_t> &result) const
 {
 	//TimeTaker t("getIds", NULL, PRECISION_MICRO);
-	if (name.substr(0,6) != "group:") {
+	if (!str_starts_with(name, "group:")) {
 		content_t id = CONTENT_IGNORE;
 		bool exists = getId(name, id);
 		if (exists)
 			result.push_back(id);
 		return exists;
 	}
-	std::string group = name.substr(6);
 
-	std::unordered_map<std::string, std::vector<content_t>>::const_iterator
-		i = m_group_to_items.find(group);
+	std::string group = name.substr(6);
+	auto i = m_group_to_items.find(group);
 	if (i == m_group_to_items.end())
 		return true;
 
@@ -2280,7 +2241,7 @@ bool NodeResolver::getIdsFromNrBacklog(std::vector<content_t> *result_out,
 		content_t c;
 		std::string &name = m_nodenames[m_nodenames_idx++];
 
-		if (name.substr(0,6) != "group:") {
+		if (!str_starts_with(name, "group:")) {
 			if (m_ndef->getId(name, c)) {
 				result_out->push_back(c);
 			} else if (all_required) {
diff --git a/src/nodedef.h b/src/nodedef.h
index 38862352a..709a00112 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -39,6 +39,7 @@ class Client;
 
 #include "texture_override.h" // TextureOverride
 #include "tileanimation.h"
+#include "util/pointabilities.h"
 
 //fm:
 #include "fm_bitset.h"
@@ -100,13 +101,14 @@ class NodeResolver;
 class TestSchematic;
 #endif
 
-enum ContentParamType
+enum ContentParamType : u8
 {
 	CPT_NONE,
 	CPT_LIGHT,
+	ContentParamType_END // Dummy for validity check
 };
 
-enum ContentParamType2
+enum ContentParamType2 : u8
 {
 	CPT2_NONE,
 	// Need 8-bit param2
@@ -137,16 +139,19 @@ enum ContentParamType2
 	CPT2_4DIR,
 	// 6 bits of palette index, then 4dir
 	CPT2_COLORED_4DIR,
+	// Dummy for validity check
+	ContentParamType2_END
 };
 
-enum LiquidType
+enum LiquidType : u8
 {
 	LIQUID_NONE,
 	LIQUID_FLOWING,
 	LIQUID_SOURCE,
+	LiquidType_END // Dummy for validity check
 };
 
-enum NodeBoxType
+enum NodeBoxType : u8
 {
 	NODEBOX_REGULAR, // Regular block; allows buildable_to
 	NODEBOX_FIXED, // Static separately defined box(es)
@@ -253,7 +258,7 @@ public:
 	WorldAlignMode world_aligned_mode;
 	AutoScale autoscale_mode;
 	int node_texture_size;
-	bool opaque_water;
+	bool translucent_liquids;
 	bool connected_glass;
 	bool enable_mesh_cache;
 	bool enable_minimap;
@@ -263,7 +268,7 @@ public:
 	void readSettings();
 };
 
-enum NodeDrawType
+enum NodeDrawType : u8
 {
 	// A basic solid block
 	NDT_NORMAL,
@@ -307,6 +312,8 @@ enum NodeDrawType
 	NDT_MESH,
 	// Combined plantlike-on-solid
 	NDT_PLANTLIKE_ROOTED,
+	// Dummy for validity check
+	NodeDrawType_END
 };
 
 // Mesh options for NDT_PLANTLIKE with CPT2_MESHOPTIONS
@@ -326,13 +333,15 @@ enum AlignStyle : u8 {
 	ALIGN_STYLE_NODE,
 	ALIGN_STYLE_WORLD,
 	ALIGN_STYLE_USER_DEFINED,
+	AlignStyle_END // Dummy for validity check
 };
 
 enum AlphaMode : u8 {
 	ALPHAMODE_BLEND,
 	ALPHAMODE_CLIP,
 	ALPHAMODE_OPAQUE,
-	ALPHAMODE_LEGACY_COMPAT, /* means either opaque or clip */
+	ALPHAMODE_LEGACY_COMPAT, /* only sent by old servers, equals OPAQUE */
+	AlphaMode_END // Dummy for validity check
 };
 
 
@@ -492,8 +501,8 @@ struct ContentFeatures
 	// This is used for collision detection.
 	// Also for general solidness queries.
 	bool walkable;
-	// Player can point to these
-	bool pointable;
+	// Player can point to these, point through or it is blocking
+	PointabilityType pointable;
 	// Player can dig these
 	bool diggable;
 	// Player can climb these
@@ -588,11 +597,9 @@ struct ContentFeatures
 		case NDT_NORMAL:
 		case NDT_LIQUID:
 		case NDT_FLOWINGLIQUID:
-			alpha = ALPHAMODE_OPAQUE;
-			break;
 		case NDT_NODEBOX:
 		case NDT_MESH:
-			alpha = ALPHAMODE_LEGACY_COMPAT; // this should eventually be OPAQUE
+			alpha = ALPHAMODE_OPAQUE;
 			break;
 		default:
 			alpha = ALPHAMODE_CLIP;
@@ -661,16 +668,6 @@ struct ContentFeatures
 //#endif
 
 private:
-#ifndef SERVER
-	/*
-	 * Checks if any tile texture has any transparent pixels.
-	 * Prints a warning and returns true if that is the case, false otherwise.
-	 * This is supposed to be used for use_texture_alpha backwards compatibility.
-	 */
-	bool textureAlphaCheck(ITextureSource *tsrc, const TileDef *tiles,
-		int length);
-#endif
-
 	void setAlphaFromLegacy(u8 legacy_alpha);
 
 	u8 getAlphaForLegacy() const;
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 2b2116af1..3497929a9 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -26,6 +26,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "inventory.h"
 #include "irrlicht_changes/printing.h"
 #include "log.h"
+#include "debug.h"
 #include "util/serialize.h"
 #include "constants.h" // MAP_BLOCKSIZE
 #include <sstream>
diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 94b711cf5..f0b725294 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -23,6 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <unordered_set>
+#include <map>
 #include "metadata.h"
 
 /*
diff --git a/src/noise.cpp b/src/noise.cpp
index de85528a3..5d24776ee 100644
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -152,6 +152,18 @@ s32 PcgRandom::randNormalDist(s32 min, s32 max, int num_trials)
 	return myround((float)accum / num_trials);
 }
 
+void PcgRandom::getState(u64 state[2]) const
+{
+	state[0] = m_state;
+	state[1] = m_inc;
+}
+
+void PcgRandom::setState(const u64 state[2])
+{
+  m_state = state[0];
+  m_inc = state[1];
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 float noise2d(int x, int y, s32 seed)
diff --git a/src/noise.h b/src/noise.h
index ca3937bfe..365ddf812 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -41,17 +41,17 @@ extern FlagDesc flagdesc_noiseparams[];
 
 template <typename type_scale, typename type_coord>
 inline type_scale farscale(type_scale scale, type_coord z) {
-	return ( 1 + ( 1 - (FARSCALE_LIMIT * 1 - (fabs(z))                     ) / (FARSCALE_LIMIT * 1) ) * (scale - 1) );
+	return ( 1 + ( 1 - (FARSCALE_LIMIT * 1 - (fabs(z) % FARSCALE_LIMIT)                     ) / (FARSCALE_LIMIT * 1) ) * (scale - 1) );
 }
 
 template <typename type_scale, typename type_coord>
 inline type_scale farscale(type_scale scale, type_coord x, type_coord z) {
-	return ( 1 + ( 1 - (FARSCALE_LIMIT * 2 - (fabs(x) + fabs(z))           ) / (FARSCALE_LIMIT * 2) ) * (scale - 1) );
+	return ( 1 + ( 1 - (FARSCALE_LIMIT * 2 - int(fabs(x) + fabs(z)) % FARSCALE_LIMIT*2           ) / (FARSCALE_LIMIT * 2) ) * (scale - 1) );
 }
 
 template <typename type_scale, typename type_coord>
 inline type_scale farscale(type_scale scale, type_coord x, type_coord y, type_coord z) {
-	return ( 1 + ( 1 - (FARSCALE_LIMIT * 3 - (fabs(x) + fabs(y) + fabs(z)) ) / (FARSCALE_LIMIT * 3) ) * (scale - 1) );
+	return ( 1 + ( 1 - (FARSCALE_LIMIT * 3 - int(fabs(x) + fabs(y) + fabs(z)) % FARSCALE_LIMIT*3 ) / (FARSCALE_LIMIT * 3) ) * (scale - 1) );
 }
 
 
@@ -61,23 +61,24 @@ class PseudoRandom {
 public:
 	const static u32 RANDOM_RANGE = 32767;
 
-	inline PseudoRandom(int seed=0):
-		m_next(seed)
+	inline PseudoRandom(s32 seed_=0)
 	{
+		seed(seed_);
 	}
 
-	inline void seed(int seed)
+	inline void seed(s32 seed)
 	{
 		m_next = seed;
 	}
 
-	inline int next()
+	inline u32 next()
 	{
-		m_next = m_next * 1103515245 + 12345;
-		return (unsigned)(m_next / 65536) % (RANDOM_RANGE + 1);
+		m_next = static_cast<u32>(m_next) * 1103515245U + 12345U;
+		// Signed division is required due to backwards compatibility
+		return static_cast<u32>(m_next / 65536) % (RANDOM_RANGE + 1U);
 	}
 
-	inline int range(int min, int max)
+	inline s32 range(s32 min, s32 max)
 	{
 		if (max < min)
 			throw PrngException("Invalid range (max < min)");
@@ -87,14 +88,19 @@ public:
 		PcgRandom, we cannot modify this RNG's range as it would change the
 		output of this RNG for reverse compatibility.
 		*/
-		if ((u32)(max - min) > (RANDOM_RANGE + 1) / 10)
+		if (static_cast<u32>(max - min) > (RANDOM_RANGE + 1) / 5)
 			throw PrngException("Range too large");
 
 		return (next() % (max - min + 1)) + min;
 	}
 
+	// Allow save and restore of state
+	inline s32 getState() const
+	{
+		return m_next;
+	}
 private:
-	int m_next;
+	s32 m_next;
 };
 
 class PcgRandom {
@@ -111,6 +117,9 @@ public:
 	void bytes(void *out, size_t len);
 	s32 randNormalDist(s32 min, s32 max, int num_trials=6);
 
+	// Allow save and restore of state
+	void getState(u64 state[2]) const;
+	void setState(const u64 state[2]);
 private:
 	std::atomic_ullong m_state;
 	//u64 m_state;
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 7f7faf8fe..b9ff9e0f0 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -24,6 +24,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlicht_changes/printing.h"
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h"
+#include "log.h"
 #include "util/serialize.h"
 #include <sstream>
 
@@ -35,7 +36,7 @@ ObjectProperties::ObjectProperties()
 	colors.emplace_back(255,255,255,255);
 }
 
-std::string ObjectProperties::dump()
+std::string ObjectProperties::dump() const
 {
 	std::ostringstream os(std::ios::binary);
 	os << "hp_max=" << hp_max;
@@ -77,7 +78,7 @@ std::string ObjectProperties::dump()
 
 	os << ", selectionbox=" << selectionbox.MinEdge << "," << selectionbox.MaxEdge;
 	os << ", rotate_selectionbox=" << rotate_selectionbox;
-	os << ", pointable=" << pointable;
+	os << ", pointable=" << Pointabilities::toStringPointabilityType(pointable);
 	os << ", static_save=" << static_save;
 	os << ", eye_height=" << eye_height;
 	os << ", zoom_fov=" << zoom_fov;
@@ -123,7 +124,7 @@ bool ObjectProperties::validate()
 
 void ObjectProperties::serialize(std::ostream &os) const
 {
-	auto lock = lock_shared();
+	// fmtodo: auto lock = lock_shared();
 
 	writeU8(os, 4); // PROTOCOL_VERSION >= 37
 	writeU16(os, hp_max);
@@ -133,7 +134,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeV3F32(os, collisionbox.MaxEdge);
 	writeV3F32(os, selectionbox.MinEdge);
 	writeV3F32(os, selectionbox.MaxEdge);
-	writeU8(os, pointable);
+	Pointabilities::serializePointabilityType(os, pointable);
 	os << serializeString16(visual);
 	writeV3F32(os, visual_size);
 	writeU16(os, textures.size());
@@ -187,7 +188,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 
 void ObjectProperties::deSerialize(std::istream &is)
 {
-	auto lock = lock_unique();
+	// fmtodo: auto lock = lock_unique();
 
 	int version = readU8(is);
 	if (version != 4)
@@ -200,7 +201,7 @@ void ObjectProperties::deSerialize(std::istream &is)
 	collisionbox.MaxEdge = readV3F32(is);
 	selectionbox.MinEdge = readV3F32(is);
 	selectionbox.MaxEdge = readV3F32(is);
-	pointable = readU8(is);
+	pointable = Pointabilities::deSerializePointabilityType(is);
 	visual = deSerializeString16(is);
 	visual_size = readV3F32(is);
 	textures.clear();
diff --git a/src/object_properties.h b/src/object_properties.h
index 4cf105682..33a581ed9 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -22,61 +22,100 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "threading/lock.h"
+
 #include <optional>
+#include <tuple>
 #include <string>
 #include "irrlichttypes_bloated.h"
 #include <iostream>
 #include <map>
 #include <vector>
-#include "threading/concurrent_vector.h"
-#include "threading/lock.h"
+#include "util/pointabilities.h"
 
-struct ObjectProperties : public shared_locker 
+struct ObjectProperties // FMTODO: public shared_locker 
 {
-	u16 hp_max = 1;
-	u16 breath_max = 0;
-	bool physical = false;
-	bool collideWithObjects = true;
+	/* member variables ordered roughly by size */
+
+	std::vector<std::string> textures;
+	std::vector<video::SColor> colors;
 	// Values are BS=1
 	aabb3f collisionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
+	// Values are BS=1
 	aabb3f selectionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
-	bool rotate_selectionbox = false;
-	bool pointable = true;
 	std::string visual = "sprite";
-	std::string mesh = "";
-	v3f visual_size = v3f(1, 1, 1);
-	concurrent_vector<std::string> textures;
+	std::string mesh;
 	std::string damage_texture_modifier = "^[brighten";
-	std::vector<video::SColor> colors;
+	std::string nametag;
+	std::string infotext;
+	// For dropped items, this contains the serialized item.
+	std::string wield_item;
+	v3f visual_size = v3f(1, 1, 1);
+	video::SColor nametag_color = video::SColor(255, 255, 255, 255);
+	std::optional<video::SColor> nametag_bgcolor;
 	v2s16 spritediv = v2s16(1, 1);
 	v2s16 initial_sprite_basepos;
-	bool is_visible = true;
-	bool makes_footstep_sound = false;
 	f32 stepheight = 0.0f;
 	float automatic_rotate = 0.0f;
-	bool automatic_face_movement_dir = false;
 	f32 automatic_face_movement_dir_offset = 0.0f;
-	bool force_load = false;
-	bool backface_culling = true;
-	s8 glow = 0;
-	std::string nametag = "";
-	video::SColor nametag_color = video::SColor(255, 255, 255, 255);
-	std::optional<video::SColor> nametag_bgcolor = std::nullopt;
 	f32 automatic_face_movement_max_rotation_per_sec = -1.0f;
-	std::string infotext;
-	//! For dropped items, this contains item information.
-	std::string wield_item;
-	bool static_save = true;
 	float eye_height = 1.625f;
 	float zoom_fov = 0.0f;
+	u16 hp_max = 1;
+	u16 breath_max = 0;
+	s8 glow = 0;
+	PointabilityType pointable = PointabilityType::POINTABLE;
+	// In a future protocol these could be a flag field.
+	bool physical = false;
+	bool collideWithObjects = true;
+	bool rotate_selectionbox = false;
+	bool is_visible = true;
+	bool makes_footstep_sound = false;
+	bool automatic_face_movement_dir = false;
+	bool backface_culling = true;
+	bool static_save = true;
 	bool use_texture_alpha = false;
 	bool shaded = true;
 	bool show_on_minimap = false;
 
+// fm:
+	bool force_load = false;
+// == 
+
 	ObjectProperties();
-	std::string dump();
-	// check limits of some important properties (strings) that'd cause exceptions later on
+
+	std::string dump() const;
+
+private:
+	auto tie() const {
+		// Make sure to add new members to this list!
+		return std::tie(
+		textures, colors, collisionbox, selectionbox, visual, mesh, damage_texture_modifier,
+		nametag, infotext, wield_item, visual_size, nametag_color, nametag_bgcolor,
+		spritediv, initial_sprite_basepos, stepheight, automatic_rotate,
+		automatic_face_movement_dir_offset, automatic_face_movement_max_rotation_per_sec,
+		eye_height, zoom_fov, hp_max, breath_max, glow, pointable, physical,
+		collideWithObjects, rotate_selectionbox, is_visible, makes_footstep_sound,
+		automatic_face_movement_dir, backface_culling, static_save, use_texture_alpha,
+		shaded, show_on_minimap
+		);
+	}
+
+public:
+	bool operator==(const ObjectProperties &other) const {
+		return tie() == other.tie();
+	};
+	bool operator!=(const ObjectProperties &other) const {
+		return tie() != other.tie();
+	};
+
+	/**
+	 * Check limits of some important properties that'd cause exceptions later on.
+	 * Errornous values are discarded after printing a warning.
+	 * @return true if a problem was found
+	*/
 	bool validate();
+
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
 };
diff --git a/src/particles.cpp b/src/particles.cpp
index 51312bbd1..6db4366f8 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -51,9 +51,9 @@ T RangedParameter<T>::pickWithin() const
 	auto p = numericAbsolute(bias) + 1;
 	for (size_t i = 0; i < sizeof(values) / sizeof(values[0]); ++i) {
 		if (bias < 0)
-			values[i] = 1.0f - pow(myrand_float(), p);
+			values[i] = 1.0f - std::pow(myrand_float(), p);
 		else
-			values[i] = pow(myrand_float(), p);
+			values[i] = std::pow(myrand_float(), p);
 	}
 	return T::pick(values, min, max);
 }
@@ -89,6 +89,8 @@ T TweenedParameter<T>::blend(float fac) const
 					fac *= myrand_range(0.7f, 1.0f);
 				}
 			}
+			case TweenStyle::TweenStyle_END:
+				break;
 		}
 		if (fac>1.f)
 			fac = 1.f;
@@ -115,6 +117,8 @@ template<typename T>
 void TweenedParameter<T>::deSerialize(std::istream &is)
 {
 	style = static_cast<TweenStyle>(readU8(is));
+	if (style >= TweenStyle::TweenStyle_END)
+		style = TweenStyle::fwd;
 	reps = readU16(is);
 	beginning = readF32(is);
 	start.deSerialize(is);
@@ -198,7 +202,8 @@ enum class ParticleTextureFlags : u8 {
  * decltype everywhere */
 using FlagT = std::underlying_type_t<ParticleTextureFlags>;
 
-void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly) const
+void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver,
+		bool newPropertiesOnly, bool skipAnimation) const
 {
 	/* newPropertiesOnly is used to de/serialize parameters of the legacy texture
 	 * field, which are encoded separately from the texspec string */
@@ -214,14 +219,19 @@ void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver, bool n
 	if (!newPropertiesOnly)
 		os << serializeString32(string);
 
-	if (animated)
+	if (!skipAnimation && animated)
 		animation.serialize(os, protocol_ver);
 }
 
-void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly)
+void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver,
+		bool newPropertiesOnly, bool skipAnimation)
 {
 	FlagT flags = 0;
 	deSerializeParameterValue(is, flags);
+	// new texture properties were missing in ParticleParameters::serialize
+	// before Minetest 5.9.0
+	if (is.eof())
+		return;
 
 	animated = !!(flags & FlagT(ParticleTextureFlags::animated));
 	blendmode = BlendMode((flags & FlagT(ParticleTextureFlags::blend)) >> 1);
@@ -231,7 +241,7 @@ void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver, bool
 	if (!newPropertiesOnly)
 		string = deSerializeString32(is);
 
-	if (animated)
+	if (!skipAnimation && animated)
 		animation.deSerialize(is, protocol_ver);
 }
 
@@ -255,6 +265,7 @@ void ParticleParameters::serialize(std::ostream &os, u16 protocol_ver) const
 	writeV3F32(os, drag);
 	jitter.serialize(os);
 	bounce.serialize(os);
+	texture.serialize(os, protocol_ver, true, true);
 }
 
 template <typename T, T (reader)(std::istream& is)>
@@ -292,4 +303,5 @@ void ParticleParameters::deSerialize(std::istream &is, u16 protocol_ver)
 		return;
 	jitter.deSerialize(is);
 	bounce.deSerialize(is);
+	texture.deSerialize(is, protocol_ver, true, true);
 }
diff --git a/src/particles.h b/src/particles.h
index 3561dee55..412bef024 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -25,7 +25,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>
 #include <sstream>
 #include <vector>
-#include <ctgmath>
 #include <type_traits>
 #include "irrlicht_changes/printing.h"
 #include "irrlichttypes_bloated.h"
@@ -205,7 +204,8 @@ namespace ParticleParamTypes
 	}
 
 	// Animation styles (fwd is normal, linear interpolation)
-	enum class TweenStyle : u8 { fwd, rev, pulse, flicker };
+	// TweenStyle_END is a dummy value for validity check
+	enum class TweenStyle : u8 { fwd, rev, pulse, flicker, TweenStyle_END};
 
 	// "Tweened" pretty much means "animated" in this context
 	template <typename T>
@@ -279,8 +279,10 @@ struct ParticleTexture
 struct ServerParticleTexture : public ParticleTexture
 {
 	std::string string;
-	void serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly = false) const;
-	void deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly = false);
+	void serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly = false,
+			bool skipAnimation = false) const;
+	void deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly = false,
+			bool skipAnimation = false);
 };
 
 struct CommonParticleParams
diff --git a/src/player.cpp b/src/player.cpp
index dab19fe30..403712098 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -82,20 +82,10 @@ Player::Player(const std::string & name, IItemDefManager *idef):
 		HUD_FLAG_CHAT_VISIBLE;
 
 	hud_hotbar_itemcount = HUD_HOTBAR_ITEMCOUNT_DEFAULT;
-
-	m_player_settings.readGlobalSettings();
-	// Register player setting callbacks
-	for (const std::string &name : m_player_settings.setting_names)
-		g_settings->registerChangedCallback(name,
-			&Player::settingsChangedCallback, &m_player_settings);
 }
 
 Player::~Player()
 {
-	// m_player_settings becomes invalid, remove callbacks
-	for (const std::string &name : m_player_settings.setting_names)
-		g_settings->deregisterChangedCallback(name,
-			&Player::settingsChangedCallback, &m_player_settings);
 	clearHud();
 }
 
@@ -146,6 +136,12 @@ HudElement* Player::getHud(u32 id)
 	return NULL;
 }
 
+void Player::hudApply(std::function<void(const std::vector<HudElement*>&)> f)
+{
+	MutexAutoLock lock(m_mutex);
+	f(hud);
+}
+
 HudElement* Player::removeHud(u32 id)
 {
 	MutexAutoLock lock(m_mutex);
@@ -201,7 +197,7 @@ u32 PlayerControl::getKeysPressed() const
 		float abs_d;
 
 		// (absolute value indicates forward / backward)
-		abs_d = abs(movement_direction);
+		abs_d = std::abs(movement_direction);
 		if (abs_d < 3.0f / 8.0f * M_PI)
 			keypress_bits |= (u32)1; // Forward
 		if (abs_d > 5.0f / 8.0f * M_PI)
@@ -211,7 +207,7 @@ u32 PlayerControl::getKeysPressed() const
 		abs_d = movement_direction + M_PI_2;
 		if (abs_d >= M_PI)
 			abs_d -= 2 * M_PI;
-		abs_d = abs(abs_d);
+		abs_d = std::abs(abs_d);
 		// (value now indicates left / right)
 		if (abs_d < 3.0f / 8.0f * M_PI)
 			keypress_bits |= (u32)1 << 2; // Left
@@ -234,20 +230,3 @@ void PlayerControl::unpackKeysPressed(u32 keypress_bits)
 	place = keypress_bits & (1 << 8);
 	zoom  = keypress_bits & (1 << 9);
 }
-
-void PlayerSettings::readGlobalSettings()
-{
-	free_move = g_settings->getBool("free_move");
-	pitch_move = g_settings->getBool("pitch_move");
-	fast_move = g_settings->getBool("fast_move");
-	continuous_forward = g_settings->getBool("continuous_forward");
-	always_fly_fast = g_settings->getBool("always_fly_fast");
-	aux1_descends = g_settings->getBool("aux1_descends");
-	noclip = g_settings->getBool("noclip");
-	autojump = g_settings->getBool("autojump");
-}
-
-void Player::settingsChangedCallback(const std::string &name, void *data)
-{
-	((PlayerSettings *)data)->readGlobalSettings();
-}
diff --git a/src/player.h b/src/player.h
index a4ac5ff2e..56e8c6e26 100644
--- a/src/player.h
+++ b/src/player.h
@@ -32,6 +32,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "threading/lock.h"
 #include "json/json.h"
 #include <mutex>
+#include <functional>
+#include <tuple>
 
 #define PLAYERNAME_SIZE 20
 
@@ -47,7 +49,17 @@ struct PlayerFovSpec
 
 	// The time to be take to trasition to the new FOV value.
 	// Transition is instantaneous if omitted. Omitted by default.
-	f32 transition_time;
+	f32 transition_time = 0;
+
+	inline bool operator==(const PlayerFovSpec &other) const {
+		// transition_time is compared here since that could be relevant
+		// when aborting a running transition.
+		return fov == other.fov && is_multiplier == other.is_multiplier &&
+			transition_time == other.transition_time;
+	}
+	inline bool operator!=(const PlayerFovSpec &other) const {
+		return !(*this == other);
+	}
 };
 
 struct PlayerControl
@@ -120,24 +132,27 @@ struct PlayerPhysicsOverride
 	float liquid_sink = 1.f;
 	float acceleration_default = 1.f;
 	float acceleration_air = 1.f;
-};
+	float speed_fast = 1.f;
+	float acceleration_fast = 1.f;
+	float speed_walk = 1.f;
 
-struct PlayerSettings
-{
-	bool free_move = false;
-	bool pitch_move = false;
-	bool fast_move = false;
-	bool continuous_forward = false;
-	bool always_fly_fast = false;
-	bool aux1_descends = false;
-	bool noclip = false;
-	bool autojump = false;
+private:
+	auto tie() const {
+		// Make sure to add new members to this list!
+		return std::tie(
+		speed, jump, gravity, sneak, sneak_glitch, new_move, speed_climb, speed_crouch,
+		liquid_fluidity, liquid_fluidity_smooth, liquid_sink, acceleration_default,
+		acceleration_air, speed_fast, acceleration_fast, speed_walk
+		);
+	}
 
-	const std::string setting_names[8] = {
-		"free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
-		"aux1_descends", "noclip", "autojump"
+public:
+	bool operator==(const PlayerPhysicsOverride &other) const {
+		return tie() == other.tie();
+	};
+	bool operator!=(const PlayerPhysicsOverride &other) const {
+		return tie() != other.tie();
 	};
-	void readGlobalSettings();
 };
 
 class Map;
@@ -162,14 +177,7 @@ public:
 	{}
 
 	// in BS-space
-	v3f getSpeed() const
-	{
-		auto lock = lock_shared();
-		return m_speed;
-	}
-
-	// in BS-space
-	void setSpeed(v3f speed)
+	inline void setSpeed(v3f speed)
 	{
 		auto lock = lock_unique();
 		m_speed = speed;
@@ -177,6 +185,9 @@ public:
 
 	void addSpeed(v3f speed);
 
+	// in BS-space
+	v3f getSpeed() const { auto lock = lock_shared(); return m_speed; }
+
 /*
 	const char *getName() const { return m_name; }
 */
@@ -220,21 +231,23 @@ public:
 
 	PlayerControl control;
 	std::mutex control_mutex;
-	const PlayerControl& getPlayerControl() {
-   		 std::lock_guard<std::mutex> lock(control_mutex);
-		 return control; }
+	const PlayerControl& getPlayerControl() { 
+		std::lock_guard<std::mutex> lock(control_mutex);
+		return control; }
+
 	PlayerPhysicsOverride physics_override;
-	PlayerSettings &getPlayerSettings() { return m_player_settings; }
-	static void settingsChangedCallback(const std::string &name, void *data);
 
 	// Returns non-empty `selected` ItemStack. `hand` is a fallback, if specified
 	ItemStack &getWieldedItem(ItemStack *selected, ItemStack *hand) const;
 	void setWieldIndex(u16 index);
 	u16 getWieldIndex() const { return m_wield_index; }
 
-	void setFov(const PlayerFovSpec &spec)
+	bool setFov(const PlayerFovSpec &spec)
 	{
+		if (m_fov_override_spec == spec)
+			return false;
 		m_fov_override_spec = spec;
+		return true;
 	}
 
 	const PlayerFovSpec &getFov() const
@@ -243,6 +256,7 @@ public:
 	}
 
 	HudElement* getHud(u32 id);
+	void        hudApply(std::function<void(const std::vector<HudElement*>&)> f);
 	u32         addHud(HudElement* hud);
 	HudElement* removeHud(u32 id);
 	void        clearHud();
@@ -264,10 +278,11 @@ protected:
 	PlayerFovSpec m_fov_override_spec = { 0.0f, false, 0.0f };
 
 	std::vector<HudElement *> hud;
+
 private:
 	// Protect some critical areas
 	// hud for example can be modified by EmergeThread
 	// and ServerThread
+	// FIXME: ^ this sounds like nonsense. should be checked.
 	std::mutex m_mutex;
-	PlayerSettings m_player_settings;
 };
diff --git a/src/porting.cpp b/src/porting.cpp
index efcc1ba30..1741e4d9a 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -54,8 +54,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #if defined(__ANDROID__)
 	#include "porting_android.h"
+	#include <android/api-level.h>
 #endif
 #if defined(__APPLE__)
+	#include <mach-o/dyld.h>
+	#include <CoreFoundation/CoreFoundation.h>
 	// For _NSGetEnviron()
 	// Related: https://gitlab.haskell.org/ghc/ghc/issues/2458
 	#include <crt_externs.h>
@@ -65,14 +68,20 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 	#include <FindDirectory.h>
 #endif
 
-#include "config.h"
+#if HAVE_MALLOC_TRIM
+	// glibc-only pretty much
+	#include <malloc.h>
+#endif
+
 #include "debug.h"
 #include "filesys.h"
 #include "log.h"
 #include "util/string.h"
-#include <list>
+#include <vector>
 #include <cstdarg>
 #include <cstdio>
+#include <signal.h>
+#include <atomic>
 
 #if !defined(SERVER) && defined(_WIN32)
 // On Windows export some driver-specific variables to encourage Minetest to be
@@ -90,7 +99,7 @@ namespace porting
 	Signal handler (grabs Ctrl-C on POSIX systems)
 */
 
-bool g_killed = false;
+static bool g_killed = false;
 
 bool *signal_handler_killstatus()
 {
@@ -100,9 +109,8 @@ bool *signal_handler_killstatus()
 std::atomic_bool g_sighup, g_siginfo;
 
 #if !defined(_WIN32) // POSIX
-	#include <signal.h>
 
-void signal_handler(int sig)
+static void signal_handler(int sig)
 {
 	switch(sig) {
 #if defined(SIGINFO)
@@ -153,9 +161,8 @@ void signal_handler_init(void)
 }
 
 #else // _WIN32
-	#include <signal.h>
 
-BOOL WINAPI event_handler(DWORD sig)
+static BOOL WINAPI event_handler(DWORD sig)
 {
 	switch (sig) {
 	case CTRL_C_EVENT:
@@ -189,11 +196,11 @@ void signal_handler_init(void)
 	Path mangler
 */
 
-// Default to RUN_IN_PLACE style relative paths
-std::string path_share = "..";
-std::string path_user = "..";
-std::string path_locale = path_share + DIR_DELIM + "locale";
-std::string path_cache = path_user + DIR_DELIM + "cache";
+// Nobody should be reading these before initializePaths() is called
+std::string path_share = "UNINITIALIZED";
+std::string path_user = "UNINITIALIZED";
+std::string path_locale = "UNINITIALIZED";
+std::string path_cache = "UNINITIALIZED";
 
 
 std::string getDataPath(const char *subpath)
@@ -201,7 +208,7 @@ std::string getDataPath(const char *subpath)
 	return path_share + DIR_DELIM + subpath;
 }
 
-void pathRemoveFile(char *path, char delim)
+[[maybe_unused]] static void pathRemoveFile(char *path, char delim)
 {
 	// Remove filename and path delimiter
 	int i;
@@ -226,10 +233,12 @@ bool detectMSVCBuildDir(const std::string &path)
 	return (!removeStringEnd(path, ends).empty());
 }
 
-std::string get_sysinfo()
+// Note that the system info is sent in every HTTP request, so keep it reasonably
+// privacy-conserving while ideally still being meaningful.
+
+static std::string detectSystemInfo()
 {
 #ifdef _WIN32
-
 	std::ostringstream oss;
 	LPSTR filePath = new char[MAX_PATH];
 	UINT blockSize;
@@ -249,28 +258,58 @@ std::string get_sysinfo()
 		<< LOWORD(fixedFileInfo->dwProductVersionMS) << '.' // Minor
 		<< HIWORD(fixedFileInfo->dwProductVersionLS) << ' '; // Build
 
-	#ifdef _WIN64
-	oss << "x86_64";
-	#else
-	BOOL is64 = FALSE;
-	if (IsWow64Process(GetCurrentProcess(), &is64) && is64)
-		oss << "x86_64"; // 32-bit app on 64-bit OS
-	else
+	SYSTEM_INFO info;
+	GetNativeSystemInfo(&info);
+	switch (info.wProcessorArchitecture) {
+	case PROCESSOR_ARCHITECTURE_AMD64:
+		oss << "x86_64";
+		break;
+	case PROCESSOR_ARCHITECTURE_ARM:
+		oss << "arm";
+		break;
+	case PROCESSOR_ARCHITECTURE_ARM64:
+		oss << "arm64";
+		break;
+	case PROCESSOR_ARCHITECTURE_INTEL:
 		oss << "x86";
-	#endif
+		break;
+	default:
+		oss << "unknown";
+		break;
+	}
 
 	delete[] lpVersionInfo;
 	delete[] filePath;
 
 	return oss.str();
-#else
+#elif defined(__ANDROID__)
+	std::ostringstream oss;
 	struct utsname osinfo;
 	uname(&osinfo);
-	return std::string(osinfo.sysname) + "/"
-		+ osinfo.release + " " + osinfo.machine;
+	int api = android_get_device_api_level();
+
+	oss << "Android/" << api << " " << osinfo.machine;
+	return oss.str();
+#else /* POSIX */
+	struct utsname osinfo;
+	uname(&osinfo);
+
+	std::string_view release(osinfo.release);
+	// cut off anything but the primary version number
+	release = release.substr(0, release.find_first_not_of("0123456789."));
+
+	std::string ret = osinfo.sysname;
+	ret.append("/").append(release).append(" ").append(osinfo.machine);
+	return ret;
 #endif
 }
 
+const std::string &get_sysinfo()
+{
+	static std::string ret = detectSystemInfo();
+	return ret;
+}
+
 
 bool getCurrentWorkingDir(char *buf, size_t len)
 {
@@ -283,9 +322,9 @@ bool getCurrentWorkingDir(char *buf, size_t len)
 }
 
 
-bool getExecPathFromProcfs(char *buf, size_t buflen)
+static bool getExecPathFromProcfs(char *buf, size_t buflen)
 {
-#ifndef _WIN32
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 	buflen--;
 
 	ssize_t len;
@@ -412,10 +451,7 @@ bool getCurrentExecPath(char *buf, size_t len)
 #endif
 
 
-//// Non-Windows
-#if !defined(_WIN32)
-
-const char *getHomeOrFail()
+[[maybe_unused]] static inline const char *getHomeOrFail()
 {
 	const char *home = getenv("HOME");
 	// In rare cases the HOME environment variable may be unset
@@ -424,8 +460,6 @@ const char *getHomeOrFail()
 	return home;
 }
 
-#endif
-
 
 //// Windows
 #if defined(_WIN32)
@@ -465,6 +499,13 @@ bool setSystemPaths()
 }
 
 
+//// Android
+
+#elif defined(__ANDROID__)
+
+extern bool setSystemPaths(); // defined in porting_android.cpp
+
+
 //// Linux
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 
@@ -473,11 +514,7 @@ bool setSystemPaths()
 	char buf[BUFSIZ];
 
 	if (!getCurrentExecPath(buf, sizeof(buf))) {
-#ifdef __ANDROID__
-		errorstream << "Unable to read bindir "<< std::endl;
-#else
 		FATAL_ERROR("Unable to read bindir");
-#endif
 		return false;
 	}
 
@@ -486,7 +523,7 @@ bool setSystemPaths()
 
 	// Find share directory from these.
 	// It is identified by containing the subdirectory "builtin".
-	std::list<std::string> trylist;
+	std::vector<std::string> trylist;
 	std::string static_sharedir = STATIC_SHAREDIR;
 	if (!static_sharedir.empty() && static_sharedir != ".")
 		trylist.push_back(static_sharedir);
@@ -495,12 +532,7 @@ bool setSystemPaths()
 		DIR_DELIM + PROJECT_NAME);
 	trylist.push_back(bindir + DIR_DELIM "..");
 
-#ifdef __ANDROID__
-	trylist.push_back(path_user);
-#endif
-
-	for (std::list<std::string>::const_iterator
-			i = trylist.begin(); i != trylist.end(); ++i) {
+	for (auto i = trylist.begin(); i != trylist.end(); ++i) {
 		const std::string &trypath = *i;
 		if (!fs::PathExists(trypath) ||
 			!fs::PathExists(trypath + DIR_DELIM + "builtin")) {
@@ -519,7 +551,6 @@ bool setSystemPaths()
 		break;
 	}
 
-#ifndef __ANDROID__
 	const char *const minetest_user_path = getenv("MINETEST_USER_PATH");
 	if (minetest_user_path && minetest_user_path[0] != '\0') {
 		path_user = std::string(minetest_user_path);
@@ -527,7 +558,6 @@ bool setSystemPaths()
 		path_user = std::string(getHomeOrFail()) + DIR_DELIM "."
 			+ PROJECT_NAME;
 	}
-#endif
 
 	return true;
 }
@@ -579,7 +609,8 @@ bool setSystemPaths()
 
 #endif
 
-void migrateCachePath()
+// Move cache folder from path_user to system cache location if possible.
+[[maybe_unused]] static void migrateCachePath()
 {
 	const std::string local_cache_path = path_user + DIR_DELIM + "cache";
 
@@ -599,13 +630,30 @@ void migrateCachePath()
 	}
 }
 
+// Create tag in cache folder according to <https://bford.info/cachedir/> spec
+static void createCacheDirTag()
+{
+	const auto path = path_cache + DIR_DELIM + "CACHEDIR.TAG";
+
+	if (fs::PathExists(path))
+		return;
+	fs::CreateAllDirs(path_cache);
+	auto ofs = open_ofstream(path.c_str(), false);
+	if (!ofs.good())
+		return;
+	ofs << "Signature: 8a477f597d28d172789f06886806bc55\n"
+		"# This file is a cache directory tag automatically created by "
+		PROJECT_NAME_C ".\n"
+		"# For information about cache directory tags, see: "
+		"https://bford.info/cachedir/\n";
+}
+
 void initializePaths()
 {
 #if RUN_IN_PLACE
-	char buf[BUFSIZ];
-
 	infostream << "Using relative paths (RUN_IN_PLACE)" << std::endl;
 
+	char buf[BUFSIZ];
 	bool success =
 		getCurrentExecPath(buf, sizeof(buf)) ||
 		getExecPathFromProcfs(buf, sizeof(buf));
@@ -650,17 +698,18 @@ void initializePaths()
 		path_user  = execpath;
 	}
 	path_cache = path_user + DIR_DELIM + "cache";
+
 #else
 	infostream << "Using system-wide paths (NOT RUN_IN_PLACE)" << std::endl;
 
 	if (!setSystemPaths())
 		errorstream << "Failed to get one or more system-wide path" << std::endl;
 
-
-#  ifdef _WIN32
+#  ifdef __ANDROID__
+	sanity_check(!path_cache.empty());
+#  elif defined(_WIN32)
 	path_cache = path_user + DIR_DELIM + "cache";
 #  else
-	// Initialize path_cache
 	// First try $XDG_CACHE_HOME/PROJECT_NAME
 	const char *cache_dir = getenv("XDG_CACHE_HOME");
 	const char *home_dir = getenv("HOME");
@@ -674,15 +723,19 @@ void initializePaths()
 		// If neither works, use $PATH_USER/cache
 		path_cache = path_user + DIR_DELIM + "cache";
 	}
+#  endif // _WIN32
+
 	// Migrate cache folder to new location if possible
 	migrateCachePath();
-#  endif // _WIN32
+
 #endif // RUN_IN_PLACE
 
 	infostream << "Detected share path: " << path_share << std::endl;
 	infostream << "Detected user path: " << path_user << std::endl;
 	infostream << "Detected cache path: " << path_cache << std::endl;
 
+	createCacheDirTag();
+
 #if USE_GETTEXT
 	bool found_localedir = false;
 #  ifdef STATIC_LOCALEDIR
@@ -722,8 +775,8 @@ float get_dpi() {
 int get_densityDpi() { return 0; }
 */
 
-void irr_device_wait_egl (irr::IrrlichtDevice *dev) {
 #if 0 //TODO fm?  #ifdef __ANDROID__
+void irr_device_wait_egl (irr::IrrlichtDevice *dev) {
 	if (!dev)
 		dev = device; // move to renderengine?
 	if (!dev)
@@ -737,8 +790,8 @@ void irr_device_wait_egl (irr::IrrlichtDevice *dev) {
 		}
 	}
 	dev->getContextManager()->activateContext(dev->getContextManager()->getContext());
-#endif
 }
+#endif
 
 #endif
 
@@ -787,15 +840,32 @@ bool secure_rand_fill_buf(void *buf, size_t len)
 
 #endif
 
+#ifndef __ANDROID__
+
+void osSpecificInit()
+{
+#ifdef _WIN32
+	// hardening options
+	HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+	SetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE |
+		BASE_SEARCH_PATH_PERMANENT);
+	SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
+#endif
+}
+
+#endif
+
 void attachOrCreateConsole()
 {
 #ifdef _WIN32
-	static bool consoleAllocated = false;
-	const bool redirected = (_fileno(stdout) == -2 || _fileno(stdout) == -1); // If output is redirected to e.g a file
-	if (!consoleAllocated && redirected && (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())) {
-		freopen("CONOUT$", "w", stdout);
-		freopen("CONOUT$", "w", stderr);
-		consoleAllocated = true;
+	static bool once = false;
+	const bool redirected = _fileno(stdout) >= 0; // If output is redirected to e.g a file
+	if (!once && !redirected) {
+		if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole()) {
+			freopen("CONOUT$", "w", stdout);
+			freopen("CONOUT$", "w", stderr);
+		}
+		once = true;
 	}
 #endif
 }
@@ -830,6 +900,21 @@ std::string QuoteArgv(const std::string &arg)
 	ret.push_back('"');
 	return ret;
 }
+
+std::string ConvertError(DWORD error_code)
+{
+	wchar_t buffer[320];
+
+	auto r = FormatMessageW(
+		FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		nullptr, error_code, 0, buffer, ARRLEN(buffer) - 1, nullptr);
+	if (!r)
+		return std::to_string(error_code);
+
+	if (!buffer[0]) // should not happen normally
+		return "?";
+	return wide_to_utf8(buffer);
+}
 #endif
 
 int mt_snprintf(char *buf, const size_t buf_size, const char *fmt, ...)
@@ -854,6 +939,11 @@ int mt_snprintf(char *buf, const size_t buf_size, const char *fmt, ...)
 	return c;
 }
 
+#ifdef __ANDROID__
+// defined in porting_android.cpp
+extern void openURIAndroid(const char *url);
+#endif
+
 static bool open_uri(const std::string &uri)
 {
 	if (uri.find_first_of("\r\n") != std::string::npos) {
@@ -864,7 +954,7 @@ static bool open_uri(const std::string &uri)
 #if defined(_WIN32)
 	return (intptr_t)ShellExecuteA(NULL, NULL, uri.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32;
 #elif defined(__ANDROID__)
-	openURIAndroid(uri);
+	openURIAndroid(uri.c_str());
 	return true;
 #elif defined(__APPLE__)
 	const char *argv[] = {"open", uri.c_str(), NULL};
@@ -878,7 +968,7 @@ static bool open_uri(const std::string &uri)
 
 bool open_url(const std::string &url)
 {
-	if (url.substr(0, 7) != "http://" && url.substr(0, 8) != "https://") {
+	if (!str_starts_with(url, "http://") && !str_starts_with(url, "https://")) {
 		errorstream << "Unable to open browser as URL is missing schema: " << url << std::endl;
 		return false;
 	}
@@ -913,4 +1003,44 @@ double perf_freq = get_perf_freq();
 
 #endif
 
+#if HAVE_MALLOC_TRIM
+
+/*
+ * On Linux/glibc we found that after deallocating bigger chunks of data (esp. MapBlocks)
+ * the memory would not be given back to the OS and would stay at peak usage.
+ * This appears to be a combination of unfortunate allocation order/fragmentation
+ * and the fact that glibc does not call madvise(MADV_DONTNEED) on its own.
+ * Some other allocators were also affected, jemalloc and musl libc were not.
+ * read more: <https://forum.minetest.net/viewtopic.php?t=30509>
+ *
+ * As a workaround we track freed memory coarsely and call malloc_trim() once a
+ * certain amount is reached.
+ *
+ * Because trimming can take more than 10ms and would cause jitter if done
+ * uncontrolled we have a separate function, which is called from background threads.
+ */
+
+static std::atomic<size_t> memory_freed;
+
+constexpr size_t MEMORY_TRIM_THRESHOLD = 256 * 1024 * 1024;
+
+void TrackFreedMemory(size_t amount)
+{
+	memory_freed.fetch_add(amount, std::memory_order_relaxed);
+}
+
+void TriggerMemoryTrim()
+{
+	constexpr auto MO = std::memory_order_relaxed;
+	if (memory_freed.load(MO) >= MEMORY_TRIM_THRESHOLD) {
+		// Synchronize call
+		if (memory_freed.exchange(0, MO) < MEMORY_TRIM_THRESHOLD)
+			return;
+		// Leave some headroom for future allocations
+		malloc_trim(8 * 1024 * 1024);
+	}
+}
+
+#endif
+
 } //namespace porting
diff --git a/src/porting.h b/src/porting.h
index 6b5b8dfda..7a316ec70 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -26,15 +26,17 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
+	#define _GNU_SOURCE
+#endif
+
+// Be mindful of what you include here!
 #include <string>
-#include <vector>
-#include "irrlicht.h"
-#include "irrlichttypes.h" // u32
-#include "irrlichttypes_extrabloated.h"
+#include "config.h"
+#include "irrlichttypes.h" // u64
 #include "debug.h"
 #include "constants.h"
-#include "gettime.h"
-#include <atomic>
+#include "util/timetaker.h" // TimePrecision
 
 #ifdef _MSC_VER
 	#define SWPRINTF_CHARSTRING L"%S"
@@ -42,10 +44,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 	#define SWPRINTF_CHARSTRING L"%s"
 #endif
 
-//currently not needed
-//template<typename T> struct alignment_trick { char c; T member; };
-//#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
-
 #ifdef _WIN32
 	#include <windows.h>
 
@@ -53,17 +51,12 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 	#define MAX_PACKET_SIZE_SINGLEPLAYER 1400
 	#define sleep_us(x) Sleep((x)/1000)
+
+	#define setenv(n,v,o) _putenv_s(n,v)
+	#define unsetenv(n) _putenv_s(n,"")
 #else
 	#include <unistd.h>
-	#include <cstdint> //for uintptr_t
-
-	// Use standard Posix macro for Linux
-	#if (defined(linux) || defined(__linux)) && !defined(__linux__)
-		#define __linux__
-	#endif
-	#if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
-		#define _GNU_SOURCE
-	#endif
+	#include <cstdlib> // setenv
 
 	//fmtodo: #define MAX_PACKET_SIZE_SINGLEPLAYER 8192
 	#define MAX_PACKET_SIZE_SINGLEPLAYER 1400
@@ -73,54 +66,29 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef _MSC_VER
-	#define ALIGNOF(x) __alignof(x)
 	#define strtok_r(x, y, z) strtok_s(x, y, z)
 	#define strtof(x, y) (float)strtod(x, y)
 	#define strtoll(x, y, z) _strtoi64(x, y, z)
 	#define strtoull(x, y, z) _strtoui64(x, y, z)
 	#define strcasecmp(x, y) stricmp(x, y)
 	#define strncasecmp(x, y, n) strnicmp(x, y, n)
-#else
-	#define ALIGNOF(x) __alignof__(x)
 #endif
 
 #ifdef __MINGW32__
+	// was broken in 2013, unclear if still needed
 	#define strtok_r(x, y, z) mystrtok_r(x, y, z)
 #endif
 
-// strlcpy is missing from glibc.  thanks a lot, drepper.
-// strlcpy is also missing from AIX and HP-UX because they aim to be weird.
-// We can't simply alias strlcpy to MSVC's strcpy_s, since strcpy_s by
-// default raises an assertion error and aborts the program if the buffer is
-// too small.
-#if defined(__FreeBSD__) || defined(__NetBSD__)    || \
-	defined(__OpenBSD__) || defined(__DragonFly__) || \
-	defined(__APPLE__)   ||                           \
-	defined(__sun)       || defined(sun)           || \
-	defined(__QNX__)     || defined(__QNXNTO__)
-	#define HAVE_STRLCPY
-#endif
-
-// So we need to define our own.
-#ifndef HAVE_STRLCPY
+#if !HAVE_STRLCPY
 	#define strlcpy(d, s, n) mystrlcpy(d, s, n)
 #endif
 
-#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
-
-#if defined(__APPLE__)
-	#include <mach-o/dyld.h>
-	#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-#ifndef _WIN32 // Posix
+#ifndef _WIN32 // POSIX
 	#include <sys/time.h>
 	#include <ctime>
-
-#if defined(__MACH__) && defined(__APPLE__)
-		#include <mach/clock.h>
-		#include <mach/mach.h>
-	#endif
+    #if defined(__MACH__) && defined(__APPLE__)
+        #include <TargetConditionals.h>
+    #endif
 #endif
 
 namespace porting
@@ -169,12 +137,6 @@ bool getCurrentExecPath(char *buf, size_t len);
 */
 std::string getDataPath(const char *subpath);
 
-/*
-	Move cache folder from path_user to the
-	system cache location if possible.
-*/
-void migrateCachePath();
-
 /*
 	Initialize path_*.
 */
@@ -184,10 +146,10 @@ void initializePaths();
 	Return system information
 	e.g. "Linux/3.12.7 x86_64"
 */
-std::string get_sysinfo();
+const std::string &get_sysinfo();
 
 
-// Monotonic counter getters.
+// Monotonic timer
 
 #ifdef _WIN32 // Windows
 
@@ -206,25 +168,20 @@ inline u64 getTimeMs() { return os_get_time(1000); }
 inline u64 getTimeUs() { return os_get_time(1000*1000); }
 inline u64 getTimeNs() { return os_get_time(1000*1000*1000); }
 
-#else // Posix
+#else // POSIX
 
 inline void os_get_clock(struct timespec *ts)
 {
-#if defined(__MACH__) && defined(__APPLE__)
-// From http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
-// OS X does not have clock_gettime, use clock_get_time
-	clock_serv_t cclock;
-	mach_timespec_t mts;
-	host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-	clock_get_time(cclock, &mts);
-	mach_port_deallocate(mach_task_self(), cclock);
-	ts->tv_sec = mts.tv_sec;
-	ts->tv_nsec = mts.tv_nsec;
-#elif defined(CLOCK_MONOTONIC_RAW)
+#if defined(CLOCK_MONOTONIC_RAW)
 	clock_gettime(CLOCK_MONOTONIC_RAW, ts);
-#elif defined(_POSIX_MONOTONIC_CLOCK)
+#elif defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0
 	clock_gettime(CLOCK_MONOTONIC, ts);
 #else
+# if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK == 0
+	// zero means it might be supported at runtime
+	if (clock_gettime(CLOCK_MONOTONIC, ts) == 0)
+		return;
+# endif
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
 	TIMEVAL_TO_TIMESPEC(&tv, ts);
@@ -323,7 +280,7 @@ inline const char *getPlatformName()
 	"Cygwin"
 #elif defined(__unix__) || defined(__unix)
 	#if defined(_POSIX_VERSION)
-		"Posix"
+		"POSIX"
 	#else
 		"Unix"
 	#endif
@@ -335,14 +292,39 @@ inline const char *getPlatformName()
 
 bool secure_rand_fill_buf(void *buf, size_t len);
 
+// Call once near beginning of main function.
+void osSpecificInit();
+
 // This attaches to the parents process console, or creates a new one if it doesnt exist.
 void attachOrCreateConsole();
 
+#if HAVE_MALLOC_TRIM
+/**
+ * Call this after freeing bigger blocks of memory. Used on some platforms to
+ * properly give memory back to the OS.
+ * @param amount Number of bytes freed
+*/
+void TrackFreedMemory(size_t amount);
+
+/**
+ * Call this regularly from background threads. This performs the actual trimming
+ * and is potentially slow.
+ */
+void TriggerMemoryTrim();
+#else
+static inline void TrackFreedMemory(size_t amount) { (void)amount; }
+static inline void TriggerMemoryTrim() { (void)0; }
+#endif
+
 #ifdef _WIN32
 // Quotes an argument for use in a CreateProcess() commandline (not cmd.exe!!)
 std::string QuoteArgv(const std::string &arg);
+
+// Convert an error code (e.g. from GetLastError()) into a string.
+std::string ConvertError(DWORD error_code);
 #endif
 
+// snprintf wrapper
 int mt_snprintf(char *buf, const size_t buf_size, const char *fmt, ...);
 
 /**
diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index 2e7ab0362..f33cfa974 100644
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -29,6 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "log.h"
 #include "debug/stacktrace.h"
+#include "settings.h"
+
+#include <jni.h>
+#define SDL_MAIN_HANDLED 1
+#include <SDL.h>
 
 #include <sstream>
 #include <exception>
@@ -42,27 +47,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 extern int main(int argc, char *argv[]);
 
-void android_main(android_app *app)
-{
-	int retval = 0;
-	porting::app_global = app;
+extern "C" JNIEXPORT void JNICALL
+Java_net_minetest_minetest_GameActivity_saveSettings(JNIEnv* env, jobject /* this */) {
+	if (!g_settings_path.empty())
+		g_settings->updateConfigFile(g_settings_path.c_str());
+}
 
+namespace porting {
+	// used here:
+	void cleanupAndroid();
+	std::string getLanguageAndroid();
+	bool setSystemPaths(); // used in porting.cpp
+}
+
+extern "C" int SDL_Main(int _argc, char *_argv[])
+{
 	Thread::setName("Main");
 
 	char *argv[] = {strdup(PROJECT_NAME), strdup("--verbose"), nullptr};
-	try {
-		main(ARRLEN(argv) - 1, argv);
-#if !EXCEPTION_DEBUG
-	} catch (std::exception &e) {
-		errorstream << "Uncaught exception in main thread: " << e.what() << std::endl;
-		retval = -1;
-	} catch (...) {
-		errorstream << "Uncaught exception in main thread!" << std::endl << stacktrace() << std::endl;
-		retval = -1;
-#else
-	} catch (int) { // impossible
-#endif
-	}
+	int retval = main(ARRLEN(argv) - 1, argv);
 	free(argv[0]);
 	free(argv[1]);
 
@@ -72,52 +75,25 @@ void android_main(android_app *app)
 }
 
 namespace porting {
-android_app *app_global;
-JNIEnv      *jnienv;
-jclass       nativeActivity;
+JNIEnv      *jnienv = nullptr;
+jobject      activity;
+jclass       activityClass;
 
 int android_version_sdk_int = 0;
-jclass findClass(const std::string &classname)
+void osSpecificInit()
 {
-	if (jnienv == nullptr)
-		return nullptr;
+	jnienv = (JNIEnv*)SDL_AndroidGetJNIEnv();
+	activity = (jobject)SDL_AndroidGetActivity();
+	activityClass = jnienv->GetObjectClass(activity);
 
-	jclass nativeactivity = jnienv->FindClass("android/app/NativeActivity");
-	jmethodID getClassLoader = jnienv->GetMethodID(
-			nativeactivity, "getClassLoader", "()Ljava/lang/ClassLoader;");
-	jobject cls = jnienv->CallObjectMethod(
-						app_global->activity->clazz, getClassLoader);
-	jclass classLoader = jnienv->FindClass("java/lang/ClassLoader");
-	jmethodID findClass = jnienv->GetMethodID(classLoader, "loadClass",
-					"(Ljava/lang/String;)Ljava/lang/Class;");
-	jstring strClassName = jnienv->NewStringUTF(classname.c_str());
-	return (jclass) jnienv->CallObjectMethod(cls, findClass, strClassName);
-}
-
-void initAndroid()
-{
-	porting::jnienv = nullptr;
-	JavaVM *jvm = app_global->activity->vm;
-	JavaVMAttachArgs lJavaVMAttachArgs;
-	lJavaVMAttachArgs.version = JNI_VERSION_1_6;
-	lJavaVMAttachArgs.name = PROJECT_NAME_C "NativeThread";
-	lJavaVMAttachArgs.group = nullptr;
-
-	if (jvm->AttachCurrentThread(&porting::jnienv, &lJavaVMAttachArgs) == JNI_ERR) {
-		errorstream << "Failed to attach native thread to jvm" << std::endl;
-		exit(-1);
-	}
-
-	nativeActivity = findClass("org/freeminer/" PROJECT_NAME_C "/GameActivity");
-	if (nativeActivity == nullptr)
-		errorstream <<
-			"porting::initAndroid unable to find Java native activity class" <<
-			std::endl;
+	// Set default language
+	auto lang = getLanguageAndroid();
+	unsetenv("LANGUAGE");
+	setenv("LANG", lang.c_str(), 1);
 
 #ifdef GPROF
 	// in the start-up code
-	__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C,
-			"Initializing GPROF profiler");
+	warningstream << "Initializing GPROF profiler" << std::endl;
 	monstartup("libfreeminer.so");
 #endif
 
@@ -141,14 +117,11 @@ void initAndroid()
 void cleanupAndroid()
 {
 #ifdef GPROF
-	errorstream << "Shutting down GPROF profiler" << std::endl;
+	warningstream << "Shutting down GPROF profiler" << std::endl;
 	setenv("CPUPROFILE", (path_user + DIR_DELIM + "gmon.out").c_str(), 1);
 	moncleanup();
 #endif
 
-	JavaVM *jvm = app_global->activity->vm;
-	if (jvm)
-	jvm->DetachCurrentThread();
 	ANativeActivity_finish(app_global->activity);
 }
 
@@ -163,100 +136,141 @@ static std::string readJavaString(jstring j_str)
 	return str;
 }
 
-void initializePathsAndroid()
+bool setSystemPaths()
 {
 	// Set user and share paths
 	{
-		jmethodID getUserDataPath = jnienv->GetMethodID(nativeActivity,
+		jmethodID getUserDataPath = jnienv->GetMethodID(activityClass,
 				"getUserDataPath", "()Ljava/lang/String;");
 		FATAL_ERROR_IF(getUserDataPath==nullptr,
 				"porting::initializePathsAndroid unable to find Java getUserDataPath method");
-		jobject result = jnienv->CallObjectMethod(app_global->activity->clazz, getUserDataPath);
+		jobject result = jnienv->CallObjectMethod(activity, getUserDataPath);
 		std::string str = readJavaString((jstring) result);
 		path_user = str;
 		path_share = str;
-		path_locale = str + DIR_DELIM + "locale";
 	}
 
 	// Set cache path
 	{
-		jmethodID getCachePath = jnienv->GetMethodID(nativeActivity,
+		jmethodID getCachePath = jnienv->GetMethodID(activityClass,
 				"getCachePath", "()Ljava/lang/String;");
 		FATAL_ERROR_IF(getCachePath==nullptr,
 				"porting::initializePathsAndroid unable to find Java getCachePath method");
-		jobject result = jnienv->CallObjectMethod(app_global->activity->clazz, getCachePath);
+		jobject result = jnienv->CallObjectMethod(activity, getCachePath);
 		path_cache = readJavaString((jstring) result);
-
-		migrateCachePath();
 	}
+
+	return true;
 }
 
-void showInputDialog(const std::string &acceptButton, const std::string &hint,
-		const std::string &current, int editType)
+void showTextInputDialog(const std::string &hint, const std::string &current, int editType)
 {
-	jmethodID showdialog = jnienv->GetMethodID(nativeActivity, "showDialog",
-		"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V");
+	jmethodID showdialog = jnienv->GetMethodID(activityClass, "showTextInputDialog",
+			"(Ljava/lang/String;Ljava/lang/String;I)V");
 
 	FATAL_ERROR_IF(showdialog == nullptr,
-		"porting::showInputDialog unable to find Java showDialog method");
+			"porting::showTextInputDialog unable to find Java showTextInputDialog method");
 
-	jstring jacceptButton = jnienv->NewStringUTF(acceptButton.c_str());
 	jstring jhint         = jnienv->NewStringUTF(hint.c_str());
 	jstring jcurrent      = jnienv->NewStringUTF(current.c_str());
 	jint    jeditType     = editType;
 
-	jnienv->CallVoidMethod(app_global->activity->clazz, showdialog,
-			jacceptButton, jhint, jcurrent, jeditType);
+	jnienv->CallVoidMethod(activity, showdialog,
+			jhint, jcurrent, jeditType);
 }
 
-void openURIAndroid(const std::string &url)
+void showComboBoxDialog(const std::string optionList[], s32 listSize, s32 selectedIdx)
 {
-	jmethodID url_open = jnienv->GetMethodID(nativeActivity, "openURI",
+	jmethodID showdialog = jnienv->GetMethodID(activityClass, "showSelectionInputDialog",
+			"([Ljava/lang/String;I)V");
+
+	FATAL_ERROR_IF(showdialog == nullptr,
+			"porting::showComboBoxDialog unable to find Java showSelectionInputDialog method");
+
+	jclass       jStringClass = jnienv->FindClass("java/lang/String");
+	jobjectArray jOptionList  = jnienv->NewObjectArray(listSize, jStringClass, NULL);
+	jint         jselectedIdx = selectedIdx;
+
+	for (s32 i = 0; i < listSize; i ++) {
+		jnienv->SetObjectArrayElement(jOptionList, i,
+				jnienv->NewStringUTF(optionList[i].c_str()));
+	}
+
+	jnienv->CallVoidMethod(activity, showdialog, jOptionList,
+			jselectedIdx);
+}
+
+void openURIAndroid(const char *url)
+{
+	jmethodID url_open = jnienv->GetMethodID(activityClass, "openURI",
 		"(Ljava/lang/String;)V");
 
 	FATAL_ERROR_IF(url_open == nullptr,
 		"porting::openURIAndroid unable to find Java openURI method");
 
-	jstring jurl = jnienv->NewStringUTF(url.c_str());
-	jnienv->CallVoidMethod(app_global->activity->clazz, url_open, jurl);
+	jstring jurl = jnienv->NewStringUTF(url);
+	jnienv->CallVoidMethod(activity, url_open, jurl);
 }
 
 void shareFileAndroid(const std::string &path)
 {
-	jmethodID url_open = jnienv->GetMethodID(nativeActivity, "shareFile",
+	jmethodID url_open = jnienv->GetMethodID(activityClass, "shareFile",
 			"(Ljava/lang/String;)V");
 
 	FATAL_ERROR_IF(url_open == nullptr,
 			"porting::shareFileAndroid unable to find Java shareFile method");
 
 	jstring jurl = jnienv->NewStringUTF(path.c_str());
-	jnienv->CallVoidMethod(app_global->activity->clazz, url_open, jurl);
+	jnienv->CallVoidMethod(activity, url_open, jurl);
 }
 
-int getInputDialogState()
+AndroidDialogType getLastInputDialogType()
 {
-	jmethodID dialogstate = jnienv->GetMethodID(nativeActivity,
-			"getDialogState", "()I");
+	jmethodID lastdialogtype = jnienv->GetMethodID(activityClass,
+			"getLastDialogType", "()I");
 
-	FATAL_ERROR_IF(dialogstate == nullptr,
-		"porting::getInputDialogState unable to find Java getDialogState method");
+	FATAL_ERROR_IF(lastdialogtype == nullptr,
+			"porting::getLastInputDialogType unable to find Java getLastDialogType method");
 
-	return jnienv->CallIntMethod(app_global->activity->clazz, dialogstate);
+	int dialogType = jnienv->CallIntMethod(activity, lastdialogtype);
+	return static_cast<AndroidDialogType>(dialogType);
 }
 
-std::string getInputDialogValue()
+AndroidDialogState getInputDialogState()
 {
-	jmethodID dialogvalue = jnienv->GetMethodID(nativeActivity,
-			"getDialogValue", "()Ljava/lang/String;");
+	jmethodID inputdialogstate = jnienv->GetMethodID(activityClass,
+			"getInputDialogState", "()I");
+
+	FATAL_ERROR_IF(inputdialogstate == nullptr,
+			"porting::getInputDialogState unable to find Java getInputDialogState method");
+
+	int dialogState = jnienv->CallIntMethod(activity, inputdialogstate);
+	return static_cast<AndroidDialogState>(dialogState);
+}
+
+std::string getInputDialogMessage()
+{
+	jmethodID dialogvalue = jnienv->GetMethodID(activityClass,
+			"getDialogMessage", "()Ljava/lang/String;");
 
 	FATAL_ERROR_IF(dialogvalue == nullptr,
-		"porting::getInputDialogValue unable to find Java getDialogValue method");
+			"porting::getInputDialogMessage unable to find Java getDialogMessage method");
 
-	jobject result = jnienv->CallObjectMethod(app_global->activity->clazz,
+	jobject result = jnienv->CallObjectMethod(activity,
 			dialogvalue);
 	return readJavaString((jstring) result);
 }
 
+int getInputDialogSelection()
+{
+	jmethodID dialogvalue = jnienv->GetMethodID(activityClass, "getDialogSelection", "()I");
+
+	FATAL_ERROR_IF(dialogvalue == nullptr,
+			"porting::getInputDialogSelection unable to find Java getDialogSelection method");
+
+	return jnienv->CallIntMethod(activity, dialogvalue);
+}
+
 #ifndef SERVER
 float getDisplayDensity()
 {
@@ -264,13 +278,13 @@ float getDisplayDensity()
 	static float value = 0;
 
 	if (firstrun) {
-		jmethodID getDensity = jnienv->GetMethodID(nativeActivity,
+		jmethodID getDensity = jnienv->GetMethodID(activityClass,
 				"getDensity", "()F");
 
 		FATAL_ERROR_IF(getDensity == nullptr,
 			"porting::getDisplayDensity unable to find Java getDensity method");
 
-		value = jnienv->CallFloatMethod(app_global->activity->clazz, getDensity);
+		value = jnienv->CallFloatMethod(activity, getDensity);
 		firstrun = false;
 	}
 
@@ -315,22 +329,22 @@ v2u32 getDisplaySize()
 	static v2u32 retval;
 
 	if (firstrun) {
-		jmethodID getDisplayWidth = jnienv->GetMethodID(nativeActivity,
+		jmethodID getDisplayWidth = jnienv->GetMethodID(activityClass,
 				"getDisplayWidth", "()I");
 
 		FATAL_ERROR_IF(getDisplayWidth == nullptr,
 			"porting::getDisplayWidth unable to find Java getDisplayWidth method");
 
-		retval.X = jnienv->CallIntMethod(app_global->activity->clazz,
+		retval.X = jnienv->CallIntMethod(activity,
 				getDisplayWidth);
 
-		jmethodID getDisplayHeight = jnienv->GetMethodID(nativeActivity,
+		jmethodID getDisplayHeight = jnienv->GetMethodID(activityClass,
 				"getDisplayHeight", "()I");
 
 		FATAL_ERROR_IF(getDisplayHeight == nullptr,
 			"porting::getDisplayHeight unable to find Java getDisplayHeight method");
 
-		retval.Y = jnienv->CallIntMethod(app_global->activity->clazz,
+		retval.Y = jnienv->CallIntMethod(activity,
 				getDisplayHeight);
 
 		firstrun = false;
@@ -341,17 +355,30 @@ v2u32 getDisplaySize()
 
 std::string getLanguageAndroid()
 {
-	jmethodID getLanguage = jnienv->GetMethodID(nativeActivity,
+	jmethodID getLanguage = jnienv->GetMethodID(activityClass,
 			"getLanguage", "()Ljava/lang/String;");
 
 	FATAL_ERROR_IF(getLanguage == nullptr,
 		"porting::getLanguageAndroid unable to find Java getLanguage method");
 
-	jobject result = jnienv->CallObjectMethod(app_global->activity->clazz,
+	jobject result = jnienv->CallObjectMethod(activity,
 			getLanguage);
 	return readJavaString((jstring) result);
 }
 
+bool hasPhysicalKeyboardAndroid()
+{
+	jmethodID hasPhysicalKeyboard = jnienv->GetMethodID(activityClass,
+			"hasPhysicalKeyboard", "()Z");
+
+	FATAL_ERROR_IF(hasPhysicalKeyboard == nullptr,
+		"porting::hasPhysicalKeyboardAndroid unable to find Java hasPhysicalKeyboard method");
+
+	jboolean result = jnienv->CallBooleanMethod(activity,
+			hasPhysicalKeyboard);
+	return result;
+}
+
 #endif // ndef SERVER
 
 
diff --git a/src/porting_android.h b/src/porting_android.h
index 05e932778..5cdb7b302 100644
--- a/src/porting_android.h
+++ b/src/porting_android.h
@@ -20,44 +20,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #ifndef __ANDROID__
-#error this include has to be included on android port only!
+#error This header has to be included on Android port only!
 #endif
 
-#include <jni.h>
-#include <android_native_app_glue.h>
-#include <android/log.h>
-
+#include "irrlichttypes_bloated.h"
 #include <string>
 
 namespace porting {
-// java app
-extern android_app *app_global;
-
-// java <-> c++ interaction interface
-extern JNIEnv *jnienv;
-
-// do initialization required on android only
-void initAndroid();
-
-void cleanupAndroid();
+/**
+ * Show a text input dialog in Java
+ * @param hint Hint to be shown
+ * @param current Initial value to be displayed
+ * @param editType Type of the text field
+ * (1 = multi-line text input; 2 = single-line text input; 3 = password field)
+ */
+void showTextInputDialog(const std::string &hint, const std::string &current, int editType);
 
 /**
- * Initializes path_* variables for Android
+ * Show a selection dialog in Java
+ * @param optionList The list of options
+ * @param listSize Size of the list
+ * @param selectedIdx Selected index
  */
-void initializePathsAndroid();
-
-/**
- * show text input dialog in java
- * @param acceptButton text to display on accept button
- * @param hint hint to show
- * @param current initial value to display
- * @param editType type of texfield
- * (1==multiline text input; 2==single line text input; 3=password field)
- */
-void showInputDialog(const std::string &acceptButton,
-					const std::string &hint, const std::string &current, int editType);
-
-void openURIAndroid(const std::string &url);
+void showComboBoxDialog(const std::string optionList[], s32 listSize, s32 selectedIdx);
 
 /**
  * Opens a share intent to the file at path
@@ -66,17 +51,51 @@ void openURIAndroid(const std::string &url);
  */
 void shareFileAndroid(const std::string &path);
 
-/**
- * WORKAROUND for not working callbacks from java -> c++
- * get current state of input dialog
+/*
+ * Types of Android input dialog:
+ * 1. Text input (single/multi-line text and password field)
+ * 2. Selection input (combo box)
  */
-int getInputDialogState();
+enum AndroidDialogType { TEXT_INPUT, SELECTION_INPUT };
 
-/**
- * WORKAROUND for not working callbacks from java -> c++
- * get text in current input dialog
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the type of the last input dialog
  */
-std::string getInputDialogValue();
+AndroidDialogType getLastInputDialogType();
+
+/*
+ * States of Android input dialog:
+ * 1. The dialog is currently shown.
+ * 2. The dialog has its input sent.
+ * 3. The dialog is canceled/dismissed.
+ */
+enum AndroidDialogState { DIALOG_SHOWN, DIALOG_INPUTTED, DIALOG_CANCELED };
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the state of the input dialog
+ */
+AndroidDialogState getInputDialogState();
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the text in the current/last input dialog
+ * This function clears the dialog state (set to canceled). Make sure to save
+ * the dialog state before calling this function.
+ */
+std::string getInputDialogMessage();
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the selection in the current/last input dialog
+ * This function clears the dialog state (set to canceled). Make sure to save
+ * the dialog state before calling this function.
+ */
+int getInputDialogSelection();
+
+
+bool hasPhysicalKeyboardAndroid();
 
 extern int android_version_sdk_int;
 int canKeyboard();
@@ -89,5 +108,4 @@ float getDisplayDensity();
 v2u32 getDisplaySize();
 #endif
 
-std::string getLanguageAndroid();
 }
diff --git a/src/precompiled_headers.txt b/src/precompiled_headers.txt
new file mode 100644
index 000000000..24c92b783
--- /dev/null
+++ b/src/precompiled_headers.txt
@@ -0,0 +1,103 @@
+
+# stdlib
+# ------
+
+# C stuff:
+<cassert>
+<cctype>
+<cerrno>
+<cfenv>
+<cfloat>
+<cinttypes>
+<ciso646>
+<climits>
+<clocale>
+<cmath>
+<csetjmp>
+<csignal>
+<cstdarg>
+<cstdbool>
+<cstddef>
+<cstdint>
+<cstdio>
+<cstdlib>
+<cstring>
+<ctgmath>
+<ctime>
+<cuchar>
+<cwchar>
+<cwctype>
+
+# Containers:
+<array>
+<deque>
+<forward_list>
+<list>
+<map>
+<queue>
+<set>
+<stack>
+<unordered_map>
+<unordered_set>
+<vector>
+
+# Input/Output:
+<fstream>
+<iomanip>
+<ios>
+<iosfwd>
+<iostream>
+<istream>
+<ostream>
+<sstream>
+<streambuf>
+
+# Multi-threading:
+<atomic>
+<condition_variable>
+<future>
+<mutex>
+<shared_mutex>
+<thread>
+
+# Other:
+<algorithm>
+<any>
+<bitset>
+<charconv>
+<chrono>
+<codecvt>
+<complex>
+<exception>
+<execution>
+<functional>
+<initializer_list>
+<iterator>
+<limits>
+<locale>
+<memory>
+<memory_resource>
+<new>
+<numeric>
+<optional>
+<random>
+<ratio>
+<regex>
+<stdexcept>
+<string>
+<string_view>
+<system_error>
+<tuple>
+<typeindex>
+<typeinfo>
+<type_traits>
+<utility>
+<valarray>
+<variant>
+
+
+# libs
+# ----
+
+# jsoncpp
+<json/json.h>
diff --git a/src/profiler.cpp b/src/profiler.cpp
index ea2708c2a..2d850a5f3 100644
--- a/src/profiler.cpp
+++ b/src/profiler.cpp
@@ -25,40 +25,36 @@ Profiler *g_profiler = &main_profiler;
 
 bool g_profiler_enabled = 0;
 
-ScopeProfiler::ScopeProfiler(
-		Profiler *profiler, const std::string &name, ScopeProfilerType type) :
-		m_profiler(profiler),
-		m_name(name), m_type(type)
+ScopeProfiler::ScopeProfiler(Profiler *profiler, const std::string &name,
+		ScopeProfilerType type, TimePrecision prec) :
+	m_profiler(profiler),
+	m_name(name), m_type(type), m_precision(prec)
 {
-	m_name.append(" [ms]");
-	if (m_profiler)
-		m_timer = new TimeTaker(m_name, nullptr, PRECISION_MILLI);
+	m_name.append(" [").append(TimePrecision_units[prec]).append("]");
+	m_time1 = porting::getTime(prec);
 }
 
 ScopeProfiler::~ScopeProfiler()
 {
-	if (!m_timer)
+	if (!m_profiler)
 		return;
 
-	float duration_ms = m_timer->stop(true);
-	float duration = duration_ms;
-	if (m_profiler) {
-		switch (m_type) {
-		case SPT_ADD:
-			m_profiler->add(m_name, duration);
-			break;
-		case SPT_AVG:
-			m_profiler->avg(m_name, duration);
-			break;
-		case SPT_GRAPH_ADD:
-			m_profiler->graphAdd(m_name, duration);
-			break;
-		case SPT_MAX:
-			m_profiler->max(m_name, duration);
-			break;
-		}
+	float duration = porting::getTime(m_precision) - m_time1;
+
+	switch (m_type) {
+	case SPT_ADD:
+		m_profiler->add(m_name, duration);
+		break;
+	case SPT_AVG:
+		m_profiler->avg(m_name, duration);
+		break;
+	case SPT_GRAPH_ADD:
+		m_profiler->graphAdd(m_name, duration);
+		break;
+	case SPT_MAX:
+		m_profiler->max(m_name, duration);
+		break;
 	}
-	delete m_timer;
 }
 
 Profiler::Profiler()
@@ -69,92 +65,68 @@ Profiler::Profiler()
 void Profiler::add(const std::string &name, float value)
 {
 	MutexAutoLock lock(m_mutex);
-	{
-		/* No average shall have been used; mark add/max used as -2 */
-		std::map<std::string, int>::iterator n = m_avgcounts.find(name);
-		if (n == m_avgcounts.end()) {
-			m_avgcounts[name] = -2;
-		} else {
-			if (n->second == -1)
-				n->second = -2;
-			assert(n->second == -2);
-		}
-	}
-	{
-		std::map<std::string, float>::iterator n = m_data.find(name);
-		if (n == m_data.end())
-			m_data[name] = value;
-		else
-			n->second += value;
+
+	auto it = m_data.find(name);
+	if (it == m_data.end()) {
+		// mark with special value for checking
+		m_data.emplace(name, DataPair{value, -SPT_ADD});
+	} else {
+		assert(it->second.avgcount == -SPT_ADD);
+		it->second.value += value;
 	}
 }
 
 void Profiler::max(const std::string &name, float value)
 {
 	MutexAutoLock lock(m_mutex);
-	{
-		/* No average shall have been used; mark add/max used as -2 */
-		auto n = m_avgcounts.find(name);
-		if (n == m_avgcounts.end()) {
-			m_avgcounts[name] = -2;
-		} else {
-			if (n->second == -1)
-				n->second = -2;
-			assert(n->second == -2);
-		}
-	}
-	{
-		auto n = m_data.find(name);
-		if (n == m_data.end())
-			m_data[name] = value;
-		else if (value > n->second)
-			n->second = value;
+
+	auto it = m_data.find(name);
+	if (it == m_data.end()) {
+		// mark with special value for checking
+		m_data.emplace(name, DataPair{value, -SPT_MAX});
+	} else {
+		assert(it->second.avgcount == -SPT_MAX);
+		it->second.value = std::max(value, it->second.value);
 	}
 }
 
 void Profiler::avg(const std::string &name, float value)
 {
 	MutexAutoLock lock(m_mutex);
-	int &count = m_avgcounts[name];
 
-	assert(count != -2);
-	count = MYMAX(count, 0) + 1;
-	m_data[name] += value;
+	auto it = m_data.find(name);
+	if (it == m_data.end()) {
+		m_data.emplace(name, DataPair{value, 1});
+	} else {
+		assert(it->second.avgcount >= 0);
+		it->second.value += value;
+		it->second.avgcount++;
+	}
 }
 
 void Profiler::clear()
 {
 	MutexAutoLock lock(m_mutex);
-	for (auto &it : m_data) {
-		it.second = 0;
-	}
-	m_avgcounts.clear();
+	for (auto &it : m_data)
+		it.second.reset();
 	m_start_time = porting::getTimeMs();
 }
 
 float Profiler::getValue(const std::string &name) const
 {
-	auto numerator = m_data.find(name);
-	if (numerator == m_data.end())
-		return 0.f;
-
-	auto denominator = m_avgcounts.find(name);
-	if (denominator != m_avgcounts.end()) {
-		if (denominator->second >= 1)
-			return numerator->second / denominator->second;
-	}
-
-	return numerator->second;
+	auto it = m_data.find(name);
+	if (it == m_data.end())
+		return 0;
+	return it->second.getValue();
 }
 
 int Profiler::getAvgCount(const std::string &name) const
 {
-	auto n = m_avgcounts.find(name);
-
-	if (n != m_avgcounts.end() && n->second >= 1)
-		return n->second;
-
-	return 1;
+	auto it = m_data.find(name);
+	if (it == m_data.end())
+		return 1;
+	int denominator = it->second.avgcount;
+	return denominator >= 1 ? denominator : 1;
 }
 
 u64 Profiler::getElapsedMs() const
@@ -209,6 +181,6 @@ void Profiler::getPage(GraphValues &o, u32 page, u32 pagecount)
 			continue;
 		}
 
-		o[i.first] = i.second / getAvgCount(i.first);
+		o[i.first] = i.second.getValue();
 	}
 }
diff --git a/src/profiler.h b/src/profiler.h
index d482782c3..ebacaa7d3 100644
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -80,21 +80,25 @@ public:
 	void getPage(GraphValues &o, u32 page, u32 pagecount);
 
 
+	void graphSet(const std::string &id, float value)
+	{
+		MutexAutoLock lock(m_mutex);
+		m_graphvalues[id] = value;
+	}
 	void graphAdd(const std::string &id, float value)
 	{
 		MutexAutoLock lock(m_mutex);
-		std::map<std::string, float>::iterator i =
-				m_graphvalues.find(id);
-		if(i == m_graphvalues.end())
-			m_graphvalues[id] = value;
+		auto it = m_graphvalues.find(id);
+		if (it == m_graphvalues.end())
+			m_graphvalues.emplace(id, value);
 		else
-			i->second += value;
+			it->second += value;
 	}
-	void graphGet(GraphValues &result)
+	void graphPop(GraphValues &result)
 	{
 		MutexAutoLock lock(m_mutex);
-		result = m_graphvalues;
-		m_graphvalues.clear();
+		assert(result.empty());
+		std::swap(result, m_graphvalues);
 	}
 
 	void remove(const std::string& name)
@@ -104,31 +108,51 @@ public:
 	}
 
 private:
+	struct DataPair {
+		float value = 0;
+		int avgcount = 0;
+
+		inline void reset() {
+			value = 0;
+			// negative values are used for type checking, so leave them alone
+			if (avgcount >= 1)
+				avgcount = 0;
+		}
+		inline float getValue() const {
+			return avgcount >= 1 ? (value / avgcount) : value;
+		}
+	};
+
 	mutable std::mutex m_mutex;
-	std::map<std::string, float> m_data;
-	std::map<std::string, int> m_avgcounts;
+	std::map<std::string, DataPair> m_data;
 	std::map<std::string, float> m_graphvalues;
 	u64 m_start_time;
 };
 
-enum ScopeProfilerType{
-	SPT_ADD,
+enum ScopeProfilerType : u8
+{
+	SPT_ADD = 1,
 	SPT_AVG,
 	SPT_GRAPH_ADD,
 	SPT_MAX
 };
 
+// Note: this class should be kept lightweight.
+
 class ScopeProfiler
 {
 public:
 	ScopeProfiler(Profiler *profiler, const std::string &name,
-			ScopeProfilerType type = SPT_ADD);
+			ScopeProfilerType type = SPT_ADD,
+			TimePrecision precision = PRECISION_MILLI);
 	~ScopeProfiler();
+
 private:
 	Profiler *m_profiler = nullptr;
 	std::string m_name;
-	TimeTaker *m_timer = nullptr;
-	enum ScopeProfilerType m_type;
+	u64 m_time1;
+	ScopeProfilerType m_type;
+	TimePrecision m_precision;
 };
 
 
diff --git a/src/raycast.cpp b/src/raycast.cpp
index c41b9c394..c78f6c27e 100644
--- a/src/raycast.cpp
+++ b/src/raycast.cpp
@@ -58,18 +58,20 @@ bool RaycastSort::operator() (const PointedThing &pt1,
 
 
 RaycastState::RaycastState(const core::line3d<f32> &shootline,
-	bool objects_pointable, bool liquids_pointable) :
+	bool objects_pointable, bool liquids_pointable,
+	const std::optional<Pointabilities> &pointabilities) :
 	m_shootline(shootline),
 	m_iterator(shootline.start / BS, shootline.getVector() / BS),
 	m_previous_node(m_iterator.m_current_node_pos),
 	m_objects_pointable(objects_pointable),
-	m_liquids_pointable(liquids_pointable)
+	m_liquids_pointable(liquids_pointable),
+	m_pointabilities(pointabilities)
 {
 }
 
 
-bool boxLineCollision(const aabb3f &box, const v3f &start,
-	const v3f &dir, v3f *collision_point, v3f *collision_normal)
+bool boxLineCollision(const aabb3f &box, const v3f start,
+	const v3f dir, v3f *collision_point, v3f *collision_normal)
 {
 	if (box.isPointInside(start)) {
 		*collision_point = start;
@@ -137,8 +139,8 @@ bool boxLineCollision(const aabb3f &box, const v3f &start,
 	return false;
 }
 
-bool boxLineCollision(const aabb3f &box, const v3f &rotation,
-	const v3f &start, const v3f &dir,
+bool boxLineCollision(const aabb3f &box, const v3f rotation,
+	const v3f start, const v3f dir,
 	v3f *collision_point, v3f *collision_normal, v3f *raw_collision_normal)
 {
 	// Inversely transform the ray rather than rotating the box faces;
@@ -147,7 +149,8 @@ bool boxLineCollision(const aabb3f &box, const v3f &rotation,
 	rot.makeInverse();
 
 	bool collision = boxLineCollision(box, rot * start, rot * dir, collision_point, collision_normal);
-	if (!collision) return collision;
+	if (!collision)
+		return collision;
 
 	// Transform the results back
 	rot.makeInverse();
diff --git a/src/raycast.h b/src/raycast.h
index 8da075738..9347b0001 100644
--- a/src/raycast.h
+++ b/src/raycast.h
@@ -38,7 +38,7 @@ public:
 	 * @param liquids pointable if false, liquid nodes won't be found
 	 */
 	RaycastState(const core::line3d<f32> &shootline, bool objects_pointable,
-		bool liquids_pointable);
+		bool liquids_pointable, const std::optional<Pointabilities> &pointabilities);
 
 	//! Shootline of the raycast.
 	core::line3d<f32> m_shootline;
@@ -55,6 +55,7 @@ public:
 
 	bool m_objects_pointable;
 	bool m_liquids_pointable;
+	const std::optional<Pointabilities> m_pointabilities;
 
 	//! The code needs to search these nodes around the center node.
 	core::aabbox3d<s16> m_search_range { 0, 0, 0, 0, 0, 0 };
@@ -73,9 +74,9 @@ public:
  * outwards of the surface. If start is in the box, zero vector.
  * @returns true if a collision point was found
  */
-bool boxLineCollision(const aabb3f &box, const v3f &start, const v3f &dir,
+bool boxLineCollision(const aabb3f &box, v3f start, v3f dir,
 	v3f *collision_point, v3f *collision_normal);
 
-bool boxLineCollision(const aabb3f &box, const v3f &box_rotation,
-	const v3f &start, const v3f &dir,
+bool boxLineCollision(const aabb3f &box, v3f box_rotation,
+	v3f start, v3f dir,
 	v3f *collision_point, v3f *collision_normal, v3f *raw_collision_normal);
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index 52fcf9964..036bcc873 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -69,6 +69,11 @@ RemotePlayer::RemotePlayer(const std::string &name, IItemDefManager *idef):
 	m_star_params   = SkyboxDefaults::getStarDefaults();
 }
 
+RemotePlayer::~RemotePlayer()
+{
+	if (m_sao)
+		m_sao->setPlayer(nullptr);
+}
 
 RemotePlayerChatResult RemotePlayer::canSendChatMessage()
 {
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index 28825486c..b52b2adb6 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -43,7 +43,7 @@ class RemotePlayer : public Player
 
 public:
 	RemotePlayer(const std::string & name, IItemDefManager *idef);
-	virtual ~RemotePlayer() = default;
+	virtual ~RemotePlayer();
 
 	PlayerSAO *getPlayerSAO() { return m_sao; }
 	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
@@ -136,6 +136,7 @@ public:
 	u16 protocol_version = 0;
 	u16 formspec_version = 0;
 
+	/// returns PEER_ID_INEXISTENT when PlayerSAO is not ready
 	session_t getPeerId() const { return m_peer_id; }
 
 	void setPeerId(session_t peer_id) { m_peer_id = peer_id; }
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index bebe2f037..ccb5785bd 100644
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(lua_api)
 # Used by server and client
 set(common_SCRIPT_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/scripting_emerge.cpp
 	${common_SCRIPT_COMMON_SRCS}
 	${common_SCRIPT_CPP_API_SRCS}
 	${common_SCRIPT_LUA_API_SRCS}
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 3591b1c29..84114be07 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -38,7 +38,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "server/player_sao.h"
 #include "util/pointedthing.h"
 #include "debug.h" // For FATAL_ERROR
+#include <SColor.h>
 #include <json/json.h>
+#include "mapgen/treegen.h"
 
 struct EnumString es_TileAnimationType[] =
 {
@@ -86,11 +88,26 @@ void read_item_definition(lua_State* L, int index,
 
 	getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
 
+	lua_getfield(L, index, "pointabilities");
+	if(lua_istable(L, -1)){
+		def.pointabilities = std::make_optional<Pointabilities>(
+				read_pointabilities(L, -1));
+	}
+
 	lua_getfield(L, index, "tool_capabilities");
 	if(lua_istable(L, -1)){
 		def.tool_capabilities = new ToolCapabilities(
 				read_tool_capabilities(L, -1));
 	}
+	lua_getfield(L, index, "wear_color");
+	if (lua_istable(L, -1)) {
+		def.wear_bar_params = read_wear_bar_params(L, -1);
+	} else if (lua_isstring(L, -1)) {
+		video::SColor color;
+		read_color(L, -1, &color);
+		def.wear_bar_params = WearBarParams({{0.0, color}},
+				WearBarParams::BLEND_MODE_CONSTANT);
+	}
 
 	// If name is "" (hand), ensure there are ToolCapabilities
 	// because it will be looked up there whenever any other item has
@@ -139,6 +156,29 @@ void read_item_definition(lua_State* L, int index,
 	int place_param2;
 	if (getintfield(L, index, "place_param2", place_param2))
 		def.place_param2 = rangelim(place_param2, 0, U8_MAX);
+
+	getboolfield(L, index, "wallmounted_rotate_vertical", def.wallmounted_rotate_vertical);
+
+	TouchInteraction &inter = def.touch_interaction;
+	lua_getfield(L, index, "touch_interaction");
+	if (lua_istable(L, -1)) {
+		inter.pointed_nothing = (TouchInteractionMode)getenumfield(L, -1, "pointed_nothing",
+				es_TouchInteractionMode, inter.pointed_nothing);
+		inter.pointed_node = (TouchInteractionMode)getenumfield(L, -1, "pointed_node",
+				es_TouchInteractionMode, inter.pointed_node);
+		inter.pointed_object = (TouchInteractionMode)getenumfield(L, -1, "pointed_object",
+				es_TouchInteractionMode, inter.pointed_object);
+	} else if (lua_isstring(L, -1)) {
+		int value;
+		if (string_to_enum(es_TouchInteractionMode, value, lua_tostring(L, -1))) {
+			inter.pointed_nothing = (TouchInteractionMode)value;
+			inter.pointed_node    = (TouchInteractionMode)value;
+			inter.pointed_object  = (TouchInteractionMode)value;
+		}
+	} else if (!lua_isnil(L, -1)) {
+		throw LuaError("invalid type for 'touch_interaction'");
+	}
+	lua_pop(L, 1);
 }
 
 /******************************************************************************/
@@ -186,10 +226,18 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 	lua_setfield(L, -2, "usable");
 	lua_pushboolean(L, i.liquids_pointable);
 	lua_setfield(L, -2, "liquids_pointable");
+	if (i.pointabilities) {
+		push_pointabilities(L, *i.pointabilities);
+		lua_setfield(L, -2, "pointabilities");
+	}
 	if (i.tool_capabilities) {
 		push_tool_capabilities(L, *i.tool_capabilities);
 		lua_setfield(L, -2, "tool_capabilities");
 	}
+	if (i.wear_bar_params.has_value()) {
+		push_wear_bar_params(L, *i.wear_bar_params);
+		lua_setfield(L, -2, "wear_color");
+	}
 	push_groups(L, i.groups);
 	lua_setfield(L, -2, "groups");
 	push_simplesoundspec(L, i.sound_place);
@@ -198,6 +246,18 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 	lua_setfield(L, -2, "sound_place_failed");
 	lua_pushstring(L, i.node_placement_prediction.c_str());
 	lua_setfield(L, -2, "node_placement_prediction");
+	lua_pushboolean(L, i.wallmounted_rotate_vertical);
+	lua_setfield(L, -2, "wallmounted_rotate_vertical");
+
+	lua_createtable(L, 0, 3);
+	const TouchInteraction &inter = i.touch_interaction;
+	lua_pushstring(L, es_TouchInteractionMode[inter.pointed_nothing].str);
+	lua_setfield(L, -2,"pointed_nothing");
+	lua_pushstring(L, es_TouchInteractionMode[inter.pointed_node].str);
+	lua_setfield(L, -2,"pointed_node");
+	lua_pushstring(L, es_TouchInteractionMode[inter.pointed_object].str);
+	lua_setfield(L, -2,"pointed_object");
+	lua_setfield(L, -2, "touch_interaction");
 }
 
 /******************************************************************************/
@@ -248,7 +308,7 @@ void read_object_properties(lua_State *L, int index,
 
 	luaL_checktype(L, -1, LUA_TTABLE);
 
-	auto lock = prop->lock_unique();
+	// fmtodo: auto lock = prop->lock_unique();
 
 	int hp_max = 0;
 	if (getintfield(L, -1, "hp_max", hp_max)) {
@@ -288,7 +348,12 @@ void read_object_properties(lua_State *L, int index,
 	}
 	lua_pop(L, 1);
 
-	getboolfield(L, -1, "pointable", prop->pointable);
+	lua_getfield(L, -1, "pointable");
+	if(!lua_isnil(L, -1)){
+		prop->pointable = read_pointability_type(L, -1);
+	}
+	lua_pop(L, 1);
+
 	getstringfield(L, -1, "visual", prop->visual);
 
 	getstringfield(L, -1, "mesh", prop->mesh);
@@ -360,9 +425,12 @@ void read_object_properties(lua_State *L, int index,
 		prop->automatic_face_movement_dir_offset = luaL_checknumber(L, -1);
 	} else if (lua_isboolean(L, -1)) {
 		prop->automatic_face_movement_dir = lua_toboolean(L, -1);
-		prop->automatic_face_movement_dir_offset = 0.0;
+		prop->automatic_face_movement_dir_offset = 0;
 	}
 	lua_pop(L, 1);
+	getfloatfield(L, -1, "automatic_face_movement_max_rotation_per_sec",
+		prop->automatic_face_movement_max_rotation_per_sec);
+
 	getboolfield(L, -1, "backface_culling", prop->backface_culling);
 	getintfield(L, -1, "glow", prop->glow);
 
@@ -386,12 +454,6 @@ void read_object_properties(lua_State *L, int index,
 	}
 	lua_pop(L, 1);
 
-	lua_getfield(L, -1, "automatic_face_movement_max_rotation_per_sec");
-	if (lua_isnumber(L, -1)) {
-		prop->automatic_face_movement_max_rotation_per_sec = luaL_checknumber(L, -1);
-	}
-	lua_pop(L, 1);
-
 	getstringfield(L, -1, "infotext", prop->infotext);
 	getboolfield(L, -1, "static_save", prop->static_save);
 
@@ -412,7 +474,7 @@ void read_object_properties(lua_State *L, int index,
 }
 
 /******************************************************************************/
-void push_object_properties(lua_State *L, ObjectProperties *prop)
+void push_object_properties(lua_State *L, const ObjectProperties *prop)
 {
 	lua_newtable(L);
 	lua_pushnumber(L, prop->hp_max);
@@ -429,7 +491,7 @@ void push_object_properties(lua_State *L, ObjectProperties *prop)
 	lua_pushboolean(L, prop->rotate_selectionbox);
 	lua_setfield(L, -2, "rotate");
 	lua_setfield(L, -2, "selectionbox");
-	lua_pushboolean(L, prop->pointable);
+	push_pointability_type(L, prop->pointable);
 	lua_setfield(L, -2, "pointable");
 	lua_pushlstring(L, prop->visual.c_str(), prop->visual.size());
 	lua_setfield(L, -2, "visual");
@@ -473,6 +535,8 @@ void push_object_properties(lua_State *L, ObjectProperties *prop)
 	else
 		lua_pushboolean(L, false);
 	lua_setfield(L, -2, "automatic_face_movement_dir");
+	lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec);
+	lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec");
 	lua_pushboolean(L, prop->backface_culling);
 	lua_setfield(L, -2, "backface_culling");
 	lua_pushnumber(L, prop->glow);
@@ -488,8 +552,6 @@ void push_object_properties(lua_State *L, ObjectProperties *prop)
 		lua_pushboolean(L, false);
 		lua_setfield(L, -2, "nametag_bgcolor");
 	}
-	lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec);
-	lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec");
 	lua_pushlstring(L, prop->infotext.c_str(), prop->infotext.size());
 	lua_setfield(L, -2, "infotext");
 	lua_pushboolean(L, prop->static_save);
@@ -785,7 +847,7 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
 
 	f.setDefaultAlphaMode();
 
-	warn_if_field_exists(L, index, "alpha",
+	warn_if_field_exists(L, index, "alpha", "node " + f.name,
 		"Obsolete, only limited compatibility provided; "
 		"replaced by \"use_texture_alpha\"");
 	if (getintfield_default(L, index, "alpha", 255) != 255)
@@ -793,7 +855,7 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
 
 	lua_getfield(L, index, "use_texture_alpha");
 	if (lua_isboolean(L, -1)) {
-		warn_if_field_exists(L, index, "use_texture_alpha",
+		warn_if_field_exists(L, index, "use_texture_alpha", "node " + f.name,
 			"Boolean values are deprecated; use the new choices");
 		if (lua_toboolean(L, -1))
 			f.alpha = (f.drawtype == NDT_NORMAL) ? ALPHAMODE_CLIP : ALPHAMODE_BLEND;
@@ -840,8 +902,14 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
 	// This is used for collision detection.
 	// Also for general solidness queries.
 	getboolfield(L, index, "walkable", f.walkable);
-	// Player can point to these
-	getboolfield(L, index, "pointable", f.pointable);
+
+	// Player can point to these, point through or it is blocking
+	lua_getfield(L, index, "pointable");
+	if(!lua_isnil(L, -1)){
+		f.pointable = read_pointability_type(L, -1);
+	}
+	lua_pop(L, 1);
+
 	// Player can dig these
 	getboolfield(L, index, "diggable", f.diggable);
 	// Player can climb these
@@ -1069,7 +1137,7 @@ void push_content_features(lua_State *L, const ContentFeatures &c)
 	lua_setfield(L, -2, "is_ground_content");
 	lua_pushboolean(L, c.walkable);
 	lua_setfield(L, -2, "walkable");
-	lua_pushboolean(L, c.pointable);
+	push_pointability_type(L, c.pointable);
 	lua_setfield(L, -2, "pointable");
 	lua_pushboolean(L, c.diggable);
 	lua_setfield(L, -2, "diggable");
@@ -1139,7 +1207,7 @@ void push_nodebox(lua_State *L, const NodeBox &box)
 		case NODEBOX_FIXED:
 			lua_pushstring(L, "fixed");
 			lua_setfield(L, -2, "type");
-			push_box(L, box.fixed);
+			push_aabb3f_vector(L, box.fixed);
 			lua_setfield(L, -2, "fixed");
 			break;
 		case NODEBOX_WALLMOUNTED:
@@ -1156,17 +1224,17 @@ void push_nodebox(lua_State *L, const NodeBox &box)
 			lua_pushstring(L, "connected");
 			lua_setfield(L, -2, "type");
 			const auto &c = box.getConnected();
-			push_box(L, c.connect_top);
+			push_aabb3f_vector(L, c.connect_top);
 			lua_setfield(L, -2, "connect_top");
-			push_box(L, c.connect_bottom);
+			push_aabb3f_vector(L, c.connect_bottom);
 			lua_setfield(L, -2, "connect_bottom");
-			push_box(L, c.connect_front);
+			push_aabb3f_vector(L, c.connect_front);
 			lua_setfield(L, -2, "connect_front");
-			push_box(L, c.connect_back);
+			push_aabb3f_vector(L, c.connect_back);
 			lua_setfield(L, -2, "connect_back");
-			push_box(L, c.connect_left);
+			push_aabb3f_vector(L, c.connect_left);
 			lua_setfield(L, -2, "connect_left");
-			push_box(L, c.connect_right);
+			push_aabb3f_vector(L, c.connect_right);
 			lua_setfield(L, -2, "connect_right");
 			// half the boxes are missing here?
 			break;
@@ -1177,16 +1245,6 @@ void push_nodebox(lua_State *L, const NodeBox &box)
 	}
 }
 
-void push_box(lua_State *L, const std::vector<aabb3f> &box)
-{
-	lua_createtable(L, box.size(), 0);
-	u8 i = 1;
-	for (const aabb3f &it : box) {
-		push_aabb3f(L, it);
-		lua_rawseti(L, -2, i++);
-	}
-}
-
 /******************************************************************************/
 void push_palette(lua_State *L, const std::vector<video::SColor> *palette)
 {
@@ -1349,13 +1407,16 @@ void pushnode(lua_State *L, const MapNode &n)
 }
 
 /******************************************************************************/
-void warn_if_field_exists(lua_State *L, int table,
-		const char *name, const std::string &message)
+void warn_if_field_exists(lua_State *L, int table, const char *fieldname,
+		std::string_view name, std::string_view message)
 {
-	lua_getfield(L, table, name);
+	lua_getfield(L, table, fieldname);
 	if (!lua_isnil(L, -1)) {
-		warningstream << "Field \"" << name << "\": "
-				<< message << std::endl;
+		warningstream << "Field \"" << fieldname << "\"";
+		if (!name.empty()) {
+			warningstream << " on " << name;
+		}
+		warningstream << ": " << message << std::endl;
 		infostream << script_get_backtrace(L) << std::endl;
 	}
 	lua_pop(L, 1);
@@ -1497,6 +1558,22 @@ void push_tool_capabilities(lua_State *L,
 		lua_setfield(L, -2, "damage_groups");
 }
 
+/******************************************************************************/
+void push_wear_bar_params(lua_State *L,
+		const WearBarParams &params)
+{
+	lua_newtable(L);
+	setstringfield(L, -1, "blend", WearBarParams::es_BlendMode[params.blend].str);
+
+	lua_newtable(L);
+	for (const std::pair<const f32, const video::SColor> item: params.colorStops) {
+		lua_pushnumber(L, item.first); // key
+		push_ARGB8(L, item.second);
+		lua_rawset(L, -3);
+	}
+	lua_setfield(L, -2, "color_stops");
+}
+
 /******************************************************************************/
 void push_inventory_list(lua_State *L, const InventoryList &invlist)
 {
@@ -1656,6 +1733,173 @@ ToolCapabilities read_tool_capabilities(
 	return toolcap;
 }
 
+/******************************************************************************/
+PointabilityType read_pointability_type(lua_State *L, int index)
+{
+	if (lua_isboolean(L, index)) {
+		if (lua_toboolean(L, index))
+			return PointabilityType::POINTABLE;
+		else
+			return PointabilityType::POINTABLE_NOT;
+	} else {
+		const char* s = luaL_checkstring(L, index);
+		if (s && !strcmp(s, "blocking")) {
+			return PointabilityType::POINTABLE_BLOCKING;
+		}
+	}
+	throw LuaError("Invalid pointable type.");
+}
+
+/******************************************************************************/
+Pointabilities read_pointabilities(lua_State *L, int index)
+{
+	Pointabilities pointabilities;
+
+	lua_getfield(L, index, "nodes");
+	if(lua_istable(L, -1)){
+		int ti = lua_gettop(L);
+		lua_pushnil(L);
+		while(lua_next(L, ti) != 0) {
+			// key at index -2 and value at index -1
+			std::string name = luaL_checkstring(L, -2);
+
+			// handle groups
+			if (str_starts_with(name, "group:")) {
+				pointabilities.node_groups[name.substr(6)] = read_pointability_type(L, -1);
+			} else {
+				pointabilities.nodes[name] = read_pointability_type(L, -1);
+			}
+
+			// removes value, keeps key for next iteration
+			lua_pop(L, 1);
+		}
+	}
+	lua_pop(L, 1);
+
+	lua_getfield(L, index, "objects");
+	if(lua_istable(L, -1)){
+		int ti = lua_gettop(L);
+		lua_pushnil(L);
+		while(lua_next(L, ti) != 0) {
+			// key at index -2 and value at index -1
+			std::string name = luaL_checkstring(L, -2);
+
+			// handle groups
+			if (str_starts_with(name, "group:")) {
+				pointabilities.object_groups[name.substr(6)] = read_pointability_type(L, -1);
+			} else {
+				pointabilities.objects[name] = read_pointability_type(L, -1);
+			}
+
+			// removes value, keeps key for next iteration
+			lua_pop(L, 1);
+		}
+	}
+	lua_pop(L, 1);
+
+	return pointabilities;
+}
+
+/******************************************************************************/
+void push_pointability_type(lua_State *L, PointabilityType pointable)
+{
+	switch(pointable)
+	{
+	case PointabilityType::POINTABLE:
+		lua_pushboolean(L, true);
+		break;
+	case PointabilityType::POINTABLE_NOT:
+		lua_pushboolean(L, false);
+		break;
+	case PointabilityType::POINTABLE_BLOCKING:
+		lua_pushliteral(L, "blocking");
+		break;
+	}
+}
+
+/******************************************************************************/
+void push_pointabilities(lua_State *L, const Pointabilities &pointabilities)
+{
+	// pointabilities table
+	lua_newtable(L);
+
+	if (!pointabilities.nodes.empty() || !pointabilities.node_groups.empty()) {
+		// Create and fill table
+		lua_newtable(L);
+		for (const auto &entry : pointabilities.nodes) {
+			push_pointability_type(L, entry.second);
+			lua_setfield(L, -2, entry.first.c_str());
+		}
+		for (const auto &entry : pointabilities.node_groups) {
+			push_pointability_type(L, entry.second);
+			lua_setfield(L, -2, ("group:" + entry.first).c_str());
+		}
+		lua_setfield(L, -2, "nodes");
+	}
+
+	if (!pointabilities.objects.empty() || !pointabilities.object_groups.empty()) {
+		// Create and fill table
+		lua_newtable(L);
+		for (const auto &entry : pointabilities.objects) {
+			push_pointability_type(L, entry.second);
+			lua_setfield(L, -2, entry.first.c_str());
+		}
+		for (const auto &entry : pointabilities.object_groups) {
+			push_pointability_type(L, entry.second);
+			lua_setfield(L, -2, ("group:" + entry.first).c_str());
+		}
+		lua_setfield(L, -2, "objects");
+	}
+}
+
+/******************************************************************************/
+WearBarParams read_wear_bar_params(
+		lua_State *L, int stack_idx)
+{
+	if (lua_isstring(L, stack_idx)) {
+		video::SColor color;
+		read_color(L, stack_idx, &color);
+		return WearBarParams(color);
+	}
+
+	if (!lua_istable(L, stack_idx))
+		throw LuaError("Expected wear bar color table or colorstring");
+
+	lua_getfield(L, stack_idx, "color_stops");
+	if (!check_field_or_nil(L, -1, LUA_TTABLE, "color_stops"))
+		throw LuaError("color_stops must be a table");
+
+	std::map<f32, video::SColor> colorStops;
+	// color stops table is on the stack
+	int table_values = lua_gettop(L);
+	lua_pushnil(L);
+	while (lua_next(L, table_values) != 0) {
+		// key at index -2 and value at index -1 within table_values
+		f32 point = luaL_checknumber(L, -2);
+		if (point < 0 || point > 1)
+			throw LuaError("Wear bar color stop key out of range");
+		video::SColor color;
+		read_color(L, -1, &color);
+		colorStops.emplace(point, color);
+
+		// removes value, keeps key for next iteration
+		lua_pop(L, 1);
+	}
+	lua_pop(L, 1); // pop color stops table
+
+	auto blend = WearBarParams::BLEND_MODE_CONSTANT;
+	lua_getfield(L, stack_idx, "blend");
+	if (check_field_or_nil(L, -1, LUA_TSTRING, "blend")) {
+		int blendInt;
+		if (!string_to_enum(WearBarParams::es_BlendMode, blendInt, std::string(lua_tostring(L, -1))))
+			throw LuaError("Invalid wear bar color blend mode");
+		blend = static_cast<WearBarParams::BlendMode>(blendInt);
+	}
+	lua_pop(L, 1);
+
+	return WearBarParams(colorStops, blend);
+}
+
 /******************************************************************************/
 void push_dig_params(lua_State *L,const DigParams &params)
 {
@@ -1871,6 +2115,51 @@ void push_noiseparams(lua_State *L, NoiseParams *np)
 	lua_setfield(L, -2, "spread");
 }
 
+bool read_tree_def(lua_State *L, int idx, const NodeDefManager *ndef,
+		treegen::TreeDef &tree_def)
+{
+	std::string trunk, leaves, fruit;
+	if (!lua_istable(L, idx))
+		return false;
+
+	getstringfield(L, idx, "axiom", tree_def.initial_axiom);
+	getstringfield(L, idx, "rules_a", tree_def.rules_a);
+	getstringfield(L, idx, "rules_b", tree_def.rules_b);
+	getstringfield(L, idx, "rules_c", tree_def.rules_c);
+	getstringfield(L, idx, "rules_d", tree_def.rules_d);
+	getstringfield(L, idx, "trunk", trunk);
+	tree_def.m_nodenames.push_back(trunk);
+	getstringfield(L, idx, "leaves", leaves);
+	tree_def.m_nodenames.push_back(leaves);
+	tree_def.leaves2_chance = 0;
+	getstringfield(L, idx, "leaves2", leaves);
+	if (!leaves.empty()) {
+		getintfield(L, idx, "leaves2_chance", tree_def.leaves2_chance);
+		if (tree_def.leaves2_chance)
+			tree_def.m_nodenames.push_back(leaves);
+	}
+	getintfield(L, idx, "angle", tree_def.angle);
+	getintfield(L, idx, "iterations", tree_def.iterations);
+	if (!getintfield(L, idx, "random_level", tree_def.iterations_random_level))
+		tree_def.iterations_random_level = 0;
+	getstringfield(L, idx, "trunk_type", tree_def.trunk_type);
+	getboolfield(L, idx, "thin_branches", tree_def.thin_branches);
+	tree_def.fruit_chance = 0;
+	getstringfield(L, idx, "fruit", fruit);
+	if (!fruit.empty()) {
+		getintfield(L, idx, "fruit_chance", tree_def.fruit_chance);
+		if (tree_def.fruit_chance)
+			tree_def.m_nodenames.push_back(fruit);
+	}
+	tree_def.explicit_seed = getintfield(L, idx, "seed", tree_def.seed);
+
+	// Resolves the node IDs for trunk, leaves, leaves2 and fruit at runtime,
+	// when tree_def.resolveNodeNames will be called.
+	ndef->pendNodeResolve(&tree_def);
+
+	return true;
+}
+
 /******************************************************************************/
 // Returns depth of json value tree
 static int push_json_value_getdepth(const Json::Value &value)
@@ -2057,8 +2346,28 @@ void push_objectRef(lua_State *L, const u16 id)
 
 void read_hud_element(lua_State *L, HudElement *elem)
 {
-	elem->type = (HudElementType)getenumfield(L, 2, "hud_elem_type",
-									es_HudElementType, HUD_ELEM_TEXT);
+	std::string type_string;
+	bool has_type = getstringfield(L, 2, "type", type_string);
+
+	// Handle deprecated hud_elem_type
+	std::string deprecated_type_string;
+	if (getstringfield(L, 2, "hud_elem_type", deprecated_type_string)) {
+		if (has_type && deprecated_type_string != type_string) {
+			log_deprecated(L, "Ambiguous HUD element fields \"type\" and \"hud_elem_type\", "
+					"\"type\" will be used.", 1, true);
+		} else {
+			has_type = true;
+			type_string = deprecated_type_string;
+			log_deprecated(L, "Deprecated \"hud_elem_type\" field, use \"type\" instead.",
+					1, true);
+		}
+	}
+
+	int type_enum;
+	if (has_type && string_to_enum(es_HudElementType, type_enum, type_string))
+		elem->type = static_cast<HudElementType>(type_enum);
+	else
+		elem->type = HUD_ELEM_TEXT;
 
 	lua_getfield(L, 2, "position");
 	elem->pos = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
@@ -2075,11 +2384,16 @@ void read_hud_element(lua_State *L, HudElement *elem)
 	elem->name    = getstringfield_default(L, 2, "name", "");
 	elem->text    = getstringfield_default(L, 2, "text", "");
 	elem->number  = getintfield_default(L, 2, "number", 0);
-	if (elem->type == HUD_ELEM_WAYPOINT)
-		// waypoints reuse the item field to store precision, item = precision + 1
-		elem->item = getintfield_default(L, 2, "precision", -1) + 1;
-	else
+	if (elem->type == HUD_ELEM_WAYPOINT) {
+		// Waypoints reuse the item field to store precision,
+		// item = precision + 1 and item = 0 <=> precision = 10 for backwards compatibility.
+		int precision = getintfield_default(L, 2, "precision", 10);
+		if (precision < 0)
+			throw LuaError("Waypoint precision must be non-negative");
+		elem->item = precision + 1;
+	} else {
 		elem->item = getintfield_default(L, 2, "item", 0);
+	}
 	elem->dir     = getintfield_default(L, 2, "direction", 0);
 	elem->z_index = MYMAX(S16_MIN, MYMIN(S16_MAX,
 			getintfield_default(L, 2, "z_index", 0)));
@@ -2131,8 +2445,10 @@ void push_hud_element(lua_State *L, HudElement *elem)
 	lua_setfield(L, -2, "number");
 
 	if (elem->type == HUD_ELEM_WAYPOINT) {
-		// waypoints reuse the item field to store precision, precision = item - 1
-		lua_pushnumber(L, elem->item - 1);
+		// Waypoints reuse the item field to store precision,
+		// item = precision + 1 and item = 0 <=> precision = 10 for backwards compatibility.
+		// See `Hud::drawLuaElements`, case `HUD_ELEM_WAYPOINT`.
+		lua_pushnumber(L, (elem->item == 0) ? 10 : (elem->item - 1));
 		lua_setfield(L, -2, "precision");
 	}
 	// push the item field for waypoints as well for backwards compatibility
@@ -2178,7 +2494,7 @@ bool read_hud_change(lua_State *L, HudElementStat &stat, HudElement *elem, void
 			return false;
 		}
 
-		stat = (HudElementStat)statint;
+		stat = static_cast<HudElementStat>(statint);
 	}
 
 	switch (stat) {
@@ -2240,6 +2556,9 @@ bool read_hud_change(lua_State *L, HudElementStat &stat, HudElement *elem, void
 			elem->style = luaL_checknumber(L, 4);
 			*value = &elem->style;
 			break;
+		case HudElementStat_END:
+			return false;
+			break;
 	}
 
 	return true;
@@ -2262,6 +2581,27 @@ static const char *collision_axis_str[] = {
 
 void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 {
+	// use faster Lua helper if possible
+	if (res.collisions.size() == 1 && res.collisions.front().type == COLLISION_NODE) {
+		lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_PUSH_MOVERESULT1);
+		const auto &c = res.collisions.front();
+		lua_pushboolean(L, res.touching_ground);
+		lua_pushboolean(L, res.collides);
+		lua_pushboolean(L, res.standing_on_object);
+		assert(c.axis != COLLISION_AXIS_NONE);
+		lua_pushinteger(L, static_cast<int>(c.axis));
+		lua_pushinteger(L, c.node_p.X);
+		lua_pushinteger(L, c.node_p.Y);
+		lua_pushinteger(L, c.node_p.Z);
+		for (v3f v : {c.new_pos / BS, c.old_speed / BS, c.new_speed / BS}) {
+			lua_pushnumber(L, v.X);
+			lua_pushnumber(L, v.Y);
+			lua_pushnumber(L, v.Z);
+		}
+		lua_call(L, 3 + 1 + 3 + 3 * 3, 1);
+		return;
+	}
+
 	lua_createtable(L, 0, 4);
 
 	setboolfield(L, -1, "touching_ground", res.touching_ground);
@@ -2272,7 +2612,7 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 	lua_createtable(L, res.collisions.size(), 0);
 	int i = 1;
 	for (const auto &c : res.collisions) {
-		lua_createtable(L, 0, 5);
+		lua_createtable(L, 0, 6);
 
 		lua_pushstring(L, collision_type_str[c.type]);
 		lua_setfield(L, -2, "type");
@@ -2289,6 +2629,9 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 			lua_setfield(L, -2, "object");
 		}
 
+		push_v3f(L, c.new_pos / BS);
+		lua_setfield(L, -2, "new_pos");
+
 		push_v3f(L, c.old_speed / BS);
 		lua_setfield(L, -2, "old_velocity");
 
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index e644b6a5c..e5007ada4 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -42,6 +42,7 @@ extern "C" {
 #include "util/string.h"
 #include "itemgroup.h"
 #include "itemdef.h"
+#include "util/pointabilities.h"
 #include "c_types.h"
 // We do an explicit path include because by default c_content.h include src/client/hud.h
 // prior to the src/hud.h, which is not good on server only build
@@ -72,6 +73,7 @@ struct NoiseParams;
 class Schematic;
 class ServerActiveObject;
 struct collisionMoveResult;
+namespace treegen { struct TreeDef; }
 
 extern struct EnumString es_TileAnimationType[];
 
@@ -85,9 +87,6 @@ void               push_content_features     (lua_State *L,
 
 void               push_nodebox              (lua_State *L,
                                               const NodeBox &box);
-void               push_box                  (lua_State *L,
-                                              const std::vector<aabb3f> &box);
-
 void               push_palette              (lua_State *L,
                                               const std::vector<video::SColor> *palette);
 
@@ -110,9 +109,17 @@ ItemStack          read_item                 (lua_State *L, int index, IItemDefM
 
 struct TileAnimationParams read_animation_definition(lua_State *L, int index);
 
+PointabilityType   read_pointability_type    (lua_State *L, int index);
+Pointabilities     read_pointabilities       (lua_State *L, int index);
+void               push_pointability_type    (lua_State *L, PointabilityType pointable);
+void               push_pointabilities       (lua_State *L, const Pointabilities &pointabilities);
+
 ToolCapabilities   read_tool_capabilities    (lua_State *L, int table);
 void               push_tool_capabilities    (lua_State *L,
                                               const ToolCapabilities &prop);
+WearBarParams      read_wear_bar_params      (lua_State *L, int table);
+void               push_wear_bar_params      (lua_State *L,
+                                              const WearBarParams &prop);
 
 void read_item_definition (lua_State *L, int index, const ItemDefinition &default_def,
 		ItemDefinition &def);
@@ -127,7 +134,7 @@ void               read_object_properties    (lua_State *L, int index,
                                               IItemDefManager *idef);
 
 void               push_object_properties    (lua_State *L,
-                                              ObjectProperties *prop);
+                                              const ObjectProperties *prop);
 
 void               push_inventory_list       (lua_State *L,
                                               const InventoryList &invlist);
@@ -186,6 +193,10 @@ bool               read_noiseparams          (lua_State *L, int index,
                                               NoiseParams *np);
 void               push_noiseparams          (lua_State *L, NoiseParams *np);
 
+bool               read_tree_def             (lua_State *L, int idx,
+                                              const NodeDefManager *ndef,
+                                              treegen::TreeDef &tree_def);
+
 void               luaentity_get             (lua_State *L,u16 id);
 
 bool               push_json_value           (lua_State *L,
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index f8133278c..2fff8dc92 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -28,6 +28,7 @@ extern "C" {
 #include "util/numeric.h"
 #include "util/serialize.h"
 #include "util/string.h"
+#include "log.h"
 #include "common/c_converter.h"
 #include "common/c_internal.h"
 #include "constants.h"
@@ -60,6 +61,7 @@ extern "C" {
  */
 static void read_v3_aux(lua_State *L, int index)
 {
+	CHECK_POS_TAB(index);
 	lua_pushvalue(L, index);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_READ_VECTOR);
 	lua_insert(L, -2);
@@ -427,20 +429,20 @@ aabb3f read_aabb3f(lua_State *L, int index, f32 scale)
 	return box;
 }
 
-void push_aabb3f(lua_State *L, aabb3f box)
+void push_aabb3f(lua_State *L, aabb3f box, f32 divisor)
 {
 	lua_createtable(L, 6, 0);
-	lua_pushnumber(L, box.MinEdge.X);
+	lua_pushnumber(L, box.MinEdge.X / divisor);
 	lua_rawseti(L, -2, 1);
-	lua_pushnumber(L, box.MinEdge.Y);
+	lua_pushnumber(L, box.MinEdge.Y / divisor);
 	lua_rawseti(L, -2, 2);
-	lua_pushnumber(L, box.MinEdge.Z);
+	lua_pushnumber(L, box.MinEdge.Z / divisor);
 	lua_rawseti(L, -2, 3);
-	lua_pushnumber(L, box.MaxEdge.X);
+	lua_pushnumber(L, box.MaxEdge.X / divisor);
 	lua_rawseti(L, -2, 4);
-	lua_pushnumber(L, box.MaxEdge.Y);
+	lua_pushnumber(L, box.MaxEdge.Y / divisor);
 	lua_rawseti(L, -2, 5);
-	lua_pushnumber(L, box.MaxEdge.Z);
+	lua_pushnumber(L, box.MaxEdge.Z / divisor);
 	lua_rawseti(L, -2, 6);
 }
 
@@ -472,6 +474,16 @@ std::vector<aabb3f> read_aabb3f_vector(lua_State *L, int index, f32 scale)
 	return boxes;
 }
 
+void push_aabb3f_vector(lua_State *L, const std::vector<aabb3f> &boxes, f32 divisor)
+{
+	lua_createtable(L, boxes.size(), 0);
+	int i = 1;
+	for (const aabb3f &box : boxes) {
+		push_aabb3f(L, box, divisor);
+		lua_rawseti(L, -2, i++);
+	}
+}
+
 size_t read_stringlist(lua_State *L, int index, std::vector<std::string> *result)
 {
 	if (index < 0)
@@ -536,6 +548,17 @@ bool check_field_or_nil(lua_State *L, int index, int type, const char *fieldname
 
 bool getstringfield(lua_State *L, int table,
 		const char *fieldname, std::string &result)
+{
+	std::string_view sv;
+	if (getstringfield(L, table, fieldname, sv)) {
+		result = sv;
+		return true;
+	}
+	return false;
+}
+
+bool getstringfield(lua_State *L, int table,
+		const char *fieldname, std::string_view &result)
 {
 	lua_getfield(L, table, fieldname);
 	bool got = false;
@@ -544,7 +567,7 @@ bool getstringfield(lua_State *L, int table,
 		size_t len = 0;
 		const char *ptr = lua_tolstring(L, -1, &len);
 		if (ptr) {
-			result.assign(ptr, len);
+			result = std::string_view(ptr, len);
 			got = true;
 		}
 	}
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index 21dc0dca9..d20bb91de 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -30,7 +30,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <vector>
-#include <unordered_map>
+#include <string_view>
 
 #include "irrlichttypes_bloated.h"
 #include "common/c_types.h"
@@ -72,11 +72,11 @@ v3pos_t            getv3pos_tfield_default(lua_State *L, int table,
 
 bool               getstringfield(lua_State *L, int table,
                              const char *fieldname, std::string &result);
+bool               getstringfield(lua_State *L, int table,
+                             const char *fieldname, std::string_view &result);
 size_t             getstringlistfield(lua_State *L, int table,
                              const char *fieldname,
                              std::vector<std::string> *result);
-void               read_groups(lua_State *L, int index,
-                             std::unordered_map<std::string, int> &result);
 bool               getboolfield(lua_State *L, int table,
                              const char *fieldname, bool &result);
 bool               getfloatfield(lua_State *L, int table,
@@ -148,17 +148,20 @@ inline void         push_v3pos          (lua_State *L, v3pos_t p) {
 	return push_v3s16(L, p);
 	#endif
 }
-void                push_aabb3f         (lua_State *L, aabb3f box);
+void                push_aabb3f         (lua_State *L, aabb3f box, f32 divisor = 1.0f);
 void                push_ARGB8          (lua_State *L, video::SColor color);
 void                pushFloatPos        (lua_State *L, v3f p);
 void                pushFloatPos        (lua_State *L, v3d p);
 void                push_v3f            (lua_State *L, v3f p);
 void                push_v3f            (lua_State *L, v3d p);
 void                push_v2f            (lua_State *L, v2f p);
+void                push_aabb3f_vector  (lua_State *L, const std::vector<aabb3f> &boxes,
+                                         f32 divisor = 1.0f);
 
 void                warn_if_field_exists(lua_State *L, int table,
                                          const char *fieldname,
-                                         const std::string &message);
+                                         std::string_view name,
+                                         std::string_view message);
 
 size_t write_array_slice_float(lua_State *L, int table_index, float *data,
 	v3u16 data_size, v3u16 slice_offset, v3u16 slice_size);
diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index f9810b1db..2ae89ff3c 100644
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -128,8 +128,10 @@ void script_error(lua_State *L, int pcall_result, const char *mod, const char *f
 
 static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
 {
-	lua_Debug ar;
+	if (stack_depth <= 0)
+		return;
 
+	lua_Debug ar;
 	if (lua_getstack(L, stack_depth, &ar)) {
 		FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
 		message.append(" (at " + std::string(ar.short_src) + ":"
@@ -176,19 +178,23 @@ DeprecatedHandlingMode get_deprecated_handling_mode()
 	return ret;
 }
 
-void log_deprecated(lua_State *L, std::string message, int stack_depth)
+void log_deprecated(lua_State *L, std::string message, int stack_depth, bool once)
 {
 	DeprecatedHandlingMode mode = get_deprecated_handling_mode();
 	if (mode == DeprecatedHandlingMode::Ignore)
 		return;
 
-	if (stack_depth >= 0)
+	bool log = true;
+	if (once) {
+		log = script_log_unique(L, message, warningstream, stack_depth);
+	} else {
 		script_log_add_source(L, message, stack_depth);
-	warningstream << message << std::endl;
+		warningstream << message << std::endl;
+	}
 
 	if (mode == DeprecatedHandlingMode::Error)
-		script_error(L, LUA_ERRRUN, NULL, NULL);
-	else
+		throw LuaError(message);
+	else if (log)
 		infostream << script_get_backtrace(L) << std::endl;
 }
 
diff --git a/src/script/common/c_internal.h b/src/script/common/c_internal.h
index 2cce9251e..85286910d 100644
--- a/src/script/common/c_internal.h
+++ b/src/script/common/c_internal.h
@@ -61,12 +61,13 @@ enum {
 	CUSTOM_RIDX_HTTP_API_LUA,
 	CUSTOM_RIDX_METATABLE_MAP,
 
-	// The following four functions are implemented in Lua because LuaJIT can
+	// The following functions are implemented in Lua because LuaJIT can
 	// trace them and optimize tables/string better than from the C API.
 	CUSTOM_RIDX_READ_VECTOR,
 	CUSTOM_RIDX_PUSH_VECTOR,
 	CUSTOM_RIDX_READ_NODE,
 	CUSTOM_RIDX_PUSH_NODE,
+	CUSTOM_RIDX_PUSH_MOVERESULT1,
 };
 
 
@@ -152,8 +153,9 @@ DeprecatedHandlingMode get_deprecated_handling_mode();
  * @param message The deprecation method
  * @param stack_depth How far on the stack to the first user function
  *        (ie: not builtin or core). -1 to disabled.
+ * @param once Log the deprecation warning only once per callsite.
  */
-void log_deprecated(lua_State *L, std::string message, int stack_depth = 1);
+void log_deprecated(lua_State *L, std::string message, int stack_depth = 1, bool once = false);
 
 // Safely call string.dump on a function value
 // (does not pop, leaves one value on stack)
diff --git a/src/script/common/c_packer.cpp b/src/script/common/c_packer.cpp
index 597f5e447..579167952 100644
--- a/src/script/common/c_packer.cpp
+++ b/src/script/common/c_packer.cpp
@@ -70,6 +70,7 @@ static inline bool uses_union(int type)
 	}
 }
 
+// can set_into be used with these key / value types in principle?
 static inline bool can_set_into(int ktype, int vtype)
 {
 	switch (ktype) {
@@ -82,7 +83,7 @@ static inline bool can_set_into(int ktype, int vtype)
 	}
 }
 
-// is the key suitable for use with set_into?
+// is the actual key suitable for use with set_into?
 static inline bool suitable_key(lua_State *L, int idx)
 {
 	if (lua_type(L, idx) == LUA_TSTRING) {
@@ -98,6 +99,27 @@ static inline bool suitable_key(lua_State *L, int idx)
 	}
 }
 
+/**
+ * Push core.known_metatables to the stack if it exists.
+ * @param L Lua state
+ * @return true if core.known_metatables exists, false otherwise.
+*/
+static inline bool get_known_lua_metatables(lua_State *L)
+{
+	lua_getglobal(L, "core");
+	if (!lua_istable(L, -1)) {
+		lua_pop(L, 1);
+		return false;
+	}
+	lua_getfield(L, -1, "known_metatables");
+	if (lua_istable(L, -1)) {
+		lua_remove(L, -2);
+		return true;
+	}
+	lua_pop(L, 2);
+	return false;
+}
+
 namespace {
 	// checks if you left any values on the stack, for debugging
 	class StackChecker {
@@ -143,6 +165,13 @@ namespace {
 	typedef std::pair<std::string, Packer> PackerTuple;
 }
 
+/**
+ * Append instruction to end.
+ *
+ * @param pv target
+ * @param type instruction type
+ * @return reference to instruction
+*/
 static inline auto emplace(PackedValue &pv, s16 type)
 {
 	pv.i.emplace_back();
@@ -211,6 +240,13 @@ void script_register_packer(lua_State *L, const char *regname,
 	lua_pop(L, 1);
 }
 
+/**
+ * Find a packer for a metatable.
+ *
+ * @param regname metatable name
+ * @param out packer will be placed here
+ * @return success
+*/
 static bool find_packer(const char *regname, PackerTuple &out)
 {
 	MutexAutoLock autolock(g_packers_lock);
@@ -223,6 +259,14 @@ static bool find_packer(const char *regname, PackerTuple &out)
 	return true;
 }
 
+/**
+ * Find a packer matching the metatable of the Lua value.
+ *
+ * @param L Lua state
+ * @param idx Index on stack
+ * @param out packer will be placed here
+ * @return success
+*/
 static bool find_packer(lua_State *L, int idx, PackerTuple &out)
 {
 #ifndef NDEBUG
@@ -254,6 +298,21 @@ static bool find_packer(lua_State *L, int idx, PackerTuple &out)
 // Packing implementation
 //
 
+/**
+ * Keeps track of seen objects, which is needed to make circular references work.
+ * The first time an object is seen it remembers the instruction index.
+ * The caller is expected to add instructions that produce the value immediately after.
+ * For second, third, ... calls it pushes an instruction that references the already
+ * created value.
+ *
+ * @param L Lua state
+ * @param idx Index of value on Lua stack
+ * @param pv target
+ * @param seen Map of seen objects
+ * @return empty reference (first time) or reference to instruction that
+ *         reproduces the value (otherwise)
+ *
+*/
 static VectorRef<PackedInstr> record_object(lua_State *L, int idx, PackedValue &pv,
 		std::unordered_map<const void *, s32> &seen)
 {
@@ -261,18 +320,31 @@ static VectorRef<PackedInstr> record_object(lua_State *L, int idx, PackedValue &
 	assert(ptr);
 	auto found = seen.find(ptr);
 	if (found == seen.end()) {
+		// first time, record index
+		assert(pv.i.size() <= S32_MAX);
 		seen[ptr] = pv.i.size();
 		return VectorRef<PackedInstr>();
 	}
+
 	s32 ref = found->second;
 	assert(ref < (s32)pv.i.size());
 	// reuse the value from first time
 	auto r = emplace(pv, INSTR_PUSHREF);
-	r->ref = ref;
+	r->sidata1 = ref;
 	pv.i[ref].keep_ref = true;
 	return r;
 }
 
+/**
+ * Pack a single Lua value and add it to the instruction stream.
+ *
+ * @param L Lua state
+ * @param idx Index of value on Lua stack. Must be positive, use absidx if not!
+ * @param vidx Next free index on the stack as it would look during unpacking. (v = virtual)
+ * @param pv target
+ * @param seen Map of seen objects (see record_object)
+ * @return reference to the instruction that creates the value
+*/
 static VectorRef<PackedInstr> pack_inner(lua_State *L, int idx, int vidx, PackedValue &pv,
 		std::unordered_map<const void *, s32> &seen)
 {
@@ -330,6 +402,7 @@ static VectorRef<PackedInstr> pack_inner(lua_State *L, int idx, int vidx, Packed
 			PackerTuple ser;
 			if (!find_packer(L, idx, ser))
 				throw LuaError("Cannot serialize unsupported userdata");
+			// use packer callback to turn into a void*
 			pv.contains_userdata = true;
 			r = emplace(pv, LUA_TUSERDATA);
 			r->sdata = ser.first;
@@ -358,22 +431,28 @@ static VectorRef<PackedInstr> pack_inner(lua_State *L, int idx, int vidx, Packed
 		else
 			rtable->uidata2++; // nrec
 
-		// check if we can use a shortcut
+		// set_into is a shortcut that allows a pushed value
+		// to be directly set into a table without separately pushing
+		// the key and using SETTABLE.
+		// only works in certain circumstances, hence the check:
 		if (can_set_into(ktype, vtype) && suitable_key(L, -2)) {
 			// push only the value
 			auto rval = pack_inner(L, absidx(L, -1), vidx, pv, seen);
+			vidx++;
 			rval->pop = rval->type != LUA_TTABLE;
-			// and where to put it:
+			// where to put it:
 			rval->set_into = vi_table;
 			if (ktype == LUA_TSTRING)
 				rval->sdata = lua_tostring(L, -2);
 			else
 				rval->sidata1 = lua_tointeger(L, -2);
-			// pop tables after the fact
+			// since tables take multiple instructions to populate we have to
+			// pop them separately afterwards.
 			if (!rval->pop) {
 				auto ri1 = emplace(pv, INSTR_POP);
-				ri1->sidata1 = vidx;
+				ri1->sidata1 = vidx - 1;
 			}
+			vidx--;
 		} else {
 			// push the key and value
 			pack_inner(L, absidx(L, -2), vidx, pv, seen);
@@ -392,6 +471,19 @@ static VectorRef<PackedInstr> pack_inner(lua_State *L, int idx, int vidx, Packed
 		lua_pop(L, 1);
 	}
 
+	// try to preserve metatable information
+	if (lua_getmetatable(L, idx) && get_known_lua_metatables(L)) {
+		lua_insert(L, -2);
+		lua_gettable(L, -2);
+		if (lua_isstring(L, -1)) {
+			auto r = emplace(pv, INSTR_SETMETATABLE);
+			r->sdata = std::string(lua_tostring(L, -1));
+			r->set_into = vi_table;
+		}
+		lua_pop(L, 2);
+	}
+
+	// exactly the table should be left on stack
 	assert(vidx == vi_table + 1);
 	return rtable;
 }
@@ -405,6 +497,7 @@ PackedValue *script_pack(lua_State *L, int idx)
 	std::unordered_map<const void *, s32> seen;
 	pack_inner(L, idx, 1, pv, seen);
 
+	// allocate last for exception safety
 	return new PackedValue(std::move(pv));
 }
 
@@ -414,14 +507,15 @@ PackedValue *script_pack(lua_State *L, int idx)
 
 void script_unpack(lua_State *L, PackedValue *pv)
 {
-	lua_newtable(L); // table at index top to track ref indices -> objects
+	// table that tracks objects for keep_ref / PUSHREF (key = instr index)
+	lua_newtable(L);
 	const int top = lua_gettop(L);
 	int ctr = 0;
 
 	for (size_t packed_idx = 0; packed_idx < pv->i.size(); packed_idx++) {
 		auto &i = pv->i[packed_idx];
 
-		// If leaving values on stack make sure there's space (every 5th iteration)
+		// Make sure there's space on the stack (if applicable)
 		if (!i.pop && (ctr++) >= 5) {
 			lua_checkstack(L, 5);
 			ctr = 0;
@@ -449,9 +543,20 @@ void script_unpack(lua_State *L, PackedValue *pv)
 					lua_remove(L, top + i.sidata2);
 				continue;
 			case INSTR_PUSHREF:
-				lua_pushinteger(L, i.ref);
+				// retrieve from top table
+				lua_pushinteger(L, i.sidata1);
 				lua_rawget(L, top);
 				break;
+			case INSTR_SETMETATABLE:
+				if (get_known_lua_metatables(L)) {
+					lua_getfield(L, -1, i.sdata.c_str());
+					lua_remove(L, -2);
+					if (lua_istable(L, -1))
+						lua_setmetatable(L, top + i.set_into);
+					else
+						lua_pop(L, 1);
+				}
+				continue;
 
 			/* Lua types */
 			case LUA_TNIL:
@@ -476,7 +581,7 @@ void script_unpack(lua_State *L, PackedValue *pv)
 				PackerTuple ser;
 				sanity_check(find_packer(i.sdata.c_str(), ser));
 				ser.second.fout(L, i.ptrdata);
-				i.ptrdata = nullptr; // ownership taken by callback
+				i.ptrdata = nullptr; // ownership taken by packer callback
 				break;
 			}
 
@@ -486,13 +591,14 @@ void script_unpack(lua_State *L, PackedValue *pv)
 		}
 
 		if (i.keep_ref) {
+			// remember in top table
 			lua_pushinteger(L, packed_idx);
 			lua_pushvalue(L, -2);
 			lua_rawset(L, top);
 		}
 
 		if (i.set_into) {
-			if (!i.pop)
+			if (!i.pop) // set will consume
 				lua_pushvalue(L, -1);
 			if (uses_sdata(i.type))
 				lua_rawseti(L, top + i.set_into, i.sidata1);
@@ -504,7 +610,7 @@ void script_unpack(lua_State *L, PackedValue *pv)
 		}
 	}
 
-	// as part of the unpacking process we take ownership of all userdata
+	// as part of the unpacking process all userdata is "used up"
 	pv->contains_userdata = false;
 	// leave exactly one value on the stack
 	lua_settop(L, top+1);
@@ -523,7 +629,7 @@ PackedValue::~PackedValue()
 		if (i.type == LUA_TUSERDATA && i.ptrdata) {
 			PackerTuple ser;
 			if (find_packer(i.sdata.c_str(), ser)) {
-				// tell it to deallocate object
+				// tell packer to deallocate object
 				ser.second.fout(nullptr, i.ptrdata);
 			} else {
 				assert(false);
@@ -536,7 +642,6 @@ PackedValue::~PackedValue()
 // script_dump_packed
 //
 
-#ifndef NDEBUG
 void script_dump_packed(const PackedValue *val)
 {
 	printf("instruction stream: [\n");
@@ -550,7 +655,10 @@ void script_dump_packed(const PackedValue *val)
 				printf(i.sidata2 ? "POP(%d, %d)" : "POP(%d)", i.sidata1, i.sidata2);
 				break;
 			case INSTR_PUSHREF:
-				printf("PUSHREF(%d)", i.ref);
+				printf("PUSHREF(%d)", i.sidata1);
+				break;
+			case INSTR_SETMETATABLE:
+				printf("SETMETATABLE(%s)", i.sdata.c_str());
 				break;
 			case LUA_TNIL:
 				printf("nil");
@@ -568,13 +676,13 @@ void script_dump_packed(const PackedValue *val)
 				printf("table(%d, %d)", i.uidata1, i.uidata2);
 				break;
 			case LUA_TFUNCTION:
-				printf("function(%lu byte)", i.sdata.size());
+				printf("function(%d bytes)", (int)i.sdata.size());
 				break;
 			case LUA_TUSERDATA:
 				printf("userdata %s %p", i.sdata.c_str(), i.ptrdata);
 				break;
 			default:
-				printf("!!UNKNOWN!!");
+				FATAL_ERROR("unknown type");
 				break;
 		}
 		if (i.set_into) {
@@ -593,4 +701,3 @@ void script_dump_packed(const PackedValue *val)
 	}
 	printf("]\n");
 }
-#endif
diff --git a/src/script/common/c_packer.h b/src/script/common/c_packer.h
index fe072c10a..2338da455 100644
--- a/src/script/common/c_packer.h
+++ b/src/script/common/c_packer.h
@@ -34,41 +34,44 @@ extern "C" {
 	states and cannot be used for persistence or network transfer.
 */
 
-#define INSTR_SETTABLE (-10)
-#define INSTR_POP      (-11)
-#define INSTR_PUSHREF  (-12)
+#define INSTR_SETTABLE     (-10)
+#define INSTR_POP          (-11)
+#define INSTR_PUSHREF      (-12)
+#define INSTR_SETMETATABLE (-13)
 
 /**
- * Represents a single instruction that pushes a new value or works with existing ones.
+ * Represents a single instruction that pushes a new value or operates with existing ones.
  */
 struct PackedInstr
 {
 	s16 type; // LUA_T* or INSTR_*
 	u16 set_into; // set into table on stack
-	bool keep_ref; // is referenced later by INSTR_PUSHREF?
+	bool keep_ref; // referenced later by INSTR_PUSHREF?
 	bool pop; // remove from stack?
+	// Note: the remaining members are named by type, not usage
 	union {
 		bool bdata; // boolean: value
 		lua_Number ndata; // number: value
 		struct {
-			u16 uidata1, uidata2; // table: narr, nrec
+			u16 uidata1, uidata2; // table: narr | nrec
 		};
 		struct {
 			/*
-				SETTABLE: key index, value index
+				SETTABLE: key index | value index
 				POP: indices to remove
-				otherwise w/ set_into: numeric key, -
+				PUSHREF: index of referenced instr | unused
+				otherwise w/ set_into: numeric key | unused
 			*/
 			s32 sidata1, sidata2;
 		};
 		void *ptrdata; // userdata: implementation defined
-		s32 ref; // PUSHREF: index of referenced instr
 	};
 	/*
 		- string: value
 		- function: buffer
 		- w/ set_into: string key (no null bytes!)
 		- userdata: name in registry
+		- INSTR_SETMETATABLE: name of the metatable
 	*/
 	std::string sdata;
 
@@ -78,7 +81,7 @@ struct PackedInstr
 /**
  * A packed value can be a primitive like a string or number but also a table
  * including all of its contents. It is made up of a linear stream of
- * 'instructions' that build the final value when executed.
+ * instructions that build the final value when executed.
  */
 struct PackedValue
 {
diff --git a/src/script/common/c_types.cpp b/src/script/common/c_types.cpp
index 638035528..c1ef9ec35 100644
--- a/src/script/common/c_types.cpp
+++ b/src/script/common/c_types.cpp
@@ -35,3 +35,11 @@ struct EnumString es_ItemType[] =
 		{ITEM_TOOL, "tool"},
 		{0, NULL},
 	};
+
+struct EnumString es_TouchInteractionMode[] =
+	{
+		{LONG_DIG_SHORT_PLACE, "long_dig_short_place"},
+		{SHORT_DIG_LONG_PLACE, "short_dig_long_place"},
+		{TouchInteractionMode_USER, "user"},
+		{0, NULL},
+	};
diff --git a/src/script/common/c_types.h b/src/script/common/c_types.h
index 19ade308b..81da65043 100644
--- a/src/script/common/c_types.h
+++ b/src/script/common/c_types.h
@@ -62,3 +62,4 @@ public:
 
 
 extern EnumString es_ItemType[];
+extern EnumString es_TouchInteractionMode[];
diff --git a/src/script/common/helper.cpp b/src/script/common/helper.cpp
index 72de2b14a..a9a05b2cb 100644
--- a/src/script/common/helper.cpp
+++ b/src/script/common/helper.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include <cmath>
 #include <irr_v2d.h>
 #include <irr_v3d.h>
+#include <string_view>
 #include "c_converter.h"
 #include "c_types.h"
 
@@ -78,11 +79,16 @@ v3f LuaHelper::readParam(lua_State *L, int index)
 }
 
 template <>
-std::string LuaHelper::readParam(lua_State *L, int index)
+std::string_view LuaHelper::readParam(lua_State *L, int index)
 {
 	size_t length;
-	std::string result;
 	const char *str = luaL_checklstring(L, index, &length);
-	result.assign(str, length);
-	return result;
+	return std::string_view(str, length);
+}
+
+template <>
+std::string LuaHelper::readParam(lua_State *L, int index)
+{
+	auto sv = readParam<std::string_view>(L, index);
+	return std::string(sv); // a copy
 }
diff --git a/src/script/common/helper.h b/src/script/common/helper.h
index fc462b6ef..106966376 100644
--- a/src/script/common/helper.h
+++ b/src/script/common/helper.h
@@ -19,6 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include <string_view>
+
 extern "C" {
 #include <lua.h>
 }
@@ -27,23 +29,22 @@ class LuaHelper
 {
 protected:
 	/**
-	 * Read a value using a template type T from Lua State L and index
-	 *
+	 * Read a value using a template type T from Lua state L at index
 	 *
 	 * @tparam T type to read from Lua
 	 * @param L Lua state
-	 * @param index Lua Index to read
+	 * @param index Lua index to read
 	 * @return read value from Lua
 	 */
 	template <typename T>
 	static T readParam(lua_State *L, int index);
 
 	/**
-	 * Read a value using a template type T from Lua State L and index
+	 * Read a value using a template type T from Lua state L at index
 	 *
 	 * @tparam T type to read from Lua
 	 * @param L Lua state
-	 * @param index Lua Index to read
+	 * @param index Lua index to read
 	 * @param default_value default value to apply if nil
 	 * @return read value from Lua or default value if nil
 	 */
@@ -53,3 +54,18 @@ protected:
 		return lua_isnoneornil(L, index) ? default_value : readParam<T>(L, index);
 	}
 };
+
+// (only declared for documentation purposes:)
+
+/**
+ * Read a string from Lua state L at index without copying it.
+ *
+ * Note that the returned string view is only valid as long as the value is on
+ * the stack and has not been modified. Be careful.
+ *
+ * @param L Lua state
+ * @param index Lua index to read
+ * @return string view
+ */
+template <>
+std::string_view LuaHelper::readParam(lua_State *L, int index);
diff --git a/src/script/cpp_api/CMakeLists.txt b/src/script/cpp_api/CMakeLists.txt
index 3cfd7709a..d9d157d5f 100644
--- a/src/script/cpp_api/CMakeLists.txt
+++ b/src/script/cpp_api/CMakeLists.txt
@@ -5,6 +5,7 @@ set(common_SCRIPT_CPP_API_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/s_env.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_inventory.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_item.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/s_mapgen.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_modchannels.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_node.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/s_nodemeta.cpp
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 489a391b4..50a103ecb 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -143,6 +143,11 @@ ScriptApiBase::ScriptApiBase(ScriptingType type):
 		return 0;
 	});
 	lua_setfield(m_luastack, -2, "set_push_node");
+	lua_pushcfunction(m_luastack, [](lua_State *L) -> int {
+		lua_rawseti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_PUSH_MOVERESULT1);
+		return 0;
+	});
+	lua_setfield(m_luastack, -2, "set_push_moveresult1");
 	// Finally, put the table into the global environment:
 	lua_setglobal(m_luastack, "core");
 
@@ -155,13 +160,6 @@ ScriptApiBase::ScriptApiBase(ScriptingType type):
 	lua_pushstring(m_luastack, porting::getPlatformName());
 	lua_setglobal(m_luastack, "PLATFORM");
 
-#ifdef HAVE_TOUCHSCREENGUI
-	lua_pushboolean(m_luastack, true);
-#else
-	lua_pushboolean(m_luastack, false);
-#endif
-	lua_setglobal(m_luastack, "TOUCHSCREEN_GUI");
-
 	// Make sure Lua uses the right locale
 	setlocale(LC_NUMERIC, "C");
 }
@@ -181,6 +179,7 @@ int ScriptApiBase::luaPanic(lua_State *L)
 	return 0;
 }
 
+#ifndef SERVER
 void ScriptApiBase::clientOpenLibs(lua_State *L)
 {
 	static const std::vector<std::pair<std::string, lua_CFunction>> m_libs = {
@@ -201,28 +200,69 @@ void ScriptApiBase::clientOpenLibs(lua_State *L)
 	    lua_call(L, 1, 0);
 	}
 }
+#endif
+
+#define CHECK(ridx, name) do { \
+	lua_rawgeti(L, LUA_REGISTRYINDEX, ridx); \
+	FATAL_ERROR_IF(lua_type(L, -1) != LUA_TFUNCTION, "missing " name); \
+	lua_pop(L, 1); \
+	} while (0)
 
 void ScriptApiBase::checkSetByBuiltin()
 {
 	lua_State *L = getStack();
 
 	if (m_gamedef) {
-		lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_READ_VECTOR);
-		FATAL_ERROR_IF(lua_type(L, -1) != LUA_TFUNCTION, "missing read_vector");
-		lua_pop(L, 1);
-
-		lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_PUSH_VECTOR);
-		FATAL_ERROR_IF(lua_type(L, -1) != LUA_TFUNCTION, "missing push_vector");
-		lua_pop(L, 1);
-
-		lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_READ_NODE);
-		FATAL_ERROR_IF(lua_type(L, -1) != LUA_TFUNCTION, "missing read_node");
-		lua_pop(L, 1);
-
-		lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_PUSH_NODE);
-		FATAL_ERROR_IF(lua_type(L, -1) != LUA_TFUNCTION, "missing push_node");
-		lua_pop(L, 1);
+		CHECK(CUSTOM_RIDX_READ_VECTOR, "read_vector");
+		CHECK(CUSTOM_RIDX_PUSH_VECTOR, "push_vector");
+		CHECK(CUSTOM_RIDX_READ_NODE, "read_node");
+		CHECK(CUSTOM_RIDX_PUSH_NODE, "push_node");
 	}
+
+	if (getType() == ScriptingType::Server) {
+		CHECK(CUSTOM_RIDX_PUSH_MOVERESULT1, "push_moveresult1");
+	}
+}
+
+#undef CHECK
+
+std::string ScriptApiBase::getCurrentModNameInsecure(lua_State *L)
+{
+	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
+	auto ret = lua_isstring(L, -1) ? readParam<std::string>(L, -1) : "";
+	lua_pop(L, 1);
+	return ret;
+}
+
+std::string ScriptApiBase::getCurrentModName(lua_State *L)
+{
+	auto script = ModApiBase::getScriptApiBase(L);
+	if (script->getType() == ScriptingType::Async ||
+		script->getType() == ScriptingType::Emerge)
+	{
+		// As a precaution never return a "secure" mod name in the async and
+		// emerge environment, because these currently do not track mod origins
+		// in a spoof-safe way (see l_register_async_dofile and l_register_mapgen_script).
+		return "";
+	}
+
+	// We have to make sure that this function is being called directly by
+	// a mod, otherwise a malicious mod could override a function and
+	// steal its return value. (e.g. request_insecure_environment)
+	lua_Debug info;
+
+	// Make sure there's only one item below this function on the stack...
+	if (lua_getstack(L, 2, &info))
+		return "";
+	FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed");
+	FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed");
+
+	// ...and that that item is the main file scope.
+	if (strcmp(info.what, "main") != 0)
+		return "";
+
+	// at this point we can trust this value:
+	return getCurrentModNameInsecure(L);
 }
 
 void ScriptApiBase::loadMod(const std::string &script_path,
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 9fc111cf0..57790e7d5 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -67,13 +67,15 @@ enum class ScriptingType: u8 {
 	Async, // either mainmenu (client) or ingame (server)
 	Client,
 	MainMenu,
-	Server
+	Server,
+	Emerge
 };
 
 class Server;
 #ifndef SERVER
 class Client;
 #endif
+class EmergeThread;
 class IGameDef;
 class Environment;
 class GUIEngine;
@@ -114,13 +116,29 @@ public:
 	Client* getClient();
 #endif
 
-	// IMPORTANT: these cannot be used for any security-related uses, they exist
-	// only to enrich error messages
+	// IMPORTANT: These cannot be used for any security-related uses, they exist
+	// only to enrich error messages.
 	const std::string &getOrigin() { return m_last_run_mod; }
 	void setOriginDirect(const char *origin);
 	void setOriginFromTableRaw(int index, const char *fxn);
 
+	// Returns the currently running mod, only during init time.
+	// The reason this is "insecure" is that mods can mess with each others code,
+	// so the boundary of who is responsible is fuzzy.
+	// Note: checking this against BUILTIN_MOD_NAME is always safe (not spoofable).
+	// returns "" on error
+	static std::string getCurrentModNameInsecure(lua_State *L);
+	// Returns the currently running mod, only during init time.
+	// This checks the Lua stack to only permit direct calls in the file
+	// scope. That way it is assured that it's really the mod it claims to be.
+	// returns "" on error
+	static std::string getCurrentModName(lua_State *L);
+
+#ifdef SERVER
+	inline void clientOpenLibs(lua_State *L) { assert(false); }
+#else
 	void clientOpenLibs(lua_State *L);
+#endif
 
 	// Check things that should be set by the builtin mod.
 	void checkSetByBuiltin();
@@ -134,6 +152,7 @@ protected:
 	friend class ModApiBase;
 	friend class ModApiEnv;
 	friend class LuaVoxelManip;
+	friend class TestMoveAction; // needs getStack()
 
 	/*
 		Subtle edge case with coroutines: If for whatever reason you have a
@@ -164,6 +183,9 @@ protected:
 	void setGuiEngine(GUIEngine* guiengine) { m_guiengine = guiengine; }
 #endif
 
+	EmergeThread* getEmergeThread() { return m_emerge; }
+	void setEmergeThread(EmergeThread *emerge) { m_emerge = emerge; }
+
 	void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj);
 
 	void pushPlayerHPChangeReason(lua_State *L, const PlayerHPChangeReason& reason);
@@ -188,5 +210,7 @@ private:
 #ifndef SERVER
 	GUIEngine      *m_guiengine = nullptr;
 #endif
+	EmergeThread   *m_emerge = nullptr;
+
 	ScriptingType  m_type;
 };
diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
index 5e3396778..7c7cef86b 100644
--- a/src/script/cpp_api/s_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -292,8 +292,6 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
 {
 	SCRIPTAPI_PRECHECKHEADER
 
-	assert(puncher);
-
 	int error_handler = PUSH_ERROR_HANDLER(L);
 
 	// Get core.luaentities[id]
@@ -308,7 +306,10 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
 	}
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object);  // self
-	objectrefGetOrCreate(L, puncher);  // Clicker reference
+	if (puncher)
+		objectrefGetOrCreate(L, puncher);  // Puncher reference
+	else
+		lua_pushnil(L);
 	lua_pushnumber(L, time_from_last_punch);
 	push_tool_capabilities(L, *toolcap);
 	push_v3f(L, dir);
diff --git a/src/script/cpp_api/s_mainmenu.cpp b/src/script/cpp_api/s_mainmenu.cpp
index da33a56ee..62855ba9b 100644
--- a/src/script/cpp_api/s_mainmenu.cpp
+++ b/src/script/cpp_api/s_mainmenu.cpp
@@ -24,7 +24,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "cpp_api/s_internal.h"
 #include "common/c_converter.h"
 
-void ScriptApiMainMenu::setMainMenuData(MainMenuDataForScript *data)
+void ScriptApiMainMenu::setMainMenuData(const MainMenuDataForScript *data)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -41,7 +41,7 @@ void ScriptApiMainMenu::setMainMenuData(MainMenuDataForScript *data)
 	lua_pop(L, 1);
 }
 
-void ScriptApiMainMenu::handleMainMenuEvent(std::string text)
+void ScriptApiMainMenu::handleMainMenuEvent(const std::string &text)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
diff --git a/src/script/cpp_api/s_mainmenu.h b/src/script/cpp_api/s_mainmenu.h
index 5fd36a5fd..7ce5cdf1e 100644
--- a/src/script/cpp_api/s_mainmenu.h
+++ b/src/script/cpp_api/s_mainmenu.h
@@ -32,13 +32,13 @@ public:
 	 * Hand over MainMenuDataForScript to lua to inform lua of the content
 	 * @param data the data
 	 */
-	void setMainMenuData(MainMenuDataForScript *data);
+	void setMainMenuData(const MainMenuDataForScript *data);
 
 	/**
 	 * process events received from formspec
 	 * @param text events in textual form
 	 */
-	void handleMainMenuEvent(std::string text);
+	void handleMainMenuEvent(const std::string &text);
 
 	/**
 	 * process field data received from formspec
diff --git a/src/script/cpp_api/s_mapgen.cpp b/src/script/cpp_api/s_mapgen.cpp
new file mode 100644
index 000000000..f50e95159
--- /dev/null
+++ b/src/script/cpp_api/s_mapgen.cpp
@@ -0,0 +1,76 @@
+/*
+Minetest
+Copyright (C) 2022 sfan5 <sfan5@live.de>
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_mapgen.h"
+#include "cpp_api/s_internal.h"
+#include "common/c_converter.h"
+#include "lua_api/l_vmanip.h"
+#include "emerge.h"
+
+void ScriptApiMapgen::on_mods_loaded()
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get registered shutdown hooks
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_mods_loaded");
+	// Call callbacks
+	runCallbacks(0, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiMapgen::on_shutdown()
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get registered shutdown hooks
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_shutdown");
+	// Call callbacks
+	runCallbacks(0, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiMapgen::on_generated(BlockMakeData *bmdata, u32 seed)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	v3s16 minp = bmdata->blockpos_min * MAP_BLOCKSIZE;
+	v3s16 maxp = bmdata->blockpos_max * MAP_BLOCKSIZE +
+				 v3s16(1,1,1) * (MAP_BLOCKSIZE - 1);
+
+	LuaVoxelManip::create(L, bmdata->vmanip, true);
+	const int vmanip = lua_gettop(L);
+
+	// Store vmanip globally (used by helpers)
+	lua_getglobal(L, "core");
+	lua_pushvalue(L, vmanip);
+	lua_setfield(L, -2, "vmanip");
+
+	// Call callbacks
+	lua_getfield(L, -1, "registered_on_generateds");
+	lua_pushvalue(L, vmanip);
+	push_v3s16(L, minp);
+	push_v3s16(L, maxp);
+	lua_pushnumber(L, seed);
+	runCallbacks(4, RUN_CALLBACKS_MODE_FIRST);
+	lua_pop(L, 1); // return val
+
+	// Unset core.vmanip again
+	lua_pushnil(L);
+	lua_setfield(L, -2, "vmanip");
+}
diff --git a/src/script/cpp_api/s_mapgen.h b/src/script/cpp_api/s_mapgen.h
new file mode 100644
index 000000000..08786f99e
--- /dev/null
+++ b/src/script/cpp_api/s_mapgen.h
@@ -0,0 +1,40 @@
+/*
+Minetest
+Copyright (C) 2022 sfan5 <sfan5@live.de>
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "cpp_api/s_base.h"
+
+struct BlockMakeData;
+
+/*
+ * Note that this is the class defining the functions called inside the emerge
+ * Lua state, not the server one.
+ */
+
+class ScriptApiMapgen : virtual public ScriptApiBase
+{
+public:
+
+	void on_mods_loaded();
+	void on_shutdown();
+
+	// Called after generating a piece of map, before writing it to the map
+	void on_generated(BlockMakeData *bmdata, u32 seed);
+};
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp
index ba7a0f0e2..8bc9f4311 100644
--- a/src/script/cpp_api/s_player.cpp
+++ b/src/script/cpp_api/s_player.cpp
@@ -71,7 +71,10 @@ bool ScriptApiPlayer::on_punchplayer(ServerActiveObject *player,
 	lua_getfield(L, -1, "registered_on_punchplayers");
 	// Call callbacks
 	objectrefGetOrCreate(L, player);
-	objectrefGetOrCreate(L, hitter);
+	if (hitter)
+		objectrefGetOrCreate(L, hitter);
+	else
+		lua_pushnil(L);
 	lua_pushnumber(L, time_from_last_punch);
 	push_tool_capabilities(L, *toolcap);
 	push_v3f(L, dir);
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index d71c8c6bc..87dfdf93e 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -505,6 +505,28 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path, const char
 }
 
 
+bool checkModNameWhitelisted(const std::string &mod_name, const std::string &setting)
+{
+	assert(str_starts_with(setting, "secure."));
+
+	if (mod_name.empty())
+		return false;
+
+	std::string value = g_settings->get(setting);
+	value.erase(std::remove(value.begin(), value.end(), ' '), value.end());
+	auto mod_list = str_split(value, ',');
+
+	return CONTAINS(mod_list, mod_name);
+}
+
+
+bool ScriptApiSecurity::checkWhitelisted(lua_State *L, const std::string &setting)
+{
+	std::string mod_name = ScriptApiBase::getCurrentModName(L);
+	return checkModNameWhitelisted(mod_name, setting);
+}
+
+
 bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 		bool write_required, bool *write_allowed)
 {
@@ -555,10 +577,8 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 		return false;
 
 	// Get mod name
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	if (lua_isstring(L, -1)) {
-		std::string mod_name = readParam<std::string>(L, -1);
-
+	std::string mod_name = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (!mod_name.empty()) {
 		// Builtin can access anything
 		if (mod_name == BUILTIN_MOD_NAME) {
 			if (write_allowed) *write_allowed = true;
@@ -572,13 +592,37 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 			if (mod) {
 				str = fs::AbsolutePath(mod->path);
 				if (!str.empty() && fs::PathStartsWith(abs_path, str)) {
-					if (write_allowed) *write_allowed = true;
+					// `mod_name` cannot be trusted here, so we catch the scenarios where this becomes a problem:
+					bool is_trusted = checkModNameWhitelisted(mod_name, "secure.trusted_mods") ||
+							checkModNameWhitelisted(mod_name, "secure.http_mods");
+					std::string filename = lowercase(fs::GetFilenameFromPath(abs_path.c_str()));
+					// By writing to any of these a malicious mod could turn itself into
+					// an existing trusted mod by renaming or becoming a modpack.
+					bool is_dangerous_file = filename == "mod.conf" ||
+							filename == "modpack.conf" ||
+							filename == "modpack.txt";
+					if (write_required) {
+						if (is_trusted) {
+							throw LuaError(
+									"Unable to write to a trusted or http mod's directory. "
+									"For data storage consider minetest.get_mod_data_path() or minetest.get_worldpath() instead.");
+						} else if (is_dangerous_file) {
+							throw LuaError(
+									"Unable to write to special file for security reasons");
+						} else {
+							const char *message =
+									"Writing to mod directories is deprecated, as any changes "
+									"will be overwritten when updating content. "
+									"For data storage consider minetest.get_mod_data_path() or minetest.get_worldpath() instead.";
+							log_deprecated(L, message, 1);
+						}
+					}
+					if (write_allowed) *write_allowed = !is_trusted && !is_dangerous_file;
 					return true;
 				}
 			}
 		}
 	}
-	lua_pop(L, 1);  // Pop mod name
 
 	// Allow read-only access to game directory
 	if (!write_required) {
@@ -602,6 +646,13 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 		}
 	}
 
+	// Allow read/write access to all mod common dirs
+	str = fs::AbsolutePath(gamedef->getModDataPath());
+	if (!str.empty() && fs::PathStartsWith(abs_path, str)) {
+		if (write_allowed) *write_allowed = true;
+		return true;
+	}
+
 	str = fs::AbsolutePath(gamedef->getWorldPath());
 	if (!str.empty()) {
 		// Don't allow access to other paths in the world mod/game path.
@@ -625,38 +676,6 @@ bool ScriptApiSecurity::checkPath(lua_State *L, const char *path,
 	return false;
 }
 
-bool ScriptApiSecurity::checkWhitelisted(lua_State *L, const std::string &setting)
-{
-	assert(str_starts_with(setting, "secure."));
-
-	// We have to make sure that this function is being called directly by
-	// a mod, otherwise a malicious mod could override this function and
-	// steal its return value.
-	lua_Debug info;
-
-	// Make sure there's only one item below this function on the stack...
-	if (lua_getstack(L, 2, &info))
-		return false;
-	FATAL_ERROR_IF(!lua_getstack(L, 1, &info), "lua_getstack() failed");
-	FATAL_ERROR_IF(!lua_getinfo(L, "S", &info), "lua_getinfo() failed");
-
-	// ...and that that item is the main file scope.
-	if (strcmp(info.what, "main") != 0)
-		return false;
-
-	// Mod must be listed in secure.http_mods or secure.trusted_mods
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	if (!lua_isstring(L, -1))
-		return false;
-	std::string mod_name = readParam<std::string>(L, -1);
-
-	std::string value = g_settings->get(setting);
-	value.erase(std::remove(value.begin(), value.end(), ' '), value.end());
-	auto mod_list = str_split(value, ',');
-
-	return CONTAINS(mod_list, mod_name);
-}
-
 
 int ScriptApiSecurity::sl_g_dofile(lua_State *L)
 {
diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h
index 880ce1638..ee93e1f99 100644
--- a/src/script/cpp_api/s_security.h
+++ b/src/script/cpp_api/s_security.h
@@ -49,12 +49,12 @@ public:
 	static bool safeLoadString(lua_State *L, const std::string &code, const char *chunk_name);
 	// Loads a file as Lua code safely (doesn't allow bytecode).
 	static bool safeLoadFile(lua_State *L, const char *path, const char *display_name = NULL);
-	// Checks if mods are allowed to read (and optionally write) to the path
-	static bool checkPath(lua_State *L, const char *path, bool write_required,
-			bool *write_allowed=NULL);
 	// Check if mod is whitelisted in the given setting
 	// This additionally checks that the mod's main file scope is executing.
 	static bool checkWhitelisted(lua_State *L, const std::string &setting);
+	// Checks if mods are allowed to read (and optionally write) to the path
+	static bool checkPath(lua_State *L, const char *path, bool write_required,
+			bool *write_allowed=NULL);
 
 private:
 	int getThread(lua_State *L);
diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 82fb945ae..c261338a4 100644
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -298,7 +298,7 @@ int LuaAreaStore::l_from_file(lua_State *L)
 	const char *filename = luaL_checkstring(L, 2);
 	CHECK_SECURE_PATH(L, filename, false);
 
-	std::ifstream is(filename, std::ios::binary);
+	auto is = open_ifstream(filename, true);
 	return deserialization_helper(L, o->as, is);
 }
 
diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
index ea56ead23..4020a8562 100644
--- a/src/script/lua_api/l_base.cpp
+++ b/src/script/lua_api/l_base.cpp
@@ -28,6 +28,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "server.h"
 #include <algorithm>
 #include <cmath>
+#include <sstream>
 
 ScriptApiBase *ModApiBase::getScriptApiBase(lua_State *L)
 {
@@ -77,10 +78,14 @@ GUIEngine *ModApiBase::getGuiEngine(lua_State *L)
 }
 #endif
 
+EmergeThread *ModApiBase::getEmergeThread(lua_State *L)
+{
+	return getScriptApiBase(L)->getEmergeThread();
+}
+
 std::string ModApiBase::getCurrentModPath(lua_State *L)
 {
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	std::string current_mod_name = readParam<std::string>(L, -1, "");
+	std::string current_mod_name = ScriptApiBase::getCurrentModNameInsecure(L);
 	if (current_mod_name.empty())
 		return ".";
 
@@ -150,11 +155,14 @@ int ModApiBase::l_deprecated_function(lua_State *L, const char *good, const char
 			== deprecated_logged.end()) {
 
 		deprecated_logged.emplace_back(hash);
-		warningstream << "Call to deprecated function '"  << bad << "', please use '"
-			<< good << "' at " << backtrace << std::endl;
+
+		std::stringstream msg;
+		msg << "Call to deprecated function '"  << bad << "', use '" << good << "' instead";
+
+		warningstream << msg.str() << " at " << backtrace << std::endl;
 
 		if (dep_mode == DeprecatedHandlingMode::Error)
-			script_error(L, LUA_ERRRUN, NULL, NULL);
+			throw LuaError(msg.str());
 	}
 
 	u64 end_time = porting::getTimeUs();
diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
index 21ed4db31..ba2ae540e 100644
--- a/src/script/lua_api/l_base.h
+++ b/src/script/lua_api/l_base.h
@@ -37,7 +37,7 @@ extern "C" {
 class Client;
 class GUIEngine;
 #endif
-
+class EmergeThread;
 class ScriptApiBase;
 class Server;
 class Environment;
@@ -52,6 +52,7 @@ public:
 	static Client*          getClient(lua_State *L);
 	static GUIEngine*       getGuiEngine(lua_State *L);
 	#endif // !SERVER
+	static EmergeThread*    getEmergeThread(lua_State *L);
 
 	static IGameDef*        getGameDef(lua_State *L);
 
diff --git a/src/script/lua_api/l_camera.cpp b/src/script/lua_api/l_camera.cpp
index aef90562b..a00a937d1 100644
--- a/src/script/lua_api/l_camera.cpp
+++ b/src/script/lua_api/l_camera.cpp
@@ -193,7 +193,6 @@ void LuaCamera::Register(lua_State *L)
 	registerClass(L, className, methods, metamethods);
 }
 
-// clang-format off
 const char LuaCamera::className[] = "Camera";
 const luaL_Reg LuaCamera::methods[] = {
 	luamethod(LuaCamera, set_camera_mode),
@@ -208,4 +207,3 @@ const luaL_Reg LuaCamera::methods[] = {
 
 	{0, 0}
 };
-// clang-format on
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 8d7eb0984..da19ed0ea 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -62,7 +62,11 @@ const static CSMFlagDesc flagdesc_csm_restriction[] = {
 // get_current_modname()
 int ModApiClient::l_get_current_modname(lua_State *L)
 {
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
+	std::string s = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (!s.empty())
+		lua_pushstring(L, s.c_str());
+	else
+		lua_pushnil(L);
 	return 1;
 }
 
@@ -76,30 +80,6 @@ int ModApiClient::l_get_modpath(lua_State *L)
 	return 1;
 }
 
-// get_last_run_mod()
-int ModApiClient::l_get_last_run_mod(lua_State *L)
-{
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	std::string current_mod = readParam<std::string>(L, -1, "");
-	if (current_mod.empty()) {
-		lua_pop(L, 1);
-		lua_pushstring(L, getScriptApiBase(L)->getOrigin().c_str());
-	}
-	return 1;
-}
-
-// set_last_run_mod(modname)
-int ModApiClient::l_set_last_run_mod(lua_State *L)
-{
-	if (!lua_isstring(L, 1))
-		return 0;
-
-	const char *mod = lua_tostring(L, 1);
-	getScriptApiBase(L)->setOriginDirect(mod);
-	lua_pushboolean(L, true);
-	return 1;
-}
-
 // print(text)
 int ModApiClient::l_print(lua_State *L)
 {
@@ -367,8 +347,6 @@ void ModApiClient::Initialize(lua_State *L, int top)
 	API_FCT(send_chat_message);
 	API_FCT(clear_out_chat_queue);
 	API_FCT(get_player_names);
-	API_FCT(set_last_run_mod);
-	API_FCT(get_last_run_mod);
 	API_FCT(show_formspec);
 	API_FCT(send_respawn);
 	API_FCT(gettext);
diff --git a/src/script/lua_api/l_client.h b/src/script/lua_api/l_client.h
index 7eb43e913..e960dc4cf 100644
--- a/src/script/lua_api/l_client.h
+++ b/src/script/lua_api/l_client.h
@@ -60,12 +60,6 @@ private:
 	// gettext(text)
 	static int l_gettext(lua_State *L);
 
-	// get_last_run_mod(n)
-	static int l_get_last_run_mod(lua_State *L);
-
-	// set_last_run_mod(modname)
-	static int l_set_last_run_mod(lua_State *L);
-
 	// get_node(pos)
 	static int l_get_node_or_nil(lua_State *L);
 
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index d3659243f..0c8efe453 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -28,6 +28,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "lua_api/l_nodetimer.h"
 #include "lua_api/l_noise.h"
 #include "lua_api/l_vmanip.h"
+#include "lua_api/l_object.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
 #include "scripting_server.h"
@@ -38,7 +39,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "daynightratio.h"
 #include "util/pointedthing.h"
 #include "mapgen/treegen.h"
-#include "emerge.h"
+#include "emerge_internal.h"
 #include "pathfinder.h"
 #include <unordered_set>
 #include "face_position_cache.h"
@@ -177,6 +178,7 @@ void LuaLBM::trigger(ServerEnvironment *env, v3s16 p,
 int LuaRaycast::l_next(lua_State *L)
 {
 	GET_PLAIN_ENV_PTR;
+	ServerEnvironment *senv = dynamic_cast<ServerEnvironment*>(env);
 
 	bool csm = false;
 #ifndef SERVER
@@ -185,7 +187,17 @@ int LuaRaycast::l_next(lua_State *L)
 
 	LuaRaycast *o = checkObject<LuaRaycast>(L, 1);
 	PointedThing pointed;
-	env->continueRaycast(&o->state, &pointed);
+	for (;;) {
+		env->continueRaycast(&o->state, &pointed);
+		if (pointed.type != POINTEDTHING_OBJECT)
+			break;
+		if (!senv)
+			break;
+		const auto *obj = senv->getActiveObject(pointed.object_id);
+		if (obj && !obj->isGone())
+			break;
+		// skip gone object
+	}
 	if (pointed.type == POINTEDTHING_NOTHING)
 		lua_pushnil(L);
 	else
@@ -200,6 +212,7 @@ int LuaRaycast::create_object(lua_State *L)
 
 	bool objects = true;
 	bool liquids = false;
+	std::optional<Pointabilities> pointabilities = std::nullopt;
 
 	v3f pos1 = checkFloatPos(L, 1);
 	v3f pos2 = checkFloatPos(L, 2);
@@ -209,9 +222,12 @@ int LuaRaycast::create_object(lua_State *L)
 	if (lua_isboolean(L, 4)) {
 		liquids = readParam<bool>(L, 4);
 	}
+	if (lua_istable(L, 5)) {
+		pointabilities = read_pointabilities(L, 5);
+	}
 
 	LuaRaycast *o = new LuaRaycast(core::line3d<f32>(pos1, pos2),
-		objects, liquids);
+		objects, liquids, pointabilities);
 
 	*(void **) (lua_newuserdata(L, sizeof(void *))) = o;
 	luaL_getmetatable(L, className);
@@ -264,7 +280,7 @@ void LuaEmergeAreaCallback(v3s16 blockpos, EmergeAction action, void *param)
 		delete state;
 }
 
-// Exported functions
+/* Exported functions */
 
 // set_node(pos, node, fast)
 // pos = {x=num, y=num, z=num}
@@ -347,39 +363,26 @@ int ModApiEnv::l_swap_node(lua_State *L)
 	return 1;
 }
 
-// get_node(pos)
-// pos = {x=num, y=num, z=num}
-int ModApiEnv::l_get_node(lua_State *L)
+// get_node_raw(x, y, z) -> content, param1, param2, pos_ok
+int ModApiEnv::l_get_node_raw(lua_State *L)
 {
 	GET_ENV_PTR;
 
 	// pos
-	v3s16 pos = read_v3s16(L, 1);
-	// Do it
-	MapNode n = env->getMap().getNode(pos);
-	// Return node
-	pushnode(L, n);
-	return 1;
-}
-
-// get_node_or_nil(pos)
-// pos = {x=num, y=num, z=num}
-int ModApiEnv::l_get_node_or_nil(lua_State *L)
-{
-	GET_ENV_PTR;
-
-	// pos
-	v3s16 pos = read_v3s16(L, 1);
+	// mirrors implementation of read_v3s16 (with the exact same rounding)
+	double x = lua_tonumber(L, 1);
+	double y = lua_tonumber(L, 2);
+	double z = lua_tonumber(L, 3);
+	v3s16 pos = doubleToInt(v3d(x, y, z), 1.0);
 	// Do it
 	bool pos_ok;
 	MapNode n = env->getMap().getNode(pos, &pos_ok);
-	if (pos_ok) {
-		// Return node
-		pushnode(L, n);
-	} else {
-		lua_pushnil(L);
-	}
-	return 1;
+	// Return node and pos_ok
+	lua_pushinteger(L, n.getContent());
+	lua_pushinteger(L, n.getParam1());
+	lua_pushinteger(L, n.getParam2());
+	lua_pushboolean(L, pos_ok);
+	return 4;
 }
 
 // get_node_light(pos, timeofday)
@@ -448,7 +451,7 @@ int ModApiEnv::l_get_natural_light(lua_State *L)
 	return 1;
 }
 
-// place_node(pos, node)
+// place_node(pos, node, [placer])
 // pos = {x=num, y=num, z=num}
 int ModApiEnv::l_place_node(lua_State *L)
 {
@@ -468,6 +471,7 @@ int ModApiEnv::l_place_node(lua_State *L)
 		lua_pushboolean(L, false);
 		return 1;
 	}
+
 	// Create item to place
 	std::optional<ItemStack> item = ItemStack(ndef->get(n).name, 1, 0, idef);
 	// Make pointed position
@@ -475,13 +479,22 @@ int ModApiEnv::l_place_node(lua_State *L)
 	pointed.type = POINTEDTHING_NODE;
 	pointed.node_abovesurface = pos;
 	pointed.node_undersurface = pos + v3s16(0,-1,0);
-	// Place it with a NULL placer (appears in Lua as nil)
-	bool success = scriptIfaceItem->item_OnPlace(item, nullptr, pointed);
+
+	ServerActiveObject *placer = nullptr;
+
+	if (!lua_isnoneornil(L, 3)) {
+		ObjectRef *ref = checkObject<ObjectRef>(L, 3);
+		placer = ObjectRef::getobject(ref);
+	}
+
+	// Place it with a nullptr placer (appears in Lua as nil)
+	// or the given ObjectRef
+	bool success = scriptIfaceItem->item_OnPlace(item, placer, pointed);
 	lua_pushboolean(L, success);
 	return 1;
 }
 
-// dig_node(pos)
+// dig_node(pos, [digger])
 // pos = {x=num, y=num, z=num}
 int ModApiEnv::l_dig_node(lua_State *L)
 {
@@ -497,14 +510,23 @@ int ModApiEnv::l_dig_node(lua_State *L)
 		lua_pushboolean(L, false);
 		return 1;
 	}
-	// Dig it out with a NULL digger (appears in Lua as a
-	// non-functional ObjectRef)
-	bool success = scriptIfaceNode->node_on_dig(pos, n, NULL);
+
+	ServerActiveObject *digger = nullptr;
+
+	if (!lua_isnoneornil(L, 2)) {
+		ObjectRef *ref = checkObject<ObjectRef>(L, 2);
+		digger = ObjectRef::getobject(ref);
+	}
+
+	// Dig it out with a nullptr digger
+	// (appears in Lua as a non-functional ObjectRef)
+	// or the given ObjectRef
+	bool success = scriptIfaceNode->node_on_dig(pos, n, digger);
 	lua_pushboolean(L, success);
 	return 1;
 }
 
-// punch_node(pos)
+// punch_node(pos, [puncher])
 // pos = {x=num, y=num, z=num}
 int ModApiEnv::l_punch_node(lua_State *L)
 {
@@ -520,9 +542,19 @@ int ModApiEnv::l_punch_node(lua_State *L)
 		lua_pushboolean(L, false);
 		return 1;
 	}
-	// Punch it with a NULL puncher (appears in Lua as a non-functional
-	// ObjectRef)
-	bool success = scriptIfaceNode->node_on_punch(pos, n, NULL, PointedThing());
+
+	ServerActiveObject *puncher = nullptr;
+
+	if (!lua_isnoneornil(L, 2)) {
+		ObjectRef *ref = checkObject<ObjectRef>(L, 2);
+		puncher = ObjectRef::getobject(ref);
+	}
+
+	// Punch it with a nullptr puncher
+	// (appears in Lua as a non-functional ObjectRef)
+	// or the given ObjectRef
+	// TODO: custom PointedThing (requires a converter function)
+	bool success = scriptIfaceNode->node_on_punch(pos, n, puncher, PointedThing());
 	lua_pushboolean(L, success);
 	return 1;
 }
@@ -651,6 +683,40 @@ int ModApiEnv::l_get_surface(lua_State *L)
 }
 
 
+// get_node_boxes(box_type, pos, [node]) -> table
+// box_type = string
+// pos = {x=num, y=num, z=num}
+// node = {name=string, param1=num, param2=num} or nil
+int ModApiEnv::l_get_node_boxes(lua_State *L)
+{
+	GET_ENV_PTR;
+
+	std::string box_type = luaL_checkstring(L, 1);
+	v3s16 pos = read_v3s16(L, 2);
+	MapNode n;
+	if (lua_istable(L, 3))
+		n = readnode(L, 3);
+	else
+		n = env->getMap().getNode(pos);
+
+	u8 neighbors = n.getNeighbors(pos, &env->getMap());
+	const NodeDefManager *ndef = env->getGameDef()->ndef();
+
+	std::vector<aabb3f> boxes;
+	if (box_type == "node_box")
+		n.getNodeBoxes(ndef, &boxes, neighbors);
+	else if (box_type == "collision_box")
+		n.getCollisionBoxes(ndef, &boxes, neighbors);
+	else if (box_type == "selection_box")
+		n.getSelectionBoxes(ndef, &boxes, neighbors);
+	else
+		luaL_error(L, "get_node_boxes: box_type is invalid. Allowed values: \"node_box\", \"collision_box\", \"selection_box\"");
+
+	push_aabb3f_vector(L, boxes, BS);
+
+	return 1;
+}
+
 // find_nodes_with_meta(pos1, pos2)
 int ModApiEnv::l_find_nodes_with_meta(lua_State *L)
 {
@@ -759,8 +825,6 @@ int ModApiEnv::l_get_connected_players(lua_State *L)
 	lua_createtable(L, env->getPlayerCount(), 0);
 	u32 i = 0;
 	for (RemotePlayer *player : env->getPlayers()) {
-		if (player->getPeerId() == PEER_ID_INEXISTENT)
-			continue;
 		PlayerSAO *sao = player->getPlayerSAO();
 		if (sao && !sao->isGone()) {
 			getScriptApiBase(L)->objectrefGetOrCreate(L, sao);
@@ -778,7 +842,7 @@ int ModApiEnv::l_get_player_by_name(lua_State *L)
 	// Do it
 	const char *name = luaL_checkstring(L, 1);
 	RemotePlayer *player = env->getPlayer(name);
-	if (!player || player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return 0;
 	PlayerSAO *sao = player->getPlayerSAO();
 	if (!sao || sao->isGone())
@@ -1399,45 +1463,6 @@ int ModApiEnv::l_find_path(lua_State *L)
 	return 0;
 }
 
-static bool read_tree_def(lua_State *L, int idx,
-	const NodeDefManager *ndef, treegen::TreeDef &tree_def)
-{
-	std::string trunk, leaves, fruit;
-	if (!lua_istable(L, idx))
-		return false;
-
-	getstringfield(L, idx, "axiom", tree_def.initial_axiom);
-	getstringfield(L, idx, "rules_a", tree_def.rules_a);
-	getstringfield(L, idx, "rules_b", tree_def.rules_b);
-	getstringfield(L, idx, "rules_c", tree_def.rules_c);
-	getstringfield(L, idx, "rules_d", tree_def.rules_d);
-	getstringfield(L, idx, "trunk", trunk);
-	tree_def.trunknode = ndef->getId(trunk);
-	getstringfield(L, idx, "leaves", leaves);
-	tree_def.leavesnode = ndef->getId(leaves);
-	tree_def.leaves2_chance = 0;
-	getstringfield(L, idx, "leaves2", leaves);
-	if (!leaves.empty()) {
-		tree_def.leaves2node = ndef->getId(leaves);
-		getintfield(L, idx, "leaves2_chance", tree_def.leaves2_chance);
-	}
-	getintfield(L, idx, "angle", tree_def.angle);
-	getintfield(L, idx, "iterations", tree_def.iterations);
-	if (!getintfield(L, idx, "random_level", tree_def.iterations_random_level))
-		tree_def.iterations_random_level = 0;
-	getstringfield(L, idx, "trunk_type", tree_def.trunk_type);
-	getboolfield(L, idx, "thin_branches", tree_def.thin_branches);
-	tree_def.fruit_chance = 0;
-	getstringfield(L, idx, "fruit", fruit);
-	if (!fruit.empty()) {
-		tree_def.fruitnode = ndef->getId(fruit);
-		getintfield(L, idx, "fruit_chance", tree_def.fruit_chance);
-	}
-	tree_def.explicit_seed = getintfield(L, idx, "seed", tree_def.seed);
-
-	return true;
-}
-
 // spawn_tree(pos, treedef)
 int ModApiEnv::l_spawn_tree(lua_State *L)
 {
@@ -1453,7 +1478,7 @@ int ModApiEnv::l_spawn_tree(lua_State *L)
 
 	ServerMap *map = &env->getServerMap();
 	treegen::error e;
-	if ((e = treegen::spawn_ltree (map, p0, ndef, tree_def)) != treegen::SUCCESS) {
+	if ((e = treegen::spawn_ltree (map, p0, tree_def)) != treegen::SUCCESS) {
 		if (e == treegen::UNBALANCED_BRACKETS) {
 			luaL_error(L, "spawn_tree(): closing ']' has no matching opening bracket");
 		} else {
@@ -1537,8 +1562,7 @@ void ModApiEnv::Initialize(lua_State *L, int top)
 	API_FCT(swap_node);
 	API_FCT(add_item);
 	API_FCT(remove_node);
-	API_FCT(get_node);
-	API_FCT(get_node_or_nil);
+	API_FCT(get_node_raw);
 	API_FCT(get_node_light);
 	API_FCT(get_natural_light);
 	API_FCT(place_node);
@@ -1548,6 +1572,7 @@ void ModApiEnv::Initialize(lua_State *L, int top)
 	API_FCT(get_node_level);
 	API_FCT(set_node_level);
 	API_FCT(add_node_level);
+	API_FCT(get_node_boxes);
 	API_FCT(add_entity);
 	API_FCT(find_nodes_with_meta);
 	API_FCT(get_meta);
@@ -1605,3 +1630,203 @@ void ModApiEnv::InitializeClient(lua_State *L, int top)
 	API_FCT(line_of_sight);
 	API_FCT(raycast);
 }
+
+#define GET_VM_PTR               \
+	MMVManip *vm = getVManip(L); \
+	if (!vm)                     \
+		return 0
+
+// get_node_or_nil(pos)
+int ModApiEnvVM::l_get_node_or_nil(lua_State *L)
+{
+	GET_VM_PTR;
+
+	v3s16 pos = read_v3s16(L, 1);
+	if (vm->exists(pos))
+		pushnode(L, vm->getNodeRefUnsafe(pos));
+	else
+		lua_pushnil(L);
+	return 1;
+}
+
+// get_node_max_level(pos)
+int ModApiEnvVM::l_get_node_max_level(lua_State *L)
+{
+	GET_VM_PTR;
+
+	v3s16 pos = read_v3s16(L, 1);
+	MapNode n = vm->getNodeNoExNoEmerge(pos);
+	lua_pushnumber(L, n.getMaxLevel(getGameDef(L)->ndef()));
+	return 1;
+}
+
+// get_node_level(pos)
+int ModApiEnvVM::l_get_node_level(lua_State *L)
+{
+	GET_VM_PTR;
+
+	v3s16 pos = read_v3s16(L, 1);
+	MapNode n = vm->getNodeNoExNoEmerge(pos);
+	lua_pushnumber(L, n.getLevel(getGameDef(L)->ndef()));
+	return 1;
+}
+
+// set_node_level(pos, level)
+int ModApiEnvVM::l_set_node_level(lua_State *L)
+{
+	GET_VM_PTR;
+
+	v3s16 pos = read_v3s16(L, 1);
+	u8 level = 1;
+	if (lua_isnumber(L, 2))
+		level = lua_tonumber(L, 2);
+	MapNode n = vm->getNodeNoExNoEmerge(pos);
+	lua_pushnumber(L, n.setLevel(getGameDef(L)->ndef(), level));
+	vm->setNodeNoEmerge(pos, n);
+	return 1;
+}
+
+// add_node_level(pos, level)
+int ModApiEnvVM::l_add_node_level(lua_State *L)
+{
+	GET_VM_PTR;
+
+	v3s16 pos = read_v3s16(L, 1);
+	u8 level = 1;
+	if (lua_isnumber(L, 2))
+		level = lua_tonumber(L, 2);
+	MapNode n = vm->getNodeNoExNoEmerge(pos);
+	lua_pushnumber(L, n.addLevel(getGameDef(L)->ndef(), level));
+	vm->setNodeNoEmerge(pos, n);
+	return 1;
+}
+
+// find_node_near(pos, radius, nodenames, [search_center])
+int ModApiEnvVM::l_find_node_near(lua_State *L)
+{
+	GET_VM_PTR;
+
+	const NodeDefManager *ndef = getGameDef(L)->ndef();
+
+	v3s16 pos = read_v3s16(L, 1);
+	int radius = luaL_checkinteger(L, 2);
+	std::vector<content_t> filter;
+	collectNodeIds(L, 3, ndef, filter);
+	int start_radius = (lua_isboolean(L, 4) && readParam<bool>(L, 4)) ? 0 : 1;
+
+	auto getNode = [&vm] (v3s16 p) -> MapNode {
+		return vm->getNodeNoExNoEmerge(p);
+	};
+	return findNodeNear(L, pos, radius, filter, start_radius, getNode);
+}
+
+// find_nodes_in_area(minp, maxp, nodenames, [grouped])
+int ModApiEnvVM::l_find_nodes_in_area(lua_State *L)
+{
+	GET_VM_PTR;
+
+	const NodeDefManager *ndef = getGameDef(L)->ndef();
+
+	v3s16 minp = read_v3s16(L, 1);
+	v3s16 maxp = read_v3s16(L, 2);
+	sortBoxVerticies(minp, maxp);
+
+	checkArea(minp, maxp);
+	// avoid the loop going out-of-bounds
+	{
+		VoxelArea cropped = VoxelArea(minp, maxp).intersect(vm->m_area);
+		minp = cropped.MinEdge;
+		maxp = cropped.MaxEdge;
+	}
+
+	std::vector<content_t> filter;
+	collectNodeIds(L, 3, ndef, filter);
+
+	bool grouped = lua_isboolean(L, 4) && readParam<bool>(L, 4);
+
+	auto iterate = [&] (auto callback) {
+		for (s16 z = minp.Z; z <= maxp.Z; z++)
+		for (s16 y = minp.Y; y <= maxp.Y; y++) {
+			u32 vi = vm->m_area.index(minp.X, y, z);
+			for (s16 x = minp.X; x <= maxp.X; x++) {
+				v3s16 pos(x, y, z);
+				MapNode n = vm->m_data[vi];
+				if (!callback(pos, n))
+					return;
+				++vi;
+			}
+		}
+	};
+	return findNodesInArea(L, ndef, filter, grouped, iterate);
+}
+
+// find_nodes_in_area_under_air(minp, maxp, nodenames)
+int ModApiEnvVM::l_find_nodes_in_area_under_air(lua_State *L)
+{
+	GET_VM_PTR;
+
+	const NodeDefManager *ndef = getGameDef(L)->ndef();
+
+	v3s16 minp = read_v3s16(L, 1);
+	v3s16 maxp = read_v3s16(L, 2);
+	sortBoxVerticies(minp, maxp);
+	checkArea(minp, maxp);
+
+	std::vector<content_t> filter;
+	collectNodeIds(L, 3, ndef, filter);
+
+	auto getNode = [&vm] (v3s16 p) -> MapNode {
+		return vm->getNodeNoExNoEmerge(p);
+	};
+	return findNodesInAreaUnderAir(L, minp, maxp, filter, getNode);
+}
+
+// spawn_tree(pos, treedef)
+int ModApiEnvVM::l_spawn_tree(lua_State *L)
+{
+	GET_VM_PTR;
+
+	const NodeDefManager *ndef = getGameDef(L)->ndef();
+
+	v3s16 p0 = read_v3s16(L, 1);
+
+	treegen::TreeDef tree_def;
+	if (!read_tree_def(L, 2, ndef, tree_def))
+		return 0;
+
+	treegen::error e;
+	if ((e = treegen::make_ltree(*vm, p0, tree_def)) != treegen::SUCCESS) {
+		if (e == treegen::UNBALANCED_BRACKETS) {
+			throw LuaError("spawn_tree(): closing ']' has no matching opening bracket");
+		} else {
+			throw LuaError("spawn_tree(): unknown error");
+		}
+	}
+
+	lua_pushboolean(L, true);
+	return 1;
+}
+
+MMVManip *ModApiEnvVM::getVManip(lua_State *L)
+{
+	auto emerge = getEmergeThread(L);
+	if (emerge)
+		return emerge->getMapgen()->vm;
+	return nullptr;
+}
+
+void ModApiEnvVM::InitializeEmerge(lua_State *L, int top)
+{
+	// other, more trivial functions are in builtin/emerge/env.lua
+	API_FCT(get_node_or_nil);
+	API_FCT(get_node_max_level);
+	API_FCT(get_node_level);
+	API_FCT(set_node_level);
+	API_FCT(add_node_level);
+	API_FCT(find_node_near);
+	API_FCT(find_nodes_in_area);
+	API_FCT(find_nodes_in_area_under_air);
+	API_FCT(spawn_tree);
+}
+
+#undef GET_VM_PTR
diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h
index 68779591b..0bd1b66a1 100644
--- a/src/script/lua_api/l_env.h
+++ b/src/script/lua_api/l_env.h
@@ -77,13 +77,10 @@ private:
 	// pos = {x=num, y=num, z=num}
 	static int l_swap_node(lua_State *L);
 
-	// get_node(pos)
-	// pos = {x=num, y=num, z=num}
-	static int l_get_node(lua_State *L);
-
-	// get_node_or_nil(pos)
-	// pos = {x=num, y=num, z=num}
-	static int l_get_node_or_nil(lua_State *L);
+	// get_node_raw(x, y, z) -> content, param1, param2, pos_ok
+	// Used to implement get_node and get_node_or_nil in lua.
+	// This is still faster than doing it from C++ even with optimized pushnode.
+	static int l_get_node_raw(lua_State *L);
 
 	// get_node_light(pos, timeofday)
 	// pos = {x=num, y=num, z=num}
@@ -95,15 +92,15 @@ private:
 	// timeofday: nil = current time, 0 = night, 0.5 = day
 	static int l_get_natural_light(lua_State *L);
 
-	// place_node(pos, node)
+	// place_node(pos, node, [placer])
 	// pos = {x=num, y=num, z=num}
 	static int l_place_node(lua_State *L);
 
-	// dig_node(pos)
+	// dig_node(pos, [digger])
 	// pos = {x=num, y=num, z=num}
 	static int l_dig_node(lua_State *L);
 
-	// punch_node(pos)
+	// punch_node(pos, [puncher])
 	// pos = {x=num, y=num, z=num}
 	static int l_punch_node(lua_State *L);
 
@@ -126,6 +123,12 @@ private:
 	// freeze_melt(pos)
 	static int l_freeze_melt(lua_State *L);
 
+	// get_node_boxes(box_type, pos, [node]) -> table
+	// box_type = string
+	// pos = {x=num, y=num, z=num}
+	// node = {name=string, param1=num, param2=num} or nil
+	static int l_get_node_boxes(lua_State *L);
+
 	// find_nodes_with_meta(pos1, pos2)
 	static int l_find_nodes_with_meta(lua_State *L);
 
@@ -256,6 +259,47 @@ public:
 	static void InitializeClient(lua_State *L, int top);
 };
 
+/*
+ * Duplicates of certain env APIs that operate not on the global
+ * map but on a VoxelManipulator. This is for emerge scripting.
+ */
+class ModApiEnvVM : public ModApiEnvBase {
+private:
+
+	// get_node_or_nil(pos)
+	static int l_get_node_or_nil(lua_State *L);
+
+	// get_node_max_level(pos)
+	static int l_get_node_max_level(lua_State *L);
+
+	// get_node_level(pos)
+	static int l_get_node_level(lua_State *L);
+
+	// set_node_level(pos)
+	static int l_set_node_level(lua_State *L);
+
+	// add_node_level(pos)
+	static int l_add_node_level(lua_State *L);
+
+	// find_node_near(pos, radius, nodenames, [search_center])
+	static int l_find_node_near(lua_State *L);
+
+	// find_nodes_in_area(minp, maxp, nodenames, [grouped])
+	static int l_find_nodes_in_area(lua_State *L);
+
+	// find_surface_nodes_in_area(minp, maxp, nodenames)
+	static int l_find_nodes_in_area_under_air(lua_State *L);
+
+	// spawn_tree(pos, treedef)
+	static int l_spawn_tree(lua_State *L);
+
+	// Helper: get the vmanip we're operating on
+	static MMVManip *getVManip(lua_State *L);
+
+public:
+	static void InitializeEmerge(lua_State *L, int top);
+};
+
 class LuaABM : public ActiveBlockModifier {
 private:
 	int m_id;
@@ -363,8 +407,9 @@ public:
 	LuaRaycast(
 		const core::line3d<f32> &shootline,
 		bool objects_pointable,
-		bool liquids_pointable) :
-		state(shootline, objects_pointable, liquids_pointable)
+		bool liquids_pointable,
+		const std::optional<Pointabilities> &pointabilities) :
+		state(shootline, objects_pointable, liquids_pointable, pointabilities)
 	{}
 
 	//! Creates a LuaRaycast and leaves it on top of the stack.
diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp
index 5566a8523..57f632291 100644
--- a/src/script/lua_api/l_http.cpp
+++ b/src/script/lua_api/l_http.cpp
@@ -114,9 +114,9 @@ int ModApiHttp::l_http_fetch_sync(lua_State *L)
 	infostream << "Mod performs HTTP request with URL " << req.url << std::endl;
 
 	HTTPFetchResult res;
-	httpfetch_sync(req, res);
+	bool completed = httpfetch_sync_interruptible(req, res);
 
-	push_http_fetch_result(L, res, true);
+	push_http_fetch_result(L, res, completed);
 
 	return 1;
 }
diff --git a/src/script/lua_api/l_inventory.cpp b/src/script/lua_api/l_inventory.cpp
index 227b9f77c..06e0ff829 100644
--- a/src/script/lua_api/l_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -154,19 +154,28 @@ int InvRef::l_set_width(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	InvRef *ref = checkObject<InvRef>(L, 1);
 	const char *listname = luaL_checkstring(L, 2);
+
 	int newwidth = luaL_checknumber(L, 3);
+	if (newwidth < 0) {
+		lua_pushboolean(L, false);
+		return 1;
+	}
+
 	Inventory *inv = getinv(L, ref);
 	if(inv == NULL){
-		return 0;
+		lua_pushboolean(L, false);
+		return 1;
 	}
 	InventoryList *list = inv->getList(listname);
 	if(list){
 		list->setWidth(newwidth);
 	} else {
-		return 0;
+		lua_pushboolean(L, false);
+		return 1;
 	}
 	reportInventoryChange(L, ref);
-	return 0;
+	lua_pushboolean(L, true);
+	return 1;
 }
 
 // get_stack(self, listname, i) -> itemstack
@@ -267,19 +276,19 @@ int InvRef::l_set_lists(lua_State *L)
 	}
 
 	// Make a temporary inventory in case reading fails
-	Inventory *tempInv(inv);
-	tempInv->clear();
+	Inventory tempInv(*inv);
+	tempInv.clear();
 
 	Server *server = getServer(L);
 
 	lua_pushnil(L);
 	luaL_checktype(L, 2, LUA_TTABLE);
 	while (lua_next(L, 2)) {
-		const char *listname = lua_tostring(L, -2);
-		read_inventory_list(L, -1, tempInv, listname, server);
+		const char *listname = luaL_checkstring(L, -2);
+		read_inventory_list(L, -1, &tempInv, listname, server);
 		lua_pop(L, 1);
 	}
-	inv = tempInv;
+	*inv = tempInv;
 	return 0;
 }
 
diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index dfcb67d3f..2afbcf75c 100644
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -166,6 +166,9 @@ int LuaItemStack::l_get_metadata(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	LuaItemStack *o = checkObject<LuaItemStack>(L, 1);
 	ItemStack &item = o->m_stack;
+
+	log_deprecated(L, "ItemStack:get_metadata is deprecated", 1, true);
+
 	const std::string &value = item.metadata.getString("");
 	lua_pushlstring(L, value.c_str(), value.size());
 	return 1;
@@ -179,6 +182,8 @@ int LuaItemStack::l_set_metadata(lua_State *L)
 	LuaItemStack *o = checkObject<LuaItemStack>(L, 1);
 	ItemStack &item = o->m_stack;
 
+	log_deprecated(L, "ItemStack:set_metadata is deprecated", 1, true);
+
 	size_t len = 0;
 	const char *ptr = luaL_checklstring(L, 2, &len);
 	item.metadata.setString("", std::string(ptr, len));
@@ -379,6 +384,22 @@ int LuaItemStack::l_add_wear_by_uses(lua_State *L)
 	return 1;
 }
 
+// get_wear_bar_params(self) -> table
+// Returns the effective wear bar parameters.
+// Returns nil if this item has none associated.
+int LuaItemStack::l_get_wear_bar_params(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	LuaItemStack *o = checkObject<LuaItemStack>(L, 1);
+	ItemStack &item = o->m_stack;
+	auto params = item.getWearBarParams(getGameDef(L)->idef());
+	if (params.has_value()) {
+		push_wear_bar_params(L, *params);
+		return 1;
+	}
+	return 0;
+}
+
 // add_item(self, itemstack or itemstring or table or nil) -> itemstack
 // Returns leftover item stack
 int LuaItemStack::l_add_item(lua_State *L)
@@ -554,6 +575,7 @@ const luaL_Reg LuaItemStack::methods[] = {
 	luamethod(LuaItemStack, get_tool_capabilities),
 	luamethod(LuaItemStack, add_wear),
 	luamethod(LuaItemStack, add_wear_by_uses),
+	luamethod(LuaItemStack, get_wear_bar_params),
 	luamethod(LuaItemStack, add_item),
 	luamethod(LuaItemStack, item_fits),
 	luamethod(LuaItemStack, take_item),
@@ -681,7 +703,7 @@ int ModApiItem::l_get_content_id(lua_State *L)
 
 	// If this is called at mod load time, NodeDefManager isn't aware of
 	// aliases yet, so we need to handle them manually
-	std::string alias_name = idef->getAlias(name);
+	const auto &alias_name = idef->getAlias(name);
 
 	content_t content_id;
 	if (alias_name != name) {
diff --git a/src/script/lua_api/l_item.h b/src/script/lua_api/l_item.h
index d418495db..b23b00df3 100644
--- a/src/script/lua_api/l_item.h
+++ b/src/script/lua_api/l_item.h
@@ -128,6 +128,11 @@ private:
 	// Returns true if the item is (or was) a tool.
 	static int l_add_wear_by_uses(lua_State *L);
 
+	// get_wear_bar_params(self) -> table
+	// Returns the effective wear bar parameters.
+	// Returns nil if this item has none associated.
+	static int l_get_wear_bar_params(lua_State *L);
+
 	// add_item(self, itemstack or itemstring or table or nil) -> itemstack
 	// Returns leftover item stack
 	static int l_add_item(lua_State *L);
diff --git a/src/script/lua_api/l_itemstackmeta.cpp b/src/script/lua_api/l_itemstackmeta.cpp
index 8ce9673db..ebabf7bae 100644
--- a/src/script/lua_api/l_itemstackmeta.cpp
+++ b/src/script/lua_api/l_itemstackmeta.cpp
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_itemstackmeta.h"
 #include "lua_api/l_internal.h"
 #include "common/c_content.h"
+#include "common/c_converter.h"
+#include "tool.h"
 
 /*
 	ItemStackMetaRef
@@ -58,6 +60,20 @@ int ItemStackMetaRef::l_set_tool_capabilities(lua_State *L)
 	return 0;
 }
 
+int ItemStackMetaRef::l_set_wear_bar_params(lua_State *L)
+{
+	ItemStackMetaRef *metaref = checkObject<ItemStackMetaRef>(L, 1);
+	if (lua_isnoneornil(L, 2)) {
+		metaref->clearWearBarParams();
+	} else if (lua_istable(L, 2) || lua_isstring(L, 2)) {
+		metaref->setWearBarParams(read_wear_bar_params(L, 2));
+	} else {
+		luaL_typerror(L, 2, "table, ColorString, or nil");
+	}
+
+	return 0;
+}
+
 ItemStackMetaRef::ItemStackMetaRef(LuaItemStack *istack): istack(istack)
 {
 	istack->grab();
@@ -102,5 +118,6 @@ const luaL_Reg ItemStackMetaRef::methods[] = {
 	luamethod(MetaDataRef, from_table),
 	luamethod(MetaDataRef, equals),
 	luamethod(ItemStackMetaRef, set_tool_capabilities),
+	luamethod(ItemStackMetaRef, set_wear_bar_params),
 	{0,0}
 };
diff --git a/src/script/lua_api/l_itemstackmeta.h b/src/script/lua_api/l_itemstackmeta.h
index ac27bcc2c..27adc57e0 100644
--- a/src/script/lua_api/l_itemstackmeta.h
+++ b/src/script/lua_api/l_itemstackmeta.h
@@ -49,8 +49,19 @@ private:
 		istack->getItem().metadata.clearToolCapabilities();
 	}
 
+	void setWearBarParams(const WearBarParams &params)
+	{
+		istack->getItem().metadata.setWearBarParams(params);
+	}
+
+	void clearWearBarParams()
+	{
+		istack->getItem().metadata.clearWearBarParams();
+	}
+
 	// Exported functions
 	static int l_set_tool_capabilities(lua_State *L);
+	static int l_set_wear_bar_params(lua_State *L);
 public:
 	// takes a reference
 	ItemStackMetaRef(LuaItemStack *istack);
diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 926894754..cfb7484df 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -198,6 +198,15 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
 	lua_pushnumber(L, phys.acceleration_air);
 	lua_setfield(L, -2, "acceleration_air");
 
+	lua_pushnumber(L, phys.speed_fast);
+	lua_setfield(L, -2, "speed_fast");
+
+	lua_pushnumber(L, phys.acceleration_fast);
+	lua_setfield(L, -2, "acceleration_fast");
+
+	lua_pushnumber(L, phys.speed_walk);
+	lua_setfield(L, -2, "speed_walk");
+
 	return 1;
 }
 
@@ -422,6 +431,26 @@ int LuaLocalPlayer::l_hud_get(lua_State *L)
 	return 1;
 }
 
+// hud_get_all(self)
+int LuaLocalPlayer::l_hud_get_all(lua_State *L)
+{
+	LocalPlayer *player = getobject(L, 1);
+	if (player == nullptr)
+		return 0;
+
+	lua_newtable(L);
+	player->hudApply([&](const std::vector<HudElement*>& hud) {
+		for (std::size_t id = 0; id < hud.size(); ++id) {
+			HudElement *elem = hud[id];
+			if (elem != nullptr) {
+				push_hud_element(L, elem);
+				lua_rawseti(L, -2, id);
+			}
+		}
+	});
+	return 1;
+}
+
 LocalPlayer *LuaLocalPlayer::getobject(LuaLocalPlayer *ref)
 {
 	return ref->m_localplayer;
@@ -483,6 +512,7 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
 		luamethod(LuaLocalPlayer, hud_remove),
 		luamethod(LuaLocalPlayer, hud_change),
 		luamethod(LuaLocalPlayer, hud_get),
+		luamethod(LuaLocalPlayer, hud_get_all),
 
 		luamethod(LuaLocalPlayer, get_move_resistance),
 
diff --git a/src/script/lua_api/l_localplayer.h b/src/script/lua_api/l_localplayer.h
index 0a416e58a..d7865b08c 100644
--- a/src/script/lua_api/l_localplayer.h
+++ b/src/script/lua_api/l_localplayer.h
@@ -93,6 +93,8 @@ private:
 	static int l_hud_change(lua_State *L);
 	// hud_get(self, id)
 	static int l_hud_get(lua_State *L);
+	// hud_get_all(self)
+	static int l_hud_get_all(lua_State *L);
 
 	static int l_get_move_resistance(lua_State *L);
 
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 7588cb66b..ea482bb77 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -29,13 +29,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "gui/guiMainMenu.h"
 #include "gui/guiKeyChangeMenu.h"
 #include "gui/guiPathSelectMenu.h"
+#include "server/serverlist.h"
 #include "version.h"
 #include "porting.h"
 #include "filesys.h"
 #include "convert_json.h"
 #include "content/content.h"
 #include "content/subgames.h"
-#include "serverlist.h"
 #include "mapgen/mapgen.h"
 #include "settings.h"
 #include "client/client.h"
@@ -47,7 +47,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /******************************************************************************/
-std::string ModApiMainMenu::getTextData(lua_State *L, std::string name)
+std::string ModApiMainMenu::getTextData(lua_State *L, const std::string &name)
 {
 	lua_getglobal(L, "gamedata");
 
@@ -60,7 +60,7 @@ std::string ModApiMainMenu::getTextData(lua_State *L, std::string name)
 }
 
 /******************************************************************************/
-int ModApiMainMenu::getIntegerData(lua_State *L, std::string name,bool& valid)
+int ModApiMainMenu::getIntegerData(lua_State *L, const std::string &name, bool& valid)
 {
 	lua_getglobal(L, "gamedata");
 
@@ -69,14 +69,14 @@ int ModApiMainMenu::getIntegerData(lua_State *L, std::string name,bool& valid)
 	if(lua_isnil(L, -1)) {
 		valid = false;
 		return -1;
-		}
+	}
 
 	valid = true;
 	return luaL_checkinteger(L, -1);
 }
 
 /******************************************************************************/
-int ModApiMainMenu::getBoolData(lua_State *L, std::string name,bool& valid)
+int ModApiMainMenu::getBoolData(lua_State *L, const std::string &name, bool& valid)
 {
 	lua_getglobal(L, "gamedata");
 
@@ -85,7 +85,7 @@ int ModApiMainMenu::getBoolData(lua_State *L, std::string name,bool& valid)
 	if(lua_isnil(L, -1)) {
 		valid = false;
 		return false;
-		}
+	}
 
 	valid = true;
 	return readParam<bool>(L, -1);
@@ -368,6 +368,9 @@ int ModApiMainMenu::l_get_content_info(lua_State *L)
 	lua_pushstring(L, spec.name.c_str());
 	lua_setfield(L, -2, "name");
 
+	lua_pushstring(L, spec.title.c_str());
+	lua_setfield(L, -2, "title");
+
 	lua_pushstring(L, spec.type.c_str());
 	lua_setfield(L, -2, "type");
 
@@ -388,6 +391,9 @@ int ModApiMainMenu::l_get_content_info(lua_State *L)
 	lua_pushstring(L, spec.path.c_str());
 	lua_setfield(L, -2, "path");
 
+	lua_pushstring(L, spec.textdomain.c_str());
+	lua_setfield(L, -2, "textdomain");
+
 	if (spec.type == "mod") {
 		ModSpec spec;
 		spec.path = path;
@@ -447,8 +453,7 @@ int ModApiMainMenu::l_check_mod_configuration(lua_State *L)
 		// Ignore non-string keys
 		if (lua_type(L, -2) != LUA_TSTRING) {
 			throw LuaError(
-					"Unexpected non-string key in table passed to "
-					"core.check_mod_configuration");
+				"Unexpected non-string key in table passed to core.check_mod_configuration");
 		}
 
 		std::string modpath = luaL_checkstring(L, -1);
@@ -487,7 +492,6 @@ int ModApiMainMenu::l_check_mod_configuration(lua_State *L)
 		return 1;
 	}
 
-
 	lua_newtable(L);
 
 	lua_pushboolean(L, modmgr.isConsistent());
@@ -515,7 +519,25 @@ int ModApiMainMenu::l_check_mod_configuration(lua_State *L)
 		index++;
 	}
 	lua_setfield(L, -2, "satisfied_mods");
+	return 1;
+}
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_content_translation(lua_State *L)
+{
+	GUIEngine* engine = getGuiEngine(L);
+	sanity_check(engine != NULL);
+
+	std::string path = luaL_checkstring(L, 1);
+	std::string domain = luaL_checkstring(L, 2);
+	std::string string = luaL_checkstring(L, 3);
+	std::string lang = gettext("LANG_CODE");
+	if (lang == "LANG_CODE")
+		lang = "";
+
+	auto *translations = engine->getContentTranslations(path, domain, lang);
+	string = wide_to_utf8(translate_string(utf8_to_wide(string), translations));
+	lua_pushstring(L, string.c_str());
 	return 1;
 }
 
@@ -567,7 +589,7 @@ int ModApiMainMenu::l_create_world(lua_State *L)
 	// Set the settings for world creation
 	// this is a bad hack but the best we have right now..
 	StringMap backup;
-	for (auto it : use_settings) {
+	for (auto &it : use_settings) {
 		if (g_settings->existsLocal(it.first))
 			backup[it.first] = g_settings->get(it.first);
 		g_settings->set(it.first, it.second);
@@ -583,7 +605,7 @@ int ModApiMainMenu::l_create_world(lua_State *L)
 	}
 
 	// Restore previous settings
-	for (auto it : use_settings) {
+	for (auto &it : use_settings) {
 		auto it2 = backup.find(it.first);
 		if (it2 == backup.end())
 			g_settings->remove(it.first); // wasn't set before
@@ -722,7 +744,7 @@ int ModApiMainMenu::l_get_cache_path(lua_State *L)
 int ModApiMainMenu::l_get_temp_path(lua_State *L)
 {
 	if (lua_isnoneornil(L, 1) || !lua_toboolean(L, 1))
-		lua_pushstring(L, fs::TempPath().c_str());
+		lua_pushstring(L, fs::CreateTempDir().c_str());
 	else
 		lua_pushstring(L, fs::CreateTempFile().c_str());
 	return 1;
@@ -926,6 +948,17 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
 	return 1;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_language(lua_State *L)
+{
+	std::string lang = gettext("LANG_CODE");
+	if (lang == "LANG_CODE")
+		lang = "";
+
+	lua_pushstring(L, lang.c_str());
+	return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_gettext(lua_State *L)
 {
@@ -960,6 +993,10 @@ int ModApiMainMenu::l_get_window_info(lua_State *L)
 	lua_pushnumber(L, info.real_hud_scaling);
 	lua_settable(L, top);
 
+	lua_pushstring(L, "touch_controls");
+	lua_pushboolean(L, info.touch_controls);
+	lua_settable(L, top);
+
 	return 1;
 }
 
@@ -974,7 +1011,7 @@ int ModApiMainMenu::l_get_active_driver(lua_State *L)
 
 int ModApiMainMenu::l_get_active_renderer(lua_State *L)
 {
-	lua_pushstring(L, wide_to_utf8(RenderingEngine::get_video_driver()->getName()).c_str());
+	lua_pushstring(L, RenderingEngine::get_video_driver()->getName());
 	return 1;
 }
 
@@ -1093,44 +1130,6 @@ int ModApiMainMenu::l_get_lan_servers(lua_State *L)
 	return 1;
 }
 
-/******************************************************************************/
-// this is intentionally a global and not part of MainMenuScripting or such
-namespace {
-	std::unordered_map<std::string, std::string> once_values;
-	std::mutex once_mutex;
-}
-
-int ModApiMainMenu::l_set_once(lua_State *L)
-{
-	std::string key = readParam<std::string>(L, 1);
-	if (lua_isnil(L, 2))
-		return 0;
-	std::string value = readParam<std::string>(L, 2);
-
-	{
-		MutexAutoLock lock(once_mutex);
-		once_values[key] = value;
-	}
-
-	return 0;
-}
-
-int ModApiMainMenu::l_get_once(lua_State *L)
-{
-	std::string key = readParam<std::string>(L, 1);
-
-	{
-		MutexAutoLock lock(once_mutex);
-		auto it = once_values.find(key);
-		if (it == once_values.end())
-			lua_pushnil(L);
-		else
-			lua_pushstring(L, it->second.c_str());
-	}
-
-	return 1;
-}
-
 /******************************************************************************/
 void ModApiMainMenu::Initialize(lua_State *L, int top)
 {
@@ -1147,6 +1146,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(get_games);
 	API_FCT(get_content_info);
 	API_FCT(check_mod_configuration);
+	API_FCT(get_content_translation);
 	API_FCT(start);
 	API_FCT(close);
 	API_FCT(show_keys_menu);
@@ -1173,6 +1173,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(get_mainmenu_path);
 	API_FCT(show_path_select_dialog);
 	API_FCT(download_file);
+	API_FCT(get_language);
 	API_FCT(gettext);
 	API_FCT(get_video_drivers);
 	API_FCT(get_window_info);
@@ -1185,8 +1186,6 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(open_dir);
 	API_FCT(share_file);
 	API_FCT(do_async_callback);
-	API_FCT(set_once);
-	API_FCT(get_once);
 }
 
 /******************************************************************************/
@@ -1217,6 +1216,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
 	API_FCT(download_file);
 	API_FCT(get_min_supp_proto);
 	API_FCT(get_max_supp_proto);
+	API_FCT(get_language);
 	API_FCT(gettext);
 }
 
diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h
index aac57a0fe..0cd709e22 100644
--- a/src/script/lua_api/l_mainmenu.h
+++ b/src/script/lua_api/l_mainmenu.h
@@ -37,7 +37,7 @@ private:
 	 * @param name name of variable to read
 	 * @return string value of requested variable
 	 */
-	static std::string getTextData(lua_State *L, std::string name);
+	static std::string getTextData(lua_State *L, const std::string &name);
 
 	/**
 	 * read an integer variable from gamedata table within lua stack
@@ -45,7 +45,7 @@ private:
 	 * @param name name of variable to read
 	 * @return integer value of requested variable
 	 */
-	static int getIntegerData(lua_State *L, std::string name,bool& valid);
+	static int getIntegerData(lua_State *L, const std::string &name, bool& valid);
 
 	/**
 	 * read a bool variable from gamedata table within lua stack
@@ -53,7 +53,7 @@ private:
 	 * @param name name of variable to read
 	 * @return bool value of requested variable
 	 */
-	static int getBoolData(lua_State *L, std::string name,bool& valid);
+	static int getBoolData(lua_State *L, const std::string &name ,bool& valid);
 
 	/**
 	 * Checks if a path may be modified. Paths in the temp directory or the user
@@ -82,6 +82,8 @@ private:
 
 	static int l_get_mapgen_names(lua_State *L);
 
+	static int l_get_language(lua_State *L);
+
 	static int l_gettext(lua_State *L);
 
 	//packages
@@ -92,6 +94,8 @@ private:
 
 	static int l_check_mod_configuration(lua_State *L);
 
+	static int l_get_content_translation(lua_State *L);
+
 	//gui
 
 	static int l_show_keys_menu(lua_State *L);
@@ -170,10 +174,6 @@ private:
 
 	static int l_share_file(lua_State *L);
 
-	static int l_set_once(lua_State *L);
-
-	static int l_get_once(lua_State *L);
-
 	// async
 	static int l_do_async_callback(lua_State *L);
 
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 17ca1e384..897cd8f0c 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -29,13 +29,14 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/serialize.h"
 #include "server.h"
 #include "environment.h"
-#include "emerge.h"
+#include "emerge_internal.h"
 #include "mapgen/mg_biome.h"
 #include "mapgen/mg_ore.h"
 #include "mapgen/mg_decoration.h"
 #include "mapgen/mg_schematic.h"
 #include "mapgen/mapgen_v5.h"
 #include "mapgen/mapgen_v7.h"
+#include "mapgen/treegen.h"
 #include "filesys.h"
 #include "settings.h"
 #include "log.h"
@@ -113,6 +114,7 @@ bool read_schematic_def(lua_State *L, int index,
 
 bool read_deco_simple(lua_State *L, DecoSimple *deco);
 bool read_deco_schematic(lua_State *L, SchematicManager *schemmgr, DecoSchematic *deco);
+bool read_deco_lsystem(lua_State *L, const NodeDefManager *ndef, DecoLSystem *deco);
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -490,7 +492,7 @@ int ModApiMapgen::l_get_biome_id(lua_State *L)
 
 	const char *biome_str = luaL_checkstring(L, 1);
 
-	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
+	const BiomeManager *bmgr = getEmergeManager(L)->getBiomeManager();
 	if (!bmgr)
 		return 0;
 
@@ -512,7 +514,7 @@ int ModApiMapgen::l_get_biome_name(lua_State *L)
 
 	int biome_id = luaL_checkinteger(L, 1);
 
-	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
+	const BiomeManager *bmgr = getEmergeManager(L)->getBiomeManager();
 	if (!bmgr)
 		return 0;
 
@@ -537,8 +539,7 @@ int ModApiMapgen::l_get_heat(lua_State *L)
 	lua_pushnumber(L, env->getServerMap().updateBlockHeat(env, pos, nullptr, nullptr, block_add));
 	return 1;
 
-	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
-
+	const BiomeGen *biomegen = getBiomeGen(L);
 	if (!biomegen || biomegen->getType() != BIOMEGEN_ORIGINAL)
 		return 0;
 
@@ -564,9 +565,7 @@ int ModApiMapgen::l_get_humidity(lua_State *L)
 	lua_pushnumber(L, env->getServerMap().updateBlockHumidity(env, pos,nullptr, nullptr, block_add));
 	return 1;
 
-
-	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
-
+	const BiomeGen *biomegen = getBiomeGen(L);
 	if (!biomegen || biomegen->getType() != BIOMEGEN_ORIGINAL)
 		return 0;
 
@@ -586,7 +585,7 @@ int ModApiMapgen::l_get_biome_data(lua_State *L)
 
 	v3s16 pos = read_v3s16(L, 1);
 
-	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
+	const BiomeGen *biomegen = getBiomeGen(L);
 	if (!biomegen)
 		return 0;
 
@@ -628,8 +627,7 @@ int ModApiMapgen::l_get_mapgen_object(lua_State *L)
 
 	enum MapgenObject mgobj = (MapgenObject)mgobjint;
 
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
-	Mapgen *mg = emerge->getCurrentMapgen();
+	Mapgen *mg = getMapgen(L);
 	if (!mg)
 		throw LuaError("Must only be called in a mapgen thread!");
 
@@ -704,8 +702,7 @@ int ModApiMapgen::l_get_mapgen_object(lua_State *L)
 		return 1;
 	}
 	case MGOBJ_GENNOTIFY: {
-		std::map<std::string, std::vector<v3s16> >event_map;
-
+		std::map<std::string, std::vector<v3s16>> event_map;
 		mg->gennotify.getEvents(event_map);
 
 		lua_createtable(L, 0, event_map.size());
@@ -720,6 +717,24 @@ int ModApiMapgen::l_get_mapgen_object(lua_State *L)
 			lua_setfield(L, -2, it->first.c_str());
 		}
 
+		// push user-defined data
+		auto &custom_map = mg->gennotify.getCustomData();
+
+		lua_createtable(L, 0, custom_map.size());
+		lua_getglobal(L, "core");
+		lua_getfield(L, -1, "deserialize");
+		lua_remove(L, -2); // remove 'core'
+		for (const auto &it : custom_map) {
+			lua_pushvalue(L, -1); // deserialize func
+			lua_pushlstring(L, it.second.c_str(), it.second.size());
+			lua_pushboolean(L, true);
+			lua_call(L, 2, 1);
+
+			lua_setfield(L, -3, it.first.c_str()); // put into table
+		}
+		lua_pop(L, 1); // remove func
+		lua_setfield(L, -2, "custom"); // put into top-level table
+
 		return 1;
 	}
 	}
@@ -749,6 +764,31 @@ int ModApiMapgen::l_get_spawn_level(lua_State *L)
 }
 
 
+// get_seed([add])
+int ModApiMapgen::l_get_seed(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	// This exists to
+	// 1. not duplicate the truncation logic from Mapgen::Mapgen() once more
+	// 2. because I don't trust myself to do it correctly in Lua
+
+	auto *emerge = getEmergeManager(L);
+	if (!emerge || !emerge->mgparams)
+		return 0;
+
+	int add = 0;
+	if (lua_isnumber(L, 1))
+		add = luaL_checkint(L, 1);
+
+	s32 seed = (s32)emerge->mgparams->seed;
+	seed += add;
+
+	lua_pushinteger(L, seed);
+	return 1;
+}
+
+
 int ModApiMapgen::l_get_mapgen_params(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -758,8 +798,8 @@ int ModApiMapgen::l_get_mapgen_params(lua_State *L)
 
 	std::string value;
 
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
+	const MapSettingsManager *settingsmgr =
+		getEmergeManager(L)->map_settings_mgr;
 
 	lua_newtable(L);
 
@@ -839,7 +879,8 @@ int ModApiMapgen::l_get_mapgen_edges(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	MapSettingsManager *settingsmgr = getServer(L)->getEmergeManager()->map_settings_mgr;
+	const MapSettingsManager *settingsmgr =
+		getEmergeManager(L)->map_settings_mgr;
 
 	// MapSettingsManager::makeMapgenParams cannot be used here because it would
 	// make mapgen settings immutable from then on. Mapgen settings should stay
@@ -875,8 +916,8 @@ int ModApiMapgen::l_get_mapgen_setting(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	std::string value;
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
+	const MapSettingsManager *settingsmgr =
+		getEmergeManager(L)->map_settings_mgr;
 
 	const char *name = luaL_checkstring(L, 1);
 	if (!settingsmgr->getMapSetting(name, &value))
@@ -892,8 +933,8 @@ int ModApiMapgen::l_get_mapgen_setting_noiseparams(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	NoiseParams np;
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
+	const MapSettingsManager *settingsmgr =
+		getEmergeManager(L)->map_settings_mgr;
 
 	const char *name = luaL_checkstring(L, 1);
 	if (!settingsmgr->getMapSettingNoiseParams(name, &np))
@@ -993,7 +1034,7 @@ int ModApiMapgen::l_get_noiseparams(lua_State *L)
 }
 
 
-// set_gen_notify(flags, {deco_id_table})
+// set_gen_notify(flags, {deco_ids}, {custom_ids})
 int ModApiMapgen::l_set_gen_notify(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -1015,26 +1056,72 @@ int ModApiMapgen::l_set_gen_notify(lua_State *L)
 		}
 	}
 
+	if (lua_istable(L, 3)) {
+		lua_pushnil(L);
+		while (lua_next(L, 3)) {
+			emerge->gen_notify_on_custom.insert(readParam<std::string>(L, -1));
+			lua_pop(L, 1);
+		}
+	}
+
+	// Clear sets if relevant flag disabled
+	if ((emerge->gen_notify_on & (1 << GENNOTIFY_DECORATION)) == 0)
+		emerge->gen_notify_on_deco_ids.clear();
+	if ((emerge->gen_notify_on & (1 << GENNOTIFY_CUSTOM)) == 0)
+		emerge->gen_notify_on_custom.clear();
+
 	return 0;
 }
 
 
 // get_gen_notify()
+// returns flagstring, {deco_ids}, {custom_ids})
 int ModApiMapgen::l_get_gen_notify(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	auto *emerge = getEmergeManager(L);
+
 	push_flags_string(L, flagdesc_gennotify, emerge->gen_notify_on,
 		emerge->gen_notify_on);
 
-	lua_newtable(L);
+	lua_createtable(L, emerge->gen_notify_on_deco_ids.size(), 0);
 	int i = 1;
-	for (u32 gen_notify_on_deco_id : emerge->gen_notify_on_deco_ids) {
-		lua_pushnumber(L, gen_notify_on_deco_id);
+	for (u32 id : emerge->gen_notify_on_deco_ids) {
+		lua_pushinteger(L, id);
 		lua_rawseti(L, -2, i++);
 	}
-	return 2;
+
+	lua_createtable(L, emerge->gen_notify_on_custom.size(), 0);
+	int j = 1;
+	for (const auto &id : emerge->gen_notify_on_custom) {
+		lua_pushstring(L, id.c_str());
+		lua_rawseti(L, -2, j++);
+	}
+
+	return 3;
+}
+
+
+// save_gen_notify(custom_id, data) [in emerge thread]
+int ModApiMapgen::l_save_gen_notify(lua_State *L)
+{
+	auto *emerge = getEmergeThread(L);
+
+	std::string key = readParam<std::string>(L, 1);
+
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "serialize");
+	lua_remove(L, -2); // remove 'core'
+	lua_pushvalue(L, 2);
+	lua_call(L, 1, 1);
+	std::string val = readParam<std::string>(L, -1);
+	lua_pop(L, 1);
+
+	bool set = emerge->getMapgen()->gennotify.setCustom(key, val);
+
+	lua_pushboolean(L, set);
+	return 1;
 }
 
 
@@ -1049,8 +1136,7 @@ int ModApiMapgen::l_get_decoration_id(lua_State *L)
 		return 0;
 
 	const DecorationManager *dmgr =
-		getServer(L)->getEmergeManager()->getDecorationManager();
-
+		getEmergeManager(L)->getDecorationManager();
 	if (!dmgr)
 		return 0;
 
@@ -1171,6 +1257,7 @@ int ModApiMapgen::l_register_decoration(lua_State *L)
 		success = read_deco_schematic(L, schemmgr, (DecoSchematic *)deco);
 		break;
 	case DECO_LSYSTEM:
+		success = read_deco_lsystem(L, ndef, (DecoLSystem *)deco);
 		break;
 	}
 
@@ -1253,6 +1340,17 @@ bool read_deco_schematic(lua_State *L, SchematicManager *schemmgr, DecoSchematic
 	return schem != NULL;
 }
 
+bool read_deco_lsystem(lua_State *L, const NodeDefManager *ndef, DecoLSystem *deco)
+{
+	deco->tree_def = std::make_shared<treegen::TreeDef>();
+
+	lua_getfield(L, 1, "treedef");
+	bool has_def = read_tree_def(L, -1, ndef, *(deco->tree_def));
+	lua_pop(L, 1);
+
+	return has_def;
+}
+
 
 // register_ore({lots of stuff})
 int ModApiMapgen::l_register_ore(lua_State *L)
@@ -1284,7 +1382,7 @@ int ModApiMapgen::l_register_ore(lua_State *L)
 	ore->flags          = 0;
 
 	//// Get noise_threshold
-	warn_if_field_exists(L, index, "noise_threshhold",
+	warn_if_field_exists(L, index, "noise_threshhold", "ore " + ore->name,
 		"Deprecated: new name is \"noise_threshold\".");
 
 	float nthresh;
@@ -1294,9 +1392,9 @@ int ModApiMapgen::l_register_ore(lua_State *L)
 	ore->nthresh = nthresh;
 
 	//// Get y_min/y_max
-	warn_if_field_exists(L, index, "height_min",
+	warn_if_field_exists(L, index, "height_min", "ore " + ore->name,
 		"Deprecated: new name is \"y_min\".");
-	warn_if_field_exists(L, index, "height_max",
+	warn_if_field_exists(L, index, "height_max", "ore " + ore->name,
 		"Deprecated: new name is \"y_max\".");
 
 	int ymin, ymax;
@@ -1481,21 +1579,27 @@ int ModApiMapgen::l_clear_registered_schematics(lua_State *L)
 }
 
 
-// generate_ores(vm, p1, p2, [ore_id])
+// generate_ores(vm, p1, p2)
 int ModApiMapgen::l_generate_ores(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	auto *emerge = getEmergeManager(L);
 	if (!emerge || !emerge->mgparams)
 		return 0;
 
+	OreManager *oremgr;
+	if (auto mg = getMapgen(L))
+		oremgr = mg->m_emerge->oremgr;
+	else
+		oremgr = emerge->oremgr;
+
 	Mapgen mg;
 	mg.env = emerge->env;
 	// Intentionally truncates to s32, see Mapgen::Mapgen()
 	mg.seed = (s32)emerge->mgparams->seed;
 	mg.vm   = checkObject<LuaVoxelManip>(L, 1)->vm;
-	mg.ndef = getServer(L)->getNodeDefManager();
+	mg.ndef = emerge->ndef;
 
 	v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) :
 			mg.vm->m_area.MinEdge + v3s16(1,1,1) * MAP_BLOCKSIZE;
@@ -1505,27 +1609,33 @@ int ModApiMapgen::l_generate_ores(lua_State *L)
 
 	u32 blockseed = Mapgen::getBlockSeed(pmin, mg.seed);
 
-	emerge->oremgr->placeAllOres(&mg, blockseed, pmin, pmax);
+	oremgr->placeAllOres(&mg, blockseed, pmin, pmax);
 
 	return 0;
 }
 
 
-// generate_decorations(vm, p1, p2, [deco_id])
+// generate_decorations(vm, p1, p2)
 int ModApiMapgen::l_generate_decorations(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	auto *emerge = getEmergeManager(L);
 	if (!emerge || !emerge->mgparams)
 		return 0;
 
+	DecorationManager *decomgr;
+	if (auto mg = getMapgen(L))
+		decomgr = mg->m_emerge->decomgr;
+	else
+		decomgr = emerge->decomgr;
+
 	Mapgen mg;
 	mg.env = emerge->env;
 	// Intentionally truncates to s32, see Mapgen::Mapgen()
 	mg.seed = (s32)emerge->mgparams->seed;
 	mg.vm   = checkObject<LuaVoxelManip>(L, 1)->vm;
-	mg.ndef = getServer(L)->getNodeDefManager();
+	mg.ndef = emerge->ndef;
 
 	v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) :
 			mg.vm->m_area.MinEdge + v3s16(1,1,1) * MAP_BLOCKSIZE;
@@ -1535,7 +1645,7 @@ int ModApiMapgen::l_generate_decorations(lua_State *L)
 
 	u32 blockseed = Mapgen::getBlockSeed(pmin, mg.seed);
 
-	emerge->decomgr->placeAllDecos(&mg, blockseed, pmin, pmax);
+	decomgr->placeAllDecos(&mg, blockseed, pmin, pmax);
 
 	return 0;
 }
@@ -1660,7 +1770,11 @@ int ModApiMapgen::l_place_schematic_on_vmanip(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	SchematicManager *schemmgr = getServer(L)->getEmergeManager()->schemmgr;
+	SchematicManager *schemmgr;
+	if (auto mg = getMapgen(L))
+		schemmgr = mg->m_emerge->schemmgr;
+	else
+		schemmgr = getServer(L)->getEmergeManager()->schemmgr;
 
 	//// Read VoxelManip object
 	MMVManip *vm = checkObject<LuaVoxelManip>(L, 1)->vm;
@@ -1708,7 +1822,7 @@ int ModApiMapgen::l_serialize_schematic(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	const SchematicManager *schemmgr = getServer(L)->getEmergeManager()->getSchematicManager();
+	const SchematicManager *schemmgr = getEmergeManager(L)->getSchematicManager();
 
 	//// Read options
 	bool use_comments = getboolfield_default(L, 3, "lua_use_comments", false);
@@ -1758,8 +1872,7 @@ int ModApiMapgen::l_read_schematic(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	const SchematicManager *schemmgr =
-		getServer(L)->getEmergeManager()->getSchematicManager();
+	const SchematicManager *schemmgr = getEmergeManager(L)->getSchematicManager();
 	const NodeDefManager *ndef = getGameDef(L)->ndef();
 
 	//// Read options
@@ -1837,18 +1950,23 @@ int ModApiMapgen::l_read_schematic(lua_State *L)
 
 int ModApiMapgen::update_liquids(lua_State *L, MMVManip *vm)
 {
-	GET_ENV_PTR;
+	UniqueQueue<v3s16> *trans_liquid;
+	if (auto emerge = getEmergeThread(L)) {
+		trans_liquid = emerge->m_trans_liquid;
+	} else {
+		GET_ENV_PTR;
+		trans_liquid = &env->getServerMap().m_transforming_liquid;
+	}
+	assert(trans_liquid);
 
-	ServerMap *map = &(env->getServerMap());
-	const NodeDefManager *ndef = getServer(L)->getNodeDefManager();
+	const NodeDefManager *ndef = getGameDef(L)->ndef();
 
 	Mapgen mg;
-	mg.env  = env;
+	mg.env  = getEmergeManager(L)->env;
 	mg.vm   = vm;
 	mg.ndef = ndef;
 
-	mg.updateLiquid(&map->m_transforming_liquid,
-		vm->m_area.MinEdge, vm->m_area.MaxEdge);
+	mg.updateLiquid(trans_liquid, vm->m_area.MinEdge, vm->m_area.MaxEdge);
 	return 0;
 }
 
@@ -1856,7 +1974,7 @@ int ModApiMapgen::calc_lighting(lua_State *L, MMVManip *vm,
 		v3s16 pmin, v3s16 pmax, bool propagate_shadow)
 {
 	const NodeDefManager *ndef = getGameDef(L)->ndef();
-	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	auto emerge = getEmergeManager(L);
 
 	assert(vm->m_area.contains(VoxelArea(pmin, pmax)));
 
@@ -1883,6 +2001,35 @@ int ModApiMapgen::set_lighting(lua_State *L, MMVManip *vm,
 	return 0;
 }
 
+const EmergeManager *ModApiMapgen::getEmergeManager(lua_State *L)
+{
+	auto emerge = getEmergeThread(L);
+	if (emerge)
+		return emerge->getEmergeManager();
+	return getServer(L)->getEmergeManager();
+}
+
+const BiomeGen *ModApiMapgen::getBiomeGen(lua_State *L)
+{
+	// path 1: we're in the emerge environment
+	auto emerge = getEmergeThread(L);
+	if (emerge)
+		return emerge->getMapgen()->m_emerge->biomegen;
+	// path 2: we're in the server environment
+	auto manager = getServer(L)->getEmergeManager();
+	return manager->getBiomeGen();
+}
+
+Mapgen *ModApiMapgen::getMapgen(lua_State *L)
+{
+	// path 1
+	auto emerge = getEmergeThread(L);
+	if (emerge)
+		return emerge->getMapgen();
+	// path 2
+	return getServer(L)->getEmergeManager()->getCurrentMapgen();
+}
+
 void ModApiMapgen::Initialize(lua_State *L, int top)
 {
 	API_FCT(get_biome_id);
@@ -1924,3 +2071,29 @@ void ModApiMapgen::Initialize(lua_State *L, int top)
 	API_FCT(serialize_schematic);
 	API_FCT(read_schematic);
 }
+
+void ModApiMapgen::InitializeEmerge(lua_State *L, int top)
+{
+	API_FCT(get_biome_id);
+	API_FCT(get_biome_name);
+	API_FCT(get_heat);
+	API_FCT(get_humidity);
+	API_FCT(get_biome_data);
+	API_FCT(get_mapgen_object);
+
+	API_FCT(get_seed);
+	API_FCT(get_mapgen_params);
+	API_FCT(get_mapgen_edges);
+	API_FCT(get_mapgen_setting);
+	API_FCT(get_mapgen_setting_noiseparams);
+	API_FCT(get_noiseparams);
+	API_FCT(get_gen_notify);
+	API_FCT(get_decoration_id);
+	API_FCT(save_gen_notify);
+
+	API_FCT(generate_ores);
+	API_FCT(generate_decorations);
+	API_FCT(place_schematic_on_vmanip);
+	API_FCT(serialize_schematic);
+	API_FCT(read_schematic);
+}
diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h
index 48d95b459..aeb266c51 100644
--- a/src/script/lua_api/l_mapgen.h
+++ b/src/script/lua_api/l_mapgen.h
@@ -28,6 +28,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 typedef u16 biome_t;  // copy from mg_biome.h to avoid an unnecessary include
 
 class MMVManip;
+class BiomeManager;
+class BiomeGen;
+class Mapgen;
 
 class ModApiMapgen : public ModApiBase
 {
@@ -71,6 +74,9 @@ private:
 	// get_mapgen_edges([mapgen_limit[, chunksize]])
 	static int l_get_mapgen_edges(lua_State *L);
 
+	// get_seed([add])
+	static int l_get_seed(lua_State *L);
+
 	// get_mapgen_setting(name)
 	static int l_get_mapgen_setting(lua_State *L);
 
@@ -89,12 +95,15 @@ private:
 	// get_noiseparam_defaults(name)
 	static int l_get_noiseparams(lua_State *L);
 
-	// set_gen_notify(flags, {deco_id_table})
+	// set_gen_notify(flags, {deco_ids}, {ud_ids})
 	static int l_set_gen_notify(lua_State *L);
 
 	// get_gen_notify()
 	static int l_get_gen_notify(lua_State *L);
 
+	// save_gen_notify(ud_id, data)
+	static int l_save_gen_notify(lua_State *L);
+
 	// get_decoration_id(decoration_name)
 	// returns the decoration ID as used in gennotify
 	static int l_get_decoration_id(lua_State *L);
@@ -161,8 +170,18 @@ private:
 	static int set_lighting(lua_State *L, MMVManip *vm,
 			v3s16 pmin, v3s16 pmax, u8 light);
 
+	// Helpers
+
+	// get a read-only(!) EmergeManager
+	static const EmergeManager *getEmergeManager(lua_State *L);
+	// get the thread-local or global BiomeGen (still read-only)
+	static const BiomeGen *getBiomeGen(lua_State *L);
+	// get the thread-local mapgen
+	static Mapgen *getMapgen(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
+	static void InitializeEmerge(lua_State *L, int top);
 
 	static struct EnumString es_BiomeTerrainType[];
 	static struct EnumString es_DecorationType[];
diff --git a/src/script/lua_api/l_metadata.cpp b/src/script/lua_api/l_metadata.cpp
index 52d7617d1..e5144259f 100644
--- a/src/script/lua_api/l_metadata.cpp
+++ b/src/script/lua_api/l_metadata.cpp
@@ -115,9 +115,13 @@ int MetaDataRef::l_set_string(lua_State *L)
 
 	MetaDataRef *ref = checkAnyMetadata(L, 1);
 	std::string name = luaL_checkstring(L, 2);
-	size_t len = 0;
-	const char *s = lua_tolstring(L, 3, &len);
-	std::string str(s, len);
+	std::string_view str;
+	if (!lua_isnoneornil(L, 3)) {
+		str = readParam<std::string_view>(L, 3);
+	} else {
+		log_deprecated(L, "Value passed to set_string is nil. This behaviour is"
+			" undocumented and will result in an error in the future.", 1, true);
+	}
 
 	IMetadata *meta = ref->getmeta(!str.empty());
 	if (meta != NULL && meta->setString(name, str))
@@ -300,9 +304,8 @@ bool MetaDataRef::handleFromTable(lua_State *L, int table, IMetadata *meta)
 		while (lua_next(L, fieldstable) != 0) {
 			// key at index -2 and value at index -1
 			std::string name = readParam<std::string>(L, -2);
-			size_t cl;
-			const char *cs = lua_tolstring(L, -1, &cl);
-			meta->setString(name, std::string(cs, cl));
+			auto value = readParam<std::string_view>(L, -1);
+			meta->setString(name, value);
 			lua_pop(L, 1); // Remove value, keep key for next iteration
 		}
 		lua_pop(L, 1);
diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
index d70063c51..fcaf89bbb 100644
--- a/src/script/lua_api/l_minimap.cpp
+++ b/src/script/lua_api/l_minimap.cpp
@@ -132,9 +132,6 @@ int LuaMinimap::l_show(lua_State *L)
 	if (!g_settings->getBool("enable_minimap"))
 		return 1;
 
-	Client *client = getClient(L);
-	assert(client);
-
 	LuaMinimap *ref = checkObject<LuaMinimap>(L, 1);
 	Minimap *m = getobject(ref);
 
@@ -144,15 +141,11 @@ int LuaMinimap::l_show(lua_State *L)
 	if (m->getModeIndex() == 0 && m->getMaxModeIndex() > 0)
 		m->setModeIndex(1);
 
-	client->showMinimap(true);
 	return 1;
 }
 
 int LuaMinimap::l_hide(lua_State *L)
 {
-	Client *client = getClient(L);
-	assert(client);
-
 	LuaMinimap *ref = checkObject<LuaMinimap>(L, 1);
 	Minimap *m = getobject(ref);
 
@@ -162,7 +155,6 @@ int LuaMinimap::l_hide(lua_State *L)
 	if (m->getModeIndex() != 0)
 		m->setModeIndex(0);
 
-	client->showMinimap(false);
 	return 1;
 }
 
diff --git a/src/script/lua_api/l_modchannels.cpp b/src/script/lua_api/l_modchannels.cpp
index 019bb2238..911f05f69 100644
--- a/src/script/lua_api/l_modchannels.cpp
+++ b/src/script/lua_api/l_modchannels.cpp
@@ -115,7 +115,6 @@ ModChannel *ModChannelRef::getobject(lua_State *L, ModChannelRef *ref)
 	return getGameDef(L)->getModChannel(ref->m_modchannel_name);
 }
 
-// clang-format off
 const char ModChannelRef::className[] = "ModChannelRef";
 const luaL_Reg ModChannelRef::methods[] = {
 	luamethod(ModChannelRef, leave),
@@ -123,4 +122,3 @@ const luaL_Reg ModChannelRef::methods[] = {
 	luamethod(ModChannelRef, send_all),
 	{0, 0},
 };
-// clang-format on
diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp
index 7442731fc..b3b9882d7 100644
--- a/src/script/lua_api/l_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -408,25 +408,33 @@ int LuaPseudoRandom::l_next(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	LuaPseudoRandom *o = checkObject<LuaPseudoRandom>(L, 1);
-	int min = 0;
-	int max = 32767;
-	lua_settop(L, 3);
+	int min = 0, max = PseudoRandom::RANDOM_RANGE;
 	if (lua_isnumber(L, 2))
 		min = luaL_checkinteger(L, 2);
 	if (lua_isnumber(L, 3))
 		max = luaL_checkinteger(L, 3);
-	if (max < min) {
-		errorstream<<"PseudoRandom.next(): max="<<max<<" min="<<min<<std::endl;
-		throw LuaError("PseudoRandom.next(): max < min");
+
+	int val;
+	if (max - min == PseudoRandom::RANDOM_RANGE) {
+		val = o->m_pseudo.next() + min;
+	} else {
+		try {
+			val = o->m_pseudo.range(min, max);
+		} catch (PrngException &e) {
+			throw LuaError(e.what());
+		}
 	}
-	if(max - min != 32767 && max - min > 32767/5)
-		throw LuaError("PseudoRandom.next() max-min is not 32767"
-				" and is > 32768/5. This is disallowed due to"
-				" the bad random distribution the"
-				" implementation would otherwise make.");
+	lua_pushinteger(L, val);
+	return 1;
+}
+
+int LuaPseudoRandom::l_get_state(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	LuaPseudoRandom *o = checkObject<LuaPseudoRandom>(L, 1);
 	PseudoRandom &pseudo = o->m_pseudo;
-	int val = pseudo.next();
-	val = (val % (max-min+1)) + min;
+	int val = pseudo.getState();
 	lua_pushinteger(L, val);
 	return 1;
 }
@@ -436,7 +444,7 @@ int LuaPseudoRandom::create_object(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	u64 seed = luaL_checknumber(L, 1);
+	s32 seed = luaL_checkinteger(L, 1);
 	LuaPseudoRandom *o = new LuaPseudoRandom(seed);
 	*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
 	luaL_getmetatable(L, className);
@@ -468,6 +476,7 @@ void LuaPseudoRandom::Register(lua_State *L)
 const char LuaPseudoRandom::className[] = "PseudoRandom";
 const luaL_Reg LuaPseudoRandom::methods[] = {
 	luamethod(LuaPseudoRandom, next),
+	luamethod(LuaPseudoRandom, get_state),
 	{0,0}
 };
 
@@ -502,6 +511,45 @@ int LuaPcgRandom::l_rand_normal_dist(lua_State *L)
 	return 1;
 }
 
+int LuaPcgRandom::l_get_state(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	LuaPcgRandom *o = checkObject<LuaPcgRandom>(L, 1);
+
+	u64 state[2];
+	o->m_rnd.getState(state);
+
+	std::ostringstream oss;
+	oss << std::hex << std::setw(16) << std::setfill('0')
+		<< state[0] << state[1];
+
+	lua_pushstring(L, oss.str().c_str());
+	return 1;
+}
+
+int LuaPcgRandom::l_set_state(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	LuaPcgRandom *o = checkObject<LuaPcgRandom>(L, 1);
+
+	std::string l_string = readParam<std::string>(L, 2);
+	if (l_string.size() != 32) {
+		throw LuaError("PcgRandom:set_state: Expected hex string of 32 characters");
+	}
+
+	std::istringstream s_state_0(l_string.substr(0, 16));
+	std::istringstream s_state_1(l_string.substr(16, 16));
+
+	u64 state[2];
+	s_state_0 >> std::hex >> state[0];
+	s_state_1 >> std::hex >> state[1];
+	
+	o->m_rnd.setState(state);
+	
+	return 0;
+}
 
 int LuaPcgRandom::create_object(lua_State *L)
 {
@@ -542,6 +590,8 @@ const char LuaPcgRandom::className[] = "PcgRandom";
 const luaL_Reg LuaPcgRandom::methods[] = {
 	luamethod(LuaPcgRandom, next),
 	luamethod(LuaPcgRandom, rand_normal_dist),
+	luamethod(LuaPcgRandom, get_state),
+	luamethod(LuaPcgRandom, set_state),
 	{0,0}
 };
 
diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h
index ffbdb7d22..5dd73453a 100644
--- a/src/script/lua_api/l_noise.h
+++ b/src/script/lua_api/l_noise.h
@@ -119,6 +119,8 @@ private:
 	// next(self, min=0, max=32767) -> get next value
 	static int l_next(lua_State *L);
 
+	// save state
+	static int l_get_state(lua_State *L);
 public:
 	LuaPseudoRandom(s32 seed) : m_pseudo(seed) {}
 
@@ -153,6 +155,9 @@ private:
 	// get next normally distributed random value
 	static int l_rand_normal_dist(lua_State *L);
 
+	// save and restore state
+	static int l_get_state(lua_State *L);
+	static int l_set_state(lua_State *L);
 public:
 	LuaPcgRandom(u64 seed) : m_rnd(seed) {}
 	LuaPcgRandom(u64 seed, u64 seq) : m_rnd(seed, seq) {}
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 7e380be4b..ad8c0af71 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -22,6 +22,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lua_api/l_object.h"
 #include <cmath>
+#include <lua.h>
 #include "lua_api/l_internal.h"
 #include "lua_api/l_inventory.h"
 #include "lua_api/l_item.h"
@@ -37,6 +38,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "server/luaentity_sao.h"
 #include "server/player_sao.h"
 #include "server/serverinventorymgr.h"
+#include "server/unit_sao.h"
 
 /*
 	ObjectRef
@@ -114,6 +116,13 @@ int ObjectRef::l_remove(lua_State *L)
 	return 0;
 }
 
+// is_valid(self)
+int ObjectRef::l_is_valid(lua_State *L)
+{
+	lua_pushboolean(L, getobject(checkObject<ObjectRef>(L, 1)) != nullptr);
+	return 1;
+}
+
 // get_pos(self)
 int ObjectRef::l_get_pos(lua_State *L)
 {
@@ -142,6 +151,21 @@ int ObjectRef::l_set_pos(lua_State *L)
 	return 0;
 }
 
+// add_pos(self, pos)
+int ObjectRef::l_add_pos(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	v3f pos = checkFloatPos(L, 2);
+
+	sao->addPos(pos);
+	return 0;
+}
+
 // move_to(self, pos, continuous)
 int ObjectRef::l_move_to(lua_State *L)
 {
@@ -163,16 +187,21 @@ int ObjectRef::l_punch(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
-	ObjectRef *puncher_ref = checkObject<ObjectRef>(L, 2);
+	ObjectRef *puncher_ref = lua_isnoneornil(L, 2) ? nullptr : checkObject<ObjectRef>(L, 2);
 	ServerActiveObject *sao = getobject(ref);
-	ServerActiveObject *puncher = getobject(puncher_ref);
-	if (sao == nullptr || puncher == nullptr)
+	ServerActiveObject *puncher = puncher_ref ? getobject(puncher_ref) : nullptr;
+	if (sao == nullptr)
 		return 0;
 
 	float time_from_last_punch = readParam<float>(L, 3, 1000000.0f);
 	ToolCapabilities toolcap = read_tool_capabilities(L, 4);
-	v3f dir = readParam<v3f>(L, 5, sao->getBasePosition() - puncher->getBasePosition());
-	dir.normalize();
+	v3f dir;
+	if (puncher) {
+		dir = readParam<v3f>(L, 5, sao->getBasePosition() - puncher->getBasePosition());
+		dir.normalize();
+	} else {
+		dir = readParam<v3f>(L, 5, v3f(0));
+	}
 
 	u32 wear = sao->punch(dir, &toolcap, puncher, time_from_last_punch);
 	lua_pushnumber(L, wear);
@@ -319,7 +348,7 @@ int ObjectRef::l_set_wielded_item(lua_State *L)
 
 	bool success = sao->setWieldedItem(item);
 	if (success && sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendInventory((PlayerSAO *)sao, true);
+		getServer(L)->SendInventory(((PlayerSAO *)sao)->getPlayer(), true);
 	}
 	lua_pushboolean(L, success);
 	return 1;
@@ -527,16 +556,25 @@ int ObjectRef::l_set_animation_frame_speed(lua_State *L)
 int ObjectRef::l_set_bone_position(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L, "Deprecated call to set_bone_position, use set_bone_override instead", 1, true);
+
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
 	ServerActiveObject *sao = getobject(ref);
 	if (sao == nullptr)
 		return 0;
 
-	std::string bone = readParam<std::string>(L, 2, "");
-	v3f position = readParam<v3f>(L, 3, v3f(0, 0, 0));
-	v3f rotation = readParam<v3f>(L, 4, v3f(0, 0, 0));
-
-	sao->setBonePosition(bone, position, rotation);
+	std::string bone;
+	if (!lua_isnoneornil(L, 2))
+		bone = readParam<std::string>(L, 2);
+	BoneOverride props;
+	if (!lua_isnoneornil(L, 3))
+		props.position.vector = check_v3f(L, 3);
+	if (!lua_isnoneornil(L, 4))
+		props.rotation.next = core::quaternion(check_v3f(L, 4) * core::DEGTORAD);
+	props.position.absolute = true;
+	props.rotation.absolute = true;
+	sao->setBoneOverride(bone, props);
 	return 0;
 }
 
@@ -544,22 +582,144 @@ int ObjectRef::l_set_bone_position(lua_State *L)
 int ObjectRef::l_get_bone_position(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
+
+	log_deprecated(L, "Deprecated call to get_bone_position, use get_bone_override instead", 1, true);
+
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
 	ServerActiveObject *sao = getobject(ref);
 	if (sao == nullptr)
 		return 0;
 
 	std::string bone = readParam<std::string>(L, 2, "");
-
-	v3f position = v3f(0, 0, 0);
-	v3f rotation = v3f(0, 0, 0);
-	sao->getBonePosition(bone, &position, &rotation);
-
-	push_v3f(L, position);
-	push_v3f(L, rotation);
+	BoneOverride props = sao->getBoneOverride(bone);
+	push_v3f(L, props.position.vector);
+	v3f euler_rot;
+	props.rotation.next.toEuler(euler_rot);
+	push_v3f(L, euler_rot * core::RADTODEG);
 	return 2;
 }
 
+// set_bone_override(self, bone, override)
+int ObjectRef::l_set_bone_override(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == NULL)
+		return 0;
+
+	std::string bone = readParam<std::string>(L, 2);
+
+	BoneOverride props;
+	if (lua_isnoneornil(L, 3)) {
+		sao->setBoneOverride(bone, props);
+		return 0;
+	}
+
+	auto read_prop_attrs = [L](auto &prop) {
+		lua_getfield(L, -1, "absolute");
+		prop.absolute = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+
+		lua_getfield(L, -1, "interpolation");
+		if (lua_isnumber(L, -1))
+			prop.interp_timer = lua_tonumber(L, -1);
+		lua_pop(L, 1);
+	};
+
+	lua_getfield(L, 3, "position");
+	if (!lua_isnil(L, -1)) {
+		lua_getfield(L, -1, "vec");
+		if (!lua_isnil(L, -1))
+			props.position.vector = check_v3f(L, -1);
+		lua_pop(L, 1);
+
+		read_prop_attrs(props.position);
+	}
+	lua_pop(L, 1);
+
+	lua_getfield(L, 3, "rotation");
+	if (!lua_isnil(L, -1)) {
+		lua_getfield(L, -1, "vec");
+		if (!lua_isnil(L, -1))
+			props.rotation.next = core::quaternion(check_v3f(L, -1));
+		lua_pop(L, 1);
+
+		read_prop_attrs(props.rotation);
+	}
+	lua_pop(L, 1);
+
+	lua_getfield(L, 3, "scale");
+	if (!lua_isnil(L, -1)) {
+		lua_getfield(L, -1, "vec");
+		props.scale.vector = lua_isnil(L, -1) ? v3f(1) : check_v3f(L, -1);
+		lua_pop(L, 1);
+
+		read_prop_attrs(props.scale);
+	}
+	lua_pop(L, 1);
+
+	sao->setBoneOverride(bone, props);
+	return 0;
+}
+
+static void push_bone_override(lua_State *L, const BoneOverride &props)
+{
+	lua_newtable(L);
+
+	auto push_prop = [L](const char *name, const auto &prop, v3f vec) {
+		lua_newtable(L);
+		push_v3f(L, vec);
+		lua_setfield(L, -2, "vec");
+		lua_pushnumber(L, prop.interp_timer);
+		lua_setfield(L, -2, "interpolation");
+		lua_pushboolean(L, prop.absolute);
+		lua_setfield(L, -2, "absolute");
+		lua_setfield(L, -2, name);
+	};
+
+	push_prop("position", props.position, props.position.vector);
+
+	v3f euler_rot;
+	props.rotation.next.toEuler(euler_rot);
+	push_prop("rotation", props.rotation, euler_rot);
+
+	push_prop("scale", props.scale, props.scale.vector);
+
+	// leave only override table on top of the stack
+}
+
+// get_bone_override(self, bone)
+int ObjectRef::l_get_bone_override(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == NULL)
+		return 0;
+
+	std::string bone = readParam<std::string>(L, 2);
+
+	push_bone_override(L, sao->getBoneOverride(bone));
+	return 1;
+}
+
+// get_bone_overrides(self)
+int ObjectRef::l_get_bone_overrides(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+	ServerActiveObject *co = getobject(ref);
+	if (co == NULL)
+		return 0;
+	lua_newtable(L);
+	for (const auto &bone_pos : co->getBoneOverrides()) {
+		push_bone_override(L, bone_pos.second);
+		lua_setfield(L, -2, bone_pos.first.c_str());
+	}
+	return 1;
+}
+
 // set_attach(self, parent, bone, position, rotation, force_visible)
 int ObjectRef::l_set_attach(lua_State *L)
 {
@@ -670,13 +830,16 @@ int ObjectRef::l_set_properties(lua_State *L)
 
 	auto lock = sao->lock_unique_rec();
 	
-	ObjectProperties *prop = sao->accessObjectProperties();
+	auto *prop = sao->accessObjectProperties();
 	if (prop == nullptr)
 		return 0;
 
+	const auto old = *prop;
 	read_object_properties(L, 2, sao, prop, getServer(L)->idef());
-	prop->validate();
-	sao->notifyObjectPropertiesModified();
+	if (*prop != old) {
+		prop->validate();
+		sao->notifyObjectPropertiesModified();
+	}
 	return 0;
 }
 
@@ -990,7 +1153,7 @@ int ObjectRef::l_get_entity_name(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
 	LuaEntitySAO *entitysao = getluaobject(ref);
-	log_deprecated(L,"Deprecated call to \"get_entity_name");
+	log_deprecated(L, "Deprecated call to \"get_entity_name\"");
 	if (entitysao == nullptr)
 		return 0;
 
@@ -1189,13 +1352,14 @@ int ObjectRef::l_set_fov(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	float degrees = static_cast<f32>(luaL_checknumber(L, 2));
-	bool is_multiplier = readParam<bool>(L, 3, false);
-	float transition_time = lua_isnumber(L, 4) ?
-		static_cast<f32>(luaL_checknumber(L, 4)) : 0.0f;
+	PlayerFovSpec s;
+	s.fov = readParam<float>(L, 2);
+	s.is_multiplier = readParam<bool>(L, 3, false);
+	if (lua_isnumber(L, 4))
+		s.transition_time = readParam<float>(L, 4);
 
-	player->setFov({degrees, is_multiplier, transition_time});
-	getServer(L)->SendPlayerFov(player->getPeerId());
+	if (player->setFov(s))
+		getServer(L)->SendPlayerFov(player->getPeerId());
 	return 0;
 }
 
@@ -1208,7 +1372,7 @@ int ObjectRef::l_get_fov(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	PlayerFovSpec fov_spec = player->getFov();
+	const auto &fov_spec = player->getFov();
 
 	lua_pushnumber(L, fov_spec.fov);
 	lua_pushboolean(L, fov_spec.is_multiplier);
@@ -1312,10 +1476,12 @@ int ObjectRef::l_set_inventory_formspec(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	std::string formspec = luaL_checkstring(L, 2);
+	auto formspec = readParam<std::string_view>(L, 2);
 
-	player->inventory_formspec = formspec;
-	getServer(L)->reportInventoryFormspecModified(player->getName());
+	if (formspec != player->inventory_formspec) {
+		player->inventory_formspec = formspec;
+		getServer(L)->reportInventoryFormspecModified(player->getName());
+	}
 	return 0;
 }
 
@@ -1328,7 +1494,7 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	std::string formspec = player->inventory_formspec;
+	auto &formspec = player->inventory_formspec;
 
 	lua_pushlstring(L, formspec.c_str(), formspec.size());
 	return 1;
@@ -1343,10 +1509,12 @@ int ObjectRef::l_set_formspec_prepend(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	std::string formspec = luaL_checkstring(L, 2);
+	auto formspec = readParam<std::string_view>(L, 2);
 
-	player->formspec_prepend = formspec;
-	getServer(L)->reportFormspecPrependModified(player->getName());
+	if (player->formspec_prepend != formspec) {
+		player->formspec_prepend = formspec;
+		getServer(L)->reportFormspecPrependModified(player->getName());
+	}
 	return 0;
 }
 
@@ -1359,7 +1527,7 @@ int ObjectRef::l_get_formspec_prepend(lua_State *L)
 	if (player == nullptr)
 		 return 0;
 
-	std::string formspec = player->formspec_prepend;
+	auto &formspec = player->formspec_prepend;
 
 	lua_pushlstring(L, formspec.c_str(), formspec.size());
 	return 1;
@@ -1372,7 +1540,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
 	RemotePlayer *player = getplayer(ref);
 
-	lua_newtable(L);
+	lua_createtable(L, 0, 12);
 	if (player == nullptr)
 		return 1;
 
@@ -1446,41 +1614,29 @@ int ObjectRef::l_set_physics_override(lua_State *L)
 	RemotePlayer *player = playersao->getPlayer();
 	auto &phys = player->physics_override;
 
-	if (lua_istable(L, 2)) {
-		bool modified = false;
-		modified |= getfloatfield(L, 2, "speed", phys.speed);
-		modified |= getfloatfield(L, 2, "jump", phys.jump);
-		modified |= getfloatfield(L, 2, "gravity", phys.gravity);
-		modified |= getboolfield(L, 2, "sneak", phys.sneak);
-		modified |= getboolfield(L, 2, "sneak_glitch", phys.sneak_glitch);
-		modified |= getboolfield(L, 2, "new_move", phys.new_move);
-		modified |= getfloatfield(L, 2, "speed_climb", phys.speed_climb);
-		modified |= getfloatfield(L, 2, "speed_crouch", phys.speed_crouch);
-		modified |= getfloatfield(L, 2, "liquid_fluidity", phys.liquid_fluidity);
-		modified |= getfloatfield(L, 2, "liquid_fluidity_smooth", phys.liquid_fluidity_smooth);
-		modified |= getfloatfield(L, 2, "liquid_sink", phys.liquid_sink);
-		modified |= getfloatfield(L, 2, "acceleration_default", phys.acceleration_default);
-		modified |= getfloatfield(L, 2, "acceleration_air", phys.acceleration_air);
-		if (modified)
-			playersao->m_physics_override_sent = false;
-	} else {
-		// old, non-table format
-		// TODO: Remove this code after version 5.4.0
-		log_deprecated(L, "Deprecated use of set_physics_override(num, num, num)");
+	const PlayerPhysicsOverride old = phys;
 
-		if (!lua_isnil(L, 2)) {
-			phys.speed = lua_tonumber(L, 2);
-			playersao->m_physics_override_sent = false;
-		}
-		if (!lua_isnil(L, 3)) {
-			phys.jump = lua_tonumber(L, 3);
-			playersao->m_physics_override_sent = false;
-		}
-		if (!lua_isnil(L, 4)) {
-			phys.gravity = lua_tonumber(L, 4);
-			playersao->m_physics_override_sent = false;
-		}
-	}
+	luaL_checktype(L, 2, LUA_TTABLE);
+
+	getfloatfield(L, 2, "speed", phys.speed);
+	getfloatfield(L, 2, "jump", phys.jump);
+	getfloatfield(L, 2, "gravity", phys.gravity);
+	getboolfield(L, 2, "sneak", phys.sneak);
+	getboolfield(L, 2, "sneak_glitch", phys.sneak_glitch);
+	getboolfield(L, 2, "new_move", phys.new_move);
+	getfloatfield(L, 2, "speed_climb", phys.speed_climb);
+	getfloatfield(L, 2, "speed_crouch", phys.speed_crouch);
+	getfloatfield(L, 2, "liquid_fluidity", phys.liquid_fluidity);
+	getfloatfield(L, 2, "liquid_fluidity_smooth", phys.liquid_fluidity_smooth);
+	getfloatfield(L, 2, "liquid_sink", phys.liquid_sink);
+	getfloatfield(L, 2, "acceleration_default", phys.acceleration_default);
+	getfloatfield(L, 2, "acceleration_air", phys.acceleration_air);
+	getfloatfield(L, 2, "speed_fast", phys.speed_fast);
+	getfloatfield(L, 2, "acceleration_fast", phys.acceleration_fast);
+	getfloatfield(L, 2, "speed_walk", phys.speed_walk);
+
+	if (phys != old)
+		playersao->m_physics_override_sent = false;
 	return 0;
 }
 
@@ -1521,6 +1677,12 @@ int ObjectRef::l_get_physics_override(lua_State *L)
 	lua_setfield(L, -2, "acceleration_default");
 	lua_pushnumber(L, phys.acceleration_air);
 	lua_setfield(L, -2, "acceleration_air");
+	lua_pushnumber(L, phys.speed_fast);
+	lua_setfield(L, -2, "speed_fast");
+	lua_pushnumber(L, phys.acceleration_fast);
+	lua_setfield(L, -2, "acceleration_fast");
+	lua_pushnumber(L, phys.speed_walk);
+	lua_setfield(L, -2, "speed_walk");
 	return 1;
 }
 
@@ -1583,6 +1745,7 @@ int ObjectRef::l_hud_change(lua_State *L)
 	void *value = nullptr;
 	bool ok = read_hud_change(L, stat, elem, &value);
 
+	// FIXME: only send when actually changed
 	if (ok)
 		getServer(L)->hudChange(player, id, stat, value);
 
@@ -1609,6 +1772,28 @@ int ObjectRef::l_hud_get(lua_State *L)
 	return 1;
 }
 
+// hud_get_all(self)
+int ObjectRef::l_hud_get_all(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+	RemotePlayer *player = getplayer(ref);
+	if (player == nullptr)
+		return 0;
+
+	lua_newtable(L);
+	player->hudApply([&](const std::vector<HudElement*>& hud) {
+		for (std::size_t id = 0; id < hud.size(); ++id) {
+			HudElement *elem = hud[id];
+			if (elem != nullptr) {
+				push_hud_element(L, elem);
+				lua_rawseti(L, -2, id);
+			}
+		}
+	});
+	return 1;
+}
+
 // hud_set_flags(self, flags)
 int ObjectRef::l_hud_set_flags(lua_State *L)
 {
@@ -1680,7 +1865,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	lua_pushnumber(L, player->getHotbarItemcount());
+	lua_pushinteger(L, player->getHotbarItemcount());
 	return 1;
 }
 
@@ -1841,15 +2026,21 @@ int ObjectRef::l_set_sky(lua_State *L)
 			if (!lua_isnil(L, -1))
 				sky_params.fog_tint_type = luaL_checkstring(L, -1);
 			lua_pop(L, 1);
-
-			// pop "sky_color" table
-			lua_pop(L, 1);
 		}
+		lua_pop(L, 1);
+
 		lua_getfield(L, 2, "fog");
 		if (lua_istable(L, -1)) {
-			sky_params.fog_distance = getintfield_default(L, -1,  "fog_distance", sky_params.fog_distance);
-			sky_params.fog_start = getfloatfield_default(L, -1,  "fog_start", sky_params.fog_start);
+			sky_params.fog_distance = getintfield_default(L, -1,
+				"fog_distance", sky_params.fog_distance);
+			sky_params.fog_start = getfloatfield_default(L, -1,
+				"fog_start", sky_params.fog_start);
+
+			lua_getfield(L, -1, "fog_color");
+			read_color(L, -1, &sky_params.fog_color);
+			lua_pop(L, 1);
 		}
+		lua_pop(L, 1);
 	} else {
 		// Handle old set_sky calls, and log deprecated:
 		log_deprecated(L, "Deprecated call to set_sky, please check lua_api.md");
@@ -2378,7 +2569,14 @@ int ObjectRef::l_set_lighting(lua_State *L)
 			lighting.exposure.center_weight_power = getfloatfield_default(L, -1, "center_weight_power", lighting.exposure.center_weight_power);
 		}
 		lua_pop(L, 1); // exposure
-	}
+
+		lua_getfield(L, 2, "volumetric_light");
+		if (lua_istable(L, -1)) {
+			getfloatfield(L, -1, "strength", lighting.volumetric_light_strength);
+			lighting.volumetric_light_strength = rangelim(lighting.volumetric_light_strength, 0.0f, 1.0f);
+		}
+		lua_pop(L, 1); // volumetric_light
+}
 
 	getServer(L)->setLighting(player, lighting);
 	return 0;
@@ -2416,6 +2614,10 @@ int ObjectRef::l_get_lighting(lua_State *L)
 	lua_pushnumber(L, lighting.exposure.center_weight_power);
 	lua_setfield(L, -2, "center_weight_power");
 	lua_setfield(L, -2, "exposure");
+	lua_newtable(L); // "volumetric_light"
+	lua_pushnumber(L, lighting.volumetric_light_strength);
+	lua_setfield(L, -2, "strength");
+	lua_setfield(L, -2, "volumetric_light");
 	return 1;
 }
 
@@ -2467,8 +2669,10 @@ const char ObjectRef::className[] = "ObjectRef";
 luaL_Reg ObjectRef::methods[] = {
 	// ServerActiveObject
 	luamethod(ObjectRef, remove),
+	luamethod(ObjectRef, is_valid),
 	luamethod_aliased(ObjectRef, get_pos, getpos),
 	luamethod_aliased(ObjectRef, set_pos, setpos),
+	luamethod(ObjectRef, add_pos),
 	luamethod_aliased(ObjectRef, move_to, moveto),
 	luamethod(ObjectRef, punch),
 	luamethod(ObjectRef, right_click),
@@ -2486,6 +2690,9 @@ luaL_Reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, set_animation_frame_speed),
 	luamethod(ObjectRef, set_bone_position),
 	luamethod(ObjectRef, get_bone_position),
+	luamethod(ObjectRef, set_bone_override),
+	luamethod(ObjectRef, get_bone_override),
+	luamethod(ObjectRef, get_bone_overrides),
 	luamethod(ObjectRef, set_attach),
 	luamethod(ObjectRef, get_attach),
 	luamethod(ObjectRef, get_children),
@@ -2544,6 +2751,7 @@ luaL_Reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, hud_remove),
 	luamethod(ObjectRef, hud_change),
 	luamethod(ObjectRef, hud_get),
+	luamethod(ObjectRef, hud_get_all),
 	luamethod(ObjectRef, hud_set_flags),
 	luamethod(ObjectRef, hud_get_flags),
 	luamethod(ObjectRef, hud_set_hotbar_itemcount),
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h
index 2e1e6da87..80ade298f 100644
--- a/src/script/lua_api/l_object.h
+++ b/src/script/lua_api/l_object.h
@@ -70,12 +70,18 @@ private:
 	// remove(self)
 	static int l_remove(lua_State *L);
 
+	// is_valid(self)
+	static int l_is_valid(lua_State *L);
+
 	// get_pos(self)
 	static int l_get_pos(lua_State *L);
 
 	// set_pos(self, pos)
 	static int l_set_pos(lua_State *L);
 
+	// add_pos(self, pos)
+	static int l_add_pos(lua_State *L);
+
 	// move_to(self, pos, continuous)
 	static int l_move_to(lua_State *L);
 
@@ -133,6 +139,15 @@ private:
 	// get_bone_position(self, bone)
 	static int l_get_bone_position(lua_State *L);
 
+	// set_bone_override(self, bone)
+	static int l_set_bone_override(lua_State *L);
+
+	// get_bone_override(self, bone)
+	static int l_get_bone_override(lua_State *L);
+
+	// get_bone_override(self)
+	static int l_get_bone_overrides(lua_State *L);
+
 	// set_attach(self, parent, bone, position, rotation)
 	static int l_set_attach(lua_State *L);
 
@@ -291,6 +306,9 @@ private:
 	// hud_get(self, id)
 	static int l_hud_get(lua_State *L);
 
+	// hud_get_all(self)
+	static int l_hud_get_all(lua_State *L);
+
 	// hud_set_flags(self, flags)
 	static int l_hud_set_flags(lua_State *L);
 
diff --git a/src/script/lua_api/l_playermeta.cpp b/src/script/lua_api/l_playermeta.cpp
index def65a1cc..e2e6ed8da 100644
--- a/src/script/lua_api/l_playermeta.cpp
+++ b/src/script/lua_api/l_playermeta.cpp
@@ -59,7 +59,6 @@ void PlayerMetaRef::Register(lua_State *L)
 	// lua_register(L, className, create_object);
 }
 
-// clang-format off
 const char PlayerMetaRef::className[] = "PlayerMetaRef";
 const luaL_Reg PlayerMetaRef::methods[] = {
 	luamethod(MetaDataRef, contains),
@@ -76,4 +75,3 @@ const luaL_Reg PlayerMetaRef::methods[] = {
 	luamethod(MetaDataRef, equals),
 	{0,0}
 };
-// clang-format on
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 9572eeb40..e78e4df80 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -32,6 +32,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "environment.h"
 #include "remoteplayer.h"
 #include "log.h"
+#include "filesys.h"
 #include <algorithm>
 
 // request_shutdown()
@@ -170,26 +171,6 @@ int ModApiServer::l_get_player_information(lua_State *L)
 		return 1;
 	}
 
-	/*
-		Be careful not to introduce a depdendency on the connection to
-		the peer here. This function is >>REQUIRED<< to still be able to return
-		values even when the peer unexpectedly disappears.
-		Hence all the ConInfo values here are optional.
-	*/
-
-	auto getConInfo = [&] (con::rtt_stat_type type, float *value) -> bool {
-		return server->getClientConInfo(player->getPeerId(), type, value);
-	};
-
-	float min_rtt, max_rtt, avg_rtt, min_jitter, max_jitter, avg_jitter;
-	bool have_con_info =
-		getConInfo(con::MIN_RTT, &min_rtt) &&
-		getConInfo(con::MAX_RTT, &max_rtt) &&
-		getConInfo(con::AVG_RTT, &avg_rtt) &&
-		getConInfo(con::MIN_JITTER, &min_jitter) &&
-		getConInfo(con::MAX_JITTER, &max_jitter) &&
-		getConInfo(con::AVG_JITTER, &avg_jitter);
-
 	ClientInfo info;
 	if (!server->getClientInfo(player->getPeerId(), info)) {
 		warningstream << FUNCTION_NAME << ": no client info?!" << std::endl;
@@ -214,6 +195,26 @@ int ModApiServer::l_get_player_information(lua_State *L)
 	}
 	lua_settable(L, table);
 
+	/*
+		Be careful not to introduce a depdendency on the connection to
+		the peer here. This function is >>REQUIRED<< to still be able to return
+		values even when the peer unexpectedly disappears.
+		Hence all the ConInfo values here are optional.
+	*/
+
+	auto getConInfo = [&] (con::rtt_stat_type type, float *value) -> bool {
+		return server->getClientConInfo(player->getPeerId(), type, value);
+	};
+
+	float min_rtt, max_rtt, avg_rtt, min_jitter, max_jitter, avg_jitter;
+	bool have_con_info =
+		getConInfo(con::MIN_RTT, &min_rtt) &&
+		getConInfo(con::MAX_RTT, &max_rtt) &&
+		getConInfo(con::AVG_RTT, &avg_rtt) &&
+		getConInfo(con::MIN_JITTER, &min_jitter) &&
+		getConInfo(con::MAX_JITTER, &max_jitter) &&
+		getConInfo(con::AVG_JITTER, &avg_jitter);
+
 	if (have_con_info) { // may be missing
 		lua_pushstring(L, "min_rtt");
 		lua_pushnumber(L, min_rtt);
@@ -320,6 +321,11 @@ int ModApiServer::l_get_player_window_information(lua_State *L)
 	lua_pushstring(L, "real_hud_scaling");
 	lua_pushnumber(L, dynamic->real_hud_scaling);
 	lua_settable(L, dyn_table);
+
+	lua_pushstring(L, "touch_controls");
+	lua_pushboolean(L, dynamic->touch_controls);
+	lua_settable(L, dyn_table);
+
 	return 1;
 }
 
@@ -423,6 +429,10 @@ int ModApiServer::l_show_formspec(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	const char *playername = luaL_checkstring(L, 1);
 	const char *formname = luaL_checkstring(L, 2);
+	if (*formname == '\0') {
+		log_deprecated(L, "Deprecated call to `minetest.show_formspec`:"
+				"`formname` must not be empty");
+	}
 	const char *formspec = luaL_checkstring(L, 3);
 
 	if(getServer(L)->showFormspec(playername,formspec,formname))
@@ -438,7 +448,11 @@ int ModApiServer::l_show_formspec(lua_State *L)
 int ModApiServer::l_get_current_modname(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
+	std::string s = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (!s.empty())
+		lua_pushstring(L, s.c_str());
+	else
+		lua_pushnil(L);
 	return 1;
 }
 
@@ -501,6 +515,24 @@ int ModApiServer::l_get_worldpath(lua_State *L)
 	return 1;
 }
 
+// get_mod_data_path()
+int ModApiServer::l_get_mod_data_path(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	std::string modname = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (modname.empty())
+		return 0;
+
+	const Server *srv = getServer(L);
+	std::string path = srv->getModDataPath() + DIR_DELIM + modname;
+	if (!fs::CreateAllDirs(path))
+		throw LuaError("Failed to create dir");
+
+	lua_pushstring(L, path.c_str());
+	return 1;
+}
+
 // sound_play(spec, parameters, [ephemeral])
 int ModApiServer::l_sound_play(lua_State *L)
 {
@@ -543,32 +575,57 @@ int ModApiServer::l_dynamic_add_media(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	if (!getEnv(L))
-		throw LuaError("Dynamic media cannot be added before server has started up");
 	Server *server = getServer(L);
+	const bool at_startup = !getEnv(L);
 
-	std::string filepath;
-	std::string to_player;
-	bool ephemeral = false;
+	std::string tmp;
+	Server::DynamicMediaArgs args;
 
 	if (lua_istable(L, 1)) {
-		getstringfield(L, 1, "filepath", filepath);
-		getstringfield(L, 1, "to_player", to_player);
-		getboolfield(L, 1, "ephemeral", ephemeral);
+		getstringfield(L, 1, "filename", args.filename);
+		if (getstringfield(L, 1, "filepath", tmp))
+			args.filepath = tmp;
+		args.data.emplace();
+		if (!getstringfield(L, 1, "filedata", *args.data))
+			args.data.reset();
+		getstringfield(L, 1, "to_player", args.to_player);
+		getboolfield(L, 1, "ephemeral", args.ephemeral);
 	} else {
-		filepath = readParam<std::string>(L, 1);
+		tmp = readParam<std::string>(L, 1);
+		args.filepath = tmp;
+	}
+	if (at_startup) {
+		if (!lua_isnoneornil(L, 2))
+			throw LuaError("must be called without callback at load-time");
+		// In order to keep edge cases to a minimum actually use an empty function.
+		int err = luaL_loadstring(L, "");
+		SANITY_CHECK(err == 0);
+		lua_replace(L, 2);
+	} else {
+		luaL_checktype(L, 2, LUA_TFUNCTION);
 	}
-	if (filepath.empty())
-		luaL_typerror(L, 1, "non-empty string");
-	luaL_checktype(L, 2, LUA_TFUNCTION);
 
-	CHECK_SECURE_PATH(L, filepath.c_str(), false);
+	// validate
+	if (args.filepath) {
+		if (args.filepath->empty())
+			throw LuaError("filepath must be non-empty");
+		if (args.data)
+			throw LuaError("cannot provide both filepath and filedata");
+	} else if (args.data) {
+		if (args.filename.empty())
+			throw LuaError("filename required");
+	} else {
+		throw LuaError("either filepath or filedata must be provided");
+	}
 
-	u32 token = server->getScriptIface()->allocateDynamicMediaCallback(L, 2);
+	if (args.filepath)
+		CHECK_SECURE_PATH(L, args.filepath->c_str(), false);
 
-	bool ok = server->dynamicAddMedia(filepath, token, to_player, ephemeral);
+	args.token = server->getScriptIface()->allocateDynamicMediaCallback(L, 2);
+
+	bool ok = server->dynamicAddMedia(args);
 	if (!ok)
-		server->getScriptIface()->freeDynamicMediaCallback(token);
+		server->getScriptIface()->freeDynamicMediaCallback(args.token);
 	lua_pushboolean(L, ok);
 
 	return 1;
@@ -629,17 +686,32 @@ int ModApiServer::l_register_async_dofile(lua_State *L)
 	std::string path = readParam<std::string>(L, 1);
 	CHECK_SECURE_PATH(L, path.c_str(), false);
 
-	// Find currently running mod name (only at init time)
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	if (!lua_isstring(L, -1))
-		return 0;
-	std::string modname = readParam<std::string>(L, -1);
+	std::string modname = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (modname.empty())
+		throw ModError("cannot determine mod name");
 
 	getServer(L)->m_async_init_files.emplace_back(modname, path);
 	lua_pushboolean(L, true);
 	return 1;
 }
 
+// register_mapgen_script(path)
+int ModApiServer::l_register_mapgen_script(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	std::string path = readParam<std::string>(L, 1);
+	CHECK_SECURE_PATH(L, path.c_str(), false);
+
+	std::string modname = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (modname.empty())
+		throw ModError("cannot determine mod name");
+
+	getServer(L)->m_mapgen_init_files.emplace_back(modname, path);
+	lua_pushboolean(L, true);
+	return 1;
+}
+
 // serialize_roundtrip(value)
 // Meant for unit testing the packer from Lua
 int ModApiServer::l_serialize_roundtrip(lua_State *L)
@@ -670,6 +742,7 @@ void ModApiServer::Initialize(lua_State *L, int top)
 	API_FCT(get_server_status);
 	API_FCT(get_server_uptime);
 	API_FCT(get_server_max_lag);
+	API_FCT(get_mod_data_path);
 	API_FCT(get_worldpath);
 	API_FCT(is_singleplayer);
 
@@ -703,6 +776,8 @@ void ModApiServer::Initialize(lua_State *L, int top)
 	API_FCT(do_async_callback);
 	API_FCT(register_async_dofile);
 	API_FCT(serialize_roundtrip);
+
+	API_FCT(register_mapgen_script);
 }
 
 void ModApiServer::InitializeAsync(lua_State *L, int top)
diff --git a/src/script/lua_api/l_server.h b/src/script/lua_api/l_server.h
index e73c1f07a..d95d4eae0 100644
--- a/src/script/lua_api/l_server.h
+++ b/src/script/lua_api/l_server.h
@@ -42,6 +42,9 @@ private:
 	// get_worldpath()
 	static int l_get_worldpath(lua_State *L);
 
+	// get_mod_data_path()
+	static int l_get_mod_data_path(lua_State *L);
+
 	// is_singleplayer()
 	static int l_is_singleplayer(lua_State *L);
 
@@ -121,6 +124,9 @@ private:
 	// register_async_dofile(path)
 	static int l_register_async_dofile(lua_State *L);
 
+	// register_mapgen_script(path)
+	static int l_register_mapgen_script(lua_State *L);
+
 	// serialize_roundtrip(obj)
 	static int l_serialize_roundtrip(lua_State *L);
 
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index 091b83581..170016fd4 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -45,6 +45,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "version.h"
 #include "util/hex.h"
 #include "util/sha1.h"
+#include "my_sha256.h"
 #include "util/png.h"
 #include <cstdio>
 
@@ -321,8 +322,7 @@ int ModApiUtil::l_compress(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	size_t size;
-	const char *data = luaL_checklstring(L, 1, &size);
+	auto data = readParam<std::string_view>(L, 1);
 
 	LuaCompressMethod method = get_compress_method(L, 2);
 
@@ -333,13 +333,13 @@ int ModApiUtil::l_compress(lua_State *L)
 		if (!lua_isnoneornil(L, 3))
 			level = readParam<int>(L, 3);
 
-		compressZlib(reinterpret_cast<const u8 *>(data), size, os, level);
+		compressZlib(data, os, level);
 	} else if (method == LUA_COMPRESS_METHOD_ZSTD) {
 		int level = ZSTD_CLEVEL_DEFAULT;
 		if (!lua_isnoneornil(L, 3))
 			level = readParam<int>(L, 3);
 
-		compressZstd(reinterpret_cast<const u8 *>(data), size, os, level);
+		compressZstd(data, os, level);
 	}
 
 	std::string out = os.str();
@@ -353,12 +353,12 @@ int ModApiUtil::l_decompress(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	size_t size;
-	const char *data = luaL_checklstring(L, 1, &size);
+	auto data = readParam<std::string_view>(L, 1);
 
 	LuaCompressMethod method = get_compress_method(L, 2);
 
-	std::istringstream is(std::string(data, size), std::ios_base::binary);
+	// FIXME: zero copy possible in c++26 or with custom rdbuf
+	std::istringstream is(std::string(data), std::ios_base::binary);
 	std::ostringstream os(std::ios_base::binary);
 
 	if (method == LUA_COMPRESS_METHOD_DEFLATE) {
@@ -378,10 +378,9 @@ int ModApiUtil::l_encode_base64(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	size_t size;
-	const char *data = luaL_checklstring(L, 1, &size);
+	auto data = readParam<std::string_view>(L, 1);
 
-	std::string out = base64_encode((const unsigned char *)(data), size);
+	std::string out = base64_encode(data);
 
 	lua_pushlstring(L, out.data(), out.size());
 	return 1;
@@ -392,9 +391,7 @@ int ModApiUtil::l_decode_base64(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	size_t size;
-	const char *d = luaL_checklstring(L, 1, &size);
-	const std::string data = std::string(d, size);
+	auto data = readParam<std::string_view>(L, 1);
 
 	if (!base64_is_valid(data)) {
 		lua_pushnil(L);
@@ -490,12 +487,11 @@ int ModApiUtil::l_safe_file_write(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	const char *path = luaL_checkstring(L, 1);
-	size_t size;
-	const char *content = luaL_checklstring(L, 2, &size);
+	auto content = readParam<std::string_view>(L, 2);
 
 	CHECK_SECURE_PATH(L, path, true);
 
-	bool ret = fs::safeWriteToFile(path, std::string(content, size));
+	bool ret = fs::safeWriteToFile(path, content);
 	lua_pushboolean(L, ret);
 
 	return 1;
@@ -552,18 +548,16 @@ int ModApiUtil::l_get_version(lua_State *L)
 int ModApiUtil::l_sha1(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	size_t size;
-	const char *data = luaL_checklstring(L, 1, &size);
+
+	auto data = readParam<std::string_view>(L, 1);
 	bool hex = !lua_isboolean(L, 2) || !readParam<bool>(L, 2);
 
 	// Compute actual checksum of data
 	std::string data_sha1;
 	{
 		class SHA1 ctx;
-		ctx.addBytes(data, size);
-		unsigned char *data_tmpdigest = ctx.getDigest();
-		data_sha1.assign((char*) data_tmpdigest, 20);
-		free(data_tmpdigest);
+		ctx.addBytes(data);
+		data_sha1 = ctx.getDigest();
 	}
 
 	if (hex) {
@@ -576,6 +570,27 @@ int ModApiUtil::l_sha1(lua_State *L)
 	return 1;
 }
 
+int ModApiUtil::l_sha256(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	auto data = readParam<std::string_view>(L, 1);
+	bool hex = !lua_isboolean(L, 2) || !readParam<bool>(L, 2);
+
+	std::string data_sha256;
+	data_sha256.resize(SHA256_DIGEST_LENGTH);
+	mt_SHA256(reinterpret_cast<const unsigned char*>(data.data()), data.size(),
+		reinterpret_cast<unsigned char *>(data_sha256.data()));
+
+	if (hex) {
+		lua_pushstring(L, hex_encode(data_sha256).c_str());
+	} else {
+		lua_pushlstring(L, data_sha256.data(), data_sha256.size());
+	}
+
+	return 1;
+}
+
 // colorspec_to_colorstring(colorspec)
 int ModApiUtil::l_colorspec_to_colorstring(lua_State *L)
 {
@@ -635,12 +650,10 @@ int ModApiUtil::l_get_last_run_mod(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
-	std::string current_mod = readParam<std::string>(L, -1, "");
-	if (current_mod.empty()) {
-		lua_pop(L, 1);
-		lua_pushstring(L, getScriptApiBase(L)->getOrigin().c_str());
-	}
+	std::string current_mod = ScriptApiBase::getCurrentModNameInsecure(L);
+	if (current_mod.empty())
+		current_mod = getScriptApiBase(L)->getOrigin();
+	lua_pushstring(L, current_mod.c_str());
 	return 1;
 }
 
@@ -659,8 +672,8 @@ int ModApiUtil::l_urlencode(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	const char *value = luaL_checkstring(L, 1);
-	lua_pushstring(L, urlencode(value).c_str());
+	auto s = readParam<std::string_view>(L, 1);
+	lua_pushstring(L, urlencode(s).c_str());
 	return 1;
 }
 
@@ -702,6 +715,7 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(sha256);
 	API_FCT(colorspec_to_colorstring);
 	API_FCT(colorspec_to_bytes);
 
@@ -735,9 +749,13 @@ void ModApiUtil::InitializeClient(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(sha256);
 	API_FCT(colorspec_to_colorstring);
 	API_FCT(colorspec_to_bytes);
 
+	API_FCT(get_last_run_mod);
+	API_FCT(set_last_run_mod);
+
 	API_FCT(urlencode);
 
 	LuaSettings::create(L, g_settings, g_settings_path);
@@ -768,13 +786,14 @@ void ModApiUtil::InitializeAsync(lua_State *L, int top)
 	API_FCT(get_dir_list);
 	API_FCT(safe_file_write);
 
-	API_FCT(request_insecure_environment);
+	// no request_insecure_environment here! mod origins are not tracked securely here.
 
 	API_FCT(encode_base64);
 	API_FCT(decode_base64);
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(sha256);
 	API_FCT(colorspec_to_colorstring);
 	API_FCT(colorspec_to_bytes);
 
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index 8ee2928b1..e0b4b8161 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -116,6 +116,9 @@ private:
 	// sha1(string, raw)
 	static int l_sha1(lua_State *L);
 
+	// sha256(string, raw)
+	static int l_sha256(lua_State *L);
+
 	// colorspec_to_colorstring(colorspec)
 	static int l_colorspec_to_colorstring(lua_State *L);
 
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index 91bcbb25f..0026cce98 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -51,6 +51,9 @@ int LuaVoxelManip::l_read_from_map(lua_State *L)
 	if (vm->isOrphan())
 		return 0;
 
+	if (getEmergeThread(L))
+		throw LuaError("VoxelManip:read_from_map called in mapgen environment");
+
 	v3s16 bp1 = getNodeBlockPos(check_v3s16(L, 2));
 	v3s16 bp2 = getNodeBlockPos(check_v3s16(L, 3));
 	sortBoxVerticies(bp1, bp2);
@@ -113,14 +116,18 @@ int LuaVoxelManip::l_set_data(lua_State *L)
 
 int LuaVoxelManip::l_write_to_map(lua_State *L)
 {
-	GET_ENV_PTR;
-
 	LuaVoxelManip *o = checkObject<LuaVoxelManip>(L, 1);
 	bool update_light = !lua_isboolean(L, 2) || readParam<bool>(L, 2);
 
 	if (o->vm->isOrphan())
 		return 0;
 
+	// This wouldn't work anyway as we have no env ptr, but it's still unsafe.
+	if (getEmergeThread(L))
+		throw LuaError("VoxelManip:write_to_map called in mapgen environment");
+
+	GET_ENV_PTR;
+
 	ServerMap *map = &(env->getServerMap());
 
 	std::map<v3s16, MapBlock*> modified_blocks;
@@ -157,9 +164,8 @@ int LuaVoxelManip::l_set_node_at(lua_State *L)
 	v3s16 pos        = check_v3s16(L, 2);
 	MapNode n        = readnode(L, 3);
 
-	o->vm->setNodeNoEmerge(pos, n);
-
-	return 0;
+	lua_pushboolean(L, o->vm->setNodeNoEmerge(pos, n));
+	return 1;
 }
 
 int LuaVoxelManip::l_update_liquids(lua_State *L)
@@ -196,8 +202,8 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
 {
 	LuaVoxelManip *o = checkObject<LuaVoxelManip>(L, 1);
 	if (!o->is_mapgen_vm) {
-		warningstream << "VoxelManip:set_lighting called for a non-mapgen "
-			"VoxelManip object" << std::endl;
+		log_deprecated(L, "set_lighting called for a non-mapgen "
+			"VoxelManip object");
 		return 0;
 	}
 
diff --git a/src/script/scripting_emerge.cpp b/src/script/scripting_emerge.cpp
new file mode 100644
index 000000000..3467b1495
--- /dev/null
+++ b/src/script/scripting_emerge.cpp
@@ -0,0 +1,93 @@
+/*
+Minetest
+Copyright (C) 2022 sfan5 <sfan5@live.de>
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "scripting_emerge.h"
+#include "emerge_internal.h"
+#include "server.h"
+#include "settings.h"
+#include "cpp_api/s_internal.h"
+#include "common/c_packer.h"
+#include "lua_api/l_areastore.h"
+#include "lua_api/l_base.h"
+#include "lua_api/l_craft.h"
+#include "lua_api/l_env.h"
+#include "lua_api/l_item.h"
+#include "lua_api/l_itemstackmeta.h"
+#include "lua_api/l_mapgen.h"
+#include "lua_api/l_noise.h"
+#include "lua_api/l_server.h"
+#include "lua_api/l_util.h"
+#include "lua_api/l_vmanip.h"
+#include "lua_api/l_settings.h"
+
+extern "C" {
+#include <lualib.h>
+}
+
+EmergeScripting::EmergeScripting(EmergeThread *parent):
+		ScriptApiBase(ScriptingType::Emerge)
+{
+	setGameDef(parent->m_server);
+	setEmergeThread(parent);
+
+	SCRIPTAPI_PRECHECKHEADER
+
+	if (g_settings->getBool("secure.enable_security"))
+		initializeSecurity();
+
+	lua_getglobal(L, "core");
+	int top = lua_gettop(L);
+
+	InitializeModApi(L, top);
+
+	auto *data = ModApiBase::getServer(L)->m_lua_globals_data.get();
+	assert(data);
+	script_unpack(L, data);
+	lua_setfield(L, top, "transferred_globals");
+
+	lua_pop(L, 1);
+
+	// Push builtin initialization type
+	lua_pushstring(L, "emerge");
+	lua_setglobal(L, "INIT");
+}
+
+void EmergeScripting::InitializeModApi(lua_State *L, int top)
+{
+	// Register reference classes (userdata)
+	ItemStackMetaRef::Register(L);
+	LuaAreaStore::Register(L);
+	LuaItemStack::Register(L);
+	LuaPerlinNoise::Register(L);
+	LuaPerlinNoiseMap::Register(L);
+	LuaPseudoRandom::Register(L);
+	LuaPcgRandom::Register(L);
+	LuaSecureRandom::Register(L);
+	LuaVoxelManip::Register(L);
+	LuaSettings::Register(L);
+
+	// Initialize mod api modules
+	ModApiCraft::InitializeAsync(L, top);
+	ModApiEnvVM::InitializeEmerge(L, top);
+	ModApiItem::InitializeAsync(L, top);
+	ModApiMapgen::InitializeEmerge(L, top);
+	ModApiServer::InitializeAsync(L, top);
+	ModApiUtil::InitializeAsync(L, top);
+	// TODO ^ these should also be renamed to InitializeRO or such
+}
diff --git a/src/script/scripting_emerge.h b/src/script/scripting_emerge.h
new file mode 100644
index 000000000..713dda7c2
--- /dev/null
+++ b/src/script/scripting_emerge.h
@@ -0,0 +1,37 @@
+/*
+Minetest
+Copyright (C) 2022 sfan5 <sfan5@live.de>
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_mapgen.h"
+#include "cpp_api/s_security.h"
+
+class EmergeThread;
+
+class EmergeScripting:
+		virtual public ScriptApiBase,
+		public ScriptApiMapgen,
+		public ScriptApiSecurity
+{
+public:
+	EmergeScripting(EmergeThread *parent);
+
+private:
+	void InitializeModApi(lua_State *L, int top);
+};
diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 21fdb98a4..f3c7f0ab1 100644
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -61,7 +61,6 @@ MainMenuScripting::MainMenuScripting(GUIEngine* guiengine):
 	infostream << "SCRIPTAPI: Initialized main menu modules" << std::endl;
 }
 
-/******************************************************************************/
 void MainMenuScripting::initializeModApi(lua_State *L, int top)
 {
 	registerLuaClasses(L, top);
@@ -82,20 +81,31 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
 	asyncEngine.initialize(MAINMENU_NUM_ASYNC_THREADS);
 }
 
-/******************************************************************************/
 void MainMenuScripting::registerLuaClasses(lua_State *L, int top)
 {
 	LuaSettings::Register(L);
 	MainMenuSoundHandle::Register(L);
 }
 
-/******************************************************************************/
+void MainMenuScripting::beforeClose()
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "on_before_close");
+
+	PCALL_RES(lua_pcall(L, 0, 0, error_handler));
+
+	lua_pop(L, 2); // Pop core, error handler
+}
+
 void MainMenuScripting::step()
 {
 	asyncEngine.step(getStack());
 }
 
-/******************************************************************************/
 u32 MainMenuScripting::queueAsync(std::string &&serialized_func,
 		std::string &&serialized_param)
 {
diff --git a/src/script/scripting_mainmenu.h b/src/script/scripting_mainmenu.h
index 398574cc0..1410a3175 100644
--- a/src/script/scripting_mainmenu.h
+++ b/src/script/scripting_mainmenu.h
@@ -40,6 +40,9 @@ public:
 	// Global step handler to pass back async events
 	void step();
 
+	// Calls core.on_before_close()
+	void beforeClose();
+
 	// Pass async events from engine to async threads
 	u32 queueAsync(std::string &&serialized_func,
 		std::string &&serialized_param);
diff --git a/src/script/scripting_server.cpp b/src/script/scripting_server.cpp
index 52d768fb1..e73bd53cd 100644
--- a/src/script/scripting_server.cpp
+++ b/src/script/scripting_server.cpp
@@ -24,6 +24,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "server.h"
 #include "log.h"
 #include "settings.h"
+#include "filesys.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_areastore.h"
 #include "lua_api/l_auth.h"
@@ -93,6 +94,12 @@ ServerScripting::ServerScripting(Server* server):
 	infostream << "SCRIPTAPI: Initialized game modules" << std::endl;
 }
 
+void ServerScripting::loadBuiltin()
+{
+	loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
+	checkSetByBuiltin();
+}
+
 void ServerScripting::saveGlobals()
 {
 	SCRIPTAPI_PRECHECKHEADER
diff --git a/src/script/scripting_server.h b/src/script/scripting_server.h
index ee4d40e91..d43c08eb7 100644
--- a/src/script/scripting_server.h
+++ b/src/script/scripting_server.h
@@ -52,6 +52,7 @@ class ServerScripting:
 public:
 	ServerScripting(Server* server);
 
+	void loadBuiltin();
 	// use ScriptApiBase::loadMod() to load mods
 
 	// Save globals that are copied into other Lua envs
diff --git a/src/serialization.cpp b/src/serialization.cpp
index 50534b79d..d1b8e95a9 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -21,7 +21,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "serialization.h"
-
+#include "log.h"
 #include "util/serialize.h"
 
 #include <zlib.h>
@@ -111,11 +111,6 @@ void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level)
 	}
 }
 
-void compressZlib(const std::string &data, std::ostream &os, int level)
-{
-	compressZlib((u8*)data.c_str(), data.size(), os, level);
-}
-
 void decompressZlib(std::istream &is, std::ostream &os, size_t limit)
 {
 	z_stream z;
@@ -216,7 +211,6 @@ void compressZstd(const u8 *data, size_t data_size, std::ostream &os, int level)
 	// it will be destroyed when the thread ends
 	thread_local std::unique_ptr<ZSTD_CStream, ZSTD_Deleter> stream(ZSTD_createCStream());
 
-
 	ZSTD_initCStream(stream.get(), level);
 
 	const size_t bufsize = 16384;
@@ -252,11 +246,6 @@ void compressZstd(const u8 *data, size_t data_size, std::ostream &os, int level)
 
 }
 
-void compressZstd(const std::string &data, std::ostream &os, int level)
-{
-	compressZstd((u8*)data.c_str(), data.size(), os, level);
-}
-
 void decompressZstd(std::istream &is, std::ostream &os)
 {
 	// reusing the context is recommended for performance
@@ -300,7 +289,7 @@ void decompressZstd(std::istream &is, std::ostream &os)
 	}
 }
 
-void compress(u8 *data, u32 size, std::ostream &os, u8 version, int level)
+void compress(const u8 *data, u32 size, std::ostream &os, u8 version, int level)
 {
 	if(version >= 29)
 	{
@@ -350,16 +339,6 @@ void compress(u8 *data, u32 size, std::ostream &os, u8 version, int level)
 	os.write((char*)&current_byte, 1);
 }
 
-void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version, int level)
-{
-	compress(*data, data.getSize(), os, version, level);
-}
-
-void compress(const std::string &data, std::ostream &os, u8 version, int level)
-{
-	compress((u8*)data.c_str(), data.size(), os, version, level);
-}
-
 void decompress(std::istream &is, std::ostream &os, u8 version)
 {
 	if(version >= 29)
diff --git a/src/serialization.h b/src/serialization.h
index 16d0fb68d..d7825a7df 100644
--- a/src/serialization.h
+++ b/src/serialization.h
@@ -25,7 +25,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "irrlichttypes.h"
 #include "exceptions.h"
 #include <iostream>
-#include "util/pointer.h"
+#include <string_view>
 
 /*
 	Map format serialization version
@@ -86,21 +86,29 @@ inline bool ser_ver_supported(s32 v) {
 }
 
 /*
-	Misc. serialization functions
+	Compression functions
 */
 
 void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level = 2);
-void compressZlib(const std::string &data, std::ostream &os, int level = 2);
+inline void compressZlib(std::string_view data, std::ostream &os, int level = 2)
+{
+	compressZlib(reinterpret_cast<const u8*>(data.data()), data.size(), os, level);
+}
 void decompressZlib(std::istream &is, std::ostream &os, size_t limit = 0);
 
 void compressZstd(const u8 *data, size_t data_size, std::ostream &os, int level = 2);
-void compressZstd(const std::string &data, std::ostream &os, int level = 2);
+inline void compressZstd(std::string_view data, std::ostream &os, int level = 2)
+{
+	compressZstd(reinterpret_cast<const u8*>(data.data()), data.size(), os, level);
+}
 void decompressZstd(std::istream &is, std::ostream &os);
 
-// These choose between zlib and a self-made one according to version
-void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version, int level = -1);
-void compress(const std::string &data, std::ostream &os, u8 version, int level = -1);
-void compress(u8 *data, u32 size, std::ostream &os, u8 version, int level = -1);
+// These choose between zstd, zlib and a self-made one according to version
+void compress(const u8 *data, u32 size, std::ostream &os, u8 version, int level = 2);
+inline void compress(std::string_view data, std::ostream &os, u8 version, int level = 2)
+{
+	compress(reinterpret_cast<const u8*>(data.data()), data.size(), os, version, level);
+}
 void decompress(std::istream &is, std::ostream &os, u8 version);
 
 //freeminer:
diff --git a/src/server.cpp b/src/server.cpp
index 6fe3f57c2..b42e7b8c7 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -21,6 +21,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "server.h"
+#include <atomic>
 #include <iostream>
 #include <memory>
 #include <queue>
@@ -29,9 +30,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "network/connection.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
-#include "ban.h"
+#include "server/ban.h"
 #include "environment.h"
-#include "map.h"
+#include "servermap.h"
 #include "threading/mutex_auto_lock.h"
 #include "constants.h"
 #include "voxel.h"
@@ -54,9 +55,9 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "content_nodemeta.h"
 #include "content/mods.h"
 #include "modchannels.h"
-#include "serverlist.h"
+#include "server/serverlist.h"
 #include "util/string.h"
-#include "rollback.h"
+#include "server/rollback.h"
 #include "util/serialize.h"
 #include "util/thread.h"
 #include "defaultsettings.h"
@@ -124,35 +125,45 @@ void *ServerThread::run()
 	/*
 	 * The real business of the server happens on the ServerThread.
 	 * How this works:
-	 * AsyncRunStep() runs an actual server step as soon as enough time has
-	 * passed (dedicated_server_loop keeps track of that).
-	 * Receive() blocks at least(!) 30ms waiting for a packet (so this loop
-	 * doesn't busy wait) and will process any remaining packets.
+	 * AsyncRunStep() (which runs the actual server step) is called at the
+	 * server-step frequency. Receive() is used for waiting between the steps.
 	 */
 
 	try {
-		m_server->AsyncRunStep(true);
+		m_server->AsyncRunStep(0.0f, true);
 	} catch (con::ConnectionBindFailed &e) {
 		m_server->setAsyncFatalError(e.what());
 	} catch (LuaError &e) {
 		m_server->setAsyncFatalError(e);
 	}
 
+	float dtime = 0.0f;
+
 	while (!stopRequested()) {
 		ScopeProfiler spm(g_profiler, "Server::RunStep() (max)", SPT_MAX);
-		try {
-			m_server->AsyncRunStep();
 
-			m_server->Receive();
+		u64 t0 = porting::getTimeUs();
+
+		const Server::StepSettings step_settings = m_server->getStepSettings();
+
+		try {
+			m_server->AsyncRunStep(step_settings.pause ? 0.0f : dtime);
+
+			const float remaining_time = step_settings.steplen
+					- 1e-6f * (porting::getTimeUs() - t0);
+			m_server->Receive(remaining_time);
 
 		} catch (con::PeerNotFoundException &e) {
 			infostream<<"Server: PeerNotFoundException"<<std::endl;
 		} catch (ClientNotFoundException &e) {
+			infostream<<"Server: ClientNotFoundException"<<std::endl;
 		} catch (con::ConnectionBindFailed &e) {
 			m_server->setAsyncFatalError(e.what());
 		} catch (LuaError &e) {
 			m_server->setAsyncFatalError(e);
 		}
+
+		dtime = 1e-6f * (porting::getTimeUs() - t0);
 	}
 
 	END_DEBUG_EXCEPTION_HANDLER
@@ -331,6 +342,10 @@ Server::Server(
 			"Number of map edit events");
 
 	m_lag_gauge->set(g_settings->getFloat("dedicated_server_step"));
+
+	m_path_mod_data = porting::path_user + DIR_DELIM "mod_data";
+	if (!fs::CreateDir(m_path_mod_data))
+		throw ServerError("Failed to create mod data dir");
 }
 
 Server::~Server()
@@ -342,14 +357,36 @@ Server::~Server()
 			m_bind_addr.getPort());
 #endif
 
-
 	// Send shutdown message
 	SendChatMessage(PEER_ID_INEXISTENT, ChatMessage(CHATMESSAGE_TYPE_ANNOUNCE,
 			L"*** Server shutting down"));
 
+	actionstream << "Server: Shutting down" << std::endl;
+
+	// Stop server step from happening
+	if (m_thread) {
+		stop();
+		delete m_thread;
+	}
+
+	// Stop all emerge activity and finish off mapgen callbacks. Do this before
+	// shutdown callbacks since there may be state that is finalized in a
+	// callback.
+	// Note: The emerge manager is not deleted yet because further code can
+	//       still interact with map loading.
+	if (m_emerge)
+		m_emerge->stopThreads();
+
 	if (m_env) {
 		//MutexAutoLock envlock(m_env_mutex);
 
+		infostream << "Server: Executing shutdown hooks" << std::endl;
+		try {
+			m_script->on_shutdown();
+		} catch (ModError &e) {
+			addShutdownError(e);
+		}
+
 		infostream << "Server: Saving players" << std::endl;
 		m_env->saveLoadedPlayers();
 
@@ -364,60 +401,44 @@ Server::~Server()
 			kick_msg = g_settings->get("kick_msg_shutdown");
 		}
 		m_env->saveLoadedPlayers(true);
-		m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,
+		kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,
 			kick_msg, reconnect);
-	}
 
-	actionstream << "Server: Shutting down" << std::endl;
-
-	// Do this before stopping the server in case mapgen callbacks need to access
-	// server-controlled resources (like ModStorages). Also do them before
-	// shutdown callbacks since they may modify state that is finalized in a
-	// callback.
-	if (m_emerge)
-		m_emerge->stopThreads();
-
-	if (m_env) {
-		//MutexAutoLock envlock(m_env_mutex);
-
-		// Execute script shutdown hooks
-		infostream << "Executing shutdown hooks" << std::endl;
 		try {
-			m_script->on_shutdown();
+			// Empty out the environment, this can also invoke callbacks.
+			m_env->deactivateBlocksAndObjects();
 		} catch (ModError &e) {
 			addShutdownError(e);
 		}
 
 		infostream << "Server: Saving environment metadata" << std::endl;
 		m_env->saveMeta();
-	}
 
-	// Stop threads
-	if (m_thread) {
-		stop();
-		delete m_thread;
+		// Note that this also deletes and saves the map.
+		delete m_env;
+		m_env = nullptr;
 	}
 
 	// Write any changes before deletion.
 	if (m_mod_storage_database)
 		m_mod_storage_database->endSave();
 
-	// Delete things in the reverse order of creation
-	delete m_emerge;
-	delete m_env;
-	delete m_rollback;
-	delete m_mod_storage_database;
+	// Clean up files
+	for (auto &it : m_media) {
+		if (it.second.delete_at_shutdown) {
+			fs::DeleteSingleFileOrEmptyDirectory(it.second.path);
+		}
+	}
+
+	// Delete the rest in the reverse order of creation
+	delete m_game_settings;
 	delete m_banmanager;
+	delete m_mod_storage_database;
+	delete m_rollback;
 	delete m_itemdef;
 	delete m_nodedef;
 	delete m_craftdef;
 
-	// Deinitialize scripting
-	infostream << "Server: Deinitializing scripting" << std::endl;
-	delete m_script;
-	delete m_startup_server_map; // if available
-	delete m_game_settings;
-
 	while (!m_unsent_map_edit_queue.empty()) {
 		delete m_unsent_map_edit_queue.pop_front();
 		//m_unsent_map_edit_queue.pop();
@@ -447,7 +468,7 @@ void Server::init()
 */
 
 	// Create emerge manager
-	m_emerge = new EmergeManager(this, m_metrics_backend.get());
+	m_emerge = std::make_unique<EmergeManager>(this, m_metrics_backend.get());
 
 	if (m_more_threads) {
 		m_map_thread =  std::make_unique<MapThread>(this);
@@ -467,6 +488,9 @@ void Server::init()
 		throw ServerError(std::string("Failed to initialize world: ") + e.what());
 	}
 
+	// Create emerge manager
+	m_emerge = std::make_unique<EmergeManager>(this, m_metrics_backend.get());
+
 	// Create ban manager
 	std::string ban_path = m_path_world + DIR_DELIM "ipban.txt";
 	m_banmanager = new BanManager(ban_path);
@@ -487,22 +511,21 @@ void Server::init()
 	//MutexAutoLock envlock(m_env_mutex);
 
 	// Create the Map (loads map_meta.txt, overriding configured mapgen params)
-	ServerMap *servermap = new ServerMap(m_path_world, this, m_emerge, m_metrics_backend.get());
-	m_startup_server_map = servermap;
+	auto startup_server_map = std::make_unique<ServerMap>(m_path_world, this,
+			m_emerge.get(), m_metrics_backend.get());
 
 	// Initialize scripting
 	infostream << "Server: Initializing Lua" << std::endl;
 
-	m_script = new ServerScripting(this);
+	m_script = std::make_unique<ServerScripting>(this);
 
 	// Must be created before mod loading because we have some inventory creation
 	m_inventory_mgr = std::make_unique<ServerInventoryManager>();
 
-	m_script->loadMod(getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
-	m_script->checkSetByBuiltin();
+	m_script->loadBuiltin();
 
 	m_gamespec.checkAndLog();
-	m_modmgr->loadMods(m_script);
+	m_modmgr->loadMods(*m_script);
 
 	m_script->saveGlobals();
 
@@ -534,9 +557,8 @@ void Server::init()
 	m_craftdef->initHashes(this);
 
 	// Initialize Environment
-	m_startup_server_map = nullptr; // Ownership moved to ServerEnvironment
-	m_env = new ServerEnvironment(servermap, m_script, this,
-		m_path_world, m_metrics_backend.get());
+	m_env = new ServerEnvironment(std::move(startup_server_map),
+		this, m_metrics_backend.get());
 
 	m_env->m_more_threads = m_more_threads;
 	m_emerge->env = m_env;
@@ -546,11 +568,11 @@ void Server::init()
 	m_inventory_mgr->setEnv(m_env);
 	m_clients.setEnv(m_env);
 
-	if (!servermap->settings_mgr.makeMapgenParams())
-		FATAL_ERROR("Couldn't create any mapgen type");
-
 	// Initialize mapgens
-	m_emerge->initMapgens(servermap->getMapgenParams());
+	auto &servermap = m_env->getServerMap();
+	if (!servermap.settings_mgr.makeMapgenParams())
+		FATAL_ERROR("Couldn't create any mapgen type");
+	m_emerge->initMapgens(servermap.getMapgenParams());
 
 #if USE_SQLITE
 	if (g_settings->getBool("enable_rollback_recording")) {
@@ -566,7 +588,7 @@ void Server::init()
 	m_script->initAsync();
 
 	// Register us to receive map edit events
-	servermap->addEventReceiver(this);
+	servermap.addEventReceiver(this);
 
 	m_env->loadMeta();
 
@@ -704,7 +726,7 @@ void Server::start()
 
 void Server::stop()
 {
-	infostream<<"Server: Stopping and waiting threads"<<std::endl;
+	infostream<<"Server: Stopping and waiting for threads"<<std::endl;
 
 	// Stop threads (set run=false first so both start stopping)
 	m_thread->stop();
@@ -742,21 +764,14 @@ void Server::stop()
 	infostream<<"Server: Threads stopped"<<std::endl;
 }
 
-void Server::step(float dtime)
+void Server::step()
 {
-	// Limit a bit
-	if (dtime > 2.0)
-		dtime = 2.0;
-	{
-		MutexAutoLock lock(m_step_dtime_mutex);
-		m_step_dtime += dtime;
-	}
-	// Assert if fatal error occurred in thread
+	// Throw if fatal error occurred in thread
 	std::string async_err = m_async_fatal_error.get();
 	if (!async_err.empty()) {
 /*
 		if (!m_simple_singleplayer_mode) {
-			m_env->kickAllPlayers(SERVER_ACCESSDENIED_CRASH,
+			kickAllPlayers(SERVER_ACCESSDENIED_CRASH,
 				g_settings->get("kick_msg_crash"),
 				g_settings->getBool("ask_reconnect_on_crash"));
 		}
@@ -768,13 +783,6 @@ void Server::step(float dtime)
 void Server::AsyncRunStep(float dtime, bool initial_step)
 {
 	TimeTaker timer_step("Server step");
-/*
-	float dtime;
-	{
-		MutexAutoLock lock1(m_step_dtime_mutex);
-		dtime = m_step_dtime;
-	}
-*/
 
 	if (!m_sendblocks_thead)
 	{
@@ -783,19 +791,12 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 		SendBlocks(dtime);
 	}
 
-	if((dtime < 0.001) && !initial_step)
+	// If paused, this function is called with a 0.0f literal
+	if ((dtime == 0.0f) && !initial_step)
 		return;
 
 	ScopeProfiler sp(g_profiler, "Server::AsyncRunStep()", SPT_AVG);
 
-/*
-	{  
-		TimeTaker timer_step("Server step: SendBlocks");
-		MutexAutoLock lock1(m_step_dtime_mutex);
-		m_step_dtime -= dtime;
-	}
-*/
-
 	/*
 		Update uptime
 	*/
@@ -843,17 +844,30 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 	}
 
 	{
-		//TimeTaker timer_step("Server step: m_env->step");
 		//MutexAutoLock lock(m_env_mutex);
-		// Figure out and report maximum lag to environment
 		float max_lag = m_env->getMaxLagEstimate();
-		max_lag *= 0.9998; // Decrease slowly (about half per 5 minutes)
-		if(dtime > max_lag){
-			if(dtime > dedicated_server_step && dtime > max_lag * 2.0)
-				infostream<<"Server: Maximum lag peaked to "<<dtime
-						<<" s"<<std::endl;
-			max_lag = dtime;
+		constexpr float lag_warn_threshold = 2.0f;
+
+		// Decrease value gradually, halve it every minute.
+		if (m_max_lag_decrease.step(dtime, 0.5f)) {
+			// To reproduce this number enter "solve (x)**(60/0.5) = 0.5"
+			// into Wolfram Alpha.
+			max_lag *= 0.99425f;
 		}
+
+		// Report a 20% change to the log but only if we're >10% off target
+		// also report if we crossed into the warning boundary
+		if (dtime >= max_lag * 1.2f ||
+			(max_lag < lag_warn_threshold && dtime >= lag_warn_threshold)) {
+			const float steplen = getStepSettings().steplen;
+			if (dtime > steplen * 1.1f) {
+				auto &to = dtime >= lag_warn_threshold ? warningstream : infostream;
+				to << "Server: Maximum lag peaked at " << dtime
+					<< " (steplen=" << steplen << ")" << std::endl;
+			}
+		}
+		max_lag = std::max(max_lag, dtime),
+
 		m_env->reportMaxLagEstimate(max_lag);
 
 		g_profiler->add("Server: dtime max_lag", max_lag);
@@ -982,18 +996,18 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 			m_player_gauge->set(clients.size());
 			for (const auto &client : clients) {
 
-				if (client->getState() < CS_DefinitionsSent)
+				if (client.second->getState() < CS_DefinitionsSent)
 					continue;
 
 				// This can happen if the client times out somehow
-				if (!m_env->getPlayer(client->peer_id))
+				if (!m_env->getPlayer(client.second->peer_id))
 					continue;
 
-				PlayerSAO *playersao = getPlayerSAO(client->peer_id);
+				PlayerSAO *playersao = getPlayerSAO(client.second->peer_id);
 				if (!playersao)
 					continue;
 
-				SendActiveObjectRemoveAdd(client.get(), playersao);
+				SendActiveObjectRemoveAdd(client.second.get(), playersao);
 			}
 		}
 
@@ -1060,13 +1074,13 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 				ActiveObjectMessages unreliable_data;
 #endif
 				//RemoteClient *client = client_it.second;
-				PlayerSAO *player = getPlayerSAO(client->peer_id);
+				PlayerSAO *player = getPlayerSAO(client.second->peer_id);
 				// Go through all objects in message buffer
 				for (const auto &buffered_message : buffered_messages) {
 					// If object does not exist or is not known by client, skip it
 					u16 id = buffered_message.first;
 					ServerActiveObject *sao = m_env->getActiveObject(id);
-					if (!sao || client->m_known_objects.find(id) == client->m_known_objects.end())
+					if (!sao || client.second->m_known_objects.find(id) == client.second->m_known_objects.end())
 						continue;
 
 					// Get message list of object
@@ -1081,14 +1095,14 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 							// Do not send position updates for attached players
 							// as long the parent is known to the client
 							ServerActiveObject *parent = sao->getParent();
-							if (parent && client->m_known_objects.find(parent->getId()) !=
-									client->m_known_objects.end())
+							if (parent && client.second->m_known_objects.find(parent->getId()) !=
+									client.second->m_known_objects.end())
 								continue;
 
 							// Limit position packets for far objects
 							constexpr static auto max_seconds_skip = 30;
 							auto &[last_time, last_dist] =
-									client->m_objects_last_pos_sent[id];
+									client.second->m_objects_last_pos_sent[id];
 						
 							if (aom.skip_by_pos && last_time && last_time + max_seconds_skip > uptime) {
 								int32_t dist = aom.skip_by_pos.value().getDistanceFrom(
@@ -1137,11 +1151,11 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 					Send them.
 				*/
 				if (!reliable_data.empty()) {
-					SendActiveObjectMessages(client->peer_id, reliable_data);
+					SendActiveObjectMessages(client.second->peer_id, reliable_data);
 				}
 
 				if (!unreliable_data.empty()) {
-					SendActiveObjectMessages(client->peer_id, unreliable_data, false);
+					SendActiveObjectMessages(client.second->peer_id, unreliable_data, false);
 				}
 			}
 		}
@@ -1220,12 +1234,7 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 			}
 			case MEET_OTHER:
 				prof.add("MEET_OTHER", 1);
-/*
-				for (const v3s16 &modified_block : event->modified_blocks) {
-					m_clients.markBlockposAsNotSent(modified_block);
-				}
-				SetBlocksNotSent(); //fmtodo
-*/				
+				m_clients.markBlocksNotSent(event->modified_blocks);
 				break;
 			default:
 				prof.add("unknown", 1);
@@ -1237,22 +1246,9 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 			/*
 				Set blocks not sent to far players
 			*/
-			if (!far_players.empty()) {
-				// Convert list format to that wanted by SetBlocksNotSent
-/*
-				std::map<v3s16, MapBlock*> modified_blocks2;
-				for (const v3s16 &modified_block : event->modified_blocks) {
-					modified_blocks2[modified_block] =
-							m_env->getMap().getBlockNoCreateNoEx(modified_block);
-				}
-*/
-				// Set blocks not sent
-#if 0
-				for (const u16 far_player : far_players) {
-					if (RemoteClient *client = getClient(far_player))
-						client->SetBlocksNotSent(/*modified_blocks2*/);
-				}
-#endif
+			for (const u16 far_player : far_players) {
+				if (RemoteClient *client = getClient(far_player))
+					client->SetBlocksNotSent(event->modified_blocks);
 			}
 
 			//delete event;
@@ -1320,74 +1316,29 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
 	m_shutdown_state.tick(dtime, this);
 }
 
-int Server::save(float dtime, float dedicated_server_step, bool breakable) {
-	// Save map, players and auth stuff
-	int ret = 0;
-		float &counter = m_savemap_timer;
-		counter += dtime;
-		static thread_local const float save_interval =
-			g_settings->getFloat("server_map_save_interval");
-		if (counter >= save_interval) {
-			counter = 0.0;
-			TimeTaker timer_step("Server step: Save map, players and auth stuff");
-			//MutexAutoLock lock(m_env_mutex);
-
-			ScopeProfiler sp(g_profiler, "Server: map saving (sum)");
-
-			// Save changed parts of map
-			if(m_env->getMap().save(MOD_STATE_WRITE_NEEDED, dedicated_server_step, breakable)) {
-				// partial save, will continue on next step
-				counter = g_settings->getFloat("server_map_save_interval");
-				++ret;
-				if (breakable)
-					goto save_break;
-			}
-
-			// Save ban file
-			if (m_banmanager->isModified()) {
-				m_banmanager->save();
-			}
-
-			// Save players
-			m_env->saveLoadedPlayers();
-
-			// Save environment metadata
-			m_env->saveMeta();
-
-			stat.save();
-			m_env->blocks_with_abm.save();
-
-		}
-		save_break:;
-
-	return ret;
-}
-
-u16 Server::Receive(int ms)
+u16 Server::Receive(float timeout)
 {
-	u16 received = 0;
+	u16 received {};
+
+	const u64 t0 = porting::getTimeUs();
+	const float timeout_us = timeout * 1e6f;
+	auto remaining_time_us = [&]() -> float {
+		return std::max(0.0f, timeout_us - (porting::getTimeUs() - t0));
+	};
 
 	NetworkPacket pkt;
 	session_t peer_id;
-	bool first = true;
 	for (;;) {
 		pkt.clear();
 		peer_id = 0;
 		try {
-			/*
-    		TimeTaker timer_step("Server recieve one packet");
-			*/
-			/*
-				In the first iteration *wait* for a packet, afterwards process
-				all packets that are immediately available (no waiting).
-			*/
-			if (first) {
-				if (!m_con->Receive(&pkt, ms))
-					return received;
-				first = false;
-			} else {
-				if (!m_con->TryReceive(&pkt))
-					return received;
+			if (!m_con->ReceiveTimeoutMs(&pkt,
+					(u32)remaining_time_us() / 1000)) {
+				// No incoming data.
+				// Already break if there's 1ms left, as ReceiveTimeoutMs is too coarse
+				// and a faster server-step is better than busy waiting.
+				if (remaining_time_us() < 1000.0f)
+					break;
 			}
 			++received;
 
@@ -1402,20 +1353,20 @@ u16 Server::Receive(int ms)
 			infostream << "Server::Receive(): SerializationError: what()="
 					<< e.what() << std::endl;
 		} catch (const ClientStateError &e) {
-			errorstream << "ProcessData: peer=" << peer_id << " what()="
+			errorstream << "ClientStateError: peer=" << peer_id << " what()="
 					 << e.what() << std::endl;
 			DenyAccess(peer_id, SERVER_ACCESSDENIED_UNEXPECTED_DATA);
-		} catch (const con::PeerNotFoundException &e) {
-			// Do nothing
-		} catch (const con::NoIncomingDataException &e) {
-			return received;
+		} catch (con::PeerNotFoundException &e) {
+			infostream << "Server: PeerNotFoundException" << std::endl;
+		} catch (ClientNotFoundException &e) {
+			infostream << "Server: ClientNotFoundException" << std::endl;
 		} catch (const ClientNotFoundException &e) {
 			// verbosestream<<"Server: recieve: clientnotfound:"<< e.what() <<std::endl;
 		} catch (const msgpack::v1::type_error &e) {
-			verbosestream << "Server: recieve: msgpack:" << e.what() << std::endl;
+			verbosestream << "Server:Receive(): msgpack:" << e.what() << std::endl;
 		} catch (const std::exception &e) {
 #if !MINETEST_PROTO
-			infostream << "Server: recieve: exception:" << e.what() << std::endl;
+			infostream << "Server:Receive(): exception:" << e.what() << std::endl;
 #endif
 		}
 	}
@@ -1435,7 +1386,7 @@ PlayerSAO* Server::StageTwoClientInit(session_t peer_id)
 		}
 	}
 
-	RemotePlayer *player = m_env->getPlayer(playername);
+	RemotePlayer *player = m_env->getPlayer(playername, true);
 
 	// If failed, cancel
 	if (!playersao || !player) {
@@ -1454,7 +1405,7 @@ PlayerSAO* Server::StageTwoClientInit(session_t peer_id)
 	/*
 		Send complete position information
 	*/
-	SendMovePlayer(peer_id);
+	SendMovePlayer(playersao);
 
 	// Send privileges
 	SendPlayerPrivileges(peer_id);
@@ -1463,7 +1414,7 @@ PlayerSAO* Server::StageTwoClientInit(session_t peer_id)
 	SendPlayerInventoryFormspec(peer_id);
 
 	// Send inventory
-	SendInventory(playersao, false);
+	SendInventory(player, false);
 
 	// Send HP
 	SendPlayerHP(playersao, false);
@@ -1510,31 +1461,7 @@ void Server::ProcessData(NetworkPacket *pkt)
 	u32 peer_id = pkt->getPeerId();
 
 	try {
-		Address address = getPeerAddress(peer_id);
-		std::string addr_s = address.serializeString();
 
-		// FIXME: Isn't it a bit excessive to check this for every packet?
-		if (m_banmanager->isIpBanned(addr_s)) {
-			std::string ban_name = m_banmanager->getBanName(addr_s);
-			infostream << "Server: A banned client tried to connect from "
-					<< addr_s << "; banned name was " << ban_name << std::endl;
-			DenyAccess(peer_id, SERVER_ACCESSDENIED_CUSTOM_STRING,
-				"Your IP is banned. Banned name was " + ban_name);
-			return;
-		}
-	} catch (con::PeerNotFoundException &e) {
-		/*
-		 * no peer for this packet found
-		 * most common reason is peer timeout, e.g. peer didn't
-		 * respond for some time, your server was overloaded or
-		 * things like that.
-		 */
-		infostream << "Server::ProcessData(): Canceling: peer "
-				<< peer_id << " not found" << std::endl;
-		return;
-	}
-
-	try {
 #if !MINETEST_PROTO
 		if (!pkt->packet_unpack())
 			return;
@@ -1545,15 +1472,15 @@ void Server::ProcessData(NetworkPacket *pkt)
 		// Command must be handled into ToServerCommandHandler
 		if (command >= TOSERVER_NUM_MSG_TYPES) {
 			infostream << "Server: Ignoring unknown command "
-					 << command << std::endl;
+					 << static_cast<unsigned>(command) << std::endl;
 			return;
 		}
 
 		if (overload) {
 			if (command == TOSERVER_PLAYERPOS || command == TOSERVER_DRAWCONTROL)
 				return;
-			if (overload > 2000 && command == TOSERVER_BREATH)
-				return;
+			//if (overload > 2000 && command == TOSERVER_BREATH)
+			//	return;
 			if (overload > 30000 && command == TOSERVER_INTERACT) // FMTODO queue here for post-process
 				return;
 			//errorstream << "overload cmd=" << command << " n="<< toServerCommandTable[command].name << "\n";
@@ -1576,9 +1503,9 @@ void Server::ProcessData(NetworkPacket *pkt)
 		u8 peer_ser_ver = getClient(peer_id, CS_InitDone)->serialization_version;
 
 		if(peer_ser_ver == SER_FMT_VER_INVALID) {
-			errorstream << "Server::ProcessData(): Cancelling: Peer"
-					" serialization format invalid or not initialized."
-					" Skipping incoming command=" << command << std::endl;
+			errorstream << "Server: Peer serialization format invalid. "
+					"Skipping incoming command "
+					<< static_cast<unsigned>(command) << std::endl;
 			return;
 		}
 
@@ -1591,10 +1518,11 @@ void Server::ProcessData(NetworkPacket *pkt)
 		if (m_clients.getClientState(peer_id) < CS_Active) {
 			if (command == TOSERVER_PLAYERPOS) return;
 
-			errorstream << "Got packet command: " << command << " for peer id "
-					<< peer_id << " but client isn't active yet. Dropping packet "
-					<< "state=" << m_clients.getClientState(peer_id)
-					<< std::endl;
+			errorstream << "Server: Got packet command "
+					<< static_cast<unsigned>(command)
+					<< " for peer id " << peer_id
+                    << " state=" << m_clients.getClientState(peer_id)
+					<< " but client isn't active yet. Dropping packet." << std::endl;
 			return;
 		}
 
@@ -1743,6 +1671,7 @@ void Server::printToConsoleOnly(const std::string &text)
 #if MINETEST_PROTO
 void Server::Send(NetworkPacket *pkt)
 {
+	FATAL_ERROR_IF(pkt->getPeerId() == 0, "Server::Send() missing peer ID");
 	Send(pkt->getPeerId(), pkt);
 }
 
@@ -1756,12 +1685,9 @@ void Server::Send(session_t peer_id, NetworkPacket *pkt)
 				<< " to=" << peer_id
 				<< std::endl;
 #endif
-
 	g_profiler->add("Server: Packets sent", 1);
-	m_clients.send(peer_id,
-		clientCommandFactoryTable[pkt->getCommand()].channel,
-		pkt,
-		clientCommandFactoryTable[pkt->getCommand()].reliable);
+
+	m_clients.send(peer_id, pkt);
 }
 
 void Server::SendMovement(session_t peer_id)
@@ -1892,10 +1818,8 @@ void Server::SendNodeDef(session_t peer_id,
 	Non-static send methods
 */
 
-void Server::SendInventory(PlayerSAO *sao, bool incremental)
+void Server::SendInventory(RemotePlayer *player, bool incremental)
 {
-	RemotePlayer *player = sao->getPlayer();
-
 	// Do not send new format to old clients
 	incremental &= player->protocol_version >= 38;
 
@@ -1905,15 +1829,14 @@ void Server::SendInventory(PlayerSAO *sao, bool incremental)
 		Serialize it
 	*/
 
-	NetworkPacket pkt(TOCLIENT_INVENTORY, 0, sao->getPeerID());
+	NetworkPacket pkt(TOCLIENT_INVENTORY, 0, player->getPeerId());
 
 	std::ostringstream os(std::ios::binary);
-	sao->getInventory()->serialize(os, incremental);
-	sao->getInventory()->setModified(false);
+	player->inventory.serialize(os, incremental);
+	player->inventory.setModified(false);
 	player->setModified(true);
 
-	const std::string &s = os.str();
-	pkt.putRawString(s.c_str(), s.size());
+	pkt.putRawString(os.str());
 	Send(&pkt);
 }
 
@@ -2048,32 +1971,30 @@ void Server::SendAddParticleSpawner(session_t peer_id, u16 protocol_version,
 
 	pkt << p.amount << p.time;
 
+	std::ostringstream os(std::ios_base::binary);
 	if (protocol_version >= 42) {
 		// Serialize entire thing
-		std::ostringstream os(std::ios_base::binary);
 		p.pos.serialize(os);
 		p.vel.serialize(os);
 		p.acc.serialize(os);
 		p.exptime.serialize(os);
 		p.size.serialize(os);
-		pkt.putRawString(os.str());
 	} else {
 		// serialize legacy fields only (compatibility)
-		std::ostringstream os(std::ios_base::binary);
 		p.pos.start.legacySerialize(os);
 		p.vel.start.legacySerialize(os);
 		p.acc.start.legacySerialize(os);
 		p.exptime.start.legacySerialize(os);
 		p.size.start.legacySerialize(os);
-		pkt.putRawString(os.str());
 	}
+	pkt.putRawString(os.str());
 	pkt << p.collisiondetection;
 
 	pkt.putLongString(p.texture.string);
 
 	pkt << id << p.vertical << p.collision_removal << attached_id;
 	{
-		std::ostringstream os(std::ios_base::binary);
+		os.str("");
 		p.animation.serialize(os, protocol_version);
 		pkt.putRawString(os.str());
 	}
@@ -2081,7 +2002,7 @@ void Server::SendAddParticleSpawner(session_t peer_id, u16 protocol_version,
 	pkt << p.node.param0 << p.node.param2 << p.node_tile;
 
 	{ // serialize new fields
-		std::ostringstream os(std::ios_base::binary);
+		os.str("");
 		if (protocol_version < 42) {
 			// initial bias for older properties
 			pkt << p.pos.start.bias
@@ -2197,14 +2118,12 @@ void Server::SendHUDSetFlags(session_t peer_id, u32 flags, u32 mask)
 {
 	NetworkPacket pkt(TOCLIENT_HUD_SET_FLAGS, 4 + 4, peer_id);
 
-	flags &= ~(HUD_FLAG_HEALTHBAR_VISIBLE | HUD_FLAG_BREATHBAR_VISIBLE);
-
 	pkt << flags << mask;
 
 	Send(&pkt);
 }
 
-void Server::SendHUDSetParam(session_t peer_id, u16 param, const std::string &value)
+void Server::SendHUDSetParam(session_t peer_id, u16 param, std::string_view value)
 {
 	NetworkPacket pkt(TOCLIENT_HUD_SET_PARAM, 0, peer_id);
 	pkt << param << value;
@@ -2225,22 +2144,21 @@ void Server::SendSetSky(session_t peer_id, const SkyboxParams &params)
 		pkt << params.clouds;
 	} else { // Handle current clients and future clients
 		pkt << params.bgcolor << params.type
-		<< params.clouds << params.fog_sun_tint
-		<< params.fog_moon_tint << params.fog_tint_type;
+			<< params.clouds << params.fog_sun_tint
+			<< params.fog_moon_tint << params.fog_tint_type;
 
 		if (params.type == "skybox") {
 			pkt << (u16) params.textures.size();
 			for (const std::string &texture : params.textures)
 				pkt << texture;
 		} else if (params.type == "regular") {
-			pkt << params.sky_color.day_sky << params.sky_color.day_horizon
-				<< params.sky_color.dawn_sky << params.sky_color.dawn_horizon
-				<< params.sky_color.night_sky << params.sky_color.night_horizon
-				<< params.sky_color.indoors;
+			auto &c = params.sky_color;
+			pkt << c.day_sky << c.day_horizon << c.dawn_sky << c.dawn_horizon
+				<< c.night_sky << c.night_horizon << c.indoors;
 		}
 
-		pkt << params.body_orbit_tilt;
-		pkt << params.fog_distance << params.fog_start;
+		pkt << params.body_orbit_tilt << params.fog_distance << params.fog_start
+			<< params.fog_color;
 	}
 
 	Send(&pkt);
@@ -2309,6 +2227,8 @@ void Server::SendSetLighting(session_t peer_id, const Lighting &lighting)
 			<< lighting.exposure.speed_bright_dark
 			<< lighting.exposure.center_weight_power;
 
+	pkt << lighting.volumetric_light_strength;
+
 	Send(&pkt);
 }
 
@@ -2333,17 +2253,12 @@ void Server::SendPlayerBreath(PlayerSAO *sao)
 	SendBreath(sao->getPeerID(), sao->getBreath());
 }
 
-void Server::SendMovePlayer(session_t peer_id)
+void Server::SendMovePlayer(PlayerSAO *sao)
 {
-	RemotePlayer *player = m_env->getPlayer(peer_id);
-	assert(player);
-	PlayerSAO *sao = player->getPlayerSAO();
-	assert(sao);
-
 	// Send attachment updates instantly to the client prior updating position
 	sao->sendOutdatedData();
 
-	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id);
+	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, sao->getPeerID());
 	pkt << sao->getBasePosition() << sao->getLookPitch() << sao->getRotation().Y;
 
 	{
@@ -2358,11 +2273,22 @@ void Server::SendMovePlayer(session_t peer_id)
 	Send(&pkt);
 }
 
+void Server::SendMovePlayerRel(session_t peer_id, const v3f &added_pos)
+{
+	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER_REL, 0, peer_id);
+	pkt << added_pos;
+	Send(&pkt);
+}
+
 void Server::SendPlayerFov(session_t peer_id)
 {
+	RemotePlayer *player = m_env->getPlayer(peer_id);
+	if (!player)
+		return;
+
 	NetworkPacket pkt(TOCLIENT_FOV, 4 + 1 + 4, peer_id);
 
-	PlayerFovSpec fov_spec = m_env->getPlayer(peer_id)->getFov();
+	PlayerFovSpec fov_spec = player->getFov();
 	pkt << fov_spec.fov << fov_spec.is_multiplier << fov_spec.transition_time;
 
 	Send(&pkt);
@@ -2390,8 +2316,7 @@ void Server::SendEyeOffset(session_t peer_id, v3f first, v3f third, v3f third_fr
 void Server::SendPlayerPrivileges(session_t peer_id)
 {
 	RemotePlayer *player = m_env->getPlayer(peer_id);
-	assert(player);
-	if(player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return;
 
 	std::set<std::string> privs;
@@ -2410,8 +2335,7 @@ void Server::SendPlayerPrivileges(session_t peer_id)
 void Server::SendPlayerInventoryFormspec(session_t peer_id)
 {
 	RemotePlayer *player = m_env->getPlayer(peer_id);
-	assert(player);
-	if (player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return;
 
 	NetworkPacket pkt(TOCLIENT_INVENTORY_FORMSPEC, 0, peer_id);
@@ -2423,8 +2347,7 @@ void Server::SendPlayerInventoryFormspec(session_t peer_id)
 void Server::SendPlayerFormspecPrepend(session_t peer_id)
 {
 	RemotePlayer *player = m_env->getPlayer(peer_id);
-	assert(player);
-	if (player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return;
 
 	NetworkPacket pkt(TOCLIENT_FORMSPEC_PREPEND, 0, peer_id);
@@ -2455,101 +2378,68 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
 	
 	my_radius *= 1.5;
 
-	std::queue<u16> removed_objects, added_objects;
+	std::vector<std::pair<bool, u16>> removed_objects;
+	std::vector<u16> added_objects;
 	m_env->getRemovedActiveObjects(playersao, my_radius, player_radius,
 		client->m_known_objects, removed_objects);
 	m_env->getAddedActiveObjects(playersao, my_radius, player_radius,
 		client->m_known_objects, added_objects);
 
-	int removed_count = removed_objects.size();
-	int added_count   = added_objects.size();
-
 	if (removed_objects.empty() && added_objects.empty())
 		return;
 
-#if MINETEST_PROTO
-	char buf[4];
-	std::string data;
+	NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD,
+		2 * removed_objects.size() + 32 * added_objects.size(), client->peer_id);
 
-	// Handle removed objects
-	writeU16((u8*)buf, removed_objects.size());
-	data.append(buf, 2);
-#else
-	std::set<u16> removed_objects_data;
-	std::vector<ActiveObjectAddData> added_objects_data;
-#endif
-	while (!removed_objects.empty()) {
-		// Get object
-		u16 id = removed_objects.front();
-		ServerActiveObject* obj = m_env->getActiveObject(id, true);
+	// Removed objects
+	pkt << static_cast<u16>(removed_objects.size());
 
-#if MINETEST_PROTO
-		// Add to data buffer for sending
-		writeU16((u8*)buf, id);
-		data.append(buf, 2);
-#else
-		removed_objects_data.insert(id);
-#endif
+	for (auto &it : removed_objects) {
+		const auto [gone, id] = it;
+		ServerActiveObject *obj = m_env->getActiveObject(id, true);
+
+		pkt << id;
 
 		// Remove from known objects
 		client->m_known_objects.erase(id);
-
 		if (obj && obj->m_known_by_count > 0)
 			obj->m_known_by_count--;
-
-		removed_objects.pop();
 	}
 
-	// Handle added objects
-#if MINETEST_PROTO
-	writeU16((u8*)buf, added_objects.size());
-	data.append(buf, 2);
-#endif
-	while (!added_objects.empty()) {
-		// Get object
-		u16 id = added_objects.front();
-		ServerActiveObject *obj = m_env->getActiveObject(id);
-		added_objects.pop();
+	// Note: Do yet NOT stop or remove object-attached sounds where the object goes out
+	// of range (client side). Such sounds would need to be re-sent when coming into range.
+	// Currently, the client will initiate m_playing_sounds clean ups indirectly by
+	// "Server::handleCommand_RemovedSounds".
 
+	// Added objects
+	pkt << static_cast<u16>(added_objects.size());
+
+	for (u16 id : added_objects) {
+		ServerActiveObject *obj = m_env->getActiveObject(id);
 		if (!obj) {
-			warningstream << FUNCTION_NAME << ": NULL object id="
+			warningstream << FUNCTION_NAME << ": found NULL object id="
 				<< (int)id << std::endl;
 			continue;
 		}
 
-		// Get object type
 		u8 type = obj->getSendType();
 
-#if MINETEST_PROTO
-		// Add to data buffer for sending
-		writeU16((u8*)buf, id);
-		data.append(buf, 2);
-		writeU8((u8*)buf, type);
-		data.append(buf, 1);
-
-		data.append(serializeString32(
-#else
-		auto data = 
-           (
-#endif
-			obj->getClientInitializationData(client->net_proto_version)));
+		pkt << id << type;
+		pkt.putLongString(obj->getClientInitializationData(client->net_proto_version));
 
 #if !MINETEST_PROTO
+		auto data = obj->getClientInitializationData(client->net_proto_version);
 		if (!data.size())
-        	continue;
+			continue;
 		added_objects_data.push_back(ActiveObjectAddData(id, type, data));
 #endif
 
 		// Add to known objects
 		client->m_known_objects.insert(id);
-
 		obj->m_known_by_count++;
 	}
 
 #if MINETEST_PROTO
-	NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, data.size(), client->peer_id);
-	pkt.putRawString(data.c_str(), data.size());
-	Send(&pkt);
 #else
 	MSGPACK_PACKET_INIT(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, 2);
 	PACK(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD_REMOVE, removed_objects_data);
@@ -2559,9 +2449,9 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
 	m_clients.send(client->peer_id, 0, buffer, true);
 #endif
 
-	verbosestream << "Server::SendActiveObjectRemoveAdd: "
-		<< removed_count << " removed, " << added_count << " added, "
-		<< "packet size is " << pkt.getSize() << std::endl;
+	verbosestream << "Server::SendActiveObjectRemoveAdd(): "
+		<< removed_objects.size() << " removed, " << added_objects.size()
+		<< " added, packet size is " << pkt.getSize() << std::endl;
 }
 
 void Server::SendActiveObjectMessages(session_t peer_id, const std::string &datas,
@@ -2570,11 +2460,10 @@ void Server::SendActiveObjectMessages(session_t peer_id, const std::string &data
 	NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_MESSAGES,
 			datas.size(), peer_id);
 
-	pkt.putRawString(datas.c_str(), datas.size());
+	pkt.putRawString(datas);
 
-	m_clients.send(pkt.getPeerId(),
-			reliable ? clientCommandFactoryTable[pkt.getCommand()].channel : 1,
-			&pkt, reliable);
+	auto &ccf = clientCommandFactoryTable[pkt.getCommand()];
+	m_clients.sendCustom(pkt.getPeerId(), reliable ? ccf.channel : 1, &pkt, reliable);
 }
 
 void Server::SendCSMRestrictionFlags(session_t peer_id)
@@ -2627,11 +2516,6 @@ s32 Server::playSound(ServerPlayingSound &params, bool ephemeral)
 					<<"\" not found"<<std::endl;
 			return -1;
 		}
-		if (player->getPeerId() == PEER_ID_INEXISTENT) {
-			infostream<<"Server::playSound: Player \""<<params.to_player
-					<<"\" not connected"<<std::endl;
-			return -1;
-		}
 		dst_clients.push_back(player->getPeerId());
 	} else {
 		std::vector<session_t> clients = m_clients.getClientIDs();
@@ -2672,12 +2556,12 @@ s32 Server::playSound(ServerPlayingSound &params, bool ephemeral)
 			<< params.spec.loop << params.spec.fade << params.spec.pitch
 			<< ephemeral << params.spec.start_time;
 
-	bool as_reliable = !ephemeral;
+	const bool as_reliable = !ephemeral;
 
 	for (const session_t peer_id : dst_clients) {
 		if (!ephemeral)
 			params.clients.insert(peer_id);
-		m_clients.send(peer_id, 0, &pkt, as_reliable);
+		m_clients.sendCustom(peer_id, 0, &pkt, as_reliable);
 	}
 
 	if (!ephemeral)
@@ -2696,8 +2580,7 @@ void Server::stopSound(s32 handle)
 	pkt << handle;
 
 	for (session_t peer_id : psound.clients) {
-		// Send as reliable
-		m_clients.send(peer_id, 0, &pkt, true);
+		Send(peer_id, &pkt);
 	}
 
 	// Remove sound reference
@@ -2717,8 +2600,7 @@ void Server::fadeSound(s32 handle, float step, float gain)
 	pkt << handle << step << gain;
 
 	for (session_t peer_id : psound.clients) {
-		// Send as reliable
-		m_clients.send(peer_id, 0, &pkt, true);
+		Send(peer_id, &pkt);
 	}
 
 	// Remove sound reference
@@ -2775,8 +2657,7 @@ void Server::sendNodeChangePkt(NetworkPacket &pkt, v3s16 block_pos,
 			continue;
 		}
 
-		// Send as reliable
-		m_clients.send(client_id, 0, &pkt, true);
+		Send(client_id, &pkt);
 	}
 }
 
@@ -2891,8 +2772,7 @@ int Server::SendBlocks(float dtime)
 
 			//total_sending += client->getSendingCount();
 			const auto old_count = queue.size();
-			total += client->GetNextBlocks(m_env,m_emerge, dtime, queue, m_uptime_counter->get() + m_env->m_game_time_start);
-			//total_sending += queue.size();
+			total += client->GetNextBlocks(m_env, m_emerge.get(), dtime, queue, m_uptime_counter->get() + m_env->m_game_time_start);
 			unique_clients += queue.size() > old_count ? 1 : 0;
 		}
 	}
@@ -2995,9 +2875,7 @@ size_t Server::addMediaFile(const std::string &filename,
 
 	// Read data
 	std::string filedata;
-	if (!fs::ReadFile(filepath, filedata)) {
-		errorstream << "Server::addMediaFile(): Failed to open \""
-					<< filename << "\" for reading" << std::endl;
+	if (!fs::ReadFile(filepath, filedata, true)) {
 		return false;
 	}
 
@@ -3015,14 +2893,13 @@ size_t Server::addMediaFile(const std::string &filename,
 	}
 
 	class SHA1 sha1;
-	sha1.addBytes(filedata.c_str(), filedata.length());
+	sha1.addBytes(filedata);
 
-	unsigned char *digest = sha1.getDigest();
-	std::string sha1_base64 = base64_encode(digest, 20);
-	std::string sha1_hex = hex_encode((char*) digest, 20);
+	std::string digest = sha1.getDigest();
+	std::string sha1_base64 = base64_encode(digest);
+	std::string sha1_hex = hex_encode(digest);
 	if (digest_to)
-		*digest_to = std::string((char*) digest, 20);
-	free(digest);
+		*digest_to = digest;
 
 	// Put in list
 	m_media[filename] = MediaInfo(filepath, sha1_base64);
@@ -3075,28 +2952,30 @@ void Server::fillMediaCache()
 
 void Server::sendMediaAnnouncement(session_t peer_id, const std::string &lang_code)
 {
+	std::string lang_suffix = ".";
+	lang_suffix.append(lang_code).append(".tr");
+
+	auto include = [&] (const std::string &name, const MediaInfo &info) -> bool {
+		if (info.no_announce)
+			return false;
+		if (str_ends_with(name, ".tr") && !str_ends_with(name, lang_suffix))
+			return false;
+		return true;
+	};
+
 	// Make packet
 	NetworkPacket pkt(TOCLIENT_ANNOUNCE_MEDIA, 0, peer_id);
 
 	u16 media_sent = 0;
-	std::string lang_suffix;
-	lang_suffix.append(".").append(lang_code).append(".tr");
 	for (const auto &i : m_media) {
-		if (i.second.no_announce)
-			continue;
-		if (str_ends_with(i.first, ".tr") && !str_ends_with(i.first, lang_suffix))
-			continue;
-		media_sent++;
+		if (include(i.first, i.second))
+			media_sent++;
 	}
-
 	pkt << media_sent;
 
 	for (const auto &i : m_media) {
-		if (i.second.no_announce)
-			continue;
-		if (str_ends_with(i.first, ".tr") && !str_ends_with(i.first, lang_suffix))
-			continue;
-		pkt << i.first << i.second.sha1_digest;
+		if (include(i.first, i.second))
+			pkt << i.first << i.second.sha1_digest;
 	}
 
 	pkt << g_settings->get("remote_media");
@@ -3108,10 +2987,12 @@ void Server::sendMediaAnnouncement(session_t peer_id, const std::string &lang_co
 
 #endif
 
+namespace {
+
 struct SendableMedia
 {
-	std::string name;
-	std::string path;
+	const std::string &name;
+	const std::string &path;
 	std::string data;
 
 	SendableMedia(const std::string &name, const std::string &path,
@@ -3120,38 +3001,59 @@ struct SendableMedia
 	{}
 };
 
+}
+
 #if MINETEST_PROTO
 
 void Server::sendRequestedMedia(session_t peer_id,
-		const std::vector<std::string> &tosend)
+		const std::unordered_set<std::string> &tosend)
 {
-	verbosestream<<"Server::sendRequestedMedia(): "
-			<<"Sending files to client"<<std::endl;
+	auto *client = getClient(peer_id, CS_DefinitionsSent);
+	assert(client);
 
-	/* Read files */
+	infostream << "Server::sendRequestedMedia(): Sending "
+		<< tosend.size() << " files to " << client->getName() << std::endl;
 
-	// Put 5kB in one bunch (this is not accurate)
-	u32 bytes_per_bunch = 5000;
+	/* Read files and prepare bunches */
 
-	std::vector< std::vector<SendableMedia> > file_bunches;
+	// Put 5KB in one bunch (this is not accurate)
+	// This is a tradeoff between burdening the network with too many packets
+	// and burdening it with too large split packets.
+	const u32 bytes_per_bunch = 5000;
+
+	std::vector<std::vector<SendableMedia>> file_bunches;
 	file_bunches.emplace_back();
 
-	u32 file_size_bunch_total = 0;
+	// Note that applying a "real" bin packing algorithm here is not necessarily
+	// an improvement (might even perform worse) since games usually have lots
+	// of files larger than 5KB and the current algorithm already minimizes
+	// the amount of bunches quite well (at the expense of overshooting).
 
+	u32 file_size_bunch_total = 0;
 	for (const std::string &name : tosend) {
-		if (m_media.find(name) == m_media.end()) {
+		auto it = m_media.find(name);
+
+		if (it == m_media.end()) {
 			errorstream<<"Server::sendRequestedMedia(): Client asked for "
 					<<"unknown file \""<<(name)<<"\""<<std::endl;
 			continue;
 		}
+		const auto &m = it->second;
 
-		const auto &m = m_media[name];
+		// no_announce <=> usually ephemeral dynamic media, which may
+		// have duplicate filenames. So we can't check it.
+		if (!m.no_announce) {
+			if (!client->markMediaSent(name)) {
+				infostream << "Server::sendRequestedMedia(): Client asked has "
+					"requested \"" << name << "\" before, not sending it again."
+					<< std::endl;
+				continue;
+			}
+		}
 
 		// Read data
 		std::string data;
-		if (!fs::ReadFile(m.path, data)) {
-			errorstream << "Server::sendRequestedMedia(): Failed to read \""
-					<< name << "\"" << std::endl;
+		if (!fs::ReadFile(m.path, data, true)) {
 			continue;
 		}
 		file_size_bunch_total += data.size();
@@ -3164,16 +3066,15 @@ void Server::sendRequestedMedia(session_t peer_id,
 			file_bunches.emplace_back();
 			file_size_bunch_total = 0;
 		}
-
 	}
 
 	/* Create and send packets */
 
-	u16 num_bunches = file_bunches.size();
+	const u16 num_bunches = file_bunches.size();
 	for (u16 i = 0; i < num_bunches; i++) {
+		auto &bunch = file_bunches[i];
 		/*
-			u16 command
-			u16 total number of texture bunches
+			u16 total number of media bunches
 			u16 index of this bunch
 			u32 number of files in this bunch
 			for each file {
@@ -3183,18 +3084,20 @@ void Server::sendRequestedMedia(session_t peer_id,
 				data
 			}
 		*/
-
 		NetworkPacket pkt(TOCLIENT_MEDIA, 4 + 0, peer_id);
-		pkt << num_bunches << i << (u32) file_bunches[i].size();
 
-		for (const SendableMedia &j : file_bunches[i]) {
+		const u32 bunch_size = bunch.size();
+		pkt << num_bunches << i << bunch_size;
+
+		for (auto &j : bunch) {
 			pkt << j.name;
 			pkt.putLongString(j.data);
 		}
+		bunch.clear(); // free memory early
 
 		verbosestream << "Server::sendRequestedMedia(): bunch "
 				<< i << "/" << num_bunches
-				<< " files=" << file_bunches[i].size()
+				<< " files=" << bunch_size
 				<< " size="  << pkt.getSize() << std::endl;
 		Send(&pkt);
 	}
@@ -3232,8 +3135,7 @@ void Server::SendMinimapModes(session_t peer_id,
 		std::vector<MinimapMode> &modes, size_t wanted_mode)
 {
 	RemotePlayer *player = m_env->getPlayer(peer_id);
-	assert(player);
-	if (player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return;
 
 	NetworkPacket pkt(TOCLIENT_MINIMAP_MODES, 0, peer_id);
@@ -3354,6 +3256,15 @@ void Server::DenyAccess(session_t peer_id, AccessDeniedCode reason,
 	DisconnectPeer(peer_id);
 }
 
+void Server::kickAllPlayers(AccessDeniedCode reason,
+		const std::string &str_reason, bool reconnect)
+{
+	std::vector<session_t> clients = m_clients.getClientIDs();
+	for (const session_t client_id : clients) {
+		DenyAccess(client_id, reason, str_reason, reconnect);
+	}
+}
+
 void Server::DisconnectPeer(session_t peer_id)
 {
 	m_modchannel_mgr->leaveAllChannels(peer_id);
@@ -3367,13 +3278,9 @@ void Server::acceptAuth(session_t peer_id, bool forSudoMode)
 
 		NetworkPacket resp_pkt(TOCLIENT_AUTH_ACCEPT, 1 + 6 + 8 + 4, peer_id);
 
-		// Right now, the auth mechs don't change between login and sudo mode.
-		u32 sudo_auth_mechs = client->allowed_auth_mechs;
-		client->allowed_sudo_mechs = sudo_auth_mechs;
-
 		resp_pkt << v3f(0,0,0) << (u64) m_env->getServerMap().getSeed()
 				<< g_settings->getFloat("dedicated_server_step")
-				<< sudo_auth_mechs;
+				<< client->allowed_auth_mechs;
 
 		Send(&resp_pkt);
 		m_clients.event(peer_id, CSE_AuthAccept);
@@ -3397,12 +3304,11 @@ void Server::DeleteClient(session_t peer_id, ClientDeletionReason reason)
 		/*
 			Clear references to playing sounds
 		*/
-		for (std::unordered_map<s32, ServerPlayingSound>::iterator
-				 i = m_playing_sounds.begin(); i != m_playing_sounds.end();) {
+		for (auto i = m_playing_sounds.begin(); i != m_playing_sounds.end();) {
 			ServerPlayingSound &psound = i->second;
 			psound.clients.erase(peer_id);
 			if (psound.clients.empty())
-				m_playing_sounds.erase(i++);
+				i = m_playing_sounds.erase(i);
 			else
 				++i;
 		}
@@ -3745,6 +3651,11 @@ void Server::reportFormspecPrependModified(const std::string &name)
 void Server::setIpBanned(const std::string &ip, const std::string &name)
 {
 	m_banmanager->add(ip, name);
+
+	auto clients = m_clients.getClientIDs(CS_Created);
+	for (const auto peer_id : clients) {
+		denyIfBanned(peer_id);
+	}
 }
 
 void Server::unsetIpBanned(const std::string &ip_or_name)
@@ -3757,6 +3668,22 @@ std::string Server::getBanDescription(const std::string &ip_or_name)
 	return m_banmanager->getBanDescription(ip_or_name);
 }
 
+bool Server::denyIfBanned(session_t peer_id)
+{
+	Address address = getPeerAddress(peer_id);
+	std::string addr_s = address.serializeString();
+
+	if (m_banmanager->isIpBanned(addr_s)) {
+		std::string ban_name = m_banmanager->getBanName(addr_s);
+		actionstream << "Server: A banned client tried to connect from "
+			<< addr_s << "; banned name was " << ban_name << std::endl;
+		DenyAccess(peer_id, SERVER_ACCESSDENIED_CUSTOM_STRING,
+			"Your IP is banned. Banned name was " + ban_name);
+		return true;
+	}
+	return false;
+}
+
 void Server::notifyPlayer(const char *name, const std::wstring &msg)
 {
 	// m_env will be NULL if the server is initializing
@@ -3768,11 +3695,7 @@ void Server::notifyPlayer(const char *name, const std::wstring &msg)
 	}
 
 	RemotePlayer *player = m_env->getPlayer(name);
-	if (!player) {
-		return;
-	}
-
-	if (player->getPeerId() == PEER_ID_INEXISTENT)
+	if (!player)
 		return;
 
 	//fmold: SendChatMessage(player->peer_id, std::string("\v#ffffff") + msg);
@@ -3859,6 +3782,9 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
 	if (hotbar_itemcount <= 0 || hotbar_itemcount > HUD_HOTBAR_ITEMCOUNT_MAX)
 		return false;
 
+	if (player->getHotbarItemcount() == hotbar_itemcount)
+		return true;
+
 	player->setHotbarItemcount(hotbar_itemcount);
 	std::ostringstream os(std::ios::binary);
 	writeS32(os, hotbar_itemcount);
@@ -3871,6 +3797,9 @@ void Server::hudSetHotbarImage(RemotePlayer *player, const std::string &name, in
 	if (!player)
 		return;
 
+	if (player->getHotbarImage() == name)
+		return;
+
 	player->setHotbarImage(name);
 	SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_IMAGE, name);
 	if (items)
@@ -3882,6 +3811,9 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &
 	if (!player)
 		return;
 
+	if (player->getHotbarSelectedImage() == name)
+		return;
+
 	player->setHotbarSelectedImage(name);
 	SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_SELECTED_IMAGE, name);
 }
@@ -3900,9 +3832,13 @@ void Server::setLocalPlayerAnimations(RemotePlayer *player,
 	SendLocalPlayerAnimations(player->getPeerId(), animation_frames, frame_speed);
 }
 
-void Server::setPlayerEyeOffset(RemotePlayer *player, const v3f &first, const v3f &third, const v3f &third_front)
+void Server::setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third, v3f third_front)
 {
 	sanity_check(player);
+	if (std::tie(player->eye_offset_first, player->eye_offset_third,
+			player->eye_offset_third_front) == std::tie(first, third, third_front))
+		return; // no change
+
 	player->eye_offset_first = first;
 	player->eye_offset_third = third;
 	player->eye_offset_third_front = third_front;
@@ -4031,72 +3967,126 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 	SendDeleteParticleSpawner(peer_id, id);
 }
 
-bool Server::dynamicAddMedia(std::string filepath,
-	const u32 token, const std::string &to_player, bool ephemeral)
+namespace {
+	std::string writeToTempFile(std::string_view content)
+	{
+		auto filepath = fs::CreateTempFile();
+		if (filepath.empty())
+			return "";
+		auto os = open_ofstream(filepath.c_str(), true);
+		if (!os.good())
+			return "";
+		os << content;
+		os.close();
+		if (os.fail()) {
+			fs::DeleteSingleFileOrEmptyDirectory(filepath);
+			return "";
+		}
+		return filepath;
+	}
+}
+
+bool Server::dynamicAddMedia(const DynamicMediaArgs &a)
 {
-	std::string filename = fs::GetFilenameFromPath(filepath.c_str());
+	std::string filename = a.filename;
+	std::string filepath;
+
+	// Deal with file -or- data, as provided
+	// (Note: caller must ensure validity, so sanity_check is okay)
+	if (a.filepath) {
+		sanity_check(!a.data);
+		filepath = *a.filepath;
+		if (filename.empty())
+			filename = fs::GetFilenameFromPath(filepath.c_str());
+	} else {
+		sanity_check(a.data);
+		sanity_check(!filename.empty());
+
+		// Write the file to disk. addMediaFile() will read it right back but this
+		// is the best way without turning the media loading code into spaghetti.
+		filepath = writeToTempFile(*a.data);
+		if (filepath.empty()) {
+			errorstream << "Server: failed writing media file \""
+				<< filename << "\" to disk" << std::endl;
+			return false;
+		}
+		verbosestream << "Server: \"" << filename << "\" temporarily written to "
+			<< filepath << std::endl;
+	}
+
+	// Do some checks
 	auto it = m_media.find(filename);
 	if (it != m_media.end()) {
 		// Allow the same path to be "added" again in certain conditions
-		if (ephemeral || it->second.path != filepath) {
+		if (a.ephemeral || it->second.path != filepath) {
 			errorstream << "Server::dynamicAddMedia(): file \"" << filename
 				<< "\" already exists in media cache" << std::endl;
 			return false;
 		}
 	}
 
+	if (!m_env && (!a.to_player.empty() || a.ephemeral)) {
+		errorstream << "Server::dynamicAddMedia(): "
+			"adding ephemeral or player-specific media at startup is nonsense"
+			<< std::endl;
+		return false;
+	}
+
 	// Load the file and add it to our media cache
 	std::string filedata, raw_hash;
 	bool ok = addMediaFile(filename, filepath, &filedata, &raw_hash);
 	if (!ok)
 		return false;
+	assert(!filedata.empty());
 
-	if (ephemeral) {
-		// Create a copy of the file and swap out the path, this removes the
-		// requirement that mods keep the file accessible at the original path.
-		filepath = fs::CreateTempFile();
-		bool ok = ([&] () -> bool {
-			if (filepath.empty())
+	const auto &media_it = m_media.find(filename);
+	assert(media_it != m_media.end());
+
+	if (a.ephemeral) {
+		if (!a.data) {
+			// Create a copy of the file and swap out the path, this removes the
+			// requirement that mods keep the file accessible at the original path.
+			filepath = writeToTempFile(filedata);
+			if (filepath.empty()) {
+				errorstream << "Server: failed creating a copy of media file \""
+					<< filename << "\"" << std::endl;
+				m_media.erase(filename);
 				return false;
-			std::ofstream os(filepath.c_str(), std::ios::binary);
-			if (!os.good())
-				return false;
-			os << filedata;
-			os.close();
-			return !os.fail();
-		})();
-		if (!ok) {
-			errorstream << "Server: failed to create a copy of media file "
-				<< "\"" << filename << "\"" << std::endl;
-			m_media.erase(filename);
-			return false;
+			}
+			verbosestream << "Server: \"" << filename << "\" temporarily copied to "
+				<< filepath << std::endl;
+			media_it->second.path = filepath;
 		}
-		verbosestream << "Server: \"" << filename << "\" temporarily copied to "
-			<< filepath << std::endl;
 
-		m_media[filename].path = filepath;
-		m_media[filename].no_announce = true;
-		// stepPendingDynMediaCallbacks will clean this up later.
-	} else if (!to_player.empty()) {
-		m_media[filename].no_announce = true;
+		media_it->second.no_announce = true;
+		// stepPendingDynMediaCallbacks will clean the file up later
+	} else if (a.data) {
+		// data is in a temporary file but not ephemeral, so the cleanup point
+		// is different.
+		media_it->second.delete_at_shutdown = true;
+	}
+	if (!a.to_player.empty()) {
+		// only sent to one player (who must be online), so shouldn't announce.
+		media_it->second.no_announce = true;
 	}
 
-	// Push file to existing clients
-	NetworkPacket pkt(TOCLIENT_MEDIA_PUSH, 0);
-	pkt << raw_hash << filename << (bool)ephemeral;
-
-	NetworkPacket legacy_pkt = pkt;
-
-	// Newer clients get asked to fetch the file (asynchronous)
-	pkt << token;
-	// Older clients have an awful hack that just throws the data at them
-	legacy_pkt.putLongString(filedata);
-
 	std::unordered_set<session_t> delivered, waiting;
-	{
+
+	// Push file to existing clients
+	if (m_env) {
+		NetworkPacket pkt(TOCLIENT_MEDIA_PUSH, 0);
+		pkt << raw_hash << filename << static_cast<bool>(a.ephemeral);
+
+		NetworkPacket legacy_pkt = pkt;
+
+		// Newer clients get asked to fetch the file (asynchronous)
+		pkt << a.token;
+		// Older clients have an awful hack that just throws the data at them
+		legacy_pkt.putLongString(filedata);
+
 		ClientInterface::AutoLock clientlock(m_clients);
-		for (auto &client : m_clients.getClientList()) {
-			if (client->getState() == CS_DefinitionsSent && !ephemeral) {
+		for (auto &pair : m_clients.getClientList()) {
+			if (pair.second->getState() == CS_DefinitionsSent && !a.ephemeral) {
 				/*
 					If a client is in the DefinitionsSent state it is too late to
 					transfer the file via sendMediaAnnouncement() but at the same
@@ -4105,19 +4095,19 @@ bool Server::dynamicAddMedia(std::string filepath,
 					way for the server to resolve this so we (currently) opt not to.
 				*/
 				warningstream << "The media \"" << filename << "\" (dynamic) could "
-					"not be delivered to " << client->getName()
+					"not be delivered to " << pair.second->getName()
 					<< " due to a race condition." << std::endl;
 				continue;
 			}
-			if (client->getState() < CS_Active)
+			if (pair.second->getState() < CS_Active)
 				continue;
 
-			const unsigned short proto_ver = client->net_proto_version;
+			const auto proto_ver = pair.second->net_proto_version.load(std::memory_order::relaxed);
 			if (proto_ver < 39)
 				continue;
 
-			const session_t peer_id = client->peer_id;
-			if (!to_player.empty() && getPlayerName(peer_id) != to_player)
+			const session_t peer_id = pair.second->peer_id;
+			if (!a.to_player.empty() && getPlayerName(peer_id) != a.to_player)
 				continue;
 
 			if (proto_ver < 40) {
@@ -4128,8 +4118,8 @@ bool Server::dynamicAddMedia(std::string filepath,
 					to push the media over ALL channels to ensure it is processed before
 					it is used. In practice this means channels 1 and 0.
 				*/
-				m_clients.send(peer_id, 1, &legacy_pkt, true);
-				m_clients.send(peer_id, 0, &legacy_pkt, true);
+				m_clients.sendCustom(peer_id, 1, &legacy_pkt, true);
+				m_clients.sendCustom(peer_id, 0, &legacy_pkt, true);
 			} else {
 				waiting.emplace(peer_id);
 				Send(peer_id, &pkt);
@@ -4140,15 +4130,15 @@ bool Server::dynamicAddMedia(std::string filepath,
 	// Run callback for players that already had the file delivered (legacy-only)
 	for (session_t peer_id : delivered) {
 		if (auto player = m_env->getPlayer(peer_id))
-			getScriptIface()->on_dynamic_media_added(token, player->getName().c_str());
+			getScriptIface()->on_dynamic_media_added(a.token, player->getName().c_str());
 	}
 
 	// Save all others in our pending state
-	auto &state = m_pending_dyn_media[token];
+	auto &state = m_pending_dyn_media[a.token];
 	state.waiting_players = std::move(waiting);
 	// regardless of success throw away the callback after a while
 	state.expiry_timer = 60.0f;
-	if (ephemeral)
+	if (a.ephemeral)
 		state.filename = filename;
 
 	return true;
@@ -4160,7 +4150,7 @@ bool Server::rollbackRevertActions(const std::list<RollbackAction> &actions,
 		std::list<std::string> *log)
 {
 	infostream<<"Server::rollbackRevertActions(len="<<actions.size()<<")"<<std::endl;
-	ServerMap *map = (ServerMap*)(&m_env->getMap());
+	auto *map = &m_env->getServerMap();
 
 	// Fail if no actions to handle
 	if (actions.empty()) {
@@ -4454,24 +4444,22 @@ void Server::requestShutdown(const std::string &msg, bool reconnect, float delay
 	} else if (delay < 0.0f && m_shutdown_state.isTimerRunning()) {
 		// Negative delay, cancel shutdown if requested
 		m_shutdown_state.reset();
-		std::wstringstream ws;
 
-		ws << L"*** Server shutdown canceled.";
+		const char *s = "*** Server shutdown canceled.";
 
-		infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
-		SendChatMessage(PEER_ID_INEXISTENT, ws.str());
-		// m_shutdown_* are already handled, skip.
+		infostream << s << std::endl;
+		SendChatMessage(PEER_ID_INEXISTENT, utf8_to_wide(s));
+		// m_shutdown_state already handled, skip.
 		return;
 	} else if (delay > 0.0f) {
 	// Positive delay, tell the clients when the server will shut down
-		std::wstringstream ws;
+		std::ostringstream oss;
 
-		ws << L"*** Server shutting down in "
-				<< duration_to_string(myround(delay)).c_str()
-				<< ".";
+		oss << "*** Server shutting down in "
+			<< duration_to_string(myround(delay)) << ".";
 
-		infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
-		SendChatMessage(PEER_ID_INEXISTENT, ws.str());
+		infostream << oss.str() << std::endl;
+		SendChatMessage(PEER_ID_INEXISTENT, utf8_to_wide(oss.str()));
 	}
 
 	m_shutdown_state.trigger(delay, msg, reconnect);
@@ -4485,7 +4473,7 @@ PlayerSAO* Server::emergePlayer(const char *name, session_t peer_id, u16 proto_v
 	RemotePlayer *player = m_env->getPlayer(name);
 
 	// If player is already connected, cancel
-	if (player && player->getPeerId() != PEER_ID_INEXISTENT) {
+	if (player) {
 		infostream<<"emergePlayer(): Player already connected"<<std::endl;
 		return NULL;
 	}
@@ -4500,10 +4488,29 @@ PlayerSAO* Server::emergePlayer(const char *name, session_t peer_id, u16 proto_v
 	}
 
 	if (!player && maintenance_status) {
-		infostream<<"emergePlayer(): Maintenance in progress, disallowing loading player"<<std::endl;
-		return nullptr;
+		infostream
+				<< "emergePlayer(): Maintenance in progress, disallowing loading player"
+				<< "\n";
+		return {};
 	}
 
+	/*
+		Object construction sequence/hierarchy
+		--------------------------------------
+		1. RemoteClient (tightly connection-bound)
+		2. RemotePlayer (controls, in-game appearance)
+		3. PlayerSAO (movable object in-game)
+			PlayerSAO controls the peer_id assignment of RemotePlayer,
+			indicating whether the player is ready
+
+		Destruction sequence
+		--------------------
+		1. PlayerSAO pending removal flag
+		2. PlayerSAO save data before free
+		3. RemotePlayer, then PlayerSAO freed
+		4. RemoteClient freed
+	*/
+
 	if (!player) {
 		player = new RemotePlayer(name, idef());
 	}
@@ -4531,36 +4538,39 @@ void dedicated_server_loop(Server &server, bool &kill)
 
 	IntervalLimiter m_profiler_interval;
 
-	static thread_local const float steplen =
-			g_settings->getFloat("dedicated_server_step");
-	static thread_local const float profiler_print_interval =
-			g_settings->getFloat("profiler_print_interval");
+	constexpr float steplen = 0.05f; // always 50 ms
+	const float profiler_print_interval = g_settings->getFloat("profiler_print_interval");
+
+	server.setStepSettings(Server::StepSettings{
+			g_settings->getFloat("dedicated_server_step"),
+			false
+		});
 
 
 	int errors = 0;
 	double run_time = 0;
 
 	/*
-	 * The dedicated server loop only does time-keeping (in Server::step) and
-	 * provides a way to main.cpp to kill the server externally (bool &kill).
+	 * The dedicated server loop only provides a way to main.cpp to kill the
+	 * server externally (bool &kill).
 	 */
 
 	for(;;) {
 		// This is kind of a hack but can be done like this
 		// because server.step() is very light
-		sleep_ms((int)(steplen*1000.0));
-		try {
-		server.step(steplen);
-		}
-		// TODO: more errors here
-		catch (const std::exception &e) {
-			if (!errors++ || !(errors % (int)(60 / steplen)))
-				errorstream << "Fatal error n=" << errors << " : " << e.what()
-							<< std::endl;
-		} catch (...) {
-			if (!errors++ || !(errors % (int)(60 / steplen)))
-				errorstream << "Fatal error unknown " << errors << std::endl;
-		}
+		sleep_ms((int)(steplen*1000.0f));
+       try {
+		server.step();
+	   }
+	   // TODO: more errors here
+	   catch (const std::exception &e) {
+		   if (!errors++ || !(errors % (int)(60 / steplen)))
+			   errorstream << "Fatal error n=" << errors << " : " << e.what()
+						   << std::endl;
+	   } catch (...) {
+		   if (!errors++ || !(errors % (int)(60 / steplen)))
+			   errorstream << "Fatal error unknown " << errors << std::endl;
+	   }
 
 		if (server.isShutdownRequested() || kill)
 			break;
@@ -4573,10 +4583,10 @@ void dedicated_server_loop(Server &server, bool &kill)
 		/*
 			Profiler
 		*/
-		if (server.m_clients.getClientList().size() && profiler_print_interval) {
-			if(m_profiler_interval.step(steplen, profiler_print_interval))
-			{
-				infostream<<"Profiler:"<<std::endl;
+       if(server.m_clients.getClientList().size())
+		if (profiler_print_interval > 0) {
+			if (m_profiler_interval.step(steplen, profiler_print_interval)) {
+				infostream << "Profiler:" << std::endl;
 				g_profiler->print(infostream);
 				g_profiler->clear();
 			}
@@ -4592,11 +4602,12 @@ void dedicated_server_loop(Server &server, bool &kill)
 #endif
 */
 
-	if (server.m_autoexit || g_profiler_enabled) {
-		actionstream << "Profiler:" << std::fixed << std::setprecision(9) << std::endl;
-		g_profiler->print(actionstream);
+	if (server.m_autoexit || g_profiler_enabled || profiler_print_interval > 0) {
+		infostream << std::fixed << std::setprecision(9) << "\n";
+		infostream << "Profiler:" << std::endl;
+		g_profiler->print(infostream);
+		g_profiler->clear();
 	}
-
 }
 
 /*
@@ -4680,7 +4691,7 @@ Translations *Server::getTranslationLanguage(const std::string &lang_code)
 	for (const auto &i : m_media) {
 		if (str_ends_with(i.first, suffix)) {
 			std::string data;
-			if (fs::ReadFile(i.second.path, data)) {
+			if (fs::ReadFile(i.second.path, data, true)) {
 				translations->loadTranslation(data);
 			}
 		}
@@ -4689,6 +4700,19 @@ Translations *Server::getTranslationLanguage(const std::string &lang_code)
 	return translations;
 }
 
+std::unordered_map<std::string, std::string> Server::getMediaList()
+{
+	//MutexAutoLock env_lock(m_env_mutex);
+
+	std::unordered_map<std::string, std::string> ret;
+	for (auto &it : m_media) {
+		if (it.second.no_announce)
+			continue;
+		ret.emplace(base64_decode(it.second.sha1_digest), it.second.path);
+	}
+	return ret;
+}
+
 ModStorageDatabase *Server::openModStorageDatabase(const std::string &world_path)
 {
 	std::string world_mt_path = world_path + DIR_DELIM + "world.mt";
@@ -4799,3 +4823,20 @@ bool Server::migrateModStorageDatabase(const GameParams &game_params, const Sett
 
 	return succeeded;
 }
+
+u16 Server::getProtocolVersionMin()
+{
+	u16 min_proto = g_settings->getU16("protocol_version_min");
+	if (g_settings->getBool("strict_protocol_version_checking"))
+		min_proto = LATEST_PROTOCOL_VERSION;
+	return rangelim(min_proto,
+		SERVER_PROTOCOL_VERSION_MIN,
+		SERVER_PROTOCOL_VERSION_MAX);
+}
+
+u16 Server::getProtocolVersionMax()
+{
+	return g_settings->getBool("strict_protocol_version_checking")
+		? LATEST_PROTOCOL_VERSION
+		: SERVER_PROTOCOL_VERSION_MAX;
+}
diff --git a/src/server.h b/src/server.h
index ec25e8138..0fce5b196 100644
--- a/src/server.h
+++ b/src/server.h
@@ -22,6 +22,13 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+//  fm:
+#include "stat.h"
+#include "network/fm_lan.h"
+#include <unordered_set>
+//== 
+
+
 #include "irr_v3d.h"
 #include "map.h"
 #include "hud.h"
@@ -37,40 +44,17 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/basic_macros.h"
 #include "util/metricsbackend.h"
 #include "serverenvironment.h"
-#include "clientiface.h"
+#include "server/clientiface.h"
 #include "chatmessage.h"
 #include "sound.h"
 #include "translation.h"
-#include <memory>
+#include <atomic>
 #include <string>
 #include <list>
 #include <map>
 #include <vector>
-
-
-//fm:
-#include "stat.h"
-#include "network/fm_lan.h"
-#include <unordered_set>
-class Circuit;
-class Stat;
-class MapThread;
-class SendBlocksThread;
-class LiquidThread;
-class EnvThread;
-class AbmThread;
-class AbmWorldThread;
-
-
-class ClientNotFoundException : public BaseException
-{
-public:
-	ClientNotFoundException(const char *s):
-		BaseException(s)
-	{}
-};
-
-
+#include <optional>
+#include <string_view>
 
 class ChatEvent;
 struct ChatEventChat;
@@ -79,7 +63,6 @@ class IWritableItemDefManager;
 class NodeDefManager;
 class IWritableCraftDefManager;
 class BanManager;
-class EventManager;
 class Inventory;
 class ModChannelMgr;
 class RemotePlayer;
@@ -104,6 +87,26 @@ struct PackedValue;
 struct ParticleParameters;
 struct ParticleSpawnerParameters;
 
+
+// fm:
+class Circuit;
+class Stat;
+class MapThread;
+class SendBlocksThread;
+class LiquidThread;
+class EnvThread;
+class AbmThread;
+class AbmWorldThread;
+
+class ClientNotFoundException : public BaseException
+{
+public:
+	ClientNotFoundException(const char *s):
+		BaseException(s)
+	{}
+};
+// ==
+
 enum ClientDeletionReason {
 	CDR_LEAVE,
 	CDR_TIMEOUT,
@@ -114,13 +117,17 @@ struct MediaInfo
 {
 	std::string path;
 	std::string sha1_digest; // base64-encoded
-	bool no_announce; // true: not announced in TOCLIENT_ANNOUNCE_MEDIA (at player join)
+	// true = not announced in TOCLIENT_ANNOUNCE_MEDIA (at player join)
+	bool no_announce;
+	// does what it says. used by some cases of dynamic media.
+	bool delete_at_shutdown;
 
-	MediaInfo(const std::string &path_="",
-	          const std::string &sha1_digest_=""):
+	MediaInfo(std::string_view path_ = "",
+	          std::string_view sha1_digest_ = ""):
 		path(path_),
 		sha1_digest(sha1_digest_),
-		no_announce(false)
+		no_announce(false),
+		delete_at_shutdown(false)
 	{
 	}
 };
@@ -185,13 +192,12 @@ public:
 
 	void start();
 	void stop();
-	// This is mainly a way to pass the time to the server.
 	// Actual processing is done in another thread.
-	void step(float dtime);
+	// This just checks if there was an error in that thread.
+	void step();
 	// This is run by ServerThread and does the actual processing
-
-	void AsyncRunStep( float dtime, bool initial_step=false);
-	u16 Receive(int ms = 10);
+	void AsyncRunStep(float dtime, bool initial_step = false);
+	u16 Receive(float timeout);
 	PlayerSAO* StageTwoClientInit(session_t peer_id);
 
 	/*
@@ -273,6 +279,7 @@ public:
 	void setIpBanned(const std::string &ip, const std::string &name);
 	void unsetIpBanned(const std::string &ip_or_name);
 	std::string getBanDescription(const std::string &ip_or_name);
+	bool denyIfBanned(session_t peer_id);
 
 	void notifyPlayer(const char *name, const std::wstring &msg);
 	void notifyPlayers(const std::wstring &msg);
@@ -285,14 +292,21 @@ public:
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
 
-	bool dynamicAddMedia(std::string filepath, u32 token,
-		const std::string &to_player, bool ephemeral);
+	struct DynamicMediaArgs {
+		std::string filename;
+		std::optional<std::string> filepath;
+		std::optional<std::string_view> data;
+		u32 token;
+		std::string to_player;
+		bool ephemeral = false;
+	};
+	bool dynamicAddMedia(const DynamicMediaArgs &args);
 
 	ServerInventoryManager *getInventoryMgr() const { return m_inventory_mgr.get(); }
 	void sendDetachedInventory(Inventory *inventory, const std::string &name, session_t peer_id);
 
 	// Envlock and conlock should be locked when using scriptapi
-	ServerScripting *getScriptIface(){ return m_script; }
+	inline ServerScripting *getScriptIface() { return m_script.get(); }
 
 	// actions: time-reversed list
 	// Return value: success/failure
@@ -306,7 +320,7 @@ public:
 	virtual ICraftDefManager* getCraftDefManager();
 	virtual u16 allocateUnknownNodeId(const std::string &name);
 	IRollbackManager *getRollbackManager() { return m_rollback; }
-	virtual EmergeManager *getEmergeManager() { return m_emerge; }
+	virtual EmergeManager *getEmergeManager() { return m_emerge.get(); }
 	virtual ModStorageDatabase *getModStorageDatabase() { return m_mod_storage_database; }
 
 	IWritableItemDefManager* getWritableItemDefManager();
@@ -318,10 +332,19 @@ public:
 	virtual const SubgameSpec* getGameSpec() const { return &m_gamespec; }
 	static std::string getBuiltinLuaPath();
 	virtual std::string getWorldPath() const { return m_path_world; }
+	virtual std::string getModDataPath() const { return m_path_mod_data; }
 
 	inline bool isSingleplayer() const
 			{ return m_simple_singleplayer_mode; }
 
+	struct StepSettings {
+		float steplen;
+		bool pause;
+	};
+
+	void setStepSettings(StepSettings spdata) { m_step_settings.store(spdata); }
+	StepSettings getStepSettings() { return m_step_settings.load(); }
+
 	inline void setAsyncFatalError(const std::string &error)
 			{ m_async_fatal_error.set(error); }
 	inline void setAsyncFatalError(const LuaError &e)
@@ -349,7 +372,7 @@ public:
 
 	void setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
 			f32 frame_speed);
-	void setPlayerEyeOffset(RemotePlayer *player, const v3f &first, const v3f &third, const v3f &third_front);
+	void setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third, v3f third_front);
 
 	void setSky(RemotePlayer *player, const SkyboxParams &params);
 	void setSun(RemotePlayer *player, const SunParams &params);
@@ -371,6 +394,8 @@ public:
 	void DenySudoAccess(session_t peer_id);
 	void DenyAccess(session_t peer_id, AccessDeniedCode reason,
 		const std::string &custom_reason = "", bool reconnect = false);
+	void kickAllPlayers(AccessDeniedCode reason,
+		const std::string &str_reason, bool reconnect);
 	void acceptAuth(session_t peer_id, bool forSudoMode);
 	void DisconnectPeer(session_t peer_id);
 	bool getClientConInfo(session_t peer_id, con::rtt_stat_type type, float *retval);
@@ -382,8 +407,9 @@ public:
 	void HandlePlayerHPChange(PlayerSAO *sao, const PlayerHPChangeReason &reason);
 	void SendPlayerHP(PlayerSAO *sao, bool effect);
 	void SendPlayerBreath(PlayerSAO *sao);
-	void SendInventory(PlayerSAO *playerSAO, bool incremental);
-	void SendMovePlayer(session_t peer_id);
+	void SendInventory(RemotePlayer *player, bool incremental);
+	void SendMovePlayer(PlayerSAO *sao);
+	void SendMovePlayerRel(session_t peer_id, const v3f &added_pos);
 	void SendPlayerSpeed(session_t peer_id, const v3f &added_vel);
 	void SendPlayerFov(session_t peer_id);
 
@@ -404,6 +430,10 @@ public:
 	// Get or load translations for a language
 	Translations *getTranslationLanguage(const std::string &lang_code);
 
+	// Returns all media files the server knows about
+	// map key = binary sha1, map value = file path
+	std::unordered_map<std::string, std::string> getMediaList();
+
 	static ModStorageDatabase *openModStorageDatabase(const std::string &world_path);
 
 	static ModStorageDatabase *openModStorageDatabase(const std::string &backend,
@@ -412,8 +442,13 @@ public:
 	static bool migrateModStorageDatabase(const GameParams &game_params,
 			const Settings &cmd_args);
 
+	static u16 getProtocolVersionMin();
+	static u16 getProtocolVersionMax();
+
 	// Lua files registered for init of async env, pair of modname + path
 	std::vector<std::pair<std::string, std::string>> m_async_init_files;
+	// Identical but for mapgen env
+	std::vector<std::pair<std::string, std::string>> m_mapgen_init_files;
 
 	// Data transferred into other Lua envs at init time
 	std::unique_ptr<PackedValue> m_lua_globals_data;
@@ -424,10 +459,23 @@ public:
 	// Environment mutex (envlock)
 	//std::mutex m_env_mutex;
 
+protected:
+	/* Do not add more members here, this is only required to make unit tests work. */
+
+	// Scripting
+	// Envlock and conlock should be locked when using Lua
+	std::unique_ptr<ServerScripting> m_script;
+
+	// Mods
+	std::unique_ptr<ServerModManager> m_modmgr;
+
 private:
 	friend class EmergeThread;
 	friend class RemoteClient;
+
+	// unittest classes
 	friend class TestServerShutdownState;
+	friend class TestMoveAction;
 
 	struct ShutdownState {
 		friend class TestServerShutdownState;
@@ -467,7 +515,6 @@ private:
 	void SendBreath(session_t peer_id, u16 breath);
 	void SendAccessDenied(session_t peer_id, AccessDeniedCode reason,
 		const std::string &custom_reason, bool reconnect = false);
-	void SendAccessDenied_Legacy(session_t peer_id, const std::wstring &reason);
 	void SendDeathscreen(session_t peer_id, bool set_camera_point_target,
 		v3f camera_point_target);
 	void SendItemDef(session_t peer_id, IItemDefManager *itemdef, u16 protocol_version);
@@ -490,7 +537,7 @@ private:
 	void SendHUDRemove(session_t peer_id, u32 id);
 	void SendHUDChange(session_t peer_id, u32 id, HudElementStat stat, void *value);
 	void SendHUDSetFlags(session_t peer_id, u32 flags, u32 mask);
-	void SendHUDSetParam(session_t peer_id, u16 param, const std::string &value);
+	void SendHUDSetParam(session_t peer_id, u16 param, std::string_view value);
 	void SendSetSky(session_t peer_id, const SkyboxParams &params);
 	void SendSetSun(session_t peer_id, const SunParams &params);
 	void SendSetMoon(session_t peer_id, const MoonParams &params);
@@ -533,7 +580,7 @@ private:
 	void fillMediaCache();
 	void sendMediaAnnouncement(session_t peer_id, const std::string &lang_code);
 	void sendRequestedMedia(session_t peer_id,
-			const std::vector<std::string> &tosend);
+			const std::unordered_set<std::string> &tosend);
 	void stepPendingDynMediaCallbacks(float dtime);
 
 	// Adds a ParticleSpawner on peer with peer_id (PEER_ID_INEXISTENT == all)
@@ -591,7 +638,10 @@ private:
 		Variables
 	*/
 	// World directory
+public:
 	std::string m_path_world;
+private:
+	std::string m_path_mod_data;
 	// Subgame specification
 	SubgameSpec m_gamespec;
 	// If true, do not allow multiple players and hide some multiplayer
@@ -600,28 +650,28 @@ private:
 	u16 m_max_chatmessage_length;
 	// For "dedicated" server list flag
 	bool m_dedicated;
+
+	// Game settings layer
 	Settings *m_game_settings = nullptr;
 
 	// Thread can set; step() will throw as ServerError
 	MutexedVariable<std::string> m_async_fatal_error;
 
 	// Some timers
+	float m_time_of_day_send_timer = 0.0f;
 	float m_liquid_transform_timer = 0.0f;
 	float m_liquid_transform_every = 1.0f;
 	float m_masterserver_timer = 0.0f;
 	float m_emergethread_trigger_timer = 0.0f;
 	float m_savemap_timer = 0.0f;
 	IntervalLimiter m_map_timer_and_unload_interval;
+	IntervalLimiter m_max_lag_decrease;
 
 	// Environment
 	ServerEnvironment *m_env = nullptr;
 
-	// Reference to the server map until ServerEnvironment is initialized
-	// after that this variable must be a nullptr
-	ServerMap *m_startup_server_map = nullptr;
-
-public:
 	// server connection
+public:
 	std::shared_ptr<con_use::Connection> m_con;
 
 private:
@@ -634,12 +684,7 @@ private:
 
 public:
 	// Emerge manager
-	EmergeManager *m_emerge = nullptr;
-private:
-
-	// Scripting
-	// Envlock and conlock should be locked when using Lua
-	ServerScripting *m_script = nullptr;
+	std::unique_ptr<EmergeManager> m_emerge;
 
 	// Item definition manager
 	IWritableItemDefManager *m_itemdef;
@@ -650,31 +695,17 @@ private:
 	// Craft definition manager
 	IWritableCraftDefManager *m_craftdef;
 
-	// Mods
-	std::unique_ptr<ServerModManager> m_modmgr;
-
 	std::unordered_map<std::string, Translations> server_translations;
 
 	/*
 		Threads
 	*/
-	// A buffer for time steps
-	// step() increments and AsyncRunStep() run by m_thread reads it.
-public:
-	float m_step_dtime = 0.0f;
-private:
-	std::mutex m_step_dtime_mutex;
+	// Set by Game
+	std::atomic<StepSettings> m_step_settings{{0.1f, false}};
 
 	// The server mainly operates in this thread
 	ServerThread *m_thread = nullptr;
 
-	/*
-		Time related stuff
-	*/
-	// Timer for sending time of day over network
-	float m_time_of_day_send_timer = 0.0f;
-
-public:
 	/*
 	 	Client interface
 	*/
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 99af6a2f5..0d624b6cc 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -3,10 +3,14 @@ set(server_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/fm_key_value_cached.cpp
 	
 	${CMAKE_CURRENT_SOURCE_DIR}/activeobjectmgr.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/ban.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/clientiface.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/luaentity_sao.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/player_sao.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobject.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serverinventorymgr.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/serverlist.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/unit_sao.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/rollback.cpp
 	PARENT_SCOPE)
diff --git a/src/server/activeobjectmgr.cpp b/src/server/activeobjectmgr.cpp
index 3e55fcb8b..c50d08148 100644
--- a/src/server/activeobjectmgr.cpp
+++ b/src/server/activeobjectmgr.cpp
@@ -42,6 +42,7 @@ ActiveObjectMgr::~ActiveObjectMgr()
 
 void ActiveObjectMgr::clearIf(const std::function<bool(const ServerActiveObjectPtr&, u16)> &cb)
 {
+/* fmtodo:?
 	decltype(m_active_objects)::full_type active_objects;
 
 	{
@@ -76,20 +77,14 @@ void ActiveObjectMgr::clearIf(const std::function<bool(const ServerActiveObjectP
 	objects_to_remove.clear();
 
 	return;
+// === */
 
-	// Make a defensive copy of the ids in case the passed callback changes the
-	// set of active objects.
-	// The callback is called for newly added objects iff they happen to reuse
-	// an old id.
-	std::vector<u16> ids = getAllIds();
-
-	for (u16 id : ids) {
-		auto it = m_active_objects.find(id);
-		if (it == m_active_objects.end())
-			continue; // obj was already removed
-		if (cb(it->second, id)) {
-			// erase by id, `it` can be invalid now
-			removeObject(id);
+	for (auto &it : m_active_objects.iter()) {
+		if (!it.second)
+			continue;
+		if (cb(it.second, it.first)) {
+			// Remove reference from m_active_objects
+			m_active_objects.remove(it.first);
 		}
 	}
 }
@@ -97,9 +92,8 @@ void ActiveObjectMgr::clearIf(const std::function<bool(const ServerActiveObjectP
 void ActiveObjectMgr::step(
 		float dtime, const std::function<void(const ServerActiveObjectPtr&)> &f)
 {
+/* fmtodo
 	std::swap(m_objects_to_delete, m_objects_to_delete_2);
-	/*for (auto & obj : m_objects_to_delete)
-		delete obj;*/
 	m_objects_to_delete.clear();
 
 	std::vector<ServerActiveObjectPtr> active_objects;
@@ -117,23 +111,21 @@ void ActiveObjectMgr::step(
 	for (const auto &ao_it : active_objects) {
 		f(ao_it);
 	}
-
-#if 0
+# if 0
+*/
 	g_profiler->avg("ActiveObjectMgr: SAO count [#]", m_active_objects.size());
+	size_t count = 0;
 
-	// See above.
-	std::vector<u16> ids = getAllIds();
-
-	for (u16 id : ids) {
-		auto it = m_active_objects.find(id);
-		if (it == m_active_objects.end())
-			continue; // obj was removed
-		f(it->second.get());
+	for (auto &ao_it : m_active_objects.iter()) {
+		if (!ao_it.second)
+			continue;
+		count++;
+		f(ao_it.second);
 	}
-#endif
+
+	g_profiler->avg("ActiveObjectMgr: SAO count [#]", count);
 }
 
-// clang-format off
 bool ActiveObjectMgr::registerObject(std::shared_ptr<ServerActiveObject> obj)
 {
 	if (!obj) return false; // Pre-condition
@@ -164,14 +156,18 @@ bool ActiveObjectMgr::registerObject(std::shared_ptr<ServerActiveObject> obj)
 		return false;
 	}
 
-	m_active_objects.insert_or_assign(obj->getId(), obj);
-	//m_active_objects[obj->getId()] = std::move(obj);
+	auto obj_id = obj->getId(); 
+	m_active_objects.put(obj_id, std::move(obj));
 
 #if !NDEBUG
-	auto obj_p = obj.get();
+	auto new_size = m_active_objects.size();
 	verbosestream << "Server::ActiveObjectMgr::addActiveObjectRaw(): "
-			<< "Added id=" << obj_p->getId() << "; there are now "
-			<< m_active_objects.size() << " active objects." << std::endl;
+			<< "Added id=" << obj_id << "; there are now ";
+	if (new_size == decltype(m_active_objects)::unknown)
+		verbosestream << "???";
+	else
+		verbosestream << new_size;
+	verbosestream << " active objects." << std::endl;
 #endif
 	return true;
 }
@@ -180,41 +176,40 @@ void ActiveObjectMgr::removeObject(u16 id)
 {
 	verbosestream << "Server::ActiveObjectMgr::removeObject(): "
 			<< "id=" << id << std::endl;
-	auto obj = getActiveObject(id);
-	if (!obj) {
+
+	// this will take the object out of the map and then destruct it
+	bool ok = m_active_objects.remove(id);
+	if (!ok) {
 		infostream << "Server::ActiveObjectMgr::removeObject(): "
 				<< "id=" << id << " not found" << std::endl;
-		return;
 	}
-
-    deferDelete(m_active_objects.get(id));
-
-	// Delete the obj before erasing, as the destructor may indirectly access
-	// m_active_objects.
-	//it->second.reset();
-	m_active_objects.erase(id); // `it` can be invalid now
 }
 
-// clang-format on
 void ActiveObjectMgr::getObjectsInsideRadius(const v3f &pos, float radius,
 		std::vector<ServerActiveObjectPtr> &result,
-		const std::function<bool(ServerActiveObjectPtr &obj)> &include_obj_cb)
+		const std::function<bool(const ServerActiveObjectPtr &obj)> &include_obj_cb)
 {
+
+#if 0
 	std::vector<ServerActiveObjectPtr> active_objects;
 	active_objects.reserve(m_active_objects.size());
 	{
-		auto lock = m_active_objects.try_lock_unique_rec(); //prelock
+		/*auto lock = m_active_objects.try_lock_unique_rec(); //prelock
 		if (!lock->owns_lock())
 			return;
+		*/	
 		// bad copy: avoid deadlocks with locks in cb
 		for (const auto &ao_it : m_active_objects) {
 			active_objects.emplace_back(ao_it.second);
 		}
 	}
+#endif
 
 	float r2 = radius * radius;
-	for (auto &obj : active_objects) {
-		//ServerActiveObject *obj = activeObject.second.get();
+	for (auto &activeObject : m_active_objects.iter()) {
+		auto obj = activeObject.second;
+		if (!obj)
+			continue;
 		const v3f &objectpos = obj->getBasePosition();
 		if (objectpos.getDistanceFromSQ(pos) > r2)
 			continue;
@@ -226,9 +221,9 @@ void ActiveObjectMgr::getObjectsInsideRadius(const v3f &pos, float radius,
 
 void ActiveObjectMgr::getObjectsInArea(const aabb3f &box,
 		std::vector<ServerActiveObjectPtr> &result,
-		const std::function<bool(ServerActiveObjectPtr &obj)> &include_obj_cb)
+		const std::function<bool(const ServerActiveObjectPtr &obj)> &include_obj_cb)
 {
-
+/* fmtodo:
 	std::vector<ServerActiveObjectPtr> active_objects;
 	active_objects.reserve(m_active_objects.size());
 	{
@@ -243,7 +238,12 @@ void ActiveObjectMgr::getObjectsInArea(const aabb3f &box,
 	}
 
 	for (auto &obj : active_objects) {
-		//ServerActiveObject *obj = activeObject.second;
+*/
+
+	for (auto &activeObject : m_active_objects.iter()) {
+		auto obj = activeObject.second;
+		if (!obj)
+			continue;
 		const v3f &objectpos = obj->getBasePosition();
 		if (!box.isPointInside(objectpos))
 			continue;
@@ -253,10 +253,11 @@ void ActiveObjectMgr::getObjectsInArea(const aabb3f &box,
 	}
 }
 
-void ActiveObjectMgr::getAddedActiveObjectsAroundPos(const v3f &player_pos, f32 radius,
-		f32 player_radius, std::set<u16> &current_objects,
-		std::queue<u16> &added_objects)
+void ActiveObjectMgr::getAddedActiveObjectsAroundPos(v3f player_pos, f32 radius,
+		f32 player_radius, const std::set<u16> &current_objects,
+		std::vector<u16> &added_objects)
 {
+#if 0
 	decltype(m_active_objects)::full_type active_objects;
 	{
 		// bad copy: avoid deadlocks with locks in cb
@@ -265,6 +266,7 @@ void ActiveObjectMgr::getAddedActiveObjectsAroundPos(const v3f &player_pos, f32
 			return;
 		active_objects = m_active_objects;
 	}
+#endif
 
 	int count = 0;
 	/*
@@ -274,7 +276,7 @@ void ActiveObjectMgr::getAddedActiveObjectsAroundPos(const v3f &player_pos, f32
 		- discard objects that are found in current_objects.
 		- add remaining objects to added_objects
 	*/
-	for (auto &ao_it : active_objects) {
+	for (auto &ao_it : m_active_objects.iter()) {
 		u16 id = ao_it.first;
 
 		// Get object
@@ -298,12 +300,10 @@ void ActiveObjectMgr::getAddedActiveObjectsAroundPos(const v3f &player_pos, f32
 		if (n != current_objects.end())
 			continue;
 		// Add to added_objects
-		added_objects.push(id);
-
+		added_objects.push_back(id);
 
 		if (++count > 10)
 			break;   
-	
 	}
 }
 
diff --git a/src/server/activeobjectmgr.h b/src/server/activeobjectmgr.h
index c63c6ee2b..b0e183fd8 100644
--- a/src/server/activeobjectmgr.h
+++ b/src/server/activeobjectmgr.h
@@ -49,13 +49,13 @@ public:
 
 	void getObjectsInsideRadius(const v3f &pos, float radius,
 			std::vector<ServerActiveObjectPtr> &result,
-			const std::function<bool(ServerActiveObjectPtr &obj)> &include_obj_cb);
+			const std::function<bool(const ServerActiveObjectPtr &obj)> &include_obj_cb);
 	void getObjectsInArea(const aabb3f &box,
 			std::vector<ServerActiveObjectPtr> &result,
-			const std::function<bool(ServerActiveObjectPtr &obj)> &include_obj_cb);
+			const std::function<bool(const ServerActiveObjectPtr &obj)> &include_obj_cb);
 
-	void getAddedActiveObjectsAroundPos(const v3f &player_pos, f32 radius,
-			f32 player_radius, std::set<u16> &current_objects,
-			std::queue<u16> &added_objects);
+	void getAddedActiveObjectsAroundPos(v3f player_pos, f32 radius,
+			f32 player_radius, const std::set<u16> &current_objects,
+			std::vector<u16> &added_objects);
 };
 } // namespace server
diff --git a/src/ban.cpp b/src/server/ban.cpp
similarity index 93%
rename from src/ban.cpp
rename to src/server/ban.cpp
index d0c18127b..6636a1c2a 100644
--- a/src/ban.cpp
+++ b/src/server/ban.cpp
@@ -49,9 +49,8 @@ void BanManager::load()
 {
 	MutexAutoLock lock(m_mutex);
 	infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
-	std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
+	auto is = open_ifstream(m_banfilepath.c_str(), false);
 	if (!is.good()) {
-		infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 		throw SerializationError("BanManager::load(): Couldn't open file");
 	}
 
@@ -124,9 +123,9 @@ void BanManager::add(const std::string &ip, const std::string &name)
 void BanManager::remove(const std::string &ip_or_name)
 {
 	MutexAutoLock lock(m_mutex);
-	for (StringMap::iterator it = m_ips.begin(); it != m_ips.end();) {
+	for (auto it = m_ips.begin(); it != m_ips.end();) {
 		if ((it->first == ip_or_name) || (it->second == ip_or_name)) {
-			m_ips.erase(it++);
+			it = m_ips.erase(it);
 			m_modified = true;
 		} else {
 			++it;
diff --git a/src/ban.h b/src/server/ban.h
similarity index 100%
rename from src/ban.h
rename to src/server/ban.h
diff --git a/src/clientiface.cpp b/src/server/clientiface.cpp
similarity index 86%
rename from src/clientiface.cpp
rename to src/server/clientiface.cpp
index f779bf4a0..1d098e609 100644
--- a/src/clientiface.cpp
+++ b/src/server/clientiface.cpp
@@ -22,10 +22,10 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "clientiface.h"
-#include "irr_v3d.h"
-#include "log.h"
-#include "network/fm_connection_use.h"
+#include "debug.h"
+#include "network/connection.h"
 #include "network/serveropcodes.h"
+#include "profiler.h"
 #include "remoteplayer.h"
 #include "settings.h"
 #include "mapblock.h"
@@ -36,28 +36,34 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "server/player_sao.h"
 #include "log_types.h"
 #include "util/srp.h"
+#include "util/string.h"
 #include "face_position_cache.h"
 
-#include "util/numeric.h"
-#include "profiler.h"
-#include "gamedef.h"
-
+static std::string string_sanitize_ascii(const std::string &s, u32 max_length)
+{
+	std::string out;
+	for (char c : s) {
+		if (out.size() >= max_length)
+			break;
+		if (c > 32 && c < 127)
+			out.push_back(c);
+	}
+	return out;
+}
 
 const char *ClientInterface::statenames[] = {
 	"Invalid",
 	"Disconnecting",
 	"Denied",
 	"Created",
-	"AwaitingInit2",
 	"HelloSent",
+	"AwaitingInit2",
 	"InitDone",
 	"DefinitionsSent",
 	"Active",
 	"SudoMode",
 };
 
-
-
 std::string ClientInterface::state2Name(ClientState state)
 {
 	return statenames[state];
@@ -69,6 +75,7 @@ RemoteClient::RemoteClient() :
 		g_settings->getFloat("full_block_send_enable_min_time_from_building")),
 	m_max_send_distance(g_settings->getS16("max_block_send_distance")),
 	m_block_optimize_distance(g_settings->getS16("block_send_optimize_distance")),
+	m_block_cull_optimize_distance(g_settings->getS16("block_cull_optimize_distance")),
 	m_max_gen_distance(g_settings->getS16("max_block_generate_distance")),
 	m_occ_cull(g_settings->getBool("server_side_occlusion_culling"))
 {
@@ -246,7 +253,10 @@ int RemoteClient::GetNextBlocks (
 		wanted_range);
 	const s16 d_opt = std::min(adjustDist(m_block_optimize_distance, prop_zoom_fov),
 		wanted_range);
-	const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
+	const s16 d_cull_opt = std::min(adjustDist(m_block_cull_optimize_distance, prop_zoom_fov),
+		wanted_range);
+	// f32 to prevent overflow, it is also what isBlockInSight(...) expects
+	const f32 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
 
 	s16 d_max_gen = std::min(adjustDist(m_max_gen_distance, prop_zoom_fov),
 		wanted_range);
@@ -283,11 +293,9 @@ int RemoteClient::GetNextBlocks (
 			Get the border/face dot coordinates of a "d-radiused"
 			box
 		*/
-			list = FacePositionCache::getFacePositions(d);
-		}
+		const auto &list = FacePositionCache::getFacePositions(d);
 
-		std::vector<v3s16>::iterator li;
-		for (li = list.begin(); li != list.end(); ++li) {
+		for (auto li = list.begin(); li != list.end(); ++li) {
 			v3s16 p = *li + center;
 
 			/*
@@ -358,43 +366,33 @@ int RemoteClient::GetNextBlocks (
 			if (m_blocks_sent.find(p) != m_blocks_sent.end())
 				continue;
 
-			bool block_not_found = false;
 			if (block) {
-				// Check whether the block exists (with data)
-				if (!block->isGenerated())
-					block_not_found = true;
-
 				/*
-					If block is not close, don't send it unless it is near
-					ground level.
-
-					Block is near ground level if night-time mesh
-					differs from day-time mesh.
+					If block is not generated and generating new ones is
+					not wanted, skip block.
 				*/
-				if (d >= d_opt) {
-					if (!block->getIsUnderground() && !block->getDayNightDiff())
-						continue;
-				}
+				if (!block->isGenerated() && !generate)
+					continue;
 
 				/*
-					Check occlusion cache first.
-				 */
-				if (m_blocks_occ.find(p) != m_blocks_occ.end())
-					continue;
-
-				if (m_occ_cull && !block_not_found &&
-						env->getMap().isBlockOccluded(block, cam_pos_nodes)) {
-					m_blocks_occ.insert(p);
-					continue;
-				}
+					If block is not close, don't send it if it
+					consists of air only.
+				*/
+				if (d >= d_opt && block->isAir())
+						continue;
 			}
+			/*
+				Check occlusion cache first.
+			 */
+			if (m_blocks_occ.find(p) != m_blocks_occ.end())
+				continue;
 
 			/*
-				If block has been marked to not exist on disk (dummy) or is
-				not generated and generating new ones is not wanted, skip block.
-			*/
-			if (!generate && block_not_found) {
-				// get next one.
+				Note that we do this even before the block is loaded as this does not depend on its contents.
+			 */
+			if (m_occ_cull &&
+					env->getMap().isBlockOccluded(p * MAP_BLOCKSIZE, cam_pos_nodes, d >= d_cull_opt)) {
+				m_blocks_occ.insert(p);
 				continue;
 			}
 			*/
@@ -402,7 +400,7 @@ int RemoteClient::GetNextBlocks (
 			/*
 				Add inexistent block to emerge queue.
 			*/
-			if (block == NULL || block_not_found) {
+			if (!block || !block->isGenerated()) {
 				if (emerge->enqueueBlockEmerge(peer_id, p, generate)) {
 					if (nearest_emerged_d == -1)
 						nearest_emerged_d = d;
@@ -525,14 +523,13 @@ void RemoteClient::SetBlocksNotSent()
 	++m_nearest_unsent_reset;
 }
 
-void RemoteClient::SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks)
+void RemoteClient::SetBlocksNotSent(const std::vector<v3s16> &blocks)
 {
 	++m_nearest_unsent_reset;
 /*
 	m_nothing_to_send_pause_timer = 0;
 
-	for (auto &block : blocks) {
-		v3s16 p = block.first;
+	for (v3s16 p : blocks) {
 		// remove the block from sending and sent sets,
 		// and mark as modified if found
 		if (m_blocks_sending.erase(p) + m_blocks_sent.erase(p) > 0)
@@ -703,16 +700,31 @@ void RemoteClient::resetChosenMech()
 	chosen_mech = AUTH_MECHANISM_NONE;
 }
 
-u64 RemoteClient::uptime() const
+void RemoteClient::setEncryptedPassword(const std::string& pwd)
 {
-	return porting::getTimeS() - m_connection_time;
+	FATAL_ERROR_IF(!str_starts_with(pwd, "#1#"), "must be srp");
+	enc_pwd = pwd;
+	// We just set SRP encrypted password, we accept only it now
+	allowed_auth_mechs = AUTH_MECHANISM_SRP;
+}
+
+void RemoteClient::setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
+{
+	m_version_major = major;
+	m_version_minor = minor;
+	m_version_patch = patch;
+	m_full_version = string_sanitize_ascii(full, 64);
+}
+
+void RemoteClient::setLangCode(const std::string &code)
+{
+	m_lang_code = string_sanitize_ascii(code, 12);
 }
 
 ClientInterface::ClientInterface(const std::shared_ptr<con_use::Connection> & con)
 :
 	m_con(con),
-	m_env(NULL),
-	m_print_info_timer(0.0f)
+	m_env(nullptr)
 {
 
 }
@@ -747,12 +759,12 @@ std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)
 	return reply;
 }
 
-void ClientInterface::markBlockposAsNotSent(const v3s16 &pos)
+void ClientInterface::markBlocksNotSent(const std::vector<v3s16> &positions)
 {
 	//RecursiveMutexAutoLock clientslock(m_clients_mutex);
 	for (const auto &client : m_clients) {
 		if (client.second->getState() >= CS_Active)
-			client.second->SetBlockNotSent(pos);
+			client.second->SetBlocksNotSent(positions);
 	}
 }
 
@@ -774,6 +786,34 @@ void ClientInterface::step(float dtime)
 		m_print_info_timer = 0.0f;
 		UpdatePlayerList();
 	}
+
+	m_check_linger_timer += dtime;
+	if (m_check_linger_timer < 1.0f)
+		return;
+	m_check_linger_timer = 0;
+
+	//RecursiveMutexAutoLock clientslock(m_clients_mutex);
+	for (const auto &it : m_clients) {
+		auto state = it.second->getState();
+		if (state >= CS_HelloSent)
+			continue;
+		if (it.second->uptime() <= LINGER_TIMEOUT)
+			continue;
+		// CS_Created means nobody has even noticed the client is there
+		//            (this is before on_prejoinplayer runs)
+		// CS_Invalid should not happen
+		// -> log those as warning, the rest as info
+		std::ostream &os = state == CS_Created || state == CS_Invalid ?
+			warningstream : infostream;
+		try {
+			Address addr = m_con->GetPeerAddress(it.second->peer_id);
+			os << "Disconnecting lingering client from "
+				<< addr.serializeString() << " (state="
+				<< state2Name(state) << ")" << std::endl;
+			m_con->DisconnectPeer(it.second->peer_id);
+		} catch (con::PeerNotFoundException &e) {
+		}
+	}
 }
 
 void ClientInterface::UpdatePlayerList()
@@ -830,10 +870,21 @@ void ClientInterface::send(u16 peer_id,u8 channelnum,
 #endif
 
 #if MINETEST_PROTO
-void ClientInterface::send(session_t peer_id, u8 channelnum,
-		NetworkPacket *pkt, bool reliable)
+void ClientInterface::send(session_t peer_id, NetworkPacket *pkt)
 {
-	m_con->Send(peer_id, channelnum, pkt, reliable);
+	auto &ccf = clientCommandFactoryTable[pkt->getCommand()];
+	FATAL_ERROR_IF(!ccf.name, "packet type missing in table");
+
+	m_con->Send(peer_id, ccf.channel, pkt, ccf.reliable);
+}
+
+void ClientInterface::sendCustom(session_t peer_id, u8 channel, NetworkPacket *pkt, bool reliable)
+{
+	// check table anyway to prevent mistakes
+	FATAL_ERROR_IF(!clientCommandFactoryTable[pkt->getCommand()].name,
+		"packet type missing in table");
+
+	m_con->Send(peer_id, channel, pkt, reliable);
 }
 
 void ClientInterface::sendToAll(NetworkPacket *pkt)
@@ -842,9 +893,9 @@ void ClientInterface::sendToAll(NetworkPacket *pkt)
 	for (auto &client_it : m_clients) {
 		const auto client = client_it.second;
 		if (client->net_proto_version != 0) {
-			m_con->Send(client->peer_id,
-					clientCommandFactoryTable[pkt->getCommand()].channel, pkt,
-					clientCommandFactoryTable[pkt->getCommand()].reliable);
+			auto &ccf = clientCommandFactoryTable[pkt->getCommand()];
+			FATAL_ERROR_IF(!ccf.name, "packet type missing in table");
+			m_con->Send(client->peer_id, ccf.channel, pkt, ccf.reliable);
 		}
 	}
 }
diff --git a/src/clientiface.h b/src/server/clientiface.h
similarity index 94%
rename from src/clientiface.h
rename to src/server/clientiface.h
index cc562742b..76082f4bc 100644
--- a/src/clientiface.h
+++ b/src/server/clientiface.h
@@ -189,8 +189,8 @@ enum ClientState
 	CS_Disconnecting,
 	CS_Denied,
 	CS_Created,
-	CS_AwaitingInit2,
 	CS_HelloSent,
+	CS_AwaitingInit2,
 	CS_InitDone,
 	CS_DefinitionsSent,
 	CS_Active,
@@ -263,15 +263,14 @@ public:
 	AuthMechanism chosen_mech  = AUTH_MECHANISM_NONE;
 	void *auth_data = nullptr;
 	u32 allowed_auth_mechs = 0;
-	u32 allowed_sudo_mechs = 0;
 
 	void resetChosenMech();
 
-	bool isSudoMechAllowed(AuthMechanism mech)
-	{ return allowed_sudo_mechs & mech; }
 	bool isMechAllowed(AuthMechanism mech)
 	{ return allowed_auth_mechs & mech; }
 
+	void setEncryptedPassword(const std::string& pwd);
+
 	RemoteClient();
 	~RemoteClient() = default;
 
@@ -286,9 +285,9 @@ public:
 	void SentBlock(v3bpos_t p, double time);
 
 	void SetBlockNotSent(v3s16 p);
-	void SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks);
 	void SetBlocksNotSent();
 	void SetBlockDeleted(v3bpos_t p);
+	void SetBlocksNotSent(const std::vector<v3s16> &blocks);
 
 	/**
 	 * tell client about this block being modified right now.
@@ -313,10 +312,10 @@ public:
 		return m_blocks_sent.find(p) != m_blocks_sent.end();
 	}
 
-	// Increments timeouts and removes timed-out blocks from list
-	// NOTE: This doesn't fix the server-not-sending-block bug
-	//       because it is related to emerging, not sending.
-	//void RunSendingTimeouts(float dtime, float timeout);
+	bool markMediaSent(const std::string &name) {
+		auto insert_result = m_media_sent.emplace(name);
+		return insert_result.second; // true = was inserted
+	}
 
 	void PrintInfo(std::ostream &o)
 	{
@@ -338,7 +337,7 @@ public:
 
 	ClientState getState() const { return m_state; }
 
-	std::string getName() const { return m_name; }
+	const std::string &getName() const { return m_name; }
 
 	void setName(const std::string &name) { m_name = name; }
 
@@ -356,16 +355,10 @@ public:
 		{ serialization_version = m_pending_serialization_version; }
 
 	/* get uptime */
-	u64 uptime() const;
+	u64 uptime() const { return porting::getTimeS() - m_connection_time; }
 
 	/* set version information */
-	void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full)
-	{
-		m_version_major = major;
-		m_version_minor = minor;
-		m_version_patch = patch;
-		m_full_version = full;
-	}
+	void setVersionInfo(u8 major, u8 minor, u8 patch, const std::string &full);
 
 	/* read version information */
 	u8 getMajor() const { return m_version_major; }
@@ -373,7 +366,7 @@ public:
 	u8 getPatch() const { return m_version_patch; }
 	const std::string &getFullVer() const { return m_full_version; }
 
-	void setLangCode(const std::string &code) { m_lang_code = code; }
+	void setLangCode(const std::string &code);
 	const std::string &getLangCode() const { return m_lang_code; }
 
 	void setCachedAddress(const Address &addr) { m_addr = addr; }
@@ -427,9 +420,16 @@ private:
 	const float m_min_time_from_building;
 	const s16 m_max_send_distance;
 	const s16 m_block_optimize_distance;
+	const s16 m_block_cull_optimize_distance;
 	const s16 m_max_gen_distance;
 	const bool m_occ_cull;
 
+	/*
+		Set of media files the client has already requested
+		We won't send the same file twice to avoid bandwidth consumption attacks.
+	*/
+	std::unordered_set<std::string> m_media_sent;
+
 	/*
 		Blocks that are currently on the line.
 		This is used for throttling the sending of blocks.
@@ -506,8 +506,8 @@ public:
 	/* get list of active client id's */
 	std::vector<session_t> getClientIDs(ClientState min_state=CS_Active);
 
-	/* mark block as not sent to active client sessions */
-	void markBlockposAsNotSent(const v3s16 &pos);
+	/* mark blocks as not sent on all active clients */
+	void markBlocksNotSent(const std::vector<v3s16> &positions);
 
 	/* verify is server user limit was reached */
 	bool isUserLimitReached();
@@ -515,8 +515,11 @@ public:
 	/* get list of client player names */
 	const std::vector<std::string> &getPlayerNames() const { return m_clients_names; }
 
-	/* send message to client */
-	void send(session_t peer_id, u8 channelnum, NetworkPacket *pkt, bool reliable);
+	/* send to one client */
+	void send(session_t peer_id, NetworkPacket *pkt);
+
+	/* send to one client, deviating from the standard params */
+	void sendCustom(session_t peer_id, u8 channel, NetworkPacket *pkt, bool reliable);
 
 	/* send message to client */
 	void send(u16 peer_id, u8 channelnum, const msgpack::sbuffer &data, bool reliable);
@@ -575,10 +578,11 @@ protected:
 		//RecursiveMutexAutoLock m_lock;
 	};
 
-/*
+public:
 	RemoteClientMap& getClientList() { return m_clients; }
-*/
+protected:
 
+/* fmtodo"
 public:
 	RemoteClientVector getClientList() {
 		RemoteClientVector clients;
@@ -591,6 +595,8 @@ public:
 		return clients;
 	}
 
+*/
+
 private:
 	/* update internal player list */
 	void UpdatePlayerList();
@@ -605,7 +611,10 @@ private:
 	// Environment
 	ServerEnvironment *m_env;
 
-	float m_print_info_timer;
+	float m_print_info_timer = 0;
+	float m_check_linger_timer = 0;
 
 	static const char *statenames[];
+
+	static constexpr int LINGER_TIMEOUT = 10;
 };
diff --git a/src/server/luaentity_sao.cpp b/src/server/luaentity_sao.cpp
index b15318088..253d90ba8 100644
--- a/src/server/luaentity_sao.cpp
+++ b/src/server/luaentity_sao.cpp
@@ -72,7 +72,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos, const std::string &d
 		break;
 	}
 	// create object
-	verbosestream << "LuaEntitySAO::create(name=\"" << name << "\" state is";
+	verbosestream << "LuaEntitySAO(name=\"" << name << "\" state is ";
 	if (state.empty())
 		verbosestream << "empty";
 	else
@@ -139,18 +139,22 @@ void LuaEntitySAO::dispatchScriptDeactivate(bool removal)
 
 void LuaEntitySAO::step(float dtime, bool send_recommended)
 {
-	if(!m_properties_sent)
-	{
+	if (!m_properties_sent) {
 		std::string str = getPropertyPacket();
 		// create message and add to list
-		m_messages_out.emplace(getId(), true, str);
+		m_messages_out.emplace(getId(), true, std::move(str));
 		m_properties_sent = true;
 	}
 
+	if (!m_texture_modifier_sent) {
+		m_texture_modifier_sent = true;
+		m_messages_out.emplace(getId(), true, generateSetTextureModCommand());
+	}
+
 	// If attached, check that our parent is still there. If it isn't, detach.
 	if (m_attachment_parent_id && !isAttached()) {
 		// This is handled when objects are removed from the map
-		warningstream << "LuaEntitySAO::step() id=" << m_id <<
+		warningstream << "LuaEntitySAO::step() " << m_init_name << " at " << m_last_sent_position << ", id=" << m_id <<
 			" is attached to nonexistent parent. This is a bug." << std::endl;
 		clearParentAttachment();
 		sendPosition(false, true);
@@ -208,7 +212,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 		}
 	}
 
-	if (fabs(m_prop.automatic_rotate) > 0.001f) {
+	if (std::abs(m_prop.automatic_rotate) > 0.001f) {
 		m_rotation_add_yaw = modulo360f(m_rotation_add_yaw + dtime * core::RADTODEG *
 				m_prop.automatic_rotate);
 	}
@@ -257,7 +261,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 
 	// PROTOCOL_VERSION >= 37
 	writeU8(os, 1); // version
-	os << serializeString16(""); // name
+	os << serializeString16(m_init_name); // name
 	writeU8(os, 0); // is_player
 	writeU16(os, getId()); //id
 	writeV3F32(os, getBasePosition());
@@ -268,13 +272,13 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 	msg_os << serializeString32(getPropertyPacket()); // message 1
 	msg_os << serializeString32(generateUpdateArmorGroupsCommand()); // 2
 	msg_os << serializeString32(generateUpdateAnimationCommand()); // 3
-	for (const auto &bone_pos : m_bone_position) {
-		msg_os << serializeString32(generateUpdateBonePositionCommand(
-			bone_pos.first, bone_pos.second.X, bone_pos.second.Y)); // 3 + N
+	for (const auto &bone_override : m_bone_override) {
+		msg_os << serializeString32(generateUpdateBoneOverrideCommand(
+			bone_override.first, bone_override.second)); // 3 + N
 	}
-	msg_os << serializeString32(generateUpdateAttachmentCommand()); // 4 + m_bone_position.size
+	msg_os << serializeString32(generateUpdateAttachmentCommand()); // 4 + m_bone_override.size
 
-	int message_count = 4 + m_bone_position.size();
+	int message_count = 4 + m_bone_override.size();
 
 	for (const auto &id : getAttachmentChildIds()) {
 		if (ServerActiveObject *obj = m_env->getActiveObject(id)) {
@@ -302,6 +306,8 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
 
 void LuaEntitySAO::getStaticData(std::string *result) const
 {
+	assert(isStaticAllowed());
+
 	std::ostringstream os(std::ios::binary);
 	// version must be 1 to keep backwards-compatibility. See version2
 	writeU8(os, 1);
@@ -343,16 +349,16 @@ u32 LuaEntitySAO::punch(v3f dir,
 		return 0;
 	}
 
-	FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
-
 	s32 old_hp = getHP();
 	ItemStack selected_item, hand_item;
-	ItemStack tool_item = puncher->getWieldedItem(&selected_item, &hand_item);
+	ItemStack tool_item;
+	if (puncher)
+		tool_item = puncher->getWieldedItem(&selected_item, &hand_item);
 
 	PunchDamageResult result = getPunchDamage(
 			m_armor_groups,
 			toolcap,
-			&tool_item,
+			puncher ? &tool_item : nullptr,
 			time_from_last_punch,
 			initial_wear);
 
@@ -366,12 +372,16 @@ u32 LuaEntitySAO::punch(v3f dir,
 		}
 	}
 
-	actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
-			", hp=" << puncher->getHP() << ") punched " <<
-			getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
-			"), damage=" << (old_hp - (s32)getHP()) <<
-			(damage_handled ? " (handled by Lua)" : "") << std::endl;
-
+	if (puncher) {
+		actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
+				", hp=" << puncher->getHP() << ")";
+	} else {
+		actionstream << "(none)";
+	}
+	actionstream << " punched " <<
+		  getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
+		  "), damage=" << (old_hp - (s32)getHP()) <<
+		  (damage_handled ? " (handled by Lua)" : "") << std::endl;
 	// TODO: give Lua control over wear
 	return result.wear;
 }
@@ -461,24 +471,24 @@ v3f LuaEntitySAO::getAcceleration()
 
 void LuaEntitySAO::setTextureMod(const std::string &mod)
 {
-	m_current_texture_modifier = mod;
-	// create message and add to list
-	m_messages_out.emplace(getId(), true, generateSetTextureModCommand());
+	if (m_texture_modifier == mod)
+		return;
+	m_texture_modifier = mod;
+	m_texture_modifier_sent = false;
 }
 
 std::string LuaEntitySAO::getTextureMod() const
 {
-	return m_current_texture_modifier;
+	return m_texture_modifier;
 }
 
-
 std::string LuaEntitySAO::generateSetTextureModCommand() const
 {
 	std::ostringstream os(std::ios::binary);
 	// command
 	writeU8(os, AO_CMD_SET_TEXTURE_MOD);
 	// parameters
-	os << serializeString16(m_current_texture_modifier);
+	os << serializeString16(m_texture_modifier);
 	return os.str();
 }
 
@@ -575,7 +585,7 @@ bool LuaEntitySAO::getCollisionBox(aabb3f *toset) const
 
 bool LuaEntitySAO::getSelectionBox(aabb3f *toset) const
 {
-	if (!m_prop.is_visible || !m_prop.pointable) {
+	if (!m_prop.is_visible) {
 		return false;
 	}
 
diff --git a/src/server/luaentity_sao.h b/src/server/luaentity_sao.h
index e62776d24..f6d87cae9 100644
--- a/src/server/luaentity_sao.h
+++ b/src/server/luaentity_sao.h
@@ -109,5 +109,7 @@ private:
 	v3f m_last_sent_rotation;
 	float m_last_sent_position_timer = 0.0f;
 	float m_last_sent_move_precision = 0.0f;
-	std::string m_current_texture_modifier = "";
+
+	std::string m_texture_modifier;
+	bool m_texture_modifier_sent = false;
 };
diff --git a/src/server/mods.cpp b/src/server/mods.cpp
index 260079a38..d547bd7cb 100644
--- a/src/server/mods.cpp
+++ b/src/server/mods.cpp
@@ -49,9 +49,8 @@ ServerModManager::ServerModManager(const std::string &worldpath):
 	configuration.checkConflictsAndDeps();
 }
 
-// clang-format off
 // This function cannot be currenctly easily tested but it should be ASAP
-void ServerModManager::loadMods(ServerScripting *script)
+void ServerModManager::loadMods(ServerScripting &script)
 {
 	// Print mods
 	infostream << "Server: Loading mods: ";
@@ -72,16 +71,15 @@ void ServerModManager::loadMods(ServerScripting *script)
 		}
 
 		auto t = porting::getTimeMs();
-		script->loadMod(script_path, mod.name);
+		script.loadMod(script_path, mod.name);
 		infostream << "Mod \"" << mod.name << "\" loaded after "
 			<< (porting::getTimeMs() - t) << " ms" << std::endl;
 	}
 
 	// Run a callback when mods are loaded
-	script->on_mods_loaded();
+	script.on_mods_loaded();
 }
 
-// clang-format on
 const ModSpec *ServerModManager::getModSpec(const std::string &modname) const
 {
 	for (const auto &mod : configuration.getMods()) {
diff --git a/src/server/mods.h b/src/server/mods.h
index 70edeb2c6..f6a40bf69 100644
--- a/src/server/mods.h
+++ b/src/server/mods.h
@@ -22,12 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content/mod_configuration.h"
 #include <memory>
 
-class MetricsBackend;
-class MetricCounter;
 class ServerScripting;
 
 /**
- * Manage server mods
+ * Manages server mods
  *
  * All new calls to this class must be tested in test_servermodmanager.cpp
  */
@@ -36,12 +34,20 @@ class ServerModManager
 	ModConfiguration configuration;
 
 public:
+
 	/**
 	 * Creates a ServerModManager which targets worldpath
 	 * @param worldpath
 	 */
 	ServerModManager(const std::string &worldpath);
-	void loadMods(ServerScripting *script);
+
+	/**
+	 * Creates an empty ServerModManager. For testing purposes.
+	 * Note: definition looks like this so it isn't accidentally used.
+	*/
+	explicit ServerModManager(std::nullptr_t) {};
+
+	void loadMods(ServerScripting &script);
 	const ModSpec *getModSpec(const std::string &modname) const;
 	void getModNames(std::vector<std::string> &modlist) const;
 
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 427307b8f..2a1bae2db 100644
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -33,23 +33,17 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p
 		bool is_singleplayer):
 	UnitSAO(env_, v3f(0,0,0)),
 	m_player(player_),
-	m_peer_id(peer_id_),
+	m_peer_id_initial(peer_id_),
 	m_is_singleplayer(is_singleplayer)
 {
-    m_ms_from_last_respawn = 10000; //more than ignore move time (1)
-
-    /*if (m_player) {
-        ++m_player->refs;
-    }*/
-
-	//SANITY_CHECK(m_peer_id != PEER_ID_INEXISTENT);
+	//SANITY_CHECK(m_peer_id_initial != PEER_ID_INEXISTENT);
 
 	m_prop.hp_max = PLAYER_MAX_HP_DEFAULT;
 	m_prop.breath_max = PLAYER_MAX_BREATH_DEFAULT;
 	m_prop.physical = false;
 	m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f);
 	m_prop.selectionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f);
-	m_prop.pointable = true;
+	m_prop.pointable = PointabilityType::POINTABLE;
 	// Start of default appearance, this should be overwritten by Lua
 	m_prop.visual = "upright_sprite";
 	m_prop.visual_size = v3f(1, 2, 1);
@@ -106,12 +100,13 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s)
 {
 	ServerActiveObject::addedToEnvironment(dtime_s);
 	if (!m_player) {
-		errorstream << "PlayerSAO::addedToEnvironment(): Fail id=" << m_peer_id << std::endl;
+		errorstream << "PlayerSAO::addedToEnvironment(): Fail id=" << getPeerID() << std::endl;
 		return;
 	}
 	//wtf? ServerActiveObject::setBasePosition(m_base_position);
 	m_player->setPlayerSAO(this);
-	m_player->setPeerId(m_peer_id);
+	m_player->setPeerId(m_peer_id_initial);
+	m_peer_id_initial = PEER_ID_INEXISTENT; // don't try to use it again.
 	m_last_good_position = getBasePosition();
 }
 
@@ -119,11 +114,16 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s)
 void PlayerSAO::removingFromEnvironment()
 {
 	ServerActiveObject::removingFromEnvironment();
-	if (m_player && m_player->getPlayerSAO() == this) {
-		unlinkPlayerSessionAndSave();
-		for (u32 attached_particle_spawner : m_attached_particle_spawners) {
-			m_env->deleteParticleSpawner(attached_particle_spawner, false);
-		}
+
+	// If this fails, fix the ActiveObjectMgr code in ServerEnvironment
+	//SANITY_CHECK(m_player->getPlayerSAO() == this);
+
+	if (!m_player || m_player->getPlayerSAO() != this)
+		return;
+
+	unlinkPlayerSessionAndSave();
+	for (u32 attached_particle_spawner : m_attached_particle_spawners) {
+		m_env->deleteParticleSpawner(attached_particle_spawner, false);
 	}
 }
 
@@ -149,14 +149,14 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 	msg_os << serializeString32(getPropertyPacket()); // message 1
 	msg_os << serializeString32(generateUpdateArmorGroupsCommand()); // 2
 	msg_os << serializeString32(generateUpdateAnimationCommand()); // 3
-	for (const auto &bone_pos : m_bone_position) {
-		msg_os << serializeString32(generateUpdateBonePositionCommand(
-			bone_pos.first, bone_pos.second.X, bone_pos.second.Y)); // 3 + N
+	for (const auto &it : m_bone_override) {
+		msg_os << serializeString32(generateUpdateBoneOverrideCommand(
+			it.first, it.second)); // 3 + N
 	}
-	msg_os << serializeString32(generateUpdateAttachmentCommand()); // 4 + m_bone_position.size
-	msg_os << serializeString32(generateUpdatePhysicsOverrideCommand()); // 5 + m_bone_position.size
+	msg_os << serializeString32(generateUpdateAttachmentCommand()); // 4 + m_bone_override.size
+	msg_os << serializeString32(generateUpdatePhysicsOverrideCommand()); // 5 + m_bone_override.size
 
-	int message_count = 5 + m_bone_position.size();
+	int message_count = 5 + m_bone_override.size();
 
 	for (const auto &id : getAttachmentChildIds()) {
 		if (ServerActiveObject *obj = m_env->getActiveObject(id)) {
@@ -267,7 +267,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 			" is attached to nonexistent parent. This is a bug." << std::endl;
 		clearParentAttachment();
 		setBasePosition(m_last_good_position);
-		m_env->getGameDef()->SendMovePlayer(m_peer_id);
+		m_env->getGameDef()->SendMovePlayer(this);
 	}
 
 	//dstream<<"PlayerSAO::step: dtime: "<<dtime<<std::endl;
@@ -384,6 +384,9 @@ std::string PlayerSAO::generateUpdatePhysicsOverrideCommand() const
 	writeF32(os, phys.liquid_sink);
 	writeF32(os, phys.acceleration_default);
 	writeF32(os, phys.acceleration_air);
+	writeF32(os, phys.speed_fast);
+	writeF32(os, phys.acceleration_fast);
+	writeF32(os, phys.speed_walk);
 	return os.str();
 }
 
@@ -403,12 +406,12 @@ void PlayerSAO::setBasePosition(v3f position)
 
 void PlayerSAO::setPos(const v3f &pos)
 {
-	if(isAttached())
+	if (isAttached())
 		return;
 
 	// Send mapblock of target location
 	v3s16 blockpos = v3s16(pos.X / MAP_BLOCKSIZE, pos.Y / MAP_BLOCKSIZE, pos.Z / MAP_BLOCKSIZE);
-	m_env->getGameDef()->SendBlock(m_peer_id, blockpos);
+	m_env->getGameDef()->SendBlock(getPeerID(), blockpos);
 
 	setBasePosition(pos);
 	{
@@ -418,7 +421,31 @@ void PlayerSAO::setPos(const v3f &pos)
 	}
 	m_move_pool.empty();
 	m_time_from_last_teleport = 0.0;
-	m_env->getGameDef()->SendMovePlayer(m_peer_id);
+	m_env->getGameDef()->SendMovePlayer(this);
+}
+
+void PlayerSAO::addPos(const v3f &added_pos)
+{
+	if (isAttached())
+		return;
+
+	// Backward compatibility for older clients
+	if (m_player->protocol_version < 44) {
+		setPos(getBasePosition() + added_pos);
+		return;
+	}
+
+	// Send mapblock of target location
+	v3f pos = getBasePosition() + added_pos;
+	v3s16 blockpos = v3s16(pos.X / MAP_BLOCKSIZE, pos.Y / MAP_BLOCKSIZE, pos.Z / MAP_BLOCKSIZE);
+	m_env->getGameDef()->SendBlock(getPeerID(), blockpos);
+
+	setBasePosition(pos);
+	// Movement caused by this command is always valid
+	m_last_good_position = getBasePosition();
+	m_move_pool.empty();
+	m_time_from_last_teleport = 0.0;
+	m_env->getGameDef()->SendMovePlayerRel(getPeerID(), added_pos);
 }
 
 void PlayerSAO::moveTo(v3f pos, bool continuous)
@@ -434,7 +461,7 @@ void PlayerSAO::moveTo(v3f pos, bool continuous)
 	}
 	m_move_pool.empty();
 	m_time_from_last_teleport = 0.0;
-	m_env->getGameDef()->SendMovePlayer(m_peer_id);
+	m_env->getGameDef()->SendMovePlayer(this);
 }
 
 void PlayerSAO::setPlayerYaw(const float yaw)
@@ -466,7 +493,7 @@ void PlayerSAO::setWantedRange(const s16 range)
 void PlayerSAO::setPlayerYawAndSend(const float yaw)
 {
 	setPlayerYaw(yaw);
-	m_env->getGameDef()->SendMovePlayer(m_peer_id);
+	m_env->getGameDef()->SendMovePlayer(this);
 }
 
 void PlayerSAO::setLookPitch(const float pitch)
@@ -480,7 +507,7 @@ void PlayerSAO::setLookPitch(const float pitch)
 void PlayerSAO::setLookPitchAndSend(const float pitch)
 {
 	setLookPitch(pitch);
-	m_env->getGameDef()->SendMovePlayer(m_peer_id);
+	m_env->getGameDef()->SendMovePlayer(this);
 }
 
 void PlayerSAO::addSpeed(v3f speed)
@@ -488,7 +515,7 @@ void PlayerSAO::addSpeed(v3f speed)
 	if (!m_player)
 		return;
 	m_player->addSpeed(speed);
-	((Server*)m_env->getGameDef())->SendPunchPlayer(m_peer_id, speed);
+	((Server*)m_env->getGameDef())->SendPunchPlayer(getPeerID(), speed);
 }
 
 u32 PlayerSAO::punch(v3f dir,
@@ -503,11 +530,9 @@ u32 PlayerSAO::punch(v3f dir,
 	if (!toolcap)
 		return 0;
 
-	FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
-
 	// No effect if PvP disabled or if immortal
 	if (isImmortal() || !g_settings->getBool("enable_pvp")) {
-		if (puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		if (puncher && puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
 			// create message and add to list
 			sendPunchCommand();
 			return 0;
@@ -537,11 +562,16 @@ u32 PlayerSAO::punch(v3f dir,
 	v3f punch = dir * 5 * BS;
 	addSpeed(punch);
 
-	actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
-		", hp=" << puncher->getHP() << ") punched " <<
-		getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
-		"), damage=" << (old_hp - (s32)getHP()) <<
-		(damage_handled ? " (handled by Lua)" : "") << std::endl;
+	if (puncher) {
+		actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
+				", hp=" << puncher->getHP() << ")";
+	} else {
+		actionstream << "(none)";
+	}
+	actionstream << " puched " <<
+			getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
+			"), damage=" << (old_hp - (s32)getHP()) <<
+			(damage_handled ? " (handled by Lua)" : "") << std::endl;
 
 	return hitparams.wear;
 }
@@ -559,8 +589,9 @@ void PlayerSAO::setHP(s32 target_hp, const PlayerHPChangeReason &reason, bool fr
 		return; // Nothing to do
 
 	s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, target_hp - (s32)m_hp, reason);
+	hp_change = std::min<s32>(hp_change, U16_MAX); // Protect against overflow
 
-	s32 hp = (s32)m_hp + std::min(hp_change, U16_MAX); // Protection against s32 overflow
+	s32 hp = (s32)m_hp + hp_change;
 	hp = rangelim(hp, 0, U16_MAX);
 
 	if (hp > m_prop.hp_max)
@@ -627,17 +658,22 @@ bool PlayerSAO::setWieldedItem(const ItemStack &item)
 
 void PlayerSAO::disconnected()
 {
-	m_peer_id = PEER_ID_INEXISTENT;
 	markForRemoval();
+	m_player->setPeerId(PEER_ID_INEXISTENT);
+}
+
+session_t PlayerSAO::getPeerID() const
+{
+	// Before adding `this` to the server env, m_player is still nullptr.
+	return m_player ? m_player->getPeerId() : PEER_ID_INEXISTENT;
 }
 
 void PlayerSAO::unlinkPlayerSessionAndSave()
 {
 	if (!m_player || m_player->getPlayerSAO() != this)
 		return;
-	m_player->setPeerId(PEER_ID_INEXISTENT);
+	//assert(m_player->getPlayerSAO() == this);
 	m_env->savePlayer(m_player);
-	m_player->setPlayerSAO(NULL);
 	m_env->removePlayer(m_player);
 	//--m_player->refs;
 	m_player = nullptr;
@@ -697,14 +733,15 @@ bool PlayerSAO::checkMovementCheat()
 	float player_max_walk = 0; // horizontal movement
 	float player_max_jump = 0; // vertical upwards movement
 
-	float speed_walk   = m_player->movement_speed_walk;
-	float speed_fast   = m_player->movement_speed_fast;
+	float speed_walk = m_player->movement_speed_walk * m_player->physics_override.speed_walk;
+	float speed_fast = m_player->movement_speed_fast * m_player->physics_override.speed_fast;
 	float speed_crouch = m_player->movement_speed_crouch * m_player->physics_override.speed_crouch;
-	float speed_climb  = m_player->movement_speed_climb  * m_player->physics_override.speed_climb;
-	speed_walk   *= m_player->physics_override.speed;
-	speed_fast   *= m_player->physics_override.speed;
+	float speed_climb = m_player->movement_speed_climb * m_player->physics_override.speed_climb;
+
+	speed_walk *= m_player->physics_override.speed;
+	speed_fast *= m_player->physics_override.speed;
 	speed_crouch *= m_player->physics_override.speed;
-	speed_climb  *= m_player->physics_override.speed;
+	speed_climb *= m_player->physics_override.speed;
 
 	// Get permissible max. speed
 	if (m_privs.count("fast") != 0) {
@@ -781,7 +818,7 @@ bool PlayerSAO::getCollisionBox(aabb3f *toset) const
 
 bool PlayerSAO::getSelectionBox(aabb3f *toset) const
 {
-	if (!m_prop.is_visible || !m_prop.pointable) {
+	if (!m_prop.is_visible) {
 		return false;
 	}
 
diff --git a/src/server/player_sao.h b/src/server/player_sao.h
index b0e4a4764..ffc91d458 100644
--- a/src/server/player_sao.h
+++ b/src/server/player_sao.h
@@ -85,9 +85,9 @@ public:
 		Active object <-> environment interface
 	*/
 
-//fm:
+// fm:
 	void addSpeed(v3f);
-
+// ==
 
 	void addedToEnvironment(u32 dtime_s) override;
 	void removingFromEnvironment() override;
@@ -98,6 +98,7 @@ public:
 	void step(float dtime, bool send_recommended) override;
 	void setBasePosition(v3f position);
 	void setPos(const v3f &pos) override;
+	void addPos(const v3f &added_pos) override;
 	void moveTo(v3f pos, bool continuous) override;
 	void setPlayerYaw(const float yaw);
 	// Data should not be sent at player initialization
@@ -149,8 +150,9 @@ public:
 
 	void disconnected();
 
+	void setPlayer(RemotePlayer *player) { m_player = player; }
 	RemotePlayer *getPlayer() { return m_player; }
-	session_t getPeerID() const { return m_peer_id; }
+	session_t getPeerID() const;
 
 	// Cheat prevention
 
@@ -202,7 +204,7 @@ private:
 	std::string generateUpdatePhysicsOverrideCommand() const;
 
 	RemotePlayer *m_player = nullptr;
-	session_t m_peer_id = 0;
+	session_t m_peer_id_initial = 0; ///< only used to initialize RemotePlayer
 
 	// Cheat prevention
 	LagPool m_dig_pool;
diff --git a/src/rollback.cpp b/src/server/rollback.cpp
similarity index 100%
rename from src/rollback.cpp
rename to src/server/rollback.cpp
diff --git a/src/rollback.h b/src/server/rollback.h
similarity index 100%
rename from src/rollback.h
rename to src/server/rollback.h
diff --git a/src/server/serveractiveobject.cpp b/src/server/serveractiveobject.cpp
index 983d0c81b..b6e19e2ea 100644
--- a/src/server/serveractiveobject.cpp
+++ b/src/server/serveractiveobject.cpp
@@ -32,8 +32,6 @@ Queue<ActiveObjectMessage> dummy_queue;
 
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
 	ActiveObject(0),
-
-
 	m_env(env),
 	m_base_position(pos)
 
diff --git a/src/server/serveractiveobject.h b/src/server/serveractiveobject.h
index 80deff4ba..d41c3aa0c 100644
--- a/src/server/serveractiveobject.h
+++ b/src/server/serveractiveobject.h
@@ -30,6 +30,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/container.h"
 #include "threading/lock.h"
 
+
 /*
 
 Some planning
@@ -77,11 +78,6 @@ public:
 	void markForRemoval();
 	void markForDeactivation();
 
-	// Create a certain type of ServerActiveObject
-	static ServerActiveObject* create(ActiveObjectType type,
-			ServerEnvironment *env, u16 id, v3f pos,
-			const std::string &data);
-
 	/*
 		Some simple getters/setters
 	*/
@@ -101,6 +97,8 @@ public:
 
 	virtual void setPos(const v3f &pos)
 		{ setBasePosition(pos); }
+	virtual void addPos(const v3f &added_pos)
+		{ setBasePosition(m_base_position + added_pos); }
 	// continuous: if true, object does not stop immediately at pos
 	virtual void moveTo(v3f pos, bool continuous)
 		{ setBasePosition(pos); }
@@ -178,14 +176,16 @@ public:
 	{}
 	virtual void setAnimationSpeed(float frame_speed)
 	{}
-	virtual void setBonePosition(const std::string &bone, v3f position, v3f rotation)
-	{}
-	virtual void getBonePosition(const std::string &bone, v3f *position, v3f *lotation)
+	virtual void setBoneOverride(const std::string &bone, const BoneOverride &props)
 	{}
+	virtual BoneOverride getBoneOverride(const std::string &bone)
+	{ BoneOverride props; return props; }
+	virtual const BoneOverrideMap &getBoneOverrides() const
+	{ static BoneOverrideMap rv; return rv; }
 	virtual const std::unordered_set<int> &getAttachmentChildIds() const
 	{ static std::unordered_set<int> rv; return rv; }
 	virtual ServerActiveObject *getParent() const { return nullptr; }
-	virtual ObjectProperties* accessObjectProperties()
+	virtual ObjectProperties *accessObjectProperties()
 	{ return NULL; }
 	virtual void notifyObjectPropertiesModified()
 	{}
@@ -235,6 +235,10 @@ public:
 
 	/*
 		Whether the object's static data has been stored to a block
+
+		Note that `!isStaticAllowed() && m_static_exists` is a valid state
+		(though it usually doesn't persist long) and you need to be careful
+		about handling it.
 	*/
 	bool m_static_exists = false;
 	/*
diff --git a/src/server/serverinventorymgr.cpp b/src/server/serverinventorymgr.cpp
index 3b524fd11..96775ec6a 100644
--- a/src/server/serverinventorymgr.cpp
+++ b/src/server/serverinventorymgr.cpp
@@ -124,7 +124,7 @@ Inventory *ServerInventoryManager::createDetachedInventory(
 		RemotePlayer *p = m_env->getPlayer(name.c_str());
 
 		// if player is connected, send him the inventory
-		if (p && p->getPeerId() != PEER_ID_INEXISTENT) {
+		if (p) {
 			m_env->getGameDef()->sendDetachedInventory(
 					inv, name, p->getPeerId());
 		}
@@ -152,7 +152,7 @@ bool ServerInventoryManager::removeDetachedInventory(const std::string &name)
 		if (m_env) {
 			RemotePlayer *player = m_env->getPlayer(owner.c_str());
 
-			if (player && player->getPeerId() != PEER_ID_INEXISTENT)
+			if (player)
 				m_env->getGameDef()->sendDetachedInventory(
 						nullptr, name, player->getPeerId());
 		}
diff --git a/src/server/serverinventorymgr.h b/src/server/serverinventorymgr.h
index b54f6edd6..9b654c507 100644
--- a/src/server/serverinventorymgr.h
+++ b/src/server/serverinventorymgr.h
@@ -40,8 +40,9 @@ public:
 		m_env = env;
 	}
 
-	Inventory *getInventory(const InventoryLocation &loc);
-	void setInventoryModified(const InventoryLocation &loc);
+	// virtual: Overwritten by MockInventoryManager for the unittests
+	virtual Inventory *getInventory(const InventoryLocation &loc);
+	virtual void setInventoryModified(const InventoryLocation &loc);
 
 	// Creates or resets inventory
 	Inventory *createDetachedInventory(const std::string &name, IItemDefManager *idef,
@@ -52,7 +53,7 @@ public:
 	void sendDetachedInventories(const std::string &peer_name, bool incremental,
 			std::function<void(const std::string &, Inventory *)> apply_cb);
 
-private:
+protected:
 	struct DetachedInventory
 	{
 		std::unique_ptr<Inventory> inventory;
diff --git a/src/serverlist.cpp b/src/server/serverlist.cpp
similarity index 96%
rename from src/serverlist.cpp
rename to src/server/serverlist.cpp
index 5ad6afe25..ac9c94190 100644
--- a/src/serverlist.cpp
+++ b/src/server/serverlist.cpp
@@ -33,6 +33,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "convert_json.h"
 #include "httpfetch.h"
 #include "config.h"
+#include "server.h"
 
 namespace ServerList
 {
@@ -100,12 +101,11 @@ Json::Value MakeReport(AnnounceAction action,
 		server["address"] = g_settings->get("server_address");
 	}
 	if (action != AA_DELETE) {
-		bool strict_checking = g_settings->getBool("strict_protocol_version_checking");
 		server["name"]         = g_settings->get("server_name");
 		server["description"]  = g_settings->get("server_description");
 		server["version"]      = g_version_string;
-		server["proto_min"]    = strict_checking ? LATEST_PROTOCOL_VERSION : SERVER_PROTOCOL_VERSION_MIN;
-		server["proto_max"]    = strict_checking ? LATEST_PROTOCOL_VERSION : SERVER_PROTOCOL_VERSION_MAX;
+		server["proto_min"]    = Server::getProtocolVersionMin();
+		server["proto_max"]    = Server::getProtocolVersionMax();
 		server["url"]          = g_settings->get("server_url");
 		server["creative"]     = g_settings->getBool("creative_mode");
 		server["damage"]       = g_settings->getBool("enable_damage");
diff --git a/src/serverlist.h b/src/server/serverlist.h
similarity index 94%
rename from src/serverlist.h
rename to src/server/serverlist.h
index ed20d0898..f490293aa 100644
--- a/src/serverlist.h
+++ b/src/server/serverlist.h
@@ -29,6 +29,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+// Note that client serverlist handling is all in Lua, this is only announcements now.
+
 namespace ServerList
 {
 
@@ -47,4 +49,4 @@ void sendAnnounce(AnnounceAction, u16 port,
 		const std::vector<ModSpec> &mods = std::vector<ModSpec>(),
 		bool dedicated = false);
 
-} // namespace ServerList
+}
diff --git a/src/server/unit_sao.cpp b/src/server/unit_sao.cpp
index f70809725..c24218c10 100644
--- a/src/server/unit_sao.cpp
+++ b/src/server/unit_sao.cpp
@@ -42,7 +42,10 @@ ServerActiveObject *UnitSAO::getParent() const
 
 void UnitSAO::setArmorGroups(const ItemGroupList &armor_groups)
 {
-	auto lock = lock_unique_rec();
+	if (m_armor_groups == armor_groups)
+		return;
+
+	const auto lock = lock_unique_rec();
 
 	m_armor_groups = armor_groups;
 	m_armor_groups_sent = false;
@@ -56,7 +59,10 @@ const ItemGroupList &UnitSAO::getArmorGroups() const
 void UnitSAO::setAnimation(
 		v2f frame_range, float frame_speed, float frame_blend, bool frame_loop)
 {
-	// store these so they can be updated to clients
+	if (std::tie(m_animation_range, m_animation_speed, m_animation_blend,
+			m_animation_loop) ==
+			std::tie(frame_range, frame_speed, frame_blend, frame_loop))
+		return; // no change
 	m_animation_range = frame_range;
 	m_animation_speed = frame_speed;
 	m_animation_blend = frame_blend;
@@ -75,27 +81,28 @@ void UnitSAO::getAnimation(v2f *frame_range, float *frame_speed, float *frame_bl
 
 void UnitSAO::setAnimationSpeed(float frame_speed)
 {
+	if (m_animation_speed == frame_speed)
+		return;
 	m_animation_speed = frame_speed;
 	m_animation_speed_sent = false;
 }
 
-void UnitSAO::setBonePosition(const std::string &bone, v3f position, v3f rotation)
+void UnitSAO::setBoneOverride(const std::string &bone, const BoneOverride &props)
 {
 	// store these so they can be updated to clients
-	m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
-	m_bone_position_sent = false;
+	m_bone_override[bone] = props;
+	m_bone_override_sent = false;
 }
 
-void UnitSAO::getBonePosition(const std::string &bone, v3f *position, v3f *rotation)
+BoneOverride UnitSAO::getBoneOverride(const std::string &bone)
 {
-	auto it = m_bone_position.find(bone);
-	if (it != m_bone_position.end()) {
-		*position = it->second.X;
-		*rotation = it->second.Y;
-	}
+	auto it = m_bone_override.find(bone);
+	BoneOverride props;
+	if (it != m_bone_override.end())
+		props = it->second;
+	return props;
 }
 
-// clang-format off
 void UnitSAO::sendOutdatedData()
 {
 	if (!m_armor_groups_sent) {
@@ -119,11 +126,11 @@ void UnitSAO::sendOutdatedData()
 
 	NOLOCK4:;
 
-	if (!m_bone_position_sent) {
-		m_bone_position_sent = true;
-		for (const auto &bone_pos : m_bone_position) {
-			m_messages_out.emplace(getId(), true, generateUpdateBonePositionCommand(
-				bone_pos.first, bone_pos.second.X, bone_pos.second.Y));
+	if (!m_bone_override_sent) {
+		m_bone_override_sent = true;
+		for (const auto &bone_pos : m_bone_override) {
+			m_messages_out.emplace(getId(), true, generateUpdateBoneOverrideCommand(
+				bone_pos.first, bone_pos.second));
 		}
 	}
 
@@ -132,7 +139,6 @@ void UnitSAO::sendOutdatedData()
 		m_messages_out.emplace(getId(), true, generateUpdateAttachmentCommand());
 	}
 }
-// clang-format on
 
 void UnitSAO::setAttachment(int parent_id, const std::string &bone, v3f position,
 		v3f rotation, bool force_visible)
@@ -286,16 +292,25 @@ std::string UnitSAO::generateUpdateAttachmentCommand() const
 	return os.str();
 }
 
-std::string UnitSAO::generateUpdateBonePositionCommand(
-		const std::string &bone, const v3f &position, const v3f &rotation)
+std::string UnitSAO::generateUpdateBoneOverrideCommand(
+		const std::string &bone, const BoneOverride &props)
 {
 	std::ostringstream os(std::ios::binary);
 	// command
 	writeU8(os, AO_CMD_SET_BONE_POSITION);
 	// parameters
 	os << serializeString16(bone);
-	writeV3F32(os, position);
-	writeV3F32(os, rotation);
+	writeV3F32(os, props.position.vector);
+	v3f euler_rot;
+	props.rotation.next.toEuler(euler_rot);
+	writeV3F32(os, euler_rot * core::RADTODEG);
+	writeV3F32(os, props.scale.vector);
+	writeF32(os, props.position.interp_timer);
+	writeF32(os, props.rotation.interp_timer);
+	writeF32(os, props.scale.interp_timer);
+	writeU8(os, (props.position.absolute & 1) << 0
+	          | (props.rotation.absolute & 1) << 1
+	          | (props.scale.absolute & 1) << 2);
 	return os.str();
 }
 
diff --git a/src/server/unit_sao.h b/src/server/unit_sao.h
index 5ba94bb4a..35812985d 100644
--- a/src/server/unit_sao.h
+++ b/src/server/unit_sao.h
@@ -87,8 +87,10 @@ public:
 	void setAnimationSpeed(float frame_speed);
 
 	// Bone position
-	void setBonePosition(const std::string &bone, v3f position, v3f rotation);
-	void getBonePosition(const std::string &bone, v3f *position, v3f *rotation);
+	void setBoneOverride(const std::string &bone, const BoneOverride &props);
+	BoneOverride getBoneOverride(const std::string &bone);
+	const std::unordered_map<std::string, BoneOverride>
+			&getBoneOverrides() const { return m_bone_override; };
 
 	// Attachments
 	ServerActiveObject *getParent() const;
@@ -117,8 +119,8 @@ public:
 			const v3f &velocity, const v3f &acceleration, const v3f &rotation,
 			bool do_interpolate, bool is_movement_end, f32 update_interval);
 	std::string generateSetPropertiesCommand(const ObjectProperties &prop) const;
-	static std::string generateUpdateBonePositionCommand(const std::string &bone,
-			const v3f &position, const v3f &rotation);
+	static std::string generateUpdateBoneOverrideCommand(
+			const std::string &bone, const BoneOverride &props);
 	void sendPunchCommand();
 
 protected:
@@ -136,7 +138,7 @@ protected:
 	ObjectProperties m_prop;
 
 	// Stores position and rotation for each bone name
-	std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;
+	std::unordered_map<std::string, BoneOverride> m_bone_override;
 
 	std::atomic_int m_attachment_parent_id {0};
 
@@ -158,7 +160,7 @@ private:
 	bool m_animation_speed_sent = false;
 
 	// Bone positions
-	std::atomic_bool m_bone_position_sent = false;
+	bool m_bone_override_sent = false;
 
 	// Attachments
 	std::unordered_set<int> m_attachment_child_ids;
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index b8f99f904..3326c9d25 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <algorithm>
 #include <stack>
+#include <utility>
 #include "serverenvironment.h"
 #include "activeobject.h"
 #include "settings.h"
@@ -27,7 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "nodemetadata.h"
 #include "gamedef.h"
-#include "map.h"
 #include "porting.h"
 #include "profiler.h"
 #include "raycast.h"
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "scripting_server.h"
 #include "server.h"
 #include "util/serialize.h"
+#include "util/numeric.h"
 #include "util/basic_macros.h"
 #include "util/pointedthing.h"
 #include "threading/mutex_auto_lock.h"
@@ -198,8 +199,7 @@ void LBMManager::loadIntroductionTimes(const std::string &times,
 	// Storing it in a map first instead of
 	// handling the stuff directly in the loop
 	// removes all duplicate entries.
-	// TODO make this std::unordered_map
-	std::map<std::string, u32> introduction_times;
+	std::unordered_map<std::string, u32> introduction_times;
 
 	/*
 	The introduction times string consists of name~time entries,
@@ -221,13 +221,11 @@ void LBMManager::loadIntroductionTimes(const std::string &times,
 	}
 
 	// Put stuff from introduction_times into m_lbm_lookup
-	for (std::map<std::string, u32>::const_iterator it = introduction_times.begin();
-		it != introduction_times.end(); ++it) {
-		const std::string &name = it->first;
-		u32 time = it->second;
+	for (auto &it : introduction_times) {
+		const std::string &name = it.first;
+		u32 time = it.second;
 
-		std::map<std::string, LoadingBlockModifierDef *>::iterator def_it =
-			m_lbm_defs.find(name);
+		auto def_it = m_lbm_defs.find(name);
 		if (def_it == m_lbm_defs.end()) {
 			// This seems to be an LBM entry for
 			// an LBM we haven't loaded. Discard it.
@@ -308,29 +306,29 @@ void LBMManager::applyLBMs(ServerEnvironment *env, MapBlock *block,
 		content_t previous_c = CONTENT_IGNORE;
 		const std::vector<LoadingBlockModifierDef *> *lbm_list = nullptr;
 
-		for (pos.X = 0; pos.X < MAP_BLOCKSIZE; pos.X++)
-			for (pos.Y = 0; pos.Y < MAP_BLOCKSIZE; pos.Y++)
-				for (pos.Z = 0; pos.Z < MAP_BLOCKSIZE; pos.Z++) {
-					n = block->getNodeNoCheck(pos);
-					c = n.getContent();
+		for (pos.Z = 0; pos.Z < MAP_BLOCKSIZE; pos.Z++)
+		for (pos.Y = 0; pos.Y < MAP_BLOCKSIZE; pos.Y++)
+		for (pos.X = 0; pos.X < MAP_BLOCKSIZE; pos.X++) {
+			n = block->getNodeNoCheck(pos);
+			c = n.getContent();
 
-					// If content_t are not matching perform an LBM lookup
-					if (previous_c != c) {
-						lbm_list = it->second.lookup(c);
-						previous_c = c;
-					}
+			// If content_t are not matching perform an LBM lookup
+			if (previous_c != c) {
+				lbm_list = it->second.lookup(c);
+				previous_c = c;
+			}
 
-					if (!lbm_list)
-						continue;
-					for (auto lbmdef : *lbm_list) {
-						lbmdef->trigger(env, pos + pos_of_block, n, dtime_s);
-						if (block->isOrphan())
-							return;
-						n = block->getNodeNoCheck(pos);
-						if (n.getContent() != c)
-							break; // The node was changed and the LBMs no longer apply
-					}
-				}
+			if (!lbm_list)
+				continue;
+			for (auto lbmdef : *lbm_list) {
+				lbmdef->trigger(env, pos + pos_of_block, n, dtime_s);
+				if (block->isOrphan())
+					return;
+				n = block->getNodeNoCheck(pos);
+				if (n.getContent() != c)
+					break; // The node was changed and the LBMs no longer apply
+			}
+		}
 	}
 }
 
@@ -338,7 +336,7 @@ void LBMManager::applyLBMs(ServerEnvironment *env, MapBlock *block,
 	ActiveBlockList
 */
 
-void fillRadiusBlock(v3s16 p0, s16 r, std::set<v3s16> &list)
+static void fillRadiusBlock(v3s16 p0, s16 r, std::set<v3s16> &list)
 {
 	v3s16 p;
 	for(p.X=p0.X-r; p.X<=p0.X+r; p.X++)
@@ -353,7 +351,7 @@ void fillRadiusBlock(v3s16 p0, s16 r, std::set<v3s16> &list)
 			}
 }
 
-void fillViewConeBlock(v3s16 p0,
+static void fillViewConeBlock(v3s16 p0,
 	const s16 r,
 	const v3f camera_pos,
 	const v3f camera_dir,
@@ -375,12 +373,14 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
 	s16 active_block_range,
 	s16 active_object_range,
 	std::set<v3s16> &blocks_removed,
-	std::set<v3s16> &blocks_added)
+	std::set<v3s16> &blocks_added,
+	std::set<v3s16> &extra_blocks_added)
 {
 	/*
 		Create the new list
 	*/
 	std::set<v3s16> newlist = m_forceloaded_list;
+	std::set<v3s16> extralist;
 	m_abm_list = m_forceloaded_list;
 	for (PlayerSAO *playersao : active_players) {
 		v3s16 pos = getNodeBlockPos(floatToInt(playersao->getBasePosition(), BS));
@@ -400,29 +400,56 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
 				playersao->getEyePosition(),
 				camera_dir,
 				playersao->getFov(),
-				newlist);
+				extralist);
 		}
 	}
 
-	/*
-		Find out which blocks on the old list are not on the new list
-	*/
-	// Go through old list
-	for (const auto & p : m_list) {
-		// If not on new list, it's been removed
-		if (newlist.find(p) == newlist.end())
-			blocks_removed.insert(p);
-	}
-
 	/*
 		Find out which blocks on the new list are not on the old list
 	*/
-	// Go through new list
 	for (v3s16 p : newlist) {
+		// also remove duplicate blocks from the extra list
+		extralist.erase(p);
 		// If not on old list, it's been added
 		if (m_list.find(p) == m_list.end())
 			blocks_added.insert(p);
 	}
+	/*
+		Find out which blocks on the extra list are not on the old list
+	*/
+	for (v3s16 p : extralist) {
+		// also make sure newlist has all blocks
+		newlist.insert(p);
+		// If not on old list, it's been added
+		if (m_list.find(p) == m_list.end())
+			extra_blocks_added.insert(p);
+	}
+
+	/*
+		Find out which blocks on the old list are not on the new + extra list
+	*/
+	std::set_difference(m_list.begin(), m_list.end(), newlist.begin(), newlist.end(),
+			std::inserter(blocks_removed, blocks_removed.end()));
+
+	/*
+		Do some least-effort sanity checks to hopefully catch code bugs.
+	*/
+	assert(newlist.size() >= extralist.size());
+	assert(blocks_removed.size() <= m_list.size());
+	if (!blocks_added.empty()) {
+		assert(newlist.count(*blocks_added.begin()) > 0);
+		assert(blocks_removed.count(*blocks_added.begin()) == 0);
+	}
+	if (!extra_blocks_added.empty()) {
+		assert(newlist.count(*extra_blocks_added.begin()) > 0);
+		assert(extralist.count(*extra_blocks_added.begin()) > 0);
+		assert(blocks_added.count(*extra_blocks_added.begin()) == 0);
+	}
+	if (!blocks_removed.empty()) {
+		assert(newlist.count(*blocks_removed.begin()) == 0);
+		assert(extralist.count(*blocks_removed.begin()) == 0);
+		assert(m_list.count(*blocks_removed.begin()) > 0);
+	}
 
 	/*
 		Update m_list
@@ -446,24 +473,17 @@ void OnMapblocksChangedReceiver::onMapEditEvent(const MapEditEvent &event)
 	ServerEnvironment
 */
 
-// Random device to seed pseudo random generators.
-static std::random_device seed;
-
-ServerEnvironment::ServerEnvironment(ServerMap *map,
-	ServerScripting *script_iface, Server *server,
-	const std::string &path_world, MetricsBackend *mb):
+ServerEnvironment::ServerEnvironment(std::unique_ptr<ServerMap> map,
+		Server *server, MetricsBackend *mb):
 	Environment(server),
 
 	m_abmhandler(this),
-	m_circuit(script_iface, map, server->ndef(), path_world),
-	blocks_with_abm(path_world, "abm_world"),
-
-	m_map(map),
-	m_script(script_iface),
-	m_server(server),
-	m_path_world(path_world),
-	m_rgen(seed())
+	m_circuit(server->getScriptIface(), map.get(), server->ndef(), server->m_path_world),
+	blocks_with_abm(server->m_path_world, "abm_world"),
 
+	m_map(std::move(map)),
+	m_script(server->getScriptIface()),
+	m_server(server)
 {
 
     //fm:
@@ -494,7 +514,8 @@ ServerEnvironment::ServerEnvironment(ServerMap *map,
 void ServerEnvironment::init()
 {
 	// Determine which database backend to use
-	std::string conf_path = m_path_world + DIR_DELIM + "world.mt";
+	const std::string world_path = m_server->getWorldPath();
+	const std::string conf_path = world_path + DIR_DELIM "world.mt";
 	Settings conf;
 
 	std::string player_backend_name = "sqlite3";
@@ -508,7 +529,7 @@ void ServerEnvironment::init()
 		u16 blocksize = 16;
 		conf.getU16NoEx("blocksize", blocksize);
 		if (blocksize != MAP_BLOCKSIZE) {
-			throw BaseException(std::string("The map's blocksize is not supported."));
+			throw BaseException("The map's blocksize is not supported.");
 		}
 
 		// Read those values before setting defaults
@@ -557,8 +578,8 @@ void ServerEnvironment::init()
 				<< "please read http://wiki.minetest.net/Database_backends." << std::endl;
 	}
 
-	m_player_database = openPlayerDatabase(player_backend_name, m_path_world, conf);
-	m_auth_database = openAuthDatabase(auth_backend_name, m_path_world, conf);
+	m_player_database = openPlayerDatabase(player_backend_name, world_path, conf);
+	m_auth_database = openAuthDatabase(auth_backend_name, world_path, conf);
 
 	if (m_map && m_script->has_on_mapblocks_changed()) {
 		m_map->addEventReceiver(&m_on_mapblocks_changed_receiver);
@@ -566,29 +587,23 @@ void ServerEnvironment::init()
 	}
 }
 
-ServerEnvironment::~ServerEnvironment()
+void ServerEnvironment::deactivateBlocksAndObjects()
 {
 	// Clear active block list.
 	// This makes the next one delete all active objects.
 	m_active_blocks.clear();
 
-	try {
-		// Convert all objects to static and delete the active objects
-		deactivateFarObjects(true);
-	} catch (ModError &e) {
-		m_server->addShutdownError(e);
-	} catch (const std::exception & ex) {
-		errorstream << "Shutdown exception: " << ex.what() << "\n";
-	} catch (...) {
-		errorstream << "Shutdown unknown exception: " << "\n";
-	}
+	deactivateFarObjects(true);
+}
 
+ServerEnvironment::~ServerEnvironment()
+{
+	assert(m_active_blocks.size() == 0); // deactivateBlocksAndObjects does this
 
 	removeRemovedObjects(50000);
 
 	// Drop/delete map
-	if (m_map)
-		m_map->drop();
+	m_map.reset();
 
 	// Delete ActiveBlockModifiers
 	for (ABMWithState &m_abm : m_abms) {
@@ -631,14 +646,18 @@ RemotePlayer *ServerEnvironment::getPlayer(const session_t peer_id)
 	return NULL;
 }
 
-RemotePlayer *ServerEnvironment::getPlayer(const std::string &name)
+RemotePlayer *ServerEnvironment::getPlayer(const std::string &name, bool match_invalid_peer)
 {
 	auto lock = m_players.lock_shared_rec();
 	for (RemotePlayer *player : m_players) {
-		if (player->getName() == name)
+		if (player->getName() != name)
+			continue;
+
+		if (match_invalid_peer || player->getPeerId() != PEER_ID_INEXISTENT)
 			return player;
+		break;
 	}
-	return NULL;
+	return nullptr;
 }
 
 void ServerEnvironment::addPlayer(RemotePlayer *player)
@@ -676,13 +695,6 @@ bool ServerEnvironment::removePlayerFromDatabase(const std::string &name)
 	return m_player_database->removePlayer(name);
 }
 
-void ServerEnvironment::kickAllPlayers(AccessDeniedCode reason,
-	const std::string &str_reason, bool reconnect)
-{
-	for (RemotePlayer *player : m_players)
-		m_server->DenyAccess(player->getPeerId(), reason, str_reason, reconnect);
-}
-
 void ServerEnvironment::saveLoadedPlayers(bool force)
 {
 	for (RemotePlayer *player : m_players) {
@@ -756,7 +768,7 @@ void ServerEnvironment::saveMeta()
 	if (!m_meta_loaded)
 		return;
 
-	std::string path = m_path_world + DIR_DELIM "env_meta.txt";
+	std::string path = m_server->getWorldPath() + DIR_DELIM "env_meta.txt";
 
 	// Open file and serialize
 	std::ostringstream ss(std::ios_base::binary);
@@ -788,8 +800,10 @@ void ServerEnvironment::loadMeta()
 	SANITY_CHECK(!m_meta_loaded);
 	m_meta_loaded = true;
 
+	std::string path = m_server->getWorldPath() + DIR_DELIM "env_meta.txt";
+
 	// If file doesn't exist, load default environment metadata
-	if (!fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
+	if (!fs::PathExists(path)) {
 		infostream << "ServerEnvironment: Loading default environment metadata"
 			<< std::endl;
 		loadDefaultMeta();
@@ -798,8 +812,6 @@ void ServerEnvironment::loadMeta()
 
 	infostream << "ServerEnvironment: Loading environment metadata" << std::endl;
 
-	std::string path = m_path_world + DIR_DELIM "env_meta.txt";
-
 	// Open file and deserialize
 	std::ifstream is(path.c_str(), std::ios_base::binary);
 	if (!is.good()) {
@@ -853,8 +865,7 @@ void ServerEnvironment::loadMeta()
 	}
 	m_lbm_mgr.loadIntroductionTimes(lbm_introduction_times, m_server, m_game_time);
 
-	m_day_count = args.exists("day_count") ?
-		args.getU64("day_count") : 0;
+	m_day_count = args.exists("day_count") ? args.getU32("day_count") : 0;
 }
 
 /**
@@ -877,6 +888,8 @@ struct ActiveABM
 	s16 max_y;
 };
 
+#define CONTENT_TYPE_CACHE_MAX 64
+
 class ABMHandler
 {
 private:
@@ -987,7 +1000,8 @@ public:
 		// Check the content type cache first
 		// to see whether there are any ABMs
 		// to be run at all for this block.
-		if (block->contents_cached) {
+		if (!block->contents.empty()) {
+			assert(!block->do_not_cache_contents); // invariant
 			blocks_cached++;
 			bool run_abms = false;
 			for (content_t c : block->contents) {
@@ -998,9 +1012,6 @@ public:
 			}
 			if (!run_abms)
 				return;
-		} else {
-			// Clear any caching
-			block->contents.clear();
 		}
 		blocks_scanned++;
 
@@ -1010,20 +1021,26 @@ public:
 		u32 active_object_count = this->countObjects(block, map, active_object_count_wider);
 		m_env->m_added_objects = 0;
 
+		bool want_contents_cached = block->contents.empty() && !block->do_not_cache_contents;
+
 		v3s16 p0;
-		for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
-		for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++)
 		for(p0.Z=0; p0.Z<MAP_BLOCKSIZE; p0.Z++)
+		for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++)
+		for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
 		{
 			MapNode n = block->getNodeNoCheck(p0);
 			content_t c = n.getContent();
+
 			// Cache content types as we go
-			if (!block->contents_cached && !block->do_not_cache_contents) {
-				block->contents.insert(c);
-				if (block->contents.size() > 64) {
+			if (want_contents_cached && !CONTAINS(block->contents, c)) {
+				if (block->contents.size() >= CONTENT_TYPE_CACHE_MAX) {
 					// Too many different nodes... don't try to cache
+					want_contents_cached = false;
 					block->do_not_cache_contents = true;
 					block->contents.clear();
+					block->contents.shrink_to_fit();
+				} else {
+					block->contents.push_back(c);
 				}
 			}
 
@@ -1087,7 +1104,6 @@ public:
 					break;
 			}
 		}
-		block->contents_cached = !block->do_not_cache_contents;
 	}
 };
 
@@ -1114,7 +1130,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 			<<stamp<<", game time: "<<m_game_time<<std::endl;*/
 
 	// Remove stored static objects if clearObjects was called since block's timestamp
-	if (stamp == BLOCK_TIMESTAMP_UNDEFINED || stamp < m_last_clear_objects_time) {
+	// Note that non-generated blocks may still have stored static objects
+	if (stamp != BLOCK_TIMESTAMP_UNDEFINED && stamp < m_last_clear_objects_time) {
 		block->m_static_objects.clearStored();
 		// do not set changed flag to avoid unnecessary mapblock writes
 	}
@@ -1363,17 +1380,13 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 
 		// Delete static object if block is loaded
 		deleteStaticFromBlock(obj.get(), id, MOD_REASON_CLEAR_ALL_OBJECTS, true);
+		obj->markForRemoval();
 
 		// If known by some client, don't delete immediately
-		if (obj->m_known_by_count > 0) {
-			obj->markForRemoval();
+		if (obj->m_known_by_count > 0)
 			return false;
-		}
 
-		// Tell the object about removal
-		obj->removingFromEnvironment();
-		// Deregister in scripting api
-		m_script->removeObjectReference(obj.get());
+		processActiveObjectRemove(obj.get());
 
 		// Delete active object
 		return true;
@@ -1536,7 +1549,7 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 	*/
 	if (m_blocks_added_last || m_active_blocks_mgmt_interval.step(dtime, m_cache_active_block_mgmt_interval / m_fast_active_block_divider)) {
 		ScopeProfiler sp(g_profiler, "ServerEnv: update active blocks", SPT_AVG);
-	   if (!m_blocks_added_last) {
+	   // fmtodo? if (!m_blocks_added_last) {
 
 		/*
 			Get player block positions
@@ -1594,8 +1607,9 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 				g_settings->getS16("active_block_range");
 		std::set<v3s16> blocks_removed;
 		//std::set<v3s16> blocks_added;
+		std::set<v3s16> extra_blocks_added;
 		m_active_blocks.update(players, active_block_range, active_object_range,
-			blocks_removed, m_blocks_added);
+			blocks_removed, m_blocks_added, extra_blocks_added);
 
 		/*
 			Handle removed blocks
@@ -1614,21 +1628,22 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 			block->setTimestamp(m_game_time);
 		}
 */
-       } // if (!m_blocks_added_last)
 
 		/*
 			Handle added blocks
 		*/
 
-	    u32 n = 0;
-		const auto end_ms = porting::getTimeMs() + max_cycle_ms;
-	    m_blocks_added_last = 0;
-	    auto i = m_blocks_added.begin();
-	    for (; i != m_blocks_added.end(); ++i) {
+	   u32 n = 0;
+	   const auto end_ms = porting::getTimeMs() + max_cycle_ms;
+	   m_blocks_added_last = 0;
+	   auto i = m_blocks_added.begin();
+	   for (; i != m_blocks_added.end(); ++i) {
 		   ++n;
 		   const auto p = *i;
-		//for (const v3s16 &p: blocks_added) {
-			MapBlock *block = m_map->getBlockOrEmerge(p);
+/*		
+		for (const v3s16 &p: blocks_added) {
+*/
+			MapBlock *block = m_map->getBlockOrEmerge(p, true);
 			if (!block) {
 				// TODO: The blocks removed here will only be picked up again
 				// on the next cycle. To minimize the latency of objects being
@@ -1640,13 +1655,26 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 
 			activateBlock(block);
 
+/* fmtodo
    		    if (porting::getTimeMs() > end_ms) {
  			    m_blocks_added_last = n;
 			    break;
 		    }
+*/		
 		}
   	    m_blocks_added.erase(m_blocks_added.begin(), i);
 
+		for (const v3s16 &p: extra_blocks_added) {
+			// only activate if the block is already loaded
+			MapBlock *block = m_map->getBlockNoCreateNoEx(p);
+			if (!block) {
+				m_active_blocks.remove(p);
+				continue;
+			}
+
+			activateBlock(block);
+		}
+
 		// Some blocks may be removed again by the code above so do this here
 		m_active_block_gauge->set(m_active_blocks.size());
 
@@ -1723,7 +1751,7 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 
 /*
 		// Shuffle to prevent persistent artifacts of ordering
-		std::shuffle(m_abms.begin(), m_abms.end(), m_rgen);
+		std::shuffle(m_abms.begin(), m_abms.end(), MyRandGenerator());
 
 		// Initialize handling of ActiveBlockModifiers
 		ABMHandler abmhandler(m_abms, m_cache_abm_interval, this, true);
@@ -1742,8 +1770,9 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 		// of having its ABMs run.
 		std::copy(m_active_blocks.m_abm_list.begin(), m_active_blocks.m_abm_list.end(), output.begin());
 	   }
-		std::shuffle(output.begin(), output.end(), m_rgen);
 	   
+		std::shuffle(output.begin(), output.end(), MyRandGenerator());
+
 		int i = 0;
 		// determine the time budget for ABMs
 		u32 calls = 0; // end_ms = porting::getTimeMs() + max_cycle_ms; 
@@ -1867,9 +1896,8 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 		Manage particle spawner expiration
 	*/
 	if (m_particle_management_interval.step(dtime, 1.0)) {
-		for (std::unordered_map<u32, float>::iterator i = m_particle_spawners.begin();
-			i != m_particle_spawners.end(); ) {
-			//non expiring spawners
+		for (auto i = m_particle_spawners.begin(); i != m_particle_spawners.end(); ) {
+			// non expiring spawners
 			if (i->second == PARTICLE_SPAWNER_NO_EXPIRY) {
 				++i;
 				continue;
@@ -1877,7 +1905,7 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 
 			i->second -= 1.0f;
 			if (i->second <= 0.f)
-				m_particle_spawners.erase(i++);
+				i = m_particle_spawners.erase(i);
 			else
 				++i;
 		}
@@ -1885,7 +1913,7 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 
 
   {
-	std::vector<PlayerSAO*> send_inventory;
+	std::vector<RemotePlayer*> send_inventory;
 
    {
 	auto lock = m_players.try_lock_shared_rec();
@@ -1896,19 +1924,20 @@ void ServerEnvironment::step(float dtime, double uptime, unsigned int max_cycle_
 		if (player->getPeerId() == PEER_ID_INEXISTENT)
 			continue;
 
-		PlayerSAO *sao = player->getPlayerSAO();
-		if (sao && player->inventory.checkModified())
-			send_inventory.emplace_back(sao);
+		if (player->inventory.checkModified())
+			//m_server->SendInventory(player, true);
+            send_inventory.emplace_back(player);
 	}
    }
    // unlocked m_players
-   for (const auto & sao : send_inventory) {
-		m_server->SendInventory(sao, true);
+   for (const auto & player : send_inventory) {
+		m_server->SendInventory(player, true);
    }
   }
    
 	// Send outdated detached inventories
-	m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
+	if (!m_players.empty())
+		m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
 
 	// Notify mods of modified mapblocks
 	if (m_on_mapblocks_changed_receiver.receiving &&
@@ -1983,7 +2012,7 @@ u16 ServerEnvironment::addActiveObject(std::shared_ptr<ServerActiveObject> objec
 	if (!object)
 		return 0;
 	m_added_objects++;
-	u16 id = addActiveObjectRaw(object, true, 0);
+	u16 id = addActiveObjectRaw(std::move(object), nullptr, 0);
 	return id;
 }
 
@@ -1993,8 +2022,8 @@ u16 ServerEnvironment::addActiveObject(std::shared_ptr<ServerActiveObject> objec
 */
 void ServerEnvironment::getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
 	s16 player_radius,
-	maybe_concurrent_set<u16> &current_objects,
-	std::queue<u16> &added_objects)
+	const concurrent_set<u16> &current_objects,
+	std::vector<u16> &added_objects)
 {
 	f32 radius_f = radius * BS;
 	f32 player_radius_f = player_radius * BS;
@@ -2016,8 +2045,8 @@ void ServerEnvironment::getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
 */
 void ServerEnvironment::getRemovedActiveObjects(PlayerSAO *playersao, s16 radius,
 	s16 player_radius,
-	maybe_concurrent_set<u16> &current_objects,
-	std::queue<u16> &removed_objects)
+	const concurrent_set<u16> &current_objects,
+	std::vector<std::pair<bool /* gone? */, u16>> &removed_objects)
 {
 	f32 radius_f = radius * BS;
 	f32 player_radius_f = player_radius * BS;
@@ -2046,17 +2075,17 @@ void ServerEnvironment::getRemovedActiveObjects(PlayerSAO *playersao, s16 radius
 	for (u16 id : current_objects_vector) {
 		ServerActiveObject *object = getActiveObject(id, true);
 
-		if (object == NULL) {
+		if (!object) {
 #if !NDEBUG
-			infostream << "ServerEnvironment::getRemovedActiveObjects():"
-				<< " object in current_objects is NULL" << std::endl;
+			warningstream << FUNCTION_NAME << ": found NULL object id="
+				<< (int)id << std::endl;
 #endif
-			removed_objects.push(id);
+			removed_objects.emplace_back(true, id);
 			continue;
 		}
 
 		if (object->isGone()) {
-			removed_objects.push(id);
+			removed_objects.emplace_back(true, id);
 			continue;
 		}
 
@@ -2068,7 +2097,7 @@ void ServerEnvironment::getRemovedActiveObjects(PlayerSAO *playersao, s16 radius
 			continue;
 
 		// Object is no longer visible
-		removed_objects.push(id);
+		removed_objects.emplace_back(false, id);
 	}
 }
 
@@ -2110,19 +2139,17 @@ bool ServerEnvironment::getActiveObjectMessage(ActiveObjectMessage *dest)
 
 void ServerEnvironment::getSelectedActiveObjects(
 	const core::line3d<f32> &shootline_on_map,
-	std::vector<PointedThing> &objects)
+	std::vector<PointedThing> &objects,
+	const std::optional<Pointabilities> &pointabilities)
 {
-	std::vector<ServerActiveObjectPtr> objs;
-	getObjectsInsideRadius(objs, shootline_on_map.start,
-		shootline_on_map.getLength() + 10.0f, nullptr);
 	const v3f line_vector = shootline_on_map.getVector();
 
-	for (auto obj : objs) {
+	auto process = [&] (ServerActiveObjectPtr obj) -> bool {
 		if (obj->isGone())
-			continue;
+			return false;
 		aabb3f selection_box;
 		if (!obj->getSelectionBox(&selection_box))
-			continue;
+			return false;
 
 		v3f pos = obj->getBasePosition();
 		v3f rel_pos = shootline_on_map.start - pos;
@@ -2142,13 +2169,37 @@ void ServerEnvironment::getSelectedActiveObjects(
 				&current_intersection, &current_normal);
 			current_raw_normal = current_normal;
 		}
-		if (collision) {
-			current_intersection += pos;
-			objects.emplace_back(
-				(s16) obj->getId(), current_intersection, current_normal, current_raw_normal,
-				(current_intersection - shootline_on_map.start).getLengthSQ());
+		if (!collision)
+			return false;
+
+		PointabilityType pointable;
+		if (pointabilities) {
+			if (LuaEntitySAO* lsao = dynamic_cast<LuaEntitySAO*>(obj.get())) {
+				pointable = pointabilities->matchObject(lsao->getName(),
+						usao->getArmorGroups()).value_or(props->pointable);
+			} else if (PlayerSAO* psao = dynamic_cast<PlayerSAO*>(obj.get())) {
+				pointable = pointabilities->matchPlayer(psao->getArmorGroups()).value_or(
+						props->pointable);
+			} else {
+				pointable = props->pointable;
+			}
+		} else {
+			pointable = props->pointable;
 		}
-	}
+		if (pointable != PointabilityType::POINTABLE_NOT) {
+			current_intersection += pos;
+			f32 d_sq = (current_intersection - shootline_on_map.start).getLengthSQ();
+			objects.emplace_back(
+				(s16) obj->getId(), current_intersection, current_normal,
+				current_raw_normal, d_sq, pointable);
+		}
+		return false;
+	};
+
+	// Use "logic in callback" pattern to avoid useless vector filling
+	std::vector<ServerActiveObjectPtr> tmp;
+	getObjectsInsideRadius(tmp, shootline_on_map.getMiddle(),
+		0.5 * shootline_on_map.getLength() + 5 * BS, process);
 }
 
 /*
@@ -2156,7 +2207,7 @@ void ServerEnvironment::getSelectedActiveObjects(
 */
 
 u16 ServerEnvironment::addActiveObjectRaw(std::shared_ptr<ServerActiveObject> object_u,
-	bool set_changed, u32 dtime_s)
+	const StaticObject *from_static, u32 dtime_s)
 {
 	auto object = object_u.get();
 	if (!m_ao_manager.registerObject(object_u)) {
@@ -2166,11 +2217,32 @@ u16 ServerEnvironment::addActiveObjectRaw(std::shared_ptr<ServerActiveObject> ob
 	// Register reference in scripting api (must be done before post-init)
 	m_script->addObjectReference(object);
 	// Post-initialize object
+	// Note that this can change the value of isStaticAllowed() in case of LuaEntitySAO
 	object->addedToEnvironment(dtime_s);
 
+	// Activate object
+	if (object->m_static_exists)
+	{
+		sanity_check(from_static);
+		/*
+		 * Note: Don't check isStaticAllowed() here. If an object has static data
+		 * when it shouldn't, we still need to activate it so the static data
+		 * can be properly removed.
+		 */
+		auto blockpos = object->m_static_block;
+		MapBlock *block = m_map->emergeBlock(blockpos);
+		if (block) {
+			block->m_static_objects.setActive(object->getId(), *from_static);
+		} else {
+			warningstream << "ServerEnvironment::addActiveObjectRaw(): "
+				<< "object was supposed to be in block " << blockpos
+				<< ", but this block disappeared." << std::endl;
+			object->m_static_exists = false;
+		}
+	}
 	// Add static data to block
-	if (object->isStaticAllowed()) {
-		// Add static object to active static list of the block
+	else if (object->isStaticAllowed())
+	{
 		v3f objectpos = object->getBasePosition();
 		StaticObject s_obj(object, objectpos);
 		// Add to the block where the object is located in
@@ -2183,14 +2255,19 @@ u16 ServerEnvironment::addActiveObjectRaw(std::shared_ptr<ServerActiveObject> ob
 			object->m_static_exists = true;
 			object->m_static_block = blockpos;
 			}
-			if(set_changed)
-				block->raiseModified(MOD_STATE_WRITE_NEEDED,
-					MOD_REASON_ADD_ACTIVE_OBJECT_RAW);
+
+			block->raiseModified(MOD_STATE_WRITE_NEEDED,
+				MOD_REASON_ADD_ACTIVE_OBJECT_RAW);
 		} else {
 			v3s16 p = floatToInt(objectpos, BS);
-			errorstream<<"ServerEnvironment::addActiveObjectRaw(): "
-				<<"could not emerge block for storing id="<<object->getId()
-				<<" statically (pos="<<p<<")"<<std::endl;
+			errorstream << "ServerEnvironment::addActiveObjectRaw(): "
+				<< "could not emerge block " << p << " for storing id="
+				<< object->getId() << " statically" << std::endl;
+			// clean in case of error
+			object->markForRemoval();
+			processActiveObjectRemove(object);
+			m_ao_manager.removeObject(object->getId());
+			return 0;
 		}
 	}
 
@@ -2215,13 +2292,6 @@ void ServerEnvironment::removeRemovedObjects(u32 max_cycle_ms)
 */
 
 	auto clear_cb = [this](const ServerActiveObjectPtr& obj, u16 id) {
-		// This shouldn't happen but check it
-		if (!obj) {
-			errorstream << "ServerEnvironment::removeRemovedObjects(): "
-					<< "NULL object found. id=" << id << std::endl;
-			return true;
-		}
-
 		/*
 			We will handle objects marked for removal or deactivation
 		*/
@@ -2256,10 +2326,7 @@ void ServerEnvironment::removeRemovedObjects(u32 max_cycle_ms)
 			}
 		}
 
-		// Tell the object about removal
-		obj->removingFromEnvironment();
-		// Deregister in scripting api
-		m_script->removeObjectReference(obj.get());
+		processActiveObjectRemove(obj.get());
 
 		// Delete
 		return true;
@@ -2345,7 +2412,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 		if (!obj) {
 			errorstream << "ServerEnvironment::activateObjects(): "
 				<< "failed to create active object from static object "
-				<< "in block " << (s_obj.pos / BS)
+				<< "in block " << block->getPos()
 				<< " type=" << (int)s_obj.type << " data:" << std::endl;
 			break;
 			print_hexdump(verbosestream, s_obj.data);
@@ -2353,13 +2420,21 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 			new_stored.push_back(s_obj);
 			continue;
 		}
-#if !NDEBUG
-		verbosestream << "ServerEnvironment::activateObjects(): "
-			<< "activated static object pos=" << (s_obj.pos / BS)
-			<< " type=" << (int)s_obj.type << std::endl;
-#endif
+
+		obj->m_static_exists = true;
+		obj->m_static_block = block->getPos();
+
 		// This will also add the object to the active static list
-		addActiveObjectRaw(std::move(obj), false, dtime_s);
+		bool ok = addActiveObjectRaw(std::move(obj), &s_obj, dtime_s) != 0;
+		if (ok) {
+#if !NDEBUG
+			verbosestream << "ServerEnvironment::activateObjects(): "
+				<< "activated static object pos=" << (s_obj.pos / BS)
+				<< " type=" << (int)s_obj.type << std::endl;
+#endif
+		}
+
+		// callbacks could invalidate this block
 		if (block->isOrphan())
 			return;
 	}
@@ -2392,7 +2467,7 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 
 	If block wasn't generated (not in memory or on disk),
 */
-void ServerEnvironment::deactivateFarObjects(bool _force_delete)
+void ServerEnvironment::deactivateFarObjects(const bool _force_delete)
 {
 	auto cb_deactivate = [this, _force_delete](const ServerActiveObjectPtr &objp, u16 id) {
 		const auto obj = objp.get();
@@ -2431,7 +2506,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
 		// If object's static data is stored in a deactivated block and object
 		// is actually located in an active block, re-save to the block in
 		// which the object is actually located in.
-		if (!force_delete && obj->m_static_exists &&
+		if (!force_delete && obj->isStaticAllowed() && obj->m_static_exists &&
 		   !m_active_blocks.contains(static_block) &&
 		   m_active_blocks.contains(blockpos_o)) {
 
@@ -2511,6 +2586,9 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
 				force_delete = true;
 
            }
+		} else {
+			// If the object has static data but shouldn't we need to get rid of it.
+			deleteStaticFromBlock(obj, id, MOD_REASON_STATIC_DATA_REMOVED, false);
 		}
 
 		// Regardless of what happens to the object at this point, deactivate it first.
@@ -2529,10 +2607,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
 			return false;
 		}
 
-		// Tell the object about removal
-		obj->removingFromEnvironment();
-		// Deregister in scripting api
-		m_script->removeObjectReference(obj);
+		processActiveObjectRemove(obj);
 
 		// Delete active object
 		return true;
@@ -2595,6 +2670,19 @@ bool ServerEnvironment::saveStaticToBlock(
 	return true;
 }
 
+void ServerEnvironment::processActiveObjectRemove(ServerActiveObject *obj)
+{
+	// markForRemoval or markForDeactivation should have been called before
+	// Not because it's strictly necessary but because the Lua callback is
+	// bound to that.
+	assert(obj->isGone());
+
+	// Tell the object about removal
+	obj->removingFromEnvironment();
+	// Deregister in scripting api
+	m_script->removeObjectReference(obj);
+}
+
 PlayerDatabase *ServerEnvironment::openPlayerDatabase(const std::string &name,
 		const std::string &savedir, const Settings &conf)
 {
diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index 9a937e70a..4516183dc 100644
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -19,11 +19,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include "server/fm_key_value_cached.h"
+#include "server/abmhandler.h"
+
+#include <set>
+#include <utility>
+
 #include "activeobject.h"
 #include "environment.h"
-#include "irr_v3d.h"
-#include "map.h"
-#include "server/fm_key_value_cached.h"
+#include "servermap.h"
 #include "settings.h"
 #include "server/activeobjectmgr.h"
 #include "threading/concurrent_set.h"
@@ -33,9 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cstdint>
 #include <mutex>
 #include "util/metricsbackend.h"
-#include <set>
-#include <random>
-#include "server/abmhandler.h"
 
 class IGameDef;
 struct GameParams;
@@ -139,7 +140,7 @@ struct LBMContentMapping
 	// many times during operation in the lbm_lookup_map.
 	void deleteContents();
 	void addLBM(LoadingBlockModifierDef *lbm_def, IGameDef *gamedef);
-	const std::vector<LoadingBlockModifierDef *> *lookup(content_t c) const;
+	const lbm_map::mapped_type *lookup(content_t c) const;
 };
 
 class LBMManager
@@ -171,8 +172,7 @@ private:
 
 	// For m_query_mode == false:
 	// The key of the map is the LBM def's name.
-	// TODO make this std::unordered_map
-	std::map<std::string, LoadingBlockModifierDef *> m_lbm_defs;
+	std::unordered_map<std::string, LoadingBlockModifierDef *> m_lbm_defs;
 
 	// For m_query_mode == true:
 	// The key of the map is the LBM def's first introduction time.
@@ -196,7 +196,8 @@ public:
 		s16 active_block_range,
 		s16 active_object_range,
 		std::set<v3s16> &blocks_removed,
-		std::set<v3s16> &blocks_added);
+		std::set<v3s16> &blocks_added,
+		std::set<v3s16> &extra_blocks_added);
 
 	bool contains(v3s16 p) const {
 		return (m_list.find(p) != m_list.end());
@@ -247,8 +248,7 @@ enum ClearObjectsMode {
 class ServerEnvironment final : public Environment
 {
 public:
-	ServerEnvironment(ServerMap *map, ServerScripting *script_iface,
-		Server *server, const std::string &path_world, MetricsBackend *mb);
+	ServerEnvironment(std::unique_ptr<ServerMap> map, Server *server, MetricsBackend *mb);
 	~ServerEnvironment();
 
 	void init();
@@ -267,8 +267,6 @@ public:
 	float getSendRecommendedInterval()
 	{ return m_recommended_send_interval; }
 
-	void kickAllPlayers(AccessDeniedCode reason,
-		const std::string &str_reason, bool reconnect);
 	// Save players
 	void saveLoadedPlayers(bool force = false);
 	void savePlayer(RemotePlayer *player);
@@ -311,24 +309,14 @@ public:
 	*/
 	u16 addActiveObject(std::shared_ptr<ServerActiveObject> object);
 
-	/*
-		Add an active object as a static object to the corresponding
-		MapBlock.
-		Caller allocates memory, ServerEnvironment frees memory.
-		Return value: true if succeeded, false if failed.
-		(note:  not used, pending removal from engine)
-	*/
-	//bool addActiveObjectAsStatic(ServerActiveObject *object);
-
 	/*
 		Find out what new objects have been added to
 		inside a radius around a position
 	*/
 	void getAddedActiveObjects(PlayerSAO *playersao, s16 radius,
 		s16 player_radius,
-		//std::set<u16>  &current_objects,
-		maybe_concurrent_set<u16> &current_objects,
-		std::queue<u16> &added_objects);
+		const concurrent_set<u16> &current_objects,
+		std::vector<u16> &added_objects);
 
 	/*
 		Find out what new objects have been removed from
@@ -336,9 +324,8 @@ public:
 	*/
 	void getRemovedActiveObjects(PlayerSAO *playersao, s16 radius,
 		s16 player_radius,
-		//std::set<u16> &current_objects,
-		maybe_concurrent_set<u16> &current_objects,
-		std::queue<u16> &removed_objects);
+		const concurrent_set<u16> &current_objects,
+		std::vector<std::pair<bool /* gone? */, u16>> &removed_objects);
 
 	/*
 		Get the next message emitted by some active object.
@@ -348,7 +335,8 @@ public:
 
 	virtual void getSelectedActiveObjects(
 		const core::line3d<f32> &shootline_on_map,
-		std::vector<PointedThing> &objects
+		std::vector<PointedThing> &objects,
+		const std::optional<Pointabilities> &pointabilities
 	);
 
 	/*
@@ -395,13 +383,16 @@ public:
 	// Clear objects, loading and going through every MapBlock
 	void clearObjects(ClearObjectsMode mode);
 
+	// to be called before destructor
+	void deactivateBlocksAndObjects();
+
 	// This makes stuff happen
-	void step(f32 dtime, double uptime, unsigned int max_cycle_ms);
+	void step(f32 dtime, double uptime={}, unsigned int max_cycle_ms={});
 
 	u32 getGameTime() const { return m_game_time; }
 
 	void reportMaxLagEstimate(float f) { m_max_lag_estimate = f; }
-	float getMaxLagEstimate() { return m_max_lag_estimate; }
+	float getMaxLagEstimate() const { return m_max_lag_estimate; }
 
 	std::set<v3s16>* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; }
 
@@ -420,7 +411,7 @@ public:
 		bool static_exists, v3s16 static_block=v3s16(0,0,0));
 
 	RemotePlayer *getPlayer(const session_t peer_id);
-	RemotePlayer *getPlayer(const std::string &name);
+	RemotePlayer *getPlayer(const std::string &name, bool match_invalid_peer = false);
 	const std::vector<RemotePlayer *> getPlayers() const { return m_players; }
 	u32 getPlayerCount() const { return m_players.size(); }
 
@@ -527,7 +518,7 @@ public:
 		Returns 0 if not added and thus deleted.
 	*/
 	u16 addActiveObjectRaw(std::shared_ptr<ServerActiveObject> object,
-			bool set_changed, u32 dtime_s);
+			const StaticObject *from_static, u32 dtime_s);
 
 	/*
 		Remove all objects that satisfy (isGone() && m_known_by_count==0)
@@ -558,12 +549,14 @@ public:
 	bool saveStaticToBlock(v3s16 blockpos, u16 store_id,
 			ServerActiveObject *obj, const StaticObject &s_obj, u32 mod_reason);
 
+	void processActiveObjectRemove(ServerActiveObject *obj);
+
 	/*
 		Member variables
 	*/
 
 	// The map
-	ServerMap *m_map;
+	std::unique_ptr<ServerMap> m_map;
 	// Lua state
 	ServerScripting* m_script;
 	// Server definition
@@ -572,8 +565,6 @@ public:
 	server::ActiveObjectMgr m_ao_manager;
 	// on_mapblocks_changed map event receiver
 	OnMapblocksChangedReceiver m_on_mapblocks_changed_receiver;
-	// World path
-	const std::string m_path_world;
 	// Outgoing network message buffer for active objects
 public:
 	Queue<ActiveObjectMessage> m_active_object_messages;
@@ -614,9 +605,6 @@ private:
 	PlayerDatabase *m_player_database = nullptr;
 	AuthDatabase *m_auth_database = nullptr;
 
-	// Pseudo random generator for shuffling, etc.
-	std::mt19937 m_rgen;
-
 	// Particles
 	IntervalLimiter m_particle_management_interval;
 	std::unordered_map<u32, float> m_particle_spawners;
diff --git a/src/servermap.cpp b/src/servermap.cpp
new file mode 100644
index 000000000..904ae53d1
--- /dev/null
+++ b/src/servermap.cpp
@@ -0,0 +1,1368 @@
+/*
+Minetest
+Copyright (C) 2010-2024 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <cstddef>
+#include <memory>
+#include "map.h"
+#include "mapsector.h"
+#include "filesys.h"
+#include "voxel.h"
+#include "voxelalgorithms.h"
+#include "porting.h"
+#include "serialization.h"
+#include "settings.h"
+#include "log.h"
+#include "profiler.h"
+#include "gamedef.h"
+#include "util/directiontables.h"
+#include "rollback_interface.h"
+#include "reflowscan.h"
+#include "emerge.h"
+#include "mapgen/mapgen_v6.h"
+#include "mapgen/mg_biome.h"
+#include "config.h"
+#include "server.h"
+#include "database/database.h"
+#include "database/database-dummy.h"
+#include "database/database-sqlite3.h"
+#include "script/scripting_server.h"
+#include "irrlicht_changes/printing.h"
+#if USE_LEVELDB
+#include "database/database-leveldb.h"
+#endif
+#if USE_REDIS
+#include "database/database-redis.h"
+#endif
+#if USE_POSTGRESQL
+#include "database/database-postgresql.h"
+#endif
+
+/*
+	ServerMap	
+*/
+
+ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
+		EmergeManager *emerge, MetricsBackend *mb):
+	Map(gamedef),
+	settings_mgr(savedir + DIR_DELIM + "map_meta.txt"),
+	m_emerge(emerge)
+{
+	verbosestream<<FUNCTION_NAME<<std::endl;
+
+	// Tell the EmergeManager about our MapSettingsManager
+	emerge->map_settings_mgr = &settings_mgr;
+
+	/*
+		Try to load map; if not found, create a new one.
+	*/
+
+	// Determine which database backend to use
+	std::string conf_path = savedir + DIR_DELIM + "world.mt";
+	Settings conf;
+	bool succeeded = conf.readConfigFile(conf_path.c_str());
+	if (!succeeded || !conf.exists("backend")) {
+		// fall back to sqlite3
+		#if USE_LEVELDB
+		conf.set("backend", "leveldb");
+		#elif USE_SQLITE3
+		conf.set("backend", "sqlite3");
+		#elif USE_REDIS
+		conf.set("backend", "redis");
+		#endif
+	}
+	std::string backend = conf.get("backend");
+	dbase = createDatabase(backend, savedir, conf);
+	if (conf.exists("readonly_backend")) {
+		std::string readonly_dir = savedir + DIR_DELIM + "readonly";
+		dbase_ro = createDatabase(conf.get("readonly_backend"), readonly_dir, conf);
+	}
+	if (!conf.updateConfigFile(conf_path.c_str()))
+		errorstream << "ServerMap::ServerMap(): Failed to update world.mt!" << std::endl;
+
+	m_savedir = savedir;
+	m_map_saving_enabled = false;
+
+	m_save_time_counter = mb->addCounter(
+		"minetest_map_save_time", "Time spent saving blocks (in microseconds)");
+	m_save_count_counter = mb->addCounter(
+		"minetest_map_saved_blocks", "Number of blocks saved");
+	m_loaded_blocks_gauge = mb->addGauge(
+		"minetest_map_loaded_blocks", "Number of loaded blocks");
+
+	m_map_compression_level = rangelim(g_settings->getS16("map_compression_level_disk"), -1, 9);
+
+	try {
+		// If directory exists, check contents and load if possible
+		if (fs::PathExists(m_savedir)) {
+			// If directory is empty, it is safe to save into it.
+			if (fs::GetDirListing(m_savedir).empty()) {
+				infostream<<"ServerMap: Empty save directory is valid."
+						<<std::endl;
+				m_map_saving_enabled = true;
+			}
+			else
+			{
+
+				if (settings_mgr.loadMapMeta()) {
+					infostream << "ServerMap: Metadata loaded from "
+						<< savedir << std::endl;
+				} else {
+					infostream << "ServerMap: Metadata could not be loaded "
+						"from " << savedir << ", assuming valid save "
+						"directory." << std::endl;
+				}
+
+				m_map_saving_enabled = true;
+				// Map loaded, not creating new one
+				return;
+			}
+		}
+		// If directory doesn't exist, it is safe to save to it
+		else{
+			m_map_saving_enabled = true;
+		}
+	}
+	catch(std::exception &e)
+	{
+		warningstream<<"ServerMap: Failed to load map from "<<savedir
+				<<", exception: "<<e.what()<<std::endl;
+		infostream<<"Please remove the map or fix it."<<std::endl;
+		warningstream<<"Map saving will be disabled."<<std::endl;
+	}
+}
+
+ServerMap::~ServerMap()
+{
+	verbosestream<<FUNCTION_NAME<<std::endl;
+	try
+	{
+/*
+		if (m_map_saving_enabled) {
+			// Save only changed parts
+*/			
+			save(MOD_STATE_WRITE_AT_UNLOAD);
+			infostream << "ServerMap: Saved map to " << m_savedir << std::endl;
+/*
+		} else {
+			infostream << "ServerMap: Map not saved" << std::endl;
+		}
+*/
+	}
+	catch(std::exception &e)
+	{
+		errorstream << "ServerMap: Failed to save map to " << m_savedir
+				 << ", exception: " << e.what() << std::endl;
+	}
+
+	/*
+		Close database if it was opened
+	*/
+	delete dbase;
+	delete dbase_ro;
+
+	deleteDetachedBlocks();
+}
+
+MapgenParams *ServerMap::getMapgenParams()
+{
+	// getMapgenParams() should only ever be called after Server is initialized
+	assert(settings_mgr.mapgen_params != NULL);
+	return settings_mgr.mapgen_params;
+}
+
+u64 ServerMap::getSeed()
+{
+	return getMapgenParams()->seed;
+}
+
+bool ServerMap::blockpos_over_mapgen_limit(v3s16 p)
+{
+	const s16 mapgen_limit_bp = rangelim(
+		getMapgenParams()->mapgen_limit, 0, MAX_MAP_GENERATION_LIMIT) /
+		MAP_BLOCKSIZE;
+	return p.X < -mapgen_limit_bp ||
+		p.X >  mapgen_limit_bp ||
+		p.Y < -mapgen_limit_bp ||
+		p.Y >  mapgen_limit_bp ||
+		p.Z < -mapgen_limit_bp ||
+		p.Z >  mapgen_limit_bp;
+}
+
+bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
+{
+	s16 csize = getMapgenParams()->chunksize;
+	v3s16 bpmin = EmergeManager::getContainingChunk(blockpos, csize);
+	v3s16 bpmax = bpmin + v3s16(1, 1, 1) * (csize - 1);
+
+	if (!m_chunks_in_progress.insert(bpmin).second)
+		return false;
+
+	bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
+	EMERGE_DBG_OUT("initBlockMake(): " << bpmin << " - " << bpmax);
+
+// fm:
+	{
+		auto lock = m_mapgen_process.lock_unique_rec();
+		auto gen = m_mapgen_process.get(bpmin);
+		auto now = porting::getTimeMs();
+		if (gen > now - 60000 ) {
+			//verbosestream << " already generating" << blockpos_min << " for " << blockpos << " gentime=" << now - gen << std::endl;
+			return false;
+		}
+		m_mapgen_process.insert_or_assign(bpmin, now);
+	}
+// ==
+
+	v3s16 extra_borders(1, 1, 1);
+	v3s16 full_bpmin = bpmin - extra_borders;
+	v3s16 full_bpmax = bpmax + extra_borders;
+
+	// Do nothing if not inside mapgen limits (+-1 because of neighbors)
+	if (blockpos_over_mapgen_limit(full_bpmin) ||
+			blockpos_over_mapgen_limit(full_bpmax))
+		return false;
+
+	data->seed = getSeed();
+	data->blockpos_min = bpmin;
+	data->blockpos_max = bpmax;
+	data->nodedef = m_nodedef;
+
+	/*
+		Create the whole area of this and the neighboring blocks
+	*/
+	for (s16 x = full_bpmin.X; x <= full_bpmax.X; x++)
+	for (s16 z = full_bpmin.Z; z <= full_bpmax.Z; z++) {
+/*
+		v2s16 sectorpos(x, z);
+		// Sector metadata is loaded from disk if not already loaded.
+		MapSector *sector = createSector(sectorpos);
+		FATAL_ERROR_IF(sector == NULL, "createSector() failed");
+*/
+		for (s16 y = full_bpmin.Y; y <= full_bpmax.Y; y++) {
+			v3s16 p(x, y, z);
+
+			MapBlock *block = emergeBlock(p, false);
+			if (block == NULL) {
+				block = createBlock(p);
+
+				// Block gets sunlight if this is true.
+				// Refer to the map generator heuristics.
+				bool ug = m_emerge->isBlockUnderground(p);
+				block->setIsUnderground(ug);
+			}
+		}
+	}
+
+	/*
+		Now we have a big empty area.
+
+		Make a ManualMapVoxelManipulator that contains this and the
+		neighboring blocks
+	*/
+
+	data->vmanip = new MMVManip(this);
+	data->vmanip->initialEmerge(full_bpmin, full_bpmax);
+
+	// Data is ready now.
+	return true;
+}
+
+void ServerMap::finishBlockMake(BlockMakeData *data,
+	std::map<v3s16, MapBlock*> *changed_blocks)
+{
+	v3s16 bpmin = data->blockpos_min;
+	v3s16 bpmax = data->blockpos_max;
+
+	bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
+	EMERGE_DBG_OUT("finishBlockMake(): " << bpmin << " - " << bpmax);
+
+	/*
+		Blit generated stuff to map
+		NOTE: blitBackAll adds nearly everything to changed_blocks
+	*/
+
+	static const thread_local auto save_generated_block = g_settings->getBool("save_generated_block");
+	{
+	MAP_NOTHREAD_LOCK(this);
+	data->vmanip->blitBackAll(changed_blocks, false, save_generated_block);
+	}
+
+	EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()="
+		<< changed_blocks->size());
+
+	/*
+		Copy transforming liquid information
+	*/
+	while (data->transforming_liquid.size()) {
+		transforming_liquid_add(data->transforming_liquid.front());
+		data->transforming_liquid.pop_front();
+	}
+
+	for (auto &changed_block : *changed_blocks) {
+		MapBlock *block = changed_block.second;
+		if (!block)
+			continue;
+		/*
+			Update is air cache of the MapBlocks
+		*/
+		block->expireIsAirCache();
+		/*
+			Set block as modified
+		*/
+	   if (save_generated_block)		
+		block->raiseModified(MOD_STATE_WRITE_NEEDED,
+			MOD_REASON_EXPIRE_IS_AIR);
+       else
+        block->setLightingComplete(0);
+	}
+
+	/*
+		Set central blocks as generated
+		Update weather data in blocks
+	*/
+	ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv();
+
+	for (s16 x = bpmin.X; x <= bpmax.X; x++)
+	for (s16 z = bpmin.Z; z <= bpmax.Z; z++)
+	for (s16 y = bpmin.Y; y <= bpmax.Y; y++) {
+		v3pos_t p(x, y, z);
+		auto block = getBlockNoCreateNoEx(p, false, true);
+		if (!block)
+			continue;
+
+		block->setGenerated(true);
+
+        updateBlockHeat(senv, p * MAP_BLOCKSIZE, block);
+        updateBlockHumidity(senv, p * MAP_BLOCKSIZE, block);
+	}
+
+	/*
+		Save changed parts of map
+		NOTE: Will be saved later.
+	*/
+	//save(MOD_STATE_WRITE_AT_UNLOAD);
+	m_chunks_in_progress.erase(bpmin);
+
+    //fmtodo merge with m_chunks_in_progress
+	m_mapgen_process.erase(bpmin);
+}
+
+#if 0
+
+MapSector *ServerMap::createSector(v2s16 p2d)
+{
+	/*
+		Check if it exists already in memory
+	*/
+	MapSector *sector = getSectorNoGenerate(p2d);
+	if (sector)
+		return sector;
+
+	/*
+		Do not create over max mapgen limit
+	*/
+	if (blockpos_over_max_limit(v3s16(p2d.X, 0, p2d.Y)))
+		throw InvalidPositionException("createSector(): pos over max mapgen limit");
+
+	/*
+		Generate blank sector
+	*/
+
+	auto block = this->getBlockNoCreateNoEx(p, false, true);
+	if(block)
+	{
+		if(block->isDummy())
+			block->unDummify();
+		return block;
+	}
+	// Create blank
+	block = this->createBlankBlock(p);
+
+
+	sector = new MapSector(this, p2d, m_gamedef);
+
+	/*
+		Insert to container
+	*/
+	m_sectors[p2d] = sector;
+
+	return sector;
+}
+
+
+MapBlock * ServerMap::createBlock(v3s16 p)
+{
+	v2s16 p2d(p.X, p.Z);
+	s16 block_y = p.Y;
+
+	/*
+		This will create or load a sector if not found in memory.
+	*/
+/*
+
+	MapSector *sector;
+	try {
+		sector = createSector(p2d);
+	} catch (InvalidPositionException &e) {
+		infostream<<"createBlock: createSector() failed"<<std::endl;
+		throw e;
+	}
+*/
+	/*
+		Try to get a block from the sector
+	*/
+	auto sector = this;
+
+
+	MapBlock *block = sector->getBlockNoCreateNoEx(block_y);
+	if (block)
+		return block;
+
+	// Create blank
+	try {
+		block = sector->createBlankBlock(block_y);
+	} catch (InvalidPositionException &e) {
+		infostream << "createBlock: createBlankBlock() failed" << std::endl;
+		throw e;
+	}
+
+	return block;
+}
+
+#endif
+
+MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank)
+{
+	TimeTaker timer("generateBlock");
+	MAP_NOTHREAD_LOCK(this);
+
+	{
+		auto block = getBlockNoCreateNoEx(p, false, true);
+		if (block)
+			return block;
+	}
+
+	if (!m_map_loading_enabled)
+		return {};
+
+	{
+		MapBlock *block = loadBlock(p);
+		if(block)
+			return block;
+	}
+
+	if (create_blank) {
+
+		return createBlankBlock(p);
+/*
+		try {
+			MapSector *sector = createSector(v2s16(p.X, p.Z));
+			return sector->createBlankBlock(p.Y);
+		} catch (InvalidPositionException &e) {}
+*/
+	}
+
+	return NULL;
+}
+
+MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d, bool generate)
+{
+	MapBlock *block = getBlockNoCreateNoEx(p3d, false, true);
+	if (block == NULL && m_map_loading_enabled)
+		m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, generate);
+
+	return block;
+}
+
+bool ServerMap::isBlockInQueue(v3s16 pos)
+{
+	return m_emerge && m_emerge->isBlockInQueue(pos);
+}
+
+void ServerMap::addNodeAndUpdate(v3s16 p, MapNode n,
+		std::map<v3s16, MapBlock*> &modified_blocks,
+		bool remove_metadata
+		, int fast, bool important)
+{
+	Map::addNodeAndUpdate(p, n, modified_blocks, remove_metadata, fast, important);
+
+	/*
+		Add neighboring liquid nodes and this node to transform queue.
+		(it's vital for the node itself to get updated last, if it was removed.)
+	 */
+
+   if (!fast)
+	for (const v3s16 &dir : g_7dirs) {
+		v3s16 p2 = p + dir;
+
+		bool is_valid_position;
+		MapNode n2 = getNode(p2, &is_valid_position);
+		if(is_valid_position &&
+				(m_nodedef->get(n2).isLiquid() ||
+				n2.getContent() == CONTENT_AIR))
+			transforming_liquid_add(p2);
+	}
+}
+
+// N.B.  This requires no synchronization, since data will not be modified unless
+// the VoxelManipulator being updated belongs to the same thread.
+void ServerMap::updateVManip(v3s16 pos)
+{
+	Mapgen *mg = m_emerge->getCurrentMapgen();
+	if (!mg)
+		return;
+
+	MMVManip *vm = mg->vm;
+	if (!vm)
+		return;
+
+	if (!vm->m_area.contains(pos))
+		return;
+
+	s32 idx = vm->m_area.index(pos);
+	vm->m_data[idx] = getNode(pos);
+	vm->m_flags[idx] &= ~VOXELFLAG_NO_DATA;
+
+	vm->m_is_dirty = true;
+}
+
+void ServerMap::reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks)
+{
+	m_loaded_blocks_gauge->set(all_blocks);
+	m_save_time_counter->increment(save_time_us);
+	m_save_count_counter->increment(saved_blocks);
+}
+
+#if 0 
+s32 ServerMap::save(ModifiedState save_level
+	, float dedicated_server_step, bool breakable)
+{
+	if (!m_map_saving_enabled) {
+		warningstream<<"Not saving map, saving disabled."<<std::endl;
+		return 0;
+	}
+
+	const auto start_time = porting::getTimeUs();
+
+	if(save_level == MOD_STATE_CLEAN)
+		infostream<<"ServerMap: Saving whole map, this can take time."
+				<<std::endl;
+
+	if (m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
+		if (settings_mgr.saveMapMeta())
+			m_map_metadata_changed = false;
+	}
+
+	// Profile modified reasons
+	Profiler modprofiler;
+
+	u32 block_count = 0;
+	u32 block_count_all = 0; // Number of blocks in memory
+
+	// Don't do anything with sqlite unless something is really saved
+	bool save_started = false;
+
+	for (auto &sector_it : m_sectors) {
+		MapSector *sector = sector_it.second;
+
+		MapBlockVect blocks;
+		sector->getBlocks(blocks);
+
+		for (MapBlock *block : blocks) {
+			block_count_all++;
+
+			if(block->getModified() >= (u32)save_level) {
+				// Lazy beginSave()
+				if(!save_started) {
+					beginSave();
+					save_started = true;
+				}
+
+				modprofiler.add(block->getModifiedReasonString(), 1);
+
+				saveBlock(block);
+				block_count++;
+			}
+		}
+	}
+
+	if(save_started)
+		endSave();
+
+	/*
+		Only print if something happened or saved whole map
+	*/
+	if(save_level == MOD_STATE_CLEAN
+			|| block_count != 0) {
+		infostream << "ServerMap: Written: "
+				<< block_count << " blocks"
+				<< ", " << block_count_all << " blocks in memory."
+				<< std::endl;
+		PrintInfo(infostream); // ServerMap/ClientMap:
+		infostream<<"Blocks modified by: "<<std::endl;
+		modprofiler.print(infostream);
+	}
+
+	const auto end_time = porting::getTimeUs();
+	reportMetrics(end_time - start_time, block_count, block_count_all);
+}
+#endif
+
+void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
+{
+	dbase->listAllLoadableBlocks(dst);
+	if (dbase_ro)
+		dbase_ro->listAllLoadableBlocks(dst);
+}
+
+void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
+{
+
+	const auto lock = m_blocks.lock_shared_rec();
+	for (const auto &i : m_blocks) {
+		dst.emplace_back(i.second->getPos());
+	}
+
+/*
+	for (auto &sector_it : m_sectors) {
+		MapSector *sector = sector_it.second;
+
+		MapBlockVect blocks;
+		sector->getBlocks(blocks);
+
+		for (MapBlock *block : blocks) {
+			v3s16 p = block->getPos();
+			dst.push_back(p);
+		}
+	}
+*/
+}
+
+MapDatabase *ServerMap::createDatabase(
+	const std::string &name,
+	const std::string &savedir,
+	Settings &conf)
+{
+	#if USE_SQLITE3
+	if (name == "sqlite3")
+		return new MapDatabaseSQLite3(savedir);
+	#endif
+	if (name == "dummy")
+		return new Database_Dummy();
+	#if USE_LEVELDB
+	if (name == "leveldb")
+		return new Database_LevelDB(savedir);
+	#endif
+	#if USE_REDIS
+	if (name == "redis")
+		return new Database_Redis(conf);
+	#endif
+	#if USE_POSTGRESQL
+	if (name == "postgresql") {
+		std::string connect_string;
+		conf.getNoEx("pgsql_connection", connect_string);
+		return new MapDatabasePostgreSQL(connect_string);
+	}
+	#endif
+
+	throw BaseException(std::string("Database backend ") + name + " not supported.");
+}
+
+void ServerMap::beginSave()
+{
+	dbase->beginSave();
+}
+
+void ServerMap::endSave()
+{
+	dbase->endSave();
+}
+
+bool ServerMap::saveBlock(MapBlock *block)
+{
+	changed_blocks_for_merge.emplace(block->getPos());
+
+	return saveBlock(block, dbase, m_map_compression_level);
+}
+
+bool ServerMap::saveBlock(MapBlock *block, MapDatabase *db, int compression_level)
+{
+	v3s16 p3d = block->getPos();
+
+	if (!block->isGenerated()) {
+		//warningstream << "saveBlock: Not writing not generated block p="<< p3d << std::endl;
+		return true;
+	}
+
+	// Format used for writing
+	u8 version = SER_FMT_VER_HIGHEST_WRITE;
+
+	/*
+		[0] u8 serialization version
+		[1] data
+	*/
+	std::ostringstream o(std::ios_base::binary);
+	o.write((char*) &version, 1);
+	block->serialize(o, version, true, compression_level);
+
+	// FIXME: zero copy possible in c++20 or with custom rdbuf
+	bool ret = db->saveBlock(p3d, o.str());
+	if (ret) {
+		// We just wrote it to the disk so clear modified flag
+		block->resetModified();
+	}
+	return ret;
+}
+
+#if 0
+void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load)
+{
+	try {
+		std::istringstream is(*blob, std::ios_base::binary);
+
+		u8 version = readU8(is);
+
+		if(is.fail())
+			throw SerializationError("ServerMap::loadBlock(): Failed"
+					" to read MapBlock version");
+
+		MapBlock *block = nullptr;
+		std::unique_ptr<MapBlock> block_created_new;
+		block = sector->getBlockNoCreateNoEx(p3d.Y);
+		if (!block) {
+			block_created_new = sector->createBlankBlockNoInsert(p3d.Y);
+			block = block_created_new.get();
+		}
+
+		{
+			ScopeProfiler sp(g_profiler, "ServerMap: deSer block", SPT_AVG, PRECISION_MICRO);
+			block->deSerialize(is, version, true);
+		}
+
+		// If it's a new block, insert it to the map
+		if (block_created_new) {
+			sector->insertBlock(std::move(block_created_new));
+			ReflowScan scanner(this, m_emerge->ndef);
+			scanner.scan(block, &m_transforming_liquid);
+		}
+
+		/*
+			Save blocks loaded in old format in new format
+		*/
+
+		//if(version < SER_FMT_VER_HIGHEST_READ || save_after_load)
+		// Only save if asked to; no need to update version
+		if(save_after_load)
+			saveBlock(block);
+
+		// We just loaded it from, so it's up-to-date.
+		block->resetModified();
+	}
+	catch(SerializationError &e)
+	{
+		errorstream<<"Invalid block data in database"
+				<<" ("<<p3d.X<<","<<p3d.Y<<","<<p3d.Z<<")"
+				<<" (SerializationError): "<<e.what()<<std::endl;
+
+		// TODO: Block should be marked as invalid in memory so that it is
+		// not touched but the game can run
+
+		if(g_settings->getBool("ignore_world_load_errors")){
+			errorstream<<"Ignoring block load error. Duck and cover! "
+					<<"(ignore_world_load_errors)"<<std::endl;
+		} else {
+			throw SerializationError("Invalid block data in database");
+		}
+	}
+}
+
+MapBlock* ServerMap::loadBlock(v3s16 blockpos)
+{
+	ScopeProfiler sp(g_profiler, "ServerMap: load block", SPT_AVG, PRECISION_MICRO);
+	bool created_new = (getBlockNoCreateNoEx(blockpos) == NULL);
+
+	v2s16 p2d(blockpos.X, blockpos.Z);
+
+	std::string ret;
+	dbase->loadBlock(blockpos, &ret);
+	if (!ret.empty()) {
+		loadBlock(&ret, blockpos, createSector(p2d), false);
+	} else if (dbase_ro) {
+		dbase_ro->loadBlock(blockpos, &ret);
+		if (!ret.empty()) {
+			loadBlock(&ret, blockpos, createSector(p2d), false);
+		}
+	} else {
+		return NULL;
+	}
+
+	MapBlock *block = getBlockNoCreateNoEx(blockpos);
+	if (created_new && (block != NULL)) {
+		std::map<v3s16, MapBlock*> modified_blocks;
+		// Fix lighting if necessary
+		voxalgo::update_block_border_lighting(this, block, modified_blocks);
+		if (!modified_blocks.empty()) {
+			//Modified lighting, send event
+			MapEditEvent event;
+			event.type = MEET_OTHER;
+			event.setModifiedBlocks(modified_blocks);
+			dispatchEvent(event);
+		}
+	}
+	return block;
+}
+
+#endif
+
+bool ServerMap::deleteBlock(v3s16 blockpos)
+{
+	if (!dbase->deleteBlock(blockpos))
+		return false;
+
+	MapBlock *block = getBlockNoCreateNoEx(blockpos);
+	if (block) {
+		Map::deleteBlock(blockpos);
+		m_detached_blocks.emplace_back(block);
+		return true;
+/*
+		v2s16 p2d(blockpos.X, blockpos.Z);
+		MapSector *sector = getSectorNoGenerate(p2d);
+		if (!sector)
+			return false;
+		// It may not be safe to delete the block from memory at the moment
+		// (pointers to it could still be in use)
+		m_detached_blocks.push_back(sector->detachBlock(block));
+*/	
+	}
+
+	return true;
+}
+
+void ServerMap::deleteDetachedBlocks()
+{
+	for (const auto &block : m_detached_blocks) {
+		assert(block->isOrphan());
+		(void)block; // silence unused-variable warning in release builds
+	}
+
+	m_detached_blocks.clear();
+}
+
+void ServerMap::step()
+{
+	// Delete from memory blocks removed by deleteBlocks() only when pointers
+	// to them are (probably) no longer in use
+	deleteDetachedBlocks();
+}
+
+void ServerMap::PrintInfo(std::ostream &out)
+{
+	out<<"ServerMap: ";
+}
+
+bool ServerMap::repairBlockLight(v3s16 blockpos,
+	std::map<v3s16, MapBlock *> *modified_blocks)
+{
+	MapBlock *block = emergeBlock(blockpos, false);
+	if (!block || !block->isGenerated())
+		return false;
+	voxalgo::repair_block_light(this, block, modified_blocks);
+	return true;
+}
+
+/*
+	Liquids
+*/
+
+#define WATER_DROP_BOOST 4
+
+const static v3s16 liquid_6dirs[6] = {
+	// order: upper before same level before lower
+	v3s16( 0, 1, 0),
+	v3s16( 0, 0, 1),
+	v3s16( 1, 0, 0),
+	v3s16( 0, 0,-1),
+	v3s16(-1, 0, 0),
+	v3s16( 0,-1, 0)
+};
+
+enum NeighborType : u8 {
+	NEIGHBOR_UPPER,
+	NEIGHBOR_SAME_LEVEL,
+	NEIGHBOR_LOWER
+};
+
+struct NodeNeighbor {
+	MapNode n;
+	NeighborType t;
+	v3s16 p;
+
+	NodeNeighbor()
+		: n(CONTENT_AIR), t(NEIGHBOR_SAME_LEVEL)
+	{ }
+
+	NodeNeighbor(const MapNode &node, NeighborType n_type, const v3s16 &pos)
+		: n(node),
+		  t(n_type),
+		  p(pos)
+	{ }
+};
+
+static s8 get_max_liquid_level(NodeNeighbor nb, s8 current_max_node_level)
+{
+	s8 max_node_level = current_max_node_level;
+	u8 nb_liquid_level = (nb.n.param2 & LIQUID_LEVEL_MASK);
+	switch (nb.t) {
+		case NEIGHBOR_UPPER:
+			if (nb_liquid_level + WATER_DROP_BOOST > current_max_node_level) {
+				max_node_level = LIQUID_LEVEL_MAX;
+				if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX)
+					max_node_level = nb_liquid_level + WATER_DROP_BOOST;
+			} else if (nb_liquid_level > current_max_node_level) {
+				max_node_level = nb_liquid_level;
+			}
+			break;
+		case NEIGHBOR_LOWER:
+			break;
+		case NEIGHBOR_SAME_LEVEL:
+			if ((nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK &&
+					nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level)
+				max_node_level = nb_liquid_level - 1;
+			break;
+	}
+	return max_node_level;
+}
+
+void ServerMap::transforming_liquid_add(const v3pos_t &p)
+{
+	std::lock_guard<std::mutex> lock(m_transforming_liquid_mutex);
+	m_transforming_liquid.push_back(p);
+}
+
+size_t ServerMap::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
+		ServerEnvironment *env
+		, Server *m_server, unsigned int max_cycle_ms)
+{
+    g_profiler->avg("Server: liquids queue", transforming_liquid_size());
+    if (thread_local const auto static liquid_real = g_settings->getBool("liquid_real"); liquid_real)
+            return ServerMap::transformLiquidsReal(m_server, max_cycle_ms);
+    const auto end_ms = porting::getTimeMs() + max_cycle_ms;
+
+
+	u32 loopcount = 0;
+	u32 initial_size = transforming_liquid_size();
+
+	/*if(initial_size != 0)
+		infostream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
+
+	// list of nodes that due to viscosity have not reached their max level height
+	std::vector<v3s16> must_reflow;
+
+	std::vector<std::pair<v3s16, MapNode> > changed_nodes;
+
+	std::vector<v3s16> check_for_falling;
+
+	u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
+	u32 loop_max = liquid_loop_max;
+
+	while (transforming_liquid_size() != 0)
+	{
+		// This should be done here so that it is done when continue is used
+		if (loopcount >= initial_size || loopcount >= loop_max)
+			break;
+
+		if (porting::getTimeMs() > end_ms)
+			break;
+
+		loopcount++;
+
+		/*
+			Get a queued transforming liquid node
+		*/
+/*
+		v3s16 p0 = m_transforming_liquid.front();
+		m_transforming_liquid.pop_front();
+*/
+
+		v3pos_t p0 = transforming_liquid_pop();
+
+		MapNode n0 = getNode(p0);
+
+		/*
+			Collect information about current node
+		 */
+		s8 liquid_level = -1;
+		// The liquid node which will be placed there if
+		// the liquid flows into this node.
+		content_t liquid_kind = CONTENT_IGNORE;
+		// The node which will be placed there if liquid
+		// can't flow into this node.
+		content_t floodable_node = CONTENT_AIR;
+		const ContentFeatures &cf = m_nodedef->get(n0);
+		LiquidType liquid_type = cf.liquid_type;
+		switch (liquid_type) {
+			case LIQUID_SOURCE:
+				liquid_level = LIQUID_LEVEL_SOURCE;
+				liquid_kind = cf.liquid_alternative_flowing_id;
+				break;
+			case LIQUID_FLOWING:
+				liquid_level = (n0.param2 & LIQUID_LEVEL_MASK);
+				liquid_kind = n0.getContent();
+				break;
+			case LIQUID_NONE:
+				// if this node is 'floodable', it *could* be transformed
+				// into a liquid, otherwise, continue with the next node.
+				if (!cf.floodable)
+					continue;
+				floodable_node = n0.getContent();
+				liquid_kind = CONTENT_AIR;
+				break;
+			case LiquidType_END:
+				break;
+		}
+
+		/*
+			Collect information about the environment
+		 */
+		NodeNeighbor sources[6]; // surrounding sources
+		int num_sources = 0;
+		NodeNeighbor flows[6]; // surrounding flowing liquid nodes
+		int num_flows = 0;
+		NodeNeighbor airs[6]; // surrounding air
+		int num_airs = 0;
+		NodeNeighbor neutrals[6]; // nodes that are solid or another kind of liquid
+		int num_neutrals = 0;
+		bool flowing_down = false;
+		bool ignored_sources = false;
+		bool floating_node_above = false;
+		for (u16 i = 0; i < 6; i++) {
+			NeighborType nt = NEIGHBOR_SAME_LEVEL;
+			switch (i) {
+				case 0:
+					nt = NEIGHBOR_UPPER;
+					break;
+				case 5:
+					nt = NEIGHBOR_LOWER;
+					break;
+				default:
+					break;
+			}
+			v3s16 npos = p0 + liquid_6dirs[i];
+			NodeNeighbor nb(getNode(npos), nt, npos);
+			const ContentFeatures &cfnb = m_nodedef->get(nb.n);
+			if (nt == NEIGHBOR_UPPER && cfnb.floats)
+				floating_node_above = true;
+			switch (cfnb.liquid_type) {
+				case LIQUID_NONE:
+					if (cfnb.floodable) {
+						airs[num_airs++] = nb;
+						// if the current node is a water source the neighbor
+						// should be enqueded for transformation regardless of whether the
+						// current node changes or not.
+						if (nb.t != NEIGHBOR_UPPER && liquid_type != LIQUID_NONE)
+							transforming_liquid_add(npos);
+							//m_transforming_liquid.push_back(npos);
+						// if the current node happens to be a flowing node, it will start to flow down here.
+						if (nb.t == NEIGHBOR_LOWER)
+							flowing_down = true;
+					} else {
+						neutrals[num_neutrals++] = nb;
+						if (nb.n.getContent() == CONTENT_IGNORE) {
+							// If node below is ignore prevent water from
+							// spreading outwards and otherwise prevent from
+							// flowing away as ignore node might be the source
+							if (nb.t == NEIGHBOR_LOWER)
+								flowing_down = true;
+							else
+								ignored_sources = true;
+						}
+					}
+					break;
+				case LIQUID_SOURCE:
+					// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
+					if (liquid_kind == CONTENT_AIR)
+						liquid_kind = cfnb.liquid_alternative_flowing_id;
+					if (cfnb.liquid_alternative_flowing_id != liquid_kind) {
+						neutrals[num_neutrals++] = nb;
+					} else {
+						// Do not count bottom source, it will screw things up
+						if(nt != NEIGHBOR_LOWER)
+							sources[num_sources++] = nb;
+					}
+					break;
+				case LIQUID_FLOWING:
+					if (nb.t != NEIGHBOR_SAME_LEVEL ||
+						(nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK) {
+						// if this node is not (yet) of a liquid type, choose the first liquid type we encounter
+						// but exclude falling liquids on the same level, they cannot flow here anyway
+
+						// used to determine if the neighbor can even flow into this node
+						s8 max_level_from_neighbor = get_max_liquid_level(nb, -1);
+						u8 range = m_nodedef->get(cfnb.liquid_alternative_flowing_id).liquid_range;
+
+						if (liquid_kind == CONTENT_AIR &&
+								max_level_from_neighbor >= (LIQUID_LEVEL_MAX + 1 - range))
+							liquid_kind = cfnb.liquid_alternative_flowing_id;
+					}
+					if (cfnb.liquid_alternative_flowing_id != liquid_kind) {
+						neutrals[num_neutrals++] = nb;
+					} else {
+						flows[num_flows++] = nb;
+						if (nb.t == NEIGHBOR_LOWER)
+							flowing_down = true;
+					}
+					break;
+				case LiquidType_END:
+					break;
+			}
+		}
+
+        u16 level_max = m_nodedef->get(liquid_kind).getMaxLevel(); // source level
+        if (level_max <= 1)
+                continue;
+
+		 /*
+			decide on the type (and possibly level) of the current node
+		 */
+		content_t new_node_content;
+		s8 new_node_level = -1;
+		s8 max_node_level = -1;
+
+		u8 range = m_nodedef->get(liquid_kind).liquid_range;
+		if (range > LIQUID_LEVEL_MAX + 1)
+			range = LIQUID_LEVEL_MAX + 1;
+
+		if ((num_sources >= 2 && m_nodedef->get(liquid_kind).liquid_renewable) || liquid_type == LIQUID_SOURCE) {
+			// liquid_kind will be set to either the flowing alternative of the node (if it's a liquid)
+			// or the flowing alternative of the first of the surrounding sources (if it's air), so
+			// it's perfectly safe to use liquid_kind here to determine the new node content.
+			new_node_content = m_nodedef->get(liquid_kind).liquid_alternative_source_id;
+		} else if (num_sources >= 1 && sources[0].t != NEIGHBOR_LOWER) {
+			// liquid_kind is set properly, see above
+			max_node_level = new_node_level = LIQUID_LEVEL_MAX;
+			if (new_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
+				new_node_content = liquid_kind;
+			else
+				new_node_content = floodable_node;
+		} else if (ignored_sources && liquid_level >= 0) {
+			// Maybe there are neighboring sources that aren't loaded yet
+			// so prevent flowing away.
+			new_node_level = liquid_level;
+			new_node_content = liquid_kind;
+		} else {
+			// no surrounding sources, so get the maximum level that can flow into this node
+			for (u16 i = 0; i < num_flows; i++) {
+				max_node_level = get_max_liquid_level(flows[i], max_node_level);
+			}
+
+			u8 viscosity = m_nodedef->get(liquid_kind).liquid_viscosity;
+			if (viscosity > 1 && max_node_level != liquid_level) {
+				// amount to gain, limited by viscosity
+				// must be at least 1 in absolute value
+				s8 level_inc = max_node_level - liquid_level;
+				if (level_inc < -viscosity || level_inc > viscosity)
+					new_node_level = liquid_level + level_inc/viscosity;
+				else if (level_inc < 0)
+					new_node_level = liquid_level - 1;
+				else if (level_inc > 0)
+					new_node_level = liquid_level + 1;
+				if (new_node_level != max_node_level)
+					must_reflow.push_back(p0);
+			} else {
+				new_node_level = max_node_level;
+			}
+
+			if (max_node_level >= (LIQUID_LEVEL_MAX + 1 - range))
+				new_node_content = liquid_kind;
+			else
+				new_node_content = floodable_node;
+
+		}
+
+        if (!new_node_level && m_nodedef->get(n0.getContent()).liquid_type == LIQUID_FLOWING)
+                new_node_content = CONTENT_AIR;
+        //if (liquid_level == new_node_level || new_node_level < 0)
+        //      continue;
+
+		/*
+			check if anything has changed. if not, just continue with the next node.
+		 */
+		if (new_node_content == n0.getContent() &&
+				(m_nodedef->get(n0.getContent()).liquid_type != LIQUID_FLOWING ||
+				((n0.param2 & LIQUID_LEVEL_MASK) == (u8)new_node_level &&
+				((n0.param2 & LIQUID_FLOW_DOWN_MASK) == LIQUID_FLOW_DOWN_MASK)
+				== flowing_down)))
+			continue;
+
+		/*
+			check if there is a floating node above that needs to be updated.
+		 */
+		if (floating_node_above && new_node_content == CONTENT_AIR)
+			check_for_falling.push_back(p0);
+
+		/*
+			update the current node
+		 */
+		MapNode n00 = n0;
+		//bool flow_down_enabled = (flowing_down && ((n0.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK));
+		if (m_nodedef->get(new_node_content).liquid_type == LIQUID_FLOWING) {
+			// set level to last 3 bits, flowing down bit to 4th bit
+			n0.param2 = (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK);
+		} else {
+			// set the liquid level and flow bits to 0
+			n0.param2 &= ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK);
+		}
+
+		// change the node.
+		n0.setContent(new_node_content);
+
+		// on_flood() the node
+		if (floodable_node != CONTENT_AIR) {
+			if (env->getScriptIface()->node_on_flood(p0, n00, n0))
+				continue;
+		}
+
+		// Ignore light (because calling voxalgo::update_lighting_nodes)
+		ContentLightingFlags f0 = m_nodedef->getLightingFlags(n0);
+		n0.setLight(LIGHTBANK_DAY, 0, f0);
+		n0.setLight(LIGHTBANK_NIGHT, 0, f0);
+
+		// Find out whether there is a suspect for this action
+		std::string suspect;
+		if (m_gamedef->rollback())
+			suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1);
+
+		if (m_gamedef->rollback() && !suspect.empty()) {
+			// Blame suspect
+			RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true);
+			// Get old node for rollback
+			RollbackNode rollback_oldnode(this, p0, m_gamedef);
+			// Set node
+			setNode(p0, n0);
+			// Report
+			RollbackNode rollback_newnode(this, p0, m_gamedef);
+			RollbackAction action;
+			action.setSetNode(p0, rollback_oldnode, rollback_newnode);
+			m_gamedef->rollback()->reportAction(action);
+		} else {
+			// Set node
+
+			try {
+				setNode(p0, n0);
+			} catch (InvalidPositionException &e) {
+				infostream << "transformLiquids: setNode() failed:" << p0 << ":"
+						   << e.what() << std::endl;
+			}
+		}
+
+		v3s16 blockpos = getNodeBlockPos(p0);
+		MapBlock *block = getBlockNoCreateNoEx(blockpos);
+		if (block != NULL) {
+			modified_blocks[blockpos] =  block;
+			changed_nodes.emplace_back(p0, n00);
+		}
+
+		/*
+			enqueue neighbors for update if necessary
+		 */
+		switch (m_nodedef->get(n0.getContent()).liquid_type) {
+			case LIQUID_SOURCE:
+			case LIQUID_FLOWING:
+				// make sure source flows into all neighboring nodes
+				for (u16 i = 0; i < num_flows; i++)
+					if (flows[i].t != NEIGHBOR_UPPER)
+						transforming_liquid_add(flows[i].p);
+				for (u16 i = 0; i < num_airs; i++)
+					if (airs[i].t != NEIGHBOR_UPPER)
+						transforming_liquid_add(airs[i].p);
+				break;
+			case LIQUID_NONE:
+				// this flow has turned to air; neighboring flows might need to do the same
+				for (u16 i = 0; i < num_flows; i++)
+					transforming_liquid_add(flows[i].p);
+				break;
+			case LiquidType_END:
+				break;
+		}
+	}
+	//infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
+
+	for (const auto &iter : must_reflow)
+		transforming_liquid_add(iter);
+
+	voxalgo::update_lighting_nodes(this, changed_nodes, modified_blocks);
+
+	for (const v3s16 &p : check_for_falling) {
+		env->getScriptIface()->check_for_falling(p);
+	}
+
+	env->getScriptIface()->on_liquid_transformed(changed_nodes);
+
+
+	u32 ret = loopcount >= initial_size ? 0 : transforming_liquid_size();
+
+	/* ----------------------------------------------------------------------
+	 * Manage the queue so that it does not grow indefinitely
+	 */
+	u16 time_until_purge = g_settings->getU16("liquid_queue_purge_time");
+
+	if (time_until_purge == 0)
+		return ret; // Feature disabled
+
+	time_until_purge *= 1000;	// seconds -> milliseconds
+
+	u64 curr_time = porting::getTimeMs();
+	u32 prev_unprocessed = m_unprocessed_count;
+	m_unprocessed_count = transforming_liquid_size();
+
+	// if unprocessed block count is decreasing or stable
+	if (m_unprocessed_count <= prev_unprocessed) {
+		m_queue_size_timer_started = false;
+	} else {
+		if (!m_queue_size_timer_started)
+			m_inc_trending_up_start_time = curr_time;
+		m_queue_size_timer_started = true;
+	}
+
+	// Account for curr_time overflowing
+	if (m_queue_size_timer_started && m_inc_trending_up_start_time > curr_time)
+		m_queue_size_timer_started = false;
+
+	/* If the queue has been growing for more than liquid_queue_purge_time seconds
+	 * and the number of unprocessed blocks is still > liquid_loop_max then we
+	 * cannot keep up; dump the oldest blocks from the queue so that the queue
+	 * has liquid_loop_max items in it
+	 */
+	if (m_queue_size_timer_started
+			&& curr_time - m_inc_trending_up_start_time > time_until_purge
+			&& m_unprocessed_count > liquid_loop_max) {
+
+		size_t dump_qty = m_unprocessed_count - liquid_loop_max;
+
+		infostream << "transformLiquids(): DUMPING " << dump_qty
+		           << " blocks from the queue" << std::endl;
+
+		while (dump_qty--)
+			transforming_liquid_pop();
+
+		m_queue_size_timer_started = false; // optimistically assume we can keep up now
+		m_unprocessed_count = transforming_liquid_size();
+	}
+	return ret;
+}
diff --git a/src/servermap.h b/src/servermap.h
new file mode 100644
index 000000000..66922150f
--- /dev/null
+++ b/src/servermap.h
@@ -0,0 +1,272 @@
+/*
+Minetest
+Copyright (C) 2010-2024 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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "threading/concurrent_set.h"
+
+#include <vector>
+#include <memory>
+
+#include "map.h"
+#include "util/container.h"
+#include "util/metricsbackend.h"
+#include "map_settings_manager.h"
+
+class Server;
+
+class Settings;
+class MapDatabase;
+class IRollbackManager;
+class EmergeManager;
+class ServerEnvironment;
+struct BlockMakeData;
+
+class MetricsBackend;
+
+/*
+	ServerMap
+
+	This is the only map class that is able to generate map.
+*/
+
+class ServerMap : public Map
+{
+public:
+
+
+//freeminer:
+	virtual s16 updateBlockHeat(ServerEnvironment *env, const v3pos_t &p, MapBlock *block = nullptr, unordered_map_v3pos<s16> *cache = nullptr, bool block_add = true);
+	virtual s16 updateBlockHumidity(ServerEnvironment *env, const v3pos_t & p, MapBlock *block = nullptr, unordered_map_v3pos<s16> *cache = nullptr, bool block_add = true);
+
+	size_t transforming_liquid_size();
+	v3pos_t transforming_liquid_pop();
+	void transforming_liquid_add(const v3pos_t &p);
+	size_t transformLiquidsReal(Server *m_server, const unsigned int max_cycle_ms);
+
+	//getSurface level starting on basepos.y up to basepos.y + searchup
+	//returns basepos.y -1 if no surface has been found
+	// (due to limited data range of basepos.y this will always give a unique
+	// return value as long as minetest is compiled at least on 32bit architecture)
+	//int getSurface(v3s16 basepos, int searchup, bool walkable_only);
+	virtual int getSurface(const v3pos_t& basepos, int searchup, bool walkable_only);
+/*
+	{
+		return basepos.Y - 1;
+	}
+*/
+
+	//concurrent_unordered_map<v3POS, bool, v3posHash, v3posEqual> m_transforming_liquid;
+	std::mutex m_transforming_liquid_mutex;
+	typedef unordered_map_v3pos<int> lighting_map_t;
+	std::mutex m_lighting_modified_mutex;
+	std::map<v3pos_t, int> m_lighting_modified_blocks;
+	std::map<unsigned int, lighting_map_t> m_lighting_modified_blocks_range;
+	void lighting_modified_add(const v3pos_t& pos, int range = 5);
+
+	void unspreadLight(enum LightBank bank, std::map<v3pos_t, u8> &from_nodes,
+			std::set<v3pos_t> &light_sources, std::map<v3bpos_t, MapBlock *> &modified_blocks);
+	void spreadLight(enum LightBank bank, std::set<v3pos_t> &from_nodes,
+			std::map<v3bpos_t, MapBlock *> &modified_blocks, uint64_t end_ms);
+
+	u32 updateLighting(concurrent_map<v3pos_t, MapBlock *> &a_blocks,
+			std::map<v3pos_t, MapBlock *> &modified_blocks, unsigned int max_cycle_ms);
+	u32 updateLighting(lighting_map_t & a_blocks, unordered_map_v3pos<int> & processed, unsigned int max_cycle_ms = 0);
+	unsigned int updateLightingQueue(unsigned int max_cycle_ms, int & loopcount);
+
+	bool propagateSunlight(
+			const v3pos_t& pos, std::set<v3pos_t> &light_sources, bool remove_light = false);
+
+	// Carries out any initialization necessary before block is sent
+	void prepareBlock(MapBlock *block);
+
+	// Helper for placing objects on ground level
+	s16 findGroundLevel(v2pos_t p2d, bool cacheBlocks);
+
+    bool m_map_loading_enabled {1};
+    concurrent_shared_unordered_map<v3pos_t, unsigned int, v3posHash, v3posEqual> m_mapgen_process;
+//end of freeminer
+
+
+
+
+	/*
+		savedir: directory to which map data should be saved
+	*/
+	ServerMap(const std::string &savedir, IGameDef *gamedef, EmergeManager *emerge, MetricsBackend *mb);
+	~ServerMap();
+
+	/*
+		Get a sector from somewhere.
+		- Check memory
+		- Check disk (doesn't load blocks)
+		- Create blank one
+	*/
+/*
+	MapSector *createSector(v2s16 p);
+*/
+
+	/*
+		Blocks are generated by using these and makeBlock().
+	*/
+	bool blockpos_over_mapgen_limit(v3s16 p);
+	bool initBlockMake(v3s16 blockpos, BlockMakeData *data);
+	void finishBlockMake(BlockMakeData *data,
+		std::map<v3s16, MapBlock*> *changed_blocks);
+
+	/*
+		Get a block from somewhere.
+		- Memory
+		- Create blank
+	*/
+	MapBlock *createBlock(v3s16 p);
+
+	/*
+		Forcefully get a block from somewhere.
+		- Memory
+		- Load from disk
+		- Create blank filled with CONTENT_IGNORE
+
+	*/
+	MapBlock *emergeBlock(v3bpos_t p, bool create_blank=false) override;
+
+	/*
+		Try to get a block.
+		If it does not exist in memory, add it to the emerge queue.
+		- Memory
+		- Emerge Queue (deferred disk or generate)
+	*/
+	MapBlock *getBlockOrEmerge(v3s16 p3d, bool generate);
+
+	bool isBlockInQueue(v3s16 pos);
+
+	void addNodeAndUpdate(v3s16 p, MapNode n,
+			std::map<v3s16, MapBlock*> &modified_blocks,
+			bool remove_metadata
+			, int fast = 0, bool important = false
+			) override;
+
+	/*
+		Database functions
+	*/
+	static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
+
+	// Call these before and after saving of blocks
+	void beginSave() override;
+	void endSave() override;
+
+	s32 save(ModifiedState save_level
+	, float dedicated_server_step = 0.1, bool breakable = 0
+	) override;
+	void listAllLoadableBlocks(std::vector<v3s16> &dst);
+	void listAllLoadedBlocks(std::vector<v3s16> &dst);
+
+	MapgenParams *getMapgenParams();
+
+	bool saveBlock(MapBlock *block) override;
+	static bool saveBlock(MapBlock *block, MapDatabase *db, int compression_level = -1);
+	MapBlock* loadBlock(v3s16 p);
+	// Database version
+/*
+	void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
+*/
+
+	// Blocks are removed from the map but not deleted from memory until
+	// deleteDetachedBlocks() is called, since pointers to them may still exist
+	// when deleteBlock() is called.
+	bool deleteBlock(v3s16 blockpos) override;
+
+	void deleteDetachedBlocks();
+
+	void step();
+
+	void updateVManip(v3s16 pos);
+
+	// For debug printing
+	void PrintInfo(std::ostream &out) override;
+
+	bool isSavingEnabled(){ return m_map_saving_enabled; }
+
+	u64 getSeed();
+
+	/*!
+	 * Fixes lighting in one map block.
+	 * May modify other blocks as well, as light can spread
+	 * out of the specified block.
+	 * Returns false if the block is not generated (so nothing
+	 * changed), true otherwise.
+	 */
+	bool repairBlockLight(v3s16 blockpos,
+		std::map<v3s16, MapBlock *> *modified_blocks);
+
+	size_t transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks,
+			ServerEnvironment *env
+			, Server *m_server, unsigned int max_cycle_ms
+			);
+
+/*
+	void transforming_liquid_add(v3s16 p);
+*/
+
+	MapSettingsManager settings_mgr;
+
+protected:
+
+	void reportMetrics(u64 save_time_us, u32 saved_blocks, u32 all_blocks) override;
+
+private:
+	friend class ModApiMapgen; // for m_transforming_liquid
+
+	// Emerge manager
+	EmergeManager *m_emerge;
+
+public:
+	std::string m_savedir;
+	bool m_map_saving_enabled;
+private:
+
+	int m_map_compression_level;
+
+	concurrent_set<v3s16> m_chunks_in_progress;
+
+	// used by deleteBlock() and deleteDetachedBlocks()
+	std::vector<std::unique_ptr<MapBlock>> m_detached_blocks;
+
+	// Queued transforming water nodes
+	UniqueQueue<v3s16> m_transforming_liquid;
+	f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
+	u32 m_unprocessed_count = 0;
+	u64 m_inc_trending_up_start_time = 0; // milliseconds
+	bool m_queue_size_timer_started = false;
+
+	/*
+		Metadata is re-written on disk only if this is true.
+		This is reset to false when written on disk.
+	*/
+	bool m_map_metadata_changed = true;
+public:
+	MapDatabase *dbase = nullptr;
+private:
+	MapDatabase *dbase_ro = nullptr;
+
+	// Map metrics
+	MetricGaugePtr m_loaded_blocks_gauge;
+	MetricCounterPtr m_save_time_counter;
+	MetricCounterPtr m_save_count_counter;
+};
diff --git a/src/settings.cpp b/src/settings.cpp
index 2c39244ae..43b75c5c4 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -101,7 +101,7 @@ void SettingsHierarchy::onLayerRemoved(int layer)
 
 /* Settings implementation */
 
-Settings *Settings::createLayer(SettingsLayer sl, const std::string &end_tag)
+Settings *Settings::createLayer(SettingsLayer sl, std::string_view end_tag)
 {
 	return new Settings(end_tag, &g_hierarchy, (int)sl);
 }
@@ -113,7 +113,7 @@ Settings *Settings::getLayer(SettingsLayer sl)
 }
 
 
-Settings::Settings(const std::string &end_tag, SettingsHierarchy *h,
+Settings::Settings(std::string_view end_tag, SettingsHierarchy *h,
 		int settings_layer) :
 	m_end_tag(end_tag),
 	m_hierarchy(h),
@@ -135,7 +135,7 @@ Settings::~Settings()
 }
 
 
-Settings & Settings::operator = (const Settings &other)
+Settings & Settings::operator=(const Settings &other)
 {
 	if (&other == this)
 		return *this;
@@ -155,7 +155,7 @@ Settings & Settings::operator = (const Settings &other)
 }
 
 
-bool Settings::checkNameValid(const std::string &name)
+bool Settings::checkNameValid(std::string_view name)
 {
 	bool valid = name.find_first_of("=\"{}#") == std::string::npos;
 	if (valid)
@@ -170,7 +170,7 @@ bool Settings::checkNameValid(const std::string &name)
 }
 
 
-bool Settings::checkValueValid(const std::string &value)
+bool Settings::checkValueValid(std::string_view value)
 {
 	if (value.substr(0, 3) == "\"\"\"" ||
 		value.find("\n\"\"\"") != std::string::npos) {
@@ -403,28 +403,25 @@ bool Settings::updateConfigFile(const std::string &filename)
 	if (!was_modified)
 		return true;
 
-	if (!fs::safeWriteToFile(filename.c_str(), os.str())) {
-		errorstream << "Error writing configuration file: \""
-			<< filename << "\"" << std::endl;
+	if (!fs::safeWriteToFile(filename, os.str()))
 		return false;
-	}
 
 	return true;
 }
 
 
 bool Settings::parseCommandLine(int argc, char *argv[],
-		std::map<std::string, ValueSpec> &allowed_options)
+		const std::map<std::string, ValueSpec> &allowed_options)
 {
 	int nonopt_index = 0;
 	for (int i = 1; i < argc; i++) {
-		std::string arg_name = argv[i];
+		std::string_view arg_name(argv[i]);
 		if (arg_name.substr(0, 2) != "--") {
 			// If option doesn't start with -, read it in as nonoptX
-			if (arg_name[0] != '-'){
+			if (arg_name[0] != '-') {
 				std::string name = "nonopt";
 				name += itos(nonopt_index);
-				set(name, arg_name);
+				set(name, std::string(arg_name));
 				nonopt_index++;
 				continue;
 			}
@@ -436,10 +433,9 @@ bool Settings::parseCommandLine(int argc, char *argv[],
 */
 		}
 
-		std::string name = arg_name.substr(2);
+		std::string name(arg_name.substr(2));
 
-		std::map<std::string, ValueSpec>::iterator n;
-		n = allowed_options.find(name);
+		auto n = allowed_options.find(name);
 		if (n == allowed_options.end()) {
 			errorstream << "Unknown command-line parameter \""
 					<< arg_name << "\"" << std::endl;
@@ -1068,7 +1064,7 @@ bool Settings::remove(const std::string &name)
 SettingsParseEvent Settings::parseConfigObject(const std::string &line,
 	std::string &name, std::string &value)
 {
-	std::string trimmed_line = trim(line);
+	auto trimmed_line = trim(line);
 
 	if (trimmed_line.empty())
 		return SPE_NONE;
diff --git a/src/settings.h b/src/settings.h
index f85fb5179..422365337 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -27,8 +27,8 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "util/basic_macros.h"
 #include <memory>
 #include <string>
-#include <list>
 #include <set>
+#include <map>
 #include <mutex>
 
 #include "porting.h"
@@ -134,18 +134,17 @@ typedef std::unordered_map<std::string, SettingsEntry> SettingEntries;
 class Settings {
 public:
 	/* These functions operate on the global hierarchy! */
-	static Settings *createLayer(SettingsLayer sl, const std::string &end_tag = "");
+	static Settings *createLayer(SettingsLayer sl, std::string_view end_tag = "");
 	static Settings *getLayer(SettingsLayer sl);
 	/**/
 
-	Settings(const std::string &end_tag = "") :
+	Settings(std::string_view end_tag = "") :
 		m_end_tag(end_tag)
 	{}
-	Settings(const std::string &end_tag, SettingsHierarchy *h, int settings_layer);
+	Settings(std::string_view end_tag, SettingsHierarchy *h, int settings_layer);
 	~Settings();
 
-	//Settings & operator += (const Settings &other);
-	Settings & operator = (const Settings &other);
+	Settings & operator=(const Settings &other);
 
 	/***********************
 	 * Reading and writing *
@@ -157,7 +156,7 @@ public:
 	bool updateConfigFile(const std::string &filename);
 	// NOTE: Types of allowed_options are ignored.  Returns success.
 	bool parseCommandLine(int argc, char *argv[],
-			std::map<std::string, ValueSpec> &allowed_options);
+			const std::map<std::string, ValueSpec> &allowed_options);
 	bool parseConfigLines(std::istream &is);
 	void writeLines(std::ostream &os, u32 tab_depth=0) const;
 
@@ -296,8 +295,8 @@ private:
 	bool updateConfigObject(std::istream &is, std::ostream &os,
 		u32 tab_depth=0);
 
-	static bool checkNameValid(const std::string &name);
-	static bool checkValueValid(const std::string &value);
+	static bool checkNameValid(std::string_view name);
+	static bool checkValueValid(std::string_view value);
 	static std::string getMultiline(std::istream &is, size_t *num_lines=NULL);
 	static void printEntry(std::ostream &os, const std::string &name,
 		const SettingsEntry &entry, u32 tab_depth=0);
@@ -314,9 +313,7 @@ private:
 	// For sane mutex locking when iterating
 	friend class LuaSettings;
 
-	void updateNoLock(const Settings &other);
 	void clearNoLock();
-	void clearDefaultsNoLock();
 
 	void doCallbacks(const std::string &name) const;
 
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index adcac066b..6347bc257 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -8,7 +8,7 @@ fake_function() {
 	gettext("Camera smoothing");
 	gettext("Smooths rotation of camera, also called look or mouse smoothing. 0 to disable.");
 	gettext("Camera smoothing in cinematic mode");
-	gettext("Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Change Keys.");
+	gettext("Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Controls.");
 	gettext("Build inside player");
 	gettext("If enabled, you can place nodes at the position (feet + eye level) where you stand.\nThis is helpful when working with nodeboxes in small areas.");
 	gettext("Aux1 key for climbing/descending");
@@ -19,6 +19,8 @@ fake_function() {
 	gettext("If disabled, \"Aux1\" key is used to fly fast if both fly and fast mode are\nenabled.");
 	gettext("Place repetition interval");
 	gettext("The time in seconds it takes between repeated node placements when holding\nthe place button.");
+	gettext("Minimum dig repetition interval");
+	gettext("The minimum time in seconds it takes between digging nodes when holding\nthe dig button.");
 	gettext("Automatic jumping");
 	gettext("Automatically jump up single-node obstacles.");
 	gettext("Safe digging and placing");
@@ -33,16 +35,22 @@ fake_function() {
 	gettext("Hotbar: Invert mouse wheel direction");
 	gettext("Invert mouse wheel (scroll) direction for item selection in hotbar.");
 	gettext("Touchscreen");
-	gettext("Touchscreen threshold");
-	gettext("The length in pixels it takes for touchscreen interaction to start.");
+	gettext("Enable touchscreen");
+	gettext("Enables touchscreen mode, allowing you to play the game with a touchscreen.");
 	gettext("Touchscreen sensitivity");
 	gettext("Touchscreen sensitivity multiplier.");
+	gettext("Movement threshold");
+	gettext("The length in pixels after which a touch interaction is considered movement.");
+	gettext("Threshold for long taps");
+	gettext("The delay in milliseconds after which a touch interaction is considered a long tap.");
 	gettext("Use crosshair for touch screen");
 	gettext("Use crosshair to select object instead of whole screen.\nIf enabled, a crosshair will be shown and will be used for selecting object.");
 	gettext("Fixed virtual joystick");
 	gettext("Fixes the position of virtual joystick.\nIf disabled, virtual joystick will center to first-touch's position.");
 	gettext("Virtual joystick triggers Aux1 button");
 	gettext("Use virtual joystick to trigger \"Aux1\" button.\nIf enabled, virtual joystick will also tap \"Aux1\" button when out of main circle.");
+	gettext("Punch gesture");
+	gettext("The gesture for punching players/entities.\nThis can be overridden by games and mods.\n\n* short_tap\nEasy to use and well-known from other games that shall not be named.\n\n* long_tap\nKnown from the classic Minetest mobile controls.\nCombat is more or less impossible.");
 	gettext("Graphics and Audio");
 	gettext("Graphics");
 	gettext("Screen");
@@ -70,8 +78,8 @@ fake_function() {
 	gettext("Undersampling");
 	gettext("Undersampling is similar to using a lower screen resolution, but it applies\nto the game world only, keeping the GUI intact.\nIt should give a significant performance boost at the cost of less detailed image.\nHigher values result in a less detailed image.");
 	gettext("Graphics Effects");
-	gettext("Opaque liquids");
-	gettext("Makes all liquids opaque");
+	gettext("Translucent liquids");
+	gettext("Allows liquids to be translucent.");
 	gettext("Leaves style");
 	gettext("Leaves style:\n-   Fancy:  all faces visible\n-   Simple: only outer faces, if defined special_tiles are used\n-   Opaque: disable transparency");
 	gettext("Connect glass");
@@ -143,7 +151,7 @@ fake_function() {
 	gettext("Anisotropic filtering");
 	gettext("Use anisotropic filtering when looking at textures from an angle.");
 	gettext("Antialiasing method");
-	gettext("Select the antialiasing method to apply.\n\n* None - No antialiasing (default)\n\n* FSAA - Hardware-provided full-screen antialiasing (incompatible with shaders)\nA.K.A multi-sample antialiasing (MSAA)\nSmoothens out block edges but does not affect the insides of textures.\nA restart is required to change this option.\n\n* FXAA - Fast approximate antialiasing (requires shaders)\nApplies a post-processing filter to detect and smoothen high-contrast edges.\nProvides balance between speed and image quality.\n\n* SSAA - Super-sampling antialiasing (requires shaders)\nRenders higher-resolution image of the scene, then scales down to reduce\nthe aliasing effects. This is the slowest and the most accurate method.");
+	gettext("Select the antialiasing method to apply.\n\n* None - No antialiasing (default)\n\n* FSAA - Hardware-provided full-screen antialiasing\n(incompatible with Post Processing and Undersampling)\nA.K.A multi-sample antialiasing (MSAA)\nSmoothens out block edges but does not affect the insides of textures.\nA restart is required to change this option.\n\n* FXAA - Fast approximate antialiasing (requires shaders)\nApplies a post-processing filter to detect and smoothen high-contrast edges.\nProvides balance between speed and image quality.\n\n* SSAA - Super-sampling antialiasing (requires shaders)\nRenders higher-resolution image of the scene, then scales down to reduce\nthe aliasing effects. This is the slowest and the most accurate method.");
 	gettext("Anti-aliasing scale");
 	gettext("Defines the size of the sampling grid for FSAA and SSAA antialiasing methods.\nValue of 2 means taking 2x2 = 4 samples.");
 	gettext("Occlusion Culling");
@@ -153,7 +161,7 @@ fake_function() {
 	gettext("Use raytraced occlusion culling in the new culler.\nThis flag enables use of raytraced occlusion culling test for\nclient mesh sizes smaller than 4x4x4 map blocks.");
 	gettext("Shaders");
 	gettext("Shaders");
-	gettext("Shaders allow advanced visual effects and may increase performance on some video\ncards.\nThis only works with the OpenGL video backend.");
+	gettext("Shaders allow advanced visual effects and may increase performance on some video\ncards.");
 	gettext("Waving Nodes");
 	gettext("Waving leaves");
 	gettext("Set to true to enable waving leaves.");
@@ -191,12 +199,16 @@ fake_function() {
 	gettext("Sky Body Orbit Tilt");
 	gettext("Set the default tilt of Sun/Moon orbit in degrees.\nGames may change orbit tilt via API.\nValue of 0 means no tilt / vertical orbit.");
 	gettext("Post Processing");
+	gettext("Enable Post Processing");
+	gettext("Enables the post processing pipeline.");
 	gettext("Filmic tone mapping");
 	gettext("Enables Hable's 'Uncharted 2' filmic tone mapping.\nSimulates the tone curve of photographic film and how this approximates the\nappearance of high dynamic range images. Mid-range contrast is slightly\nenhanced, highlights and shadows are gradually compressed.");
 	gettext("Enable Automatic Exposure");
 	gettext("Enable automatic exposure correction\nWhen enabled, the post-processing engine will\nautomatically adjust to the brightness of the scene,\nsimulating the behavior of human eye.");
 	gettext("Exposure compensation");
 	gettext("Set the exposure compensation in EV units.\nValue of 0.0 (default) means no exposure compensation.\nRange: from -1 to 1.0");
+	gettext("Enable Debanding");
+	gettext("Apply dithering to reduce color banding artifacts.\nDithering significantly increases the size of losslessly-compressed\nscreenshots and it works incorrectly if the display or operating system\nperforms additional dithering or if the color channels are not quantized\nto 8 bits.\nWith OpenGL ES, dithering only works if the shader supports high\nfloating-point precision and it may have a higher performance impact.");
 	gettext("Bloom");
 	gettext("Enable Bloom");
 	gettext("Set to true to enable bloom effect.\nBright colors will bleed over the neighboring objects.");
@@ -208,14 +220,18 @@ fake_function() {
 	gettext("Defines the magnitude of bloom overexposure.\nRange: from 0.1 to 10.0, default: 1.0");
 	gettext("Bloom Radius");
 	gettext("Logical value that controls how far the bloom effect spreads\nfrom the bright objects.\nRange: from 0.1 to 8, default: 1");
+	gettext("Volumetric lighting");
+	gettext("Set to true to enable volumetric lighting effect (a.k.a. \"Godrays\").");
 	gettext("Audio");
 	gettext("Volume");
 	gettext("Volume of all sounds.\nRequires the sound system to be enabled.");
+	gettext("Volume when unfocused");
+	gettext("Volume multiplier when the window is unfocused.");
 	gettext("Mute sound");
 	gettext("Whether to mute sounds. You can unmute sounds at any time, unless the\nsound system is disabled (enable_sound=false).\nIn-game, you can toggle the mute state with the mute key or by using the\npause menu.");
 	gettext("User Interfaces");
 	gettext("Language");
-	gettext("Set the language. Leave empty to use the system language.\nA restart is required after changing this.");
+	gettext("Set the language. By default, the system language is used.\nA restart is required after changing this.");
 	gettext("GUI");
 	gettext("GUI scaling");
 	gettext("Scale GUI by a user specified value.\nUse a nearest-neighbor-anti-alias filter to scale the GUI.\nThis will smooth over some of the rough edges, and blend\npixels when scaling down, at the cost of blurring some\nedge pixels when images are scaled by non-integer sizes.");
@@ -260,6 +276,8 @@ fake_function() {
 	gettext("Content Repository");
 	gettext("ContentDB URL");
 	gettext("The URL for the content repository");
+	gettext("Enable updates available indicator on content tab");
+	gettext("If enabled and you have ContentDB packages installed, Minetest may contact ContentDB to\ncheck for package updates when opening the mainmenu.");
 	gettext("ContentDB Flag Blacklist");
 	gettext("Comma-separated list of flags to hide in the content repository.\n\"nonfree\" can be used to hide packages which do not qualify as 'free software',\nas defined by the Free Software Foundation.\nYou can also specify content ratings.\nThese flags are independent from Minetest versions,\nso see a full list at https://content.minetest.net/help/content_flags/");
 	gettext("ContentDB Max Concurrent Downloads");
@@ -273,7 +291,7 @@ fake_function() {
 	gettext("Enable split login/register");
 	gettext("If enabled, account registration is separate from login in the UI.\nIf disabled, new accounts will be registered automatically when logging in.");
 	gettext("Update information URL");
-	gettext("URL to JSON file which provides information about the newest Minetest release");
+	gettext("URL to JSON file which provides information about the newest Minetest release.\nIf this is empty the engine will never check for updates.");
 	gettext("Server");
 	gettext("Admin name");
 	gettext("Name of the player.\nWhen running a server, clients connecting with this name are admins.\nWhen starting from the main menu, this is overridden.");
@@ -303,6 +321,8 @@ fake_function() {
 	gettext("The network interface that the server listens on.");
 	gettext("Strict protocol checking");
 	gettext("Enable to disallow old clients from connecting.\nOlder clients are compatible in the sense that they will not crash when connecting\nto new servers, but they may not support all new features that you are expecting.");
+	gettext("Protocol version minimum");
+	gettext("Define the oldest clients allowed to connect.\nOlder clients are compatible in the sense that they will not crash when connecting\nto new servers, but they may not support all new features that you are expecting.\nThis allows for more fine-grained control than strict_protocol_version_checking.\nMinetest still enforces its own internal minimum, and enabling\nstrict_protocol_version_checking will effectively override this.");
 	gettext("Remote media");
 	gettext("Specifies URL from which client fetches media instead of using UDP.\n$filename should be accessible from $remote_media$filename via cURL\n(obviously, remote_media should end with a slash).\nFiles that are not present will be fetched the usual way.");
 	gettext("IPv6 server");
@@ -436,7 +456,7 @@ fake_function() {
 	gettext("3D noise that determines number of dungeons per mapchunk.");
 	gettext("Mapgen V6");
 	gettext("Mapgen V6 specific flags");
-	gettext("Map generation attributes specific to Mapgen v6.\nThe 'snowbiomes' flag enables the new 5 biome system.\nWhen the 'snowbiomes' flag is enabled jungles are automatically enabled and\nthe 'jungles' flag is ignored.");
+	gettext("Map generation attributes specific to Mapgen v6.\nThe 'snowbiomes' flag enables the new 5 biome system.\nWhen the 'snowbiomes' flag is enabled jungles are automatically enabled and\nthe 'jungles' flag is ignored.\nThe 'temples' flag disables generation of desert temples. Normal dungeons will appear instead.");
 	gettext("Desert noise threshold");
 	gettext("Deserts occur when np_biome exceeds this value.\nWhen the 'snowbiomes' flag is enabled, this is ignored.");
 	gettext("Beach noise threshold");
@@ -788,6 +808,8 @@ fake_function() {
 	gettext("Handling for deprecated Lua API calls:\n-    none: Do not log deprecated calls\n-    log: mimic and log backtrace of deprecated call (default).\n-    error: abort on usage of deprecated call (suggested for mod developers).");
 	gettext("Random input");
 	gettext("Enable random user input (only used for testing).");
+	gettext("Random mod load order");
+	gettext("Enable random mod loading (mainly used for testing).");
 	gettext("Mod channels");
 	gettext("Enable mod channels support.");
 	gettext("Mod Profiler");
@@ -823,11 +845,9 @@ fake_function() {
 	gettext("Shader path");
 	gettext("Path to shader directory. If no path is defined, default location will be used.");
 	gettext("Video driver");
-	gettext("The rendering back-end.\nNote: A restart is required after changing this!\nOpenGL is the default for desktop, and OGLES2 for Android.\nShaders are supported by OpenGL and OGLES2 (experimental).");
+	gettext("The rendering back-end.\nNote: A restart is required after changing this!\nOpenGL is the default for desktop, and OGLES2 for Android.\nShaders are supported by everything but OGLES1.");
 	gettext("Transparency Sorting Distance");
 	gettext("Distance in nodes at which transparency depth sorting is enabled\nUse this to limit the performance impact of transparency depth sorting");
-	gettext("VBO");
-	gettext("Enable vertex buffer objects.\nThis should greatly improve graphics performance.");
 	gettext("Cloud radius");
 	gettext("Radius of cloud area stated in number of 64 node cloud squares.\nValues larger than 26 will start to produce sharp cutoffs at cloud area corners.");
 	gettext("Desynchronize block animation");
@@ -838,8 +858,6 @@ fake_function() {
 	gettext("Delay between mesh updates on the client in ms. Increasing this will slow\ndown the rate of mesh updates, thus reducing jitter on slower clients.");
 	gettext("Mapblock mesh generation threads");
 	gettext("Number of threads to use for mesh generation.\nValue of 0 (default) will let Minetest autodetect the number of available threads.");
-	gettext("Mapblock mesh generator's MapBlock cache size in MB");
-	gettext("Size of the MapBlock cache of the mesh generator. Increasing this will\nincrease the cache hit %, reducing the data being copied from the main\nthread, thus reducing jitter.");
 	gettext("Minimap scan height");
 	gettext("True = 256\nFalse = 128\nUsable to make minimap smoother on slower machines.");
 	gettext("World-aligned textures mode");
@@ -850,6 +868,11 @@ fake_function() {
 	gettext("When using bilinear/trilinear/anisotropic filters, low-resolution textures\ncan be blurred, so automatically upscale them with nearest-neighbor\ninterpolation to preserve crisp pixels. This sets the minimum texture size\nfor the upscaled textures; higher values look sharper, but require more\nmemory. Powers of 2 are recommended. This setting is ONLY applied if\nbilinear/trilinear/anisotropic filtering is enabled.\nThis is also used as the base node texture size for world-aligned\ntexture autoscaling.");
 	gettext("Client Mesh Chunksize");
 	gettext("Side length of a cube of map blocks that the client will consider together\nwhen generating meshes.\nLarger values increase the utilization of the GPU by reducing the number of\ndraw calls, benefiting especially high-end GPUs.\nSystems with a low-end GPU (or no GPU) would benefit from smaller values.");
+	gettext("OpenGL debug");
+	gettext("Enables debug and error-checking in the OpenGL driver.");
+	gettext("Sound");
+	gettext("Sound Extensions Blacklist");
+	gettext("Comma-separated list of AL and ALC extensions that should not be used.\nUseful for testing. See al_extensions.[h,cpp] for details.");
 	gettext("Font");
 	gettext("Font bold by default");
 	gettext("Font italic by default");
@@ -920,7 +943,7 @@ fake_function() {
 	gettext("Whether to ask clients to reconnect after a (Lua) crash.\nSet this to true if your server is set up to restart automatically.");
 	gettext("Server/Env Performance");
 	gettext("Dedicated server step");
-	gettext("Length of a server tick and the interval at which objects are generally updated over\nnetwork, stated in seconds.");
+	gettext("Length of a server tick (the interval at which everything is generally updated),\nstated in seconds.\nDoes not apply to sessions hosted from the client menu.");
 	gettext("Unlimited player transfer distance");
 	gettext("Whether players are shown to clients without any range limit.\nDeprecated, use the setting player_transfer_distance instead.");
 	gettext("Player transfer distance");
@@ -956,9 +979,11 @@ fake_function() {
 	gettext("Liquid update tick");
 	gettext("Liquid update interval in seconds.");
 	gettext("Block send optimize distance");
-	gettext("At this distance the server will aggressively optimize which blocks are sent to\nclients.\nSmall values potentially improve performance a lot, at the expense of visible\nrendering glitches (some blocks will not be rendered under water and in caves,\nas well as sometimes on land).\nSetting this to a value greater than max_block_send_distance disables this\noptimization.\nStated in mapblocks (16 nodes).");
+	gettext("At this distance the server will aggressively optimize which blocks are sent to\nclients.\nSmall values potentially improve performance a lot, at the expense of visible\nrendering glitches (some blocks might not be rendered correctly in caves).\nSetting this to a value greater than max_block_send_distance disables this\noptimization.\nStated in MapBlocks (16 nodes).");
 	gettext("Server-side occlusion culling");
 	gettext("If enabled, the server will perform map block occlusion culling based on\non the eye position of the player. This can reduce the number of blocks\nsent to the client by 50-80%. Clients will no longer receive most\ninvisible blocks, so that the utility of noclip mode is reduced.");
+	gettext("Block cull optimize distance");
+	gettext("At this distance the server will perform a simpler and cheaper occlusion check.\nSmaller values potentially improve performance, at the expense of temporarily visible\nrendering glitches (missing blocks).\nThis is especially useful for very large viewing range (upwards of 500).\nStated in MapBlocks (16 nodes).");
 	gettext("Mapgen");
 	gettext("Chunk size");
 	gettext("Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\nWARNING: There is no benefit, and there are several dangers, in\nincreasing this value above 5.\nReducing this value increases cave and dungeon density.\nAltering this value is for special usage, leaving it unchanged is\nrecommended.");
@@ -980,8 +1005,6 @@ fake_function() {
 	gettext("cURL file download timeout");
 	gettext("Maximum time a file download (e.g. a mod download) may take, stated in milliseconds.");
 	gettext("Miscellaneous");
-	gettext("DPI");
-	gettext("Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k screens.");
 	gettext("Display Density Scaling Factor");
 	gettext("Adjust the detected display density, used for scaling UI elements.");
 	gettext("Enable console window");
diff --git a/src/skyparams.h b/src/skyparams.h
index 9148d93ae..69fd58f02 100644
--- a/src/skyparams.h
+++ b/src/skyparams.h
@@ -51,6 +51,7 @@ struct SkyboxParams
 	float body_orbit_tilt { INVALID_SKYBOX_TILT };
 	s16 fog_distance { -1 };
 	float fog_start { -1.0f };
+	video::SColor fog_color; // override, only used if alpha > 0
 };
 
 struct SunParams
@@ -106,6 +107,7 @@ public:
 		sky.fog_sun_tint = video::SColor(255, 244, 125, 29);
 		sky.fog_moon_tint = video::SColorf(0.5, 0.6, 0.8, 1).toSColor();
 		sky.fog_tint_type = "default";
+		sky.fog_color = video::SColor(0);
 		return sky;
 	}
 
diff --git a/src/sound.h b/src/sound.h
index 6f3fa097b..9ab008bdd 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -50,7 +50,7 @@ enum {
 */
 struct SoundSpec
 {
-	SoundSpec(const std::string &name = "", float gain = 1.0f,
+	SoundSpec(std::string_view name = "", float gain = 1.0f,
 			bool loop = false, float fade = 0.0f, float pitch = 1.0f,
 			float start_time = 0.0f) :
 			name(name), gain(gain), fade(fade), pitch(pitch), start_time(start_time),
diff --git a/src/staticobject.cpp b/src/staticobject.cpp
index 590f6f44b..08f3969ed 100644
--- a/src/staticobject.cpp
+++ b/src/staticobject.cpp
@@ -30,6 +30,7 @@ StaticObject::StaticObject(const ServerActiveObject *s_obj, const v3f &pos_):
 	type(s_obj->getType()),
 	pos(pos_)
 {
+	assert(s_obj->isStaticAllowed());
 	s_obj->getStaticData(&data);
 }
 
diff --git a/src/terminal_chat_console.cpp b/src/terminal_chat_console.cpp
index 50ccea6ef..abaf5d4f0 100644
--- a/src/terminal_chat_console.cpp
+++ b/src/terminal_chat_console.cpp
@@ -281,7 +281,7 @@ void TerminalChatConsole::handleInput(int ch, bool &complete_redraw_needed)
 				ChatPrompt::CURSOROP_DIR_RIGHT,
 				ChatPrompt::CURSOROP_SCOPE_LINE);
 			break;
-		case KEY_TAB:
+		case '\t':
 			// Tab pressed
 			// Nick completion
 			prompt.nickCompletion(m_nicks, false);
@@ -427,7 +427,7 @@ void TerminalChatConsole::step(int ch)
 		printw("[ESC] Toggle ESC mode |"
 			" [CTRL+C] Shut down |"
 			" (L) in-, (l) decrease loglevel %s",
-			Logger::getLevelLabel((LogLevel) m_log_level).c_str());
+			Logger::getLevelLabel((LogLevel) m_log_level));
 	}
 
 	refresh();
diff --git a/src/texture_override.cpp b/src/texture_override.cpp
index 88f754f88..1b8b4671d 100644
--- a/src/texture_override.cpp
+++ b/src/texture_override.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "texture_override.h"
 
 #include "log.h"
+#include "filesys.h"
 #include "util/string.h"
 #include <algorithm>
 #include <fstream>
@@ -46,9 +47,9 @@ static const std::map<std::string, OverrideTarget> override_LUT = {
 	{ "*", OverrideTarget::ALL_FACES }
 };
 
-TextureOverrideSource::TextureOverrideSource(std::string filepath)
+TextureOverrideSource::TextureOverrideSource(const std::string &filepath)
 {
-	std::ifstream infile(filepath.c_str());
+	auto infile = open_ifstream(filepath.c_str(), false);
 	std::string line;
 	int line_index = 0;
 	while (std::getline(infile, line)) {
@@ -115,7 +116,7 @@ TextureOverrideSource::TextureOverrideSource(std::string filepath)
 }
 
 //! Get all overrides that apply to item definitions
-std::vector<TextureOverride> TextureOverrideSource::getItemTextureOverrides()
+std::vector<TextureOverride> TextureOverrideSource::getItemTextureOverrides() const
 {
 	std::vector<TextureOverride> found_overrides;
 
@@ -128,7 +129,7 @@ std::vector<TextureOverride> TextureOverrideSource::getItemTextureOverrides()
 }
 
 //! Get all overrides that apply to node definitions
-std::vector<TextureOverride> TextureOverrideSource::getNodeTileOverrides()
+std::vector<TextureOverride> TextureOverrideSource::getNodeTileOverrides() const
 {
 	std::vector<TextureOverride> found_overrides;
 
diff --git a/src/texture_override.h b/src/texture_override.h
index 4c09fa540..19e55689c 100644
--- a/src/texture_override.h
+++ b/src/texture_override.h
@@ -44,13 +44,11 @@ enum class OverrideTarget : override_t
 	SPECIAL_5 = 1 << 12,
 	SPECIAL_6 = 1 << 13,
 
-	// clang-format off
 	SIDES = LEFT | RIGHT | FRONT | BACK,
 	ALL_FACES = TOP | BOTTOM | SIDES,
 	ALL_SPECIAL = SPECIAL_1 | SPECIAL_2 | SPECIAL_3 | SPECIAL_4 | SPECIAL_5 | SPECIAL_6,
 	NODE_TARGETS = ALL_FACES | ALL_SPECIAL,
 	ITEM_TARGETS = INVENTORY | WIELD,
-	// clang-format on
 };
 
 struct TextureOverride
@@ -72,13 +70,13 @@ struct TextureOverride
 class TextureOverrideSource
 {
 public:
-	TextureOverrideSource(std::string filepath);
+	TextureOverrideSource(const std::string &filepath);
 
 	//! Get all overrides that apply to item definitions
-	std::vector<TextureOverride> getItemTextureOverrides();
+	std::vector<TextureOverride> getItemTextureOverrides() const;
 
 	//! Get all overrides that apply to node definitions
-	std::vector<TextureOverride> getNodeTileOverrides();
+	std::vector<TextureOverride> getNodeTileOverrides() const;
 
 private:
 	std::vector<TextureOverride> m_overrides;
diff --git a/src/threading/concurrent_unordered_set.h b/src/threading/concurrent_unordered_set.h
new file mode 100644
index 000000000..0b4fda4d0
--- /dev/null
+++ b/src/threading/concurrent_unordered_set.h
@@ -0,0 +1,80 @@
+/*
+Copyright (C) 2024 proller <proler@gmail.com>
+*/
+
+/*
+This file is part of Freeminer.
+
+Freeminer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Freeminer  is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <unordered_set>
+
+#include "lock.h"
+
+template <class LOCKER, class Value, class Hash = std::hash<Value>,
+		class Pred = std::equal_to<Value>, class Alloc = std::allocator<Value>>
+class concurrent_unordered_set_ : public std::unordered_set<Value, Hash, Pred, Alloc>,
+								  public LOCKER
+{
+public:
+	using full_type = std::unordered_set<Value, Hash, Pred, Alloc>;
+
+	~concurrent_unordered_set_() { clear(); }
+
+	LOCK_UNIQUE_PROXY(full_type, operator=);
+	LOCK_SHARED_PROXY(full_type, empty);
+	LOCK_SHARED_PROXY(full_type, size);
+	LOCK_SHARED_PROXY(full_type, max_size);
+
+	LOCK_SHARED_PROXY(full_type, begin);
+	LOCK_SHARED_PROXY(full_type, end);
+	LOCK_SHARED_PROXY(full_type, cbegin);
+	LOCK_SHARED_PROXY(full_type, cend);
+
+	LOCK_UNIQUE_PROXY(full_type, emplace);
+	LOCK_UNIQUE_PROXY(full_type, emplace_hint);
+	LOCK_UNIQUE_PROXY(full_type, insert);
+	LOCK_UNIQUE_PROXY(full_type, extract);
+	LOCK_UNIQUE_PROXY(full_type, erase);
+	LOCK_UNIQUE_PROXY(full_type, clear);
+	LOCK_UNIQUE_PROXY(full_type, merge);
+	LOCK_UNIQUE_PROXY(full_type, swap);
+	//c++23 LOCK_UNIQUE_PROXY(full_type, insert_range);
+
+	LOCK_SHARED_PROXY(full_type, find);
+	LOCK_SHARED_PROXY(full_type, count);
+	LOCK_SHARED_PROXY(full_type, contains);
+	LOCK_SHARED_PROXY(full_type, equal_range);
+
+	LOCK_SHARED_PROXY(full_type, at);
+	LOCK_UNIQUE_PROXY(full_type, assign);
+
+	LOCK_UNIQUE_PROXY(full_type, rehash);
+	LOCK_UNIQUE_PROXY(full_type, reserve);
+	LOCK_SHARED_PROXY(full_type, load_factor);
+	LOCK_SHARED_PROXY(full_type, max_load_factor);
+};
+
+template <class Value, class Hash = std::hash<Value>, class Pred = std::equal_to<Value>,
+		class Alloc = std::allocator<Value>>
+using concurrent_unordered_set =
+		concurrent_unordered_set_<locker<>, Value, Hash, Pred, Alloc>;
+
+template <class Value, class Hash = std::hash<Value>, class Pred = std::equal_to<Value>,
+		class Alloc = std::allocator<Value>>
+using concurrent_shared_unordered_set =
+		concurrent_unordered_set_<shared_locker, Value, Hash, Pred, Alloc>;
diff --git a/src/threading/lambda.h b/src/threading/lambda.h
new file mode 100644
index 000000000..146693457
--- /dev/null
+++ b/src/threading/lambda.h
@@ -0,0 +1,64 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <exception>
+#include <functional>
+#include <memory>
+#include "debug.h"
+#include "threading/thread.h"
+
+/**
+ * Class returned by `runInThread`.
+ *
+ * Provides the usual thread methods along with `rethrow()`.
+*/
+class LambdaThread : public Thread
+{
+	friend std::unique_ptr<LambdaThread> runInThread(
+		const std::function<void()> &, const std::string &);
+public:
+	/// Re-throw a caught exception, if any. Can only be called after thread exit.
+	void rethrow()
+	{
+		sanity_check(!isRunning());
+		if (m_exptr)
+			std::rethrow_exception(m_exptr);
+	}
+
+private:
+	// hide methods
+	LambdaThread(const std::string &name="") : Thread(name) {}
+	using Thread::start;
+
+	std::function<void()> m_fn;
+	std::exception_ptr m_exptr;
+
+	void *run()
+	{
+		try {
+			m_fn();
+		} catch(...) {
+			m_exptr = std::current_exception();
+		}
+		return nullptr;
+	};
+};
+
+/**
+ * Run a lambda in a separate thread.
+ *
+ * Exceptions will be caught.
+ * @param fn function to run
+ * @param thread_name name for thread
+ * @return thread object of type `LambdaThread`
+*/
+std::unique_ptr<LambdaThread> runInThread(const std::function<void()> &fn,
+	const std::string &thread_name = "")
+{
+	std::unique_ptr<LambdaThread> t(new LambdaThread(thread_name));
+	t->m_fn = fn;
+	t->start();
+	return t;
+}
diff --git a/src/threading/lock.cpp b/src/threading/lock.cpp
index 91c2b9bbf..aa3858d19 100644
--- a/src/threading/lock.cpp
+++ b/src/threading/lock.cpp
@@ -12,11 +12,12 @@
 #define SCOPE_PROFILE(a)
 #endif
 
-template<class GUARD, class MUTEX>
-recursive_lock<GUARD, MUTEX>::recursive_lock(MUTEX & mtx, std::atomic<std::size_t> & thread_id_, bool try_lock):
-	thread_id(thread_id_) {
+template <class GUARD, class MUTEX>
+recursive_lock<GUARD, MUTEX>::recursive_lock(MUTEX &mtx,
+		std::atomic<std::size_t> &thread_id_, bool try_lock) : thread_id(thread_id_)
+{
 	auto thread_me = std::hash<std::thread::id>()(std::this_thread::get_id());
-	if(thread_me != thread_id) {
+	if (thread_me != thread_id) {
 		if (try_lock) {
 			SCOPE_PROFILE("try_lock");
 			lock = new GUARD(mtx, try_to_lock);
@@ -44,22 +45,25 @@ recursive_lock<GUARD, MUTEX>::recursive_lock(MUTEX & mtx, std::atomic<std::size_
 	lock = nullptr;
 }
 
-template<class GUARD, class MUTEX>
-recursive_lock<GUARD, MUTEX>::~recursive_lock() {
+template <class GUARD, class MUTEX>
+recursive_lock<GUARD, MUTEX>::~recursive_lock()
+{
 	unlock();
 }
 
-template<class GUARD, class MUTEX>
-bool recursive_lock<GUARD, MUTEX>::owns_lock() {
+template <class GUARD, class MUTEX>
+bool recursive_lock<GUARD, MUTEX>::owns_lock()
+{
 	if (lock)
 		return lock;
 	auto thread_me = std::hash<std::thread::id>()(std::this_thread::get_id());
 	return thread_id == thread_me;
 }
 
-template<class GUARD, class MUTEX>
-void recursive_lock<GUARD, MUTEX>::unlock() {
-	if(lock) {
+template <class GUARD, class MUTEX>
+void recursive_lock<GUARD, MUTEX>::unlock()
+{
+	if (lock) {
 		thread_id = 0;
 		lock->unlock();
 		delete lock;
@@ -67,66 +71,79 @@ void recursive_lock<GUARD, MUTEX>::unlock() {
 	}
 }
 
-
-template<class mutex, class unique_lock, class shared_lock>
-locker<mutex, unique_lock, shared_lock>::locker() {
+template <class mutex, class unique_lock, class shared_lock>
+locker<mutex, unique_lock, shared_lock>::locker()
+{
 	thread_id = 0;
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<unique_lock> locker<mutex, unique_lock, shared_lock>::lock_unique() {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<unique_lock> locker<mutex, unique_lock, shared_lock>::lock_unique() const
+{
 	return std::make_unique<unique_lock>(mtx);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<unique_lock> locker<mutex, unique_lock, shared_lock>::try_lock_unique() {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<unique_lock>
+locker<mutex, unique_lock, shared_lock>::try_lock_unique() const
+{
 	SCOPE_PROFILE("locker::try_lock_unique");
 	return std::make_unique<unique_lock>(mtx, std::try_to_lock);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<shared_lock> locker<mutex, unique_lock, shared_lock>::lock_shared() const {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<shared_lock> locker<mutex, unique_lock, shared_lock>::lock_shared() const
+{
 	SCOPE_PROFILE("locker::lock_shared");
 	return std::make_unique<shared_lock>(mtx);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<shared_lock> locker<mutex, unique_lock, shared_lock>::try_lock_shared() {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<shared_lock>
+locker<mutex, unique_lock, shared_lock>::try_lock_shared() const
+{
 	SCOPE_PROFILE("locker::try_lock_shared");
 	return std::make_unique<shared_lock>(mtx, std::try_to_lock);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<recursive_lock<unique_lock, mutex>> locker<mutex, unique_lock, shared_lock>::lock_unique_rec() const {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<recursive_lock<unique_lock, mutex>>
+locker<mutex, unique_lock, shared_lock>::lock_unique_rec() const
+{
 	SCOPE_PROFILE("locker::lock_unique_rec");
 	return std::make_unique<lock_rec_unique>(mtx, thread_id);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<recursive_lock<unique_lock, mutex>> locker<mutex, unique_lock, shared_lock>::try_lock_unique_rec() {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<recursive_lock<unique_lock, mutex>>
+locker<mutex, unique_lock, shared_lock>::try_lock_unique_rec() const
+{
 	SCOPE_PROFILE("locker::try_lock_unique_rec");
 	return std::make_unique<lock_rec_unique>(mtx, thread_id, true);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<recursive_lock<shared_lock, mutex>> locker<mutex, unique_lock, shared_lock>::lock_shared_rec() const {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<recursive_lock<shared_lock, mutex>>
+locker<mutex, unique_lock, shared_lock>::lock_shared_rec() const
+{
 	SCOPE_PROFILE("locker::lock_shared_rec");
 	return std::make_unique<lock_rec_shared>(mtx, thread_id);
 }
 
-template<class mutex, class unique_lock, class shared_lock>
-std::unique_ptr<recursive_lock<shared_lock, mutex>> locker<mutex, unique_lock, shared_lock>::try_lock_shared_rec() {
+template <class mutex, class unique_lock, class shared_lock>
+std::unique_ptr<recursive_lock<shared_lock, mutex>>
+locker<mutex, unique_lock, shared_lock>::try_lock_shared_rec() const
+{
 	SCOPE_PROFILE("locker::try_lock_shared_rec");
 	return std::make_unique<lock_rec_shared>(mtx, thread_id, true);
 }
 
-
 template class recursive_lock<std::unique_lock<use_mutex>>;
 template class locker<>;
 #if LOCK_TWO
 template class recursive_lock<try_shared_lock, try_shared_mutex>;
 template class recursive_lock<std::unique_lock<try_shared_mutex>, try_shared_mutex>;
 
-template class locker<try_shared_mutex, std::unique_lock<try_shared_mutex>, std::shared_lock<try_shared_mutex>>;
+template class locker<try_shared_mutex, std::unique_lock<try_shared_mutex>,
+		std::shared_lock<try_shared_mutex>>;
 #endif
-
diff --git a/src/threading/lock.h b/src/threading/lock.h
index 1f934a614..6bf9490ed 100644
--- a/src/threading/lock.h
+++ b/src/threading/lock.h
@@ -37,7 +37,6 @@ const auto try_to_lock = std::try_to_lock;
 
 typedef std::mutex use_mutex;
 
-
 #if USE_BOOST // not finished
 
 //#include <ctime>
@@ -62,14 +61,13 @@ const auto try_to_lock = std::try_to_lock;
 #else
 
 using try_shared_mutex = use_mutex;
-using try_shared_lock = std::unique_lock<try_shared_mutex> ;
-using unique_lock = std::unique_lock<try_shared_mutex> ;
+using try_shared_lock = std::unique_lock<try_shared_mutex>;
+using unique_lock = std::unique_lock<try_shared_mutex>;
 const auto try_to_lock = std::try_to_lock;
 #endif
 
 #endif
 
-
 // http://stackoverflow.com/questions/4792449/c0x-has-no-semaphores-how-to-synchronize-threads
 /* uncomment when need
 #include <condition_variable>
@@ -96,19 +94,23 @@ public:
 };
 */
 
-template<class GUARD, class MUTEX = use_mutex>
-class recursive_lock {
+template <class GUARD, class MUTEX = use_mutex>
+class recursive_lock
+{
 public:
-	GUARD * lock;
-	std::atomic<std::size_t> & thread_id;
-	recursive_lock(MUTEX & mtx, std::atomic<std::size_t> & thread_id_, bool try_lock = false);
+	GUARD *lock;
+	std::atomic<std::size_t> &thread_id;
+	recursive_lock(
+			MUTEX &mtx, std::atomic<std::size_t> &thread_id_, bool try_lock = false);
 	~recursive_lock();
 	bool owns_lock();
 	void unlock();
 };
 
-template<class mutex = use_mutex, class unique_lock = std::unique_lock<mutex> , class shared_lock = std::unique_lock<mutex> >
-class locker {
+template <class mutex = use_mutex, class unique_lock = std::unique_lock<mutex>,
+		class shared_lock = std::unique_lock<mutex>>
+class locker
+{
 public:
 	using lock_rec_shared = recursive_lock<shared_lock, mutex>;
 	using lock_rec_unique = recursive_lock<unique_lock, mutex>;
@@ -117,40 +119,41 @@ public:
 	mutable std::atomic<std::size_t> thread_id;
 
 	locker();
-	std::unique_ptr<unique_lock> lock_unique();
-	std::unique_ptr<unique_lock> try_lock_unique();
+	std::unique_ptr<unique_lock> lock_unique() const;
+	std::unique_ptr<unique_lock> try_lock_unique() const;
 	std::unique_ptr<shared_lock> lock_shared() const;
-	std::unique_ptr<shared_lock> try_lock_shared();
+	std::unique_ptr<shared_lock> try_lock_shared() const;
 	std::unique_ptr<lock_rec_unique> lock_unique_rec() const;
-	std::unique_ptr<lock_rec_unique> try_lock_unique_rec();
+	std::unique_ptr<lock_rec_unique> try_lock_unique_rec() const;
 	std::unique_ptr<lock_rec_shared> lock_shared_rec() const;
-	std::unique_ptr<lock_rec_shared> try_lock_shared_rec();
+	std::unique_ptr<lock_rec_shared> try_lock_shared_rec() const;
 };
 
 using shared_locker = locker<try_shared_mutex, unique_lock, try_shared_lock>;
 
-class dummy_lock {
+class dummy_lock
+{
 public:
-	~dummy_lock() {}; //no unused variable warning
-	bool owns_lock() {return true;}
-	bool operator!() {return true;}
-	dummy_lock * operator->() {return this; }
+	~dummy_lock(){}; //no unused variable warning
+	bool owns_lock() { return true; }
+	bool operator!() { return true; }
+	dummy_lock *operator->() { return this; }
 	void unlock() {};
 };
 
-class dummy_locker {
+class dummy_locker
+{
 public:
-	dummy_lock lock_unique() { return {}; };
-	dummy_lock try_lock_unique() { return {}; };
-	dummy_lock lock_shared() { return {}; };
-	dummy_lock try_lock_shared() { return {}; };
-	dummy_lock lock_unique_rec() { return {}; };
-	dummy_lock try_lock_unique_rec() { return {}; };
-	dummy_lock lock_shared_rec() { return {}; };
-	dummy_lock try_lock_shared_rec() { return {}; };
+	dummy_lock lock_unique() const { return {}; };
+	dummy_lock try_lock_unique() const { return {}; };
+	dummy_lock lock_shared() const { return {}; };
+	dummy_lock try_lock_shared() const { return {}; };
+	dummy_lock lock_unique_rec() const { return {}; };
+	dummy_lock try_lock_unique_rec() const { return {}; };
+	dummy_lock lock_shared_rec() const { return {}; };
+	dummy_lock try_lock_shared_rec() const { return {}; };
 };
 
-
 #if ENABLE_THREADS
 
 using maybe_locker = locker<>;
@@ -162,3 +165,25 @@ using maybe_locker = dummy_locker;
 using maybe_shared_locker = dummy_locker;
 
 #endif
+
+#define LOCK_PROXY(CLASS, METHOD, LOCK)                                                  \
+	template <typename... Args>                                                          \
+	decltype(auto) METHOD(Args &&...args)                                                \
+	{                                                                                    \
+		const auto lock = LOCK();                                                        \
+		return CLASS::METHOD(std::forward<Args>(args)...);                               \
+	}
+
+#define LOCK_UNIQUE_PROXY(CLASS, METHOD)                                                 \
+	LOCK_PROXY(CLASS, METHOD, LOCKER::lock_unique_rec)
+#define LOCK_SHARED_PROXY(CLASS, METHOD)                                                 \
+	LOCK_PROXY(CLASS, METHOD, LOCKER::lock_shared_rec)
+
+#define WITH_UNIQUE_LOCK(LOCK) if (const auto lock___ = std::unique_lock(LOCK); true)
+#define WITH_SHARED_LOCK(LOCK) if (const auto lock___ = std::shared_lock(LOCK); true)
+#define TRY_UNIQUE_LOCK(LOCK)                                                            \
+	if (const auto lock___ = std::unique_lock(LOCK, std::try_to_lock);                   \
+			lock___.owns_lock())
+#define TRY_SHARED_LOCK(LOCK)                                                            \
+	if (const auto lock___ = std::shared_lock(LOCK, std::try_to_lock);                   \
+			lock___.owns_lock())
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index da0509a0e..28b5b808e 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -60,6 +60,11 @@ DEALINGS IN THE SOFTWARE.
 	#include <mach/thread_act.h>
 #endif
 
+// See https://msdn.microsoft.com/en-us/library/hh920601.aspx#thread__native_handle_method
+#define win32_native_handle() ((HANDLE) getThreadHandle())
+
+thread_local Thread *current_thread = nullptr;
+
 
 Thread::Thread(const std::string &name) :
 	m_name(name),
@@ -82,9 +87,8 @@ Thread::~Thread()
 		m_running = false;
 
 #if defined(_WIN32)
-		// See https://msdn.microsoft.com/en-us/library/hh920601.aspx#thread__native_handle_method
-		TerminateThread((HANDLE) m_thread_obj->native_handle(), 0);
-		CloseHandle((HANDLE) m_thread_obj->native_handle());
+		TerminateThread(win32_native_handle(), 0);
+		CloseHandle(win32_native_handle());
 #else
 		// We need to pthread_kill instead on Android since NDKv5's pthread
 		// implementation is incomplete.
@@ -177,6 +181,8 @@ void Thread::threadProc(Thread *thr)
 	thr->m_kernel_thread_id = thread_self();
 #endif
 
+	current_thread = thr;
+
 	thr->setName(thr->m_name);
 
 	g_logger.registerThread(thr->m_name);
@@ -197,6 +203,12 @@ void Thread::threadProc(Thread *thr)
 }
 
 
+Thread *Thread::getCurrentThread()
+{
+	return current_thread;
+}
+
+
 void Thread::setName(const std::string &name)
 {
 #if defined(__linux__)
@@ -267,13 +279,9 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
 	return false;
 
-#elif _MSC_VER
+#elif defined(_WIN32)
 
-	return SetThreadAffinityMask(getThreadHandle(), 1 << proc_number);
-
-#elif __MINGW32__
-
-	return SetThreadAffinityMask(pthread_gethandle(getThreadHandle()), 1 << proc_number);
+	return SetThreadAffinityMask(win32_native_handle(), 1 << proc_number);
 
 #elif __FreeBSD_version >= 702106 || defined(__linux__) || defined(__DragonFly__)
 
@@ -326,13 +334,9 @@ bool Thread::bindToProcessor(unsigned int proc_number)
 
 bool Thread::setPriority(int prio)
 {
-#ifdef _MSC_VER
+#ifdef _WIN32
 
-	return SetThreadPriority(getThreadHandle(), prio);
-
-#elif __MINGW32__
-
-	return SetThreadPriority(pthread_gethandle(getThreadHandle()), prio);
+	return SetThreadPriority(win32_native_handle(), prio);
 
 #else
 
diff --git a/src/threading/thread.h b/src/threading/thread.h
index ad928512f..a037aebc4 100644
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -59,6 +59,7 @@ public:
 	Thread(const std::string &name="");
 	virtual ~Thread();
 	DISABLE_CLASS_COPY(Thread)
+	// Note: class cannot be moved since other references exist
 
 	/*
 	 * Begins execution of a new thread at the pure virtual method Thread::run().
@@ -123,6 +124,11 @@ public:
 	 */
 	bool setPriority(int prio);
 
+	/*
+	 * Returns the thread object of the current thread if it exists.
+	 */
+	static Thread *getCurrentThread();
+
 	/*
 	 * Sets the currently executing thread's name to where supported; useful
 	 * for debugging.
diff --git a/src/tileanimation.cpp b/src/tileanimation.cpp
index 025d27d91..53ae264af 100644
--- a/src/tileanimation.cpp
+++ b/src/tileanimation.cpp
@@ -31,26 +31,33 @@ void TileAnimationParams::serialize(std::ostream &os, u16 protocol_ver) const
 	if (type == TAT_VERTICAL_FRAMES) {
 		writeU16(os, vertical_frames.aspect_w);
 		writeU16(os, vertical_frames.aspect_h);
-		writeF32(os, need_abs ? fabs(vertical_frames.length) : vertical_frames.length);
+		writeF32(os, need_abs ? std::abs(vertical_frames.length) : vertical_frames.length);
 	} else if (type == TAT_SHEET_2D) {
 		writeU8(os, sheet_2d.frames_w);
 		writeU8(os, sheet_2d.frames_h);
-		writeF32(os, need_abs ? fabs(sheet_2d.frame_length) : sheet_2d.frame_length);
+		writeF32(os, need_abs ? std::abs(sheet_2d.frame_length) : sheet_2d.frame_length);
 	}
 }
 
 void TileAnimationParams::deSerialize(std::istream &is, u16 protocol_ver)
 {
-	type = (TileAnimationType) readU8(is);
-
-	if (type == TAT_VERTICAL_FRAMES) {
-		vertical_frames.aspect_w = readU16(is);
-		vertical_frames.aspect_h = readU16(is);
-		vertical_frames.length = readF32(is);
-	} else if (type == TAT_SHEET_2D) {
-		sheet_2d.frames_w = readU8(is);
-		sheet_2d.frames_h = readU8(is);
-		sheet_2d.frame_length = readF32(is);
+	type = static_cast<TileAnimationType>(readU8(is));
+	switch(type) {
+		case TAT_NONE:
+			break;
+		case TAT_VERTICAL_FRAMES:
+			vertical_frames.aspect_w = readU16(is);
+			vertical_frames.aspect_h = readU16(is);
+			vertical_frames.length = readF32(is);
+			break;
+		case TAT_SHEET_2D:
+			sheet_2d.frames_w = readU8(is);
+			sheet_2d.frames_h = readU8(is);
+			sheet_2d.frame_length = readF32(is);
+			break;
+		default:
+			type = TAT_NONE;
+			break;
 	}
 }
 
diff --git a/src/tileanimation.h b/src/tileanimation.h
index 45b91655e..db258e240 100644
--- a/src/tileanimation.h
+++ b/src/tileanimation.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include "irrlichttypes_bloated.h"
 
-enum TileAnimationType
+enum TileAnimationType : u8
 {
 	TAT_NONE = 0,
 	TAT_VERTICAL_FRAMES = 1,
@@ -31,7 +31,7 @@ enum TileAnimationType
 
 struct TileAnimationParams
 {
-	enum TileAnimationType type;
+	enum TileAnimationType type = TileAnimationType::TAT_NONE;
 	union
 	{
 		// struct {
diff --git a/src/tool.cpp b/src/tool.cpp
index 184aae77e..5805c0f47 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -29,8 +29,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "convert_json.h"
 #include "util/serialize.h"
 #include "util/numeric.h"
+#include "util/hex.h"
+#include "common/c_content.h"
 #include <json/json.h>
 
+
 void ToolGroupCap::toJson(Json::Value &object) const
 {
 	object["maxlevel"] = maxlevel;
@@ -204,6 +207,127 @@ void ToolCapabilities::msgpack_unpack(msgpack::object o)
 	packet[TOOLCAP_DAMAGEGROUPS].convert(damageGroups);
 }
 
+void WearBarParams::serialize(std::ostream &os) const
+{
+	writeU8(os, 1); // Version for future-proofing
+	writeU8(os, blend);
+	writeU16(os, colorStops.size());
+	for (const std::pair<f32, video::SColor> item : colorStops) {
+		writeF32(os, item.first);
+		writeARGB8(os, item.second);
+	}
+}
+
+WearBarParams WearBarParams::deserialize(std::istream &is)
+{
+	u8 version = readU8(is);
+	if (version > 1)
+		throw SerializationError("unsupported WearBarParams version");
+
+	auto blend = static_cast<WearBarParams::BlendMode>(readU8(is));
+	if (blend >= BlendMode_END)
+		throw SerializationError("invalid blend mode");
+	u16 count = readU16(is);
+	if (count == 0)
+		throw SerializationError("no stops");
+	std::map<f32, video::SColor> colorStops;
+	for (u16 i = 0; i < count; i++) {
+		f32 key = readF32(is);
+		if (key < 0 || key > 1)
+			throw SerializationError("key out of range");
+		video::SColor color = readARGB8(is);
+		colorStops.emplace(key, color);
+	}
+	return WearBarParams(colorStops, blend);
+}
+
+void WearBarParams::serializeJson(std::ostream &os) const
+{
+	Json::Value root;
+	Json::Value color_stops;
+	for (const std::pair<f32, video::SColor> item : colorStops) {
+		color_stops[ftos(item.first)] = encodeHexColorString(item.second);
+	}
+	root["color_stops"] = color_stops;
+	root["blend"] = WearBarParams::es_BlendMode[blend].str;
+
+	fastWriteJson(root, os);
+}
+
+std::optional<WearBarParams> WearBarParams::deserializeJson(std::istream &is)
+{
+	Json::Value root;
+	is >> root;
+	if (!root.isObject() || !root["color_stops"].isObject() || !root["blend"].isString())
+		return std::nullopt;
+
+	int blendInt;
+	WearBarParams::BlendMode blend;
+	if (string_to_enum(WearBarParams::es_BlendMode, blendInt, root["blend"].asString()))
+		blend = static_cast<WearBarParams::BlendMode>(blendInt);
+	else
+		return std::nullopt;
+
+	const Json::Value &color_stops_object = root["color_stops"];
+	std::map<f32, video::SColor> colorStops;
+	for (const std::string &key : color_stops_object.getMemberNames()) {
+		f32 stop = stof(key);
+		if (stop < 0 || stop > 1)
+			return std::nullopt;
+		const Json::Value &value = color_stops_object[key];
+		if (value.isString()) {
+			video::SColor color;
+			parseColorString(value.asString(), color, false);
+			colorStops.emplace(stop, color);
+		}
+	}
+	if (colorStops.empty())
+		return std::nullopt;
+	return WearBarParams(colorStops, blend);
+}
+
+video::SColor WearBarParams::getWearBarColor(f32 durabilityPercent) {
+	if (colorStops.empty())
+		return video::SColor();
+
+	/*
+	 * Strategy:
+	 * Find upper bound of durabilityPercent
+	 *
+	 * if it == stops.end() -> return last color in the map
+	 * if it == stops.begin() -> return first color in the map
+	 *
+	 * else:
+	 * 	lower_bound = it - 1
+	 * 	interpolate/do constant
+	 */
+	auto upper = colorStops.upper_bound(durabilityPercent);
+
+	if (upper == colorStops.end()) // durability is >= the highest defined color stop
+		return std::prev(colorStops.end())->second; // return last element of the map
+
+	if (upper == colorStops.begin()) // durability is <= the lowest defined color stop
+		return upper->second;
+
+	auto lower = std::prev(upper);
+	f32 lower_bound = lower->first;
+	video::SColor lower_color = lower->second;
+	f32 upper_bound = upper->first;
+	video::SColor upper_color = upper->second;
+
+	f32 progress = (durabilityPercent - lower_bound) / (upper_bound - lower_bound);
+
+	switch (blend) {
+		case BLEND_MODE_CONSTANT:
+			return lower_color;
+		case BLEND_MODE_LINEAR:
+			return upper_color.getInterpolated(lower_color, progress);
+		case BlendMode_END:
+			throw std::logic_error("dummy value");
+	}
+	throw std::logic_error("invalid blend value");
+}
+
 u32 calculateResultWear(const u32 uses, const u16 initial_wear)
 {
 	if (uses == 0) {
@@ -299,11 +423,11 @@ DigParams getDigParams(const ItemGroupList &groups,
 			continue;
 
 		const std::string &groupname = groupcap.first;
-		float time = 0;
 		int rating = itemgroup_get(groups, groupname);
-		bool time_exists = cap.getTime(rating, &time);
-		if (!time_exists)
+		const auto time_o = cap.getTime(rating);
+		if (!time_o.has_value())
 			continue;
+		float time = *time_o;
 
 		if (leveldiff > 1)
 			time /= leveldiff;
@@ -313,8 +437,7 @@ DigParams getDigParams(const ItemGroupList &groups,
 			// The actual number of uses increases
 			// exponentially with leveldiff.
 			// If the levels are equal, real_uses equals cap.uses.
-			u32 real_uses = cap.uses * pow(3.0, leveldiff);
-			real_uses = MYMIN(real_uses, U16_MAX);
+			const u32 real_uses = std::min<f64>(cap.uses * pow(3.0, leveldiff), U16_MAX);
 			result_wear = calculateResultWear(real_uses, initial_wear);
 			result_main_group = groupname;
 		}
@@ -380,7 +503,7 @@ PunchDamageResult getPunchDamage(
 	{
 		HitParams hitparams = getHitParams(armor_groups, toolcap,
 				time_from_last_punch,
-				punchitem->wear);
+				punchitem ? punchitem->wear : 0);
 		result.did_punch = true;
 		result.wear = hitparams.wear;
 		result.damage = hitparams.hp;
@@ -389,10 +512,16 @@ PunchDamageResult getPunchDamage(
 	return result;
 }
 
-f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand)
+f32 getToolRange(const ItemStack &wielded_item, const ItemStack &hand_item,
+		const IItemDefManager *itemdef_manager)
 {
-	float max_d = def_selected.range;
-	float max_d_hand = def_hand.range;
+	const std::string &wielded_meta_range = wielded_item.metadata.getString("range");
+	const std::string &hand_meta_range = hand_item.metadata.getString("range");
+
+	f32 max_d = wielded_meta_range.empty() ? wielded_item.getDefinition(itemdef_manager).range :
+			stof(wielded_meta_range);
+	f32 max_d_hand = hand_meta_range.empty() ? hand_item.getDefinition(itemdef_manager).range :
+			stof(hand_meta_range);
 
 	if (max_d < 0 && max_d_hand >= 0)
 		max_d = max_d_hand;
diff --git a/src/tool.h b/src/tool.h
index 4be631086..ce797f709 100644
--- a/src/tool.h
+++ b/src/tool.h
@@ -23,12 +23,19 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "irrlichttypes.h"
-#include <string>
-#include <iostream>
 #include "itemgroup.h"
 #include "json-forwards.h"
+#include "common/c_types.h"
+#include <SColor.h>
+
+#include <string>
+#include <iostream>
+#include <map>
+#include <unordered_map>
+#include <optional>
 
 struct ItemDefinition;
+class IItemDefManager;
 
 #include "network/connection.h"
 #include "util/msgpack_serialize.h"
@@ -47,15 +54,11 @@ struct ToolGroupCap
 
 	ToolGroupCap() = default;
 
-	bool getTime(int rating, float *time) const
-	{
-		std::unordered_map<int, float>::const_iterator i = times.find(rating);
-		if (i == times.end()) {
-			*time = 0;
-			return false;
-		}
-		*time = i->second;
-		return true;
+	std::optional<float> getTime(int rating) const {
+		auto i = times.find(rating);
+		if (i == times.end())
+			return std::nullopt;
+		return i->second;
 	}
 
 	template<typename Packer>
@@ -121,6 +124,37 @@ struct ToolCapabilities
 	void deserializeJson(std::istream &is);
 };
 
+struct WearBarParams
+{
+	std::map<f32, video::SColor> colorStops;
+	enum BlendMode : u8 {
+	    BLEND_MODE_CONSTANT,
+	    BLEND_MODE_LINEAR,
+	    BlendMode_END // Dummy for validity check
+	};
+	constexpr const static EnumString es_BlendMode[3] = {
+		{WearBarParams::BLEND_MODE_CONSTANT, "constant"},
+		{WearBarParams::BLEND_MODE_LINEAR, "linear"},
+		{0, nullptr}
+	};
+	BlendMode blend;
+
+	WearBarParams(const std::map<f32, video::SColor> &colorStops, BlendMode blend):
+		colorStops(colorStops),
+		blend(blend)
+	{}
+
+	WearBarParams(const video::SColor color):
+		WearBarParams({{0.0f, color}}, WearBarParams::BLEND_MODE_CONSTANT)
+	{};
+
+	void serialize(std::ostream &os) const;
+	static WearBarParams deserialize(std::istream &is);
+	void serializeJson(std::ostream &os) const;
+	static std::optional<WearBarParams> deserializeJson(std::istream &is);
+	video::SColor getWearBarColor(f32 durabilityPercent);
+};
+
 struct DigParams
 {
 	bool diggable;
@@ -182,4 +216,5 @@ PunchDamageResult getPunchDamage(
 );
 
 u32 calculateResultWear(const u32 uses, const u16 initial_wear);
-f32 getToolRange(const ItemDefinition &def_selected, const ItemDefinition &def_hand);
+f32 getToolRange(const ItemStack &wielded_item, const ItemStack &hand_item,
+		const IItemDefManager *itemdef_manager);
diff --git a/src/translation.cpp b/src/translation.cpp
index eabd0ec0a..5d5491e56 100644
--- a/src/translation.cpp
+++ b/src/translation.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifndef SERVER
 // Client translations
-Translations client_translations;
+static Translations client_translations;
 Translations *g_client_translations = &client_translations;
 #endif
 
@@ -36,24 +36,19 @@ void Translations::clear()
 }
 
 const std::wstring &Translations::getTranslation(
-		const std::wstring &textdomain, const std::wstring &s)
+		const std::wstring &textdomain, const std::wstring &s) const
 {
 	std::wstring key = textdomain + L"|" + s;
-	try {
-		return m_translations.at(key);
-	} catch (const std::out_of_range &) {
-		verbosestream << "Translations: can't find translation for string \""
-		              << wide_to_utf8(s) << "\" in textdomain \""
-		              << wide_to_utf8(textdomain) << "\"" << std::endl;
-		// Silence that warning in the future
-		m_translations[key] = s;
-		return s;
-	}
+	auto it = m_translations.find(key);
+	if (it != m_translations.end())
+		return it->second;
+	return s;
 }
 
 void Translations::loadTranslation(const std::string &data)
 {
 	std::istringstream is(data);
+	std::string textdomain_narrow;
 	std::wstring textdomain;
 	std::string line;
 
@@ -70,7 +65,8 @@ void Translations::loadTranslation(const std::string &data)
 						<< "\"" << std::endl;
 				continue;
 			}
-			textdomain = utf8_to_wide(trim(parts[1]));
+			textdomain_narrow = trim(parts[1]);
+			textdomain = utf8_to_wide(textdomain_narrow);
 		}
 		if (line.empty() || line[0] == '#')
 			continue;
@@ -116,7 +112,7 @@ void Translations::loadTranslation(const std::string &data)
 
 		if (i == wline.length()) {
 			errorstream << "Malformed translation line \"" << line << "\""
-			            << std::endl;
+			            << " in text domain " << textdomain_narrow << std::endl;
 			continue;
 		}
 		i++;
@@ -153,10 +149,7 @@ void Translations::loadTranslation(const std::string &data)
 		if (!oword2.empty()) {
 			std::wstring translation_index = textdomain + L"|";
 			translation_index.append(oword1);
-			m_translations[translation_index] = oword2;
-		} else {
-			infostream << "Ignoring empty translation for \""
-				<< wide_to_utf8(oword1) << "\"" << std::endl;
+			m_translations.emplace(std::move(translation_index), std::move(oword2));
 		}
 	}
 }
diff --git a/src/translation.h b/src/translation.h
index e3f5b21ea..d7ed15505 100644
--- a/src/translation.h
+++ b/src/translation.h
@@ -32,8 +32,8 @@ class Translations
 public:
 	void loadTranslation(const std::string &data);
 	void clear();
-	const std::wstring &getTranslation(
-			const std::wstring &textdomain, const std::wstring &s);
+	const std::wstring &getTranslation(const std::wstring &textdomain,
+		const std::wstring &s) const;
 
 private:
 	std::unordered_map<std::wstring, std::wstring> m_translations;
diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index 34007ffa2..a99da39e6 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -11,11 +11,13 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_compression.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_connection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_craft.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/test_filepath.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_datastructures.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_filesys.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_inventory.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_irrptr.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_lua.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_map.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_mapblock.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_map_settings_manager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_mapnode.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_modchannels.cpp
@@ -27,6 +29,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_objdef.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_profiler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_random.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_sao.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_schematic.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_serialization.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_serveractiveobjectmgr.cpp
@@ -43,18 +46,12 @@ set (UNITTEST_SRCS
 	PARENT_SCOPE)
 
 set (UNITTEST_CLIENT_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/mesh_compare.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_clientactiveobjectmgr.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_content_mapblock.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_eventmanager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_gameui.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_mesh_compare.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_keycode.cpp
 	PARENT_SCOPE)
 
-set (TEST_WORLDDIR ${CMAKE_CURRENT_SOURCE_DIR}/test_world)
-set (TEST_SUBGAME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../games/devtest)
-set (TEST_MOD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/test_mod)
-set (HELPERS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/helpers)
-
-configure_file(
-	"${CMAKE_CURRENT_SOURCE_DIR}/test_config.h.in"
-	"${PROJECT_BINARY_DIR}/test_config.h"
-)
diff --git a/src/unittest/helpers/helper_moveaction.lua b/src/unittest/helpers/helper_moveaction.lua
deleted file mode 100644
index 8cffe01b8..000000000
--- a/src/unittest/helpers/helper_moveaction.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-minetest.register_allow_player_inventory_action(function(player, action, inventory, info)
-	if info.stack:get_name() == "default:water" then
-		return 0
-	end
-
-	if info.stack:get_name() == "default:lava" then
-		return 5
-	end
-
-	return info.stack:get_count()
-end)
diff --git a/src/unittest/mesh_compare.cpp b/src/unittest/mesh_compare.cpp
new file mode 100644
index 000000000..6e21d377b
--- /dev/null
+++ b/src/unittest/mesh_compare.cpp
@@ -0,0 +1,103 @@
+/*
+Minetest
+Copyright (C) 2023 Vitaliy Lobachevskiy
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "mesh_compare.h"
+#include <algorithm>
+#include <map>
+#include <stdexcept>
+
+static std::vector<Triangle> expandMesh(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices)
+{
+	const int n_indices = indices.size();
+	const int n_triangles = n_indices / 3;
+	if (n_indices % 3)
+		throw std::invalid_argument("got fractional number of triangles");
+
+	std::vector<Triangle> ret(n_triangles);
+	for (int i_triangle = 0; i_triangle < n_triangles; i_triangle++) {
+		ret.at(i_triangle) = {
+			vertices.at(indices.at(3 * i_triangle)),
+			vertices.at(indices.at(3 * i_triangle + 1)),
+			vertices.at(indices.at(3 * i_triangle + 2)),
+		};
+	}
+
+	return ret;
+}
+
+/// Sorts triangle vertices, keeping winding order.
+static Triangle sortTriangle(Triangle t)
+{
+	if (t[0] < t[1] && t[0] < t[2]) return {t[0], t[1], t[2]};
+	if (t[1] < t[2] && t[1] < t[0]) return {t[1], t[2], t[0]};
+	if (t[2] < t[0] && t[2] < t[1]) return {t[2], t[0], t[1]};
+	throw std::invalid_argument("got bad triangle");
+}
+
+static std::vector<Triangle> canonicalizeMesh(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices)
+{
+	std::vector<Triangle> mesh = expandMesh(vertices, indices);
+	for (auto &triangle: mesh)
+		triangle = sortTriangle(triangle);
+	std::sort(std::begin(mesh), std::end(mesh));
+	return mesh;
+}
+
+bool checkMeshEqual(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices, const std::vector<Triangle> &expected)
+{
+	auto actual = canonicalizeMesh(vertices, indices);
+	return actual == expected;
+}
+
+bool checkMeshEqual(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices, const std::vector<Quad> &expected)
+{
+	using QuadRefCount = std::array<int, 4>;
+	struct QuadRef {
+		unsigned quad_id;
+		int quad_part;
+	};
+
+	std::vector<QuadRefCount> refs(expected.size());
+	std::map<Triangle, QuadRef> tris;
+	for (unsigned k = 0; k < expected.size(); k++) {
+		auto &&quad = expected[k];
+		// There are 2 ways to split a quad into two triangles. So for each quad,
+		// the mesh must contain either triangles 0 and 1, or triangles 2 and 3,
+		// from the following list. No more, no less.
+		tris.insert({sortTriangle({quad[0], quad[1], quad[2]}), {k, 0}});
+		tris.insert({sortTriangle({quad[0], quad[2], quad[3]}), {k, 1}});
+		tris.insert({sortTriangle({quad[0], quad[1], quad[3]}), {k, 2}});
+		tris.insert({sortTriangle({quad[1], quad[2], quad[3]}), {k, 3}});
+	}
+
+	auto actual = canonicalizeMesh(vertices, indices);
+	for (auto &&tri: actual) {
+		auto itri = tris.find(tri);
+		if (itri == tris.end())
+			return false;
+		refs[itri->second.quad_id][itri->second.quad_part] += 1;
+	}
+
+	for (unsigned k = 0; k < expected.size(); k++) {
+		if (refs[k] != QuadRefCount{1, 1, 0, 0} && refs[k] != QuadRefCount{0, 0, 1, 1})
+			return false;
+	}
+
+	return true;
+}
diff --git a/src/unittest/mesh_compare.h b/src/unittest/mesh_compare.h
new file mode 100644
index 000000000..3f0d53d67
--- /dev/null
+++ b/src/unittest/mesh_compare.h
@@ -0,0 +1,47 @@
+/*
+Minetest
+Copyright (C) 2023 Vitaliy Lobachevskiy
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+#include <array>
+#include <vector>
+#include <irrlichttypes.h>
+#include <S3DVertex.h>
+
+/// Represents a triangle as three vertices.
+/// “Smallest” (according to <) vertex is expected to be first, others should follow in the counter-clockwise order.
+using Triangle = std::array<video::S3DVertex, 3>;
+
+/// Represents a quad as four vertices.
+/// Vertices should be in the counter-clockwise order.
+using Quad = std::array<video::S3DVertex, 4>;
+
+/// Compare two meshes for equality.
+/// @param vertices Vertices of the first mesh. Order doesn’t matter.
+/// @param indices Indices of the first mesh. Triangle order doesn’t matter. Vertex order in a triangle only matters for winding.
+/// @param expected The second mesh, in an expanded form. Must be sorted.
+/// @returns Whether the two meshes are equal.
+[[nodiscard]] bool checkMeshEqual(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices, const std::vector<Triangle> &expected);
+
+/// Compare two meshes for equality.
+/// @param vertices Vertices of the first mesh. Order doesn’t matter.
+/// @param indices Indices of the first mesh. Triangle order doesn’t matter. Vertex order in a triangle only matters for winding.
+/// @param expected The second mesh, in a quad form.
+/// @returns Whether the two meshes are equal.
+/// @note There are two ways to split a quad into 2 triangles; either is allowed.
+[[nodiscard]] bool checkMeshEqual(const std::vector<video::S3DVertex> &vertices, const std::vector<u16> &indices, const std::vector<Quad> &expected);
diff --git a/src/unittest/mock_inventorymanager.h b/src/unittest/mock_inventorymanager.h
index dc75490de..bdf75296a 100644
--- a/src/unittest/mock_inventorymanager.h
+++ b/src/unittest/mock_inventorymanager.h
@@ -17,11 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <gamedef.h>
-#include <inventory.h>
-#include <inventorymanager.h>
+#pragma once
 
-class MockInventoryManager : public InventoryManager
+#include "gamedef.h"
+#include "inventory.h"
+#include "server/serverinventorymgr.h"
+
+class ServerEnvironment;
+
+class MockInventoryManager : public ServerInventoryManager
 {
 public:
 	MockInventoryManager(IGameDef *gamedef) :
@@ -29,14 +33,17 @@ public:
 		p2(gamedef->getItemDefManager())
 	{};
 
-	virtual Inventory* getInventory(const InventoryLocation &loc){
+	Inventory *getInventory(const InventoryLocation &loc) override
+	{
 		if (loc.type == InventoryLocation::PLAYER && loc.name == "p1")
 			return &p1;
 		if (loc.type == InventoryLocation::PLAYER && loc.name == "p2")
 			return &p2;
 		return nullptr;
 	}
+	void setInventoryModified(const InventoryLocation &loc) override {}
 
 	Inventory p1;
 	Inventory p2;
+
 };
diff --git a/src/unittest/mock_server.h b/src/unittest/mock_server.h
index d39ffd5b5..6ac86b471 100644
--- a/src/unittest/mock_server.h
+++ b/src/unittest/mock_server.h
@@ -17,15 +17,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <server.h>
+#pragma once
+
+#include "server.h"
+#include "server/mods.h"
+#include "scripting_server.h"
 
 class MockServer : public Server
 {
 public:
-	MockServer() : Server(TEST_WORLDDIR, SubgameSpec("fakespec", "fakespec"), true,
-		Address(), true, nullptr)
+	/* Set `path_world` to a real existing folder if you plan to initialize scripting! */
+	MockServer(const std::string &path_world = "fakepath") :
+		Server(path_world, SubgameSpec("fakespec", "fakespec"), true,
+			Address(), true, nullptr
+		)
 	{}
 
+	/*
+	 * Use this in unit tests to create scripting.
+	 * Note that you still need to call script->loadBuiltin() and don't forget
+	 * a try-catch for `ModError`.
+	 */
+	void createScripting() {
+		m_script = std::make_unique<ServerScripting>(this);
+		m_modmgr = std::make_unique<ServerModManager>(nullptr);
+	}
+
+	void start() = delete;
+	void stop() = delete;
+
 private:
 	void SendChatMessage(session_t peer_id, const ChatMessage &message) {}
 };
diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
index b17aca0bf..33f8dcbb5 100644
--- a/src/unittest/test.cpp
+++ b/src/unittest/test.cpp
@@ -17,15 +17,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "catch.h"
+
 #include "test.h"
 
-#include "client/sound.h"
 #include "nodedef.h"
 #include "itemdef.h"
 #include "dummygamedef.h"
 #include "modchannels.h"
 #include "util/numeric.h"
 #include "porting.h"
+#include "debug.h"
+
+#include <iostream>
+
+#include "catch.h"
 
 content_t t_CONTENT_STONE;
 content_t t_CONTENT_GRASS;
@@ -234,6 +240,21 @@ bool run_tests()
 		num_total_tests_run += testmod->num_tests_run;
 	}
 
+	rawstream << "Catch test results: " << std::endl;
+	Catch::Session session{};
+	auto config = session.configData();
+	config.skipBenchmarks = true;
+	config.allowZeroTests = true;
+	session.useConfigData(config);
+	auto exit_code = session.run();
+	// We count all the Catch tests as one test for Minetest's own logging
+	// because we don't have a way to tell how many individual tests Catch ran.
+	++num_total_tests_run;
+	if (exit_code != 0) {
+		++num_modules_failed;
+		++num_total_tests_failed;
+	}
+
 	u64 tdiff = porting::getTimeMs() - t1;
 
 	g_logger.setLevelSilenced(LL_ERROR, false);
@@ -269,8 +290,11 @@ bool run_tests(const std::string &module_name)
 
 	auto testmod = findTestModule(module_name);
 	if (!testmod) {
-		errorstream << "Test module not found: " << module_name << std::endl;
-		return 1;
+		rawstream << "Did not find module, searching Catch tests: " << module_name << std::endl;
+		Catch::Session session;
+		session.configData().testsOrTags.push_back(module_name);
+		auto catch_test_failures = session.run();
+		return catch_test_failures == 0;
 	}
 
 	g_logger.setLevelSilenced(LL_ERROR, true);
@@ -325,13 +349,8 @@ std::string TestBase::getTestTempDirectory()
 	if (!m_test_dir.empty())
 		return m_test_dir;
 
-	char buf[32];
-	porting::mt_snprintf(buf, sizeof(buf), "%08X", myrand());
-
-	m_test_dir = fs::TempPath() + DIR_DELIM "mttest_" + buf;
-	if (!fs::CreateDir(m_test_dir))
-		throw TestFailedException();
-
+	m_test_dir = fs::CreateTempDir();
+	UASSERT(!m_test_dir.empty());
 	return m_test_dir;
 }
 
@@ -343,6 +362,29 @@ std::string TestBase::getTestTempFile()
 	return getTestTempDirectory() + DIR_DELIM + buf + ".tmp";
 }
 
+void TestBase::runTest(const char *name, std::function<void()> &&test)
+{
+	u64 t1 = porting::getTimeMs();
+	try {
+		test();
+		rawstream << "[PASS] ";
+	} catch (TestFailedException &e) {
+		rawstream << "Test assertion failed: " << e.message << std::endl;
+		rawstream << "    at " << e.file << ":" << e.line << std::endl;
+		rawstream << "[FAIL] ";
+		num_tests_failed++;
+	}
+#if CATCH_UNHANDLED_EXCEPTIONS == 1
+	catch (std::exception &e) {
+		rawstream << "Caught unhandled exception: " << e.what() << std::endl;
+		rawstream << "[FAIL] ";
+		num_tests_failed++;
+	}
+#endif
+	num_tests_run++;
+	u64 tdiff = porting::getTimeMs() - t1;
+	rawstream << name << " - " << tdiff << "ms" << std::endl;
+}
 
 /*
 	NOTE: These tests became non-working then NodeContainer was removed.
diff --git a/src/unittest/test.h b/src/unittest/test.h
index 8782bc92b..881189adf 100644
--- a/src/unittest/test.h
+++ b/src/unittest/test.h
@@ -19,7 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include <functional>
 #include <exception>
+#include <sstream>
 #include <vector>
 
 #include "irrlichttypes_extrabloated.h"
@@ -27,63 +29,48 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "mapnode.h"
 
-class TestFailedException : public std::exception {
+class TestFailedException { // don’t derive from std::exception to avoid accidental catch
+public:
+	TestFailedException(std::string in_message, const char *in_file, int in_line)
+		: message(std::move(in_message))
+		, file(fs::GetFilenameFromPath(in_file))
+		, line(in_line)
+	{}
+
+	const std::string message;
+	const std::string file;
+	const int line;
 };
 
 // Runs a unit test and reports results
-#define TEST(fxn, ...) {                                                      \
-	u64 t1 = porting::getTimeMs();                                            \
-	try {                                                                     \
-		fxn(__VA_ARGS__);                                                     \
-		rawstream << "[PASS] ";                                               \
-	} catch (TestFailedException &e) {                                        \
-		rawstream << "[FAIL] ";                                               \
-		num_tests_failed++;                                                   \
-	} catch (std::exception &e) {                                             \
-		rawstream << "Caught unhandled exception: " << e.what() << std::endl; \
-		rawstream << "[FAIL] ";                                               \
-		num_tests_failed++;                                                   \
-	}                                                                         \
-	num_tests_run++;                                                          \
-	u64 tdiff = porting::getTimeMs() - t1;                                    \
-	rawstream << #fxn << " - " << tdiff << "ms" << std::endl;                 \
-}
+#define TEST(fxn, ...) runTest(#fxn, [&] () { fxn(__VA_ARGS__); });
 
 // Asserts the specified condition is true, or fails the current unit test
-#define UASSERT(x)                                              \
-	if (!(x)) {                                                 \
-		rawstream << "Test assertion failed: " #x << std::endl  \
-			<< "    at " << fs::GetFilenameFromPath(__FILE__)   \
-			<< ":" << __LINE__ << std::endl;                    \
-		throw TestFailedException();                            \
+#define UASSERT(x) \
+	if (!(x)) { \
+		throw TestFailedException(#x, __FILE__, __LINE__); \
 	}
 
 // Asserts the specified condition is true, or fails the current unit test
 // and prints the format specifier fmt
-#define UTEST(x, fmt, ...)                                               \
-	if (!(x)) {                                                          \
-		char utest_buf[1024];                                            \
-		snprintf(utest_buf, sizeof(utest_buf), fmt, __VA_ARGS__);        \
-		rawstream << "Test assertion failed: " << utest_buf << std::endl \
-			<< "    at " << fs::GetFilenameFromPath(__FILE__)            \
-			<< ":" << __LINE__ << std::endl;                             \
-		throw TestFailedException();                                     \
+#define UTEST(x, fmt, ...) \
+	if (!(x)) { \
+		char utest_buf[1024]; \
+		snprintf(utest_buf, sizeof(utest_buf), fmt, __VA_ARGS__); \
+		throw TestFailedException(utest_buf, __FILE__, __LINE__); \
 	}
 
 // Asserts the comparison specified by CMP is true, or fails the current unit test
-#define UASSERTCMP(T, CMP, actual, expected) {                            \
-	T a = (actual);                                                       \
-	T e = (expected);                                                     \
-	if (!(a CMP e)) {                                                     \
-		rawstream                                                         \
-			<< "Test assertion failed: " << #actual << " " << #CMP << " " \
-			<< #expected << std::endl                                     \
-			<< "    at " << fs::GetFilenameFromPath(__FILE__) << ":"      \
-			<< __LINE__ << std::endl                                      \
-			<< "    actual  : " << a << std::endl << "    expected: "     \
-			<< e << std::endl;                                            \
-		throw TestFailedException();                                      \
-	}                                                                     \
+#define UASSERTCMP(T, CMP, actual, expected) { \
+	T a = (actual); \
+	T e = (expected); \
+	if (!(a CMP e)) { \
+		std::ostringstream message; \
+		message << #actual " " #CMP " " #expected; \
+		message << std::endl << "    actual  : " << a; \
+		message << std::endl << "    expected: " << e; \
+		throw TestFailedException(message.str(), __FILE__, __LINE__); \
+	} \
 }
 
 #define UASSERTEQ(T, actual, expected) UASSERTCMP(T, ==, actual, expected)
@@ -113,6 +100,8 @@ public:
 	u32 num_tests_failed;
 	u32 num_tests_run;
 
+	void runTest(const char *name, std::function<void()> &&test);
+
 private:
 	std::string m_test_dir;
 };
diff --git a/src/unittest/test_address.cpp b/src/unittest/test_address.cpp
index f46135577..dd77d0264 100644
--- a/src/unittest/test_address.cpp
+++ b/src/unittest/test_address.cpp
@@ -32,14 +32,36 @@ public:
 
 	void runTests(IGameDef *gamedef);
 
+	void testBasic();
 	void testIsLocalhost();
+	void testResolve();
 };
 
 static TestAddress g_test_instance;
 
 void TestAddress::runTests(IGameDef *gamedef)
 {
+	TEST(testBasic);
 	TEST(testIsLocalhost);
+	TEST(testResolve);
+}
+
+void TestAddress::testBasic()
+{
+	Address tmp;
+
+	UASSERT(!tmp.isValid());
+	UASSERTEQ(int, tmp.getFamily(), 0);
+
+	tmp = Address(static_cast<u32>(0), 0);
+	UASSERT(tmp.isValid());
+	UASSERTEQ(int, tmp.getFamily(), AF_INET);
+	UASSERT(tmp.isAny());
+
+	tmp = Address(static_cast<IPv6AddressBytes*>(nullptr), 0);
+	UASSERT(tmp.isValid());
+	UASSERTEQ(int, tmp.getFamily(), AF_INET6);
+	UASSERT(tmp.isAny());
 }
 
 void TestAddress::testIsLocalhost()
@@ -65,3 +87,33 @@ void TestAddress::testIsLocalhost()
 	memcpy(ipv6Bytes->bytes, &ipv6RawAddr[0], 16);
 	UASSERT(!Address(ipv6Bytes.get(), 0).isLocalhost())
 }
+
+void TestAddress::testResolve()
+{
+	// Empty test
+	{
+		Address tmp(1, 2, 3, 4, 5);
+		tmp.Resolve("");
+
+		UASSERT(tmp.isValid());
+		UASSERT(tmp.isAny());
+	}
+
+	// Localhost test
+	Address result, fallback;
+	result.Resolve("localhost", &fallback);
+
+	UASSERT(result.isValid());
+	UASSERT(result.isLocalhost());
+
+	if (fallback.isValid()) {
+		UASSERT(fallback.isLocalhost());
+
+		// the result should be ::1 and 127.0.0.1 so the fallback addr should be
+		// of a different family
+		UASSERTCMP(int, !=, result.getFamily(), fallback.getFamily());
+	} else if (g_settings->getBool("enable_ipv6")) {
+		warningstream << "Couldn't verify Address::Resolve fallback (no IPv6?)"
+			<< std::endl;
+	}
+}
diff --git a/src/unittest/test_authdatabase.cpp b/src/unittest/test_authdatabase.cpp
index 1e1744d40..856f04437 100644
--- a/src/unittest/test_authdatabase.cpp
+++ b/src/unittest/test_authdatabase.cpp
@@ -115,7 +115,7 @@ static TestAuthDatabase g_test_instance;
 void TestAuthDatabase::runTests(IGameDef *gamedef)
 {
 	// fixed directory, for persistence
-	thread_local const std::string test_dir = getTestTempDirectory();
+	const std::string test_dir = getTestTempDirectory();
 
 	// Each set of tests is run twice for each database type:
 	// one where we reuse the same AuthDatabase object (to test local caching),
diff --git a/src/unittest/test_ban.cpp b/src/unittest/test_ban.cpp
index bab2b9ee8..58132e20a 100644
--- a/src/unittest/test_ban.cpp
+++ b/src/unittest/test_ban.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "test.h"
 
-#include "ban.h"
+#include "server/ban.h"
 
 class TestBan : public TestBase
 {
@@ -37,6 +37,7 @@ private:
 	void testGetBanName();
 	void testGetBanDescription();
 
+	std::string m_testbm, m_testbm2;
 	void reinitTestEnv();
 };
 
@@ -61,32 +62,31 @@ void TestBan::runTests(IGameDef *gamedef)
 
 	reinitTestEnv();
 	TEST(testGetBanDescription);
-
-	// Delete leftover files
-	reinitTestEnv();
 }
 
-// This module is stateful due to disk writes, add helper to remove files
 void TestBan::reinitTestEnv()
 {
-	fs::DeleteSingleFileOrEmptyDirectory("testbm.txt");
-	fs::DeleteSingleFileOrEmptyDirectory("testbm2.txt");
+	m_testbm = getTestTempDirectory().append(DIR_DELIM "testbm.txt");
+	m_testbm2 = getTestTempDirectory().append(DIR_DELIM "testbm2.txt");
+
+	fs::DeleteSingleFileOrEmptyDirectory(m_testbm);
+	fs::DeleteSingleFileOrEmptyDirectory(m_testbm2);
 }
 
 void TestBan::testCreate()
 {
 	// test save on object removal
 	{
-		BanManager bm("testbm.txt");
+		BanManager bm(m_testbm);
 	}
 
-	UASSERT(std::ifstream("testbm.txt", std::ios::binary).is_open());
+	UASSERT(fs::IsFile(m_testbm));
 
 	// test manual save
 	{
-		BanManager bm("testbm2.txt");
+		BanManager bm(m_testbm2);
 		bm.save();
-		UASSERT(std::ifstream("testbm2.txt", std::ios::binary).is_open());
+		UASSERT(fs::IsFile(m_testbm2));
 	}
 }
 
@@ -95,7 +95,7 @@ void TestBan::testAdd()
 	std::string bm_test1_entry = "192.168.0.246";
 	std::string bm_test1_result = "test_username";
 
-	BanManager bm("testbm.txt");
+	BanManager bm(m_testbm);
 	bm.add(bm_test1_entry, bm_test1_result);
 
 	UASSERT(bm.getBanName(bm_test1_entry) == bm_test1_result);
@@ -109,7 +109,7 @@ void TestBan::testRemove()
 	std::string bm_test2_entry = "192.168.0.250";
 	std::string bm_test2_result = "test_username7";
 
-	BanManager bm("testbm.txt");
+	BanManager bm(m_testbm);
 
 	// init data
 	bm.add(bm_test1_entry, bm_test1_result);
@@ -125,7 +125,7 @@ void TestBan::testRemove()
 
 void TestBan::testModificationFlag()
 {
-	BanManager bm("testbm.txt");
+	BanManager bm(m_testbm);
 	bm.add("192.168.0.247", "test_username");
 	UASSERT(bm.isModified());
 
@@ -145,7 +145,7 @@ void TestBan::testGetBanName()
 	std::string bm_test1_entry = "192.168.0.247";
 	std::string bm_test1_result = "test_username";
 
-	BanManager bm("testbm.txt");
+	BanManager bm(m_testbm);
 	bm.add(bm_test1_entry, bm_test1_result);
 
 	// Test with valid entry
@@ -162,7 +162,7 @@ void TestBan::testGetBanDescription()
 
 	std::string bm_test1_result = "192.168.0.247|test_username";
 
-	BanManager bm("testbm.txt");
+	BanManager bm(m_testbm);
 	bm.add(bm_test1_entry, bm_test1_entry2);
 
 	UASSERT(bm.getBanDescription(bm_test1_entry) == bm_test1_result);
diff --git a/src/unittest/test_clientactiveobjectmgr.cpp b/src/unittest/test_clientactiveobjectmgr.cpp
index fc36c6669..0e208a819 100644
--- a/src/unittest/test_clientactiveobjectmgr.cpp
+++ b/src/unittest/test_clientactiveobjectmgr.cpp
@@ -17,12 +17,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "client/activeobjectmgr.h"
-#include <algorithm>
-#include <memory>
 #include "test.h"
 
-#include "profiler.h"
+#include "client/activeobjectmgr.h"
+
+#include "catch.h"
+
+#include <unordered_set>
+#include <utility>
 
 class TestClientActiveObject : public ClientActiveObject
 {
@@ -59,9 +61,6 @@ public:
 
 	void runTests(IGameDef *gamedef);
 
-	void testFreeID();
-	void testRegisterObject();
-	void testRemoveObject();
 	void testGetActiveSelectableObjects();
 };
 
@@ -69,75 +68,74 @@ static TestClientActiveObjectMgr g_test_instance;
 
 void TestClientActiveObjectMgr::runTests(IGameDef *gamedef)
 {
-	TEST(testFreeID);
-	TEST(testRegisterObject)
-	TEST(testRemoveObject)
 	TEST(testGetActiveSelectableObjects)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void TestClientActiveObjectMgr::testFreeID()
+static TestClientActiveObject* register_default_test_object(
+		client::ActiveObjectMgr &caomgr) {
+	auto test_obj = std::make_unique<TestClientActiveObject>();
+	auto result = test_obj.get();
+	REQUIRE(caomgr.registerObject(std::move(test_obj)));
+	return result;
+}
+
+TEST_CASE("test client active object manager")
 {
 	client::ActiveObjectMgr caomgr;
-	std::vector<u16> aoids;
+	auto tcao1 = register_default_test_object(caomgr);
 
-	u16 aoid = caomgr.getFreeId();
-	// Ensure it's not the same id
-	UASSERT(caomgr.getFreeId() != aoid);
-
-	aoids.push_back(aoid);
-
-	// Register basic objects, ensure we never found
-	for (u8 i = 0; i < UINT8_MAX; i++) {
-		// Register an object
-		auto tcao_u = std::make_unique<TestClientActiveObject>();
-		auto tcao = tcao_u.get();
-		caomgr.registerObject(std::move(tcao_u));
-		aoids.push_back(tcao->getId());
-
-		// Ensure next id is not in registered list
-		UASSERT(std::find(aoids.begin(), aoids.end(), caomgr.getFreeId()) ==
-				aoids.end());
+	SECTION("When we register many client objects, "
+			"then all the assigned IDs should be unique.")
+	{
+		// This should be enough rounds to be pretty confident
+		// there are no duplicates.
+		u16 n = 255;
+		std::unordered_set<u16> ids;
+		ids.insert(tcao1->getId());
+		for (u16 i = 0; i < n; ++i) {
+			auto other_tcao = register_default_test_object(caomgr);
+			ids.insert(other_tcao->getId());
+		}
+		// n added objects & tcao1
+		CHECK(n + 1 == static_cast<u16>(ids.size()));
 	}
 
-	caomgr.clear();
-}
+	SECTION("two registered objects")
+	{
+		auto tcao2 = register_default_test_object(caomgr);
+		auto tcao2_id = tcao2->getId();
 
-void TestClientActiveObjectMgr::testRegisterObject()
-{
-	client::ActiveObjectMgr caomgr;
-	auto tcao_u = std::make_shared<TestClientActiveObject>();
-	auto tcao = tcao_u.get();
-	UASSERT(caomgr.registerObject(std::move(tcao_u)));
+		auto obj1 = caomgr.getActiveObject(tcao1->getId());
+		REQUIRE(obj1 != nullptr);
 
-	u16 id = tcao->getId();
+		auto obj2 = caomgr.getActiveObject(tcao2_id);
+		REQUIRE(obj2 != nullptr);
 
-	auto tcaoToCompare = caomgr.getActiveObject(id).get();
-	UASSERT(tcaoToCompare->getId() == id);
-	UASSERT(tcaoToCompare == tcao);
+		SECTION("When we query an object by its ID, "
+				"then we should get back an object with that ID.")
+		{
+			CHECK(obj1->getId() == tcao1->getId());
+			CHECK(obj2->getId() == tcao2->getId());
+		}
 
-	tcao_u = std::make_shared<TestClientActiveObject>();
-	tcao = tcao_u.get();
-	UASSERT(caomgr.registerObject(std::move(tcao_u)));
-	UASSERT(caomgr.getActiveObject(tcao->getId()).get() == tcao);
-	UASSERT(caomgr.getActiveObject(tcao->getId()).get() != tcaoToCompare);
+		SECTION("When we register and query for an object, "
+				"its memory location should not have changed.")
+		{
+			CHECK(obj1.get() == tcao1);
+			CHECK(obj2.get() == tcao2);
+		}
+	}
 
-	caomgr.clear();
-}
-
-void TestClientActiveObjectMgr::testRemoveObject()
-{
-	client::ActiveObjectMgr caomgr;
-	auto tcao_u = std::make_unique<TestClientActiveObject>();
-	auto tcao = tcao_u.get();
-	UASSERT(caomgr.registerObject(std::move(tcao_u)));
-
-	u16 id = tcao->getId();
-	UASSERT(caomgr.getActiveObject(id) != nullptr)
-
-	caomgr.removeObject(tcao->getId());
-	UASSERT(caomgr.getActiveObject(id) == nullptr)
+	SECTION("Given an object has been removed, "
+			"when we query for it, "
+			"then we should get nullptr.")
+	{
+		auto id = tcao1->getId();
+		caomgr.removeObject(tcao1->getId()); // may invalidate tcao1
+		CHECK(caomgr.getActiveObject(id) == nullptr);
+	}
 
 	caomgr.clear();
 }
diff --git a/src/unittest/test_compression.cpp b/src/unittest/test_compression.cpp
index a96282f58..3ada3fa00 100644
--- a/src/unittest/test_compression.cpp
+++ b/src/unittest/test_compression.cpp
@@ -57,7 +57,7 @@ void TestCompression::runTests(IGameDef *gamedef)
 
 void TestCompression::testRLECompression()
 {
-	SharedBuffer<u8> fromdata(4);
+	Buffer<u8> fromdata(4);
 	fromdata[0]=1;
 	fromdata[1]=5;
 	fromdata[2]=5;
@@ -106,7 +106,7 @@ void TestCompression::testRLECompression()
 
 void TestCompression::testZlibCompression()
 {
-	SharedBuffer<u8> fromdata(4);
+	Buffer<u8> fromdata(4);
 	fromdata[0]=1;
 	fromdata[1]=5;
 	fromdata[2]=5;
diff --git a/src/unittest/test_config.h.in b/src/unittest/test_config.h.in
deleted file mode 100644
index cb04b1fe3..000000000
--- a/src/unittest/test_config.h.in
+++ /dev/null
@@ -1,8 +0,0 @@
-// Filled in by the build system
-
-#pragma once
-
-#define TEST_WORLDDIR "@TEST_WORLDDIR@"
-#define TEST_SUBGAME_PATH "@TEST_SUBGAME_PATH@"
-#define TEST_MOD_PATH "@TEST_MOD_PATH@"
-#define HELPERS_PATH "@HELPERS_PATH@"
diff --git a/src/unittest/test_connection.cpp b/src/unittest/test_connection.cpp
index 001217857..0bfd8cb10 100644
--- a/src/unittest/test_connection.cpp
+++ b/src/unittest/test_connection.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "settings.h"
 #include "util/serialize.h"
-#include "network/connection.h"
+#include "network/connection_internal.h"
 #include "network/networkpacket.h"
 #include "network/socket.h"
 
@@ -251,7 +251,7 @@ void TestConnection::testConnectSendReceive()
 	UASSERT(hand_client.last_id == 1);
 	// Server should have the client
 	UASSERT(hand_server.count == 1);
-	UASSERT(hand_server.last_id == 2);
+	UASSERT(hand_server.last_id >= 2);
 
 	//sleep_ms(50);
 
@@ -283,8 +283,8 @@ void TestConnection::testConnectSendReceive()
 		Simple send-receive test
 	*/
 	{
-		NetworkPacket pkt;
-		pkt.putRawPacket((u8*) "Hello World !", 14, 0);
+		NetworkPacket pkt(0x4b, 0);
+		pkt.putRawString("Hello World !", 14);
 
 		auto sentdata = pkt.oldForgePacket();
 
@@ -306,15 +306,15 @@ void TestConnection::testConnectSendReceive()
 		UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
 	}
 
-	session_t peer_id_client = 2;
+	const session_t peer_id_client = hand_server.last_id;
 	/*
 		Send a large packet
 	*/
 	{
 		const int datasize = 30000;
-		NetworkPacket pkt(0, datasize);
+		NetworkPacket pkt(0xff, datasize);
 		for (u16 i=0; i<datasize; i++) {
-			pkt << (u8) i/4;
+			pkt << static_cast<u8>(i/4);
 		}
 
 		infostream << "Sending data (size=" << datasize << "):";
@@ -380,7 +380,7 @@ void TestConnection::testConnectSendReceive()
 	UASSERT(hand_client.count == 1);
 	UASSERT(hand_client.last_id == 1);
 	UASSERT(hand_server.count == 1);
-	UASSERT(hand_server.last_id == 2);
+	UASSERT(hand_server.last_id >= 2);
 }
 
 #endif
diff --git a/src/unittest/test_content_mapblock.cpp b/src/unittest/test_content_mapblock.cpp
new file mode 100644
index 000000000..798206a5f
--- /dev/null
+++ b/src/unittest/test_content_mapblock.cpp
@@ -0,0 +1,268 @@
+/*
+Minetest
+Copyright (C) 2023 Vitaliy Lobachevskiy
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include <algorithm>
+#include <numeric>
+
+#include "gamedef.h"
+#include "dummygamedef.h"
+#include "client/content_mapblock.h"
+#include "client/mapblock_mesh.h"
+#include "client/meshgen/collector.h"
+#include "mesh_compare.h"
+#include "util/directiontables.h"
+
+namespace {
+
+class MockGameDef : public DummyGameDef {
+public:
+	IWritableItemDefManager *item_mgr() noexcept {
+		return static_cast<IWritableItemDefManager *>(m_itemdef);
+	}
+
+	NodeDefManager *node_mgr() noexcept {
+		return const_cast<NodeDefManager *>(m_nodedef);
+	}
+
+	content_t registerNode(ItemDefinition itemdef, ContentFeatures nodedef) {
+		item_mgr()->registerItem(itemdef);
+		return node_mgr()->set(nodedef.name, nodedef);
+	}
+
+	void finalize() {
+		node_mgr()->resolveCrossrefs();
+	}
+
+	MeshMakeData makeSingleNodeMMD(bool smooth_lighting = true, bool for_shaders = true)
+	{
+		MeshMakeData data{ndef(), 1, for_shaders};
+		data.setSmoothLighting(smooth_lighting);
+		data.m_blockpos = {0, 0, 0};
+		for (s16 x = -1; x <= 1; x++)
+		for (s16 y = -1; y <= 1; y++)
+		for (s16 z = -1; z <= 1; z++)
+			data.m_vmanip.setNode({x, y, z}, {CONTENT_AIR, 0, 0});
+		return data;
+	}
+
+	content_t addSimpleNode(std::string name, u32 texture)
+	{
+		ItemDefinition itemdef;
+		itemdef.type = ITEM_NODE;
+		itemdef.name = "test:" + name;
+		itemdef.description = name;
+
+		ContentFeatures f;
+		f.name = itemdef.name;
+		f.drawtype = NDT_NORMAL;
+		f.solidness = 2;
+		f.alpha = ALPHAMODE_OPAQUE;
+		for (TileDef &tiledef : f.tiledef)
+			tiledef.name = name + ".png";
+		for (TileSpec &tile : f.tiles)
+			tile.layers[0].texture_id = texture;
+
+		return registerNode(itemdef, f);
+	}
+
+	content_t addLiquidSource(std::string name, u32 texture)
+	{
+		ItemDefinition itemdef;
+		itemdef.type = ITEM_NODE;
+		itemdef.name = "test:" + name + "_source";
+		itemdef.description = name;
+
+		ContentFeatures f;
+		f.name = itemdef.name;
+		f.drawtype = NDT_LIQUID;
+		f.solidness = 1;
+		f.alpha = ALPHAMODE_BLEND;
+		f.light_propagates = true;
+		f.param_type = CPT_LIGHT;
+		f.liquid_type = LIQUID_SOURCE;
+		f.liquid_viscosity = 4;
+		f.groups["liquids"] = 3;
+		f.liquid_alternative_source = "test:" + name + "_source";
+		f.liquid_alternative_flowing = "test:" + name + "_flowing";
+		for (TileDef &tiledef : f.tiledef)
+			tiledef.name = name + ".png";
+		for (TileSpec &tile : f.tiles)
+			tile.layers[0].texture_id = texture;
+
+		return registerNode(itemdef, f);
+	}
+
+	content_t addLiquidFlowing(std::string name, u32 texture_top, u32 texture_side)
+	{
+		ItemDefinition itemdef;
+		itemdef.type = ITEM_NODE;
+		itemdef.name = "test:" + name + "_flowing";
+		itemdef.description = name;
+
+		ContentFeatures f;
+		f.name = itemdef.name;
+		f.drawtype = NDT_FLOWINGLIQUID;
+		f.solidness = 0;
+		f.alpha = ALPHAMODE_BLEND;
+		f.light_propagates = true;
+		f.param_type = CPT_LIGHT;
+		f.liquid_type = LIQUID_FLOWING;
+		f.liquid_viscosity = 4;
+		f.groups["liquids"] = 3;
+		f.liquid_alternative_source = "test:" + name + "_source";
+		f.liquid_alternative_flowing = "test:" + name + "_flowing";
+		f.tiledef_special[0].name = name + "_top.png";
+		f.tiledef_special[1].name = name + "_side.png";
+		f.special_tiles[0].layers[0].texture_id = texture_top;
+		f.special_tiles[1].layers[0].texture_id = texture_side;
+
+		return registerNode(itemdef, f);
+	}
+};
+
+void set_light_decode_table()
+{
+	u8 table[LIGHT_SUN + 1] = {
+		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+		0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
+	};
+	memcpy(const_cast<u8 *>(light_decode_table), table, sizeof(table));
+}
+
+class TestMapblockMeshGenerator : public TestBase {
+public:
+	TestMapblockMeshGenerator() { TestManager::registerTestModule(this); }
+	const char *getName() override { return "TestMapblockMeshGenerator"; }
+
+	void runTests(IGameDef *gamedef) override;
+	void testSimpleNode();
+	void testSurroundedNode();
+	void testInterliquidSame();
+	void testInterliquidDifferent();
+};
+
+static TestMapblockMeshGenerator g_test_instance;
+
+void TestMapblockMeshGenerator::runTests(IGameDef *gamedef)
+{
+	set_light_decode_table();
+	TEST(testSimpleNode);
+	TEST(testSurroundedNode);
+	TEST(testInterliquidSame);
+	TEST(testInterliquidDifferent);
+}
+
+namespace quad {
+	constexpr float h = BS / 2.0f;
+	const Quad zp{{{{-h, -h, h}, {0, 0, 1}, 0, {1, 1}}, {{h, -h, h}, {0, 0, 1}, 0, {0, 1}}, {{h, h, h}, {0, 0, 1}, 0, {0, 0}}, {{-h, h, h}, {0, 0, 1}, 0, {1, 0}}}};
+	const Quad yp{{{{-h, h, -h}, {0, 1, 0}, 0, {0, 1}}, {{-h, h, h}, {0, 1, 0}, 0, {0, 0}}, {{h, h, h}, {0, 1, 0}, 0, {1, 0}}, {{h, h, -h}, {0, 1, 0}, 0, {1, 1}}}};
+	const Quad xp{{{{h, -h, -h}, {1, 0, 0}, 0, {0, 1}}, {{h, h, -h}, {1, 0, 0}, 0, {0, 0}}, {{h, h, h}, {1, 0, 0}, 0, {1, 0}}, {{h, -h, h}, {1, 0, 0}, 0, {1, 1}}}};
+	const Quad zn{{{{-h, -h, -h}, {0, 0, -1}, 0, {0, 1}}, {{-h, h, -h}, {0, 0, -1}, 0, {0, 0}}, {{h, h, -h}, {0, 0, -1}, 0, {1, 0}}, {{h, -h, -h}, {0, 0, -1}, 0, {1, 1}}}};
+	const Quad yn{{{{-h, -h, -h}, {0, -1, 0}, 0, {0, 0}}, {{h, -h, -h}, {0, -1, 0}, 0, {1, 0}}, {{h, -h, h}, {0, -1, 0}, 0, {1, 1}}, {{-h, -h, h}, {0, -1, 0}, 0, {0, 1}}}};
+	const Quad xn{{{{-h, -h, -h}, {-1, 0, 0}, 0, {1, 1}}, {{-h, -h, h}, {-1, 0, 0}, 0, {0, 1}}, {{-h, h, h}, {-1, 0, 0}, 0, {0, 0}}, {{-h, h, -h}, {-1, 0, 0}, 0, {1, 0}}}};
+}
+
+void TestMapblockMeshGenerator::testSimpleNode()
+{
+	MockGameDef gamedef;
+	content_t stone = gamedef.addSimpleNode("stone", 42);
+	gamedef.finalize();
+
+	MeshMakeData data = gamedef.makeSingleNodeMMD();
+	data.m_vmanip.setNode({0, 0, 0}, {stone, 0, 0});
+
+	MeshCollector col{{}};
+	MapblockMeshGenerator mg{&data, &col, nullptr};
+	mg.generate();
+	UASSERTEQ(std::size_t, col.prebuffers[0].size(), 1);
+	UASSERTEQ(std::size_t, col.prebuffers[1].size(), 0);
+
+	auto &&buf = col.prebuffers[0][0];
+	UASSERTEQ(u32, buf.layer.texture_id, 42);
+	UASSERT(checkMeshEqual(buf.vertices, buf.indices, {quad::xn, quad::xp, quad::yn, quad::yp, quad::zn, quad::zp}));
+}
+
+void TestMapblockMeshGenerator::testSurroundedNode()
+{
+	MockGameDef gamedef;
+	content_t stone = gamedef.addSimpleNode("stone", 42);
+	content_t wood = gamedef.addSimpleNode("wood", 13);
+	gamedef.finalize();
+
+	MeshMakeData data = gamedef.makeSingleNodeMMD();
+	data.m_vmanip.setNode({0, 0, 0}, {stone, 0, 0});
+	data.m_vmanip.setNode({1, 0, 0}, {wood, 0, 0});
+
+	MeshCollector col{{}};
+	MapblockMeshGenerator mg{&data, &col, nullptr};
+	mg.generate();
+	UASSERTEQ(std::size_t, col.prebuffers[0].size(), 1);
+	UASSERTEQ(std::size_t, col.prebuffers[1].size(), 0);
+
+	auto &&buf = col.prebuffers[0][0];
+	UASSERTEQ(u32, buf.layer.texture_id, 42);
+	UASSERT(checkMeshEqual(buf.vertices, buf.indices, {quad::xn, quad::yn, quad::yp, quad::zn, quad::zp}));
+}
+
+void TestMapblockMeshGenerator::testInterliquidSame()
+{
+	MockGameDef gamedef;
+	auto water = gamedef.addLiquidSource("water", 42);
+	gamedef.finalize();
+
+	MeshMakeData data = gamedef.makeSingleNodeMMD();
+	data.m_vmanip.setNode({0, 0, 0}, {water, 0, 0});
+	data.m_vmanip.setNode({1, 0, 0}, {water, 0, 0});
+
+	MeshCollector col{{}};
+	MapblockMeshGenerator mg{&data, &col, nullptr};
+	mg.generate();
+	UASSERTEQ(std::size_t, col.prebuffers[0].size(), 1);
+	UASSERTEQ(std::size_t, col.prebuffers[1].size(), 0);
+
+	auto &&buf = col.prebuffers[0][0];
+	UASSERTEQ(u32, buf.layer.texture_id, 42);
+	UASSERT(checkMeshEqual(buf.vertices, buf.indices, {quad::xn, quad::yn, quad::yp, quad::zn, quad::zp}));
+}
+
+void TestMapblockMeshGenerator::testInterliquidDifferent()
+{
+	MockGameDef gamedef;
+	auto water = gamedef.addLiquidSource("water", 42);
+	auto lava = gamedef.addLiquidSource("lava", 13);
+	gamedef.finalize();
+
+	MeshMakeData data = gamedef.makeSingleNodeMMD();
+	data.m_vmanip.setNode({0, 0, 0}, {water, 0, 0});
+	data.m_vmanip.setNode({0, 0, 1}, {lava, 0, 0});
+
+	MeshCollector col{{}};
+	MapblockMeshGenerator mg{&data, &col, nullptr};
+	mg.generate();
+	UASSERTEQ(std::size_t, col.prebuffers[0].size(), 1);
+	UASSERTEQ(std::size_t, col.prebuffers[1].size(), 0);
+
+	auto &&buf = col.prebuffers[0][0];
+	UASSERTEQ(u32, buf.layer.texture_id, 42);
+	UASSERT(checkMeshEqual(buf.vertices, buf.indices, {quad::xn, quad::xp, quad::yn, quad::yp, quad::zn, quad::zp}));
+}
+
+}
diff --git a/src/unittest/test_datastructures.cpp b/src/unittest/test_datastructures.cpp
new file mode 100644
index 000000000..0bf892353
--- /dev/null
+++ b/src/unittest/test_datastructures.cpp
@@ -0,0 +1,185 @@
+/*
+Minetest
+Copyright (C) 2024 sfan5
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include "util/container.h"
+
+class TestDataStructures : public TestBase
+{
+public:
+	TestDataStructures() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestDataStructures"; }
+
+	void runTests(IGameDef *gamedef);
+
+	void testMap1();
+	void testMap2();
+	void testMap3();
+	void testMap4();
+	void testMap5();
+};
+
+static TestDataStructures g_test_instance;
+
+void TestDataStructures::runTests(IGameDef *gamedef)
+{
+	rawstream << "-------- ModifySafeMap" << std::endl;
+	TEST(testMap1);
+	TEST(testMap2);
+	TEST(testMap3);
+	TEST(testMap4);
+	TEST(testMap5);
+}
+
+namespace {
+
+struct TrackerState {
+	bool copied = false;
+	bool deleted = false;
+};
+
+class Tracker {
+	TrackerState *res = nullptr;
+
+	inline void trackDeletion() { res && (res->deleted = true); }
+
+public:
+	Tracker() {}
+	Tracker(TrackerState &res) : res(&res) {}
+
+	operator bool() const { return !!res; }
+
+	Tracker(const Tracker &other) { *this = other; }
+	Tracker &operator=(const Tracker &other) {
+		trackDeletion();
+		res = other.res;
+		res && (res->copied = true);
+		return *this;
+	}
+	Tracker(Tracker &&other) { *this = std::move(other); }
+	Tracker &operator=(Tracker &&other) {
+		trackDeletion();
+		res = other.res;
+		other.res = nullptr;
+		return *this;
+	}
+
+	~Tracker() { trackDeletion(); }
+};
+
+}
+
+void TestDataStructures::testMap1()
+{
+	ModifySafeMap<int, Tracker> map;
+	TrackerState t0, t1;
+
+	// no-copy put
+	map.put(1, Tracker(t0));
+	UASSERT(!t0.copied);
+	UASSERT(!t0.deleted);
+
+	// overwrite during iter
+	bool once = false;
+	for (auto &it : map.iter()) {
+		(void)it;
+		map.put(1, Tracker(t1));
+		UASSERT(t0.deleted);
+		UASSERT(!t1.copied);
+		UASSERT(!t1.deleted);
+		if ((once |= 1))
+			break;
+	}
+	UASSERT(once);
+
+	map.clear(); // ASan complains about stack-use-after-scope otherwise
+}
+
+void TestDataStructures::testMap2()
+{
+	ModifySafeMap<int, Tracker> map;
+	TrackerState t0, t1;
+
+	// overwrite
+	map.put(1, Tracker(t0));
+	map.put(1, Tracker(t1));
+	UASSERT(t0.deleted);
+	UASSERT(!t1.copied);
+	UASSERT(!t1.deleted);
+
+	map.clear();
+}
+
+void TestDataStructures::testMap3()
+{
+	ModifySafeMap<int, Tracker> map;
+	TrackerState t0, t1;
+
+	// take
+	map.put(1, Tracker(t0));
+	{
+		auto v = map.take(1);
+		UASSERT(!t0.copied);
+		UASSERT(!t0.deleted);
+	}
+	UASSERT(t0.deleted);
+
+	// remove during iter
+	map.put(1, Tracker(t1));
+	for (auto &it : map.iter()) {
+		(void)it;
+		map.remove(1);
+		UASSERT(t1.deleted);
+		break;
+	}
+}
+
+void TestDataStructures::testMap4()
+{
+	ModifySafeMap<int, u32> map;
+
+	// overwrite + take during iter
+	map.put(1, 100);
+	for (auto &it : map.iter()) {
+		(void)it;
+		map.put(1, 200);
+		u32 taken = map.take(1);
+		UASSERTEQ(u32, taken, 200);
+		break;
+	}
+
+	UASSERT(map.get(1) == u32());
+	UASSERTEQ(size_t, map.size(), 0);
+}
+
+void TestDataStructures::testMap5()
+{
+	ModifySafeMap<int, u32> map;
+
+	// overwrite 2x during iter
+	map.put(9001, 9001);
+	for (auto &it : map.iter()) {
+		(void)it;
+		map.put(1, 100);
+		map.put(1, 200);
+		UASSERTEQ(u32, map.get(1), 200);
+		break;
+	}
+}
diff --git a/src/unittest/test_filepath.cpp b/src/unittest/test_filesys.cpp
similarity index 75%
rename from src/unittest/test_filepath.cpp
rename to src/unittest/test_filesys.cpp
index f1a79062d..8fc9db3d8 100644
--- a/src/unittest/test_filepath.cpp
+++ b/src/unittest/test_filesys.cpp
@@ -26,10 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "noise.h"
 
-class TestFilePath : public TestBase {
+class TestFileSys : public TestBase
+{
 public:
-	TestFilePath() { TestManager::registerTestModule(this); }
-	const char *getName() { return "TestFilePath"; }
+	TestFileSys() {	TestManager::registerTestModule(this); }
+	const char *getName() {	return "TestFileSys"; }
 
 	void runTests(IGameDef *gamedef);
 
@@ -38,17 +39,23 @@ public:
 	void testRemoveLastPathComponent();
 	void testRemoveLastPathComponentWithTrailingDelimiter();
 	void testRemoveRelativePathComponent();
+	void testSafeWriteToFile();
+	void testCopyFileContents();
+	void testNonExist();
 };
 
-static TestFilePath g_test_instance;
+static TestFileSys g_test_instance;
 
-void TestFilePath::runTests(IGameDef *gamedef)
+void TestFileSys::runTests(IGameDef *gamedef)
 {
 	TEST(testIsDirDelimiter);
 	TEST(testPathStartsWith);
 	TEST(testRemoveLastPathComponent);
 	TEST(testRemoveLastPathComponentWithTrailingDelimiter);
 	TEST(testRemoveRelativePathComponent);
+	TEST(testSafeWriteToFile);
+	TEST(testCopyFileContents);
+	TEST(testNonExist);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -56,7 +63,7 @@ void TestFilePath::runTests(IGameDef *gamedef)
 // adjusts a POSIX path to system-specific conventions
 // -> changes '/' to DIR_DELIM
 // -> absolute paths start with "C:\\" on windows
-std::string p(std::string path)
+static std::string p(std::string path)
 {
 	for (size_t i = 0; i < path.size(); ++i) {
 		if (path[i] == '/') {
@@ -74,7 +81,7 @@ std::string p(std::string path)
 }
 
 
-void TestFilePath::testIsDirDelimiter()
+void TestFileSys::testIsDirDelimiter()
 {
 	UASSERT(fs::IsDirDelimiter('/') == true);
 	UASSERT(fs::IsDirDelimiter('A') == false);
@@ -87,7 +94,7 @@ void TestFilePath::testIsDirDelimiter()
 }
 
 
-void TestFilePath::testPathStartsWith()
+void TestFileSys::testPathStartsWith()
 {
 	const int numpaths = 12;
 	std::string paths[numpaths] = {
@@ -163,7 +170,7 @@ void TestFilePath::testPathStartsWith()
 }
 
 
-void TestFilePath::testRemoveLastPathComponent()
+void TestFileSys::testRemoveLastPathComponent()
 {
 	std::string path, result, removed;
 
@@ -200,7 +207,7 @@ void TestFilePath::testRemoveLastPathComponent()
 }
 
 
-void TestFilePath::testRemoveLastPathComponentWithTrailingDelimiter()
+void TestFileSys::testRemoveLastPathComponentWithTrailingDelimiter()
 {
 	std::string path, result, removed;
 
@@ -236,7 +243,7 @@ void TestFilePath::testRemoveLastPathComponentWithTrailingDelimiter()
 }
 
 
-void TestFilePath::testRemoveRelativePathComponent()
+void TestFileSys::testRemoveRelativePathComponent()
 {
 	std::string path, result;
 
@@ -262,3 +269,71 @@ void TestFilePath::testRemoveRelativePathComponent()
 	result = fs::RemoveRelativePathComponents(path);
 	UASSERT(result == p("/a/e"));
 }
+
+
+void TestFileSys::testSafeWriteToFile()
+{
+	const std::string dest_path = getTestTempFile();
+	const std::string test_data("hello\0world", 11);
+	fs::safeWriteToFile(dest_path, test_data);
+	UASSERT(fs::PathExists(dest_path));
+	std::string contents_actual;
+	UASSERT(fs::ReadFile(dest_path, contents_actual));
+	UASSERTEQ(auto, contents_actual, test_data);
+}
+
+void TestFileSys::testCopyFileContents()
+{
+	const auto dir_path = getTestTempDirectory();
+	const auto file1 = dir_path + DIR_DELIM "src", file2 = dir_path + DIR_DELIM "dst";
+	const std::string test_data("hello\0world", 11);
+
+	// error case
+	UASSERT(!fs::CopyFileContents(file1, "somewhere"));
+
+	{
+		std::ofstream ofs(file1);
+		ofs << test_data;
+	}
+
+	// normal case
+	UASSERT(fs::CopyFileContents(file1, file2));
+	std::string contents_actual;
+	UASSERT(fs::ReadFile(file2, contents_actual));
+	UASSERTEQ(auto, contents_actual, test_data);
+
+	// should overwrite and truncate
+	{
+		std::ofstream ofs(file2);
+		for (int i = 0; i < 10; i++)
+			ofs << "OH MY GAH";
+	}
+	UASSERT(fs::CopyFileContents(file1, file2));
+	contents_actual.clear();
+	UASSERT(fs::ReadFile(file2, contents_actual));
+	UASSERTEQ(auto, contents_actual, test_data);
+}
+
+void TestFileSys::testNonExist()
+{
+	const auto path = getTestTempFile();
+	fs::DeleteSingleFileOrEmptyDirectory(path);
+
+	UASSERT(!fs::IsFile(path));
+	UASSERT(!fs::IsDir(path));
+	UASSERT(!fs::IsExecutable(path));
+
+	std::string s;
+	UASSERT(!fs::ReadFile(path, s));
+	UASSERT(s.empty());
+
+	UASSERT(!fs::Rename(path, getTestTempFile()));
+
+	std::filebuf buf;
+	// with logging enabled to test that code path
+	UASSERT(!fs::OpenStream(buf, path.c_str(), std::ios::in, false, true));
+	UASSERT(!buf.is_open());
+
+	auto ifs = open_ifstream(path.c_str(), false);
+	UASSERT(!ifs.good());
+}
diff --git a/src/unittest/test_gameui.cpp b/src/unittest/test_gameui.cpp
index a6d853f19..7170031ba 100644
--- a/src/unittest/test_gameui.cpp
+++ b/src/unittest/test_gameui.cpp
@@ -30,7 +30,6 @@ public:
 	void runTests(IGameDef *gamedef);
 
 	void testInit();
-	void testFlagSetters();
 	void testInfoText();
 	void testStatusText();
 };
@@ -40,7 +39,6 @@ static TestGameUI g_test_instance;
 void TestGameUI::runTests(IGameDef *gamedef)
 {
 	TEST(testInit);
-	TEST(testFlagSetters);
 	TEST(testInfoText);
 	TEST(testStatusText);
 }
@@ -51,30 +49,18 @@ void TestGameUI::testInit()
 	// Ensure flags on GameUI init
 	UASSERT(gui.getFlags().show_chat)
 	UASSERT(gui.getFlags().show_hud)
-	UASSERT(!gui.getFlags().show_minimap)
 	UASSERT(!gui.getFlags().show_profiler_graph)
 
 	// And after the initFlags init stage
 	gui.initFlags();
 	UASSERT(gui.getFlags().show_chat)
 	UASSERT(gui.getFlags().show_hud)
-	UASSERT(!gui.getFlags().show_minimap)
 	UASSERT(!gui.getFlags().show_profiler_graph)
 
 	// @TODO verify if we can create non UI nulldevice to test this function
 	// gui.init();
 }
 
-void TestGameUI::testFlagSetters()
-{
-	GameUI gui{};
-	gui.showMinimap(true);
-	UASSERT(gui.getFlags().show_minimap);
-
-	gui.showMinimap(false);
-	UASSERT(!gui.getFlags().show_minimap);
-}
-
 void TestGameUI::testStatusText()
 {
 	GameUI gui{};
diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index aa9fc3292..686f7446c 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -189,10 +189,9 @@ void TestMapSettingsManager::testMapSettingsManager()
 	SHA1 ctx;
 	std::string metafile_contents;
 	UASSERT(fs::ReadFile(test_mapmeta_path, metafile_contents));
-	ctx.addBytes(&metafile_contents[0], metafile_contents.size());
-	unsigned char *sha1_result = ctx.getDigest();
-	int resultdiff = memcmp(sha1_result, expected_contents_hash, 20);
-	free(sha1_result);
+	ctx.addBytes(metafile_contents);
+	std::string sha1_result = ctx.getDigest();
+	int resultdiff = memcmp(sha1_result.data(), expected_contents_hash, 20);
 
 	UASSERT(!resultdiff);
 #endif
diff --git a/src/unittest/test_mapblock.cpp b/src/unittest/test_mapblock.cpp
new file mode 100644
index 000000000..955e6fe62
--- /dev/null
+++ b/src/unittest/test_mapblock.cpp
@@ -0,0 +1,359 @@
+// Minetest
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "test.h"
+
+#include <sstream>
+#include "gamedef.h"
+#include "nodedef.h"
+#include "mapblock.h"
+#include "serialization.h"
+#include "noise.h"
+#include "inventory.h"
+
+class TestMapBlock : public TestBase
+{
+public:
+	TestMapBlock() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestMapBlock"; }
+
+	void runTests(IGameDef *gamedef);
+
+	void testSaveLoad(IGameDef *gamedef, u8 ver);
+	inline void testSaveLoadLowest(IGameDef *gamedef) {
+		testSaveLoad(gamedef, SER_FMT_VER_LOWEST_WRITE);
+	}
+
+	void testSave29(IGameDef *gamedef);
+
+	void testLoad29(IGameDef *gamedef);
+
+	// Tests loading a MapBlock from Minetest-c55 0.3
+	void testLoad20(IGameDef *gamedef);
+
+	// Tests loading a non-standard MapBlock
+	void testLoadNonStd(IGameDef *gamedef);
+};
+
+static TestMapBlock g_test_instance;
+
+void TestMapBlock::runTests(IGameDef *gamedef)
+{
+	TEST(testSaveLoad, gamedef, SER_FMT_VER_HIGHEST_WRITE);
+	TEST(testSaveLoadLowest, gamedef);
+	TEST(testSave29, gamedef);
+	TEST(testLoad29, gamedef);
+	TEST(testLoad20, gamedef);
+	TEST(testLoadNonStd, gamedef);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void TestMapBlock::testSaveLoad(IGameDef *gamedef, const u8 version)
+{
+	// Use the bottom node ids for this test
+	content_t max = 0;
+	{
+		auto *ndef = gamedef->getNodeDefManager();
+		const auto &unknown_name = ndef->get(CONTENT_UNKNOWN).name;
+		while (ndef->get(max).name != unknown_name)
+			max++;
+	}
+	UASSERT(max >= 2);
+	UASSERT(max <= CONTENT_UNKNOWN);
+
+	constexpr u64 seed = 0x207366616e3520ULL;
+	std::stringstream ss;
+	{
+		MapBlock block({}, gamedef);
+		// Fill with data
+		PcgRandom r(seed);
+		for (size_t i = 0; i < MapBlock::nodecount; ++i) {
+			u32 rval = r.next();
+			block.getData()[i] =
+				MapNode(rval % max, (rval >> 16) & 0xff, (rval >> 24) & 0xff);
+		}
+
+		// Serialize
+		block.serialize(ss, version, true, -1);
+	}
+
+	{
+		MapBlock block({}, gamedef);
+		// Deserialize
+		block.deSerialize(ss, version, true);
+
+		// Check data
+		PcgRandom r(seed);
+		for (size_t i = 0; i < MapBlock::nodecount; ++i) {
+			u32 rval = r.next();
+			auto expect =
+				MapNode(rval % max, (rval >> 16) & 0xff, (rval >> 24) & 0xff);
+			UASSERT(block.getData()[i] == expect);
+		}
+	}
+}
+
+#define SS2_CHECK() UASSERT(!ss2.fail())
+
+void TestMapBlock::testSave29(IGameDef *gamedef)
+{
+	auto *ndef = gamedef->getNodeDefManager();
+	std::stringstream ss;
+
+	{
+		// Prepare test block
+		MapBlock block({}, gamedef);
+		for (size_t i = 0; i < MapBlock::nodecount; ++i)
+			block.getData()[i] = MapNode(CONTENT_AIR);
+		MapNode n {t_CONTENT_STONE};
+		block.setNode({0, 0, 0}, n);
+
+		block.serialize(ss, 29, true, -1);
+	}
+
+	// Pick it apart a bit:
+	std::stringstream ss2;
+	decompressZstd(ss, ss2); // first zstd
+
+	u8 flags = readU8(ss2);
+	SS2_CHECK();
+	UASSERT(flags & 0x02); // !is_air == true
+	UASSERT(flags & 0x08); // !is_genereated == true
+
+	ss2.seekg(2+4, std::ios_base::cur); // lighting_complete & timestamp
+	SS2_CHECK();
+
+	// nimap
+	u8 ver = readU8(ss2);
+	u16 count = readU16(ss2);
+	SS2_CHECK();
+	UASSERTEQ(int, ver, 0);
+	// Invariant 1: map only contains nodes that are actually present in the data
+	//              and no duplicates.
+	UASSERTEQ(int, count, 2);
+	std::string nn[2];
+	content_t ii[2];
+	for (int i = 0; i < 2; i++) {
+		ii[i] = readU16(ss2);
+		nn[i] = deSerializeString16(ss2);
+	}
+	// no particular order is guaranteed
+	if (nn[0] > nn[1])
+		std::swap(nn[0], nn[1]);
+	UASSERTEQ(auto, nn[0], ndef->get(CONTENT_AIR).name);
+	UASSERTEQ(auto, nn[1], ndef->get(t_CONTENT_STONE).name);
+	// Invariant 2: IDs must start from zero
+	if (ii[0] > ii[1])
+		std::swap(ii[0], ii[1]);
+	UASSERTEQ(int, ii[0], 0x0000);
+	UASSERTEQ(int, ii[1], 0x0001);
+
+	/*
+	 * Quick note:
+	 * Minetest deals with MapBlocks that violate these invariants (mostly) fine,
+	 * but we should still be careful about them as third-party tools may rely on them.
+	 */
+
+	u8 content_width, params_width;
+	content_width = readU8(ss2);
+	params_width = readU8(ss2);
+	SS2_CHECK();
+	UASSERT(content_width == 2 && params_width == 2);
+}
+
+#undef SS2_CHECK
+
+// The array was generated with: minetestmapper -i testworld --dumpblock 6,0,0 |
+// python -c 'import sys;d=bytes.fromhex(sys.stdin.read().strip());print(",".join("%d"%c for c in d))'
+
+static const u8 coded_mapblock29[] = {
+	29,40,181,47,253,0,88,77,11,0,2,138,32,38,160,23,36,29,255,255,103,85,85,
+	213,136,105,255,110,103,27,53,43,218,89,210,205,184,194,207,24,226,254,135,
+	7,16,191,92,232,249,141,144,20,175,126,149,175,29,143,211,164,99,16,206,80,
+	28,115,77,190,197,176,52,212,147,14,12,130,34,88,75,42,45,65,21,24,44,215,
+	16,102,229,107,199,191,192,232,52,26,47,182,136,216,22,91,108,177,45,182,
+	88,44,98,199,127,148,30,253,41,49,36,205,81,120,167,33,197,232,124,108,73,
+	14,178,225,1,89,96,74,192,233,226,7,34,0,78,36,138,124,168,193,182,41,40,42,
+	148,182,14,48,131,17,74,155,12,99,18,0,113,80,150,98,137,8,98,56,144,8,20,
+	33,66,66,136,128,8,8,17,32,225,7,205,42,26,14,52,88,86,216,141,181,243,179,
+	3,4,215,245,139,22,83,172,157,47,73,82,216,114,3,60,78,223,0,155,247,80,5,
+	12,253,12,187,13,205,139,12,84,48,218,228,35,240,86,70,203,121,239,228,210,
+	96,86,116,12,5,10,97,49,111,52,238,79,12,36,119,59,39,118,53,49,89,216,181,
+	248,68,147,193,146,59,21,88,196,217,4,120,51,69,7,12,32,80,227,49,80,232,6,
+	163,221,171,38,126,130,81,154,216,165,93,120,40,186,136,115,223,1,231,48,
+	101,208,254,192,23,23,206,172,130,253,9,225,127,116,192,192,13,149,20,201,
+	60,244,151,226,114,71,81,114,126,198,247,177,98,70,70,62,181,18,74,140,239,
+	245,248,62,71,1,107,238,209,77,222,10,141,7,71,29,14,62,168,83,126,138,139,
+	26,106
+};
+
+void TestMapBlock::testLoad29(IGameDef *gamedef)
+{
+	UASSERT(MAP_BLOCKSIZE == 16);
+	const std::string_view buf(reinterpret_cast<const char*>(coded_mapblock29), sizeof(coded_mapblock29));
+
+	// this node is not part of the test gamedef, so we also test handling of
+	// unknown nodes here.
+	auto *ndef = gamedef->getNodeDefManager();
+	UASSERT(ndef->getId("default:chest") == CONTENT_IGNORE);
+
+	std::istringstream iss;
+	iss.str(std::string(buf));
+	u8 version = readU8(iss);
+	UASSERTEQ(int, version, 29);
+	MapBlock block({}, gamedef);
+	block.deSerialize(iss, version, true);
+
+	auto content_chest = ndef->getId("default:chest");
+	UASSERT(content_chest != CONTENT_IGNORE);
+
+	// there are bricks at each corner
+	const v3s16 pl[] = {
+		{0, 0, 0}, {15, 0, 0}, {0, 15, 0}, {0, 0, 15},
+		{15, 15, 0}, {15, 0, 15}, {0, 15, 15}, {15, 15, 15},
+	};
+	for (auto p : pl)
+		UASSERTEQ(int, block.getNodeNoEx(p).getContent(), t_CONTENT_BRICK);
+
+	// and a chest with an item inside
+	UASSERTEQ(int, block.getNodeNoEx({0, 1, 0}).getContent(), content_chest);
+	auto *meta = block.m_node_metadata.get({0, 1, 0});
+	UASSERT(meta);
+	auto *inv = meta->getInventory();
+	UASSERT(inv);
+	auto *ilist = inv->getList("main");
+	UASSERT(ilist);
+	UASSERTEQ(int, ilist->getSize(), 32);
+	UASSERTEQ(auto, ilist->getItem(1).name, "default:stone");
+}
+
+static const u8 coded_mapblock20[] = {
+	20,2,120,156,237,150,91,114,131,48,12,69,197,63,30,88,2,75,242,138,24,47,
+	189,230,145,196,186,184,22,170,12,161,33,183,51,105,78,41,182,142,95,48,142,
+	33,132,113,250,152,126,17,45,95,95,159,143,43,75,22,30,199,132,89,144,173,
+	57,186,253,49,209,29,39,125,98,190,4,254,1,252,3,212,179,97,185,247,242,253,
+	156,195,134,197,246,229,36,109,210,234,255,98,169,127,99,125,106,95,105,184,
+	132,254,202,161,217,159,115,218,98,128,122,180,220,199,217,54,206,183,106,
+	248,149,33,240,39,240,15,224,179,139,203,93,234,252,181,203,79,153,156,191,
+	218,23,248,215,206,254,114,176,73,203,223,22,2,255,0,62,74,206,20,91,222,43,
+	21,20,44,137,229,208,72,172,126,240,3,37,129,5,127,235,98,189,124,222,241,
+	40,187,82,132,13,126,194,139,141,34,31,63,27,66,46,119,26,157,156,204,163,
+	250,94,67,112,119,255,111,238,154,206,181,212,186,206,77,233,58,162,149,187,
+	132,219,233,219,146,137,95,52,51,11,178,53,105,95,57,174,209,197,236,55,91,
+	57,226,190,11,59,135,252,188,149,184,239,150,121,185,206,109,216,9,220,150,
+	175,203,122,98,92,58,187,220,143,192,71,207,45,175,183,181,50,140,31,178,
+	109,60,8,234,111,26,206,120,93,203,77,220,89,41,187,29,236,56,151,135,7,215,
+	151,46,4,245,82,3,140,215,247,48,175,191,117,86,238,74,108,240,143,119,178,
+	250,43,113,218,62,219,254,18,175,62,42,182,36,174,45,94,191,153,29,172,93,
+	231,138,92,255,96,215,101,94,172,201,140,17,247,137,103,121,203,86,247,14,
+	230,139,19,185,230,236,217,99,63,154,213,71,121,253,71,153,33,219,71,201,
+	209,220,21,249,220,28,242,98,241,143,114,185,211,232,228,76,47,154,151,90,
+	144,103,103,123,26,223,203,255,155,187,134,104,232,135,248,49,101,121,227,
+	137,188,254,129,200,251,244,202,131,137,18,62,52,105,95,57,174,210,197,170,
+	155,240,179,23,240,247,224,239,193,95,63,26,3,167,161,200,195,134,213,253,
+	101,42,40,245,201,253,188,151,184,102,223,57,223,226,191,31,177,58,82,35,15,
+	190,34,199,159,158,181,214,35,15,69,94,118,34,99,134,194,112,213,72,226,227,
+	193,47,203,186,214,117,243,47,249,30,224,47,250,2,239,110,248,47,7,155,180,
+	252,235,198,131,159,204,197,226,50,115,201,217,92,176,45,139,74,234,3,167,
+	123,47,50,11,236,213,237,94,62,118,246,222,158,119,60,202,174,20,97,131,159,
+	240,98,163,200,199,207,134,144,203,157,70,39,7,253,233,110,67,112,119,255,
+	111,238,154,31,244,135,233,2,120,156,99,96,100,96,100,206,102,16,96,232,242,
+	201,44,46,81,72,43,77,205,81,48,228,114,205,45,40,169,228,114,205,75,241,
+	204,43,75,205,43,201,47,170,4,201,114,129,149,20,23,37,19,80,145,2,196,38,
+	48,21,152,36,186,30,100,1,46,3,5,3,5,0,187,133,49,88,0,0,0,0,0,0,210,62,6
+};
+
+void TestMapBlock::testLoad20(IGameDef *gamedef)
+{
+	UASSERT(MAP_BLOCKSIZE == 16);
+	const std::string_view buf(reinterpret_cast<const char*>(coded_mapblock20), sizeof(coded_mapblock20));
+
+	// Conversion of minerals does not work if these nodes are not already
+	// defined at load time. (Is this a bug? Does anyone even care?)
+	gamedef->allocateUnknownNodeId("default:stone_with_coal");
+	gamedef->allocateUnknownNodeId("default:stone_with_iron");
+
+	std::istringstream iss;
+	iss.str(std::string(buf));
+	u8 version = readU8(iss);
+	UASSERTEQ(int, version, 20);
+	MapBlock block({}, gamedef);
+	block.deSerialize(iss, version, true);
+
+	auto *ndef = gamedef->getNodeDefManager();
+	auto get_node = [&] (s16 x, s16 y, s16 z) -> std::string_view {
+		MapNode n = block.getNodeNoEx({x, y, z});
+		return ndef->get(n).name;
+	};
+
+	// These names come from content_mapnode.cpp and are hardcoded in the engine.
+	UASSERTEQ(auto, get_node(11, 0, 3), "default:stone");
+	UASSERTEQ(auto, get_node(11, 1, 3), "default:stone_with_coal");
+	UASSERTEQ(auto, get_node(11, 2, 3), "default:dirt");
+	UASSERTEQ(auto, get_node(10, 5, 4), "default:dirt_with_grass");
+	UASSERTEQ(auto, get_node(10, 6, 4), "air");
+	UASSERTEQ(auto, get_node(11, 6, 3), "default:furnace");
+
+	for (size_t i = 0; i < MapBlock::nodecount; ++i)
+		UASSERT(block.getData()[i].getContent() != CONTENT_IGNORE);
+
+	// metadata is also translated
+	auto *meta = block.m_node_metadata.get({11, 6, 3});
+	UASSERT(meta);
+	UASSERT(meta->contains("formspec"));
+	auto *inv = meta->getInventory();
+	UASSERT(inv);
+	auto *ilist = inv->getList("dst");
+	UASSERT(ilist);
+	UASSERTEQ(int, ilist->getSize(), 4);
+}
+
+static const u8 coded_mapblock_nonstd[] = {
+	27,0,255,255,1,2,120,218,237,208,177,13,130,64,0,0,192,127,21,5,31,176,182,
+	182,34,177,103,3,18,6,176,115,20,72,76,156,137,45,88,199,222,26,38,128,228,
+	110,132,139,113,233,179,18,0,0,0,0,0,0,0,128,205,75,227,235,59,63,223,237,
+	227,222,76,67,247,235,243,99,125,169,138,243,33,102,101,186,93,195,201,16,0,
+	0,0,236,223,31,36,149,14,142,120,218,99,0,0,0,1,0,1,0,0,0,255,255,255,255,0,
+	0,3,0,0,0,3,97,105,114,0,1,0,8,116,101,115,116,58,111,110,101,8,0,0,8,116,
+	101,115,116,58,116,119,111,10,0,0
+};
+
+void TestMapBlock::testLoadNonStd(IGameDef *gamedef)
+{
+	/*
+	 * Node IDs were originally 8-bit, then some special format that allowed exactly
+	 * 2176 IDs (but only the first 128 could use the full range of param2), and
+	 * finally 16-bit like today.
+	 * The content_width field in MapBlocks was used around that time during the
+	 * transition to 16-bit: <https://github.com/minetest/minetest/commit/ea62ee4b61371107ef3d693bda4c410ba02ca7e6>
+	 * A content_width of 1 would normally never appear with a version > 24, but
+	 * it is in fact perfectly possible to serialize a block in todays format with
+	 * shortened IDs.
+	 *
+	 * This test checks that such a block is deserialized correctly.
+	 * To future readers: I think it's worth not breaking this quirk (~sfan5)
+	 */
+
+	UASSERT(MAP_BLOCKSIZE == 16);
+	const std::string_view buf(reinterpret_cast<const char*>(coded_mapblock_nonstd), sizeof(coded_mapblock_nonstd));
+
+	std::istringstream iss;
+	iss.str(std::string(buf));
+	u8 version = readU8(iss);
+	UASSERT(version > 24);
+	MapBlock block({}, gamedef);
+	block.deSerialize(iss, version, true);
+
+	auto *ndef = gamedef->getNodeDefManager();
+	UASSERTEQ(int, block.getNodeNoEx({0, 0, 0}).getContent(), ndef->getId("test:one"));
+	UASSERTEQ(int, block.getNodeNoEx({0, 1, 0}).getContent(), ndef->getId("test:two"));
+
+	// Check that param2 was handeled correctly
+	const static u8 data_lo[] = {8, 3, 14, 7, 13, 9, 6, 2, 1, 5, 12, 11, 15, 10, 0, 4};
+	const static u8 data_hi[] = {11, 125, 85, 131, 204, 44, 92, 55, 35, 25, 41, 181, 124, 70, 245, 73};
+	for (s16 i = 0; i < 16; i++)
+		UASSERTEQ(int, block.getNodeNoEx({i, 0, 0}).param2, data_hi[i]);
+	for (s16 i = 0; i < 16; i++)
+		UASSERTEQ(int, block.getNodeNoEx({i, 1, 0}).param2, data_lo[i]);
+}
diff --git a/src/unittest/test_mesh_compare.cpp b/src/unittest/test_mesh_compare.cpp
new file mode 100644
index 000000000..63ce04231
--- /dev/null
+++ b/src/unittest/test_mesh_compare.cpp
@@ -0,0 +1,152 @@
+/*
+Minetest
+Copyright (C) 2023 Vitaliy Lobachevskiy
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include "mesh_compare.h"
+
+// This is a self-test to ensure proper functionality of the vertex
+// building functions (`Triangle`, `Quad`) and its validation function
+// `checkMeshEqual` in preparation for the tests in test_content_mapblock.cpp
+class TestMeshCompare : public TestBase {
+public:
+	TestMeshCompare() { TestManager::registerTestModule(this); }
+	const char *getName() override { return "TestMeshCompare"; }
+
+	void runTests(IGameDef *gamedef) override {
+		TEST(testTriangle);
+		TEST(testQuad);
+	}
+
+	void testTriangle() {
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+		}, {0, 1, 2}, {
+			Triangle{{
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			}},
+		}));
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+		}, {2, 0, 1}, {
+			Triangle{{
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			}},
+		}));
+		UASSERT(!checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+		}, {0, 2, 1}, {
+			Triangle{{
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			}},
+		}));
+
+		UASSERT(checkMeshEqual({
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+		}, {0, 1, 2}, {
+			Triangle{{
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			}},
+		}));
+		UASSERT(!checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+		}, {0, 1, 2}, {
+			Triangle{{
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			}},
+		}));
+	}
+
+	void testQuad() {
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+			{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+		}, {0, 1, 2, 0, 2, 3}, {
+			Quad{{
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+			}},
+		}));
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+			{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+		}, {2, 3, 0, 1, 2, 0}, {
+			Quad{{
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+			}},
+		}));
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+			{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+		}, {2, 3, 1, 0, 1, 3}, {
+			Quad{{
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+			}},
+		}));
+		UASSERT(checkMeshEqual({
+			{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+			{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+			{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+			{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+		}, {3, 0, 1, 1, 2, 3}, {
+			Quad{{
+				{{1., 0., 0.}, {3., 0., 0.}, 1, {0., 0.}},
+				{{0., 1., 0.}, {2., 0., 0.}, 2, {0., 0.}},
+				{{0., 0., 1.}, {1., 0., 0.}, 3, {0., 0.}},
+				{{1., -1., 1.}, {4., 0., 0.}, 4, {0., 0.}},
+			}},
+		}));
+	}
+};
+
+static TestMeshCompare mesh_compare_test;
diff --git a/src/unittest/test_mod/test_mod/init.lua b/src/unittest/test_mod/test_mod/init.lua
deleted file mode 100644
index 724a863f5..000000000
--- a/src/unittest/test_mod/test_mod/init.lua
+++ /dev/null
@@ -1 +0,0 @@
--- deliberately empty
diff --git a/src/unittest/test_mod/test_mod/mod.conf b/src/unittest/test_mod/test_mod/mod.conf
deleted file mode 100644
index 56c64b2d8..000000000
--- a/src/unittest/test_mod/test_mod/mod.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-name = test_mod
-description = A mod doing nothing, to test if MINETEST_MOD_PATH is recognised
diff --git a/src/unittest/test_moveaction.cpp b/src/unittest/test_moveaction.cpp
index 7c2ecbb83..966cea8c7 100644
--- a/src/unittest/test_moveaction.cpp
+++ b/src/unittest/test_moveaction.cpp
@@ -18,15 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "test.h"
-#include "test_config.h"
 
 #include "mock_inventorymanager.h"
 #include "mock_server.h"
 #include "mock_serveractiveobject.h"
 
-#include <scripting_server.h>
-
-
 class TestMoveAction : public TestBase
 {
 public:
@@ -36,35 +32,56 @@ public:
 	void runTests(IGameDef *gamedef);
 
 	void testMove(ServerActiveObject *obj, IGameDef *gamedef);
+	void testMoveFillStack(ServerActiveObject *obj, IGameDef *gamedef);
 	void testMoveSomewhere(ServerActiveObject *obj, IGameDef *gamedef);
+	void testMoveSomewherePartial(ServerActiveObject *obj, IGameDef *gamedef);
 	void testMoveUnallowed(ServerActiveObject *obj, IGameDef *gamedef);
 	void testMovePartial(ServerActiveObject *obj, IGameDef *gamedef);
+
 	void testSwap(ServerActiveObject *obj, IGameDef *gamedef);
 	void testSwapFromUnallowed(ServerActiveObject *obj, IGameDef *gamedef);
 	void testSwapToUnallowed(ServerActiveObject *obj, IGameDef *gamedef);
+
+	void testCallbacks(ServerActiveObject *obj, Server *server);
+	void testCallbacksSwap(ServerActiveObject *obj, Server *server);
 };
 
 static TestMoveAction g_test_instance;
 
 void TestMoveAction::runTests(IGameDef *gamedef)
 {
-	MockServer server;
+	MockServer server(getTestTempDirectory());
 
-	ServerScripting server_scripting(&server);
-	server_scripting.loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
-	server_scripting.loadMod(std::string(HELPERS_PATH) + DIR_DELIM "helper_moveaction.lua",	BUILTIN_MOD_NAME);
+	server.createScripting();
+	try {
+		std::string builtin = Server::getBuiltinLuaPath() + DIR_DELIM;
+		auto script = server.getScriptIface();
+		script->loadBuiltin();
+		script->loadMod(builtin + "game" DIR_DELIM "tests" DIR_DELIM "test_moveaction.lua", BUILTIN_MOD_NAME);
+	} catch (ModError &e) {
+		rawstream << e.what() << std::endl;
+		num_tests_failed = 1;
+		return;
+	}
 
 	MetricsBackend mb;
-	ServerEnvironment server_env(nullptr, &server_scripting, &server, "", &mb);
+	auto null_map = std::unique_ptr<ServerMap>();
+	ServerEnvironment server_env(std::move(null_map), &server, &mb);
 	MockServerActiveObject obj(&server_env);
 
 	TEST(testMove, &obj, gamedef);
+	TEST(testMoveFillStack, &obj, gamedef);
 	TEST(testMoveSomewhere, &obj, gamedef);
+	TEST(testMoveSomewherePartial, &obj, gamedef);
 	TEST(testMoveUnallowed, &obj, gamedef);
 	TEST(testMovePartial, &obj, gamedef);
+
 	TEST(testSwap, &obj, gamedef);
 	TEST(testSwapFromUnallowed, &obj, gamedef);
 	TEST(testSwapToUnallowed, &obj, gamedef);
+
+	TEST(testCallbacks, &obj, &server);
+	TEST(testCallbacksSwap, &obj, &server);
 }
 
 static ItemStack parse_itemstack(const char *s)
@@ -95,6 +112,26 @@ void TestMoveAction::testMove(ServerActiveObject *obj, IGameDef *gamedef)
 	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:stone 20");
 }
 
+void TestMoveAction::testMoveFillStack(ServerActiveObject *obj, IGameDef *gamedef)
+{
+	MockInventoryManager inv(gamedef);
+
+	auto list = inv.p1.addList("main", 10);
+	list->changeItem(0, parse_itemstack("default:stone 209"));
+	list->changeItem(1, parse_itemstack("default:stone 90")); // 9 free slots
+
+	apply_action("Move 209 player:p1 main 0 player:p1 main 1", &inv, obj, gamedef);
+
+	UASSERT(list->getItem(0).getItemString() == "default:stone 200");
+	UASSERT(list->getItem(1).getItemString() == "default:stone 99");
+
+	// Trigger stack swap
+	apply_action("Move 200 player:p1 main 0 player:p1 main 1", &inv, obj, gamedef);
+
+	UASSERT(list->getItem(0).getItemString() == "default:stone 99");
+	UASSERT(list->getItem(1).getItemString() == "default:stone 200");
+}
+
 void TestMoveAction::testMoveSomewhere(ServerActiveObject *obj, IGameDef *gamedef)
 {
 	MockInventoryManager inv(gamedef);
@@ -108,19 +145,41 @@ void TestMoveAction::testMoveSomewhere(ServerActiveObject *obj, IGameDef *gamede
 
 	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:brick 10");
 	UASSERT(inv.p2.getList("main")->getItem(1).getItemString() == "default:stone 36");
+	// Partially moved
 	UASSERT(inv.p2.getList("main")->getItem(2).getItemString() == "default:stone 99");
 }
 
+void TestMoveAction::testMoveSomewherePartial(ServerActiveObject *obj, IGameDef *gamedef)
+{
+	// "Fail" because the destination list is full.
+	MockInventoryManager inv(gamedef);
+
+	InventoryList *src = inv.p1.addList("main", 3);
+	src->addItem(0, parse_itemstack("default:brick 10"));
+	src->changeItem(1, parse_itemstack("default:stone 111")); // oversized
+
+	InventoryList *dst = inv.p2.addList("main", 1);
+	dst->addItem(0, parse_itemstack("default:stone 98"));
+
+	// No free slots to fit
+	apply_action("MoveSomewhere 10 player:p1 main 0 player:p2 main", &inv, obj, gamedef);
+	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:brick 10");
+
+	// Only 1 item fits
+	apply_action("MoveSomewhere 111 player:p1 main 1 player:p2 main", &inv, obj, gamedef);
+	UASSERT(inv.p1.getList("main")->getItem(1).getItemString() == "default:stone 110");
+}
+
 void TestMoveAction::testMoveUnallowed(ServerActiveObject *obj, IGameDef *gamedef)
 {
 	MockInventoryManager inv(gamedef);
 
-	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:water 50"));
+	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_deny 50"));
 	inv.p2.addList("main", 10);
 
 	apply_action("Move 20 player:p1 main 0 player:p2 main 0", &inv, obj, gamedef);
 
-	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:water 50");
+	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:takeput_deny 50");
 	UASSERT(inv.p2.getList("main")->getItem(0).empty())
 }
 
@@ -128,13 +187,14 @@ void TestMoveAction::testMovePartial(ServerActiveObject *obj, IGameDef *gamedef)
 {
 	MockInventoryManager inv(gamedef);
 
-	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:lava 50"));
+	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_max_5 50"));
 	inv.p2.addList("main", 10);
 
+	// Lua: limited to 5 per transaction
 	apply_action("Move 20 player:p1 main 0 player:p2 main 0", &inv, obj, gamedef);
 
-	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:lava 45");
-	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:lava 5");
+	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:takeput_max_5 45");
+	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:takeput_max_5 5");
 }
 
 void TestMoveAction::testSwap(ServerActiveObject *obj, IGameDef *gamedef)
@@ -154,12 +214,12 @@ void TestMoveAction::testSwapFromUnallowed(ServerActiveObject *obj, IGameDef *ga
 {
 	MockInventoryManager inv(gamedef);
 
-	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:water 50"));
+	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_deny 50"));
 	inv.p2.addList("main", 10)->addItem(0, parse_itemstack("default:brick 60"));
 
 	apply_action("Move 50 player:p1 main 0 player:p2 main 0", &inv, obj, gamedef);
 
-	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:water 50");
+	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:takeput_deny 50");
 	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:brick 60");
 }
 
@@ -168,10 +228,60 @@ void TestMoveAction::testSwapToUnallowed(ServerActiveObject *obj, IGameDef *game
 	MockInventoryManager inv(gamedef);
 
 	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:stone 50"));
-	inv.p2.addList("main", 10)->addItem(0, parse_itemstack("default:water 60"));
+	inv.p2.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_deny 60"));
 
 	apply_action("Move 50 player:p1 main 0 player:p2 main 0", &inv, obj, gamedef);
 
 	UASSERT(inv.p1.getList("main")->getItem(0).getItemString() == "default:stone 50");
-	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:water 60");
+	UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:takeput_deny 60");
+}
+
+static bool check_function(lua_State *L, bool expect_swap)
+{
+	bool ok = false;
+	int error_handler = PUSH_ERROR_HANDLER(L);
+
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "__helper_check_callbacks");
+	lua_pushboolean(L, expect_swap);
+	int result = lua_pcall(L, 1, 1, error_handler);
+	if (result == 0)
+		ok = lua_toboolean(L, -1);
+	else
+		errorstream << lua_tostring(L, -1) << std::endl; // Error msg
+
+	lua_settop(L, 0);
+	return ok;
+}
+
+void TestMoveAction::testCallbacks(ServerActiveObject *obj, Server *server)
+{
+	server->m_inventory_mgr = std::make_unique<MockInventoryManager>(server);
+	MockInventoryManager &inv = *(MockInventoryManager *)server->getInventoryMgr();
+
+	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_cb_1 10"));
+	inv.p2.addList("main", 10);
+
+	apply_action("Move 10 player:p1 main 0 player:p2 main 1", &inv, obj, server);
+
+	// Expecting no swap. 4 callback executions in total. See Lua file for details.
+	UASSERT(check_function(server->getScriptIface()->getStack(), false));
+
+	server->m_inventory_mgr.reset();
+}
+
+void TestMoveAction::testCallbacksSwap(ServerActiveObject *obj, Server *server)
+{
+	server->m_inventory_mgr = std::make_unique<MockInventoryManager>(server);
+	MockInventoryManager &inv = *(MockInventoryManager *)server->getInventoryMgr();
+
+	inv.p1.addList("main", 10)->addItem(0, parse_itemstack("default:takeput_cb_2 50"));
+	inv.p2.addList("main", 10)->addItem(1, parse_itemstack("default:takeput_cb_1 10"));
+
+	apply_action("Move 10 player:p1 main 0 player:p2 main 1", &inv, obj, server);
+
+	// Expecting swap. 8 callback executions in total. See Lua file for details.
+	UASSERT(check_function(server->getScriptIface()->getStack(), true));
+
+	server->m_inventory_mgr.reset();
 }
diff --git a/src/unittest/test_random.cpp b/src/unittest/test_random.cpp
index 14de764e1..5fa7a5932 100644
--- a/src/unittest/test_random.cpp
+++ b/src/unittest/test_random.cpp
@@ -38,7 +38,7 @@ public:
 	void testPcgRandomBytes();
 	void testPcgRandomNormalDist();
 
-	static const int expected_pseudorandom_results[256];
+	static const s32 expected_pseudorandom_results[256];
 	static const u32 expected_pcgrandom_results[256];
 	static const u8 expected_pcgrandom_bytes_result[24];
 	static const u8 expected_pcgrandom_bytes_result2[24];
@@ -63,24 +63,41 @@ void TestRandom::testPseudoRandom()
 	PseudoRandom pr(814538);
 
 	for (u32 i = 0; i != 256; i++)
-		UASSERTEQ(int, pr.next(), expected_pseudorandom_results[i]);
+		UASSERTEQ(s32, pr.next(), expected_pseudorandom_results[i]);
+
+	s32 state = pr.getState();
+	PseudoRandom pr2(state);
+
+	for (u32 i = 0; i != 256; i++) {
+		UASSERTEQ(s32, pr.next(), pr2.next());
+	}
+
+	PseudoRandom pr3(0);
+	UASSERTEQ(s32, pr3.next(), 0);
+	UASSERTEQ(s32, pr3.next(), 21469);
+	UASSERTEQ(s32, pr3.next(), 9989);
+
+	PseudoRandom pr4(-101);
+	UASSERTEQ(s32, pr4.next(), 3267);
+	UASSERTEQ(s32, pr4.next(), 2485);
+	UASSERTEQ(s32, pr4.next(), 30057);
 }
 
 
 void TestRandom::testPseudoRandomRange()
 {
-	PseudoRandom pr((int)time(NULL));
+	PseudoRandom pr((s32)time(NULL));
 
-	EXCEPTION_CHECK(PrngException, pr.range(2000, 6000));
+	EXCEPTION_CHECK(PrngException, pr.range(2000, 8600));
 	EXCEPTION_CHECK(PrngException, pr.range(5, 1));
 
 	for (u32 i = 0; i != 32768; i++) {
-		int min = (pr.next() % 3000) - 500;
-		int max = (pr.next() % 3000) - 500;
+		s32 min = (pr.next() % 3000) - 500;
+		s32 max = (pr.next() % 3000) - 500;
 		if (min > max)
-			SWAP(int, min, max);
+			SWAP(s32, min, max);
 
-		int randval = pr.range(min, max);
+		s32 randval = pr.range(min, max);
 		UASSERT(randval >= min);
 		UASSERT(randval <= max);
 	}
@@ -93,12 +110,21 @@ void TestRandom::testPcgRandom()
 
 	for (u32 i = 0; i != 256; i++)
 		UASSERTEQ(u32, pr.next(), expected_pcgrandom_results[i]);
+
+	PcgRandom pr2(0, 0);
+	u64 state[2];
+	pr.getState(state);
+	pr2.setState(state);
+
+	for (u32 i = 0; i != 256; i++) {
+		UASSERTEQ(u32, pr.next(), pr2.next());
+	}
 }
 
 
 void TestRandom::testPcgRandomRange()
 {
-	PcgRandom pr((int)time(NULL));
+	PcgRandom pr((u64)time(NULL));
 
 	EXCEPTION_CHECK(PrngException, pr.range(5, 1));
 
@@ -106,12 +132,12 @@ void TestRandom::testPcgRandomRange()
 	pr.range(pr.RANDOM_MIN, pr.RANDOM_MAX);
 
 	for (u32 i = 0; i != 32768; i++) {
-		int min = (pr.next() % 3000) - 500;
-		int max = (pr.next() % 3000) - 500;
+		s32 min = (pr.next() % 3000) - 500;
+		s32 max = (pr.next() % 3000) - 500;
 		if (min > max)
-			SWAP(int, min, max);
+			SWAP(s32, min, max);
 
-		int randval = pr.range(min, max);
+		s32 randval = pr.range(min, max);
 		UASSERT(randval >= min);
 		UASSERT(randval <= max);
 	}
@@ -137,8 +163,8 @@ void TestRandom::testPcgRandomBytes()
 
 void TestRandom::testPcgRandomNormalDist()
 {
-	static const int max = 120;
-	static const int min = -120;
+	static const s32 max = 120;
+	static const s32 min = -120;
 	static const int num_trials = 20;
 	static const u32 num_samples = 61000;
 	s32 bins[max - min + 1];
@@ -186,7 +212,7 @@ void TestRandom::testPcgRandomNormalDist()
 }
 
 
-const int TestRandom::expected_pseudorandom_results[256] = {
+const s32 TestRandom::expected_pseudorandom_results[256] = {
 	0x02fa, 0x60d5, 0x6c10, 0x606b, 0x098b, 0x5f1e, 0x4f56, 0x3fbd, 0x77af,
 	0x4fe9, 0x419a, 0x6fe1, 0x177b, 0x6858, 0x36f8, 0x6d83, 0x14fc, 0x2d62,
 	0x1077, 0x23e2, 0x041b, 0x7a7e, 0x5b52, 0x215d, 0x682b, 0x4716, 0x47e3,
diff --git a/src/unittest/test_sao.cpp b/src/unittest/test_sao.cpp
new file mode 100644
index 000000000..595cb6434
--- /dev/null
+++ b/src/unittest/test_sao.cpp
@@ -0,0 +1,315 @@
+/*
+Minetest
+Copyright (C) 2024 sfan5
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "test.h"
+
+#include "mock_server.h"
+#include "server/luaentity_sao.h"
+#include "emerge.h"
+
+/*
+ * Tests how SAOs behave in the server environment.
+ * See also test_serveractiveobjectmgr.cpp and test_activeobject.cpp for other tests.
+ */
+
+class TestSAO : public TestBase
+{
+public:
+	TestSAO() { TestManager::registerTestModule(this); }
+	const char *getName() { return "TestSAO"; }
+
+	void runTests(IGameDef *gamedef);
+
+	void testStaticSave(ServerEnvironment *env);
+	void testNotSaved(ServerEnvironment *env);
+	void testActivate(ServerEnvironment *env);
+	void testStaticToFalse(ServerEnvironment *env);
+	void testStaticToTrue(ServerEnvironment *env);
+
+private:
+	// enough for both removeRemovedObjects and deactivateFarObjects to be called
+	// use as param to ServerEnvironment::step()
+	float m_step_interval;
+};
+
+static TestSAO g_test_instance;
+
+const static char *helper_lua_src = R"(
+core.register_entity(":test:static", {})
+core.register_entity(":test:non_static", {
+	initial_properties = {
+		static_save = false,
+	}
+})
+)";
+
+void TestSAO::runTests(IGameDef *gamedef)
+{
+	MockServer server(getTestTempDirectory());
+
+	const auto helper_lua = getTestTempFile();
+	{
+		std::ofstream ofs(helper_lua, std::ios::out | std::ios::binary);
+		ofs << helper_lua_src;
+		std::ofstream ofs2(server.getWorldPath() + DIR_DELIM "world.mt",
+			std::ios::out | std::ios::binary);
+		ofs2 << "backend = dummy\n";
+	}
+
+	server.createScripting();
+	try {
+		auto script = server.getScriptIface();
+		script->loadBuiltin();
+		script->loadMod(helper_lua, BUILTIN_MOD_NAME);
+	} catch (ModError &e) {
+		rawstream << e.what() << std::endl;
+		num_tests_failed = 1;
+		return;
+	}
+
+	// unfortunately we have to create a lot since a DummyMap doesn't cut it.
+	// TODO: best to factor entity mgmt out of ServerEnvironment, also
+	//       EmergeManager should become mockable
+	MetricsBackend mb;
+	EmergeManager emerge(&server, &mb);
+	auto map = std::make_unique<ServerMap>(server.getWorldPath(), gamedef, &emerge, &mb);
+	ServerEnvironment env(std::move(map), &server, &mb);
+	env.loadMeta();
+
+	m_step_interval = std::max(
+		g_settings->getFloat("active_block_mgmt_interval"), 0.5f) + 0.1f;
+
+	TEST(testStaticSave, &env);
+	TEST(testNotSaved, &env);
+	TEST(testActivate, &env);
+	TEST(testStaticToFalse, &env);
+	TEST(testStaticToTrue, &env);
+
+	env.deactivateBlocksAndObjects();
+}
+
+static LuaEntitySAO *add_entity(ServerEnvironment *env, v3f pos, const char *name)
+{
+	auto obj_u = std::make_unique<LuaEntitySAO>(env, pos, name, "");
+	auto obj = obj_u.get();
+	u16 id = env->addActiveObject(std::move(obj_u));
+	if (!id || obj->isGone())
+		return nullptr;
+	return obj;
+}
+
+static u16 assert_active_in_block(MapBlock *block, u16 obj_id = 0)
+{
+	const auto &so = block->m_static_objects;
+	UASSERTEQ(size_t, so.getStoredSize(), 0);
+	UASSERTEQ(size_t, so.getActiveSize(), 1);
+	if (obj_id) {
+		UASSERT(so.getAllActives().count(obj_id) == 1);
+	} else {
+		obj_id = so.getAllActives().begin()->first;
+		UASSERT(obj_id != 0);
+	}
+	return obj_id;
+}
+
+void TestSAO::testStaticSave(ServerEnvironment *env)
+{
+	Map &map = env->getMap();
+
+	const v3f testpos(0, -66 * BS, 0);
+	const v3s16 testblockpos = getNodeBlockPos(floatToInt(testpos, BS));
+
+	auto obj = add_entity(env, testpos, "test:static");
+	UASSERT(obj);
+	const u16 obj_id = obj->getId();
+
+	// static data should have been created
+	UASSERT(obj->accessObjectProperties()->static_save);
+	UASSERT(obj->m_static_exists);
+	UASSERTEQ(auto, obj->m_static_block, testblockpos);
+	// check that it's really in there
+	auto *block = map.getBlockNoCreateNoEx(testblockpos);
+	UASSERT(block);
+	assert_active_in_block(block, obj_id);
+
+	// Since we have no active blocks, stepping will deactivate it.
+	env->step(m_step_interval);
+
+	obj = nullptr; // dangling reference
+	UASSERT(!env->getActiveObject(obj_id));
+	UASSERTEQ(size_t, block->m_static_objects.getStoredSize(), 1);
+	UASSERTEQ(size_t, block->m_static_objects.getActiveSize(), 0);
+}
+
+void TestSAO::testNotSaved(ServerEnvironment *env)
+{
+	Map &map = env->getMap();
+
+	const v3f testpos(0, 4 * BS, 0);
+	const v3s16 testblockpos = getNodeBlockPos(floatToInt(testpos, BS));
+
+	// make sure matching block exists (see below)
+	auto *block = map.emergeBlock(testblockpos, true);
+	UASSERT(block);
+
+	auto obj = add_entity(env, testpos, "test:non_static");
+	UASSERT(obj);
+	const u16 obj_id = obj->getId();
+
+	UASSERT(!obj->accessObjectProperties()->static_save);
+	UASSERT(!obj->m_static_exists);
+	UASSERTEQ(size_t, block->m_static_objects.size(), 0);
+
+	// Non-static objects are only unloaded together with their block, so doing
+	// this will *not* delete it.
+	env->step(m_step_interval, {}, {});
+
+	UASSERT(env->getActiveObject(obj_id) == obj);
+
+	// Here we force the block to be unloaded, this has the expected effect.
+	map.timerUpdate(10.0f, 5.0f, -1);
+	env->step(m_step_interval, {}, {});
+
+	block = nullptr;
+	obj = nullptr;
+	UASSERT(!env->getActiveObject(obj_id));
+	block = map.emergeBlock(testblockpos, false);
+	if (block)
+		UASSERTEQ(size_t, block->m_static_objects.size(), 0);
+}
+
+void TestSAO::testActivate(ServerEnvironment *env)
+{
+	Map &map = env->getMap();
+
+	const v3f testpos(0, 0, 100 * BS);
+	const v3s16 testblockpos = getNodeBlockPos(floatToInt(testpos, BS));
+
+	// this time insert the static object manually
+	StaticObject s_obj;
+	{
+		auto obj = std::make_unique<LuaEntitySAO>(env, testpos, "test:static", "");
+		s_obj = StaticObject(obj.get(), obj->getBasePosition());
+	}
+
+	auto *block = map.emergeBlock(testblockpos, true);
+	UASSERT(block);
+	block->m_static_objects.insert(0, s_obj);
+
+	// Activating the block will convert it to active.
+	env->activateBlock(block);
+
+	const u16 obj_id = assert_active_in_block(block);
+	auto *obj = env->getActiveObject(obj_id);
+	UASSERT(obj);
+
+	// same conditions as testStaticSave
+	UASSERT(obj->m_static_exists);
+	UASSERTEQ(auto, obj->m_static_block, testblockpos);
+
+	// let the object be deactivated, it causes a warning when we unload
+	// MapBlocks in further tests otherwise
+	// FIXME: figure out if this is a bug that needs to be fixed
+	env->step(m_step_interval);
+}
+
+void TestSAO::testStaticToFalse(ServerEnvironment *env)
+{
+	Map &map = env->getMap();
+
+	const v3f testpos(0, 0, -22 * BS);
+	const v3s16 testblockpos = getNodeBlockPos(floatToInt(testpos, BS));
+
+	/*
+	 * This test represents an edge case where static_save changed from true
+	 * to false while the server was off.
+	 */
+
+	StaticObject s_obj;
+	{
+		auto obj = std::make_unique<LuaEntitySAO>(env, testpos, "test:non_static", "");
+		// since the object is not added, it doesn't read info from Lua and retains
+		// the default value. This is what allows us to do this.
+		UASSERT(obj->isStaticAllowed());
+		s_obj = StaticObject(obj.get(), obj->getBasePosition());
+	}
+
+	auto *block = map.emergeBlock(testblockpos, true);
+	UASSERT(block);
+	block->m_static_objects.insert(0, s_obj);
+
+	env->activateBlock(block);
+
+	const u16 obj_id = assert_active_in_block(block);
+	auto *obj = env->getActiveObject(obj_id);
+	UASSERT(obj);
+
+	// environment must remember place of static data
+	UASSERT(obj->m_static_exists);
+	UASSERTEQ(auto, obj->m_static_block, testblockpos);
+
+#if 0
+	/*
+	 * FIXME: needs investigation
+	 * When using this code path the test fails and there's also a warning.
+	 * The problem is that the block is unloaded while the object is still in the
+	 * active list, removeFarObjects() has no chance at doing something.
+	 * This seems to be a general issue that in practice only applies with static_save=false.
+	 */
+	map.timerUpdate(10.0f, 5.0f, -1);
+	env->step(m_step_interval);
+#else
+	obj->markForRemoval();
+	env->step(m_step_interval);
+#endif
+
+	block = nullptr;
+	obj = nullptr;
+	UASSERT(!env->getActiveObject(obj_id));
+	// static data must have been deleted
+	block = map.emergeBlock(testblockpos, false);
+	if (block)
+		UASSERTEQ(size_t, block->m_static_objects.size(), 0);
+}
+
+void TestSAO::testStaticToTrue(ServerEnvironment *env)
+{
+	Map &map = env->getMap();
+
+	const v3f testpos(123 * BS, 5 * BS, 0);
+	const v3s16 testblockpos = getNodeBlockPos(floatToInt(testpos, BS));
+
+	auto obj = add_entity(env, testpos, "test:non_static");
+	UASSERT(obj);
+	const u16 obj_id = obj->getId();
+
+	UASSERT(!obj->m_static_exists);
+	obj->accessObjectProperties()->static_save = true;
+
+	env->step(m_step_interval, {}, {});
+
+	obj = nullptr;
+	UASSERT(!env->getActiveObject(obj_id));
+
+	// data must have been newly saved
+	auto *block = map.getBlockNoCreateNoEx(testblockpos);
+	UASSERT(block);
+	UASSERTEQ(size_t, block->m_static_objects.getStoredSize(), 1);
+	UASSERTEQ(size_t, block->m_static_objects.getActiveSize(), 0);
+}
diff --git a/src/unittest/test_server_shutdown_state.cpp b/src/unittest/test_server_shutdown_state.cpp
index 679030696..b52fbcb82 100644
--- a/src/unittest/test_server_shutdown_state.cpp
+++ b/src/unittest/test_server_shutdown_state.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "test.h"
-#include "test_config.h"
 
 #include "mock_server.h"
 
diff --git a/src/unittest/test_serveractiveobjectmgr.cpp b/src/unittest/test_serveractiveobjectmgr.cpp
index b991b6884..f1e4893ee 100644
--- a/src/unittest/test_serveractiveobjectmgr.cpp
+++ b/src/unittest/test_serveractiveobjectmgr.cpp
@@ -173,12 +173,12 @@ void TestServerActiveObjectMgr::testGetAddedActiveObjectsAroundPos()
 		saomgr.registerObject(std::make_unique<MockServerActiveObject>(nullptr, p));
 	}
 
-	std::queue<u16> result;
+	std::vector<u16> result;
 	std::set<u16> cur_objects;
 	saomgr.getAddedActiveObjectsAroundPos(v3f(), 100, 50, cur_objects, result);
 	UASSERTCMP(int, ==, result.size(), 1);
 
-	result = std::queue<u16>();
+	result.clear();
 	cur_objects.clear();
 	saomgr.getAddedActiveObjectsAroundPos(v3f(), 740, 50, cur_objects, result);
 	UASSERTCMP(int, ==, result.size(), 2);
diff --git a/src/unittest/test_servermodmanager.cpp b/src/unittest/test_servermodmanager.cpp
index 91bf5d3a4..90c29e125 100644
--- a/src/unittest/test_servermodmanager.cpp
+++ b/src/unittest/test_servermodmanager.cpp
@@ -21,9 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <algorithm>
 #include "server/mods.h"
 #include "settings.h"
-#include "test_config.h"
 #include "util/string.h"
 
+#define SUBGAME_ID "devtest"
+
 class TestServerModManager : public TestBase
 {
 public:
@@ -32,6 +33,8 @@ public:
 
 	void runTests(IGameDef *gamedef);
 
+	std::string m_worlddir;
+
 	void testCreation();
 	void testIsConsistent();
 	void testUnsatisfiedMods();
@@ -48,22 +51,26 @@ static TestServerModManager g_test_instance;
 
 void TestServerModManager::runTests(IGameDef *gamedef)
 {
-	const char *saved_env_mt_subgame_path = getenv("MINETEST_SUBGAME_PATH");
-	const char *saved_env_mt_mod_path = getenv("MINETEST_MOD_PATH");
-#ifdef WIN32
-	{
-		std::string subgame_path("MINETEST_SUBGAME_PATH=");
-		subgame_path.append(TEST_SUBGAME_PATH);
-		_putenv(subgame_path.c_str());
-
-		std::string mod_path("MINETEST_MOD_PATH=");
-		mod_path.append(TEST_MOD_PATH);
-		_putenv(mod_path.c_str());
+	if (!findSubgame(SUBGAME_ID).isValid()) {
+		warningstream << "Can't find game " SUBGAME_ID ", skipping this module." << std::endl;
+		return;
 	}
-#else
-	setenv("MINETEST_SUBGAME_PATH", TEST_SUBGAME_PATH, 1);
-	setenv("MINETEST_MOD_PATH", TEST_MOD_PATH, 1);
-#endif
+
+	auto test_mods = getTestTempDirectory().append(DIR_DELIM "test_mods");
+	{
+		auto p = test_mods + (DIR_DELIM "test_mod" DIR_DELIM);
+		fs::CreateAllDirs(p);
+		std::ofstream ofs1(p + "mod.conf", std::ios::out | std::ios::binary);
+		ofs1 << "name = test_mod\n"
+			<< "description = Does nothing\n";
+		std::ofstream ofs2(p + "init.lua", std::ios::out | std::ios::binary);
+		ofs2 << "-- intentionally empty\n";
+	}
+
+	setenv("MINETEST_MOD_PATH", test_mods.c_str(), 1);
+
+	m_worlddir = getTestTempDirectory().append(DIR_DELIM "world");
+	fs::CreateDir(m_worlddir);
 
 	TEST(testCreation);
 	TEST(testIsConsistent);
@@ -75,65 +82,47 @@ void TestServerModManager::runTests(IGameDef *gamedef)
 	TEST(testGetModNames);
 	TEST(testGetModMediaPathsWrongDir);
 	TEST(testGetModMediaPaths);
+	// TODO: test MINETEST_GAME_PATH
 
-#ifdef WIN32
-	{
-		std::string subgame_path("MINETEST_SUBGAME_PATH=");
-		if (saved_env_mt_subgame_path)
-			subgame_path.append(saved_env_mt_subgame_path);
-		_putenv(subgame_path.c_str());
-
-		std::string mod_path("MINETEST_MOD_PATH=");
-		if (saved_env_mt_mod_path)
-			mod_path.append(saved_env_mt_mod_path);
-		_putenv(mod_path.c_str());
-	}
-#else
-	if (saved_env_mt_subgame_path)
-		setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);
-	else
-		unsetenv("MINETEST_SUBGAME_PATH");
-	if (saved_env_mt_mod_path)
-		setenv("MINETEST_MOD_PATH", saved_env_mt_mod_path, 1);
-	else
-		unsetenv("MINETEST_MOD_PATH");
-#endif
+	unsetenv("MINETEST_MOD_PATH");
 }
 
 void TestServerModManager::testCreation()
 {
-	std::string path = std::string(TEST_WORLDDIR) + DIR_DELIM + "world.mt";
+	std::string path = m_worlddir + DIR_DELIM + "world.mt";
 	Settings world_config;
-	world_config.set("gameid", "devtest");
+	world_config.set("gameid", SUBGAME_ID);
 	world_config.set("load_mod_test_mod", "true");
 	UASSERTEQ(bool, world_config.updateConfigFile(path.c_str()), true);
-	ServerModManager sm(TEST_WORLDDIR);
+
+	ServerModManager sm(m_worlddir);
 }
 
 void TestServerModManager::testGetModsWrongDir()
 {
 	// Test in non worlddir to ensure no mods are found
-	ServerModManager sm(std::string(TEST_WORLDDIR) + DIR_DELIM + "..");
+	ServerModManager sm(m_worlddir + DIR_DELIM + "..");
 	UASSERTEQ(bool, sm.getMods().empty(), true);
 }
 
 void TestServerModManager::testUnsatisfiedMods()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	UASSERTEQ(bool, sm.getUnsatisfiedMods().empty(), true);
 }
 
 void TestServerModManager::testIsConsistent()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	UASSERTEQ(bool, sm.isConsistent(), true);
 }
 
 void TestServerModManager::testGetMods()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	const auto &mods = sm.getMods();
-	UASSERTEQ(bool, mods.empty(), false);
+	// `ls ./games/devtest/mods | wc -l` + 1 (test mod)
+	UASSERTEQ(std::size_t, mods.size(), 31 + 1);
 
 	// Ensure we found basenodes mod (part of devtest)
 	// and test_mod (for testing MINETEST_MOD_PATH).
@@ -151,18 +140,21 @@ void TestServerModManager::testGetMods()
 
 	UASSERTEQ(bool, default_found, true);
 	UASSERTEQ(bool, test_mod_found, true);
+
+	UASSERT(mods.front().name == "first_mod");
+	UASSERT(mods.back().name == "last_mod");
 }
 
 void TestServerModManager::testGetModspec()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	UASSERTEQ(const ModSpec *, sm.getModSpec("wrongmod"), NULL);
 	UASSERT(sm.getModSpec("basenodes") != NULL);
 }
 
 void TestServerModManager::testGetModNamesWrongDir()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR) + DIR_DELIM + "..");
+	ServerModManager sm(m_worlddir + DIR_DELIM + "..");
 	std::vector<std::string> result;
 	sm.getModNames(result);
 	UASSERTEQ(bool, result.empty(), true);
@@ -170,7 +162,7 @@ void TestServerModManager::testGetModNamesWrongDir()
 
 void TestServerModManager::testGetModNames()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	std::vector<std::string> result;
 	sm.getModNames(result);
 	UASSERTEQ(bool, result.empty(), false);
@@ -179,7 +171,7 @@ void TestServerModManager::testGetModNames()
 
 void TestServerModManager::testGetModMediaPathsWrongDir()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR) + DIR_DELIM + "..");
+	ServerModManager sm(m_worlddir + DIR_DELIM + "..");
 	std::vector<std::string> result;
 	sm.getModsMediaPaths(result);
 	UASSERTEQ(bool, result.empty(), true);
@@ -187,7 +179,7 @@ void TestServerModManager::testGetModMediaPathsWrongDir()
 
 void TestServerModManager::testGetModMediaPaths()
 {
-	ServerModManager sm(std::string(TEST_WORLDDIR));
+	ServerModManager sm(m_worlddir);
 	std::vector<std::string> result;
 	sm.getModsMediaPaths(result);
 	UASSERTEQ(bool, result.empty(), false);
diff --git a/src/unittest/test_settings.cpp b/src/unittest/test_settings.cpp
index dae6a7beb..c0ab59c2d 100644
--- a/src/unittest/test_settings.cpp
+++ b/src/unittest/test_settings.cpp
@@ -36,7 +36,7 @@ public:
 	void testFlagDesc();
 
 	static const char *config_text_before;
-	static const std::string config_text_after;
+	static const char *config_text_after;
 };
 
 static TestSettings g_test_instance;
@@ -76,7 +76,7 @@ const char *TestSettings::config_text_before =
 	"zoop = true\n"
 	"[dummy_eof_end_tag]\n";
 
-const std::string TestSettings::config_text_after =
+const char *TestSettings::config_text_after =
 	"leet = 1337\n"
 	"leetleet = 13371337\n"
 	"leetleet_neg = -13371337\n"
@@ -107,7 +107,7 @@ const std::string TestSettings::config_text_after =
 	"	scale = 40\n"
 	"	seed = 12341\n"
 	"	spread = (250,250,250)\n"
- 	"   farlacunarity = 1\n"
+	"   farlacunarity = 1\n"
 	"	farpersist = 1\n"
 	"	farscale = 1\n"
 	"	farspread = 1\n"
diff --git a/src/unittest/test_threading.cpp b/src/unittest/test_threading.cpp
index 65ef7c02d..a91e1b532 100644
--- a/src/unittest/test_threading.cpp
+++ b/src/unittest/test_threading.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "test.h"
 
 #include <atomic>
+#include <iostream>
 #include "threading/semaphore.h"
 #include "threading/thread.h"
 
@@ -32,6 +33,7 @@ public:
 
 	void testStartStopWait();
 	void testAtomicSemaphoreThread();
+	void testTLS();
 };
 
 static TestThreading g_test_instance;
@@ -40,6 +42,7 @@ void TestThreading::runTests(IGameDef *gamedef)
 {
 	TEST(testStartStopWait);
 	TEST(testAtomicSemaphoreThread);
+	TEST(testTLS);
 }
 
 class SimpleTestThread : public Thread {
@@ -156,3 +159,86 @@ void TestThreading::testAtomicSemaphoreThread()
 	UASSERT(val == num_threads * 0x10000);
 }
 
+
+
+static std::atomic<bool> g_tls_broken;
+
+class TLSTestThread : public Thread {
+public:
+	TLSTestThread() : Thread("TLSTest")
+	{
+	}
+
+private:
+	struct TestObject {
+		TestObject() {
+			for (u32 i = 0; i < buffer_size; i++)
+				buffer[i] = (i % 2) ? 0xa1 : 0x1a;
+		}
+		~TestObject() {
+			for (u32 i = 0; i < buffer_size; i++) {
+				const u8 expect = (i % 2) ? 0xa1 : 0x1a;
+				if (buffer[i] != expect) {
+					std::cout << "At offset " << i << " expected " << (int)expect
+						<< " but found " << (int)buffer[i] << std::endl;
+					g_tls_broken = true;
+					break;
+				}
+				// If we're unlucky the loop might actually just crash.
+				// probably the user will realize the test failure :)
+			}
+		}
+		// larger objects seem to surface corruption more easily
+		static constexpr u32 buffer_size = 576;
+		u8 buffer[buffer_size];
+	};
+
+	void *run() {
+		thread_local TestObject foo;
+		while (!stopRequested())
+			sleep_ms(1);
+		return nullptr;
+	}
+};
+
+/*
+	What are we actually testing here?
+
+	MinGW with gcc has a long-standing unsolved bug where memory belonging to
+	thread-local variables is freed *before* the destructors are called.
+	Needless to say this leads to unreliable crashes whenever a thread exits.
+	It does not affect MSVC or MinGW+clang and as far as we know no other platforms
+	are affected either.
+
+	Related reports and information:
+	* <https://sourceforge.net/p/mingw-w64/bugs/727/> (2018)
+	* <https://github.com/msys2/MINGW-packages/issues/2519> (2017)
+	* <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58142> maybe
+
+	Note that this is different from <https://sourceforge.net/p/mingw-w64/bugs/527/>,
+	which affected only 32-bit MinGW. It was caused by incorrect calling convention
+	and fixed in GCC in 2020.
+
+	Occurrences in Minetest:
+	* <https://github.com/minetest/minetest/issues/10137> (2020)
+	* <https://github.com/minetest/minetest/issues/12022> (2022)
+	* <https://github.com/minetest/minetest/issues/14140> (2023)
+*/
+void TestThreading::testTLS()
+{
+	constexpr int num_threads = 10;
+
+	for (int j = 0; j < num_threads; j++) {
+		g_tls_broken = false;
+
+		TLSTestThread thread;
+		thread.start();
+		thread.stop();
+		thread.wait();
+
+		if (g_tls_broken) {
+			std::cout << "While running test thread " << j << std::endl;
+			UASSERT(!g_tls_broken);
+		}
+	}
+}
diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp
index 0a19f1466..e6791877d 100644
--- a/src/unittest/test_utilities.cpp
+++ b/src/unittest/test_utilities.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "util/string.h"
 #include "util/base64.h"
+#include "util/colorize.h"
 
 class TestUtilities : public TestBase {
 public:
@@ -59,6 +60,7 @@ public:
 	void testBase64();
 	void testSanitizeDirName();
 	void testIsBlockInSight();
+	void testColorizeURL();
 };
 
 static TestUtilities g_test_instance;
@@ -92,6 +94,7 @@ void TestUtilities::runTests(IGameDef *gamedef)
 	TEST(testBase64);
 	TEST(testSanitizeDirName);
 	TEST(testIsBlockInSight);
+	TEST(testColorizeURL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -180,9 +183,11 @@ void TestUtilities::testWrapDegrees_0_360_v3f()
 
 void TestUtilities::testLowercase()
 {
-	UASSERT(lowercase("Foo bAR") == "foo bar");
-	UASSERT(lowercase("eeeeeeaaaaaaaaaaaààààà") == "eeeeeeaaaaaaaaaaaààààà");
-	UASSERT(lowercase("MINETEST-powa") == "minetest-powa");
+	UASSERTEQ(auto, lowercase("Foo bAR"), "foo bar");
+	UASSERTEQ(auto, lowercase("eeeeeeaaaaaaaaaaaààààà"), "eeeeeeaaaaaaaaaaaààààà");
+	// intentionally won't handle Unicode, regardless of locale
+	UASSERTEQ(auto, lowercase("ÜÜ"), "ÜÜ");
+	UASSERTEQ(auto, lowercase("MINETEST-powa"), "minetest-powa");
 }
 
 
@@ -240,20 +245,26 @@ void TestUtilities::testPadString()
 
 void TestUtilities::testStartsWith()
 {
-	UASSERT(str_starts_with(std::string(), std::string()) == true);
+	std::string the("the");
+	UASSERT(str_starts_with(std::string(), "") == true);
 	UASSERT(str_starts_with(std::string("the sharp pickaxe"),
 		std::string()) == true);
 	UASSERT(str_starts_with(std::string("the sharp pickaxe"),
-		std::string("the")) == true);
+		std::string_view(the)) == true);
 	UASSERT(str_starts_with(std::string("the sharp pickaxe"),
 		std::string("The")) == false);
 	UASSERT(str_starts_with(std::string("the sharp pickaxe"),
 		std::string("The"), true) == true);
-	UASSERT(str_starts_with(std::string("T"), std::string("The")) == false);
+	UASSERT(str_starts_with(std::string("T"), "The") == false);
 }
 
 void TestUtilities::testStrEqual()
 {
+	std::string foo("foo");
+	UASSERT(str_equal(foo, std::string_view(foo)));
+	UASSERT(!str_equal(foo, std::string("bar")));
+	UASSERT(str_equal(std::string_view(foo), std::string_view(foo)));
+	UASSERT(str_equal(std::wstring(L"FOO"), std::wstring(L"foo"), true));
 	UASSERT(str_equal(utf8_to_wide("abc"), utf8_to_wide("abc")));
 	UASSERT(str_equal(utf8_to_wide("ABC"), utf8_to_wide("abc"), true));
 }
@@ -300,18 +311,30 @@ void TestUtilities::testAsciiPrintableHelper()
 
 void TestUtilities::testUTF8()
 {
-	UASSERT(utf8_to_wide("¤") == L"¤");
+#if FMTODO	
+	UASSERT(utf8_to_wide(u8"¤") == L"¤");
 
-	UASSERT(wide_to_utf8(L"¤") == "¤");
+	UASSERTEQ(std::string, wide_to_utf8(L"¤"), u8"¤");
 
 	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("")), "");
 	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("the shovel dug a crumbly node!")),
 		"the shovel dug a crumbly node!");
-	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("-ä-")),
-		"-ä-");
-	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("-\xF0\xA0\x80\x8B-")),
-		"-\xF0\xA0\x80\x8B-");
 
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide(u8"-ä-")),
+		u8"-ä-");
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide(u8"-\U0002000b-")),
+		u8"-\U0002000b-");
+	if constexpr (sizeof(wchar_t) == 4) {
+		const auto *literal = U"-\U0002000b-";
+		UASSERT(utf8_to_wide(u8"-\U0002000b-") == reinterpret_cast<const wchar_t*>(literal));
+	}
+
+	// try to check that the conversion function does not accidentally keep
+	// its internal state across invocations.
+	// \xC4\x81 is UTF-8 for \u0101
+	utf8_to_wide("\xC4");
+	UASSERT(utf8_to_wide("\x81") != L"\u0101");
+#endif
 }
 
 void TestUtilities::testRemoveEscapes()
@@ -626,17 +649,18 @@ void TestUtilities::testBase64()
 	UASSERT(base64_is_valid("AAAAA=A") == false);
 }
 
-
 void TestUtilities::testSanitizeDirName()
 {
-	UASSERT(sanitizeDirName("a", "~") == "a");
-	UASSERT(sanitizeDirName("  ", "~") == "__");
-	UASSERT(sanitizeDirName(" a ", "~") == "_a_");
-	UASSERT(sanitizeDirName("COM1", "~") == "~COM1");
-	UASSERT(sanitizeDirName("COM1", ":") == "_COM1");
-	UASSERT(sanitizeDirName("cOm\u00B2", "~") == "~cOm\u00B2");
-	UASSERT(sanitizeDirName("cOnIn$", "~") == "~cOnIn$");
-	UASSERT(sanitizeDirName(" cOnIn$ ", "~") == "_cOnIn$_");
+#if FMTODO
+	UASSERTEQ(auto, sanitizeDirName("a", "~"), "a");
+	UASSERTEQ(auto, sanitizeDirName("  ", "~"), "__");
+	UASSERTEQ(auto, sanitizeDirName(" a ", "~"), "_a_");
+	UASSERTEQ(auto, sanitizeDirName("COM1", "~"), "~COM1");
+	UASSERTEQ(auto, sanitizeDirName("COM1", ":"), "_COM1");
+	UASSERTEQ(auto, sanitizeDirName(u8"cOm\u00B2", "~"), u8"~cOm\u00B2");
+	UASSERTEQ(auto, sanitizeDirName("cOnIn$", "~"), "~cOnIn$");
+	UASSERTEQ(auto, sanitizeDirName(" cOnIn$ ", "~"), "_cOnIn$_");
+#endif
 }
 
 template <typename F, typename C>
@@ -704,3 +728,21 @@ void TestUtilities::testIsBlockInSight()
 		UASSERT(isBlockInSight({-1, 0, 0}, cam_pos, cam_dir, fov, range));
 	}
 }
+
+void TestUtilities::testColorizeURL()
+{
+#ifdef HAVE_COLORIZE_URL
+	#define RED COLOR_CODE("#faa")
+	#define GREY COLOR_CODE("#aaa")
+	#define WHITE COLOR_CODE("#fff")
+
+	std::string result = colorize_url("http://example.com/");
+	UASSERTEQ(auto, result, (GREY "http://" WHITE "example.com" GREY "/"));
+
+	result = colorize_url("https://u:p@wikipedi\u0430.org:1234/heIIoll?a=b#c");
+	UASSERTEQ(auto, result,
+		(GREY "https://u:p@" WHITE "wikipedi" RED "%d0%b0" WHITE ".org" GREY ":1234/heIIoll?a=b#c"));
+#else
+	warningstream << "Test skipped." << std::endl;
+#endif
+}
diff --git a/src/unittest/test_voxelalgorithms.cpp b/src/unittest/test_voxelalgorithms.cpp
index 8caa0fbf4..366755da5 100644
--- a/src/unittest/test_voxelalgorithms.cpp
+++ b/src/unittest/test_voxelalgorithms.cpp
@@ -49,31 +49,29 @@ void TestVoxelAlgorithms::runTests(IGameDef *gamedef)
 void TestVoxelAlgorithms::testVoxelLineIterator()
 {
 	// Test some lines
-	// Do not test lines that start or end on the border of
-	// two voxels as rounding errors can make the test fail!
-	std::vector<core::line3d<f32> > lines;
-	for (f32 x = -9.1; x < 9; x += 3.124) {
-	for (f32 y = -9.2; y < 9; y += 3.123) {
-	for (f32 z = -9.3; z < 9; z += 3.122) {
+	std::vector<core::line3d<f32>> lines;
+	for (f32 x = -9.1f; x < 9.0f; x += 3.124f)
+	for (f32 y = -9.2f; y < 9.0f; y += 3.123f)
+	for (f32 z = -9.3f; z < 9.0f; z += 3.122f) {
 		lines.emplace_back(-x, -y, -z, x, y, z);
 	}
+	for (f32 x = -3.0f; x < 3.1f; x += 0.5f)
+	for (f32 y = -3.0f; y < 3.1f; y += 0.5f)
+	for (f32 z = -3.0f; z < 3.1f; z += 0.5f) {
+		lines.emplace_back(-x, -y, -z, x, y, z);
 	}
-	}
-	lines.emplace_back(0, 0, 0, 0, 0, 0);
+	lines.emplace_back(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
 	// Test every line
-	std::vector<core::line3d<f32> >::iterator it = lines.begin();
-	for (; it < lines.end(); it++) {
-		core::line3d<f32> l = *it;
-
+	for (auto l : lines) {
 		// Initialize test
 		voxalgo::VoxelLineIterator iterator(l.start, l.getVector());
 
 		//Test the first voxel
-		v3s16 start_voxel = floatToInt(l.start, 1);
+		v3s16 start_voxel = floatToInt(l.start, 1.0f);
 		UASSERT(iterator.m_current_node_pos == start_voxel);
 
 		// Values for testing
-		v3s16 end_voxel = floatToInt(l.end, 1);
+		v3s16 end_voxel = floatToInt(l.end, 1.0f);
 		v3s16 voxel_vector = end_voxel - start_voxel;
 		int nodecount = abs(voxel_vector.X) + abs(voxel_vector.Y)
 			+ abs(voxel_vector.Z);
@@ -88,8 +86,9 @@ void TestVoxelAlgorithms::testVoxelLineIterator()
 			UASSERTEQ(f32, (new_voxel - old_voxel).getLengthSQ(), 1);
 			// The line must intersect with the voxel
 			v3f voxel_center = intToFloat(iterator.m_current_node_pos, 1);
-			aabb3f box(voxel_center - v3f(0.5, 0.5, 0.5),
-				voxel_center + v3f(0.5, 0.5, 0.5));
+			constexpr f32 eps = 1.0e-5f;
+			aabb3f box(voxel_center - v3f(0.5f + eps),
+				voxel_center + v3f(0.5f + eps));
 			UASSERT(box.intersectsWithLine(l));
 			// Update old voxel
 			old_voxel = new_voxel;
diff --git a/src/unittest/test_world/do_not_remove.txt b/src/unittest/test_world/do_not_remove.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 6bc97915f..01b932c72 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/areastore.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/auth.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/colorize.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/enriched_string.cpp
@@ -8,10 +9,10 @@ set(UTIL_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/metricsbackend.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/pointabilities.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/quicktune.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/sha256.c
 	${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/srp.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
diff --git a/src/util/auth.cpp b/src/util/auth.cpp
index 3dd5a9afa..d7d1da280 100644
--- a/src/util/auth.cpp
+++ b/src/util/auth.cpp
@@ -39,10 +39,9 @@ std::string translate_password(const std::string &name,
 
 	std::string slt = name + password;
 	SHA1 sha1;
-	sha1.addBytes(slt.c_str(), slt.length());
-	unsigned char *digest = sha1.getDigest();
-	std::string pwd = base64_encode(digest, 20);
-	free(digest);
+	sha1.addBytes(slt);
+	std::string digest = sha1.getDigest();
+	std::string pwd = base64_encode(digest);
 	return pwd;
 }
 
@@ -112,8 +111,8 @@ std::string encode_srp_verifier(const std::string &verifier,
 {
 	std::ostringstream ret_str;
 	ret_str << "#1#"
-		<< base64_encode((unsigned char *)salt.c_str(), salt.size()) << "#"
-		<< base64_encode((unsigned char *)verifier.c_str(), verifier.size());
+		<< base64_encode(salt) << "#"
+		<< base64_encode(verifier);
 	return ret_str.str();
 }
 
diff --git a/src/util/base64.cpp b/src/util/base64.cpp
index 0c2455222..2acf78167 100644
--- a/src/util/base64.cpp
+++ b/src/util/base64.cpp
@@ -2,6 +2,7 @@
 base64.cpp and base64.h
 
 Copyright (C) 2004-2008 René Nyffenegger
+Stricter validation added by the Minetest Contributors.
 
 This source code is provided 'as-is', without any express or implied
 warranty. In no event will the author be held liable for any damages
@@ -44,15 +45,15 @@ static inline bool is_base64(unsigned char c)
 			|| c == '+' || c == '/';
 }
 
-bool base64_is_valid(std::string const& s)
+bool base64_is_valid(std::string_view s)
 {
 	size_t i = 0;
 	for (; i < s.size(); ++i)
 		if (!is_base64(s[i]))
 			break;
 	unsigned char padding = 3 - ((i + 3) % 4);
-	if ((padding == 1 && base64_chars_padding_1.find(s[i - 1]) == std::string::npos)
-			|| (padding == 2 && base64_chars_padding_2.find(s[i - 1]) == std::string::npos)
+	if ((padding == 1 && base64_chars_padding_1.find(s[i - 1]) == s.npos)
+			|| (padding == 2 && base64_chars_padding_2.find(s[i - 1]) == s.npos)
 			|| padding == 3)
 		return false;
 	int actual_padding = s.size() - i;
@@ -68,8 +69,14 @@ bool base64_is_valid(std::string const& s)
 	return padding == actual_padding;
 }
 
-std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
+std::string base64_encode(std::string_view s)
+{
+	const unsigned char *bytes_to_encode = reinterpret_cast<const unsigned char*>(s.data());
+	size_t in_len = s.size();
+
 	std::string ret;
+	ret.reserve(in_len + in_len / 3);
+
 	int i = 0;
 	int j = 0;
 	unsigned char char_array_3[3];
@@ -109,16 +116,17 @@ std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_
 	}
 
 	return ret;
-
 }
 
-std::string base64_decode(std::string const& encoded_string) {
+std::string base64_decode(std::string_view encoded_string)
+{
 	int in_len = encoded_string.size();
 	int i = 0;
 	int j = 0;
 	int in_ = 0;
 	unsigned char char_array_4[4], char_array_3[3];
 	std::string ret;
+	ret.reserve(in_len / 4 * 3);
 
 	while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
 		char_array_4[i++] = encoded_string[in_]; in_++;
diff --git a/src/util/base64.h b/src/util/base64.h
index 7f2bf1368..3846d3a25 100644
--- a/src/util/base64.h
+++ b/src/util/base64.h
@@ -1,26 +1,36 @@
 /*
-Minetest
-Copyright (C) 2013-2017 celeron55, Perttu Ahola <celeron55@gmail.com>
+base64.cpp and base64.h
 
-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
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+Copyright (C) 2004-2008 René Nyffenegger
+Minor modifications by the Minetest Contributors.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+This source code is provided 'as-is', without any express or implied
+warranty. In no event will the author be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented; you must not
+   claim that you wrote the original source code. If you use this source code
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original source code.
+
+3. This notice may not be removed or altered from any source distribution.
+
+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #pragma once
 
 #include <string>
+#include <string_view>
 
-bool base64_is_valid(std::string const& s);
-std::string base64_encode(unsigned char const* , unsigned int len);
-std::string base64_decode(std::string const& s);
+bool base64_is_valid(std::string_view s);
+std::string base64_encode(std::string_view s);
+std::string base64_decode(std::string_view s);
diff --git a/src/util/colorize.cpp b/src/util/colorize.cpp
new file mode 100644
index 000000000..873ec06fc
--- /dev/null
+++ b/src/util/colorize.cpp
@@ -0,0 +1,110 @@
+/*
+Part of Minetest
+Copyright (C) 2024 rubenwardy
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include "colorize.h"
+
+#ifdef HAVE_COLORIZE_URL
+
+#include <curl/urlapi.h>
+#include "log.h"
+#include "string.h"
+#include <sstream>
+
+std::string colorize_url(const std::string &url)
+{
+	auto urlHandleRAII = std::unique_ptr<CURLU, decltype(&curl_url_cleanup)>(
+			curl_url(), curl_url_cleanup);
+	CURLU *urlHandle = urlHandleRAII.get();
+
+	auto rc = curl_url_set(urlHandle, CURLUPART_URL, url.c_str(), 0);
+	if (rc != CURLUE_OK) {
+		throw std::runtime_error("URL is not valid");
+	}
+
+	auto url_get = [&] (CURLUPart what) -> std::string {
+		char *tmp = nullptr;
+		curl_url_get(urlHandle, what, &tmp, 0);
+		std::string ret(tmp ? tmp : "");
+		curl_free(tmp);
+		return ret;
+	};
+
+	auto scheme = url_get(CURLUPART_SCHEME);
+	auto user = url_get(CURLUPART_USER);
+	auto password = url_get(CURLUPART_PASSWORD);
+	auto host = url_get(CURLUPART_HOST);
+	auto port = url_get(CURLUPART_PORT);
+	auto path = url_get(CURLUPART_PATH);
+	auto query = url_get(CURLUPART_QUERY);
+	auto fragment = url_get(CURLUPART_FRAGMENT);
+#if LIBCURL_VERSION_NUM >= 0x074100
+	auto zoneid = url_get(CURLUPART_ZONEID);
+#else
+	std::string zoneid;
+#endif
+
+	std::ostringstream os;
+
+	std::string_view red = COLOR_CODE("#faa");
+	std::string_view white = COLOR_CODE("#fff");
+	std::string_view grey = COLOR_CODE("#aaa");
+
+	os << grey << scheme << "://";
+	if (!user.empty())
+		os << user;
+	if (!password.empty())
+		os << ":" << password;
+	if (!(user.empty() && password.empty()))
+		os << "@";
+
+	// Print hostname, escaping unsafe characters
+	os << white;
+	bool was_alphanum = true;
+	for (char c : host) {
+		bool is_alphanum = isalnum(c) || ispunct(c);
+		if (is_alphanum == was_alphanum) {
+			// skip
+		} else if (is_alphanum) {
+			os << white;
+		} else {
+			os << red;
+		}
+		was_alphanum = is_alphanum;
+
+		if (is_alphanum) {
+			os << c;
+		} else {
+			os << "%" << std::setfill('0') << std::setw(2) << std::hex
+				<< (static_cast<unsigned int>(c) & 0xff);
+		}
+	}
+
+	os << grey;
+	if (!zoneid.empty())
+		os << "%" << zoneid;
+	if (!port.empty())
+		os << ":" << port;
+	os << path;
+	if (!query.empty())
+		os << "?" << query;
+	if (!fragment.empty())
+		os << "#" << fragment;
+
+	return os.str();
+}
+
+#endif
diff --git a/src/util/colorize.h b/src/util/colorize.h
new file mode 100644
index 000000000..cb7ae7c30
--- /dev/null
+++ b/src/util/colorize.h
@@ -0,0 +1,42 @@
+/*
+Part of Minetest
+Copyright (C) 2024 rubenwardy
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#pragma once
+
+#include <string>
+#include "config.h"
+
+#define COLOR_CODE(color) "\x1b(c@" color ")"
+
+#if USE_CURL
+#include <curl/curlver.h>
+// curl_url functions since 7.62.0
+#if LIBCURL_VERSION_NUM >= 0x073e00
+#define HAVE_COLORIZE_URL
+#endif
+#endif
+
+#ifdef HAVE_COLORIZE_URL
+
+/**
+ * Colorize URL to highlight the hostname and any unsafe characters.
+ *
+ * Throws an exception if the url is invalid.
+ */
+std::string colorize_url(const std::string &url);
+
+#endif
diff --git a/src/util/container.h b/src/util/container.h
index a4e020b00..81bcdc65b 100644
--- a/src/util/container.h
+++ b/src/util/container.h
@@ -23,6 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "irrlichttypes.h"
+#include "debug.h" // sanity_check
 #include "exceptions.h"
 #include "threading/mutex_auto_lock.h"
 #include "threading/semaphore.h"
@@ -33,9 +34,11 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "unordered_map_hash.h"
 #include <unordered_set>
 #include <queue>
+#include <cassert>
+#include <limits>
 
 /*
-Queue with unique values with fast checking of value existence
+	Queue with unique values with fast checking of value existence
 */
 
 template<typename Value>
@@ -79,6 +82,10 @@ private:
 	std::queue<Value> m_queue;
 };
 
+/*
+	Thread-safe map
+*/
+
 template<typename Key, typename Value>
 class MutexedMap
 {
@@ -232,7 +239,9 @@ public:
 	}
 };
 
-// Thread-safe Double-ended queue
+/*
+	Thread-safe double-ended queue
+*/
 
 template<typename T>
 class MutexedQueue
@@ -366,6 +375,10 @@ protected:
 	Semaphore m_signal;
 };
 
+/*
+	LRU cache
+*/
+
 template<typename K, typename V>
 class LRUCache
 {
@@ -434,3 +447,227 @@ private:
 	// we can't use std::deque here, because its iterators get invalidated
 	std::list<K> m_queue;
 };
+
+/*
+	Map that can be safely modified (insertion, deletion) during iteration
+	Caveats:
+	- you cannot insert null elements
+	- you have to check for null elements during iteration, those are ones already deleted
+	- size() and empty() don't work during iteration
+	- not thread-safe in any way
+
+	How this is implemented:
+	- there are two maps: new and real
+	- if inserting duration iteration, the value is inserted into the "new" map
+	- if deleting during iteration, the value is set to null (to be GC'd later)
+	- when iteration finishes the "new" map is merged into the "real" map
+*/
+
+template<typename K, typename V>
+class ModifySafeMap
+{
+public:
+	// this allows bare pointers but also e.g. std::unique_ptr
+	static_assert(std::is_default_constructible<V>::value,
+		"Value type must be default constructible");
+	static_assert(std::is_constructible<bool, V>::value,
+		"Value type must be convertible to bool");
+	static_assert(std::is_move_assignable<V>::value,
+		"Value type must be move-assignable");
+
+	typedef K key_type;
+	typedef V mapped_type;
+
+	ModifySafeMap() {
+		// the null value must convert to false and all others to true, but
+		// we can't statically check the latter.
+		sanity_check(!null_value);
+	}
+	~ModifySafeMap() {
+		assert(!m_iterating);
+	}
+
+	// possible to implement but we don't need it
+	DISABLE_CLASS_COPY(ModifySafeMap)
+	ALLOW_CLASS_MOVE(ModifySafeMap)
+
+	const V &get(const K &key) const {
+		if (m_iterating) {
+			auto it = m_new.find(key);
+			if (it != m_new.end())
+				return it->second;
+		}
+		auto it = m_values.find(key);
+		// This conditional block was converted from a ternary to ensure no
+		// temporary values are created in evaluating the return expression,
+		// which could cause a dangling reference.
+		if (it != m_values.end()) {
+			return it->second;
+		} else {
+			return null_value;
+		}
+	}
+
+	void put(const K &key, const V &value) {
+		if (!value) {
+			assert(false);
+			return;
+		}
+		if (m_iterating) {
+			auto it = m_values.find(key);
+			if (it != m_values.end()) {
+				it->second = V();
+				m_garbage++;
+			}
+			m_new[key] = value;
+		} else {
+			m_values[key] = value;
+		}
+	}
+
+	void put(const K &key, V &&value) {
+		if (!value) {
+			assert(false);
+			return;
+		}
+		if (m_iterating) {
+			auto it = m_values.find(key);
+			if (it != m_values.end()) {
+				it->second = V();
+				m_garbage++;
+			}
+			m_new[key] = std::move(value);
+		} else {
+			m_values[key] = std::move(value);
+		}
+	}
+
+	V take(const K &key) {
+		V ret = V();
+		if (m_iterating) {
+			auto it = m_new.find(key);
+			if (it != m_new.end()) {
+				ret = std::move(it->second);
+				m_new.erase(it);
+			}
+		}
+		auto it = m_values.find(key);
+		if (it == m_values.end())
+			return ret;
+		if (!ret)
+			ret = std::move(it->second);
+		if (m_iterating) {
+			it->second = V();
+			m_garbage++;
+		} else {
+			m_values.erase(it);
+		}
+		return ret;
+	}
+
+	bool remove(const K &key) {
+		return !!take(key);
+	}
+
+	// Warning: not constant-time!
+	size_t size() const {
+		if (m_iterating) {
+			// This is by no means impossible to determine, it's just annoying
+			// to code and we happen to not need this.
+			return unknown;
+		}
+		assert(m_new.empty());
+		if (m_garbage == 0)
+			return m_values.size();
+		size_t n = 0;
+		for (auto &it : m_values)
+			n += !it.second ? 0 : 1;
+		return n;
+	}
+
+	// Warning: not constant-time!
+	bool empty() const {
+		if (m_iterating)
+			return false; // maybe
+		if (m_garbage == 0)
+			return m_values.empty();
+		for (auto &it : m_values) {
+			if (!!it.second)
+				return false;
+		}
+		return true;
+	}
+
+	auto iter() { return IterationHelper(this); }
+
+	void clear() {
+		if (m_iterating) {
+			for (auto &it : m_values)
+				it.second = V();
+			m_garbage = m_values.size();
+		} else {
+			m_values.clear();
+			m_garbage = 0;
+		}
+	}
+
+	static inline const V null_value = V();
+
+	// returned by size() if called during iteration
+	static constexpr size_t unknown = static_cast<size_t>(-1);
+
+protected:
+	void merge_new() {
+		assert(!m_iterating);
+		if (!m_new.empty()) {
+			m_new.merge(m_values); // entries in m_new take precedence
+			m_values.clear();
+			std::swap(m_values, m_new);
+		}
+	}
+
+	void collect_garbage() {
+		assert(!m_iterating);
+		if (m_values.size() < GC_MIN_SIZE || m_garbage < m_values.size() / 2)
+			return;
+		for (auto it = m_values.begin(); it != m_values.end(); ) {
+			if (!it->second)
+				it = m_values.erase(it);
+			else
+				++it;
+		}
+		m_garbage = 0;
+	}
+
+	struct IterationHelper {
+		friend class ModifySafeMap<K, V>;
+		~IterationHelper() {
+			assert(m->m_iterating);
+			m->m_iterating--;
+			if (!m->m_iterating) {
+				m->merge_new();
+				m->collect_garbage();
+			}
+		}
+
+		auto begin() { return m->m_values.cbegin(); }
+		auto end() { return m->m_values.cend(); }
+
+	private:
+		IterationHelper(ModifySafeMap<K, V> *parent) : m(parent) {
+			assert(m->m_iterating < std::numeric_limits<decltype(m_iterating)>::max());
+			m->m_iterating++;
+		}
+
+		ModifySafeMap<K, V> *m;
+	};
+
+private:
+	std::map<K, V> m_values;
+	std::map<K, V> m_new;
+	unsigned int m_iterating = 0;
+	// approximate amount of null-placeholders in m_values, reliable for != 0 tests
+	size_t m_garbage = 0;
+
+	static constexpr size_t GC_MIN_SIZE = 30;
+};
diff --git a/src/util/directiontables.cpp b/src/util/directiontables.cpp
index 5be61add7..e438aab72 100644
--- a/src/util/directiontables.cpp
+++ b/src/util/directiontables.cpp
@@ -113,13 +113,15 @@ const v3s16 g_27dirs[27] =
 	v3s16(0,0,0),
 };
 
-const u8 wallmounted_to_facedir[6] = {
+const u8 wallmounted_to_facedir[8] = {
 	20,
 	0,
 	16 + 1,
 	12 + 3,
 	8,
-	4 + 2
+	4 + 2,
+	20 + 1, // special 1
+	0 + 1 // special 2
 };
 
 const v3s16 wallmounted_dirs[8] = {
diff --git a/src/util/directiontables.h b/src/util/directiontables.h
index e562ef239..ebc810d38 100644
--- a/src/util/directiontables.h
+++ b/src/util/directiontables.h
@@ -72,16 +72,22 @@ enum Direction6D {
 /// Direction in the wallmounted format.
 /// P is Positive, N is Negative.
 enum DirectionWallmounted {
+	// The 6 wallmounted directions
 	DWM_YP,
 	DWM_YN,
 	DWM_XP,
 	DWM_XN,
 	DWM_ZP,
 	DWM_ZN,
-	DWM_COUNT,
+	// There are 6 wallmounted directions, but 8 possible states (3 bits).
+	// So we have 2 additional states, which drawtypes might use for
+	// special ("S") behavior.
+	DWM_S1,
+	DWM_S2,
+	DWM_COUNT
 };
 
-extern const v3s16 g_6dirs[DWM_COUNT];
+extern const v3s16 g_6dirs[6];
 
 extern const v3s16 g_7dirs[7];
 
@@ -90,9 +96,9 @@ extern const v3s16 g_26dirs[26];
 // 26th is (0,0,0)
 extern const v3s16 g_27dirs[27];
 
-extern const u8 wallmounted_to_facedir[6];
+extern const u8 wallmounted_to_facedir[DWM_COUNT];
 
-extern const v3s16 wallmounted_dirs[8];
+extern const v3s16 wallmounted_dirs[DWM_COUNT];
 
 extern const v3s16 facedir_dirs[32];
 
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp
index 941f8b08d..04c5ef806 100644
--- a/src/util/enriched_string.cpp
+++ b/src/util/enriched_string.cpp
@@ -59,10 +59,11 @@ void EnrichedString::clear()
 	m_background = irr::video::SColor(0, 0, 0, 0);
 }
 
-void EnrichedString::operator=(const wchar_t *str)
+EnrichedString &EnrichedString::operator=(const wchar_t *str)
 {
 	clear();
 	addAtEnd(translate_string(std::wstring(str)), m_default_color);
+	return *this;
 }
 
 void EnrichedString::addAtEnd(const std::wstring &s, SColor initial_color)
@@ -165,6 +166,21 @@ void EnrichedString::operator+=(const EnrichedString &other)
 	}
 }
 
+EnrichedString EnrichedString::getNextLine(size_t *pos) const
+{
+	size_t str_pos = *pos;
+
+	// Split per line
+	size_t str_nl = getString().find(L'\n', str_pos);
+	if (str_nl == std::wstring::npos)
+		str_nl = getString().size();
+	EnrichedString line = substr(str_pos, str_nl - str_pos);
+	str_pos += line.size() + 1;
+
+	*pos = str_pos;
+	return line;
+}
+
 EnrichedString EnrichedString::substr(size_t pos, size_t len) const
 {
 	if (pos >= m_string.length())
diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h
index 4e249eac5..3d19eaed5 100644
--- a/src/util/enriched_string.h
+++ b/src/util/enriched_string.h
@@ -34,7 +34,7 @@ public:
 		const video::SColor &color = video::SColor(255, 255, 255, 255));
 	EnrichedString(const std::wstring &string,
 		const std::vector<video::SColor> &colors);
-	void operator=(const wchar_t *str);
+	EnrichedString &operator=(const wchar_t *str);
 
 	void clear();
 
@@ -49,6 +49,7 @@ public:
 	// color. The color used will be the one from the last character.
 	void addCharNoColor(wchar_t c);
 
+	EnrichedString getNextLine(size_t *pos) const;
 	EnrichedString substr(size_t pos = 0, size_t len = std::string::npos) const;
 	EnrichedString operator+(const EnrichedString &other) const;
 	void operator+=(const EnrichedString &other);
diff --git a/src/util/hex.h b/src/util/hex.h
index 01ec4385c..2537c0198 100644
--- a/src/util/hex.h
+++ b/src/util/hex.h
@@ -23,6 +23,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <string>
+#include <string_view>
 
 static const char hex_chars[] = "0123456789abcdef";
 
@@ -44,9 +45,9 @@ static inline std::string hex_encode(const char *data, unsigned int data_size)
 	return ret;
 }
 
-static inline std::string hex_encode(const std::string &data)
+static inline std::string hex_encode(std::string_view data)
 {
-	return hex_encode(data.c_str(), data.size());
+	return hex_encode(data.data(), data.size());
 }
 
 static inline bool hex_digit_decode(char hexdigit, unsigned char &value)
diff --git a/src/util/ieee_float.cpp b/src/util/ieee_float.cpp
index b73763c55..b70d4af67 100644
--- a/src/util/ieee_float.cpp
+++ b/src/util/ieee_float.cpp
@@ -22,17 +22,18 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
 #include "ieee_float.h"
 #include "log.h"
 #include "porting.h"
 #include <limits>
 #include <cmath>
+#include <cstring>
 
 // Given an unsigned 32-bit integer representing an IEEE-754 single-precision
 // float, return the float.
 f32 u32Tof32Slow(u32 i)
 {
-	// clang-format off
 	int exp = (i >> 23) & 0xFF;
 	u32 sign = i & 0x80000000UL;
 	u32 imant = i & 0x7FFFFFUL;
@@ -56,7 +57,6 @@ f32 u32Tof32Slow(u32 i)
 
 	return sign ? -ldexpf((f32)(imant | 0x800000UL), exp - 150) :
 		ldexpf((f32)(imant | 0x800000UL), exp - 150);
-	// clang-format on
 }
 
 // Given a float, return an unsigned 32-bit integer representing the f32
@@ -94,7 +94,6 @@ u32 f32Tou32Slow(f32 f)
 // - The endianness of f32s and integers must match.
 FloatType getFloatSerializationType()
 {
-	// clang-format off
 	const f32 cf = -22220490.f;
 	const u32 cu = 0xCBA98765UL;
 	if (std::numeric_limits<f32>::is_iec559 && sizeof(cf) == 4 &&
@@ -132,5 +131,4 @@ FloatType getFloatSerializationType()
 	}
 
 	return FLOATTYPE_SLOW;
-	// clang-format on
 }
diff --git a/src/util/md32_common.h b/src/util/md32_common.h
deleted file mode 100644
index 2c050b72a..000000000
--- a/src/util/md32_common.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* md32_common.h file used by sha256 implementation */
-/* ====================================================================
- * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-/*-
- * This is a generic 32 bit "collector" for message digest algorithms.
- * Whenever needed it collects input character stream into chunks of
- * 32 bit values and invokes a block function that performs actual hash
- * calculations.
- *
- * Porting guide.
- *
- * Obligatory macros:
- *
- * DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
- *      this macro defines byte order of input stream.
- * HASH_CBLOCK
- *      size of a unit chunk HASH_BLOCK operates on.
- * HASH_LONG
- *      has to be at lest 32 bit wide, if it's wider, then
- *      HASH_LONG_LOG2 *has to* be defined along
- * HASH_CTX
- *      context structure that at least contains following
- *      members:
- *              typedef struct {
- *                      ...
- *                      HASH_LONG       Nl,Nh;
- *                      either {
- *                      HASH_LONG       data[HASH_LBLOCK];
- *                      unsigned char   data[HASH_CBLOCK];
- *                      };
- *                      unsigned int    num;
- *                      ...
- *                      } HASH_CTX;
- *      data[] vector is expected to be zeroed upon first call to
- *      HASH_UPDATE.
- * HASH_UPDATE
- *      name of "Update" function, implemented here.
- * HASH_TRANSFORM
- *      name of "Transform" function, implemented here.
- * HASH_FINAL
- *      name of "Final" function, implemented here.
- * HASH_BLOCK_DATA_ORDER
- *      name of "block" function capable of treating *unaligned* input
- *      message in original (data) byte order, implemented externally.
- * HASH_MAKE_STRING
- *      macro convering context variables to an ASCII hash string.
- *
- * MD5 example:
- *
- *      #define DATA_ORDER_IS_LITTLE_ENDIAN
- *
- *      #define HASH_LONG               MD5_LONG
- *      #define HASH_LONG_LOG2          MD5_LONG_LOG2
- *      #define HASH_CTX                MD5_CTX
- *      #define HASH_CBLOCK             MD5_CBLOCK
- *      #define HASH_UPDATE             MD5_Update
- *      #define HASH_TRANSFORM          MD5_Transform
- *      #define HASH_FINAL              MD5_Final
- *      #define HASH_BLOCK_DATA_ORDER   md5_block_data_order
- *
- *                                      <appro@fy.chalmers.se>
- */
-
-#pragma once
-
-#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-# error "DATA_ORDER must be defined!"
-#endif
-
-#ifndef HASH_CBLOCK
-# error "HASH_CBLOCK must be defined!"
-#endif
-#ifndef HASH_LONG
-# error "HASH_LONG must be defined!"
-#endif
-#ifndef HASH_CTX
-# error "HASH_CTX must be defined!"
-#endif
-
-#ifndef HASH_UPDATE
-# error "HASH_UPDATE must be defined!"
-#endif
-#ifndef HASH_TRANSFORM
-# error "HASH_TRANSFORM must be defined!"
-#endif
-#ifndef HASH_FINAL
-# error "HASH_FINAL must be defined!"
-#endif
-
-#ifndef HASH_BLOCK_DATA_ORDER
-# error "HASH_BLOCK_DATA_ORDER must be defined!"
-#endif
-
-/*
- * Engage compiler specific rotate intrinsic function if available.
- */
-#undef ROTATE
-#ifndef PEDANTIC
-# if defined(_MSC_VER)
-#  define ROTATE(a,n)   _lrotl(a,n)
-# elif defined(__ICC)
-#  define ROTATE(a,n)   _rotl(a,n)
-# elif defined(__MWERKS__)
-#  if defined(__POWERPC__)
-#   define ROTATE(a,n)  __rlwinm(a,n,0,31)
-#  elif defined(__MC68K__)
-    /* Motorola specific tweak. <appro@fy.chalmers.se> */
-#   define ROTATE(a,n)  ( n<24 ? __rol(a,n) : __ror(a,32-n) )
-#  else
-#   define ROTATE(a,n)  __rol(a,n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-  /*
-   * Some GNU C inline assembler templates. Note that these are
-   * rotates by *constant* number of bits! But that's exactly
-   * what we need here...
-   *                                    <appro@fy.chalmers.se>
-   */
-#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm (                   \
-                                "roll %1,%0"            \
-                                : "=r"(ret)             \
-                                : "I"(n), "0"((unsigned int)(a))        \
-                                : "cc");                \
-                           ret;                         \
-                        })
-#  elif defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
-        defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm (                   \
-                                "rlwinm %0,%1,%2,0,31"  \
-                                : "=r"(ret)             \
-                                : "r"(a), "I"(n));      \
-                           ret;                         \
-                        })
-#  elif defined(__s390x__)
-#   define ROTATE(a,n) ({ register unsigned int ret;    \
-                                asm ("rll %0,%1,%2"     \
-                                : "=r"(ret)             \
-                                : "r"(a), "I"(n));      \
-                          ret;                          \
-                        })
-#  endif
-# endif
-#endif                          /* PEDANTIC */
-
-#ifndef ROTATE
-# define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
-#endif
-
-#if defined(DATA_ORDER_IS_BIG_ENDIAN)
-
-# ifndef PEDANTIC
-#  if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#   if ((defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)) || \
-      (defined(__x86_64) || defined(__x86_64__))
-#    if !defined(B_ENDIAN)
-    /*
-     * This gives ~30-40% performance improvement in SHA-256 compiled
-     * with gcc [on P4]. Well, first macro to be frank. We can pull
-     * this trick on x86* platforms only, because these CPUs can fetch
-     * unaligned data without raising an exception.
-     */
-#     define HOST_c2l(c,l)        ({ unsigned int r=*((const unsigned int *)(c)); \
-                                   asm ("bswapl %0":"=r"(r):"0"(r));    \
-                                   (c)+=4; (l)=r;                       })
-#     define HOST_l2c(l,c)        ({ unsigned int r=(l);                  \
-                                   asm ("bswapl %0":"=r"(r):"0"(r));    \
-                                   *((unsigned int *)(c))=r; (c)+=4; r; })
-#    endif
-#   elif defined(__aarch64__)
-#    if defined(__BYTE_ORDER__)
-#     if defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
-#      define HOST_c2l(c,l)      ({ unsigned int r;              \
-                                   asm ("rev    %w0,%w1"        \
-                                        :"=r"(r)                \
-                                        :"r"(*((const unsigned int *)(c))));\
-                                   (c)+=4; (l)=r;               })
-#      define HOST_l2c(l,c)      ({ unsigned int r;              \
-                                   asm ("rev    %w0,%w1"        \
-                                        :"=r"(r)                \
-                                        :"r"((unsigned int)(l)));\
-                                   *((unsigned int *)(c))=r; (c)+=4; r; })
-#     elif defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__==__ORDER_BIG_ENDIAN__
-#      define HOST_c2l(c,l)      ((l)=*((const unsigned int *)(c)), (c)+=4, (l))
-#      define HOST_l2c(l,c)      (*((unsigned int *)(c))=(l), (c)+=4, (l))
-#     endif
-#    endif
-#   endif
-#  endif
-#  if defined(__s390__) || defined(__s390x__)
-#   define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, (l))
-#   define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, (l))
-#  endif
-# endif
-
-# ifndef HOST_c2l
-#  define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))<<24),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    )           )
-# endif
-# ifndef HOST_l2c
-#  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
-# endif
-
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-
-# ifndef PEDANTIC
-#  if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#   if defined(__s390x__)
-#    define HOST_c2l(c,l)        ({ asm ("lrv    %0,%1"                  \
-                                   :"=d"(l) :"m"(*(const unsigned int *)(c)));\
-                                   (c)+=4; (l);                         })
-#    define HOST_l2c(l,c)        ({ asm ("strv   %1,%0"                  \
-                                   :"=m"(*(unsigned int *)(c)) :"d"(l));\
-                                   (c)+=4; (l);                         })
-#   endif
-#  endif
-#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   ifndef B_ENDIAN
-    /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
-#    define HOST_c2l(c,l)        ((l)=*((const unsigned int *)(c)), (c)+=4, l)
-#    define HOST_l2c(l,c)        (*((unsigned int *)(c))=(l), (c)+=4, l)
-#   endif
-#  endif
-# endif
-
-# ifndef HOST_c2l
-#  define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))    ),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<<24)           )
-# endif
-# ifndef HOST_l2c
-#  define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
-# endif
-
-#endif
-
-/*
- * Time for some action:-)
- */
-
-int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
-{
-    const unsigned char *data = (const unsigned char *)data_;
-    unsigned char *p;
-    HASH_LONG l;
-    size_t n;
-
-    if (len == 0)
-        return 1;
-
-    l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
-    /*
-     * 95-05-24 eay Fixed a bug with the overflow handling, thanks to Wei Dai
-     * <weidai@eskimo.com> for pointing it out.
-     */
-    if (l < c->Nl)              /* overflow */
-        c->Nh++;
-    c->Nh += (HASH_LONG) (len >> 29); /* might cause compiler warning on
-                                       * 16-bit */
-    c->Nl = l;
-
-    n = c->num;
-    if (n != 0) {
-        p = (unsigned char *)c->data;
-
-        if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {
-            memcpy(p + n, data, HASH_CBLOCK - n);
-            HASH_BLOCK_DATA_ORDER(c, p, 1);
-            n = HASH_CBLOCK - n;
-            data += n;
-            len -= n;
-            c->num = 0;
-            memset(p, 0, HASH_CBLOCK); /* keep it zeroed */
-        } else {
-            memcpy(p + n, data, len);
-            c->num += (unsigned int)len;
-            return 1;
-        }
-    }
-
-    n = len / HASH_CBLOCK;
-    if (n > 0) {
-        HASH_BLOCK_DATA_ORDER(c, data, n);
-        n *= HASH_CBLOCK;
-        data += n;
-        len -= n;
-    }
-
-    if (len != 0) {
-        p = (unsigned char *)c->data;
-        c->num = (unsigned int)len;
-        memcpy(p, data, len);
-    }
-    return 1;
-}
-
-void HASH_TRANSFORM(HASH_CTX *c, const unsigned char *data)
-{
-    HASH_BLOCK_DATA_ORDER(c, data, 1);
-}
-
-int HASH_FINAL(unsigned char *md, HASH_CTX *c)
-{
-    unsigned char *p = (unsigned char *)c->data;
-    size_t n = c->num;
-
-    p[n] = 0x80;                /* there is always room for one */
-    n++;
-
-    if (n > (HASH_CBLOCK - 8)) {
-        memset(p + n, 0, HASH_CBLOCK - n);
-        n = 0;
-        HASH_BLOCK_DATA_ORDER(c, p, 1);
-    }
-    memset(p + n, 0, HASH_CBLOCK - 8 - n);
-
-    p += HASH_CBLOCK - 8;
-#if   defined(DATA_ORDER_IS_BIG_ENDIAN)
-    (void)HOST_l2c(c->Nh, p);
-    (void)HOST_l2c(c->Nl, p);
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-    (void)HOST_l2c(c->Nl, p);
-    (void)HOST_l2c(c->Nh, p);
-#endif
-    p -= HASH_CBLOCK;
-    HASH_BLOCK_DATA_ORDER(c, p, 1);
-    c->num = 0;
-    memset(p, 0, HASH_CBLOCK);
-
-#ifndef HASH_MAKE_STRING
-# error "HASH_MAKE_STRING must be defined!"
-#else
-    HASH_MAKE_STRING(c, md);
-#endif
-
-    return 1;
-}
-
-#ifndef MD32_REG_T
-# if defined(__alpha) || defined(__sparcv9) || defined(__mips)
-#  define MD32_REG_T long
-/*
- * This comment was originaly written for MD5, which is why it
- * discusses A-D. But it basically applies to all 32-bit digests,
- * which is why it was moved to common header file.
- *
- * In case you wonder why A-D are declared as long and not
- * as MD5_LONG. Doing so results in slight performance
- * boost on LP64 architectures. The catch is we don't
- * really care if 32 MSBs of a 64-bit register get polluted
- * with eventual overflows as we *save* only 32 LSBs in
- * *either* case. Now declaring 'em long excuses the compiler
- * from keeping 32 MSBs zeroed resulting in 13% performance
- * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
- * Well, to be honest it should say that this *prevents*
- * performance degradation.
- *                              <appro@fy.chalmers.se>
- */
-# else
-/*
- * Above is not absolute and there are LP64 compilers that
- * generate better code if MD32_REG_T is defined int. The above
- * pre-processor condition reflects the circumstances under which
- * the conclusion was made and is subject to further extension.
- *                              <appro@fy.chalmers.se>
- */
-#  define MD32_REG_T int
-# endif
-#endif
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 80e6e0743..58296b620 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -33,7 +33,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 // myrand
 
-PcgRandom g_pcgrand;
+static PcgRandom g_pcgrand;
 
 u32 myrand()
 {
@@ -196,7 +196,7 @@ s16 adjustDist(s16 dist, float zoom_fov)
 	return std::round(adjustDist((float)dist, zoom_fov));
 }
 
-void setPitchYawRollRad(core::matrix4 &m, const v3f &rot)
+void setPitchYawRollRad(core::matrix4 &m, v3f rot)
 {
 	f64 a1 = rot.Z, a2 = rot.X, a3 = rot.Y;
 	f64 c1 = cos(a1), s1 = sin(a1);
diff --git a/src/util/numeric.h b/src/util/numeric.h
index 8a474b55a..e5dc220e6 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -259,6 +259,16 @@ int myrand_range(int min, int max);
 float myrand_range(float min, float max);
 float myrand_float();
 
+// Implements a C++11 UniformRandomBitGenerator using the above functions
+struct MyRandGenerator {
+	typedef u32 result_type;
+	static constexpr result_type min() { return 0; }
+	static constexpr result_type max() { return MYRAND_RANGE; }
+	inline result_type operator()() {
+		return myrand();
+	}
+};
+
 /*
 	Miscellaneous functions
 */
@@ -466,12 +476,10 @@ class IntervalLimiter
 public:
 	IntervalLimiter() = default;
 
-	/*
-		dtime: time from last call to this method
-		wanted_interval: interval wanted
-		return value:
-			true: action should be skipped
-			false: action should be done
+	/**
+		@param dtime time from last call to this method
+		@param wanted_interval interval wanted
+		@return true if action should be done
 	*/
 	bool step(float dtime, float wanted_interval)
 	{
@@ -587,18 +595,18 @@ inline void wrappedApproachShortest(T &current, const T target, const T stepsize
 	}
 }
 
-void setPitchYawRollRad(core::matrix4 &m, const v3f &rot);
+void setPitchYawRollRad(core::matrix4 &m, v3f rot);
 
-inline void setPitchYawRoll(core::matrix4 &m, const v3f &rot)
+inline void setPitchYawRoll(core::matrix4 &m, v3f rot)
 {
-	setPitchYawRollRad(m, rot * core::DEGTORAD64);
+	setPitchYawRollRad(m, rot * core::DEGTORAD);
 }
 
 v3f getPitchYawRollRad(const core::matrix4 &m);
 
 inline v3f getPitchYawRoll(const core::matrix4 &m)
 {
-	return getPitchYawRollRad(m) * core::RADTODEG64;
+	return getPitchYawRollRad(m) * core::RADTODEG;
 }
 
 // Muliply the RGB value of a color linearly, and clamp to black/white
diff --git a/src/util/png.cpp b/src/util/png.cpp
old mode 100755
new mode 100644
index 698cbc9a5..b4bc6b72f
--- a/src/util/png.cpp
+++ b/src/util/png.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "png.h"
 #include <string>
+#include <optional>
 #include <sstream>
 #include <zlib.h>
 #include <cassert>
@@ -26,43 +27,108 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include "irrlichttypes.h"
 
-static void writeChunk(std::ostringstream &target, const std::string &chunk_str)
+enum {
+	COLOR_GRAY = 0,
+	COLOR_RGB = 2,
+	COLOR_RGBA = 6,
+};
+
+static void writeChunk(std::string &target, const std::string &chunk_str)
 {
 	assert(chunk_str.size() >= 4);
 	assert(chunk_str.size() - 4 < U32_MAX);
-	writeU32(target, chunk_str.size() - 4); // Write length minus the identifier
-	target << chunk_str;
-	writeU32(target, crc32(0,(const u8*)chunk_str.data(), chunk_str.size()));
+	u8 tmp[4];
+	target.reserve(target.size() + 4 + chunk_str.size() + 4);
+
+	writeU32(tmp, chunk_str.size() - 4); // Length minus the identifier
+	target.append(reinterpret_cast<char*>(tmp), 4);
+	target.append(chunk_str); // Data
+	const u32 csum = crc32(0, reinterpret_cast<const u8*>(chunk_str.data()),
+			chunk_str.size());
+	writeU32(tmp, csum); // CRC32 checksum
+	target.append(reinterpret_cast<char*>(tmp), 4);
+}
+
+static std::optional<u8> reduceColor(const u8 *data, u32 width, u32 height, std::string &new_data)
+{
+	const u32 npixels = width * height;
+	// check if the alpha channel is all opaque
+	for (u32 i = 0; i < npixels; i++) {
+		if (data[4*i + 3] != 255)
+			return std::nullopt;
+	}
+
+	// check if RGB components are identical
+	bool gray = true;
+	for (u32 i = 0; i < npixels; i++) {
+		const u8 *pixel = &data[4*i];
+		if (pixel[0] != pixel[1] || pixel[1] != pixel[2]) {
+			gray = false;
+			break;
+		}
+	}
+
+	if (gray) {
+		// convert to grayscale
+		new_data.resize(width * height);
+		u8 *dst = reinterpret_cast<u8*>(new_data.data());
+		for (u32 i = 0; i < npixels; i++)
+			dst[i] = data[4*i];
+		return COLOR_GRAY;
+	} else {
+		// convert to RGB
+		new_data.resize(width * 3 * height);
+		u8 *dst = reinterpret_cast<u8*>(new_data.data());
+		for (u32 i = 0; i < npixels; i++)
+			memcpy(&dst[3*i], &data[4*i], 3);
+		return COLOR_RGB;
+	}
 }
 
 std::string encodePNG(const u8 *data, u32 width, u32 height, s32 compression)
 {
-	std::ostringstream file(std::ios::binary);
-	file << "\x89PNG\r\n\x1a\n";
+	u8 color_type = COLOR_RGBA;
+	std::string new_data;
+	if (compression == Z_DEFAULT_COMPRESSION || compression >= 2) {
+		// try to reduce the image data to grayscale or RGB
+		if (auto ret = reduceColor(data, width, height, new_data); ret.has_value()) {
+			color_type = ret.value();
+			assert(!new_data.empty());
+			data = reinterpret_cast<u8*>(new_data.data());
+		}
+	}
+
+	std::string file;
+	file.append("\x89PNG\r\n\x1a\n");
 
 	{
-		std::ostringstream IHDR(std::ios::binary);
-		IHDR << "IHDR";
-		writeU32(IHDR, width);
-		writeU32(IHDR, height);
-		// 8 bpp, color type 6 (RGBA)
-		IHDR.write("\x08\x06\x00\x00\x00", 5);
-		writeChunk(file, IHDR.str());
+		std::ostringstream header(std::ios::binary);
+		header << "IHDR";
+		writeU32(header, width);
+		writeU32(header, height);
+		writeU8(header, 8); // bpp
+		writeU8(header, color_type);
+		header.write("\x00\x00\x00", 3);
+		writeChunk(file, header.str());
 	}
 
 	{
 		std::ostringstream IDAT(std::ios::binary);
 		IDAT << "IDAT";
-		std::ostringstream scanlines(std::ios::binary);
+		const u32 ps = color_type == COLOR_GRAY ? 1 :
+				(color_type == COLOR_RGB ? 3 : 4);
+		std::string scanlines;
+		scanlines.reserve(width * ps * height + height);
 		for(u32 i = 0; i < height; i++) {
-			scanlines.write("\x00", 1); // Null predictor
-			scanlines.write((const char*) data + width * 4 * i, width * 4);
+			scanlines.append(1, 0); // Null predictor
+			scanlines.append(reinterpret_cast<const char*>(data + width * ps * i),
+					width * ps);
 		}
-		compressZlib(scanlines.str(), IDAT, compression);
+		compressZlib(scanlines, IDAT, compression);
 		writeChunk(file, IDAT.str());
 	}
 
-	file.write("\x00\x00\x00\x00IEND\xae\x42\x60\x82", 12);
+	file.append("\x00\x00\x00\x00IEND\xae\x42\x60\x82", 12);
 
-	return file.str();
+	return file;
 }
diff --git a/src/util/png.h b/src/util/png.h
old mode 100755
new mode 100644
diff --git a/src/util/pointabilities.cpp b/src/util/pointabilities.cpp
new file mode 100644
index 000000000..575ae269b
--- /dev/null
+++ b/src/util/pointabilities.cpp
@@ -0,0 +1,147 @@
+/*
+Minetest
+Copyright (C) 2023 cx384
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "pointabilities.h"
+
+#include "serialize.h"
+#include "exceptions.h"
+#include <sstream>
+
+PointabilityType Pointabilities::deSerializePointabilityType(std::istream &is)
+{
+	PointabilityType pointable_type = static_cast<PointabilityType>(readU8(is));
+	switch(pointable_type) {
+		case PointabilityType::POINTABLE:
+		case PointabilityType::POINTABLE_NOT:
+		case PointabilityType::POINTABLE_BLOCKING:
+			break;
+		default:
+			// Default to POINTABLE in case of unknown PointabilityType type.
+			pointable_type = PointabilityType::POINTABLE;
+			break;
+	}
+	return pointable_type;
+}
+
+void Pointabilities::serializePointabilityType(std::ostream &os, PointabilityType pointable_type)
+{
+	writeU8(os, static_cast<u8>(pointable_type));
+}
+
+std::string Pointabilities::toStringPointabilityType(PointabilityType pointable_type)
+{
+	switch(pointable_type) {
+		case PointabilityType::POINTABLE:
+			return "true";
+		case PointabilityType::POINTABLE_NOT:
+			return "false";
+		case PointabilityType::POINTABLE_BLOCKING:
+			return "\"blocking\"";
+	}
+	return "unknown";
+}
+
+std::optional<PointabilityType> Pointabilities::matchNode(const std::string &name,
+	const ItemGroupList &groups) const
+{
+	auto i = nodes.find(name);
+	return i == nodes.end() ? matchGroups(groups, node_groups) : i->second;
+}
+
+std::optional<PointabilityType> Pointabilities::matchObject(const std::string &name,
+	const ItemGroupList &groups) const
+{
+	auto i = objects.find(name);
+	return i == objects.end() ? matchGroups(groups, object_groups) : i->second;
+}
+
+std::optional<PointabilityType> Pointabilities::matchPlayer(const ItemGroupList &groups) const
+{
+	return matchGroups(groups, object_groups);
+}
+
+std::optional<PointabilityType> Pointabilities::matchGroups(const ItemGroupList &groups,
+	const std::unordered_map<std::string, PointabilityType> &pointable_groups)
+{
+	// prefers POINTABLE over POINTABLE_NOT over POINTABLE_BLOCKING
+	bool blocking = false;
+	bool not_pointable = false;
+	for (auto const &ability : pointable_groups) {
+		if (itemgroup_get(groups, ability.first) > 0) {
+			switch(ability.second) {
+				case PointabilityType::POINTABLE:
+					return PointabilityType::POINTABLE;
+				case PointabilityType::POINTABLE_NOT:
+					not_pointable = true;
+					break;
+				default:
+					blocking = true;
+					break;
+			}
+		}
+	}
+	if (not_pointable)
+		return PointabilityType::POINTABLE_NOT;
+	if (blocking)
+		return PointabilityType::POINTABLE_BLOCKING;
+	return std::nullopt;
+}
+
+void Pointabilities::serializeTypeMap(std::ostream &os,
+	const std::unordered_map<std::string, PointabilityType> &map)
+{
+	writeU32(os, map.size());
+	for (const auto &entry : map) {
+		os << serializeString16(entry.first);
+		writeU8(os, (u8)entry.second);
+	}
+}
+
+void Pointabilities::deSerializeTypeMap(std::istream &is,
+	std::unordered_map<std::string, PointabilityType> &map)
+{
+	map.clear();
+	u32 size = readU32(is);
+	for (u32 i = 0; i < size; i++) {
+		std::string name = deSerializeString16(is);
+		PointabilityType type = Pointabilities::deSerializePointabilityType(is);
+		map[name] = type;
+	}
+}
+
+void Pointabilities::serialize(std::ostream &os) const
+{
+	writeU8(os, 0); // version
+	serializeTypeMap(os, nodes);
+	serializeTypeMap(os, node_groups);
+	serializeTypeMap(os, objects);
+	serializeTypeMap(os, object_groups);
+}
+
+void Pointabilities::deSerialize(std::istream &is)
+{
+	int version = readU8(is);
+	if (version != 0)
+		throw SerializationError("unsupported Pointabilities version");
+
+	deSerializeTypeMap(is, nodes);
+	deSerializeTypeMap(is, node_groups);
+	deSerializeTypeMap(is, objects);
+	deSerializeTypeMap(is, object_groups);
+}
diff --git a/src/util/pointabilities.h b/src/util/pointabilities.h
new file mode 100644
index 000000000..1ad57143b
--- /dev/null
+++ b/src/util/pointabilities.h
@@ -0,0 +1,79 @@
+/*
+Minetest
+Copyright (C) 2023 cx384
+
+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
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+#include <string>
+#include <unordered_map>
+#include "itemgroup.h"
+#include <optional>
+#include "irrlichttypes.h"
+
+enum class PointabilityType : u8
+{
+	// Can be pointed through.
+	// Note: This MUST be the 0-th item in the enum for backwards compat.
+	// Older Minetest versions send "pointable=false" as "0".
+	POINTABLE_NOT,
+	// Is pointable.
+	// Note: This MUST be the 1-th item in the enum for backwards compat:
+	// Older Minetest versions send "pointable=true" as "1".
+	POINTABLE,
+	// Note: Since (u8) 2 is truthy,
+	// older clients will understand this as "pointable=true",
+	// which is a reasonable fallback.
+	POINTABLE_BLOCKING,
+};
+
+// An object to store overridden pointable properties
+struct Pointabilities
+{
+	// Nodes
+	std::unordered_map<std::string, PointabilityType> nodes;
+	std::unordered_map<std::string, PointabilityType> node_groups;
+
+	// Objects
+	std::unordered_map<std::string, PointabilityType> objects;
+	std::unordered_map<std::string, PointabilityType> object_groups; // armor_groups
+
+	// Match functions return fitting pointability,
+	// otherwise the default pointability should be used.
+
+	std::optional<PointabilityType> matchNode(const std::string &name,
+		const ItemGroupList &groups) const;
+	std::optional<PointabilityType> matchObject(const std::string &name,
+		const ItemGroupList &groups) const;
+	// For players only armor groups will work
+	std::optional<PointabilityType> matchPlayer(const ItemGroupList &groups) const;
+
+	void serialize(std::ostream &os) const;
+	void deSerialize(std::istream &is);
+
+	// For a save enum conversion.
+	static PointabilityType deSerializePointabilityType(std::istream &is);
+	static void serializePointabilityType(std::ostream &os, PointabilityType pointable_type);
+	static std::string toStringPointabilityType(PointabilityType pointable_type);
+
+private:
+	static std::optional<PointabilityType> matchGroups(const ItemGroupList &groups,
+		const std::unordered_map<std::string, PointabilityType> &pointable_groups);
+	static void serializeTypeMap(std::ostream &os,
+		const std::unordered_map<std::string, PointabilityType> &map);
+	static void deSerializeTypeMap(std::istream &is,
+		std::unordered_map<std::string, PointabilityType> &map);
+};
diff --git a/src/util/pointedthing.cpp b/src/util/pointedthing.cpp
index ec94f955c..1b7228064 100644
--- a/src/util/pointedthing.cpp
+++ b/src/util/pointedthing.cpp
@@ -26,29 +26,6 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "exceptions.h"
 #include <sstream>
 
-PointedThing::PointedThing(const v3s16 &under, const v3s16 &above,
-	const v3s16 &real_under, const v3f &point, const v3f &normal,
-	u16 box_id, f32 distSq):
-	type(POINTEDTHING_NODE),
-	node_undersurface(under),
-	node_abovesurface(above),
-	node_real_undersurface(real_under),
-	intersection_point(point),
-	intersection_normal(normal),
-	box_id(box_id),
-	distanceSq(distSq)
-{}
-
-PointedThing::PointedThing(u16 id, const v3f &point,
-  const v3f &normal, const v3f &raw_normal, f32 distSq) :
-	type(POINTEDTHING_OBJECT),
-	object_id(id),
-	intersection_point(point),
-	intersection_normal(normal),
-	raw_intersection_normal(raw_normal),
-	distanceSq(distSq)
-{}
-
 std::string PointedThing::dump() const
 {
 	std::ostringstream os(std::ios::binary);
@@ -95,7 +72,7 @@ void PointedThing::deSerialize(std::istream &is)
 	int version = readU8(is);
 	if (version != 0) throw SerializationError(
 			"unsupported PointedThing version");
-	type = (PointedThingType) readU8(is);
+	type = static_cast<PointedThingType>(readU8(is));
 	switch (type) {
 	case POINTEDTHING_NOTHING:
 		break;
@@ -159,18 +136,14 @@ bool PointedThing::operator==(const PointedThing &pt2) const
 	{
 		if ((node_undersurface != pt2.node_undersurface)
 				|| (node_abovesurface != pt2.node_abovesurface)
-				|| (node_real_undersurface != pt2.node_real_undersurface))
+				|| (node_real_undersurface != pt2.node_real_undersurface)
+				|| (pointability != pt2.pointability))
 			return false;
 	}
 	else if (type == POINTEDTHING_OBJECT)
 	{
-		if (object_id != pt2.object_id)
+		if (object_id != pt2.object_id || pointability != pt2.pointability)
 			return false;
 	}
 	return true;
 }
-
-bool PointedThing::operator!=(const PointedThing &pt2) const
-{
-	return !(*this == pt2);
-}
diff --git a/src/util/pointedthing.h b/src/util/pointedthing.h
index 76e8f428f..7f46fdda3 100644
--- a/src/util/pointedthing.h
+++ b/src/util/pointedthing.h
@@ -22,13 +22,15 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "util/msgpack_serialize.h"
+
 #include "irrlichttypes.h"
 #include "irr_v3d.h"
 #include <iostream>
 #include <string>
-#include "util/msgpack_serialize.h"
+#include "pointabilities.h"
 
-enum PointedThingType
+enum PointedThingType :u8
 {
 	POINTEDTHING_NOTHING,
 	POINTEDTHING_NODE,
@@ -47,6 +49,8 @@ struct PointedThing
 {
 	//! The type of the pointed object.
 	PointedThingType type = POINTEDTHING_NOTHING;
+	//! How the object or node can be pointed at.
+	PointabilityType pointability = PointabilityType::POINTABLE_NOT;
 	/*!
 	 * Only valid if type is POINTEDTHING_NODE.
 	 * The coordinates of the node which owns the
@@ -73,6 +77,11 @@ struct PointedThing
 	 * The ID of the object the ray hit.
 	 */
 	u16 object_id = 0;
+	/*!
+	 * Only valid if type isn't POINTEDTHING_NONE.
+	 * Indicates which selection box is selected, if there are more of them.
+	 */
+	u16 box_id = 0;
 	/*!
 	 * Only valid if type isn't POINTEDTHING_NONE.
 	 * First intersection point of the ray and the nodebox in irrlicht
@@ -91,11 +100,6 @@ struct PointedThing
 	 * Raw normal vector of the intersection before applying rotation.
 	 */
 	v3f raw_intersection_normal;
-	/*!
-	 * Only valid if type isn't POINTEDTHING_NONE.
-	 * Indicates which selection box is selected, if there are more of them.
-	 */
-	u16 box_id = 0;
 	/*!
 	 * Square of the distance between the pointing
 	 * ray's start point and the intersection point in irrlicht coordinates.
@@ -105,21 +109,46 @@ struct PointedThing
 	//! Constructor for POINTEDTHING_NOTHING
 	PointedThing() = default;
 	//! Constructor for POINTEDTHING_NODE
-	PointedThing(const v3s16 &under, const v3s16 &above,
-		const v3s16 &real_under, const v3f &point, const v3f &normal,
-		u16 box_id, f32 distSq);
+	inline PointedThing(const v3s16 under, const v3s16 above,
+		const v3s16 real_under, const v3f point, const v3f normal,
+		u16 box_id, f32 distSq, PointabilityType pointab) :
+		type(POINTEDTHING_NODE),
+		pointability(pointab),
+		node_undersurface(under),
+		node_abovesurface(above),
+		node_real_undersurface(real_under),
+		box_id(box_id),
+		intersection_point(point),
+		intersection_normal(normal),
+		distanceSq(distSq)
+	{}
 	//! Constructor for POINTEDTHING_OBJECT
-	PointedThing(u16 id, const v3f &point, const v3f &normal, const v3f &raw_normal, f32 distSq);
+	inline PointedThing(u16 id, const v3f point, const v3f normal,
+		const v3f raw_normal, f32 distSq, PointabilityType pointab) :
+		type(POINTEDTHING_OBJECT),
+		pointability(pointab),
+		object_id(id),
+		intersection_point(point),
+		intersection_normal(normal),
+		raw_intersection_normal(raw_normal),
+		distanceSq(distSq)
+	{}
+
 	std::string dump() const;
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
+
 	/*!
 	 * This function ignores the intersection point and normal.
 	 */
 	bool operator==(const PointedThing &pt2) const;
-	bool operator!=(const PointedThing &pt2) const;
 
 	// fm:
 	void msgpack_pack(msgpack::packer<msgpack::sbuffer> &pk) const;
 	void msgpack_unpack(msgpack::object o);
+    // ==
+
+	bool operator!=(const PointedThing &pt2) const {
+		return !(*this == pt2);
+	}
 };
diff --git a/src/util/pointer.h b/src/util/pointer.h
index 395592075..35ef084d3 100644
--- a/src/util/pointer.h
+++ b/src/util/pointer.h
@@ -26,6 +26,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h" // For assert()
 #include <cstring>
 #include <memory> // std::shared_ptr
+#include <string_view>
 
 
 template<typename T> class ConstSharedPtr {
@@ -136,6 +137,13 @@ public:
 		return m_size;
 	}
 
+	operator std::string_view() const
+	{
+		if (!data)
+			return std::string_view();
+		return std::string_view(reinterpret_cast<char*>(data), m_size);
+	}
+
 private:
 	void drop()
 	{
diff --git a/src/util/quicktune.cpp b/src/util/quicktune.cpp
index 20455d03d..a082aca06 100644
--- a/src/util/quicktune.cpp
+++ b/src/util/quicktune.cpp
@@ -34,6 +34,7 @@ std::string QuicktuneValue::getString()
 	}
 	return "<invalid type>";
 }
+
 void QuicktuneValue::relativeAdd(float amount)
 {
 	switch(type){
@@ -51,24 +52,16 @@ void QuicktuneValue::relativeAdd(float amount)
 
 static std::map<std::string, QuicktuneValue> g_values;
 static std::vector<std::string> g_names;
-std::mutex *g_mutex = NULL;
+static std::mutex g_mutex;
 
-static void makeMutex()
-{
-	if(!g_mutex){
-		g_mutex = new std::mutex();
-	}
-}
-
-std::vector<std::string> getQuicktuneNames()
+const std::vector<std::string> &getQuicktuneNames()
 {
 	return g_names;
 }
 
 QuicktuneValue getQuicktuneValue(const std::string &name)
 {
-	makeMutex();
-	MutexAutoLock lock(*g_mutex);
+	MutexAutoLock lock(g_mutex);
 	std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
 	if(i == g_values.end()){
 		QuicktuneValue val;
@@ -80,17 +73,15 @@ QuicktuneValue getQuicktuneValue(const std::string &name)
 
 void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
 {
-	makeMutex();
-	MutexAutoLock lock(*g_mutex);
+	MutexAutoLock lock(g_mutex);
 	g_values[name] = val;
 	g_values[name].modified = true;
 }
 
 void updateQuicktuneValue(const std::string &name, QuicktuneValue &val)
 {
-	makeMutex();
-	MutexAutoLock lock(*g_mutex);
-	std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
+	MutexAutoLock lock(g_mutex);
+	auto i = g_values.find(name);
 	if(i == g_values.end()){
 		g_values[name] = val;
 		g_names.push_back(name);
diff --git a/src/util/quicktune.h b/src/util/quicktune.h
index 538b3bd9c..fb1e63fa6 100644
--- a/src/util/quicktune.h
+++ b/src/util/quicktune.h
@@ -77,7 +77,7 @@ struct QuicktuneValue
 	void relativeAdd(float amount);
 };
 
-std::vector<std::string> getQuicktuneNames();
+const std::vector<std::string> &getQuicktuneNames();
 QuicktuneValue getQuicktuneValue(const std::string &name);
 void setQuicktuneValue(const std::string &name, const QuicktuneValue &val);
 
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
index 6b400f6d4..ec671c355 100644
--- a/src/util/serialize.cpp
+++ b/src/util/serialize.cpp
@@ -37,7 +37,7 @@ FloatType g_serialize_f32_type = FLOATTYPE_UNKNOWN;
 //// String
 ////
 
-std::string serializeString16(const std::string &plain)
+std::string serializeString16(std::string_view plain)
 {
 	std::string s;
 	char buf[2];
@@ -79,7 +79,7 @@ std::string deSerializeString16(std::istream &is)
 //// Long String
 ////
 
-std::string serializeString32(const std::string &plain)
+std::string serializeString32(std::string_view plain)
 {
 	std::string s;
 	char buf[4];
@@ -125,7 +125,7 @@ std::string deSerializeString32(std::istream &is)
 //// JSON-like strings
 ////
 
-std::string serializeJsonString(const std::string &plain)
+std::string serializeJsonString(std::string_view plain)
 {
 	std::string tmp;
 
@@ -266,13 +266,13 @@ std::string deSerializeJsonString(std::istream &is)
 	return tmp;
 }
 
-std::string serializeJsonStringIfNeeded(const std::string &s)
+std::string serializeJsonStringIfNeeded(std::string_view s)
 {
 	for (size_t i = 0; i < s.size(); ++i) {
 		if (s[i] <= 0x1f || s[i] >= 0x7f || s[i] == ' ' || s[i] == '\"')
 			return serializeJsonString(s);
 	}
-	return s;
+	return std::string(s);
 }
 
 std::string deSerializeJsonStringIfNeeded(std::istream &is)
diff --git a/src/util/serialize.h b/src/util/serialize.h
index 777b6ba55..27080cbd2 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -24,27 +24,38 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h" // for SerializationError
-#include "debug.h" // for assert
 #include "ieee_float.h"
 
 #include "config.h"
-#if HAVE_ENDIAN_H
-	#ifdef _WIN32
-		#define __BYTE_ORDER 0
-		#define __LITTLE_ENDIAN 0
-		#define __BIG_ENDIAN 1
-	#elif defined(__MACH__) && defined(__APPLE__)
-		#include <machine/endian.h>
-	#elif defined(__FreeBSD__) || defined(__DragonFly__)
-		#include <sys/endian.h>
-	#else
-		#include <endian.h>
-	#endif
-#endif
 #include <cstring> // for memcpy
+#include <cassert>
 #include <iostream>
 #include <string>
-#include <vector>
+#include <string_view>
+
+/* make sure BYTE_ORDER macros are available */
+#ifdef _WIN32
+	#define BYTE_ORDER 1234
+#elif defined(__MACH__) && defined(__APPLE__)
+	#include <machine/endian.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+	#include <sys/endian.h>
+#elif HAVE_ENDIAN_H
+	#include <endian.h>
+#else
+	#error "Can't detect endian (missing header)"
+#endif
+#ifndef LITTLE_ENDIAN
+	#define LITTLE_ENDIAN 1234
+#endif
+#ifndef BIG_ENDIAN
+	#define BIG_ENDIAN 4321
+#endif
+#if !defined(BYTE_ORDER) && defined(_BYTE_ORDER)
+	#define BYTE_ORDER _BYTE_ORDER
+#elif !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
+	#define BYTE_ORDER __BYTE_ORDER
+#endif
 
 #include "../msgpack_fix.h"
 #include "msgpack_define_external.h"
@@ -286,7 +297,7 @@ inline v3f readV3F32(const u8 *data)
 
 inline void writeU8(u8 *data, u8 i)
 {
-	data[0] = (i >> 0) & 0xFF;
+	data[0] = i;
 }
 
 inline void writeS8(u8 *data, s8 i)
@@ -461,19 +472,19 @@ inline v3f clampToF1000(v3f v)
 }
 
 // Creates a string with the length as the first two bytes
-std::string serializeString16(const std::string &plain);
+std::string serializeString16(std::string_view plain);
 
 // Reads a string with the length as the first two bytes
 std::string deSerializeString16(std::istream &is);
 
 // Creates a string with the length as the first four bytes
-std::string serializeString32(const std::string &plain);
+std::string serializeString32(std::string_view plain);
 
 // Reads a string with the length as the first four bytes
 std::string deSerializeString32(std::istream &is);
 
 // Creates a string encoded in JSON format (almost equivalent to a C string literal)
-std::string serializeJsonString(const std::string &plain);
+std::string serializeJsonString(std::string_view plain);
 
 // Reads a string encoded in JSON format
 std::string deSerializeJsonString(std::istream &is);
@@ -489,7 +500,7 @@ MSGPACK_DEFINE_EXTERNAL(aabb3f, MinEdge, MaxEdge);
 
 // If the string contains spaces, quotes or control characters, encodes as JSON.
 // Else returns the string unmodified.
-std::string serializeJsonStringIfNeeded(const std::string &s);
+std::string serializeJsonStringIfNeeded(std::string_view s);
 
 // Parses a string serialized by serializeJsonStringIfNeeded.
 std::string deSerializeJsonStringIfNeeded(std::istream &is);
diff --git a/src/util/sha1.cpp b/src/util/sha1.cpp
index ba95909ff..5d8b92598 100644
--- a/src/util/sha1.cpp
+++ b/src/util/sha1.cpp
@@ -65,7 +65,7 @@ void SHA1::storeBigEndianUint32( unsigned char* byte, Uint32 num )
 SHA1::SHA1()
 {
 	// make sure that the data type is the right size
-	assert( sizeof( Uint32 ) * 5 == 20 );
+	static_assert( sizeof( Uint32 ) * 5 == 20 );
 }
 
 // Destructor ********************************************************
@@ -134,20 +134,19 @@ void SHA1::process()
 }
 
 // addBytes **********************************************************
-void SHA1::addBytes( const char* data, int num )
+void SHA1::addBytes( const char* data, Uint32 num )
 {
 	assert( data );
-	assert( num >= 0 );
 	// add these bytes to the running total
 	size += num;
 	// repeat until all data is processed
 	while( num > 0 )
 	{
 		// number of bytes required to complete block
-		int needed = 64 - unprocessedBytes;
-		assert( needed > 0 );
+		Uint32 needed = 64 - unprocessedBytes;
+		assert( needed <= 64 );
 		// number of bytes to copy (use smaller of two)
-		int toCopy = (num < needed) ? num : needed;
+		Uint32 toCopy = (num < needed) ? num : needed;
 		// Copy the bytes
 		memcpy( bytes + unprocessedBytes, data, toCopy );
 		// Bytes have been copied
@@ -161,7 +160,7 @@ void SHA1::addBytes( const char* data, int num )
 }
 
 // digest ************************************************************
-unsigned char* SHA1::getDigest()
+void SHA1::getDigest(unsigned char *digest)
 {
 	// save the message size
 	Uint32 totalBitsL = size << 3;
@@ -179,20 +178,16 @@ unsigned char* SHA1::getDigest()
 		addBytes( (char*)footer, 64 - unprocessedBytes);
 	assert( unprocessedBytes <= 56 );
 	// how many zeros do we need
-	int neededZeros = 56 - unprocessedBytes;
+	Uint32 neededZeros = 56 - unprocessedBytes;
 	// store file size (in bits) in big-endian format
 	storeBigEndianUint32( footer + neededZeros    , totalBitsH );
 	storeBigEndianUint32( footer + neededZeros + 4, totalBitsL );
 	// finish the final block
 	addBytes( (char*)footer, neededZeros + 8 );
-	// allocate memory for the digest bytes
-	unsigned char* digest = (unsigned char*)malloc( 20 );
 	// copy the digest bytes
 	storeBigEndianUint32( digest, H0 );
 	storeBigEndianUint32( digest + 4, H1 );
 	storeBigEndianUint32( digest + 8, H2 );
 	storeBigEndianUint32( digest + 12, H3 );
 	storeBigEndianUint32( digest + 16, H4 );
-	// return the digest
-	return digest;
 }
diff --git a/src/util/sha1.h b/src/util/sha1.h
index 20f89eae6..81eeeca97 100644
--- a/src/util/sha1.h
+++ b/src/util/sha1.h
@@ -26,7 +26,11 @@ SOFTWARE.
 
 #pragma once
 
-typedef unsigned int Uint32;
+#include <cstdint>
+#include <string>
+#include <string_view>
+
+typedef uint32_t Uint32;
 
 class SHA1
 {
@@ -38,15 +42,24 @@ private:
 	Uint32 H3 = 0x10325476;
 	Uint32 H4 = 0xc3d2e1f0;
 	unsigned char bytes[64];
-	int unprocessedBytes = 0;
+	Uint32 unprocessedBytes = 0;
 	Uint32 size = 0;
 	void process();
 
 public:
 	SHA1();
 	~SHA1();
-	void addBytes(const char *data, int num);
-	unsigned char *getDigest();
+	void addBytes(const char *data, Uint32 num);
+	inline void addBytes(std::string_view data) {
+		addBytes(data.data(), data.size());
+	}
+	void getDigest(unsigned char *to);
+	inline std::string getDigest() {
+		std::string ret(20, '\000');
+		getDigest(reinterpret_cast<unsigned char*>(ret.data()));
+		return ret;
+	}
+
 	// utility methods
 	static Uint32 lrot(Uint32 x, int bits);
 	static void storeBigEndianUint32(unsigned char *byte, Uint32 num);
diff --git a/src/util/sha256.c b/src/util/sha256.c
deleted file mode 100644
index 5854ca754..000000000
--- a/src/util/sha256.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* crypto/sha/sha256.c */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  All rights reserved
- * according to the OpenSSL license [found in ../../LICENSE].
- * ====================================================================
- */
-# include <stdlib.h>
-# include <string.h>
-
-# include <util/sha2.h>
-
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2a 19 Mar 2015"
-# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
-
-const char SHA256_version[] = "SHA-256" OPENSSL_VERSION_PTEXT;
-
-/* mem_clr.c */
-unsigned static char cleanse_ctr = 0;
-static void OPENSSL_cleanse(void *ptr, size_t len)
-{
-    unsigned char *p = (unsigned char *)ptr;
-    size_t loop = len, ctr = cleanse_ctr;
-    while (loop--) {
-        *(p++) = (unsigned char)ctr;
-        ctr += (17 + ((size_t)p & 0xF));
-    }
-    p = (unsigned char *)memchr(ptr, (unsigned char)ctr, len);
-    if (p)
-        ctr += (63 + (size_t)p);
-    cleanse_ctr = (unsigned char)ctr;
-}
-
-fips_md_init_ctx(mt_SHA224, mt_SHA256)
-{
-    memset(c, 0, sizeof(*c));
-    c->h[0] = 0xc1059ed8UL;
-    c->h[1] = 0x367cd507UL;
-    c->h[2] = 0x3070dd17UL;
-    c->h[3] = 0xf70e5939UL;
-    c->h[4] = 0xffc00b31UL;
-    c->h[5] = 0x68581511UL;
-    c->h[6] = 0x64f98fa7UL;
-    c->h[7] = 0xbefa4fa4UL;
-    c->md_len = SHA224_DIGEST_LENGTH;
-    return 1;
-}
-
-fips_md_init(mt_SHA256)
-{
-    memset(c, 0, sizeof(*c));
-    c->h[0] = 0x6a09e667UL;
-    c->h[1] = 0xbb67ae85UL;
-    c->h[2] = 0x3c6ef372UL;
-    c->h[3] = 0xa54ff53aUL;
-    c->h[4] = 0x510e527fUL;
-    c->h[5] = 0x9b05688cUL;
-    c->h[6] = 0x1f83d9abUL;
-    c->h[7] = 0x5be0cd19UL;
-    c->md_len = SHA256_DIGEST_LENGTH;
-    return 1;
-}
-
-unsigned char *mt_SHA224(const unsigned char *d, size_t n, unsigned char *md)
-{
-    mt_SHA256_CTX c;
-    static unsigned char m[SHA224_DIGEST_LENGTH];
-
-    if (md == NULL)
-        md = m;
-    mt_SHA224_Init(&c);
-    mt_SHA256_Update(&c, d, n);
-    mt_SHA256_Final(md, &c);
-    OPENSSL_cleanse(&c, sizeof(c));
-    return (md);
-}
-
-unsigned char *mt_SHA256(const unsigned char *d, size_t n, unsigned char *md)
-{
-    mt_SHA256_CTX c;
-    static unsigned char m[SHA256_DIGEST_LENGTH];
-
-    if (md == NULL)
-        md = m;
-    mt_SHA256_Init(&c);
-    mt_SHA256_Update(&c, d, n);
-    mt_SHA256_Final(md, &c);
-    OPENSSL_cleanse(&c, sizeof(c));
-    return (md);
-}
-
-int mt_SHA224_Update(mt_SHA256_CTX *c, const void *data, size_t len)
-{
-    return mt_SHA256_Update(c, data, len);
-}
-
-int mt_SHA224_Final(unsigned char *md, mt_SHA256_CTX *c)
-{
-    return mt_SHA256_Final(md, c);
-}
-
-# define DATA_ORDER_IS_BIG_ENDIAN
-
-# define HASH_LONG               SHA_LONG
-# define HASH_CTX                mt_SHA256_CTX
-# define HASH_CBLOCK             SHA_CBLOCK
-/*
- * Note that FIPS180-2 discusses "Truncation of the Hash Function Output."
- * default: case below covers for it. It's not clear however if it's
- * permitted to truncate to amount of bytes not divisible by 4. I bet not,
- * but if it is, then default: case shall be extended. For reference.
- * Idea behind separate cases for pre-defined lenghts is to let the
- * compiler decide if it's appropriate to unroll small loops.
- */
-# define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        unsigned int  nn;               \
-        switch ((c)->md_len)            \
-        {   case SHA224_DIGEST_LENGTH:  \
-                for (nn=0;nn<SHA224_DIGEST_LENGTH/4;nn++)       \
-                {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
-                break;                  \
-            case SHA256_DIGEST_LENGTH:  \
-                for (nn=0;nn<SHA256_DIGEST_LENGTH/4;nn++)       \
-                {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
-                break;                  \
-            default:                    \
-                if ((c)->md_len > SHA256_DIGEST_LENGTH) \
-                    return 0;                           \
-                for (nn=0;nn<(c)->md_len/4;nn++)                \
-                {   ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));   }  \
-                break;                  \
-        }                               \
-        } while (0)
-
-# define HASH_UPDATE             mt_SHA256_Update
-# define HASH_TRANSFORM          mt_SHA256_Transform
-# define HASH_FINAL              mt_SHA256_Final
-# define HASH_BLOCK_DATA_ORDER   sha256_block_data_order
-# ifndef SHA256_ASM
-static
-# endif
-void sha256_block_data_order(mt_SHA256_CTX *ctx, const void *in, size_t num);
-
-# include "md32_common.h"
-
-# ifndef SHA256_ASM
-static const SHA_LONG K256[64] = {
-    0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
-    0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
-    0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
-    0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
-    0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
-    0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
-    0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
-    0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
-    0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
-    0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
-    0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
-    0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
-    0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
-    0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
-    0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
-    0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-/*
- * FIPS specification refers to right rotations, while our ROTATE macro
- * is left one. This is why you might notice that rotation coefficients
- * differ from those observed in FIPS document by 32-N...
- */
-#  define Sigma0(x)       (ROTATE((x),30) ^ ROTATE((x),19) ^ ROTATE((x),10))
-#  define Sigma1(x)       (ROTATE((x),26) ^ ROTATE((x),21) ^ ROTATE((x),7))
-#  define sigma0(x)       (ROTATE((x),25) ^ ROTATE((x),14) ^ ((x)>>3))
-#  define sigma1(x)       (ROTATE((x),15) ^ ROTATE((x),13) ^ ((x)>>10))
-
-#  define Ch(x,y,z)       (((x) & (y)) ^ ((~(x)) & (z)))
-#  define Maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-#  ifdef OPENSSL_SMALL_FOOTPRINT
-
-static void sha256_block_data_order(mt_SHA256_CTX *ctx, const void *in,
-                                    size_t num)
-{
-    unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
-    SHA_LONG X[16], l;
-    int i;
-    const unsigned char *data = in;
-
-    while (num--) {
-
-        a = ctx->h[0];
-        b = ctx->h[1];
-        c = ctx->h[2];
-        d = ctx->h[3];
-        e = ctx->h[4];
-        f = ctx->h[5];
-        g = ctx->h[6];
-        h = ctx->h[7];
-
-        for (i = 0; i < 16; i++) {
-            HOST_c2l(data, l);
-            T1 = X[i] = l;
-            T1 += h + Sigma1(e) + Ch(e, f, g) + K256[i];
-            T2 = Sigma0(a) + Maj(a, b, c);
-            h = g;
-            g = f;
-            f = e;
-            e = d + T1;
-            d = c;
-            c = b;
-            b = a;
-            a = T1 + T2;
-        }
-
-        for (; i < 64; i++) {
-            s0 = X[(i + 1) & 0x0f];
-            s0 = sigma0(s0);
-            s1 = X[(i + 14) & 0x0f];
-            s1 = sigma1(s1);
-
-            T1 = X[i & 0xf] += s0 + s1 + X[(i + 9) & 0xf];
-            T1 += h + Sigma1(e) + Ch(e, f, g) + K256[i];
-            T2 = Sigma0(a) + Maj(a, b, c);
-            h = g;
-            g = f;
-            f = e;
-            e = d + T1;
-            d = c;
-            c = b;
-            b = a;
-            a = T1 + T2;
-        }
-
-        ctx->h[0] += a;
-        ctx->h[1] += b;
-        ctx->h[2] += c;
-        ctx->h[3] += d;
-        ctx->h[4] += e;
-        ctx->h[5] += f;
-        ctx->h[6] += g;
-        ctx->h[7] += h;
-
-    }
-}
-
-#  else
-
-#   define ROUND_00_15(i,a,b,c,d,e,f,g,h)          do {    \
-        T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];      \
-        h = Sigma0(a) + Maj(a,b,c);                     \
-        d += T1;        h += T1;                } while (0)
-
-#   define ROUND_16_63(i,a,b,c,d,e,f,g,h,X)        do {    \
-        s0 = X[(i+1)&0x0f];     s0 = sigma0(s0);        \
-        s1 = X[(i+14)&0x0f];    s1 = sigma1(s1);        \
-        T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f];    \
-        ROUND_00_15(i,a,b,c,d,e,f,g,h);         } while (0)
-
-static void sha256_block_data_order(mt_SHA256_CTX *ctx, const void *in,
-                                    size_t num)
-{
-    unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
-    SHA_LONG X[16];
-    int i;
-    const unsigned char *data = (const unsigned char *)in;
-    const union {
-        long one;
-        char little;
-    } is_endian = {
-        1
-    };
-
-    while (num--) {
-
-        a = ctx->h[0];
-        b = ctx->h[1];
-        c = ctx->h[2];
-        d = ctx->h[3];
-        e = ctx->h[4];
-        f = ctx->h[5];
-        g = ctx->h[6];
-        h = ctx->h[7];
-
-        if (!is_endian.little && sizeof(SHA_LONG) == 4
-            && ((size_t)in % 4) == 0) {
-            const SHA_LONG *W = (const SHA_LONG *)data;
-
-            T1 = X[0] = W[0];
-            ROUND_00_15(0, a, b, c, d, e, f, g, h);
-            T1 = X[1] = W[1];
-            ROUND_00_15(1, h, a, b, c, d, e, f, g);
-            T1 = X[2] = W[2];
-            ROUND_00_15(2, g, h, a, b, c, d, e, f);
-            T1 = X[3] = W[3];
-            ROUND_00_15(3, f, g, h, a, b, c, d, e);
-            T1 = X[4] = W[4];
-            ROUND_00_15(4, e, f, g, h, a, b, c, d);
-            T1 = X[5] = W[5];
-            ROUND_00_15(5, d, e, f, g, h, a, b, c);
-            T1 = X[6] = W[6];
-            ROUND_00_15(6, c, d, e, f, g, h, a, b);
-            T1 = X[7] = W[7];
-            ROUND_00_15(7, b, c, d, e, f, g, h, a);
-            T1 = X[8] = W[8];
-            ROUND_00_15(8, a, b, c, d, e, f, g, h);
-            T1 = X[9] = W[9];
-            ROUND_00_15(9, h, a, b, c, d, e, f, g);
-            T1 = X[10] = W[10];
-            ROUND_00_15(10, g, h, a, b, c, d, e, f);
-            T1 = X[11] = W[11];
-            ROUND_00_15(11, f, g, h, a, b, c, d, e);
-            T1 = X[12] = W[12];
-            ROUND_00_15(12, e, f, g, h, a, b, c, d);
-            T1 = X[13] = W[13];
-            ROUND_00_15(13, d, e, f, g, h, a, b, c);
-            T1 = X[14] = W[14];
-            ROUND_00_15(14, c, d, e, f, g, h, a, b);
-            T1 = X[15] = W[15];
-            ROUND_00_15(15, b, c, d, e, f, g, h, a);
-
-            data += SHA256_CBLOCK;
-        } else {
-            SHA_LONG l;
-
-            HOST_c2l(data, l);
-            T1 = X[0] = l;
-            ROUND_00_15(0, a, b, c, d, e, f, g, h);
-            HOST_c2l(data, l);
-            T1 = X[1] = l;
-            ROUND_00_15(1, h, a, b, c, d, e, f, g);
-            HOST_c2l(data, l);
-            T1 = X[2] = l;
-            ROUND_00_15(2, g, h, a, b, c, d, e, f);
-            HOST_c2l(data, l);
-            T1 = X[3] = l;
-            ROUND_00_15(3, f, g, h, a, b, c, d, e);
-            HOST_c2l(data, l);
-            T1 = X[4] = l;
-            ROUND_00_15(4, e, f, g, h, a, b, c, d);
-            HOST_c2l(data, l);
-            T1 = X[5] = l;
-            ROUND_00_15(5, d, e, f, g, h, a, b, c);
-            HOST_c2l(data, l);
-            T1 = X[6] = l;
-            ROUND_00_15(6, c, d, e, f, g, h, a, b);
-            HOST_c2l(data, l);
-            T1 = X[7] = l;
-            ROUND_00_15(7, b, c, d, e, f, g, h, a);
-            HOST_c2l(data, l);
-            T1 = X[8] = l;
-            ROUND_00_15(8, a, b, c, d, e, f, g, h);
-            HOST_c2l(data, l);
-            T1 = X[9] = l;
-            ROUND_00_15(9, h, a, b, c, d, e, f, g);
-            HOST_c2l(data, l);
-            T1 = X[10] = l;
-            ROUND_00_15(10, g, h, a, b, c, d, e, f);
-            HOST_c2l(data, l);
-            T1 = X[11] = l;
-            ROUND_00_15(11, f, g, h, a, b, c, d, e);
-            HOST_c2l(data, l);
-            T1 = X[12] = l;
-            ROUND_00_15(12, e, f, g, h, a, b, c, d);
-            HOST_c2l(data, l);
-            T1 = X[13] = l;
-            ROUND_00_15(13, d, e, f, g, h, a, b, c);
-            HOST_c2l(data, l);
-            T1 = X[14] = l;
-            ROUND_00_15(14, c, d, e, f, g, h, a, b);
-            HOST_c2l(data, l);
-            T1 = X[15] = l;
-            ROUND_00_15(15, b, c, d, e, f, g, h, a);
-        }
-
-        for (i = 16; i < 64; i += 8) {
-            ROUND_16_63(i + 0, a, b, c, d, e, f, g, h, X);
-            ROUND_16_63(i + 1, h, a, b, c, d, e, f, g, X);
-            ROUND_16_63(i + 2, g, h, a, b, c, d, e, f, X);
-            ROUND_16_63(i + 3, f, g, h, a, b, c, d, e, X);
-            ROUND_16_63(i + 4, e, f, g, h, a, b, c, d, X);
-            ROUND_16_63(i + 5, d, e, f, g, h, a, b, c, X);
-            ROUND_16_63(i + 6, c, d, e, f, g, h, a, b, X);
-            ROUND_16_63(i + 7, b, c, d, e, f, g, h, a, X);
-        }
-
-        ctx->h[0] += a;
-        ctx->h[1] += b;
-        ctx->h[2] += c;
-        ctx->h[3] += d;
-        ctx->h[4] += e;
-        ctx->h[5] += f;
-        ctx->h[6] += g;
-        ctx->h[7] += h;
-
-    }
-}
-
-#  endif
-# endif                         /* SHA256_ASM */
diff --git a/src/util/srp.cpp b/src/util/srp.cpp
index a9f69061f..8455774b7 100644
--- a/src/util/srp.cpp
+++ b/src/util/srp.cpp
@@ -26,7 +26,6 @@
  *
  */
 
-// clang-format off
 
 #include <cstddef>
 
@@ -37,7 +36,6 @@
 	#include <ctime>
 
 #endif
-// clang-format on
 
 #include <cstdlib>
 #include <cstring>
@@ -52,12 +50,14 @@
 	#include <mini-gmp.h>
 #endif
 
-#include <util/sha2.h>
+#include "my_sha256.h"
 
 #include "srp.h"
 //#define CSRP_USE_SHA1
 #define CSRP_USE_SHA256
 
+#define CSRP_MAX_HASH (SHA256_DIGEST_LENGTH)
+
 #define srp_dbg_data(data, datalen, prevtext) ;
 /*void srp_dbg_data(unsigned char * data, size_t datalen, char * prevtext)
 {
@@ -80,7 +80,6 @@ void *(*srp_alloc)(size_t) = &malloc;
 void *(*srp_realloc)(void *, size_t) = &realloc;
 void (*srp_free)(void *) = &free;
 
-// clang-format off
 void srp_set_memory_functions(
 		void *(*new_srp_alloc)(size_t),
 		void *(*new_srp_realloc)(void *, size_t),
@@ -90,7 +89,6 @@ void srp_set_memory_functions(
 	srp_realloc = new_srp_realloc;
 	srp_free = new_srp_free;
 }
-// clang-format on
 
 typedef struct {
 	mpz_t N;
@@ -222,7 +220,7 @@ static NGConstant *new_ng(SRP_NGType ng_type, const char *n_hex, const char *g_h
 }
 
 typedef union {
-	SHA_CTX sha;
+	// SHA_CTX sha;
 	mt_SHA256_CTX sha256;
 	// SHA512_CTX sha512;
 } HashCTX;
@@ -235,9 +233,9 @@ struct SRPVerifier {
 	unsigned char *bytes_B;
 	int authenticated;
 
-	unsigned char M[SHA512_DIGEST_LENGTH];
-	unsigned char H_AMK[SHA512_DIGEST_LENGTH];
-	unsigned char session_key[SHA512_DIGEST_LENGTH];
+	unsigned char M[CSRP_MAX_HASH];
+	unsigned char H_AMK[CSRP_MAX_HASH];
+	unsigned char session_key[CSRP_MAX_HASH];
 };
 
 struct SRPUser {
@@ -256,12 +254,11 @@ struct SRPUser {
 	unsigned char *password;
 	size_t password_len;
 
-	unsigned char M[SHA512_DIGEST_LENGTH];
-	unsigned char H_AMK[SHA512_DIGEST_LENGTH];
-	unsigned char session_key[SHA512_DIGEST_LENGTH];
+	unsigned char M[CSRP_MAX_HASH];
+	unsigned char H_AMK[CSRP_MAX_HASH];
+	unsigned char session_key[CSRP_MAX_HASH];
 };
 
-// clang-format off
 static int hash_init(SRP_HashAlgorithm alg, HashCTX *c)
 {
 	switch (alg) {
@@ -357,7 +354,6 @@ static size_t hash_length(SRP_HashAlgorithm alg)
 		default: return 0;
 	};
 }
-// clang-format on
 
 inline static int mpz_num_bytes(const mpz_t op)
 {
@@ -401,7 +397,7 @@ inline static void mpz_subm(
 static SRP_Result H_nn(
 	mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2)
 {
-	unsigned char buff[SHA512_DIGEST_LENGTH];
+	unsigned char buff[CSRP_MAX_HASH];
 	size_t len_N = mpz_num_bytes(N);
 	size_t len_n1 = mpz_num_bytes(n1);
 	size_t len_n2 = mpz_num_bytes(n2);
@@ -424,7 +420,7 @@ static SRP_Result H_nn(
 static SRP_Result H_ns(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *n,
 	size_t len_n, const unsigned char *bytes, size_t len_bytes)
 {
-	unsigned char buff[SHA512_DIGEST_LENGTH];
+	unsigned char buff[CSRP_MAX_HASH];
 	size_t nbytes = len_n + len_bytes;
 	unsigned char *bin = (unsigned char *)srp_alloc(nbytes);
 	if (!bin) return SRP_ERR;
@@ -440,7 +436,7 @@ static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char
 	size_t salt_len, const char *username, const unsigned char *password,
 	size_t password_len)
 {
-	unsigned char ucp_hash[SHA512_DIGEST_LENGTH];
+	unsigned char ucp_hash[CSRP_MAX_HASH];
 	HashCTX ctx;
 	hash_init(alg, &ctx);
 
@@ -481,10 +477,10 @@ static SRP_Result calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned ch
 	const char *I, const unsigned char *s_bytes, size_t s_len, const mpz_t A,
 	const mpz_t B, const unsigned char *K)
 {
-	unsigned char H_N[SHA512_DIGEST_LENGTH];
-	unsigned char H_g[SHA512_DIGEST_LENGTH];
-	unsigned char H_I[SHA512_DIGEST_LENGTH];
-	unsigned char H_xor[SHA512_DIGEST_LENGTH];
+	unsigned char H_N[CSRP_MAX_HASH];
+	unsigned char H_g[CSRP_MAX_HASH];
+	unsigned char H_I[CSRP_MAX_HASH];
+	unsigned char H_xor[CSRP_MAX_HASH];
 	HashCTX ctx;
 	size_t i = 0;
 	size_t hash_len = hash_length(alg);
@@ -588,7 +584,6 @@ static SRP_Result init_random()
  *
  ***********************************************************************************************************/
 
-// clang-format off
 SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg,
 	SRP_NGType ng_type, const char *username_for_verifier,
 	const unsigned char *password, size_t len_password,
@@ -600,7 +595,6 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg,
 
 	mpz_t v; mpz_init(v);
 	mpz_t x; mpz_init(x);
-	// clang-format on
 
 	NGConstant *ng = new_ng(ng_type, n_hex, g_hex);
 
@@ -646,7 +640,6 @@ error_and_exit:
 	goto cleanup_and_exit;
 }
 
-// clang-format off
 
 /* Out: bytes_B, len_B.
  *
@@ -671,7 +664,6 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg,
 	mpz_t tmp1; mpz_init(tmp1);
 	mpz_t tmp2; mpz_init(tmp2);
 	mpz_t tmp3; mpz_init(tmp3);
-	// clang-format on
 	size_t ulen = strlen(username) + 1;
 	NGConstant *ng = new_ng(ng_type, n_hex, g_hex);
 	struct SRPVerifier *ver = 0;
@@ -808,7 +800,7 @@ size_t srp_verifier_get_session_key_length(struct SRPVerifier *ver)
 	return hash_length(ver->hash_alg);
 }
 
-/* user_M must be exactly SHA512_DIGEST_LENGTH bytes in size */
+/* user_M must be exactly CSRP_MAX_HASH bytes in size */
 void srp_verifier_verify_session(
 	struct SRPVerifier *ver, const unsigned char *user_M, unsigned char **bytes_HAMK)
 {
@@ -922,13 +914,11 @@ size_t srp_user_get_session_key_length(struct SRPUser *usr)
 	return hash_length(usr->hash_alg);
 }
 
-// clang-format off
 /* Output: username, bytes_A, len_A */
 SRP_Result srp_user_start_authentication(struct SRPUser *usr, char **username,
 	const unsigned char *bytes_a, size_t len_a,
 	unsigned char **bytes_A, size_t *len_A)
 {
-	// clang-format on
 	if (bytes_a) {
 		mpz_from_bin(bytes_a, len_a, usr->a);
 	} else {
@@ -956,8 +946,7 @@ error_and_exit:
 	return SRP_ERR;
 }
 
-// clang-format off
-/* Output: bytes_M. Buffer length is SHA512_DIGEST_LENGTH */
+/* Output: bytes_M. Buffer length is CSRP_MAX_HASH */
 void  srp_user_process_challenge(struct SRPUser *usr,
 	const unsigned char *bytes_s, size_t len_s,
 	const unsigned char *bytes_B, size_t len_B,
@@ -972,7 +961,6 @@ void  srp_user_process_challenge(struct SRPUser *usr,
 	mpz_t tmp2; mpz_init(tmp2);
 	mpz_t tmp3; mpz_init(tmp3);
 	mpz_t tmp4; mpz_init(tmp4);
-	// clang-format on
 
 	if(len_M)
 		*len_M = 0;
@@ -997,7 +985,6 @@ void  srp_user_process_challenge(struct SRPUser *usr,
 
 		srp_dbg_num(v, "Client calculated v: ");
 
-		// clang-format off
 		/* S = (B - k*(g^x)) ^ (a + ux) */
 		mpz_mul(tmp1, u, x);
 		mpz_add(tmp2, usr->a, tmp1);               /* tmp2 = (a + ux)      */
@@ -1005,7 +992,6 @@ void  srp_user_process_challenge(struct SRPUser *usr,
 		mpz_mulm(tmp3, k, tmp1, usr->ng->N, tmp4); /* tmp3 = k*(g^x)       */
 		mpz_subm(tmp1, B, tmp3, usr->ng->N, tmp4); /* tmp1 = (B - K*(g^x)) */
 		mpz_powm(usr->S, tmp1, tmp2, usr->ng->N);
-		// clang-format on
 
 		if (!hash_num(usr->hash_alg, usr->S, usr->session_key)) goto cleanup_and_exit;
 
diff --git a/src/util/srp.h b/src/util/srp.h
index cf2bdec50..ac66dc936 100644
--- a/src/util/srp.h
+++ b/src/util/srp.h
@@ -79,8 +79,6 @@ typedef enum {
 	SRP_OK,
 } SRP_Result;
 
-// clang-format off
-
 /* Sets the memory functions used by srp.
  * Note: this doesn't set the memory functions used by gmp,
  * but it is supported to have different functions for srp and gmp.
@@ -130,8 +128,6 @@ struct SRPVerifier* srp_verifier_new(SRP_HashAlgorithm alg, SRP_NGType ng_type,
 	unsigned char** bytes_B, size_t *len_B,
 	const char* n_hex, const char* g_hex);
 
-// clang-format on
-
 void srp_verifier_delete(struct SRPVerifier *ver);
 
 // srp_verifier_verify_session must have been called before
@@ -170,8 +166,6 @@ const unsigned char *srp_user_get_session_key(struct SRPUser *usr, size_t *key_l
 
 size_t srp_user_get_session_key_length(struct SRPUser *usr);
 
-// clang-format off
-
 /* Output: username, bytes_A, len_A.
  * If you don't want it get written, set username to NULL.
  * If bytes_a == NULL, random data is used for a. */
@@ -185,7 +179,6 @@ void srp_user_process_challenge(struct SRPUser *usr,
 	const unsigned char *bytes_s, size_t len_s,
 	const unsigned char *bytes_B, size_t len_B,
 	unsigned char **bytes_M, size_t *len_M);
-// clang-format on
 
 /* bytes_HAMK must be exactly srp_user_get_session_key_length() bytes in size */
 void srp_user_verify_session(struct SRPUser *usr, const unsigned char *bytes_HAMK);
diff --git a/src/util/strfnd.h b/src/util/strfnd.h
index 4ba599437..296e37a82 100644
--- a/src/util/strfnd.h
+++ b/src/util/strfnd.h
@@ -20,14 +20,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include <string>
+#include <string_view>
 
+// FIXME: convert this class to string_view
 template <typename T>
 class BasicStrfnd {
 	typedef std::basic_string<T> String;
 	String str;
 	size_t pos;
 public:
-	BasicStrfnd(const String &s) : str(s), pos(0) {}
+	BasicStrfnd(const String &s) { start(s); }
+	BasicStrfnd(const T *ptr) { str = ptr; pos = 0; }
+	BasicStrfnd(std::basic_string_view<T> sv) { str = sv; pos = 0; }
+
 	void start(const String &s) { str = s; pos = 0; }
 	size_t where() { return pos; }
 	void to(size_t i) { pos = i; }
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 9f5767937..f6435c627 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -21,7 +21,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "string.h"
-#include "pointer.h"
+#include "serialize.h" // BYTE_ORDER
 #include "numeric.h"
 
 #include <cctype>
@@ -153,79 +153,92 @@ std::string wide_to_narrow(const std::wstring &input) {
 #include <iomanip>
 #include <unordered_map>
 
-/*
 #ifndef _WIN32
 	#include <iconv.h>
 #else
 	#include <windows.h>
 #endif
 
-*/
-
 std::wstring utf8_to_wide(const std::string &input) { return narrow_to_wide(input); };
 std::string wide_to_utf8(const std::wstring &input) { return wide_to_narrow(input); };
 
-/*
 #ifndef _WIN32
 
-static bool convert(const char *to, const char *from, char *outbuf,
-		size_t *outbuf_size, char *inbuf, size_t inbuf_size)
+namespace {
+	class IconvSmartPointer {
+		iconv_t m_cd;
+		static const iconv_t null_value;
+	public:
+		IconvSmartPointer() : m_cd(null_value) {}
+		~IconvSmartPointer() { reset(); }
+
+		DISABLE_CLASS_COPY(IconvSmartPointer)
+		ALLOW_CLASS_MOVE(IconvSmartPointer)
+
+		iconv_t get() const { return m_cd; }
+		operator bool() const { return m_cd != null_value; }
+		void reset(iconv_t cd = null_value) {
+			if (m_cd != null_value)
+				iconv_close(m_cd);
+			m_cd = cd;
+		}
+	};
+
+	// note that this can't be constexpr if iconv_t is a pointer
+	const iconv_t IconvSmartPointer::null_value = (iconv_t) -1;
+}
+
+static bool convert(iconv_t cd, char *outbuf, size_t *outbuf_size,
+	char *inbuf, size_t inbuf_size)
 {
-	iconv_t cd = iconv_open(to, from);
+	// reset conversion state
+	iconv(cd, nullptr, nullptr, nullptr, nullptr);
 
 	char *inbuf_ptr = inbuf;
 	char *outbuf_ptr = outbuf;
 
-	size_t *inbuf_left_ptr = &inbuf_size;
-
 	const size_t old_outbuf_size = *outbuf_size;
 	size_t old_size = inbuf_size;
 	while (inbuf_size > 0) {
-		iconv(cd, &inbuf_ptr, inbuf_left_ptr, &outbuf_ptr, outbuf_size);
+		iconv(cd, &inbuf_ptr, &inbuf_size, &outbuf_ptr, outbuf_size);
 		if (inbuf_size == old_size) {
-			iconv_close(cd);
 			return false;
 		}
 		old_size = inbuf_size;
 	}
 
-	iconv_close(cd);
 	*outbuf_size = old_outbuf_size - *outbuf_size;
 	return true;
 }
 
-#ifdef __ANDROID__
-// On Android iconv disagrees how big a wchar_t is for whatever reason
-const char *DEFAULT_ENCODING = "UTF-32LE";
-#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-	// NetBSD does not allow "WCHAR_T" as a charset input to iconv.
-	#include <sys/endian.h>
-	#if BYTE_ORDER == BIG_ENDIAN
-	const char *DEFAULT_ENCODING = "UTF-32BE";
-	#else
-	const char *DEFAULT_ENCODING = "UTF-32LE";
-	#endif
-#else
-const char *DEFAULT_ENCODING = "WCHAR_T";
-#endif
+// select right encoding for wchar_t size
+constexpr auto DEFAULT_ENCODING = ([] () -> const char* {
+	constexpr auto sz = sizeof(wchar_t);
+	static_assert(sz == 2 || sz == 4, "Unexpected wide char size");
+	if constexpr (sz == 2) {
+		return (BYTE_ORDER == BIG_ENDIAN) ? "UTF-16BE" : "UTF-16LE";
+	} else {
+		return (BYTE_ORDER == BIG_ENDIAN) ? "UTF-32BE" : "UTF-32LE";
+	}
+})();
 
-std::wstring utf8_to_wide(const std::string &input)
+std::wstring utf8_to_wide(std::string_view input)
 {
+	thread_local IconvSmartPointer cd;
+	if (!cd)
+		cd.reset(iconv_open(DEFAULT_ENCODING, "UTF-8"));
+
 	const size_t inbuf_size = input.length();
 	// maximum possible size, every character is sizeof(wchar_t) bytes
 	size_t outbuf_size = input.length() * sizeof(wchar_t);
 
 	char *inbuf = new char[inbuf_size]; // intentionally NOT null-terminated
-	memcpy(inbuf, input.c_str(), inbuf_size);
+	memcpy(inbuf, input.data(), inbuf_size);
 	std::wstring out;
 	out.resize(outbuf_size / sizeof(wchar_t));
 
-#if defined(__ANDROID__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-	static_assert(sizeof(wchar_t) == 4, "Unexpected wide char size");
-#endif
-
 	char *outbuf = reinterpret_cast<char*>(&out[0]);
-	if (!convert(DEFAULT_ENCODING, "UTF-8", outbuf, &outbuf_size, inbuf, inbuf_size)) {
+	if (!convert(cd.get(), outbuf, &outbuf_size, inbuf, inbuf_size)) {
 		infostream << "Couldn't convert UTF-8 string 0x" << hex_encode(input)
 			<< " into wstring" << std::endl;
 		delete[] inbuf;
@@ -237,18 +250,22 @@ std::wstring utf8_to_wide(const std::string &input)
 	return out;
 }
 
-std::string wide_to_utf8(const std::wstring &input)
+std::string wide_to_utf8(std::wstring_view input)
 {
+	thread_local IconvSmartPointer cd;
+	if (!cd)
+		cd.reset(iconv_open("UTF-8", DEFAULT_ENCODING));
+
 	const size_t inbuf_size = input.length() * sizeof(wchar_t);
 	// maximum possible size: utf-8 encodes codepoints using 1 up to 4 bytes
 	size_t outbuf_size = input.length() * 4;
 
 	char *inbuf = new char[inbuf_size]; // intentionally NOT null-terminated
-	memcpy(inbuf, input.c_str(), inbuf_size);
+	memcpy(inbuf, input.data(), inbuf_size);
 	std::string out;
 	out.resize(outbuf_size);
 
-	if (!convert("UTF-8", DEFAULT_ENCODING, &out[0], &outbuf_size, inbuf, inbuf_size)) {
+	if (!convert(cd.get(), &out[0], &outbuf_size, inbuf, inbuf_size)) {
 		infostream << "Couldn't convert wstring 0x" << hex_encode(inbuf, inbuf_size)
 			<< " into UTF-8 string" << std::endl;
 		delete[] inbuf;
@@ -262,24 +279,24 @@ std::string wide_to_utf8(const std::wstring &input)
 
 #else // _WIN32
 
-std::wstring utf8_to_wide(const std::string &input)
+std::wstring utf8_to_wide(std::string_view input)
 {
 	size_t outbuf_size = input.size() + 1;
 	wchar_t *outbuf = new wchar_t[outbuf_size];
 	memset(outbuf, 0, outbuf_size * sizeof(wchar_t));
-	MultiByteToWideChar(CP_UTF8, 0, input.c_str(), input.size(),
+	MultiByteToWideChar(CP_UTF8, 0, input.data(), input.size(),
 		outbuf, outbuf_size);
 	std::wstring out(outbuf);
 	delete[] outbuf;
 	return out;
 }
 
-std::string wide_to_utf8(const std::wstring &input)
+std::string wide_to_utf8(std::wstring_view input)
 {
 	size_t outbuf_size = (input.size() + 1) * 6;
 	char *outbuf = new char[outbuf_size];
 	memset(outbuf, 0, outbuf_size);
-	WideCharToMultiByte(CP_UTF8, 0, input.c_str(), input.size(),
+	WideCharToMultiByte(CP_UTF8, 0, input.data(), input.size(),
 		outbuf, outbuf_size, NULL, NULL);
 	std::string out(outbuf);
 	delete[] outbuf;
@@ -287,12 +304,10 @@ std::string wide_to_utf8(const std::wstring &input)
 }
 
 #endif // _WIN32
-*/
 
-
-std::string urlencode(const std::string &str)
+std::string urlencode(std::string_view str)
 {
-	// Encodes non-unreserved URI characters by a percent sign
+	// Encodes reserved URI characters by a percent sign
 	// followed by two hex digits. See RFC 3986, section 2.3.
 	static const char url_hex_chars[] = "0123456789ABCDEF";
 	std::ostringstream oss(std::ios::binary);
@@ -308,7 +323,7 @@ std::string urlencode(const std::string &str)
 	return oss.str();
 }
 
-std::string urldecode(const std::string &str)
+std::string urldecode(std::string_view str)
 {
 	// Inverse of urlencode
 	std::ostringstream oss(std::ios::binary);
@@ -385,7 +400,7 @@ std::string writeFlagString(u32 flags, const FlagDesc *flagdesc, u32 flagmask)
 	return result;
 }
 
-size_t mystrlcpy(char *dst, const char *src, size_t size)
+size_t mystrlcpy(char *dst, const char *src, size_t size) noexcept
 {
 	size_t srclen  = strlen(src) + 1;
 	size_t copylen = MYMIN(srclen, size);
@@ -398,7 +413,7 @@ size_t mystrlcpy(char *dst, const char *src, size_t size)
 	return srclen;
 }
 
-char *mystrtok_r(char *s, const char *sep, char **lasts)
+char *mystrtok_r(char *s, const char *sep, char **lasts) noexcept
 {
 	char *t;
 
@@ -753,11 +768,59 @@ bool parseColorString(const std::string &value, video::SColor &color, bool quiet
 	return success;
 }
 
+std::string encodeHexColorString(video::SColor color)
+{
+	std::string color_string = "#";
+	const char red = color.getRed();
+	const char green = color.getGreen();
+	const char blue = color.getBlue();
+	const char alpha = color.getAlpha();
+	color_string += hex_encode(&red, 1);
+	color_string += hex_encode(&green, 1);
+	color_string += hex_encode(&blue, 1);
+	color_string += hex_encode(&alpha, 1);
+	return color_string;
+}
+
 void str_replace(std::string &str, char from, char to)
 {
 	std::replace(str.begin(), str.end(), from, to);
 }
 
+std::string wrap_rows(std::string_view from, unsigned row_len, bool has_color_codes)
+{
+	std::string to;
+	to.reserve(from.size());
+	std::string last_color_code;
+
+	unsigned character_idx = 0;
+	bool inside_colorize = false;
+	for (size_t i = 0; i < from.size(); i++) {
+		if (!IS_UTF8_MULTB_INNER(from[i])) {
+			if (inside_colorize) {
+				last_color_code += from[i];
+				if (from[i] == ')') {
+					inside_colorize = false;
+				} else {
+					// keep reading
+				}
+			} else if (has_color_codes && from[i] == '\x1b') {
+				inside_colorize = true;
+				last_color_code = "\x1b";
+			} else {
+				// Wrap string after last inner byte of char
+				if (character_idx > 0 && character_idx % row_len == 0) {
+					to += '\n' + last_color_code;
+				}
+				character_idx++;
+			}
+		}
+		to += from[i];
+	}
+
+	return to;
+}
+
 /* Translated strings have the following format:
  * \x1bT marks the beginning of a translated string
  * \x1bE marks its end
@@ -780,10 +843,10 @@ void str_replace(std::string &str, char from, char to)
  * before filling it again.
  */
 
-void translate_all(const std::wstring &s, size_t &i,
+static void translate_all(const std::wstring &s, size_t &i,
 		Translations *translations, std::wstring &res);
 
-void translate_string(const std::wstring &s, Translations *translations,
+static void translate_string(const std::wstring &s, Translations *translations,
 		const std::wstring &textdomain, size_t &i, std::wstring &res)
 {
 	std::wostringstream output;
@@ -897,14 +960,15 @@ void translate_string(const std::wstring &s, Translations *translations,
 	res = result.str();
 }
 
-void translate_all(const std::wstring &s, size_t &i,
+static void translate_all(const std::wstring &s, size_t &i,
 		Translations *translations, std::wstring &res)
 {
-	std::wostringstream output;
+	res.clear();
+	res.reserve(s.length());
 	while (i < s.length()) {
 		// Not an escape sequence: just add the character.
 		if (s[i] != '\x1b') {
-			output.put(s[i]);
+			res.append(1, s[i]);
 			++i;
 			continue;
 		}
@@ -912,7 +976,7 @@ void translate_all(const std::wstring &s, size_t &i,
 		// We have an escape sequence: locate it and its data
 		// It is either a single character, or it begins with '('
 		// and extends up to the following ')', with '\' as an escape character.
-		size_t escape_start = i;
+		const size_t escape_start = i;
 		++i;
 		size_t start_index = i;
 		size_t length;
@@ -949,14 +1013,12 @@ void translate_all(const std::wstring &s, size_t &i,
 				textdomain = parts[1];
 			std::wstring translated;
 			translate_string(s, translations, textdomain, i, translated);
-			output << translated;
+			res.append(translated);
 		} else {
 			// Another escape sequence, such as colors. Preserve it.
-			output << std::wstring(s, escape_start, i - escape_start);
+			res.append(&s[escape_start], i - escape_start);
 		}
 	}
-
-	res = output.str();
 }
 
 // Translate string server side
@@ -978,7 +1040,7 @@ std::wstring translate_string(const std::wstring &s)
 #endif
 }
 
-static const std::array<std::wstring, 30> disallowed_dir_names = {
+static const std::array<std::wstring_view, 30> disallowed_dir_names = {
 	// Problematic filenames from here:
 	// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#file-and-directory-names
 	// Plus undocumented values from here:
@@ -1018,14 +1080,14 @@ static const std::array<std::wstring, 30> disallowed_dir_names = {
 /**
  * List of characters that are blacklisted from created directories
  */
-static const std::wstring disallowed_path_chars = L"<>:\"/\\|?*.";
+static const std::wstring_view disallowed_path_chars = L"<>:\"/\\|?*.";
 
 
-std::string sanitizeDirName(const std::string &str, const std::string &optional_prefix)
+std::string sanitizeDirName(std::string_view str, std::string_view optional_prefix)
 {
 	std::wstring safe_name = utf8_to_wide(str);
 
-	for (std::wstring disallowed_name : disallowed_dir_names) {
+	for (auto &disallowed_name : disallowed_dir_names) {
 		if (str_equal(safe_name, disallowed_name, true)) {
 			safe_name = utf8_to_wide(optional_prefix) + safe_name;
 			break;
@@ -1062,7 +1124,7 @@ std::string sanitizeDirName(const std::string &str, const std::string &optional_
 }
 
 
-void safe_print_string(std::ostream &os, const std::string &str)
+void safe_print_string(std::ostream &os, std::string_view str)
 {
 	std::ostream::fmtflags flags = os.flags();
 	os << std::hex;
@@ -1078,7 +1140,7 @@ void safe_print_string(std::ostream &os, const std::string &str)
 }
 
 
-v3f str_to_v3f(const std::string &str)
+v3f str_to_v3f(std::string_view str)
 {
 	v3f value;
 	Strfnd f(str);
diff --git a/src/util/string.h b/src/util/string.h
index 01f426404..b5aeba651 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -23,13 +23,15 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "irrlichttypes_bloated.h"
+#ifndef SERVER
 #include "irrString.h"
+#endif
 #include <cstdlib>
 #include <string>
+#include <string_view>
 #include <cstring>
 #include <vector>
 #include <limits>
-#include <map>
 #include <sstream>
 #include "SColor.h"
 #include <iomanip>
@@ -47,13 +49,19 @@ class Translations;
 	( (unsigned int)(x) <= 0x7e))
 
 // Checks whether a value is in a Unicode private use area
-#define IS_PRIVATE_USE_CHAR(x)    \
-	(((wchar_t)(x) >= 0xE000 &&   \
-	  (wchar_t)(x) <= 0xF8FF) ||  \
-	 ((wchar_t)(x) >= 0xF0000 &&  \
+#define IS_PRIVATE_USE_CHAR16(x)    \
+	((wchar_t)(x) >= 0xE000 &&   \
+	  (wchar_t)(x) <= 0xF8FF)
+#define IS_PRIVATE_USE_CHAR32(x)    \
+	(((wchar_t)(x) >= 0xF0000 &&  \
 	  (wchar_t)(x) <= 0xFFFFD) || \
 	 ((wchar_t)(x) >= 0x100000 && \
-	  (wchar_t)(x) <= 0x10FFFD))  \
+	  (wchar_t)(x) <= 0x10FFFD))
+#if WCHAR_MAX > 0xFFFF
+#define IS_PRIVATE_USE_CHAR(x) (IS_PRIVATE_USE_CHAR16(x) || IS_PRIVATE_USE_CHAR32(x))
+#else
+#define IS_PRIVATE_USE_CHAR(x) IS_PRIVATE_USE_CHAR16(x)
+#endif
 
 // Checks whether a byte is an inner byte for an utf-8 multibyte sequence
 #define IS_UTF8_MULTB_INNER(x)       \
@@ -80,19 +88,38 @@ struct FlagDesc {
 
 // Try to avoid converting between wide and UTF-8 unless you need to
 // input/output stuff via Irrlicht
-std::wstring utf8_to_wide(const std::string &input);
-std::string wide_to_utf8(const std::wstring &input);
+std::wstring utf8_to_wide(std::string_view input);
+std::string wide_to_utf8(std::wstring_view input);
+
+std::string urlencode(std::string_view str);
+std::string urldecode(std::string_view str);
 
-std::string urlencode(const std::string &str);
-std::string urldecode(const std::string &str);
 u32 readFlagString(std::string str, const FlagDesc *flagdesc, u32 *flagmask);
 std::string writeFlagString(u32 flags, const FlagDesc *flagdesc, u32 flagmask);
-size_t mystrlcpy(char *dst, const char *src, size_t size);
-char *mystrtok_r(char *s, const char *sep, char **lasts);
+
+size_t mystrlcpy(char *dst, const char *src, size_t size) noexcept;
+char *mystrtok_r(char *s, const char *sep, char **lasts) noexcept;
+
 u64 read_seed(const char *str);
 bool parseColorString(const std::string &value, video::SColor &color, bool quiet = true,
 		unsigned char default_alpha = 0xff);
+std::string encodeHexColorString(video::SColor color);
 
+/**
+ * Converts a letter to lowercase, with safe handling of the char type and non-ASCII.
+ * @param c input letter
+ * @returns same letter but lowercase
+*/
+inline char my_tolower(char c)
+{
+	// By design this function cannot handle any Unicode (codepoints don't fit into char),
+	// but make sure to pass it through unchanged.
+	// tolower() can mangle it if the POSIX locale is not UTF-8.
+	if (static_cast<unsigned char>(c) > 0x7f)
+		return c;
+	// toupper(3): "If the argument c is of type char, it must be cast to unsigned char"
+	return tolower(static_cast<unsigned char>(c));
+}
 
 /**
  * Returns a copy of \p str with spaces inserted at the right hand side to ensure
@@ -118,23 +145,32 @@ inline std::string padStringRight(std::string str, size_t len)
  *
  * @return If no end could be removed then "" is returned.
  */
-inline std::string removeStringEnd(const std::string &str,
+inline std::string_view removeStringEnd(std::string_view str,
 		const char *ends[])
 {
 	const char **p = ends;
 
 	for (; *p && (*p)[0] != '\0'; p++) {
-		std::string end = *p;
+		std::string_view end(*p);
 		if (str.size() < end.size())
 			continue;
 		if (str.compare(str.size() - end.size(), end.size(), end) == 0)
 			return str.substr(0, str.size() - end.size());
 	}
 
-	return "";
+	return std::string_view();
 }
 
 
+#define MAKE_VARIANT(_name, _t0, _t1) \
+	template <typename T, typename... Args> \
+	inline auto _name(_t0 arg1, _t1 arg2, Args&&... args) \
+	{ \
+		return (_name)(std::basic_string_view<T>(arg1), std::basic_string_view<T>(arg2), \
+			std::forward<Args>(args)...); \
+	}
+
+
 /**
  * Check two strings for equivalence.  If \p case_insensitive is true
  * then the case of the strings is ignored (default is false).
@@ -145,8 +181,8 @@ inline std::string removeStringEnd(const std::string &str,
  * @return true if the strings match
  */
 template <typename T>
-inline bool str_equal(const std::basic_string<T> &s1,
-		const std::basic_string<T> &s2,
+inline bool str_equal(std::basic_string_view<T> s1,
+		std::basic_string_view<T> s2,
 		bool case_insensitive = false)
 {
 	if (!case_insensitive)
@@ -156,12 +192,22 @@ inline bool str_equal(const std::basic_string<T> &s1,
 		return false;
 
 	for (size_t i = 0; i < s1.size(); ++i)
-		if(tolower(s1[i]) != tolower(s2[i]))
+		if (my_tolower(s1[i]) != my_tolower(s2[i]))
 			return false;
 
 	return true;
 }
 
+// For some reason an std::string will not implicitly get converted
+// to an std::basic_string_view<char> in the template case above, so we need
+// these three wrappers. It works if you take out the template parameters.
+// see also <https://stackoverflow.com/questions/68380141/>
+MAKE_VARIANT(str_equal, const std::basic_string<T> &, const std::basic_string<T> &)
+
+MAKE_VARIANT(str_equal, std::basic_string_view<T>, const std::basic_string<T> &)
+
+MAKE_VARIANT(str_equal, const std::basic_string<T> &, std::basic_string_view<T>)
+
 
 /**
  * Check whether \p str begins with the string prefix. If \p case_insensitive
@@ -174,8 +220,8 @@ inline bool str_equal(const std::basic_string<T> &s1,
  * @return true if the str begins with prefix
  */
 template <typename T>
-inline bool str_starts_with(const std::basic_string<T> &str,
-		const std::basic_string<T> &prefix,
+inline bool str_starts_with(std::basic_string_view<T> str,
+		std::basic_string_view<T> prefix,
 		bool case_insensitive = false)
 {
 	if (str.size() < prefix.size())
@@ -185,29 +231,22 @@ inline bool str_starts_with(const std::basic_string<T> &str,
 		return str.compare(0, prefix.size(), prefix) == 0;
 
 	for (size_t i = 0; i < prefix.size(); ++i)
-		if (tolower(str[i]) != tolower(prefix[i]))
+		if (my_tolower(str[i]) != my_tolower(prefix[i]))
 			return false;
 	return true;
 }
 
-/**
- * Check whether \p str begins with the string prefix. If \p case_insensitive
- * is true then the check is case insensitve (default is false; i.e. case is
- * significant).
- *
- * @param str
- * @param prefix
- * @param case_insensitive
- * @return true if the str begins with prefix
- */
-template <typename T>
-inline bool str_starts_with(const std::basic_string<T> &str,
-		const T *prefix,
-		bool case_insensitive = false)
-{
-	return str_starts_with(str, std::basic_string<T>(prefix),
-			case_insensitive);
-}
+// (same conversion issue here)
+MAKE_VARIANT(str_starts_with, const std::basic_string<T> &, const std::basic_string<T> &)
+
+MAKE_VARIANT(str_starts_with, std::basic_string_view<T>, const std::basic_string<T> &)
+
+MAKE_VARIANT(str_starts_with, const std::basic_string<T> &, std::basic_string_view<T>)
+
+// (the same but with char pointers, only for the prefix argument)
+MAKE_VARIANT(str_starts_with, const std::basic_string<T> &, const T*)
+
+MAKE_VARIANT(str_starts_with, std::basic_string_view<T>, const T*)
 
 
 /**
@@ -221,8 +260,8 @@ inline bool str_starts_with(const std::basic_string<T> &str,
  * @return true if the str begins with suffix
  */
 template <typename T>
-inline bool str_ends_with(const std::basic_string<T> &str,
-		const std::basic_string<T> &suffix,
+inline bool str_ends_with(std::basic_string_view<T> str,
+		std::basic_string_view<T> suffix,
 		bool case_insensitive = false)
 {
 	if (str.size() < suffix.size())
@@ -233,30 +272,25 @@ inline bool str_ends_with(const std::basic_string<T> &str,
 		return str.compare(start, suffix.size(), suffix) == 0;
 
 	for (size_t i = 0; i < suffix.size(); ++i)
-		if (tolower(str[start + i]) != tolower(suffix[i]))
+		if (my_tolower(str[start + i]) != my_tolower(suffix[i]))
 			return false;
 	return true;
 }
 
+// (same conversion issue here)
+MAKE_VARIANT(str_ends_with, const std::basic_string<T> &, const std::basic_string<T> &)
 
-/**
- * Check whether \p str ends with the string suffix. If \p case_insensitive
- * is true then the check is case insensitve (default is false; i.e. case is
- * significant).
- *
- * @param str
- * @param suffix
- * @param case_insensitive
- * @return true if the str begins with suffix
- */
-template <typename T>
-inline bool str_ends_with(const std::basic_string<T> &str,
-		const T *suffix,
-		bool case_insensitive = false)
-{
-	return str_ends_with(str, std::basic_string<T>(suffix),
-			case_insensitive);
-}
+MAKE_VARIANT(str_ends_with, std::basic_string_view<T>, const std::basic_string<T> &)
+
+MAKE_VARIANT(str_ends_with, const std::basic_string<T> &, std::basic_string_view<T>)
+
+// (the same but with char pointers, only for the suffix argument)
+MAKE_VARIANT(str_ends_with, const std::basic_string<T> &, const T*)
+
+MAKE_VARIANT(str_ends_with, std::basic_string_view<T>, const T*)
+
+
+#undef MAKE_VARIANT
 
 
 /**
@@ -285,24 +319,21 @@ inline std::vector<std::basic_string<T> > str_split(
  * @param str
  * @return A copy of \p str converted to all lowercase characters.
  */
-inline std::string lowercase(const std::string &str)
+inline std::string lowercase(std::string_view str)
 {
 	std::string s2;
-
-	s2.reserve(str.size());
-
-	for (char i : str)
-		s2 += tolower(i);
-
+	s2.resize(str.size());
+	for (size_t i = 0; i < str.size(); i++)
+		s2[i] = my_tolower(str[i]);
 	return s2;
 }
 
 
 /**
  * @param str
- * @return A copy of \p str with leading and trailing whitespace removed.
+ * @return A view of \p str with leading and trailing whitespace removed.
  */
-inline std::string trim(const std::string &str)
+inline std::string_view trim(std::string_view str)
 {
 	size_t front = 0;
 	size_t back = str.size();
@@ -316,6 +347,26 @@ inline std::string trim(const std::string &str)
 	return str.substr(front, back - front);
 }
 
+// If input was a temporary string keep it one to make sure patterns like
+// trim(func_that_returns_str()) are predictable regarding memory allocation
+// and don't lead to UAF. ↓ ↓ ↓
+
+/**
+ * @param str
+ * @return A copy of \p str with leading and trailing whitespace removed.
+ */
+inline std::string trim(std::string &&str)
+{
+	std::string ret(trim(std::string_view(str)));
+	return ret;
+}
+
+// The above declaration causes ambiguity with char pointers so we have to fix that:
+inline std::string_view trim(const char *str)
+{
+	return trim(std::string_view(str));
+}
+
 
 /**
  * Returns whether \p str should be regarded as (bool) true.  Case and leading
@@ -323,7 +374,7 @@ inline std::string trim(const std::string &str)
  * true are "y", "yes", "true" and any number that is not 0.
  * @param str
  */
-inline bool is_yes(const std::string &str)
+inline bool is_yes(std::string_view str)
 {
 	std::string s2 = lowercase(trim(str));
 
@@ -380,7 +431,7 @@ inline float mystof(const std::string &str)
 template <typename T>
 inline T from_string(const std::string &str)
 {
-	std::stringstream tmp(str);
+	std::istringstream tmp(str);
 	T t;
 	tmp >> t;
 	return t;
@@ -389,42 +440,6 @@ inline T from_string(const std::string &str)
 /// Returns a 64-bit signed value represented by the string \p str (decimal).
 inline s64 stoi64(const std::string &str) { return from_string<s64>(str); }
 
-#if __cplusplus < 201103L || defined(__ANDROID__)
-namespace std {
-
-/// Returns a string representing the value \p val.
-template <typename T>
-inline string to_string(T val)
-{
-	ostringstream oss;
-	oss << val;
-	return oss.str();
-}
-#define DEFINE_STD_TOSTRING_FLOATINGPOINT(T)		\
-	template <>					\
-	inline string to_string<T>(T val)		\
-	{						\
-		ostringstream oss;			\
-		oss << std::fixed			\
-			<< std::setprecision(6)		\
-			<< val;				\
-		return oss.str();			\
-	}
-DEFINE_STD_TOSTRING_FLOATINGPOINT(float)
-DEFINE_STD_TOSTRING_FLOATINGPOINT(double)
-DEFINE_STD_TOSTRING_FLOATINGPOINT(long double)
-
-#undef DEFINE_STD_TOSTRING_FLOATINGPOINT
-
-/// Returns a wide string representing the value \p val
-template <typename T>
-inline wstring to_wstring(T val)
-{
-	return utf8_to_wide(to_string(val));
-}
-}
-#endif
-
 /// Returns a string representing the decimal value of the 32-bit value \p i.
 inline std::string itos(u32 i) { return std::to_string(i); }
 /// Returns a string representing the decimal value of the 64-bit value \p i.
@@ -446,8 +461,8 @@ inline std::string ftos(float f)
  * @param pattern The pattern to replace.
  * @param replacement What to replace the pattern with.
  */
-inline void str_replace(std::string &str, const std::string &pattern,
-		const std::string &replacement)
+inline void str_replace(std::string &str, std::string_view pattern,
+		std::string_view replacement)
 {
 	std::string::size_type start = str.find(pattern, 0);
 	while (start != str.npos) {
@@ -457,7 +472,7 @@ inline void str_replace(std::string &str, const std::string &pattern,
 }
 
 /**
- * Escapes characters [ ] \ , ; that cannot be used in formspecs
+ * Escapes characters that cannot be used in formspecs
  */
 inline void str_formspec_escape(std::string &str)
 {
@@ -489,7 +504,7 @@ void str_replace(std::string &str, char from, char to);
  *
  * @see string_allowed_blacklist()
  */
-inline bool string_allowed(const std::string &str, const std::string &allowed_chars)
+inline bool string_allowed(std::string_view str, std::string_view allowed_chars)
 {
 	return str.find_first_not_of(allowed_chars) == str.npos;
 }
@@ -505,8 +520,8 @@ inline bool string_allowed(const std::string &str, const std::string &allowed_ch
 
  * @see string_allowed()
  */
-inline bool string_allowed_blacklist(const std::string &str,
-		const std::string &blacklisted_chars)
+inline bool string_allowed_blacklist(std::string_view str,
+		std::string_view blacklisted_chars)
 {
 	return str.find_first_of(blacklisted_chars) == str.npos;
 }
@@ -516,7 +531,7 @@ inline bool string_allowed_blacklist(const std::string &str,
  * Create a string based on \p from where a newline is forcefully inserted
  * every \p row_len characters.
  *
- * @note This function does not honour word wraps and blindy inserts a newline
+ * @note This function does not honour word wraps and blindly inserts a newline
  *	every \p row_len characters whether it breaks a word or not.  It is
  *	intended to be used for, for example, showing paths in the GUI.
  *
@@ -525,26 +540,10 @@ inline bool string_allowed_blacklist(const std::string &str,
  *
  * @param from The (utf-8) string to be wrapped into rows.
  * @param row_len The row length (in characters).
+ * @param has_color_codes Whether the source string has colorize codes.
  * @return A new string with the wrapping applied.
  */
-inline std::string wrap_rows(const std::string &from,
-		unsigned row_len)
-{
-	std::string to;
-
-	size_t character_idx = 0;
-	for (size_t i = 0; i < from.size(); i++) {
-		if (!IS_UTF8_MULTB_INNER(from[i])) {
-			// Wrap string after last inner byte of char
-			if (character_idx > 0 && character_idx % row_len == 0)
-				to += '\n';
-			character_idx++;
-		}
-		to += from[i];
-	}
-
-	return to;
-}
+std::string wrap_rows(std::string_view from, unsigned row_len, bool has_color_codes = false);
 
 
 /**
@@ -554,6 +553,7 @@ template <typename T>
 inline std::basic_string<T> unescape_string(const std::basic_string<T> &s)
 {
 	std::basic_string<T> res;
+	res.reserve(s.size());
 
 	for (size_t i = 0; i < s.length(); i++) {
 		if (s[i] == '\\') {
@@ -577,6 +577,7 @@ template <typename T>
 std::basic_string<T> unescape_enriched(const std::basic_string<T> &s)
 {
 	std::basic_string<T> output;
+	output.reserve(s.size());
 	size_t i = 0;
 	while (i < s.length()) {
 		if (s[i] == '\x1b') {
@@ -649,7 +650,7 @@ inline std::wstring unescape_translate(const std::wstring &s) {
  * @return true if to_check is not empty and all characters in to_check are
  *	decimal digits, otherwise false
  */
-inline bool is_number(const std::string &to_check)
+inline bool is_number(std::string_view to_check)
 {
 	for (char i : to_check)
 		if (!std::isdigit(i))
@@ -658,6 +659,7 @@ inline bool is_number(const std::string &to_check)
 	return !to_check.empty();
 }
 
+
 /**
  * Returns a C-string, either "true" or "false", corresponding to \p val.
  *
@@ -729,7 +731,7 @@ inline const std::string duration_to_string(int sec)
  * @return A std::string
  */
 inline std::string str_join(const std::vector<std::string> &list,
-		const std::string &delimiter)
+		std::string_view delimiter)
 {
 	std::ostringstream oss;
 	bool first = true;
@@ -742,23 +744,25 @@ inline std::string str_join(const std::vector<std::string> &list,
 	return oss.str();
 }
 
+#ifndef SERVER
 /**
  * Create a UTF8 std::string from an irr::core::stringw.
  */
 inline std::string stringw_to_utf8(const irr::core::stringw &input)
 {
-	std::wstring str(input.c_str());
-	return wide_to_utf8(str);
+	std::wstring_view sv(input.c_str(), input.size());
+	return wide_to_utf8(sv);
 }
 
  /**
   * Create an irr::core:stringw from a UTF8 std::string.
   */
-inline irr::core::stringw utf8_to_stringw(const std::string &input)
+inline irr::core::stringw utf8_to_stringw(std::string_view input)
 {
 	std::wstring str = utf8_to_wide(input);
-	return irr::core::stringw(str.c_str());
+	return irr::core::stringw(str.c_str(), str.size());
 }
+#endif
 
 /**
  * Sanitize the name of a new directory. This consists of two stages:
@@ -766,7 +770,7 @@ inline irr::core::stringw utf8_to_stringw(const std::string &input)
  *    and add a prefix to them
  * 2. Remove 'unsafe' characters from the name by replacing them with '_'
  */
-std::string sanitizeDirName(const std::string &str, const std::string &optional_prefix);
+std::string sanitizeDirName(std::string_view str, std::string_view optional_prefix);
 
 /**
  * Prints a sanitized version of a string without control characters.
@@ -774,12 +778,12 @@ std::string sanitizeDirName(const std::string &str, const std::string &optional_
  * ASCII control characters are replaced with their hex encoding in angle
  * brackets (e.g. "a\x1eb" -> "a<1e>b").
  */
-void safe_print_string(std::ostream &os, const std::string &str);
+void safe_print_string(std::ostream &os, std::string_view str);
 
 /**
  * Parses a string of form `(1, 2, 3)` to a v3f
  *
- * @param str String
- * @return
+ * @param str string
+ * @return float vector
  */
-v3f str_to_v3f(const std::string &str);
+v3f str_to_v3f(std::string_view str);
diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp
index 965bde2b2..b7fdf990f 100644
--- a/src/util/timetaker.cpp
+++ b/src/util/timetaker.cpp
@@ -28,21 +28,10 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 unsigned int g_time_taker_enabled = 0;
 
-void TimeTaker::start() {
-	if (!m_time1)
-		m_time1 = porting::getTime(m_precision);
-};
-
-TimeTaker::TimeTaker(const std::string &name, u64 *result, TimePrecision prec)
+void TimeTaker::start()
 {
-	m_name = name;
-	m_result = result;
-	m_precision = prec;
-	if (!g_time_taker_enabled) {
-		m_running = false;
-		return;
-	}
-	m_time1 = porting::getTime(prec);
+	if (!m_time1)
+	m_time1 = porting::getTime(m_precision);
 }
 
 u64 TimeTaker::stop(bool quiet)
@@ -53,15 +42,8 @@ u64 TimeTaker::stop(bool quiet)
 			(*m_result) += dtime;
 		} else {
 			if (!quiet && dtime >= g_time_taker_enabled) {
-				static const char* const units[] = {
-					"s"  /* PRECISION_SECONDS */,
-					"ms" /* PRECISION_MILLI */,
-					"us" /* PRECISION_MICRO */,
-					"ns" /* PRECISION_NANO */,
-				};
 				verbosestream << m_name << " took "
-				           << dtime << units[m_precision]
-					   << std::endl;
+					<< dtime << TimePrecision_units[m_precision] << std::endl;
 			}
 		}
 		m_running = false;
diff --git a/src/util/timetaker.h b/src/util/timetaker.h
index 2de20159d..3daf29fa7 100644
--- a/src/util/timetaker.h
+++ b/src/util/timetaker.h
@@ -22,24 +22,53 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include <string>
 #include "irrlichttypes.h"
-#include "gettime.h"
+
+enum TimePrecision : s8
+{
+	PRECISION_SECONDS,
+	PRECISION_MILLI,
+	PRECISION_MICRO,
+	PRECISION_NANO,
+};
+
+constexpr const char *TimePrecision_units[] = {
+	"s"  /* PRECISION_SECONDS */,
+	"ms" /* PRECISION_MILLI */,
+	"us" /* PRECISION_MICRO */,
+	"ns" /* PRECISION_NANO */,
+};
 
 /*
 	TimeTaker
 */
 extern unsigned int g_time_taker_enabled;
 
+// Note: this class should be kept lightweight
+
 class TimeTaker
 {
 public:
 	// in freeminer timetaker by default disabled for release builds.
-	// to count time should call this: 
-	void start();
+	// to count time should call start(): 
 
+	TimeTaker(const std::string &name, u64 *result = nullptr,
+		TimePrecision prec = PRECISION_MILLI)
+	{
+		if (result)
+			m_result = result;
+		else
+			m_name = name;
+		m_precision = prec;
 
-	TimeTaker(const std::string &name, u64 *result=nullptr,
-		TimePrecision prec=PRECISION_MILLI);
+		if (!g_time_taker_enabled) {
+			m_running = false;
+			return;
+		}
+
+		start();
+	}
 
 	~TimeTaker()
 	{
@@ -50,10 +79,12 @@ public:
 
 	u64 getTimerTime();
 
+	void start();
 private:
+
 	std::string m_name;
-	u64 m_time1 = 0;
+	u64 *m_result = nullptr;
+	u64 m_time1{};
 	bool m_running = true;
 	TimePrecision m_precision;
-	u64 *m_result = nullptr;
 };
diff --git a/src/voxel.cpp b/src/voxel.cpp
index d6654d945..c615eadea 100644
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -26,6 +26,7 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 #include "nodedef.h"
 #include "util/directiontables.h"
 #include "util/timetaker.h"
+#include "porting.h"
 #include <cstring>  // memcpy, memset
 
 /*
@@ -43,14 +44,17 @@ VoxelManipulator::~VoxelManipulator()
 
 void VoxelManipulator::clear()
 {
-	// Reset area to volume=0
-	m_area = VoxelArea();
+	// Reset area to empty volume
+	VoxelArea old;
+	std::swap(m_area, old);
    if(m_data)
-	delete m_data;
+	delete[] m_data;
 	m_data = nullptr;
    if (m_flags)
 	delete[] m_flags;
 	m_flags = nullptr;
+
+	porting::TrackFreedMemory((sizeof(*m_data) + sizeof(*m_flags)) * old.getVolume());
 }
 
 void VoxelManipulator::print(std::ostream &o, const NodeDefManager *ndef,
diff --git a/src/voxel.h b/src/voxel.h
index 8148824bc..a0ba409f6 100644
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -455,7 +455,7 @@ public:
 			!(getFlagsRefUnsafe(p) & VOXELFLAG_NO_DATA);
 	}
 
-	void setNode(const v3s16 &p, const MapNode &n)
+	void setNode(const v3s16 &p, const MapNode &n, bool important = false)
 	{
 		VoxelArea voxel_area(p);
 		addArea(voxel_area);
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index b835b9330..02a75848d 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -20,6 +20,8 @@ You should have received a copy of the GNU General Public License
 along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <array>
+
 #include "voxelalgorithms.h"
 #include "nodedef.h"
 #include "mapblock.h"
@@ -54,12 +56,12 @@ typedef v3s16 mapblock_v3;
 
 //! Contains information about a node whose light is about to change.
 struct ChangingLight {
+	//! Pointer to the node's block.
+	MapBlock *block = nullptr;
 	//! Relative position of the node in its map block.
 	relative_v3 rel_position;
 	//! Position of the node's block.
 	mapblock_v3 block_position;
-	//! Pointer to the node's block.
-	MapBlock *block = NULL;
 	/*!
 	 * Direction from the node that caused this node's changing
 	 * to this node.
@@ -70,9 +72,9 @@ struct ChangingLight {
 
 	ChangingLight(relative_v3 rel_pos, mapblock_v3 block_pos,
 		MapBlock *b, direction source_dir) :
+		block(b),
 		rel_position(rel_pos),
 		block_position(block_pos),
-		block(b),
 		source_direction(source_dir)
 	{}
 };
@@ -84,7 +86,7 @@ struct ChangingLight {
  */
 struct LightQueue {
 	//! For each light level there is a vector.
-	std::vector<ChangingLight> lights[LIGHT_SUN + 1];
+	std::array<std::vector<ChangingLight>, LIGHT_SUN + 1> lights;
 	//! Light of the brightest ChangingLight in the queue.
 	u8 max_light;
 
@@ -95,9 +97,15 @@ struct LightQueue {
 	LightQueue(size_t reserve)
 	{
 		max_light = LIGHT_SUN;
-		for (u8 i = 0; i <= LIGHT_SUN; i++) {
-			lights[i].reserve(reserve);
-		}
+		for (auto &l : lights)
+			l.reserve(reserve);
+	}
+
+	//! Clears a LightQueue.
+	void clear() {
+		max_light = LIGHT_SUN;
+		for (auto &l : lights)
+			l.clear();
 	}
 
 	/*!
@@ -472,7 +480,7 @@ bool is_sunlight_above(Map *map, v3s16 pos, const NodeDefManager *ndef)
 	return sunlight;
 }
 
-static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
+static constexpr LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
 
 void update_lighting_nodes(Map *map,
 	const std::vector<std::pair<v3s16, MapNode>> &oldnodes,
@@ -482,10 +490,14 @@ void update_lighting_nodes(Map *map,
 	// For node getter functions
 	bool is_valid_position;
 
+	// cached allocations
+	thread_local UnlightQueue disappearing_lights(1);
+	thread_local ReLightQueue light_sources(4);
+
 	// Process each light bank separately
 	for (LightBank bank : banks) {
-		UnlightQueue disappearing_lights(256);
-		ReLightQueue light_sources(256);
+		disappearing_lights.clear();
+		light_sources.clear();
 		// Nodes that are brighter than the brightest modified node was
 		// won't change, since they didn't get their light from a
 		// modified node.
@@ -634,9 +646,8 @@ void update_lighting_nodes(Map *map,
 			modified_blocks);
 		// Initialize light values for light spreading.
 		for (u8 i = 0; i <= LIGHT_SUN; i++) {
-			const std::vector<ChangingLight> &lights = light_sources.lights[i];
-			for (std::vector<ChangingLight>::const_iterator it = lights.begin();
-					it < lights.end(); ++it) {
+			const auto &lights = light_sources.lights[i];
+			for (auto it = lights.begin(); it < lights.end(); ++it) {
 				MapNode n = it->block->getNodeNoCheck(it->rel_position);
 				n.setLight(bank, i, ndef->getLightingFlags(n));
 				it->block->setNodeNoCheck(it->rel_position, n);
@@ -655,14 +666,16 @@ void update_lighting_nodes(Map *map,
  * Borders of a map block in relative node coordinates.
  * Compatible with type 'direction'.
  */
-const VoxelArea block_borders[] = {
-	VoxelArea(v3s16(15, 0, 0), v3s16(15, 15, 15)), //X+
-	VoxelArea(v3s16(0, 15, 0), v3s16(15, 15, 15)), //Y+
-	VoxelArea(v3s16(0, 0, 15), v3s16(15, 15, 15)), //Z+
-	VoxelArea(v3s16(0, 0, 0), v3s16(15, 15, 0)),   //Z-
-	VoxelArea(v3s16(0, 0, 0), v3s16(15, 0, 15)),   //Y-
-	VoxelArea(v3s16(0, 0, 0), v3s16(0, 15, 15))    //X-
+#define B_1 (MAP_BLOCKSIZE - 1)
+const static VoxelArea block_borders[] = {
+	VoxelArea(v3s16(B_1, 0, 0), v3s16(B_1, B_1, B_1)), //X+
+	VoxelArea(v3s16(0, B_1, 0), v3s16(B_1, B_1, B_1)), //Y+
+	VoxelArea(v3s16(0, 0, B_1), v3s16(B_1, B_1, B_1)), //Z+
+	VoxelArea(v3s16(0, 0, 0), v3s16(B_1, B_1, 0)),   //Z-
+	VoxelArea(v3s16(0, 0, 0), v3s16(B_1, 0, B_1)),   //Y-
+	VoxelArea(v3s16(0, 0, 0), v3s16(0, B_1, B_1))    //X-
 };
+#undef B_1
 
 /*!
  * Returns true if:
@@ -700,11 +713,14 @@ void update_block_border_lighting(Map *map, MapBlock *block,
 	std::map<v3s16, MapBlock*> &modified_blocks)
 {
 	const NodeDefManager *ndef = map->getNodeDefManager();
+	// Since invalid light is not common, do not allocate
+	// memory if not needed.
+	UnlightQueue disappearing_lights(0);
+	ReLightQueue light_sources(0);
+
 	for (LightBank bank : banks) {
-		// Since invalid light is not common, do not allocate
-		// memory if not needed.
-		UnlightQueue disappearing_lights(0);
-		ReLightQueue light_sources(0);
+		disappearing_lights.clear();
+		light_sources.clear();
 		// Get incorrect lights
 		for (direction d = 0; d < 6; d++) {
 			// For each direction
@@ -757,9 +773,8 @@ void update_block_border_lighting(Map *map, MapBlock *block,
 			modified_blocks);
 		// Initialize light values for light spreading.
 		for (u8 i = 0; i <= LIGHT_SUN; i++) {
-			const std::vector<ChangingLight> &lights = light_sources.lights[i];
-			for (std::vector<ChangingLight>::const_iterator it = lights.begin();
-					it < lights.end(); ++it) {
+			const auto &lights = light_sources.lights[i];
+			for (auto it = lights.begin(); it < lights.end(); ++it) {
 				MapNode n = it->block->getNodeNoCheck(it->rel_position);
 				n.setLight(bank, i, ndef->getLightingFlags(n));
 				it->block->setNodeNoCheck(it->rel_position, n);
@@ -1046,8 +1061,8 @@ void finish_bulk_light_update(Map *map, mapblock_v3 minblock,
 			// Skip not existing blocks
 			continue;
 		// For each node in the block:
-		for (relpos.X = 0; relpos.X < MAP_BLOCKSIZE; relpos.X++)
 		for (relpos.Z = 0; relpos.Z < MAP_BLOCKSIZE; relpos.Z++)
+		for (relpos.X = 0; relpos.X < MAP_BLOCKSIZE; relpos.X++)
 		for (relpos.Y = 0; relpos.Y < MAP_BLOCKSIZE; relpos.Y++) {
 			MapNode node = block->getNodeNoCheck(relpos.X, relpos.Y, relpos.Z);
 			ContentLightingFlags f = ndef->getLightingFlags(node);
@@ -1073,9 +1088,8 @@ void finish_bulk_light_update(Map *map, mapblock_v3 minblock,
 		u8 maxlight = (b == 0) ? LIGHT_MAX : LIGHT_SUN;
 		// Initialize light values for light spreading.
 		for (u8 i = 0; i <= maxlight; i++) {
-			const std::vector<ChangingLight> &lights = relight[b].lights[i];
-			for (std::vector<ChangingLight>::const_iterator it = lights.begin();
-					it < lights.end(); ++it) {
+			const auto &lights = relight[b].lights[i];
+			for (auto it = lights.begin(); it < lights.end(); ++it) {
 				MapNode n = it->block->getNodeNoCheck(it->rel_position);
 				n.setLight(bank, i, ndef->getLightingFlags(n));
 				it->block->setNodeNoCheck(it->rel_position, n);
@@ -1151,8 +1165,8 @@ void blit_back_with_light(Map *map, MMVManip *vm,
 		// For each border of the block:
 		for (const VoxelArea &a : block_pad) {
 			// For each node of the border:
-			for (relpos.X = a.MinEdge.X; relpos.X <= a.MaxEdge.X; relpos.X++)
 			for (relpos.Z = a.MinEdge.Z; relpos.Z <= a.MaxEdge.Z; relpos.Z++)
+			for (relpos.X = a.MinEdge.X; relpos.X <= a.MaxEdge.X; relpos.X++)
 			for (relpos.Y = a.MinEdge.Y; relpos.Y <= a.MaxEdge.Y; relpos.Y++) {
 
 				// Get old and new node
@@ -1327,34 +1341,34 @@ VoxelLineIterator::VoxelLineIterator(const v3f &start_position, const v3f &line_
 	m_last_index = getIndex(floatToInt(start_position + line_vector, 1));
 
 	if (m_line_vector.X > 0) {
-		m_next_intersection_multi.X = (floorf(m_start_position.X - 0.5) + 1.5
+		m_next_intersection_multi.X = (m_current_node_pos.X + 0.5f
 			- m_start_position.X) / m_line_vector.X;
 		m_intersection_multi_inc.X = 1 / m_line_vector.X;
 	} else if (m_line_vector.X < 0) {
-		m_next_intersection_multi.X = (floorf(m_start_position.X - 0.5)
-			- m_start_position.X + 0.5) / m_line_vector.X;
+		m_next_intersection_multi.X = (m_current_node_pos.X - 0.5f
+			- m_start_position.X) / m_line_vector.X;
 		m_intersection_multi_inc.X = -1 / m_line_vector.X;
 		m_step_directions.X = -1;
 	}
 
 	if (m_line_vector.Y > 0) {
-		m_next_intersection_multi.Y = (floorf(m_start_position.Y - 0.5) + 1.5
+		m_next_intersection_multi.Y = (m_current_node_pos.Y + 0.5f
 			- m_start_position.Y) / m_line_vector.Y;
 		m_intersection_multi_inc.Y = 1 / m_line_vector.Y;
 	} else if (m_line_vector.Y < 0) {
-		m_next_intersection_multi.Y = (floorf(m_start_position.Y - 0.5)
-			- m_start_position.Y + 0.5) / m_line_vector.Y;
+		m_next_intersection_multi.Y = (m_current_node_pos.Y - 0.5f
+			- m_start_position.Y) / m_line_vector.Y;
 		m_intersection_multi_inc.Y = -1 / m_line_vector.Y;
 		m_step_directions.Y = -1;
 	}
 
 	if (m_line_vector.Z > 0) {
-		m_next_intersection_multi.Z = (floorf(m_start_position.Z - 0.5) + 1.5
+		m_next_intersection_multi.Z = (m_current_node_pos.Z + 0.5f
 			- m_start_position.Z) / m_line_vector.Z;
 		m_intersection_multi_inc.Z = 1 / m_line_vector.Z;
 	} else if (m_line_vector.Z < 0) {
-		m_next_intersection_multi.Z = (floorf(m_start_position.Z - 0.5)
-			- m_start_position.Z + 0.5) / m_line_vector.Z;
+		m_next_intersection_multi.Z = (m_current_node_pos.Z - 0.5f
+			- m_start_position.Z) / m_line_vector.Z;
 		m_intersection_multi_inc.Z = -1 / m_line_vector.Z;
 		m_step_directions.Z = -1;
 	}
diff --git a/util/README_mod_translation_updater.md b/util/README_mod_translation_updater.md
deleted file mode 100644
index fa4304ac8..000000000
--- a/util/README_mod_translation_updater.md
+++ /dev/null
@@ -1,213 +0,0 @@
-# `mod_translation_updater.py`—Minetest Mod Translation Updater
-
-This Python script is intended for use with localized Minetest mods, i.e., mods that use
-`*.tr` and contain translatable strings of the form `S("This string can be translated")`.
-It extracts the strings from the mod's source code and updates the localization files
-accordingly. It can also be used to update the `*.tr` files in Minetest's `builtin` component.
-
-## Preparing your source code
-
-This script makes assumptions about your source code. Before it is usable, you first have
-to prepare your source code accordingly.
-
-### Choosing the textdomain name
-
-It is recommended to set the textdomain name (for `minetest.get_translator`) to be identical
-of the mod name as the script will automatically detect it. If the textdomain name differs,
-you may have to manually change the `# textdomain:` line of newly generated files.
-
-**Note:** In each `*.tr` file, there **must** be only one textdomain. Multiple textdomains in
-the same file are not supported by this script and any additional textdomain line will be
-removed.
-
-### Defining the helper functions
-
-In any source code file with translatable strings, you have to manually define helper
-functions at the top with something like `local S = minetest.get_translator("<textdomain>")`.
-Optionally, you can also define additional helper functions `FS`, `NS` and `NFS` if needed.
-
-Here is the list of all recognized function names. All functions return a string.
-
-* `S`: Returns translation of input. See Minetest's `lua_api.md`. You should always have at
-       least this function defined.
-* `NS`: Returns the input. Useful to make a string visible to the script without actually
-        translating it here.
-* `FS`: Same as `S`, but returns a formspec-escaped version of the translation of the input.
-        Supported for convenience.
-* `NFS`: Returns a formspec-escaped version of the input, but not translated.
-         Supported for convenience.
-
-Here is the boilerplate code you have to add at the top of your source code file:
-
-    local S = minetest.get_translator("<textdomain>")
-    local NS = function(s) return s end
-    local FS = function(...) return minetest.formspec_escape(S(...)) end
-    local NFS = function(s) return minetest.formspec_escape(s) end
-
-Replace `<textdomain>` above and optionally delete `NS`, `FS` and/or `NFS` if you don't need
-them.
-
-### Preparing the strings
-
-This script can detect translatable strings of the notations listed below.
-Additional function arguments followed after a literal string are ignored.
-
-* `S("literal")`: one literal string enclosed by the delimiters
-  `"..."`, `'...'` or `[[...]]`
-* `S("foo " .. 'bar ' .. "baz")`: concatenation of multiple literal strings. Line
-  breaks are accepted.
-
-The `S` may also be `NS`, `FS` and `NFS` (see above).
-
-Undetectable notations:
-
-* `S"literal"`: omitted function brackets
-* `S(variable)`: requires the use of `NS`. See example below.
-* `S("literal " .. variable)`: non-static content.
-  Use placeholders (`@1`, ...) for variable text.
-* Any literal string concatenation using `[[...]]`
-
-### A minimal example
-
-This minimal code example sends "Hello world!" to all players, but translated according to
-each player's language:
-
-    local S = minetest.get_translator("example")
-    minetest.chat_send_all(S("Hello world!"))
-
-### How to use `NS`
-
-The reason why `NS` exists is for cases like this: Sometimes, you want to define a list of
-strings to they can be later output in a function. Like so:
-
-    local fruit = { "Apple", "Orange", "Pear" }
-    local function return_fruit(fruit_id)
-       return fruit[fruit_id]
-    end
-
-If you want to translate the fruit names when `return_fruit` is run, but have the
-*untranslated* fruit names in the `fruit` table stored, this is where `NS` will help.
-It will show the script the string without Minetest translating it. The script could be made
-translatable like this:
-
-    local fruit = { NS("Apple"), NS("Orange"), NS("Pear") }
-    local function return_fruit(fruit_id)
-       return S(fruit[fruit_id])
-    end
-
-## How to run the script
-
-First, change the working directory to the directory of the mod you want the files to be
-updated. From this directory, run the script.
-
-When you run the script, it will update the `template.txt` and any `*.tr` files present
-in that mod's `/locale` folder. If the `/locale` folder or `template.txt` file don't
-exist yet, they will be created.
-
-This script will also work in the root directory of a modpack. It will run on each mod
-inside the modpack in that situation. Alternatively, you can run the script to update
-the files of all mods in subdirectories with the `-r` option, which is useful to update
-the locale files in an entire game.
-
-It has the following command line options:
-
-    mod_translation_updater.py [OPTIONS] [PATHS...]
-
-    --help, -h: prints this help message
-    --recursive, -r: run on all subfolders of paths given
-    --old-file, -o: create copies of files before updating them, named `<FILE NAME>.old`
-    --break-long-lines, -b: add extra line-breaks before and after long strings
-    --print-source, -p: add comments denoting the source file
-    --verbose, -v: add output information
-    --truncate-unused, -t: delete unused strings from files
-
-## Script output
-
-This section explains how the output of this script works, roughly. This script aims to make
-the output more or less stable, i.e. given identical source files and arguments, the script
-should produce the same output.
-
-### Textdomain
-
-The script will add (if not already present) a `# textdomain: <modname>` at the top, where
-`<modname>` is identical to the mod directory name. If a `# textdomain` already exists, it
-will be moved to the top, with the textdomain name being left intact (even if it differs
-from the mod name).
-
-**Note:** If there are multiple `# textdomain:` lines in the file, all of them except the
-first one will be deleted. This script only supports one textdomain per `*.tr` file.
-
-### Strings
-
-The order of the strings is deterministic and follows certain rules: First, all strings are
-grouped by the source `*.lua` file. The files are loaded in alphabetical order. In case of
-subdirectories, the mod's root directory takes precedence, then the directories are traversed
-in top-down alphabetical order. Second, within each file, the strings are then inserted in
-the same order as they appear in the source code.
-
-If a string appears multiple times in the source code, the string will be added when it was
-first found only.
-
-Don't bother to manually organize the order of the lines in the file yourself because the
-script will just reorder everything.
-
-If the mod's source changes in such a way that a line with an existing translation or comment
-is no longer present, and `--truncate-unused` or `-t` are *not* provided as arguments, the
-unused line will be moved to the bottom of the translation file under a special comment:
-
-    ##### not used anymore #####
-
-This allows for old translations and comments to be reused with new lines where appropriate.
-This script doesn't attempt "fuzzy" matching of old strings to new, so even a single change
-of punctuation or spelling will put strings into the "not used anymore" section and require
-manual re-association with the new string.
-
-### Comments
-
-The script will preserve any comments in an existing `template.txt` or the various `*.tr`
-files, associating them with the line that follows them. So for example:
-
-    # This comment pertains to Some Text
-    Some text=
-    
-    # Multi-line comments
-    # are also supported
-    Text as well=
-
-There are also a couple of special comments that this script gives special treatment to.
-
-#### Source file comments
-
-If `--print-source` or `-p` is provided as option, the script will insert comments to show
-from which file or files each string has come from.
-This is the syntax of such a comment:
-
-    ##[ file.lua ]##
-
-This comment means that all lines following it belong to the file `file.lua`. In the special
-case the same string was found in multiple files, multiple file name comments will be used in
-row, like so:
-
-    ##[ file1.lua ]##
-    ##[ file2.lua ]##
-    ##[ file3.lua ]##
-    example=Beispiel
-
-This means the string "example" was found in the files `file1.lua`, `file2.lua` and
-`file3.lua`.
-
-If the print source option is not provided, these comments will disappear.
-
-Note that all comments of the form `##[something]##` will be treated as "source file" comments
-so they may be moved, changed or removed by the script at will.
-
-#### "not used anymore" section
-
-By default, the exact comment `##### not used anymore #####` will be automatically added to
-mark the beginning of a section where old/unused strings will go. Leave the exact wording of
-this comment intact so this line can be moved (or removed) properly in subsequent runs.
-
-## Updating `builtin`
-
-To update the `builtin` component of Minetest, change the working directory to `builtin` of
-the Minetest source code repository, then run this script from there.
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 642b82c41..b070a4343 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -13,48 +13,39 @@ libdir=$builddir/libs
 
 source $topdir/common.sh
 
-# Test which win32 compiler is present
-command -v i686-w64-mingw32-gcc >/dev/null &&
-	compiler=i686-w64-mingw32-gcc
-command -v i686-w64-mingw32-gcc-posix >/dev/null &&
-	compiler=i686-w64-mingw32-gcc-posix
+compiler=i686-w64-mingw32-clang
 
-if [ -z "$compiler" ]; then
-	echo "Unable to determine which MinGW compiler to use"
+if ! command -v "$compiler" >/dev/null; then
+	echo "Unable to find $compiler"
 	exit 1
 fi
-toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake
+toolchain_file=$topdir/toolchain_${compiler%-*}.cmake
 echo "Using $toolchain_file"
 
-find_runtime_dlls i686-w64-mingw32
+find_runtime_dlls ${compiler%-*}
 
 # Get stuff
-irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
-
 mkdir -p $libdir
 
-# 'dw2' just points to rebuilt versions after a toolchain change
-# this distinction should be gotten rid of next time
-
 cd $libdir
-download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip
-download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/dw2/libvorbis-$vorbis_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/freetype-$freetype_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip"
-download "http://minetest.kitsunemimi.pw/dw2/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version.zip
-download "http://minetest.kitsunemimi.pw/openal-soft-$openal_version-win32.zip"
+libhost="http://minetest.kitsunemimi.pw"
+download "$libhost/llvm/zlib-$zlib_version-win32.zip"
+download "$libhost/llvm/zstd-$zstd_version-win32.zip"
+download "$libhost/llvm/libogg-$ogg_version-win32.zip"
+download "$libhost/llvm/libvorbis-$vorbis_version-win32.zip"
+download "$libhost/llvm/curl-$curl_version-win32.zip"
+download "$libhost/ucrt/gettext-$gettext_version-win32.zip"
+download "$libhost/llvm/freetype-$freetype_version-win32.zip"
+download "$libhost/llvm/sqlite3-$sqlite3_version-win32.zip"
+download "$libhost/llvm/luajit-$luajit_version-win32.zip"
+download "$libhost/llvm/libleveldb-$leveldb_version-win32.zip"
+download "$libhost/llvm/openal-soft-$openal_version-win32.zip"
+download "$libhost/llvm/libjpeg-$libjpeg_version-win32.zip"
+download "$libhost/llvm/libpng-$libpng_version-win32.zip"
 
 # Set source dir, downloading Minetest as needed
 get_sources
 
-git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
-
 # Build the thing
 cd $builddir
 [ -d build ] && rm -rf build
@@ -62,7 +53,6 @@ cd $builddir
 cmake_args=(
 	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file
 	-DCMAKE_INSTALL_PREFIX=/tmp
-	-DVERSION_EXTRA=$git_hash
 	-DBUILD_CLIENT=1 -DBUILD_SERVER=0
 	-DEXTRA_DLL="$runtime_dlls"
 
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 92a522ece..541045a02 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -13,53 +13,46 @@ libdir=$builddir/libs
 
 source $topdir/common.sh
 
-# Test which win64 compiler is present
-command -v x86_64-w64-mingw32-gcc >/dev/null &&
-	compiler=x86_64-w64-mingw32-gcc
-command -v x86_64-w64-mingw32-gcc-posix >/dev/null &&
-	compiler=x86_64-w64-mingw32-gcc-posix
+compiler=x86_64-w64-mingw32-clang
 
-if [ -z "$compiler" ]; then
-	echo "Unable to determine which MinGW compiler to use"
+if ! command -v "$compiler" >/dev/null; then
+	echo "Unable to find $compiler"
 	exit 1
 fi
-toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake
+toolchain_file=$topdir/toolchain_${compiler%-*}.cmake
 echo "Using $toolchain_file"
 
-find_runtime_dlls x86_64-w64-mingw32
+find_runtime_dlls ${compiler%-*}
 
 # Get stuff
-irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
-
 mkdir -p $libdir
 
 cd $libdir
-download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip
-download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/freetype-$freetype_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
-download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
-download "http://minetest.kitsunemimi.pw/openal-soft-$openal_version-win64.zip"
+libhost="http://minetest.kitsunemimi.pw"
+download "$libhost/llvm/zlib-$zlib_version-win64.zip"
+download "$libhost/llvm/zstd-$zstd_version-win64.zip"
+download "$libhost/llvm/libogg-$ogg_version-win64.zip"
+download "$libhost/llvm/libvorbis-$vorbis_version-win64.zip"
+download "$libhost/llvm/curl-$curl_version-win64.zip"
+download "$libhost/ucrt/gettext-$gettext_version-win64.zip"
+download "$libhost/llvm/freetype-$freetype_version-win64.zip"
+download "$libhost/llvm/sqlite3-$sqlite3_version-win64.zip"
+download "$libhost/llvm/luajit-$luajit_version-win64.zip"
+download "$libhost/llvm/libleveldb-$leveldb_version-win64.zip"
+download "$libhost/llvm/openal-soft-$openal_version-win64.zip"
+download "$libhost/llvm/libjpeg-$libjpeg_version-win64.zip"
+download "$libhost/llvm/libpng-$libpng_version-win64.zip"
 
 # Set source dir, downloading Minetest as needed
 get_sources
 
-git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
-
 # Build the thing
-cd $sourcedir
+cd $builddir
 [ -d build ] && rm -rf build
 
 cmake_args=(
 	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file
 	-DCMAKE_INSTALL_PREFIX=/tmp
-	-DVERSION_EXTRA=$git_hash
 	-DBUILD_CLIENT=1 -DBUILD_SERVER=0
 	-DEXTRA_DLL="$runtime_dlls"
 
diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh
index 4d0cc08b0..5359d3517 100644
--- a/util/buildbot/common.sh
+++ b/util/buildbot/common.sh
@@ -3,16 +3,18 @@ CORE_BRANCH=master
 CORE_NAME=minetest
 
 ogg_version=1.3.5
-openal_version=1.23.0
+openal_version=1.23.1
 vorbis_version=1.3.7
-curl_version=8.0.1
+curl_version=8.5.0
 gettext_version=0.20.2
-freetype_version=2.12.1
-sqlite3_version=3.41.2
-luajit_version=20230221
+freetype_version=2.13.2
+sqlite3_version=3.44.2
+luajit_version=20240125
 leveldb_version=1.23
-zlib_version=1.2.13
+zlib_version=1.3.1
 zstd_version=1.5.5
+libjpeg_version=3.0.1
+libpng_version=1.6.40
 
 download () {
 	local url=$1
@@ -23,6 +25,7 @@ download () {
 
 	[ -d "./$foldername" ] && return 0
 	wget "$url" -c -O "./$filename"
+	sha256sum -w -c <(grep -F "$filename" "$topdir/sha256sums.txt")
 	if [ "$extract" = "unzip" ]; then
 		unzip -o "$filename" -d "$foldername"
 	elif [ "$extract" = "unzip_nofolder" ]; then
@@ -47,11 +50,11 @@ get_sources () {
 # sets $runtime_dlls
 find_runtime_dlls () {
 	local triple=$1
-	# Try to find runtime DLLs in various paths (varies by distribution, sigh)
+	# Try to find runtime DLLs in various paths
 	local tmp=$(dirname "$(command -v $compiler)")/..
 	runtime_dlls=
-	for name in lib{gcc_,stdc++-,winpthread-}'*'.dll; do
-		for dir in $tmp/$triple/{bin,lib} $tmp/lib/gcc/$triple/*; do
+	for name in lib{clang_rt,c++,unwind,winpthread-}'*'.dll; do
+		for dir in $tmp/$triple/{bin,lib}; do
 			[ -d "$dir" ] || continue
 			local file=$(echo $dir/$name)
 			[ -f "$file" ] && { runtime_dlls+="$file;"; break; }
@@ -64,14 +67,25 @@ find_runtime_dlls () {
 	fi
 }
 
-add_cmake_libs () {
-	local irr_dlls=$(echo $libdir/irrlicht/lib/*.dll | tr ' ' ';')
-	local vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
-	local gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
+_dlls () {
+	for f in "$@"; do
+		if [ ! -e "$f" ]; then
+			echo "Could not find $f" >&2
+		elif [[ -f "$f" && "$f" == *.dll ]]; then
+			printf '%s;' "$f"
+		fi
+	done
+}
 
+add_cmake_libs () {
 	cmake_args+=(
-		-DCMAKE_PREFIX_PATH=$libdir/irrlicht
-		-DIRRLICHT_DLL="$irr_dlls"
+		-DPNG_LIBRARY=$libdir/libpng/lib/libpng.dll.a
+		-DPNG_PNG_INCLUDE_DIR=$libdir/libpng/include
+		-DPNG_DLL="$(_dlls $libdir/libpng/bin/*)"
+
+		-DJPEG_LIBRARY=$libdir/libjpeg/lib/libjpeg.dll.a
+		-DJPEG_INCLUDE_DIR=$libdir/libjpeg/include
+		-DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)"
 
 		-DZLIB_INCLUDE_DIR=$libdir/zlib/include
 		-DZLIB_LIBRARY=$libdir/zlib/lib/libz.dll.a
@@ -86,37 +100,37 @@ add_cmake_libs () {
 
 		-DOGG_INCLUDE_DIR=$libdir/libogg/include
 		-DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a
-		-DOGG_DLL=$libdir/libogg/bin/libogg-0.dll
+		-DOGG_DLL="$(_dlls $libdir/libogg/bin/*)"
 
 		-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include
 		-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a
-		-DVORBIS_DLL="$vorbis_dlls"
+		-DVORBIS_DLL="$(_dlls $libdir/libvorbis/bin/libvorbis{,file}[-.]*)"
 		-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a
 
 		-DOPENAL_INCLUDE_DIR=$libdir/openal/include/AL
 		-DOPENAL_LIBRARY=$libdir/openal/lib/libOpenAL32.dll.a
 		-DOPENAL_DLL=$libdir/openal/bin/OpenAL32.dll
 
-		-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll
+		-DCURL_DLL="$(_dlls $libdir/curl/bin/libcurl*)"
 		-DCURL_INCLUDE_DIR=$libdir/curl/include
 		-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a
 
 		-DGETTEXT_MSGFMT=`command -v msgfmt`
-		-DGETTEXT_DLL="$gettext_dlls"
+		-DGETTEXT_DLL="$(_dlls $libdir/gettext/bin/lib{intl,iconv}*)"
 		-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include
 		-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a
 
 		-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2
 		-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2
 		-DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a
-		-DFREETYPE_DLL=$libdir/freetype/bin/libfreetype-6.dll
+		-DFREETYPE_DLL="$(_dlls $libdir/freetype/bin/libfreetype*)"
 
 		-DSQLITE3_INCLUDE_DIR=$libdir/sqlite3/include
 		-DSQLITE3_LIBRARY=$libdir/sqlite3/lib/libsqlite3.dll.a
-		-DSQLITE3_DLL=$libdir/sqlite3/bin/libsqlite3-0.dll
+		-DSQLITE3_DLL="$(_dlls $libdir/sqlite3/bin/libsqlite*)"
 
-		-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include
-		-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a
-		-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
+		-DLEVELDB_INCLUDE_DIR=$libdir/libleveldb/include
+		-DLEVELDB_LIBRARY=$libdir/libleveldb/lib/libleveldb.dll.a
+		-DLEVELDB_DLL=$libdir/libleveldb/bin/libleveldb.dll
 	)
 }
diff --git a/util/buildbot/download_toolchain.sh b/util/buildbot/download_toolchain.sh
new file mode 100755
index 000000000..3097f803b
--- /dev/null
+++ b/util/buildbot/download_toolchain.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -z "$1" ]; then
+	echo "Usage: $0 <dest path>"
+	exit 1
+fi
+
+# key points:
+# * Clang + LLD + libc++ instead of GCC + binutils + stdc++
+# * Mingw-w64 with UCRT enabled and winpthreads support
+# why are we avoiding GCC? -> Thread Local Storage (TLS) is totally broken
+name=llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
+wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/$name" -O "$name"
+sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt")
+tar -xaf "$name" -C "$1" --strip-components=1
+rm -f "$name"
diff --git a/util/buildbot/sha256sums.txt b/util/buildbot/sha256sums.txt
new file mode 100644
index 000000000..4c6c13fcc
--- /dev/null
+++ b/util/buildbot/sha256sums.txt
@@ -0,0 +1,27 @@
+753dc38c591e078eae6a0a6b25f69826211256f444f3691a170670d8a12988f9  curl-8.5.0-win32.zip
+aa86abc3eb054d74d5fe15996f281cf84230a61b4ab7b3a702ab7dbb71e1203f  curl-8.5.0-win64.zip
+3e9d7bbca953b96dfd65acc28baaa87e8881aab29809ba03b9c9aefe3d071189  freetype-2.13.2-win32.zip
+acf901e93aedbcfa92eb3aab1def252676af845b1747ca5c3e7c5866576168cc  freetype-2.13.2-win64.zip
+41b10766de2773f0f0851fde16b363024685e0397f4bb2e5cd2a7be196960a01  gettext-0.20.2-win32.zip
+1ceed167ff16fea944f76ab6ea2969160c71a67419259b17c9c523e7a01eb883  gettext-0.20.2-win64.zip
+53dfd31285f470fcf0dca88217c5cf9c557729af6d103afae5936e72ddc38d3c  libjpeg-3.0.1-win32.zip
+3d44e0740914e6878300e30653aad39e974821b5d7f6c2567e246b4eb04a5324  libjpeg-3.0.1-win64.zip
+f54e9a577e2db47ed28f4a01e74181d2c607627c551d30f48263e01b59e84f67  libleveldb-1.23-win32.zip
+2f039848a4e6c05a2347fe5a7fa63c430dd08d1bc88235645a863c859e14f5f8  libleveldb-1.23-win64.zip
+0df94afb8efa361cceb132ecf9491720afbc45ba844a7b1c94607295829b53ca  libogg-1.3.5-win32.zip
+5c4acb4c99429a04b5e69650719b2eb17616bf52837d2372a0f859952eebce48  libogg-1.3.5-win64.zip
+6baf4e819bfb3573760524b5dc9a04b5e479090d6d2046b86cf39a3107c0071f  libpng-1.6.40-win32.zip
+c02e029f01fce44baea7f4aecfd2564bd8a03507c0c6af8b03339ae0452c8b7d  libpng-1.6.40-win64.zip
+456ece10a2be4247b27fbe88f88ddd54aae604736a6b76ba9a922b602fe40f40  libvorbis-1.3.7-win32.zip
+57f4db02da00556895bb63fafa6e46b5f7dac87c25fde27af4315f56a1aa7a86  libvorbis-1.3.7-win64.zip
+0f21ff3be90311092fe32e0e30878ef3ae9d9437b8d9ac25ef279e0d84e9bb8e  llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
+da6ad10632cf172992158e9ea0977a87914b5d5de93a972c3430b6a412237556  luajit-20240125-win32.zip
+2b1dabe83d478b398cf9226d96de7fa62c973365c4aea70d27ba5782fb49d2d0  luajit-20240125-win64.zip
+e2443451fe5c2066eb564c64b8a1762738a88b7fd749c8b5907fed45c785497b  openal-soft-1.23.1-win32.zip
+cb041445a118469caefbad2647470cb8571c8337bce2adc07634011ab5625417  openal-soft-1.23.1-win64.zip
+326701086a0ed66e09a9f3ec4d971654c13b6bd79cfdd079c947ecdcd6409525  sqlite3-3.44.2-win32.zip
+b2d474e3625f8f426b6cc5c0ecac831a1de46f7d1027bf4a9f6267b0b0411d42  sqlite3-3.44.2-win64.zip
+8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c  zlib-1.3.1-win32.zip
+ad43f5d23052590c65633530743e5d622cc76b33c109072e6fd7b487aff56bca  zlib-1.3.1-win64.zip
+3564dabbe17ec4ecae1fb9a78fe48d9f7c71e2b1166456f6ee27e52fd9c84357  zstd-1.5.5-win32.zip
+e61b1f327ce2d836d1f8ca00c40ac77d3ab5309135851c98229bbdf82b060ae5  zstd-1.5.5-win64.zip
diff --git a/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake b/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake
deleted file mode 100644
index 5d4d310f8..000000000
--- a/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# name of the target operating system
-SET(CMAKE_SYSTEM_NAME Windows)
-
-# which compilers to use for C and C++
-# *-posix is Ubuntu's naming for the MinGW variant that comes with support
-# for pthreads / std::thread (required by MT)
-SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix)
-SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
-SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
-
-# here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
-
-# adjust the default behavior of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/util/buildbot/toolchain_i686-w64-mingw32.cmake b/util/buildbot/toolchain_i686-w64-mingw32.cmake
index b0bc2b6b0..015682394 100644
--- a/util/buildbot/toolchain_i686-w64-mingw32.cmake
+++ b/util/buildbot/toolchain_i686-w64-mingw32.cmake
@@ -2,8 +2,8 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
-SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-clang)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-clang++)
 SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 
 # here is the target environment located
diff --git a/util/buildbot/toolchain_x86_64-w64-mingw32-posix.cmake b/util/buildbot/toolchain_x86_64-w64-mingw32-posix.cmake
deleted file mode 100644
index fa3b2f4d3..000000000
--- a/util/buildbot/toolchain_x86_64-w64-mingw32-posix.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# name of the target operating system
-SET(CMAKE_SYSTEM_NAME Windows)
-
-# which compilers to use for C and C++
-# *-posix is Ubuntu's naming for the MinGW variant that comes with support
-# for pthreads / std::thread (required by MT)
-SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
-SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
-SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
-
-# here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
-
-# adjust the default behavior of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
index 1f769ed85..113cc0e78 100644
--- a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
+++ b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
@@ -2,8 +2,8 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
-SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32-clang)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-clang++)
 SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
 
 # here is the target environment located
diff --git a/util/bump_version.sh b/util/bump_version.sh
index 82895f768..45452c295 100755
--- a/util/bump_version.sh
+++ b/util/bump_version.sh
@@ -142,10 +142,10 @@ perform_release() {
 	local release_version=$1
 	RELEASE_DATE=$(date +%Y-%m-%d)
 
-	sed -i '/\<release/s/\(version\)="[^"]*"/\1="'"$release_version"'"/' misc/net.minetest.minetest.appdata.xml
-	sed -i 's/\(<release date\)="[^"]*"/\1="'"$RELEASE_DATE"'"/' misc/net.minetest.minetest.appdata.xml
+	sed -i '/\<release/s/\(version\)="[^"]*"/\1="'"$release_version"'"/' misc/net.minetest.minetest.metainfo.xml
+	sed -i 's/\(<release date\)="[^"]*"/\1="'"$RELEASE_DATE"'"/' misc/net.minetest.minetest.metainfo.xml
 
-	git add -f misc/net.minetest.minetest.appdata.xml
+	git add -f misc/net.minetest.minetest.metainfo.xml
 
 	git commit -m "Bump version to $release_version"
 
diff --git a/util/ci/build.sh b/util/ci/build.sh
index e357bf556..eafb17ce3 100755
--- a/util/ci/build.sh
+++ b/util/ci/build.sh
@@ -1,8 +1,9 @@
-#! /bin/bash -e
+#!/bin/bash -e
 
 cmake -B build \
 	-DNO_BUILD_BIN_DIR=1 \
 	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \
+	-DENABLE_LTO=FALSE \
 	-DRUN_IN_PLACE=TRUE \
 	-DENABLE_GETTEXT=${CMAKE_ENABLE_GETTEXT:-TRUE} \
 	-DBUILD_SERVER=${CMAKE_BUILD_SERVER:-TRUE} \
diff --git a/util/ci/build_luajit.sh b/util/ci/build_luajit.sh
new file mode 100755
index 000000000..6307b2780
--- /dev/null
+++ b/util/ci/build_luajit.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -eu
+cd $HOME
+git clone --depth 1 https://github.com/LuaJIT/LuaJIT
+pushd LuaJIT
+make -j$(nproc)
+popd
diff --git a/util/ci/build_prometheus_cpp.sh b/util/ci/build_prometheus_cpp.sh
index f3e4a5559..d2956aa5e 100755
--- a/util/ci/build_prometheus_cpp.sh
+++ b/util/ci/build_prometheus_cpp.sh
@@ -1,7 +1,7 @@
-#! /bin/bash -eu
-
+#!/bin/bash -eu
 cd /tmp
-git clone --recursive https://github.com/jupp0r/prometheus-cpp
+git clone --recursive --depth 1 --shallow-submodules \
+	https://github.com/jupp0r/prometheus-cpp
 mkdir prometheus-cpp/build
 cd prometheus-cpp/build
 cmake .. \
diff --git a/util/ci/clang-format-whitelist.txt b/util/ci/clang-format-whitelist.txt
deleted file mode 100644
index 5cbc262ef..000000000
--- a/util/ci/clang-format-whitelist.txt
+++ /dev/null
@@ -1,500 +0,0 @@
-src/activeobject.h
-src/ban.cpp
-src/camera.cpp
-src/camera.h
-src/chat.cpp
-src/chat.h
-src/chat_interface.h
-src/client/clientlauncher.cpp
-src/client/clientlauncher.h
-src/client/sound_openal.cpp
-src/client.cpp
-src/clientenvironment.cpp
-src/clientenvironment.h
-src/client/gameui.cpp
-src/client.h
-src/client/hud.cpp
-src/client/hud.h
-src/clientiface.cpp
-src/clientiface.h
-src/client/joystick_controller.cpp
-src/client/joystick_controller.h
-src/clientmap.cpp
-src/clientmap.h
-src/clientmedia.cpp
-src/clientmedia.h
-src/clientobject.cpp
-src/clientobject.h
-src/client/render/core.cpp
-src/client/renderingengine.cpp
-src/client/render/interlaced.cpp
-src/client/render/plain.cpp
-src/client/render/sidebyside.cpp
-src/client/render/stereo.cpp
-src/client/tile.cpp
-src/client/tile.h
-src/client/fontengine.h
-src/client/clientenvironment.cpp
-src/client/mapblock_mesh.cpp
-src/client/sound_openal.h
-src/client/clouds.cpp
-src/client/fontengine.cpp
-src/client/camera.h
-src/client/hud.cpp
-src/client/clientmap.cpp
-src/client/sound_openal.cpp
-src/client/minimap.h
-src/client/content_cao.cpp
-src/client/localplayer.h
-src/client/mapblock_mesh.h
-src/client/mesh.cpp
-src/client/sound.cpp
-src/client/guiscalingfilter.cpp
-src/client/content_cso.cpp
-src/client/gameui.cpp
-src/client/wieldmesh.cpp
-src/client/clientmedia.h
-src/client/game.cpp
-src/client/keys.h
-src/client/client.h
-src/client/shader.cpp
-src/client/clientmap.h
-src/client/inputhandler.h
-src/client/content_mapblock.h
-src/client/game.h
-src/client/mesh.h
-src/client/camera.cpp
-src/client/sky.h
-src/client/mesh_generator_thread.cpp
-src/client/guiscalingfilter.h
-src/client/clientobject.cpp
-src/client/tile.cpp
-src/client/hud.h
-src/client/inputhandler.cpp
-src/client/clientevent.h
-src/client/gameui.h
-src/client/content_cso.h
-src/client/sky.cpp
-src/client/localplayer.cpp
-src/client/content_mapblock.cpp
-src/client/clientobject.h
-src/client/filecache.cpp
-src/client/particles.h
-src/client/clientenvironment.h
-src/client/imagefilters.h
-src/client/renderingengine.cpp
-src/client/tile.h
-src/client/clientmedia.cpp
-src/client/event_manager.h
-src/client/joystick_controller.h
-src/client/clouds.h
-src/client/clientlauncher.h
-src/client/content_cao.h
-src/client/minimap.cpp
-src/client/sound.h
-src/client/keycode.cpp
-src/client/particles.cpp
-src/client/joystick_controller.cpp
-src/client/keycode.h
-src/client/wieldmesh.h
-src/client/filecache.h
-src/client/shader.h
-src/client/mesh_generator_thread.h
-src/client/renderingengine.h
-src/client/client.cpp
-src/client/imagefilters.cpp
-src/client/clientlauncher.cpp
-src/clouds.cpp
-src/clouds.h
-src/collision.cpp
-src/collision.h
-src/config.h
-src/content_cao.cpp
-src/content_cao.h
-src/content_cso.cpp
-src/content_cso.h
-src/content_mapblock.cpp
-src/content_mapblock.h
-src/content_mapnode.cpp
-src/content_nodemeta.cpp
-src/content_nodemeta.h
-src/convert_json.cpp
-src/convert_json.h
-src/craftdef.cpp
-src/craftdef.h
-src/database/database.cpp
-src/database/database-dummy.cpp
-src/database/database-files.cpp
-src/database/database-leveldb.cpp
-src/database/database-postgresql.cpp
-src/database/database-postgresql.h
-src/database/database-redis.cpp
-src/database/database-sqlite3.cpp
-src/database/database-sqlite3.h
-src/daynightratio.h
-src/debug.cpp
-src/debug.h
-src/defaultsettings.cpp
-src/emerge.cpp
-src/emerge.h
-src/environment.cpp
-src/exceptions.h
-src/face_position_cache.cpp
-src/face_position_cache.h
-src/filecache.cpp
-src/filesys.cpp
-src/filesys.h
-src/fontengine.cpp
-src/fontengine.h
-src/game.cpp
-src/gamedef.h
-src/game.h
-src/gettext.cpp
-src/gettext.h
-src/gui/guiAnimatedImage.cpp
-src/gui/guiAnimatedImage.h
-src/gui/guiBackgroundImage.cpp
-src/gui/guiBackgroundImage.h
-src/gui/guiBox.cpp
-src/gui/guiBox.h
-src/gui/guiButton.cpp
-src/gui/guiButton.h
-src/gui/guiButtonImage.cpp
-src/gui/guiButtonImage.h
-src/gui/guiButtonItemImage.cpp
-src/gui/guiButtonItemImage.h
-src/gui/guiChatConsole.cpp
-src/gui/guiChatConsole.h
-src/gui/guiConfirmRegistration.cpp
-src/gui/guiEditBoxWithScrollbar.cpp
-src/gui/guiEditBoxWithScrollbar.h
-src/gui/guiEngine.cpp
-src/gui/guiEngine.h
-src/gui/guiFormSpecMenu.cpp
-src/gui/guiFormSpecMenu.h
-src/gui/guiKeyChangeMenu.cpp
-src/gui/guiHyperText.cpp
-src/gui/guiHyperText.h
-src/gui/guiInventoryList.cpp
-src/gui/guiInventoryList.h
-src/gui/guiItemImage.cpp
-src/gui/guiItemImage.h
-src/gui/guiMainMenu.h
-src/gui/guiPasswordChange.cpp
-src/gui/guiPathSelectMenu.cpp
-src/gui/guiPathSelectMenu.h
-src/gui/guiScene.cpp
-src/gui/guiScene.h
-src/gui/guiScrollBar.cpp
-src/gui/guiSkin.cpp
-src/gui/guiSkin.h
-src/gui/guiTable.cpp
-src/gui/guiTable.h
-src/gui/guiVolumeChange.cpp
-src/gui/guiVolumeChange.h
-src/gui/mainmenumanager.h
-src/gui/modalMenu.h
-src/guiscalingfilter.cpp
-src/guiscalingfilter.h
-src/gui/StyleSpec.h
-src/gui/touchscreengui.cpp
-src/httpfetch.cpp
-src/hud.cpp
-src/hud.h
-src/imagefilters.cpp
-src/imagefilters.h
-src/inventory.cpp
-src/inventory.h
-src/inventorymanager.cpp
-src/inventorymanager.h
-src/irrlicht_changes/CGUITTFont.cpp
-src/irrlicht_changes/CGUITTFont.h
-src/irrlicht_changes/irrUString.h
-src/irrlicht_changes/static_text.cpp
-src/irrlicht_changes/static_text.h
-src/irrlichttypes.h
-src/itemdef.cpp
-src/itemdef.h
-src/itemstackmetadata.cpp
-src/keycode.cpp
-src/light.cpp
-src/localplayer.cpp
-src/log.cpp
-src/log.h
-src/main.cpp
-src/mapblock.cpp
-src/mapblock.h
-src/mapblock_mesh.cpp
-src/mapblock_mesh.h
-src/map.cpp
-src/mapgen/cavegen.cpp
-src/mapgen/cavegen.h
-src/mapgen/dungeongen.cpp
-src/mapgen/dungeongen.h
-src/mapgen/mapgen.cpp
-src/mapgen/mapgen.h
-src/mapgen/mapgen_carpathian.cpp
-src/mapgen/mapgen_carpathian.h
-src/mapgen/mapgen_flat.cpp
-src/mapgen/mapgen_flat.h
-src/mapgen/mapgen_fractal.cpp
-src/mapgen/mapgen_fractal.h
-src/mapgen/mapgen_singlenode.cpp
-src/mapgen/mapgen_singlenode.h
-src/mapgen/mapgen_v5.cpp
-src/mapgen/mapgen_v5.h
-src/mapgen/mapgen_v6.cpp
-src/mapgen/mapgen_v6.h
-src/mapgen/mapgen_v7.cpp
-src/mapgen/mapgen_v7.h
-src/mapgen/mapgen_valleys.cpp
-src/mapgen/mapgen_valleys.h
-src/mapgen/mg_biome.cpp
-src/mapgen/mg_biome.h
-src/mapgen/mg_decoration.cpp
-src/mapgen/mg_decoration.h
-src/mapgen/mg_ore.cpp
-src/mapgen/mg_ore.h
-src/mapgen/mg_schematic.cpp
-src/mapgen/mg_schematic.h
-src/mapgen/treegen.cpp
-src/mapgen/treegen.h
-src/map.h
-src/mapnode.cpp
-src/mapnode.h
-src/mapsector.cpp
-src/mapsector.h
-src/map_settings_manager.cpp
-src/map_settings_manager.h
-src/mesh.cpp
-src/mesh_generator_thread.cpp
-src/mesh.h
-src/metadata.h
-src/minimap.cpp
-src/minimap.h
-src/mods.cpp
-src/mods.h
-src/network/address.cpp
-src/network/clientopcodes.cpp
-src/network/clientopcodes.h
-src/network/clientpackethandler.cpp
-src/network/connection.cpp
-src/network/connection.h
-src/network/connectionthreads.cpp
-src/network/networkpacket.cpp
-src/network/networkprotocol.h
-src/network/serveropcodes.cpp
-src/network/serveropcodes.h
-src/network/serverpackethandler.cpp
-src/nodedef.cpp
-src/nodedef.h
-src/nodemetadata.cpp
-src/nodemetadata.h
-src/nodetimer.cpp
-src/nodetimer.h
-src/noise.cpp
-src/noise.h
-src/objdef.cpp
-src/objdef.h
-src/object_properties.cpp
-src/object_properties.h
-src/particles.cpp
-src/particles.h
-src/pathfinder.cpp
-src/pathfinder.h
-src/player.cpp
-src/player.h
-src/porting_android.cpp
-src/porting_android.h
-src/porting.cpp
-src/porting.h
-src/profiler.h
-src/raycast.cpp
-src/raycast.h
-src/reflowscan.cpp
-src/reflowscan.h
-src/remoteplayer.cpp
-src/rollback.cpp
-src/rollback.h
-src/rollback_interface.cpp
-src/rollback_interface.h
-src/script/common/c_content.cpp
-src/script/common/c_content.h
-src/script/common/c_converter.cpp
-src/script/common/c_converter.h
-src/script/common/c_internal.cpp
-src/script/common/c_internal.h
-src/script/common/c_types.cpp
-src/script/common/c_types.h
-src/script/cpp_api/s_async.cpp
-src/script/cpp_api/s_async.h
-src/script/cpp_api/s_base.cpp
-src/script/cpp_api/s_base.h
-src/script/cpp_api/s_client.cpp
-src/script/cpp_api/s_entity.cpp
-src/script/cpp_api/s_entity.h
-src/script/cpp_api/s_env.cpp
-src/script/cpp_api/s_env.h
-src/script/cpp_api/s_internal.h
-src/script/cpp_api/s_inventory.cpp
-src/script/cpp_api/s_inventory.h
-src/script/cpp_api/s_item.cpp
-src/script/cpp_api/s_item.h
-src/script/cpp_api/s_mainmenu.h
-src/script/cpp_api/s_node.cpp
-src/script/cpp_api/s_node.h
-src/script/cpp_api/s_nodemeta.cpp
-src/script/cpp_api/s_nodemeta.h
-src/script/cpp_api/s_player.cpp
-src/script/cpp_api/s_player.h
-src/script/cpp_api/s_security.cpp
-src/script/cpp_api/s_security.h
-src/script/cpp_api/s_server.cpp
-src/script/cpp_api/s_server.h
-src/script/lua_api/l_areastore.cpp
-src/script/lua_api/l_base.cpp
-src/script/lua_api/l_base.h
-src/script/lua_api/l_client.cpp
-src/script/lua_api/l_craft.cpp
-src/script/lua_api/l_craft.h
-src/script/lua_api/l_env.cpp
-src/script/lua_api/l_env.h
-src/script/lua_api/l_http.cpp
-src/script/lua_api/l_http.h
-src/script/lua_api/l_internal.h
-src/script/lua_api/l_inventory.cpp
-src/script/lua_api/l_inventory.h
-src/script/lua_api/l_item.cpp
-src/script/lua_api/l_item.h
-src/script/lua_api/l_itemstackmeta.cpp
-src/script/lua_api/l_itemstackmeta.h
-src/script/lua_api/l_localplayer.cpp
-src/script/lua_api/l_mainmenu.cpp
-src/script/lua_api/l_mainmenu.h
-src/script/lua_api/l_mapgen.cpp
-src/script/lua_api/l_mapgen.h
-src/script/lua_api/l_metadata.cpp
-src/script/lua_api/l_minimap.cpp
-src/script/lua_api/l_nodemeta.cpp
-src/script/lua_api/l_nodemeta.h
-src/script/lua_api/l_nodetimer.cpp
-src/script/lua_api/l_noise.cpp
-src/script/lua_api/l_object.cpp
-src/script/lua_api/l_object.h
-src/script/lua_api/l_particles.cpp
-src/script/lua_api/l_particles.h
-src/script/lua_api/l_particles_local.cpp
-src/script/lua_api/l_rollback.cpp
-src/script/lua_api/l_rollback.h
-src/script/lua_api/l_server.cpp
-src/script/lua_api/l_settings.cpp
-src/script/lua_api/l_sound.cpp
-src/script/lua_api/l_storage.cpp
-src/script/lua_api/l_util.cpp
-src/script/lua_api/l_vmanip.cpp
-src/script/scripting_client.cpp
-src/script/scripting_client.h
-src/script/scripting_mainmenu.cpp
-src/script/scripting_mainmenu.h
-src/script/scripting_server.cpp
-src/script/scripting_server.h
-src/serialization.cpp
-src/serialization.h
-src/server.cpp
-src/serverenvironment.cpp
-src/serverenvironment.h
-src/server.h
-src/serverlist.cpp
-src/serverlist.h
-src/server/luaentity_sao.cpp
-src/server/player_sao.cpp
-src/server/serveractiveobject.cpp
-src/server/serveractiveobject.h
-src/settings.cpp
-src/settings.h
-src/settings_translation_file.cpp
-src/shader.cpp
-src/shader.h
-src/sky.cpp
-src/sound.cpp
-src/staticobject.cpp
-src/staticobject.h
-src/subgame.cpp
-src/subgame.h
-src/terminal_chat_console.cpp
-src/terminal_chat_console.h
-src/texture_override.cpp
-src/threading/atomic.h
-src/threading/event.cpp
-src/threading/mutex_auto_lock.h
-src/threading/mutex.cpp
-src/threading/mutex.h
-src/threading/semaphore.cpp
-src/threading/thread.cpp
-src/threading/thread.h
-src/threads.h
-src/tileanimation.cpp
-src/tileanimation.h
-src/tool.cpp
-src/tool.h
-src/translation.cpp
-src/unittest/test_areastore.cpp
-src/unittest/test_collision.cpp
-src/unittest/test_compression.cpp
-src/unittest/test_connection.cpp
-src/unittest/test.cpp
-src/unittest/test_filepath.cpp
-src/unittest/test.h
-src/unittest/test_inventory.cpp
-src/unittest/test_keycode.cpp
-src/unittest/test_map_settings_manager.cpp
-src/unittest/test_noderesolver.cpp
-src/unittest/test_noise.cpp
-src/unittest/test_random.cpp
-src/unittest/test_schematic.cpp
-src/unittest/test_serialization.cpp
-src/unittest/test_settings.cpp
-src/unittest/test_socket.cpp
-src/unittest/test_threading.cpp
-src/unittest/test_utilities.cpp
-src/unittest/test_voxelalgorithms.cpp
-src/unittest/test_voxelmanipulator.cpp
-src/util/areastore.cpp
-src/util/areastore.h
-src/util/auth.cpp
-src/util/auth.h
-src/util/base64.cpp
-src/util/base64.h
-src/util/basic_macros.h
-src/util/container.h
-src/util/directiontables.cpp
-src/util/directiontables.h
-src/util/enriched_string.cpp
-src/util/enriched_string.h
-src/util/md32_common.h
-src/util/numeric.cpp
-src/util/numeric.h
-src/util/pointedthing.cpp
-src/util/pointedthing.h
-src/util/pointer.h
-src/util/quicktune.h
-src/util/quicktune_shortcutter.h
-src/util/quicktune.cpp
-src/util/serialize.cpp
-src/util/serialize.h
-src/util/sha1.cpp
-src/util/srp.cpp
-src/util/srp.h
-src/util/strfnd.h
-src/util/string.cpp
-src/util/string.h
-src/util/thread.h
-src/util/timetaker.cpp
-src/util/timetaker.h
-src/version.cpp
-src/version.h
-src/voxelalgorithms.cpp
-src/voxelalgorithms.h
-src/voxel.cpp
-src/voxel.h
-src/wieldmesh.cpp
diff --git a/util/ci/clang-format.sh b/util/ci/clang-format.sh
deleted file mode 100755
index 89576c656..000000000
--- a/util/ci/clang-format.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/bash
-
-function setup_for_format() {
-	if [ -z "${CLANG_FORMAT}" ]; then
-		CLANG_FORMAT=clang-format
-	fi
-	echo "LINT: Using binary $CLANG_FORMAT"
-	CLANG_FORMAT_WHITELIST="util/ci/clang-format-whitelist.txt"
-
-	files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
-}
-
-function check_format() {
-	echo "Checking format..."
-
-	setup_for_format
-
-	local errorcount=0
-	local fail=0
-	for f in ${files_to_lint}; do
-		d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true)
-
-		if ! [ -z "$d" ]; then
-			whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
-
-			# If file is not whitelisted, mark a failure
-			if [ -z "${whitelisted}" ]; then
-				errorcount=$((errorcount+1))
-
-				printf "The file %s is not compliant with the coding style" "$f"
-				if [ ${errorcount} -gt 50 ]; then
-					printf "\nToo many errors encountered previously, this diff is hidden.\n"
-				else
-					printf ":\n%s\n" "$d"
-				fi
-
-				fail=1
-			fi
-		fi
-	done
-
-	if [ "$fail" = 1 ]; then
-		echo "LINT reports failure."
-		exit 1
-	fi
-
-	echo "LINT OK"
-}
-
-
-
-function fix_format() {
-	echo "Fixing format..."
-
-	setup_for_format
-
-	for f in ${files_to_lint}; do
-		whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
-		if [ -z "${whitelisted}" ]; then
-			echo "$f"
-			$CLANG_FORMAT -i "$f"
-		fi
-	done
-}
diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh
index e678cf3b9..99f419395 100755
--- a/util/ci/clang-tidy.sh
+++ b/util/ci/clang-tidy.sh
@@ -3,11 +3,11 @@
 cmake -B build -DCMAKE_BUILD_TYPE=Debug \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	-DRUN_IN_PLACE=TRUE \
-	-DENABLE_{GETTEXT,SOUND}=FALSE \
+	-DENABLE_GETTEXT=FALSE \
 	-DBUILD_SERVER=TRUE
 cmake --build build --target GenerateVersion
 
 ./util/ci/run-clang-tidy.py \
-	-clang-tidy-binary=clang-tidy-9 -p build \
+	-clang-tidy-binary=$CLANG_TIDY -p build \
 	-quiet -config="$(cat .clang-tidy)" \
 	'src/.*'
diff --git a/util/ci/common.sh b/util/ci/common.sh
index 37a746504..1b500e62b 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -5,27 +5,24 @@ install_linux_deps() {
 	local pkgs=(
 		cmake gettext postgresql
 		libleveldb-dev libsnappy-dev libboost-system-dev libunwind-dev
-		libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev
+		libpng-dev libjpeg-dev libgl1-mesa-dev libxi-dev libfreetype-dev
 		libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
 		libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
 	)
 
-	if [[ "$1" == "--no-irr" ]]; then
-		shift
-	else
-		local ver=$(cat misc/irrlichtmt_tag.txt)
-		wget "https://github.com/minetest/irrlicht/releases/download/$ver/ubuntu-bionic.tar.gz"
-		sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
-	fi
-
 	sudo apt-get update
 	sudo apt-get install -y --no-install-recommends "${pkgs[@]}" "$@"
 
-	sudo systemctl start postgresql.service
-	sudo -u postgres psql <<<"
-		CREATE USER minetest WITH PASSWORD 'minetest';
-		CREATE DATABASE minetest;
-	"
+	# set up Postgres for unit tests
+	if [ -n "$MINETEST_POSTGRESQL_CONNECT_STRING" ]; then
+		sudo systemctl start postgresql.service
+		sudo -u postgres psql <<<"
+			CREATE USER minetest WITH PASSWORD 'minetest';
+			CREATE DATABASE minetest;
+			\c minetest
+			GRANT ALL ON SCHEMA public TO minetest;
+		"
+	fi
 }
 
 # macOS build only
diff --git a/util/ci/docker.sh b/util/ci/docker.sh
deleted file mode 100755
index dd671a007..000000000
--- a/util/ci/docker.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-name=${CONTAINER_IMAGE}/server
-
-# build and publish Docker image (gitlab-ci)
-
-docker build . \
-	-t ${name}:${CI_COMMIT_SHA} \
-	-t ${name}:${CI_COMMIT_REF_NAME} \
-	-t ${name}:latest
-
-docker push ${name}:${CI_COMMIT_SHA}
-docker push ${name}:${CI_COMMIT_REF_NAME}
-[ "$CI_COMMIT_BRANCH" = master ] && docker push ${name}:latest
-
-exit 0
diff --git a/util/fix_format.sh b/util/fix_format.sh
deleted file mode 100755
index 3cef6f58d..000000000
--- a/util/fix_format.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-. ./util/ci/clang-format.sh
-
-fix_format
diff --git a/util/gather_git_credits.py b/util/gather_git_credits.py
index 7bbcf402d..cb0f42dde 100755
--- a/util/gather_git_credits.py
+++ b/util/gather_git_credits.py
@@ -6,7 +6,7 @@ from collections import defaultdict
 codefiles = r"(\.[ch](pp)?|\.lua|\.md|\.cmake|\.java|\.gradle|Makefile|CMakeLists\.txt)$"
 
 # two minor versions back, for "Active Contributors"
-REVS_ACTIVE = "5.6.0..HEAD"
+REVS_ACTIVE = "5.7.0..HEAD"
 # all time, for "Previous Contributors"
 REVS_PREVIOUS = "HEAD"
 
@@ -46,7 +46,8 @@ def load(revs):
 	p.wait()
 
 	# Some authors duplicate? Don't add manual workarounds here, edit the .mailmap!
-	for author in ("updatepo.sh <script@mt>", "Weblate <42@minetest.ru>"):
+	for author in ("updatepo.sh <script@mt>", "Weblate <42@minetest.ru>",
+		"import <script@mt>", "minetest <minetest@minetest.net>"):
 		points.pop(author, None)
 	return points
 
diff --git a/util/mod_translation_updater.py b/util/mod_translation_updater.py
deleted file mode 100755
index b2feaaf15..000000000
--- a/util/mod_translation_updater.py
+++ /dev/null
@@ -1,495 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# Script to generate Minetest translation template files and update
-# translation files.
-#
-# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer,
-#                    2023 Wuzzy.
-# License: LGPLv2.1 or later (see LICENSE file for details)
-
-import os, fnmatch, re, shutil, errno
-from sys import argv as _argv
-from sys import stderr as _stderr
-
-# Running params
-params = {"recursive": False,
-	"help": False,
-	"verbose": False,
-	"folders": [],
-	"old-file": False,
-	"break-long-lines": False,
-	"print-source": False,
-	"truncate-unused": False,
-}
-# Available CLI options
-options = {"recursive": ['--recursive', '-r'],
-	"help": ['--help', '-h'],
-	"verbose": ['--verbose', '-v'],
-	"old-file": ['--old-file', '-o'],
-	"break-long-lines": ['--break-long-lines', '-b'],
-	"print-source": ['--print-source', '-p'],
-	"truncate-unused": ['--truncate-unused', '-t'],
-}
-
-# Strings longer than this will have extra space added between
-# them in the translation files to make it easier to distinguish their
-# beginnings and endings at a glance
-doublespace_threshold = 80
-
-# These symbols mark comment lines showing the source file name.
-# A comment may look like "##[ init.lua ]##".
-symbol_source_prefix = "##["
-symbol_source_suffix = "]##"
-
-# comment to mark the section of old/unused strings
-comment_unused = "##### not used anymore #####"
-
-def set_params_folders(tab: list):
-	'''Initialize params["folders"] from CLI arguments.'''
-	# Discarding argument 0 (tool name)
-	for param in tab[1:]:
-		stop_param = False
-		for option in options:
-			if param in options[option]:
-				stop_param = True
-				break
-		if not stop_param:
-			params["folders"].append(os.path.abspath(param))
-
-def set_params(tab: list):
-	'''Initialize params from CLI arguments.'''
-	for option in options:
-		for option_name in options[option]:
-			if option_name in tab:
-				params[option] = True
-				break
-
-def print_help(name):
-	'''Prints some help message.'''
-	print(f'''SYNOPSIS
-	{name} [OPTIONS] [PATHS...]
-DESCRIPTION
-	{', '.join(options["help"])}
-		prints this help message
-	{', '.join(options["recursive"])}
-		run on all subfolders of paths given
-	{', '.join(options["old-file"])}
-		create *.old files
-	{', '.join(options["break-long-lines"])}
-		add extra line breaks before and after long strings
-	{', '.join(options["print-source"])}
-		add comments denoting the source file
-	{', '.join(options["verbose"])}
-		add output information
-	{', '.join(options["truncate-unused"])}
-		delete unused strings from files
-''')
-
-def main():
-	'''Main function'''
-	set_params(_argv)
-	set_params_folders(_argv)
-	if params["help"]:
-		print_help(_argv[0])
-	else:
-		# Add recursivity message
-		print("Running ", end='')
-		if params["recursive"]:
-			print("recursively ", end='')
-		# Running
-		if len(params["folders"]) >= 2:
-			print("on folder list:", params["folders"])
-			for f in params["folders"]:
-				if params["recursive"]:
-					run_all_subfolders(f)
-				else:
-					update_folder(f)
-		elif len(params["folders"]) == 1:
-			print("on folder", params["folders"][0])
-			if params["recursive"]:
-				run_all_subfolders(params["folders"][0])
-			else:
-				update_folder(params["folders"][0])
-		else:
-			print("on folder", os.path.abspath("./"))
-			if params["recursive"]:
-				run_all_subfolders(os.path.abspath("./"))
-			else:
-				update_folder(os.path.abspath("./"))
-
-# Group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
-# See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
-pattern_lua_quoted = re.compile(
-	r'(?:^|[\.=,{\(\s])' # Look for beginning of file or anything that isn't a function identifier
-	r'N?F?S\s*\(\s*' # Matches S, FS, NS or NFS function call
-	r'(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)' # Quoted string
-	r'[\s,\)]', # End of call or argument
-	re.DOTALL)
-# Handles the [[ ... ]] string delimiters
-pattern_lua_bracketed = re.compile(
-	r'(?:^|[\.=,{\(\s])' # Same as for pattern_lua_quoted
-	r'N?F?S\s*\(\s*' # Same as for pattern_lua_quoted
-	r'\[\[(.*?)\]\]' # [[ ... ]] string delimiters
-	r'[\s,\)]', # Same as for pattern_lua_quoted
-	re.DOTALL)
-
-# Handles "concatenation" .. " of strings"
-pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
-
-# Handles a translation line in *.tr file.
-# Group 1 is the source string left of the equals sign.
-# Group 2 is the translated string, right of the equals sign.
-pattern_tr = re.compile(
-	r'(.*)' # Source string
-	# the separating equals sign, if NOT preceded by @, unless
-	# that @ is preceded by another @
-	r'(?:(?<!(?<!@)@)=)'
-	r'(.*)' # Translation string
-	)
-pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
-pattern_tr_filename = re.compile(r'\.tr$')
-
-# Matches bad use of @ signs in Lua string
-pattern_bad_luastring = re.compile(
-	r'^@$|'	# single @, OR
-	r'[^@]@$|' # trailing unescaped @, OR
-	r'(?<!@)@(?=[^@1-9])' # an @ that is not escaped or part of a placeholder
-)
-
-# Attempt to read the mod's name from the mod.conf file or folder name. Returns None on failure
-def get_modname(folder):
-	try:
-		with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
-			for line in mod_conf:
-				match = pattern_name.match(line)
-				if match:
-					return match.group(1)
-	except FileNotFoundError:
-		if not os.path.isfile(os.path.join(folder, "modpack.txt")):
-			folder_name = os.path.basename(folder)
-			# Special case when run in Minetest's builtin directory
-			if folder_name == "builtin":
-				return "__builtin"
-			else:
-				return folder_name
-		else:
-			return None
-	return None
-
-# If there are already .tr files in /locale, returns a list of their names
-def get_existing_tr_files(folder):
-	out = []
-	for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
-		for name in files:
-			if pattern_tr_filename.search(name):
-				out.append(name)
-	return out
-
-# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
-# Creates a directory if it doesn't exist, silently does
-# nothing if it already exists
-def mkdir_p(path):
-	try:
-		os.makedirs(path)
-	except OSError as exc: # Python >2.5
-		if exc.errno == errno.EEXIST and os.path.isdir(path):
-			pass
-		else: raise
-
-# Converts the template dictionary to a text to be written as a file
-# dKeyStrings is a dictionary of localized string to source file sets
-# dOld is a dictionary of existing translations and comments from
-# the previous version of this text
-def strings_to_text(dkeyStrings, dOld, mod_name, header_comments, textdomain):
-	# if textdomain is specified, insert it at the top
-	if textdomain != None:
-		lOut = [textdomain] # argument is full textdomain line
-	# otherwise, use mod name as textdomain automatically
-	else:
-		lOut = [f"# textdomain: {mod_name}"]
-	if header_comments is not None:
-		lOut.append(header_comments)
-
-	dGroupedBySource = {}
-
-	for key in dkeyStrings:
-		sourceList = list(dkeyStrings[key])
-		sourceString = "\n".join(sourceList)
-		listForSource = dGroupedBySource.get(sourceString, [])
-		listForSource.append(key)
-		dGroupedBySource[sourceString] = listForSource
-
-	lSourceKeys = list(dGroupedBySource.keys())
-	lSourceKeys.sort()
-	for source in lSourceKeys:
-		localizedStrings = dGroupedBySource[source]
-		if params["print-source"]:
-			if lOut[-1] != "":
-				lOut.append("")
-			lOut.append(source)
-		for localizedString in localizedStrings:
-			val = dOld.get(localizedString, {})
-			translation = val.get("translation", "")
-			comment = val.get("comment")
-			if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
-				lOut.append("")
-			if comment != None and comment != "" and not comment.startswith("# textdomain:"):
-				lOut.append(comment)
-			lOut.append(f"{localizedString}={translation}")
-			if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
-				lOut.append("")
-
-	unusedExist = False
-	if not params["truncate-unused"]:
-		for key in dOld:
-			if key not in dkeyStrings:
-				val = dOld[key]
-				translation = val.get("translation")
-				comment = val.get("comment")
-				# only keep an unused translation if there was translated
-				# text or a comment associated with it
-				if translation != None and (translation != "" or comment):
-					if not unusedExist:
-						unusedExist = True
-						lOut.append("\n\n" + comment_unused + "\n")
-					if params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
-						lOut.append("")
-					if comment != None:
-						lOut.append(comment)
-					lOut.append(f"{key}={translation}")
-					if params["break-long-lines"] and len(key) > doublespace_threshold:
-						lOut.append("")
-	return "\n".join(lOut) + '\n'
-
-# Writes a template.txt file
-# dkeyStrings is the dictionary returned by generate_template
-def write_template(templ_file, dkeyStrings, mod_name):
-	# read existing template file to preserve comments
-	existing_template = import_tr_file(templ_file)
-
-	text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2], existing_template[3])
-	mkdir_p(os.path.dirname(templ_file))
-	with open(templ_file, "wt", encoding='utf-8') as template_file:
-		template_file.write(text)
-
-# Gets all translatable strings from a lua file
-def read_lua_file_strings(lua_file):
-	lOut = []
-	with open(lua_file, encoding='utf-8') as text_file:
-		text = text_file.read()
-
-		text = re.sub(pattern_concat, "", text)
-
-		strings = []
-		for s in pattern_lua_quoted.findall(text):
-			strings.append(s[1])
-		for s in pattern_lua_bracketed.findall(text):
-			strings.append(s)
-
-		for s in strings:
-			found_bad = pattern_bad_luastring.search(s)
-			if found_bad:
-				print("SYNTAX ERROR: Unescaped '@' in Lua string: " + s)
-				continue
-			s = s.replace('\\"', '"')
-			s = s.replace("\\'", "'")
-			s = s.replace("\n", "@n")
-			s = s.replace("\\n", "@n")
-			s = s.replace("=", "@=")
-			lOut.append(s)
-	return lOut
-
-# Gets strings from an existing translation file
-# returns both a dictionary of translations
-# and the full original source text so that the new text
-# can be compared to it for changes.
-# Returns also header comments in the third return value.
-def import_tr_file(tr_file):
-	dOut = {}
-	text = None
-	in_header = True
-	header_comments = None
-	textdomain = None
-	if os.path.exists(tr_file):
-		with open(tr_file, "r", encoding='utf-8') as existing_file :
-			# save the full text to allow for comparison
-			# of the old version with the new output
-			text = existing_file.read()
-			existing_file.seek(0)
-			# a running record of the current comment block
-			# we're inside, to allow preceeding multi-line comments
-			# to be retained for a translation line
-			latest_comment_block = None
-			for line in existing_file.readlines():
-				line = line.rstrip('\n')
-				# "##### not used anymore #####" comment
-				if line == comment_unused:
-					# Always delete the 'not used anymore' comment.
-					# It will be re-added to the file if neccessary.
-					latest_comment_block = None
-					if header_comments != None:
-						in_header = False
-					continue
-				# Comment lines
-				elif line.startswith("#"):
-					# Source file comments: ##[ file.lua ]##
-					if line.startswith(symbol_source_prefix) and line.endswith(symbol_source_suffix):
-						# This line marks the end of header comments.
-						if params["print-source"]:
-							in_header = False
-						# Remove those comments; they may be added back automatically.
-						continue
-
-					# Store first occurance of textdomain
-					# discard all subsequent textdomain lines
-					if line.startswith("# textdomain:"):
-						if textdomain == None:
-							textdomain = line
-						continue
-					elif in_header:
-						# Save header comments (normal comments at top of file)
-						if not header_comments:
-							header_comments = line
-						else:
-							header_comments = header_comments + "\n" + line
-					else:
-						# Save normal comments
-						if line.startswith("# textdomain:") and textdomain == None:
-							textdomain = line
-						elif not latest_comment_block:
-							latest_comment_block = line
-						else:
-							latest_comment_block = latest_comment_block + "\n" + line
-
-					continue
-
-				match = pattern_tr.match(line)
-				if match:
-					# this line is a translated line
-					outval = {}
-					outval["translation"] = match.group(2)
-					if latest_comment_block:
-						# if there was a comment, record that.
-						outval["comment"] = latest_comment_block
-					latest_comment_block = None
-					in_header = False
-
-					dOut[match.group(1)] = outval
-	return (dOut, text, header_comments, textdomain)
-
-# like os.walk but returns sorted filenames
-def sorted_os_walk(folder):
-	tuples = []
-	t = 0
-	for root, dirs, files in os.walk(folder):
-		tuples.append( (root, dirs, files) )
-		t = t + 1
-
-	tuples = sorted(tuples)
-
-	paths_and_files = []
-	f = 0
-
-	for tu in tuples:
-		root = tu[0]
-		dirs = tu[1]
-		files = tu[2]
-		files = sorted(files, key=str.lower)
-		for filename in files:
-			paths_and_files.append( (os.path.join(root, filename), filename) )
-			f = f + 1
-	return paths_and_files
-
-# Walks all lua files in the mod folder, collects translatable strings,
-# and writes it to a template.txt file
-# Returns a dictionary of localized strings to source file lists
-# that can be used with the strings_to_text function.
-def generate_template(folder, mod_name):
-	dOut = {}
-	paths_and_files = sorted_os_walk(folder)
-	for paf in paths_and_files:
-		fullpath_filename = paf[0]
-		filename = paf[1]
-		if fnmatch.fnmatch(filename, "*.lua"):
-			found = read_lua_file_strings(fullpath_filename)
-			if params["verbose"]:
-				print(f"{fullpath_filename}: {str(len(found))} translatable strings")
-
-			for s in found:
-				sources = dOut.get(s, set())
-				sources.add(os.path.relpath(fullpath_filename, start=folder))
-				dOut[s] = sources
-
-	if len(dOut) == 0:
-		return None
-
-	# Convert source file set to list, sort it and add comment symbols.
-	# Needed because a set is unsorted and might result in unpredictable.
-	# output orders if any source string appears in multiple files.
-	for d in dOut:
-		sources = dOut.get(d, set())
-		sources = sorted(list(sources), key=str.lower)
-		newSources = []
-		for i in sources:
-			newSources.append(f"{symbol_source_prefix} {i} {symbol_source_suffix}")
-		dOut[d] = newSources
-
-	templ_file = os.path.join(folder, "locale/template.txt")
-	write_template(templ_file, dOut, mod_name)
-	return dOut
-
-# Updates an existing .tr file, copying the old one to a ".old" file
-# if any changes have happened
-# dNew is the data used to generate the template, it has all the
-# currently-existing localized strings
-def update_tr_file(dNew, mod_name, tr_file):
-	if params["verbose"]:
-		print(f"updating {tr_file}")
-
-	tr_import = import_tr_file(tr_file)
-	dOld = tr_import[0]
-	textOld = tr_import[1]
-
-	textNew = strings_to_text(dNew, dOld, mod_name, tr_import[2], tr_import[3])
-
-	if textOld and textOld != textNew:
-		print(f"{tr_file} has changed.")
-		if params["old-file"]:
-			shutil.copyfile(tr_file, f"{tr_file}.old")
-
-	with open(tr_file, "w", encoding='utf-8') as new_tr_file:
-		new_tr_file.write(textNew)
-
-# Updates translation files for the mod in the given folder
-def update_mod(folder):
-	modname = get_modname(folder)
-	if modname is not None:
-		print(f"Updating translations for {modname}")
-		data = generate_template(folder, modname)
-		if data == None:
-			print(f"No translatable strings found in {modname}")
-		else:
-			for tr_file in get_existing_tr_files(folder):
-				update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
-	else:
-		print(f"Unable to determine the mod name in folder {folder}. Missing 'name' field in mod.conf.", file=_stderr)
-		exit(1)
-
-# Determines if the folder being pointed to is a mod or a mod pack
-# and then runs update_mod accordingly
-def update_folder(folder):
-	is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
-	if is_modpack:
-		subfolders = [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]
-		for subfolder in subfolders:
-			update_mod(subfolder)
-	else:
-		update_mod(folder)
-	print("Done.")
-
-def run_all_subfolders(folder):
-	for modfolder in [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]:
-		update_folder(modfolder)
-
-main()
diff --git a/util/test_multiplayer.sh b/util/test_multiplayer.sh
index b514de70b..695112868 100755
--- a/util/test_multiplayer.sh
+++ b/util/test_multiplayer.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Runs a multiplayer server and connects a headless client, devtest unittests are executed.
+
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 gameid=${gameid:-devtest}
 minetest=$dir/../bin/freeminer
@@ -21,6 +23,7 @@ waitfor () {
 
 [ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; }
 
+rm -f "$testspath/log.txt"
 rm -rf "$worldpath"
 mkdir -p "$worldpath/worldmods"
 
@@ -29,17 +32,19 @@ printf '%s\n' >"$testspath/client1.conf" \
 	enable_{sound,minimap,shaders}=false
 
 printf '%s\n' >"$testspath/server.conf" \
-	max_block_send_distance=1 devtest_unittests_autostart=true \
-	helper_mode=devtest
+	max_block_send_distance=1 active_block_range=1 \
+	devtest_unittests_autostart=true helper_mode=devtest
 
 ln -s "$dir/helper_mod" "$worldpath/worldmods/"
 
 echo "Starting server"
-"$minetest" --debugger --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 | sed -u 's/^/(server) /' &
+"$minetest" --debugger --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 \
+	| sed -u 's/^/(server) /' | tee -a "$testspath/log.txt" &
 waitfor "$worldpath/startup"
 
 echo "Starting client"
-"$minetest" --debugger --config "$conf_client1" --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' &
+"$minetest" --debugger --config "$conf_client1" --go --address 127.0.0.1 2>&1 \
+	| sed -u 's/^/(client) /' | tee -a "$testspath/log.txt" &
 waitfor "$worldpath/done"
 
 echo "Waiting for client and server to exit"
@@ -49,5 +54,10 @@ if [ -f "$worldpath/test_failure" ]; then
 	echo "There were test failures."
 	exit 1
 fi
+# gdb|lldb
+if grep -Eq "(Thread .* received signal|thread .* stop reason =)" "$testspath/log.txt"; then
+	echo "Debugger reported error."
+	exit 1
+fi
 echo "Success"
 exit 0
diff --git a/util/wireshark/minetest.lua b/util/wireshark/minetest.lua
index 93e4f0387..837ea2963 100644
--- a/util/wireshark/minetest.lua
+++ b/util/wireshark/minetest.lua
@@ -1280,13 +1280,14 @@ do
 
 	function p_minetest.dissector(buffer, pinfo, tree)
 
-		-- Add Minetest tree item and verify the ID
+		-- Defer if payload doesn't have Minetest's magic number
+		if buffer(0,4):uint() ~= minetest_id then
+			return false
+		end
+
+		-- Add Minetest tree item
 		local t = tree:add(p_minetest, buffer(0,8))
 		t:add(f_id, buffer(0,4))
-		if buffer(0,4):uint() ~= minetest_id then
-			t:add_expert_info(PI_UNDECODED, PI_WARN, "Invalid ID, this is not a Minetest packet")
-			return
-		end
 
 		-- ID is valid, so replace packet's shown protocol
 		pinfo.cols.protocol = "Minetest"
@@ -1339,12 +1340,11 @@ do
 		end
 
 		pinfo.cols.info:append(" (" .. reliability_info .. ")")
+		return true
 
 	end
 
-	-- FIXME Is there a way to let the dissector table check if the first payload bytes are 0x4f457403?
-	DissectorTable.get("udp.port"):add(30000, p_minetest)
-	DissectorTable.get("udp.port"):add(30001, p_minetest)
+	p_minetest:register_heuristic("udp", p_minetest.dissector)
 end